956 files changed, 42229 insertions, 40965 deletions

diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 8d44c7269..b6d07662e 100755
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -1223,8 +1223,8 @@ _080224C0:
 	bx r0
 	thumb_func_end sub_8022250
 
-	thumb_func_start sub_80224D0
-sub_80224D0: @ 80224D0
+	thumb_func_start ShowBerryCrushRankings
+ShowBerryCrushRankings: @ 80224D0
 	push {lr}
 	bl ScriptContext2_Enable
 	ldr r0, =sub_8022250
@@ -1259,7 +1259,7 @@ sub_80224D0: @ 80224D0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80224D0
+	thumb_func_end ShowBerryCrushRankings
 
 	thumb_func_start sub_8022524
 sub_8022524: @ 8022524
diff --git a/asm/macros.inc b/asm/macros.inc
index 7c35e059d..f6a143d7a 100644
--- a/asm/macros.inc
+++ b/asm/macros.inc
@@ -6,6 +6,7 @@
 	.include "asm/macros/ec.inc"
 	.include "asm/macros/map.inc"
 	.include "asm/macros/field_effect_script.inc"
+	.include "asm/macros/battle_frontier.inc"
 
 	.macro region_map_entry x, y, width, height, name
 	.byte \x
diff --git a/asm/macros/battle_frontier.inc b/asm/macros/battle_frontier.inc
new file mode 100644
index 000000000..2a6ee7d74
--- /dev/null
+++ b/asm/macros/battle_frontier.inc
@@ -0,0 +1,169 @@
+@ To be populated with macros for the Battle Frontier CallFacilityFunction specials
+
+
+@ Frontier Util
+
+.macro frontier_setlvlmode lvlmode:req
+setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
+setvar VAR_0x8005, 1
+setvar VAR_0x8006, \lvlmode
+special CallFrontierUtilFunc
+.endm
+
+@ Battle Tower
+
+.macro battletower_getstreak
+setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
+setvar VAR_0x8005, 1
+special CallBattleTowerFunc
+.endm
+
+@ Battle Dome
+
+@ Battle Palace
+
+@ Battle Arena
+
+@ Battle Factory
+
+@ Battle Pike
+
+@ Battle Pyramid
+
+@ Battle Tent
+
+@ Trainer Hill
+
+@ Apprentice
+
+.macro apprentice_gavelvlmode
+setvar VAR_0x8004, APPRENTICE_FUNC_GAVE_LVLMODE
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_setlvlmode lvlmode:req
+setvar VAR_0x8004, APPRENTICE_FUNC_SET_LVLMODE
+setorcopyvar VAR_0x8005, \lvlmode
+addvar VAR_0x8005, 1
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_answeredquestion
+setvar VAR_0x8004, APPRENTICE_FUNC_ANSWERED_QUESTION
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_menu  which:req
+setvar VAR_0x8004, APPRENTICE_FUNC_MENU
+setvar VAR_0x8005, \which
+special CallApprenticeFunction
+waitstate
+.endm
+
+.macro apprentice_shufflespecies
+setvar VAR_0x8004, APPRENTICE_FUNC_SHUFFLE_SPECIES
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_randomizequestions
+setvar VAR_0x8004, APPRENTICE_FUNC_RANDOMIZE_QUESTIONS
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_msg  waitbuttonpress:req, which:req
+setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG
+setvar VAR_0x8005, \waitbuttonpress
+setvar VAR_0x8006, \which
+special CallApprenticeFunction
+waitstate
+.endm
+
+.macro apprentice_reset
+setvar VAR_0x8004, APPRENTICE_FUNC_RESET
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_shouldcheckgone
+setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_getquestion
+setvar VAR_0x8004, APPRENTICE_FUNC_GET_QUESTION
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_getnumpartymons
+setvar VAR_0x8004, APPRENTICE_FUNC_GET_NUM_PARTY_MONS
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_setpartymon  slot:req
+copyvar VAR_0x8006, \slot
+setvar VAR_0x8004, APPRENTICE_FUNC_SET_PARTY_MON
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_initquestion  which:req
+setvar VAR_0x8004, APPRENTICE_FUNC_INIT_QUESTION_DATA
+setvar VAR_0x8005, \which
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_freequestion
+setvar VAR_0x8004, APPRENTICE_FUNC_FREE_QUESTION_DATA
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_buff  whichstringvar:req, tobuff:req
+setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
+setvar VAR_0x8005, \whichstringvar
+.if \tobuff >= VARS_START
+copyvar VAR_0x8006, \tobuff
+.else
+setvar VAR_0x8006, \tobuff
+.endif
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_setmove
+setvar VAR_0x8004, APPRENTICE_FUNC_SET_MOVE
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_setleadmon  monId:req
+copyvar VAR_0x8005, \monId
+setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_openbag
+setvar VAR_0x8004, APPRENTICE_FUNC_OPEN_BAG
+special CallApprenticeFunction
+waitstate
+.endm
+
+.macro apprentice_trysetitem
+setvar VAR_0x8004, APPRENTICE_FUNC_TRY_SET_HELD_ITEM
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_save
+setvar VAR_0x8004, APPRENTICE_FUNC_SAVE
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_setgfx
+setvar VAR_0x8004, APPRENTICE_FUNC_SET_GFX
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_shouldleave
+setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_shiftsaved
+setvar VAR_0x8004, APPRENTICE_FUNC_SHIFT_SAVED
+special CallApprenticeFunction
+.endm
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 997af51cc..eda410c5b 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -391,11 +391,11 @@
 	.byte 0x47
 	.endm
 
-	.macro playstatchangeanimation battler:req, param1:req, param2:req
+	.macro playstatchangeanimation battler:req, stats:req, statchange:req
 	.byte 0x48
 	.byte \battler
-	.byte \param1
-	.byte \param2
+	.byte \stats
+	.byte \statchange
 	.endm
 
 	.macro moveend param0:req, param1:req
@@ -738,10 +738,10 @@
 	.byte 0x88
 	.endm
 
-	.macro statbuffchange param0:req, param1:req
+	.macro statbuffchange flags:req, jumpptr:req
 	.byte 0x89
-	.byte \param0
-	.4byte \param1
+	.byte \flags
+	.4byte \jumpptr
 	.endm
 
 	.macro normalisebuffs
@@ -1267,7 +1267,7 @@
 	various \battler, 4
 	.endm
 	
-	.macro resetintrimidatetracebits battler:req
+	.macro resetintimidatetracebits battler:req
 	various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
 	.endm
 	
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 39510c207..9db57daf1 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -677,7 +677,7 @@
 	.elseif \type == TRAINER_BATTLE_SET_TRAINER_B
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == TRAINER_BATTLE_12
+	.elseif \type == TRAINER_BATTLE_HILL
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 	.endif
@@ -891,7 +891,7 @@
 	.endm
 
 	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
-	.macro drawcontestwinner a:req
+	.macro showcontestwinner a:req
 	.byte 0x77
 	.byte \a
 	.endm
@@ -1080,9 +1080,11 @@
 	.byte \check
 	.endm
 
-	@ Hides the secondary box spawned by showmoney.
+	@ Hides the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out.
 	.macro hidemoneybox
 	.byte 0x94
+	.byte 0  @ \x
+	.byte 0  @ \y
 	.endm
 
 	@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
@@ -1506,7 +1508,7 @@
 	.byte 0xd9
 	.endm
 
-	.macro hidebox2
+	.macro closebraillemessage
 	.byte 0xda
 	.endm
 
@@ -1630,6 +1632,14 @@
 	call_if 5, \dest
 	.endm
 
+	.macro vgoto_if_eq dest:req
+	vgoto_if 1, \dest
+	.endm
+
+	.macro vgoto_if_ne dest:req
+	vgoto_if 0, \dest
+	.endm
+
 	.macro switch var:req
 	copyvar VAR_0x8000, \var
 	.endm
@@ -1645,6 +1655,7 @@
 	MSGBOX_DEFAULT = 4
 	MSGBOX_YESNO = 5
 	MSGBOX_AUTOCLOSE = 6
+	MSGBOX_GETPOINTS = 9
 
 	YES = 1
 	NO  = 0
@@ -1671,3 +1682,10 @@
 	setorcopyvar VAR_0x8000, \trainer
 	callstd STD_REGISTER_MATCH_CALL
 	.endm
+
+	.macro dofieldeffectsparkle x:req, y:req, priority:req
+	setfieldeffectargument 0, \x
+	setfieldeffectargument 1, \y
+	setfieldeffectargument 2, \priority
+	dofieldeffect FLDEFF_SPARKLE
+	.endm
diff --git a/common_syms/apprentice.txt b/common_syms/apprentice.txt
index e35133ecc..0d3569dcb 100644
--- a/common_syms/apprentice.txt
+++ b/common_syms/apprentice.txt
@@ -1,3 +1,3 @@
-gUnknown_030062EC
-gUnknown_030062F0
-gUnknown_030062F4
+gApprenticePartyMovesData
+gApprenticeQuestionData
+gApprenticeFunc
diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt
index 1fba37a59..32bb8be16 100644
--- a/common_syms/contest_painting.txt
+++ b/common_syms/contest_painting.txt
@@ -1,4 +1,4 @@
-gUnknown_03006190
-gUnknown_030061A0
-gUnknown_030061C0
+gContestMonPixels
+gImageProcessingContext
+gContestPaintingWinner
 gContestPaintingMonPalette
diff --git a/common_syms/contest_painting_effects.txt b/common_syms/contest_painting_effects.txt
deleted file mode 100644
index 2f3d79219..000000000
--- a/common_syms/contest_painting_effects.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-gUnknown_03006164
-gUnknown_03006168
-gUnknown_0300616C
-gUnknown_03006170
-gUnknown_03006174
-gUnknown_03006178
-gUnknown_0300617C
-gUnknown_03006180
-gUnknown_03006184
-gUnknown_03006188
diff --git a/common_syms/image_processing_effects.txt b/common_syms/image_processing_effects.txt
new file mode 100644
index 000000000..134f7e88b
--- /dev/null
+++ b/common_syms/image_processing_effects.txt
@@ -0,0 +1,10 @@
+gCanvasColumnStart
+gCanvasPixels
+gCanvasRowEnd
+gCanvasHeight
+gCanvasColumnEnd
+gCanvasRowStart
+gCanvasMonPersonality
+gCanvasWidth
+gCanvasPalette
+gCanvasPaletteStart
diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt
index 53e72fa53..6ed37392c 100644
--- a/common_syms/party_menu.txt
+++ b/common_syms/party_menu.txt
@@ -1 +1 @@
-gUnknown_03006328
+gItemUseCB
diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt
index 2d0514325..0b30a632a 100644
--- a/common_syms/trainer_see.txt
+++ b/common_syms/trainer_see.txt
@@ -1,5 +1,5 @@
-gUnknown_03006080
-gUnknown_03006084
+gWhichTrainerToFaceAfterBattle
+gPostBattleMovementScript
 gApproachingTrainers
 gNoOfApproachingTrainers
-gUnknown_030060AC
+gTrainerApproachedPlayer
diff --git a/constants/gba_constants.inc b/constants/gba_constants.inc
index 9d59c8fcd..3ff857ee8 100644
--- a/constants/gba_constants.inc
+++ b/constants/gba_constants.inc
@@ -488,3 +488,26 @@
 	.set OAM_SIZE_8x32,          OAM_SIZE_1 | OAM_V_RECTANGLE
 	.set OAM_SIZE_16x32,         OAM_SIZE_2 | OAM_V_RECTANGLE
 	.set OAM_SIZE_32x64,         OAM_SIZE_3 | OAM_V_RECTANGLE
+
+@ BLDCNT
+
+	.set BLDCNT_TGT1_BG0,       1 << 0
+	.set BLDCNT_TGT1_BG1,       1 << 1
+	.set BLDCNT_TGT1_BG2,       1 << 2
+	.set BLDCNT_TGT1_BG3,       1 << 3
+	.set BLDCNT_TGT1_OBJ,       1 << 4
+	.set BLDCNT_TGT1_BD,        1 << 5
+	.set BLDCNT_TGT1_ALL,       BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD
+
+	.set BLDCNT_EFFECT_NONE,    0 << 6
+	.set BLDCNT_EFFECT_BLEND,   1 << 6
+	.set BLDCNT_EFFECT_LIGHTEN, 2 << 6
+	.set BLDCNT_EFFECT_DARKEN,  3 << 6
+
+	.set BLDCNT_TGT2_BG0,       1 << 8
+	.set BLDCNT_TGT2_BG1,       1 << 9
+	.set BLDCNT_TGT2_BG2,       1 << 10
+	.set BLDCNT_TGT2_BG3,       1 << 11
+	.set BLDCNT_TGT2_OBJ,       1 << 12
+	.set BLDCNT_TGT2_BD,        1 << 13
+	.set BLDCNT_TGT2_ALL,       BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 244a3ac05..24a266de6 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -366,7 +366,7 @@ BattleScript_EffectAbsorb::
 	setbyte cMULTISTRING_CHOOSER, 0x0
 	goto BattleScript_AbsorbUpdateHp
 BattleScript_AbsorbLiquidOoze::
-	manipulatedamage ATK80_DMG_CHANGE_SIGN
+	manipulatedamage DMG_CHANGE_SIGN
 	setbyte cMULTISTRING_CHOOSER, 0x1
 BattleScript_AbsorbUpdateHp::
 	healthbarupdate BS_ATTACKER
@@ -422,7 +422,7 @@ BattleScript_ExplosionLoop:
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -430,7 +430,7 @@ BattleScript_ExplosionMissed:
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -511,7 +511,7 @@ BattleScript_EffectStatUp::
 BattleScript_EffectStatUpAfterAtkCanceler::
 	attackstring
 	ppreduce
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_StatUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
 	pause 0x20
 	goto BattleScript_StatUpPrintString
@@ -557,7 +557,7 @@ BattleScript_EffectStatDown::
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
 	ppreduce
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StatDownEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd
 	pause 0x20
@@ -654,7 +654,7 @@ BattleScript_DoMultiHit::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	addbyte sMULTIHIT_STRING + 4, 0x1
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
 	decrementmultihit BattleScript_MultiHitLoop
 	goto BattleScript_MultiHitPrintStrings
@@ -670,8 +670,8 @@ BattleScript_MultiHitPrintStrings::
 BattleScript_MultiHitEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendcase ATK49_SYNCHRONIZE_TARGET
-	moveendfrom ATK49_STATUS_IMMUNITY_ABILITIES
+	moveendcase MOVEEND_SYNCHRONIZE_TARGET
+	moveendfrom MOVEEND_IMMUNITY_ABILITIES
 	end
 
 BattleScript_EffectConversion::
@@ -882,7 +882,7 @@ BattleScript_MoveMissedDoDamage::
 	damagecalc
 	typecalc
 	adjustnormaldamage
-	manipulatedamage ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP
+	manipulatedamage DMG_RECOIL_FROM_MISS
 	bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
 	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
 	healthbarupdate BS_ATTACKER
@@ -1435,7 +1435,7 @@ BattleScript_DoTripleKickAttack::
 	waitmessage 0x40
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
 	decrementmultihit BattleScript_TripleKickLoop
 	goto BattleScript_TripleKickPrintStrings
@@ -1454,7 +1454,7 @@ BattleScript_TripleKickPrintStrings::
 BattleScript_TripleKickEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendfrom ATK49_UPDATE_LAST_MOVES
+	moveendfrom MOVEEND_UPDATE_LAST_MOVES
 	end
 
 BattleScript_EffectThief::
@@ -1513,17 +1513,17 @@ BattleScript_CurseTrySpeed::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryAttack
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_CurseTryAttack::
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryDefence
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefence
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CurseTryDefence::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CurseEnd::
@@ -1635,7 +1635,7 @@ BattleScript_EffectSwagger::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_ATK, 2, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_SwaggerTryConfuse
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1716,7 +1716,7 @@ BattleScript_EffectBatonPass::
 	attackstring
 	ppreduce
 	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_ButItFailed
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	openpartyscreen 0x1, BattleScript_ButItFailed
@@ -1834,7 +1834,7 @@ BattleScript_EffectSkullBash::
 	setbyte sTWOTURN_STRINGID, 0x2
 	call BattleScriptFirstChargingTurn
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_SkullBashEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
 	setgraphicalstatchangevalues
 	playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1885,7 +1885,7 @@ BattleScript_DoHitAllWithUndergroundBonus::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 BattleScript_HitAllWithUndergroundBonusMissed::
@@ -1894,7 +1894,7 @@ BattleScript_HitAllWithUndergroundBonusMissed::
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 
@@ -1970,7 +1970,7 @@ BattleScript_BeatUpLoop::
 	printstring STRINGID_PKMNATTACK
 	critcalc
 	jumpifbyte CMP_NOT_EQUAL, gCritMultiplier, 0x2, BattleScript_BeatUpAttack
-	manipulatedamage ATK80_DMG_DOUBLED
+	manipulatedamage DMG_DOUBLED
 BattleScript_BeatUpAttack::
 	adjustnormaldamage
 	attackanimation
@@ -1985,7 +1985,7 @@ BattleScript_BeatUpAttack::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	goto BattleScript_BeatUpLoop
 BattleScript_BeatUpEnd::
 	end
@@ -2037,7 +2037,7 @@ BattleScript_EffectDefenseCurl::
 	ppreduce
 	setdefensecurlbit
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DefenseCurlDoStatUpAnim
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
 	attackanimation
 	waitanimation
@@ -2178,7 +2178,7 @@ BattleScript_EffectFlatter::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_FlatterTryConfuse
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -2232,17 +2232,17 @@ BattleScript_EffectMemento::
 	waitanimation
 	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectMementoPrintNoEffect
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_ATK, 2, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTrySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTrySpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_EffectMementoTrySpAtk:
-	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTryFaint
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTryFaint
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -2606,7 +2606,7 @@ BattleScript_TeeterDanceLoop::
 	resultmessage
 	waitmessage 0x40
 BattleScript_TeeterDanceDoMoveEndIncrement::
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 BattleScript_TeeterDanceLoopIncrement::
 	addbyte gBattlerTarget, 0x1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
@@ -2677,17 +2677,17 @@ BattleScript_TickleDoMoveAnim::
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleTryLowerDef
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_TickleTryLowerDef::
-	playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -2713,13 +2713,13 @@ BattleScript_CosmicPowerDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0x0
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CosmicPowerTrySpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -2742,13 +2742,13 @@ BattleScript_BulkUpDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpTryDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_BulkUpTryDef::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -2767,13 +2767,13 @@ BattleScript_CalmMindDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CalmMindTrySpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -2799,13 +2799,13 @@ BattleScript_DragonDanceDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceTrySpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_DragonDanceTrySpeed::
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -2865,7 +2865,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
 	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
 	jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
-	jumpifcantswitch 11, BattleScript_FaintedMonChooseAnother
+	jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonChooseAnother
 	printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
 	setbyte gBattleCommunication, 0x0
 	yesnobox
@@ -2875,7 +2875,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	switchhandleorder BS_ATTACKER, 0x2
 	jumpifbyte CMP_EQUAL, gBattleCommunication, 0x6, BattleScript_FaintedMonChooseAnother
 	atknameinbuff1
-	resetintrimidatetracebits BS_ATTACKER
+	resetintimidatetracebits BS_ATTACKER
 	hpthresholds2 BS_ATTACKER
 	printstring STRINGID_RETURNMON
 	switchoutabilities BS_ATTACKER
@@ -3128,8 +3128,8 @@ BattleScript_DoSwitchOut::
 	switchinanim BS_ATTACKER, FALSE
 	waitstate
 	switchineffects BS_ATTACKER
-	moveendcase ATK49_STATUS_IMMUNITY_ABILITIES
-	moveendcase ATK49_MIRROR_MOVE
+	moveendcase MOVEEND_IMMUNITY_ABILITIES
+	moveendcase MOVEEND_MIRROR_MOVE
 	end2
 
 BattleScript_PursuitDmgOnSwitchOut::
@@ -3152,7 +3152,7 @@ BattleScript_PursuitDmgOnSwitchOut::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendfromto ATK49_MOVE_END_ABILITIES, ATK49_CHOICE_MOVE
+	moveendfromto MOVEEND_ON_DAMAGE_ABILITIES, MOVEEND_CHOICE_MOVE
 	various4 BS_TARGET
 	jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
 	setbyte sGIVEEXP_STATE, 0x0
@@ -3281,7 +3281,7 @@ BattleScript_LeechSeedTurnDrain::
 	datahpupdate BS_ATTACKER
 	copyword gBattleMoveDamage, gHpDealt
 	jumpifability BS_ATTACKER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze
-	manipulatedamage ATK80_DMG_CHANGE_SIGN
+	manipulatedamage DMG_CHANGE_SIGN
 	setbyte cMULTISTRING_CHOOSER, 0x3
 	goto BattleScript_LeechSeedTurnPrintAndUpdateHp
 BattleScript_LeechSeedTurnPrintLiquidOoze::
@@ -3380,7 +3380,7 @@ BattleScript_DisabledNoMore::
 BattleScript_SelectingDisabledMoveInPalace::
 	printstring STRINGID_PKMNMOVEISDISABLED
 BattleScript_SelectingUnusableMoveInPalace::
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_EncoredNoMore::
@@ -3471,27 +3471,27 @@ BattleScript_AllStatsUpAtk::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpDef::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpeed::
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpAtk::
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpRet
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpRet::
@@ -3543,8 +3543,8 @@ BattleScript_DoFutureAttackHit::
 	tryfaintmon BS_TARGET, FALSE, NULL
 	atk24 BattleScript_FutureAttackEnd
 BattleScript_FutureAttackEnd::
-	moveendcase ATK49_RAGE
-	moveendfromto ATK49_ITEM_EFFECTS_ALL, ATK49_UPDATE_LAST_MOVES
+	moveendcase MOVEEND_RAGE
+	moveendfromto MOVEEND_ITEM_EFFECTS_ALL, MOVEEND_UPDATE_LAST_MOVES
 	setbyte gMoveResultFlags, 0
 	end2
 
@@ -3635,17 +3635,17 @@ BattleScript_PrintMonIsRooted::
 
 BattleScript_AtkDefDown::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
+	playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_82DB144
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_82DB144
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_82DB144::
-	playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_82DB167
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_82DB167
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -3709,9 +3709,9 @@ BattleScript_OneHitKOMsg::
 
 BattleScript_SAtkDown2::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_SAtkDown2End
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SAtkDown2End
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -4042,7 +4042,7 @@ BattleScript_IntimidateActivatesLoop:
 	jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
 	jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
 	jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
-	statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_BS_PTR, BattleScript_IntimidateActivatesLoopIncrement
+	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4233,7 +4233,7 @@ BattleScript_AbilityCuredStatus::
 BattleScript_IgnoresWhileAsleep::
 	printstring STRINGID_PKMNIGNORESASLEEP
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndUsesRandomMove::
@@ -4249,7 +4249,7 @@ BattleScript_MoveUsedLoafingAround::
 BattleScript_82DB6C7::
 	printfromtable gInobedientStringIds
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndFallsAsleep::
@@ -4257,7 +4257,7 @@ BattleScript_IgnoresAndFallsAsleep::
 	waitmessage 0x40
 	setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
 	seteffectprimary
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndHitsItself::
@@ -4420,7 +4420,7 @@ BattleScript_BerryConfuseHealEnd2::
 
 BattleScript_BerryStatRaiseEnd2::
 	playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_82DB85B
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B
 BattleScript_82DB85B::
 	setbyte cMULTISTRING_CHOOSER, 0x4
 	call BattleScript_StatUp
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 62489d1fb..9f0e27ce6 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,11 +1,14 @@
 #include "constants/global.h"
+#include "constants/apprentice.h"
 #include "constants/battle.h"
+#include "constants/battle_frontier.h"
 #include "constants/battle_pike.h"
 #include "constants/battle_pyramid.h"
-#include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
+#include "constants/battle_tower.h"
 #include "constants/berry.h"
 #include "constants/cable_club.h"
+#include "constants/coins.h"
 #include "constants/contest.h"
 #include "constants/daycare.h"
 #include "constants/decorations.h"
@@ -17,6 +20,7 @@
 #include "constants/field_specials.h"
 #include "constants/field_tasks.h"
 #include "constants/flags.h"
+#include "constants/frontier_util.h"
 #include "constants/game_stat.h"
 #include "constants/item.h"
 #include "constants/items.h"
@@ -25,6 +29,7 @@
 #include "constants/lilycove_lady.h"
 #include "constants/map_scripts.h"
 #include "constants/maps.h"
+#include "constants/mauville_old_man.h"
 #include "constants/metatile_labels.h"
 #include "constants/moves.h"
 #include "constants/party_menu.h"
@@ -37,6 +42,7 @@
 #include "constants/trainer_hill.h"
 #include "constants/trainers.h"
 #include "constants/tv.h"
+#include "constants/union_room.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
 	.include "asm/macros.inc"
@@ -84,7 +90,7 @@ gStdScripts:: @ 81DC2A0
 	.4byte Std_MsgboxAutoclose
 	.4byte Std_ObtainDecoration
 	.4byte Std_RegisteredInMatchCall
-	.4byte Std_9
+	.4byte Std_MsgboxGetPoints
 	.4byte Std_10
 gStdScripts_End:: @ 81DC2CC
 
@@ -174,8 +180,8 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc"
 	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/FallarborTown_House1/scripts.inc"
-	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/FallarborTown_CozmosHouse/scripts.inc"
+	.include "data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc"
 	.include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc"
 	.include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc"
 	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc"
@@ -204,12 +210,12 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/SlateportCity_BattleTentLobby/scripts.inc"
 	.include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc"
 	.include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc"
-	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_NameRatersHouse/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
 	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
 	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
 	.include "data/maps/SlateportCity_Harbor/scripts.inc"
-	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_House/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
 	.include "data/maps/SlateportCity_Mart/scripts.inc"
@@ -435,22 +441,11 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/AlteringCave/scripts.inc"
 	.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
 	.include "data/scripts/shared_secret_base.inc"
-	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/BattleColosseum2P/scripts.inc"
 	.include "data/maps/TradeCenter/scripts.inc"
 	.include "data/maps/RecordCorner/scripts.inc"
-	.include "data/maps/DoubleBattleColosseum/scripts.inc"
-	.include "data/maps/LinkContestRoom1/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
-	.include "data/maps/LinkContestRoom2/scripts.inc"
-	.include "data/maps/LinkContestRoom3/scripts.inc"
-	.include "data/maps/LinkContestRoom4/scripts.inc"
-	.include "data/maps/LinkContestRoom5/scripts.inc"
-	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/BattleColosseum4P/scripts.inc"
+	.include "data/maps/ContestHall/scripts.inc"
 	.include "data/maps/InsideOfTruck/scripts.inc"
 	.include "data/maps/SSTidalCorridor/scripts.inc"
 	.include "data/maps/SSTidalLowerDeck/scripts.inc"
@@ -514,7 +509,7 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc"
 	.include "data/maps/BattleFrontier_RankingHall/scripts.inc"
 	.include "data/maps/BattleFrontier_Lounge1/scripts.inc"
-	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc"
+	.include "data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc"
 	.include "data/maps/BattleFrontier_Lounge2/scripts.inc"
 	.include "data/maps/BattleFrontier_Lounge3/scripts.inc"
 	.include "data/maps/BattleFrontier_Lounge4/scripts.inc"
@@ -584,6 +579,7 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/Route119_House/scripts.inc"
 	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
 
+@ Below could be split as std_msgbox.inc but autoclose straddles trainer_battle.inc
 Std_MsgboxNPC: @ 8271315
 	lock
 	faceplayer
@@ -613,7 +609,7 @@ Std_MsgboxYesNo: @ 8271332
 	yesnobox 20, 8
 	return
 
-Std_9: @ 827133C
+Std_MsgboxGetPoints: @ 827133C
 	message 0x0
 	playfanfare MUS_ME_POINTGET
 	waitfanfare
@@ -633,10 +629,6 @@ Common_EventScript_SaveGame:: @ 827134F
 	waitstate
 	return
 
-EventScript_271354:: @ 8271354
-	cmdD8
-	cmdD9
-
 	.include "data/scripts/trainer_battle.inc"
 
 Std_MsgboxAutoclose:: @ 8271494
@@ -647,60 +639,7 @@ Std_MsgboxAutoclose:: @ 8271494
 	return
 
 	.include "data/scripts/new_game.inc"
-
-EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
-	special sub_81AFDD0
-	setflag FLAG_IS_CHAMPION
-	call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
-	compare VAR_FOSSIL_MANIAC_STATE, 0
-	call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
-	clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
-	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
-	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
-	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
-	setvar VAR_STEVENS_HOUSE_STATE, 2
-	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
-	clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
-	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
-	clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
-	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
-	clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
-	setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
-	special sub_813BA60
-	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_271843
-	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F
-	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
-	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
-	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0
-	call_if_eq EverGrandeCity_HallOfFame_EventScript_271851
-	return
-
-EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
-	clearflag FLAG_DEFEATED_MEW
-	clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
-	clearflag FLAG_DEFEATED_DEOXYS
-	clearflag FLAG_DEFEATED_LUGIA
-	clearflag FLAG_DEFEATED_HO_OH
-	return
-
-EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
-	setvar VAR_FOSSIL_MANIAC_STATE, 1
-	return
-
-EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
-	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
-	return
-
-EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
-	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
-	return
-
-EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
-	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
-	return
+	.include "data/scripts/hall_of_fame.inc"
 
 EventScript_WhiteOut:: @ 8271857
 	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
@@ -713,13 +652,13 @@ EventScript_ResetMrBriney:: @ 8271862
 	compare VAR_BRINEY_LOCATION, 2
 	goto_if_eq EventScript_MoveMrBrineyToDewford
 	compare VAR_BRINEY_LOCATION, 3
-	goto_if_eq EventScript_MoveMrBrineyToRoute108
+	goto_if_eq EventScript_MoveMrBrineyToRoute109
 	end
 
 EventScript_MoveMrBrineyToHouse:: @ 8271884
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -727,7 +666,7 @@ EventScript_MoveMrBrineyToHouse:: @ 8271884
 	end
 
 EventScript_MoveMrBrineyToDewford:: @ 827189A
-	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
@@ -737,14 +676,14 @@ EventScript_MoveMrBrineyToDewford:: @ 827189A
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
-EventScript_MoveMrBrineyToRoute108:: @ 82718B3
+EventScript_MoveMrBrineyToRoute109:: @ 82718B3
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	end
 
@@ -761,7 +700,7 @@ Common_EventScript_UpdateBrineyLocation:: @ 82718DE
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
 	goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House
 	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, EventScript_SetBrineyLocation_Dewford
-	goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, EventScript_SetBrineyLocation_Route108
+	goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109
 	return
 
 EventScript_SetBrineyLocation_House:: @ 827190C
@@ -772,246 +711,16 @@ EventScript_SetBrineyLocation_Dewford:: @ 8271912
 	setvar VAR_BRINEY_LOCATION, 2
 	return
 
-EventScript_SetBrineyLocation_Route108:: @ 8271918
+EventScript_SetBrineyLocation_Route109:: @ 8271918
 	setvar VAR_BRINEY_LOCATION, 3
 	return
 
 	.include "data/scripts/pkmn_center_nurse.inc"
-
-Std_ObtainItem:: @ 8271AD3
-	giveitem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	call EventScript_271AE3
-	return
-
-EventScript_271AE3:: @ 8271AE3
-	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
-	checkitemtype VAR_0x8000
-	call EventScript_BufferStdString
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_271B95
-	compare VAR_0x8007, 0
-	call_if_eq EventScript_271BA9
-	return
-
-EventScript_BufferStdString:: @ 8271B08
-	switch VAR_RESULT
-	case POCKET_ITEMS, EventScript_StdStringItem
-	case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems
-	case POCKET_POKE_BALLS, EventScript_StdStringPokeballs
-	case POCKET_TM_HM, EventScript_StdStringTMHMS
-	case POCKET_BERRIES, EventScript_StdStringBerries
-	end
-
-EventScript_StdStringItem:: @ 8271B45
-	bufferstdstring 2, STDSTRING_ITEMS
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_PlayFanfare4
-	return
-
-EventScript_StdStringKeyItems:: @ 8271B55
-	bufferstdstring 2, STDSTRING_KEYITEMS
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_PlayFanfare4
-	return
-
-EventScript_StdStringPokeballs:: @ 8271B65
-	bufferstdstring 2, STDSTRING_POKEBALLS
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_PlayFanfare4
-	return
-
-EventScript_StdStringTMHMS:: @ 8271B75
-	bufferstdstring 2, STDSTRING_TMHMS
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BB3
-	return
-
-EventScript_StdStringBerries:: @ 8271B85
-	bufferstdstring 2, STDSTRING_BERRIES
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_PlayFanfare4
-	return
-
-EventScript_271B95:: @ 8271B95
-	message gText_ObtainedTheItem
-	waitfanfare
-	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 1
-	return
-
-EventScript_271BA9:: @ 8271BA9
-	setvar VAR_RESULT, 0
-	return
-
-EventScript_PlayFanfare4:: @ 8271BAF
-	playfanfare MUS_FANFA4
-	return
-
-EventScript_271BB3:: @ 8271BB3
-	playfanfare MUS_ME_WAZA
-	return
-
-Std_ObtainDecoration:: @ 8271BB7
-	givedecoration VAR_0x8000
-	copyvar VAR_0x8007, VAR_RESULT
-	call EventScript_271BC5
-	return
-
-EventScript_271BC5:: @ 8271BC5
-	bufferdecorationname 1, VAR_0x8000
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_271BE0
-	compare VAR_0x8007, 0
-	call_if_eq EventScript_271BF7
-	return
-
-EventScript_271BE0:: @ 8271BE0
-	playfanfare MUS_FANFA4
-	message gText_ObtainedTheMon
-	waitfanfare
-	msgbox gText_TheMonWasTransferredToThePC, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 1
-	return
-
-EventScript_271BF7:: @ 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_BufferStdString
-	compare VAR_0x8007, 1
-	call_if_eq EventScript_PickItemUp
-	compare VAR_0x8007, 0
-	call_if_eq EventScript_271CA1
-	release
-	return
-
-EventScript_PickItemUp:: @ 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_271C8F
-	compare VAR_0x8008, 0
-	call_if_eq EventScript_271C9B
-	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_271C86
-	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	return
-
-EventScript_271C86:: @ 8271C86
-	msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT
-	return
-
-EventScript_271C8F:: @ 8271C8F
-	bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
-	message gText_PlayerFoundOneItemTwoLines
-	return
-
-EventScript_271C9B:: @ 8271C9B
-	message gText_PlayerFoundOneItem
-	return
-
-EventScript_271CA1:: @ 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_BufferStdString
-	compare VAR_0x8007, 1
-	goto_if_eq EventScript_271CE8
-	compare VAR_0x8007, 0
-	goto_if_eq EventScript_271D47
-	end
-
-EventScript_271CE8:: @ 8271CE8
-	copyvar VAR_0x8008, VAR_0x8004
-	copyvar VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, BufferTMHMMoveName
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_271D0E
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_271D1F
-	end
-
-EventScript_271D0E:: @ 8271D0E
-	bufferitemnameplural 0, VAR_0x8004, 1
-	message gText_PlayerFoundOneItemTwoLines
-	goto EventScript_271D2A
-	end
-
-EventScript_271D1F:: @ 8271D1F
-	message gText_PlayerFoundOneItem
-	goto EventScript_271D2A
-	end
-
-EventScript_271D2A:: @ 8271D2A
-	waitmessage
-	waitfanfare
-	bufferitemnameplural 1, VAR_0x8004, 1
-	copyvar VAR_0x8004, VAR_0x8008
-	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	special sub_80EDCE8
-	special SetFlagInVar
-	releaseall
-	end
-
-EventScript_271D47:: @ 8271D47
-	msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT
-	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 0
-	releaseall
-	end
-
-EventScript_271D5E:: @ 8271D5E
-	lock
-	faceplayer
-	msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_271D83
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_271D89
-	goto EventScript_271D89
-
-EventScript_271D83:: @ 8271D83
-	special RecordMixingPlayerSpotTriggered
-	waitstate
-	lock
-	faceplayer
-
-EventScript_271D89:: @ 8271D89
-	message Text_WouldNotLikeToMixRecords
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
+	.include "data/scripts/obtain_item.inc"
+	.include "data/scripts/record_mix.inc"
 	.include "data/scripts/pc.inc"
 
+@ scripts/notices.inc? signs.inc? See comment about text/notices.inc
 Common_EventScript_ShowPokemartSign:: @ 8271E6A
 	msgbox gText_PokemartSign, MSGBOX_SIGN
 	end
@@ -1031,180 +740,20 @@ Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
-DewfordTown_EventScript_271E8B:: @ 8271E8B
-DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B
+Common_EventScript_BufferTrendyPhrase:: @ 8271E8B
 	dotimebasedevents
 	setvar VAR_0x8004, 0
 	special BufferTrendyPhraseString
 	return
 
-DewfordTown_EventScript_271E95:: @ 8271E95
-Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95
-Route109_EventScript_271E95:: @ 8271E95
+EventScript_BackupMrBrineyLocation:: @ 8271E95
 	copyvar VAR_0x8008, VAR_BRINEY_LOCATION
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-EventScript_UseSurf:: @ 8271EA0
-	checkpartymove MOVE_SURF
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_CantSurf
-	bufferpartymonnick 0, VAR_RESULT
-	setfieldeffectargument 0, VAR_RESULT
-	lockall
-	msgbox gText_WantToUseSurf, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_CancelSurf
-	msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
-	dofieldeffect FLDEFF_USE_SURF
-
-EventScript_CancelSurf:: @ 8271ED5
-	releaseall
-
-EventScript_CantSurf:: @ 8271ED6
-	end
-
-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
-
-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
+	.include "data/scripts/surf.inc"
+	.include "data/scripts/rival_graphics.inc"
+	.include "data/scripts/set_gym_trainers.inc"
 
 Common_EventScript_ShowBagIsFull:: @ 8272054
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
@@ -1215,16 +764,16 @@ Common_EventScript_BagIsFull:: @ 827205E
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
-Route114_LanettesHouse_EventScript_272067:: @ 8272067
+Common_EventScript_ShowNoRoomForDecor:: @ 8272067
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
 	end
 
-Common_EventScript_NoRoomLeftForAnother:: @ 8272071
+Common_EventScript_NoRoomForDecor:: @ 8272071
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_SetWeather15:: @ 827207A
+Common_EventScript_SetAlternatingWeather:: @ 827207A
 	setweather WEATHER_ALTERNATING
 	return
 
@@ -1262,6 +811,7 @@ Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
 
 	.include "data/scripts/prof_birch.inc"
 
+@ Below could be split as ferry.inc aside from the Rusturf tunnel script
 Common_EventScript_FerryDepart:: @ 82721E2
 	delay 60
 	applymovement VAR_0x8004, Movement_FerryDepart
@@ -1281,7 +831,7 @@ Movement_FerryDepart: @ 82721F0
 EventScript_HideMrBriney:: @ 82721F8
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
@@ -1290,39 +840,35 @@ EventScript_HideMrBriney:: @ 82721F8
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-RusturfTunnel_EventScript_272216:: @ 8272216
+RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
 	removeobject 1
 	removeobject 10
-	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
-	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
+	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
 	setvar VAR_RUSTURF_TUNNEL_STATE, 6
 	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
-EventScript_27222B:: @ 827222B
+EventScript_UnusedBoardFerry:: @ 827222B
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
-	applymovement EVENT_OBJ_ID_PLAYER, Movement_27224E
+	applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry
 	waitmovement 0
 	delay 30
 	return
 
-Movement_27224E: @ 827224E
+Movement_UnusedBoardFerry: @ 827224E
 	walk_up
 	step_end
 
-BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250
-BirthIsland_Harbor_EventScript_272250:: @ 8272250
-FarawayIsland_Entrance_EventScript_272250:: @ 8272250
-NavelRock_Harbor_EventScript_272250:: @ 8272250
-SouthernIsland_Exterior_EventScript_272250:: @ 8272250
+Common_EventScript_FerryDepartIsland:: @ 8272250
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_242A21
+	call_if_eq Ferry_EventScript_DepartIslandSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C
+	call_if_eq Ferry_EventScript_DepartIslandWest
 	delay 30
 	hideobjectat 255, MAP_PETALBURG_CITY
 	call Common_EventScript_FerryDepart
@@ -1349,60 +895,13 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
 	.include "data/scripts/elite_four.inc"
 	.include "data/scripts/movement.inc"
 	.include "data/scripts/check_furniture.inc"
-
-Text_WouldYouLikeToMixRecords: @ 827260D
-	.string "Would you like to mix records with\n"
-	.string "other TRAINERS?$"
-
-Text_WouldNotLikeToMixRecords: @ 8272640
-	.string "We hope to see you again!$"
-
+	.include "data/text/record_mix.inc"
 	.include "data/text/pc.inc"
 	.include "data/text/pkmn_center_nurse.inc"
+	.include "data/text/mart_clerk.inc"
+	.include "data/text/obtain_item.inc"
 
-gText_HowMayIServeYou:: @ 8272A21
-	.string "Welcome!\p"
-	.string "How may I serve you?$"
-
-gText_PleaseComeAgain:: @ 8272A3F
-	.string "Please come again!$"
-
-gText_PlayerWhatCanIDoForYou:: @ 8272A52
-	.string "{PLAYER}{STRING 5}, welcome!\p"
-	.string "What can I do for you?$"
-
-gText_ObtainedTheItem:: @ 8272A78
-	.string "Obtained the {STR_VAR_2}!$"
-
-gText_TheBagIsFull:: @ 8272A89
-	.string "The BAG is full…$"
-
-gText_PutItemInPocket:: @ 8272A9A
-	.string "{PLAYER} put away the {STR_VAR_2}\n"
-	.string "in the {STR_VAR_3} POCKET.$"
-
-gText_PlayerFoundOneItem:: @ 8272ABF
-	.string "{PLAYER} found one {STR_VAR_2}!$"
-
-gText_TooBadBagIsFull:: @ 8272AD0
-	.string "Too bad!\n"
-	.string "The BAG is full…$"
-
-gText_PlayerPutItemInBag:: @ 8272AEA
-	.string "{PLAYER} put away the {STR_VAR_2}\n"
-	.string "in the BAG.$"
-
-gText_ObtainedTheMon:: @ 8272B09
-	.string "Obtained the {STR_VAR_2}!$"
-
-gText_NoRoomLeftForAnother:: @ 8272B1A
-	.string "Too bad! There's no room left for\n"
-	.string "another {STR_VAR_2}…$"
-
-gText_TheMonWasTransferredToThePC:: @ 8272B48
-	.string "The {STR_VAR_2} was transferred\n"
-	.string "to the PC.$"
-
+@ The below and surf.inc could be split into some text/notices.inc
 gText_PokemartSign:: @ 8272B6A
 	.string "“Selected items for your convenience!”\n"
 	.string "POKéMON MART$"
@@ -1509,7 +1008,7 @@ gText_ThankYouForAccessingMysteryGift:: @ 8273178
 	.string "Thank you for accessing the\n"
 	.string "MYSTERY GIFT System.$"
 
-gText_PlayerFoundOneItemTwoLines:: @ 82731A9
+gText_PlayerFoundOneTMHM:: @ 82731A9
 	.string "{PLAYER} found one {STR_VAR_1}\n"
 	.string "{STR_VAR_2}!$"
 
@@ -1521,38 +1020,7 @@ gText_Sudowoodo_Attacked:: @ 82731BD
 gText_LegendaryFlewAway:: @ 8273204
 	.string "The {STR_VAR_1} flew away!$"
 
-gText_PkmnTransferredSomeonesPC:: @ 8273216
-	.string "{STR_VAR_2} was transferred to\n"
-	.string "SOMEONE'S PC.\p"
-	.string "It was placed in \n"
-	.string "BOX “{STR_VAR_1}.”$"
-
-gText_PkmnTransferredLanettesPC:: @ 8273256
-	.string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p"
-	.string "It was placed in \n"
-	.string "BOX “{STR_VAR_1}.”$"
-
-gText_PkmnBoxSomeonesPCFull:: @ 8273296
-	.string "BOX “{STR_VAR_3}” on\n"
-	.string "SOMEONE'S PC was full.\p"
-	.string "{STR_VAR_2} was transferred to\n"
-	.string "BOX “{STR_VAR_1}.”$"
-
-gText_PkmnBoxLanettesPCFull:: @ 82732D9
-	.string "BOX “{STR_VAR_3}” on\n"
-	.string "LANETTE'S PC was full.\p"
-	.string "{STR_VAR_2} was transferred to\n"
-	.string "BOX “{STR_VAR_1}.”$"
-
-gText_NoMoreRoomForPokemon:: @ 827331C
-	.string "There's no more room for POKéMON!\p"
-	.string "The POKéMON BOXES are full and\n"
-	.string "can't accept any more!$"
-
-gText_NicknameThisPokemon:: @ 8273374
-	.string "Do you want to give a nickname to\n"
-	.string "this {STR_VAR_1}?$"
-
+	.include "data/text/pc_transfer.inc"
 	.include "data/text/mevent.inc"
 	.include "data/text/unusual_weather.inc"
 
@@ -1602,89 +1070,10 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 	release
 	end
 
-@ 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
-
-LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0
-MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0
-Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
-RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
-	bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
-	bufferspeciesname 1, VAR_TEMP_1
-	call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB
-	call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB
-	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4
-	msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4
-	specialvar VAR_RESULT, GetPCBoxToSendMon
-	bufferboxname 2, VAR_RESULT
-	msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6
-	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF
-	msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF
-	specialvar VAR_RESULT, GetPCBoxToSendMon
-	bufferboxname 2, VAR_RESULT
-	msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT
-	return
-
-Common_EventScript_NoMoreRoomForPokemon:: @ 8273811
-	msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT
-	release
-	end
-
+	.include "data/scripts/pc_transfer.inc"
 	.include "data/scripts/mevent.inc"
 	.include "data/scripts/unusual_weather.inc"
-
-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
-
+	.include "data/scripts/trainer_script.inc"
 	.include "data/scripts/berry_tree.inc"
 	.include "data/scripts/secret_base.inc"
 	.include "data/scripts/cable_club.inc"
@@ -1704,24 +1093,12 @@ EventScript_GotoTrainerScript:: @ 82742F6
 	.include "data/scripts/item_ball_scripts.inc"
 	.include "data/scripts/mystery_event_club.inc"
 	.include "data/scripts/day_care.inc"
-
-EventScript_2926F8:: @ 82926F8
-	animateflash 1
-	setflashradius 1
-	end
-
+	.include "data/scripts/flash.inc"
 	.include "data/scripts/players_house.inc"
-	.include "data/scripts/pokeblocks.inc"
+	.include "data/scripts/berry_blender.inc"
 	.include "data/text/mauville_man.inc"
 	.include "data/text/trainers.inc"
-
-EventScript_RepelWoreOff:: @ 82A4B2A
-	msgbox Text_RepelWoreOff, MSGBOX_SIGN
-	end
-
-Text_RepelWoreOff: @ 82A4B33
-	.string "REPEL's effect wore off…$"
-
+	.include "data/scripts/repel.inc"
 	.include "data/scripts/safari_zone.inc"
 	.include "data/scripts/roulette.inc"
 	.include "data/text/pokedex_rating.inc"
@@ -1735,25 +1112,16 @@ Text_RepelWoreOff: @ 82A4B33
 	.include "data/scripts/lilycove_lady.inc"
 	.include "data/text/match_call.inc"
 	.include "data/scripts/apprentice.inc"
+	.include "data/text/apprentice.inc"
 	.include "data/text/battle_dome.inc"
 	.include "data/scripts/battle_pike.inc"
-	.include "data/text/contest_hall.inc"
+	.include "data/text/blend_master.inc"
 	.include "data/text/battle_tent.inc"
 	.include "data/text/event_ticket_2.inc"
 	.include "data/text/move_tutors.inc"
 	.include "data/scripts/move_tutors.inc"
 	.include "data/scripts/trainer_hill.inc"
-
-Text_ThisIsATestSignpostMsg:: @ 82C840A
-	.string "This is a test message.\n"
-	.string "This is a signpost.$"
-
-EventScript_TestSignpostMsg:: @ 82C8436
-	msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN
-	end
-
+	.include "data/scripts/test_signpost.inc"
 	.include "data/text/frontier_brain.inc"
-
-	.align 2
 	.include "data/text/save.inc"
 	.include "data/text/birch_speech.inc"
diff --git a/data/contest_painting_effects.s b/data/image_processing_effects.s
index d14b51a51..b319b4023 100644
--- a/data/contest_painting_effects.s
+++ b/data/image_processing_effects.s
@@ -4,7 +4,7 @@
 	.section .rodata
 	.align 2, 0
 
-gUnknown_085A1F94:: @ 85A1F94
+gPointillismPoints:: @ 85A1F94
 	.byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f
 	.byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22
 	.byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20
diff --git a/data/io_reg.s b/data/io_reg.s
index 9c5f64f58..0941b4345 100644
--- a/data/io_reg.s
+++ b/data/io_reg.s
@@ -7,31 +7,31 @@
 
 .align 2
 gUnref_82EC784:: @ 82EC784
-    .4byte 0x00000000
-    .4byte 0x00000000
-    .4byte 0x04000008
-    .4byte 0x0400000A
-    .4byte 0x0400000C
-    .4byte 0x0400000E
-    .4byte 0x04000010
-    .4byte 0x04000014
-    .4byte 0x04000018
-    .4byte 0x0400001C
-    .4byte 0x04000012
-    .4byte 0x04000016
-    .4byte 0x0400001A
-    .4byte 0x0400001E
-    .4byte 0x02000100
-    .4byte 0x08000400
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x04000008
+	.4byte 0x0400000A
+	.4byte 0x0400000C
+	.4byte 0x0400000E
+	.4byte 0x04000010
+	.4byte 0x04000014
+	.4byte 0x04000018
+	.4byte 0x0400001C
+	.4byte 0x04000012
+	.4byte 0x04000016
+	.4byte 0x0400001A
+	.4byte 0x0400001E
+	.4byte 0x02000100
+	.4byte 0x08000400
 
 gOverworldBackgroundLayerFlags:: @ 82EC7C4
-	.2byte 0x0100 /* BLDCNT_TGT2_BG0 */
-	.2byte 0x0200 /* BLDCNT_TGT2_BG1 */
-	.2byte 0x0400 /* BLDCNT_TGT2_BG2 */
-	.2byte 0x0800 /* BLDCNT_TGT2_BG3 */
+	.2byte BLDCNT_TGT2_BG0
+	.2byte BLDCNT_TGT2_BG1
+	.2byte BLDCNT_TGT2_BG2
+	.2byte BLDCNT_TGT2_BG3
 
-gUnknown_82EC7CC:: @ 82EC7CC
-	.2byte 0x0001
-	.2byte 0x0002
-	.2byte 0x0004
-	.2byte 0x0008
+gOrbEffectBackgroundLayerFlags:: @ 82EC7CC
+	.2byte BLDCNT_TGT1_BG0
+	.2byte BLDCNT_TGT1_BG1
+	.2byte BLDCNT_TGT1_BG2
+	.2byte BLDCNT_TGT1_BG3
diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/BattleColosseum2P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/DoubleBattleColosseum/border.bin
+++ b/data/layouts/BattleColosseum2P/border.bin
diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/BattleColosseum2P/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/layouts/SingleBattleColosseum/map.bin
+++ b/data/layouts/BattleColosseum2P/map.bin
diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/BattleColosseum4P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom1/border.bin
+++ b/data/layouts/BattleColosseum4P/border.bin
diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/BattleColosseum4P/map.bin
index 77606e818..77606e818 100644
--- a/data/layouts/DoubleBattleColosseum/map.bin
+++ b/data/layouts/BattleColosseum4P/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
+++ b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin
index 62d5761e0..62d5761e0 100644
--- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
+++ b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin
diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom2/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/ContestHall/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/layouts/LinkContestRoom1/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/ContestHallBeauty/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom3/border.bin
+++ b/data/layouts/ContestHallBeauty/border.bin
diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/ContestHallBeauty/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/layouts/LinkContestRoom2/map.bin
+++ b/data/layouts/ContestHallBeauty/map.bin
diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/ContestHallCool/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom4/border.bin
+++ b/data/layouts/ContestHallCool/border.bin
diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/ContestHallCool/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/layouts/LinkContestRoom4/map.bin
+++ b/data/layouts/ContestHallCool/map.bin
diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/ContestHallCute/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom5/border.bin
+++ b/data/layouts/ContestHallCute/border.bin
diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/ContestHallCute/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/layouts/LinkContestRoom6/map.bin
+++ b/data/layouts/ContestHallCute/map.bin
diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/ContestHallSmart/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom6/border.bin
+++ b/data/layouts/ContestHallSmart/border.bin
diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/ContestHallSmart/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/layouts/LinkContestRoom5/map.bin
+++ b/data/layouts/ContestHallSmart/map.bin
diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/ContestHallTough/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/SingleBattleColosseum/border.bin
+++ b/data/layouts/ContestHallTough/border.bin
diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/ContestHallTough/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/layouts/LinkContestRoom3/map.bin
+++ b/data/layouts/ContestHallTough/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 353b9a284..bfa2aa811 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -2202,14 +2202,14 @@
       "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin"
     },
     {
-      "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
-      "name": "SingleBattleColosseum_Layout",
+      "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
+      "name": "BattleColosseum2P_Layout",
       "width": 14,
       "height": 9,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_CableClub",
-      "border_filepath": "data/layouts/SingleBattleColosseum/border.bin",
-      "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin"
+      "border_filepath": "data/layouts/BattleColosseum2P/border.bin",
+      "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
     },
     {
       "id": "LAYOUT_TRADE_CENTER",
@@ -2232,24 +2232,24 @@
       "blockdata_filepath": "data/layouts/RecordCorner/map.bin"
     },
     {
-      "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
-      "name": "DoubleBattleColosseum_Layout",
+      "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
+      "name": "BattleColosseum4P_Layout",
       "width": 14,
       "height": 9,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_CableClub",
-      "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin",
-      "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin"
+      "border_filepath": "data/layouts/BattleColosseum4P/border.bin",
+      "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM1",
-      "name": "LinkContestRoom1_Layout",
+      "id": "LAYOUT_CONTEST_HALL",
+      "name": "ContestHall_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom1/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
+      "border_filepath": "data/layouts/ContestHall/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHall/map.bin"
     },
     {
       "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
@@ -2312,54 +2312,54 @@
       "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM2",
-      "name": "LinkContestRoom2_Layout",
+      "id": "LAYOUT_CONTEST_HALL_BEAUTY",
+      "name": "ContestHallBeauty_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom2/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
+      "border_filepath": "data/layouts/ContestHallBeauty/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallBeauty/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM3",
-      "name": "LinkContestRoom3_Layout",
+      "id": "LAYOUT_CONTEST_HALL_TOUGH",
+      "name": "ContestHallTough_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom3/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
+      "border_filepath": "data/layouts/ContestHallTough/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallTough/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM4",
-      "name": "LinkContestRoom4_Layout",
+      "id": "LAYOUT_CONTEST_HALL_COOL",
+      "name": "ContestHallCool_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom4/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
+      "border_filepath": "data/layouts/ContestHallCool/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCool/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM5",
-      "name": "LinkContestRoom5_Layout",
+      "id": "LAYOUT_CONTEST_HALL_SMART",
+      "name": "ContestHallSmart_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom5/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
+      "border_filepath": "data/layouts/ContestHallSmart/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallSmart/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM6",
-      "name": "LinkContestRoom6_Layout",
+      "id": "LAYOUT_CONTEST_HALL_CUTE",
+      "name": "ContestHallCute_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom6/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
+      "border_filepath": "data/layouts/ContestHallCute/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCute/map.bin"
     },
     {
       "id": "LAYOUT_INSIDE_OF_TRUCK",
@@ -3972,14 +3972,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin"
     },
     {
-      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
-      "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout",
+      "id": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+      "name": "BattleFrontier_ExchangeServiceCorner_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattleFrontier",
-      "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin",
-      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
+      "border_filepath": "data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json
index b876ad849..804fd0afc 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.json
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2",
+      "script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide",
       "flag": "0"
     },
     {
diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 011ea4a07..b2940eb6f 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
@@ -1,42 +1,42 @@
 AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
 	.byte 0
 
-AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
+AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
 	lock
 	faceplayer
-	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A
+	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
 	checkitem ITEM_SCANNER, 1
 	compare VAR_RESULT, 1
-	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810
-	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A
-	msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT
+	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
+	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
+	msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810
-	msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT
+AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810
+	msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A
-	msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT
+AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A
+	msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_Text_238824: @ 8238824
+AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824
 	.string "I'm investigating this ship on behalf\n"
 	.string "of CAPT. STERN.\p"
 	.string "He also asked me to find a SCANNER,\n"
 	.string "but I haven't had any success…$"
 
-AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D
+AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D
 	.string "Oh! That's a SCANNER!\p"
 	.string "Listen, can I get you to deliver that\n"
 	.string "to CAPT. STERN?\p"
 	.string "I want to investigate this ship a\n"
 	.string "little more.$"
 
-AbandonedShip_CaptainsOffice_Text_238918: @ 8238918
+AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918
 	.string "This ship is called S.S. CACTUS.\n"
 	.string "It seems to be from an earlier era.$"
 
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json
index 4ddf92226..b75fcf3ac 100644
--- a/data/maps/AbandonedShip_Corridors_1F/map.json
+++ b/data/maps/AbandonedShip_Corridors_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Corridors_1F_EventScript_2379A5",
+      "script": "AbandonedShip_Corridors_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "AbandonedShip_Corridors_1F_EventScript_2379AE",
+      "script": "AbandonedShip_Corridors_1F_EventScript_Charlie",
       "flag": "0"
     }
   ],
diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index 15fda4194..a954ee119 100644
--- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
@@ -1,26 +1,26 @@
 AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4
 	.byte 0
 
-AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5
-	msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC
+AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5
+	msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE
-	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01
-	msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE
+AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE
+	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat
+	msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5
+AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5
 	.string "What's so funny about having my inner\n"
 	.string "tube aboard the ship?$"
 
-AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01
+AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01
 	.string "Whoa, you overwhelmed me!$"
 
-AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B
+AbandonedShip_Corridors_1F_Text_CharliePostBattle: @ 8237A1B
 	.string "It's not easy throwing POKé BALLS\n"
 	.string "while hanging on to an inner tube!$"
 
-AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60
+AbandonedShip_Corridors_1F_Text_IsntItFunHere: @ 8237A60
 	.string "Isn't it fun here?\n"
 	.string "I get excited just being here!$"
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json
index 9bccfc636..04868ad92 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/map.json
+++ b/data/maps/AbandonedShip_Corridors_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF",
+      "script": "AbandonedShip_Corridors_B1F_EventScript_TuberM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AbandonedShip_Corridors_B1F_EventScript_237E13",
+      "script": "AbandonedShip_Corridors_B1F_EventScript_Duncan",
       "flag": "0"
     }
   ],
@@ -107,7 +107,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8"
+      "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index 1012ebce7..c56951a03 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -1,88 +1,87 @@
 AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
-	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F
-	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
 	.byte 0
 
-AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
+AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
-	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB
-	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5
+AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98
+	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
+	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
-	setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1
+AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB
+	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
-	setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1
+AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5
+	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC
+AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF
+	msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
+AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
 	lockall
-	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09
+	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
 	checkitem ITEM_STORAGE_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
+	msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_STORAGE_KEY, 1
 	setflag FLAG_USED_STORAGE_KEY
-	call AbandonedShip_Corridors_B1F_EventScript_237DB5
+	call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
 	special DrawWholeMapView
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT
+AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF
+	msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09
-	msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT
+AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09
+	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13
-	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
-	msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE
+AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13
+	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat
+	msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A
+AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A
 	.string "When we go out to sea, we SAILORS\n"
 	.string "always bring our POKéMON.\l"
 	.string "How about a quick battle?$"
 
-AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80
+AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80
 	.string "Whoops, I'm sunk!$"
 
-AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92
+AbandonedShip_Corridors_B1F_Text_DuncanPostBattle: @ 8237E92
 	.string "The ship's bottom has sunk into the\n"
 	.string "depths.\p"
 	.string "If a POKéMON knew how to go underwater,\n"
 	.string "we might make some progress…$"
 
-AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03
+AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03
 	.string "Yay!\n"
 	.string "It's a ship!$"
 
-AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15
+AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15
 	.string "The door is locked.\p"
 	.string "“STORAGE” is painted on the door.$"
 
-AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B
+AbandonedShip_Corridors_B1F_Text_InsertedStorageKey: @ 8237F4B
 	.string "{PLAYER} inserted and turned the\n"
 	.string "STORAGE KEY.\p"
 	.string "The inserted KEY stuck fast,\n"
 	.string "but the door opened.$"
 
-AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5
-AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5
+AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5
 	.string "The door is open.$"
 
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
index 1b1466fe1..81e19fd1f 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
@@ -66,7 +66,7 @@
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door"
     },
     {
       "type": "sign",
@@ -74,7 +74,7 @@
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door"
     },
     {
       "type": "sign",
@@ -82,7 +82,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door"
     },
     {
       "type": "sign",
@@ -90,7 +90,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index 9c6474b6f..5fc4160f8 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -1,157 +1,157 @@
 AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
-	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
-	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
 	.byte 0
 
-AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
+AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
-	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
-	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
-	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
-	call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
-	call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
-	call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
-	call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
-	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
+AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
+	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
+	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
+	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
+	call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6
+	call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
+	call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
+	call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
+	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
-	setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9
+	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3
-	setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3
+	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD
-	setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD
+	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7
-	setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7
+	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1
-	setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1
+	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB
-	setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB
+	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05
-	setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05
+	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
-	setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F
+	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
+AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
 	lockall
-	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_1_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_1_KEY, 1
 	setflag FLAG_USED_ROOM_1_KEY
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
+	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
 	special DrawWholeMapView
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
+AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
 	lockall
-	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_2_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_2_KEY, 1
 	setflag FLAG_USED_ROOM_2_KEY
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
+	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
 	special DrawWholeMapView
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
+AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
 	lockall
-	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_4_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_4_KEY, 1
 	setflag FLAG_USED_ROOM_4_KEY
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
+	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
 	special DrawWholeMapView
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
+AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
 	lockall
-	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_6_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_6_KEY, 1
 	setflag FLAG_USED_ROOM_6_KEY
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
+	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
 	special DrawWholeMapView
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT
+AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D
+	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27
+AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27
 	.string "The door is locked.\p"
 	.string "“RM. 1” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B
+AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked: @ 8238B5B
 	.string "The door is locked.\p"
 	.string "“RM. 2” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F
+AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F
 	.string "The door is locked.\p"
 	.string "“RM. 4” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3
+AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked: @ 8238BC3
 	.string "The door is locked.\p"
 	.string "“RM. 6” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7
+AbandonedShip_HiddenFloorCorridors_Text_InsertedKey: @ 8238BF7
 	.string "{PLAYER} inserted and turned the\n"
 	.string "KEY.\p"
 	.string "The inserted KEY stuck fast,\n"
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
index fdfb8a187..f937eb649 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -172,7 +172,7 @@
       "y": 5,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     },
     {
       "type": "sign",
@@ -180,7 +180,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     },
     {
       "type": "sign",
@@ -188,7 +188,7 @@
       "y": 10,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     },
     {
       "type": "sign",
@@ -196,7 +196,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     },
     {
       "type": "sign",
@@ -204,7 +204,7 @@
       "y": 2,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     },
     {
       "type": "sign",
@@ -212,7 +212,7 @@
       "y": 6,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3"
+      "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 2d6f7ee77..53a7ee2ed 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -1,148 +1,125 @@
 AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
 	.byte 0
 
-AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F
-	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59
+AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
+	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
 	.2byte 0
 
-AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59
+@ After the below calculation, VAR_TEMP_4 is the room number of the door the player entered
+@ Bottom row, left column   (Rm 1)
+@ Bottom row, middle column (Rm 2)
+@ Bottom row, right column	(Rm 3)
+@ Upper row,  left column   (Rm 4)
+@ Upper row,  middle column (Rm 5)
+@ Upper row,  right column  (Rm 6)
+AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
 	setvar VAR_TEMP_1, 1
 	getplayerxy VAR_TEMP_2, VAR_TEMP_3
 	setvar VAR_TEMP_4, 1
 	compare VAR_TEMP_2, 21
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn
 	compare VAR_TEMP_2, 36
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn
 	compare VAR_TEMP_3, 2
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow
 	switch VAR_TEMP_4
-	case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3
-	case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C
-	case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D
-	case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33
-	case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B
-	case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2
+	case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1
+	case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2
+	case 3, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3
+	case 4, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4
+	case 5, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5
+	case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1
+AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1
 	addvar VAR_TEMP_4, 1
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7
+AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7
 	addvar VAR_TEMP_4, 2
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD
+AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD
 	addvar VAR_TEMP_4, 3
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
 	delay 20
-	setfieldeffectargument 0, 10
-	setfieldeffectargument 1, 10
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 10, 10, 0
 	specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
-	compare VAR_RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
+	compare VAR_RESULT, FALSE
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
 	specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
-	compare VAR_RESULT, 1
-	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
+	compare VAR_RESULT, TRUE
+	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
 	delay 20
-	compare VAR_RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
+	compare VAR_RESULT, FALSE
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32
+AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
 	delay 20
-	setfieldeffectargument 0, 8
-	setfieldeffectargument 1, 5
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
-	setfieldeffectargument 0, 11
-	setfieldeffectargument 1, 3
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 8, 5, 0
+	dofieldeffectsparkle 11, 3, 0
 	specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
-	compare VAR_RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
+	compare VAR_RESULT, FALSE
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
 	delay 20
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 3
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
-	setfieldeffectargument 0, 25
-	setfieldeffectargument 1, 2
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
-	setfieldeffectargument 0, 24
-	setfieldeffectargument 1, 6
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 16, 3, 0
+	dofieldeffectsparkle 25, 2, 0
+	dofieldeffectsparkle 24, 6, 0
 	specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
-	compare VAR_RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
+	compare VAR_RESULT, FALSE
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
-	setfieldeffectargument 0, 42
-	setfieldeffectargument 1, 10
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3
+	dofieldeffectsparkle 42, 10, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
-	setfieldeffectargument 0, 20
-	setfieldeffectargument 1, 5
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3
+	dofieldeffectsparkle 20, 5, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
-	setfieldeffectargument 0, 1
-	setfieldeffectargument 1, 12
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3
+	dofieldeffectsparkle 1, 12, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
-	setfieldeffectargument 0, 1
-	setfieldeffectargument 1, 2
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3
+	dofieldeffectsparkle 1, 2, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3
+AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3
 	lockall
-	msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT
+	msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE
+AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE
 	.string "It's bright and shiny!\n"
 	.string "But it's just trash…$"
 
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json
index 35b029f7f..6f39d4827 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_Dan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "AbandonedShip_Rooms2_1F_EventScript_23810B",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_Kira",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "AbandonedShip_Rooms2_1F_EventScript_238186",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_Garrison",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "AbandonedShip_Rooms2_1F_EventScript_23816F",
+      "script": "AbandonedShip_Rooms2_1F_EventScript_Jani",
       "flag": "0"
     }
   ],
diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index ec382e56c..a09242fc9 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -1,151 +1,151 @@
 AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
 	.byte 0
 
-AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
-	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
+AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
-	msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_DanRematch
+	msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7
-	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
+AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7
+	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT  @ Kira speaks for both when registering KiraAndDan
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
-	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
-	msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanRematchIntro, AbandonedShip_Rooms2_1F_Text_DanRematchDefeat, AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons
+	msgbox AbandonedShip_Rooms2_1F_Text_DanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
-	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
+AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154
-	msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_KiraRematch
+	msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B
-	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
+AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B
+	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154
-	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
-	msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraRematchIntro, AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat, AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons
+	msgbox AbandonedShip_Rooms2_1F_Text_KiraPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F
-	trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
-	msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F
+	trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat
+	msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186
-	trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
-	msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186
+	trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat
+	msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D
+AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D
 	.string "DAN: While searching for treasures,\n"
 	.string "we discovered a TRAINER!$"
 
-AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA
+AbandonedShip_Rooms2_1F_Text_DanDefeat: @ 82381DA
 	.string "DAN: We couldn't win even though\n"
 	.string "we worked together…$"
 
-AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F
+AbandonedShip_Rooms2_1F_Text_DanPostBattle: @ 823820F
 	.string "DAN: We can't find any treasures…\n"
 	.string "I wonder if someone got them already?$"
 
-AbandonedShip_Rooms2_1F_Text_238257: @ 8238257
+AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons: @ 8238257
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4
+AbandonedShip_Rooms2_1F_Text_KiraIntro: @ 82382A4
 	.string "KIRA: Oh?\n"
 	.string "We were searching for treasures.\l"
 	.string "But we discovered a TRAINER instead!$"
 
-AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4
+AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4
 	.string "KIRA: Ooh, so strong!$"
 
-AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A
+AbandonedShip_Rooms2_1F_Text_KiraPostBattle: @ 823830A
 	.string "KIRA: Where could the treasures be?\p"
 	.string "I've already decided what I'm buying\n"
 	.string "when we find the treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F
+AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons: @ 823836F
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB
+AbandonedShip_Rooms2_1F_Text_KiraRegister: @ 82383BB
 	.string "KIRA: Oh, you make me so angry!\n"
 	.string "I'm going to register you for that!$"
 
-AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF
+AbandonedShip_Rooms2_1F_Text_DanRematchIntro: @ 82383FF
 	.string "DAN: We've been searching for\n"
 	.string "treasures all this time.\p"
 	.string "Our POKéMON have grown stronger, too.\n"
 	.string "Let us show you, okay?$"
 
-AbandonedShip_Rooms2_1F_Text_238473: @ 8238473
+AbandonedShip_Rooms2_1F_Text_DanRematchDefeat: @ 8238473
 	.string "DAN: You're strong, as usual!$"
 
-AbandonedShip_Rooms2_1F_Text_238491: @ 8238491
+AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491
 	.string "DAN: We can't find any treasures,\n"
 	.string "we lose at POKéMON…\p"
 	.string "I want to go home… But if I say that,\n"
 	.string "she gets all angry with me…$"
 
-AbandonedShip_Rooms2_1F_Text_238509: @ 8238509
+AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_238556: @ 8238556
+AbandonedShip_Rooms2_1F_Text_KiraRematchIntro: @ 8238556
 	.string "KIRA: Oh? We meet again!\p"
 	.string "Just like us, you still haven't given up\n"
 	.string "searching for treasures, have you?\p"
 	.string "Want to make it so the loser has\n"
 	.string "to give up searching?$"
 
-AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2
+AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2
 	.string "KIRA: Oh, we lost again…$"
 
-AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B
+AbandonedShip_Rooms2_1F_Text_KiraPostRematch: @ 823860B
 	.string "KIRA: We're not leaving until we raise\n"
 	.string "our POKéMON some more and we find\l"
 	.string "the treasures here!$"
 
-AbandonedShip_Rooms2_1F_Text_238668: @ 8238668
+AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons: @ 8238668
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4
+AbandonedShip_Rooms2_1F_Text_JaniIntro: @ 82386B4
 	.string "I'm not good at swimming,\n"
 	.string "but I am good at battles!$"
 
-AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8
+AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8
 	.string "Oops.\n"
 	.string "That didn't go very well.$"
 
-AbandonedShip_Rooms2_1F_Text_238708: @ 8238708
+AbandonedShip_Rooms2_1F_Text_JaniPostBattle: @ 8238708
 	.string "Walking around barefoot in this ship\n"
 	.string "is kind of gross.$"
 
-AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F
+AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F
 	.string "Strength and compassion…\n"
 	.string "Those are a TRAINER's treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_238779: @ 8238779
+AbandonedShip_Rooms2_1F_Text_GarrisonDefeat: @ 8238779
 	.string "Ah, there is something about you\n"
 	.string "that sparkles.$"
 
-AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9
+AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9
 	.string "In a cabin somewhere on board,\n"
 	.string "I saw something sparkle.$"
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json
index 621b80bb1..672d2c54e 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms2_B1F_EventScript_238025",
+      "script": "AbandonedShip_Rooms2_B1F_EventScript_Camper",
       "flag": "0"
     },
     {
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index a0b9e3946..5c2418696 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
@@ -1,11 +1,11 @@
 AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024
 	.byte 0
 
-AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025
-	msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC
+AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025
+	msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E
+AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E
 	.string "This is a perfect place to go exploring!\n"
 	.string "It's exciting here!\p"
 	.string "I bet there're amazing treasures on\n"
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json
index af25a3994..28feaf940 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms_1F_EventScript_237A93",
+      "script": "AbandonedShip_Rooms_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AbandonedShip_Rooms_1F_EventScript_237AB3",
+      "script": "AbandonedShip_Rooms_1F_EventScript_Thalia",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AbandonedShip_Rooms_1F_EventScript_237A9C",
+      "script": "AbandonedShip_Rooms_1F_EventScript_Demetrius",
       "flag": "0"
     }
   ],
diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index 5797ed5fb..cabbb45ea 100644
--- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
@@ -1,78 +1,78 @@
 AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92
 	.byte 0
 
-AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93
-	msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC
+AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93
+	msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C
-	trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A
-	msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C
+	trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat
+	msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
-	trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
+AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
+	trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE
-	msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq AbandonedShip_Rooms_1F_EventScript_ThaliaRematch
+	msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF
-	special sub_80B4808
+AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT
+	msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_THALIA_1
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE
-	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2
-	msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE
+AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE
+	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat
+	msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15
+AbandonedShip_Rooms_1F_Text_TakingALookAround: @ 8237B15
 	.string "Ships of this sort are rare, so I'm\n"
 	.string "taking a look around.\p"
 	.string "Hmhm…\n"
 	.string "There appear to be other cabins…$"
 
-AbandonedShip_Rooms_1F_Text_237B76: @ 8237B76
+AbandonedShip_Rooms_1F_Text_ThaliaIntro: @ 8237B76
 	.string "What on earth would compel you to\n"
 	.string "come here? You must be curious!$"
 
-AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8
+AbandonedShip_Rooms_1F_Text_ThaliaDefeat: @ 8237BB8
 	.string "Not just curious, but also strong…$"
 
-AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB
+AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB
 	.string "The man next door…\p"
 	.string "He says he's just sightseeing,\n"
 	.string "but I don't know about that.$"
 
-AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A
+AbandonedShip_Rooms_1F_Text_ThaliaRegister: @ 8237C2A
 	.string "You're such a tough TRAINER!\n"
 	.string "Let me register you as a memento!$"
 
-AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69
+AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro: @ 8237C69
 	.string "What on earth would compel you to\n"
 	.string "come back? You must really be curious!$"
 
-AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2
+AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat: @ 8237CB2
 	.string "Aren't you too strong?$"
 
-AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9
+AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9
 	.string "I'm sure that man's up to something!\n"
 	.string "He just acts so suspiciously!$"
 
-AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C
+AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C
 	.string "Waaah!\n"
 	.string "I've been found! …Huh?$"
 
-AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A
+AbandonedShip_Rooms_1F_Text_DemetriusDefeat: @ 8237D2A
 	.string "Oh, you're not my mom.$"
 
-AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41
+AbandonedShip_Rooms_1F_Text_DemetriusPostBattle: @ 8237D41
 	.string "I'm in trouble with my mom, so I ran.\n"
 	.string "Keep it a secret where I am!$"
 
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json
index 2e836f3a1..0af0a05ac 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6",
+      "script": "AbandonedShip_Rooms_B1F_EventScript_FatMan",
       "flag": "0"
     },
     {
diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 05223592e..80208b051 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -1,16 +1,16 @@
 AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
-	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
 	.byte 0
 
-AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD
+AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6
-	msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC
+AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6
+	msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF
+AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF
 	.string "Urrrrppp…\p"
 	.string "I'm getting queasy just being aboard\n"
 	.string "this ship…\p"
diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index b957bb6be..9e10c19f5 100644
--- a/data/maps/AbandonedShip_Underwater1/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
@@ -1,8 +1,8 @@
 AbandonedShip_Underwater1_MapScripts:: @ 8238096
-	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
 	.byte 0
 
-AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C
+AbandonedShip_Underwater1_OnResume: @ 823809C
 	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
 	end
 
diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index cc000b09c..40e6c1e5e 100644
--- a/data/maps/AbandonedShip_Underwater2/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
@@ -1,8 +1,8 @@
 AbandonedShip_Underwater2_MapScripts:: @ 823895D
-	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
 	.byte 0
 
-AbandonedShip_Underwater2_MapScript1_238963: @ 8238963
+AbandonedShip_Underwater2_OnResume: @ 8238963
 	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
 	end
 
diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json
index 9de100bff..9229f7581 100644
--- a/data/maps/AncientTomb/map.json
+++ b/data/maps/AncientTomb/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AncientTomb_EventScript_23905A",
+      "script": "AncientTomb_EventScript_Registeel",
       "flag": "FLAG_HIDE_REGISTEEL"
     }
   ],
@@ -59,7 +59,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AncientTomb_EventScript_239033"
+      "script": "AncientTomb_EventScript_CaveEntranceMiddle"
     },
     {
       "type": "sign",
@@ -67,7 +67,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AncientTomb_EventScript_239050"
+      "script": "AncientTomb_EventScript_CaveEntranceSide"
     },
     {
       "type": "sign",
@@ -75,7 +75,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AncientTomb_EventScript_239050"
+      "script": "AncientTomb_EventScript_CaveEntranceSide"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 322bd06b7..95dd85d28 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -1,14 +1,14 @@
 AncientTomb_MapScripts:: @ 8238FB3
-	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
-	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
+	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
 	.byte 0
 
-AncientTomb_MapScript1_238FC3: @ 8238FC3
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD
+AncientTomb_OnResume: @ 8238FC3
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel
 	end
 
-AncientTomb_EventScript_238FCD:: @ 8238FCD
+AncientTomb_EventScript_TryRemoveRegisteel:: @ 8238FCD
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -17,18 +17,18 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
 
 AncientTomb_OnTransition: @ 8238FE1
 	setflag FLAG_LANDMARK_ANCIENT_TOMB
-	call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
+	call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_ShowRegisteel
 	end
 
-AncientTomb_EventScript_238FEE:: @ 8238FEE
+AncientTomb_EventScript_ShowRegisteel:: @ 8238FEE
 	clearflag FLAG_HIDE_REGISTEEL
 	return
 
-AncientTomb_MapScript1_238FF2: @ 8238FF2
-	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC
+AncientTomb_OnLoad: @ 8238FF2
+	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_HideRegiEntrance
 	end
 
-AncientTomb_EventScript_238FFC:: @ 8238FFC
+AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -37,29 +37,29 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-AncientTomb_EventScript_239033:: @ 8239033
+AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
 	lockall
-	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046
-	braillemessage AncientTomb_Braille_2A6D06
+	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
+	braillemessage AncientTomb_Braille_ShineInTheMiddle
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-AncientTomb_EventScript_239046:: @ 8239046
+AncientTomb_EventScript_BigHoleInWall:: @ 8239046
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AncientTomb_EventScript_239050:: @ 8239050
+AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
 	lockall
-	braillemessage AncientTomb_Braille_2A6D06
+	braillemessage AncientTomb_Braille_ShineInTheMiddle
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-AncientTomb_EventScript_23905A:: @ 823905A
+AncientTomb_EventScript_Registeel:: @ 823905A
 	lock
 	faceplayer
 	waitse
@@ -73,21 +73,21 @@ AncientTomb_EventScript_23905A:: @ 823905A
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq AncientTomb_EventScript_2390A1
+	goto_if_eq AncientTomb_EventScript_DefeatedRegisteel
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq AncientTomb_EventScript_2390AA
+	goto_if_eq AncientTomb_EventScript_RanFromRegisteel
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq AncientTomb_EventScript_2390AA
+	goto_if_eq AncientTomb_EventScript_RanFromRegisteel
 	setflag FLAG_DEFEATED_REGISTEEL
 	release
 	end
 
-AncientTomb_EventScript_2390A1:: @ 82390A1
+AncientTomb_EventScript_DefeatedRegisteel:: @ 82390A1
 	setflag FLAG_DEFEATED_REGISTEEL
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AncientTomb_EventScript_2390AA:: @ 82390AA
+AncientTomb_EventScript_RanFromRegisteel:: @ 82390AA
 	setvar VAR_0x8004, SPECIES_REGISTEEL
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json
index 5f585f32f..25fe48a9e 100644
--- a/data/maps/AquaHideout_1F/map.json
+++ b/data/maps/AquaHideout_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_1F_EventScript_233494",
+      "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt1",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_1F_EventScript_2334C6",
+      "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt2",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "AquaHideout_1F_EventScript_2334F8",
+      "script": "AquaHideout_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc
index 653e0f7c7..b246862a7 100644
--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -1,55 +1,56 @@
 AquaHideout_1F_MapScripts:: @ 8233493
 	.byte 0
 
-AquaHideout_1F_EventScript_233494:: @ 8233494
+@ The below two entrance guards give hints about what to do to progress the story
+AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494
 	lock
 	faceplayer
-	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC
-	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2
-	msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT
+	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint1
+	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint1
+	msgbox AquaHideout_1F_Text_OurBossIsSnatchingSomething, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334B2:: @ 82334B2
-	msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT
+AquaHideout_1F_EventScript_MagmaHideoutHint1:: @ 82334B2
+	msgbox AquaHideout_1F_Text_WhereMightMagmaHideoutBe, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334BC:: @ 82334BC
-	msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT
+AquaHideout_1F_EventScript_SlateportHint1:: @ 82334BC
+	msgbox AquaHideout_1F_Text_BossWentToJackASubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334C6:: @ 82334C6
+AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6
 	lock
 	faceplayer
-	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE
-	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4
-	msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT
+	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint2
+	goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint2
+	msgbox AquaHideout_1F_Text_BossIsOnRoute122, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334E4:: @ 82334E4
-	msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT
+AquaHideout_1F_EventScript_MagmaHideoutHint2:: @ 82334E4
+	msgbox AquaHideout_1F_Text_TeamMagmaAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334EE:: @ 82334EE
-	msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT
+AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE
+	msgbox AquaHideout_1F_Text_BossIsInSlateportCity, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_2334F8:: @ 82334F8
-	trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
-	msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE
+AquaHideout_1F_EventScript_Grunt1:: @ 82334F8
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
+	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_1F_EventScript_233513:: @ 8233513
-	msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT
+AquaHideout_1F_EventScript_Grunt1Defeated:: @ 8233513
+	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_Text_23351D: @ 823351D
+AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's gone off to\n"
@@ -59,7 +60,7 @@ AquaHideout_1F_Text_23351D: @ 823351D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_2335E3: @ 82335E3
+AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is trying to\n"
@@ -67,7 +68,7 @@ AquaHideout_1F_Text_2335E3: @ 82335E3
 	.string "HIDEOUT.\p"
 	.string "But where might their HIDEOUT be?$"
 
-AquaHideout_1F_Text_23367D: @ 823367D
+AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -77,7 +78,7 @@ AquaHideout_1F_Text_23367D: @ 823367D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_233739: @ 8233739
+AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's on his way to\n"
@@ -87,14 +88,14 @@ AquaHideout_1F_Text_233739: @ 8233739
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_2337FA: @ 82337FA
+AquaHideout_1F_Text_TeamMagmaAtMtChimney: @ 82337FA
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is after\n"
 	.string "an awesome POKéMON at MT. CHIMNEY.\p"
 	.string "But what is that POKéMON like?$"
 
-AquaHideout_1F_Text_233884: @ 8233884
+AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884
 	.string "What? What? What do you want with\n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -104,15 +105,15 @@ AquaHideout_1F_Text_233884: @ 8233884
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_23393D: @ 823393D
+AquaHideout_1F_Text_Grunt1Intro: @ 823393D
 	.string "Ayiyiyi!\n"
 	.string "Suspicious character spotted!$"
 
-AquaHideout_1F_Text_233964: @ 8233964
+AquaHideout_1F_Text_Grunt1Defeat: @ 8233964
 	.string "Grrrrr…\n"
 	.string "I lost it!$"
 
-AquaHideout_1F_Text_233977: @ 8233977
+AquaHideout_1F_Text_Grunt1PostBattle: @ 8233977
 	.string "I took the loss for the TEAM,\n"
 	.string "but I did my job…$"
 
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
index 8cdc901ec..f31180f8b 100644
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AquaHideout_B1F_EventScript_233A85",
+      "script": "AquaHideout_B1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "AquaHideout_B1F_EventScript_233AB0",
+      "script": "AquaHideout_B1F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AquaHideout_B1F_EventScript_233AD5",
+      "script": "AquaHideout_B1F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_2339EB",
+      "script": "AquaHideout_B1F_EventScript_Electrode1",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_233A38",
+      "script": "AquaHideout_B1F_EventScript_Electrode2",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AquaHideout_B1F_EventScript_233AEC",
+      "script": "AquaHideout_B1F_EventScript_Grunt7",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 83906c509..17e803814 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -1,13 +1,13 @@
 AquaHideout_B1F_MapScripts:: @ 82339A7
-	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
+	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
 	.byte 0
 
-AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC
+AquaHideout_B1F_OnResume: @ 82339B2
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode
 	end
 
-AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
+AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -15,19 +15,19 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
 	return
 
 AquaHideout_B1F_OnTransition: @ 82339D0
-	call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
-	call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
+	call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1
+	call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2
 	end
 
-AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
+AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
 	return
 
-AquaHideout_B1F_EventScript_2339E7:: @ 82339E7
+AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	return
 
-AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
+AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -40,21 +40,21 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq AquaHideout_B1F_EventScript_233A2F
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq AquaHideout_B1F_EventScript_233A2F
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq AquaHideout_B1F_EventScript_233A2F
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
 	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	release
 	end
 
-AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F
+AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F
 	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_233A38:: @ 8233A38
+AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -67,101 +67,101 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq AquaHideout_B1F_EventScript_233A7C
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq AquaHideout_B1F_EventScript_233A7C
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq AquaHideout_B1F_EventScript_233A7C
+	goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
 	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	release
 	end
 
-AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
+AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
 	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_233A85:: @ 8233A85
-	trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
-	msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
+	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0
-	special sub_80B4808
+AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT
+	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0
-	trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
-	msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
+	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB
-	msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT
+AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
+	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5
-	trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
-	msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
+	msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC
-	trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
-	msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
+	msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_Text_233B03: @ 8233B03
+AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
 	.string "If you want to know the secret about\n"
 	.string "our HIDEOUT, you have me to beat!$"
 
-AquaHideout_B1F_Text_233B4A: @ 8233B4A
+AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A
 	.string "I can't win at all…$"
 
-AquaHideout_B1F_Text_233B5E: @ 8233B5E
+AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E
 	.string "Our HIDEOUT's secret?\p"
 	.string "Well, let's just say…\n"
 	.string "There's a submarine at the far end!\p"
 	.string "But, by now…\n"
 	.string "Kekekeke…$"
 
-AquaHideout_B1F_Text_233BC5: @ 8233BC5
+AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5
 	.string "Fuel supply loaded A-OK!\n"
 	.string "In-cruise snacks loaded A-OK!\p"
 	.string "Nothing left to do but KO a pesky\n"
 	.string "meddler!$"
 
-AquaHideout_B1F_Text_233C27: @ 8233C27
+AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27
 	.string "I took a serious licking!$"
 
-AquaHideout_B1F_Text_233C41: @ 8233C41
+AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
 	.string "Humph!\n"
 	.string "This was supposed to happen!\p"
 	.string "My mission was to just hold you up!$"
 
-AquaHideout_B1F_Text_233C89: @ 8233C89
+AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
 	.string "Yawn… Keeping watch over the\n"
 	.string "HIDEOUT bores me. I'll take you on.$"
 
-AquaHideout_B1F_Text_233CCA: @ 8233CCA
+AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
 	.string "Yawn…\n"
 	.string "Oh, I lost…$"
 
-AquaHideout_B1F_Text_233CDC: @ 8233CDC
+AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
 	.string "If you scurry too much, other TEAM\n"
 	.string "AQUA members might get you.$"
 
-AquaHideout_B1F_Text_233D1B: @ 8233D1B
+AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
 	.string "Hey!\n"
 	.string "You there!\p"
 	.string "Which do you think is cooler?\n"
 	.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
 
-AquaHideout_B1F_Text_233D6E: @ 8233D6E
+AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
 	.string "I lost in a cool way…$"
 
-AquaHideout_B1F_Text_233D84: @ 8233D84
+AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
 	.string "If you have a cool uniform, you look\n"
 	.string "good even in a loss, don't you think?$"
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
index b286872af..1ae0fcecd 100644
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B2F_EventScript_233E09",
+      "script": "AquaHideout_B2F_EventScript_Matt",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "AquaHideout_B2F_EventScript_233E8A",
+      "script": "AquaHideout_B2F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "AquaHideout_B2F_EventScript_233EAF",
+      "script": "AquaHideout_B2F_EventScript_Grunt6",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "AquaHideout_B2F_EventScript_233EC6",
+      "script": "AquaHideout_B2F_EventScript_Grunt8",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     }
   ],
@@ -173,7 +173,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "AquaHideout_B2F_EventScript_233DE5"
+      "script": "AquaHideout_B2F_EventScript_MattNoticePlayer"
     },
     {
       "type": "trigger",
@@ -182,7 +182,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "AquaHideout_B2F_EventScript_233DE5"
+      "script": "AquaHideout_B2F_EventScript_MattNoticePlayer"
     }
   ],
   "bg_events": []
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index 87830e500..dd2c38fa4 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -3,16 +3,16 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF
 	.byte 0
 
 AquaHideout_B2F_OnTransition: @ 8233DD5
-	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF
+	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing
 	end
 
-AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
+AquaHideout_B2F_EventScript_PreventMattNoticing:: @ 8233DDF
 	setvar VAR_TEMP_1, 1
 	return
 
-AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
+AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5
 	lockall
-	setvar VAR_0x8008, 1
+	setvar VAR_0x8008, 1  @ Matt object event id
 	playse SE_PIN
 	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -22,70 +22,71 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
 	releaseall
 	end
 
-AquaHideout_B2F_EventScript_233E09:: @ 8233E09
-	trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
-	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
+AquaHideout_B2F_EventScript_Matt:: @ 8233E09
+	trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_MattIntro, AquaHideout_B2F_Text_MattDefeat, AquaHideout_B2F_EventScript_SubmarineEscape
+	msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_233E25:: @ 8233E25
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 4
+AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25
+	setvar VAR_0x8008, 1  @ Matt object event id
+	setvar VAR_0x8009, 4  @ Submarine object event id
 	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
 	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
+	msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
-	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
+	applymovement VAR_0x8009, AquaHideout_B2F_Movement_SumbarineDepartLeft
 	waitmovement 0
 	removeobject VAR_0x8009
 	delay 20
 	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
+	msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT
 	setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE
 	setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
 	release
 	end
 
-AquaHideout_B2F_Movement_233E80: @ 8233E80
+AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-AquaHideout_B2F_Movement_233E85: @ 8233E85
+@ Unused
+AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
-	trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
-	msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE
+AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
+	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
-	msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT
+AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5
+	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
-	trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
-	msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE
+AquaHideout_B2F_EventScript_Grunt6:: @ 8233EAF
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_6, AquaHideout_B2F_Text_Grunt6Intro, AquaHideout_B2F_Text_Grunt6Defeat
+	msgbox AquaHideout_B2F_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
-	trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
-	msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE
+AquaHideout_B2F_EventScript_Grunt8:: @ 8233EC6
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_8, AquaHideout_B2F_Text_Grunt8Intro, AquaHideout_B2F_Text_Grunt8Defeat
+	msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_Text_233EDD: @ 8233EDD
+AquaHideout_B2F_Text_MattIntro: @ 8233EDD
 	.string "Hehehe…\p"
 	.string "Got here already, did you?\n"
 	.string "We underestimated you!\p"
@@ -95,16 +96,16 @@ AquaHideout_B2F_Text_233EDD: @ 8233EDD
 	.string "I'm not stalling for time.\n"
 	.string "I'm going to pulverize you!$"
 
-AquaHideout_B2F_Text_233F8D: @ 8233F8D
+AquaHideout_B2F_Text_MattDefeat: @ 8233F8D
 	.string "Hehehe…\n"
 	.string "So, I lost, too…$"
 
-AquaHideout_B2F_Text_233FA6: @ 8233FA6
+AquaHideout_B2F_Text_OurBossGotThroughHisPreparations: @ 8233FA6
 	.string "Hehehe!\p"
 	.string "While I was toying with you, our BOSS\n"
 	.string "got through his preparations!$"
 
-AquaHideout_B2F_Text_233FF2: @ 8233FF2
+AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2
 	.string "Hehehe!\p"
 	.string "Our BOSS has already gone on his way to\n"
 	.string "some cave under the sea!\p"
@@ -114,19 +115,19 @@ AquaHideout_B2F_Text_233FF2: @ 8233FF2
 	.string "But will you find it then?\n"
 	.string "Hehehe!$"
 
-AquaHideout_B2F_Text_2340B4: @ 82340B4
+AquaHideout_B2F_Text_Grunt4Intro: @ 82340B4
 	.string "Wahahah, I grew weary of waiting!\n"
 	.string "You owe me a battle, too!$"
 
-AquaHideout_B2F_Text_2340F0: @ 82340F0
+AquaHideout_B2F_Text_Grunt4Defeat: @ 82340F0
 	.string "Tired of waiting…\n"
 	.string "Lost and dazed…$"
 
-AquaHideout_B2F_Text_234112: @ 8234112
+AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112
 	.string "BOSS…\n"
 	.string "Is this good enough?$"
 
-AquaHideout_B2F_Text_23412D: @ 823412D
+AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
 	.string "Warp panels, the HIDEOUT's pride\n"
 	.string "and joy!\p"
 	.string "You're clueless about where you are,\n"
@@ -134,25 +135,25 @@ AquaHideout_B2F_Text_23412D: @ 823412D
 	.string "Fluster and tire out the enemy, then\n"
 	.string "lower the boom! That's our plan!$"
 
-AquaHideout_B2F_Text_2341CE: @ 82341CE
+AquaHideout_B2F_Text_Grunt6Defeat: @ 82341CE
 	.string "What's wrong with you?\n"
 	.string "You're not tired at all!$"
 
-AquaHideout_B2F_Text_2341FE: @ 82341FE
+AquaHideout_B2F_Text_Grunt6PostBattle: @ 82341FE
 	.string "That reminds me… I can't remember\n"
 	.string "where I put the MASTER BALL.\p"
 	.string "If I fail to guard it, our BOSS will\n"
 	.string "chew me out…$"
 
-AquaHideout_B2F_Text_23426F: @ 823426F
+AquaHideout_B2F_Text_Grunt8Intro: @ 823426F
 	.string "When I joined TEAM AQUA, the first\n"
 	.string "thing I had to learn was how these\l"
 	.string "warp panels connected.$"
 
-AquaHideout_B2F_Text_2342CC: @ 82342CC
+AquaHideout_B2F_Text_Grunt8Defeat: @ 82342CC
 	.string "I was too occupied thinking about\n"
 	.string "the warp panels…$"
 
-AquaHideout_B2F_Text_2342FF: @ 82342FF
+AquaHideout_B2F_Text_Grunt8PostBattle: @ 82342FF
 	.string "I'll have to learn about how I can\n"
 	.string "battle more effectively…$"
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/BattleColosseum2P/map.json
index f63464424..18df18491 100644
--- a/data/maps/SingleBattleColosseum/map.json
+++ b/data/maps/BattleColosseum2P/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SINGLE_BATTLE_COLOSSEUM",
-  "name": "SingleBattleColosseum",
-  "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
+  "id": "MAP_BATTLE_COLOSSEUM_2P",
+  "name": "BattleColosseum2P",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SingleBattleColosseum_EventScript_Attendant",
+      "script": "BattleColosseum2P_EventScript_Attendant",
       "flag": "0"
     }
   ],
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_SingleBattleColosseum_PlayerSpot0"
+      "script": "EventScript_BattleColosseum2P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
+      "script": "EventScript_BattleColosseum2P_PlayerSpot1"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc
new file mode 100644
index 000000000..efa01af6c
--- /dev/null
+++ b/data/maps/BattleColosseum2P/scripts.inc
@@ -0,0 +1,3 @@
+BattleColosseum2P_MapScripts:: @ 823B77D
+	.byte 0
+
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/BattleColosseum4P/map.json
index 172bb3fdc..d17851aaf 100644
--- a/data/maps/DoubleBattleColosseum/map.json
+++ b/data/maps/BattleColosseum4P/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_DOUBLE_BATTLE_COLOSSEUM",
-  "name": "DoubleBattleColosseum",
-  "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
+  "id": "MAP_BATTLE_COLOSSEUM_4P",
+  "name": "BattleColosseum4P",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot2"
     },
     {
       "type": "trigger",
@@ -70,7 +70,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot1"
     },
     {
       "type": "trigger",
@@ -79,7 +79,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot3"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc
new file mode 100644
index 000000000..b1733aecd
--- /dev/null
+++ b/data/maps/BattleColosseum4P/scripts.inc
@@ -0,0 +1,3 @@
+BattleColosseum4P_MapScripts:: @ 823B780
+	.byte 0
+
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index 2823a4f30..6eb7e515b 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -10,7 +10,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
 	end
 
 BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
 	special CallFrontierUtilFunc
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
 	end
@@ -40,7 +40,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
 	showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -48,15 +48,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
 	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 7
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF
 	waitmovement 0
@@ -109,7 +109,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -118,11 +118,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -138,20 +138,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -201,9 +201,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808
 	message BattleFrontier_BattleArenaBattleRoom_Text_257E9E
@@ -224,7 +224,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
 	delay 60
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -270,7 +270,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
@@ -330,14 +330,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
 	case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
@@ -357,7 +357,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -368,20 +368,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
 	message BattleFrontier_BattleArenaBattleRoom_Text_25819C
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
@@ -401,7 +401,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -412,7 +412,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
 	message BattleFrontier_BattleArenaBattleRoom_Text_25835B
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -426,7 +426,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
 FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -435,10 +435,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, 18
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
 	special CallFrontierUtilFunc
 	special HealPlayerParty
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
 	special CallFrontierUtilFunc
 	return
 
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index 0c55e9917..34feceb39 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -21,7 +21,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
 	.2byte 0
 
 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -37,7 +37,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleArenaFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -47,9 +47,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
 
 BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
 	msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_255CF8
@@ -59,9 +59,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
 
 BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
 	msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleArenaLobby_Text_256931
 	waitmessage
 	call BattleFrontier_BattleArenaLobby_EventScript_255D59
@@ -87,7 +87,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
 	end
 
 BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -122,7 +122,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
 	special CallBattleArenaFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -154,11 +154,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -173,13 +173,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
 	msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8
+	case NO, BattleFrontier_BattleArenaLobby_EventScript_255FF8
+	case YES, BattleFrontier_BattleArenaLobby_EventScript_255EE8
+	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FF8
 
 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
@@ -188,11 +188,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleArenaFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -206,12 +206,12 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 
 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -241,7 +241,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4
 	goto BattleFrontier_BattleArenaLobby_EventScript_256003
 
 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -344,7 +344,7 @@ BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
 
 BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 3
 	special CallFrontierUtilFunc
 	waitbuttonpress
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index 5ef17d381..1ee9c29dc 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
 	setvar VAR_0x8004, 10
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -78,9 +78,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
 	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
 	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
 	waitmovement 0
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 5
@@ -134,7 +134,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
 	special CallBattleDomeFunction
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -142,7 +142,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
 @ 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
@@ -150,7 +150,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
 	setvar VAR_0x8005, 0
 	special CallFrontierUtilFunc
 	message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
@@ -177,11 +177,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -194,7 +194,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
 	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
@@ -210,7 +210,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
 	playse SE_W227B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
 	delay 60
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -377,7 +377,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	return
@@ -426,13 +426,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
 	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
 	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -444,10 +444,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -459,19 +459,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -486,7 +486,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -498,7 +498,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	message BattleFrontier_BattleDomeBattleRoom_Text_24D522
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -524,7 +524,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -552,12 +552,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
 	setvar VAR_TEMP_1, 1
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 3
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_E, VAR_RESULT
 	compare VAR_RESULT, 0
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index c777f7a7a..deea13c83 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -9,7 +9,7 @@ BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
 BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
 	delay 16
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index 4ba6db967..12940496d 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -28,7 +28,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
 	.2byte 0
 
 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -48,7 +48,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -59,9 +59,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
 	call BattleFrontier_BattleDomeLobby_EventScript_241EBA
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
@@ -71,16 +71,16 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
 
 BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 6
@@ -104,10 +104,10 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
@@ -157,7 +157,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
 	special CallBattleDomeFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -207,11 +207,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -226,22 +226,22 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61
+	case NO, BattleFrontier_BattleDomeLobby_EventScript_249C61
+	case YES, BattleFrontier_BattleDomeLobby_EventScript_249B60
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C61
 
 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -257,8 +257,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 15
 	special CallBattleDomeFunction
@@ -292,7 +292,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
 	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
 
 BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -410,7 +410,7 @@ BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
 
 BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -421,7 +421,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 
 BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -482,16 +482,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
 	msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19
+@ A few OutsideWest event scripts are inserted here instead, two of which are unused
+BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
 	msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22
-	msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
+	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B
-	msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
+	msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
@@ -699,11 +700,11 @@ BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
 	.string "The BATTLE FRONTIER…\n"
 	.string "I've long dreamed about a place like it.$"
 
-BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44
+BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
 	.string "The BATTLE DOME\n"
 	.string "Become the Unbeatable Superstar!$"
 
-BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75
+BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
 	.string "The ??????\n"
 	.string "Under Construction!$"
 
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 3f5d53ac1..8987f3e07 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -71,9 +71,9 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93
@@ -99,7 +99,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
@@ -120,7 +120,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
@@ -156,7 +156,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	setvar VAR_0x8005, 2
 	special sub_80F9490
 	waitstate
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -185,7 +185,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
@@ -208,7 +208,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
@@ -242,8 +242,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	setvar VAR_TEMP_0, 1
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT
 	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	playfanfare MUS_ME_ASA
 	waitfanfare
@@ -256,7 +256,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index 68e6194cf..a6e02f443 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -5,14 +5,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
 	.byte 0
 
 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
 	special CallFrontierUtilFunc
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
 	compare VAR_RESULT, FEMALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
@@ -85,7 +85,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -99,7 +99,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -122,11 +122,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -137,7 +137,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
 	waitstate
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -148,13 +148,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
 	case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
 	case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
 	case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -166,7 +166,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
@@ -178,19 +178,19 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
 	message BattleFrontier_BattleFactoryBattleRoom_Text_25B460
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -202,7 +202,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
@@ -214,14 +214,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
 	message BattleFrontier_BattleFactoryBattleRoom_Text_25B640
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -253,7 +253,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index 9569d23ca..cead1a1d7 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -21,7 +21,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
 	.2byte 0
 
 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -43,7 +43,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -53,9 +53,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
 
 BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT
 	waitmessage
@@ -67,12 +67,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
 
 BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
 	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleFactoryLobby_Text_259323
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 3
@@ -87,7 +87,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_258CC7
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 2
@@ -131,7 +131,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
 	special CallBattleFactoryFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -180,21 +180,21 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A
+	case NO, BattleFrontier_BattleFactoryLobby_EventScript_25879A
+	case YES, BattleFrontier_BattleFactoryLobby_EventScript_2586B9
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879A
 
 BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -202,7 +202,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -246,7 +246,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
 	goto BattleFrontier_BattleFactoryLobby_EventScript_258606
 
 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -300,7 +300,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8
 
 BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -311,7 +311,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 
 BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index f65ffae0d..97365a46e 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -73,7 +73,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
@@ -94,13 +94,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -150,9 +150,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A
@@ -176,9 +176,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
 	fadescreen 1
@@ -231,7 +231,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
@@ -240,7 +240,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
 	setvar VAR_0x8004, 10
 	setvar VAR_0x8005, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -442,9 +442,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C
 	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 0513e2bb3..94c21a6d0 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
 	.byte 0
 
 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
 	special CallFrontierUtilFunc
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
 	end
@@ -34,7 +34,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
 	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -43,7 +43,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
 	waitmovement 0
 	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -54,8 +54,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
 	waitmovement 0
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 2
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
 	waitmovement 0
@@ -68,7 +68,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -76,11 +76,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -95,20 +95,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -158,9 +158,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2
 	message BattleFrontier_BattlePalaceBattleRoom_Text_25005A
@@ -178,7 +178,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -193,7 +193,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
@@ -244,13 +244,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
 	case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -264,7 +264,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	setvar VAR_0x8004, 6
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -276,7 +276,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
@@ -287,13 +287,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -307,7 +307,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	setvar VAR_0x8004, 6
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -319,7 +319,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	message BattleFrontier_BattlePalaceBattleRoom_Text_250699
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
@@ -333,7 +333,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
 VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -342,10 +342,10 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, 18
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
 	special CallFrontierUtilFunc
 	special HealPlayerParty
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
 	special CallFrontierUtilFunc
 	return
 
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index d5219636c..5df680aa8 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -25,7 +25,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
 	compare VAR_RESULT, 4
 	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
 	closemessage
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index c3b688661..649b20f87 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -21,7 +21,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
 	.2byte 0
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -37,7 +37,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -47,9 +47,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
@@ -59,9 +59,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
 	waitmessage
 	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
@@ -87,7 +87,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -123,7 +123,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
 	special CallBattlePalaceFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -178,11 +178,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -197,13 +197,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+	case NO, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+	case YES, BattleFrontier_BattlePalaceLobby_EventScript_24DA87
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
@@ -212,11 +212,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -230,8 +230,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT
 	closemessage
@@ -265,7 +265,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -361,7 +361,7 @@ BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -372,7 +372,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 44027d7ce..6bfd5b045 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -9,7 +9,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
 
 BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	delay 16
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -27,7 +27,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	releaseall
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
 	waitmovement 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 99
 	special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 541ffd313..d145ba429 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -20,7 +20,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -39,7 +39,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -49,9 +49,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
 
 BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT
 	waitmessage
@@ -63,10 +63,10 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
 
 BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
-	setvar VAR_0x8004, 8
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
 	setvar VAR_0x8005, 3
@@ -97,9 +97,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	lockall
 	message BattleFrontier_BattlePikeLobby_Text_25C146
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -147,11 +147,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -166,19 +166,19 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	case NO, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	case YES, BattleFrontier_BattlePikeLobby_EventScript_25B95C
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA73
 
 BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -188,7 +188,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	special CallBattlePikeFunction
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -202,12 +202,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
 	special CallFrontierUtilFunc
 	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
 	special HealPlayerParty
@@ -235,7 +235,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
 	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -253,7 +253,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	waitbuttonpress
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
index 565e28d47..deb0a7974 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
 	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -142,13 +142,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
 	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
 	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
 	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -160,7 +160,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
 	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -170,20 +170,20 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
 	message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT
 	closemessage
 	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -195,7 +195,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
 	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -205,7 +205,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
 	message BattleFrontier_BattlePikeRandomRoom1_Text_25E118
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
index b12ff0d6e..b1a55c33f 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
 	delay 16
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB
 	waitmovement 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
index a18ccda4c..ff5e3e1db 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
 	end
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -35,7 +35,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
 
 BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
 	call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index 6416ad4d7..53a796011 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -22,7 +22,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -40,28 +40,28 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	special CallBattlePikeFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 255
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 99
 	special CallFrontierUtilFunc
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	switch VAR_RESULT
@@ -126,13 +126,13 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
 	release
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6
 	special CallFrontierUtilFunc
 	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
 	waitmessage
@@ -143,16 +143,16 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
 	release
 	end
 
@@ -197,9 +197,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
+	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
 	release
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
deleted file mode 100644
index 2011c42df..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+++ /dev/null
@@ -1,764 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070
-	.byte 0
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT
-	special ShowBattlePointsWindow
-	return
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
-	specialvar VAR_TEMP_1, GetFrontierBattlePoints
-	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	compare VAR_TEMP_2, 2
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
-	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
-	checkdecorspace VAR_0x8009
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
-	copyvar VAR_0x8004, VAR_0x8008
-	special TakeFrontierBattlePoints
-	givedecoration VAR_0x8009
-	special UpdateBattlePointsWindow
-	playse SE_REGI
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
-	checkitemspace VAR_0x8009, 1
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
-	copyvar VAR_0x8004, VAR_0x8008
-	special TakeFrontierBattlePoints
-	giveitem VAR_0x8009, 1
-	special UpdateBattlePointsWindow
-	playse SE_REGI
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 2
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 0
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0
-	case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313
-	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336
-	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359
-	case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 16
-	setvar VAR_0x8009, DECOR_KISS_POSTER
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, DECOR_KISS_CUSHION
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_DITTO_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 1
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 2
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_PROTEIN
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_CALCIUM
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_IRON
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_ZINC
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_CARBOS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_HP_UP
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 3
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762
-	case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785
-	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8
-	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_LEFTOVERS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_WHITE_HERB
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_QUICK_CLAW
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_MENTAL_HERB
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_CHOICE_BAND
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_KINGS_ROCK
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_FOCUS_BAND
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_SCOPE_LENS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD
-	lock
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA
-	.string "Hello, this is the EXCHANGE SERVICE\n"
-	.string "CORNER.\p"
-	.string "We exchange the Battle Points you\n"
-	.string "have collected for lovely prizes.\p"
-	.string "Please choose a prize from this list.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890
-	.string "Please choose a prize from this list.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6
-	.string "You've chosen the KISS POSTER.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6
-	.string "You've chosen the KISS CUSHION.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917
-	.string "You've chosen the SMOOCHUM DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949
-	.string "You've chosen the TOGEPI DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979
-	.string "You've chosen the MEOWTH DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9
-	.string "You've chosen the CLEFAIRY DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB
-	.string "You've chosen the DITTO DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A
-	.string "You've chosen the CYNDAQUIL DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D
-	.string "You've chosen the CHIKORITA DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70
-	.string "You've chosen the TOTODILE DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2
-	.string "You've chosen the LAPRAS DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2
-	.string "You've chosen the SNORLAX DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03
-	.string "You've chosen the VENUSAUR DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35
-	.string "You've chosen the CHARIZARD DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68
-	.string "You've chosen the BLASTOISE DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B
-	.string "You've chosen the PROTEIN.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7
-	.string "You've chosen the CALCIUM.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3
-	.string "You've chosen the IRON.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C
-	.string "You've chosen the ZINC.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45
-	.string "You've chosen the CARBOS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70
-	.string "You've chosen the HP UP.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A
-	.string "You've chosen the BRIGHTPOWDER.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB
-	.string "You've chosen the WHITE HERB.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA
-	.string "You've chosen the QUICK CLAW.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29
-	.string "You've chosen the MENTAL HERB.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59
-	.string "You've chosen the CHOICE BAND.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89
-	.string "You've chosen the KING'S ROCK.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9
-	.string "You've chosen the FOCUS BAND.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8
-	.string "You've chosen the SCOPE LENS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17
-	.string "You've chosen the LEFTOVERS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45
-	.string "Thank you!\n"
-	.string "We'll send it to your PC at home.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72
-	.string "Here is your prize!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86
-	.string "I'm so sorry…\n"
-	.string "You don't have enough Battle Points…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9
-	.string "I'm so sorry…\n"
-	.string "Your PC appears to be full…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3
-	.string "I'm so sorry…\n"
-	.string "You don't have space to hold it…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12
-	.string "Thank you very much.\p"
-	.string "Please visit us when you have\n"
-	.string "saved up Battle Points.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D
-	.string "Oh, they're so nice!\n"
-	.string "I wish I had them!\l"
-	.string "Cute cushions!\l"
-	.string "Big plush DOLLS!\l"
-	.string "Little plush DOLLS!\l"
-	.string "I wish I had them all!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0
-	.string "Leave it to your mommy!\p"
-	.string "If it's anything you want, I'll go\n"
-	.string "through anything to get it, honey!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E
-	.string "If I can get hold of the items here,\n"
-	.string "my POKéMON will get tougher.\p"
-	.string "You bet they will!\n"
-	.string "No question about it!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099
-	.string "Hah?\n"
-	.string "What are you gawking at?\p"
-	.string "I don't like you staring at my plush\n"
-	.string "doll like that.\p"
-	.string "If you want it, go get one yourself!\n"
-	.string "Isn't that right, SMOOCHUM?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D
-	.string "Did you know?\p"
-	.string "If you stretch your record at any of\n"
-	.string "the BATTLE facilities, they start\l"
-	.string "giving you more and more Battle Points.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA
-	.string "A large poster with a SMOOCHUM print.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0
-	.string "A SMOOCHUM cushion.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201
-	.string "A SMOOCHUM DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F
-	.string "A TOGEPI DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B
-	.string "A MEOWTH DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287
-	.string "A CLEFAIRY DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5
-	.string "A DITTO DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0
-	.string "A CYNDAQUIL DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F
-	.string "A CHIKORITA DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E
-	.string "A TOTODILE DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C
-	.string "A large DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397
-	.string "Raises the stat ATTACK of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE
-	.string "Raises the stat SP. ATK of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6
-	.string "Raises the stat DEFENSE of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E
-	.string "Raises the stat SP. DEF of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436
-	.string "Raises the stat SPEED of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C
-	.string "Raises the HP of one POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A
-	.string "A hold item that gradually restores\n"
-	.string "HP in battle.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC
-	.string "A hold item that restores any\n"
-	.string "lowered stat.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8
-	.string "A hold item that occasionally allows\n"
-	.string "the first strike.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F
-	.string "A hold item that snaps POKéMON out\n"
-	.string "of infatuation.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542
-	.string "A hold item that casts a glare to\n"
-	.string "reduce accuracy.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575
-	.string "Raises a move's power, but permits\n"
-	.string "only that move.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8
-	.string "A hold item that may cause flinching\n"
-	.string "when the foe is hit.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2
-	.string "A hold item that occasionally\n"
-	.string "prevents fainting.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613
-	.string "A hold item that raises the\n"
-	.string "critical-hit rate.$"
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index ba862ebdf..1bcf1814a 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -40,13 +40,13 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	switch VAR_TEMP_0
 	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
 	case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
 	case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 4
@@ -61,8 +61,8 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
 	compare VAR_RESULT, 9
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE
+	setvar VAR_0x8005, BATTLE_TYPE_TRAINER
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_D, 1
 
@@ -73,7 +73,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -100,14 +100,14 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_F, 1
 	end
@@ -126,11 +126,11 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -152,6 +152,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
+@ TRAINER_PHILLIP is used as a placeholder
 BattlePyramid_TrainerBattle:: @ 8252C4F
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 72abed5ef..0b30d96e3 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
 	.2byte 0
 
 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -40,7 +40,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -50,9 +50,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
 	lockall
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
@@ -61,11 +61,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
-	special sub_81B95E0
-	compare VAR_RESULT, 1
+	special DoBattlePyramidMonsHaveHeldItem
+	compare VAR_RESULT, TRUE
 	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB
-	clearflag FLAG_SPECIAL_FLAG_0x4004
-	setvar VAR_0x8004, 8
+	clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
@@ -76,9 +76,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	playse SE_EXPMAX
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
@@ -95,7 +95,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
@@ -151,11 +151,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -170,13 +170,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+	case NO, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+	case YES, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
 
 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
@@ -185,11 +185,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -207,13 +207,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -242,7 +242,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -424,7 +424,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 6
 	special CallFrontierUtilFunc
 	waitbuttonpress
@@ -494,8 +494,8 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
 
 BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT
-	setflag FLAG_SPECIAL_FLAG_0x4004
-	special sub_81C6A94
+	setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
+	special TryStoreHeldItemsInPyramidBag
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
 	message BattleFrontier_BattlePyramidLobby_Text_2518C6
@@ -525,7 +525,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
-	special sub_81B9620
+	special BattlePyramidChooseMonHeldItems
 	waitstate
 	message BattleFrontier_BattlePyramidLobby_Text_25197E
 	waitmessage
@@ -533,8 +533,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
-	special sub_81B95E0
-	compare VAR_RESULT, 1
+	special DoBattlePyramidMonsHaveHeldItem
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
 	return
 
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 8906d4c42..7b777b165 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
 	end
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
@@ -36,13 +36,13 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
 
 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
 	copyvar VAR_TEMP_C, VAR_RESULT
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	switch VAR_TEMP_0
 	case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
 	case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
 	case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
@@ -73,14 +73,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_F, 1
 	end
@@ -107,7 +107,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
 	closemessage
 
 BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -133,7 +133,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
 	case 2, BattleFrontier_BattlePyramidTop_EventScript_255335
 	case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0
 	case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -143,7 +143,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
@@ -165,7 +165,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A
@@ -174,13 +174,13 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
 	message BattleFrontier_BattlePyramidTop_Text_2558E9
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
 
 BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -190,7 +190,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
@@ -212,7 +212,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
@@ -221,7 +221,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
 	message BattleFrontier_BattlePyramidTop_Text_255B59
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index f2c6ca0ac..e305260df 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -20,7 +20,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	setvar VAR_TEMP_0, 1
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -30,21 +30,21 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
 	waitmovement 0
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 1
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
 	waitmovement 0
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -53,27 +53,27 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
-	special sub_813BF7C
+	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
+	special CallBattleTowerFunc
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
@@ -87,12 +87,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
 	special CallFrontierUtilFunc
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
@@ -131,9 +131,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
 	message BattleFrontier_BattleTowerBattleRoom_Text_24244C
@@ -153,27 +153,27 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
-	special sub_813BF7C
+	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
 	message BattleFrontier_BattleTowerBattleRoom_Text_242426
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
@@ -223,7 +223,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA
 BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
 BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
 BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_17
 	special CallFrontierUtilFunc
 	return
 
@@ -286,13 +286,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
 	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -305,7 +305,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
@@ -314,19 +314,19 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
 	message BattleFrontier_BattleTowerBattleRoom_Text_24270E
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 
@@ -339,7 +339,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
@@ -348,7 +348,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
 	message BattleFrontier_BattleTowerBattleRoom_Text_242932
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
 	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
@@ -357,7 +357,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
 BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -369,16 +369,16 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_0x8004, 3
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
-	setvar VAR_0x8004, 18
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
 	special CallFrontierUtilFunc
 	special HealPlayerParty
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
 	special CallFrontierUtilFunc
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
-	setvar VAR_0x8004, 15
-	special sub_8161F74
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_15
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	return
@@ -389,7 +389,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170
 BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
 BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
 BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
-	setvar VAR_0x8004, 22
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT
 	special CallFrontierUtilFunc
 	return
 
@@ -506,8 +506,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
-	setvar VAR_0x8004, 13
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_13
+	special CallBattleTowerFunc
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index 07883c7ca..f447434f1 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -12,8 +12,8 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
-	setvar VAR_0x8004, 14
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
+	special CallBattleTowerFunc
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
@@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
@@ -56,15 +56,15 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	waitmovement 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 1
 	addobject 4
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
@@ -72,17 +72,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, 3
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -90,18 +90,18 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	messageautoscroll 0x2021fc4
 	waitmessage
 	delay 48
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	messageautoscroll 0x2021fc4
@@ -114,21 +114,21 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
-	special sub_813BF7C
+	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
+	special CallBattleTowerFunc
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
@@ -154,7 +154,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
 	special LoadPlayerParty
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_FRONTIER_BATTLE_MODE, 3
@@ -164,7 +164,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
 	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
@@ -205,8 +205,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
 	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
+	case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
@@ -231,27 +231,27 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
-	special sub_813BF7C
+	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
 	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
index 786f1fa3e..a53cac0c5 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
@@ -12,8 +12,8 @@ BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
 	end
 
 BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
-	setvar VAR_0x8004, 14
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
+	special CallBattleTowerFunc
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
index 339b20b56..32aa11636 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.json
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Reporter",
       "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EventScript_Apprentice",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Apprentice",
       "flag": "FLAG_HIDE_APPRENTICE"
     },
     {
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 00205942d..3767db315 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -1,44 +1,40 @@
 BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
+BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
 	special sub_81653CC
 	end
 
-BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
-	call BattleFrontier_BattleTowerLobby_EventScript_28CC84
-	setvar VAR_0x8004, 10
-	special CallApprenticeFunction
-	compare VAR_0x8004, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
-	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
+BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
+	call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
+	apprentice_shouldcheckgone
+	compare VAR_0x8004, FALSE  @ Always TRUE here
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice
+	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice
+BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice:: @ 823E6B5
 	clearflag FLAG_HIDE_APPRENTICE
-	setvar VAR_0x8004, 23
-	special CallApprenticeFunction
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
+	apprentice_setgfx
+BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice:: @ 823E6C0
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
+BattleFrontier_BattleTowerLobby_EventScript_HideApprentice:: @ 823E6C1
 	setflag FLAG_HIDE_APPRENTICE
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
+	goto BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice
 
-BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3
+BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
+BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
+BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707
 	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710
 	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
@@ -47,7 +43,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
 	.2byte 0
 
 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -56,15 +52,15 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 	faceplayer
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -75,9 +71,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
 	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
 	message BattleFrontier_BattleTowerLobby_Text_23F60D
 	waitmessage
@@ -87,8 +83,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
 	msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT
 
 BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
-	setvar VAR_0x8004, 5
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GIVE_RIBBONS
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
 	message BattleFrontier_BattleTowerLobby_Text_23F844
@@ -99,13 +95,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
 
 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
 	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 49
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT
@@ -121,17 +117,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
 	compare VAR_FRONTIER_BATTLE_MODE, 2
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
 
 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 
 BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
 	lock
@@ -148,13 +144,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
 BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	message BattleFrontier_BattleTowerLobby_Text_23F70F
 	waitmessage
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
@@ -179,7 +175,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4
 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
-	setvar VAR_0x8004, 19
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_19
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
@@ -204,7 +200,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 6
 	special CallFrontierUtilFunc
 	return
@@ -218,12 +214,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	waitmessage
 	message BattleFrontier_BattleTowerLobby_Text_23F754
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -259,11 +255,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -278,22 +274,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case YES, BattleFrontier_BattleTowerLobby_EventScript_23EA2A
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -339,11 +335,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -358,22 +354,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case YES, BattleFrontier_BattleTowerLobby_EventScript_23EB93
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -420,11 +416,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -439,22 +435,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case YES, BattleFrontier_BattleTowerLobby_EventScript_23ECFF
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -500,11 +496,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -519,31 +515,31 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case YES, BattleFrontier_BattleTowerLobby_EventScript_23EE68
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
@@ -629,7 +625,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -640,7 +636,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -651,7 +647,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 2
 	special CallFrontierUtilFunc
@@ -662,7 +658,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
 
 BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -713,7 +709,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	special CallFrontierUtilFunc
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
@@ -732,14 +728,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
 	call BattleFrontier_BattleTowerLobby_EventScript_23F272
 	special CallFrontierUtilFunc
 	setvar VAR_RESULT, 0
 
 BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
-	setvar VAR_0x8004, 12
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_12
+	special CallBattleTowerFunc
 	delay 1
 	compare VAR_RESULT, 6
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108
@@ -897,7 +893,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5
@@ -920,7 +916,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7
 BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7
 BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
 BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 1
 	special CallFrontierUtilFunc
 	return
@@ -998,9 +994,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE
@@ -1015,7 +1011,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
 	end
 
@@ -1061,9 +1057,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE
@@ -1529,13 +1525,7 @@ BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4
 	.string "In recognition of your infinite talent,\n"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520
-BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520
-BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520
-BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520
+BattleFrontier_Text_ObtainedXBattlePoints: @ 8241520
 	.string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$"
 
 BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index d053c33e4..9da5e6a14 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -20,8 +20,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
 	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
 	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
-	setvar VAR_0x8004, 10
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_10
+	special CallBattleTowerFunc
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
@@ -94,7 +94,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
@@ -166,27 +166,27 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
 	closemessage
@@ -202,9 +202,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 4
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
 	release
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
index 4c7bcad2a..055b6e56e 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
-  "name": "BattleFrontier_BattlePointExchangeServiceCorner",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+  "id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+  "name": "BattleFrontier_ExchangeServiceCorner",
+  "layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
   "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Man",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
new file mode 100644
index 000000000..b343b0c97
--- /dev/null
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -0,0 +1,765 @@
+BattleFrontier_ExchangeServiceCorner_MapScripts:: @ 825F070
+	.byte 0
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome:: @ 825F071
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize, MSGBOX_DEFAULT
+	special ShowBattlePointsWindow
+	return
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye:: @ 825F07D
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
+	specialvar VAR_TEMP_1, GetFrontierBattlePoints
+	compare VAR_TEMP_1, VAR_0x8008
+	goto_if_ge BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
+	checkdecorspace VAR_0x8009
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
+	copyvar VAR_0x8004, VAR_0x8008
+	special TakeFrontierBattlePoints
+	givedecoration VAR_0x8009
+	special UpdateBattlePointsWindow
+	playse SE_REGI
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor:: @ 825F11D
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_PCIsFull, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
+	checkitemspace VAR_0x8009, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
+	copyvar VAR_0x8004, VAR_0x8008
+	special TakeFrontierBattlePoints
+	giveitem VAR_0x8009, 1
+	special UpdateBattlePointsWindow
+	playse SE_REGI
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_BagFull:: @ 825F166
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll
+	case 7, BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll
+	case 8, BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll
+	case 9, BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll
+	case 10, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 16
+	setvar VAR_0x8009, DECOR_KISS_POSTER
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 32
+	setvar VAR_0x8009, DECOR_KISS_CUSHION
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 32
+	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_DITTO_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 128
+	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 128
+	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_Protein
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_Calcium
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_Iron
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_Zinc
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_Carbos
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_HPUp
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_PROTEIN
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_CALCIUM
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_IRON
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_ZINC
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_CARBOS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_HP_UP
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_HOLD_ITEM_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock
+	case 7, BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand
+	case 8, BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens
+	case 9, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_LEFTOVERS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_WHITE_HERB
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_QUICK_CLAW
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_MENTAL_HERB
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_CHOICE_BAND
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_KINGS_ROCK
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_FOCUS_BAND
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_SCOPE_LENS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_260099, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_26002E, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
+	lock
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_26012D, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
+	.string "Hello, this is the EXCHANGE SERVICE\n"
+	.string "CORNER.\p"
+	.string "We exchange the Battle Points you\n"
+	.string "have collected for lovely prizes.\p"
+	.string "Please choose a prize from this list.$"
+
+@ Unused
+BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize: @ 825F890
+	.string "Please choose a prize from this list.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster: @ 825F8B6
+	.string "You've chosen the KISS POSTER.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion: @ 825F8E6
+	.string "You've chosen the KISS CUSHION.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll: @ 825F917
+	.string "You've chosen the SMOOCHUM DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll: @ 825F949
+	.string "You've chosen the TOGEPI DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll: @ 825F979
+	.string "You've chosen the MEOWTH DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll: @ 825F9A9
+	.string "You've chosen the CLEFAIRY DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll: @ 825F9DB
+	.string "You've chosen the DITTO DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll: @ 825FA0A
+	.string "You've chosen the CYNDAQUIL DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll: @ 825FA3D
+	.string "You've chosen the CHIKORITA DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll: @ 825FA70
+	.string "You've chosen the TOTODILE DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll: @ 825FAA2
+	.string "You've chosen the LAPRAS DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll: @ 825FAD2
+	.string "You've chosen the SNORLAX DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll: @ 825FB03
+	.string "You've chosen the VENUSAUR DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll: @ 825FB35
+	.string "You've chosen the CHARIZARD DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll: @ 825FB68
+	.string "You've chosen the BLASTOISE DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein: @ 825FB9B
+	.string "You've chosen the PROTEIN.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium: @ 825FBC7
+	.string "You've chosen the CALCIUM.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron: @ 825FBF3
+	.string "You've chosen the IRON.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc: @ 825FC1C
+	.string "You've chosen the ZINC.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos: @ 825FC45
+	.string "You've chosen the CARBOS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp: @ 825FC70
+	.string "You've chosen the HP UP.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder: @ 825FC9A
+	.string "You've chosen the BRIGHTPOWDER.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb: @ 825FCCB
+	.string "You've chosen the WHITE HERB.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw: @ 825FCFA
+	.string "You've chosen the QUICK CLAW.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb: @ 825FD29
+	.string "You've chosen the MENTAL HERB.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand: @ 825FD59
+	.string "You've chosen the CHOICE BAND.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock: @ 825FD89
+	.string "You've chosen the KING'S ROCK.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand: @ 825FDB9
+	.string "You've chosen the FOCUS BAND.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens: @ 825FDE8
+	.string "You've chosen the SCOPE LENS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers: @ 825FE17
+	.string "You've chosen the LEFTOVERS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC: @ 825FE45
+	.string "Thank you!\n"
+	.string "We'll send it to your PC at home.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize: @ 825FE72
+	.string "Here is your prize!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints: @ 825FE86
+	.string "I'm so sorry…\n"
+	.string "You don't have enough Battle Points…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_PCIsFull: @ 825FEB9
+	.string "I'm so sorry…\n"
+	.string "Your PC appears to be full…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt: @ 825FEE3
+	.string "I'm so sorry…\n"
+	.string "You don't have space to hold it…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
+	.string "Thank you very much.\p"
+	.string "Please visit us when you have\n"
+	.string "saved up Battle Points.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
+	.string "Oh, they're so nice!\n"
+	.string "I wish I had them!\l"
+	.string "Cute cushions!\l"
+	.string "Big plush DOLLS!\l"
+	.string "Little plush DOLLS!\l"
+	.string "I wish I had them all!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_25FFD0: @ 825FFD0
+	.string "Leave it to your mommy!\p"
+	.string "If it's anything you want, I'll go\n"
+	.string "through anything to get it, honey!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_26002E: @ 826002E
+	.string "If I can get hold of the items here,\n"
+	.string "my POKéMON will get tougher.\p"
+	.string "You bet they will!\n"
+	.string "No question about it!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
+	.string "Hah?\n"
+	.string "What are you gawking at?\p"
+	.string "I don't like you staring at my plush\n"
+	.string "doll like that.\p"
+	.string "If you want it, go get one yourself!\n"
+	.string "Isn't that right, SMOOCHUM?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_26012D: @ 826012D
+	.string "Did you know?\p"
+	.string "If you stretch your record at any of\n"
+	.string "the BATTLE facilities, they start\l"
+	.string "giving you more and more Battle Points.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc:: @ 82601AA
+	.string "A large poster with a SMOOCHUM print.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc:: @ 82601D0
+	.string "A SMOOCHUM cushion.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc:: @ 8260201
+	.string "A SMOOCHUM DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc:: @ 826022F
+	.string "A TOGEPI DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc:: @ 826025B
+	.string "A MEOWTH DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc:: @ 8260287
+	.string "A CLEFAIRY DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc:: @ 82602B5
+	.string "A DITTO DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc:: @ 82602E0
+	.string "A CYNDAQUIL DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc:: @ 826030F
+	.string "A CHIKORITA DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc:: @ 826033E
+	.string "A TOTODILE DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc:: @ 826036C
+	.string "A large DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc:: @ 8260397
+	.string "Raises the stat ATTACK of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc:: @ 82603BE
+	.string "Raises the stat SP. ATK of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_IronDesc:: @ 82603E6
+	.string "Raises the stat DEFENSE of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ZincDesc:: @ 826040E
+	.string "Raises the stat SP. DEF of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc:: @ 8260436
+	.string "Raises the stat SPEED of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc:: @ 826045C
+	.string "Raises the HP of one POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc:: @ 826047A
+	.string "A hold item that gradually restores\n"
+	.string "HP in battle.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc:: @ 82604AC
+	.string "A hold item that restores any\n"
+	.string "lowered stat.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc:: @ 82604D8
+	.string "A hold item that occasionally allows\n"
+	.string "the first strike.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc:: @ 826050F
+	.string "A hold item that snaps POKéMON out\n"
+	.string "of infatuation.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc:: @ 8260542
+	.string "A hold item that casts a glare to\n"
+	.string "reduce accuracy.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc:: @ 8260575
+	.string "Raises a move's power, but permits\n"
+	.string "only that move.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc:: @ 82605A8
+	.string "A hold item that may cause flinching\n"
+	.string "when the foe is hit.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc:: @ 82605E2
+	.string "A hold item that occasionally\n"
+	.string "prevents fainting.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc:: @ 8260613
+	.string "A hold item that raises the\n"
+	.string "critical-hit rate.$"
diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json
index 8d4870f4f..d63190776 100644
--- a/data/maps/BattleFrontier_Lounge1/map.json
+++ b/data/maps/BattleFrontier_Lounge1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E775",
+      "script": "BattleFrontier_Lounge1_EventScript_Breeder",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E94D",
+      "script": "BattleFrontier_Lounge1_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E956",
+      "script": "BattleFrontier_Lounge1_EventScript_Boy2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc
index dee3fd431..0ded021b6 100644
--- a/data/maps/BattleFrontier_Lounge1/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
@@ -1,166 +1,173 @@
 BattleFrontier_Lounge1_MapScripts:: @ 825E774
 	.byte 0
 
-BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
+@ NPC that rates pokemon based on their IVs
+BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
 	lock
 	faceplayer
-	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7AD
-	call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7B6
+	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_BreederIntro
+	call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder
 	setflag FLAG_MET_BATTLE_FRONTIER_BREEDER
-	goto BattleFrontier_Lounge1_EventScript_25E792
+	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792
-	special sub_81B94B0
+BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, 255
-	goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF
+	goto_if_ne BattleFrontier_Lounge1_EventScript_ShowMonToBreeder
 	compare VAR_0x8004, 255
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E943
+	goto_if_eq BattleFrontier_Lounge1_EventScript_CancelMonSelect
 	end
 
-BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD
-	msgbox BattleFrontier_Lounge1_Text_25E95F, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_BreederIntro:: @ 825E7AD
+	msgbox BattleFrontier_Lounge1_Text_PokemonBreederIntro, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
-	msgbox BattleFrontier_Lounge1_Text_25EEF6, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
+	msgbox BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
+@ BufferVarsForIVRater buffers the following values
+@ VAR_0x8005: Sum of the mons IVs
+@ VAR_0x8006: Stat id of highest IV stat
+@ VAR_0x8007: IV of the highest IV stat
+BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
 	special BufferVarsForIVRater
-	compare VAR_0x8005, 90
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E87F
-	compare VAR_0x8005, 120
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E88D
-	compare VAR_0x8005, 150
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E89B
-	compare VAR_0x8005, 151
-	goto_if_ge BattleFrontier_Lounge1_EventScript_25E8A9
+	compare VAR_0x8005, 90   @ Average of 15
+	goto_if_le BattleFrontier_Lounge1_EventScript_AverageTotalIVs
+	compare VAR_0x8005, 120  @ Average of 20
+	goto_if_le BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs
+	compare VAR_0x8005, 150  @ Average of 25
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighTotalIVs
+	compare VAR_0x8005, 151  @ Average of > 25
+	goto_if_ge BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs
 	end
 
-BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF
-	msgbox BattleFrontier_Lounge1_Text_25EF5E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E792
+BattleFrontier_Lounge1_EventScript_ShowEggToBreeder:: @ 825E7FF
+	msgbox BattleFrontier_Lounge1_Text_EvenICantTell, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D
-	compare VAR_0x8006, 0
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8B7
-	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8C5
-	compare VAR_0x8006, 2
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8D3
-	compare VAR_0x8006, 3
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8E1
-	compare VAR_0x8006, 4
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8EF
-	compare VAR_0x8006, 5
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8FD
+@ Comment on the highest IV stat
+BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
+	compare VAR_0x8006, STAT_HP
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVHP
+	compare VAR_0x8006, STAT_ATK
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVAtk
+	compare VAR_0x8006, STAT_DEF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVDef
+	compare VAR_0x8006, STAT_SPEED
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpeed
+	compare VAR_0x8006, STAT_SPATK
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpAtk
+	compare VAR_0x8006, STAT_SPDEF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpDef
 	end
 
-BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850
+@ Comment on the highest IV value
+BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
 	compare VAR_0x8007, 15
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E90B
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVLow
 	compare VAR_0x8007, 25
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E919
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVMid
 	compare VAR_0x8007, 30
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E927
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVHigh
 	compare VAR_0x8007, 31
-	goto_if_ge BattleFrontier_Lounge1_EventScript_25E935
+	goto_if_ge BattleFrontier_Lounge1_EventScript_HighestIVMax
 	end
 
-BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D
+BattleFrontier_Lounge1_EventScript_EndBreederComments:: @ 825E87D
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F
-	msgbox BattleFrontier_Lounge1_Text_25EA92, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_AverageTotalIVs:: @ 825E87F
+	msgbox BattleFrontier_Lounge1_Text_AverageAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D
-	msgbox BattleFrontier_Lounge1_Text_25EAD9, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs:: @ 825E88D
+	msgbox BattleFrontier_Lounge1_Text_BetterThanAverageAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B
-	msgbox BattleFrontier_Lounge1_Text_25EB2A, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_HighTotalIVs:: @ 825E89B
+	msgbox BattleFrontier_Lounge1_Text_ImpressiveAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9
-	msgbox BattleFrontier_Lounge1_Text_25EB6F, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs:: @ 825E8A9
+	msgbox BattleFrontier_Lounge1_Text_OutstandingAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7
-	msgbox BattleFrontier_Lounge1_Text_25EBBB, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVHP:: @ 825E8B7
+	msgbox BattleFrontier_Lounge1_Text_BestAspectHP, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5
-	msgbox BattleFrontier_Lounge1_Text_25EBF8, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVAtk:: @ 825E8C5
+	msgbox BattleFrontier_Lounge1_Text_BestAspectAtk, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3
-	msgbox BattleFrontier_Lounge1_Text_25EC39, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVDef:: @ 825E8D3
+	msgbox BattleFrontier_Lounge1_Text_BestAspectDef, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1
-	msgbox BattleFrontier_Lounge1_Text_25ED0E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpeed:: @ 825E8E1
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpeed, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF
-	msgbox BattleFrontier_Lounge1_Text_25EC7B, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpAtk:: @ 825E8EF
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpAtk, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD
-	msgbox BattleFrontier_Lounge1_Text_25ECC4, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpDef:: @ 825E8FD
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpDef, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B
-	msgbox BattleFrontier_Lounge1_Text_25ED4E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVLow:: @ 825E90B
+	msgbox BattleFrontier_Lounge1_Text_StatRelativelyGood, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919
-	msgbox BattleFrontier_Lounge1_Text_25ED87, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVMid:: @ 825E919
+	msgbox BattleFrontier_Lounge1_Text_StatImpressive, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927
-	msgbox BattleFrontier_Lounge1_Text_25EDC1, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVHigh:: @ 825E927
+	msgbox BattleFrontier_Lounge1_Text_StatOutstanding, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935
-	msgbox BattleFrontier_Lounge1_Text_25EDF6, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVMax:: @ 825E935
+	msgbox BattleFrontier_Lounge1_Text_StatFlawless, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943
-	msgbox BattleFrontier_Lounge1_Text_25EE37, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_CancelMonSelect:: @ 825E943
+	msgbox BattleFrontier_Lounge1_Text_NoTimeForMyAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D
-	msgbox BattleFrontier_Lounge1_Text_25EFDD, MSGBOX_NPC
+BattleFrontier_Lounge1_EventScript_Boy1:: @ 825E94D
+	msgbox BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956
-	msgbox BattleFrontier_Lounge1_Text_25F020, MSGBOX_NPC
+BattleFrontier_Lounge1_EventScript_Boy2:: @ 825E956
+	msgbox BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_Text_25E95F: @ 825E95F
+BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
 	.string "For 70 years I have raised POKéMON!\n"
 	.string "I am the man they revere as\l"
 	.string "the legendary top POKéMON BREEDER!\p"
@@ -173,94 +180,95 @@ BattleFrontier_Lounge1_Text_25E95F: @ 825E95F
 	.string "Here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_25EA92: @ 825EA92
+BattleFrontier_Lounge1_Text_AverageAbility: @ 825EA92
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe\n"
 	.string "as being of average ability.$"
 
-BattleFrontier_Lounge1_Text_25EAD9: @ 825EAD9
+BattleFrontier_Lounge1_Text_BetterThanAverageAbility: @ 825EAD9
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe as\n"
 	.string "having better-than-average ability.$"
 
-BattleFrontier_Lounge1_Text_25EB2A: @ 825EB2A
+BattleFrontier_Lounge1_Text_ImpressiveAbility: @ 825EB2A
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "quite impressive in ability!$"
 
-BattleFrontier_Lounge1_Text_25EB6F: @ 825EB6F
+BattleFrontier_Lounge1_Text_OutstandingAbility: @ 825EB6F
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "wonderfully outstanding in ability!$"
 
-BattleFrontier_Lounge1_Text_25EBBB: @ 825EBBB
+BattleFrontier_Lounge1_Text_BestAspectHP: @ 825EBBB
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its HP…$"
 
-BattleFrontier_Lounge1_Text_25EBF8: @ 825EBF8
+BattleFrontier_Lounge1_Text_BestAspectAtk: @ 825EBF8
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its ATTACK…$"
 
-BattleFrontier_Lounge1_Text_25EC39: @ 825EC39
+BattleFrontier_Lounge1_Text_BestAspectDef: @ 825EC39
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_25EC7B: @ 825EC7B
+BattleFrontier_Lounge1_Text_BestAspectSpAtk: @ 825EC7B
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL ATTACK…$"
 
-BattleFrontier_Lounge1_Text_25ECC4: @ 825ECC4
+BattleFrontier_Lounge1_Text_BestAspectSpDef: @ 825ECC4
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E
+BattleFrontier_Lounge1_Text_BestAspectSpeed: @ 825ED0E
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPEED…$"
 
-BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E
+BattleFrontier_Lounge1_Text_StatRelativelyGood: @ 825ED4E
 	.string "That stat is relatively good.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25ED87: @ 825ED87
+BattleFrontier_Lounge1_Text_StatImpressive: @ 825ED87
 	.string "That stat is quite impressive.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1
+BattleFrontier_Lounge1_Text_StatOutstanding: @ 825EDC1
 	.string "That stat is outstanding!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6
+BattleFrontier_Lounge1_Text_StatFlawless: @ 825EDF6
 	.string "It's flawless! A thing of perfection!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EE37: @ 825EE37
+BattleFrontier_Lounge1_Text_NoTimeForMyAdvice: @ 825EE37
 	.string "What?\n"
 	.string "You have no time for my advice?\p"
 	.string "You should always be eager to learn\n"
 	.string "from the experiences of your elders!$"
 
-BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6
+@ Unused
+BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending: @ 825EEA6
 	.string "Yes, what is it now?\p"
 	.string "I have business that needs tending!\n"
 	.string "Save it for next time!$"
 
-BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6
+BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon: @ 825EEF6
 	.string "Ah, youngster! Do your POKéMON's\n"
 	.string "abilities intrigue you?\p"
 	.string "Here, here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E
+BattleFrontier_Lounge1_Text_EvenICantTell: @ 825EF5E
 	.string "An expert I am, but even I can't tell\n"
 	.string "anything about an unhatched POKéMON!\p"
 	.string "Show me a POKéMON!\n"
 	.string "A POKéMON is what I need to see!$"
 
-BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD
+BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding: @ 825EFDD
 	.string "He said my POKéMON is outstanding!\n"
 	.string "I'm glad I raised it carefully!$"
 
-BattleFrontier_Lounge1_Text_25F020: @ 825F020
+BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt: @ 825F020
 	.string "He said my POKéMON is outstanding!\n"
 	.string "But I didn't do anything special\l"
 	.string "raising it…$"
diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json
index e2ace0b93..575f2898e 100644
--- a/data/maps/BattleFrontier_Lounge2/map.json
+++ b/data/maps/BattleFrontier_Lounge2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260643",
+      "script": "BattleFrontier_Lounge2_EventScript_FrontierManiac",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_26073C",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260747",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_26075D",
+      "script": "BattleFrontier_Lounge2_EventScript_TriathleteF",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260752",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac3",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index 02dd09a52..610a744b4 100644
--- a/data/maps/BattleFrontier_Lounge2/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
@@ -1,122 +1,128 @@
 BattleFrontier_Lounge2_MapScripts:: @ 8260642
 	.byte 0
 
-BattleFrontier_Lounge2_EventScript_260643:: @ 8260643
+@ This NPC gives hints about a random facility or battle mode.
+@ For battle modes he gives generic advice 
+@ For facilities, depending on how far the player has progressed he will say either
+@    The name of the Frontier Brain there
+@    The type and description of the 3 pokemon they use in their silver battle
+@    The type and description of the 3 pokemon they use in their gold battle
+BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_26065F
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_AlreadyMetManiac
 	setflag FLAG_MET_BATTLE_FRONTIER_MANIAC
-	msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge2_EventScript_26066D
+	msgbox BattleFrontier_Lounge2_Text_FrontierManiacIntro, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
-	msgbox BattleFrontier_Lounge2_Text_260857, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge2_EventScript_26066D
+BattleFrontier_Lounge2_EventScript_AlreadyMetManiac:: @ 826065F
+	msgbox BattleFrontier_Lounge2_Text_SwingByForTheLatestWord, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
+BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
 	compare VAR_FRONTIER_MANIAC_FACILITY, 0
-	call_if_eq BattleFrontier_Lounge2_EventScript_26070A
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferSingle
 	compare VAR_FRONTIER_MANIAC_FACILITY, 1
-	call_if_eq BattleFrontier_Lounge2_EventScript_26070F
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferDouble
 	compare VAR_FRONTIER_MANIAC_FACILITY, 2
-	call_if_eq BattleFrontier_Lounge2_EventScript_260714
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferMulti
 	compare VAR_FRONTIER_MANIAC_FACILITY, 3
-	call_if_eq BattleFrontier_Lounge2_EventScript_260719
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferMultiLink
 	compare VAR_FRONTIER_MANIAC_FACILITY, 4
-	call_if_eq BattleFrontier_Lounge2_EventScript_26071E
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleDome
 	compare VAR_FRONTIER_MANIAC_FACILITY, 5
-	call_if_eq BattleFrontier_Lounge2_EventScript_260723
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleFactory
 	compare VAR_FRONTIER_MANIAC_FACILITY, 6
-	call_if_eq BattleFrontier_Lounge2_EventScript_260728
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePalace
 	compare VAR_FRONTIER_MANIAC_FACILITY, 7
-	call_if_eq BattleFrontier_Lounge2_EventScript_26072D
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleArena
 	compare VAR_FRONTIER_MANIAC_FACILITY, 8
-	call_if_eq BattleFrontier_Lounge2_EventScript_260732
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePike
 	compare VAR_FRONTIER_MANIAC_FACILITY, 9
-	call_if_eq BattleFrontier_Lounge2_EventScript_260737
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
 	compare VAR_FRONTIER_MANIAC_FACILITY, 3
-	call_if_le BattleFrontier_Lounge2_EventScript_2606F8
+	call_if_le BattleFrontier_Lounge2_EventScript_BattleTowerNews
 	compare VAR_FRONTIER_MANIAC_FACILITY, 4
-	call_if_ge BattleFrontier_Lounge2_EventScript_260701
+	call_if_ge BattleFrontier_Lounge2_EventScript_FacilityNews
 	special ShowFrontierManiacMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8
-	msgbox BattleFrontier_Lounge2_Text_260933, MSGBOX_DEFAULT
+BattleFrontier_Lounge2_EventScript_BattleTowerNews:: @ 82606F8
+	msgbox BattleFrontier_Lounge2_Text_BattleTowerIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_260701:: @ 8260701
-	msgbox BattleFrontier_Lounge2_Text_2608F2, MSGBOX_DEFAULT
+BattleFrontier_Lounge2_EventScript_FacilityNews:: @ 8260701
+	msgbox BattleFrontier_Lounge2_Text_FacilityIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A
+BattleFrontier_Lounge2_EventScript_BufferSingle:: @ 826070A
 	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
-BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F
+BattleFrontier_Lounge2_EventScript_BufferDouble:: @ 826070F
 	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
-BattleFrontier_Lounge2_EventScript_260714:: @ 8260714
+BattleFrontier_Lounge2_EventScript_BufferMulti:: @ 8260714
 	bufferstdstring 0, STDSTRING_MULTI
 	return
 
-BattleFrontier_Lounge2_EventScript_260719:: @ 8260719
+BattleFrontier_Lounge2_EventScript_BufferMultiLink:: @ 8260719
 	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
-BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E
+BattleFrontier_Lounge2_EventScript_BufferBattleDome:: @ 826071E
 	bufferstdstring 0, STDSTRING_BATTLE_DOME
 	return
 
-BattleFrontier_Lounge2_EventScript_260723:: @ 8260723
+BattleFrontier_Lounge2_EventScript_BufferBattleFactory:: @ 8260723
 	bufferstdstring 0, STDSTRING_BATTLE_FACTORY
 	return
 
-BattleFrontier_Lounge2_EventScript_260728:: @ 8260728
+BattleFrontier_Lounge2_EventScript_BufferBattlePalace:: @ 8260728
 	bufferstdstring 0, STDSTRING_BATTLE_PALACE
 	return
 
-BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D
+BattleFrontier_Lounge2_EventScript_BufferBattleArena:: @ 826072D
 	bufferstdstring 0, STDSTRING_BATTLE_ARENA
 	return
 
-BattleFrontier_Lounge2_EventScript_260732:: @ 8260732
+BattleFrontier_Lounge2_EventScript_BufferBattlePike:: @ 8260732
 	bufferstdstring 0, STDSTRING_BATTLE_PIKE
 	return
 
-BattleFrontier_Lounge2_EventScript_260737:: @ 8260737
+BattleFrontier_Lounge2_EventScript_BufferBattlePyramid:: @ 8260737
 	bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
 	return
 
-BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C
+BattleFrontier_Lounge2_EventScript_Maniac1:: @ 826073C
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261C9C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_NewsGatheringPower, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_260747:: @ 8260747
+BattleFrontier_Lounge2_EventScript_Maniac2:: @ 8260747
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261CDC, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_AmazingPowersOfObservation, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_260752:: @ 8260752
+BattleFrontier_Lounge2_EventScript_Maniac3:: @ 8260752
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261D1D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D
-	msgbox BattleFrontier_Lounge2_Text_261D5C, MSGBOX_NPC
+BattleFrontier_Lounge2_EventScript_TriathleteF:: @ 826075D
+	msgbox BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge2_Text_260766:: @ 8260766
+BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
 	.string "Howdy! When it comes to news about\n"
 	.string "the BATTLE FRONTIER, I'm no. 1.\p"
 	.string "You can think of me as\n"
@@ -126,33 +132,34 @@ BattleFrontier_Lounge2_Text_260766:: @ 8260766
 	.string "I'll happily share the hottest news\n"
 	.string "I gathered about the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_260857:: @ 8260857
+BattleFrontier_Lounge2_Text_SwingByForTheLatestWord:: @ 8260857
 	.string "Howdy! Did you swing by to grill me\n"
 	.string "about the latest word? Oh, all right!$"
 
-BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1
+@ Unused
+BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight:: @ 82608A1
 	.string "Well? Well? Well?\p"
 	.string "I'm sure my information's been\n"
 	.string "seriously useful to you, right?$"
 
-BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2
+BattleFrontier_Lounge2_Text_FacilityIsHottest:: @ 82608F2
 	.string "Let's see now…\p"
 	.string "It sounds like the {STR_VAR_1}\n"
 	.string "is the hottest place going.$"
 
-BattleFrontier_Lounge2_Text_260933:: @ 8260933
+BattleFrontier_Lounge2_Text_BattleTowerIsHottest:: @ 8260933
 	.string "Let's see now…\p"
 	.string "It sounds like BATTLE TOWER\n"
 	.string "{STR_VAR_1} is the hottest.$"
 
-BattleFrontier_Lounge2_Text_260971:: @ 8260971
+BattleFrontier_Lounge2_Text_SalonMaidenIsThere:: @ 8260971
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this mysterious TRAINER called\n"
 	.string "the SALON MAIDEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E
+BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
 	.string "Have you battled the SALON MAIDEN?\p"
 	.string "When she's measuring up her opponent,\n"
 	.string "she apparently uses these POKéMON:\p"
@@ -160,7 +167,7 @@ BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E
 	.string "a FIRE-type VOLCANO POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7
+BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
 	.string "Have you battled the SALON MAIDEN\n"
 	.string "when she's serious?\p"
 	.string "When she's battling flat out,\n"
@@ -169,14 +176,14 @@ BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7
 	.string "an ELECTRIC-type THUNDER POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4
+BattleFrontier_Lounge2_Text_DomeAceIsThere:: @ 8260BC4
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this flamboyant TRAINER called\n"
 	.string "the DOME ACE that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D
+BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
 	.string "Have you battled the DOME ACE?\p"
 	.string "When he's treating the opponent\n"
 	.string "lightly, he uses these three POKéMON:\p"
@@ -184,7 +191,7 @@ BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D
 	.string "a WATER & GROUND MUD FISH POKéMON,\l"
 	.string "and a FIRE & FLYING FLAME POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A
+BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
 	.string "Have you battled the DOME ACE\n"
 	.string "when he's serious?\p"
 	.string "When he's demonstrating his strategy,\n"
@@ -194,14 +201,14 @@ BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A
 	.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E
+BattleFrontier_Lounge2_Text_FactoryHeadIsThere:: @ 8260E1E
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this freaky TRAINER called\n"
 	.string "the FACTORY HEAD that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7
+BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "already?\p"
 	.string "Let me think… When he goes to battle,\n"
@@ -209,7 +216,7 @@ BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7
 	.string "He battles under pretty much the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_260F74:: @ 8260F74
+BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "when he's serious?\p"
 	.string "When he goes seriously to battle,\n"
@@ -217,14 +224,14 @@ BattleFrontier_Lounge2_Text_260F74:: @ 8260F74
 	.string "He battles under virtually the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_261026:: @ 8261026
+BattleFrontier_Lounge2_Text_PikeQueenIsThere:: @ 8261026
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this scary TRAINER called\n"
 	.string "the PIKE QUEEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC
+BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "before?\p"
 	.string "When she's in a good mood, they say\n"
@@ -233,7 +240,7 @@ BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC
 	.string "a BUG & ROCK MOLD POKéMON,\l"
 	.string "and a WATER-type TENDER POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261194:: @ 8261194
+BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "when she's serious?\p"
 	.string "When she's seriously annoyed, they say\n"
@@ -243,14 +250,14 @@ BattleFrontier_Lounge2_Text_261194:: @ 8261194
 	.string "and a WATER- & FLYING-type ATROCIOUS\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261282:: @ 8261282
+BattleFrontier_Lounge2_Text_ArenaTycoonIsThere:: @ 8261282
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this cute TRAINER called\n"
 	.string "the ARENA TYCOON that runs the place.$"
 
-BattleFrontier_Lounge2_Text_261329:: @ 8261329
+BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "before?\p"
 	.string "When she's assessing the foe's ability,\n"
@@ -259,7 +266,7 @@ BattleFrontier_Lounge2_Text_261329:: @ 8261329
 	.string "a DARK-type MOONLIGHT POKéMON,\l"
 	.string "and a BUG & GHOST SHED POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261403:: @ 8261403
+BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "when she's serious?\p"
 	.string "When she battles for keeps,\n"
@@ -269,14 +276,14 @@ BattleFrontier_Lounge2_Text_261403:: @ 8261403
 	.string "and a GRASS- & FIGHTING-type\l"
 	.string "MUSHROOM POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6
+BattleFrontier_Lounge2_Text_PalaceMavenIsThere:: @ 82614E6
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this sinister TRAINER called\n"
 	.string "the PALACE MAVEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_261591:: @ 8261591
+BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "before?\p"
 	.string "When he's testing the opponent's\n"
@@ -285,7 +292,7 @@ BattleFrontier_Lounge2_Text_261591:: @ 8261591
 	.string "a NORMAL-type LAZY POKéMON, and a\l"
 	.string "WATER- & ICE-type TRANSPORT POKéMON.$"
 
-BattleFrontier_Lounge2_Text_26166F:: @ 826166F
+BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "when he's serious?\p"
 	.string "When he throws his entire might into\n"
@@ -294,14 +301,14 @@ BattleFrontier_Lounge2_Text_26166F:: @ 826166F
 	.string "a NORMAL-type LAZY POKéMON,\l"
 	.string "and a WATER-type AURORA POKéMON.$"
 
-BattleFrontier_Lounge2_Text_26174D:: @ 826174D
+BattleFrontier_Lounge2_Text_PyramidKingIsThere:: @ 826174D
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this fiery-hot TRAINER called\n"
 	.string "the PYRAMID KING that runs the place.$"
 
-BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9
+BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
 	.string "Have you battled the PYRAMID KING\n"
 	.string "before?\p"
 	.string "When he's checking the foe's power,\n"
@@ -310,7 +317,7 @@ BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9
 	.string "an ICE-type ICEBERG POKéMON,\l"
 	.string "and a STEEL-type IRON POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4
+BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
 	.string "Have you battled the PYRAMID KING\n"
 	.string "when he's serious?\p"
 	.string "When he's pumped with hot power,\n"
@@ -320,7 +327,7 @@ BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4
 	.string "and a FIRE- & FLYING-type FLAME\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
 	.string "Sure, there are several places where\n"
 	.string "you can enter DOUBLE BATTLES.\p"
 	.string "But the DOUBLE BATTLE ROOMS of\n"
@@ -329,44 +336,44 @@ BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC
 	.string "how DOUBLE BATTLES are played here\l"
 	.string "in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_261A91:: @ 8261A91
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice2:: @ 8261A91
 	.string "Watch yourself in the battles here.\p"
 	.string "I hear there are TRAINERS that have\n"
 	.string "strategies they developed just for\l"
 	.string "DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice3:: @ 8261B0C
 	.string "Once you're confident and comfortable\n"
 	.string "with DOUBLE BATTLES here, you should\l"
 	.string "think about challenging other places\l"
 	.string "offering DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_261B95:: @ 8261B95
+BattleFrontier_Lounge2_Text_MultiBattleAdvice:: @ 8261B95
 	.string "All sorts of TRAINERS gather in\n"
 	.string "the BATTLE SALON.\p"
 	.string "Just think--you may run into your\n"
 	.string "friends or followers!\l"
 	.string "You should look carefully!$"
 
-BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A
+BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice:: @ 8261C1A
 	.string "If you're with a friend, head for the\n"
 	.string "LINK MULTI BATTLE ROOM.\p"
 	.string "If you play with a strong friend,\n"
 	.string "you can expect to see tough foes!$"
 
-BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C
+BattleFrontier_Lounge2_Text_NewsGatheringPower:: @ 8261C9C
 	.string "What amazing news-gathering power!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC
+BattleFrontier_Lounge2_Text_AmazingPowersOfObservation:: @ 8261CDC
 	.string "What amazing powers of observation!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D
+BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion:: @ 8261D1D
 	.string "What amazing power of persuasion!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C
+BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe:: @ 8261D5C
 	.string "…What is this place?\n"
 	.string "It's scaring me…$"
 
diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json
index 5ff702a86..843fc6e10 100644
--- a/data/maps/BattleFrontier_Lounge3/map.json
+++ b/data/maps/BattleFrontier_Lounge3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261D83",
+      "script": "BattleFrontier_Lounge3_EventScript_Gambler",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FE1",
+      "script": "BattleFrontier_Lounge3_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FC1",
+      "script": "BattleFrontier_Lounge3_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FD1",
+      "script": "BattleFrontier_Lounge3_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FB8",
+      "script": "BattleFrontier_Lounge3_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 3be247099..e892ad3ea 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -1,81 +1,85 @@
 BattleFrontier_Lounge3_MapScripts:: @ 8261D82
 	.byte 0
 
-BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
+	.set BET_AMOUNT_5,  5
+	.set BET_AMOUNT_10, 10
+	.set BET_AMOUNT_15, 15
+
+BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_BATTLE_FRONTIER_BETTOR, BattleFrontier_Lounge3_EventScript_261EF9
-	call BattleFrontier_Lounge3_EventScript_261EA0
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler
+	call BattleFrontier_Lounge3_EventScript_CountSilverSymbols
 	compare VAR_0x8004, 2
-	goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
-	setflag FLAG_MET_BATTLE_FRONTIER_BETTOR
-	msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261DAF
+	goto_if_le BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols
+	setflag FLAG_MET_BATTLE_FRONTIER_GAMBLER
+	msgbox BattleFrontier_Lounge3_Text_YouLookToughExplainGambling, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
+BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
 	special ShowFrontierGamblerLookingMessage
 	waitmessage
 	waitbuttonpress
-	msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
-	msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
-	message BattleFrontier_Lounge3_Text_262B42
+	msgbox BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
+	msgbox BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
+	message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
 	waitmessage
 	special ShowBattlePointsWindow
-	goto BattleFrontier_Lounge3_EventScript_261DE9
+	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
+BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
 	multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, 0
 	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
-	case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_261E30
-	case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_261E3B
-	case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_261E46
-	case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_261FAF
-	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_261FAF
+	case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_Bet5
+	case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_Bet10
+	case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_Bet15
+	case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_CancelBet
+	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_CancelBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30
-	setvar VAR_0x8008, 5
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet5:: @ 8261E30
+	setvar VAR_0x8008, BET_AMOUNT_5
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E3B:: @ 8261E3B
-	setvar VAR_0x8008, 10
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet10:: @ 8261E3B
+	setvar VAR_0x8008, BET_AMOUNT_10
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
-	setvar VAR_0x8008, 15
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet15:: @ 8261E46
+	setvar VAR_0x8008, BET_AMOUNT_15
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
+BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
-	msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
-	message BattleFrontier_Lounge3_Text_262B42
+	goto_if_ge BattleFrontier_Lounge3_EventScript_PlaceBet
+	msgbox BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints, MSGBOX_DEFAULT
+	message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
 	waitmessage
-	goto BattleFrontier_Lounge3_EventScript_261DE9
+	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
+BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	special UpdateBattlePointsWindow
 	playse SE_REGI
-	msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261E96
+	msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FinishBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
+BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
@@ -83,132 +87,132 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0
+BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
+	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	return
 
-BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5
+BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount:: @ 8261EE5
 	addvar VAR_0x8004, 1
 	return
 
-BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
-	msgbox BattleFrontier_Lounge3_Text_261FFE, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols:: @ 8261EEB
+	msgbox BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
-	msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_AlreadyMetGambler:: @ 8261EF9
+	msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
-	goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
-	goto BattleFrontier_Lounge3_EventScript_261DAF
+	goto_if_ge BattleFrontier_Lounge3_EventScript_CheckBetResults
+	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
+BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
+	goto_if_eq BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
-	goto BattleFrontier_Lounge3_EventScript_261F71
+	goto_if_eq BattleFrontier_Lounge3_EventScript_WonChallenge
+	goto BattleFrontier_Lounge3_EventScript_LostChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
-	msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
+	msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F80
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet5
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet10
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F94
-	msgbox BattleFrontier_Lounge3_Text_2633D4, 9
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet15
+	msgbox BattleFrontier_Lounge3_Text_ObtainedBattlePoints, MSGBOX_GETPOINTS
 	special GiveFrontierBattlePoints
-	msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
-	msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_LostChallenge:: @ 8261F71
+	msgbox BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261F80:: @ 8261F80
-	buffernumberstring 0, 10
-	setvar VAR_0x8004, 10
+BattleFrontier_Lounge3_EventScript_RewardBet5:: @ 8261F80
+	buffernumberstring 0, (BET_AMOUNT_5 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_5 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F8A:: @ 8261F8A
-	buffernumberstring 0, 20
-	setvar VAR_0x8004, 20
+BattleFrontier_Lounge3_EventScript_RewardBet10:: @ 8261F8A
+	buffernumberstring 0, (BET_AMOUNT_10 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_10 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94
-	buffernumberstring 0, 30
-	setvar VAR_0x8004, 30
+BattleFrontier_Lounge3_EventScript_RewardBet15:: @ 8261F94
+	buffernumberstring 0, (BET_AMOUNT_15 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_15 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E
+BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted:: @ 8261F9E
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5
-	msgbox BattleFrontier_Lounge3_Text_26342D, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_DeclineChallenge:: @ 8261FA5
+	msgbox BattleFrontier_Lounge3_Text_NotInterested, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF
+BattleFrontier_Lounge3_EventScript_CancelBet:: @ 8261FAF
 	special CloseBattlePointsWindow
-	goto BattleFrontier_Lounge3_EventScript_261FA5
+	goto BattleFrontier_Lounge3_EventScript_DeclineChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8
-	msgbox BattleFrontier_Lounge3_Text_263545, MSGBOX_NPC
+BattleFrontier_Lounge3_EventScript_Man:: @ 8261FB8
+	msgbox BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1
+BattleFrontier_Lounge3_EventScript_Woman:: @ 8261FC1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_26346F, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_BackedWrongTrainer, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1
+BattleFrontier_Lounge3_EventScript_PokefanF:: @ 8261FD1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_26351D, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1
+BattleFrontier_Lounge3_EventScript_FatMan:: @ 8261FE1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_2634C9, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_TrainerGoodButRattled, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
+BattleFrontier_Lounge3_EventScript_FaceOriginalDirection:: @ 8261FF1
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE
+BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere:: @ 8261FFE
 	.string "…What's that you want?\p"
 	.string "Can't you see we're kind of busy here?\n"
 	.string "Can't your business wait till later?$"
 
-BattleFrontier_Lounge3_Text_262061:: @ 8262061
+BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
 	.string "…Huh?\n"
 	.string "You look to me like a tough TRAINER.\p"
 	.string "Heheh…\n"
@@ -228,201 +232,201 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061
 	.string "Sounds simple, huh?\n"
 	.string "So, anyway…$"
 
-BattleFrontier_Lounge3_Text_262261:: @ 8262261
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle:: @ 8262261
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's SINGLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26230D:: @ 826230D
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble:: @ 826230D
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's DOUBLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti:: @ 82623B9
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's MULTI BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262464:: @ 8262464
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle:: @ 8262464
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's SINGLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26250E:: @ 826250E
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble:: @ 826250E
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's DOUBLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8
+BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle:: @ 82625B8
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Single Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26266A:: @ 826266A
+BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble:: @ 826266A
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Double Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26271C:: @ 826271C
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle:: @ 826271C
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's SINGLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble:: @ 82627C9
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's DOUBLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262876:: @ 8262876
+BattleFrontier_Lounge3_Text_ChallengeBattleArena:: @ 8262876
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "ARENA's Set KO Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26291A:: @ 826291A
+BattleFrontier_Lounge3_Text_ChallengeBattlePike:: @ 826291A
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE PIKE's\l"
 	.string "Battle Choice.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC
+BattleFrontier_Lounge3_Text_ChallengeBattlePyramid:: @ 82629BC
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "PYRAMID's Battle Quest.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262A60:: @ 8262A60
+BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe:: @ 8262A60
 	.string "I'll see to it that you benefit, too.\n"
 	.string "So how about it?\l"
 	.string "How about entering that event for me?$"
 
-BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD
+BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints:: @ 8262ABD
 	.string "All right, that's perfect.\n"
 	.string "So, uh… How about spotting me some\l"
 	.string "of your Battle Points?\p"
 	.string "Trust me, I'll show you my gratitude\n"
 	.string "afterward.$"
 
-BattleFrontier_Lounge3_Text_262B42:: @ 8262B42
+BattleFrontier_Lounge3_Text_HowMuchCanYouSpot:: @ 8262B42
 	.string "Great, great!\n"
 	.string "So, how much can you spot me?$"
 
-BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E
+BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints:: @ 8262B6E
 	.string "Oh, no, no, no!\n"
 	.string "You don't have enough Battle Points!\p"
 	.string "I wish you wouldn't monkey around and\n"
 	.string "waste everyone's time!$"
 
-BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0
+BattleFrontier_Lounge3_Text_ThanksOffYouGo:: @ 8262BE0
 	.string "Heheh! Thanks much!\n"
 	.string "So, off you go!$"
 
-BattleFrontier_Lounge3_Text_262C04:: @ 8262C04
+BattleFrontier_Lounge3_Text_GetToBattleTowerSingle:: @ 8262C04
 	.string "Get to the BATTLE TOWER's\n"
 	.string "SINGLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262C90:: @ 8262C90
+BattleFrontier_Lounge3_Text_GetToBattleTowerDouble:: @ 8262C90
 	.string "Get to the BATTLE TOWER's\n"
 	.string "DOUBLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C
+BattleFrontier_Lounge3_Text_GetToBattleTowerMulti:: @ 8262D1C
 	.string "Get to the BATTLE TOWER's\n"
 	.string "MULTI BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7
+BattleFrontier_Lounge3_Text_GetToBattleDomeSingle:: @ 8262DA7
 	.string "Get to the BATTLE DOME's\n"
 	.string "SINGLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262E34:: @ 8262E34
+BattleFrontier_Lounge3_Text_GetToBattleDomeDouble:: @ 8262E34
 	.string "Get to the BATTLE DOME's\n"
 	.string "DOUBLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1
+BattleFrontier_Lounge3_Text_GetToBattleFactorySingle:: @ 8262EC1
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Single Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262F56:: @ 8262F56
+BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble:: @ 8262F56
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Double Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB
+BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle:: @ 8262FEB
 	.string "Get to the BATTLE PALACE's\n"
 	.string "SINGLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263078:: @ 8263078
+BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble:: @ 8263078
 	.string "Get to the BATTLE PALACE's\n"
 	.string "DOUBLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263105:: @ 8263105
+BattleFrontier_Lounge3_Text_GetToBattleArena:: @ 8263105
 	.string "Get to the BATTLE ARENA's\n"
 	.string "Set KO Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_26318C:: @ 826318C
+BattleFrontier_Lounge3_Text_GetToBattlePike:: @ 826318C
 	.string "Get to the BATTLE PIKE's\n"
 	.string "Battle Choice pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263211:: @ 8263211
+BattleFrontier_Lounge3_Text_GetToBattlePyramid:: @ 8263211
 	.string "Get to the BATTLE PYRAMID's\n"
 	.string "Battle Quest pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263298:: @ 8263298
+BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
 	.string "Oh, it's you…\n"
 	.string "Nice try…\p"
 	.string "I hate to break it to you, but I can't\n"
@@ -430,7 +434,7 @@ BattleFrontier_Lounge3_Text_263298:: @ 8263298
 	.string "I guess we'll have to let it motivate\n"
 	.string "us to try harder next time!$"
 
-BattleFrontier_Lounge3_Text_263334:: @ 8263334
+BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
 	.string "Oh, yes!\n"
 	.string "Hello there, champ!\p"
 	.string "I knew you could!\n"
@@ -439,36 +443,36 @@ BattleFrontier_Lounge3_Text_263334:: @ 8263334
 	.string "I'll return your Battle Points and,\n"
 	.string "of course, a little extra from me!$"
 
-BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4
+BattleFrontier_Lounge3_Text_ObtainedBattlePoints:: @ 82633D4
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Points.$"
 
-BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2
+BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge:: @ 82633F2
 	.string "If you're up for another challenge,\n"
 	.string "please do think of me!$"
 
-BattleFrontier_Lounge3_Text_26342D:: @ 826342D
+BattleFrontier_Lounge3_Text_NotInterested:: @ 826342D
 	.string "Not interested?! You shouldn't be\n"
 	.string "so afraid to take a chance!$"
 
-BattleFrontier_Lounge3_Text_26346B:: @ 826346B
+BattleFrontier_Lounge3_Text_Oh:: @ 826346B
 	.string "Oh…$"
 
-BattleFrontier_Lounge3_Text_26346F:: @ 826346F
+BattleFrontier_Lounge3_Text_BackedWrongTrainer:: @ 826346F
 	.string "I backed the wrong TRAINER again!\p"
 	.string "Maybe I should be battling normally\n"
 	.string "like everyone else…$"
 
-BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9
+BattleFrontier_Lounge3_Text_TrainerGoodButRattled:: @ 82634C9
 	.string "That TRAINER…\p"
 	.string "He's good, but he gets rattled too\n"
 	.string "easily to survive the BATTLE DOME…$"
 
-BattleFrontier_Lounge3_Text_26351D:: @ 826351D
+BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne:: @ 826351D
 	.string "Giggle!\n"
 	.string "I know a winner when I see one!$"
 
-BattleFrontier_Lounge3_Text_263545:: @ 8263545
+BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges:: @ 8263545
 	.string "Those TRAINERS…\n"
 	.string "What are they doing?\l"
 	.string "They should be taking challenges.$"
diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json
index b67d3bb07..0c86ccf3c 100644
--- a/data/maps/BattleFrontier_Lounge4/map.json
+++ b/data/maps/BattleFrontier_Lounge4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_26358D",
+      "script": "BattleFrontier_Lounge4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_263596",
+      "script": "BattleFrontier_Lounge4_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_26359F",
+      "script": "BattleFrontier_Lounge4_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc
index 407720915..6da60d30f 100644
--- a/data/maps/BattleFrontier_Lounge4/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
@@ -1,27 +1,27 @@
 BattleFrontier_Lounge4_MapScripts:: @ 826358C
 	.byte 0
 
-BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D
-	msgbox BattleFrontier_Lounge4_Text_2635A8, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Woman:: @ 826358D
+	msgbox BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_263596:: @ 8263596
-	msgbox BattleFrontier_Lounge4_Text_2635EC, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Cook:: @ 8263596
+	msgbox BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F
-	msgbox BattleFrontier_Lounge4_Text_263625, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Man:: @ 826359F
+	msgbox BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_Text_2635A8: @ 82635A8
+BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring: @ 82635A8
 	.string "I wonder if they'll be airing interviews\n"
 	.string "with tough TRAINERS today?$"
 
-BattleFrontier_Lounge4_Text_2635EC: @ 82635EC
+BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere: @ 82635EC
 	.string "If I opened a restaurant here,\n"
 	.string "it'd make money for sure.$"
 
-BattleFrontier_Lounge4_Text_263625: @ 8263625
+BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles: @ 8263625
 	.string "Whew…\p"
 	.string "I need to take a breather after\n"
 	.string "some intense battles…\p"
diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json
index 3847e6691..6d9eab35f 100644
--- a/data/maps/BattleFrontier_Lounge5/map.json
+++ b/data/maps/BattleFrontier_Lounge5/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264617",
+      "script": "BattleFrontier_Lounge5_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264620",
+      "script": "BattleFrontier_Lounge5_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264629",
+      "script": "BattleFrontier_Lounge5_EventScript_LittleBoy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc
index 020c8fdfb..3df294fb1 100644
--- a/data/maps/BattleFrontier_Lounge5/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
@@ -5,9 +5,9 @@ BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
-	special sub_81B94B0
+	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
@@ -32,16 +32,16 @@ BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_264617:: @ 8264617
-	msgbox BattleFrontier_Lounge5_Text_264F22, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_Gentleman:: @ 8264617
+	msgbox BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_264620:: @ 8264620
-	msgbox BattleFrontier_Lounge5_Text_264F64, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_BlackBelt:: @ 8264620
+	msgbox BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_264629:: @ 8264629
-	msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_LittleBoy:: @ 8264629
+	msgbox BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot, MSGBOX_NPC
 	end
 
 BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
@@ -190,16 +190,16 @@ BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
 	.string "That's silly! An EGG is asleep!\n"
 	.string "I can't talk to it!$"
 
-BattleFrontier_Lounge5_Text_264F22:: @ 8264F22
+BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon:: @ 8264F22
 	.string "How charming!\n"
 	.string "That little lady claims she can\l"
 	.string "understand POKéMON!$"
 
-BattleFrontier_Lounge5_Text_264F64:: @ 8264F64
+BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound:: @ 8264F64
 	.string "I have this feeling that the little girl\n"
 	.string "is saying something profound.$"
 
-BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB
+BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot:: @ 8264FAB
 	.string "I know something!\p"
 	.string "That little girl plays at the red house\n"
 	.string "a lot!$"
diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json
index 1ecbec9f8..5888ea7c0 100644
--- a/data/maps/BattleFrontier_Lounge6/map.json
+++ b/data/maps/BattleFrontier_Lounge6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge6_EventScript_264FED",
+      "script": "BattleFrontier_Lounge6_EventScript_Trader",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index 8f695aee3..34ca00073 100644
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -1,54 +1,54 @@
 BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
 	.byte 0
 
-BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
+BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
 	lock
 	faceplayer
-	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
+	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_TradeCompleted
 	setvar VAR_0x8008, INGAME_TRADE_MEOWTH
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
-	special sub_81B94B0
+	msgbox BattleFrontier_Lounge6_Text_WouldYouLikeToTrade, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, 255
-	goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
+	goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne BattleFrontier_Lounge6_EventScript_265075
+	goto_if_ne BattleFrontier_Lounge6_EventScript_NotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
-	msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt, MSGBOX_DEFAULT
 	setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B
-	msgbox BattleFrontier_Lounge6_Text_2651CB, MSGBOX_DEFAULT
+BattleFrontier_Lounge6_EventScript_DeclineTrade:: @ 826506B
+	msgbox BattleFrontier_Lounge6_Text_WellThatsFineToo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_265075:: @ 8265075
+BattleFrontier_Lounge6_EventScript_NotRequestedMon:: @ 8265075
 	bufferspeciesname 0, VAR_0x8009
-	msgbox BattleFrontier_Lounge6_Text_26518D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_265083:: @ 8265083
-	msgbox BattleFrontier_Lounge6_Text_26520E, MSGBOX_DEFAULT
+BattleFrontier_Lounge6_EventScript_TradeCompleted:: @ 8265083
+	msgbox BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_Text_26508D: @ 826508D
+BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
 	.string "My POKéMON is a {STR_VAR_2}.\n"
 	.string "Do you know it?\l"
 	.string "It's quite cute and rather nice.\p"
@@ -57,24 +57,24 @@ BattleFrontier_Lounge6_Text_26508D: @ 826508D
 	.string "Would you like to trade me a {STR_VAR_1}\n"
 	.string "for my {STR_VAR_2}?$"
 
-BattleFrontier_Lounge6_Text_265128: @ 8265128
+BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt: @ 8265128
 	.string "Oh, it's adorable!\n"
 	.string "Thank you!\l"
 	.string "I promise I'll be good to it!\p"
 	.string "Oh! I hope you'll be good to\n"
 	.string "my {STR_VAR_2}, too!$"
 
-BattleFrontier_Lounge6_Text_26518D: @ 826518D
+BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon: @ 826518D
 	.string "Oh, I'm sorry!\n"
 	.string "I don't intend to trade for anything\l"
 	.string "but a {STR_VAR_1}.$"
 
-BattleFrontier_Lounge6_Text_2651CB: @ 82651CB
+BattleFrontier_Lounge6_Text_WellThatsFineToo: @ 82651CB
 	.string "Oh, you won't?\n"
 	.string "Well, that's fine, too.\l"
 	.string "Please come visit us again.$"
 
-BattleFrontier_Lounge6_Text_26520E: @ 826520E
+BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined: @ 826520E
 	.string "Giggle!\n"
 	.string "A SKITTY is so much cuter than I had\l"
 	.string "imagined. I'm delighted!$"
diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json
index da866ea72..5ebc789ba 100644
--- a/data/maps/BattleFrontier_Lounge7/map.json
+++ b/data/maps/BattleFrontier_Lounge7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_2656DB",
+      "script": "BattleFrontier_Lounge7_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_265255",
+      "script": "BattleFrontier_Lounge7_EventScript_LeftMoveTutor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_265445",
+      "script": "BattleFrontier_Lounge7_EventScript_RightMoveTutor",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_2656E4",
+      "script": "BattleFrontier_Lounge7_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 854a1d360..97e41cd96 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -1,23 +1,23 @@
 BattleFrontier_Lounge7_MapScripts:: @ 8265254
 	.byte 0
 
-BattleFrontier_Lounge7_EventScript_265255:: @ 8265255
+BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
 	lock
 	faceplayer
-	setvar VAR_TEMP_C, 9
-	goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265276
-	msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT
+	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_1
+	goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor
+	msgbox BattleFrontier_Lounge7_Text_LeftTutorIntro, MSGBOX_DEFAULT
 	setflag FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR
-	goto BattleFrontier_Lounge7_EventScript_265284
+	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265276:: @ 8265276
-	msgbox BattleFrontier_Lounge7_Text_2658AB, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_265284
+BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor:: @ 8265276
+	msgbox BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
-	message BattleFrontier_Lounge7_Text_2658EF
+BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 0
@@ -27,22 +27,22 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2653D7
-	case 1, BattleFrontier_Lounge7_EventScript_2653E2
-	case 2, BattleFrontier_Lounge7_EventScript_2653ED
-	case 3, BattleFrontier_Lounge7_EventScript_2653F8
-	case 4, BattleFrontier_Lounge7_EventScript_265403
-	case 5, BattleFrontier_Lounge7_EventScript_26540E
-	case 6, BattleFrontier_Lounge7_EventScript_265419
-	case 7, BattleFrontier_Lounge7_EventScript_265424
-	case 8, BattleFrontier_Lounge7_EventScript_26542F
-	case 9, BattleFrontier_Lounge7_EventScript_26543A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
-	message BattleFrontier_Lounge7_Text_2658EF
+	case 0, BattleFrontier_Lounge7_EventScript_Softboiled
+	case 1, BattleFrontier_Lounge7_EventScript_SeismicToss
+	case 2, BattleFrontier_Lounge7_EventScript_DreamEater
+	case 3, BattleFrontier_Lounge7_EventScript_MegaPunch
+	case 4, BattleFrontier_Lounge7_EventScript_MegaKick
+	case 5, BattleFrontier_Lounge7_EventScript_BodySlam
+	case 6, BattleFrontier_Lounge7_EventScript_RockSlide
+	case 7, BattleFrontier_Lounge7_EventScript_Counter
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderWave
+	case 9, BattleFrontier_Lounge7_EventScript_SwordsDance
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 0
 	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
@@ -51,87 +51,87 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2653D7
-	case 1, BattleFrontier_Lounge7_EventScript_2653E2
-	case 2, BattleFrontier_Lounge7_EventScript_2653ED
-	case 3, BattleFrontier_Lounge7_EventScript_2653F8
-	case 4, BattleFrontier_Lounge7_EventScript_265403
-	case 5, BattleFrontier_Lounge7_EventScript_26540E
-	case 6, BattleFrontier_Lounge7_EventScript_265419
-	case 7, BattleFrontier_Lounge7_EventScript_265424
-	case 8, BattleFrontier_Lounge7_EventScript_26542F
-	case 9, BattleFrontier_Lounge7_EventScript_26543A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7
+	case 0, BattleFrontier_Lounge7_EventScript_Softboiled
+	case 1, BattleFrontier_Lounge7_EventScript_SeismicToss
+	case 2, BattleFrontier_Lounge7_EventScript_DreamEater
+	case 3, BattleFrontier_Lounge7_EventScript_MegaPunch
+	case 4, BattleFrontier_Lounge7_EventScript_MegaKick
+	case 5, BattleFrontier_Lounge7_EventScript_BodySlam
+	case 6, BattleFrontier_Lounge7_EventScript_RockSlide
+	case 7, BattleFrontier_Lounge7_EventScript_Counter
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderWave
+	case 9, BattleFrontier_Lounge7_EventScript_SwordsDance
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_Softboiled:: @ 82653D7
 	setvar VAR_0x8008, 16
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653E2:: @ 82653E2
+BattleFrontier_Lounge7_EventScript_SeismicToss:: @ 82653E2
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653ED:: @ 82653ED
+BattleFrontier_Lounge7_EventScript_DreamEater:: @ 82653ED
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653F8:: @ 82653F8
+BattleFrontier_Lounge7_EventScript_MegaPunch:: @ 82653F8
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265403:: @ 8265403
+BattleFrontier_Lounge7_EventScript_MegaKick:: @ 8265403
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26540E:: @ 826540E
+BattleFrontier_Lounge7_EventScript_BodySlam:: @ 826540E
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265419:: @ 8265419
+BattleFrontier_Lounge7_EventScript_RockSlide:: @ 8265419
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265424:: @ 8265424
+BattleFrontier_Lounge7_EventScript_Counter:: @ 8265424
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26542F:: @ 826542F
+BattleFrontier_Lounge7_EventScript_ThunderWave:: @ 826542F
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26543A:: @ 826543A
+BattleFrontier_Lounge7_EventScript_SwordsDance:: @ 826543A
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265445:: @ 8265445
+BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
 	lock
 	faceplayer
-	setvar VAR_TEMP_C, 10
-	goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265466
-	msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT
+	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_2
+	goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor
+	msgbox BattleFrontier_Lounge7_Text_RightTutorIntro, MSGBOX_DEFAULT
 	setflag FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR
-	goto BattleFrontier_Lounge7_EventScript_265474
+	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265466:: @ 8265466
-	msgbox BattleFrontier_Lounge7_Text_265C2C, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_265474
+BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor:: @ 8265466
+	msgbox BattleFrontier_Lounge7_Text_RightTutorWelcomeBack, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
-	message BattleFrontier_Lounge7_Text_2658EF
+BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 1
@@ -141,22 +141,22 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2655C7
-	case 1, BattleFrontier_Lounge7_EventScript_2655D2
-	case 2, BattleFrontier_Lounge7_EventScript_2655DD
-	case 3, BattleFrontier_Lounge7_EventScript_2655E8
-	case 4, BattleFrontier_Lounge7_EventScript_2655F3
-	case 5, BattleFrontier_Lounge7_EventScript_2655FE
-	case 6, BattleFrontier_Lounge7_EventScript_265609
-	case 7, BattleFrontier_Lounge7_EventScript_265614
-	case 8, BattleFrontier_Lounge7_EventScript_26561F
-	case 9, BattleFrontier_Lounge7_EventScript_26562A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
-	message BattleFrontier_Lounge7_Text_2658EF
+	case 0, BattleFrontier_Lounge7_EventScript_DefenseCurl
+	case 1, BattleFrontier_Lounge7_EventScript_Snore
+	case 2, BattleFrontier_Lounge7_EventScript_MudSlap
+	case 3, BattleFrontier_Lounge7_EventScript_Swift
+	case 4, BattleFrontier_Lounge7_EventScript_IcyWind
+	case 5, BattleFrontier_Lounge7_EventScript_Endure
+	case 6, BattleFrontier_Lounge7_EventScript_PsychUp
+	case 7, BattleFrontier_Lounge7_EventScript_IcePunch
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderPunch
+	case 9, BattleFrontier_Lounge7_EventScript_FirePunch
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 1
 	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
@@ -165,131 +165,133 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2655C7
-	case 1, BattleFrontier_Lounge7_EventScript_2655D2
-	case 2, BattleFrontier_Lounge7_EventScript_2655DD
-	case 3, BattleFrontier_Lounge7_EventScript_2655E8
-	case 4, BattleFrontier_Lounge7_EventScript_2655F3
-	case 5, BattleFrontier_Lounge7_EventScript_2655FE
-	case 6, BattleFrontier_Lounge7_EventScript_265609
-	case 7, BattleFrontier_Lounge7_EventScript_265614
-	case 8, BattleFrontier_Lounge7_EventScript_26561F
-	case 9, BattleFrontier_Lounge7_EventScript_26562A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7
+	case 0, BattleFrontier_Lounge7_EventScript_DefenseCurl
+	case 1, BattleFrontier_Lounge7_EventScript_Snore
+	case 2, BattleFrontier_Lounge7_EventScript_MudSlap
+	case 3, BattleFrontier_Lounge7_EventScript_Swift
+	case 4, BattleFrontier_Lounge7_EventScript_IcyWind
+	case 5, BattleFrontier_Lounge7_EventScript_Endure
+	case 6, BattleFrontier_Lounge7_EventScript_PsychUp
+	case 7, BattleFrontier_Lounge7_EventScript_IcePunch
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderPunch
+	case 9, BattleFrontier_Lounge7_EventScript_FirePunch
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_DefenseCurl:: @ 82655C7
 	setvar VAR_0x8008, 16
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655D2:: @ 82655D2
+BattleFrontier_Lounge7_EventScript_Snore:: @ 82655D2
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655DD:: @ 82655DD
+BattleFrontier_Lounge7_EventScript_MudSlap:: @ 82655DD
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655E8:: @ 82655E8
+BattleFrontier_Lounge7_EventScript_Swift:: @ 82655E8
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655F3:: @ 82655F3
+BattleFrontier_Lounge7_EventScript_IcyWind:: @ 82655F3
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655FE:: @ 82655FE
+BattleFrontier_Lounge7_EventScript_Endure:: @ 82655FE
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265609:: @ 8265609
+BattleFrontier_Lounge7_EventScript_PsychUp:: @ 8265609
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265614:: @ 8265614
+BattleFrontier_Lounge7_EventScript_IcePunch:: @ 8265614
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26561F:: @ 826561F
+BattleFrontier_Lounge7_EventScript_ThunderPunch:: @ 826561F
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A
+BattleFrontier_Lounge7_EventScript_FirePunch:: @ 826562A
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265635:: @ 8265635
+BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect:: @ 8265635
 	special CloseBattleFrontierTutorWindow
 	special CloseBattlePointsWindow
-	msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_265645:: @ 8265645
-	msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
+BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
+	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-@ VAR_0x8004 here is used to determine which move name to buffer
-@ VAR_0x8005 here is used to determine which move tutor was spoken to
-BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
+@ VAR_0x8008 is the price
+@ VAR_TEMP_C is the scroll multichoice ID
+@ VAR_TEMP_D is the move selection
+@ VAR_TEMP_E is which move tutor was spoken to
+BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
 	copyvar VAR_0x8004, VAR_TEMP_D
 	copyvar VAR_0x8005, VAR_TEMP_E
 	special BufferBattleFrontierTutorMoveName
 	buffernumberstring 1, VAR_0x8008
 	copyvar VAR_0x8004, VAR_TEMP_C
-	msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
+	msgbox BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_Lounge7_EventScript_265696
-	msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_2656CA
+	goto_if_ge BattleFrontier_Lounge7_EventScript_TeachTutorMove
+	msgbox BattleFrontier_Lounge7_Text_HaventGotEnoughPoints, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
-	msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT
+BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
+	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
 	special GetBattleFrontierTutorMoveIndex
 	fadescreen 1
 	special CloseBattlePointsWindow
 	special CloseBattleFrontierTutorWindow
-	special OpenPartyMenuForMoveTutor
+	special ChooseMonForMoveTutor
 	waitstate
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge7_EventScript_265645
-	msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_Lounge7_EventScript_CancelChooseMon
+	msgbox BattleFrontier_Lounge7_Text_IllTakeBattlePoints, MSGBOX_DEFAULT
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA
+BattleFrontier_Lounge7_EventScript_ChooseNewMove:: @ 82656CA
 	compare VAR_TEMP_E, 0
-	goto_if_eq BattleFrontier_Lounge7_EventScript_26532F
-	goto BattleFrontier_Lounge7_EventScript_26551F
+	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
+	goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB
-	msgbox BattleFrontier_Lounge7_Text_265C6F, MSGBOX_NPC
+BattleFrontier_Lounge7_EventScript_Sailor:: @ 82656DB
+	msgbox BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4
-	msgbox BattleFrontier_Lounge7_Text_265D17, MSGBOX_NPC
+BattleFrontier_Lounge7_EventScript_Gentleman:: @ 82656E4
+	msgbox BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_Text_2656ED: @ 82656ED
+BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
 	.string "Buhahaha!\p"
 	.string "You couldn't tell it from looking now,\n"
 	.string "but I used to be one tough TRAINER.\p"
@@ -307,38 +309,38 @@ BattleFrontier_Lounge7_Text_2656ED: @ 82656ED
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_2658AB: @ 82658AB
+BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack: @ 82658AB
 	.string "Buhahaha!\p"
 	.string "Are you back to learn special and\n"
 	.string "yet cute POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_2658EF: @ 82658EF
+BattleFrontier_Lounge7_Text_TeachWhichMove: @ 82658EF
 	.string "Fine, fine, look here!\n"
 	.string "Which move should I teach?$"
 
-BattleFrontier_Lounge7_Text_265921: @ 8265921
+BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints: @ 8265921
 	.string "The move {STR_VAR_1}, is it?\n"
 	.string "That will be {STR_VAR_2} Battle Points, okay?$"
 
-BattleFrontier_Lounge7_Text_26595A: @ 826595A
+BattleFrontier_Lounge7_Text_TeachMoveToWhichMon: @ 826595A
 	.string "Fine, fine, now pick the POKéMON\n"
 	.string "I should teach the move to.$"
 
-BattleFrontier_Lounge7_Text_265997: @ 8265997
+BattleFrontier_Lounge7_Text_HaventGotEnoughPoints: @ 8265997
 	.string "What the…\n"
 	.string "You haven't got enough Battle Points!$"
 
-BattleFrontier_Lounge7_Text_2659C7: @ 82659C7
+BattleFrontier_Lounge7_Text_IllTakeBattlePoints: @ 82659C7
 	.string "Do you see how skilled I am now?\n"
 	.string "I'll take your Battle Points, thanks!$"
 
-BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E
+BattleFrontier_Lounge7_Text_YouDontWantTo: @ 8265A0E
 	.string "What's that?\n"
 	.string "You don't want to…\p"
 	.string "If you want to see how skilled I am,\n"
 	.string "you come see me anytime!$"
 
-BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C
+BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
 	.string "Ihihihi!\p"
 	.string "I know it's hard to see now, but I used\n"
 	.string "to be one fantastic TRAINER.\p"
@@ -356,19 +358,19 @@ BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C
+BattleFrontier_Lounge7_Text_RightTutorWelcomeBack: @ 8265C2C
 	.string "Ihihihi!\p"
 	.string "Have you come to learn hard and\n"
 	.string "yet pretty POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F
+BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong: @ 8265C6F
 	.string "Those ladies, the way they bad-mouth\n"
 	.string "each other, you probably think that\l"
 	.string "they don't get along.\p"
 	.string "But if that were true, they wouldn't\n"
 	.string "stay out here together, would they?$"
 
-BattleFrontier_Lounge7_Text_265D17: @ 8265D17
+BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
 	.string "When I was just a wee YOUNGSTER,\n"
 	.string "those ladies were strong and beautiful.\p"
 	.string "They were idols among us TRAINERS.\p"
@@ -380,102 +382,102 @@ BattleFrontier_Lounge7_Text_265D17: @ 8265D17
 	.string "but feel this…\p"
 	.string "Time is so cruel…$"
 
-BattleFrontier_Lounge7_Text_265E30:: @ 8265E30
+BattleFrontier_Lounge7_Text_SoftboiledDesc:: @ 8265E30
 	.string "Recovers up to\n"
 	.string "half the user's\n"
 	.string "maximum HP.$"
 
-BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B
+BattleFrontier_Lounge7_Text_SeismicTossDesc:: @ 8265E5B
 	.string "Inflicts damage\n"
 	.string "identical to the\n"
 	.string "user's level.$"
 
-BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A
+BattleFrontier_Lounge7_Text_DreamEaterDesc:: @ 8265E8A
 	.string "Recovers half the\n"
 	.string "damage inflicted\n"
 	.string "on a sleeping foe.$"
 
-BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0
+BattleFrontier_Lounge7_Text_MegaPunchDesc:: @ 8265EC0
 	.string "A strong punch\n"
 	.string "thrown with\n"
 	.string "incredible power.$"
 
-BattleFrontier_Lounge7_Text_265EED:: @ 8265EED
+BattleFrontier_Lounge7_Text_MegaKickDesc:: @ 8265EED
 	.string "An extremely\n"
 	.string "powerful kick with\n"
 	.string "intense force.$"
 
-BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C
+BattleFrontier_Lounge7_Text_BodySlamDesc:: @ 8265F1C
 	.string "A full-body slam\n"
 	.string "that may cause\n"
 	.string "paralysis.$"
 
-BattleFrontier_Lounge7_Text_265F47:: @ 8265F47
+BattleFrontier_Lounge7_Text_RockSlideDesc:: @ 8265F47
 	.string "Large boulders\n"
 	.string "are hurled. May\n"
 	.string "cause flinching.$"
 
-BattleFrontier_Lounge7_Text_265F77:: @ 8265F77
+BattleFrontier_Lounge7_Text_CounterDesc:: @ 8265F77
 	.string "Retaliates any\n"
 	.string "physical hit with\n"
 	.string "double the power.$"
 
-BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA
+BattleFrontier_Lounge7_Text_ThunderWaveDesc:: @ 8265FAA
 	.string "A weak jolt of\n"
 	.string "electricity that\n"
 	.string "paralyzes the foe.$"
 
-BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD
+BattleFrontier_Lounge7_Text_SwordsDanceDesc:: @ 8265FDD
 	.string "A fighting dance\n"
 	.string "that sharply\n"
 	.string "raises ATTACK.$"
 
-BattleFrontier_Lounge7_Text_26600A:: @ 826600A
+BattleFrontier_Lounge7_Text_DefenseCurlDesc:: @ 826600A
 	.string "Curls up to con-\n"
 	.string "ceal weak spots\n"
 	.string "and raise DEFENSE.$"
 
-BattleFrontier_Lounge7_Text_26603E:: @ 826603E
+BattleFrontier_Lounge7_Text_SnoreDesc:: @ 826603E
 	.string "A loud attack\n"
 	.string "that can be used\n"
 	.string "only while asleep.$"
 
-BattleFrontier_Lounge7_Text_266070:: @ 8266070
+BattleFrontier_Lounge7_Text_MudSlapDesc:: @ 8266070
 	.string "Hurls mud in the\n"
 	.string "foe's face to re-\n"
 	.string "duce its accuracy.$"
 
-BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6
+BattleFrontier_Lounge7_Text_SwiftDesc:: @ 82660A6
 	.string "Sprays star-\n"
 	.string "shaped rays\n"
 	.string "that never miss.$"
 
-BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0
+BattleFrontier_Lounge7_Text_IcyWindDesc:: @ 82660D0
 	.string "A chilling attack\n"
 	.string "that lowers the\n"
 	.string "foe's SPEED.$"
 
-BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF
+BattleFrontier_Lounge7_Text_EndureDesc:: @ 82660FF
 	.string "Endures any at-\n"
 	.string "tack for 1 turn,\n"
 	.string "leaving 1HP.$"
 
-BattleFrontier_Lounge7_Text_26612D:: @ 826612D
+BattleFrontier_Lounge7_Text_PsychUpDesc:: @ 826612D
 	.string "Copies the foe's\n"
 	.string "effect(s) and\n"
 	.string "gives to the user.$"
 
-BattleFrontier_Lounge7_Text_26615F:: @ 826615F
+BattleFrontier_Lounge7_Text_IcePunchDesc:: @ 826615F
 	.string "An icy punch\n"
 	.string "that may\n"
 	.string "freeze the foe.$"
 
-BattleFrontier_Lounge7_Text_266185:: @ 8266185
+BattleFrontier_Lounge7_Text_ThunderPunchDesc:: @ 8266185
 	.string "An electrified\n"
 	.string "punch that may\n"
 	.string "paralyze the foe.$"
 
-BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5
+BattleFrontier_Lounge7_Text_FirePunchDesc:: @ 82661B5
 	.string "A fiery punch\n"
 	.string "that may burn\n"
 	.string "the foe.$"
diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json
index ff2bd2361..519f008fc 100644
--- a/data/maps/BattleFrontier_Lounge8/map.json
+++ b/data/maps/BattleFrontier_Lounge8/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676DC",
+      "script": "BattleFrontier_Lounge8_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676CA",
+      "script": "BattleFrontier_Lounge8_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676D3",
+      "script": "BattleFrontier_Lounge8_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc
index 3a6f78fd7..2615af743 100644
--- a/data/maps/BattleFrontier_Lounge8/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
@@ -1,19 +1,19 @@
 BattleFrontier_Lounge8_MapScripts:: @ 82676C9
 	.byte 0
 
-BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA
-	msgbox BattleFrontier_Lounge8_Text_2676E5, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_Man:: @ 82676CA
+	msgbox BattleFrontier_Lounge8_Text_WhatATrainerNeeds, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3
-	msgbox BattleFrontier_Lounge8_Text_26779C, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_Woman:: @ 82676D3
+	msgbox BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC
-	msgbox BattleFrontier_Lounge8_Text_26782C, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_NinjaBoy:: @ 82676DC
+	msgbox BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_Text_2676E5: @ 82676E5
+BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
 	.string "What a TRAINER needs…\p"
 	.string "Knowledge…\n"
 	.string "Strategy…\l"
@@ -27,14 +27,14 @@ BattleFrontier_Lounge8_Text_2676E5: @ 82676E5
 	.string "Huh? POKéMON?\n"
 	.string "What's that?$"
 
-BattleFrontier_Lounge8_Text_26779C: @ 826779C
+BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains: @ 826779C
 	.string "Do you know about the FRONTIER\n"
 	.string "BRAINS?\p"
 	.string "That's what SCOTT calls the seven\n"
 	.string "special TRAINERS that run the seven\l"
 	.string "facilities in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge8_Text_26782C: @ 826782C
+BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling: @ 826782C
 	.string "At the BATTLE TOWER, an older girl\n"
 	.string "told me that I have a lot of talent\l"
 	.string "for battling!\p"
diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json
index 46f6de9af..f4adf6c36 100644
--- a/data/maps/BattleFrontier_Mart/map.json
+++ b/data/maps/BattleFrontier_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267ACC",
+      "script": "BattleFrontier_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B0B",
+      "script": "BattleFrontier_Mart_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B02",
+      "script": "BattleFrontier_Mart_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B20",
+      "script": "BattleFrontier_Mart_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 59ba707d8..e04a2e6d3 100644
--- a/data/maps/BattleFrontier_Mart/scripts.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
@@ -1,18 +1,18 @@
 BattleFrontier_Mart_MapScripts:: @ 8267ACB
 	.byte 0
 
-BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC
+BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart BattleFrontier_Mart_Pokemart_267AE4
+	pokemart BattleFrontier_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4
+BattleFrontier_Mart_Pokemart: @ 8267AE4
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -30,35 +30,35 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4
 	release
 	end
 
-BattleFrontier_Mart_EventScript_267B02:: @ 8267B02
-	msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC
+BattleFrontier_Mart_EventScript_OldMan:: @ 8267B02
+	msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B
+BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
 	lock
 	applymovement 2, Common_Movement_FaceDown
 	waitmovement 0
-	msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Mart_Text_ProteinMakeNiceGift, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Mart_EventScript_267B20:: @ 8267B20
-	msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC
+BattleFrontier_Mart_EventScript_Boy:: @ 8267B20
+	msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_Text_267B29: @ 8267B29
+BattleFrontier_Mart_Text_ChaperonGrandson: @ 8267B29
 	.string "We came here to chaperon our\n"
 	.string "grandson.\p"
 	.string "But since we're here, we thought\n"
 	.string "we should get some souvenirs.$"
 
-BattleFrontier_Mart_Text_267B8F: @ 8267B8F
+BattleFrontier_Mart_Text_ProteinMakeNiceGift: @ 8267B8F
 	.string "Dear, what do you think of this?\n"
 	.string "Wouldn't this make a nice gift?\p"
 	.string "It's…PRO…TE…IN?\n"
 	.string "It sounds delicious, doesn't it?$"
 
-BattleFrontier_Mart_Text_267C01: @ 8267C01
+BattleFrontier_Mart_Text_FacilitiesDontAllowItems: @ 8267C01
 	.string "A lot of the BATTLE FRONTIER's\n"
 	.string "facilities don't allow the use of items\l"
 	.string "during battles.\p"
diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json
index e45e4f13b..cccf8fb8a 100644
--- a/data/maps/BattleFrontier_OutsideEast/map.json
+++ b/data/maps/BattleFrontier_OutsideEast/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C67",
+      "script": "BattleFrontier_OutsideEast_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -43,7 +43,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C70",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C79",
+      "script": "BattleFrontier_OutsideEast_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C82",
+      "script": "BattleFrontier_OutsideEast_EventScript_HexManiac",
       "flag": "0"
     },
     {
@@ -82,7 +82,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C8B",
+      "script": "BattleFrontier_OutsideEast_EventScript_BlackBelt1",
       "flag": "0"
     },
     {
@@ -95,7 +95,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C94",
+      "script": "BattleFrontier_OutsideEast_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -108,7 +108,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CBB",
+      "script": "BattleFrontier_OutsideEast_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -121,7 +121,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CE1",
+      "script": "BattleFrontier_OutsideEast_EventScript_TriathleteM",
       "flag": "0"
     },
     {
@@ -134,7 +134,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CB2",
+      "script": "BattleFrontier_OutsideEast_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -147,7 +147,7 @@
       "movement_range_y": 6,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CC4",
+      "script": "BattleFrontier_OutsideEast_EventScript_TriathleteF",
       "flag": "0"
     },
     {
@@ -160,7 +160,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CCD",
+      "script": "BattleFrontier_OutsideEast_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -173,7 +173,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CD6",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -186,7 +186,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C9F",
+      "script": "BattleFrontier_OutsideEast_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -212,7 +212,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D79",
+      "script": "BattleFrontier_OutsideEast_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -225,7 +225,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D82",
+      "script": "BattleFrontier_OutsideEast_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -238,7 +238,7 @@
       "movement_range_y": 6,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D8B",
+      "script": "BattleFrontier_OutsideEast_EventScript_PsychicM",
       "flag": "0"
     },
     {
@@ -251,7 +251,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D94",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -264,7 +264,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D9D",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -277,7 +277,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DA6",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -290,7 +290,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DAF",
+      "script": "BattleFrontier_OutsideEast_EventScript_BlackBelt2",
       "flag": "0"
     },
     {
@@ -303,7 +303,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DB8",
+      "script": "BattleFrontier_OutsideEast_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -316,7 +316,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DC3",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman3",
       "flag": "0"
     },
     {
@@ -329,7 +329,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DE9",
+      "script": "BattleFrontier_OutsideEast_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -342,7 +342,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DE0",
+      "script": "BattleFrontier_OutsideEast_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -355,7 +355,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242E08",
+      "script": "BattleFrontier_OutsideEast_EventScript_Camper",
       "flag": "0"
     }
   ],
@@ -406,7 +406,7 @@
       "x": 10,
       "y": 28,
       "elevation": 0,
-      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+      "dest_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
       "dest_warp_id": 0
     },
     {
@@ -467,7 +467,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C43"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattleTowerSign"
     },
     {
       "type": "sign",
@@ -475,7 +475,7 @@
       "y": 56,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C4C"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattlePalaceSign"
     },
     {
       "type": "sign",
@@ -483,7 +483,7 @@
       "y": 34,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C55"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattleArenaSign"
     },
     {
       "type": "sign",
@@ -491,7 +491,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C5E"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattlePyramidSign"
     },
     {
       "type": "sign",
@@ -499,7 +499,7 @@
       "y": 29,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DD7"
+      "script": "BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign"
     },
     {
       "type": "sign",
@@ -507,7 +507,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DCE"
+      "script": "BattleFrontier_OutsideEast_EventScript_RankingHallSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index ab968b6dd..ebfdba916 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -1,105 +1,105 @@
 BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19
+BattleFrontier_OutsideEast_OnResume: @ 8242C0F
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
+BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo:: @ 8242C19
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
+BattleFrontier_OutsideEast_OnTransition: @ 8242C2D
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
-	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
+	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_ShowSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
+BattleFrontier_OutsideEast_EventScript_ShowSudowoodo:: @ 8242C3F
 	clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	return
 
-BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
-	msgbox BattleFrontier_OutsideEast_Text_242E11, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattleTowerSign:: @ 8242C43
+	msgbox BattleFrontier_OutsideEast_Text_BattleTowerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C
-	msgbox BattleFrontier_OutsideEast_Text_242E58, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattlePalaceSign:: @ 8242C4C
+	msgbox BattleFrontier_OutsideEast_Text_BattlePalaceSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55
-	msgbox BattleFrontier_OutsideEast_Text_242E96, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattleArenaSign:: @ 8242C55
+	msgbox BattleFrontier_OutsideEast_Text_BattleArenaSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E
-	msgbox BattleFrontier_OutsideEast_Text_242ECF, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattlePyramidSign:: @ 8242C5E
+	msgbox BattleFrontier_OutsideEast_Text_BattlePyramidSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67
-	msgbox BattleFrontier_OutsideEast_Text_242F8C, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_NinjaBoy:: @ 8242C67
+	msgbox BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70
-	msgbox BattleFrontier_OutsideEast_Text_242FDC, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Man1:: @ 8242C70
+	msgbox BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79
-	msgbox BattleFrontier_OutsideEast_Text_24308C, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Hiker:: @ 8242C79
+	msgbox BattleFrontier_OutsideEast_Text_PyramidTooHarsh, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82
-	msgbox BattleFrontier_OutsideEast_Text_243106, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_HexManiac:: @ 8242C82
+	msgbox BattleFrontier_OutsideEast_Text_ThriveInDarkness, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B
-	msgbox BattleFrontier_OutsideEast_Text_2431A5, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_BlackBelt1:: @ 8242C8B
+	msgbox BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94
+BattleFrontier_OutsideEast_EventScript_Cook:: @ 8242C94
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_2432DD, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_BelieveInYouBuddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F
+BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox BattleFrontier_OutsideEast_Text_24334B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2
-	msgbox BattleFrontier_OutsideEast_Text_243363, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_RichBoy:: @ 8242CB2
+	msgbox BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB
-	msgbox BattleFrontier_OutsideEast_Text_243425, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_ExpertF:: @ 8242CBB
+	msgbox BattleFrontier_OutsideEast_Text_OnceBeatGymLeader, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4
-	msgbox BattleFrontier_OutsideEast_Text_2434A0, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_TriathleteF:: @ 8242CC4
+	msgbox BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD
-	msgbox BattleFrontier_OutsideEast_Text_243504, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Twin:: @ 8242CCD
+	msgbox BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6
+BattleFrontier_OutsideEast_EventScript_Man2:: @ 8242CD6
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243529, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1
-	msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_TriathleteM:: @ 8242CE1
+	msgbox BattleFrontier_OutsideEast_Text_DidScottBringYouHere, MSGBOX_NPC
 	end
 
 BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
@@ -134,16 +134,16 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	setflag FLAG_DEFEATED_SUDOWOODO
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo:: @ 8242D60
+BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo:: @ 8242D60
 	setflag FLAG_DEFEATED_SUDOWOODO
 	goto Common_EventScript_RemoveStaticPokemon
 	end
@@ -166,107 +166,107 @@ BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
 	face_down
 	step_end
 
-BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
-	msgbox BattleFrontier_OutsideEast_Text_243598, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Maniac1:: @ 8242D79
+	msgbox BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82
-	msgbox BattleFrontier_OutsideEast_Text_243668, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Girl:: @ 8242D82
+	msgbox BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B
-	msgbox BattleFrontier_OutsideEast_Text_2436F2, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_PsychicM:: @ 8242D8B
+	msgbox BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94
-	msgbox BattleFrontier_OutsideEast_Text_243809, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Man3:: @ 8242D94
+	msgbox BattleFrontier_OutsideEast_Text_GotWipedOut, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D
-	msgbox BattleFrontier_OutsideEast_Text_243895, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Woman1:: @ 8242D9D
+	msgbox BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6
-	msgbox BattleFrontier_OutsideEast_Text_243943, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Woman2:: @ 8242DA6
+	msgbox BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF
-	msgbox BattleFrontier_OutsideEast_Text_2439A0, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_BlackBelt2:: @ 8242DAF
+	msgbox BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8
+BattleFrontier_OutsideEast_EventScript_Maniac2:: @ 8242DB8
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A2B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3
+BattleFrontier_OutsideEast_EventScript_Woman3:: @ 8242DC3
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A53, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE
-	msgbox BattleFrontier_OutsideEast_Text_242F0D, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_RankingHallSign:: @ 8242DCE
+	msgbox BattleFrontier_OutsideEast_Text_RankingHallSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7
-	msgbox BattleFrontier_OutsideEast_Text_242F4A, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign:: @ 8242DD7
+	msgbox BattleFrontier_OutsideEast_Text_ExchangeCornerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
-	msgbox BattleFrontier_OutsideEast_Text_243B68, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Gentleman:: @ 8242DE0
+	msgbox BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
+BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone
+	msgbox BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243CA3, MSGBOX_DEFAULT
+BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone:: @ 8242DFE
+	msgbox BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08
-	msgbox BattleFrontier_OutsideEast_Text_243D0B, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Camper:: @ 8242E08
+	msgbox BattleFrontier_OutsideEast_Text_StickyMonWithLongTail, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_Text_242E11: @ 8242E11
+BattleFrontier_OutsideEast_Text_BattleTowerSign: @ 8242E11
 	.string "This is the BATTLE TOWER!\n"
 	.string "Keep the win streak as the toughest\l"
 	.string "TRAINER!$"
 
-BattleFrontier_OutsideEast_Text_242E58: @ 8242E58
+BattleFrontier_OutsideEast_Text_BattlePalaceSign: @ 8242E58
 	.string "This is the BATTLE PALACE!\n"
 	.string "Keep your eyes on POKéMON battles!$"
 
-BattleFrontier_OutsideEast_Text_242E96: @ 8242E96
+BattleFrontier_OutsideEast_Text_BattleArenaSign: @ 8242E96
 	.string "This is the BATTLE ARENA!\n"
 	.string "Let the toughest teams gather!$"
 
-BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF
+BattleFrontier_OutsideEast_Text_BattlePyramidSign: @ 8242ECF
 	.string "This is the BATTLE PYRAMID!\n"
 	.string "Advance through the Battle Quest!$"
 
-BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D
+BattleFrontier_OutsideEast_Text_RankingHallSign: @ 8242F0D
 	.string "BATTLE FRONTIER RANKING HALL\n"
 	.string "Set your sights on new records!$"
 
-BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A
+BattleFrontier_OutsideEast_Text_ExchangeCornerSign: @ 8242F4A
 	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
 	.string "Exchange your Battle Points!$"
 
-BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C
+BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial: @ 8242F8C
 	.string "Wow!\n"
 	.string "It's huge!\p"
 	.string "The BATTLE TOWER feels special.\n"
 	.string "It's different from the others.$"
 
-BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
+BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
 	.string "My grand ambition is to conquer both\n"
 	.string "the BATTLE FRONTIER and the POKéMON\l"
 	.string "LEAGUE.\p"
@@ -274,26 +274,26 @@ BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
 	.string "I… I'm going to ask MIMI next door\n"
 	.string "if she will be friends with me!$"
 
-BattleFrontier_OutsideEast_Text_24308C: @ 824308C
+BattleFrontier_OutsideEast_Text_PyramidTooHarsh: @ 824308C
 	.string "The BATTLE PYRAMID's too harsh!\n"
 	.string "I just can't make it to the top!\p"
 	.string "Since I'm out of options, maybe I can\n"
 	.string "climb the outside…$"
 
-BattleFrontier_OutsideEast_Text_243106: @ 8243106
+BattleFrontier_OutsideEast_Text_ThriveInDarkness: @ 8243106
 	.string "I thrive in darkness…\n"
 	.string "Yes… What is worthy of me?\l"
 	.string "None other than the BATTLE PYRAMID…\p"
 	.string "What say you to wandering in darkness\n"
 	.string "and in utter and total desperation?$"
 
-BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5
+BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam: @ 82431A5
 	.string "I didn't sleep for a week, but then\n"
 	.string "I put together the ultimate team!\p"
 	.string "I can't see myself losing, no joke.\n"
 	.string "We're storming the BATTLE ARENA!$"
 
-BattleFrontier_OutsideEast_Text_243230: @ 8243230
+BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
 	.string "Did SCOTT bring you here, too?\n"
 	.string "What is it with that guy?\p"
 	.string "It sounds like he really does know\n"
@@ -301,16 +301,16 @@ BattleFrontier_OutsideEast_Text_243230: @ 8243230
 	.string "I've never seen him battling in person\n"
 	.string "ever.$"
 
-BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD
+BattleFrontier_OutsideEast_Text_BelieveInYouBuddy: @ 82432DD
 	.string "ZIGG!\n"
 	.string "I believe in you, little buddy!\p"
 	.string "I'll make my little ZIGG any favorite\n"
 	.string "tasty treats you like if you win!$"
 
-BattleFrontier_OutsideEast_Text_24334B: @ 824334B
+BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant: @ 824334B
 	.string "ZIGZAGOON looks vacant…$"
 
-BattleFrontier_OutsideEast_Text_243363: @ 8243363
+BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
 	.string "People call me a busybody,\n"
 	.string "but I can't help it.\p"
 	.string "Your hat's on crooked!\n"
@@ -319,29 +319,29 @@ BattleFrontier_OutsideEast_Text_243363: @ 8243363
 	.string "I don't know if I can stand to just\n"
 	.string "watch at the BATTLE PALACE…$"
 
-BattleFrontier_OutsideEast_Text_243425: @ 8243425
+BattleFrontier_OutsideEast_Text_OnceBeatGymLeader: @ 8243425
 	.string "I may not look that impressive now,\n"
 	.string "but I once beat a GYM LEADER.\p"
 	.string "Who knows, maybe I should give it\n"
 	.string "another shot at glory.$"
 
-BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0
+BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles: @ 82434A0
 	.string "I'm fast on my BIKE, and that goes for\n"
 	.string "the way I battle, too.\p"
 	.string "I win matches in the blink of\n"
 	.string "an eye!$"
 
-BattleFrontier_OutsideEast_Text_243504: @ 8243504
+BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon: @ 8243504
 	.string "I'm better than my daddy\n"
 	.string "at POKéMON.$"
 
-BattleFrontier_OutsideEast_Text_243529: @ 8243529
+BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy: @ 8243529
 	.string "Go on, my baby sweetie!\n"
 	.string "Go rack up some wins for Daddy!\p"
 	.string "You're just like your mother,\n"
 	.string "so you'll be dominating!$"
 
-BattleFrontier_OutsideEast_Text_243598: @ 8243598
+BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
 	.string "It wasn't easy getting here,\n"
 	.string "but I'd heard about this knockout\l"
 	.string "pretty girl at the BATTLE ARENA.\p"
@@ -350,13 +350,13 @@ BattleFrontier_OutsideEast_Text_243598: @ 8243598
 	.string "A whole teeming mob of sweaty,\n"
 	.string "stinky, and primitive martial artists!$"
 
-BattleFrontier_OutsideEast_Text_243668: @ 8243668
+BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere: @ 8243668
 	.string "I sometimes see this really important-\n"
 	.string "looking old man going in there.\p"
 	.string "He has these really awesome POKéMON.\n"
 	.string "He seems really nice, though.$"
 
-BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
+BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
 	.string "Do you know it?\n"
 	.string "The legend of the BATTLE PYRAMID?\p"
 	.string "When there comes a confident TRAINER\n"
@@ -368,7 +368,7 @@ BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
 	.string "What's it supposed to mean?\n"
 	.string "That, my friend, I can't say!$"
 
-BattleFrontier_OutsideEast_Text_243809: @ 8243809
+BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
 	.string "Man! Oh man!\n"
 	.string "I've never lost once before!\p"
 	.string "But I got wiped out with no saving\n"
@@ -376,7 +376,7 @@ BattleFrontier_OutsideEast_Text_243809: @ 8243809
 	.string "And then I'm told I don't have any\n"
 	.string "talent?! Man!$"
 
-BattleFrontier_OutsideEast_Text_243895: @ 8243895
+BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
 	.string "This guy ran into a horribly tough\n"
 	.string "TRAINER while he was on the BATTLE\l"
 	.string "TOWER challenge.\p"
@@ -384,23 +384,23 @@ BattleFrontier_OutsideEast_Text_243895: @ 8243895
 	.string "You need to be cautious if you ever\n"
 	.string "decide to go to the BATTLE TOWER.$"
 
-BattleFrontier_OutsideEast_Text_243943: @ 8243943
+BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll: @ 8243943
 	.string "Yes!\n"
 	.string "I've finally got enough Battle Points!\p"
 	.string "I guess I'll trade for another giant\n"
 	.string "plush DOLL!$"
 
-BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0
+BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere: @ 82439A0
 	.string "Oh, yeah, okay!\n"
 	.string "So this is the RANKING HALL!\p"
 	.string "I'd like to go down in history as\n"
 	.string "a super champ and have my name\l"
 	.string "recorded here for posterity.$"
 
-BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B
+BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou: @ 8243A2B
 	.string "With you by my side, I can do anything.$"
 
-BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
+BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
 	.string "Ooh, darling, you are so wonderful!\p"
 	.string "Ooh, I just can't wait anymore!\p"
 	.string "Let's go to a MULTI BATTLE ROOM\n"
@@ -411,7 +411,7 @@ BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
 	.string "Why, before us, darling, everything\n"
 	.string "will topple like dominoes!$"
 
-BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
+BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B68
 	.string "The BATTLE FRONTIER isn't exclusively\n"
 	.string "for tough TRAINERS.\p"
 	.string "Many people with special abilities\n"
@@ -420,19 +420,19 @@ BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
 	.string "He may have built this place to serve\n"
 	.string "a bigger objective…$"
 
-BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C
+BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle: @ 8243C2C
 	.string "Excuse me, young one.\n"
 	.string "Have you good eyesight?\p"
 	.string "There is an odd tree past here, and to\n"
 	.string "my tired eyes it seems to wiggle.$"
 
-BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3
+BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere: @ 8243CA3
 	.string "Excuse me, young one.\n"
 	.string "Have you a good memory?\p"
 	.string "I have this feeling there once was\n"
 	.string "an odd tree past here.$"
 
-BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B
+BattleFrontier_OutsideEast_Text_StickyMonWithLongTail: @ 8243D0B
 	.string "I…\n"
 	.string "I saw it!\p"
 	.string "There was a sticky sort of a POKéMON\n"
diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json
index a2972e0b4..42b76323a 100644
--- a/data/maps/BattleFrontier_OutsideWest/map.json
+++ b/data/maps/BattleFrontier_OutsideWest/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D50F",
+      "script": "BattleFrontier_OutsideWest_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D3F0",
+      "script": "BattleFrontier_OutsideWest_EventScript_FerryAttendant",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D68B",
+      "script": "BattleFrontier_OutsideWest_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -82,7 +82,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D52D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -95,7 +95,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D69D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -108,7 +108,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6A6",
+      "script": "BattleFrontier_OutsideWest_EventScript_FatMan1",
       "flag": "0"
     },
     {
@@ -121,7 +121,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D679",
+      "script": "BattleFrontier_OutsideWest_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -134,7 +134,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D536",
+      "script": "BattleFrontier_OutsideWest_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -147,7 +147,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D53D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -160,7 +160,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D694",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -173,7 +173,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D5C6",
+      "script": "BattleFrontier_OutsideWest_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -186,7 +186,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D635",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -199,7 +199,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D57F",
+      "script": "BattleFrontier_OutsideWest_EventScript_Camper",
       "flag": "0"
     },
     {
@@ -212,7 +212,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D682",
+      "script": "BattleFrontier_OutsideWest_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -225,7 +225,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_249E19",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -238,7 +238,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D667",
+      "script": "BattleFrontier_OutsideWest_EventScript_Fisherman1",
       "flag": "0"
     },
     {
@@ -251,7 +251,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D518",
+      "script": "BattleFrontier_OutsideWest_EventScript_Fisherman2",
       "flag": "0"
     },
     {
@@ -264,7 +264,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6AF",
+      "script": "BattleFrontier_OutsideWest_EventScript_FatMan2",
       "flag": "0"
     },
     {
@@ -277,7 +277,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6B8",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman3",
       "flag": "0"
     },
     {
@@ -290,7 +290,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6C3",
+      "script": "BattleFrontier_OutsideWest_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -303,7 +303,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6CE",
+      "script": "BattleFrontier_OutsideWest_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -316,7 +316,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6D7",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man4",
       "flag": "0"
     },
     {
@@ -329,7 +329,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6EE",
+      "script": "BattleFrontier_OutsideWest_EventScript_PokefanF",
       "flag": "0"
     }
   ],
@@ -420,7 +420,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4E2"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattleDomeSign"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 30,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4F4"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattlePikeSign"
     },
     {
       "type": "sign",
@@ -436,7 +436,7 @@
       "y": 43,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4EB"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattleFactorySign"
     },
     {
       "type": "sign",
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index 1f3d61628..4fb750023 100644
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -1,109 +1,111 @@
 BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
+BattleFrontier_OutsideWest_OnTransition: @ 823D3E7
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
+BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT
 	checkitem ITEM_SS_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D44E
-	message BattleFrontier_OutsideWest_Text_23D89D
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_NoSSTicket
+	message BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo
 	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
+	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416
+BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
 	multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_OutsideWest_EventScript_23D458
-	case 1, BattleFrontier_OutsideWest_EventScript_23D483
-	case 2, BattleFrontier_OutsideWest_EventScript_23D4D8
-	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_23D4D8
+	case 0, BattleFrontier_OutsideWest_EventScript_FerryToSlateport
+	case 1, BattleFrontier_OutsideWest_EventScript_FerryToLilycove
+	case 2, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
+	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E
-	msgbox BattleFrontier_OutsideWest_Text_23D842, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_NoSSTicket:: @ 823D44E
+	msgbox BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
-	msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
+BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
+	msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
+	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
+	call BattleFrontier_OutsideWest_EventScript_BoardFerry
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483
-	msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
+BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
+	msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
+	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
+	call BattleFrontier_OutsideWest_EventScript_BoardFerry
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
-	message BattleFrontier_OutsideWest_Text_23D97A
+BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination:: @ 823D4AE
+	message BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo
 	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
+	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
+BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	setvar VAR_0x8004, 2
-	call BattleFrontier_OutsideWest_EventScript_272250
+	call Common_EventScript_FerryDepartIsland
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8
-	msgbox BattleFrontier_OutsideWest_Text_23D929, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_CancelFerrySelect:: @ 823D4D8
+	msgbox BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2
-	msgbox BattleFrontier_OutsideWest_Text_23D6F7, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign:: @ 823D4E2
+	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB
-	msgbox BattleFrontier_OutsideWest_Text_23D737, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattleFactorySign:: @ 823D4EB
+	msgbox BattleFrontier_OutsideWest_Text_BattleFactorySign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4
-	msgbox BattleFrontier_OutsideWest_Text_23D772, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattlePikeSign:: @ 823D4F4
+	msgbox BattleFrontier_OutsideWest_Text_BattlePikeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D7A6, MSGBOX_NPC
+@ Unused. Of note, Battle Tower is in the East section in the final release
+BattleFrontier_OutsideWest_EventScript_UnusedNPC1:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_ThisIsBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D9DD, MSGBOX_NPC
+@ Unused
+BattleFrontier_OutsideWest_EventScript_UnusedNPC2:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_CantFindBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F
-	msgbox BattleFrontier_OutsideWest_Text_23D99C, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Boy1:: @ 823D50F
+	msgbox BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
+BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
 	lock
 	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DA60
+	message BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere
 	waitmessage
 	applymovement 18, Common_Movement_FaceAwayPlayer
 	waitmovement 0
@@ -111,27 +113,27 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D
-	msgbox BattleFrontier_OutsideWest_Text_23DABF, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Man1:: @ 823D52D
+	msgbox BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536
+BattleFrontier_OutsideWest_EventScript_Maniac1:: @ 823D536
 	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
+	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
+BattleFrontier_OutsideWest_EventScript_Maniac2:: @ 823D53D
 	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
+	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
+BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
 	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT
 	applymovement 10, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons, MSGBOX_DEFAULT
 	closemessage
 	delay 25
 	applymovement 9, Common_Movement_WalkInPlaceFastestUp
@@ -140,239 +142,240 @@ BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
+BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
 	lock
 	faceplayer
 	delay 20
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
-	msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
+	msgbox BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
+BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: @ 823D5BA
 	applymovement 14, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5
+BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory:: @ 823D5C5
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
+BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
 	lock
 	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DCB0
+	message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper
 	waitmessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderEast
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D629
+BattleFrontier_OutsideWest_EventScript_GirlShudderNorth:: @ 823D5FD
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderNorth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C
+BattleFrontier_OutsideWest_EventScript_GirlShudderSouth:: @ 823D608
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderSouth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F
+BattleFrontier_OutsideWest_EventScript_GirlShudderWest:: @ 823D613
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderWest
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D632
+BattleFrontier_OutsideWest_EventScript_GirlShudderEast:: @ 823D61E
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderEast
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_Movement_23D629: @ 823D629
+BattleFrontier_OutsideWest_Movement_GirlShudderNorth: @ 823D629
 	walk_in_place_fastest_down
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
+BattleFrontier_OutsideWest_Movement_GirlShudderSouth: @ 823D62C
 	walk_in_place_fastest_up
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
+BattleFrontier_OutsideWest_Movement_GirlShudderWest: @ 823D62F
 	walk_in_place_fastest_right
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
+BattleFrontier_OutsideWest_Movement_GirlShudderEast: @ 823D632
 	walk_in_place_fastest_left
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
+BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT
 	random 2
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D653
-	goto BattleFrontier_OutsideWest_EventScript_23D65D
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors
+	goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653
-	msgbox BattleFrontier_OutsideWest_Text_23DD7A, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors:: @ 823D653
+	msgbox BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D
-	msgbox BattleFrontier_OutsideWest_Text_23DDAD, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors:: @ 823D65D
+	msgbox BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667
-	msgbox BattleFrontier_OutsideWest_Text_23DE15, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Fisherman1:: @ 823D667
+	msgbox BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670
-	msgbox BattleFrontier_OutsideWest_Text_23DF7D, MSGBOX_NPC
+@ Unused
+BattleFrontier_OutsideWest_EventScript_UnusedNPC3:: @ 823D670
+	msgbox BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679
-	msgbox BattleFrontier_OutsideWest_Text_23DEFD, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Gentleman:: @ 823D679
+	msgbox BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682
-	msgbox BattleFrontier_OutsideWest_Text_23DEB4, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Lass:: @ 823D682
+	msgbox BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B
-	msgbox BattleFrontier_OutsideWest_Text_23DFBF, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_ExpertM:: @ 823D68B
+	msgbox BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694
-	msgbox BattleFrontier_OutsideWest_Text_23E01E, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Man2:: @ 823D694
+	msgbox BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D
-	msgbox BattleFrontier_OutsideWest_Text_23E09F, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Woman1:: @ 823D69D
+	msgbox BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6
-	msgbox BattleFrontier_OutsideWest_Text_23E102, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_FatMan1:: @ 823D6A6
+	msgbox BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF
-	msgbox BattleFrontier_OutsideWest_Text_23E154, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_FatMan2:: @ 823D6AF
+	msgbox BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8
+BattleFrontier_OutsideWest_EventScript_Woman3:: @ 823D6B8
 	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E273, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3
+BattleFrontier_OutsideWest_EventScript_Boy2:: @ 823D6C3
 	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E2E9, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE
-	msgbox BattleFrontier_OutsideWest_Text_23E37E, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_OldMan:: @ 823D6CE
+	msgbox BattleFrontier_OutsideWest_Text_DomeAceIsMine, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
+BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers, MSGBOX_DEFAULT
 	closemessage
 	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE
-	msgbox BattleFrontier_OutsideWest_Text_23E5A5, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_PokefanF:: @ 823D6EE
+	msgbox BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7
+BattleFrontier_OutsideWest_Text_BattleDomeSign: @ 823D6F7
 	.string "This is the BATTLE DOME!\n"
 	.string "Your path to the invincible superstar!$"
 
-BattleFrontier_OutsideWest_Text_23D737: @ 823D737
+BattleFrontier_OutsideWest_Text_BattleFactorySign: @ 823D737
 	.string "This is the BATTLE FACTORY!\n"
 	.string "Seek out the toughest POKéMON!$"
 
-BattleFrontier_OutsideWest_Text_23D772: @ 823D772
+BattleFrontier_OutsideWest_Text_BattlePikeSign: @ 823D772
 	.string "This is the BATTLE PIKE!\n"
 	.string "Choose one of three paths!$"
 
-BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6
+BattleFrontier_OutsideWest_Text_ThisIsBattleTower: @ 823D7A6
 	.string "This is the BATTLE TOWER.\p"
 	.string "TRAINERS bring their best-raised\n"
 	.string "POKéMON for elimination-style matches.$"
 
-BattleFrontier_OutsideWest_Text_23D808: @ 823D808
+BattleFrontier_OutsideWest_Text_MayISeeYourTicket: @ 823D808
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-BattleFrontier_OutsideWest_Text_23D842: @ 823D842
+BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard: @ 823D842
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D
+BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo: @ 823D89D
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2
+BattleFrontier_OutsideWest_Text_SlateportItIs: @ 823D8F2
 	.string "SLATEPORT CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E
+BattleFrontier_OutsideWest_Text_LilycoveItIs: @ 823D90E
 	.string "LILYCOVE CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_23D929: @ 823D929
+BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime: @ 823D929
 	.string "Please sail with us another time!$"
 
-BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B
+BattleFrontier_OutsideWest_Text_PleaseBoardFerry: @ 823D94B
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A
+BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo: @ 823D97A
 	.string "Then, where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C
+BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends: @ 823D99C
 	.string "I'm the best out of all my friends.\n"
 	.string "But here…\l"
 	.string "I've been useless!$"
 
-BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD
+BattleFrontier_OutsideWest_Text_CantFindBattleTower: @ 823D9DD
 	.string "I want to go to the BATTLE TOWER,\n"
 	.string "but I can't find it even though I have\l"
 	.string "a map of the BATTLE FRONTIER.\p"
 	.string "This place is just too big!$"
 
-BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60
+BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere: @ 823DA60
 	.string "I wanted to take a challenge as soon\n"
 	.string "as I arrived here.\p"
 	.string "But on the way, I got seasick…\n"
 	.string "Urrrrp…$"
 
-BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
+BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
 	.string "It's not as if just anyone can come\n"
 	.string "here, you know?\p"
 	.string "Only those TRAINERS who've been\n"
@@ -380,94 +383,94 @@ BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
 	.string "That's why many TRAINERS don't even\n"
 	.string "know about the BATTLE FRONTIER.$"
 
-BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D
+BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons: @ 823DB7D
 	.string "Hey, bro…\p"
 	.string "Are you sure we can make challenges\n"
 	.string "even if we don't have any POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE
+BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons: @ 823DBCE
 	.string "Uh…\n"
 	.string "I'm sure it'll be okay.\p"
 	.string "I think…\p"
 	.string "But remember that big scary guy?\n"
 	.string "He said, “I'll lend you POKéMON!”$"
 
-BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36
+BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons: @ 823DC36
 	.string "That's the BATTLE FACTORY.\n"
 	.string "You can rent strong POKéMON there.\p"
 	.string "But it makes me wonder.\n"
 	.string "Who's raising those rental POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0
+BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper: @ 823DCB0
 	.string "I'm scared of going into the BATTLE\n"
 	.string "PIKE because of SEVIPER…\p"
 	.string "B-but I came all the way here, so I will\n"
 	.string "try to conquer everything!\l"
 	.string "…Shudder…$"
 
-BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B
+BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors: @ 823DD3B
 	.string "Let's play rock, paper, scissors!\n"
 	.string "One, two, three!\p"
 	.string "… … … … … …$"
 
-BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A
+BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge: @ 823DD7A
 	.string "Yay! I won!\n"
 	.string "I will take the BATTLE PIKE challenge!$"
 
-BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD
+BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge: @ 823DDAD
 	.string "Oh, no…\n"
 	.string "I lost.\p"
 	.string "I guess I'm not very lucky today.\n"
 	.string "I'll put off my BATTLE PIKE challenge\l"
 	.string "until tomorrow.$"
 
-BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15
+BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling: @ 823DE15
 	.string "I believe I'm the only person here who,\n"
 	.string "for some unknown reason, would choose\l"
 	.string "fishing over battling.\p"
 	.string "Huh? You can't catch anything here?\n"
 	.string "That's disappointing…$"
 
-BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4
+BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol: @ 823DEB4
 	.string "Today, I'm going to keep battling, no\n"
 	.string "matter what, until I get a Symbol.$"
 
-BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD
+BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome: @ 823DEFD
 	.string "Oh? You're off to challenge\n"
 	.string "the BATTLE DOME?\p"
 	.string "I'll wish you the best of luck.\n"
 	.string "Let us both win our way up and meet\l"
 	.string "in challenges.$"
 
-BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D
+BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa: @ 823DF7D
 	.string "Grandpa, over here!\n"
 	.string "The BATTLE DOME is here!\l"
 	.string "Go get 'em, Grandpa!$"
 
-BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF
+BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe: @ 823DFBF
 	.string "Ah, so this here is the BATTLE DOME?\n"
 	.string "I won't let GENTLEMEN beat me!\p"
 	.string "But where is the entrance?$"
 
-BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E
+BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo: @ 823E01E
 	.string "There used to be nothing here not all\n"
 	.string "that long ago.\p"
 	.string "But, now look at this place! Amazing!\n"
 	.string "I'll bring my mother out to see this.$"
 
-BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F
+BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier: @ 823E09F
 	.string "I've finally arrived at the BATTLE\n"
 	.string "FRONTIER!\p"
 	.string "I'm sure to grab attention with\n"
 	.string "my looks and ability!$"
 
-BattleFrontier_OutsideWest_Text_23E102: @ 823E102
+BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople: @ 823E102
 	.string "Munch, munch…\p"
 	.string "It looks like this square's filled with\n"
 	.string "tough people.\p"
 	.string "Munch, munch…$"
 
-BattleFrontier_OutsideWest_Text_23E154: @ 823E154
+BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
 	.string "Crunch, munch…\p"
 	.string "A while back, I met this older girl\n"
 	.string "at the BATTLE PIKE.\p"
@@ -480,13 +483,13 @@ BattleFrontier_OutsideWest_Text_23E154: @ 823E154
 	.string "scary experience, sure enough.\p"
 	.string "Crunch, munch…$"
 
-BattleFrontier_OutsideWest_Text_23E273: @ 823E273
+BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet: @ 823E273
 	.string "Huh? Will you listen to yourself?\n"
 	.string "That's nothing!\p"
 	.string "Why, the last time I cheered for him,\n"
 	.string "our eyes met and sparks flew!$"
 
-BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
+BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
 	.string "Whaaaaaat?!\n"
 	.string "Pfft!\p"
 	.string "That only happened because\n"
@@ -494,7 +497,7 @@ BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
 	.string "The DOME ACE only looked our way\n"
 	.string "because my cheering was so loud!$"
 
-BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
+BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
 	.string "Oh, shush!\n"
 	.string "Keep that racket down!\p"
 	.string "You fair-weather fans should stick\n"
@@ -502,7 +505,7 @@ BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
 	.string "The DOME ACE is mine!\n"
 	.string "The only idol for me!$"
 
-BattleFrontier_OutsideWest_Text_23E410: @ 823E410
+BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
 	.string "Those people squabbling over there…\p"
 	.string "It's hard to believe, but they once\n"
 	.string "were TRAINERS, and good ones, too.\p"
@@ -516,7 +519,7 @@ BattleFrontier_OutsideWest_Text_23E410: @ 823E410
 	.string "They go cheer for their idol at the\l"
 	.string "BATTLE DOME every day now.$"
 
-BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5
+BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier: @ 823E5A5
 	.string "I heard a rumor that someone saw\n"
 	.string "a POKéMON with an unusually long tail\l"
 	.string "somewhere in the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
index 8f8153c08..743bab8b0 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Picnicker",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Skitty",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 84aeef182..f77d9ab83 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,13 +1,14 @@
 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
+BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904
 	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
+@ VAR_0x800B is the Nurse's object event id
+BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,29 +16,29 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916
+	msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F
-	msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F
+	msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928
+	msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931
+BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT
+	msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
+BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
 	.string "There was someone here using a \n"
 	.string "POKéMON I've never seen before.\p"
 	.string "I never learned about it at\n"
@@ -45,15 +46,15 @@ BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
 	.string "I wonder where you can catch POKéMON\n"
 	.string "like that.$"
 
-BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB
+BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB
 	.string "Okay! Next stop, the BATTLE ARENA!\n"
 	.string "I'd better get the right POKéMON from\l"
 	.string "the PC Storage System.$"
 
-BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B
+BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B
 	.string "Giggle… I'm going to go through every\n"
 	.string "challenge with just this baby!$"
 
-BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90
+BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90
 	.string "SKITTY: Mya myaaah!$"
 
diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json
index af28ecea6..f26e03e41 100644
--- a/data/maps/BattleFrontier_RankingHall/map.json
+++ b/data/maps/BattleFrontier_RankingHall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E52F",
+      "script": "BattleFrontier_RankingHall_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E54A",
+      "script": "BattleFrontier_RankingHall_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E573",
+      "script": "BattleFrontier_RankingHall_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -78,7 +78,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4AA"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerSinglesRecords"
     },
     {
       "type": "sign",
@@ -86,7 +86,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4B6"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerDoublesRecords"
     },
     {
       "type": "sign",
@@ -94,7 +94,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4C2"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerMultisRecords"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4CE"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerLinkRecords"
     },
     {
       "type": "sign",
@@ -110,7 +110,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4DA"
+      "script": "BattleFrontier_RankingHall_EventScript_ArenaRecords"
     },
     {
       "type": "sign",
@@ -118,7 +118,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4E6"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceRecords"
     },
     {
       "type": "sign",
@@ -126,7 +126,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4F2"
+      "script": "BattleFrontier_RankingHall_EventScript_FactoryRecords"
     },
     {
       "type": "sign",
@@ -134,7 +134,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4FE"
+      "script": "BattleFrontier_RankingHall_EventScript_DomeRecords"
     },
     {
       "type": "sign",
@@ -142,7 +142,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E50A"
+      "script": "BattleFrontier_RankingHall_EventScript_PikeRecords"
     },
     {
       "type": "sign",
@@ -150,7 +150,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E516"
+      "script": "BattleFrontier_RankingHall_EventScript_PyramidRecords"
     },
     {
       "type": "sign",
@@ -158,7 +158,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E538"
+      "script": "BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign"
     },
     {
       "type": "sign",
@@ -166,7 +166,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E541"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index 5f8a6c44e..e8415c828 100644
--- a/data/maps/BattleFrontier_RankingHall/scripts.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
@@ -1,67 +1,67 @@
 BattleFrontier_RankingHall_MapScripts:: @ 825E4A9
 	.byte 0
 
-BattleFrontier_RankingHall_EventScript_25E4AA:: @ 825E4AA
+BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: @ 825E4AA
 	lockall
-	setvar VAR_0x8005, 0
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4B6:: @ 825E4B6
+BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: @ 825E4B6
 	lockall
-	setvar VAR_0x8005, 1
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4C2:: @ 825E4C2
+BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: @ 825E4C2
 	lockall
-	setvar VAR_0x8005, 2
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4CE:: @ 825E4CE
+BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: @ 825E4CE
 	lockall
-	setvar VAR_0x8005, 9
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4DA:: @ 825E4DA
+BattleFrontier_RankingHall_EventScript_ArenaRecords:: @ 825E4DA
 	lockall
-	setvar VAR_0x8005, 5
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4E6:: @ 825E4E6
+BattleFrontier_RankingHall_EventScript_PalaceRecords:: @ 825E4E6
 	lockall
-	setvar VAR_0x8005, 4
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4F2:: @ 825E4F2
+BattleFrontier_RankingHall_EventScript_FactoryRecords:: @ 825E4F2
 	lockall
-	setvar VAR_0x8005, 6
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4FE:: @ 825E4FE
+BattleFrontier_RankingHall_EventScript_DomeRecords:: @ 825E4FE
 	lockall
-	setvar VAR_0x8005, 3
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E50A:: @ 825E50A
+BattleFrontier_RankingHall_EventScript_PikeRecords:: @ 825E50A
 	lockall
-	setvar VAR_0x8005, 7
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516
+BattleFrontier_RankingHall_EventScript_PyramidRecords:: @ 825E516
 	lockall
-	setvar VAR_0x8005, 8
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
+BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
 	special ShowRankingHallRecordsWindow
 	waitbuttonpress
 	special ScrollRankingHallRecordsWindow
@@ -70,64 +70,64 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
 	releaseall
 	end
 
-BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F
-	msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Attendant:: @ 825E52F
+	msgbox BattleFrontier_RankingHall_Text_ExplainRankingHall, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538
-	msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign:: @ 825E538
+	msgbox BattleFrontier_RankingHall_Text_DomePikeFactoryRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541
-	msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn:: @ 825E541
+	msgbox BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A
+BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
 	lock
 	faceplayer
-	msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_RankingHall_EventScript_25E569
-	msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList
+	msgbox BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569
-	msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT
+BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList:: @ 825E569
+	msgbox BattleFrontier_RankingHall_Text_WowThatsSuper, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573
-	msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Boy:: @ 825E573
+	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_Text_25E57C: @ 825E57C
+BattleFrontier_RankingHall_Text_ExplainRankingHall: @ 825E57C
 	.string "This is the RANKING HALL.\p"
 	.string "This is where we recognize the immortal\n"
 	.string "TRAINERS who left great records in\l"
 	.string "BATTLE FRONTIER events.$"
 
-BattleFrontier_RankingHall_Text_25E5F9: @ 825E5F9
+BattleFrontier_RankingHall_Text_DomePikeFactoryRecords: @ 825E5F9
 	.string "BATTLE DOME, BATTLE PIKE,\n"
 	.string "and BATTLE FACTORY Records$"
 
-BattleFrontier_RankingHall_Text_25E62E: @ 825E62E
+BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords: @ 825E62E
 	.string "BATTLE PALACE, BATTLE ARENA,\n"
 	.string "and BATTLE PYRAMID Records$"
 
-BattleFrontier_RankingHall_Text_25E666: @ 825E666
+BattleFrontier_RankingHall_Text_IsYourNameOnThisList: @ 825E666
 	.string "Hi, is your name on this list?$"
 
-BattleFrontier_RankingHall_Text_25E685: @ 825E685
+BattleFrontier_RankingHall_Text_WowThatsSuper: @ 825E685
 	.string "Wow, that's super!\n"
 	.string "I'll have to try harder, too!$"
 
-BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6
+BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName: @ 825E6B6
 	.string "Oh, is that right?\p"
 	.string "If you saw your friend's name up here,\n"
 	.string "I bet it would make you work harder!$"
 
-BattleFrontier_RankingHall_Text_25E715: @ 825E715
+BattleFrontier_RankingHall_Text_MyNamesNotUpThere: @ 825E715
 	.string "Hmm…\n"
 	.string "My name's not up there…\p"
 	.string "Well, it's only natural since I haven't\n"
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json
index db140442e..ff891ad5b 100644
--- a/data/maps/BattleFrontier_ReceptionGate/map.json
+++ b/data/maps/BattleFrontier_ReceptionGate/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_2662FC",
+      "script": "BattleFrontier_ReceptionGate_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_266310",
+      "script": "BattleFrontier_ReceptionGate_EventScript_FacilityGuide",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_266436",
+      "script": "BattleFrontier_ReceptionGate_EventScript_RulesGuide",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_2664F4",
+      "script": "BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 640309975..cb01034ad 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -1,5 +1,5 @@
 BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
 	.byte 0
 
@@ -7,11 +7,11 @@ BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
 	setflag FLAG_LANDMARK_BATTLE_FRONTIER
 	end
 
-BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
-	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
+BattleFrontier_ReceptionGate_OnFrame: @ 82661E9
+	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering
 	.2byte 0
 
-BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
+BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
 	lockall
 	setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
 	playse SE_PIN
@@ -19,24 +19,24 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D2
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter
 	waitmovement 0
-	goto BattleFrontier_ReceptionGate_EventScript_266229
+	goto BattleFrontier_ReceptionGate_EventScript_ScottScene
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_2665F7, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
+	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message BattleFrontier_ReceptionGate_Text_266676
+	message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass
 	waitfanfare
 	waitmessage
-	msgbox BattleFrontier_ReceptionGate_Text_266695, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass, MSGBOX_DEFAULT
 	setflag FLAG_SYS_FRONTIER_PASS
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	applymovement 2, Common_Movement_WalkInPlaceFastestUp
@@ -47,29 +47,29 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	applymovement 2, Common_Movement_ExclamationMark
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D7
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_GreeterFaceScott
+	applymovement 2, BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottEnter
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottExit
 	waitmovement 0
 	removeobject 4
 	releaseall
 	end
 
-BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2
+BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter: @ 82662D2
 	walk_up
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
+BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
 	delay_16
 	delay_16
 	delay_16
@@ -77,12 +77,13 @@ BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
+@ Unused
+BattleFrontier_ReceptionGate_Movement_WalkDown: @ 82662DD
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
+BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
 	walk_down
 	walk_down
 	walk_down
@@ -92,7 +93,7 @@ BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
+BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
 	walk_right
 	walk_up
 	walk_up
@@ -102,7 +103,7 @@ BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
 	walk_up
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
+BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
 	delay_16
 	delay_16
 	delay_16
@@ -110,7 +111,7 @@ BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
+BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
 	delay_16
 	delay_16
 	delay_16
@@ -118,217 +119,217 @@ BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC
+BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
+BattleFrontier_ReceptionGate_EventScript_FacilityGuide:: @ 8266310
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266857, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFacilities, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
-	message BattleFrontier_ReceptionGate_Text_26689D
+BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich2
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
-	case 1, BattleFrontier_ReceptionGate_EventScript_2663BC
-	case 2, BattleFrontier_ReceptionGate_EventScript_2663CA
-	case 3, BattleFrontier_ReceptionGate_EventScript_2663D8
-	case 4, BattleFrontier_ReceptionGate_EventScript_2663E6
-	case 5, BattleFrontier_ReceptionGate_EventScript_2663F4
-	case 6, BattleFrontier_ReceptionGate_EventScript_266402
-	case 7, BattleFrontier_ReceptionGate_EventScript_266410
-	case 8, BattleFrontier_ReceptionGate_EventScript_26641E
-	case 9, BattleFrontier_ReceptionGate_EventScript_26642C
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_26642C
+	case 0, BattleFrontier_ReceptionGate_EventScript_BattleTower
+	case 1, BattleFrontier_ReceptionGate_EventScript_BattleDome
+	case 2, BattleFrontier_ReceptionGate_EventScript_BattlePalace
+	case 3, BattleFrontier_ReceptionGate_EventScript_BattleArena
+	case 4, BattleFrontier_ReceptionGate_EventScript_BattleFactory
+	case 5, BattleFrontier_ReceptionGate_EventScript_BattlePike
+	case 6, BattleFrontier_ReceptionGate_EventScript_BattlePyramid
+	case 7, BattleFrontier_ReceptionGate_EventScript_RankingHall
+	case 8, BattleFrontier_ReceptionGate_EventScript_ExchangeCorner
+	case 9, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE
-	msgbox BattleFrontier_ReceptionGate_Text_2668C2, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleTower:: @ 82663AE
+	msgbox BattleFrontier_ReceptionGate_Text_BattleTowerInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC
-	msgbox BattleFrontier_ReceptionGate_Text_26696F, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleDome:: @ 82663BC
+	msgbox BattleFrontier_ReceptionGate_Text_BattleDomeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA
-	msgbox BattleFrontier_ReceptionGate_Text_266A34, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePalace:: @ 82663CA
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePalaceInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8
-	msgbox BattleFrontier_ReceptionGate_Text_266AC2, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleArena:: @ 82663D8
+	msgbox BattleFrontier_ReceptionGate_Text_BattleArenaInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6
-	msgbox BattleFrontier_ReceptionGate_Text_266B5D, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleFactory:: @ 82663E6
+	msgbox BattleFrontier_ReceptionGate_Text_BattleFactoryInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4
-	msgbox BattleFrontier_ReceptionGate_Text_266C24, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePike:: @ 82663F4
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePikeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402
-	msgbox BattleFrontier_ReceptionGate_Text_266CBB, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePyramid:: @ 8266402
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePyramidInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410
-	msgbox BattleFrontier_ReceptionGate_Text_266D1C, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_RankingHall:: @ 8266410
+	msgbox BattleFrontier_ReceptionGate_Text_RankingHallInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E
-	msgbox BattleFrontier_ReceptionGate_Text_266DCB, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_ExchangeCorner:: @ 826641E
+	msgbox BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide:: @ 826642C
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436
+BattleFrontier_ReceptionGate_EventScript_RulesGuide:: @ 8266436
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266E66, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToRules, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
-	message BattleFrontier_ReceptionGate_Text_266EE0
+BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhat
 	waitmessage
 	multichoice 15, 0, MULTI_FRONTIER_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2664A4
-	case 1, BattleFrontier_ReceptionGate_EventScript_2664B2
-	case 2, BattleFrontier_ReceptionGate_EventScript_2664C0
-	case 3, BattleFrontier_ReceptionGate_EventScript_2664CE
-	case 4, BattleFrontier_ReceptionGate_EventScript_2664DC
-	case 5, BattleFrontier_ReceptionGate_EventScript_2664EA
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_2664EA
+	case 0, BattleFrontier_ReceptionGate_EventScript_LevelMode
+	case 1, BattleFrontier_ReceptionGate_EventScript_Level50
+	case 2, BattleFrontier_ReceptionGate_EventScript_OpenLevel
+	case 3, BattleFrontier_ReceptionGate_EventScript_MonEntry
+	case 4, BattleFrontier_ReceptionGate_EventScript_HoldItems
+	case 5, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4
-	msgbox BattleFrontier_ReceptionGate_Text_266F04, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_LevelMode:: @ 82664A4
+	msgbox BattleFrontier_ReceptionGate_Text_LevelModeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2
-	msgbox BattleFrontier_ReceptionGate_Text_266F69, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_Level50:: @ 82664B2
+	msgbox BattleFrontier_ReceptionGate_Text_Level50Info, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0
-	msgbox BattleFrontier_ReceptionGate_Text_267080, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_OpenLevel:: @ 82664C0
+	msgbox BattleFrontier_ReceptionGate_Text_OpenLevelInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE
-	msgbox BattleFrontier_ReceptionGate_Text_26716A, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_MonEntry:: @ 82664CE
+	msgbox BattleFrontier_ReceptionGate_Text_MonEntryInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC
-	msgbox BattleFrontier_ReceptionGate_Text_267298, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_HoldItems:: @ 82664DC
+	msgbox BattleFrontier_ReceptionGate_Text_HoldItemsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide:: @ 82664EA
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4
+BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide:: @ 82664F4
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_267357, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504
-	message BattleFrontier_ReceptionGate_Text_26737C
+BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @ 8266504
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich1
 	waitmessage
 	multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_26654C
-	case 1, BattleFrontier_ReceptionGate_EventScript_26655A
-	case 2, BattleFrontier_ReceptionGate_EventScript_266568
-	case 3, BattleFrontier_ReceptionGate_EventScript_266576
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_266576
+	case 0, BattleFrontier_ReceptionGate_EventScript_Symbols
+	case 1, BattleFrontier_ReceptionGate_EventScript_RecordBattle
+	case 2, BattleFrontier_ReceptionGate_EventScript_BattlePoints
+	case 3, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C
-	msgbox BattleFrontier_ReceptionGate_Text_2673A1, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_Symbols:: @ 826654C
+	msgbox BattleFrontier_ReceptionGate_Text_SymbolsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A
-	msgbox BattleFrontier_ReceptionGate_Text_2674F3, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_RecordBattle:: @ 826655A
+	msgbox BattleFrontier_ReceptionGate_Text_RecordedBattleInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568
-	msgbox BattleFrontier_ReceptionGate_Text_26761C, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_BattlePoints:: @ 8266568
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePointsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide:: @ 8266576
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_Text_266580: @ 8266580
+BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay: @ 8266580
 	.string "Is it your first time here?\n"
 	.string "Please step this way!$"
 
-BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2
+BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier: @ 82665B2
 	.string "The front lines of POKéMON battling!\n"
 	.string "Welcome to the BATTLE FRONTIER!$"
 
-BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7
+BattleFrontier_ReceptionGate_Text_IssueFrontierPass: @ 82665F7
 	.string "For a first-time visitor, we issue\n"
 	.string "the FRONTIER PASS.\p"
 	.string "It's for use at all the facilities\n"
 	.string "in the BATTLE FRONTIER.\p"
 	.string "Here you are!$"
 
-BattleFrontier_ReceptionGate_Text_266676: @ 8266676
+BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass: @ 8266676
 	.string "{PLAYER} obtained\n"
 	.string "the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_266695: @ 8266695
+BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass: @ 8266695
 	.string "{PLAYER} placed the TRAINER CARD\n"
 	.string "in the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6
+BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier: @ 82666C6
 	.string "We hope you enjoy all that the BATTLE\n"
 	.string "FRONTIER has to offer!$"
 
-BattleFrontier_ReceptionGate_Text_266703: @ 8266703
+BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame: @ 8266703
 	.string "???: Well, if it isn't {PLAYER}{KUN}!\n"
 	.string "You came out here!$"
 
-BattleFrontier_ReceptionGate_Text_266733: @ 8266733
+BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay: @ 8266733
 	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
 	.string "Good day to you, sir!$"
 
-BattleFrontier_ReceptionGate_Text_266764: @ 8266764
+BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
 	.string "SCOTT: It's great to see you here,\n"
 	.string "it really is!\p"
 	.string "I hope you'll take your time and\n"
@@ -338,21 +339,21 @@ BattleFrontier_ReceptionGate_Text_266764: @ 8266764
 	.string "I also have my quarters here, so feel\n"
 	.string "free to visit if you have time.$"
 
-BattleFrontier_ReceptionGate_Text_266857: @ 8266857
+BattleFrontier_ReceptionGate_Text_YourGuideToFacilities: @ 8266857
 	.string "I'm your guide to the various facilities\n"
 	.string "here in the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_26689D: @ 826689D
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich2: @ 826689D
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2
+BattleFrontier_ReceptionGate_Text_BattleTowerInfo: @ 82668C2
 	.string "It is the gigantic tower considered\n"
 	.string "to be the BATTLE FRONTIER's symbol.\p"
 	.string "There are four kinds of BATTLE ROOMS\n"
 	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
 	.string "and LINK MULTI BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
+BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
 	.string "The BATTLE DOME is the large building\n"
 	.string "shaped like a huge egg.\p"
 	.string "Events named Battle Tourneys are held\n"
@@ -361,20 +362,20 @@ BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
 	.string "two courses--for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34
+BattleFrontier_ReceptionGate_Text_BattlePalaceInfo: @ 8266A34
 	.string "The BATTLE PALACE is the red building\n"
 	.string "on the right of the BATTLE FRONTIER.\p"
 	.string "There are two kinds of BATTLE HALLS\n"
 	.string "for SINGLE and DOUBLE BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2
+BattleFrontier_ReceptionGate_Text_BattleArenaInfo: @ 8266AC2
 	.string "The BATTLE ARENA is the dojo-like\n"
 	.string "building at the center-right of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Set KO Tourney\n"
 	.string "takes place at the BATTLE ARENA.$"
 
-BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
+BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
 	.string "The BATTLE FACTORY is the large\n"
 	.string "building that is the closest to us.\p"
 	.string "An event called the Battle Swap\n"
@@ -383,20 +384,20 @@ BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
 	.string "two courses for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24
+BattleFrontier_ReceptionGate_Text_BattlePikeInfo: @ 8266C24
 	.string "The BATTLE PIKE is the building shaped\n"
 	.string "like a POKéMON at the center-left of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Battle Choice\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB
+BattleFrontier_ReceptionGate_Text_BattlePyramidInfo: @ 8266CBB
 	.string "The BATTLE PYRAMID is the enormous\n"
 	.string "pyramid.\p"
 	.string "An event called the Battle Quest\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
+BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
 	.string "The RANKING HALL is located near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "There, you may see the most fantastic\n"
@@ -404,28 +405,28 @@ BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
 	.string "took on the many challenges of\l"
 	.string "the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB
+BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo: @ 8266DCB
 	.string "The EXCHANGE SERVICE CORNER is near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "The Battle Points you have earned in\n"
 	.string "the BATTLE FRONTIER may be exchanged\l"
 	.string "for fabulous prizes there.$"
 
-BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66
+BattleFrontier_ReceptionGate_Text_YourGuideToRules: @ 8266E66
 	.string "I'm your guide to the basic rules that\n"
 	.string "are common to all the challenges\l"
 	.string "offered by the facilities in the BATTLE\l"
 	.string "FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0
+BattleFrontier_ReceptionGate_Text_LearnAboutWhat: @ 8266EE0
 	.string "What would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04
+BattleFrontier_ReceptionGate_Text_LevelModeInfo: @ 8266F04
 	.string "All the challenges at the BATTLE\n"
 	.string "FRONTIER's facilities come in\l"
 	.string "two courses--Level 50 and Open Level.$"
 
-BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
+BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
 	.string "The Level 50 course is open to POKéMON\n"
 	.string "up to and including Level 50.\p"
 	.string "Please keep in mind, however, that\n"
@@ -436,7 +437,7 @@ BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
 	.string "To begin, we hope you will challenge\n"
 	.string "this course.$"
 
-BattleFrontier_ReceptionGate_Text_267080: @ 8267080
+BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
 	.string "The Open Level course places no limit\n"
 	.string "on the levels of POKéMON entering\l"
 	.string "challenges.\p"
@@ -446,7 +447,7 @@ BattleFrontier_ReceptionGate_Text_267080: @ 8267080
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 60.$"
 
-BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
+BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
 	.string "Virtually any kind of POKéMON may take\n"
 	.string "on the challenges at all facilities.\p"
 	.string "EGGS and certain kinds of POKéMON,\n"
@@ -457,7 +458,7 @@ BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
 	.string "of the same kind of POKéMON are not\l"
 	.string "permitted.$"
 
-BattleFrontier_ReceptionGate_Text_267298: @ 8267298
+BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
 	.string "When entering a challenge at a BATTLE\n"
 	.string "FRONTIER facility, POKéMON may not\l"
 	.string "be holding the same kind of item.\p"
@@ -465,13 +466,13 @@ BattleFrontier_ReceptionGate_Text_267298: @ 8267298
 	.string "entering a challenge are holding\l"
 	.string "different items.$"
 
-BattleFrontier_ReceptionGate_Text_267357: @ 8267357
+BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass: @ 8267357
 	.string "I'm your guide to the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_26737C: @ 826737C
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich1: @ 826737C
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
+BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
 	.string "There are seven facilities at\n"
 	.string "the BATTLE FRONTIER.\p"
 	.string "TRAINERS who gain recognition for\n"
@@ -483,7 +484,7 @@ BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
 	.string "It's certainly not easy to win symbols.\n"
 	.string "I wish you the best of luck!$"
 
-BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
+BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
 	.string "It is possible to record one battle\n"
 	.string "on your FRONTIER PASS.\p"
 	.string "You may record a battle you had with\n"
@@ -495,7 +496,7 @@ BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
 	.string "You may choose to record your match\n"
 	.string "at the end of a battle.$"
 
-BattleFrontier_ReceptionGate_Text_26761C: @ 826761C
+BattleFrontier_ReceptionGate_Text_BattlePointsInfo: @ 826761C
 	.string "Battle Points are rewards given to\n"
 	.string "TRAINERS who battled outstandingly\l"
 	.string "at the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json
index bff7696b3..13cb13dd4 100644
--- a/data/maps/BattleFrontier_ScottsHouse/map.json
+++ b/data/maps/BattleFrontier_ScottsHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ScottsHouse_EventScript_2636A8",
+      "script": "BattleFrontier_ScottsHouse_EventScript_Scott",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index eeb6f6904..c2f7b3fbc 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -1,252 +1,232 @@
 BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
 	.byte 0
 
-BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
+BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_2637DA
-	goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_2638AA
-	goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_263939
-	goto BattleFrontier_ScottsHouse_EventScript_2636CB
+	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_GivenBerry
+	goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_GivenShield
+	goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints
+	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveItems
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
-	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943
-	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704
-	goto_if_unset FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
-	goto BattleFrontier_ScottsHouse_EventScript_2636EC
+BattleFrontier_ScottsHouse_EventScript_CheckGiveItems:: @ 82636CB
+	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier
+	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols
+	goto_if_unset FLAG_COLLECTED_ALL_GOLD_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols
+	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC
-	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_26381B
-	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_2638B4
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveShield:: @ 82636EC
+	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield
+	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
-	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
+	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT
 	giveitem_std ITEM_LANSAT_BERRY
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
 	setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
 	setflag FLAG_TEMP_4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
-	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
+	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT
 	giveitem_std ITEM_STARF_BERRY
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
-	setflag FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
+	setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS
 	setflag FLAG_TEMP_4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0
-	msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_BerryPocketFull:: @ 82637D0
+	msgbox BattleFrontier_ScottsHouse_Text_BerryPocketStuffed, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA
-	msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenBerry:: @ 82637DA
+	msgbox BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4
+BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
 	random 3
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_263807
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_263811
-	msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment
+	msgbox BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807
-	msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment:: @ 8263807
+	msgbox BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811
-	msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
+	msgbox BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
+BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	frontier_setlvlmode FRONTIER_LVL_50
+	battletower_getstreak
 	compare VAR_RESULT, 50
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
+	frontier_setlvlmode FRONTIER_LVL_OPEN
+	battletower_getstreak
 	compare VAR_RESULT, 50
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
-	msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
+	msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
 	givedecoration_std DECOR_SILVER_SHIELD
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_SILVER_SHIELD
 	setflag FLAG_TEMP_3
-	goto BattleFrontier_ScottsHouse_EventScript_2638AA
+	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0
-	msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_NoRoomForShield:: @ 82638A0
+	msgbox BattleFrontier_ScottsHouse_Text_ComeBackForThisLater, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA
-	msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
+	msgbox BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	frontier_setlvlmode FRONTIER_LVL_50
+	battletower_getstreak
 	compare VAR_RESULT, 100
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
+	frontier_setlvlmode FRONTIER_LVL_OPEN
+	battletower_getstreak
 	compare VAR_RESULT, 100
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
-	msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
+	msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
 	givedecoration_std DECOR_GOLD_SHIELD
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_GOLD_SHIELD
 	setflag FLAG_TEMP_3
-	goto BattleFrontier_ScottsHouse_EventScript_2638AA
+	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939
-	msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints:: @ 8263939
+	msgbox BattleFrontier_ScottsHouse_Text_ExpectingGreatThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
-	msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
+	msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
-	msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest
+	msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT
 	compare VAR_SCOTT_STATE, 13
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints
 	compare VAR_SCOTT_STATE, 9
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints
 	compare VAR_SCOTT_STATE, 6
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
-	goto BattleFrontier_ScottsHouse_EventScript_2639E9
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints
+	goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639BC:: @ 82639BC
+BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints:: @ 82639BC
 	buffernumberstring 0, 4
 	setvar VAR_0x8004, 4
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639CB:: @ 82639CB
+BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints:: @ 82639CB
 	buffernumberstring 0, 3
 	setvar VAR_0x8004, 3
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639DA:: @ 82639DA
+BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints:: @ 82639DA
 	buffernumberstring 0, 2
 	setvar VAR_0x8004, 2
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
+BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint:: @ 82639E9
 	buffernumberstring 0, 1
 	setvar VAR_0x8004, 1
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
+BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
 	special GiveFrontierBattlePoints
-	msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
-	msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
+	msgbox BattleFrontier_ScottsHouse_Text_ExplainBattlePoints, MSGBOX_DEFAULT
 	setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
 	setflag FLAG_TEMP_2
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: @ 8263A13
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: @ 8263A1E
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: @ 8263A29
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: @ 8263A34
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F
+BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
 	.string "SCOTT: Well, hello and welcome!\n"
 	.string "Heheh… Sorry about the cramped space.\p"
 	.string "Anyway, {PLAYER}{KUN}, let me formally\n"
@@ -255,7 +235,7 @@ BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F
 	.string "It took me years and years, but I've\l"
 	.string "finally given shape to my dream.$"
 
-BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29
+BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
 	.string "On reflection, it was a terribly long\n"
 	.string "journey…\p"
 	.string "I left home alone on a quest to find\n"
@@ -263,7 +243,7 @@ BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29
 	.string "No one can imagine how much effort\n"
 	.string "or time it took to make this real.$"
 
-BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4
+BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
 	.string "But that's all in the past.\n"
 	.string "No point dwelling on that!\p"
 	.string "All I want for you is to enjoy battling\n"
@@ -272,11 +252,11 @@ BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4
 	.string "as a memento for all the time our\l"
 	.string "paths crossed on our journeys.$"
 
-BattleFrontier_ScottsHouse_Text_263CB0: @ 8263CB0
+BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints: @ 8263CB0
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Point(s).$"
 
-BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0
+BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
 	.string "SCOTT: You can check your Battle\n"
 	.string "Points on your FRONTIER PASS.\p"
 	.string "The more success you have here at\n"
@@ -285,10 +265,10 @@ BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0
 	.string "Use your Battle Points the way you\n"
 	.string "see fit, like trading them for items.$"
 
-BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8
+BattleFrontier_ScottsHouse_Text_ExpectingGreatThings: @ 8263DB8
 	.string "I'm expecting great things from you!$"
 
-BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD
+BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
 	.string "SCOTT: Every TRAINER is an individual.\n"
 	.string "They all lead lives of their own.\p"
 	.string "But when they're in a battle,\n"
@@ -300,7 +280,7 @@ BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD
 	.string "TRAINERS who are serious about\l"
 	.string "battling, and invite them here.$"
 
-BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12
+BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
 	.string "SCOTT: Have you met any of\n"
 	.string "the FRONTIER BRAINS?\p"
 	.string "Better yet, have you obtained any\n"
@@ -310,7 +290,7 @@ BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12
 	.string "But I'm sure that seeing how tough\n"
 	.string "you are will startle even them!$"
 
-BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE
+BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
 	.string "SCOTT: You don't just train for battle,\n"
 	.string "right?\p"
 	.string "I think I remember you working on\n"
@@ -320,7 +300,7 @@ BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE
 	.string "the BATTLE FRONTIER somewhere…\l"
 	.string "Fufufu!$"
 
-BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
 	.string "SCOTT: Are you enjoying things in\n"
 	.string "the BATTLE FRONTIER?\p"
 	.string "…Wait a second…\n"
@@ -335,7 +315,7 @@ BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC
 	.string "I want you to have this.\n"
 	.string "I'm sure you can put it to proper use.$"
 
-BattleFrontier_ScottsHouse_Text_264216: @ 8264216
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
 	.string "SCOTT: I hope you're enjoying\n"
 	.string "everything in the BATTLE FRONTIER.\p"
 	.string "…Wait a second…\n"
@@ -350,35 +330,35 @@ BattleFrontier_ScottsHouse_Text_264216: @ 8264216
 	.string "I think you will be able to\n"
 	.string "appreciate the value of my gift!$"
 
-BattleFrontier_ScottsHouse_Text_264373: @ 8264373
+BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere: @ 8264373
 	.string "I must say I have the gift of knowing\n"
 	.string "a good TRAINER when I see one.\p"
 	.string "I'm so glad I had the foresight to\n"
 	.string "bring you here!$"
 
-BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB
+BattleFrontier_ScottsHouse_Text_BerryPocketStuffed: @ 82643EB
 	.string "Your BERRY POCKET seems to\n"
 	.string "be stuffed.$"
 
-BattleFrontier_ScottsHouse_Text_264412: @ 8264412
+BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow: @ 8264412
 	.string "SCOTT: Oh, I heard about you!\n"
 	.string "How you ruled the BATTLE TOWER!\l"
 	.string "You beat over 50 TRAINERS in a row?\p"
 	.string "That's fantastic!\n"
 	.string "I want you to have this!$"
 
-BattleFrontier_ScottsHouse_Text_26449F: @ 826449F
+BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow: @ 826449F
 	.string "SCOTT: Oh, my! I heard about you!\n"
 	.string "How you overwhelmed the BATTLE TOWER!\l"
 	.string "You beat over 100 TRAINERS in a row?\p"
 	.string "That's ridiculously spectacular!\n"
 	.string "You've got to have this!$"
 
-BattleFrontier_ScottsHouse_Text_264546: @ 8264546
+BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings: @ 8264546
 	.string "I'll be expecting to hear even greater\n"
 	.string "things about you now!$"
 
-BattleFrontier_ScottsHouse_Text_264583: @ 8264583
+BattleFrontier_ScottsHouse_Text_ComeBackForThisLater: @ 8264583
 	.string "Oops, well, if you have too much\n"
 	.string "stuff, come back for this later.$"
 
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index c3e5ddddf..50bd57f0b 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BirthIsland_Exterior_EventScript_267F83",
+      "script": "BirthIsland_Exterior_EventScript_Triangle",
       "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE"
     },
     {
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 72469f519..b51940a7c 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -1,11 +1,11 @@
 BirthIsland_Exterior_MapScripts:: @ 8267F15
 	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
+	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField
 	.byte 0
 
-BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
-	special sub_813B1D0
+BirthIsland_Exterior_OnReturnToField: @ 8267F25
+	special SetDeoxysRockPalette
 	end
 
 BirthIsland_Exterior_OnTransition: @ 8267F29
@@ -13,57 +13,57 @@ BirthIsland_Exterior_OnTransition: @ 8267F29
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
 	setvar VAR_DEOXYS_ROCK_LEVEL, 0
-	call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E
-	call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55
+	call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle
+	call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle
 	end
 
-BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
+BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 8267F4E
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	return
 
-BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
+BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8267F55
 	goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
 
-BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F
+BirthIsland_Exterior_OnResume: @ 8267F65
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys
 	end
 
-BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
+BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 8267F6F
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject 2
 	return
 
-BirthIsland_Exterior_EventScript_267F83:: @ 8267F83
+BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
 	lock
 	faceplayer
 	special DoDeoxysRockInteraction
 	waitstate
 	switch VAR_RESULT
-	case 0, BirthIsland_Exterior_EventScript_267FBB
-	case 1, BirthIsland_Exterior_EventScript_267FBD
-	case 2, BirthIsland_Exterior_EventScript_267FC1
-	case 3, BirthIsland_Exterior_EventScript_267FBF
+	case 0, BirthIsland_Exterior_EventScript_NotSolved1
+	case 1, BirthIsland_Exterior_EventScript_NotSolved2
+	case 2, BirthIsland_Exterior_EventScript_Deoxys
+	case 3, BirthIsland_Exterior_EventScript_NotSolved3
 	end
 
-BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB
+BirthIsland_Exterior_EventScript_NotSolved1:: @ 8267FBB
 	release
 	end
 
-BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD
+BirthIsland_Exterior_EventScript_NotSolved2:: @ 8267FBD
 	release
 	end
 
-BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF
+BirthIsland_Exterior_EventScript_NotSolved3:: @ 8267FBF
 	release
 	end
 
-BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
+BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
 	waitse
 	setfieldeffectargument 0, 1
 	setfieldeffectargument 1, 58
@@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	playbgm MUS_RG_DEOEYE, 0
 	waitfieldeffect FLDEFF_65
 	addobject 2
-	applymovement 2, BirthIsland_Exterior_Movement_268054
+	applymovement 2, BirthIsland_Exterior_Movement_DeoxysApproach
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_DEOXYS, 2
@@ -80,7 +80,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	waitmoncry
 	setvar VAR_LAST_TALKED, 2
 	setvar VAR_0x8004, SPECIES_DEOXYS
-	setvar VAR_0x8005, 30 @level
+	setvar VAR_0x8005, 30 @ level
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -89,27 +89,27 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq BirthIsland_Exterior_EventScript_26803B
+	goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq BirthIsland_Exterior_EventScript_268049
+	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq BirthIsland_Exterior_EventScript_268049
+	goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
 	setflag FLAG_BATTLED_DEOXYS
 	release
 	end
 
-BirthIsland_Exterior_EventScript_26803B:: @ 826803B
+BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 826803B
 	setflag FLAG_DEFEATED_DEOXYS
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_EventScript_268049:: @ 8268049
+BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8268049
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_Movement_268054: @ 8268054
+BirthIsland_Exterior_Movement_DeoxysApproach: @ 8268054
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index 48937d482..ea124d9ef 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BirthIsland_Harbor_EventScript_26805D",
+      "script": "BirthIsland_Harbor_EventScript_Sailor",
       "flag": "0"
     },
     {
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
index a42152183..f19b373f5 100644
--- a/data/maps/BirthIsland_Harbor/scripts.inc
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -1,12 +1,12 @@
 BirthIsland_Harbor_MapScripts:: @ 826805C
 	.byte 0
 
-BirthIsland_Harbor_EventScript_26805D:: @ 826805D
+BirthIsland_Harbor_EventScript_Sailor:: @ 826805D
 	lock
 	faceplayer
 	msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq BirthIsland_Harbor_EventScript_2680A2
+	compare VAR_RESULT, NO
+	goto_if_eq BirthIsland_Harbor_EventScript_AsYouLike
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -14,13 +14,13 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	delay 30
 	hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR
 	setvar VAR_0x8004, 2
-	call BirthIsland_Harbor_EventScript_272250
+	call Common_EventScript_FerryDepartIsland
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2
+BirthIsland_Harbor_EventScript_AsYouLike:: @ 82680A2
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 8c72ec4b8..de1d979d4 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
 	.byte 0
 
 CaveOfOrigin_1F_OnTransition: @ 823576E
-	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
 	end
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
index ac3baeaf8..61d8dc715 100644
--- a/data/maps/CaveOfOrigin_B1F/map.json
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "CaveOfOrigin_B1F_EventScript_2357A9",
+      "script": "CaveOfOrigin_B1F_EventScript_Wallace",
       "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE"
     }
   ],
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 5a6383199..378819f43 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -1,10 +1,10 @@
 CaveOfOrigin_B1F_MapScripts:: @ 82357A8
 	.byte 0
 
-CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
+CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
 	lock
 	faceplayer
-	msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
+	msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -17,37 +17,37 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
 	delay 30
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	message CaveOfOrigin_B1F_Text_235ACE
+	message CaveOfOrigin_B1F_Text_WhereIsRayquaza
 	waitmessage
-	goto CaveOfOrigin_B1F_EventScript_2357F0
+	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0
+CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
 	multichoice 0, 0, MULTI_WHERES_RAYQUAZA, 0
 	switch VAR_RESULT
-	case 0, CaveOfOrigin_B1F_EventScript_23582C
-	case 1, CaveOfOrigin_B1F_EventScript_235837
-	case 2, CaveOfOrigin_B1F_EventScript_23584D
-	case 3, CaveOfOrigin_B1F_EventScript_235842
-	goto CaveOfOrigin_B1F_EventScript_235842
+	case 0, CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin
+	case 1, CaveOfOrigin_B1F_EventScript_AtMtPyre
+	case 2, CaveOfOrigin_B1F_EventScript_AtSkyPillar
+	case 3, CaveOfOrigin_B1F_EventScript_DontRemember
+	goto CaveOfOrigin_B1F_EventScript_DontRemember
 	end
 
-CaveOfOrigin_B1F_EventScript_23582C:: @ 823582C
-	message CaveOfOrigin_B1F_Text_235B23
+CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin:: @ 823582C
+	message CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin
 	waitmessage
-	goto CaveOfOrigin_B1F_EventScript_2357F0
+	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_235837:: @ 8235837
-	message CaveOfOrigin_B1F_Text_235BBF
+CaveOfOrigin_B1F_EventScript_AtMtPyre:: @ 8235837
+	message CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat
 	waitmessage
-	goto CaveOfOrigin_B1F_EventScript_2357F0
+	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_235842:: @ 8235842
-	message CaveOfOrigin_B1F_Text_235C99
+CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842
+	message CaveOfOrigin_B1F_Text_CantYouRememberSomehow
 	waitmessage
-	goto CaveOfOrigin_B1F_EventScript_2357F0
+	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
-	msgbox CaveOfOrigin_B1F_Text_235CEE, MSGBOX_DEFAULT
+CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
+	msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	playse SE_KAIDAN
 	fadescreenspeed 1, 4
@@ -59,7 +59,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
 	release
 	end
 
-CaveOfOrigin_B1F_Text_23586E: @ 823586E
+CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E
 	.string "Ah, so you are {PLAYER}{KUN}?\n"
 	.string "I've heard tales of your exploits.\p"
 	.string "My name is WALLACE.\p"
@@ -83,19 +83,19 @@ CaveOfOrigin_B1F_Text_23586E: @ 823586E
 	.string "But even I have no clue as to\n"
 	.string "RAYQUAZA's whereabouts…$"
 
-CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE
+CaveOfOrigin_B1F_Text_WhereIsRayquaza: @ 8235ACE
 	.string "WALLACE: {PLAYER}{KUN}, do you perhaps\n"
 	.string "know where RAYQUAZA is now?\p"
 	.string "If you do, please tell me.$"
 
-CaveOfOrigin_B1F_Text_235B23: @ 8235B23
+CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin: @ 8235B23
 	.string "WALLACE: The CAVE OF ORIGIN?\p"
 	.string "But that's right here!\n"
 	.string "I need you to do better than that!\p"
 	.string "Please, I need you to think about\n"
 	.string "where RAYQUAZA might be right now.$"
 
-CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF
+CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF
 	.string "WALLACE: MT. PYRE?\p"
 	.string "But when I met the old lady there\n"
 	.string "earlier, she made no mention of it.\p"
@@ -104,12 +104,12 @@ CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF
 	.string "{PLAYER}{KUN}, could you think about this\n"
 	.string "more carefully for me?$"
 
-CaveOfOrigin_B1F_Text_235C99: @ 8235C99
+CaveOfOrigin_B1F_Text_CantYouRememberSomehow: @ 8235C99
 	.string "WALLACE: Huh? You don't remember?\n"
 	.string "Hmm… That's a problem…\p"
 	.string "Can't you remember somehow?$"
 
-CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE
+CaveOfOrigin_B1F_Text_WellHeadToSkyPillar: @ 8235CEE
 	.string "WALLACE: The SKY PILLAR?\p"
 	.string "That's it!\n"
 	.string "It must be the SKY PILLAR!\p"
diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 53228f63c..76cdbc7ad 100644
--- a/data/maps/CaveOfOrigin_Entrance/scripts.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
@@ -1,8 +1,8 @@
 CaveOfOrigin_Entrance_MapScripts:: @ 8235759
-	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F
+	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_OnResume
 	.byte 0
 
-CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F
+CaveOfOrigin_Entrance_OnResume: @ 823575F
 	setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17
 	end
 
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index bc574be2d..326ea21e3 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
@@ -3,5 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
-	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
 	end
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index 340e4a585..5e92a7d45 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
-	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
 	end
 
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index f2e118907..2f0e2b66c 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
 	.byte 0
 
 CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
-	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
+	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
 	end
 
diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/ContestHall/map.json
index 664a32b29..1402a9afa 100644
--- a/data/maps/LinkContestRoom1/map.json
+++ b/data/maps/ContestHall/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM1",
-  "name": "LinkContestRoom1",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM1",
+  "id": "MAP_CONTEST_HALL",
+  "name": "ContestHall",
+  "layout": "LAYOUT_CONTEST_HALL",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -181,7 +181,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_LINK_CONTEST_POKE_BALL"
+      "flag": "FLAG_HIDE_CONTEST_POKE_BALL"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_VAR_3",
diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc
new file mode 100644
index 000000000..e1ef9b708
--- /dev/null
+++ b/data/maps/ContestHall/scripts.inc
@@ -0,0 +1,460 @@
+ContestHall_MapScripts:: @ 823B781
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame
+	map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
+	map_script MAP_SCRIPT_ON_RESUME, ContestHall_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
+	.byte 0
+
+ContestHall_OnReturn: @ 823B79B
+	special LoadLinkContestPlayerPalettes
+	end
+
+ContestHall_OnTransition: @ 823B79F
+	call ContestHall_EventScript_ReadyContestMusic
+	setvar VAR_TEMP_0, 1
+	call ContestHall_EventScript_AddRandomAudienceMembers
+	end
+
+ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
+	call ContestHall_EventScript_TryWaitForLink
+	special ScriptGetMultiplayerId
+	compare VAR_RESULT, 0
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
+	compare VAR_RESULT, 1
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer2
+	compare VAR_RESULT, 2
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer3
+	compare VAR_RESULT, 3
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer4
+	compare VAR_RESULT, 4
+	call_if_eq ContestHall_EventScript_SaveContestMusic
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
+	savebgm MUS_TEST1
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
+	savebgm MUS_TEST2
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
+	savebgm MUS_TEST3
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
+	savebgm MUS_TEST4
+	return
+
+ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
+	savebgm MUS_CONTEST0
+	return
+
+ContestHall_OnResume: @ 823B803
+	compare VAR_TEMP_9, 1
+	call_if_eq ContestHall_EventScript_ReShowAudience
+	end
+
+ContestHall_EventScript_ReShowAudience:: @ 823B80F
+	call ContestHall_EventScript_CreateAudience
+	return
+
+ContestHall_OnFrame: @ 823B815
+	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
+	.2byte 0
+
+ContestHall_OnWarp: @ 823B81F
+	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
+	.2byte 0
+
+ContestHall_EventScript_Contest:: @ 823B829
+	call ContestHall_EventScript_DoContest
+	call ContestHall_EventScript_SetExitWarp
+	end
+
+ContestHall_EventScript_SetContestObjects:: @ 823B834
+	special LoadLinkContestPlayerPalettes
+	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
+	call ContestHall_EventScript_CreateAudience
+	end
+
+@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist)
+@ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
+ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
+	call ContestHall_EventScript_GetRandomAudienceGfxId
+	call ContestHall_EventScript_SetRandomAudienceGfx
+	compare VAR_TEMP_0, 8
+	goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
+	return
+
+ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
+	switch VAR_TEMP_0
+	case 1, ContestHall_EventScript_SetRandomAudience1
+	case 2, ContestHall_EventScript_SetRandomAudience2
+	case 3, ContestHall_EventScript_SetRandomAudience3
+	case 4, ContestHall_EventScript_SetRandomAudience4
+	case 5, ContestHall_EventScript_SetRandomAudience5
+	case 6, ContestHall_EventScript_SetRandomAudience6
+	case 7, ContestHall_EventScript_SetRandomAudience7
+	end
+
+ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
+	setvar VAR_RESULT, 32
+	special ScriptRandom
+	addvar VAR_RESULT, 1
+	switch VAR_RESULT
+	case 1, ContestHall_EventScript_RandomAudienceNinjaBoy
+	case 2, ContestHall_EventScript_RandomAudienceTwin
+	case 3, ContestHall_EventScript_RandomAudienceBoy1
+	case 4, ContestHall_EventScript_RandomAudienceGirl1
+	case 5, ContestHall_EventScript_RandomAudienceGirl2
+	case 6, ContestHall_EventScript_RandomAudienceLittleBoy
+	case 7, ContestHall_EventScript_RandomAudienceGirl
+	case 8, ContestHall_EventScript_RandomAudienceBoy3
+	case 9, ContestHall_EventScript_RandomAudienceGirl3
+	case 10, ContestHall_EventScript_RandomAudienceRichBoy
+	case 11, ContestHall_EventScript_RandomAudienceFatMan
+	case 12, ContestHall_EventScript_RandomAudiencePokefanF
+	case 13, ContestHall_EventScript_RandomAudienceMan1
+	case 14, ContestHall_EventScript_RandomAudienceWoman2
+	case 15, ContestHall_EventScript_RandomAudienceExpertM
+	case 16, ContestHall_EventScript_RandomAudienceExpertF
+	case 17, ContestHall_EventScript_RandomAudiencePokefanM
+	case 18, ContestHall_EventScript_RandomAudienceWoman4
+	case 19, ContestHall_EventScript_RandomAudienceCook
+	case 20, ContestHall_EventScript_RandomAudienceLass
+	case 21, ContestHall_EventScript_RandomAudienceOldWoman
+	case 22, ContestHall_EventScript_RandomAudienceCamper
+	case 23, ContestHall_EventScript_RandomAudiencePicnicker
+	case 24, ContestHall_EventScript_RandomAudienceMan3
+	case 25, ContestHall_EventScript_RandomAudienceWoman5
+	case 26, ContestHall_EventScript_RandomAudienceYoungster
+	case 27, ContestHall_EventScript_RandomAudienceBugCatcher
+	case 28, ContestHall_EventScript_RandomAudiencePsychicM
+	case 29, ContestHall_EventScript_RandomAudienceSchoolKidM
+	case 30, ContestHall_EventScript_RandomAudienceBlackBelt
+	case 31, ContestHall_EventScript_RandomAudienceBeauty
+	case 32, ContestHall_EventScript_RandomAudienceScientist1
+	end
+
+ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
+	return
+
+ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
+	return
+
+ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
+	return
+
+ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
+	return
+
+ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
+	return
+
+ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
+	return
+
+ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
+	return
+
+ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
+	return
+
+ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
+	return
+
+ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
+	return
+
+ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
+	return
+
+ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
+	return
+
+ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
+	return
+
+ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
+	return
+
+ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
+	return
+
+ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
+	return
+
+ContestHall_EventScript_RandomAudienceLass:: @ 823BADD
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
+	return
+
+ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
+	return
+
+ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
+	return
+
+ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
+	return
+
+ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
+	return
+
+ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
+	return
+
+ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
+	return
+
+ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
+	return
+
+ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
+	return
+
+ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
+	return
+
+ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
+	return
+
+ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
+	return
+
+ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
+	return
+
+ContestHall_EventScript_CreateAudience:: @ 823BB2B
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
+	switch VAR_CONTEST_TYPE
+	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience
+	case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience
+	case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_CreateHyperContestAudience
+	case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_CreateMasterContestAudience
+	case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience
+	return
+
+ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
+	return
+
+ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
+	return
+
+ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_SetExitWarp:: @ 823BE44
+	special ClearLinkContestFlags
+	switch VAR_CONTEST_TYPE
+	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest
+	case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_SetExitWarpSuperContest
+	case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_SetExitWarpHyperContest
+	case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_SetExitWarpMasterContest
+	case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest
+	return
+
+ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
+	compare VAR_RESULT, FEMALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
+	return
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
+
diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/ContestHallBeauty/map.json
index b02da178f..daad0f962 100644
--- a/data/maps/LinkContestRoom2/map.json
+++ b/data/maps/ContestHallBeauty/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM2",
-  "name": "LinkContestRoom2",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM2",
+  "id": "MAP_CONTEST_HALL_BEAUTY",
+  "name": "ContestHallBeauty",
+  "layout": "LAYOUT_CONTEST_HALL_BEAUTY",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/ContestHallCool/map.json
index fb0bf29e0..d1c2e985c 100644
--- a/data/maps/LinkContestRoom3/map.json
+++ b/data/maps/ContestHallCool/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM3",
-  "name": "LinkContestRoom3",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM3",
+  "id": "MAP_CONTEST_HALL_COOL",
+  "name": "ContestHallCool",
+  "layout": "LAYOUT_CONTEST_HALL_COOL",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/ContestHallCute/map.json
index 85d12ece4..d6b16dc4e 100644
--- a/data/maps/LinkContestRoom4/map.json
+++ b/data/maps/ContestHallCute/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM4",
-  "name": "LinkContestRoom4",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM4",
+  "id": "MAP_CONTEST_HALL_CUTE",
+  "name": "ContestHallCute",
+  "layout": "LAYOUT_CONTEST_HALL_CUTE",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/ContestHallSmart/map.json
index f312d4c2b..12d3cccd8 100644
--- a/data/maps/LinkContestRoom5/map.json
+++ b/data/maps/ContestHallSmart/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM5",
-  "name": "LinkContestRoom5",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM5",
+  "id": "MAP_CONTEST_HALL_SMART",
+  "name": "ContestHallSmart",
+  "layout": "LAYOUT_CONTEST_HALL_SMART",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json
new file mode 100644
index 000000000..070211173
--- /dev/null
+++ b/data/maps/ContestHallTough/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_CONTEST_HALL_TOUGH",
+  "name": "ContestHallTough",
+  "layout": "LAYOUT_CONTEST_HALL_TOUGH",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
+}
\ No newline at end of file
diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json
index 28a04a458..441157d86 100644
--- a/data/maps/DesertRuins/map.json
+++ b/data/maps/DesertRuins/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DesertRuins_EventScript_22DA02",
+      "script": "DesertRuins_EventScript_Regirock",
       "flag": "FLAG_HIDE_REGIROCK"
     }
   ],
@@ -59,7 +59,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DesertRuins_EventScript_22D9DB"
+      "script": "DesertRuins_EventScript_CaveEntranceMiddle"
     },
     {
       "type": "sign",
@@ -67,7 +67,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DesertRuins_EventScript_22D9F8"
+      "script": "DesertRuins_EventScript_CaveEntranceSide"
     },
     {
       "type": "sign",
@@ -75,7 +75,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DesertRuins_EventScript_22D9F8"
+      "script": "DesertRuins_EventScript_CaveEntranceSide"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index dbadad2ab..bd7b04fb4 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -1,25 +1,25 @@
 DesertRuins_MapScripts:: @ 822D95B
-	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
-	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
+	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
 	.byte 0
 
-DesertRuins_MapScript1_22D96B: @ 822D96B
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975
+DesertRuins_OnResume: @ 822D96B
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_TryRemoveRegirock
 	end
 
-DesertRuins_EventScript_22D975:: @ 822D975
+DesertRuins_EventScript_TryRemoveRegirock:: @ 822D975
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-DesertRuins_MapScript1_22D989: @ 822D989
-	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993
+DesertRuins_OnLoad: @ 822D989
+	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_HideRegiEntrance
 	end
 
-DesertRuins_EventScript_22D993:: @ 822D993
+DesertRuins_EventScript_HideRegiEntrance:: @ 822D993
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -30,36 +30,36 @@ DesertRuins_EventScript_22D993:: @ 822D993
 
 DesertRuins_OnTransition: @ 822D9CA
 	setflag FLAG_LANDMARK_DESERT_RUINS
-	call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
+	call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_ShowRegirock
 	end
 
-DesertRuins_EventScript_22D9D7:: @ 822D9D7
+DesertRuins_EventScript_ShowRegirock:: @ 822D9D7
 	clearflag FLAG_HIDE_REGIROCK
 	return
 
-DesertRuins_EventScript_22D9DB:: @ 822D9DB
+DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB
 	lockall
-	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE
-	braillemessage DesertRuins_Braille_2A6CA0
+	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
+	braillemessage DesertRuins_Braille_UseRockSmash
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-DesertRuins_EventScript_22D9EE:: @ 822D9EE
+DesertRuins_EventScript_BigHoleInWall:: @ 822D9EE
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DesertRuins_EventScript_22D9F8:: @ 822D9F8
+DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8
 	lockall
-	braillemessage DesertRuins_Braille_2A6CA0
+	braillemessage DesertRuins_Braille_UseRockSmash
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-DesertRuins_EventScript_22DA02:: @ 822DA02
+DesertRuins_EventScript_Regirock:: @ 822DA02
 	lock
 	faceplayer
 	waitse
@@ -73,21 +73,21 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq DesertRuins_EventScript_22DA49
+	goto_if_eq DesertRuins_EventScript_DefeatedRegirock
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq DesertRuins_EventScript_22DA52
+	goto_if_eq DesertRuins_EventScript_RanFromRegirock
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq DesertRuins_EventScript_22DA52
+	goto_if_eq DesertRuins_EventScript_RanFromRegirock
 	setflag FLAG_DEFEATED_REGIROCK
 	release
 	end
 
-DesertRuins_EventScript_22DA49:: @ 822DA49
+DesertRuins_EventScript_DefeatedRegirock:: @ 822DA49
 	setflag FLAG_DEFEATED_REGIROCK
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-DesertRuins_EventScript_22DA52:: @ 822DA52
+DesertRuins_EventScript_RanFromRegirock:: @ 822DA52
 	setvar VAR_0x8004, SPECIES_REGIROCK
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json
index ca4b894d4..a3a80d41e 100644
--- a/data/maps/DesertUnderpass/map.json
+++ b/data/maps/DesertUnderpass/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DesertUnderpass_EventScript_23AF41",
+      "script": "DesertUnderpass_EventScript_Fossil",
       "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL"
     }
   ],
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
index 8e89075e5..437f5de4b 100644
--- a/data/maps/DesertUnderpass/scripts.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D
 	setflag FLAG_LANDMARK_DESERT_UNDERPASS
 	end
 
-DesertUnderpass_EventScript_23AF41:: @ 823AF41
+DesertUnderpass_EventScript_Fossil:: @ 823AF41
 	lock
 	faceplayer
-	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57
-	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68
+	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil
+	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil
 	release
 	end
 
-DesertUnderpass_EventScript_23AF57:: @ 823AF57
+DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
 	giveitem_std ITEM_CLAW_FOSSIL
 	removeobject 1
 	release
 	end
 
-DesertUnderpass_EventScript_23AF68:: @ 823AF68
+DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
 	giveitem_std ITEM_ROOT_FOSSIL
 	removeobject 1
 	release
 	end
 
-DesertUnderpass_Text_23AF79:: @ 823AF79
+@ Unused
+DesertUnderpass_Text_FoundRootFossil:: @ 823AF79
 	.string "{PLAYER} found the ROOT FOSSIL.$"
 
-DesertUnderpass_Text_23AF93:: @ 823AF93
+@ Unused
+DesertUnderpass_Text_FoundClawFossil:: @ 823AF93
 	.string "{PLAYER} found the CLAW FOSSIL.$"
 
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index 32fe0c313..bfa5a2e8b 100644
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_EventScript_1E95B1",
+      "script": "DewfordTown_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_EventScript_1E9511",
+      "script": "DewfordTown_EventScript_Briney",
       "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_EventScript_1E95D5",
+      "script": "DewfordTown_EventScript_OldRodFisherman",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_EventScript_1E9922",
+      "script": "DewfordTown_EventScript_TrendyPhraseBoy",
       "flag": "0"
     }
   ],
@@ -136,7 +136,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DewfordTown_EventScript_1E95BA"
+      "script": "DewfordTown_EventScript_TownSign"
     },
     {
       "type": "sign",
@@ -144,7 +144,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DewfordTown_EventScript_1E95C3"
+      "script": "DewfordTown_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -168,7 +168,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DewfordTown_EventScript_1E95CC"
+      "script": "DewfordTown_EventScript_HallSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index ac0155df9..137b394b1 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -6,131 +6,131 @@ DewfordTown_OnTransition: @ 81E950D
 	setflag FLAG_VISITED_DEWFORD_TOWN
 	end
 
-DewfordTown_EventScript_1E9511:: @ 81E9511
+DewfordTown_EventScript_Briney:: @ 81E9511
 	lock
 	faceplayer
-	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585
-	message DewfordTown_Text_1E9C8A
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt
+	message DewfordTown_Text_WhereAreWeBound
 	waitmessage
 	multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0
 	switch VAR_RESULT
-	case 0, DewfordTown_EventScript_1E955A
-	case 1, DewfordTown_EventScript_1E956A
-	case 2, DewfordTown_EventScript_1E957A
-	case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A
+	case 0, DewfordTown_EventScript_ChoosePetalburg
+	case 1, DewfordTown_EventScript_ChooseSlateport
+	case 2, DewfordTown_EventScript_CancelSailSelect
+	case MULTI_B_PRESSED, DewfordTown_EventScript_CancelSailSelect
 	end
 
-DewfordTown_EventScript_1E955A:: @ 81E955A
-	msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT
+DewfordTown_EventScript_ChoosePetalburg:: @ 81E955A
+	msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT
 	closemessage
-	goto DewfordTown_EventScript_1E9660
+	goto DewfordTown_EventScript_SailToPetalburg
 	release
 	end
 
-DewfordTown_EventScript_1E956A:: @ 81E956A
-	msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT
+DewfordTown_EventScript_ChooseSlateport:: @ 81E956A
+	msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT
 	closemessage
-	goto DewfordTown_EventScript_1E96E7
+	goto DewfordTown_EventScript_SailToSlateport
 	release
 	end
 
-DewfordTown_EventScript_1E957A:: @ 81E957A
-	msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT
+DewfordTown_EventScript_CancelSailSelect:: @ 81E957A
+	msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
-DewfordTown_EventScript_1E9585:: @ 81E9585
-	msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_EventScript_1E95A2
-	msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT
+DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585
+	msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq DewfordTown_EventScript_SailBackToPetalburg
+	msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E95A2:: @ 81E95A2
-	msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT
+DewfordTown_EventScript_SailBackToPetalburg:: @ 81E95A2
+	msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT
 	closemessage
-	goto DewfordTown_EventScript_1E9660
+	goto DewfordTown_EventScript_SailToPetalburg
 	end
 
-DewfordTown_EventScript_1E95B1:: @ 81E95B1
-	msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC
+DewfordTown_EventScript_Woman:: @ 81E95B1
+	msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC
 	end
 
-DewfordTown_EventScript_1E95BA:: @ 81E95BA
-	msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN
+DewfordTown_EventScript_TownSign:: @ 81E95BA
+	msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_1E95C3:: @ 81E95C3
-	msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN
+DewfordTown_EventScript_GymSign:: @ 81E95C3
+	msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_1E95CC:: @ 81E95CC
-	msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN
+DewfordTown_EventScript_HallSign:: @ 81E95CC
+	msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_1E95D5:: @ 81E95D5
+DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A
-	msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_EventScript_1E95FF
-	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_EventScript_1E9620
+	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing
+	msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq DewfordTown_EventScript_GiveOldRod
+	compare VAR_RESULT, NO
+	goto_if_eq DewfordTown_EventScript_NotGettingItchToFish
 	end
 
-DewfordTown_EventScript_1E95FF:: @ 81E95FF
-	msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT
+DewfordTown_EventScript_GiveOldRod:: @ 81E95FF
+	msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT
 	giveitem_std ITEM_OLD_ROD
 	setflag FLAG_RECEIVED_OLD_ROD
-	msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT
+	msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E9620:: @ 81E9620
-	msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT
+DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620
+	msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E962A:: @ 81E962A
-	message DewfordTown_Text_1E9FB8
+DewfordTown_EventScript_HowsFishing:: @ 81E962A
+	message DewfordTown_Text_HowsYourFishing
 	waitmessage
 	multichoice 20, 8, MULTI_HOWS_FISHING, 1
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_EventScript_1E964C
+	goto_if_eq DewfordTown_EventScript_FishingExcellent
 	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_EventScript_1E9656
+	goto_if_eq DewfordTown_EventScript_FishingNotSoGood
 	end
 
-DewfordTown_EventScript_1E964C:: @ 81E964C
-	msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT
+DewfordTown_EventScript_FishingExcellent:: @ 81E964C
+	msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E9656:: @ 81E9656
-	msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT
+DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656
+	msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E9660:: @ 81E9660
-	call DewfordTown_EventScript_271E95
+DewfordTown_EventScript_SailToPetalburg:: @ 81E9660
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
-	applymovement 2, DewfordTown_Movement_1E991D
+	applymovement 2, DewfordTown_Movement_BrineyBoardBoat
 	waitmovement 0
 	removeobject 2
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
 	waitmovement 0
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
 	call Common_EventScript_PlayBrineysBoatMusic
-	applymovement 4, DewfordTown_Movement_1E97A2
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2
+	applymovement 4, DewfordTown_Movement_SailToPetalburg
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg
 	waitmovement 0
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	call Common_EventScript_StopBrineysBoatMusic
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg
 	waitmovement 0
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -146,36 +146,36 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
 	release
 	end
 
-DewfordTown_EventScript_1E96E7:: @ 81E96E7
-	call DewfordTown_EventScript_271E95
+DewfordTown_EventScript_SailToSlateport:: @ 81E96E7
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
-	applymovement 2, DewfordTown_Movement_1E991D
+	applymovement 2, DewfordTown_Movement_BrineyBoardBoat
 	waitmovement 0
 	removeobject 2
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
 	waitmovement 0
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
 	call Common_EventScript_PlayBrineysBoatMusic
-	applymovement 4, DewfordTown_Movement_1E9865
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865
+	applymovement 4, DewfordTown_Movement_SailToSlateport
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport
 	waitmovement 0
 	call Common_EventScript_StopBrineysBoatMusic
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918
+	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport
 	waitmovement 0
 	setobjectxyperm 2, 21, 26
 	addobject 2
 	setobjectpriority 2, MAP_ROUTE109, 0
-	applymovement 2, DewfordTown_Movement_1E991F
+	applymovement 2, DewfordTown_Movement_BrineyExitBoat
 	waitmovement 0
-	clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	addobject 1
 	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
-	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
-	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
+	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods
+	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport
 	closemessage
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
@@ -184,15 +184,15 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
 	release
 	end
 
-DewfordTown_EventScript_1E9790:: @ 81E9790
-	msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT
+DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 81E9790
+	msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT
 	return
 
-DewfordTown_EventScript_1E9799:: @ 81E9799
-	msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT
+DewfordTown_EventScript_LandedSlateport:: @ 81E9799
+	msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT
 	return
 
-DewfordTown_Movement_1E97A2: @ 81E97A2
+DewfordTown_Movement_SailToPetalburg: @ 81E97A2
 	walk_up
 	walk_up
 	walk_fast_up
@@ -389,7 +389,7 @@ DewfordTown_Movement_1E97A2: @ 81E97A2
 	walk_up
 	step_end
 
-DewfordTown_Movement_1E9865: @ 81E9865
+DewfordTown_Movement_SailToSlateport: @ 81E9865
 	walk_right
 	walk_fast_right
 	walk_fast_right
@@ -563,154 +563,153 @@ DewfordTown_Movement_1E9865: @ 81E9865
 	walk_fast_up
 	step_end
 
-DewfordTown_Movement_1E9911: @ 81E9911
+DewfordTown_Movement_PlayerBoardBoat: @ 81E9911
 	walk_right
 	walk_up
 	step_end
 
-DewfordTown_Movement_1E9914: @ 81E9914
+DewfordTown_Movement_ExitBoatPetalburg: @ 81E9914
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-DewfordTown_Movement_1E9918: @ 81E9918
+DewfordTown_Movement_ExitBoatSlateport: @ 81E9918
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-DewfordTown_Movement_1E991D: @ 81E991D
+DewfordTown_Movement_BrineyBoardBoat: @ 81E991D
 	walk_up
 	step_end
 
-DewfordTown_Movement_1E991F: @ 81E991F
+DewfordTown_Movement_BrineyExitBoat: @ 81E991F
 	walk_up
 	walk_up
 	step_end
 
-DewfordTown_EventScript_1E9922:: @ 81E9922
+DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922
 	lock
 	faceplayer
-	call DewfordTown_EventScript_271E8B
-	msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_EventScript_1E9948
-	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_EventScript_1E9952
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase
+	compare VAR_RESULT, NO
+	goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase
 	end
 
-DewfordTown_EventScript_1E9948:: @ 81E9948
-	msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT
+DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 81E9948
+	msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E9952:: @ 81E9952
-	msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
+DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952
+	msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_EventScript_1E997D
+	goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_EventScript_1E9994
+	goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase
 	end
 
-DewfordTown_EventScript_1E997D:: @ 81E997D
+DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D
 	incrementgamestat GAME_STAT_STARTED_TRENDS
 	compare VAR_0x8004, 0
-	goto_if_eq DewfordTown_EventScript_1E999E
-	msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT
+	goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough
+	msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E9994:: @ 81E9994
-	msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT
+DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 81E9994
+	msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_1E999E:: @ 81E999E
-	msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT
+DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 81E999E
+	msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Text_1E99A8: @ 81E99A8
+DewfordTown_Text_TinyIslandCommunity: @ 81E99A8
 	.string "DEWFORD is a tiny island community.\n"
 	.string "If something gets trendy here,\l"
 	.string "everyone picks up on it right away.$"
 
-DewfordTown_Text_1E9A0F: @ 81E9A0F
+DewfordTown_Text_TownSign: @ 81E9A0F
 	.string "DEWFORD TOWN\n"
 	.string "“A tiny island in the blue sea.”$"
 
-DewfordTown_Text_1E9A3D: @ 81E9A3D
+DewfordTown_Text_GymSign: @ 81E9A3D
 	.string "DEWFORD TOWN POKéMON GYM\n"
 	.string "LEADER: BRAWLY\l"
 	.string "“A big wave in fighting!”$"
 
-DewfordTown_Text_1E9A7F: @ 81E9A7F
+DewfordTown_Text_HallSign: @ 81E9A7F
 	.string "DEWFORD HALL\n"
 	.string "“Everyone's information exchange!”$"
 
-Route104_Text_1E9AAF: @ 81E9AAF
+Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've hit land in DEWFORD.\p"
 	.string "I suppose you're off to deliver that\n"
 	.string "LETTER to, who was it now, STEVEN!$"
 
-DewfordTown_Text_1E9B24: @ 81E9B24
+DewfordTown_Text_SetSailBackToPetalburg: @ 81E9B24
 	.string "MR. BRINEY: Have you delivered your\n"
 	.string "LETTER?\p"
 	.string "Or were you meaning to sail back to\n"
 	.string "PETALBURG?$"
 
-DewfordTown_Text_1E9B7F: @ 81E9B7F
+DewfordTown_Text_PetalburgWereSettingSail2: @ 81E9B7F
 	.string "MR. BRINEY: PETALBURG it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_1E9BD9: @ 81E9BD9
+DewfordTown_Text_GoDeliverIllBeWaiting: @ 81E9BD9
 	.string "MR. BRINEY: Then you go on and deliver\n"
 	.string "the LETTER. I'll be waiting.$"
 
-Route104_Text_1E9C1D: @ 81E9C1D
-Route109_Text_1E9C1D: @ 81E9C1D
+DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've hit land in DEWFORD!\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail again!$"
 
-DewfordTown_Text_1E9C8A: @ 81E9C8A
+DewfordTown_Text_WhereAreWeBound: @ 81E9C8A
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-DewfordTown_Text_1E9CE5: @ 81E9CE5
+DewfordTown_Text_PetalburgWereSettingSail: @ 81E9CE5
 	.string "MR. BRINEY: PETALBURG, is it?\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_1E9D3A: @ 81E9D3A
+DewfordTown_Text_SlateportWereSettingSail: @ 81E9D3A
 	.string "MR. BRINEY: SLATEPORT, is it?\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_1E9D8F: @ 81E9D8F
+DewfordTown_Text_JustTellMeWhenYouNeedToSetSail: @ 81E9D8F
 	.string "MR. BRINEY: You just tell me whenever\n"
 	.string "you need to set sail again!$"
 
-DewfordTown_Text_1E9DD1: @ 81E9DD1
+DewfordTown_Text_GettingItchToFish: @ 81E9DD1
 	.string "This is a renowned fishing spot.\n"
 	.string "Are you getting the itch to fish?$"
 
-DewfordTown_Text_1E9E14: @ 81E9E14
+DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14
 	.string "I hear you, and I like what\n"
 	.string "you're saying!\p"
 	.string "I'll give you one of my fishing RODS.$"
 
-DewfordTown_Text_1E9E65: @ 81E9E65
+DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65
 	.string "And, as an added bonus, I'll even throw\n"
 	.string "in a little fishing advice!\p"
 	.string "First, you want to face the water,\n"
@@ -722,19 +721,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65
 	.string "you need to time the pulls on your ROD\l"
 	.string "to haul them in.$"
 
-DewfordTown_Text_1E9F92: @ 81E9F92
+DewfordTown_Text_ThatsTooBadThen: @ 81E9F92
 	.string "Oh, is that so?\n"
 	.string "That's too bad, then.$"
 
-DewfordTown_Text_1E9FB8: @ 81E9FB8
+DewfordTown_Text_HowsYourFishing: @ 81E9FB8
 	.string "Yo!\n"
 	.string "How's your fishing?$"
 
-DewfordTown_Text_1E9FD0: @ 81E9FD0
+DewfordTown_Text_GreatHaulInSomeBigOnes: @ 81E9FD0
 	.string "Is that right! That's great!\n"
 	.string "Haul in some big ones!$"
 
-DewfordTown_Text_1EA004: @ 81EA004
+DewfordTown_Text_FishingAdvice: @ 81EA004
 	.string "Oh, hey, don't get down on yourself!\n"
 	.string "I'll give you a little fishing advice.\p"
 	.string "First, you want to face the water,\n"
@@ -746,7 +745,7 @@ DewfordTown_Text_1EA004: @ 81EA004
 	.string "you need to time the pulls on your ROD\l"
 	.string "to haul them in.$"
 
-DewfordTown_Text_1EA136: @ 81EA136
+DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136
 	.string "I like what's hip, happening, and trendy.\n"
 	.string "I'm always checking it out.\p"
 	.string "Listen, have you heard about this new\n"
@@ -760,13 +759,13 @@ DewfordTown_Text_1EA136: @ 81EA136
 	.string "“{STR_VAR_1}”\l"
 	.string "is the biggest happening thing, right?$"
 
-DewfordTown_Text_1EA242: @ 81EA242
+DewfordTown_Text_TellMeWhatsNewAndIn: @ 81EA242
 	.string "Hunh?\n"
 	.string "It's not the hip and happening thing?\p"
 	.string "Well, hey, you have to tell me,\n"
 	.string "what's new and what's “in”?$"
 
-DewfordTown_Text_1EA2AA: @ 81EA2AA
+DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA
 	.string "Hunh?\n"
 	.string "“{STR_VAR_2}”?\p"
 	.string "… …\p"
@@ -784,18 +783,18 @@ DewfordTown_Text_1EA2AA: @ 81EA2AA
 	.string "Now, “{STR_VAR_2}” is\n"
 	.string "what's vital and in tune with the times!$"
 
-DewfordTown_Text_1EA3FE: @ 81EA3FE
+DewfordTown_Text_XHuhIThinkYIsCool: @ 81EA3FE
 	.string "Hmm…\n"
 	.string "“{STR_VAR_2},” huh?\p"
 	.string "But personally, I think\n"
 	.string "“{STR_VAR_1}”\l"
 	.string "is what's real in cool.$"
 
-DewfordTown_Text_1EA443: @ 81EA443
+DewfordTown_Text_HearOfAnyTrendsComeShareWithMe: @ 81EA443
 	.string "Well, if you hear of any happening new\n"
 	.string "trends, come share them with me, okay?$"
 
-DewfordTown_Text_1EA491: @ 81EA491
+DewfordTown_Text_YeahDefinitionOfInRightNow: @ 81EA491
 	.string "Yeah, absolutely right!\p"
 	.string "“{STR_VAR_1}” is the\n"
 	.string "definition of “in” right now.$"
diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json
index b801ea3c2..087981fde 100644
--- a/data/maps/DewfordTown_Hall/map.json
+++ b/data/maps/DewfordTown_Hall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD4D0",
+      "script": "DewfordTown_Hall_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD4F9",
+      "script": "DewfordTown_Hall_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD50A",
+      "script": "DewfordTown_Hall_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD547",
+      "script": "DewfordTown_Hall_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD563",
+      "script": "DewfordTown_Hall_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD57F",
+      "script": "DewfordTown_Hall_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD62F",
+      "script": "DewfordTown_Hall_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD63B",
+      "script": "DewfordTown_Hall_EventScript_PsychicM",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Hall_EventScript_1FD7DA",
+      "script": "DewfordTown_Hall_EventScript_SludgeBombMan",
       "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN"
     }
   ],
@@ -156,7 +156,7 @@
       "y": 1,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DewfordTown_Hall_EventScript_1FD590"
+      "script": "DewfordTown_Hall_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -164,7 +164,7 @@
       "y": 1,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "DewfordTown_Hall_EventScript_1FD5A0"
+      "script": "DewfordTown_Hall_EventScript_Painting"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 9790753cf..971dd2321 100644
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -1,319 +1,319 @@
 DewfordTown_Hall_MapScripts:: @ 81FD4CF
 	.byte 0
 
-DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0
+DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
+	call Common_EventScript_BufferTrendyPhrase
 	special TrendyPhraseIsOld
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_Hall_EventScript_1FD4EF
-	msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend
+	msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF
-	msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81FD4EF
+	msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9
+DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_TeachingMonAboutTrend, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A
+DewfordTown_Hall_EventScript_Man:: @ 81FD50A
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
+	call Common_EventScript_BufferTrendyPhrase
 	special sub_811EF6C
-	msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_Hall_EventScript_1FD533
-	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Hall_EventScript_1FD53D
+	msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink
+	compare VAR_RESULT, NO
+	goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink
 	end
 
-DewfordTown_Hall_EventScript_1FD533:: @ 81FD533
-	msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81FD533
+	msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D
-	msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_RejectTrendLink:: @ 81FD53D
+	msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
+DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
+DewfordTown_Hall_EventScript_Twin:: @ 81FD563
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F
+DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_CollectTrendMerchandise, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD590:: @ 81FD590
+DewfordTown_Hall_EventScript_Bookshelf:: @ 81FD590
 	lockall
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0
+DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0
 	lockall
-	call DewfordTown_Hall_EventScript_271E8B
+	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
 	switch VAR_RESULT
-	case 0, DewfordTown_Hall_EventScript_1FD607
-	case 4, DewfordTown_Hall_EventScript_1FD607
-	case 1, DewfordTown_Hall_EventScript_1FD611
-	case 5, DewfordTown_Hall_EventScript_1FD607
-	case 2, DewfordTown_Hall_EventScript_1FD61B
-	case 6, DewfordTown_Hall_EventScript_1FD61B
-	case 3, DewfordTown_Hall_EventScript_1FD625
-	case 7, DewfordTown_Hall_EventScript_1FD61B
+	case 0, DewfordTown_Hall_EventScript_ScreamTitle
+	case 4, DewfordTown_Hall_EventScript_ScreamTitle
+	case 1, DewfordTown_Hall_EventScript_SmileTitle
+	case 5, DewfordTown_Hall_EventScript_ScreamTitle
+	case 2, DewfordTown_Hall_EventScript_LastTitle
+	case 6, DewfordTown_Hall_EventScript_LastTitle
+	case 3, DewfordTown_Hall_EventScript_BirthTitle
+	case 7, DewfordTown_Hall_EventScript_LastTitle
 	end
 
-DewfordTown_Hall_EventScript_1FD607:: @ 81FD607
-	msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_ScreamTitle:: @ 81FD607
+	msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD611:: @ 81FD611
-	msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_SmileTitle:: @ 81FD611
+	msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B
-	msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_LastTitle:: @ 81FD61B
+	msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD625:: @ 81FD625
-	msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_BirthTitle:: @ 81FD625
+	msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F
+DewfordTown_Hall_EventScript_SchoolKidM:: @ 81FD62F
 	lockall
 	setvar VAR_0x8008, 0
-	goto DewfordTown_Hall_EventScript_1FD647
+	goto DewfordTown_Hall_EventScript_DoTrendDebate
 	end
 
-DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B
+DewfordTown_Hall_EventScript_PsychicM:: @ 81FD63B
 	lockall
 	setvar VAR_0x8008, 1
-	goto DewfordTown_Hall_EventScript_1FD647
+	goto DewfordTown_Hall_EventScript_DoTrendDebate
 	end
 
-DewfordTown_Hall_EventScript_1FD647:: @ 81FD647
-	call DewfordTown_Hall_EventScript_271E8B
+DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647
+	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
 	switch VAR_RESULT
-	case 0, DewfordTown_Hall_EventScript_1FD6AD
-	case 1, DewfordTown_Hall_EventScript_1FD6AD
-	case 2, DewfordTown_Hall_EventScript_1FD6C9
-	case 3, DewfordTown_Hall_EventScript_1FD6C9
-	case 4, DewfordTown_Hall_EventScript_1FD6E5
-	case 5, DewfordTown_Hall_EventScript_1FD6E5
-	case 6, DewfordTown_Hall_EventScript_1FD701
-	case 7, DewfordTown_Hall_EventScript_1FD71D
+	case 0, DewfordTown_Hall_EventScript_TrendDebate1
+	case 1, DewfordTown_Hall_EventScript_TrendDebate1
+	case 2, DewfordTown_Hall_EventScript_TrendDebate2
+	case 3, DewfordTown_Hall_EventScript_TrendDebate2
+	case 4, DewfordTown_Hall_EventScript_TrendDebate3
+	case 5, DewfordTown_Hall_EventScript_TrendDebate3
+	case 6, DewfordTown_Hall_EventScript_TrendDebate4
+	case 7, DewfordTown_Hall_EventScript_TrendDebate5
 	end
 
-DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD
+	call DewfordTown_Hall_EventScript_DebateReact1
+	msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT
+	call DewfordTown_Hall_EventScript_DebateReact2
+	msgbox DewfordTown_Hall_Text_AllegedTrendNotAuthentic, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9
+	call DewfordTown_Hall_EventScript_DebateReact1
+	msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT
+	call DewfordTown_Hall_EventScript_DebateReact2
+	msgbox DewfordTown_Hall_Text_WorkOnYourSinging, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5
+	call DewfordTown_Hall_EventScript_DebateReact1
+	msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT
+	call DewfordTown_Hall_EventScript_DebateReact2
+	msgbox DewfordTown_Hall_Text_BrilliantIndeed, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD701:: @ 81FD701
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701
+	call DewfordTown_Hall_EventScript_DebateReact1
+	msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT
+	call DewfordTown_Hall_EventScript_DebateReact2
+	msgbox DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D
+	call DewfordTown_Hall_EventScript_DebateReact1
+	msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT
+	call DewfordTown_Hall_EventScript_DebateReact2
+	msgbox DewfordTown_Hall_Text_WellBeTrendDuo, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_1FD739:: @ 81FD739
+DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81FD739
 	return
 
-DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
-	applymovement 8, DewfordTown_Hall_Movement_1FD7D6
+DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A
+	applymovement 8, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft
 	waitmovement 0
 	compare VAR_0x8008, 0
-	goto_if_eq DewfordTown_Hall_EventScript_1FD75B
+	goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest
 	compare VAR_0x8008, 1
-	goto_if_eq DewfordTown_Hall_EventScript_1FD771
+	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2
 	end
 
-DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
+DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B
 	compare VAR_FACING, DIR_EAST
-	goto_if_eq DewfordTown_Hall_EventScript_1FD739
+	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_1FD771:: @ 81FD771
+DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 81FD771
 	return
 
-DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
-	applymovement 7, DewfordTown_Hall_Movement_1FD7D8
+DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772
+	applymovement 7, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight
 	waitmovement 0
 	compare VAR_0x8008, 0
-	goto_if_eq DewfordTown_Hall_EventScript_1FD793
+	goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth
 	compare VAR_0x8008, 1
-	goto_if_eq DewfordTown_Hall_EventScript_1FD7C0
+	goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast
 	end
 
-DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
+DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq DewfordTown_Hall_EventScript_1FD7AA
+	call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq DewfordTown_Hall_EventScript_1FD7B5
+	call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown
 	return
 
-DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
+DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
+DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
+DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0
 	compare VAR_FACING, DIR_WEST
-	goto_if_eq DewfordTown_Hall_EventScript_1FD739
+	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6
+DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: @ 81FD7D6
 	walk_in_place_left
 	step_end
 
-DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8
+DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight: @ 81FD7D8
 	walk_in_place_right
 	step_end
 
-DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
+DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E
-	msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
+	call Common_EventScript_BufferTrendyPhrase
+	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb
+	msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM36
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM36
 	release
 	end
 
-DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E
-	msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT
+DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81FD80E
+	msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_Text_1FD818: @ 81FD818
+DewfordTown_Hall_Text_CantImagineLifeWithoutTrend: @ 81FD818
 	.string "What's in vogue? Why, it has to be\n"
 	.string "“{STR_VAR_1}”!\p"
 	.string "I can't imagine what life would be like\n"
 	.string "without “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_1FD877: @ 81FD877
+DewfordTown_Hall_Text_GettingBoredOfTrend: @ 81FD877
 	.string "What's in vogue? Why, it has to be\n"
 	.string "“{STR_VAR_1}”!\p"
 	.string "But I'm getting kind of bored with it.\p"
 	.string "I should look for the next big thing.$"
 
-DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED
+DewfordTown_Hall_Text_TeachingMonAboutTrend: @ 81FD8ED
 	.string "I'm teaching my POKéMON about\n"
 	.string "“{STR_VAR_1},”\l"
 	.string "but it's not going well.\p"
 	.string "It's a bit too much, I think.$"
 
-DewfordTown_Hall_Text_1FD948: @ 81FD948
+DewfordTown_Hall_Text_DeepLinkBetweenXAndY: @ 81FD948
 	.string "I'm studying up on the hip and trendy\n"
 	.string "“{STR_VAR_1}” now.\p"
 	.string "Is it true that there's a deep link\n"
 	.string "between “{STR_VAR_1}”\l"
 	.string "and “{STR_VAR_2}”?$"
 
-DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3
+DewfordTown_Hall_Text_MyHunchWasRight: @ 81FD9B3
 	.string "Oh!\n"
 	.string "So, my hunch was right!\p"
 	.string "I'm one step closer to being hip and\n"
 	.string "happening, yowza!$"
 
-DewfordTown_Hall_Text_1FDA06: @ 81FDA06
+DewfordTown_Hall_Text_NotEasyToKeepUp: @ 81FDA06
 	.string "What?!\n"
 	.string "Is that so?!\p"
 	.string "It's not easy for an older fellow like\n"
 	.string "me to keep up with trends!$"
 
-DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C
+DewfordTown_Hall_Text_TVShowAboutTrend: @ 81FDA5C
 	.string "This whole business about\n"
 	.string "“{STR_VAR_1}”…\l"
 	.string "Isn't there a TV show on it?$"
 
-DewfordTown_Hall_Text_1FDA99: @ 81FDA99
+DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea: @ 81FDA99
 	.string "Across the sea…\p"
 	.string "Is “{STR_VAR_1}”\n"
 	.string "even more popular?$"
 
-DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4
+DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4
 	.string "I collect official\n"
 	.string "“{STR_VAR_1}”\l"
 	.string "licensed merchandise.\p"
@@ -327,7 +327,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4
 	.string "Heheh, I own!\n"
 	.string "I'm not sharing anything with you!$"
 
-DewfordTown_Hall_Text_1FDB89: @ 81FDB89
+DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89
 	.string "IDENTIFYING GOOD\n"
 	.string "“{STR_VAR_1}” &\l"
 	.string "BAD “{STR_VAR_1}”…\p"
@@ -339,30 +339,30 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89
 	.string "It's neatly jammed with books about\n"
 	.string "“{STR_VAR_1}.”$"
 
-DewfordTown_Hall_Text_1FDC05: @ 81FDC05
+DewfordTown_Hall_Text_TrendsScream: @ 81FDC05
 	.string "“{STR_VAR_1}'S\n"
 	.string "SCREAM” is the title.$"
 
-DewfordTown_Hall_Text_1FDC21: @ 81FDC21
+DewfordTown_Hall_Text_TrendsSmile: @ 81FDC21
 	.string "“{STR_VAR_1}'S\n"
 	.string "SMILE” is the title.$"
 
-DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C
+DewfordTown_Hall_Text_LastTrend: @ 81FDC3C
 	.string "It's titled “THE LAST\n"
 	.string "{STR_VAR_1}”.$"
 
-DewfordTown_Hall_Text_1FDC57: @ 81FDC57
+DewfordTown_Hall_Text_BirthOfTrend: @ 81FDC57
 	.string "It's titled “THE BIRTH OF\n"
 	.string "{STR_VAR_1}”.$"
 
-DewfordTown_Hall_Text_1FDC76: @ 81FDC76
+DewfordTown_Hall_Text_SawTrendCoolestThing: @ 81FDC76
 	.string "I saw “{STR_VAR_1}”!\n"
 	.string "Cool, huh?\p"
 	.string "It's, like, the coolest thing going!\p"
 	.string "It was awesome!\n"
 	.string "It was the real thing, oh yeah!$"
 
-DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2
+DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2
 	.string "Oh, no, no, no.\p"
 	.string "That alleged\n"
 	.string "“{STR_VAR_1}”\l"
@@ -372,7 +372,7 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2
 	.string "Sharper, yet more mellow!\p"
 	.string "Ah, no matter. It's astonishing!$"
 
-DewfordTown_Hall_Text_1FDD95: @ 81FDD95
+DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95
 	.string "Hey, listen, I composed a theme song\n"
 	.string "for “{STR_VAR_1}.”\p"
 	.string "“{STR_VAR_1}”\n"
@@ -384,20 +384,20 @@ DewfordTown_Hall_Text_1FDD95: @ 81FDD95
 	.string "Wonderful\n"
 	.string "{STR_VAR_1}!$"
 
-DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E
+DewfordTown_Hall_Text_WorkOnYourSinging: @ 81FDE0E
 	.string "… …\p"
 	.string "I dare say, chap, it would pay for you\n"
 	.string "to work on your singing before you\l"
 	.string "trifle yourself with\l"
 	.string "“{STR_VAR_1}.”$"
 
-DewfordTown_Hall_Text_1FDE77: @ 81FDE77
+DewfordTown_Hall_Text_OrganizeTrendParty: @ 81FDE77
 	.string "Anyway, as I was saying earlier, we\n"
 	.string "should get together and organize a\l"
 	.string "“{STR_VAR_1}” party\l"
 	.string "on the island.$"
 
-DewfordTown_Hall_Text_1FDED8: @ 81FDED8
+DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8
 	.string "Oh, a smashing good idea!\p"
 	.string "It will settle once and for all\n"
 	.string "who is the best at\l"
@@ -406,14 +406,14 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8
 	.string "Starting today, our lives will revolve\n"
 	.string "around “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_1FDF72: @ 81FDF72
+DewfordTown_Hall_Text_TrendHasBecomePartOfLife: @ 81FDF72
 	.string "I was thinking, though…\p"
 	.string "Wouldn't you agree that\n"
 	.string "“{STR_VAR_1}” has\l"
 	.string "grown from being something trendy to\l"
 	.string "being a part of our daily lives?$"
 
-DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1
+DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1
 	.string "Beg pardon?\n"
 	.string "That much, what?\p"
 	.string "However, it's true that\n"
@@ -424,19 +424,19 @@ DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1
 	.string "“{STR_VAR_1}”\l"
 	.string "PROFESSOR, old sport!$"
 
-DewfordTown_Hall_Text_1FE09A: @ 81FE09A
+DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible: @ 81FE09A
 	.string "If you and me team up as a combo,\n"
 	.string "we'll be invincible when it comes to all\l"
 	.string "things “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2
+DewfordTown_Hall_Text_WellBeTrendDuo: @ 81FE0F2
 	.string "Spot on, my friend!\p"
 	.string "We shall be the\n"
 	.string "“{STR_VAR_1}” DUO!\p"
 	.string "Isn't that a ripe image?\n"
 	.string "Hahahah!$"
 
-DewfordTown_Hall_Text_1FE142: @ 81FE142
+DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142
 	.string "For me, SLUDGE BOMB is at the peak\n"
 	.string "of popularity. It's the one.\p"
 	.string "Hunh? You're telling me that you don't\n"
@@ -444,7 +444,7 @@ DewfordTown_Hall_Text_1FE142: @ 81FE142
 	.string "That's outright pitiful.\n"
 	.string "I'll give you one.$"
 
-DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED
+DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo: @ 81FE1ED
 	.string "I love SLUDGE BOMB.\p"
 	.string "But POKéMON with the move\n"
 	.string "“{STR_VAR_1}”\l"
diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json
index dfae500bd..beb6d5275 100644
--- a/data/maps/DewfordTown_House1/map.json
+++ b/data/maps/DewfordTown_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_House1_EventScript_1FC3D7",
+      "script": "DewfordTown_House1_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_House1_EventScript_1FC3CE",
+      "script": "DewfordTown_House1_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_House1_EventScript_1FC3E0",
+      "script": "DewfordTown_House1_EventScript_Zigzagoon",
       "flag": "0"
     }
   ],
diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc
index 32706dbde..06e377057 100644
--- a/data/maps/DewfordTown_House1/scripts.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
@@ -1,36 +1,36 @@
 DewfordTown_House1_MapScripts:: @ 81FC3CD
 	.byte 0
 
-DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE
-	msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC
+DewfordTown_House1_EventScript_Man:: @ 81FC3CE
+	msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC
 	end
 
-DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7
-	msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC
+DewfordTown_House1_EventScript_Woman:: @ 81FC3D7
+	msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC
 	end
 
-DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0
+DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT
+	msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-DewfordTown_House1_Text_1FC3F3: @ 81FC3F3
+DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland: @ 81FC3F3
 	.string "There's a lot to be said for living on\n"
 	.string "a small island like this in harmony with\l"
 	.string "POKéMON and the family.$"
 
-DewfordTown_House1_Text_1FC45B: @ 81FC45B
+DewfordTown_House1_Text_LifeGoesSlowlyOnIsland: @ 81FC45B
 	.string "I left the major port of SLATEPORT\n"
 	.string "CITY when I married my husband here.\p"
 	.string "Life goes by slowly on this little\n"
 	.string "island. But being surrounded by the\l"
 	.string "beautiful sea--that's happiness, too.$"
 
-DewfordTown_House1_Text_1FC510: @ 81FC510
+DewfordTown_House1_Text_Zigzagoon: @ 81FC510
 	.string "ZIGZAGOON: Guguuh!$"
 
diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json
index bc9c008fc..ac1abca36 100644
--- a/data/maps/DewfordTown_House2/map.json
+++ b/data/maps/DewfordTown_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_House2_EventScript_1FE22E",
+      "script": "DewfordTown_House2_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_House2_EventScript_1FE271",
+      "script": "DewfordTown_House2_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc
index eb6beb951..43d2c1b5e 100644
--- a/data/maps/DewfordTown_House2/scripts.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
@@ -1,33 +1,33 @@
 DewfordTown_House2_MapScripts:: @ 81FE22D
 	.byte 0
 
-DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E
+DewfordTown_House2_EventScript_Man:: @ 81FE22E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267
-	msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf
+	msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT
 	giveitem_std ITEM_SILK_SCARF
-	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_House2_EventScript_1FE25D
+	compare VAR_RESULT, FALSE
+	goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf
 	setflag FLAG_RECEIVED_SILK_SCARF
 	release
 	end
 
-DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D
-	msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT
+DewfordTown_House2_EventScript_NoRoomForScarf:: @ 81FE25D
+	msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_House2_EventScript_1FE267:: @ 81FE267
-	msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT
+DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 81FE267
+	msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_House2_EventScript_1FE271:: @ 81FE271
-	msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC
+DewfordTown_House2_EventScript_Boy:: @ 81FE271
+	msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC
 	end
 
-DewfordTown_House2_Text_1FE27A: @ 81FE27A
+DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A
 	.string "Gorge your eyes on this!\p"
 	.string "It's a SILK SCARF. It's right at the\n"
 	.string "cutting edge of fashion, yeah!\p"
@@ -36,19 +36,19 @@ DewfordTown_House2_Text_1FE27A: @ 81FE27A
 	.string "Oh, you're a delight!\n"
 	.string "Here you go. I want you to have it!$"
 
-DewfordTown_House2_Text_1FE356: @ 81FE356
+DewfordTown_House2_Text_NoRoom: @ 81FE356
 	.string "Oh, you don't have room?\p"
 	.string "Now, listen tight, this SCARF is a must-\n"
 	.string "have! Why, I would sell all my items\l"
 	.string "in order to get it!$"
 
-DewfordTown_House2_Text_1FE3D1: @ 81FE3D1
+DewfordTown_House2_Text_ExplainSilkScarf: @ 81FE3D1
 	.string "The SILK SCARF raises the power of\n"
 	.string "NORMAL-type moves.\p"
 	.string "It's a marvelous SCARF that will go\n"
 	.string "with almost all POKéMON!$"
 
-DewfordTown_House2_Text_1FE444: @ 81FE444
+DewfordTown_House2_Text_BrawlySoCool: @ 81FE444
 	.string "Wow, you bothered to cross the sea\n"
 	.string "to visit DEWFORD?\p"
 	.string "Did you maybe come here because you\n"
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json
index 89acf1ea8..67e0e5721 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/map.json
+++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 6fc9abb99..99d180d8f 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537
+@ VAR_0x800B is the Nurse's object event id
+DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC537
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,21 +17,21 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537
 	release
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545
-	msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC
+DewfordTown_PokemonCenter_1F_EventScript_PokefanF:: @ 81FC545
+	msgbox DewfordTown_PokemonCenter_1F_Text_StoneCavern, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E
-	msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC
+DewfordTown_PokemonCenter_1F_EventScript_Man:: @ 81FC54E
+	msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557
+DewfordTown_PokemonCenter_1F_Text_StoneCavern: @ 81FC557
 	.string "There's a stone cavern at the edge\n"
 	.string "of town.\p"
 	.string "I've heard you can find rare stones\n"
 	.string "there.$"
 
-DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE
+DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM: @ 81FC5AE
 	.string "Even if a POKéMON faints and can't\n"
 	.string "battle, it can still use a move learned\l"
 	.string "from a HIDDEN MACHINE (HM).$"
diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc
deleted file mode 100644
index ac64377ae..000000000
--- a/data/maps/DoubleBattleColosseum/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-DoubleBattleColosseum_MapScripts:: @ 823B780
-	.byte 0
-
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 90175db1d..0fd6e9eca 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -58,7 +58,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -67,7 +67,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -76,7 +76,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -85,7 +85,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -94,7 +94,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -103,7 +103,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -112,7 +112,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -121,7 +121,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -130,7 +130,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -139,7 +139,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     },
     {
       "type": "trigger",
@@ -148,7 +148,7 @@
       "elevation": 1,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "EverGrandeCity_EventScript_1E7D46"
+      "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
     }
   ],
   "bg_events": [
@@ -158,7 +158,7 @@
       "y": 43,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EverGrandeCity_EventScript_1E7D2B"
+      "script": "EverGrandeCity_EventScript_VictoryRoadSign"
     },
     {
       "type": "sign",
@@ -174,7 +174,7 @@
       "y": 52,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EverGrandeCity_EventScript_1E7D34"
+      "script": "EverGrandeCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -182,7 +182,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EverGrandeCity_EventScript_1E7D3D"
+      "script": "EverGrandeCity_EventScript_PokemonLeagueSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc
index 39e57f563..04d3a9631 100644
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -3,34 +3,34 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
 	.byte 0
 
 EverGrandeCity_OnTransition: @ 81E7D21
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B
-	msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN
+EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B
+	msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_1E7D34:: @ 81E7D34
-	msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN
+EverGrandeCity_EventScript_CitySign:: @ 81E7D34
+	msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D
-	msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN
+EverGrandeCity_EventScript_PokemonLeagueSign:: @ 81E7D3D
+	msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_1E7D46:: @ 81E7D46
+EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 81E7D46
 	setflag FLAG_VISITED_EVER_GRANDE_CITY
 	setvar VAR_TEMP_1, 1
 	end
 
-EverGrandeCity_Text_1E7D4F: @ 81E7D4F
+EverGrandeCity_Text_EnteringVictoryRoad: @ 81E7D4F
 	.string "ENTERING VICTORY ROAD$"
 
-EverGrandeCity_Text_1E7D65: @ 81E7D65
+EverGrandeCity_Text_EnteringPokemonLeague: @ 81E7D65
 	.string "ENTERING POKéMON LEAGUE\n"
 	.string "CENTER GATE$"
 
-EverGrandeCity_Text_1E7D89: @ 81E7D89
+EverGrandeCity_Text_CitySign: @ 81E7D89
 	.string "EVER GRANDE CITY\p"
 	.string "“The paradise of flowers, the sea,\n"
 	.string "and POKéMON.”$"
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index e2623e28c..139154fa9 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A
 
 EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
 	setvar VAR_0x8004, 0
-	special sub_813BF7C
+	special Script_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index c2ffaca47..cd9bd27c1 100644
--- a/data/maps/EverGrandeCity_Hall1/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
@@ -1,12 +1,12 @@
 EverGrandeCity_Hall1_MapScripts:: @ 8229569
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579
+EverGrandeCity_Hall1_OnWarp: @ 822956F
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
+EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index be19992ef..4591aa111 100644
--- a/data/maps/EverGrandeCity_Hall2/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
@@ -1,12 +1,12 @@
 EverGrandeCity_Hall2_MapScripts:: @ 822957E
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E
+EverGrandeCity_Hall2_OnWarp: @ 8229584
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
+EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index eaf2f4e5a..7bd895fd0 100644
--- a/data/maps/EverGrandeCity_Hall3/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
@@ -1,12 +1,12 @@
 EverGrandeCity_Hall3_MapScripts:: @ 8229593
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3
+EverGrandeCity_Hall3_OnWarp: @ 8229599
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
+EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index e36890874..54d7adfc3 100644
--- a/data/maps/EverGrandeCity_Hall4/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
@@ -1,12 +1,12 @@
 EverGrandeCity_Hall4_MapScripts:: @ 82295A8
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8
+EverGrandeCity_Hall4_OnWarp: @ 82295AE
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
+EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index 6079bbd42..1ba85b999 100644
--- a/data/maps/EverGrandeCity_Hall5/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
@@ -1,12 +1,12 @@
 EverGrandeCity_Hall5_MapScripts:: @ 82295BD
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD
+EverGrandeCity_Hall5_OnWarp: @ 82295C3
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
+EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 638e18eb5..3fe146f99 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -1,38 +1,38 @@
 EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp
 	.byte 0
 
-EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841
+EverGrandeCity_HallOfFame_OnWarp: @ 8229837
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
+EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850
+EverGrandeCity_HallOfFame_OnFrame: @ 8229846
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame
 	.2byte 0
 
-EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
+EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
 	lockall
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
 	waitmovement 0
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_229908
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2
 	waitmovement 0
 	delay 20
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -42,15 +42,15 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
-	call EverGrandeCity_HallOfFame_EventScript_2717C1
+	call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9
+	goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5
+	goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale
 	end
 
-EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
+EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
@@ -58,7 +58,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
 	releaseall
 	end
 
-EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
+EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
@@ -66,7 +66,7 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
 	releaseall
 	end
 
-EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901
 	walk_up
 	walk_up
 	walk_up
@@ -75,7 +75,7 @@ EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
 	walk_up
 	step_end
 
-EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908
 	walk_up
 	walk_up
 	walk_up
@@ -83,7 +83,7 @@ EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
 	walk_up
 	step_end
 
-EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
+EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E
 	.string "WALLACE: This room…\p"
 	.string "This is where we keep records of\n"
 	.string "POKéMON that prevailed through\l"
@@ -91,7 +91,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
 	.string "It is here that the LEAGUE CHAMPIONS\n"
 	.string "are honored.$"
 
-EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3
+EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames: @ 82299A3
 	.string "WALLACE: Come on, let's record your\n"
 	.string "name as a TRAINER who triumphed over\l"
 	.string "the POKéMON LEAGUE, and the names of\l"
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
index 38c527b34..23bbe085f 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Scott",
       "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT"
     }
   ],
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 2d1f1de37..95be20f75 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -5,15 +5,16 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 
 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
-	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
+	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
+EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: @ 8229A4C
 	goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
+@ VAR_0x800B is the Nurse's object event id
+EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -21,25 +22,25 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC
+EverGrandeCity_PokemonCenter_1F_EventScript_Woman:: @ 8229A67
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC
+EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM:: @ 8229A70
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
+EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
 	lock
 	faceplayer
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	playse SE_KAIDAN
@@ -48,17 +49,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: @ 8229AB6
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: @ 8229AC1
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: @ 8229ACC
 	walk_left
 	walk_down
 	walk_down
@@ -67,7 +68,7 @@ EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExit: @ 8229AD3
 	walk_down
 	walk_down
 	walk_left
@@ -76,20 +77,20 @@ EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA
+EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad: @ 8229ADA
 	.string "The POKéMON LEAGUE is only a short\n"
 	.string "distance after the VICTORY ROAD.\p"
 	.string "If you've come this far, what choice\n"
 	.string "do you have but to keep going?$"
 
-EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62
+EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon: @ 8229B62
 	.string "The long and harrowing VICTORY ROAD…\p"
 	.string "It's like reliving the path one has\n"
 	.string "traveled in life…\p"
 	.string "Believe in your POKéMON and give it\n"
 	.string "your very best!$"
 
-EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1
+EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou: @ 8229BF1
 	.string "SCOTT: {PLAYER}{KUN}, you've clawed your\n"
 	.string "way up to face the POKéMON LEAGUE!\p"
 	.string "I'm happy for you!\n"
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
index 2a9efbeaf..8efb63b9a 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index 4b695d9d9..814025895 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -6,15 +6,16 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
-	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
+EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: @ 82295ED
 	setobjectxyperm 3, 9, 2
 	setobjectxyperm 4, 10, 2
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
+@ VAR_0x800B is the Nurse's object event id
+EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 82295FC
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -22,18 +23,18 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
 	release
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
+EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 822960A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624
+	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
+EverGrandeCity_PokemonLeague_1F_Pokemart: @ 8229624
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -45,25 +46,27 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
 	release
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
+@ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
+@ Its assumed the player has the remaining badges
+EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636
 	lockall
-	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GoForth
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 11
-	call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698
+	call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight
 	compare VAR_TEMP_0, 8
-	call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3
-	message EverGrandeCity_PokemonLeague_1F_Text_2296E8
+	call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft
+	message EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges
 	waitmessage
 	delay 120
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE
+	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges
 	closemessage
-	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2
-	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5
+	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay
+	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay
 	waitmovement 0
 	delay 10
 	playfanfare MUS_ME_BACHI
-	message EverGrandeCity_PokemonLeague_1F_Text_2297EF
+	message EverGrandeCity_PokemonLeague_1F_Text_GoForth
 	waitmessage
 	waitfanfare
 	closemessage
@@ -73,67 +76,67 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DA
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DE
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
+EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE
 	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
+EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 82296BB
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight: @ 82296DA
 	walk_down
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft: @ 82296DE
 	walk_down
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2
+EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay: @ 82296E2
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5
+EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay: @ 82296E5
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8
+EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges: @ 82296E8
 	.string "Beyond this point, only those TRAINERS\n"
 	.string "who have collected all the GYM BADGES\l"
 	.string "are permitted to enter.\p"
 	.string "TRAINER, let us confirm that you have\n"
 	.string "all the GYM BADGES.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787
+EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges: @ 8229787
 	.string "You haven't obtained all the BADGES.\p"
 	.string "If you're bound for the POKéMON\n"
 	.string "LEAGUE, you must return with them.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF
+EverGrandeCity_PokemonLeague_1F_Text_GoForth: @ 82297EF
 	.string "TRAINER! Believe in yourself and your\n"
 	.string "POKéMON, and go forth!$"
 
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 863319184..b0475451a 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_EventScript_1EB22B",
+      "script": "FallarborTown_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_EventScript_1EB20C",
+      "script": "FallarborTown_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_EventScript_1EB234",
+      "script": "FallarborTown_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_EventScript_1EB23D",
+      "script": "FallarborTown_EventScript_Azurill",
       "flag": "FLAG_HIDE_FALLARBOR_AZURILL"
     }
   ],
@@ -104,14 +104,14 @@
       "x": 6,
       "y": 17,
       "elevation": 0,
-      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1",
+      "dest_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
       "dest_warp_id": 0
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 0,
-      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2",
+      "dest_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
       "dest_warp_id": 0
     }
   ],
@@ -139,7 +139,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FallarborTown_EventScript_1EB250"
+      "script": "FallarborTown_EventScript_BattleTentSign"
     },
     {
       "type": "sign",
@@ -155,7 +155,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FallarborTown_EventScript_1EB259"
+      "script": "FallarborTown_EventScript_TownSign"
     },
     {
       "type": "sign",
@@ -171,7 +171,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FallarborTown_EventScript_1EB262"
+      "script": "FallarborTown_EventScript_MoveTutorSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 15942007b..a94c81ae9 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -4,74 +4,74 @@ FallarborTown_MapScripts:: @ 81EB1FA
 
 FallarborTown_OnTransition: @ 81EB200
 	setflag FLAG_VISITED_FALLARBOR_TOWN
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
-FallarborTown_EventScript_1EB20C:: @ 81EB20C
+FallarborTown_EventScript_ExpertM:: @ 81EB20C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221
-	msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal
+	msgbox FallarborTown_Text_ShadyCharactersCozmosHome, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_EventScript_1EB221:: @ 81EB221
-	msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT
+FallarborTown_EventScript_ExpertMNormal:: @ 81EB221
+	msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_EventScript_1EB22B:: @ 81EB22B
-	msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC
+FallarborTown_EventScript_Girl:: @ 81EB22B
+	msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC
 	end
 
-FallarborTown_EventScript_1EB234:: @ 81EB234
-	msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC
+FallarborTown_EventScript_Gentleman:: @ 81EB234
+	msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC
 	end
 
-FallarborTown_EventScript_1EB23D:: @ 81EB23D
+FallarborTown_EventScript_Azurill:: @ 81EB23D
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 0
-	msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT
+	msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FallarborTown_EventScript_1EB250:: @ 81EB250
-	msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN
+FallarborTown_EventScript_BattleTentSign:: @ 81EB250
+	msgbox FallarborTown_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-FallarborTown_EventScript_1EB259:: @ 81EB259
-	msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN
+FallarborTown_EventScript_TownSign:: @ 81EB259
+	msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-FallarborTown_EventScript_1EB262:: @ 81EB262
-	msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN
+FallarborTown_EventScript_MoveTutorSign:: @ 81EB262
+	msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN
 	end
 
-FallarborTown_Text_1EB26B: @ 81EB26B
+FallarborTown_Text_ShadyCharactersCozmosHome: @ 81EB26B
 	.string "Something's happening,\n"
 	.string "and I don't like it!\p"
 	.string "I've seen shady characters wandering\n"
 	.string "in and out of PROF. COZMO's home…$"
 
-FallarborTown_Text_1EB2DE: @ 81EB2DE
+FallarborTown_Text_RegionKnownForMeteors: @ 81EB2DE
 	.string "This region's been known for meteors\n"
 	.string "since the olden days.\p"
 	.string "They say METEOR FALLS was gouged out\n"
 	.string "by a falling meteorite long ago.$"
 
-FallarborTown_Text_1EB35F: @ 81EB35F
+FallarborTown_Text_MyPreciousAzurill: @ 81EB35F
 	.string "See! Take a look!\n"
 	.string "This is my precious AZURILL!\p"
 	.string "It's slick and smooth and plushy, too!$"
 
-FallarborTown_Text_1EB3B5: @ 81EB3B5
+FallarborTown_Text_Azurill: @ 81EB3B5
 	.string "AZURILL: Rooreelooo.$"
 
-FallarborTown_Text_1EB3CA: @ 81EB3CA
+FallarborTown_Text_HaveYouChallengedFlannery: @ 81EB3CA
 	.string "Have you already challenged FLANNERY,\n"
 	.string "the LEADER of LAVARIDGE GYM?\p"
 	.string "The girl's grandfather was famous.\n"
@@ -81,15 +81,15 @@ FallarborTown_Text_1EB3CA: @ 81EB3CA
 	.string "become a great TRAINER in her own\l"
 	.string "right.$"
 
-FallarborTown_Text_1EB4C2: @ 81EB4C2
+FallarborTown_Text_BattleTentSign: @ 81EB4C2
 	.string "BATTLE TENT FALLARBOR SITE\n"
 	.string "“May the Greatest Teams Gather!”$"
 
-FallarborTown_Text_1EB4FE: @ 81EB4FE
+FallarborTown_Text_TownSign: @ 81EB4FE
 	.string "FALLARBOR TOWN\n"
 	.string "“A farm community with small gardens.”$"
 
-FallarborTown_Text_1EB534: @ 81EB534
+FallarborTown_Text_MoveTutorSign: @ 81EB534
 	.string "MOVE TUTOR'S HOUSE\n"
 	.string "“New moves taught to POKéMON.”$"
 
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index b63846abd..18f39ecd1 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -35,15 +35,15 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
 	showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
 
 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 3
 	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
 	waitmovement 0
@@ -68,7 +68,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT
 
 FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -85,11 +85,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
 	closemessage
 
 FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -105,15 +105,15 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -129,9 +129,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
 FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51
-	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case NO, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case YES, FallarborTown_BattleTentBattleRoom_EventScript_200B51
+	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
 
 FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6
 	message FallarborTown_BattleTentBattleRoom_Text_257E9E
@@ -153,7 +153,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
 
 FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
 	delay 60
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -190,7 +190,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json
index aa65e71a0..4c565ff8c 100644
--- a/data/maps/FallarborTown_BattleTentLobby/map.json
+++ b/data/maps/FallarborTown_BattleTentLobby/map.json
@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "FallarborTown_BattleTentLobby_EventScript_200228",
-      "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT"
+      "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT"
     }
   ],
   "warp_events": [
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 3f6eec374..b5cc43558 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -21,7 +21,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
 	.2byte 0
 
 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -29,12 +29,12 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
 	lockall
 	msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -48,7 +48,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
 	waitmessage
 	setvar VAR_0x8004, 4
 	special sub_81B9B80
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -64,7 +64,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
 	special sub_81B9B80
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -96,7 +96,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
 	lockall
 	message FallarborTown_BattleTentLobby_Text_2C4FD7
 	waitmessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -120,7 +120,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 	special sub_81B9B80
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -151,11 +151,11 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 	setvar VAR_FRONTIER_FACILITY, 3
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
 	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 2
 	special CallFrontierUtilFunc
@@ -169,22 +169,22 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2
 	msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_2001C2
-	case 1, FallarborTown_BattleTentLobby_EventScript_2000E2
-	case 127, FallarborTown_BattleTentLobby_EventScript_2001C2
+	case NO, FallarborTown_BattleTentLobby_EventScript_2001C2
+	case YES, FallarborTown_BattleTentLobby_EventScript_2000E2
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C2
 
 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
 	special sub_81B9B80
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -198,8 +198,8 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 
 FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT
 	closemessage
@@ -227,7 +227,7 @@ FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
 	goto FallarborTown_BattleTentLobby_EventScript_2001CD
 
 FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_CozmosHouse/map.json
index e5e75c631..a31c1c5bf 100644
--- a/data/maps/FallarborTown_House1/map.json
+++ b/data/maps/FallarborTown_CozmosHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_FALLARBOR_TOWN_HOUSE1",
-  "name": "FallarborTown_House1",
+  "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
+  "name": "FallarborTown_CozmosHouse",
   "layout": "LAYOUT_HOUSE1",
   "music": "MUS_TONEKUSA",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
@@ -24,8 +24,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_House1_EventScript_200F13",
-      "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO"
+      "script": "FallarborTown_CozmosHouse_EventScript_ProfCozmo",
+      "flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_House1_EventScript_200FBC",
+      "script": "FallarborTown_CozmosHouse_EventScript_CozmosWife",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc
new file mode 100644
index 000000000..224147bc5
--- /dev/null
+++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc
@@ -0,0 +1,121 @@
+FallarborTown_CozmosHouse_MapScripts:: @ 8200F12
+	.byte 0
+
+FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_GaveMeteorite
+	checkitem ITEM_METEORITE, 1
+	compare VAR_RESULT, TRUE
+	goto_if_eq FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite
+	msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
+	call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite
+	call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite
+	compare VAR_RESULT, NO
+	goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite
+	msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT
+	giveitem_std ITEM_TM27
+	compare VAR_RESULT, FALSE
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	setvar VAR_0x8004, ITEM_METEORITE
+	call Common_EventScript_PlayerHandedOverTheItem
+	setflag FLAG_RECEIVED_TM27
+	msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8200F8B
+	msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT
+	msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO
+	return
+
+FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8200F9C
+	msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO
+	return
+
+FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8200FA5
+	setflag FLAG_TEMP_2
+	msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8200FB2
+	msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8200FBC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_CozmoIsSad
+	msgbox FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8200FDA
+	msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8200FE4
+	msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT
+	release
+	end
+
+FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow: @ 8200FEE
+	.string "PROF. COZMO: Oh…\n"
+	.string "I never should have let myself be\l"
+	.string "conned into telling TEAM MAGMA where\l"
+	.string "you can find METEORITES…\p"
+	.string "That METEORITE from METEOR FALLS…\n"
+	.string "It's never going to be mine now…$"
+
+FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt: @ 82010A2
+	.string "Oh!\n"
+	.string "Hah?\p"
+	.string "That item…\p"
+	.string "Could it be?\p"
+	.string "Is it the METEORITE that TEAM MAGMA\n"
+	.string "took from METEOR FALLS?\p"
+	.string "Please, may I have it?\p"
+	.string "I'm not asking for it for free.\n"
+	.string "How about in exchange for this TM?$"
+
+FallarborTown_CozmosHouse_Text_PleaseUseThisTM: @ 8201159
+	.string "PROF. COZMO: This TM, it represents\n"
+	.string "my feeling of gratitude.\l"
+	.string "Please use it!$"
+
+FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch: @ 82011A5
+	.string "PROF. COZMO: Oh, I can't believe it.\n"
+	.string "This is really, really great!\p"
+	.string "This is really going to help my research!$"
+
+FallarborTown_CozmosHouse_Text_CrushedWithDisappointment: @ 8201212
+	.string "PROF. COZMO: Oh, but…\n"
+	.string "I'm crushed with disappointment…$"
+
+FallarborTown_CozmosHouse_Text_MayIHaveMeteorite: @ 8201249
+	.string "PROF. COZMO: Please, may I have that\n"
+	.string "METEORITE?\p"
+	.string "I'm not asking for it for free.\n"
+	.string "How about in exchange for this TM?$"
+
+FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls: @ 82012BC
+	.string "PROF. COZMO went off to METEOR FALLS\n"
+	.string "on ROUTE 114 with some people from\l"
+	.string "TEAM MAGMA.$"
+
+FallarborTown_CozmosHouse_Text_FeelSorryForCozmo: @ 8201310
+	.string "Poor PROF. COZMO…\n"
+	.string "He's so depressed… I feel sorry for him.$"
+
+FallarborTown_CozmosHouse_Text_CozmoIsSoHappy: @ 820134B
+	.string "Look at PROF. COZMO…\n"
+	.string "He's so happy! I think it's cute.$"
+
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
deleted file mode 100644
index e3299e096..000000000
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-FallarborTown_House1_MapScripts:: @ 8200F12
-	.byte 0
-
-FallarborTown_House1_EventScript_200F13:: @ 8200F13
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2
-	checkitem ITEM_METEORITE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq FallarborTown_House1_EventScript_200F38
-	msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200F38:: @ 8200F38
-	call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B
-	call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C
-	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_House1_EventScript_200FA5
-	msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM27
-	compare VAR_RESULT, 0
-	goto_if_eq Common_EventScript_ShowBagIsFull
-	setvar VAR_0x8004, ITEM_METEORITE
-	call Common_EventScript_PlayerHandedOverTheItem
-	setflag FLAG_RECEIVED_TM27
-	msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200F8B:: @ 8200F8B
-	msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT
-	msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO
-	return
-
-FallarborTown_House1_EventScript_200F9C:: @ 8200F9C
-	msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO
-	return
-
-FallarborTown_House1_EventScript_200FA5:: @ 8200FA5
-	setflag FLAG_TEMP_2
-	msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200FB2:: @ 8200FB2
-	msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200FBC:: @ 8200FBC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4
-	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA
-	msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200FDA:: @ 8200FDA
-	msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_EventScript_200FE4:: @ 8200FE4
-	msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT
-	release
-	end
-
-FallarborTown_House1_Text_200FEE: @ 8200FEE
-	.string "PROF. COZMO: Oh…\n"
-	.string "I never should have let myself be\l"
-	.string "conned into telling TEAM MAGMA where\l"
-	.string "you can find METEORITES…\p"
-	.string "That METEORITE from METEOR FALLS…\n"
-	.string "It's never going to be mine now…$"
-
-FallarborTown_House1_Text_2010A2: @ 82010A2
-	.string "Oh!\n"
-	.string "Hah?\p"
-	.string "That item…\p"
-	.string "Could it be?\p"
-	.string "Is it the METEORITE that TEAM MAGMA\n"
-	.string "took from METEOR FALLS?\p"
-	.string "Please, may I have it?\p"
-	.string "I'm not asking for it for free.\n"
-	.string "How about in exchange for this TM?$"
-
-FallarborTown_House1_Text_201159: @ 8201159
-	.string "PROF. COZMO: This TM, it represents\n"
-	.string "my feeling of gratitude.\l"
-	.string "Please use it!$"
-
-FallarborTown_House1_Text_2011A5: @ 82011A5
-	.string "PROF. COZMO: Oh, I can't believe it.\n"
-	.string "This is really, really great!\p"
-	.string "This is really going to help my research!$"
-
-FallarborTown_House1_Text_201212: @ 8201212
-	.string "PROF. COZMO: Oh, but…\n"
-	.string "I'm crushed with disappointment…$"
-
-FallarborTown_House1_Text_201249: @ 8201249
-	.string "PROF. COZMO: Please, may I have that\n"
-	.string "METEORITE?\p"
-	.string "I'm not asking for it for free.\n"
-	.string "How about in exchange for this TM?$"
-
-FallarborTown_House1_Text_2012BC: @ 82012BC
-	.string "PROF. COZMO went off to METEOR FALLS\n"
-	.string "on ROUTE 114 with some people from\l"
-	.string "TEAM MAGMA.$"
-
-FallarborTown_House1_Text_201310: @ 8201310
-	.string "Poor PROF. COZMO…\n"
-	.string "He's so depressed… I feel sorry for him.$"
-
-FallarborTown_House1_Text_20134B: @ 820134B
-	.string "Look at PROF. COZMO…\n"
-	.string "He's so happy! I think it's cute.$"
-
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
deleted file mode 100644
index d0305ad4b..000000000
--- a/data/maps/FallarborTown_House2/scripts.inc
+++ /dev/null
@@ -1,102 +0,0 @@
-FallarborTown_House2_MapScripts:: @ 8201382
-	.byte 0
-
-FallarborTown_House2_EventScript_201383:: @ 8201383
-	lockall
-	applymovement 1, Common_Movement_FacePlayer
-	waitmovement 0
-	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8
-	msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT
-	setflag FLAG_TEMP_1
-	goto FallarborTown_House2_EventScript_2013A8
-	end
-
-FallarborTown_House2_EventScript_2013A8:: @ 82013A8
-	checkitem ITEM_HEART_SCALE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_House2_EventScript_201452
-	msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO
-	switch VAR_RESULT
-	case 0, FallarborTown_House2_EventScript_201452
-	goto FallarborTown_House2_EventScript_2013D6
-	end
-
-FallarborTown_House2_EventScript_2013D6:: @ 82013D6
-	msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT
-	special sub_81B951C
-	waitstate
-	compare VAR_0x8004, 255
-	goto_if_eq FallarborTown_House2_EventScript_201452
-	special sub_81B98DC
-	compare VAR_RESULT, 1
-	goto_if_eq FallarborTown_House2_EventScript_201444
-	compare VAR_0x8005, 0
-	goto_if_eq FallarborTown_House2_EventScript_201436
-	goto FallarborTown_House2_EventScript_20140C
-	end
-
-FallarborTown_House2_EventScript_20140C:: @ 820140C
-	msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
-	special TeachMoveRelearnerMove
-	waitstate
-	compare VAR_0x8004, 0
-	goto_if_eq FallarborTown_House2_EventScript_2013D6
-	msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT
-	takeitem ITEM_HEART_SCALE, 1
-	goto FallarborTown_House2_EventScript_201452
-	end
-
-FallarborTown_House2_EventScript_201436:: @ 8201436
-	msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT
-	goto FallarborTown_House2_EventScript_2013D6
-	end
-
-FallarborTown_House2_EventScript_201444:: @ 8201444
-	msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT
-	goto FallarborTown_House2_EventScript_2013D6
-	end
-
-FallarborTown_House2_EventScript_201452:: @ 8201452
-	msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT
-	releaseall
-	end
-
-FallarborTown_House2_Text_20145C: @ 820145C
-	.string "I'm the MOVE TUTOR.\p"
-	.string "I know all the moves that POKéMON\n"
-	.string "learn--every one of them--and I can\l"
-	.string "teach POKéMON those moves.\p"
-	.string "I can teach a move to a POKéMON\n"
-	.string "of yours if you'd like.\p"
-	.string "I'll do it for a HEART SCALE.\n"
-	.string "I'm collecting those now.$"
-
-FallarborTown_House2_Text_201541: @ 8201541
-	.string "Oh! That's it! That's an honest to\n"
-	.string "goodness HEART SCALE!\p"
-	.string "Let me guess, you want me to teach\n"
-	.string "a move?$"
-
-FallarborTown_House2_Text_2015A5: @ 82015A5
-	.string "Which POKéMON needs tutoring?$"
-
-FallarborTown_House2_Text_2015C3: @ 82015C3
-	.string "Which move should I teach?$"
-
-FallarborTown_House2_Text_2015DE: @ 82015DE
-	.string "Sorry…\p"
-	.string "It doesn't appear as if I have any move\n"
-	.string "I can teach that POKéMON.$"
-
-FallarborTown_House2_Text_201627: @ 8201627
-	.string "{PLAYER} handed over one HEART SCALE\n"
-	.string "in exchange.$"
-
-FallarborTown_House2_Text_201653: @ 8201653
-	.string "If your POKéMON need to learn a move,\n"
-	.string "come back with a HEART SCALE.$"
-
-FallarborTown_House2_Text_201697: @ 8201697
-	.string "Hunh? There isn't a single move that\n"
-	.string "I can teach an EGG.$"
-
diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json
index 60b0be26a..f58c0d9e2 100644
--- a/data/maps/FallarborTown_Mart/map.json
+++ b/data/maps/FallarborTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCBF",
+      "script": "FallarborTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCF4",
+      "script": "FallarborTown_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCFD",
+      "script": "FallarborTown_Mart_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFD06",
+      "script": "FallarborTown_Mart_EventScript_Skitty",
       "flag": "0"
     },
     {
diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc
index 3ae8dc9dd..bf106781a 100644
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 FallarborTown_Mart_MapScripts:: @ 81FFCBE
 	.byte 0
 
-FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF
+FallarborTown_Mart_EventScript_Clerk:: @ 81FFCBF
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart FallarborTown_Mart_Pokemart_1FFCD8
+	pokemart FallarborTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
+FallarborTown_Mart_Pokemart: @ 81FFCD8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -29,25 +29,25 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
 	release
 	end
 
-FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4
-	msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC
+FallarborTown_Mart_EventScript_Woman:: @ 81FFCF4
+	msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD
-	msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC
+FallarborTown_Mart_EventScript_PokefanM:: @ 81FFCFD
+	msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06
+FallarborTown_Mart_EventScript_Skitty:: @ 81FFD06
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT
+	msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FallarborTown_Mart_Text_1FFD19: @ 81FFD19
+FallarborTown_Mart_Text_DecidingSkittyEvolve: @ 81FFD19
 	.string "I'm having a hard time deciding if I\n"
 	.string "should make my SKITTY evolve or not.\p"
 	.string "I only have to use this MOON STONE,\n"
@@ -56,10 +56,10 @@ FallarborTown_Mart_Text_1FFD19: @ 81FFD19
 	.string "much stronger.\p"
 	.string "But it will look so different, too.$"
 
-FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA
+FallarborTown_Mart_Text_Skitty: @ 81FFDFA
 	.string "SKITTY: Miyao?$"
 
-FallarborTown_Mart_Text_1FFE09: @ 81FFE09
+FallarborTown_Mart_Text_SellNuggetIFound: @ 81FFE09
 	.string "This NUGGET I found here…\n"
 	.string "I suppose I'll have to sell it, seeing\l"
 	.string "as how it has no other use.$"
diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json
index fe0ce67a0..c444c1e38 100644
--- a/data/maps/FallarborTown_House2/map.json
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_FALLARBOR_TOWN_HOUSE2",
-  "name": "FallarborTown_House2",
+  "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
+  "name": "FallarborTown_MoveRelearnersHouse",
   "layout": "LAYOUT_HOUSE2",
   "music": "MUS_TONEKUSA",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_House2_EventScript_201383",
+      "script": "FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
new file mode 100644
index 000000000..788ee088d
--- /dev/null
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
@@ -0,0 +1,102 @@
+FallarborTown_MoveRelearnersHouse_MapScripts:: @ 8201382
+	.byte 0
+
+FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383
+	lockall
+	applymovement 1, Common_Movement_FacePlayer
+	waitmovement 0
+	goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove
+	msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT
+	setflag FLAG_TEMP_1
+	goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8
+	checkitem ITEM_HEART_SCALE, 1
+	compare VAR_RESULT, 0
+	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
+	msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO
+	switch VAR_RESULT
+	case NO, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
+	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 82013D6
+	msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT
+	special ChooseMonForMoveRelearner
+	waitstate
+	compare VAR_0x8004, 255
+	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
+	special IsSelectedMonEgg
+	compare VAR_RESULT, TRUE
+	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg
+	compare VAR_0x8005, 0
+	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon
+	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C
+	msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT
+	special TeachMoveRelearnerMove
+	waitstate
+	compare VAR_0x8004, 0
+	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
+	msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT
+	takeitem ITEM_HEART_SCALE, 1
+	goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8201436
+	msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT
+	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8201444
+	msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT
+	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
+	end
+
+FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8201452
+	msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT
+	releaseall
+	end
+
+FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor: @ 820145C
+	.string "I'm the MOVE TUTOR.\p"
+	.string "I know all the moves that POKéMON\n"
+	.string "learn--every one of them--and I can\l"
+	.string "teach POKéMON those moves.\p"
+	.string "I can teach a move to a POKéMON\n"
+	.string "of yours if you'd like.\p"
+	.string "I'll do it for a HEART SCALE.\n"
+	.string "I'm collecting those now.$"
+
+FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove: @ 8201541
+	.string "Oh! That's it! That's an honest to\n"
+	.string "goodness HEART SCALE!\p"
+	.string "Let me guess, you want me to teach\n"
+	.string "a move?$"
+
+FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon: @ 82015A5
+	.string "Which POKéMON needs tutoring?$"
+
+FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove: @ 82015C3
+	.string "Which move should I teach?$"
+
+FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon: @ 82015DE
+	.string "Sorry…\p"
+	.string "It doesn't appear as if I have any move\n"
+	.string "I can teach that POKéMON.$"
+
+FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale: @ 8201627
+	.string "{PLAYER} handed over one HEART SCALE\n"
+	.string "in exchange.$"
+
+FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale: @ 8201653
+	.string "If your POKéMON need to learn a move,\n"
+	.string "come back with a HEART SCALE.$"
+
+FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg: @ 8201697
+	.string "Hunh? There isn't a single move that\n"
+	.string "I can teach an EGG.$"
+
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json
index b1ea1ed14..0b55de01a 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/map.json
+++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Lanette",
       "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE"
     }
   ],
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index db9122b6d..70c209ef9 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
+@ VAR_0x800B is the Nurse's object event id
+FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,44 +17,44 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC
+FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8200BEF
+	msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC
+FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8200BF8
+	msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
+FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
 	lock
 	faceplayer
-	msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT
+	msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
-	case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28
-	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38
+	case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth
+	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8200C28
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth
 	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest
 	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48
 	playse SE_JIDO_DOA
 	removeobject 4
 	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
 	walk_right
 	walk_down
 	walk_down
@@ -68,7 +69,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
 	walk_down
 	walk_down
 	walk_left
@@ -81,7 +82,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
+FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
 	.string "Oh, hello.\n"
 	.string "You are?\p"
 	.string "Okay, your name's {PLAYER}{KUN}.\n"
@@ -98,13 +99,13 @@ FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
 	.string "If you could, please visit me at home.\n"
 	.string "My house is on ROUTE 114.$"
 
-FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22
+FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown: @ 8200E22
 	.string "I wonder what POKéMON looked like\n"
 	.string "long, long ago?\p"
 	.string "Maybe the FOSSIL MANIAC at the edge\n"
 	.string "of town will know.$"
 
-FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B
+FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees: @ 8200E8B
 	.string "In the fields of FALLARBOR, we plant\n"
 	.string "seedlings of hardy trees that thrive\l"
 	.string "even in volcanic ash.$"
diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json
index e8dc6dbed..fe81fd10a 100644
--- a/data/maps/FarawayIsland_Entrance/map.json
+++ b/data/maps/FarawayIsland_Entrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FarawayIsland_Entrance_EventScript_267CA2",
+      "script": "FarawayIsland_Entrance_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "FarawayIsland_Entrance_EventScript_267C98"
+      "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "FarawayIsland_Entrance_EventScript_267C9D"
+      "script": "FarawayIsland_Entrance_EventScript_ClearWeather"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "FarawayIsland_Entrance_EventScript_267C98"
+      "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather"
     }
   ],
   "bg_events": [
@@ -93,7 +93,7 @@
       "y": 32,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FarawayIsland_Entrance_EventScript_267CF1"
+      "script": "FarawayIsland_Entrance_EventScript_Sign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
index f69bca377..33b2a294c 100644
--- a/data/maps/FarawayIsland_Entrance/scripts.inc
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
@@ -6,22 +6,22 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94
 	setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
 	end
 
-FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
+FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98
 	setweather WEATHER_CLOUDS
 	doweather
 	end
 
-FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
+FarawayIsland_Entrance_EventScript_ClearWeather:: @ 8267C9D
 	setweather WEATHER_NONE
 	doweather
 	end
 
-FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
+FarawayIsland_Entrance_EventScript_Sailor:: @ 8267CA2
 	lock
 	faceplayer
 	msgbox FarawayIsland_Entrance_Text_SailorReturn, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
+	compare VAR_RESULT, NO
+	goto_if_eq FarawayIsland_Entrance_EventScript_AsYouLike
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -29,18 +29,18 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	delay 30
 	hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE
 	setvar VAR_0x8004, 2
-	call FarawayIsland_Entrance_EventScript_272250
+	call Common_EventScript_FerryDepartIsland
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7
+FarawayIsland_Entrance_EventScript_AsYouLike:: @ 8267CE7
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 
-FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1
+FarawayIsland_Entrance_EventScript_Sign:: @ 8267CF1
 	msgbox FarawayIsland_Entrance_Text_Sign, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json
index b41c5461a..4998380e1 100644
--- a/data/maps/FarawayIsland_Interior/map.json
+++ b/data/maps/FarawayIsland_Interior/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 15,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "FarawayIsland_Interior_EventScript_267DF2",
+      "script": "FarawayIsland_Interior_EventScript_Mew",
       "flag": "FLAG_HIDE_MEW"
     }
   ],
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index 632240814..20121d500 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -1,11 +1,11 @@
 FarawayIsland_Interior_MapScripts:: @ 8267CFA
-	map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54
+	map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_OnFrame
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_OnReturnToField
 	.byte 0
 
-FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
+FarawayIsland_Interior_OnReturnToField: @ 8267D0F
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19
 	end
 
@@ -26,11 +26,11 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B
 	special sub_81D4A90
 	return
 
-FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E
+FarawayIsland_Interior_OnResume: @ 8267D54
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_TryRemoveMew
 	end
 
-FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
+FarawayIsland_Interior_EventScript_TryRemoveMew:: @ 8267D5E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -40,34 +40,34 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
 FarawayIsland_Interior_OnTransition: @ 8267D72
 	setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
 	setvar VAR_TEMP_1, 1
-	call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
+	call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_TryShowMew
 	end
 
-FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
+FarawayIsland_Interior_EventScript_TryShowMew:: @ 8267D86
 	goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
 
-FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
-	map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2
+FarawayIsland_Interior_OnFrame: @ 8267D98
+	map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_FindMew
 	.2byte 0
 
-FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
+FarawayIsland_Interior_EventScript_FindMew:: @ 8267DA2
 	lockall
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 1, FarawayIsland_Interior_Movement_267DCE
+	applymovement 1, FarawayIsland_Interior_Movement_MewMoveAndHide
 	waitmovement 0
 	copyobjectxytoperm 1
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end
 
-FarawayIsland_Interior_Movement_267DCE: @ 8267DCE
+FarawayIsland_Interior_Movement_MewMoveAndHide: @ 8267DCE
 	walk_up
 	walk_up
 	walk_up
@@ -75,11 +75,11 @@ FarawayIsland_Interior_Movement_267DCE: @ 8267DCE
 	set_invisible
 	step_end
 
-FarawayIsland_Interior_Movement_267DD4: @ 8267DD4
+FarawayIsland_Interior_Movement_MewAppear: @ 8267DD4
 	set_visible
 	step_end
 
-FarawayIsland_Interior_Movement_267DD6: @ 8267DD6
+FarawayIsland_Interior_Movement_MewHideDown: @ 8267DD6
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -88,7 +88,7 @@ FarawayIsland_Interior_Movement_267DD6: @ 8267DD6
 	walk_in_place_down
 	step_end
 
-FarawayIsland_Interior_Movement_267DDD: @ 8267DDD
+FarawayIsland_Interior_Movement_MewHideUp: @ 8267DDD
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -97,7 +97,7 @@ FarawayIsland_Interior_Movement_267DDD: @ 8267DDD
 	walk_in_place_up
 	step_end
 
-FarawayIsland_Interior_Movement_267DE4: @ 8267DE4
+FarawayIsland_Interior_Movement_MewHideRight: @ 8267DE4
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -106,7 +106,7 @@ FarawayIsland_Interior_Movement_267DE4: @ 8267DE4
 	walk_in_place_right
 	step_end
 
-FarawayIsland_Interior_Movement_267DEB: @ 8267DEB
+FarawayIsland_Interior_Movement_MewHideLeft: @ 8267DEB
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -115,10 +115,10 @@ FarawayIsland_Interior_Movement_267DEB: @ 8267DEB
 	walk_in_place_left
 	step_end
 
-FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
+FarawayIsland_Interior_EventScript_Mew:: @ 8267DF2
 	lock
 	faceplayer
-	applymovement 1, FarawayIsland_Interior_Movement_267DD4
+	applymovement 1, FarawayIsland_Interior_Movement_MewAppear
 	waitmovement 0
 	setvar VAR_0x8004, 0
 	special sub_81D4A90
@@ -126,18 +126,18 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	waitse
 	playmoncry SPECIES_MEW, 2
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq FarawayIsland_Interior_EventScript_267EAF
+	call_if_eq FarawayIsland_Interior_EventScript_MewHideDown
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq FarawayIsland_Interior_EventScript_267EBA
+	call_if_eq FarawayIsland_Interior_EventScript_MewHideUp
 	compare VAR_FACING, DIR_WEST
-	call_if_eq FarawayIsland_Interior_EventScript_267EC5
+	call_if_eq FarawayIsland_Interior_EventScript_MewHideRight
 	compare VAR_FACING, DIR_EAST
-	call_if_eq FarawayIsland_Interior_EventScript_267ED0
+	call_if_eq FarawayIsland_Interior_EventScript_MewHideLeft
 	special sub_81D4BEC
 	delay 40
 	waitmoncry
 	setvar VAR_0x8004, SPECIES_MEW
-	setvar VAR_0x8005, 30 @level
+	setvar VAR_0x8005, 30 @ level
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -146,58 +146,58 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq FarawayIsland_Interior_EventScript_267E96
+	goto_if_eq FarawayIsland_Interior_EventScript_MewDefeated
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq FarawayIsland_Interior_EventScript_267EA4
+	goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq FarawayIsland_Interior_EventScript_267EA4
+	goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan
 	compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED
-	goto_if_eq FarawayIsland_Interior_EventScript_267EA4
+	goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan
 	setflag FLAG_CAUGHT_MEW
 	release
 	end
 
-FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
+FarawayIsland_Interior_EventScript_MewDefeated:: @ 8267E96
 	setflag FLAG_DEFEATED_MEW
 	setvar VAR_0x8004, SPECIES_MEW
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4
+FarawayIsland_Interior_EventScript_PlayerOrMewRan:: @ 8267EA4
 	setvar VAR_0x8004, SPECIES_MEW
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF
-	applymovement 1, FarawayIsland_Interior_Movement_267DD6
+FarawayIsland_Interior_EventScript_MewHideDown:: @ 8267EAF
+	applymovement 1, FarawayIsland_Interior_Movement_MewHideDown
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA
-	applymovement 1, FarawayIsland_Interior_Movement_267DDD
+FarawayIsland_Interior_EventScript_MewHideUp:: @ 8267EBA
+	applymovement 1, FarawayIsland_Interior_Movement_MewHideUp
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5
-	applymovement 1, FarawayIsland_Interior_Movement_267DE4
+FarawayIsland_Interior_EventScript_MewHideRight:: @ 8267EC5
+	applymovement 1, FarawayIsland_Interior_Movement_MewHideRight
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
-	applymovement 1, FarawayIsland_Interior_Movement_267DEB
+FarawayIsland_Interior_EventScript_MewHideLeft:: @ 8267ED0
+	applymovement 1, FarawayIsland_Interior_Movement_MewHideLeft
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB
+FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB
 	lockall
 	fadescreenswapbuffers 1
 	setflag FLAG_HIDE_MEW
 	removeobject 1
 	fadescreenswapbuffers 0
-	msgbox FarawayIsland_Interior_Text_267EF1, MSGBOX_DEFAULT
+	msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-FarawayIsland_Interior_Text_267EF1: @ 8267EF1
+FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded: @ 8267EF1
 	.string "The feeling of being watched faded…$"
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index 0aa5769a0..ca259993e 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -3,12 +3,12 @@ FieryPath_MapScripts:: @ 8230F24
 	.byte 0
 
 FieryPath_OnTransition: @ 8230F2A
-	call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
+	call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor
 	setflag FLAG_LANDMARK_FIERY_PATH
 	end
 
-FieryPath_EventScript_230F37:: @ 8230F37
+FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37
 	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
-	clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	return
 
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 454fc34d3..ce1dcee3e 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25B6",
+      "script": "FortreeCity_EventScript_Man",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25DE",
+      "script": "FortreeCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25BF",
+      "script": "FortreeCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25F0",
+      "script": "FortreeCity_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25E7",
+      "script": "FortreeCity_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E25F9",
+      "script": "FortreeCity_EventScript_GameboyKid",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_EventScript_1E2614",
+      "script": "FortreeCity_EventScript_Kecleon",
       "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON"
     }
   ],
@@ -190,7 +190,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FortreeCity_EventScript_1E2602"
+      "script": "FortreeCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -214,7 +214,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FortreeCity_EventScript_1E260B"
+      "script": "FortreeCity_EventScript_GymSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index 34853336d..748ed2558 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -1,76 +1,76 @@
 FortreeCity_MapScripts:: @ 81E25A4
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3
+	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume
 	.byte 0
 
 FortreeCity_OnTransition: @ 81E25AF
 	setflag FLAG_VISITED_FORTREE_CITY
 	end
 
-FortreeCity_MapScript1_1E25B3: @ 81E25B3
+FortreeCity_OnResume: @ 81E25B3
 	setstepcallback STEP_CB_FORTREE_BRIDGE
 	end
 
-FortreeCity_EventScript_1E25B6:: @ 81E25B6
-	msgbox FortreeCity_Text_1E2676, MSGBOX_NPC
+FortreeCity_EventScript_Man:: @ 81E25B6
+	msgbox FortreeCity_Text_SawGiganticPokemonInSky, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_1E25BF:: @ 81E25BF
+FortreeCity_EventScript_Woman:: @ 81E25BF
 	lock
 	faceplayer
-	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4
-	msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT
+	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible
+	msgbox FortreeCity_Text_SomethingBlockingGym, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_EventScript_1E25D4:: @ 81E25D4
-	msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT
+FortreeCity_EventScript_WomanGymAccessible:: @ 81E25D4
+	msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_EventScript_1E25DE:: @ 81E25DE
-	msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC
+FortreeCity_EventScript_Girl:: @ 81E25DE
+	msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_1E25E7:: @ 81E25E7
-	msgbox FortreeCity_Text_1E2880, MSGBOX_NPC
+FortreeCity_EventScript_OldMan:: @ 81E25E7
+	msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_1E25F0:: @ 81E25F0
-	msgbox FortreeCity_Text_1E292E, MSGBOX_NPC
+FortreeCity_EventScript_Boy:: @ 81E25F0
+	msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_1E25F9:: @ 81E25F9
-	msgbox FortreeCity_Text_1E299D, MSGBOX_NPC
+FortreeCity_EventScript_GameboyKid:: @ 81E25F9
+	msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_1E2602:: @ 81E2602
-	msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN
+FortreeCity_EventScript_CitySign:: @ 81E2602
+	msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-FortreeCity_EventScript_1E260B:: @ 81E260B
-	msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN
+FortreeCity_EventScript_GymSign:: @ 81E260B
+	msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-FortreeCity_EventScript_1E2614:: @ 81E2614
+FortreeCity_EventScript_Kecleon:: @ 81E2614
 	lock
 	faceplayer
 	checkitem ITEM_DEVON_SCOPE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq FortreeCity_EventScript_1E2630
-	msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq FortreeCity_EventScript_AskUseDevonScope
+	msgbox FortreeCity_Text_SomethingUnseeable, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_EventScript_1E2630:: @ 81E2630
-	msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq FortreeCity_EventScript_1E2645
+FortreeCity_EventScript_AskUseDevonScope:: @ 81E2630
+	msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq FortreeCity_EventScript_UseDevonScope
 	release
 	end
 
-FortreeCity_EventScript_1E2645:: @ 81E2645
-	msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT
+FortreeCity_EventScript_UseDevonScope:: @ 81E2645
+	msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
 	waitmovement 0
@@ -78,18 +78,18 @@ FortreeCity_EventScript_1E2645:: @ 81E2645
 	playmoncry SPECIES_KECLEON, 2
 	delay 40
 	waitmoncry
-	applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674
+	applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	setflag FLAG_KECLEON_FLED_FORTREE
 	release
 	end
 
-FortreeCity_Movement_1E2674: @ 81E2674
+FortreeCity_Movement_KecleonFlee: @ 81E2674
 	walk_right
 	step_end
 
-FortreeCity_Text_1E2676: @ 81E2676
+FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676
 	.string "No one believes me, but I saw this\n"
 	.string "gigantic POKéMON in the sky.\p"
 	.string "It seemed to squirm as it flew toward\n"
@@ -98,23 +98,23 @@ FortreeCity_Text_1E2676: @ 81E2676
 	.string "Um… You, uh…smell singed.\p"
 	.string "Were you at a volcano or something?$"
 
-FortreeCity_Text_1E2738: @ 81E2738
+FortreeCity_Text_SomethingBlockingGym: @ 81E2738
 	.string "I want to go to the POKéMON GYM,\n"
 	.string "but something's blocking the way.\p"
 	.string "After all the bother I went through\n"
 	.string "training on ROUTE 120…$"
 
-FortreeCity_Text_1E27B6: @ 81E27B6
+FortreeCity_Text_ThisTimeIllBeatWinona: @ 81E27B6
 	.string "I've got my pride-and-joy POKéMON\n"
 	.string "with me. This time, I'll beat WINONA.$"
 
-FortreeCity_Text_1E27FE: @ 81E27FE
+FortreeCity_Text_TreesGrowByDrinkingRainwater: @ 81E27FE
 	.string "The ground absorbs rainwater, and\n"
 	.string "trees grow by drinking that water…\p"
 	.string "Our FORTREE CITY exists because\n"
 	.string "there's both water and soil.$"
 
-FortreeCity_Text_1E2880: @ 81E2880
+FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880
 	.string "The CITY consists of homes built on\n"
 	.string "trees.\p"
 	.string "Perhaps because of that lifestyle,\n"
@@ -122,35 +122,35 @@ FortreeCity_Text_1E2880: @ 81E2880
 	.string "Why, even myself--I feel as if I've\n"
 	.string "grown thirty years younger.$"
 
-FortreeCity_Text_1E292E: @ 81E292E
+FortreeCity_Text_BugPokemonComeThroughWindow: @ 81E292E
 	.string "Living on top of trees is okay.\p"
 	.string "But sometimes BUG POKéMON come in\n"
 	.string "through windows.\l"
 	.string "It can be really startling.$"
 
-FortreeCity_Text_1E299D: @ 81E299D
+FortreeCity_Text_PokemonThatEvolveWhenTraded: @ 81E299D
 	.string "There are POKéMON that evolve when\n"
 	.string "you trade them! That's what I heard.$"
 
-FortreeCity_Text_1E29E5: @ 81E29E5
+FortreeCity_Text_SomethingUnseeable: @ 81E29E5
 	.string "Something unseeable is in the way.$"
 
-FortreeCity_Text_1E2A08: @ 81E2A08
+FortreeCity_Text_UnseeableUseDevonScope: @ 81E2A08
 	.string "Something unseeable is in the way.\p"
 	.string "Want to use the DEVON SCOPE?$"
 
-FortreeCity_Text_1E2A48: @ 81E2A48
+FortreeCity_Text_UsedDevonScopePokemonFled: @ 81E2A48
 	.string "{PLAYER} used the DEVON SCOPE.\p"
 	.string "An invisible POKéMON became completely\n"
 	.string "visible!\p"
 	.string "The startled POKéMON fled!$"
 
-FortreeCity_Text_1E2AAC: @ 81E2AAC
+FortreeCity_Text_CitySign: @ 81E2AAC
 	.string "FORTREE CITY\n"
 	.string "“The treetop city that frolics with\l"
 	.string "nature.”$"
 
-FortreeCity_Text_1E2AE6: @ 81E2AE6
+FortreeCity_Text_GymSign: @ 81E2AE6
 	.string "FORTREE CITY POKéMON GYM\n"
 	.string "LEADER: WINONA\p"
 	.string "“The bird user taking flight into\n"
diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json
index a8654e708..ac0ca1f89 100644
--- a/data/maps/FortreeCity_DecorationShop/map.json
+++ b/data/maps/FortreeCity_DecorationShop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_DecorationShop_EventScript_21800E",
+      "script": "FortreeCity_DecorationShop_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_DecorationShop_EventScript_218017",
+      "script": "FortreeCity_DecorationShop_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_DecorationShop_EventScript_218020",
+      "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_DecorationShop_EventScript_21804C",
+      "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 14c864ee5..4dd751b0f 100644
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -1,15 +1,15 @@
 FortreeCity_DecorationShop_MapScripts:: @ 821800D
 	.byte 0
 
-FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E
-	msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC
+FortreeCity_DecorationShop_EventScript_PokefanM:: @ 821800E
+	msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC
 	end
 
-FortreeCity_DecorationShop_EventScript_218017:: @ 8218017
-	msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC
+FortreeCity_DecorationShop_EventScript_Girl:: @ 8218017
+	msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC
 	end
 
-FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
+FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -33,7 +33,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
 	release
 	end
 
-FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
+FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -57,13 +57,13 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
 	release
 	end
 
-FortreeCity_DecorationShop_Text_218078: @ 8218078
+FortreeCity_DecorationShop_Text_MerchandiseSentToPC: @ 8218078
 	.string "Merchandise you buy here is sent to\n"
 	.string "your own PC.\p"
 	.string "That's fantastic! I wish they could\n"
 	.string "also deliver me home like that.$"
 
-FortreeCity_DecorationShop_Text_2180ED: @ 82180ED
+FortreeCity_DecorationShop_Text_BuyingDeskForDolls: @ 82180ED
 	.string "I'm buying a pretty desk and I'm\n"
 	.string "putting my cute DOLLS on it.\p"
 	.string "If I don't, when I decorate my\n"
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 0b0008d53..f69ec8204 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -43,8 +43,8 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_WINONA_MATCH_CALL
-	setvar VAR_WINONA_CALL_STEP_COUNTER, 0
-	setflag FLAG_REGISTER_WINONA_POKENAV
+	setvar VAR_SCOTT_FORTREE_CALL_STEP_COUNTER, 0
+	setflag FLAG_SCOTT_CALL_FORTREE_GYM
 	release
 	end
 
diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json
index 62469515a..f984e2be5 100644
--- a/data/maps/FortreeCity_House1/map.json
+++ b/data/maps/FortreeCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House1_EventScript_2162BB",
+      "script": "FortreeCity_House1_EventScript_Trader",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House1_EventScript_216368",
+      "script": "FortreeCity_House1_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House1_EventScript_21635F",
+      "script": "FortreeCity_House1_EventScript_ExpertF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc
index e6a617677..c7f4a8d5b 100644
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -1,69 +1,69 @@
 FortreeCity_House1_MapScripts:: @ 82162BA
 	.byte 0
 
-FortreeCity_House1_EventScript_2162BB:: @ 82162BB
+FortreeCity_House1_EventScript_Trader:: @ 82162BB
 	lock
 	faceplayer
-	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
+	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted
 	setvar VAR_0x8008, INGAME_TRADE_PLUSLE
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House1_EventScript_21633D
-	special sub_81B94B0
+	msgbox FortreeCity_House1_Text_YouWillTradeWontYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq FortreeCity_House1_EventScript_DeclineTrade
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, 255
-	goto_if_eq FortreeCity_House1_EventScript_21633D
+	goto_if_eq FortreeCity_House1_EventScript_DeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne FortreeCity_House1_EventScript_216347
+	goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
 	bufferspeciesname 0, VAR_0x8009
-	msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT
+	msgbox FortreeCity_House1_Text_MonYouTakeCare, MSGBOX_DEFAULT
 	setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	release
 	end
 
-FortreeCity_House1_EventScript_21633D:: @ 821633D
-	msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT
+FortreeCity_House1_EventScript_DeclineTrade:: @ 821633D
+	msgbox FortreeCity_House1_Text_YouWontTradeMe, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_216347:: @ 8216347
+FortreeCity_House1_EventScript_NotRequestedMon:: @ 8216347
 	bufferspeciesname 0, VAR_0x8009
-	msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT
+	msgbox FortreeCity_House1_Text_ThisIsntAMon, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_216355:: @ 8216355
-	msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT
+FortreeCity_House1_EventScript_TradeCompleted:: @ 8216355
+	msgbox FortreeCity_House1_Text_GoingToMakeVolbeatStrong, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_21635F:: @ 821635F
-	msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC
+FortreeCity_House1_EventScript_ExpertF:: @ 821635F
+	msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC
 	end
 
-FortreeCity_House1_EventScript_216368:: @ 8216368
+FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT
+	msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FortreeCity_House1_Text_21637B: @ 821637B
+FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B
 	.string "Wrooooaaar! I need it!\n"
 	.string "I have to get me a {STR_VAR_1}!\l"
 	.string "I'll do anything for it!\p"
@@ -73,29 +73,29 @@ FortreeCity_House1_Text_21637B: @ 821637B
 	.string "your {STR_VAR_1} for my {STR_VAR_2},\l"
 	.string "won't you?$"
 
-FortreeCity_House1_Text_216440: @ 8216440
+FortreeCity_House1_Text_MonYouTakeCare: @ 8216440
 	.string "Oh, yeah, right on!\p"
 	.string "{STR_VAR_1}, welcome!\n"
 	.string "{STR_VAR_2}, you take care!$"
 
-FortreeCity_House1_Text_216474: @ 8216474
+FortreeCity_House1_Text_ThisIsntAMon: @ 8216474
 	.string "Uh, no, I don't think so.\n"
 	.string "That isn't a {STR_VAR_1}.$"
 
-FortreeCity_House1_Text_21649F: @ 821649F
+FortreeCity_House1_Text_YouWontTradeMe: @ 821649F
 	.string "No? You won't trade me?\n"
 	.string "Even after I bared my heart to you?$"
 
-FortreeCity_House1_Text_2164DB: @ 82164DB
+FortreeCity_House1_Text_GoingToMakeVolbeatStrong: @ 82164DB
 	.string "I'm going to make VOLBEAT super\n"
 	.string "strong from this moment on!\p"
 	.string "I hope you do the same with PLUSLE!$"
 
-FortreeCity_House1_Text_21653B: @ 821653B
+FortreeCity_House1_Text_TradingMemoriesWithOthers: @ 821653B
 	.string "Trading POKéMON with others…\p"
 	.string "It's as if you're trading your own\n"
 	.string "memories with other people.$"
 
-FortreeCity_House1_Text_216597: @ 8216597
+FortreeCity_House1_Text_Zigzagoon: @ 8216597
 	.string "ZIGZAGOON: Gumomoh?$"
 
diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json
index 492590c6c..c4988e863 100644
--- a/data/maps/FortreeCity_House2/map.json
+++ b/data/maps/FortreeCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House2_EventScript_2177CB",
+      "script": "FortreeCity_House2_EventScript_HiddenPowerGiver",
       "flag": "0"
     },
     {
diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc
index 14ab157ed..bfbe40ff4 100644
--- a/data/maps/FortreeCity_House2/scripts.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
@@ -1,82 +1,82 @@
 FortreeCity_House2_MapScripts:: @ 82177CA
 	.byte 0
 
-FortreeCity_House2_EventScript_2177CB:: @ 82177CB
+FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E
-	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862
-	msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower
+	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting
+	msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT
 	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
-	case 1, FortreeCity_House2_EventScript_217878
-	msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT
+	case 1, FortreeCity_House2_EventScript_WrongGuess
+	msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT
 	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
-	case 1, FortreeCity_House2_EventScript_217878
-	msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT
+	case 1, FortreeCity_House2_EventScript_WrongGuess
+	msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT
 	multichoice 21, 8, MULTI_RIGHTLEFT, 1
 	switch VAR_RESULT
-	case 0, FortreeCity_House2_EventScript_217878
-	msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT
+	case 0, FortreeCity_House2_EventScript_WrongGuess
+	msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM10
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM10
-	msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
+	msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_EventScript_217862:: @ 8217862
-	msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT
+FortreeCity_House2_EventScript_Greeting:: @ 8217862
+	msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT
 	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
-FortreeCity_House2_EventScript_21786E:: @ 821786E
-	msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
+FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 821786E
+	msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_EventScript_217878:: @ 8217878
-	msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT
+FortreeCity_House2_EventScript_WrongGuess:: @ 8217878
+	msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_Text_217882: @ 8217882
+FortreeCity_House2_Text_HiddenPowersArousedByNature: @ 8217882
 	.string "People… POKéMON…\p"
 	.string "Their hidden powers are aroused by\n"
 	.string "living in natural environments…$"
 
-FortreeCity_House2_Text_2178D6: @ 82178D6
+FortreeCity_House2_Text_CoinInWhichHand: @ 82178D6
 	.string "Let this old woman see if your hidden\n"
 	.string "power has awoken…\p"
 	.string "I hold a coin in my hand.\p"
 	.string "Now, tell me, have I palmed it in\n"
 	.string "the right hand? Or in the left?$"
 
-FortreeCity_House2_Text_21796A: @ 821796A
+FortreeCity_House2_Text_CorrectTryAgainWhichHand: @ 821796A
 	.string "Oh! Yes, correct!\p"
 	.string "We shall try again.\p"
 	.string "In which hand have I palmed the coin?\n"
 	.string "The right or left?$"
 
-FortreeCity_House2_Text_2179C9: @ 82179C9
+FortreeCity_House2_Text_CorrectTryAgainWhichHand2: @ 82179C9
 	.string "Oh! Yes, correct!\p"
 	.string "We shall try again.\p"
 	.string "In which hand have I palmed the coin?\n"
 	.string "The right or left?$"
 
-FortreeCity_House2_Text_217A28: @ 8217A28
+FortreeCity_House2_Text_YourHiddenPowerHasAwoken: @ 8217A28
 	.string "Oh! Splendid!\n"
 	.string "Your hidden power has awoken!\p"
 	.string "Here, take this and awaken the hidden\n"
 	.string "power of your POKéMON.$"
 
-FortreeCity_House2_Text_217A91: @ 8217A91
+FortreeCity_House2_Text_ExplainHiddenPower: @ 8217A91
 	.string "HIDDEN POWER is a move that changes\n"
 	.string "with the POKéMON.$"
 
-FortreeCity_House2_Text_217AC7: @ 8217AC7
+FortreeCity_House2_Text_YouGuessedWrong: @ 8217AC7
 	.string "No, too bad.\n"
 	.string "You guessed wrong.$"
 
diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json
index 8b7e971c7..ce70f4605 100644
--- a/data/maps/FortreeCity_House3/map.json
+++ b/data/maps/FortreeCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House3_EventScript_217AE8",
+      "script": "FortreeCity_House3_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House3_EventScript_217AF1",
+      "script": "FortreeCity_House3_EventScript_SchoolKidM",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc
index fe1f6cfee..396bd4b22 100644
--- a/data/maps/FortreeCity_House3/scripts.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
@@ -1,15 +1,15 @@
 FortreeCity_House3_MapScripts:: @ 8217AE7
 	.byte 0
 
-FortreeCity_House3_EventScript_217AE8:: @ 8217AE8
-	msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC
+FortreeCity_House3_EventScript_Maniac:: @ 8217AE8
+	msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC
 	end
 
-FortreeCity_House3_EventScript_217AF1:: @ 8217AF1
-	msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC
+FortreeCity_House3_EventScript_SchoolKidM:: @ 8217AF1
+	msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC
 	end
 
-FortreeCity_House3_Text_217AFA: @ 8217AFA
+FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA
 	.string "While speaking about POKéDEXES,\n"
 	.string "I remembered something.\p"
 	.string "I met this TRAINER, STEVEN, when\n"
@@ -21,7 +21,7 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA
 	.string "He might even be stronger than the\n"
 	.string "GYM LEADER in this town…$"
 
-FortreeCity_House3_Text_217C22: @ 8217C22
+FortreeCity_House3_Text_OhYouHavePokedex: @ 8217C22
 	.string "What's that thing you have there?\p"
 	.string "… … … … … …\p"
 	.string "Oh, it's called a POKéDEX?\n"
diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json
index a9db995ed..01d1a99e8 100644
--- a/data/maps/FortreeCity_House4/map.json
+++ b/data/maps/FortreeCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House4_EventScript_217C81",
+      "script": "FortreeCity_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House4_EventScript_217C8A",
+      "script": "FortreeCity_House4_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House4_EventScript_217D20",
+      "script": "FortreeCity_House4_EventScript_Wingull",
       "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL"
     }
   ],
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index 5dc9d769a..b050ba3f9 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -1,51 +1,51 @@
 FortreeCity_House4_MapScripts:: @ 8217C80
 	.byte 0
 
-FortreeCity_House4_EventScript_217C81:: @ 8217C81
-	msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC
+FortreeCity_House4_EventScript_Woman:: @ 8217C81
+	msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC
 	end
 
-FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
+FortreeCity_House4_EventScript_Boy:: @ 8217C8A
 	lockall
-	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06
-	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8
-	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4
-	msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb
+	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned
+	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand
+	msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_WINGULL_SENT_ON_ERRAND
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
-	applymovement 3, FortreeCity_House4_Movement_217D1A
+	applymovement 3, FortreeCity_House4_Movement_WingullExit
 	waitmovement 0
 	removeobject 3
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_217CC4:: @ 8217CC4
+FortreeCity_House4_EventScript_WingullOnErrand:: @ 8217CC4
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT
+	msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
+FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT
+	msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT
 	giveitem_std ITEM_MENTAL_HERB
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_217D06:: @ 8217D06
+FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8217D06
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT
+	msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_House4_Movement_217D1A: @ 8217D1A
+FortreeCity_House4_Movement_WingullExit: @ 8217D1A
 	walk_fast_down
 	walk_fast_down
 	walk_fast_right
@@ -53,31 +53,31 @@ FortreeCity_House4_Movement_217D1A: @ 8217D1A
 	delay_8
 	step_end
 
-FortreeCity_House4_EventScript_217D20:: @ 8217D20
+FortreeCity_House4_EventScript_Wingull:: @ 8217D20
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT
+	msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FortreeCity_House4_Text_217D33: @ 8217D33
+FortreeCity_House4_Text_BringsWorldCloserTogether: @ 8217D33
 	.string "By being together with POKéMON,\n"
 	.string "people make more and more friends.\p"
 	.string "And that brings the world closer\n"
 	.string "together. I think it's wonderful!$"
 
-FortreeCity_House4_Text_217DB9: @ 8217DB9
+FortreeCity_House4_Text_GoBirdPokemon: @ 8217DB9
 	.string "There!\n"
 	.string "Go, BIRD POKéMON!$"
 
-FortreeCity_House4_Text_217DD2: @ 8217DD2
+FortreeCity_House4_Text_AskedWingullToRunErrand: @ 8217DD2
 	.string "Heheh, I asked my WINGULL to run\n"
 	.string "an errand for me.$"
 
-FortreeCity_House4_Text_217E05: @ 8217E05
+FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05
 	.string "Good!\n"
 	.string "Welcome back, WINGULL!\p"
 	.string "Huh? What is this?\n"
@@ -87,10 +87,10 @@ FortreeCity_House4_Text_217E05: @ 8217E05
 	.string "But I'm not a TRAINER, so you can\n"
 	.string "have it.$"
 
-FortreeCity_House4_Text_217EA8: @ 8217EA8
+FortreeCity_House4_Text_FriendsFarAwayThanksToWingull: @ 8217EA8
 	.string "Thanks to my WINGULL, I have friends\n"
 	.string "who live far away.$"
 
-FortreeCity_House4_Text_217EE0: @ 8217EE0
+FortreeCity_House4_Text_Wingull: @ 8217EE0
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json
index a60c02ec3..a53b4e35c 100644
--- a/data/maps/FortreeCity_House5/map.json
+++ b/data/maps/FortreeCity_House5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House5_EventScript_217EF2",
+      "script": "FortreeCity_House5_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House5_EventScript_217F04",
+      "script": "FortreeCity_House5_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_House5_EventScript_217EFB",
+      "script": "FortreeCity_House5_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc
index a40fe0e83..4d27c2f06 100644
--- a/data/maps/FortreeCity_House5/scripts.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
@@ -1,35 +1,35 @@
 FortreeCity_House5_MapScripts:: @ 8217EF1
 	.byte 0
 
-FortreeCity_House5_EventScript_217EF2:: @ 8217EF2
-	msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC
+FortreeCity_House5_EventScript_PokefanF:: @ 8217EF2
+	msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC
 	end
 
-FortreeCity_House5_EventScript_217EFB:: @ 8217EFB
-	msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC
+FortreeCity_House5_EventScript_Man:: @ 8217EFB
+	msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC
 	end
 
-FortreeCity_House5_EventScript_217F04:: @ 8217F04
+FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT
+	msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FortreeCity_House5_Text_217F17: @ 8217F17
+FortreeCity_House5_Text_TreeHousesAreGreat: @ 8217F17
 	.string "The tree houses of FORTREE are great!\p"
 	.string "I think it's the number one town for\n"
 	.string "living together with POKéMON.$"
 
-FortreeCity_House5_Text_217F80: @ 8217F80
+FortreeCity_House5_Text_AdaptedToNature: @ 8217F80
 	.string "POKéMON and people have adapted to\n"
 	.string "nature for survival.\p"
 	.string "There's no need to make nature\n"
 	.string "conform to the way we want to live.$"
 
-FortreeCity_House5_Text_217FFB: @ 8217FFB
+FortreeCity_House5_Text_Zigzagoon: @ 8217FFB
 	.string "ZIGZAGOON: Bufuu!$"
 
diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json
index c1bb6df86..a8bca3743 100644
--- a/data/maps/FortreeCity_Mart/map.json
+++ b/data/maps/FortreeCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_217666",
+      "script": "FortreeCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_217698",
+      "script": "FortreeCity_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_2176A1",
+      "script": "FortreeCity_Mart_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_2176AA",
+      "script": "FortreeCity_Mart_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 30caaeff3..05318e7bd 100644
--- a/data/maps/FortreeCity_Mart/scripts.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 FortreeCity_Mart_MapScripts:: @ 8217665
 	.byte 0
 
-FortreeCity_Mart_EventScript_217666:: @ 8217666
+FortreeCity_Mart_EventScript_Clerk:: @ 8217666
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart FortreeCity_Mart_Pokemart_217680
+	pokemart FortreeCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-FortreeCity_Mart_Pokemart_217680: @ 8217680
+FortreeCity_Mart_Pokemart: @ 8217680
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_SUPER_POTION
@@ -27,31 +27,31 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680
 	release
 	end
 
-FortreeCity_Mart_EventScript_217698:: @ 8217698
-	msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Woman:: @ 8217698
+	msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_2176A1:: @ 82176A1
-	msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Girl:: @ 82176A1
+	msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_2176AA:: @ 82176AA
-	msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Boy:: @ 82176AA
+	msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_Text_2176B3: @ 82176B3
+FortreeCity_Mart_Text_SuperRepelBetter: @ 82176B3
 	.string "SUPER REPEL lasts a long time,\n"
 	.string "and it gets the job done.\p"
 	.string "It's much better than an ordinary\n"
 	.string "REPEL.$"
 
-FortreeCity_Mart_Text_217715: @ 8217715
+FortreeCity_Mart_Text_StockUpOnItems: @ 8217715
 	.string "I always stock up on more items than\n"
 	.string "I'm sure I'll need.\p"
 	.string "You never know what might happen.\n"
 	.string "Better to be safe than sorry!$"
 
-FortreeCity_Mart_Text_21778E: @ 821778E
+FortreeCity_Mart_Text_RareCandyMakesMonGrow: @ 821778E
 	.string "A RARE CANDY makes a POKéMON grow\n"
 	.string "immediately by one level.$"
 
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json
index efa58e87b..38f133cc0 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/map.json
+++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_217407",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index fa88bd752..e759d2d93 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
 	setrespawn HEAL_LOCATION_FORTREE_CITY
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7
+@ VAR_0x800B is the Nurse's object event id
+FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 82173E7
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,25 +16,25 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7
 	release
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5
-	msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 82173F5
+	msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE
-	msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 82173FE
+	msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407
-	msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 8217407
+	msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410
+FortreeCity_PokemonCenter_1F_Text_GoToSafariZone: @ 8217410
 	.string "Listen, kid, are you working\n"
 	.string "on a POKéDEX?\p"
 	.string "Hmm… Go to the SAFARI ZONE.\n"
 	.string "That's my suggestion.$"
 
-FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D
+FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat: @ 821746D
 	.string "Have you done anything at\n"
 	.string "the RECORD CORNER?\p"
 	.string "It's pretty neat. It mixes and matches\n"
@@ -41,7 +42,7 @@ FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D
 	.string "I don't know quite how it works,\n"
 	.string "but it's cool. It's exciting, even!$"
 
-FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F
+FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav: @ 821751F
 	.string "Oh, wow, you have a POKéNAV!\n"
 	.string "And it's just like mine!\p"
 	.string "Do you know about POKéNAV's\n"
diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json
index 2413a023d..1822dd0c9 100644
--- a/data/maps/GraniteCave_1F/map.json
+++ b/data/maps/GraniteCave_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_1F_EventScript_22DA5E",
+      "script": "GraniteCave_1F_EventScript_Hiker",
       "flag": "0"
     },
     {
diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc
index b9e68d43c..9aa0332f7 100644
--- a/data/maps/GraniteCave_1F/scripts.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
@@ -1,23 +1,23 @@
 GraniteCave_1F_MapScripts:: @ 822DA5D
 	.byte 0
 
-GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E
+GraniteCave_1F_EventScript_Hiker:: @ 822DA5E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A
-	msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash
+	msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM05
 	setflag FLAG_RECEIVED_HM05
-	msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
+	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release
 	end
 
-GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A
-	msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
+GraniteCave_1F_EventScript_ReceivedFlash:: @ 822DA8A
+	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release
 	end
 
-GraniteCave_1F_Text_22DA94: @ 822DA94
+GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94
 	.string "Hey, you.\n"
 	.string "It gets awfully dark ahead.\l"
 	.string "It'll be tough trying to explore.\p"
@@ -29,7 +29,7 @@ GraniteCave_1F_Text_22DA94: @ 822DA94
 	.string "that we meet is our motto.\p"
 	.string "Here you go, I'll pass this on to you.$"
 
-GraniteCave_1F_Text_22DBB7: @ 822DBB7
+GraniteCave_1F_Text_ExplainFlash: @ 822DBB7
 	.string "Teach that hidden move FLASH to\n"
 	.string "a POKéMON and use it.\p"
 	.string "It lights up even the inky darkness\n"
diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json
index ae5b61a6b..87264cd54 100644
--- a/data/maps/GraniteCave_StevensRoom/map.json
+++ b/data/maps/GraniteCave_StevensRoom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_StevensRoom_EventScript_22DC7B",
+      "script": "GraniteCave_StevensRoom_EventScript_Steven",
       "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN"
     }
   ],
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 333f97a66..0456f5eaf 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -1,63 +1,63 @@
 GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
 	.byte 0
 
-GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
+GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	lock
 	faceplayer
-	msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_LETTER
 	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
-	msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM47
-	compare VAR_RESULT, 0
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq GraniteCave_StevensRoom_EventScript_BagFull
+	msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_REGISTERED_STEVEN_POKENAV
-	msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
 	compare VAR_FACING, DIR_EAST
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
 	playse SE_KAIDAN
 	removeobject 1
 	release
 	end
 
-GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18
-	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18
+	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A
-	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD51
+GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A
+	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT
+GraniteCave_StevensRoom_EventScript_BagFull:: @ 822DD3C
+	msgbox GraniteCave_StevensRoom_Text_OhBagIsFull, MSGBOX_DEFAULT
 	return
 
-GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
+GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45
 	walk_up
 	walk_up
 	walk_up
@@ -66,14 +66,14 @@ GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C
+GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit: @ 822DD4C
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
+GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51
 	walk_left
 	walk_up
 	walk_up
@@ -84,14 +84,14 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A
+GraniteCave_StevensRoom_Text_ImStevenLetterForMe: @ 822DD5A
 	.string "My name is STEVEN.\p"
 	.string "I'm interested in rare stones,\n"
 	.string "so I travel here and there.\p"
 	.string "Oh?\n"
 	.string "A LETTER for me?$"
 
-GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
+GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD
 	.string "STEVEN: Okay, thank you.\p"
 	.string "You went through all this trouble to\n"
 	.string "deliver that. I need to thank you.\p"
@@ -100,7 +100,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
 	.string "It contains my favorite move,\n"
 	.string "STEEL WING.$"
 
-GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
+GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B
 	.string "STEVEN: Your POKéMON appear quite\n"
 	.string "capable.\p"
 	.string "If you keep training, you could even\n"
@@ -111,14 +111,14 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
 	.string "our POKéNAVS.\p"
 	.string "… … … … … …$"
 
-GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A
+GraniteCave_StevensRoom_Text_RegisteredSteven: @ 822DF6A
 	.string "Registered STEVEN\n"
 	.string "in the POKéNAV.$"
 
-GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C
+GraniteCave_StevensRoom_Text_IveGotToHurryAlong: @ 822DF8C
 	.string "Now, I've got to hurry along.$"
 
-GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA
+GraniteCave_StevensRoom_Text_OhBagIsFull: @ 822DFAA
 	.string "Oh, your BAG is full…\n"
 	.string "That's too bad, then.$"
 
diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json
index ff76eb774..256c7c1a5 100644
--- a/data/maps/InsideOfTruck/map.json
+++ b/data/maps/InsideOfTruck/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "InsideOfTruck_EventScript_23BF6C",
+      "script": "InsideOfTruck_EventScript_MovingBox",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "InsideOfTruck_EventScript_23BF6C",
+      "script": "InsideOfTruck_EventScript_MovingBox",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "InsideOfTruck_EventScript_23BF6C",
+      "script": "InsideOfTruck_EventScript_MovingBox",
       "flag": "0"
     }
   ],
@@ -85,7 +85,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_INTRO_STATE",
       "var_value": "0",
-      "script": "InsideOfTruck_EventScript_23BF04"
+      "script": "InsideOfTruck_EventScript_SetIntroFlags"
     },
     {
       "type": "trigger",
@@ -94,7 +94,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_INTRO_STATE",
       "var_value": "0",
-      "script": "InsideOfTruck_EventScript_23BF04"
+      "script": "InsideOfTruck_EventScript_SetIntroFlags"
     },
     {
       "type": "trigger",
@@ -103,7 +103,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_INTRO_STATE",
       "var_value": "0",
-      "script": "InsideOfTruck_EventScript_23BF04"
+      "script": "InsideOfTruck_EventScript_SetIntroFlags"
     }
   ],
   "bg_events": [
@@ -113,7 +113,7 @@
       "y": 0,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "InsideOfTruck_EventScript_23BF6C"
+      "script": "InsideOfTruck_EventScript_MovingBox"
     },
     {
       "type": "sign",
@@ -121,7 +121,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "InsideOfTruck_EventScript_23BF6C"
+      "script": "InsideOfTruck_EventScript_MovingBox"
     },
     {
       "type": "sign",
@@ -129,7 +129,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "InsideOfTruck_EventScript_23BF6C"
+      "script": "InsideOfTruck_EventScript_MovingBox"
     },
     {
       "type": "sign",
@@ -137,7 +137,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "InsideOfTruck_EventScript_23BF6C"
+      "script": "InsideOfTruck_EventScript_MovingBox"
     },
     {
       "type": "sign",
@@ -145,7 +145,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "InsideOfTruck_EventScript_23BF6C"
+      "script": "InsideOfTruck_EventScript_MovingBox"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 9573fe745..fb75273cc 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -1,29 +1,29 @@
 InsideOfTruck_MapScripts:: @ 823BEDA
-	map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5
-	map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01
+	map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_OnLoad
+	map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_OnResume
 	.byte 0
 
-InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
+InsideOfTruck_OnLoad: @ 823BEE5
 	setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
 	setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
 	setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
 	end
 
-InsideOfTruck_MapScript1_23BF01: @ 823BF01
+InsideOfTruck_OnResume: @ 823BF01
 	setstepcallback STEP_CB_TRUCK
 	end
 
-InsideOfTruck_EventScript_23BF04:: @ 823BF04
+InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04
 	lockall
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq InsideOfTruck_EventScript_23BF20
+	goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq InsideOfTruck_EventScript_23BF46
+	goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsFemale
 	end
 
-InsideOfTruck_EventScript_23BF20:: @ 823BF20
+InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 1
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
@@ -31,12 +31,12 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
 	releaseall
 	end
 
-InsideOfTruck_EventScript_23BF46:: @ 823BF46
+InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 2
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
@@ -44,16 +44,16 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 1
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
 	end
 
-InsideOfTruck_EventScript_23BF6C:: @ 823BF6C
-	msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN
+InsideOfTruck_EventScript_MovingBox:: @ 823BF6C
+	msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN
 	end
 
-InsideOfTruck_Text_23BF75: @ 823BF75
+InsideOfTruck_Text_BoxPrintedWithMonLogo: @ 823BF75
 	.string "The box is printed with a POKéMON logo.\p"
 	.string "It's a POKéMON brand moving and\n"
 	.string "delivery service.$"
diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json
index 27876f5e5..dbecdf4ed 100644
--- a/data/maps/IslandCave/map.json
+++ b/data/maps/IslandCave/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "IslandCave_EventScript_238F58",
+      "script": "IslandCave_EventScript_Regice",
       "flag": "FLAG_HIDE_REGICE"
     }
   ],
@@ -59,7 +59,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "IslandCave_EventScript_238EEF"
+      "script": "IslandCave_EventScript_CaveEntranceMiddle"
     },
     {
       "type": "sign",
@@ -67,7 +67,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "IslandCave_EventScript_238F1D"
+      "script": "IslandCave_EventScript_CaveEntranceSide"
     },
     {
       "type": "sign",
@@ -75,7 +75,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "IslandCave_EventScript_238F1D"
+      "script": "IslandCave_EventScript_CaveEntranceSide"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index b0843667c..8587e62c2 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -1,25 +1,25 @@
 IslandCave_MapScripts:: @ 8238E2A
-	map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
-	map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
+	map_script MAP_SCRIPT_ON_RESUME, IslandCave_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, IslandCave_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
 	.byte 0
 
-IslandCave_MapScript1_238E3A: @ 8238E3A
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44
+IslandCave_OnResume: @ 8238E3A
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_TryRemoveRegice
 	end
 
-IslandCave_EventScript_238E44:: @ 8238E44
+IslandCave_EventScript_TryRemoveRegice:: @ 8238E44
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-IslandCave_MapScript1_238E58: @ 8238E58
-	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62
+IslandCave_OnLoad: @ 8238E58
+	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_HideRegiEntrance
 	end
 
-IslandCave_EventScript_238E62:: @ 8238E62
+IslandCave_EventScript_HideRegiEntrance:: @ 8238E62
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -30,15 +30,15 @@ IslandCave_EventScript_238E62:: @ 8238E62
 
 IslandCave_OnTransition: @ 8238E99
 	setflag FLAG_LANDMARK_ISLAND_CAVE
-	call IslandCave_EventScript_238F45
-	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
+	call IslandCave_EventScript_ClearSteps
+	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_ShowRegice
 	end
 
-IslandCave_EventScript_238EAB:: @ 8238EAB
+IslandCave_EventScript_ShowRegice:: @ 8238EAB
 	clearflag FLAG_HIDE_REGICE
 	return
 
-IslandCave_EventScript_238EAF:: @ 8238EAF
+IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF
 	setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
 	setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
 	setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
@@ -50,45 +50,45 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
 	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
 	end
 
-IslandCave_EventScript_238EEF:: @ 8238EEF
+IslandCave_EventScript_CaveEntranceMiddle:: @ 8238EEF
 	lockall
-	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
-	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13
-	braillemessage IslandCave_Braille_2A6CD4
+	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_BigHoleInWall
+	braillemessage IslandCave_Braille_RunLapAroundWall
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
-	goto IslandCave_EventScript_238F41
+	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_238F13:: @ 8238F13
+IslandCave_EventScript_BigHoleInWall:: @ 8238F13
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-IslandCave_EventScript_238F1D:: @ 8238F1D
+IslandCave_EventScript_CaveEntranceSide:: @ 8238F1D
 	lockall
-	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
-	braillemessage IslandCave_Braille_2A6CD4
-	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41
+	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
+	braillemessage IslandCave_Braille_RunLapAroundWall
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_CloseBrailleMsg
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
-	goto IslandCave_EventScript_238F41
+	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_238F41:: @ 8238F41
+IslandCave_EventScript_CloseBrailleMsg:: @ 8238F41
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-IslandCave_EventScript_238F45:: @ 8238F45
+IslandCave_EventScript_ClearSteps:: @ 8238F45
 	setvar VAR_REGICE_STEPS_1, 0
 	setvar VAR_REGICE_STEPS_2, 0
 	setvar VAR_REGICE_STEPS_3, 0
 	clearflag FLAG_TEMP_3
 	return
 
-IslandCave_EventScript_238F58:: @ 8238F58
+IslandCave_EventScript_Regice:: @ 8238F58
 	lock
 	faceplayer
 	waitse
@@ -102,21 +102,21 @@ IslandCave_EventScript_238F58:: @ 8238F58
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq IslandCave_EventScript_238F9F
+	goto_if_eq IslandCave_EventScript_DefeatedRegice
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq IslandCave_EventScript_238FA8
+	goto_if_eq IslandCave_EventScript_RanFromRegice
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq IslandCave_EventScript_238FA8
+	goto_if_eq IslandCave_EventScript_RanFromRegice
 	setflag FLAG_DEFEATED_REGICE
 	release
 	end
 
-IslandCave_EventScript_238F9F:: @ 8238F9F
+IslandCave_EventScript_DefeatedRegice:: @ 8238F9F
 	setflag FLAG_DEFEATED_REGICE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-IslandCave_EventScript_238FA8:: @ 8238FA8
+IslandCave_EventScript_RanFromRegice:: @ 8238FA8
 	setvar VAR_0x8004, SPECIES_REGICE
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
index e695c826c..ea13d94c2 100644
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "JaggedPass_EventScript_230785",
+      "script": "JaggedPass_EventScript_Eric",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "JaggedPass_EventScript_2307FB",
+      "script": "JaggedPass_EventScript_Ethan",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "JaggedPass_EventScript_23079C",
+      "script": "JaggedPass_EventScript_Diana",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "JaggedPass_EventScript_230718",
+      "script": "JaggedPass_EventScript_MagmaHideoutGuard",
       "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "JaggedPass_EventScript_230871",
+      "script": "JaggedPass_EventScript_Autumn",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "JaggedPass_EventScript_23085A",
+      "script": "JaggedPass_EventScript_Julio",
       "flag": "0"
     }
   ],
@@ -186,7 +186,7 @@
       "elevation": 3,
       "var": "VAR_JAGGED_PASS_STATE",
       "var_value": "1",
-      "script": "JaggedPass_EventScript_2306BB"
+      "script": "JaggedPass_EventScript_OpenMagmaHideout"
     },
     {
       "type": "trigger",
@@ -195,7 +195,7 @@
       "elevation": 3,
       "var": "VAR_JAGGED_PASS_STATE",
       "var_value": "1",
-      "script": "JaggedPass_EventScript_2306BB"
+      "script": "JaggedPass_EventScript_OpenMagmaHideout"
     },
     {
       "type": "trigger",
@@ -204,7 +204,7 @@
       "elevation": 3,
       "var": "VAR_JAGGED_PASS_STATE",
       "var_value": "1",
-      "script": "JaggedPass_EventScript_2306BB"
+      "script": "JaggedPass_EventScript_OpenMagmaHideout"
     },
     {
       "type": "trigger",
@@ -213,7 +213,7 @@
       "elevation": 3,
       "var": "VAR_JAGGED_PASS_STATE",
       "var_value": "1",
-      "script": "JaggedPass_EventScript_2306BB"
+      "script": "JaggedPass_EventScript_OpenMagmaHideout"
     },
     {
       "type": "trigger",
@@ -222,7 +222,7 @@
       "elevation": 3,
       "var": "VAR_JAGGED_PASS_STATE",
       "var_value": "1",
-      "script": "JaggedPass_EventScript_2306BB"
+      "script": "JaggedPass_EventScript_OpenMagmaHideout"
     }
   ],
   "bg_events": [
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 62ef6e1a9..5e6712c68 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -1,46 +1,46 @@
 JaggedPass_MapScripts:: @ 8230656
-	map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666
+	map_script MAP_SCRIPT_ON_RESUME, JaggedPass_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C
+	map_script MAP_SCRIPT_ON_LOAD, JaggedPass_OnLoad
 	.byte 0
 
-JaggedPass_MapScript1_230666: @ 8230666
+JaggedPass_OnResume: @ 8230666
 	setstepcallback STEP_CB_ASH
 	compare VAR_JAGGED_PASS_STATE, 0
-	call_if_eq JaggedPass_EventScript_230674
+	call_if_eq JaggedPass_EventScript_CheckHasMagmaEmblem
 	end
 
-JaggedPass_EventScript_230674:: @ 8230674
+JaggedPass_EventScript_CheckHasMagmaEmblem:: @ 8230674
 	checkitem ITEM_MAGMA_EMBLEM, 1
 	compare VAR_RESULT, 1
-	goto_if_eq JaggedPass_EventScript_230685
+	goto_if_eq JaggedPass_EventScript_SetReadyToOpenHideout
 	return
 
-JaggedPass_EventScript_230685:: @ 8230685
+JaggedPass_EventScript_SetReadyToOpenHideout:: @ 8230685
 	setvar VAR_JAGGED_PASS_STATE, 1
 	return
 
 JaggedPass_OnTransition: @ 823068B
 	compare VAR_JAGGED_PASS_ASH_WEATHER, 1
-	call_if_eq JaggedPass_EventScript_230697
+	call_if_eq JaggedPass_EventScript_SetWeatherAsh
 	end
 
-JaggedPass_EventScript_230697:: @ 8230697
+JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
 	setweather WEATHER_ASH
 	doweather
 	return
 
-JaggedPass_MapScript1_23069C: @ 823069C
+JaggedPass_OnLoad: @ 823069C
 	compare VAR_JAGGED_PASS_STATE, 1
-	goto_if_le JaggedPass_EventScript_2306A8
+	goto_if_le JaggedPass_EventScript_ConcealHideoutEntrance
 	end
 
-JaggedPass_EventScript_2306A8:: @ 82306A8
+JaggedPass_EventScript_ConcealHideoutEntrance:: @ 82306A8
 	setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1
 	setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1
 	end
 
-JaggedPass_EventScript_2306BB:: @ 82306BB
+JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB
 	lockall
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -48,7 +48,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT
+	msgbox JaggedPass_Text_BoulderShakingInResponseToEmblem, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 1   @ horizontal pan
@@ -66,9 +66,9 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
 	releaseall
 	end
 
-JaggedPass_EventScript_230718:: @ 8230718
+JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718
 	lockall
-	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766
+	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_GuardDefeated
 	waitse
 	playse SE_PIN
 	applymovement 5, Common_Movement_ExclamationMark
@@ -77,196 +77,196 @@ JaggedPass_EventScript_230718:: @ 8230718
 	waitmovement 0
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
+	msgbox JaggedPass_Text_GruntIntro, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
+	trainerbattle_no_intro TRAINER_GRUNT_JAGGED_PASS, JaggedPass_Text_GruntDefeat
 	setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-JaggedPass_EventScript_230766:: @ 8230766
+JaggedPass_EventScript_GuardDefeated:: @ 8230766
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT
+	msgbox JaggedPass_Text_GoWhereverYouWant, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-JaggedPass_EventScript_230785:: @ 8230785
-	trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF
-	msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE
+JaggedPass_EventScript_Eric:: @ 8230785
+	trainerbattle_single TRAINER_ERIC, JaggedPass_Text_EricIntro, JaggedPass_Text_EricDefeat
+	msgbox JaggedPass_Text_EricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_23079C:: @ 823079C
-	trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
+JaggedPass_EventScript_Diana:: @ 823079C
+	trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_DianaIntro, JaggedPass_Text_DianaDefeat, JaggedPass_EventScript_RegisterDiana
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
-	goto_if_eq JaggedPass_EventScript_2307E4
-	msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT
+	goto_if_eq JaggedPass_EventScript_DianaRematch
+	msgbox JaggedPass_Text_DianaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-JaggedPass_EventScript_2307C8:: @ 82307C8
-	special sub_80B4808
-	msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT
+JaggedPass_EventScript_RegisterDiana:: @ 82307C8
+	special PlayerFaceTrainerAfterBattle
+	msgbox JaggedPass_Text_DianaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DIANA_1
 	release
 	end
 
-JaggedPass_EventScript_2307E4:: @ 82307E4
-	trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA
-	msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE
+JaggedPass_EventScript_DianaRematch:: @ 82307E4
+	trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_DianaRematchIntro, JaggedPass_Text_DianaRematchDefeat
+	msgbox JaggedPass_Text_DianaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_2307FB:: @ 82307FB
-	trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
+JaggedPass_EventScript_Ethan:: @ 82307FB
+	trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_EthanIntro, JaggedPass_Text_EthanDefeat, JaggedPass_EventScript_RegisterEthan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
-	goto_if_eq JaggedPass_EventScript_230843
-	msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT
+	goto_if_eq JaggedPass_EventScript_EthanRematch
+	msgbox JaggedPass_Text_EthanPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-JaggedPass_EventScript_230827:: @ 8230827
-	special sub_80B4808
-	msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT
+JaggedPass_EventScript_RegisterEthan:: @ 8230827
+	special PlayerFaceTrainerAfterBattle
+	msgbox JaggedPass_Text_EthanRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ETHAN_1
 	release
 	end
 
-JaggedPass_EventScript_230843:: @ 8230843
-	trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60
-	msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE
+JaggedPass_EventScript_EthanRematch:: @ 8230843
+	trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_EthanRematchIntro, JaggedPass_Text_EthanRematchDefeat
+	msgbox JaggedPass_Text_EthanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_23085A:: @ 823085A
-	trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38
-	msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE
+JaggedPass_EventScript_Julio:: @ 823085A
+	trainerbattle_single TRAINER_JULIO, JaggedPass_Text_JulioIntro, JaggedPass_Text_JulioDefeat
+	msgbox JaggedPass_Text_JulioPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_230871:: @ 8230871
-	trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD
-	msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE
+JaggedPass_EventScript_Autumn:: @ 8230871
+	trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_AutumnIntro, JaggedPass_Text_AutumnDefeat
+	msgbox JaggedPass_Text_AutumnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_Text_230888: @ 8230888
+JaggedPass_Text_EricIntro: @ 8230888
 	.string "MT. CHIMNEY's JAGGED PASS…\p"
 	.string "Now this is what I've always wanted\n"
 	.string "in a mountain.\p"
 	.string "This jagged bumpiness…\n"
 	.string "It rocks my soul!$"
 
-JaggedPass_Text_2308FF: @ 82308FF
+JaggedPass_Text_EricDefeat: @ 82308FF
 	.string "Losing left me bitter!$"
 
-JaggedPass_Text_230916: @ 8230916
+JaggedPass_Text_EricPostBattle: @ 8230916
 	.string "Yes, I did lose at POKéMON…\p"
 	.string "But, when it comes to the love of\n"
 	.string "the mountains, I have you beat!$"
 
-JaggedPass_Text_230974: @ 8230974
+JaggedPass_Text_DianaIntro: @ 8230974
 	.string "This place isn't your casual hike.\n"
 	.string "It's not suited for a picnic.$"
 
-JaggedPass_Text_2309B5: @ 82309B5
+JaggedPass_Text_DianaDefeat: @ 82309B5
 	.string "Ohhh, no!\n"
 	.string "The ground is too bumpy…$"
 
-JaggedPass_Text_2309D8: @ 82309D8
+JaggedPass_Text_DianaPostBattle: @ 82309D8
 	.string "Did you know?\p"
 	.string "Some people cleverly ride their\n"
 	.string "bicycles up this horribly bumpy pass.$"
 
-JaggedPass_Text_230A2C: @ 8230A2C
+JaggedPass_Text_DianaRegister: @ 8230A2C
 	.string "Will you ever be back in this area?\n"
 	.string "If you do return, I'd like a rematch.$"
 
-JaggedPass_Text_230A76: @ 8230A76
+JaggedPass_Text_DianaRematchIntro: @ 8230A76
 	.string "Picnics are fun wherever you go.\n"
 	.string "Just like POKéMON!$"
 
-JaggedPass_Text_230AAA: @ 8230AAA
+JaggedPass_Text_DianaRematchDefeat: @ 8230AAA
 	.string "I only lost because the ground is\n"
 	.string "too bumpy!$"
 
-JaggedPass_Text_230AD7: @ 8230AD7
+JaggedPass_Text_DianaPostRematch: @ 8230AD7
 	.string "I'll forget about losing and just\n"
 	.string "enjoy this bumpy hike.$"
 
-JaggedPass_Text_230B10: @ 8230B10
+JaggedPass_Text_EthanIntro: @ 8230B10
 	.string "JAGGED PASS is hard to walk on.\n"
 	.string "It's a good place for training.$"
 
-JaggedPass_Text_230B50: @ 8230B50
+JaggedPass_Text_EthanDefeat: @ 8230B50
 	.string "It was all over while we were still\n"
 	.string "trying to find a good footing…$"
 
-JaggedPass_Text_230B93: @ 8230B93
+JaggedPass_Text_EthanPostBattle: @ 8230B93
 	.string "If I had an ACRO BIKE, I'd be able to\n"
 	.string "jump ledges.$"
 
-JaggedPass_Text_230BC6: @ 8230BC6
+JaggedPass_Text_EthanRegister: @ 8230BC6
 	.string "When I get more used to this bumpiness,\n"
 	.string "I'll be sure to win!\p"
 	.string "Can you register me in your POKéNAV?$"
 
-JaggedPass_Text_230C28: @ 8230C28
+JaggedPass_Text_EthanRematchIntro: @ 8230C28
 	.string "I got used to this bumpiness.\n"
 	.string "I sing while I climb now.$"
 
-JaggedPass_Text_230C60: @ 8230C60
+JaggedPass_Text_EthanRematchDefeat: @ 8230C60
 	.string "It's still not easy to battle on this\n"
 	.string "bumpy ground…$"
 
-JaggedPass_Text_230C94: @ 8230C94
+JaggedPass_Text_EthanPostRematch: @ 8230C94
 	.string "I should get an ACRO BIKE from RYDEL\n"
 	.string "in MAUVILLE CITY…$"
 
-JaggedPass_Text_230CCB: @ 8230CCB
+JaggedPass_Text_GruntIntro: @ 8230CCB
 	.string "Wah!\n"
 	.string "What are you doing here?\p"
 	.string "What am I doing in a place like this?\p"
 	.string "What business is it of yours?$"
 
-JaggedPass_Text_230D2D: @ 8230D2D
+JaggedPass_Text_GruntDefeat: @ 8230D2D
 	.string "Urrrgh…\p"
 	.string "I should've ducked into our HIDEOUT\n"
 	.string "right away…$"
 
-JaggedPass_Text_230D65: @ 8230D65
+JaggedPass_Text_GoWhereverYouWant: @ 8230D65
 	.string "Okay, oh-kay!\n"
 	.string "I admit it--you're strong!\p"
 	.string "Don't worry about me.\n"
 	.string "Go wherever you want!$"
 
-JaggedPass_Text_230DBA: @ 8230DBA
+JaggedPass_Text_BoulderShakingInResponseToEmblem: @ 8230DBA
 	.string "Oh! This boulder is shaking in response\n"
 	.string "to the MAGMA EMBLEM!$"
 
-JaggedPass_Text_230DF7: @ 8230DF7
+JaggedPass_Text_JulioIntro: @ 8230DF7
 	.string "Aiyeeh! It's awfully scary to shoot\n"
 	.string "down the mountain in one go!$"
 
-JaggedPass_Text_230E38: @ 8230E38
+JaggedPass_Text_JulioDefeat: @ 8230E38
 	.string "I feel like I'm falling apart…$"
 
-JaggedPass_Text_230E57: @ 8230E57
+JaggedPass_Text_JulioPostBattle: @ 8230E57
 	.string "My bicycle bounced around so much,\n"
 	.string "my rear end's sore…$"
 
-JaggedPass_Text_230E8E: @ 8230E8E
+JaggedPass_Text_AutumnIntro: @ 8230E8E
 	.string "I climb this hill every day.\n"
 	.string "I have confidence in my strength!$"
 
-JaggedPass_Text_230ECD: @ 8230ECD
+JaggedPass_Text_AutumnDefeat: @ 8230ECD
 	.string "Hmm…\n"
 	.string "What went wrong?$"
 
-JaggedPass_Text_230EE3: @ 8230EE3
+JaggedPass_Text_AutumnPostBattle: @ 8230EE3
 	.string "What is that odd rock protrusion\n"
 	.string "a little up the hill from here?$"
 
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
index 65a6a25d3..1212f3354 100644
--- a/data/maps/LavaridgeTown/map.json
+++ b/data/maps/LavaridgeTown/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA73B",
+      "script": "LavaridgeTown_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -43,7 +43,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA70E",
+      "script": "LavaridgeTown_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA717",
+      "script": "LavaridgeTown_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA720",
+      "script": "LavaridgeTown_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -82,7 +82,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA729",
+      "script": "LavaridgeTown_EventScript_HotSpringsOldWoman1",
       "flag": "0"
     },
     {
@@ -95,7 +95,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA732",
+      "script": "LavaridgeTown_EventScript_HotSpringsOldWoman2",
       "flag": "0"
     },
     {
@@ -109,7 +109,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2"
+      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_VAR_0",
@@ -122,7 +122,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1"
+      "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
@@ -134,7 +134,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_EventScript_1EA744",
+      "script": "LavaridgeTown_EventScript_EggWoman",
       "flag": "0"
     }
   ],
@@ -190,7 +190,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "LavaridgeTown_EventScript_1EA6FA"
+      "script": "LavaridgeTown_EventScript_HotSpringsTrigger"
     }
   ],
   "bg_events": [
@@ -200,7 +200,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LavaridgeTown_EventScript_1EA7B7"
+      "script": "LavaridgeTown_EventScript_HerbShopSign"
     },
     {
       "type": "sign",
@@ -208,7 +208,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LavaridgeTown_EventScript_1EA7AE"
+      "script": "LavaridgeTown_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -224,7 +224,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LavaridgeTown_EventScript_1EA7A5"
+      "script": "LavaridgeTown_EventScript_TownSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index ee689ed29..dc45f94d4 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -1,98 +1,98 @@
 LavaridgeTown_MapScripts:: @ 81EA4D3
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame
 	.byte 0
 
 LavaridgeTown_OnTransition: @ 81EA4DE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
-	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
+	call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, LavaridgeTown_EventScript_ClearLavaridgeWhiteOut
+	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_LAVARIDGE_TOWN_STATE, 1
-	call_if_eq LavaridgeTown_EventScript_1EA518
+	call_if_eq LavaridgeTown_EventScript_CheckSetRivalPos
 	compare VAR_LAVARIDGE_TOWN_STATE, 1
-	call_if_eq LavaridgeTown_EventScript_1EA543
+	call_if_eq LavaridgeTown_EventScript_HideMapNamePopup
 	end
 
-LavaridgeTown_EventScript_1EA514:: @ 81EA514
-	clearflag FLAG_FLANNERY_GIVES_BADGE_INFO
+LavaridgeTown_EventScript_ClearLavaridgeWhiteOut:: @ 81EA514
+	clearflag FLAG_WHITEOUT_TO_LAVARIDGE
 	return
 
-LavaridgeTown_EventScript_1EA518:: @ 81EA518
+LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 9
-	goto_if_eq LavaridgeTown_EventScript_1EA529
+	goto_if_eq LavaridgeTown_EventScript_SetRivalPos
 	return
 
-LavaridgeTown_EventScript_1EA529:: @ 81EA529
+LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529
 	setobjectxyperm 8, 11, 9
 	setobjectxyperm 7, 9, 8
 	setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP
-	clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
+	clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
 	return
 
-LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
+LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 81EA53F
 	clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	return
 
-LavaridgeTown_EventScript_1EA543:: @ 81EA543
+LavaridgeTown_EventScript_HideMapNamePopup:: @ 81EA543
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LavaridgeTown_MapScript2_1EA547: @ 81EA547
-	map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551
+LavaridgeTown_OnFrame: @ 81EA547
+	map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles
 	.2byte 0
 
-LavaridgeTown_EventScript_1EA551:: @ 81EA551
+LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
 	lockall
 	getplayerxy VAR_0x8008, VAR_0x8009
 	compare VAR_0x8008, 9
-	call_if_eq LavaridgeTown_EventScript_1EA63A
+	call_if_eq LavaridgeTown_EventScript_RivalNoticePlayer
 	compare VAR_0x8008, 9
-	call_if_ne LavaridgeTown_EventScript_1EA65C
+	call_if_ne LavaridgeTown_EventScript_RivalExitHerbShop
 	delay 20
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LavaridgeTown_EventScript_1EA630
+	call_if_eq LavaridgeTown_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq LavaridgeTown_EventScript_1EA635
+	call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic
 	compare VAR_0x8008, 9
-	call_if_eq LavaridgeTown_EventScript_1EA6A1
+	call_if_eq LavaridgeTown_EventScript_RivalApproachPlayer1
 	compare VAR_0x8008, 9
-	call_if_ne LavaridgeTown_EventScript_1EA6AC
+	call_if_ne LavaridgeTown_EventScript_RivalApproachPlayer2
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LavaridgeTown_EventScript_1EA5B5
+	goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LavaridgeTown_EventScript_1EA5DA
+	goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles
 	end
 
-LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
-	msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
+	msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT
-	goto LavaridgeTown_EventScript_1EA5FF
+	msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
+	goto LavaridgeTown_EventScript_RivalExit
 	end
 
-LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
-	msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
+	msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT
-	goto LavaridgeTown_EventScript_1EA5FF
+	msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
+	goto LavaridgeTown_EventScript_RivalExit
 	end
 
-LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
+LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF
 	closemessage
 	removeobject 8
 	addobject 7
 	delay 30
 	compare VAR_0x8008, 9
-	call_if_eq LavaridgeTown_EventScript_1EA6B7
+	call_if_eq LavaridgeTown_EventScript_RivalExit1
 	compare VAR_0x8008, 9
-	call_if_ne LavaridgeTown_EventScript_1EA6C9
+	call_if_ne LavaridgeTown_EventScript_RivalExit2
 	removeobject 7
 	setvar VAR_LAVARIDGE_TOWN_STATE, 2
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -101,15 +101,15 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
 	releaseall
 	end
 
-LavaridgeTown_EventScript_1EA630:: @ 81EA630
+LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-LavaridgeTown_EventScript_1EA635:: @ 81EA635
+LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635
 	playbgm MUS_BOY_SUP, 1
 	return
 
-LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
+LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A
 	applymovement 8, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -119,11 +119,11 @@ LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
+LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C
 	opendoor 12, 15
 	waitdooranim
 	addobject 8
-	applymovement 8, LavaridgeTown_Movement_1EA6F8
+	applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop
 	waitmovement 0
 	closedoor 12, 15
 	waitdooranim
@@ -138,28 +138,28 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1
-	applymovement 8, LavaridgeTown_Movement_1EA6F4
+LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1
+	applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer1
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC
-	applymovement 8, LavaridgeTown_Movement_1EA6ED
+LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC
+	applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7
-	applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF
-	applymovement 7, LavaridgeTown_Movement_1EA6E3
+LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7
+	applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
+	applymovement 7, LavaridgeTown_Movement_RivalExit1
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9
-	applymovement 7, LavaridgeTown_Movement_1EA6D4
+LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9
+	applymovement 7, LavaridgeTown_Movement_RivalExit2
 	waitmovement 0
 	return
 
-LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
+LavaridgeTown_Movement_RivalExit2: @ 81EA6D4
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -172,13 +172,13 @@ LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
 	walk_fast_up
 	step_end
 
-LavaridgeTown_Movement_1EA6DF: @ 81EA6DF
+LavaridgeTown_Movement_PlayerWatchRivalExit: @ 81EA6DF
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
+LavaridgeTown_Movement_RivalExit1: @ 81EA6E3
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -190,7 +190,7 @@ LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
 	walk_fast_right
 	step_end
 
-LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
+LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED
 	walk_left
 	walk_left
 	walk_left
@@ -199,97 +199,97 @@ LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
 	walk_left
 	step_end
 
-LavaridgeTown_Movement_1EA6F4: @ 81EA6F4
+LavaridgeTown_Movement_RivalApproachPlayer1: @ 81EA6F4
 	walk_left
 	walk_left
 	walk_up
 	step_end
 
-LavaridgeTown_Movement_1EA6F8: @ 81EA6F8
+LavaridgeTown_Movement_RivalExitHerbShop: @ 81EA6F8
 	walk_down
 	step_end
 
-LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
+LavaridgeTown_EventScript_HotSpringsTrigger:: @ 81EA6FA
 	specialvar VAR_RESULT, GetPlayerFacingDirection
-	compare VAR_RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_1EA70B
+	compare VAR_RESULT, DIR_SOUTH
+	goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings
 	end
 
-LavaridgeTown_EventScript_1EA70B:: @ 81EA70B
+LavaridgeTown_EventScript_EnteredHotSprings:: @ 81EA70B
 	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
 	end
 
-LavaridgeTown_EventScript_1EA70E:: @ 81EA70E
-	msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC
+LavaridgeTown_EventScript_ExpertM:: @ 81EA70E
+	msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_1EA717:: @ 81EA717
-	msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN
+LavaridgeTown_EventScript_OldMan:: @ 81EA717
+	msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_1EA720:: @ 81EA720
-	msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC
+LavaridgeTown_EventScript_Twin:: @ 81EA720
+	msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_1EA729:: @ 81EA729
-	msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC
+LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 81EA729
+	msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_1EA732:: @ 81EA732
-	msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC
+LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 81EA732
+	msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
-	msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC
+LavaridgeTown_EventScript_ExpertF:: @ 81EA73B
+	msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_1EA744:: @ 81EA744
+LavaridgeTown_EventScript_EggWoman:: @ 81EA744
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787
-	msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_1EA79B
+	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg
+	msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LavaridgeTown_EventScript_DeclineEgg
 	getpartysize
-	compare VAR_RESULT, 6
-	goto_if_eq LavaridgeTown_EventScript_1EA791
-	msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT
+	compare VAR_RESULT, PARTY_SIZE
+	goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg
+	msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_LAVARIDGE_EGG
 	playfanfare MUS_FANFA4
-	message LavaridgeTown_Text_1EACF4
+	message LavaridgeTown_Text_ReceivedTheEgg
 	waitfanfare
 	giveegg SPECIES_WYNAUT
 	release
 	end
 
-LavaridgeTown_EventScript_1EA787:: @ 81EA787
-	msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_ReceivedEgg:: @ 81EA787
+	msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_1EA791:: @ 81EA791
-	msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_NoRoomForEgg:: @ 81EA791
+	msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_1EA79B:: @ 81EA79B
-	msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_DeclineEgg:: @ 81EA79B
+	msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5
-	msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN
+LavaridgeTown_EventScript_TownSign:: @ 81EA7A5
+	msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE
-	msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN
+LavaridgeTown_EventScript_GymSign:: @ 81EA7AE
+	msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7
-	msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN
+LavaridgeTown_EventScript_HerbShopSign:: @ 81EA7B7
+	msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_Text_1EA7C0: @ 81EA7C0
+LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0
 	.string "MAY: {PLAYER}{KUN}! Long time no see!\p"
 	.string "Oh? While I visited the hot springs,\n"
 	.string "you got the LAVARIDGE GYM BADGE.\p"
@@ -299,7 +299,7 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0
 	.string "I guess it would be okay for you to\n"
 	.string "have this.$"
 
-LavaridgeTown_Text_1EA897: @ 81EA897
+LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897
 	.string "MAY: With those GO-GOGGLES, you'll\n"
 	.string "have no trouble getting through the\l"
 	.string "desert near ROUTE 111.\p"
@@ -311,7 +311,7 @@ LavaridgeTown_Text_1EA897: @ 81EA897
 	.string "your dad in PETALBURG GYM.\p"
 	.string "See you again!$"
 
-LavaridgeTown_Text_1EA9A2: @ 81EA9A2
+LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2
 	.string "BRENDAN: {PLAYER}, hey, it's been a while.\n"
 	.string "How's it going?\p"
 	.string "Hmm…\n"
@@ -319,7 +319,7 @@ LavaridgeTown_Text_1EA9A2: @ 81EA9A2
 	.string "All right, then.\n"
 	.string "You may as well have this.$"
 
-LavaridgeTown_Text_1EAA2E: @ 81EAA2E
+LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E
 	.string "BRENDAN: Keep those with you if you're\n"
 	.string "planning on going into that desert near\l"
 	.string "ROUTE 111.\p"
@@ -333,7 +333,7 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E
 	.string "he really is tough.\p"
 	.string "See you around!$"
 
-LavaridgeTown_Text_1EAB80: @ 81EAB80
+LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80
 	.string "I have here an EGG.\p"
 	.string "I'd hoped to hatch it by covering it in\n"
 	.string "hot sand by the hot springs.\l"
@@ -346,28 +346,28 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80
 	.string "So, what say you?\n"
 	.string "Will you take this EGG to hatch?$"
 
-LavaridgeTown_Text_1EACC0: @ 81EACC0
+LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg: @ 81EACC0
 	.string "Good! I hope you'll walk plenty with\n"
 	.string "this here EGG!$"
 
-LavaridgeTown_Text_1EACF4: @ 81EACF4
+LavaridgeTown_Text_ReceivedTheEgg: @ 81EACF4
 	.string "{PLAYER} received the EGG.$"
 
-LavaridgeTown_Text_1EAD09: @ 81EAD09
+LavaridgeTown_Text_NoRoomForThisEgg: @ 81EAD09
 	.string "Oh? You've too many POKéMON.\n"
 	.string "There's no room for this EGG…$"
 
-LavaridgeTown_Text_1EAD44: @ 81EAD44
+LavaridgeTown_Text_AsYouWishThen: @ 81EAD44
 	.string "As you wish, then…\p"
 	.string "If you have a change of heart about\n"
 	.string "hatching this EGG, I will be here.$"
 
-LavaridgeTown_Text_1EAD9E: @ 81EAD9E
+LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare: @ 81EAD9E
 	.string "Every so often, an EGG will be found at\n"
 	.string "the POKéMON DAY CARE.\p"
 	.string "Or at least that's how the rumor goes.$"
 
-LavaridgeTown_Text_1EAE03: @ 81EAE03
+LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03
 	.string "We draw as much hot water as we need,\n"
 	.string "and yet the hot springs never run dry.\p"
 	.string "Isn't it magical?\p"
@@ -376,47 +376,47 @@ LavaridgeTown_Text_1EAE03: @ 81EAE03
 	.string "ground are heated by magma to well up\l"
 	.string "as hot springs.$"
 
-LavaridgeTown_Text_1EAEE1: @ 81EAEE1
+LavaridgeTown_Text_PokemonNippedBackside: @ 81EAEE1
 	.string "Being buried in this hot sand is…\n"
 	.string "Sigh…\p"
 	.string "So warm and heavenly…\p"
 	.string "Eh? Gyaah! Ouch!\p"
 	.string "A POKéMON nipped my backside!$"
 
-LavaridgeTown_Text_1EAF4E: @ 81EAF4E
+LavaridgeTown_Text_OhYouLikeHotSprings: @ 81EAF4E
 	.string "Oh, you like hot springs, do you?\p"
 	.string "That's surprising for one as young\n"
 	.string "as you.$"
 
-LavaridgeTown_Text_1EAF9B: @ 81EAF9B
+LavaridgeTown_Text_BatheInHotSpringsEveryDay: @ 81EAF9B
 	.string "I bathe in the hot springs every day.\p"
 	.string "I want to become a beautiful and strong\n"
 	.string "GYM LEADER like FLANNERY.$"
 
-LavaridgeTown_Text_1EB003: @ 81EB003
+LavaridgeTown_Text_IfPokemonInHotSprings: @ 81EB003
 	.string "If people put POKéMON in hot springs,\n"
 	.string "it might be seriously strange.\p"
 	.string "Why, it might be an electric bath, or\n"
 	.string "a bubble bath, or even a lava bath…$"
 
-LavaridgeTown_Text_1EB092: @ 81EB092
+LavaridgeTown_Text_HotSpringsClaims: @ 81EB092
 	.string "They're claiming that these hot springs\n"
 	.string "are good for calming nervous tension,\l"
 	.string "relieving aching muscles, solving\l"
 	.string "romantic problems, and attracting\l"
 	.string "money…$"
 
-LavaridgeTown_Text_1EB12B: @ 81EB12B
+LavaridgeTown_Text_TownSign: @ 81EB12B
 	.string "LAVARIDGE TOWN\p"
 	.string "“POKéMON CENTER HOT SPRINGS\n"
 	.string "An excellent place for relaxing!”$"
 
-LavaridgeTown_Text_1EB178: @ 81EB178
+LavaridgeTown_Text_GymSign: @ 81EB178
 	.string "LAVARIDGE TOWN POKéMON GYM\n"
 	.string "LEADER: FLANNERY\l"
 	.string "“One with a fiery passion that burns!”$"
 
-LavaridgeTown_Text_1EB1CB: @ 81EB1CB
+LavaridgeTown_Text_HerbShopSign: @ 81EB1CB
 	.string "POKéMON HERB SHOP\n"
 	.string "“Bitter taste--better cure!”$"
 
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index a5dcabf30..b94970e62 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -66,7 +66,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT
-	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
+	setflag FLAG_WHITEOUT_TO_LAVARIDGE
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json
index 203812fb2..1e7048b3f 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.json
+++ b/data/maps/LavaridgeTown_HerbShop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7",
+      "script": "LavaridgeTown_HerbShop_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_HerbShop_EventScript_1FE505",
+      "script": "LavaridgeTown_HerbShop_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC",
+      "script": "LavaridgeTown_HerbShop_EventScript_ExpertM",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index c7ae5fb9e..c32468589 100644
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -1,18 +1,18 @@
 LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6
 	.byte 0
 
-LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7
+LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7
 	lock
 	faceplayer
-	message LavaridgeTown_HerbShop_Text_1FE53E
+	message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop
 	waitmessage
-	pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0
+	pokemart LavaridgeTown_HerbShop_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0
+LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0
 	.2byte ITEM_ENERGY_POWDER
 	.2byte ITEM_ENERGY_ROOT
 	.2byte ITEM_HEAL_POWDER
@@ -21,15 +21,15 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0
 	release
 	end
 
-LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC
-	msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC
+LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 81FE4FC
+	msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC
 	end
 
-LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
+LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
 	lock
 	faceplayer
-	goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534
-	msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
+	goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal
+	msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHARCOAL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -37,22 +37,22 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
 	release
 	end
 
-LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534
-	msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT
+LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 81FE534
+	msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E
+LavaridgeTown_HerbShop_Text_WelcomeToHerbShop: @ 81FE53E
 	.string "Welcome to the HERB SHOP, home of\n"
 	.string "effective and inexpensive medicine!$"
 
-LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584
+LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine: @ 81FE584
 	.string "You've come to look at herbal medicine\n"
 	.string "in LAVARIDGE?\p"
 	.string "That's rather commendable.\p"
 	.string "I like you! Take this!$"
 
-LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB
+LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB
 	.string "That CHARCOAL I gave you, it's used\n"
 	.string "for making herbal medicine.\p"
 	.string "It also does wonders when held by\n"
@@ -60,7 +60,7 @@ LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB
 	.string "It intensifies the power of FIRE-type\n"
 	.string "moves.$"
 
-LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685
+LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike: @ 81FE685
 	.string "Herbal medicine works impressively well.\n"
 	.string "But your POKéMON will dislike you for it.\l"
 	.string "It must be horribly bitter!$"
diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json
index 83416a7c0..77ebb268e 100644
--- a/data/maps/LavaridgeTown_House/map.json
+++ b/data/maps/LavaridgeTown_House/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_House_EventScript_1FF912",
+      "script": "LavaridgeTown_House_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_House_EventScript_1FF91B",
+      "script": "LavaridgeTown_House_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 2dc6bc76e..6db5f9ee5 100644
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -1,26 +1,26 @@
 LavaridgeTown_House_MapScripts:: @ 81FF911
 	.byte 0
 
-LavaridgeTown_House_EventScript_1FF912:: @ 81FF912
-	msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC
+LavaridgeTown_House_EventScript_OldMan:: @ 81FF912
+	msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B
+LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LavaridgeTown_House_Text_1FF92E: @ 81FF92E
+LavaridgeTown_House_Text_WifeWarmingEggInHotSprings: @ 81FF92E
 	.string "My wife's warming an EGG in the hot\n"
 	.string "springs. This is what she told me.\p"
 	.string "She left two POKéMON with the DAY CARE.\n"
 	.string "And they discovered that EGG!$"
 
-LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB
+LavaridgeTown_House_Text_Zigzagoon: @ 81FF9BB
 	.string "ZIGZAGOON: Pshoo!$"
 
diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json
index 2f8d1278f..d55b562db 100644
--- a/data/maps/LavaridgeTown_Mart/map.json
+++ b/data/maps/LavaridgeTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FF9CE",
+      "script": "LavaridgeTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FF9FE",
+      "script": "LavaridgeTown_Mart_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FFA07",
+      "script": "LavaridgeTown_Mart_EventScript_OldWoman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index d1d2ec4d2..b5b3cb6f1 100644
--- a/data/maps/LavaridgeTown_Mart/scripts.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 LavaridgeTown_Mart_MapScripts:: @ 81FF9CD
 	.byte 0
 
-LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE
+LavaridgeTown_Mart_EventScript_Clerk:: @ 81FF9CE
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LavaridgeTown_Mart_Pokemart_1FF9E8
+	pokemart LavaridgeTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8
+LavaridgeTown_Mart_Pokemart: @ 81FF9E8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -26,21 +26,21 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8
 	release
 	end
 
-LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE
-	msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC
+LavaridgeTown_Mart_EventScript_ExpertM:: @ 81FF9FE
+	msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07
-	msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC
+LavaridgeTown_Mart_EventScript_OldWoman:: @ 81FFA07
+	msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10
+LavaridgeTown_Mart_Text_XSpeedFirstStrike: @ 81FFA10
 	.string "Use X SPEED to add to a POKéMON's\n"
 	.string "SPEED in battle.\p"
 	.string "That will help it get in the first\n"
 	.string "strike--a decided advantage!$"
 
-LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83
+LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney: @ 81FFA83
 	.string "On MT. CHIMNEY's peak, there's a local\n"
 	.string "specialty that you can buy only there.\p"
 	.string "Give it to a POKéMON--it will be elated.$"
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
index ef32ef660..4df734a49 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 3a27182d5..a2b25fe0e 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E
+@ VAR_0x800B is the Nurse's object event id
+LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FFB0E
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,31 +17,31 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E
 	release
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Youngster:: @ 81FFB1C
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Woman:: @ 81FFB25
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FFB2E
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37
+LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether: @ 81FFB37
 	.string "I think POKéMON get closer to their\n"
 	.string "TRAINERS if they spend time together.\p"
 	.string "The longer the better.\n"
 	.string "That's what I think.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD
+LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate: @ 81FFBAD
 	.string "It's sort of magical how just sitting\n"
 	.string "in a hot-spring pool can invigorate.\p"
 	.string "I wish I could let my POKéMON\n"
 	.string "soak, too.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFC21: @ 81FFC21
+LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo: @ 81FFC21
 	.string "Hohoho! Hey, kid, you can reach\n"
 	.string "the hot springs from here.\p"
 	.string "If POKéMON are getting rest, so too\n"
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 26f0ad36d..4f7c3ab0f 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C53",
+      "script": "LilycoveCity_EventScript_Sailor2",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C2B",
+      "script": "LilycoveCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C22",
+      "script": "LilycoveCity_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C4A",
+      "script": "LilycoveCity_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C91",
+      "script": "LilycoveCity_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C72",
+      "script": "LilycoveCity_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C9A",
+      "script": "LilycoveCity_EventScript_ExpertM1",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CA3",
+      "script": "LilycoveCity_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CAC",
+      "script": "LilycoveCity_EventScript_ExpertM2",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2D7D",
+      "script": "LilycoveCity_EventScript_WailmerTrainerGrunt",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DD5",
+      "script": "LilycoveCity_EventScript_AquaGrunt4",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DBA",
+      "script": "LilycoveCity_EventScript_AquaGrunt1",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DC3",
+      "script": "LilycoveCity_EventScript_AquaGrunt2",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DCC",
+      "script": "LilycoveCity_EventScript_AquaGrunt3",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2BD8",
+      "script": "LilycoveCity_EventScript_BerryGentleman",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DDE",
+      "script": "LilycoveCity_EventScript_Rival",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E302D",
+      "script": "LilycoveCity_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CEE",
+      "script": "LilycoveCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CDD",
+      "script": "LilycoveCity_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CCB",
+      "script": "LilycoveCity_EventScript_Sailor1",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CD4",
+      "script": "LilycoveCity_EventScript_FatMan",
       "flag": "0"
     }
   ],
@@ -420,7 +420,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D1A"
+      "script": "LilycoveCity_EventScript_MuseumSign"
     },
     {
       "type": "sign",
@@ -436,7 +436,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D6B"
+      "script": "LilycoveCity_EventScript_DepartmentStoreSign"
     },
     {
       "type": "sign",
@@ -452,7 +452,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2CFF"
+      "script": "LilycoveCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -460,7 +460,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D08"
+      "script": "LilycoveCity_EventScript_ContestHallSign"
     },
     {
       "type": "sign",
@@ -468,7 +468,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D11"
+      "script": "LilycoveCity_EventScript_MotelSign"
     },
     {
       "type": "sign",
@@ -476,7 +476,7 @@
       "y": 30,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D44"
+      "script": "LilycoveCity_EventScript_HarborSign"
     },
     {
       "type": "sign",
@@ -484,7 +484,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D62"
+      "script": "LilycoveCity_EventScript_TrainerFanClubSign"
     },
     {
       "type": "sign",
@@ -492,7 +492,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D74"
+      "script": "LilycoveCity_EventScript_MoveDeletersHouseSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index ed0239819..66746ad37 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -1,21 +1,21 @@
 LilycoveCity_MapScripts:: @ 81E2B3C
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad
 	.byte 0
 
 LilycoveCity_OnTransition: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	call Common_EventScript_SetupRivalGfxId
 	end
 
-LilycoveCity_MapScript1_1E2B61: @ 81E2B61
-	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B
+LilycoveCity_OnLoad: @ 81E2B61
+	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_SetWailmerMetatiles
 	end
 
-LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
+LilycoveCity_EventScript_SetWailmerMetatiles:: @ 81E2B6B
 	setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
 	setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
 	setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
@@ -30,362 +30,362 @@ LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
 	setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
 	return
 
-LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
+LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
-	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_ReceivedBerry
+	msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
-	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_BecauseYoureTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C18:: @ 81E2C18
-	msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT
+LilycoveCity_EventScript_ReceivedBerry:: @ 81E2C18
+	msgbox LilycoveCity_Text_PokeblocksSuitPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C22:: @ 81E2C22
-	msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC
+LilycoveCity_EventScript_Man3:: @ 81E2C22
+	msgbox LilycoveCity_Text_ContestHallInTown, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B
+LilycoveCity_EventScript_Girl:: @ 81E2C2B
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40
-	msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_GirlAquaGone
+	msgbox LilycoveCity_Text_StrangeCaveInCove, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C40:: @ 81E2C40
-	msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT
+LilycoveCity_EventScript_GirlAquaGone:: @ 81E2C40
+	msgbox LilycoveCity_Text_GoingToMoveDeleterForHMs, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
-	msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC
+LilycoveCity_EventScript_RichBoy:: @ 81E2C4A
+	msgbox LilycoveCity_Text_ImFromKanto, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C53:: @ 81E2C53
+LilycoveCity_EventScript_Sailor2:: @ 81E2C53
 	lock
 	faceplayer
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68
-	msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Sailor2AquaGone
+	msgbox LilycoveCity_Text_TeamAquaBeenTrainingWailmer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C68:: @ 81E2C68
-	msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT
+LilycoveCity_EventScript_Sailor2AquaGone:: @ 81E2C68
+	msgbox LilycoveCity_Text_SomeonePuntedTeamAquaOut, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C72:: @ 81E2C72
+LilycoveCity_EventScript_Woman2:: @ 81E2C72
 	lock
 	faceplayer
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87
-	msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Woman2AquaGone
+	msgbox LilycoveCity_Text_SomeoneStoleMyPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C87:: @ 81E2C87
-	msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT
+LilycoveCity_EventScript_Woman2AquaGone:: @ 81E2C87
+	msgbox LilycoveCity_Text_MissingPokemonCameBack, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C91:: @ 81E2C91
-	msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC
+LilycoveCity_EventScript_Man2:: @ 81E2C91
+	msgbox LilycoveCity_Text_ImArtDealer, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A
-	msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN
+LilycoveCity_EventScript_ExpertM1:: @ 81E2C9A
+	msgbox LilycoveCity_Text_SeaRemainsForeverYoung, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3
-	msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN
+LilycoveCity_EventScript_ExpertF:: @ 81E2CA3
+	msgbox LilycoveCity_Text_SixtyYearsAgoHusbandProposed, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC
+LilycoveCity_EventScript_ExpertM2:: @ 81E2CAC
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1
-	msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_ExpertM2AquaGone
+	msgbox LilycoveCity_Text_TeamAquaRenovatedCavern, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1
-	msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT
+LilycoveCity_EventScript_ExpertM2AquaGone:: @ 81E2CC1
+	msgbox LilycoveCity_Text_TeamAquaLotGoneForGood, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB
-	msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC
+LilycoveCity_EventScript_Sailor1:: @ 81E2CCB
+	msgbox LilycoveCity_Text_HeardTowerCalledSkyPillar, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4
-	msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC
+LilycoveCity_EventScript_FatMan:: @ 81E2CD4
+	msgbox LilycoveCity_Text_SawTallTowerOnRoute131, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD
+LilycoveCity_EventScript_Man1:: @ 81E2CDD
 	lockall
-	msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC
+	msgbox LilycoveCity_Text_JustArrivedAndSawRarePokemon, MSGBOX_NPC
 	applymovement 20, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE
+LilycoveCity_EventScript_Woman1:: @ 81E2CEE
 	lockall
-	msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC
+	msgbox LilycoveCity_Text_HoneymoonVowToSeeRarePokemon, MSGBOX_NPC
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF
-	msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN
+LilycoveCity_EventScript_CitySign:: @ 81E2CFF
+	msgbox LilycoveCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D08:: @ 81E2D08
-	msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN
+LilycoveCity_EventScript_ContestHallSign:: @ 81E2D08
+	msgbox LilycoveCity_Text_ContestHallSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D11:: @ 81E2D11
-	msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN
+LilycoveCity_EventScript_MotelSign:: @ 81E2D11
+	msgbox LilycoveCity_Text_MotelSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
+LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
 	lockall
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 0, LilycoveCity_EventScript_1E2D3A
-	msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT
+	case 0, LilycoveCity_EventScript_MuseumSignNoPaintings
+	msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A
-	msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MuseumSignNoPaintings:: @ 81E2D3A
+	msgbox LilycoveCity_Text_MuseumSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D44:: @ 81E2D44
+LilycoveCity_EventScript_HarborSign:: @ 81E2D44
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58
-	msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_HarborSignFerryReady
+	msgbox LilycoveCity_Text_HarborSignUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D58:: @ 81E2D58
-	msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT
+LilycoveCity_EventScript_HarborSignFerryReady:: @ 81E2D58
+	msgbox LilycoveCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D62:: @ 81E2D62
-	msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN
+LilycoveCity_EventScript_TrainerFanClubSign:: @ 81E2D62
+	msgbox LilycoveCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B
-	msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN
+LilycoveCity_EventScript_DepartmentStoreSign:: @ 81E2D6B
+	msgbox LilycoveCity_Text_DepartmentStoreSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D74:: @ 81E2D74
-	msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN
+LilycoveCity_EventScript_MoveDeletersHouseSign:: @ 81E2D74
+	msgbox LilycoveCity_Text_MoveDeletersHouseSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
+LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 81E2D7D
 	lockall
-	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
-	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer
+	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_GetLostMessingUpTraining, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0
-	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MetWailmerTrainer:: @ 81E2DB0
+	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA
-	msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt1:: @ 81E2DBA
+	msgbox LilycoveCity_Text_MovedLootIntoHideoutToday, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3
-	msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt2:: @ 81E2DC3
+	msgbox LilycoveCity_Text_ChanceToDoBigThings, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC
-	msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt3:: @ 81E2DCC
+	msgbox LilycoveCity_Text_DontGoNearCaveInCove, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5
-	msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt4:: @ 81E2DD5
+	msgbox LilycoveCity_Text_IfWorldBecomesOurs, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
+LilycoveCity_EventScript_Rival:: @ 81E2DDE
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LilycoveCity_EventScript_1E2DF8
+	goto_if_eq LilycoveCity_EventScript_May
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LilycoveCity_EventScript_1E2E6B
+	goto_if_eq LilycoveCity_EventScript_Brendan
 	end
 
-LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
+LilycoveCity_EventScript_May:: @ 81E2DF8
 	playbgm MUS_GIRL_SUP, 1
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_1E2E5A
-	msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_DeclineMayBattle
+	msgbox LilycoveCity_Text_MayWontBeBeaten, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_1E2EDE
-	case 1, LilycoveCity_EventScript_1E2EEE
-	case 2, LilycoveCity_EventScript_1E2EFE
+	case 0, LilycoveCity_EventScript_BattleMayTreecko
+	case 1, LilycoveCity_EventScript_BattleMayTorchic
+	case 2, LilycoveCity_EventScript_BattleMayMudkip
 	end
 
-LilycoveCity_EventScript_1E2E48:: @ 81E2E48
-	msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO
+LilycoveCity_EventScript_MayAskToBattleAgain:: @ 81E2E48
+	msgbox LilycoveCity_Text_MayBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2E51:: @ 81E2E51
-	msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO
+LilycoveCity_EventScript_MayAskToBattle:: @ 81E2E51
+	msgbox LilycoveCity_Text_MayShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
+LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_MayNotRaisingPokemon, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	release
 	end
 
-LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
+LilycoveCity_EventScript_Brendan:: @ 81E2E6B
 	playbgm MUS_BOY_SUP, 1
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_1E2ECD
-	msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_DeclineBrendanBattle
+	msgbox LilycoveCity_Text_BrendanWontBeBeaten, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_1E2F0E
-	case 1, LilycoveCity_EventScript_1E2F1E
-	case 2, LilycoveCity_EventScript_1E2F2E
+	case 0, LilycoveCity_EventScript_BattleBrendanTreecko
+	case 1, LilycoveCity_EventScript_BattleBrendanTorchic
+	case 2, LilycoveCity_EventScript_BattleBrendanMudkip
 	end
 
-LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB
-	msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO
+LilycoveCity_EventScript_BrendanAskToBattleAgain:: @ 81E2EBB
+	msgbox LilycoveCity_Text_BrendanBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4
-	msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO
+LilycoveCity_EventScript_BrendanAskToBattle:: @ 81E2EC4
+	msgbox LilycoveCity_Text_BrendanShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
+LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_BrendanNoConfidence, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	release
 	end
 
-LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE
-	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
+	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE
-	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
+	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE
-	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
+	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E
-	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
+	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E
-	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
+	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
-	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
+	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
-	msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_EventScript_1E2F86
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_EventScript_1E2F8F
+LilycoveCity_EventScript_DefeatedMay:: @ 81E2F3E
+	msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT
+	setvar VAR_RESULT, FALSE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_EventScript_MayCollectBadges
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_EventScript_MayPokemonLeague
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
-	goto LilycoveCity_EventScript_1E3006
+	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_1E2F76:: @ 81E2F76
-	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80
+LilycoveCity_EventScript_CheckFinalBadge:: @ 81E2F76
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_HasFinalBadge
 	return
 
-LilycoveCity_EventScript_1E2F80:: @ 81E2F80
-	setvar VAR_RESULT, 1
+LilycoveCity_EventScript_HasFinalBadge:: @ 81E2F80
+	setvar VAR_RESULT, TRUE
 	return
 
-LilycoveCity_EventScript_1E2F86:: @ 81E2F86
-	msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayCollectBadges:: @ 81E2F86
+	msgbox LilycoveCity_Text_MayYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1
-	msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayPokemonLeague:: @ 81E2F8F
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_MayBattleFrontier
+	msgbox LilycoveCity_Text_MayYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1
-	msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayBattleFrontier:: @ 81E2FA1
+	msgbox LilycoveCity_Text_MayYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
-	msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_EventScript_1E2FE2
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_EventScript_1E2FEB
+LilycoveCity_EventScript_DefeatedBrendan:: @ 81E2FAA
+	msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT
+	setvar VAR_RESULT, FALSE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_EventScript_BrendanCollectBadges
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_EventScript_BrendanPokemonLeague
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
-	goto LilycoveCity_EventScript_1E3006
+	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2
-	msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanCollectBadges:: @ 81E2FE2
+	msgbox LilycoveCity_Text_BrendanYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD
-	msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanPokemonLeague:: @ 81E2FEB
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_BrendanBattleFrontier
+	msgbox LilycoveCity_Text_BrendanYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
-	msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanBattleFrontier:: @ 81E2FFD
+	msgbox LilycoveCity_Text_BrendanYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E3006:: @ 81E3006
+LilycoveCity_EventScript_RivalFlyAway:: @ 81E3006
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -401,26 +401,26 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
 	release
 	end
 
-LilycoveCity_EventScript_1E302D:: @ 81E302D
+LilycoveCity_EventScript_SchoolKidM:: @ 81E302D
 	lock
 	faceplayer
-	msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_EventScript_1E304F
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_EventScript_1E3058
+	msgbox LilycoveCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq LilycoveCity_EventScript_KnowAboutBerryBlender
+	compare VAR_RESULT, NO
+	call_if_eq LilycoveCity_EventScript_DontKnowAboutBerryBlender
 	release
 	end
 
-LilycoveCity_EventScript_1E304F:: @ 81E304F
-	msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT
+LilycoveCity_EventScript_KnowAboutBerryBlender:: @ 81E304F
+	msgbox LilycoveCity_Text_FasterSpinBetterPokeblocks, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E3058:: @ 81E3058
-	msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT
+LilycoveCity_EventScript_DontKnowAboutBerryBlender:: @ 81E3058
+	msgbox LilycoveCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_Text_1E3061: @ 81E3061
+LilycoveCity_Text_MayShoppingLetsBattle: @ 81E3061
 	.string "MAY: Oh, hey?\n"
 	.string "{PLAYER}{KUN}, are you shopping, too?\p"
 	.string "I bought a whole bunch of DOLLS and\n"
@@ -433,35 +433,35 @@ LilycoveCity_Text_1E3061: @ 81E3061
 	.string "I'll battle with you, so you can show\n"
 	.string "me your POKéMON, {PLAYER}{KUN}.$"
 
-LilycoveCity_Text_1E318D: @ 81E318D
+LilycoveCity_Text_MayNotRaisingPokemon: @ 81E318D
 	.string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n"
 	.string "been raising your POKéMON?\p"
 	.string "That's not a very good showing as a\n"
 	.string "TRAINER…$"
 
-LilycoveCity_Text_1E31F5: @ 81E31F5
+LilycoveCity_Text_MayBattleMe: @ 81E31F5
 	.string "MAY: Come on, battle with me, so I can\n"
 	.string "check out your POKéMON!$"
 
-LilycoveCity_Text_1E3234: @ 81E3234
+LilycoveCity_Text_MayWontBeBeaten: @ 81E3234
 	.string "MAY: The POKéMON I raised won't be\n"
 	.string "beaten by your POKéMON, {PLAYER}{KUN}!$"
 
-LilycoveCity_Text_1E3275: @ 81E3275
+LilycoveCity_Text_MayDefeat: @ 81E3275
 	.string "… … … … … … … …\p"
 	.string "I remember the battle I had with you,\n"
 	.string "{PLAYER}{KUN}, on ROUTE 103.\p"
 	.string "That battle helped you become this\n"
 	.string "strong, {PLAYER}{KUN}, didn't it?$"
 
-LilycoveCity_Text_1E32FB: @ 81E32FB
+LilycoveCity_Text_MayGoingBackToLittleroot: @ 81E32FB
 	.string "MAY: I'm thinking of going back to\n"
 	.string "LITTLEROOT soon.\p"
 	.string "I've caught a decent group of POKéMON,\n"
 	.string "and my POKéDEX is coming along, so\l"
 	.string "I'm going home to show my dad.$"
 
-LilycoveCity_Text_1E3398: @ 81E3398
+LilycoveCity_Text_MayYouGoingToCollectBadges: @ 81E3398
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
@@ -470,7 +470,7 @@ LilycoveCity_Text_1E3398: @ 81E3398
 	.string "POKéDEX. I'll complete it before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E346D: @ 81E346D
+LilycoveCity_Text_MayYouGoingToPokemonLeague: @ 81E346D
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the POKéMON LEAGUE\n"
 	.string "challenge?\p"
@@ -480,7 +480,7 @@ LilycoveCity_Text_1E346D: @ 81E346D
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E353A: @ 81E353A
+LilycoveCity_Text_MayYouGoingToBattleFrontier: @ 81E353A
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -490,7 +490,7 @@ LilycoveCity_Text_1E353A: @ 81E353A
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E3608: @ 81E3608
+LilycoveCity_Text_BrendanShoppingLetsBattle: @ 81E3608
 	.string "BRENDAN: Oh, hey, it's {PLAYER}.\p"
 	.string "I'm running an errand for my dad.\n"
 	.string "No, I'm not buying any DOLLS.\p"
@@ -498,39 +498,39 @@ LilycoveCity_Text_1E3608: @ 81E3608
 	.string "Want to have a battle to see who's been\n"
 	.string "raising POKéMON better?$"
 
-LilycoveCity_Text_1E36BF: @ 81E36BF
+LilycoveCity_Text_BrendanNoConfidence: @ 81E36BF
 	.string "BRENDAN: Oh, what's the matter?\n"
 	.string "Don't have the confidence?$"
 
-LilycoveCity_Text_1E36FA: @ 81E36FA
+LilycoveCity_Text_BrendanBattleMe: @ 81E36FA
 	.string "BRENDAN: Want to battle to see who's\n"
 	.string "been raising POKéMON better?$"
 
-LilycoveCity_Text_1E373C: @ 81E373C
+LilycoveCity_Text_BrendanWontBeBeaten: @ 81E373C
 	.string "BRENDAN: Aww, but you know I'm not\n"
 	.string "going to lose to no {PLAYER}.$"
 
-LilycoveCity_Text_1E3777: @ 81E3777
+LilycoveCity_Text_BrendanDefeat: @ 81E3777
 	.string "Humph…\n"
 	.string "You've done a lot of raising.\p"
 	.string "That stings a bit--I had a head start\n"
 	.string "on you as a TRAINER…$"
 
-LilycoveCity_Text_1E37D7: @ 81E37D7
+LilycoveCity_Text_BrendanGoingBackToLittleroot: @ 81E37D7
 	.string "BRENDAN: I…\n"
 	.string "I plan on going home to LITTLEROOT.\p"
 	.string "You know I'm helping out my dad on his\n"
 	.string "POKéDEX. It's coming together pretty\l"
 	.string "decently, so I should go show him.$"
 
-LilycoveCity_Text_1E3876: @ 81E3876
+LilycoveCity_Text_BrendanYouGoingToCollectBadges: @ 81E3876
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
 	.string "Maybe I'll do that, too…\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E390C: @ 81E390C
+LilycoveCity_Text_BrendanYouGoingToPokemonLeague: @ 81E390C
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Since you're that strong, are you\n"
 	.string "taking the POKéMON LEAGUE challenge?\p"
@@ -539,7 +539,7 @@ LilycoveCity_Text_1E390C: @ 81E390C
 	.string "you, {PLAYER}.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E39E3: @ 81E39E3
+LilycoveCity_Text_BrendanYouGoingToBattleFrontier: @ 81E39E3
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -553,14 +553,14 @@ LilycoveCity_Text_1E39E3: @ 81E39E3
 	.string "FRONTIER.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E3B2C: @ 81E3B2C
+LilycoveCity_Text_MovedLootIntoHideoutToday: @ 81E3B2C
 	.string "Fufufu…\p"
 	.string "We moved more loot into our secret\n"
 	.string "HIDEOUT today…\p"
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_1E3B95: @ 81E3B95
+LilycoveCity_Text_ChanceToDoBigThings: @ 81E3B95
 	.string "I'm just a GRUNT, so I don't know what\n"
 	.string "the BOSS is thinking…\p"
 	.string "But being on TEAM AQUA, I know I'll get\n"
@@ -568,44 +568,44 @@ LilycoveCity_Text_1E3B95: @ 81E3B95
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_1E3C46: @ 81E3C46
+LilycoveCity_Text_DontGoNearCaveInCove: @ 81E3C46
 	.string "Hey, you!\p"
 	.string "Don't go near the cave in the cove!\p"
 	.string "Why? You don't need a reason why!\n"
 	.string "I'm an adult, so you just listen to me!$"
 
-LilycoveCity_Text_1E3CBE: @ 81E3CBE
+LilycoveCity_Text_IfWorldBecomesOurs: @ 81E3CBE
 	.string "If this whole wide world becomes ours,\n"
 	.string "TEAM AQUA's, it will be a happier\l"
 	.string "place for POKéMON, too.$"
 
-LilycoveCity_Text_1E3D1F: @ 81E3D1F
+LilycoveCity_Text_WailmerLeapOutOfWater: @ 81E3D1F
 	.string "There! WAILMER!\n"
 	.string "Leap out of the water now!$"
 
-LilycoveCity_Text_1E3D4A: @ 81E3D4A
+LilycoveCity_Text_GetLostMessingUpTraining: @ 81E3D4A
 	.string "Hunh? What do you want?\p"
 	.string "You're messing up our training,\n"
 	.string "so can you, like, get lost?$"
 
-LilycoveCity_Text_1E3D9E: @ 81E3D9E
+LilycoveCity_Text_ContestHallInTown: @ 81E3D9E
 	.string "There's a POKéMON CONTEST HALL\n"
 	.string "right in this here town. \p"
 	.string "That means well-raised POKéMON will\n"
 	.string "come from all over the country.\p"
 	.string "My heart swells with excitement!$"
 
-LilycoveCity_Text_1E3E3C: @ 81E3E3C
+LilycoveCity_Text_StrangeCaveInCove: @ 81E3E3C
 	.string "Have you seen that strange cave in\n"
 	.string "the cove at the edge of town?$"
 
-LilycoveCity_Text_1E3E7D: @ 81E3E7D
+LilycoveCity_Text_GoingToMoveDeleterForHMs: @ 81E3E7D
 	.string "I'm going to teach my POKéMON some new\n"
 	.string "moves for entering a CONTEST.\p"
 	.string "So, I'm going to see the MOVE DELETER\n"
 	.string "and make it forget HM moves.$"
 
-LilycoveCity_Text_1E3F05: @ 81E3F05
+LilycoveCity_Text_ImFromKanto: @ 81E3F05
 	.string "I came from KANTO.\p"
 	.string "The HOENN region is beautiful with\n"
 	.string "all its water and verdant nature.\p"
@@ -613,50 +613,50 @@ LilycoveCity_Text_1E3F05: @ 81E3F05
 	.string "Could there be rare POKéMON that live\n"
 	.string "only in this area?$"
 
-LilycoveCity_Text_1E3FAB: @ 81E3FAB
+LilycoveCity_Text_TeamAquaBeenTrainingWailmer: @ 81E3FAB
 	.string "TEAM AQUA's been training their\n"
 	.string "WAILMER in the cove.\p"
 	.string "We SAILORS can't get our boats out\n"
 	.string "to sea with them in the way!$"
 
-LilycoveCity_Text_1E4020: @ 81E4020
+LilycoveCity_Text_SomeonePuntedTeamAquaOut: @ 81E4020
 	.string "Ahoy, did you know?\p"
 	.string "Someone punted TEAM AQUA out of\n"
 	.string "the way for us!\p"
 	.string "That got the WAILMER out of the cove,\n"
 	.string "so we can get our boats out again.$"
 
-LilycoveCity_Text_1E40AD: @ 81E40AD
+LilycoveCity_Text_SomeoneStoleMyPokemon: @ 81E40AD
 	.string "I was taking a relaxing snooze at the\n"
 	.string "seaside inn to the sound of waves…\p"
 	.string "When someone stole my POKéMON!\p"
 	.string "Who's the abductor?\n"
 	.string "TEAM AQUA? Is it TEAM AQUA?$"
 
-LilycoveCity_Text_1E4145: @ 81E4145
+LilycoveCity_Text_MissingPokemonCameBack: @ 81E4145
 	.string "My missing POKéMON…\n"
 	.string "It came back without me noticing!$"
 
-LilycoveCity_Text_1E417B: @ 81E417B
+LilycoveCity_Text_ImArtDealer: @ 81E417B
 	.string "I'm an ART DEALER.\p"
 	.string "I am a buyer and seller of fine art,\n"
 	.string "especially paintings.\p"
 	.string "I've heard that the MUSEUM here has\n"
 	.string "magnificent works on exhibit…$"
 
-LilycoveCity_Text_1E420B: @ 81E420B
+LilycoveCity_Text_SeaRemainsForeverYoung: @ 81E420B
 	.string "Even as we grow old and wrinkled,\n"
 	.string "the sea remains forever young with\l"
 	.string "the vivid brilliance of life…\p"
 	.string "Fwohoho fwohohohoho…$"
 
-LilycoveCity_Text_1E4283: @ 81E4283
+LilycoveCity_Text_SixtyYearsAgoHusbandProposed: @ 81E4283
 	.string "It was sixty years ago that my husband\n"
 	.string "proposed to me here.\l"
 	.string "The sea remains as beautiful as ever.\p"
 	.string "Mufufufu mufufufufufu…$"
 
-LilycoveCity_Text_1E42FC: @ 81E42FC
+LilycoveCity_Text_TeamAquaRenovatedCavern: @ 81E42FC
 	.string "Hm, you know of the peculiar cavern\n"
 	.string "in this cove?\p"
 	.string "That had been a natural formation,\n"
@@ -667,92 +667,92 @@ LilycoveCity_Text_1E42FC: @ 81E42FC
 	.string "But what they do and what they say\n"
 	.string "don't match at all!$"
 
-LilycoveCity_Text_1E43FF: @ 81E43FF
+LilycoveCity_Text_TeamAquaLotGoneForGood: @ 81E43FF
 	.string "That cave in the cove…\p"
 	.string "I didn't notice it right away,\n"
 	.string "but it's completely empty now.\p"
 	.string "That TEAM AQUA lot, they must\n"
 	.string "have gone away for good.$"
 
-LilycoveCity_Text_1E448B: @ 81E448B
+LilycoveCity_Text_CitySign: @ 81E448B
 	.string "LILYCOVE CITY\p"
 	.string "“Where the land ends and the\n"
 	.string "sea begins.”$"
 
-LilycoveCity_Text_1E44C3: @ 81E44C3
+LilycoveCity_Text_ContestHallSign: @ 81E44C3
 	.string "POKéMON CONTEST HALL\n"
 	.string "“The gathering place for TRAINERS!”$"
 
-LilycoveCity_Text_1E44FC: @ 81E44FC
+LilycoveCity_Text_MotelSign: @ 81E44FC
 	.string "COVE LILY MOTEL\p"
 	.string "“Remember us as COVE LILY of\n"
 	.string "LILYCOVE.”$"
 
-LilycoveCity_Text_1E4534: @ 81E4534
+LilycoveCity_Text_MuseumSign: @ 81E4534
 	.string "LILYCOVE MUSEUM\p"
 	.string "“POKéMON Masterpiece Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_1E4571: @ 81E4571
+LilycoveCity_Text_MuseumSignPlayersExhibit: @ 81E4571
 	.string "LILYCOVE MUSEUM\p"
 	.string "“{PLAYER}'s POKéMON Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_1E45A7: @ 81E45A7
+LilycoveCity_Text_HarborSignUnderConstruction: @ 81E45A7
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in SLATEPORT CITY.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-LilycoveCity_Text_1E4624: @ 81E4624
+LilycoveCity_Text_HarborSign: @ 81E4624
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-LilycoveCity_Text_1E466E: @ 81E466E
+LilycoveCity_Text_TrainerFanClubSign: @ 81E466E
 	.string "POKéMON TRAINER FAN CLUB\p"
 	.string "The names of TRAINERS are scribbled\n"
 	.string "all over the sign…$"
 
-LilycoveCity_Text_1E46BE: @ 81E46BE
+LilycoveCity_Text_DepartmentStoreSign: @ 81E46BE
 	.string "LILYCOVE DEPARTMENT STORE\p"
 	.string "“Overflowing with great merchandise\n"
 	.string "and excitement!\p"
 	.string "“A great place to find that something\n"
 	.string "you need!”$"
 
-LilycoveCity_Text_1E473D: @ 81E473D
+LilycoveCity_Text_MoveDeletersHouseSign: @ 81E473D
 	.string "MOVE DELETER'S HOUSE\p"
 	.string "“Unwanted POKéMON moves deleted.”$"
 
-LilycoveCity_Text_1E4774: @ 81E4774
+LilycoveCity_Text_DoYouKnowAboutBerryBlender: @ 81E4774
 	.string "Do you know about the machine\n"
 	.string "BERRY BLENDER?$"
 
-LilycoveCity_Text_1E47A1: @ 81E47A1
+LilycoveCity_Text_FasterSpinBetterPokeblocks: @ 81E47A1
 	.string "People have to work together to get it\n"
 	.string "to spin faster.\p"
 	.string "The faster you can make it spin, the\n"
 	.string "better {POKEBLOCK}S you can get, I've heard.$"
 
-LilycoveCity_Text_1E4824: @ 81E4824
+LilycoveCity_Text_ExplainBerryBlender: @ 81E4824
 	.string "It's used for making a kind of candy\n"
 	.string "called a {POKEBLOCK}.\p"
 	.string "If you give a good {POKEBLOCK} to a POKéMON,\n"
 	.string "its condition will improve by a lot.$"
 
-LilycoveCity_Text_1E48A5: @ 81E48A5
+LilycoveCity_Text_HeardTowerCalledSkyPillar: @ 81E48A5
 	.string "I heard there's a tower somewhere out\n"
 	.string "on the sea routes.\p"
 	.string "It's called the SKY PILLAR, I hear.$"
 
-LilycoveCity_Text_1E4902: @ 81E4902
+LilycoveCity_Text_SawTallTowerOnRoute131: @ 81E4902
 	.string "I saw this tall tower somewhere\n"
 	.string "around ROUTE 131.\p"
 	.string "Could that possibly be…?$"
 
-LilycoveCity_Text_1E494D: @ 81E494D
+LilycoveCity_Text_JustArrivedAndSawRarePokemon: @ 81E494D
 	.string "We just arrived here on our\n"
 	.string "honeymoon vacation.\p"
 	.string "We happened to see a DRAGON-type\n"
@@ -760,7 +760,7 @@ LilycoveCity_Text_1E494D: @ 81E494D
 	.string "Do cool POKéMON like that live in\n"
 	.string "the HOENN region?$"
 
-LilycoveCity_Text_1E49F4: @ 81E49F4
+LilycoveCity_Text_HoneymoonVowToSeeRarePokemon: @ 81E49F4
 	.string "On our honeymoon, we vowed to see as\n"
 	.string "many rare POKéMON as we can.\p"
 	.string "So we were delighted to see a rare\n"
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json
index 3522c7963..456c7eec8 100644
--- a/data/maps/LilycoveCity_ContestHall/map.json
+++ b/data/maps/LilycoveCity_ContestHall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B485",
+      "script": "LilycoveCity_ContestHall_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B48E",
+      "script": "LilycoveCity_ContestHall_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B497",
+      "script": "LilycoveCity_ContestHall_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4A9",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestMC",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4C0",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestJudge",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4D7",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant1",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4EE",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant2",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B505",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant3",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B51C",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant4",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B533",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience1",
       "flag": "0"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B56A",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience4",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B53C",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience2",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B581",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestMC",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B598",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestJudge",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5AF",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant1",
       "flag": "0"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5C6",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant2",
       "flag": "0"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5DD",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant3",
       "flag": "0"
     },
     {
@@ -245,7 +245,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5F4",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant4",
       "flag": "0"
     },
     {
@@ -258,7 +258,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B60B",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience1",
       "flag": "0"
     },
     {
@@ -271,7 +271,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B639",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience3",
       "flag": "0"
     },
     {
@@ -284,7 +284,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B622",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience2",
       "flag": "0"
     },
     {
@@ -297,7 +297,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B553",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience3",
       "flag": "0"
     },
     {
@@ -310,7 +310,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B650",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestMC",
       "flag": "0"
     },
     {
@@ -323,7 +323,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B667",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestJudge",
       "flag": "0"
     },
     {
@@ -336,7 +336,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B67E",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant1",
       "flag": "0"
     },
     {
@@ -349,7 +349,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B695",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant2",
       "flag": "0"
     },
     {
@@ -362,7 +362,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6AC",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant3",
       "flag": "0"
     },
     {
@@ -375,7 +375,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6C3",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant4",
       "flag": "0"
     },
     {
@@ -388,7 +388,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6DA",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience1",
       "flag": "0"
     },
     {
@@ -401,7 +401,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B71C",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience3",
       "flag": "0"
     },
     {
@@ -414,7 +414,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B705",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience2",
       "flag": "0"
     },
     {
@@ -427,7 +427,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4A0",
+      "script": "LilycoveCity_ContestHall_EventScript_Sailor",
       "flag": "0"
     }
   ],
@@ -469,7 +469,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
     },
     {
       "type": "sign",
@@ -477,7 +477,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+      "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
     },
     {
       "type": "sign",
@@ -485,7 +485,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+      "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
     },
     {
       "type": "sign",
@@ -493,7 +493,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+      "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
     },
     {
       "type": "sign",
@@ -501,7 +501,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
     },
     {
       "type": "sign",
@@ -509,7 +509,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+      "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 5823b6da4..fb98c72f6 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -1,319 +1,319 @@
 LilycoveCity_ContestHall_MapScripts:: @ 821B484
 	.byte 0
 
-LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485
-	msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy1:: @ 821B485
+	msgbox LilycoveCity_ContestHall_Text_TodayWonSmartnessContest, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E
-	msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy2:: @ 821B48E
+	msgbox LilycoveCity_ContestHall_Text_EnteredBunchOfContests, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497
-	msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Girl:: @ 821B497
+	msgbox LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0
-	msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Sailor:: @ 821B4A0
+	msgbox LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9
+LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0
+LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7
+LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE
+LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505
+LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C
+LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533
-	msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartContestAudience1:: @ 821B533
+	msgbox LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C
+LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT
 	closemessage
 	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553
+LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT
 	closemessage
 	applymovement 22, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A
+LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT
 	closemessage
 	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581
+LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598
+LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF
+LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT
 	closemessage
 	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6
+LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT
 	closemessage
 	applymovement 16, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD
+LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT
 	closemessage
 	applymovement 17, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4
+LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT
 	closemessage
 	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT
 	closemessage
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT
 	closemessage
 	applymovement 21, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT
 	closemessage
 	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650
+LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667
+LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT
 	closemessage
 	applymovement 24, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E
+LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT
 	closemessage
 	applymovement 25, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695
+LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC
+LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT
 	closemessage
 	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3
+LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT
 	closemessage
 	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA
+LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA
 	lockall
 	applymovement 29, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyChildIsInContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 25
-	msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_ComeOnDear, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705
+LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C
+LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733
-	msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_BeautyStageSign:: @ 821B733
+	msgbox LilycoveCity_ContestHall_Text_BeautyContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C
-	msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_CuteStageSign:: @ 821B73C
+	msgbox LilycoveCity_ContestHall_Text_CuteContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745
-	msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartStageSign:: @ 821B745
+	msgbox LilycoveCity_ContestHall_Text_SmartContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_Text_21B74E: @ 821B74E
+LilycoveCity_ContestHall_Text_TodayWonSmartnessContest: @ 821B74E
 	.string "This POKéMON won the BEAUTY CONTEST\n"
 	.string "here before.\p"
 	.string "Well, guess what? Today, I made it\n"
 	.string "win a SMARTNESS CONTEST!\p"
 	.string "My abilities scare even me…$"
 
-LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
+LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7
 	.string "I've entered a bunch of CONTESTS,\n"
 	.string "so I'm seeing how things work.\p"
 	.string "If you're in a COOLNESS CONTEST,\n"
@@ -321,29 +321,29 @@ LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
 	.string "But smart moves and cute moves\n"
 	.string "don't go over well, for instance.$"
 
-LilycoveCity_ContestHall_Text_21B899: @ 821B899
+LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks: @ 821B899
 	.string "That young man who won earlier had\n"
 	.string "a whole bunch of different {POKEBLOCK}S.\p"
 	.string "Can you win if you had that many\n"
 	.string "of those things?$"
 
-LilycoveCity_ContestHall_Text_21B911: @ 821B911
+LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous: @ 821B911
 	.string "Whoa, isn't this place humongous!\p"
 	.string "The tension in the air… It's not\n"
 	.string "like a CONTEST hall in the sticks.$"
 
-LilycoveCity_ContestHall_Text_21B977: @ 821B977
+LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal: @ 821B977
 	.string "MC: Okay, SMART POKéMON and their\n"
 	.string "TRAINERS, are you ready?!\p"
 	.string "Give it your best showing!\n"
 	.string "Let's appeal!$"
 
-LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC
+LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest: @ 821B9DC
 	.string "JUDGE: Are you enjoying this CONTEST?\p"
 	.string "Come back with three friends, and\n"
 	.string "all of you may enter a CONTEST!$"
 
-LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
+LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44
 	.string "Ayayayay…\n"
 	.string "I entered the wrong CONTEST.\p"
 	.string "I entered this tough POKéMON in\n"
@@ -351,7 +351,7 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
 	.string "Come on, wow them with a smart-looking\n"
 	.string "ROCK SMASH.$"
 
-LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
+LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5
 	.string "I've spent many a year, and all my\n"
 	.string "wisdom besides, raising this POKéMON\l"
 	.string "to be smart.\p"
@@ -359,54 +359,54 @@ LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
 	.string "young pup's POKéMON.\p"
 	.string "My dear wife, are you seeing this?$"
 
-LilycoveCity_ContestHall_Text_21BB84: @ 821BB84
+LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext: @ 821BB84
 	.string "There it is!\p"
 	.string "If my POKéMON pulls a smart move next,\n"
 	.string "the audience's excitement will peak!$"
 
-LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD
+LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife: @ 821BBDD
 	.string "Oh, dear, no!\p"
 	.string "My darling ZUBAT's LEECH LIFE is so\n"
 	.string "cute I kept using it over and over!\p"
 	.string "But these mean people don't appreciate\n"
 	.string "it at all!$"
 
-LilycoveCity_ContestHall_Text_21BC65: @ 821BC65
+LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa: @ 821BC65
 	.string "Kiyaaah! You're beautiful, Grandpa!$"
 
-LilycoveCity_ContestHall_Text_21BC89: @ 821BC89
+LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves: @ 821BC89
 	.string "Even when TRAINERS enter the same\n"
 	.string "kind of POKéMON, they all seem to use\l"
 	.string "different moves for appeals.\p"
 	.string "It's just like the way people have\n"
 	.string "different styles for battling.$"
 
-LilycoveCity_ContestHall_Text_21BD30: @ 821BD30
+LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers: @ 821BD30
 	.string "I think the POKéMON look smarter\n"
 	.string "than their TRAINERS. By a lot.$"
 
-LilycoveCity_ContestHall_Text_21BD70: @ 821BD70
+LilycoveCity_ContestHall_Text_StillLoveSmartnessContests: @ 821BD70
 	.string "When all's said and done, I still love\n"
 	.string "SMARTNESS CONTESTS.\p"
 	.string "That intellectual green color…\n"
 	.string "It's so… So… Cool.$"
 
-LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD
+LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest: @ 821BDDD
 	.string "MC: Are you entering the BEAUTY\n"
 	.string "CONTEST, too? Good luck!$"
 
-LilycoveCity_ContestHall_Text_21BE16: @ 821BE16
+LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty: @ 821BE16
 	.string "JUDGE: Ah, every POKéMON here is\n"
 	.string "a model of pristine beauty!\p"
 	.string "Why, I almost forgot to score them!$"
 
-LilycoveCity_ContestHall_Text_21BE77: @ 821BE77
+LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty: @ 821BE77
 	.string "A POKéMON this beautiful…\n"
 	.string "There isn't another one like it.\p"
 	.string "Everyone's eyes will be glued to\n"
 	.string "my beauty.$"
 
-LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
+LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE
 	.string "Waaaah!\p"
 	.string "I brushed and groomed my POKéMON\n"
 	.string "carefully for this CONTEST…\p"
@@ -414,96 +414,96 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
 	.string "My POKéMON's coat turned all scraggly…\p"
 	.string "What should I do?$"
 
-LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E
+LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam: @ 821BF6E
 	.string "This AURORA BEAM is so dazzling,\n"
 	.string "the JUDGE won't be able to see it.\p"
 	.string "Uh, wait a second…\n"
 	.string "That'll be meaningless, then!$"
 
-LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3
+LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe: @ 821BFE3
 	.string "This pretty POKéMON looks just like\n"
 	.string "me when I was younger.\p"
 	.string "Right when I said that, my husband\n"
 	.string "spewed the coffee he was drinking.\p"
 	.string "Did I say something funny?$"
 
-LilycoveCity_ContestHall_Text_21C07F: @ 821C07F
+LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy: @ 821C07F
 	.string "You know, if I win at a BEAUTY\n"
 	.string "CONTEST, sure it makes me\l"
 	.string "happy. More than usual, anyway.$"
 
-LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8
+LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon: @ 821C0D8
 	.string "Wahahahah!\p"
 	.string "Will you take a gander at all those\n"
 	.string "pretty POKéMON!\l"
 	.string "I just love this sort of glitz!$"
 
-LilycoveCity_ContestHall_Text_21C137: @ 821C137
+LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone: @ 821C137
 	.string "You can't always win on just beauty\n"
 	.string "alone.\p"
 	.string "You have to groom your POKéMON so\n"
 	.string "it's nice and glossy like mine.$"
 
-LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4
+LilycoveCity_ContestHall_Text_InTheMiddleOfContest: @ 821C1A4
 	.string "MC: Uh-oh! Hello!\n"
 	.string "We're in the middle of a CONTEST!\p"
 	.string "Please enter at our registration\n"
 	.string "counter and come out, okay?$"
 
-LilycoveCity_ContestHall_Text_21C215: @ 821C215
+LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals: @ 821C215
 	.string "JUDGE: Oh, such charming and cute\n"
 	.string "appeals!\p"
 	.string "Oh, my goodness! What a perfectly\n"
 	.string "adorable WATER SPORT appeal!$"
 
-LilycoveCity_ContestHall_Text_21C27F: @ 821C27F
+LilycoveCity_ContestHall_Text_MyAzurillWasDistracted: @ 821C27F
 	.string "Oh, no… My sweet AZURILL was\n"
 	.string "distracted by another POKéMON.$"
 
-LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB
+LilycoveCity_ContestHall_Text_NeverWonBattleButContest: @ 821C2BB
 	.string "My POKéMON has never won in a battle,\n"
 	.string "but put it in a CONTEST and look out!$"
 
-LilycoveCity_ContestHall_Text_21C307: @ 821C307
+LilycoveCity_ContestHall_Text_PetalDanceIsMarvel: @ 821C307
 	.string "My POKéMON's PETAL DANCE is a marvel\n"
 	.string "of elegance.\p"
 	.string "I won't let anyone disturb its\n"
 	.string "performance.$"
 
-LilycoveCity_ContestHall_Text_21C365: @ 821C365
+LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter: @ 821C365
 	.string "Everyone's POKéMON are very cute.\p"
 	.string "However, if my POKéMON were to make\n"
 	.string "a cute appeal…\p"
 	.string "I'm sure that it would be so much \n"
 	.string "cuter than the others.$"
 
-LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4
+LilycoveCity_ContestHall_Text_MyChildIsInContest: @ 821C3F4
 	.string "My child is in this CONTEST.$"
 
-LilycoveCity_ContestHall_Text_21C411: @ 821C411
+LilycoveCity_ContestHall_Text_ComeOnDear: @ 821C411
 	.string "Come on, dear. Go for it!\n"
 	.string "Your POKéMON is the best!$"
 
-LilycoveCity_ContestHall_Text_21C445: @ 821C445
+LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest: @ 821C445
 	.string "I think that girl over there is\n"
 	.string "the cutest of the lot.\p"
 	.string "What's that? They're judging\n"
 	.string "POKéMON by their looks?$"
 
-LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1
+LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn: @ 821C4B1
 	.string "Ohh, seeing all these cute POKéMON,\n"
 	.string "they make we want to get my own!\p"
 	.string "I'm going to go catch some!$"
 
-LilycoveCity_ContestHall_Text_21C512: @ 821C512
+LilycoveCity_ContestHall_Text_BeautyContestStage: @ 821C512
 	.string "BEAUTY CONTEST STAGE\n"
 	.string "BE ALLURED BY BEAUTIFUL POKéMON!$"
 
-LilycoveCity_ContestHall_Text_21C548: @ 821C548
+LilycoveCity_ContestHall_Text_CuteContestStage: @ 821C548
 	.string "CUTENESS CONTEST STAGE\n"
 	.string "BE CHARMED BY CUTE POKéMON!$"
 
-LilycoveCity_ContestHall_Text_21C57B: @ 821C57B
+LilycoveCity_ContestHall_Text_SmartContestStage: @ 821C57B
 	.string "SMARTNESS CONTEST STAGE\n"
 	.string "BE IMPRESSED BY SMART POKéMON!$"
 
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
index 3cbb48f21..744ed4174 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.json
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A554",
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestReceptionist",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A806",
+      "script": "LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FA2",
+      "script": "BerryBlender_EventScript_Blender2Man",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A708",
+      "script": "LilycoveCity_ContestLobby_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A711",
+      "script": "LilycoveCity_ContestLobby_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A71A",
+      "script": "LilycoveCity_ContestLobby_EventScript_Artist",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_28CA59",
+      "script": "LilycoveCity_ContestLobby_EventScript_Reporter",
       "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A768",
+      "script": "LilycoveCity_ContestLobby_EventScript_Blender3Boy",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FB4",
+      "script": "BerryBlender_EventScript_Blender2Twin",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A72C",
+      "script": "LilycoveCity_ContestLobby_EventScript_Fisherman",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A723",
+      "script": "LilycoveCity_ContestLobby_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A735",
+      "script": "LilycoveCity_ContestLobby_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FAB",
+      "script": "BerryBlender_EventScript_Blender3PokefanF",
       "flag": "0"
     },
     {
@@ -219,8 +219,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FBD",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT"
+      "script": "BerryBlender_EventScript_Blender1ExpertM",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
@@ -232,7 +232,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A771",
+      "script": "LilycoveCity_ContestLobby_EventScript_Blender3Girl",
       "flag": "0"
     },
     {
@@ -245,8 +245,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7B3",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_CAMPER",
@@ -258,8 +258,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7BE",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -271,8 +271,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7C9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2",
@@ -284,8 +284,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7D9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
@@ -297,8 +297,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7E9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
@@ -310,8 +310,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7A8",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
@@ -323,8 +323,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A798",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMaster",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -336,7 +336,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21ACF1",
+      "script": "LilycoveCity_ContestLobby_EventScript_LittleGirl",
       "flag": "0"
     }
   ],
@@ -378,7 +378,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EventScript_PblockLink"
+      "script": "BerryBlender_EventScript_BerryBlenderLink"
     },
     {
       "type": "sign",
@@ -386,7 +386,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_293E1E"
+      "script": "BerryBlender_EventScript_BerryBlender3"
     },
     {
       "type": "sign",
@@ -394,7 +394,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A753"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner4"
     },
     {
       "type": "sign",
@@ -402,7 +402,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A75A"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner5"
     },
     {
       "type": "sign",
@@ -410,7 +410,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A761"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner6"
     },
     {
       "type": "sign",
@@ -418,7 +418,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A77A"
+      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords"
     },
     {
       "type": "sign",
@@ -426,7 +426,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A73E"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner1"
     },
     {
       "type": "sign",
@@ -434,7 +434,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A745"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner2"
     },
     {
       "type": "sign",
@@ -442,7 +442,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A74C"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner3"
     },
     {
       "type": "sign",
@@ -450,7 +450,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EventScript_Pblock1_Ask"
+      "script": "BerryBlender_EventScript_BerryBlender1"
     },
     {
       "type": "sign",
@@ -458,7 +458,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_293D4D"
+      "script": "BerryBlender_EventScript_BerryBlender2"
     },
     {
       "type": "sign",
@@ -466,7 +466,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A784"
+      "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 3b470b8a6..ecd8e2b95 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -1,164 +1,166 @@
 LilycoveCity_ContestLobby_MapScripts:: @ 821A211
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_OnFrame
 	.byte 0
 
+@ Some scripts for this room are split into data/scripts/contest_hall and data/scripts/berry_blender
+
 LilycoveCity_ContestLobby_OnTransition: @ 821A21C
-	call LilycoveCity_ContestLobby_EventScript_28CB2B
-	call LilycoveCity_ContestLobby_EventScript_21A227
+	call LilycoveCity_ContestLobby_EventScript_TryShowContestReporter
+	call LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
+LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster:: @ 821A227
 	getpricereduction POKENEWS_BLENDMASTER
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
-	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ShowBlendMaster
+	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
-	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+LilycoveCity_ContestLobby_EventScript_ShowBlendMaster:: @ 821A23C
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
+	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427
+LilycoveCity_ContestLobby_OnFrame: @ 821A243
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_TryDoContestArtist
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist
 	.2byte 0
 
-LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264
+LilycoveCity_ContestLobby_EventScript_TryDoContestArtist:: @ 821A255
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_ContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
+LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
 	lockall
 	addobject 4
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A407
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer
 	waitmovement 4
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A418
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen 1
-	drawcontestwinner 0
+	showcontestwinner 0
 	lockall
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4
+	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: @ 821A2AA
+	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
-	special sub_80F88DC
+	special SaveMuseumContestPainting
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21A314
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit
 	waitmovement 0
 	removeobject 4
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons
+	call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: @ 821A2E4
+	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum
+	msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit
 	waitmovement 0
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
+LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80F8390
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
+	special BufferContestWinnerMonName
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit
 	waitmovement 0
 	playse SE_PIN
 	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
+LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3AA
-	case 4, LilycoveCity_ContestLobby_EventScript_21A3AE
-	case 5, LilycoveCity_ContestLobby_EventScript_21A3B2
+	case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1
+	case 2, LilycoveCity_ContestLobby_EventScript_ShowPatron2
+	case 3, LilycoveCity_ContestLobby_EventScript_ShowPatron3
+	case 4, LilycoveCity_ContestLobby_EventScript_ShowPatron4
+	case 5, LilycoveCity_ContestLobby_EventScript_ShowTourists
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
+LilycoveCity_ContestLobby_EventScript_ShowPatron1:: @ 821A3A2
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
+LilycoveCity_ContestLobby_EventScript_ShowPatron2:: @ 821A3A6
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
+LilycoveCity_ContestLobby_EventScript_ShowPatron3:: @ 821A3AA
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
+LilycoveCity_ContestLobby_EventScript_ShowPatron4:: @ 821A3AE
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
+LilycoveCity_ContestLobby_EventScript_ShowTourists:: @ 821A3B2
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
+LilycoveCity_ContestLobby_EventScript_SetPaintingFlag:: @ 821A3B6
 	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A3F3
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3F7
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3FB
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3FF
-	case 4, LilycoveCity_ContestLobby_EventScript_21A403
+	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_MadeCoolPainting
+	case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting
+	case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_MadeCutePainting
+	case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_MadeSmartPainting
+	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_MadeToughPainting
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
+LilycoveCity_ContestLobby_EventScript_MadeCoolPainting:: @ 821A3F3
 	setflag FLAG_COOL_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
+LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting:: @ 821A3F7
 	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
+LilycoveCity_ContestLobby_EventScript_MadeCutePainting:: @ 821A3FB
 	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
+LilycoveCity_ContestLobby_EventScript_MadeSmartPainting:: @ 821A3FF
 	setflag FLAG_SMART_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
+LilycoveCity_ContestLobby_EventScript_MadeToughPainting:: @ 821A403
 	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
+LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer: @ 821A407
 	walk_down
 	walk_down
 	walk_down
@@ -168,7 +170,7 @@ LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
+LilycoveCity_ContestLobby_Movement_ArtistExit: @ 821A40F
 	walk_down
 	walk_down
 	walk_down
@@ -179,17 +181,17 @@ LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
+LilycoveCity_ContestLobby_Movement_PlayerFaceArtist: @ 821A418
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
+LilycoveCity_ContestLobby_Movement_ArtistBeginToExit: @ 821A41A
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
+LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer: @ 821A41E
 	delay_16
 	delay_16
 	delay_16
@@ -200,79 +202,79 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436
+LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist:: @ 821A427
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_LinkContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
+LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
 	lockall
 	addobject 11
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A533
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer
 	waitmovement 11
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A545
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen 1
-	drawcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4
+	showcontestwinner 0
+	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: @ 821A47A
+	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
-	special sub_80F88DC
+	special SaveMuseumContestPainting
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit
 	waitmovement 0
 	removeobject 11
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons
+	call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A
-	msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: @ 821A4B4
+	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
+	msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit
 	waitmovement 0
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 11
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
+LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
-	special sub_80F8390
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
+	special BufferContestWinnerMonName
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit
 	waitmovement 0
 	playse SE_PIN
 	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
+LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer: @ 821A533
 	walk_down
 	walk_down
 	walk_down
@@ -283,7 +285,7 @@ LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
+LilycoveCity_ContestLobby_Movement_LinkArtistExit: @ 821A53C
 	walk_down
 	walk_down
 	walk_down
@@ -294,17 +296,17 @@ LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
+LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist: @ 821A545
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
+LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit: @ 821A547
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
+LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer: @ 821A54B
 	delay_16
 	delay_16
 	delay_16
@@ -315,122 +317,124 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
-	special sub_80F9154
-	specialvar VAR_RESULT, sub_80F8D24
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A5CF
-	call LilycoveCity_ContestLobby_EventScript_279CC5
-	call LilycoveCity_ContestLobby_EventScript_21A670
+@ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted
+LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
+	special ClearLinkContestFlags
+	specialvar VAR_RESULT, IsContestDebugActive  @ Always FALSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetDebug
+	call LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist
+	call LilycoveCity_ContestLobby_EventScript_LeadToContestHall
 	special SetContestTrainerGfxIds
-	call LilycoveCity_ContestLobby_EventScript_23BEB6
-	call LilycoveCity_ContestLobby_EventScript_21A585
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
+	call LilycoveCity_ContestLobby_EventScript_SetPlayerGfx
+	call LilycoveCity_ContestLobby_EventScript_SetContestType
+	call LilycoveCity_ContestLobby_EventScript_WarpToContestHall
 	waitstate
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
+LilycoveCity_ContestLobby_EventScript_SetContestType:: @ 821A585
 	switch VAR_CONTEST_RANK
-	case 0, LilycoveCity_ContestLobby_EventScript_21A5B7
-	case 1, LilycoveCity_ContestLobby_EventScript_21A5BD
-	case 2, LilycoveCity_ContestLobby_EventScript_21A5C3
-	case 3, LilycoveCity_ContestLobby_EventScript_21A5C9
+	case CONTEST_RANK_NORMAL, LilycoveCity_ContestLobby_EventScript_SetNormalContestType
+	case CONTEST_RANK_SUPER, LilycoveCity_ContestLobby_EventScript_SetSuperContestType
+	case CONTEST_RANK_HYPER, LilycoveCity_ContestLobby_EventScript_SetHyperContestType
+	case CONTEST_RANK_MASTER, LilycoveCity_ContestLobby_EventScript_SetMasterContestType
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
-	setvar VAR_CONTEST_LOCATION, 1
+LilycoveCity_ContestLobby_EventScript_SetNormalContestType:: @ 821A5B7
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
-	setvar VAR_CONTEST_LOCATION, 2
+LilycoveCity_ContestLobby_EventScript_SetSuperContestType:: @ 821A5BD
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
-	setvar VAR_CONTEST_LOCATION, 3
+LilycoveCity_ContestLobby_EventScript_SetHyperContestType:: @ 821A5C3
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
-	setvar VAR_CONTEST_LOCATION, 4
+LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
+@ Functionally unused
+LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 	giveitem ITEM_CONTEST_PASS, 1
 	setvar VAR_0x800B, 8
-	setvar VAR_CONTEST_RANK, 3
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	setflag FLAG_SYS_RIBBON_GET
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
-	setflag FLAG_ENTERED_LINK_CONTEST
+LilycoveCity_ContestLobby_EventScript_WarpToContestHall:: @ 821A5EF
+	setflag FLAG_ENTERED_CONTEST
 	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A62F
-	case 1, LilycoveCity_ContestLobby_EventScript_21A63C
-	case 2, LilycoveCity_ContestLobby_EventScript_21A649
-	case 3, LilycoveCity_ContestLobby_EventScript_21A656
-	case 4, LilycoveCity_ContestLobby_EventScript_21A663
+	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall
+	case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall
+	case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall
+	case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall
+	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F
-	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall:: @ 821A62F
+	setwarp MAP_CONTEST_HALL_COOL, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C
-	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall:: @ 821A63C
+	setwarp MAP_CONTEST_HALL_BEAUTY, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649
-	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall:: @ 821A649
+	setwarp MAP_CONTEST_HALL_CUTE, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656
-	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall:: @ 821A656
+	setwarp MAP_CONTEST_HALL_SMART, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663
-	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall:: @ 821A663
+	setwarp MAP_CONTEST_HALL_TOUGH, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
+LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
 	lockall
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 12, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6F2
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6E8
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall
 	waitmovement 0
 	releaseall
 	return
 
-LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
+LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall: @ 821A6E8
 	walk_left
 	walk_left
 	walk_left
@@ -442,24 +446,24 @@ LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
+LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist: @ 821A6F2
 	walk_in_place_fastest_left
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
+LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter: @ 821A6F5
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
+LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter: @ 821A6F9
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
+LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: @ 821A6FD
 	walk_left
 	walk_left
 	walk_left
@@ -470,85 +474,85 @@ LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
+LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer: @ 821A706
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708
-	msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708
+	msgbox LilycoveCity_ContestLobby_Text_MasterRankHereICome, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711
-	msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711
+	msgbox LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A
-	msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A
+	msgbox LilycoveCity_ContestLobby_Text_ContestFeastForEyes, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723
-	msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723
+	msgbox LilycoveCity_ContestLobby_Text_ToughContestIsExtreme, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C
-	msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C
+	msgbox LilycoveCity_ContestLobby_Text_LavishedCareOnMon, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735
-	msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
+	msgbox LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E
+LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
 	lockall
 	fadescreen 1
-	drawcontestwinner 1
+	showcontestwinner 1
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745
+LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
 	lockall
 	fadescreen 1
-	drawcontestwinner 2
+	showcontestwinner 2
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C
+LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
 	lockall
 	fadescreen 1
-	drawcontestwinner 3
+	showcontestwinner 3
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753
+LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
 	lockall
 	fadescreen 1
-	drawcontestwinner 4
+	showcontestwinner 4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A
+LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
 	lockall
 	fadescreen 1
-	drawcontestwinner 5
+	showcontestwinner 5
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761
+LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
 	lockall
 	fadescreen 1
-	drawcontestwinner 6
+	showcontestwinner 6
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768
-	msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768
+	msgbox BerryBlender_Text_LetsGetBlendingAlready, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771
-	msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771
+	msgbox BerryBlender_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
+LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbuttonpress
@@ -556,9 +560,9 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
+LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
 	lockall
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 7
 	special CallFrontierUtilFunc
 	waitbuttonpress
@@ -566,397 +570,397 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798
+LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhoaAwesome, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WickedlyFast, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhatAnExpert, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_MadeAmazingPokeblocksWithMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_QualitiesOfBlendMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_MasterWorksOnSkillsInMountains, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
+LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
-	special sub_80F9154
+LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
+	special ClearLinkContestFlags
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A819
+	msgbox LilycoveCity_ContestLobby_Text_LinkContestReception, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819
-	message LilycoveCity_ContestLobby_Text_27C0F6
+LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819
+	message LilycoveCity_ContestLobby_Text_EnterContest3
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A856
-	case 1, LilycoveCity_ContestLobby_EventScript_21A90D
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_LinkContestInfo
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
-	msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856
+	msgbox LilycoveCity_ContestLobby_Text_ProgressWillBeSaved, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27C8FD
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	message LilycoveCity_ContestLobby_Text_WhichContestMode
 	waitmessage
 	specialvar VAR_TEMP_D, IsWirelessAdapterConnected
 	multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A8BB
-	case 1, LilycoveCity_ContestLobby_EventScript_21A8C6
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_EmeraldMode  @ Shortened to E-Mode
+	case 1, LilycoveCity_ContestLobby_EventScript_GlobalMode   @ Shortened to G-Mode
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB
+LilycoveCity_ContestLobby_EventScript_EmeraldMode:: @ 821A8BB
 	setvar VAR_TEMP_C, 0
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6
+LilycoveCity_ContestLobby_EventScript_GlobalMode:: @ 821A8C6
 	setvar VAR_TEMP_C, 1
 	compare VAR_TEMP_D, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAFC
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
-	message LilycoveCity_ContestLobby_Text_27C119
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
+	message LilycoveCity_ContestLobby_Text_EnterWhichContest3
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, 0
 	switch VAR_RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case CONTEST_CATEGORIES_COUNT, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D
-	message LilycoveCity_ContestLobby_Text_27C0DA
+LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D
+	message LilycoveCity_ContestLobby_Text_WhichTopic2
 	waitmessage
 	multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A955
-	case 1, LilycoveCity_ContestLobby_EventScript_21A963
-	case 2, LilycoveCity_ContestLobby_EventScript_21A971
-	case 3, LilycoveCity_ContestLobby_EventScript_21A819
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A819
+	case 0, LilycoveCity_ContestLobby_EventScript_ExplainLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_ExplainEMode
+	case 2, LilycoveCity_ContestLobby_EventScript_ExplainGMode
+	case 3, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955
-	msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainLinkContest:: @ 821A955
+	msgbox LilycoveCity_ContestLobby_Text_ExplainLinkContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963
-	msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainEMode:: @ 821A963
+	msgbox LilycoveCity_ContestLobby_Text_ExplainEMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
-	msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainGMode:: @ 821A971
+	msgbox LilycoveCity_ContestLobby_Text_ExplainGMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkContest:: @ 821A97F
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C
-	msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon:: @ 821A98C
+	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon3, MSGBOX_DEFAULT
 	setvar VAR_CONTEST_RANK, 0
 	choosecontestmon
 	compare VAR_0x8004, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	special sub_80F7F30
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9E0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9EE
-	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9FC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	special TryEnterContestMon
+	compare VAR_RESULT, CANT_ENTER_CONTEST
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank
+	compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest
+	compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest
+	compare VAR_RESULT, CANT_ENTER_CONTEST_EGG
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg
+	compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0
-	msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank:: @ 821A9E0
+	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE
-	msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg:: @ 821A9EE
+	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart2, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC
-	msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted:: @ 821A9FC
+	msgbox LilycoveCity_ContestLobby_Text_MonInNoCondition2, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A
+LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest:: @ 821AA0A
 	copyvar VAR_0x8008, VAR_0x8004
-	goto LilycoveCity_ContestLobby_EventScript_21AA15
+	goto LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15
+LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15
 	compare VAR_TEMP_D, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AB4B
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupType
 	compare VAR_TEMP_D, 2
-	goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27BF85
+	goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	message LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel
 	waitmessage
 	copyvar VAR_0x8004, VAR_RESULT
 	compare VAR_TEMP_C, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB
+	call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkEMode
 	compare VAR_TEMP_C, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0
+	call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkGMode
 	compare VAR_TEMP_C, 2
-	goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F
+	goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices
 	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	compare VAR_RESULT, 6
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAEF
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkError
 	compare VAR_RESULT, 10
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAE1
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference
+	message3 LilycoveCity_ContestLobby_Text_Transmitting
 	contestlinktransfer
 	switch VAR_0x8004
-	case 0, LilycoveCity_ContestLobby_EventScript_21AB17
-	case 1, LilycoveCity_ContestLobby_EventScript_21AAC5
-	case 2, LilycoveCity_ContestLobby_EventScript_21AB09
+	case 0, LilycoveCity_ContestLobby_EventScript_StartLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB
-	special sub_80B3028
+LilycoveCity_ContestLobby_EventScript_TryLinkEMode:: @ 821AABB
+	special TryContestEModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0
-	special sub_80B3000
+LilycoveCity_ContestLobby_EventScript_TryLinkGMode:: @ 821AAC0
+	special TryContestGModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5
-	msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest:: @ 821AAC5
+	msgbox LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3
-	msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices:: @ 821AAD3
+	msgbox LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
-	msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference:: @ 821AAE1
+	msgbox LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
+LilycoveCity_ContestLobby_EventScript_CancelLinkError:: @ 821AAEF
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
+LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode:: @ 821AAFC
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09
-	msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError:: @ 821AB09
+	msgbox LilycoveCity_ContestLobby_Text_TransmissionError, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
-	special sub_80F84B0
+LilycoveCity_ContestLobby_EventScript_StartLinkContest:: @ 821AB17
+	special GetContestPlayerId
 	addvar VAR_0x8004, 1
 	buffernumberstring 1, VAR_0x8004
-	messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8
+	messageautoscroll LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX
 	waitmessage
 	subvar VAR_0x8004, 1
-	call LilycoveCity_ContestLobby_EventScript_21AC49
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
-	special sub_80F8AFC
-	setvar VAR_CONTEST_LOCATION, 5
-	setvar VAR_CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B
-	compare VAR_CONTEST_CATEGORY, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88
-	compare VAR_CONTEST_CATEGORY, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E
-	compare VAR_CONTEST_CATEGORY, 2
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94
-	compare VAR_CONTEST_CATEGORY, 3
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A
-	compare VAR_CONTEST_CATEGORY, 4
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0
-	goto LilycoveCity_ContestLobby_EventScript_21ABA6
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88
-	setvar VAR_0x8004, 15
+	call LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall
+	setvar VAR_CONTEST_HALL_STATE, 1
+	special SetLinkContestPlayerGfx
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	call LilycoveCity_ContestLobby_EventScript_WarpToContestHall
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupType:: @ 821AB4B
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_COOL
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_BEAUTY
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_CUTE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_SMART
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_TOUGH
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest
+	goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest:: @ 821AB88
+	setvar VAR_0x8004, LINK_GROUP_COOL_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E
-	setvar VAR_0x8004, 16
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest:: @ 821AB8E
+	setvar VAR_0x8004, LINK_GROUP_BEAUTY_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94
-	setvar VAR_0x8004, 17
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest:: @ 821AB94
+	setvar VAR_0x8004, LINK_GROUP_CUTE_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A
-	setvar VAR_0x8004, 18
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest:: @ 821AB9A
+	setvar VAR_0x8004, LINK_GROUP_SMART_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
-	setvar VAR_0x8004, 19
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest:: @ 821ABA0
+	setvar VAR_0x8004, LINK_GROUP_TOUGH_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
-	message Text_DecideLinkLeader
+LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6
+	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21AC0B
-	case 1, LilycoveCity_ContestLobby_EventScript_21ABE3
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup
+	case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3
-	call LilycoveCity_ContestLobby_EventScript_21AC33
+LilycoveCity_ContestLobby_EventScript_TryLeadGroup:: @ 821ABE3
+	call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABE3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
-	call LilycoveCity_ContestLobby_EventScript_21AC38
+LilycoveCity_ContestLobby_EventScript_TryJoinGroup:: @ 821AC0B
+	call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC0B
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
+LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader:: @ 821AC33
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
+LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup:: @ 821AC38
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
+LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided:: @ 821AC3D
+	message3 LilycoveCity_ContestLobby_Text_Transmitting
 	contestlinktransfer
-	goto LilycoveCity_ContestLobby_EventScript_21AB17
+	goto LilycoveCity_ContestLobby_EventScript_StartLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
-	messageautoscroll LilycoveCity_ContestLobby_Text_27C043
+LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
+	messageautoscroll LilycoveCity_ContestLobby_Text_ContestBeginShortly
 	waitmessage
 	delay 20
 	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 17, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACDB
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist
 	waitmovement 0
-	messageautoscroll LilycoveCity_ContestLobby_Text_27B653
+	messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere
 	waitmessage
 	delay 20
 	closemessage
-	call LilycoveCity_ContestLobby_EventScript_27AD92
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACD0
+	call LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall
 	waitmovement 0
 	release
 	return
 
-LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
+LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall: @ 821ACD0
 	walk_right
 	walk_right
 	walk_right
@@ -969,23 +973,23 @@ LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
+LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist: @ 821ACDB
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
+LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter: @ 821ACDD
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
+LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter: @ 821ACE1
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
+LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: @ 821ACE5
 	walk_right
 	walk_right
 	walk_right
@@ -997,34 +1001,34 @@ LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
+LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer: @ 821ACEF
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
+LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase
+	msgbox LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase:: @ 821AD06
+	msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10
+LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase: @ 821AD10
 	.string "Yippee!\p"
 	.string "The lady at the reception counter\n"
 	.string "gave me a case for {POKEBLOCK}S!$"
 
-LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55
+LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries: @ 821AD55
 	.string "Make {POKEBLOCK}S and put them in there.\p"
 	.string "When you make a {POKEBLOCK}, everyone\n"
 	.string "has to put in a different BERRY.$"
 
-LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
+LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint: @ 821ADB9
 	.string "Congratulations!\p"
 	.string "I did a painting of your POKéMON to\n"
 	.string "commemorate its victory…\p"
@@ -1033,7 +1037,7 @@ LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
 	.string "painting better than I usually do.\l"
 	.string "Look, see?$"
 
-LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
+LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum: @ 821AE78
 	.string "What do you think? I'm confident in\n"
 	.string "what I've done, but do you like it?\p"
 	.string "A work of this caliber, it wouldn't look\n"
@@ -1042,7 +1046,7 @@ LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
 	.string "for paintings?\p"
 	.string "Do you think I should take this there?$"
 
-LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
+LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum: @ 821AF63
 	.string "What, really? Then, sure, I will take\n"
 	.string "this painting there right now.\p"
 	.string "I'll give it a proper title, too.\p"
@@ -1051,34 +1055,34 @@ LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
 	.string "Please check if they did accept this.\n"
 	.string "Thank you!$"
 
-LilycoveCity_ContestLobby_Text_21B030: @ 821B030
+LilycoveCity_ContestLobby_Text_TakeMementoOfPainting: @ 821B030
 	.string "Oh, that's right!\p"
 	.string "As a memento of me painting your\n"
 	.string "POKéMON, please take this.$"
 
-LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E
+LilycoveCity_ContestLobby_Text_ReceivedARibbon: @ 821B07E
 	.string "{PLAYER} received a RIBBON.$"
 
-LilycoveCity_ContestLobby_Text_21B094: @ 821B094
+LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon: @ 821B094
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD
+LilycoveCity_ContestLobby_Text_OkaySeeYou: @ 821B0AD
 	.string "Okay, see you!$"
 
-LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC
+LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum: @ 821B0BC
 	.string "Oh… Then, I guess I'll just take\n"
 	.string "this home with me…\p"
 	.string "But, you know, I would like to take\n"
 	.string "this to the art museum… Okay?$"
 
-LilycoveCity_ContestLobby_Text_21B132: @ 821B132
+LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs: @ 821B132
 	.string "Oh, fine, that's the way it is.\n"
 	.string "I will hang this in my own house.\p"
 	.string "I'll just have to try harder next time.\n"
 	.string "Well, be seeing you.$"
 
-LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
+LilycoveCity_ContestLobby_Text_MasterRankHereICome: @ 821B1B1
 	.string "Hoo, boy… Master Rank CONTESTS,\n"
 	.string "here I come.\p"
 	.string "The world will know that my dearest\n"
@@ -1086,31 +1090,31 @@ LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
 	.string "existence. The time has come!\l"
 	.string "Uheheheh.$"
 
-LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D
+LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere: @ 821B24D
 	.string "You can see a whole variety of\n"
 	.string "POKéMON here.\p"
 	.string "That's why I make this place a regular\n"
 	.string "part of my daily stroll.$"
 
-LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA
+LilycoveCity_ContestLobby_Text_ContestFeastForEyes: @ 821B2BA
 	.string "Wow, coming out to a CONTEST is\n"
 	.string "a feast for these eyes!\p"
 	.string "Would you look at all the POKéMON\n"
 	.string "that just scream to be painted?$"
 
-LilycoveCity_ContestLobby_Text_21B334: @ 821B334
+LilycoveCity_ContestLobby_Text_ToughContestIsExtreme: @ 821B334
 	.string "The TOUGHNESS CONTEST is like\n"
 	.string "extreme, man!\p"
 	.string "Those muscular appeals…\n"
 	.string "Cascading sweat… I swoon!$"
 
-LilycoveCity_ContestLobby_Text_21B392: @ 821B392
+LilycoveCity_ContestLobby_Text_LavishedCareOnMon: @ 821B392
 	.string "Day in and day out, I lavished my care\n"
 	.string "on this POKéMON.\p"
 	.string "Its condition is peaking.\n"
 	.string "Today, victory is mine!$"
 
-LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC
+LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily: @ 821B3FC
 	.string "I made {POKEBLOCK}S with Mom, Dad, and\n"
 	.string "Big Sister. They turned out great!\p"
 	.string "I bet you can make smoother, better\n"
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
index 8f251039c..c447bb41d 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189",
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211"
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV"
     }
   ],
   "bg_events": []
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index d4e630e4a..3f97cc597 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -1,43 +1,43 @@
 LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
+LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 8218189
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 82181C3
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 82181EA
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
+LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211
 	lockall
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -46,34 +46,34 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_218259
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer
 	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259
+LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV: @ 8218259
 	face_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer: @ 821825E
 	walk_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn: @ 8218260
 	face_down
 	walk_down
 	face_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
+LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot: @ 8218264
 	.string "Hm, so they doubled the guests by\n"
 	.string "using POKéMON as attractions?\p"
 	.string "Hm, well, maybe I should make a cute\n"
@@ -81,17 +81,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
 	.string "I wonder if that will attract more\n"
 	.string "guests to stay with us?$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E
+LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua: @ 821831E
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "Since that TEAM AQUA came to town,\n"
 	.string "the tourists have been staying away.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B
+LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV: @ 821839B
 	.string "Hey, down in front!\n"
 	.string "I can't see the TV!$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
+LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem: @ 82183C3
 	.string "Amazing! You're telling me a POKéMON\n"
 	.string "found someone's lost item?\p"
 	.string "That's something. If we had some smart\n"
@@ -99,7 +99,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
 	.string "We could recover anything that our\n"
 	.string "guests mislaid…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
+LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted: @ 8218470
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "I heard that someone busted\n"
@@ -109,7 +109,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
 	.string "It was a company called… Uh…\n"
 	.string "GAME something…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
+LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar: @ 8218544
 	.string "Amazing! A house-sitting POKéMON\n"
 	.string "caught a burglar?\p"
 	.string "That's something. If we had a tough\n"
@@ -117,7 +117,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
 	.string "We would be able to provide our guests\n"
 	.string "with greater safety.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4
+LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner: @ 82185F4
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV.\p"
 	.string "Oh, yes. A big group of guests arrived\n"
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
index 0bd551815..17c93e5a1 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT"
     }
   ],
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index fd6aa34bd..7878e791a 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 82186D3
 	lock
 	faceplayer
-	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
-	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
+	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex
+	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	specialvar VAR_RESULT, HasAllHoennMons
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
+LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702
 	setflag FLAG_TEMP_2
 	playfanfare MUS_FANFA4
 	waitfanfare
-	goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
+	goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
-	message LilycoveCity_CoveLilyMotel_2F_Text_21881C
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 821870F
+	message LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
 	special Special_ShowDiploma
@@ -32,42 +32,42 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer:: @ 8218720
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist:: @ 8218729
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan:: @ 8218732
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_Woman:: @ 821873B
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid:: @ 8218744
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
+LilycoveCity_CoveLilyMotel_2F_EventScript_Scott:: @ 821874D
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles, MSGBOX_DEFAULT
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_LILYCOVE
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott:: @ 821876A
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774
+LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex: @ 8218774
 	.string "I'm the GAME DESIGNER.\p"
 	.string "Oh, is that right?\n"
 	.string "You're working on a POKéDEX?\p"
@@ -76,7 +76,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774
 	.string "If you do complete it, please come\n"
 	.string "show me.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C
+LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis: @ 821881C
 	.string "Wow! That's awesome!\n"
 	.string "Yep, it's totally awesome!\p"
 	.string "This POKéDEX is completely filled!\n"
@@ -85,17 +85,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C
 	.string "Let me give you something in\n"
 	.string "recognition of your feat!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer: @ 82188D6
 	.string "Me? You're talking to me?\n"
 	.string "I'm the PROGRAMMER.\p"
 	.string "I wonder what the SLOTS are\n"
 	.string "like here.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist: @ 821892B
 	.string "I'm the GRAPHIC ARTIST! Aren't the\n"
 	.string "POKéMON of HOENN interesting?$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C
+LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute: @ 821896C
 	.string "The girl TUBERS, they're cute, hey?\n"
 	.string "To battle against a cute TUBER…\p"
 	.string "Whoop, it's so awesome!\p"
@@ -103,17 +103,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C
 	.string "A 2-on-2 battle with TWINS…\p"
 	.string "Whoop, it's unbearably fun!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21
+LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart: @ 8218A21
 	.string "The sea breeze tickles my heart.\n"
 	.string "It feels wonderful here!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B
+LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy: @ 8218A5B
 	.string "You never know when and where\n"
 	.string "people will challenge you.\p"
 	.string "That's why I never leave home without\n"
 	.string "my GAME BOY ADVANCE.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF
+LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles: @ 8218ACF
 	.string "SCOTT: … … … … …\n"
 	.string "… … … … … Zzz…\p"
 	.string "… … … … … Huh?!\n"
@@ -129,7 +129,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF
 	.string "like the GYMS, CONTESTS, BATTLE TENT,\l"
 	.string "the whole works!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33
+LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy: @ 8218C33
 	.string "SCOTT: I think it does take strategy\n"
 	.string "to win a CONTEST.\p"
 	.string "Devising CONTEST strategies is one way\n"
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
index 75a1fddf9..abc4e18dd 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624",
+      "script": "LilycoveCity_DepartmentStoreElevator_EventScript_Attendant",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index d7061d7e4..b7d6e4a49 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -1,11 +1,11 @@
 LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623
 	.byte 0
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
+LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624
 	lock
 	faceplayer
 	setvar VAR_0x8004, 0
-	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
+	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor
 	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
 	special ShowDeptStoreElevatorFloorSelect
 	message gText_WhichFloorWouldYouLike
@@ -13,105 +13,106 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
 	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689
+@ Below scripts ensure the cursor for floor select always starts on the current floor
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 8220689
 	multichoicedefault 0, 0, MULTI_FLOORS, 0, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 8220695
 	multichoicedefault 0, 0, MULTI_FLOORS, 1, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 82206A1
 	multichoicedefault 0, 0, MULTI_FLOORS, 2, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 82206AD
 	multichoicedefault 0, 0, MULTI_FLOORS, 3, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 82206B9
 	multichoicedefault 0, 0, MULTI_FLOORS, 4, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor:: @ 82206C5
 	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718
-	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor
+	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
+LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor:: @ 8220718
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
+LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor:: @ 8220740
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
+LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor:: @ 8220768
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
+LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor:: @ 8220790
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
+LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor:: @ 82207B8
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
+LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: @ 82207E0
 	special CloseDeptStoreElevatorWindow
 	release
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
+LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 82207E5
 	special CloseDeptStoreElevatorWindow
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -122,7 +123,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	setflag FLAG_TEMP_2
 	return
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
+LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor:: @ 82207FC
 	special SetDeptStoreFloor
 	return
 
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
index 06159b81a..44f54006c 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman",
       "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN"
     },
     {
@@ -84,7 +84,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine"
     },
     {
       "type": "sign",
@@ -92,7 +92,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 44b9b2d24..906286bc7 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -4,32 +4,32 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
 
 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
 	getpricereduction POKENEWS_LILYCOVE
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227
+LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman:: @ 8220227
 	clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B
+LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman:: @ 822022B
 	setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
+LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 822022F
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248
+	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
+LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale: @ 8220248
 	.2byte DECOR_MUD_BALL
 	.2byte DECOR_FENCE_LENGTH
 	.2byte DECOR_FENCE_WIDTH
@@ -48,189 +48,187 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
+LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 8220268
 	lock
 	faceplayer
 	getpricereduction POKENEWS_LILYCOVE
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale:: @ 8220282
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC
+LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan:: @ 822028C
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295
+LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295
 	lockall
-	message LilycoveCity_DepartmentStoreRooftop_Text_22056D
+	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
 	showmoneybox 0, 0, 0
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6
 	multichoice 16, 0, MULTI_VENDING_MACHINE, 0
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4
-	case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF
-	case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater
+	case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop
+	case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4
+LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater:: @ 82202E4
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF
+LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop:: @ 82202EF
 	setvar VAR_TEMP_0, ITEM_SODA_POP
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA
+LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade:: @ 82202FA
 	setvar VAR_TEMP_0, ITEM_LEMONADE
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater:: @ 8220305
 	checkmoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop:: @ 822030C
 	checkmoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313
 	checkmoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater:: @ 822031A
 	takemoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop:: @ 8220321
 	takemoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade:: @ 8220328
 	takemoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
+LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	compare VAR_TEMP_1, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink
 	checkitemspace VAR_TEMP_0, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	compare VAR_TEMP_1, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade
 	updatemoneybox 0, 0
 	bufferitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	random 64
+	random 64  @ 1/64 chance of an additional drink dropping
 	compare VAR_RESULT, 0
-	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	checkitemspace VAR_TEMP_0, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	random 64
+	random 64  @ 1/64 * the prev 1/64 chance of a third additional drink dropping, ~ 0.02% chance
 	compare VAR_RESULT, 0
-	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436
-	message LilycoveCity_DepartmentStoreRooftop_Text_22056D
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink:: @ 8220436
+	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink:: @ 8220442
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450
+LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E
+LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
 	hidemoneybox
-	nop
-	nop
 	releaseall
 	end
 
-LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463
+LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales: @ 8220463
 	.string "Don't they have set dates for their\n"
 	.string "clear-out sales?\p"
 	.string "I watch TV, but they never show any\n"
 	.string "commercials.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9
+LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale: @ 82204C9
 	.string "Yes! I've been waiting a long time for\n"
 	.string "this clear-out sale.\p"
 	.string "They have items that you can only get\n"
 	.string "here. I'm going to load up, that I am!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552
+LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty: @ 8220552
 	.string "Ohh… I'm bone-dry thirsty!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D
+LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike: @ 822056D
 	.string "It's a VENDING MACHINE.\n"
 	.string "Which drink would you like?$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1
+LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown: @ 82205A1
 	.string "Clang!\p"
 	.string "A can of {STR_VAR_1} dropped down.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205C2: @ 82205C2
+LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown: @ 82205C2
 	.string "Clang!\p"
 	.string "Score! An extra can of {STR_VAR_1}\n"
 	.string "dropped down!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1
+LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney: @ 82205F1
 	.string "Not enough money…$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603
+LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink: @ 8220603
 	.string "Decided against buying a drink.$"
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
index 564377f7f..0fc05dd5a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_Azumarill",
       "flag": "0"
     }
   ],
@@ -131,7 +131,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D"
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 36057b3bb..117dc6034 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -1,27 +1,27 @@
 LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692
 	.byte 0
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_Greeter:: @ 821F693
+	msgbox LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
+LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C
 	lock
 	faceplayer
 	dotimebasedevents
-	compare VAR_POKELOT_PRIZE_ITEM, 0
-	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
-	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797
+	compare VAR_POKELOT_PRIZE_ITEM, ITEM_NONE
+	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier
+	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow
+	msgbox LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain
 	setflag FLAG_DAILY_PICKED_LOTO_TICKET
-	message LilycoveCity_DepartmentStore_1F_Text_2A64C8
+	message LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket
 	waitmessage
 	special RetrieveLotteryNumber
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PC_ON
@@ -33,142 +33,142 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8004, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoMatch
 	incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY
 	compare VAR_0x8006, 0
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon
 	compare VAR_0x8006, 1
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon
 	bufferitemname 0, VAR_0x8005
 	compare VAR_0x8004, 1
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch
 	compare VAR_0x8004, 2
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch
 	compare VAR_0x8004, 3
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch
 	compare VAR_0x8004, 4
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch
 	giveitem_std VAR_0x8005
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD
-	special sub_80EE2CC
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom
+	special TryPutLotteryWinnerReportOnAir
+	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon:: @ 821F77B
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon:: @ 821F784
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow:: @ 821F78D
+	msgbox LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain:: @ 821F797
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF
+LilycoveCity_DepartmentStore_1F_EventScript_NoMatch:: @ 821F7A1
+	msgbox LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2:: @ 821F7AF
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch:: @ 821F7B9
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch:: @ 821F7C2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch:: @ 821F7CB
+	msgbox LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_FullMatch:: @ 821F7D4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD
+LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom:: @ 821F7DD
 	copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004
 	copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
+	goto LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED
+	msgbox LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT
 	giveitem_std VAR_POKELOT_PRIZE_ITEM
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE
 	copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM
-	special sub_80EE2CC
-	setvar VAR_POKELOT_PRIZE_ITEM, 0
+	special TryPutLotteryWinnerReportOnAir
+	setvar VAR_POKELOT_PRIZE_ITEM, ITEM_NONE
 	setvar VAR_POKELOT_PRIZE_PLACE, 0
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanF:: @ 821F82F
+	msgbox LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl:: @ 821F838
+	msgbox LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanM:: @ 821F841
+	msgbox LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A
+LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 821F84A
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStore_1F_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN
+LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign:: @ 821F85D
+	msgbox LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866
+LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore: @ 821F866
 	.string "Welcome to LILYCOVE DEPARTMENT STORE.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C
+LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings: @ 821F88C
 	.string "Whenever I come to the DEPARTMENT\n"
 	.string "STORE, I always end up buying all sorts\l"
 	.string "of things because it's so fun.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5
+LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture: @ 821F8F5
 	.string "Today, my mom is going to buy me some\n"
 	.string "nice furniture.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B
+LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill: @ 821F92B
 	.string "I'm buying something for my AZUMARILL\n"
 	.string "as a reward for winning a CONTEST.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974
+LilycoveCity_DepartmentStore_1F_Text_Azumarill: @ 821F974
 	.string "AZUMARILL: Maririroo!$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A
+LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign: @ 821F98A
 	.string "1F: SERVICE COUNTER\n"
 	.string "    LOTTERY CORNER\p"
 	.string "2F: TRAINER'S ZONE\p"
@@ -177,7 +177,8 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A
 	.string "5F: POKé DOLL FLOOR\p"
 	.string "ROOFTOP: ROOFTOP PLAZA$"
 
-LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13
+@ Unused
+LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun: @ 821FA13
 	.string "Wireless Communication is a\n"
 	.string "lot of fun, isn't it?\p"
 	.string "I think it lets you do things that\n"
@@ -186,7 +187,8 @@ LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13
 	.string "with people you couldn't before.\p"
 	.string "I think it's going to be exciting!$"
 
-LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5
+@ Unused
+LilycoveCity_DepartmentStore_1F_Text_SpreadWordAboutWirelessComm: @ 821FAE5
 	.string "I want to spread the word about how\n"
 	.string "fun Wireless Communication can be.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
index 3238eeee8..fd30dc516 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 33f0bff9a..9ced6b347 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C
 	.byte 0
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_Cook:: @ 821FB2D
+	msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_PokefanF:: @ 821FB36
+	msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_Sailor:: @ 821FB3F
+	msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 821FB48
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60
+	pokemart LilycoveCity_DepartmentStore_2F_Pokemart1
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
+LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
@@ -40,18 +40,18 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 821FB7A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94
+	pokemart LilycoveCity_DepartmentStore_2F_Pokemart2
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94
+LilycoveCity_DepartmentStore_2F_Pokemart2: @ 821FB94
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_HYPER_POTION
@@ -66,15 +66,15 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC
+LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly: @ 821FBAC
 	.string "Learn to use items properly.\n"
 	.string "That's basic, really.$"
 
-LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF
+LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband: @ 821FBDF
 	.string "My husband is waiting at home.\n"
 	.string "What would make a good gift for him?$"
 
-LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23
+LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems: @ 821FC23
 	.string "I'm leaving on a long journey soon.\n"
 	.string "I need to stock up on items.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
index 9ecf5104a..cf25e1798 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 23c24b681..bec38867c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
@@ -1,17 +1,17 @@
 LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64
 	.byte 0
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 821FC65
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C
+	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C
+LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: @ 821FC7C
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_IRON
@@ -22,18 +22,18 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 821FC8C
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4
+	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
+LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 821FCA4
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_SPECIAL
 	.2byte ITEM_X_ATTACK
@@ -45,31 +45,31 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM:: @ 821FCB6
+	msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_PokefanM:: @ 821FCBF
+	msgbox LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_Woman:: @ 821FCC8
+	msgbox LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1
+LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon: @ 821FCD1
 	.string "For quickly toughening up POKéMON,\n"
 	.string "items are the best.\p"
 	.string "PROTEIN boosts ATTACK,\n"
 	.string "and CALCIUM raises SP. ATK.$"
 
-LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B
+LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance: @ 821FD3B
 	.string "I want my POKéMON to have more\n"
 	.string "endurance.\p"
 	.string "I'm trying to decide whether to raise\n"
 	.string "DEFENSE with IRON, or SP. DEF with ZINC.$"
 
-LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4
+LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon: @ 821FDB4
 	.string "I gave a CARBOS to my POKéMON,\n"
 	.string "and its SPEED went up.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
index 2abccb783..a95cf6c3e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 25bc7c33c..441697a7c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
@@ -1,72 +1,72 @@
 LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA
 	.byte 0
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Gentleman:: @ 821FDEB
+	msgbox LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Woman:: @ 821FDF4
+	msgbox LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Youngster:: @ 821FDFD
+	msgbox LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 821FE06
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20
+	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20
-	.2byte ITEM_TM38
-	.2byte ITEM_TM25
-	.2byte ITEM_TM14
-	.2byte ITEM_TM15
+LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs: @ 821FE20
+	.2byte ITEM_TM38  @ Fire Blast
+	.2byte ITEM_TM25  @ Thunder
+	.2byte ITEM_TM14  @ Blizzard
+	.2byte ITEM_TM15  @ Hyper Beam
 	.2byte ITEM_NONE
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 821FE2C
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44
+	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44
-	.2byte ITEM_TM17
-	.2byte ITEM_TM20
-	.2byte ITEM_TM33
-	.2byte ITEM_TM16
+LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs: @ 821FE44
+	.2byte ITEM_TM17  @ Protect
+	.2byte ITEM_TM20  @ Safeguard
+	.2byte ITEM_TM33  @ Reflect
+	.2byte ITEM_TM16  @ Light Screen
 	.2byte ITEM_NONE
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50
+LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM: @ 821FE50
 	.string "Hmm…\p"
 	.string "An attacking move…\n"
 	.string "Or a defensive move…\p"
 	.string "It's no easy matter to decide which TM\n"
 	.string "moves should be taught to POKéMON…$"
 
-LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7
+LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs: @ 821FEC7
 	.string "There are so many different kinds of\n"
 	.string "TM moves.\p"
 	.string "A catalog I read said there are fifty\n"
 	.string "different kinds.$"
 
-LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D
+LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves: @ 821FF2D
 	.string "I'd like to get all the different TMs,\n"
 	.string "but a POKéMON learns only four moves.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
index a49de9255..98d15787e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 79943cec3..012fe12f5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -1,19 +1,21 @@
 LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
 	.byte 0
 
-LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
+@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
+@ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
+LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
 	.2byte 0
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
+LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs:: @ 821FF9A
 	setobjectxy 7, 16, 2
 	turnobject 7, DIR_NORTH
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 821FFA6
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -41,7 +43,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 821FFDC
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -66,7 +68,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 822000A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -91,7 +93,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 822003A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -117,53 +119,53 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C
-	msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC
+LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: @ 822006C
+	msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075
+LilycoveCity_DepartmentStore_5F_EventScript_Woman:: @ 8220075
 	lockall
 	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C
+	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C
-	goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7
+	goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal
+	goto LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
-	msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: @ 822009C
+	msgbox LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
-	msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: @ 82200A7
+	msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC
-	msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC
+LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl:: @ 82200BC
+	msgbox LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5
+LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls: @ 82200C5
 	.string "This place is full of cute DOLLS.\p"
 	.string "I should buy some for me, instead of\n"
 	.string "just for my children.$"
 
-LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122
+LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon: @ 8220122
 	.string "I'm not big enough to raise POKéMON,\n"
 	.string "so I'm getting a cute DOLL instead.$"
 
-LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B
+LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere: @ 822016B
 	.string "They sell many cute MATS here.\p"
 	.string "I wonder which one I should get?\n"
 	.string "Maybe I'll buy them all…$"
 
-LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4
+LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather: @ 82201C4
 	.string "I think they closed the rooftop\n"
 	.string "because the weather is wild today.$"
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 5ef4852d3..cf273bcb8 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -87,9 +87,9 @@ LilycoveCity_Harbor_EventScript_GoToFarawayIsland:: @ 821E139
 
 LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
@@ -98,7 +98,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
 
 LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171
 	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
@@ -390,9 +390,9 @@ LilycoveCity_Harbor_EventScript_NoTicket:: @ 821E56B
 @ Unused
 LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
@@ -402,7 +402,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
 @ Unused
 LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D
 	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json
index 54fa58333..4f3fbcc28 100644
--- a/data/maps/LilycoveCity_House1/map.json
+++ b/data/maps/LilycoveCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House1_EventScript_21ECCE",
+      "script": "LilycoveCity_House1_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House1_EventScript_21ECD7",
+      "script": "LilycoveCity_House1_EventScript_Kecleon",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc
index ce09fa3dc..207b27a11 100644
--- a/data/maps/LilycoveCity_House1/scripts.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
@@ -1,26 +1,26 @@
 LilycoveCity_House1_MapScripts:: @ 821ECCD
 	.byte 0
 
-LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE
-	msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC
+LilycoveCity_House1_EventScript_ExpertM:: @ 821ECCE
+	msgbox LilycoveCity_House1_Text_PokemonPartnersNotTools, MSGBOX_NPC
 	end
 
-LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7
+LilycoveCity_House1_EventScript_Kecleon:: @ 821ECD7
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LilycoveCity_House1_Text_21ECEA: @ 821ECEA
+LilycoveCity_House1_Text_PokemonPartnersNotTools: @ 821ECEA
 	.string "POKéMON are partners to people.\n"
 	.string "They aren't our tools.\p"
 	.string "Unfortunately, there are some people\n"
 	.string "who fail to understand that…$"
 
-LilycoveCity_House1_Text_21ED63: @ 821ED63
+LilycoveCity_House1_Text_Kecleon: @ 821ED63
 	.string "KECLEON: Ruroro?$"
 
diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json
index b3e4127a6..c92a50499 100644
--- a/data/maps/LilycoveCity_House2/map.json
+++ b/data/maps/LilycoveCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House2_EventScript_21ED75",
+      "script": "LilycoveCity_House2_EventScript_FatMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 0a0792bfd..517ba0434 100644
--- a/data/maps/LilycoveCity_House2/scripts.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_House2_MapScripts:: @ 821ED74
 	.byte 0
 
-LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
+LilycoveCity_House2_EventScript_FatMan:: @ 821ED75
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC
-	msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest
+	msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM44
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44
-	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC
-	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
+LilycoveCity_House2_EventScript_ReceivedRest:: @ 821EDAC
+	msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House2_Text_21EDB6: @ 821EDB6
+LilycoveCity_House2_Text_NotAwakeYetHaveThis: @ 821EDB6
 	.string "Huh? What? What's that?\p"
 	.string "I'm not near awake yet…\n"
 	.string "You can have this…$"
 
-LilycoveCity_House2_Text_21EDF9: @ 821EDF9
+LilycoveCity_House2_Text_SleepIsEssential: @ 821EDF9
 	.string "Yawn…\p"
 	.string "Sleep is essential for good health…\n"
 	.string "Sleep and regain health…$"
diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json
index 537fc46b3..e8010956d 100644
--- a/data/maps/LilycoveCity_House3/map.json
+++ b/data/maps/LilycoveCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EF3D",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid4",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EE4B",
+      "script": "LilycoveCity_House3_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EED5",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EF09",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid3",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EEA1",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid1",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EE8A",
+      "script": "LilycoveCity_House3_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 7d949fd8b..8d4a1059e 100644
--- a/data/maps/LilycoveCity_House3/scripts.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
@@ -7,98 +7,98 @@ LilycoveCity_House3_OnTransition: @ 821EE42
 	copyvar VAR_TEMP_1, VAR_RESULT
 	end
 
-LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
+LilycoveCity_House3_EventScript_PokefanF:: @ 821EE4B
 	lock
 	faceplayer
-	msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_House3_EventScript_21EE75
-	msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_House3_EventScript_DeclinePokeblockLearn
+	msgbox LilycoveCity_House3_Text_ExplainPokeblocks, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EE75:: @ 821EE75
-	msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 821EE75
+	msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A
+LilycoveCity_House3_EventScript_Man:: @ 821EE8A
 	lock
 	faceplayer
-	msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1
+LilycoveCity_House3_EventScript_GameBoyKid1:: @ 821EEA1
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EED5:: @ 821EED5
+LilycoveCity_House3_EventScript_GameBoyKid2:: @ 821EED5
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF09:: @ 821EF09
+LilycoveCity_House3_EventScript_GameBoyKid3:: @ 821EF09
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D
+LilycoveCity_House3_EventScript_GameBoyKid4:: @ 821EF3D
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF71:: @ 821EF71
-	msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereDoingMultiBattle:: @ 821EF71
+	msgbox LilycoveCity_House3_Text_GoingToWinMultiBattles, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B
-	msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereMixingRecords:: @ 821EF7B
+	msgbox LilycoveCity_House3_Text_LikeMixingAtRecordCorner, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF85:: @ 821EF85
-	msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereBlendingBerries:: @ 821EF85
+	msgbox LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F
-	msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereDoingContest:: @ 821EF8F
+	msgbox LilycoveCity_House3_Text_GoingToEnterContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_Text_21EF99: @ 821EF99
+LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: @ 821EF99
 	.string "Oh, my, my! Are you traveling alone?\n"
 	.string "But you're so young! Good for you!\p"
 	.string "I'm sure my kids could learn a thing\n"
@@ -109,12 +109,12 @@ LilycoveCity_House3_Text_21EF99: @ 821EF99
 	.string "Would you like to learn from me,\n"
 	.string "a master of {POKEBLOCK}S?$"
 
-LilycoveCity_House3_Text_21F0A9: @ 821F0A9
+LilycoveCity_House3_Text_OhAreYouSure: @ 821F0A9
 	.string "Oh? Are you sure?\p"
 	.string "You shouldn't always try to do\n"
 	.string "everything by yourself, dear!$"
 
-LilycoveCity_House3_Text_21F0F8: @ 821F0F8
+LilycoveCity_House3_Text_ExplainPokeblocks: @ 821F0F8
 	.string "Oh, good! You're a smart soul!\n"
 	.string "This is a bit long, so listen up!\p"
 	.string "Are you ready?\p"
@@ -143,26 +143,26 @@ LilycoveCity_House3_Text_21F0F8: @ 821F0F8
 	.string "the world would be a happier place.\p"
 	.string "Don't give up, dear!$"
 
-LilycoveCity_House3_Text_21F430: @ 821F430
+LilycoveCity_House3_Text_HappyToHaveQuadruplets: @ 821F430
 	.string "When my wife gave birth to quadruplets,\n"
 	.string "you bet I was shocked.\p"
 	.string "But, now, seeing them play together,\n"
 	.string "it makes me happy.$"
 
-LilycoveCity_House3_Text_21F4A7: @ 821F4A7
+LilycoveCity_House3_Text_GoingToWinMultiBattles: @ 821F4A7
 	.string "We're having MULTI BATTLES, but I know\n"
 	.string "I'm going to win.$"
 
-LilycoveCity_House3_Text_21F4E0: @ 821F4E0
+LilycoveCity_House3_Text_LikeMixingAtRecordCorner: @ 821F4E0
 	.string "We like mixing stuff at\n"
 	.string "the RECORD CORNER.\p"
 	.string "But what gets mixed up?$"
 
-LilycoveCity_House3_Text_21F523: @ 821F523
+LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender: @ 821F523
 	.string "We're going to make super {POKEBLOCK}S\n"
 	.string "with a BERRY BLENDER!$"
 
-LilycoveCity_House3_Text_21F55A: @ 821F55A
+LilycoveCity_House3_Text_GoingToEnterContest: @ 821F55A
 	.string "I want to brag about how tough my\n"
 	.string "POKéMON is, so we're going to enter\l"
 	.string "a CONTEST together.$"
diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json
index f442d00ba..95fc79d35 100644
--- a/data/maps/LilycoveCity_House4/map.json
+++ b/data/maps/LilycoveCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House4_EventScript_21F5B5",
+      "script": "LilycoveCity_House4_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House4_EventScript_21F5BE",
+      "script": "LilycoveCity_House4_EventScript_Man2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 2306ff6df..685a91b7d 100644
--- a/data/maps/LilycoveCity_House4/scripts.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
@@ -1,20 +1,20 @@
 LilycoveCity_House4_MapScripts:: @ 821F5B4
 	.byte 0
 
-LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5
-	msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC
+LilycoveCity_House4_EventScript_Man1:: @ 821F5B5
+	msgbox LilycoveCity_House4_Text_MysteriesAtBottomOfSea, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE
-	msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC
+LilycoveCity_House4_EventScript_Man2:: @ 821F5BE
+	msgbox LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_Text_21F5C7: @ 821F5C7
+LilycoveCity_House4_Text_MysteriesAtBottomOfSea: @ 821F5C7
 	.string "This planet's biggest mysteries are\n"
 	.string "at the bottom of the sea.\p"
 	.string "Somebody said that, but I don't know…$"
 
-LilycoveCity_House4_Text_21F62B: @ 821F62B
+LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis: @ 821F62B
 	.string "There's a deep underwater trench\n"
 	.string "between MOSSDEEP and SOOTOPOLIS.\p"
 	.string "That's what someone told me, anyway.$"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
index 11272059e..83028fbeb 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Curator",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3"
     }
   ],
@@ -176,7 +176,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting"
     },
     {
       "type": "sign",
@@ -184,7 +184,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting"
     },
     {
       "type": "sign",
@@ -192,7 +192,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting"
     },
     {
       "type": "sign",
@@ -200,7 +200,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting"
     },
     {
       "type": "sign",
@@ -208,7 +208,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting"
     },
     {
       "type": "sign",
@@ -216,7 +216,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting"
     },
     {
       "type": "sign",
@@ -224,7 +224,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting"
     },
     {
       "type": "sign",
@@ -232,7 +232,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     },
     {
       "type": "sign",
@@ -240,7 +240,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting"
     },
     {
       "type": "sign",
@@ -248,7 +248,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting"
     },
     {
       "type": "sign",
@@ -256,7 +256,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     },
     {
       "type": "sign",
@@ -264,7 +264,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting"
     },
     {
       "type": "sign",
@@ -272,7 +272,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting"
     },
     {
       "type": "sign",
@@ -280,7 +280,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     },
     {
       "type": "sign",
@@ -288,7 +288,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture"
     },
     {
       "type": "sign",
@@ -296,7 +296,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index 51e9129f9..a9c6f1266 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -1,175 +1,174 @@
 LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: @ 8218CB9
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
+LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
-	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
+	message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings
 	waitmessage
 	multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet:: @ 8218CEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E
+LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8218CF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: @ 8218D14
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat, MSGBOX_SIGN
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99
+LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs
 	waitmovement 0
 	removeobject 2
 	switch VAR_FACING
-	case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
-	case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
-	case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
+	case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth
+	case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest
+	case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99
+LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs: @ 8218D99
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest: @ 8218D9B
 	walk_left
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast: @ 8218D9E
 	walk_right
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth: @ 8218DA1
 	walk_up
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting:: @ 8218DA4
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting:: @ 8218DAD
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting:: @ 8218DB6
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting:: @ 8218DBF
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting:: @ 8218DC8
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting:: @ 8218DD1
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA
-LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture:: @ 8218DDA
+	msgbox LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture:: @ 8218DE3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet:: @ 8218DEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM:: @ 8218DF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1:: @ 8218DFE
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy:: @ 8218E07
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1:: @ 8218E10
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2:: @ 8218E19
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM:: @ 8218E22
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 8218E2B
 	lock
 	faceplayer
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan:: @ 8218E42
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B
+LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum: @ 8218E4B
 	.string "Welcome to LILYCOVE MUSEUM.\p"
 	.string "Please take the time to enjoy our\n"
 	.string "collection of fantastic artwork\l"
 	.string "featuring POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
+LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings: @ 8218EBC
 	.string "I'm the CURATOR of this MUSEUM of\n"
 	.string "fine arts.\p"
 	.string "It's heartening to see someone so\n"
@@ -177,116 +176,116 @@ LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
 	.string "Have you viewed our collection of\n"
 	.string "paintings already?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C
+LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime: @ 8218F5C
 	.string "Ah, then let me not disturb you.\n"
 	.string "Please, do take your time.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98
+LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings: @ 8218F98
 	.string "Oh? I do believe that you seem to\n"
 	.string "be a POKéMON TRAINER.\p"
 	.string "Have you an interest in paintings,\n"
 	.string "too?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8
+LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat: @ 8218FF8
 	.string "I see…\p"
 	.string "I'm honored that you would visit\n"
 	.string "us in spite of that.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035
+LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe: @ 8219035
 	.string "Ah, excellent!\n"
 	.string "You do like paintings!\p"
 	.string "Then, may I ask you to come with me?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080
+LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting: @ 8219080
 	.string "It's a very old painting.\n"
 	.string "The paint is peeling here and there.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF
+LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery: @ 82190BF
 	.string "It's an odd landscape with bizarre\n"
 	.string "and fantastic scenery.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman: @ 82190F9
 	.string "It's a painting of a beautiful, smiling\n"
 	.string "woman with a POKéMON on her lap.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon: @ 8219142
 	.string "It's a painting of a legendary POKéMON\n"
 	.string "from long ago.\p"
 	.string "The artist painted this from\n"
 	.string "imagination.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon: @ 82191A2
 	.string "It's a painting of GRASS POKéMON\n"
 	.string "swaying in a breeze.\p"
 	.string "They appear to be enjoying the wind's\n"
 	.string "gentle caress.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries: @ 821920D
 	.string "It's a delicious-looking painting\n"
 	.string "of BERRIES.\p"
 	.string "This painting could make you hungry!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260
+LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica: @ 8219260
 	.string "It's a replica of a famous sculpture.\p"
 	.string "It depicts an ancient BIRD POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA
+LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone: @ 82192AA
 	.string "It's a big POKé BALL carved from\n"
 	.string "a black stone.\p"
 	.string "It was apparently used in festivals\n"
 	.string "in the olden days.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311
+LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText: @ 8219311
 	.string "It's a huge stone tablet inscribed\n"
 	.string "with POKéMON and dense text in the\l"
 	.string "small characters of an ancient,\l"
 	.string "unreadable language.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C
+LilycoveCity_LilycoveMuseum_1F_Text_WorksOfMagnificence: @ 821938C
 	.string "Hmmm…\n"
 	.string "What works of great magnificence…$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4
+LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts: @ 82193B4
 	.string "Battling with POKéMON is fun,\n"
 	.string "I'll grant you that.\p"
 	.string "But one mustn't forget our love for\n"
 	.string "the fine arts.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A
+LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration: @ 821941A
 	.string "This ART MUSEUM… Well, you could\n"
 	.string "see many fantastic paintings.\p"
 	.string "And the CURATOR is a wonderful person.\p"
 	.string "Among artists like myself, this MUSEUM\n"
 	.string "is an inspiration.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA
+LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty: @ 82194BA
 	.string "This lady is pretty!\n"
 	.string "She's like Mommy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1
+LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable: @ 82194E1
 	.string "This POKéMON is adorable!\n"
 	.string "Just like our little boy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515
+LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings: @ 8219515
 	.string "I'd heard that this ART MUSEUM got\n"
 	.string "in some new paintings.\p"
 	.string "So, naturally I hurried over.\p"
 	.string "Are the new paintings up on\n"
 	.string "the second floor?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B
+LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful: @ 821959B
 	.string "Lately, the CURATOR has been\n"
 	.string "unusually cheerful.\p"
 	.string "I bet something good happened for him.\n"
 	.string "Definitely.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF
+LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings: @ 82195FF
 	.string "I aim to see many great paintings\n"
 	.string "here and learn from them.\p"
 	.string "I have this dream of one day having\n"
 	.string "my artwork exhibited here.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A
+LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination: @ 821967A
 	.string "The ART MUSEUM has become a favorite\n"
 	.string "tourist destination.\p"
 	.string "It's great for LILYCOVE…\n"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
index 18a2829e4..54d6fbc63 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Curator",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Girl",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     }
   ],
@@ -84,7 +84,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting"
     },
     {
       "type": "sign",
@@ -92,7 +92,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting"
     },
     {
       "type": "sign",
@@ -100,7 +100,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting"
     },
     {
       "type": "sign",
@@ -108,7 +108,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting"
     },
     {
       "type": "sign",
@@ -116,7 +116,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting"
     },
     {
       "type": "sign",
@@ -124,7 +124,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting"
     },
     {
       "type": "sign",
@@ -132,7 +132,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting"
     },
     {
       "type": "sign",
@@ -140,7 +140,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting"
     },
     {
       "type": "sign",
@@ -148,7 +148,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting"
     },
     {
       "type": "sign",
@@ -156,7 +156,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting"
     },
     {
       "type": "sign",
@@ -164,7 +164,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     },
     {
       "type": "sign",
@@ -172,7 +172,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 71aead3e4..4279d3064 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -1,224 +1,224 @@
 LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
-	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+LilycoveCity_LilycoveMuseum_2F_OnLoad: @ 8219745
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting:: @ 8219754
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting:: @ 8219763
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting:: @ 8219772
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting:: @ 8219781
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting:: @ 821978B
 	setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
 	setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting:: @ 82197A3
 	setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
 	setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting:: @ 82197BB
 	setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
 	setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting:: @ 82197D3
 	setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
 	setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting:: @ 82197EB
 	setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
 	setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
 	end
 
-LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
-	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
+LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE
+	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall
 	.2byte 0
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808
 	lockall
 	applymovement 1, Common_Movement_FacePlayer
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861
+LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft: @ 8219861
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
+LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863
 	face_up
 	delay_16
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
+LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
 	lockall
-	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
+	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC
+	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: @ 82198BA
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
+LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
+LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA
 	applymovement 1, Common_Movement_FacePlayer
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT
 	givedecoration_std DECOR_GLASS_ORNAMENT
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
-	call Common_EventScript_NoRoomLeftForAnother
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT
+LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament:: @ 8219911
+	call Common_EventScript_NoRoomForDecor
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament:: @ 8219921
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit, MSGBOX_NPC
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
+LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting:: @ 821992B
 	lockall
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
+LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting:: @ 821993E
 	lockall
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
+LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting:: @ 8219951
 	lockall
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
+LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting:: @ 8219964
 	lockall
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
+LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting:: @ 8219977
 	lockall
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_Girl:: @ 821998A
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM:: @ 8219993
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 9
+	showcontestwinner 9
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 10
+	showcontestwinner 10
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 11
+	showcontestwinner 11
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 12
+	showcontestwinner 12
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 13
+	showcontestwinner 13
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB
+LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall: @ 82199EB
 	.string "This is our special exhibit hall.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
+LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall: @ 8219A0D
 	.string "As you can plainly see, there is not\n"
 	.string "a single painting on exhibit.\p"
 	.string "Here, I don't wish to exhibit works of\n"
@@ -234,7 +234,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
 	.string "POKéMON seemingly ready to spring\l"
 	.string "forth into glorious life!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
+LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit: @ 8219BC4
 	.string "I beg your pardon. I didn't intend\n"
 	.string "to monopolize the conversation.\p"
 	.string "Now, as you are young, and yet\n"
@@ -246,23 +246,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
 	.string "the artist's permission to exhibit\l"
 	.string "it here?$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3
+LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit: @ 8219CF3
 	.string "I wish to fill this exhibit hall with\n"
 	.string "modern and vibrant paintings of\l"
 	.string "POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42
+LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting: @ 8219D42
 	.string "Thanks to you, we've added a new\n"
 	.string "painting to our collection!\p"
 	.string "I've heard it depicts your POKéMON.\n"
 	.string "Truly magnificent!\p"
 	.string "Thank you so very, very much!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer: @ 8219DD4
 	.string "Ah! It's you!\n"
 	.string "{PLAYER}!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
+LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests: @ 8219DE6
 	.string "Isn't this marvelous?\n"
 	.string "This collection of paintings!\p"
 	.string "Each one of them flawless!\n"
@@ -272,56 +272,56 @@ LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
 	.string "Sincerely, I thank you, {PLAYER}.\n"
 	.string "This is my dream come true!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5
+LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude: @ 8219EC5
 	.string "This is merely a token of my gratitude.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED
+LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou: @ 8219EED
 	.string "I will keep this for you until we\n"
 	.string "meet again.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B
+LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit: @ 8219F1B
 	.string "Ah, so good to see you, {PLAYER}!\p"
 	.string "It's an honor to have you visit us\n"
 	.string "on your busy journeys.\p"
 	.string "Please, relax and do enjoy your\n"
 	.string "visit with us.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame: @ 8219FA0
 	.string "It's a picture frame with pink-colored\n"
 	.string "adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame: @ 8219FD3
 	.string "It's a picture frame with\n"
 	.string "yellow-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008
+LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame: @ 821A008
 	.string "It's a picture frame with\n"
 	.string "blue-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B
+LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame: @ 821A03B
 	.string "It's a picture frame with\n"
 	.string "red-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D
+LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame: @ 821A06D
 	.string "It's a picture frame with\n"
 	.string "green-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon: @ 821A0A1
 	.string "It's a painting of POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe: @ 821A0BD
 	.string "I've been away awhile, so the new\n"
 	.string "paintings up here surprised me.\p"
 	.string "I wish someone would paint my POKéMON\n"
 	.string "this pretty.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing: @ 821A132
 	.string "Well… So this is where they show\n"
 	.string "the topical POKéMON paintings.\p"
 	.string "I see, these new paintings are indeed\n"
 	.string "rather amusing.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8
+LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon: @ 821A1A8
 	.string "Wow, is that right?\n"
 	.string "These paintings are of your POKéMON.\p"
 	.string "Isn't that just the ultimate joy for\n"
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
index f4adbabe8..30c5a413f 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B",
+      "script": "LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index e94fa43f1..7d9e0f239 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -1,110 +1,110 @@
 LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A
 	.byte 0
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B
+LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 821EA0B
 	lockall
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO
+	msgbox LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B
-	case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT
-	special sub_81B94B0
+LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B
+	msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget, MSGBOX_DEFAULT
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, 255
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6
-	special sub_81B98DC
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain
+	special IsSelectedMonEgg
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves
+	special GetNumMovesSelectedMonHas
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC
-	special sub_81B96D0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove
+	msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT
 	fadescreen 1
-	special sub_81B968C
+	special MoveDeleterChooseMoveToForget
 	fadescreen 0
-	compare VAR_0x8005, 4
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B
-	special sub_81B9718
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO
+	compare VAR_0x8005, MAX_MON_MOVES
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget
+	special BufferMoveDeleterNicknameAndMove
+	msgbox LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0
-	case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0
-	special sub_81B9918
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0
-	special sub_81B9770
+LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0
+	special IsLastMonThatKnowsSurf
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf
+	special MoveDeleterForgetMove
 	playfanfare MUS_ME_WASURE
 	waitfanfare
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT
+	msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF
-	special sub_81B9718
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT
+LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove:: @ 821EACF
+	special BufferMoveDeleterNicknameAndMove
+	msgbox LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT
+LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves:: @ 821EADC
+	msgbox LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT
+LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain:: @ 821EAE6
+	msgbox LilycoveCity_MoveDeletersHouse_Text_ComeAgain, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0
-	special sub_81B9718
-	msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT
+LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf:: @ 821EAF0
+	special BufferMoveDeleterNicknameAndMove
+	msgbox LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD
+LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove: @ 821EAFD
 	.string "Uh…\n"
 	.string "Oh, yes, I'm the MOVE DELETER.\p"
 	.string "I can make POKéMON forget their moves.\p"
 	.string "Would you like me to do that?$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EB65: @ 821EB65
+LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget: @ 821EB65
 	.string "Which POKéMON should forget a move?$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89
+LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten: @ 821EB89
 	.string "Which move should be forgotten?$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9
+LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove: @ 821EBA9
 	.string "{STR_VAR_1} knows only one move\n"
 	.string "so it can't be forgotten…$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA
+LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten: @ 821EBDA
 	.string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n"
 	.string "That move should be forgotten?$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06
+LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove: @ 821EC06
 	.string "It worked to perfection!\p"
 	.string "{STR_VAR_1} has forgotten\n"
 	.string "{STR_VAR_2} completely.$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EC3F: @ 821EC3F
+LilycoveCity_MoveDeletersHouse_Text_ComeAgain: @ 821EC3F
 	.string "Come again if there are moves that\n"
 	.string "need to be forgotten.$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78
+LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves: @ 821EC78
 	.string "What?\n"
 	.string "No EGG should know any moves.$"
 
-LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C
+LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf: @ 821EC9C
 	.string "Hm!\p"
 	.string "Your {STR_VAR_1} doesn't seem willing\n"
 	.string "to forget SURF.$"
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
index c5c0121f4..4f87f50b0 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady",
       "flag": "0"
     },
     {
@@ -76,8 +76,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7",
-      "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY"
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon",
+      "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON"
     }
   ],
   "warp_events": [
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index 09b18f4bd..a7df8528e 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -5,26 +5,28 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
 
 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
+	goto LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6
+@ SetLilycoveLadyGfx returns TRUE if its the Contest Lady
+LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx:: @ 821C5C6
 	special SetLilycoveLadyGfx
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0
-	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
+LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon:: @ 821C5E0
+	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4
-	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
+LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon:: @ 821C5E4
+	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
+@ VAR_0x800B is the Nurse's object event id
+LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 821C5E8
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -32,35 +34,35 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC
+LilycoveCity_PokemonCenter_1F_EventScript_Boy:: @ 821C5F6
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF
+LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 821C5FF
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_21C614
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone:: @ 821C614
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E
+LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon: @ 821C61E
 	.string "I wonder how many kinds of POKéMON\n"
 	.string "there are in the world.\p"
 	.string "It'd be great to cross seas and\n"
 	.string "trade POKéMON with people far away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D
+LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels: @ 821C69D
 	.string "I've been hearing about some rotten\n"
 	.string "scoundrels who steal POKéMON and rip\l"
 	.string "off METEORITES.$"
 
-LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6
+LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels: @ 821C6F6
 	.string "Those rotten scoundrels who steal\n"
 	.string "POKéMON and rip off METEORITES…\p"
 	.string "I haven't seen them around recently.$"
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
index 0591d3c8e..f918c86ec 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy",
       "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Boy",
       "flag": "FLAG_HIDE_FANCLUB_BOY"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Woman",
       "flag": "FLAG_HIDE_FANCLUB_LADY"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF",
       "flag": "FLAG_HIDE_FANCLUB_OLD_LADY"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer",
       "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER"
     }
   ],
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 8b0cf40ac..039fb6413 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -1,34 +1,36 @@
 LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
 	.byte 0
 
-LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
-	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
+	@ See field_specials.c for a breakdown of the Fan Club and its variables
+
+LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790
+	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans
 	.2byte 0
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
+LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 821C79A
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
-	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer
+	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer
 	waitmovement 0
 	setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
 	releaseall
 	end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5
+LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer: @ 821C7F5
 	delay_8
 	walk_in_place_fastest_down
 	walk_down
@@ -38,7 +40,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5
 	walk_left
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer: @ 821C7FD
 	walk_fast_left
 	walk_fast_left
 	walk_fast_down
@@ -47,12 +49,12 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD
 	walk_fast_down
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer: @ 821C804
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer: @ 821C807
 	jump_in_place_right
 	walk_fast_up
 	walk_fast_up
@@ -61,558 +63,563 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
 	step_end
 
 LilycoveCity_PokemonTrainerFanClub_OnTransition: @ 821C80D
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
-	special UpdateMovedLilycoveFanClubMembers
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
-	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
-	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
-	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
-	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
-	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
-	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
-	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
-	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
-	specialvar VAR_RESULT, sub_80EE7C0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 821C829
+	special TryLoseFansFromPlayTime
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER2
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER3
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER4
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER5
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER6
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER7
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
+	setvar VAR_0x8004, FANCLUB_MEMBER8
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer:: @ 821C8DA
+	specialvar VAR_RESULT, ShouldHideFanClubInterviewer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_HideInterviewer
 	clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 	clearflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
+LilycoveCity_PokemonTrainerFanClub_EventScript_HideInterviewer:: @ 821C8F1
 	setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
-	setvar VAR_0x8005, 8
-	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+@ Set up the fan club TV show, if the player has at least 5 fans in the club
+@ Rather than counting up, 1 is subtracted from the total for each member not a fan of the players
+LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow:: @ 821C8F5
+	setvar VAR_0x8005, NUM_TRAINER_FAN_CLUB_MEMBERS
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER2
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER3
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER4
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER5
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER6
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER7
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
+	setvar VAR_0x8004, FANCLUB_MEMBER8
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan
 	compare VAR_0x8005, 5
-	goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4
+	goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE
+LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan:: @ 821C9AE
 	subvar VAR_0x8005, 1
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4:: @ 821C9B4
-	special sub_80EE72C
+LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow:: @ 821C9B4
+	special TrySetUpTrainerFanClubSpecial
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8:: @ 821C9B8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 821C9B8
 	setobjectxyperm 1, 7, 5
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0:: @ 821C9C0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 821C9C0
 	setobjectxyperm 3, 3, 4
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8:: @ 821C9C8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 821C9C8
 	setobjectxyperm 4, 7, 2
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0:: @ 821C9D0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 821C9D0
 	setobjectxyperm 5, 5, 5
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8:: @ 821C9D8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 821C9D8
 	setobjectxyperm 6, 5, 2
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0:: @ 821C9E0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 821C9E0
 	setobjectxyperm 2, 8, 4
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8:: @ 821C9E8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 821C9E8
 	setobjectxyperm 7, 3, 3
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0:: @ 821C9F0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 821C9F0
 	setobjectxyperm 8, 8, 3
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8:: @ 821C9F8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
+LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting:: @ 821C9F8
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
+LilycoveCity_PokemonTrainerFanClub_EventScript_Man:: @ 821CA17
 	lock
 	faceplayer
-	setvar VAR_0x8004, 13
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER6
+	special BufferFanClubTrainerName
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan:: @ 821CA56
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan:: @ 821CA70
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan:: @ 821CA7A
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion:: @ 821CA84
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
+LilycoveCity_PokemonTrainerFanClub_EventScript_Lass:: @ 821CA8E
 	lock
 	faceplayer
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan:: @ 821CACD
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan:: @ 821CAE7
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan:: @ 821CAF1
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion:: @ 821CAFB
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM:: @ 821CB05
 	lock
 	faceplayer
-	setvar VAR_0x8004, 9
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER2
+	special BufferFanClubTrainerName
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan:: @ 821CB44
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan:: @ 821CB5E
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan:: @ 821CB68
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion:: @ 821CB72
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 821CB7C
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER3
+	special BufferFanClubTrainerName
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 821CBBB
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 821CBD5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 821CBDF
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 821CBE9
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy:: @ 821CBF3
 	lock
 	faceplayer
-	setvar VAR_0x8004, 11
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT
+	setvar VAR_0x8004, FANCLUB_MEMBER4
+	special BufferFanClubTrainerName
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan:: @ 821CC27
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan:: @ 821CC41
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan:: @ 821CC4B
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
+LilycoveCity_PokemonTrainerFanClub_EventScript_Boy:: @ 821CC55
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT
+	setvar VAR_0x8004, FANCLUB_MEMBER5
+	special BufferFanClubTrainerName
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan:: @ 821CC89
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan:: @ 821CCA3
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan:: @ 821CCAD
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
+LilycoveCity_PokemonTrainerFanClub_EventScript_Woman:: @ 821CCB7
 	lock
 	faceplayer
-	setvar VAR_0x8004, 14
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT
+	setvar VAR_0x8004, FANCLUB_MEMBER7
+	special BufferFanClubTrainerName
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 821CCEB
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 821CD05
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 821CD0F
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF:: @ 821CD19
 	lock
 	faceplayer
-	setvar VAR_0x8004, 15
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
-	compare VAR_RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT
+	setvar VAR_0x8004, FANCLUB_MEMBER8
+	special BufferFanClubTrainerName
+	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
-	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan:: @ 821CD4D
+	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan:: @ 821CD67
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan:: @ 821CD71
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
 	lock
 	faceplayer
-	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
-	goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
+	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed
+	goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_Interview
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
-	setvar VAR_0x8005, 11
+@ The interviewer doesnt count as an individual fan club member
+@ Instead they always ask about whoever the Lass would be interested in, if not the player
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
+	setvar VAR_0x8005, TVSHOW_FAN_CLUB_SPECIAL
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2
 	copyvar VAR_0x800A, VAR_0x8006
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion:: @ 821CDE0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink, MSGBOX_DEFAULT
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
+LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	message LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
 	special ShowScrollableMultichoice
 	waitstate
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, FANCLUB_MEMBER1
 	switch VAR_RESULT
-	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
+	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
+	case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
 	copyvar VAR_0x8006, VAR_0x800A
 	copyvar VAR_0x8005, VAR_RESULT
 	special PutFanClubSpecialOnTheAir
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer:: @ 821CEC6
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo, MSGBOX_DEFAULT
 	setflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
-	setvar VAR_0x8004, 8
-	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special BufferFanClubTrainerName
+	msgbox LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
+@ Shouldnt be reached
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
 	end
 
-LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
+LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
 	.string "Oh, wow!\n"
 	.string "It's {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
+LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
 	.string "I've heard the news!\n"
 	.string "You're really strong, aren't you?\p"
 	.string "We always argue about who is the\n"
@@ -628,29 +635,29 @@ LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
 	.string "Remember, I'm cheering for you,\n"
 	.string "{PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094
+LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin: @ 821D094
 	.string "Yo, {PLAYER}!\n"
 	.string "You're the one we want to win!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB
+LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest: @ 821D0BB
 	.string "The others, they don't know that\n"
 	.string "you're the best of the best!\p"
 	.string "Isn't that right, {PLAYER}?\n"
 	.string "Show them you've got guts!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A
+LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary: @ 821D12A
 	.string "I hate to say this, but the TRAINER\n"
 	.string "everybody's talking about is\l"
 	.string "{STR_VAR_1}, no question about it!\p"
 	.string "That TRAINER's power…\n"
 	.string "It's out of the ordinary.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen: @ 821D1B5
 	.string "Darn it… I've been telling people\n"
 	.string "that {STR_VAR_1} is the best now…\p"
 	.string "But no one wants to listen…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C
+LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer: @ 821D20C
 	.string "I've been hearing things about\n"
 	.string "a tough new TRAINER.\p"
 	.string "This TRAINER's supposed to be beating\n"
@@ -658,13 +665,13 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C
 	.string "Do you know anything about this\n"
 	.string "new TRAINER?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6
+LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou: @ 821D2A6
 	.string "Oh!\n"
 	.string "{PLAYER}!\p"
 	.string "Go for it!\n"
 	.string "I'm pulling for you!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE
+LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan: @ 821D2CE
 	.string "Sigh…\n"
 	.string "BRAWLY…\p"
 	.string "Oh, no! Wait!\n"
@@ -673,36 +680,36 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE
 	.string "So make me proud!\n"
 	.string "Go for it!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347
+LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly: @ 821D347
 	.string "I can't help it, I can only get to\n"
 	.string "like BRAWLY…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377
+LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly: @ 821D377
 	.string "Nobody understands the charm of\n"
 	.string "BRAWLY…\p"
 	.string "I don't care!\p"
 	.string "Even if I'm the only one, I'm going\n"
 	.string "to keep cheering for BRAWLY!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE
+LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly: @ 821D3EE
 	.string "Whatever anyone says, my favorite\n"
 	.string "TRAINER is DEWFORD's GYM LEADER\l"
 	.string "BRAWLY!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438
+LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather: @ 821D438
 	.string "You've surpassed your own father in\n"
 	.string "every regard!\p"
 	.string "I'm telling you, so there's no question\n"
 	.string "about it at all!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3
+LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling: @ 821D4A3
 	.string "Even when things turned bleak,\n"
 	.string "your father never gave up.\p"
 	.string "This I know to be true.\p"
 	.string "You never give up even if you lose!\n"
 	.string "So keep on battling!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E
+LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman: @ 821D52E
 	.string "NORMAN battled with more power,\n"
 	.string "charisma, and showmanship than you.\p"
 	.string "Even though people may say that\n"
@@ -710,7 +717,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E
 	.string "You've still got a long way to go\n"
 	.string "compared to your father.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC
+LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent: @ 821D5DC
 	.string "You're beginning to get the same\n"
 	.string "air of awe NORMAN exudes.\p"
 	.string "But there's something conclusively\n"
@@ -718,7 +725,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC
 	.string "I can't tell you what that is.\n"
 	.string "You'll have to find it yourself.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C
+LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers: @ 821D69C
 	.string "Everyone here, we're all huge fans\n"
 	.string "of POKéMON battles.\p"
 	.string "We discuss who we consider to be\n"
@@ -726,12 +733,12 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C
 	.string "If you were to become famous,\n"
 	.string "we might even become your fans!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751
+LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer: @ 821D751
 	.string "Oh, woweee! It's {PLAYER}!\n"
 	.string "For real, too!\p"
 	.string "Please, shake my hand, shake my hand!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B
+LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou: @ 821D79B
 	.string "I'll always cheer for you, {PLAYER}!\n"
 	.string "Always, always!\p"
 	.string "I don't want to see you lose ever,\n"
@@ -739,60 +746,60 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B
 	.string "Because I know you're really,\n"
 	.string "really strong, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822
+LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool: @ 821D822
 	.string "{STR_VAR_1} is really cool…\p"
 	.string "Everyone thinks so, right, right?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe: @ 821D857
 	.string "{STR_VAR_1} really is cool, don't\n"
 	.string "you think so?\p"
 	.string "Even if it's just me, I'm going to keep\n"
 	.string "cheering my favorite TRAINER.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4
+LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat: @ 821D8C4
 	.string "My favorite TRAINER is…\p"
 	.string "Cool…\p"
 	.string "Strong…\p"
 	.string "And really nice…\p"
 	.string "I wish there was a TRAINER like that…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921
+LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou: @ 821D921
 	.string "Whoa! It's {PLAYER}!\n"
 	.string "Wicked!\p"
 	.string "When I grow up, I want to be strong\n"
 	.string "like you, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A
+LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou: @ 821D96A
 	.string "Even if I'm the only one…\p"
 	.string "You'll always be the only one\n"
 	.string "I cheer for, {PLAYER}!\p"
 	.string "Because I believe in you, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool: @ 821D9D1
 	.string "{STR_VAR_1} is so wickedly cool…\n"
 	.string "I want to shake hands with my hero.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D
+LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan: @ 821DA0D
 	.string "Even if I'm the only one…\p"
 	.string "I'm never going to stop being\n"
 	.string "{STR_VAR_1}'s fan!\p"
 	.string "Because I've heard, {STR_VAR_1}\n"
 	.string "never loses!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73
+LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll: @ 821DA73
 	.string "{PLAYER}!\n"
 	.string "You are amazing after all!\p"
 	.string "Ever since I set eyes on you,\n"
 	.string "I knew that you were great.\p"
 	.string "It looks like my eyes didn't deceive me.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5
+LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner: @ 821DAF5
 	.string "Who cares about the others.\n"
 	.string "I'm in your corner!\p"
 	.string "You don't need to worry. Just get\n"
 	.string "out there and battle like always.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69
+LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne: @ 821DB69
 	.string "You're a pretty decent TRAINER,\n"
 	.string "I think.\p"
 	.string "But I also think that {STR_VAR_1}\n"
@@ -800,32 +807,32 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69
 	.string "That's just my opinion.\n"
 	.string "Don't worry about it too much.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB
+LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer: @ 821DBFB
 	.string "Wow, you really are strong.\n"
 	.string "Maybe even stronger than {STR_VAR_1}.\p"
 	.string "But {STR_VAR_1} needs me.\p"
 	.string "If I don't cheer for {STR_VAR_1},\n"
 	.string "who will?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68
+LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind: @ 821DC68
 	.string "You've changed my mind!\n"
 	.string "You are strong, aren't you?\p"
 	.string "I'd like you to tell me how you managed\n"
 	.string "to get so strong!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6
+LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation: @ 821DCD6
 	.string "The tougher the situation, the more\n"
 	.string "attractively you battle.\p"
 	.string "I can't wait for your next battle!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout: @ 821DD36
 	.string "Among the recently hot TRAINERS,\n"
 	.string "{STR_VAR_1} is the standout.\p"
 	.string "That toughness, it's simply not normal.\p"
 	.string "You're doing okay, but you're not in\n"
 	.string "the same class as {STR_VAR_1}.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
+LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger: @ 821DDCE
 	.string "You are really popular…\p"
 	.string "You're strong, and you're caring to\n"
 	.string "POKéMON. No one can knock you.\p"
@@ -833,23 +840,23 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
 	.string "{STR_VAR_1} is definitely stronger!\n"
 	.string "I'm positive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
+LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72
 	.string "You…\p"
 	.string "Impressive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
+LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83
 	.string "Your true worth, it is fine if only\n"
 	.string "I recognized it.\p"
 	.string "The others I doubt will understand\n"
 	.string "the hidden power that beats within.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF
+LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential: @ 821DEFF
 	.string "Yes, I see strength in your eyes.\p"
 	.string "But!\p"
 	.string "You still haven't realized your\n"
 	.string "potential.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51
+LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength: @ 821DF51
 	.string "It is true that you are tremendously\n"
 	.string "powerful.\p"
 	.string "But!\n"
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
deleted file mode 100644
index 9fb83a7a9..000000000
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ /dev/null
@@ -1,458 +0,0 @@
-LinkContestRoom1_MapScripts:: @ 823B781
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815
-	map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B
-	.byte 0
-
-LinkContestRoom1_MapScript1_23B79B: @ 823B79B
-	special sub_80F8B94
-	end
-
-LinkContestRoom1_OnTransition: @ 823B79F
-	call LinkContestRoom1_EventScript_23B7AF
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_23B842
-	end
-
-LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
-	call LinkContestRoom1_EventScript_27A133
-	special ScriptGetMultiplayerId
-	compare VAR_RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_23B7EF
-	compare VAR_RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_23B7F3
-	compare VAR_RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_23B7F7
-	compare VAR_RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_23B7FB
-	compare VAR_RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_23B7FF
-	return
-
-LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
-	savebgm MUS_TEST1
-	return
-
-LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
-	savebgm MUS_TEST2
-	return
-
-LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
-	savebgm MUS_TEST3
-	return
-
-LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
-	savebgm MUS_TEST4
-	return
-
-LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
-	savebgm MUS_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_23B803: @ 823B803
-	compare VAR_TEMP_9, 1
-	call_if_eq LinkContestRoom1_EventScript_23B80F
-	end
-
-LinkContestRoom1_EventScript_23B80F:: @ 823B80F
-	call LinkContestRoom1_EventScript_23BB2B
-	return
-
-LinkContestRoom1_MapScript2_23B815: @ 823B815
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829
-	.2byte 0
-
-LinkContestRoom1_MapScript2_23B81F: @ 823B81F
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834
-	.2byte 0
-
-LinkContestRoom1_EventScript_23B829:: @ 823B829
-	call LinkContestRoom1_EventScript_279F97
-	call LinkContestRoom1_EventScript_23BE44
-	end
-
-LinkContestRoom1_EventScript_23B834:: @ 823B834
-	special sub_80F8B94
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_23BB2B
-	end
-
-LinkContestRoom1_EventScript_23B842:: @ 823B842
-	call LinkContestRoom1_EventScript_23B8F8
-	call LinkContestRoom1_EventScript_23B858
-	compare VAR_TEMP_0, 8
-	goto_if_lt LinkContestRoom1_EventScript_23B842
-	return
-
-LinkContestRoom1_EventScript_23B858:: @ 823B858
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_23B8AB
-	case 2, LinkContestRoom1_EventScript_23B8B6
-	case 3, LinkContestRoom1_EventScript_23B8C1
-	case 4, LinkContestRoom1_EventScript_23B8CC
-	case 5, LinkContestRoom1_EventScript_23B8D7
-	case 6, LinkContestRoom1_EventScript_23B8E2
-	case 7, LinkContestRoom1_EventScript_23B8ED
-	end
-
-LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
-	setvar VAR_RESULT, 32
-	special ScriptRandom
-	addvar VAR_RESULT, 1
-	switch VAR_RESULT
-	case 1, LinkContestRoom1_EventScript_23BA6B
-	case 2, LinkContestRoom1_EventScript_23BA71
-	case 3, LinkContestRoom1_EventScript_23BA77
-	case 4, LinkContestRoom1_EventScript_23BA7D
-	case 5, LinkContestRoom1_EventScript_23BA83
-	case 6, LinkContestRoom1_EventScript_23BA89
-	case 7, LinkContestRoom1_EventScript_23BA8F
-	case 8, LinkContestRoom1_EventScript_23BA95
-	case 9, LinkContestRoom1_EventScript_23BA9B
-	case 10, LinkContestRoom1_EventScript_23BAA1
-	case 11, LinkContestRoom1_EventScript_23BAA7
-	case 12, LinkContestRoom1_EventScript_23BAAD
-	case 13, LinkContestRoom1_EventScript_23BAB3
-	case 14, LinkContestRoom1_EventScript_23BAB9
-	case 15, LinkContestRoom1_EventScript_23BABF
-	case 16, LinkContestRoom1_EventScript_23BAC5
-	case 17, LinkContestRoom1_EventScript_23BACB
-	case 18, LinkContestRoom1_EventScript_23BAD1
-	case 19, LinkContestRoom1_EventScript_23BAD7
-	case 20, LinkContestRoom1_EventScript_23BADD
-	case 21, LinkContestRoom1_EventScript_23BAE3
-	case 22, LinkContestRoom1_EventScript_23BAE9
-	case 23, LinkContestRoom1_EventScript_23BAEF
-	case 24, LinkContestRoom1_EventScript_23BAF5
-	case 25, LinkContestRoom1_EventScript_23BAFB
-	case 26, LinkContestRoom1_EventScript_23BB01
-	case 27, LinkContestRoom1_EventScript_23BB07
-	case 28, LinkContestRoom1_EventScript_23BB0D
-	case 29, LinkContestRoom1_EventScript_23BB13
-	case 30, LinkContestRoom1_EventScript_23BB19
-	case 31, LinkContestRoom1_EventScript_23BB1F
-	case 32, LinkContestRoom1_EventScript_23BB25
-	end
-
-LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
-	return
-
-LinkContestRoom1_EventScript_23BA71:: @ 823BA71
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
-	return
-
-LinkContestRoom1_EventScript_23BA77:: @ 823BA77
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
-	return
-
-LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
-	return
-
-LinkContestRoom1_EventScript_23BA83:: @ 823BA83
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
-	return
-
-LinkContestRoom1_EventScript_23BA89:: @ 823BA89
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
-	return
-
-LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
-	return
-
-LinkContestRoom1_EventScript_23BA95:: @ 823BA95
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
-	return
-
-LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
-	return
-
-LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
-	return
-
-LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
-	return
-
-LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
-	return
-
-LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
-	return
-
-LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
-	return
-
-LinkContestRoom1_EventScript_23BABF:: @ 823BABF
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
-	return
-
-LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
-	return
-
-LinkContestRoom1_EventScript_23BACB:: @ 823BACB
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
-	return
-
-LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
-	return
-
-LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
-	return
-
-LinkContestRoom1_EventScript_23BADD:: @ 823BADD
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
-	return
-
-LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
-	return
-
-LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
-	return
-
-LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
-	return
-
-LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
-	return
-
-LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
-	return
-
-LinkContestRoom1_EventScript_23BB01:: @ 823BB01
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
-	return
-
-LinkContestRoom1_EventScript_23BB07:: @ 823BB07
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
-	return
-
-LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
-	return
-
-LinkContestRoom1_EventScript_23BB13:: @ 823BB13
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
-	return
-
-LinkContestRoom1_EventScript_23BB19:: @ 823BB19
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
-	return
-
-LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
-	return
-
-LinkContestRoom1_EventScript_23BB25:: @ 823BB25
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
-	return
-
-LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_23BD86
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_23BB78
-	case 2, LinkContestRoom1_EventScript_23BB8B
-	case 3, LinkContestRoom1_EventScript_23BBE6
-	case 4, LinkContestRoom1_EventScript_23BC92
-	case 5, LinkContestRoom1_EventScript_23BC92
-	return
-
-LinkContestRoom1_EventScript_23BB78:: @ 823BB78
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
-	return
-
-LinkContestRoom1_EventScript_23BC92:: @ 823BC92
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
-	return
-
-LinkContestRoom1_EventScript_23BD86:: @ 823BD86
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BE44:: @ 823BE44
-	special sub_80F9154
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_23BE84
-	case 2, LinkContestRoom1_EventScript_23BE8E
-	case 3, LinkContestRoom1_EventScript_23BE98
-	case 4, LinkContestRoom1_EventScript_23BEA2
-	case 5, LinkContestRoom1_EventScript_23BEAC
-	return
-
-LinkContestRoom1_EventScript_23BE84:: @ 823BE84
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE98:: @ 823BE98
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
-	checkplayergender
-	compare VAR_RESULT, MALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
-	compare VAR_RESULT, FEMALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
-
diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom5/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json
deleted file mode 100644
index 38bfcd979..000000000
--- a/data/maps/LinkContestRoom6/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_LINK_CONTEST_ROOM6",
-  "name": "LinkContestRoom6",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM6",
-  "music": "MUS_CONTEST0",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom6/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index eaa17a5df..56249cb50 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_EventScript_1E8034",
+      "script": "LittlerootTown_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -43,7 +43,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_EventScript_1E8022",
+      "script": "LittlerootTown_EventScript_FatMan",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_EventScript_1E802B",
+      "script": "LittlerootTown_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_EventScript_1E863D",
+      "script": "LittlerootTown_EventScript_Mom",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE"
     },
     {
@@ -156,7 +156,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "0",
-      "script": "LittlerootTown_EventScript_1E8091"
+      "script": "LittlerootTown_EventScript_NeedPokemonTriggerLeft"
     },
     {
       "type": "trigger",
@@ -165,7 +165,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "0",
-      "script": "LittlerootTown_EventScript_1E80EF"
+      "script": "LittlerootTown_EventScript_NeedPokemonTriggerRight"
     },
     {
       "type": "trigger",
@@ -174,7 +174,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "1",
-      "script": "LittlerootTown_EventScript_1E811F"
+      "script": "LittlerootTown_EventScript_GoSaveBirchTrigger"
     },
     {
       "type": "trigger",
@@ -183,7 +183,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E81F9"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger4"
     },
     {
       "type": "trigger",
@@ -192,7 +192,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E8205"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger5"
     },
     {
       "type": "trigger",
@@ -201,7 +201,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E81E1"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger2"
     },
     {
       "type": "trigger",
@@ -210,7 +210,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E81ED"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger3"
     },
     {
       "type": "trigger",
@@ -219,7 +219,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E81BB"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger0"
     },
     {
       "type": "trigger",
@@ -228,7 +228,7 @@
       "elevation": 3,
       "var": "VAR_LITTLEROOT_TOWN_STATE",
       "var_value": "3",
-      "script": "LittlerootTown_EventScript_1E81CE"
+      "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger1"
     }
   ],
   "bg_events": [
@@ -238,7 +238,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_EventScript_1E8151"
+      "script": "LittlerootTown_EventScript_TownSign"
     },
     {
       "type": "sign",
@@ -246,7 +246,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_EventScript_1E815A"
+      "script": "LittlerootTown_EventScript_BirchsLabSign"
     },
     {
       "type": "sign",
@@ -254,7 +254,7 @@
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_EventScript_1E8163"
+      "script": "LittlerootTown_EventScript_BrendansHouseSign"
     },
     {
       "type": "sign",
@@ -262,7 +262,7 @@
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_EventScript_1E818F"
+      "script": "LittlerootTown_EventScript_MaysHouseSign"
     }
   ]
 }
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index 8825d1899..cb2589ed2 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -1,139 +1,169 @@
 LittlerootTown_MapScripts:: @ 81E7DCB
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_OnWarp
 	.byte 0
 
-LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
+	@ State descriptions for VAR_LITTLEROOT_TOWN_STATE
+	@ 1: Met Rival
+	@ 2: Saving Birch
+	@ 3: Received Pokedex
+	@ 4: Received Running Shoes
+
+	@ State descriptions for VAR_LITTLEROOT_INTRO_STATE
+	@ 1: In truck male
+	@ 2: In truck female
+	@ 3: Entered house
+	@ 4: Told to go set clock
+	@ 5: Entered 2F to set clock
+	@ 6: Set clock
+	@ 7: Told to go meet rival
+
+	@ State descriptions for VAR_LITTLEROOT_HOUSES_STATE_MAY
+	@                    and VAR_LITTLEROOT_HOUSES_STATE_BRENDAN
+	@ 1: On Truck (and is corresponding gender)
+	@ 2: Met Rival's Mom (and is corresponding gender)
+	@ 3: Entered Hall of Fame
+	@ 4: Completed Lati TV / SS Ticket event
+	@ 5: Exited house after above event
+
+	@ State descriptions for VAR_LITTLEROOT_RIVAL_STATE
+	@ 1: Never occurs
+	@ 2: Entered Rival's bedroom
+	@ 3: Met Rival
+	@ 4: Received Pokedex
+
+
+LittlerootTown_OnTransition: @ 81E7DDB
 	setflag FLAG_VISITED_LITTLEROOT_TOWN
 	call Common_EventScript_SetupRivalGfxId
 	compare VAR_LITTLEROOT_INTRO_STATE, 2
-	call_if_eq LittlerootTown_EventScript_1E7E67
-	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
+	call_if_eq LittlerootTown_EventScript_MoveMomToMaysDoor
+	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_SetTwinPos
 	compare VAR_LITTLEROOT_TOWN_STATE, 3
-	call_if_eq LittlerootTown_EventScript_1E7E92
-	compare VAR_LITTLEROOT_HOUSES_STATE, 4
-	call_if_eq LittlerootTown_EventScript_1E7E5C
-	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
-	call_if_eq LittlerootTown_EventScript_1E7E5C
+	call_if_eq LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos
+	compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
+	call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
+	compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
+	call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
 	compare VAR_OLDALE_RIVAL_STATE, 1
-	call_if_eq LittlerootTown_EventScript_1E7E53
+	call_if_eq LittlerootTown_EventScript_MoveRivalFromOldale
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if_eq LittlerootTown_EventScript_1E7E4F
+	call_if_eq LittlerootTown_EventScript_SetRivalLeftForRoute103
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
-	call_if_eq LittlerootTown_EventScript_1E7E4B
+	call_if_eq LittlerootTown_EventScript_HideMapNamePopup
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	call_if_eq LittlerootTown_EventScript_1E7E45
+	call_if_eq LittlerootTown_EventScript_LeftLabAfterDexUpgrade
 	end
 
-LittlerootTown_EventScript_1E7E45:: @ 81E7E45
+LittlerootTown_EventScript_LeftLabAfterDexUpgrade:: @ 81E7E45
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	return
 
-LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
+LittlerootTown_EventScript_HideMapNamePopup:: @ 81E7E4B
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
+LittlerootTown_EventScript_SetRivalLeftForRoute103:: @ 81E7E4F
 	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
-LittlerootTown_EventScript_1E7E53:: @ 81E7E53
+LittlerootTown_EventScript_MoveRivalFromOldale:: @ 81E7E53
 	setvar VAR_OLDALE_RIVAL_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	return
 
-LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
+LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent:: @ 81E7E5C
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 5
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 5
 	return
 
-LittlerootTown_EventScript_1E7E67:: @ 81E7E67
+LittlerootTown_EventScript_MoveMomToMaysDoor:: @ 81E7E67
 	setobjectxyperm 4, 14, 8
 	return
 
-LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
+LittlerootTown_EventScript_SetTwinPos:: @ 81E7E6F
 	compare VAR_LITTLEROOT_TOWN_STATE, 0
-	goto_if_eq LittlerootTown_EventScript_1E7E86
+	goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos
 	setobjectxyperm 1, 10, 1
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_EventScript_1E7E86:: @ 81E7E86
+LittlerootTown_EventScript_SetTwinGuardingRoutePos:: @ 81E7E86
 	setobjectxyperm 1, 7, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-LittlerootTown_EventScript_1E7E92:: @ 81E7E92
+LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 81E7E92
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E7EB1
+	call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E7EB9
+	call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale
 	return
 
-LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1
+LittlerootTown_EventScript_SetMomInFrontOfDoorMale:: @ 81E7EB1
 	setobjectxyperm 4, 5, 9
 	return
 
-LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
+LittlerootTown_EventScript_SetMomInFrontOfDoorFemale:: @ 81E7EB9
 	setobjectxyperm 4, 14, 9
 	return
 
-LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FB1
+LittlerootTown_OnFrame: @ 81E7EC1
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_StepOffTruckMale
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_StepOffTruckFemale
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_BeginDexUpgradeScene
 	.2byte 0
 
-LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB
+LittlerootTown_EventScript_StepOffTruckMale:: @ 81E7EDB
 	lockall
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 8
-	call LittlerootTown_EventScript_1E7F17
+	call LittlerootTown_EventScript_GoInsideWithMom
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
 	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
 	waitstate
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9
+LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9
 	lockall
 	setvar VAR_0x8004, 14
 	setvar VAR_0x8005, 8
-	call LittlerootTown_EventScript_1E7F17
+	call LittlerootTown_EventScript_GoInsideWithMom
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
 	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
 	waitstate
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E7F17:: @ 81E7F17
+LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17
 	delay 15
 	playse SE_DANSA
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck
 	waitmovement 0
 	opendoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	addobject 4
-	applymovement 4, LittlerootTown_Movement_1E7F98
+	applymovement 4, LittlerootTown_Movement_MomExitHouse
 	waitmovement 0
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	delay 10
-	applymovement 4, LittlerootTown_Movement_1E7F9A
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerAtTruck
 	waitmovement 0
-	msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LittlerootTown_Movement_1E7F9D
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4
+	applymovement 4, LittlerootTown_Movement_MomApproachDoor
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor
 	waitmovement 0
 	opendoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E7FA1
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9
+	applymovement 4, LittlerootTown_Movement_MomEnterHouse
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse
 	waitmovement 0
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setvar VAR_LITTLEROOT_INTRO_STATE, 3
@@ -144,52 +174,52 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LittlerootTown_Movement_1E7F98: @ 81E7F98
+LittlerootTown_Movement_MomExitHouse: @ 81E7F98
 	walk_down
 	step_end
 
-LittlerootTown_Movement_1E7F9A: @ 81E7F9A
+LittlerootTown_Movement_MomApproachPlayerAtTruck: @ 81E7F9A
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_Movement_1E7F9D: @ 81E7F9D
+LittlerootTown_Movement_MomApproachDoor: @ 81E7F9D
 	delay_16
 	delay_8
 	walk_up
 	step_end
 
-LittlerootTown_Movement_1E7FA1: @ 81E7FA1
+LittlerootTown_Movement_MomEnterHouse: @ 81E7FA1
 	walk_up
 	set_invisible
 	step_end
 
-LittlerootTown_Movement_1E7FA4: @ 81E7FA4
+LittlerootTown_Movement_PlayerApproachDoor: @ 81E7FA4
 	delay_16
 	delay_8
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E7FA9: @ 81E7FA9
+LittlerootTown_Movement_PlayerEnterHouse: @ 81E7FA9
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_Movement_1E7FAC: @ 81E7FAC
+LittlerootTown_Movement_PlayerStepOffTruck: @ 81E7FAC
 	jump_right
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
+LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 81E7FB1
 	lockall
 	playse SE_PIN
 	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 80
-	msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_BirchSomethingToShowYouAtLab, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
@@ -200,51 +230,51 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	releaseall
 	end
 
-LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FEC
+LittlerootTown_OnWarp: @ 81E7FE2
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade
 	.2byte 0
 
-LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade:: @ 81E7FEC
 	addobject 8
 	addobject 7
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_EventScript_1E8004
-	goto LittlerootTown_EventScript_1E8013
+	goto_if_eq LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale
+	goto LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale
 	end
 
-LittlerootTown_EventScript_1E8004:: @ 81E8004
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale:: @ 81E8004
 	setobjectxy 7, 6, 10
 	setobjectxy 8, 5, 10
 	end
 
-LittlerootTown_EventScript_1E8013:: @ 81E8013
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale:: @ 81E8013
 	setobjectxy 7, 13, 10
 	setobjectxy 8, 14, 10
 	end
 
-LittlerootTown_EventScript_1E8022:: @ 81E8022
-	msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC
+LittlerootTown_EventScript_FatMan:: @ 81E8022
+	msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC
 	end
 
-LittlerootTown_EventScript_1E802B:: @ 81E802B
-	msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC
+LittlerootTown_EventScript_Boy:: @ 81E802B
+	msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC
 	end
 
-LittlerootTown_EventScript_1E8034:: @ 81E8034
+LittlerootTown_EventScript_Twin:: @ 81E8034
 	lock
 	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087
-	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A
+	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch
 	compare VAR_LITTLEROOT_TOWN_STATE, 0
-	goto_if_ne LittlerootTown_EventScript_1E805D
-	msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
+	goto_if_ne LittlerootTown_EventScript_GoSaveBirch
+	msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_EventScript_1E805D:: @ 81E805D
+LittlerootTown_EventScript_GoSaveBirch:: @ 81E805D
 	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -252,38 +282,38 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
 	release
 	end
 
-LittlerootTown_EventScript_1E807A:: @ 81E807A
+LittlerootTown_EventScript_YouSavedBirch:: @ 81E807A
 	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_YouSavedBirch, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_EventScript_1E8087:: @ 81E8087
-	msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT
+LittlerootTown_EventScript_GoodLuck:: @ 81E8087
+	msgbox LittlerootTown_Text_GoodLuckCatchingPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_EventScript_1E8091:: @ 81E8091
+LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 81E8091
 	lockall
-	applymovement 1, LittlerootTown_Movement_1E80D1
+	applymovement 1, LittlerootTown_Movement_TwinApproachPlayerLeft
 	waitmovement 0
-	call LittlerootTown_EventScript_1E80AD
-	applymovement 1, LittlerootTown_Movement_1E80E1
+	call LittlerootTown_EventScript_DangerousWithoutPokemon
+	applymovement 1, LittlerootTown_Movement_TwinReturnLeft
 	waitmovement 0
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E80AD:: @ 81E80AD
-	msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
+LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD
+	msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_1E80DF
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB
+	applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute
 	waitmovement 0
-	msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_Movement_1E80D1: @ 81E80D1
+LittlerootTown_Movement_TwinApproachPlayerLeft: @ 81E80D1
 	face_right
 	delay_8
 	disable_jump_landing_ground_effect
@@ -299,11 +329,11 @@ LittlerootTown_Movement_1E80D1: @ 81E80D1
 	face_down
 	step_end
 
-LittlerootTown_Movement_1E80DF: @ 81E80DF
+LittlerootTown_Movement_TwinPushPlayerFromRoute: @ 81E80DF
 	walk_down
 	step_end
 
-LittlerootTown_Movement_1E80E1: @ 81E80E1
+LittlerootTown_Movement_TwinReturnLeft: @ 81E80E1
 	walk_right
 	walk_down
 	walk_down
@@ -315,23 +345,23 @@ LittlerootTown_Movement_1E80E1: @ 81E80E1
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_Movement_1E80EB: @ 81E80EB
+LittlerootTown_Movement_PushPlayerBackFromRoute: @ 81E80EB
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-LittlerootTown_EventScript_1E80EF:: @ 81E80EF
+LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 81E80EF
 	lockall
-	applymovement 1, LittlerootTown_Movement_1E810B
+	applymovement 1, LittlerootTown_Movement_TwinApproachPlayerRight
 	waitmovement 0
-	call LittlerootTown_EventScript_1E80AD
-	applymovement 1, LittlerootTown_Movement_1E8118
+	call LittlerootTown_EventScript_DangerousWithoutPokemon
+	applymovement 1, LittlerootTown_Movement_TwinReturnRight
 	waitmovement 0
 	releaseall
 	end
 
-LittlerootTown_Movement_1E810B: @ 81E810B
+LittlerootTown_Movement_TwinApproachPlayerRight: @ 81E810B
 	face_right
 	delay_8
 	disable_jump_landing_ground_effect
@@ -346,7 +376,7 @@ LittlerootTown_Movement_1E810B: @ 81E810B
 	face_down
 	step_end
 
-LittlerootTown_Movement_1E8118: @ 81E8118
+LittlerootTown_Movement_TwinReturnRight: @ 81E8118
 	walk_left
 	walk_down
 	walk_left
@@ -355,14 +385,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_EventScript_1E811F:: @ 81E811F
+LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -370,372 +400,372 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E8151:: @ 81E8151
-	msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN
+LittlerootTown_EventScript_TownSign:: @ 81E8151
+	msgbox LittlerootTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-LittlerootTown_EventScript_1E815A:: @ 81E815A
-	msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN
+LittlerootTown_EventScript_BirchsLabSign:: @ 81E815A
+	msgbox LittlerootTown_Text_ProfBirchsLab, MSGBOX_SIGN
 	end
 
-LittlerootTown_EventScript_1E8163:: @ 81E8163
+LittlerootTown_EventScript_BrendansHouseSign:: @ 81E8163
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E817D
+	call_if_eq LittlerootTown_EventScript_PlayersHouseSignMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E8186
+	call_if_eq LittlerootTown_EventScript_BirchsHouseSignFemale
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E817D:: @ 81E817D
-	msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT
+LittlerootTown_EventScript_PlayersHouseSignMale:: @ 81E817D
+	msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_1E8186:: @ 81E8186
-	msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT
+LittlerootTown_EventScript_BirchsHouseSignFemale:: @ 81E8186
+	msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_1E818F:: @ 81E818F
+LittlerootTown_EventScript_MaysHouseSign:: @ 81E818F
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E81A9
+	call_if_eq LittlerootTown_EventScript_BirchsHouseSignMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E81B2
+	call_if_eq LittlerootTown_EventScript_PlayersHouseSignFemale
 	releaseall
 	end
 
-LittlerootTown_EventScript_1E81A9:: @ 81E81A9
-	msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT
+LittlerootTown_EventScript_BirchsHouseSignMale:: @ 81E81A9
+	msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_1E81B2:: @ 81E81B2
-	msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT
+LittlerootTown_EventScript_PlayersHouseSignFemale:: @ 81E81B2
+	msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_1E81BB:: @ 81E81BB
+LittlerootTown_EventScript_GiveRunningShoesTrigger0:: @ 81E81BB
 	lockall
 	setvar VAR_0x8008, 0
 	setobjectxy 4, 10, 9
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E81CE:: @ 81E81CE
+LittlerootTown_EventScript_GiveRunningShoesTrigger1:: @ 81E81CE
 	lockall
 	setvar VAR_0x8008, 1
 	setobjectxy 4, 11, 9
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E81E1:: @ 81E81E1
+LittlerootTown_EventScript_GiveRunningShoesTrigger2:: @ 81E81E1
 	lockall
 	setvar VAR_0x8008, 2
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E81ED:: @ 81E81ED
+LittlerootTown_EventScript_GiveRunningShoesTrigger3:: @ 81E81ED
 	lockall
 	setvar VAR_0x8008, 3
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E81F9:: @ 81E81F9
+LittlerootTown_EventScript_GiveRunningShoesTrigger4:: @ 81E81F9
 	lockall
 	setvar VAR_0x8008, 4
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E8205:: @ 81E8205
+LittlerootTown_EventScript_GiveRunningShoesTrigger5:: @ 81E8205
 	lockall
 	setvar VAR_0x8008, 5
-	goto LittlerootTown_EventScript_1E8211
+	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_1E8211:: @ 81E8211
+LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 81E8211
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E8297
+	call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E82A2
+	call_if_eq LittlerootTown_EventScript_MomNoticePlayerFemale
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E8281
+	call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E828C
-	msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT
+	call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale
+	msgbox LittlerootTown_Text_WaitPlayer, MSGBOX_DEFAULT
 	closemessage
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E82AD
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E82F0
-	call LittlerootTown_EventScript_1E8693
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale
+	call LittlerootTown_EventScript_GiveRunningShoes
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E8405
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E8448
-	goto LittlerootTown_EventScript_1E8686
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale
+	goto LittlerootTown_EventScript_SetReceivedRunningShoes
 	end
 
-LittlerootTown_EventScript_1E8281:: @ 81E8281
+LittlerootTown_EventScript_SetHomeDoorCoordsMale:: @ 81E8281
 	setvar VAR_0x8009, 5
 	setvar VAR_0x800A, 8
 	return
 
-LittlerootTown_EventScript_1E828C:: @ 81E828C
+LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: @ 81E828C
 	setvar VAR_0x8009, 14
 	setvar VAR_0x800A, 8
 	return
 
-LittlerootTown_EventScript_1E8297:: @ 81E8297
+LittlerootTown_EventScript_MomNoticePlayerMale:: @ 81E8297
 	applymovement 4, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E82A2:: @ 81E82A2
+LittlerootTown_EventScript_MomNoticePlayerFemale:: @ 81E82A2
 	applymovement 4, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E82AD:: @ 81E82AD
+LittlerootTown_EventScript_MomApproachPlayerMale:: @ 81E82AD
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_EventScript_1E8333
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_EventScript_1E8348
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_EventScript_1E835D
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale2
 	compare VAR_0x8008, 3
-	call_if_eq LittlerootTown_EventScript_1E8372
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale3
 	compare VAR_0x8008, 4
-	call_if_eq LittlerootTown_EventScript_1E8387
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale4
 	compare VAR_0x8008, 5
-	call_if_eq LittlerootTown_EventScript_1E839C
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5
 	return
 
-LittlerootTown_EventScript_1E82F0:: @ 81E82F0
+LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_EventScript_1E8333
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_EventScript_1E8348
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_EventScript_1E83B1
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale2
 	compare VAR_0x8008, 3
-	call_if_eq LittlerootTown_EventScript_1E83C6
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale3
 	compare VAR_0x8008, 4
-	call_if_eq LittlerootTown_EventScript_1E83DB
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale4
 	compare VAR_0x8008, 5
-	call_if_eq LittlerootTown_EventScript_1E83F0
+	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5
 	return
 
-LittlerootTown_EventScript_1E8333:: @ 81E8333
+LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85D1
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E8348:: @ 81E8348
+LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85D8
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E835D:: @ 81E835D
+LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85DF
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E8372:: @ 81E8372
+LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85E4
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E8387:: @ 81E8387
+LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85EA
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E839C:: @ 81E839C
+LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85ED
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E83B1:: @ 81E83B1
+LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F1
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E83C6:: @ 81E83C6
+LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F5
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E83DB:: @ 81E83DB
+LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F8
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E83F0:: @ 81E83F0
+LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85FE
+	applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E8405:: @ 81E8405
+LittlerootTown_EventScript_MomReturnHomeMale:: @ 81E8405
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_EventScript_1E848B
+	call_if_eq LittlerootTown_EventScript_MomReturnHome0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_EventScript_1E8496
+	call_if_eq LittlerootTown_EventScript_MomReturnHome1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_EventScript_1E84A1
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale2
 	compare VAR_0x8008, 3
-	call_if_eq LittlerootTown_EventScript_1E84C7
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale3
 	compare VAR_0x8008, 4
-	call_if_eq LittlerootTown_EventScript_1E84ED
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale4
 	compare VAR_0x8008, 5
-	call_if_eq LittlerootTown_EventScript_1E8513
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5
 	return
 
-LittlerootTown_EventScript_1E8448:: @ 81E8448
+LittlerootTown_EventScript_MomReturnHomeFemale:: @ 81E8448
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_EventScript_1E848B
+	call_if_eq LittlerootTown_EventScript_MomReturnHome0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_EventScript_1E8496
+	call_if_eq LittlerootTown_EventScript_MomReturnHome1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_EventScript_1E8539
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale2
 	compare VAR_0x8008, 3
-	call_if_eq LittlerootTown_EventScript_1E855F
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale3
 	compare VAR_0x8008, 4
-	call_if_eq LittlerootTown_EventScript_1E8585
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale4
 	compare VAR_0x8008, 5
-	call_if_eq LittlerootTown_EventScript_1E85AB
+	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5
 	return
 
-LittlerootTown_EventScript_1E848B:: @ 81E848B
-	applymovement 4, LittlerootTown_Movement_1E8603
+LittlerootTown_EventScript_MomReturnHome0:: @ 81E848B
+	applymovement 4, LittlerootTown_Movement_MomReturnHome0
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E8496:: @ 81E8496
-	applymovement 4, LittlerootTown_Movement_1E8609
+LittlerootTown_EventScript_MomReturnHome1:: @ 81E8496
+	applymovement 4, LittlerootTown_Movement_MomReturnHome1
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_1E84A1:: @ 81E84A1
-	applymovement 4, LittlerootTown_Movement_1E860F
+LittlerootTown_EventScript_MomReturnHomeMale2:: @ 81E84A1
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeMale2
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E84C7:: @ 81E84C7
-	applymovement 4, LittlerootTown_Movement_1E8615
+LittlerootTown_EventScript_MomReturnHomeMale3:: @ 81E84C7
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeMale3
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E84ED:: @ 81E84ED
-	applymovement 4, LittlerootTown_Movement_1E861C
+LittlerootTown_EventScript_MomReturnHomeMale4:: @ 81E84ED
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeMale4
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E8513:: @ 81E8513
-	applymovement 4, LittlerootTown_Movement_1E8620
+LittlerootTown_EventScript_MomReturnHomeMale5:: @ 81E8513
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeMale5
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E8539:: @ 81E8539
-	applymovement 4, LittlerootTown_Movement_1E8625
+LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 81E8539
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale2
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E855F:: @ 81E855F
-	applymovement 4, LittlerootTown_Movement_1E862A
+LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 81E855F
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale3
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E8585:: @ 81E8585
-	applymovement 4, LittlerootTown_Movement_1E862E
+LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 81E8585
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale4
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_1E85AB:: @ 81E85AB
-	applymovement 4, LittlerootTown_Movement_1E8635
+LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 81E85AB
+	applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale5
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
 	return
 
-LittlerootTown_Movement_1E85D1: @ 81E85D1
+LittlerootTown_Movement_MomApproachPlayer0: @ 81E85D1
 	walk_up
 	walk_up
 	walk_up
@@ -744,7 +774,7 @@ LittlerootTown_Movement_1E85D1: @ 81E85D1
 	walk_up
 	step_end
 
-LittlerootTown_Movement_1E85D8: @ 81E85D8
+LittlerootTown_Movement_MomApproachPlayer1: @ 81E85D8
 	walk_up
 	walk_up
 	walk_up
@@ -753,14 +783,14 @@ LittlerootTown_Movement_1E85D8: @ 81E85D8
 	walk_up
 	step_end
 
-LittlerootTown_Movement_1E85DF: @ 81E85DF
+LittlerootTown_Movement_MomApproachPlayerMale2: @ 81E85DF
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_1E85E4: @ 81E85E4
+LittlerootTown_Movement_MomApproachPlayerMale3: @ 81E85E4
 	walk_right
 	walk_right
 	walk_right
@@ -768,29 +798,29 @@ LittlerootTown_Movement_1E85E4: @ 81E85E4
 	walk_right
 	step_end
 
-LittlerootTown_Movement_1E85EA: @ 81E85EA
+LittlerootTown_Movement_MomApproachPlayerMale4: @ 81E85EA
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_1E85ED: @ 81E85ED
+LittlerootTown_Movement_MomApproachPlayerMale5: @ 81E85ED
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_1E85F1: @ 81E85F1
+LittlerootTown_Movement_MomApproachPlayerFemale2: @ 81E85F1
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_1E85F5: @ 81E85F5
+LittlerootTown_Movement_MomApproachPlayerFemale3: @ 81E85F5
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_1E85F8: @ 81E85F8
+LittlerootTown_Movement_MomApproachPlayerFemale4: @ 81E85F8
 	walk_left
 	walk_left
 	walk_left
@@ -798,14 +828,14 @@ LittlerootTown_Movement_1E85F8: @ 81E85F8
 	walk_left
 	step_end
 
-LittlerootTown_Movement_1E85FE: @ 81E85FE
+LittlerootTown_Movement_MomApproachPlayerFemale5: @ 81E85FE
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_1E8603: @ 81E8603
+LittlerootTown_Movement_MomReturnHome0: @ 81E8603
 	walk_down
 	walk_down
 	walk_down
@@ -813,7 +843,7 @@ LittlerootTown_Movement_1E8603: @ 81E8603
 	walk_down
 	step_end
 
-LittlerootTown_Movement_1E8609: @ 81E8609
+LittlerootTown_Movement_MomReturnHome1: @ 81E8609
 	walk_down
 	walk_down
 	walk_down
@@ -821,7 +851,7 @@ LittlerootTown_Movement_1E8609: @ 81E8609
 	walk_down
 	step_end
 
-LittlerootTown_Movement_1E860F: @ 81E860F
+LittlerootTown_Movement_MomReturnHomeMale2: @ 81E860F
 	walk_left
 	walk_left
 	walk_left
@@ -829,7 +859,7 @@ LittlerootTown_Movement_1E860F: @ 81E860F
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E8615: @ 81E8615
+LittlerootTown_Movement_MomReturnHomeMale3: @ 81E8615
 	walk_left
 	walk_left
 	walk_left
@@ -838,33 +868,33 @@ LittlerootTown_Movement_1E8615: @ 81E8615
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E861C: @ 81E861C
+LittlerootTown_Movement_MomReturnHomeMale4: @ 81E861C
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E8620: @ 81E8620
+LittlerootTown_Movement_MomReturnHomeMale5: @ 81E8620
 	walk_left
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E8625: @ 81E8625
+LittlerootTown_Movement_MomReturnHomeFemale2: @ 81E8625
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E862A: @ 81E862A
+LittlerootTown_Movement_MomReturnHomeFemale3: @ 81E862A
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E862E: @ 81E862E
+LittlerootTown_Movement_MomReturnHomeFemale4: @ 81E862E
 	walk_right
 	walk_right
 	walk_right
@@ -873,7 +903,7 @@ LittlerootTown_Movement_1E862E: @ 81E862E
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E8635: @ 81E8635
+LittlerootTown_Movement_MomReturnHomeFemale5: @ 81E8635
 	walk_right
 	walk_right
 	walk_right
@@ -881,51 +911,51 @@ LittlerootTown_Movement_1E8635: @ 81E8635
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_1E863B: @ 81E863B
+LittlerootTown_Movement_MomExitThroughDoor: @ 81E863B
 	walk_up
 	step_end
 
-LittlerootTown_EventScript_1E863D:: @ 81E863D
+LittlerootTown_EventScript_Mom:: @ 81E863D
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_EventScript_1E8281
+	call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_EventScript_1E828C
-	call LittlerootTown_EventScript_1E8693
+	call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale
+	call LittlerootTown_EventScript_GiveRunningShoes
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
+	applymovement 4, LittlerootTown_Movement_MomExitThroughDoor
 	waitmovement 0
 	hideobjectat 4, MAP_LITTLEROOT_TOWN
 	closedoor VAR_0x8009, VAR_0x800A
 	waitdooranim
-	goto LittlerootTown_EventScript_1E8686
+	goto LittlerootTown_EventScript_SetReceivedRunningShoes
 	end
 
-LittlerootTown_EventScript_1E8686:: @ 81E8686
+LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686
 	removeobject 4
 	setflag FLAG_SYS_B_DASH
 	setvar VAR_LITTLEROOT_TOWN_STATE, 4
 	release
 	end
 
-LittlerootTown_EventScript_1E8693:: @ 81E8693
-	msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT
+LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693
+	msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message LittlerootTown_Text_1E8925
+	message LittlerootTown_Text_SwitchShoesWithRunningShoes
 	waitfanfare
 	setflag FLAG_RECEIVED_RUNNING_SHOES
-	msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT
-	msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_ExplainRunningShoes, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_ComeHomeIfAnythingHappens, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	return
 
-LittlerootTown_Text_1E86BC: @ 81E86BC
+LittlerootTown_Text_OurNewHomeLetsGoInside: @ 81E86BC
 	.string "MOM: {PLAYER}, we're here, honey!\p"
 	.string "It must be tiring riding with our things\n"
 	.string "in the moving truck.\p"
@@ -937,10 +967,10 @@ LittlerootTown_Text_1E86BC: @ 81E86BC
 	.string "And, you get your own room, {PLAYER}!\n"
 	.string "Let's go inside.$"
 
-LittlerootTown_Text_1E87E1: @ 81E87E1
+LittlerootTown_Text_WaitPlayer: @ 81E87E1
 	.string "MOM: Wait, {PLAYER}!$"
 
-LittlerootTown_Text_1E87F0: @ 81E87F0
+LittlerootTown_Text_WearTheseRunningShoes: @ 81E87F0
 	.string "MOM: {PLAYER}! {PLAYER}! Did you\n"
 	.string "introduce yourself to PROF. BIRCH?\p"
 	.string "Oh! What an adorable POKéMON!\n"
@@ -951,11 +981,11 @@ LittlerootTown_Text_1E87F0: @ 81E87F0
 	.string "adventure, wear these RUNNING SHOES.\p"
 	.string "They'll put a zip in your step!$"
 
-LittlerootTown_Text_1E8925: @ 81E8925
+LittlerootTown_Text_SwitchShoesWithRunningShoes: @ 81E8925
 	.string "{PLAYER} switched shoes with the\n"
 	.string "RUNNING SHOES.$"
 
-LittlerootTown_Text_1E894F: @ 81E894F
+LittlerootTown_Text_ExplainRunningShoes: @ 81E894F
 	.string "MOM: {PLAYER}, those shoes came with\n"
 	.string "instructions.\p"
 	.string "“Press the B Button while wearing these\n"
@@ -963,7 +993,7 @@ LittlerootTown_Text_1E894F: @ 81E894F
 	.string "“Slip on these RUNNING SHOES and race\n"
 	.string "in the great outdoors!”$"
 
-LittlerootTown_Text_1E8A03: @ 81E8A03
+LittlerootTown_Text_ComeHomeIfAnythingHappens: @ 81E8A03
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "To think that you have your very own\n"
@@ -973,28 +1003,28 @@ LittlerootTown_Text_1E8A03: @ 81E8A03
 	.string "If anything happens, you can come home.\p"
 	.string "Go on, go get them, honey!$"
 
-LittlerootTown_Text_1E8ACF: @ 81E8ACF
+LittlerootTown_Text_CanUsePCToStoreItems: @ 81E8ACF
 	.string "If you use a PC, you can store items\n"
 	.string "and POKéMON.\p"
 	.string "The power of science is staggering!$"
 
-LittlerootTown_Text_1E8B25: @ 81E8B25
+LittlerootTown_Text_BirchSpendsDaysInLab: @ 81E8B25
 	.string "PROF. BIRCH spends days in his LAB\n"
 	.string "studying, then he'll suddenly go out in\l"
 	.string "the wild to do more research…\p"
 	.string "When does PROF. BIRCH spend time\n"
 	.string "at home?$"
 
-LittlerootTown_Text_1E8BB8: @ 81E8BB8
+LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut: @ 81E8BB8
 	.string "Um, um, um!\p"
 	.string "If you go outside and go in the grass,\n"
 	.string "wild POKéMON will jump out!$"
 
-LittlerootTown_Text_1E8C07: @ 81E8C07
+LittlerootTown_Text_DangerousIfYouDontHavePokemon: @ 81E8C07
 	.string "It's dangerous if you don't have\n"
 	.string "your own POKéMON.$"
 
-LittlerootTown_Text_1E8C3A: @ 81E8C3A
+LittlerootTown_Text_CanYouGoSeeWhatsHappening: @ 81E8C3A
 	.string "Um, hi!\p"
 	.string "There are scary POKéMON outside!\n"
 	.string "I can hear their cries!\p"
@@ -1003,28 +1033,28 @@ LittlerootTown_Text_1E8C3A: @ 81E8C3A
 	.string "Can you go see what's happening\n"
 	.string "for me?$"
 
-LittlerootTown_Text_1E8CE3: @ 81E8CE3
+LittlerootTown_Text_YouSavedBirch: @ 81E8CE3
 	.string "You saved PROF. BIRCH!\n"
 	.string "I'm so glad!$"
 
-LittlerootTown_Text_1E8D07: @ 81E8D07
+LittlerootTown_Text_GoodLuckCatchingPokemon: @ 81E8D07
 	.string "Are you going to catch POKéMON?\n"
 	.string "Good luck!$"
 
-LittlerootTown_Text_1E8D32: @ 81E8D32
+LittlerootTown_Text_TownSign: @ 81E8D32
 	.string "LITTLEROOT TOWN\n"
 	.string "“A town that can't be shaded any hue.”$"
 
-LittlerootTown_Text_1E8D69: @ 81E8D69
+LittlerootTown_Text_ProfBirchsLab: @ 81E8D69
 	.string "PROF. BIRCH'S POKéMON LAB$"
 
-LittlerootTown_Text_1E8D83: @ 81E8D83
+LittlerootTown_Text_PlayersHouse: @ 81E8D83
 	.string "{PLAYER}'s HOUSE$"
 
-LittlerootTown_Text_1E8D8E: @ 81E8D8E
+LittlerootTown_Text_ProfBirchsHouse: @ 81E8D8E
 	.string "PROF. BIRCH'S HOUSE$"
 
-LittlerootTown_Text_1E8DA2: @ 81E8DA2
+LittlerootTown_Text_BirchSomethingToShowYouAtLab: @ 81E8DA2
 	.string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n"
 	.string "That was good work out there!\p"
 	.string "I knew there was something special\n"
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
index d6d4af86c..8b0c762f9 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5",
+      "script": "PlayersHouse_1F_EventScript_Mom",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD",
+      "script": "PlayersHouse_1F_EventScript_Vigoroth2",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA",
+      "script": "PlayersHouse_1F_EventScript_Vigoroth1",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3",
+      "script": "RivalsHouse_1F_EventScript_RivalMom",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D",
+      "script": "RivalsHouse_1F_EventScript_RivalSibling",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING"
     },
     {
@@ -137,7 +137,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_INTRO_STATE",
       "var_value": "4",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3"
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom"
     },
     {
       "type": "trigger",
@@ -146,7 +146,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE"
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0"
     },
     {
       "type": "trigger",
@@ -155,7 +155,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA"
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1"
     },
     {
       "type": "trigger",
@@ -164,7 +164,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6"
+      "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 3d6284600..ee8d67cd9 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -1,93 +1,95 @@
 LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
-	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_OnFrame
 	.byte 0
 
-LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
+LittlerootTown_BrendansHouse_1F_OnLoad: @ 81F7765
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
-	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
+	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
+LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes:: @ 81F777A
 	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
 	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
+LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual:: @ 81F778D
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A
+	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
+LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F779A
 	setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
-LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
+LittlerootTown_BrendansHouse_1F_OnTransition: @ 81F77A4
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs:: @ 81F77C6
 	setobjectxyperm 1, 8, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV:: @ 81F77D2
 	setobjectxyperm 1, 4, 5
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE
 	setobjectxyperm 1, 9, 8
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
+@ Many of the below scripts have no gender check because they assume youre in the correct house
+@ The below SS Ticket script uses Mays house state by accident(?), but theyre both set identically after the intro
+LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
 	.2byte 0
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
+LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814
 	lockall
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F783A
-	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs
+	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs
 	waitmovement 0
 	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
 	waitstate
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A
+LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs: @ 81F783A
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C
+LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F783C
 	lockall
 	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292704
+	setvar VAR_0x8005, MALE
+	goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
+LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: @ 81F784D
 	lockall
 	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 1
-	goto LittlerootTown_BrendansHouse_1F_EventScript_29286D
+	setvar VAR_0x8005, 1  @ Object event ID for Mom
+	goto PlayersHouse_1F_EventScript_PetalburgGymReportMale
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
+LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E
 	lockall
 	playse SE_PIN
 	applymovement 4, Common_Movement_ExclamationMark
@@ -95,16 +97,16 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach
 	waitmovement 0
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
+	msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 2
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C
+LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach: @ 81F789C
 	walk_down
 	walk_right
 	walk_right
@@ -113,34 +115,34 @@ LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
+LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 81F78A3
 	lockall
 	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
+	setvar VAR_0x8005, MALE
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
+	goto PlayersHouse_1F_EventScript_MomGoSeeRoom
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0:: @ 81F78BE
 	lockall
 	setvar VAR_0x8008, 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1:: @ 81F78CA
 	lockall
 	setvar VAR_0x8008, 1
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6
 	lockall
 	setvar VAR_0x8008, 2
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
 	playse SE_KAIDAN
 	delay 10
 	addobject 7
@@ -151,22 +153,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
-	call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
+	call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan
 	playbgm MUS_BOY_SUP, 1
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2
+	msgbox RivalsHouse_1F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2
 	playse SE_KAIDAN
 	removeobject 7
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
@@ -180,27 +182,27 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
+LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0:: @ 81F798C
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1:: @ 81F7997
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2:: @ 81F79A2
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: @ 81F79AD
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -210,13 +212,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1: @ 81F79B5
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -226,31 +228,31 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79F7
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79FB
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F7A02
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0: @ 81F79F7
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: @ 81F79FB
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
@@ -259,13 +261,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2: @ 81F7A02
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: @ 81F7A06
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -273,7 +275,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: @ 81F7A0C
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -285,7 +287,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: @ 81F7A16
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -293,11 +295,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C
+PlayersHouse_1F_Text_IsntItNiceInHere: @ 81F7A1C
 	.string "MOM: See, {PLAYER}?\n"
 	.string "Isn't it nice in here, too?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46
+PlayersHouse_1F_Text_MoversPokemonGoSetClock: @ 81F7A46
 	.string "The mover's POKéMON do all the work\n"
 	.string "of moving us in and cleaning up after.\l"
 	.string "This is so convenient!\p"
@@ -307,91 +309,87 @@ LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46
 	.string "our move here.\l"
 	.string "Don't forget to set it!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24
+PlayersHouse_1F_Text_ArentYouInterestedInRoom: @ 81F7B24
 	.string "MOM: Well, {PLAYER}?\p"
 	.string "Aren't you interested in seeing your\n"
 	.string "very own room?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67
-LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67
+PlayersHouse_1F_Text_GoSetTheClock: @ 81F7B67
 	.string "MOM: {PLAYER}.\p"
 	.string "Go set the clock in your room, honey.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96
+PlayersHouse_1F_Text_OhComeQuickly: @ 81F7B96
 	.string "MOM: Oh! {PLAYER}, {PLAYER}!\n"
 	.string "Quick! Come quickly!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC
-LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC
+PlayersHouse_1F_Text_MaybeDadWillBeOn: @ 81F7BBC
 	.string "MOM: Look! It's PETALBURG GYM!\n"
 	.string "Maybe DAD will be on!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1
-LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1
+PlayersHouse_1F_Text_ItsOverWeMissedHim: @ 81F7BF1
 	.string "MOM: Oh… It's over.\p"
 	.string "I think DAD was on, but we missed him.\n"
 	.string "Too bad.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35
-LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35
+PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor: @ 81F7C35
 	.string "Oh, yes.\n"
 	.string "One of DAD's friends lives in town.\p"
 	.string "PROF. BIRCH is his name.\p"
 	.string "He lives right next door, so you should\n"
 	.string "go over and introduce yourself.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3
+PlayersHouse_1F_Text_SeeYouHoney: @ 81F7CC3
 	.string "MOM: See you, honey!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8
+PlayersHouse_1F_Text_DidYouMeetProfBirch: @ 81F7CD8
 	.string "MOM: Did you introduce yourself to\n"
 	.string "PROF. BIRCH?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08
+PlayersHouse_1F_Text_YouShouldRestABit: @ 81F7D08
 	.string "MOM: How are you doing, {PLAYER}?\n"
 	.string "You look a little tired.\p"
 	.string "I think you should rest a bit.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C
+PlayersHouse_1F_Text_TakeCareHoney: @ 81F7D5C
 	.string "MOM: Take care, honey!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73
+PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom: @ 81F7D73
 	.string "MOM: Oh? Did DAD give you that BADGE?\p"
 	.string "Then here's something from your MOM!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE
+PlayersHouse_1F_Text_DontPushYourselfTooHard: @ 81F7DBE
 	.string "Don't push yourself too hard, dear.\n"
 	.string "You can always come home.\p"
 	.string "Go for it, honey!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E
+PlayersHouse_1F_Text_IsThatAPokenav: @ 81F7E0E
 	.string "MOM: What is that, honey? A POKéNAV?\n"
 	.string "Someone from DEVON gave it to you?\p"
 	.string "Well, honey, how about registering\n"
 	.string "your mom?\p"
 	.string "… … …$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89
+PlayersHouse_1F_Text_RegisteredMom: @ 81F7E89
 	.string "Registered MOM\n"
 	.string "in the POKéNAV.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8
+PlayersHouse_1F_Text_Vigoroth1: @ 81F7EA8
 	.string "Fugiiiiih!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3
+PlayersHouse_1F_Text_Vigoroth2: @ 81F7EB3
 	.string "Huggoh, uggo uggo…$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6
+PlayersHouse_1F_Text_ReportFromPetalburgGym: @ 81F7EC6
 	.string "INTERVIEWER: …We brought you this\n"
 	.string "report from in front of PETALBURG GYM.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F
+PlayersHouse_1F_Text_TheresAMovieOnTV: @ 81F7F0F
 	.string "There is a movie on TV.\p"
 	.string "Two men are dancing on a big piano\n"
 	.string "keyboard.\p"
 	.string "Better get going!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66
+PlayersHouse_1F_Text_RunningShoesManual: @ 81F7F66
 	.string "It's the instruction booklet for the\n"
 	.string "RUNNING SHOES.\p"
 	.string "“Press the B Button to run while\n"
@@ -399,7 +397,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66
 	.string "“Lace up your RUNNING SHOES and hit\n"
 	.string "the road running!”$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E
+PlayersHouse_1F_Text_TicketFromBrineyCameForYou: @ 81F800E
 	.string "DAD: Hm?\p"
 	.string "Hey, it's {PLAYER}!\p"
 	.string "It's been a while since I saw you,\n"
@@ -410,26 +408,26 @@ LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E
 	.string "This came to you from someone named\l"
 	.string "MR. BRINEY.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE
+PlayersHouse_1F_Text_PortsInSlateportLilycove: @ 81F80FE
 	.string "DAD: Hm, a TICKET for a ferry?\p"
 	.string "If I recall, there are ferry ports in\n"
 	.string "SLATEPORT and LILYCOVE.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B
+PlayersHouse_1F_Text_BetterGetBackToGym: @ 81F815B
 	.string "I'd better get back to PETALBURG GYM.\p"
 	.string "MOM, thanks for looking after the house\n"
 	.string "while I'm away.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9
+PlayersHouse_1F_Text_DadShouldStayLonger: @ 81F81B9
 	.string "MOM: That DAD of yours…\p"
 	.string "He comes home for the first time in a\n"
 	.string "while, but all he talks about is POKéMON.\p"
 	.string "He should relax and stay a little longer.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B
+PlayersHouse_1F_Text_IsThatABreakingStory: @ 81F824B
 	.string "MOM: Is that a breaking news story?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F
+PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F
 	.string "We bring you this emergency\n"
 	.string "news flash!\p"
 	.string "In various HOENN locales, there have\n"
@@ -440,11 +438,11 @@ LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F
 	.string "We now return you to the regular\n"
 	.string "movie program.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351
+PlayersHouse_1F_Text_WhatColorDidTheySay: @ 81F8351
 	.string "MOM: {PLAYER}, did you catch that?\p"
 	.string "What color did the announcer say\n"
 	.string "that POKéMON was?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1
+PlayersHouse_1F_Text_StillUnknownPokemon: @ 81F83A1
 	.string "MOM: Well, isn't that something!\n"
 	.string "There are still unknown POKéMON.$"
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
index e07959b20..01af64e7d 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1",
+      "script": "RivalsHouse_2F_EventScript_Rival",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481",
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL"
     },
     {
@@ -240,7 +240,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "EventScript_PlayerPCMale"
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_PC"
     },
     {
       "type": "sign",
@@ -248,7 +248,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656"
+      "script": "PlayersHouse_2F_EventScript_Notebook"
     },
     {
       "type": "sign",
@@ -256,7 +256,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781"
+      "script": "LittlerootTown_BrendansHouse_2F_EventScript_WallClock"
     },
     {
       "type": "sign",
@@ -264,7 +264,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F"
+      "script": "PlayersHouse_2F_EventScript_GameCube"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 130781f23..101e2bbad 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -1,70 +1,70 @@
 LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp
 	.byte 0
 
-LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
+LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
-	call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457
+	call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
+	call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
+	call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet
 	call SecretBase_EventScript_SetDecorationFlags
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
-	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
+LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos:: @ 81F841A
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
 	compare VAR_BIRCH_LAB_STATE, 2
-	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456
-	goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433
+	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_Ret
+	goto LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
+LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
+	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_Ret
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
+	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret  @ Odd that the MaysHouse equivalent was used here instead
 	setobjectxyperm 1, 0, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
+LittlerootTown_BrendansHouse_2F_EventScript_Ret:: @ 81F8456
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
+LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan:: @ 81F8457
 	checkplayergender
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
+	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
+LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan:: @ 81F8464
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
-LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
-	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
+LittlerootTown_BrendansHouse_2F_OnWarp: @ 81F846A
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor
 	.2byte 0
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
+LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81F8474
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
+LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481
 	lockall
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT
+	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan
+	msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
 	delay 10
 	addobject 1
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters
 	waitmovement 0
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	delay 10
 	playbgm MUS_BOY_SUP, 1
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
@@ -90,60 +90,60 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85CF
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85E2
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85F6
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC
+LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: @ 81F85BC
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0
 	walk_left
 	walk_left
 	walk_down
@@ -151,7 +151,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6
 	walk_up
 	walk_up
 	walk_up
@@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -172,13 +172,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: @ 81F85D7
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB
 	walk_up
 	walk_left
 	walk_left
@@ -187,7 +187,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -195,14 +195,14 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: @ 81F85E8
 	walk_left
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED
 	walk_up
 	walk_up
 	walk_left
@@ -213,7 +213,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6
 	delay_8
 	delay_16
 	walk_in_place_fastest_up
@@ -222,7 +222,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD
 	walk_left
 	walk_left
 	walk_left
@@ -231,29 +231,30 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604
 	walk_up
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
+@ Unused, the player is already facing this direction so its unneeded
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: @ 81F8609
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-EventScript_PlayerPCMale:: @ 81F860D
+LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626
+	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C
+	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
+LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626
 	setvar VAR_0x8004, 1
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
@@ -263,33 +264,31 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
+LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F863F
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C
+LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 81F864C
 	msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656
-LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN
+PlayersHouse_2F_EventScript_Notebook:: @ 81F8656
+	msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F
-LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN
+PlayersHouse_2F_EventScript_GameCube:: @ 81F865F
+	msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN
 	end
 
-LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668
+PlayersHouse_2F_Text_ClockIsStopped: @ 81F8668
 	.string "The clock is stopped…\p"
 	.string "Better set it and start it!$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A
+PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A
 	.string "MOM: {PLAYER}, how do you like your\n"
 	.string "new room?\p"
 	.string "Good! Everything's put away neatly!\p"
@@ -299,7 +298,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A
 	.string "Oh, you should make sure that\n"
 	.string "everything's all there on your desk.$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
+PlayersHouse_2F_Text_Notebook: @ 81F877F
 	.string "{PLAYER} flipped open the notebook.\p"
 	.string "ADVENTURE RULE NO. 1\n"
 	.string "Open the MENU with START.\p"
@@ -311,7 +310,7 @@ Common_Text_LookCloserAtMap: @ 81F8820
 	.string "{PLAYER} took a closer look at the\n"
 	.string "HOENN region map.$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F
+PlayersHouse_2F_Text_ItsAGameCube: @ 81F884F
 	.string "It's a Nintendo GameCube.\p"
 	.string "A Game Boy Advance is connected to\n"
 	.string "serve as the Controller.$"
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json
index 0938e6966..118e3e819 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5",
+      "script": "PlayersHouse_1F_EventScript_Mom",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA",
+      "script": "PlayersHouse_1F_EventScript_Vigoroth1",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD",
+      "script": "PlayersHouse_1F_EventScript_Vigoroth2",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3",
+      "script": "RivalsHouse_1F_EventScript_RivalMom",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D",
+      "script": "RivalsHouse_1F_EventScript_RivalSibling",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING"
     },
     {
@@ -103,7 +103,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN"
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY"
     }
   ],
   "warp_events": [
@@ -137,7 +137,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_INTRO_STATE",
       "var_value": "4",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C"
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom"
     },
     {
       "type": "trigger",
@@ -146,7 +146,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67"
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival0"
     },
     {
       "type": "trigger",
@@ -155,7 +155,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73"
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival1"
     },
     {
       "type": "trigger",
@@ -164,7 +164,7 @@
       "elevation": 0,
       "var": "VAR_LITTLEROOT_RIVAL_STATE",
       "var_value": "2",
-      "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F"
+      "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 74654f7ee..f016031df 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -1,93 +1,94 @@
 LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
-	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame
 	.byte 0
 
-LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
+LittlerootTown_MaysHouse_1F_OnLoad: @ 81F88B5
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA
-	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
+	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
+LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 81F88CA
 	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
 	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
+LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81F88DD
 	checkplayergender
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA
+	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
+LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F88EA
 	setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
-LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
+LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916
 	setobjectxyperm 1, 2, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922
 	setobjectxyperm 1, 6, 5
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E
 	setobjectxyperm 1, 1, 8
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
+@ Many of the below scripts have no gender check because they assume youre in the correct house
+LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
 	.2byte 0
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
+LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
 	lockall
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F898A
-	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
+	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
 	waitmovement 0
 	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
 	waitstate
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A
+LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C
+LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C
 	lockall
 	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_292704
+	setvar VAR_0x8005, FEMALE
+	goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D
+LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_2928DC
+	goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
+LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
 	lockall
 	playse SE_PIN
 	applymovement 4, Common_Movement_ExclamationMark
@@ -95,16 +96,16 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach
 	waitmovement 0
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
+	msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 2
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC
+LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC
 	walk_down
 	walk_left
 	walk_left
@@ -113,71 +114,69 @@ LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3
-LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
+RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
-	goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften
+	goto_if_set FLAG_SYS_POKEMON_GET, RivalsHouse_1F_EventScript_RivalIsOnRoute103
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
+	goto_if_eq RivalsHouse_1F_EventScript_RivalTooBusy
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT
+	msgbox RivalsHouse_1F_Text_LikeChildLikeFather, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT
+RivalsHouse_1F_EventScript_RivalTooBusy:: @ 81F8A1F
+	msgbox RivalsHouse_1F_Text_TooBusyToNoticeVisit, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT
+RivalsHouse_1F_EventScript_RivalIsOnRoute103:: @ 81F8A29
+	msgbox RivalsHouse_1F_Text_WentOutToRoute103, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT
+RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 81F8A33
+	msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
-LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
+RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT
+	msgbox RivalsHouse_1F_Text_DoYouHavePokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
+LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
 	lockall
 	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
+	setvar VAR_0x8005, FEMALE
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_292765
+	goto PlayersHouse_1F_EventScript_MomGoSeeRoom
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival0:: @ 81F8A67
 	lockall
 	setvar VAR_0x8008, 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival1:: @ 81F8A73
 	lockall
 	setvar VAR_0x8008, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F
 	lockall
 	setvar VAR_0x8008, 2
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
 	playse SE_KAIDAN
 	delay 10
 	addobject 7
@@ -188,25 +187,25 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
-	call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
+	call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay
 	playbgm MUS_GIRL_SUP, 1
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2
+	msgbox RivalsHouse_1F_Text_MayWhoAreYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0
 	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1
 	compare VAR_0x8008, 2
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2
 	playse SE_KAIDAN
 	removeobject 7
-	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	delay 30
@@ -217,27 +216,27 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
+LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -247,13 +246,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1: @ 81F8B5E
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -263,31 +262,31 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA0
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA4
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BAB
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: @ 81F8BA0
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
@@ -296,13 +295,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: @ 81F8BAB
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -310,7 +309,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -322,7 +321,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -330,8 +329,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5
-LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5
+RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5
 	.string "Oh, hello. And you are?\p"
 	.string "… … … … … … … … …\n"
 	.string "… … … … … … … … …\p"
@@ -343,26 +341,26 @@ LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5
 	.string "a new friend.\p"
 	.string "Our {STR_VAR_1} is upstairs, I think.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5
+RivalsHouse_1F_Text_LikeChildLikeFather: @ 81F8CA5
 	.string "Like child, like father.\p"
 	.string "My husband is as wild about POKéMON\n"
 	.string "as our child.\p"
 	.string "If he's not at his LAB, he's likely\n"
 	.string "scrabbling about in grassy places.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37
+RivalsHouse_1F_Text_TooBusyToNoticeVisit: @ 81F8D37
 	.string "That {RIVAL}!\p"
 	.string "I guess our child is too busy with\n"
 	.string "POKéMON to notice that you came\l"
 	.string "to visit, {PLAYER}{KUN}.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93
+RivalsHouse_1F_Text_WentOutToRoute103: @ 81F8D93
 	.string "Oh, {RIVAL} went out to ROUTE 103\n"
 	.string "just a little while ago.\p"
 	.string "Like father, like child.\n"
 	.string "{RIVAL} can't stay quietly at home.$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01
+RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01
 	.string "I think it's wonderful for people to\n"
 	.string "travel with POKéMON.\p"
 	.string "But you should go home every so often\n"
@@ -370,7 +368,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01
 	.string "She might not say it, but I'm sure she\n"
 	.string "worries about you, {PLAYER}{KUN}.$"
 
-LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6
+RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6
 	.string "Huh?\n"
 	.string "Who… Who are you?\p"
 	.string "… … … … … … … …\n"
@@ -394,7 +392,7 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6
 	.string "some wild POKéMON!\p"
 	.string "{PLAYER}{KUN}, I'll catch you later!$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4
+RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4
 	.string "Hey!\n"
 	.string "You…\p"
 	.string "Who are you?\p"
@@ -414,7 +412,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4
 	.string "some wild POKéMON.\p"
 	.string "Some other time, okay?$"
 
-LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262
+RivalsHouse_1F_Text_DoYouHavePokemon: @ 81F9262
 	.string "Hi, neighbor!\p"
 	.string "Do you already have your\n"
 	.string "own POKéMON?$"
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
index d92b024c6..33cdfb7c1 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1",
+      "script": "RivalsHouse_2F_EventScript_Rival",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334",
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL"
     }
   ],
@@ -240,7 +240,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F"
+      "script": "PlayersHouse_2F_EventScript_GameCube"
     },
     {
       "type": "sign",
@@ -248,7 +248,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656"
+      "script": "PlayersHouse_2F_EventScript_Notebook"
     },
     {
       "type": "sign",
@@ -256,7 +256,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D"
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_WallClock"
     },
     {
       "type": "sign",
@@ -264,7 +264,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EventScript_PlayerPCFemale"
+      "script": "LittlerootTown_MaysHouse_2F_EventScript_PC"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 31a097ead..5bfbfbbcd 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -1,71 +1,70 @@
 LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp
 	.byte 0
 
-LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
+LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
-	call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A
+	call_if_lt LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
+	call_if_ge LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
+	call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet
 	call SecretBase_EventScript_SetDecorationFlags
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
-	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
+LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos:: @ 81F92CD
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
 	compare VAR_BIRCH_LAB_STATE, 2
-	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
-	goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
+	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret
+	goto LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
 
-LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
+LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6
 	checkplayergender
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_Ret
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
+	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret
 	setobjectxyperm 1, 8, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309
-LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
+LittlerootTown_MaysHouse_2F_EventScript_Ret:: @ 81F9309
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
+LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay:: @ 81F930A
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
+LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay:: @ 81F9317
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
-LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
-	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
+LittlerootTown_MaysHouse_2F_OnWarp: @ 81F931D
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor
 	.2byte 0
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
+LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 81F9327
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
+LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334
 	lockall
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMay
+	msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
+LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
 	delay 10
 	addobject 1
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayEnters
 	waitmovement 0
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -75,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	delay 10
 	playbgm MUS_GIRL_SUP, 1
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
@@ -91,60 +90,60 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9483
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
+LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9497
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
+	msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F94BB
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F
+LittlerootTown_MaysHouse_2F_Movement_MayEnters: @ 81F946F
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473
 	walk_right
 	walk_right
 	walk_down
@@ -152,7 +151,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473
 	walk_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479
 	walk_up
 	walk_up
 	walk_up
@@ -164,7 +163,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -174,13 +173,13 @@ LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: @ 81F948B
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F
 	walk_up
 	walk_in_place_fastest_right
 	walk_right
@@ -190,7 +189,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -198,7 +197,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D
 	walk_right
 	walk_right
 	walk_right
@@ -207,27 +206,28 @@ LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4
 	walk_up
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9
+@ Unused, the player is already facing this direction so its unneeded
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: @ 81F94A9
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: @ 81F94AD
 	walk_right
 	walk_right
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2
 	walk_up
 	walk_up
 	walk_right
@@ -238,7 +238,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -246,72 +246,71 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
-LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
+RivalsHouse_2F_EventScript_Rival:: @ 81F94C1
 	lockall
-	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
+	goto_if_eq RivalsHouse_2F_EventScript_May
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
+	goto_if_eq RivalsHouse_2F_EventScript_Brendan
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_May:: @ 81F94E3
+	msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_Brendan:: @ 81F94ED
+	msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
+RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D
+	call_if_eq RivalsHouse_2F_EventScript_MayPostLilycove
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F
+	call_if_eq RivalsHouse_2F_EventScript_BrendanPostLilycove
 	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F9541
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext
+	msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F954A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext
+	msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541
+	msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT
+RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A
+	msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-EventScript_PlayerPCFemale:: @ 81F9553
+LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
+LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 81F956C
 	msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
+LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576
 	setvar VAR_0x8004, 2
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
@@ -321,14 +320,14 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
+LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F958F
 	setvar VAR_0x8004, 2
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C
+RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C
 	.string "Huh?\n"
 	.string "Who… Who are you?\p"
 	.string "… … … … … … … …\n"
@@ -352,11 +351,11 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C
 	.string "some wild POKéMON!\p"
 	.string "{PLAYER}{KUN}, I'll catch you later!$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A
+RivalsHouse_2F_Text_MayGettingReady: @ 81F978A
 	.string "POKéMON fully restored!\n"
 	.string "Items ready, and…$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4
+RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4
 	.string "Hey!\n"
 	.string "You…\p"
 	.string "Who are you?\p"
@@ -376,16 +375,15 @@ LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4
 	.string "some wild POKéMON.\p"
 	.string "Some other time, okay?$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962
+RivalsHouse_2F_Text_BrendanGettingReady: @ 81F9962
 	.string "POKéMON fully restored…\n"
 	.string "Items all packed, and…$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991
-LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991
+RivalsHouse_2F_Text_ItsRivalsPokeBall: @ 81F9991
 	.string "It's {RIVAL}'s POKé BALL!\p"
 	.string "Better leave it right where it is.$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9
+RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9
 	.string "MAY: {PLAYER}{KUN}!\p"
 	.string "I was just checking my POKéDEX.\p"
 	.string "There's still a lot of POKéMON that\n"
@@ -395,13 +393,13 @@ LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9
 	.string "I wonder where I should go catch\n"
 	.string "some POKéMON next?$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E
+RivalsHouse_2F_Text_MayWhereShouldIGoNext: @ 81F9A9E
 	.string "MAY: I wonder where I should go catch\n"
 	.string "some POKéMON next?\p"
 	.string "Wouldn't it be funny if we ran into each\n"
 	.string "other, {PLAYER}{KUN}?$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D
+RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D
 	.string "BRENDAN: Hey, it's {PLAYER}.\p"
 	.string "I was just checking out my POKéDEX.\p"
 	.string "There are still many POKéMON that\n"
@@ -410,7 +408,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D
 	.string "Checking this POKéDEX out gives me\n"
 	.string "the urge to hit the road again.$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7
+RivalsHouse_2F_Text_BrendanWhereShouldIGoNext: @ 81F9BE7
 	.string "BRENDAN: I'm having a hard time deciding\n"
 	.string "where I should catch POKéMON next.\p"
 	.string "Hey, {PLAYER}, if I see you while I'm out\n"
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
index 25ec2e745..7aadfe03a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Aide",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Birch",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Rival",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Totodile",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023",
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA"
     }
   ],
@@ -117,7 +117,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine"
     },
     {
       "type": "sign",
@@ -125,7 +125,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine"
     },
     {
       "type": "sign",
@@ -133,7 +133,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book"
     },
     {
       "type": "sign",
@@ -141,7 +141,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book"
     },
     {
       "type": "sign",
@@ -149,7 +149,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -157,7 +157,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -165,7 +165,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -173,7 +173,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -181,7 +181,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -189,7 +189,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
@@ -197,7 +197,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
@@ -205,7 +205,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
@@ -213,7 +213,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
@@ -221,7 +221,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
@@ -229,7 +229,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 283be0477..b27cb1f8a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -1,57 +1,72 @@
 LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
-	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_OnFrame
 	.byte 0
 
-LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
+	@ State descriptions for VAR_DEX_UPGRADE_JOHTO_STARTER_STATE
+	@ 1: Beat Elite Four, Dex upgrade ready
+	@ 2: Received National Dex
+	@ 3: Left lab after receiving National Dex
+	@ 4: Entered lab after catching all Hoenn mons
+	@ 5: Birch told player to choose Johto starter
+	@ 6: Chose Johto starter
+
+	@ State descriptions for VAR_BIRCH_LAB_STATE
+	@ 1: Never occurs
+	@ 2: Chose starter
+	@ 3: Received starter in lab
+	@ 4: Defeated rival on Route 103
+	@ 5: Received pokedex
+
+LittlerootTown_ProfessorBirchsLab_OnTransition: @ 81F9CA1
 	call Common_EventScript_SetupRivalGfxId
 	call ProfBirch_EventScript_UpdateLocation
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
+LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter:: @ 81F9CCD
 	specialvar VAR_RESULT, HasAllHoennMons
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
+	compare VAR_RESULT, TRUE
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
+LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter:: @ 81F9CE9
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
+LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout:: @ 81F9CF3
 	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
+LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout:: @ 81F9CF7
 	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
+LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters
 	.2byte 0
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
+LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
+LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	addobject 2
 	addobject 3
@@ -63,11 +78,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
 	setobjectxy 1, 10, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71
+LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject:: @ 81F9D71
 	addobject 3
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
+LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters:: @ 81F9D75
 	addobject 4
 	addobject 5
 	addobject 6
@@ -84,64 +99,66 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
 	setobjectxy 3, 5, 5
 	end
 
-LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
-	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
-	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
+LittlerootTown_ProfessorBirchsLab_OnFrame: @ 81F9DB9
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent
+	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter
 	.2byte 0
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
+@ The starter is technically given prior to this on Route 101 by special ChooseStarter
+@ This is just where the game tells you its yours and lets you nickname it
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB
 	lockall
 	bufferleadmonspeciesname 0
-	message LittlerootTown_ProfessorBirchsLab_Text_1FA74D
+	message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
+LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter:: @ 81F9E07
 	setvar VAR_0x8004, 0
 	call Common_EventScript_NameReceivedPartyMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 81F9E17
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival:: @ 81F9E36
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_ROUTE_101_BOY
 	setvar VAR_BIRCH_LAB_STATE, 3
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67
+LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex
 	waitmovement 0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex
 	end
 
-LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78
+LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex: @ 81F9E78
 	walk_up
 	walk_up
 	walk_up
@@ -151,12 +168,12 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78
 	walk_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
+LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
 	lockall
 	delay 30
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes
 	waitmovement 0
 	delay 20
 	playse SE_TK_KASYA
@@ -172,45 +189,45 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment
 	playse SE_PC_ON
 	waitse
 	delay 20
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex
 	waitmovement 0
 	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FB436
+	message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational
 	waitmessage
 	waitfanfare
 	setflag FLAG_SYS_NATIONAL_DEX
 	special EnableNationalPokedex
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	setvar VAR_SCOTT_CALL_STEP_COUNTER, 0
-	setflag FLAG_SCOTT_CALL_NATIONAL_DEX
+	setvar VAR_SCOTT_BF_CALL_STEP_COUNTER, 0
+	setflag FLAG_SCOTT_CALL_BATTLE_FRONTIER
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment:: @ 81F9F32
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment:: @ 81F9F3C
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46
+LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: @ 81F9F46
 	walk_left
 	walk_in_place_fastest_down
 	delay_16
@@ -230,7 +247,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58
+LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58
 	walk_left
 	walk_left
 	walk_left
@@ -242,16 +259,16 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
+LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C
+	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter
 	waitmovement 0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
+LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter: @ 81F9F7C
 	walk_up
 	walk_up
 	walk_up
@@ -261,259 +278,259 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
 	walk_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
+LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 81F9F84
 	lock
 	faceplayer
 	compare VAR_BIRCH_LAB_STATE, 3
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
-	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter
+	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork, MSGBOX_DEFAULT
 	setflag FLAG_BIRCH_AIDE_MET
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet:: @ 81F9FA7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: @ 81F9FB1
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
+LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: @ 81F9FBB
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	showmonpic SPECIES_CYNDAQUIL, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
+LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: @ 81F9FEF
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	showmonpic SPECIES_TOTODILE, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
+LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: @ 81FA023
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	showmonpic SPECIES_CHIKORITA, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter:: @ 81FA057
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
+LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime:: @ 81FA061
 	hidemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil:: @ 81FA06C
 	bufferspeciesname 0, SPECIES_CYNDAQUIL
 	setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
 	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty
 	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC
 	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty:: @ 81FA0A1
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 4
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC:: @ 81FA0CC
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 4
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC:: @ 81FA0F2
+	call Common_EventScript_TransferredToPC
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil:: @ 81FA0FD
 	hidemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile:: @ 81FA10D
 	bufferspeciesname 0, SPECIES_TOTODILE
 	setvar VAR_TEMP_1, SPECIES_TOTODILE
 	givemon SPECIES_TOTODILE, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty
 	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC
 	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty:: @ 81FA142
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 5
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC:: @ 81FA16D
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 5
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC:: @ 81FA193
+	call Common_EventScript_TransferredToPC
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile:: @ 81FA19E
 	hidemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita:: @ 81FA1AE
 	bufferspeciesname 0, SPECIES_CHIKORITA
 	setvar VAR_TEMP_1, SPECIES_CHIKORITA
 	givemon SPECIES_CHIKORITA, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty
 	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC
 	hidemonpic
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty:: @ 81FA1E3
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 6
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC:: @ 81FA20E
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject 6
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
+	compare VAR_RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC:: @ 81FA234
+	call Common_EventScript_TransferredToPC
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F
 	hidemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F
 	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7
+	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter
 	waitmessage
 	waitfanfare
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
+LittlerootTown_ProfessorBirchsLab_EventScript_Birch:: @ 81FA25A
 	lock
 	faceplayer
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
-	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting
+	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister
 	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon:: @ 81FA28A
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting:: @ 81FA294
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
+LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister:: @ 81FA29E
 	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_BIRCH_LAB_STATE, 5
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome, MSGBOX_DEFAULT
 	release
 	end
 
 EventScript_RegisterProfBirch:: @ 81FA2D2
-	msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
+	msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route101_Text_2B603A, MSGBOX_DEFAULT
+	msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -522,20 +539,20 @@ EventScript_RegisterProfBirch:: @ 81FA2D2
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex, MSGBOX_DEFAULT
+	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
+	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls
 	setvar VAR_BIRCH_LAB_STATE, 5
 	setflag FLAG_ADVENTURE_STARTED
 	setvar VAR_OLDALE_TOWN_STATE, 1
@@ -544,153 +561,153 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT
 	giveitem_std ITEM_POKE_BALL, 5
-	compare VAR_RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT
 	giveitem_std ITEM_POKE_BALL, 5
-	compare VAR_RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 1
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
 	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FAC32
+	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex
 	waitfanfare
 	setflag FLAG_SYS_POKEDEX_GET
-	special sub_81AFDA0
+	special sub_81AFDA0  @ sets flags that are never read
 	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
 	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait:: @ 81FA3C4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls:: @ 81FA3CE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls:: @ 81FA3D7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0
+LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer: @ 81FA3E0
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN
+LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: @ 81FA3E3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
+LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 81FA3EC
 	lock
 	faceplayer
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext:: @ 81FA428
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext:: @ 81FA431
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans:: @ 81FA43A
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere:: @ 81FA453
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly: @ 81FA45C
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier:: @ 81FA465
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier:: @ 81FA47E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier:: @ 81FA487
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork:: @ 81FA490
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork:: @ 81FA4A9
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork:: @ 81FA4B2
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN
+LittlerootTown_ProfessorBirchsLab_EventScript_PC:: @ 81FA4BB
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN
+LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf:: @ 81FA4C4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN
+LittlerootTown_ProfessorBirchsLab_EventScript_Book:: @ 81FA4CD
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6
+LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6
 	lockall
-	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A
+	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall
 	waitmessage
-	clearflag FLAG_SCOTT_CALL_NATIONAL_DEX
+	clearflag FLAG_SCOTT_CALL_BATTLE_FRONTIER
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2
+LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork: @ 81FA4E2
 	.string "Hunh? PROF. BIRCH?\p"
 	.string "The PROF's away on fieldwork.\n"
 	.string "Ergo, he isn't here.\p"
@@ -703,19 +720,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2
 	.string "rather go outside and experience\l"
 	.string "things than read about them here.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641
+LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork: @ 81FA641
 	.string "The PROF isn't one for doing desk work.\n"
 	.string "He's the type of person who would\l"
 	.string "rather go outside and experience\l"
 	.string "things than read about them here.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE
+LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo: @ 81FA6CE
 	.string "PROF. BIRCH is studying the habitats\n"
 	.string "and distribution of POKéMON.\p"
 	.string "The PROF enjoys {RIVAL}'s help, too.\n"
 	.string "There's a lot of love there.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D
+LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon: @ 81FA74D
 	.string "PROF. BIRCH: So, {PLAYER}{KUN}.\p"
 	.string "I've heard so much about you from\n"
 	.string "your father.\p"
@@ -730,11 +747,11 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D
 	.string "used earlier.\p"
 	.string "{PLAYER} received the {STR_VAR_1}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1
+LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon: @ 81FA8B1
 	.string "PROF. BIRCH: While you're at it, why not\n"
 	.string "give a nickname to that {STR_VAR_1}?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6
+LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival: @ 81FA8F6
 	.string "PROF. BIRCH: If you work at POKéMON\n"
 	.string "and gain experience, I think you'll make\l"
 	.string "an extremely good TRAINER.\p"
@@ -743,17 +760,17 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6
 	.string "{PLAYER}{KUN}, don't you think it might be\n"
 	.string "a good idea to go see {RIVAL}?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5
+LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou: @ 81FA9D5
 	.string "PROF. BIRCH: Great!\n"
 	.string "{RIVAL} should be happy, too.\p"
 	.string "Get {RIVAL} to teach you what it\n"
 	.string "means to be a TRAINER.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35
+LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay: @ 81FAA35
 	.string "PROF. BIRCH: Oh, don't be that way.\n"
 	.string "You should go meet my kid.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74
+LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome: @ 81FAA74
 	.string "PROF. BIRCH: {RIVAL}?\n"
 	.string "Gone home, I think.\p"
 	.string "Or maybe that kid's scrabbling around\n"
@@ -761,7 +778,7 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74
 	.string "If you or your POKéMON get tired,\n"
 	.string "you should get some rest at home.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22
+LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex: @ 81FAB22
 	.string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "I heard you beat {RIVAL} on\n"
 	.string "your first try. That's excellent!\p"
@@ -773,10 +790,10 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22
 	.string "research, but I think you should have\l"
 	.string "this POKéDEX.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32
+LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex: @ 81FAC32
 	.string "{PLAYER} received the POKéDEX!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B
+LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex: @ 81FAC4B
 	.string "PROF. BIRCH: The POKéDEX is a high-tech\n"
 	.string "tool that automatically makes a record\l"
 	.string "of any POKéMON you meet or catch.\p"
@@ -787,19 +804,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B
 	.string "why, {RIVAL} looks for me while I'm out\l"
 	.string "doing fieldwork, and shows me.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F
+LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait: @ 81FAD6F
 	.string "PROF. BIRCH: Countless POKéMON\n"
 	.string "await you!\p"
 	.string "Argh, I'm getting the itch to get out\n"
 	.string "and do fieldwork again!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7
+LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese: @ 81FADD7
 	.string "MAY: Oh, wow, {PLAYER}{KUN}!\n"
 	.string "You got a POKéDEX, too!\p"
 	.string "That's great! Just like me!\n"
 	.string "I've got something for you, too!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40
+LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls: @ 81FAE40
 	.string "MAY: It's fun if you can get a lot of\n"
 	.string "POKéMON!\p"
 	.string "I'm going to look all over the place\n"
@@ -807,20 +824,20 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40
 	.string "If I find any cute POKéMON, I'll catch\n"
 	.string "them with POKé BALLS!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3
+LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull: @ 81FAEF3
 	.string "Oh? Your BAG's full.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08
+LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext: @ 81FAF08
 	.string "MAY: I wonder where I should go look\n"
 	.string "for POKéMON next?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F
+LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese: @ 81FAF3F
 	.string "BRENDAN: Huh…\n"
 	.string "So you got a POKéDEX, too.\p"
 	.string "Well then, here.\n"
 	.string "I'll give you these.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E
+LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls: @ 81FAF8E
 	.string "BRENDAN: You know it's more fun to\n"
 	.string "have a whole bunch of POKéMON.\p"
 	.string "I'm going to explore all over the place\n"
@@ -828,28 +845,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E
 	.string "If I find any cool POKéMON, you bet\n"
 	.string "I'll try to get them with POKé BALLS.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D
+LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull: @ 81FB05D
 	.string "Hey, your BAG's full.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073
+LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext: @ 81FB073
 	.string "BRENDAN: Where should I look for\n"
 	.string "POKéMON next…$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2
+LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine: @ 81FB0A2
 	.string "It's a serious-looking machine.\n"
 	.string "The PROF must use this for research.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7
+LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch: @ 81FB0E7
 	.string "It's a PC used for research.\n"
 	.string "Better not mess around with it.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124
+LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon: @ 81FB124
 	.string "It's crammed with books on POKéMON.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148
+LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead: @ 81FB148
 	.string "It's a book that's too hard to read.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D
+LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational: @ 81FB16D
 	.string "PROF. BIRCH: Now…\p"
 	.string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n"
 	.string "of you help me study POKéMON.\p"
@@ -866,28 +883,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D
 	.string "the NATIONAL Mode.\p"
 	.string "Here, let me see your POKéDEX units.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F
+LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool: @ 81FB30F
 	.string "MAY: Eheheh!\p"
 	.string "It's so cool that even my POKéDEX\n"
 	.string "is getting updated!\p"
 	.string "It's because you went out and caught\n"
 	.string "so many POKéMON, {PLAYER}{KUN}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E
+LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe: @ 81FB38E
 	.string "BRENDAN: I went out all over HOENN\n"
 	.string "and checked out POKéMON.\p"
 	.string "You can thank me for getting\n"
 	.string "the NATIONAL Mode POKéDEX.\p"
 	.string "Yep, you're lucky, {PLAYER}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419
+LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone: @ 81FB419
 	.string "PROF. BIRCH: Okay, all done!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436
+LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational: @ 81FB436
 	.string "{PLAYER}'s POKéDEX was upgraded\n"
 	.string "to the NATIONAL Mode!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466
+LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2: @ 81FB466
 	.string "PROF. BIRCH: But listen.\n"
 	.string "You've become the CHAMPION,\l"
 	.string "but your POKéMON journey isn't over.\p"
@@ -896,19 +913,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466
 	.string "Somewhere, there is a grassy patch\n"
 	.string "that's waiting for you!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528
+LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork: @ 81FB528
 	.string "MAY: I think I'll take a short break\n"
 	.string "from fieldwork.\p"
 	.string "I think I'll help the PROF here for\n"
 	.string "a while.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A
+LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork: @ 81FB58A
 	.string "BRENDAN: For the time being,\n"
 	.string "I'm taking a break from fieldwork.\p"
 	.string "I'll be helping out the PROF here\n"
 	.string "for a while.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9
+LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon: @ 81FB5F9
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "Let's have a look at your POKéDEX.\p"
 	.string "… … … … … …\n"
@@ -925,48 +942,50 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9
 	.string "You can have any one of these\n"
 	.string "three POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787
+LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon: @ 81FB787
 	.string "PROF. BIRCH: These are rare POKéMON\n"
 	.string "only found in another region!\p"
 	.string "You can have any one of these\n"
 	.string "three POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil: @ 81FB7F6
 	.string "PROF. BIRCH: The FIRE POKéMON\n"
 	.string "CYNDAQUIL caught your eye!\p"
 	.string "You're as sharp as ever!\p"
 	.string "So the CYNDAQUIL is your choice?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile: @ 81FB869
 	.string "PROF. BIRCH: The WATER POKéMON\n"
 	.string "TOTODILE is your choice!\p"
 	.string "You know how to pick a good one.\p"
 	.string "So, you'll take the TOTODILE?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita: @ 81FB8E0
 	.string "PROF. BIRCH: The GRASS POKéMON\n"
 	.string "CHIKORITA is your choice!\p"
 	.string "You sure know what you're doing.\p"
 	.string "So, you'll take the CHIKORITA?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959
+LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable: @ 81FB959
 	.string "PROF. BIRCH: Take your time before\n"
 	.string "you decide.\p"
 	.string "They're all invaluable POKéMON.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8
+@ Unused
+LittlerootTown_ProfessorBirchsLab_Text_PickedFinePokemon: @ 81FB9A8
 	.string "PROF. BIRCH: I see!\n"
 	.string "You picked a fine POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7
+LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter: @ 81FB9D7
 	.string "{PLAYER} received the {STR_VAR_1}\n"
 	.string "from PROF. BIRCH!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC
+@ Unused
+LittlerootTown_ProfessorBirchsLab_Text_NicknameJohtoStarter: @ 81FB9FC
 	.string "Want to give a nickname to\n"
 	.string "the {STR_VAR_1} you received?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C
+LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting: @ 81FBA2C
 	.string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n"
 	.string "You've completed the HOENN POKéDEX,\l"
 	.string "but your POKéMON journey isn't over.\p"
@@ -975,15 +994,16 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C
 	.string "Somewhere, there is a grassy patch\n"
 	.string "that's waiting for you!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8
+LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone: @ 81FBAF8
 	.string "You received the promised POKéMON.\n"
 	.string "Better leave the others alone.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A
+@ Unused
+LittlerootTown_ProfessorBirchsLab_Text_DontHaveAnyRoomForPokemon: @ 81FBB3A
 	.string "Oh, you don't have any room for\n"
 	.string "this POKéMON.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68
+LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere: @ 81FBB68
 	.string "MAY: {PLAYER}{KUN}, after this…\n"
 	.string "What are you going to do?\p"
 	.string "Are you going to keep battling\n"
@@ -992,22 +1012,22 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68
 	.string "the NATIONAL POKéDEX?\p"
 	.string "I'm staying here to help the PROF.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D
+LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly: @ 81FBC2D
 	.string "BRENDAN: Rather than collecting\n"
 	.string "POKéMON, I prefer slowly and \l"
 	.string "steadily raising the one I chose.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D
+LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier: @ 81FBC8D
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\n"
 	.string "Have you gone to that place,\l"
 	.string "the BATTLE FRONTIER?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2
+LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier: @ 81FBCD2
 	.string "BRENDAN: Hey, {PLAYER}!\n"
 	.string "Have you gone out to that place,\l"
 	.string "the BATTLE FRONTIER?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A
+LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall: @ 81FBD1A
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "SCOTT: Hi, hi, {PLAYER}!\n"
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
index 350c52b4f..ce7474c6f 100644
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MagmaHideout_1F_EventScript_23988C",
+      "script": "MagmaHideout_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_1F_EventScript_2398A3",
+      "script": "MagmaHideout_1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 2fe4ad581..7c6997ca2 100644
--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -6,33 +6,33 @@ MagmaHideout_1F_OnTransition: @ 8239886
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-MagmaHideout_1F_EventScript_23988C:: @ 823988C
-	trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964
-	msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE
+MagmaHideout_1F_EventScript_Grunt1:: @ 823988C
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_1, MagmaHideout_1F_Text_Grunt1Intro, MagmaHideout_1F_Text_Grunt1Defeat
+	msgbox MagmaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_EventScript_2398A3:: @ 82398A3
-	trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA
-	msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE
+MagmaHideout_1F_EventScript_Grunt2:: @ 82398A3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_2, MagmaHideout_1F_Text_Grunt2Intro, MagmaHideout_1F_Text_Grunt2Defeat
+	msgbox MagmaHideout_1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_Text_2398BA: @ 82398BA
+MagmaHideout_1F_Text_Grunt1Intro: @ 82398BA
 	.string "When TEAM MAGMA has roll call, we get\n"
 	.string "important guarding assignments in\l"
 	.string "the order that we line up.\p"
 	.string "That's why I'm stuck off in this corner.\n"
 	.string "I'm always late to roll call!$"
 
-MagmaHideout_1F_Text_239964: @ 8239964
+MagmaHideout_1F_Text_Grunt1Defeat: @ 8239964
 	.string "I'm always late for training sessions,\n"
 	.string "too!\p"
 	.string "I hate to say it, but I'm wimpy…$"
 
-MagmaHideout_1F_Text_2399B1: @ 82399B1
+MagmaHideout_1F_Text_Grunt1PostBattle: @ 82399B1
 	.string "Okay, I'll try to put a little more\n"
 	.string "effort into things from now on…$"
 
-MagmaHideout_1F_Text_2399F5: @ 82399F5
+MagmaHideout_1F_Text_Grunt2Intro: @ 82399F5
 	.string "Our leader told us to dig into\n"
 	.string "MT. CHIMNEY, so we dug and dug.\p"
 	.string "And in the course of digging, we came\n"
@@ -41,11 +41,11 @@ MagmaHideout_1F_Text_2399F5: @ 82399F5
 	.string "Fuhahaha!\n"
 	.string "I'll tell you if you beat me!$"
 
-MagmaHideout_1F_Text_239ABA: @ 8239ABA
+MagmaHideout_1F_Text_Grunt2Defeat: @ 8239ABA
 	.string "Arrgh!\n"
 	.string "Taken down!$"
 
-MagmaHideout_1F_Text_239ACD: @ 8239ACD
+MagmaHideout_1F_Text_Grunt2PostBattle: @ 8239ACD
 	.string "I won't tell you after all.\n"
 	.string "You'll find out when you get there!\p"
 	.string "It'd be better if you saved surprises\n"
diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json
index d628c1b5a..a059ed3d9 100644
--- a/data/maps/MagmaHideout_2F_1R/map.json
+++ b/data/maps/MagmaHideout_2F_1R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MagmaHideout_2F_1R_EventScript_239B7F",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_2F_1R_EventScript_239B96",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "MagmaHideout_2F_1R_EventScript_239B51",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt14",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_2F_1R_EventScript_239B68",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc
index 9ea2ef6fe..6f117c006 100644
--- a/data/maps/MagmaHideout_2F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
@@ -1,27 +1,27 @@
 MagmaHideout_2F_1R_MapScripts:: @ 8239B50
 	.byte 0
 
-MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51
-	trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B
-	msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt14:: @ 8239B51
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_14, MagmaHideout_2F_1R_Text_Grunt14Intro, MagmaHideout_2F_1R_Text_Grunt14Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt14PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68
-	trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09
-	msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt3:: @ 8239B68
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_3, MagmaHideout_2F_1R_Text_Grunt3Intro, MagmaHideout_2F_1R_Text_Grunt3Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F
-	trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75
-	msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt4:: @ 8239B7F
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_4, MagmaHideout_2F_1R_Text_Grunt4Intro, MagmaHideout_2F_1R_Text_Grunt4Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96
-	trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA
-	msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt5:: @ 8239B96
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_5, MagmaHideout_2F_1R_Text_Grunt5Intro, MagmaHideout_2F_1R_Text_Grunt5Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD
+MagmaHideout_2F_1R_Text_Grunt14Intro: @ 8239BAD
 	.string "What, what, what?\p"
 	.string "Only TEAM MAGMA members are supposed\n"
 	.string "to be in here!\p"
@@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD
 	.string "You rouse my suspicion!\n"
 	.string "Battle with me!$"
 
-MagmaHideout_2F_1R_Text_239C4B: @ 8239C4B
+MagmaHideout_2F_1R_Text_Grunt14Defeat: @ 8239C4B
 	.string "Aiyiyi…\n"
 	.string "My pride as a TEAM MAGMA member…$"
 
-MagmaHideout_2F_1R_Text_239C74: @ 8239C74
+MagmaHideout_2F_1R_Text_Grunt14PostBattle: @ 8239C74
 	.string "If you suffer from chills, you should\n"
 	.string "join TEAM MAGMA.$"
 
-MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB
+MagmaHideout_2F_1R_Text_Grunt3Intro: @ 8239CAB
 	.string "Hold it right there!\p"
 	.string "You don't really expect me to keep\n"
 	.string "my trap shut and let you waltz by me?$"
 
-MagmaHideout_2F_1R_Text_239D09: @ 8239D09
+MagmaHideout_2F_1R_Text_Grunt3Defeat: @ 8239D09
 	.string "Ooh wow!\n"
 	.string "I concede!$"
 
-MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D
+MagmaHideout_2F_1R_Text_Grunt3PostBattle: @ 8239D1D
 	.string "Maybe it would've been better if I did\n"
 	.string "just let you go unchallenged…$"
 
-MagmaHideout_2F_1R_Text_239D62: @ 8239D62
+MagmaHideout_2F_1R_Text_Grunt4Intro: @ 8239D62
 	.string "Ahah!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_239D75: @ 8239D75
+MagmaHideout_2F_1R_Text_Grunt4Defeat: @ 8239D75
 	.string "Graaah!$"
 
-MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D
+MagmaHideout_2F_1R_Text_Grunt4PostBattle: @ 8239D7D
 	.string "I've already lost.\p"
 	.string "Do I really need to keep running\n"
 	.string "around in a circle?$"
 
-MagmaHideout_2F_1R_Text_239DC5: @ 8239DC5
+MagmaHideout_2F_1R_Text_Grunt5Intro: @ 8239DC5
 	.string "Oh, oh!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA
+MagmaHideout_2F_1R_Text_Grunt5Defeat: @ 8239DDA
 	.string "Mutter…$"
 
-MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2
+MagmaHideout_2F_1R_Text_Grunt5PostBattle: @ 8239DE2
 	.string "Actually, I'm no expert at battling…$"
 
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
index b52d34212..5d70de489 100644
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "MagmaHideout_2F_2R_EventScript_239E4D",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt8",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MagmaHideout_2F_2R_EventScript_239E36",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt7",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_2F_2R_EventScript_239E1F",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt6",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MagmaHideout_2F_2R_EventScript_239E08",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt15",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc
index 5539d26de..d0121f953 100644
--- a/data/maps/MagmaHideout_2F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
@@ -1,78 +1,78 @@
 MagmaHideout_2F_2R_MapScripts:: @ 8239E07
 	.byte 0
 
-MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08
-	trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5
-	msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt15:: @ 8239E08
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_15, MagmaHideout_2F_2R_Text_Grunt15Intro, MagmaHideout_2F_2R_Text_Grunt15Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt15PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F
-	trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71
-	msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt6:: @ 8239E1F
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_6, MagmaHideout_2F_2R_Text_Grunt6Intro, MagmaHideout_2F_2R_Text_Grunt6Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36
-	trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050
-	msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt7:: @ 8239E36
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_7, MagmaHideout_2F_2R_Text_Grunt7Intro, MagmaHideout_2F_2R_Text_Grunt7Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D
-	trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C
-	msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt8:: @ 8239E4D
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_8, MagmaHideout_2F_2R_Text_Grunt8Intro, MagmaHideout_2F_2R_Text_Grunt8Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_Text_239E64: @ 8239E64
+MagmaHideout_2F_2R_Text_Grunt15Intro: @ 8239E64
 	.string "I don't have a bone to pick with you.\n"
 	.string "I'm just following orders!$"
 
-MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5
+MagmaHideout_2F_2R_Text_Grunt15Defeat: @ 8239EA5
 	.string "I may have lost, but…$"
 
-MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB
+MagmaHideout_2F_2R_Text_Grunt15PostBattle: @ 8239EBB
 	.string "We dug up something beyond belief!\n"
 	.string "And, we got the BLUE ORB!\p"
 	.string "All that's left is for our leader to…\n"
 	.string "Fufufu… Fwahahaha!$"
 
-MagmaHideout_2F_2R_Text_239F31: @ 8239F31
+MagmaHideout_2F_2R_Text_Grunt6Intro: @ 8239F31
 	.string "I can't stand heat. Maybe I should've\n"
 	.string "joined TEAM AQUA instead…$"
 
-MagmaHideout_2F_2R_Text_239F71: @ 8239F71
+MagmaHideout_2F_2R_Text_Grunt6Defeat: @ 8239F71
 	.string "Yeah, I really may not be right for\n"
 	.string "TEAM MAGMA…$"
 
-MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1
+MagmaHideout_2F_2R_Text_Grunt6PostBattle: @ 8239FA1
 	.string "Don't you get lonely for the sea\n"
 	.string "being in a place like this?$"
 
-MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE
+MagmaHideout_2F_2R_Text_Grunt7Intro: @ 8239FDE
 	.string "You can hear tremors here sometimes.\p"
 	.string "Could it be the volcano rattling?\n"
 	.string "Or is it GROU…\p"
 	.string "Whoops!\n"
 	.string "No, no, never mind!$"
 
-MagmaHideout_2F_2R_Text_23A050: @ 823A050
+MagmaHideout_2F_2R_Text_Grunt7Defeat: @ 823A050
 	.string "You're a fiery battler.\n"
 	.string "Just like a volcano!$"
 
-MagmaHideout_2F_2R_Text_23A07D: @ 823A07D
+MagmaHideout_2F_2R_Text_Grunt7PostBattle: @ 823A07D
 	.string "You just happened to win this time,\n"
 	.string "but that doesn't matter.\p"
 	.string "TEAM MAGMA's goal is about to be\n"
 	.string "reached!$"
 
-MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4
+MagmaHideout_2F_2R_Text_Grunt8Intro: @ 823A0E4
 	.string "One of our guys was freaking out that\n"
 	.string "he lost his MAGMA EMBLEM…\p"
 	.string "Wait a minute!\n"
 	.string "Was it you who found it?$"
 
-MagmaHideout_2F_2R_Text_23A14C: @ 823A14C
+MagmaHideout_2F_2R_Text_Grunt8Defeat: @ 823A14C
 	.string "I'm having trouble believing this…$"
 
-MagmaHideout_2F_2R_Text_23A16F: @ 823A16F
+MagmaHideout_2F_2R_Text_Grunt8PostBattle: @ 823A16F
 	.string "I'm getting this feeling that our plan\n"
 	.string "is going to end in failure…$"
 
diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json
index e3c1bac70..edf3e6671 100644
--- a/data/maps/MagmaHideout_3F_1R/map.json
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "MagmaHideout_3F_1R_EventScript_23A1B3",
+      "script": "MagmaHideout_3F_1R_EventScript_Grunt9",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_3F_1R_EventScript_23A1CA",
+      "script": "MagmaHideout_3F_1R_EventScript_Grunt16",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc
index 879cd282d..04e5526ae 100644
--- a/data/maps/MagmaHideout_3F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
@@ -1,29 +1,29 @@
 MagmaHideout_3F_1R_MapScripts:: @ 823A1B2
 	.byte 0
 
-MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3
-	trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229
-	msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_1R_EventScript_Grunt9:: @ 823A1B3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_9, MagmaHideout_3F_1R_Text_Grunt9Intro, MagmaHideout_3F_1R_Text_Grunt9Defeat
+	msgbox MagmaHideout_3F_1R_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA
-	trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353
-	msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_1R_EventScript_Grunt16:: @ 823A1CA
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_16, MagmaHideout_3F_1R_Text_Grunt16Intro, MagmaHideout_3F_1R_Text_Grunt16Defeat
+	msgbox MagmaHideout_3F_1R_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1
+MagmaHideout_3F_1R_Text_Grunt9Intro: @ 823A1E1
 	.string "What did I do to deserve this guard\n"
 	.string "posting?\p"
 	.string "My left ear is burning up!$"
 
-MagmaHideout_3F_1R_Text_23A229: @ 823A229
+MagmaHideout_3F_1R_Text_Grunt9Defeat: @ 823A229
 	.string "I'm getting heat exhaustion…$"
 
-MagmaHideout_3F_1R_Text_23A246: @ 823A246
+MagmaHideout_3F_1R_Text_Grunt9PostBattle: @ 823A246
 	.string "Do you think it's odd that we're wearing\n"
 	.string "hoods in this magma-filled volcano?$"
 
-MagmaHideout_3F_1R_Text_23A293: @ 823A293
+MagmaHideout_3F_1R_Text_Grunt16Intro: @ 823A293
 	.string "We joined so we can help our leader\n"
 	.string "achieve his fantastic vision.\p"
 	.string "I don't care if you're with TEAM AQUA\n"
@@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_23A293: @ 823A293
 	.string "No one interferes with us and gets\n"
 	.string "away with it!$"
 
-MagmaHideout_3F_1R_Text_23A353: @ 823A353
+MagmaHideout_3F_1R_Text_Grunt16Defeat: @ 823A353
 	.string "Oh, no!\n"
 	.string "You're not to be trusted at all!$"
 
-MagmaHideout_3F_1R_Text_23A37C: @ 823A37C
+MagmaHideout_3F_1R_Text_Grunt16PostBattle: @ 823A37C
 	.string "Listen to me.\n"
 	.string "TEAM MAGMA is right!\p"
 	.string "Don't listen to TEAM AQUA.\n"
diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json
index e4b267858..70dd1bdf8 100644
--- a/data/maps/MagmaHideout_3F_2R/map.json
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_3F_2R_EventScript_23A3D5",
+      "script": "MagmaHideout_3F_2R_EventScript_Grunt10",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc
index 14f7001fa..06f371151 100644
--- a/data/maps/MagmaHideout_3F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
@@ -1,12 +1,12 @@
 MagmaHideout_3F_2R_MapScripts:: @ 823A3D4
 	.byte 0
 
-MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5
-	trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB
-	msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_2R_EventScript_Grunt10:: @ 823A3D5
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_10, MagmaHideout_3F_2R_Text_Grunt10Intro, MagmaHideout_3F_2R_Text_Grunt10Defeat
+	msgbox MagmaHideout_3F_2R_Text_Grunt10PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC
+MagmaHideout_3F_2R_Text_Grunt10Intro: @ 823A3EC
 	.string "I understand everything our leader\n"
 	.string "says. But you know what?\p"
 	.string "Doing stuff like digging up a super-\n"
@@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC
 	.string "I think we're going a little too far.\n"
 	.string "What do you think?$"
 
-MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB
+MagmaHideout_3F_2R_Text_Grunt10Defeat: @ 823A4BB
 	.string "Yeah, I think we are doing something\n"
 	.string "wrong somehow.$"
 
-MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF
+MagmaHideout_3F_2R_Text_Grunt10PostBattle: @ 823A4EF
 	.string "You know, losing to you cleared my mind.\p"
 	.string "The next time I see our leader,\n"
 	.string "I'm going to ask him about what we do.$"
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
index 5eebc41d8..b01200f08 100644
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_23A68C",
+      "script": "MagmaHideout_4F_EventScript_Grunt11",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_23A6A3",
+      "script": "MagmaHideout_4F_EventScript_Grunt12",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_23A6BA",
+      "script": "MagmaHideout_4F_EventScript_Grunt13",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_4F_EventScript_23A6D1",
+      "script": "MagmaHideout_4F_EventScript_Tabitha",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_4F_EventScript_23A560",
+      "script": "MagmaHideout_4F_EventScript_Maxie",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index ce2229396..08b59e1f0 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -1,33 +1,30 @@
 MagmaHideout_4F_MapScripts:: @ 823A55F
 	.byte 0
 
-MagmaHideout_4F_EventScript_23A560:: @ 823A560
+MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	lockall
 	playbgm MUS_MGM0, 0
-	msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT
+	msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	setvar VAR_RESULT, 1
 	playse SE_W197
-	setfieldeffectargument 0, 18
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 18, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	setvar VAR_RESULT, 1
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
-	special sub_80B0534
+	special DoOrbEffect
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 150
-	removeobject 7
-	addobject 1
+	removeobject 7  @ sleeping Groudon
+	addobject 1     @ awakened Groudon
 	waitstate
 	delay 60
-	applymovement 1, MagmaHideout_4F_Movement_23A672
+	applymovement 1, MagmaHideout_4F_Movement_GroudonApproach
 	waitmovement 0
-	special sub_80B058C
+	special FadeOutOrbEffect
 	waitstate
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -35,7 +32,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 1, MagmaHideout_4F_Movement_23A67D
+	applymovement 1, MagmaHideout_4F_Movement_GroudonExit
 	waitmovement 0
 	removeobject 1
 	delay 4
@@ -46,19 +43,19 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	special ShakeCamera
 	waitstate
 	delay 30
-	applymovement 6, MagmaHideout_4F_Movement_23A680
+	applymovement 6, MagmaHideout_4F_Movement_MaxieLookAround
 	waitmovement 0
-	msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
+	msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT
 	closemessage
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
+	msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5
-	msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat
+	msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
 	clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
@@ -76,7 +73,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	releaseall
 	end
 
-MagmaHideout_4F_Movement_23A672: @ 823A672
+MagmaHideout_4F_Movement_GroudonApproach: @ 823A672
 	delay_16
 	delay_16
 	walk_slow_down
@@ -89,12 +86,12 @@ MagmaHideout_4F_Movement_23A672: @ 823A672
 	delay_16
 	step_end
 
-MagmaHideout_4F_Movement_23A67D: @ 823A67D
+MagmaHideout_4F_Movement_GroudonExit: @ 823A67D
 	slide_up
 	slide_up
 	step_end
 
-MagmaHideout_4F_Movement_23A680: @ 823A680
+MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680
 	face_left
 	delay_16
 	face_right
@@ -108,64 +105,64 @@ MagmaHideout_4F_Movement_23A680: @ 823A680
 	delay_16
 	step_end
 
-MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
-	trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
-	msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt11:: @ 823A68C
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_11, MagmaHideout_4F_Text_Grunt11Intro, MagmaHideout_4F_Text_Grunt11Defeat
+	msgbox MagmaHideout_4F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3
-	trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
-	msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt12:: @ 823A6A3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_12, MagmaHideout_4F_Text_Grunt12Intro, MagmaHideout_4F_Text_Grunt12Defeat
+	msgbox MagmaHideout_4F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA
-	trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
-	msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_13, MagmaHideout_4F_Text_Grunt13Intro, MagmaHideout_4F_Text_Grunt13Defeat
+	msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1
-	trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
-	msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
+	trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
+	msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_Text_23A6E8: @ 823A6E8
+MagmaHideout_4F_Text_Grunt11Intro: @ 823A6E8
 	.string "I want to see GROUDON, too, but they\n"
 	.string "won't let me see even its tail…\p"
 	.string "It's got me feeling really frustrated.\p"
 	.string "Oh, no!\n"
 	.string "I blabbed about GROUDON!$"
 
-MagmaHideout_4F_Text_23A775: @ 823A775
+MagmaHideout_4F_Text_Grunt11Defeat: @ 823A775
 	.string "I guess it's impossible to win if one\n"
 	.string "doesn't have a calm mind…$"
 
-MagmaHideout_4F_Text_23A7B5: @ 823A7B5
+MagmaHideout_4F_Text_Grunt11PostBattle: @ 823A7B5
 	.string "I wonder if GROUDON even has a tail?$"
 
-MagmaHideout_4F_Text_23A7DA: @ 823A7DA
+MagmaHideout_4F_Text_Grunt12Intro: @ 823A7DA
 	.string "Fuhahaha!\n"
 	.string "Soon! Very soon!\l"
 	.string "Our grand objective will be achieved!$"
 
-MagmaHideout_4F_Text_23A81B: @ 823A81B
+MagmaHideout_4F_Text_Grunt12Defeat: @ 823A81B
 	.string "Grrr…\n"
 	.string "I've come so far, but now this?$"
 
-MagmaHideout_4F_Text_23A841: @ 823A841
+MagmaHideout_4F_Text_Grunt12PostBattle: @ 823A841
 	.string "MAXIE, sir!\n"
 	.string "An intruder is headed your way!$"
 
-MagmaHideout_4F_Text_23A86D: @ 823A86D
+MagmaHideout_4F_Text_Grunt13Intro: @ 823A86D
 	.string "You're not finished yet!\n"
 	.string "You're not getting by me easily!$"
 
-MagmaHideout_4F_Text_23A8A7: @ 823A8A7
+MagmaHideout_4F_Text_Grunt13Defeat: @ 823A8A7
 	.string "Was I that easy to knock down?$"
 
-MagmaHideout_4F_Text_23A8C6: @ 823A8C6
+MagmaHideout_4F_Text_Grunt13PostBattle: @ 823A8C6
 	.string "C-come on, one more match…$"
 
-MagmaHideout_4F_Text_23A8E1: @ 823A8E1
+MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1
 	.string "Hehehe!\n"
 	.string "You made it this far, so I'll tell you!\p"
 	.string "That's right!\n"
@@ -175,15 +172,15 @@ MagmaHideout_4F_Text_23A8E1: @ 823A8E1
 	.string "It's going to awaken real soon!\n"
 	.string "Hehe! Hehehe!$"
 
-MagmaHideout_4F_Text_23A994: @ 823A994
+MagmaHideout_4F_Text_TabithaDefeat: @ 823A994
 	.string "Taken down again…\n"
 	.string "Hehe…$"
 
-MagmaHideout_4F_Text_23A9AC: @ 823A9AC
+MagmaHideout_4F_Text_TabithaPostBattle: @ 823A9AC
 	.string "…And while you wasted time with me,\n"
 	.string "MAXIE should have awakened GROUDON…$"
 
-MagmaHideout_4F_Text_23A9F4: @ 823A9F4
+MagmaHideout_4F_Text_MaxieAwakenGroudon: @ 823A9F4
 	.string "MAXIE: GROUDON…\p"
 	.string "Nothing could awaken you from your\n"
 	.string "sleep bathed in magma…\p"
@@ -194,25 +191,25 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4
 	.string "And show me…\n"
 	.string "Show me the full extent of your power!$"
 
-MagmaHideout_4F_Text_23AADA: @ 823AADA
+MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: @ 823AADA
 	.string "MAXIE: GROUDON!\n"
 	.string "What's wrong?\p"
 	.string "Wasn't the BLUE ORB the key?\p"
 	.string "GROUDON!\n"
 	.string "Where have you gone…$"
 
-MagmaHideout_4F_Text_23AB33: @ 823AB33
+MagmaHideout_4F_Text_MaxieOhItWasYou: @ 823AB33
 	.string "MAXIE: Oh, so it was you?\p"
 	.string "I've seen you poking around uninvited\n"
 	.string "here and there…\p"
 	.string "I get it now!\n"
 	.string "You must have pulled a cheap stunt!$"
 
-MagmaHideout_4F_Text_23ABB5: @ 823ABB5
+MagmaHideout_4F_Text_MaxieDefeat: @ 823ABB5
 	.string "What makes you so adept at handling\n"
 	.string "POKéMON?$"
 
-MagmaHideout_4F_Text_23ABE2: @ 823ABE2
+MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: @ 823ABE2
 	.string "MAXIE: There has to be some reason\n"
 	.string "why GROUDON fled…\p"
 	.string "That's what you're trying to say,\n"
diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json
index ec1c3389a..133d89fe0 100644
--- a/data/maps/MarineCave_End/map.json
+++ b/data/maps/MarineCave_End/map.json
@@ -45,7 +45,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "1",
-      "script": "MarineCave_End_EventScript_23B01B"
+      "script": "MarineCave_End_EventScript_Kyogre"
     }
   ],
   "bg_events": []
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index fd434804e..0050af939 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -1,13 +1,13 @@
 MarineCave_End_MapScripts:: @ 823AFDF
-	map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA
+	map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition
 	.byte 0
 
-MarineCave_End_MapScript1_23AFEA: @ 823AFEA
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_23AFF4
+MarineCave_End_OnResume: @ 823AFEA
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_TryRemoveKyogre
 	end
 
-MarineCave_End_EventScript_23AFF4:: @ 823AFF4
+MarineCave_End_EventScript_TryRemoveKyogre:: @ 823AFF4
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -15,19 +15,19 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4
 	return
 
 MarineCave_End_OnTransition: @ 823B008
-	call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012
+	call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_ShowKyogre
 	end
 
-MarineCave_End_EventScript_23B012:: @ 823B012
+MarineCave_End_EventScript_ShowKyogre:: @ 823B012
 	clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE
 	setvar VAR_TEMP_1, 1
 	return
 
-MarineCave_End_EventScript_23B01B:: @ 823B01B
+MarineCave_End_EventScript_Kyogre:: @ 823B01B
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 1, MarineCave_End_Movement_23B09D
+	applymovement 1, MarineCave_End_Movement_KyogreApproach
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
@@ -42,28 +42,28 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
 	setvar VAR_TEMP_1, 0
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq MarineCave_End_EventScript_23B084
+	goto_if_eq MarineCave_End_EventScript_DefeatedKyogre
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq MarineCave_End_EventScript_23B092
+	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq MarineCave_End_EventScript_23B092
+	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	releaseall
 	end
 
-MarineCave_End_EventScript_23B084:: @ 823B084
+MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-MarineCave_End_EventScript_23B092:: @ 823B092
+MarineCave_End_EventScript_RanFromKyogre:: @ 823B092
 	setvar VAR_0x8004, SPECIES_KYOGRE
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-MarineCave_End_Movement_23B09D: @ 823B09D
+MarineCave_End_Movement_KyogreApproach: @ 823B09D
 	init_affine_anim
 	walk_down_start_affine
 	delay_16
diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc
index 82ff756e1..1ba4546e3 100644
--- a/data/maps/MarineCave_Entrance/scripts.inc
+++ b/data/maps/MarineCave_Entrance/scripts.inc
@@ -1,8 +1,8 @@
 MarineCave_Entrance_MapScripts:: @ 823AFD0
-	map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6
+	map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_OnResume
 	.byte 0
 
-MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6
+MarineCave_Entrance_OnResume: @ 823AFD6
 	setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6
 	end
 
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index d5dc8ae99..1708008bd 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF3B3",
+      "script": "MauvilleCity_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF3CE",
+      "script": "MauvilleCity_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -71,7 +71,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF3BC",
+      "script": "MauvilleCity_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -84,7 +84,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF3C5",
+      "script": "MauvilleCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -97,7 +97,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF3FB",
+      "script": "MauvilleCity_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF452",
+      "script": "MauvilleCity_EventScript_Wally",
       "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF41D",
+      "script": "MauvilleCity_EventScript_WallysUncle",
       "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_EventScript_1DF73A",
+      "script": "MauvilleCity_EventScript_Wattson",
       "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON"
     },
     {
@@ -246,7 +246,7 @@
       "y": 6,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_EventScript_1DF3E0"
+      "script": "MauvilleCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -278,7 +278,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_EventScript_1DF3D7"
+      "script": "MauvilleCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -286,7 +286,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_EventScript_1DF3E9"
+      "script": "MauvilleCity_EventScript_BikeShopSign"
     },
     {
       "type": "sign",
@@ -294,7 +294,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_EventScript_1DF3F2"
+      "script": "MauvilleCity_EventScript_GameCornerSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 52ff2237c..3410664a1 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -9,88 +9,88 @@ MauvilleCity_OnTransition: @ 81DF38B
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar VAR_MAUVILLE_GYM_STATE, 0
-	call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
+	call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym
 	end
 
-MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
+MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9
 	clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
 	setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
 	setflag FLAG_WATTSON_REMATCH_AVAILABLE
 	return
 
-MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
-	msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC
+MauvilleCity_EventScript_Boy:: @ 81DF3B3
+	msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC
-	msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC
+MauvilleCity_EventScript_Maniac:: @ 81DF3BC
+	msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5
-	msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC
+MauvilleCity_EventScript_Woman:: @ 81DF3C5
+	msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE
-	msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC
+MauvilleCity_EventScript_RichBoy:: @ 81DF3CE
+	msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7
-	msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN
+MauvilleCity_EventScript_CitySign:: @ 81DF3D7
+	msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0
-	msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN
+MauvilleCity_EventScript_GymSign:: @ 81DF3E0
+	msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9
-	msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN
+MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9
+	msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
-	msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN
+MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2
+	msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
+MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB
 	lock
 	faceplayer
-	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413
-	msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT
+	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained
+	msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT
 	setflag FLAG_TV_EXPLAINED
 	release
 	end
 
-MauvilleCity_EventScript_1DF413:: @ 81DF413
-	msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT
+MauvilleCity_EventScript_TVExplained:: @ 81DF413
+	msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF41D:: @ 81DF41D
+MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
 	lock
 	faceplayer
-	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
-	msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally
+	msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MauvilleCity_EventScript_1DF43D:: @ 81DF43D
-	msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT
+MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
+	msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MauvilleCity_EventScript_1DF452:: @ 81DF452
+MauvilleCity_EventScript_Wally:: @ 81DF452
 	lockall
-	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
-	msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
-	msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
@@ -98,61 +98,61 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452
 	waitmovement 0
 	applymovement 6, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO
-	goto MauvilleCity_EventScript_1DF4AD
+	msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO
+	goto MauvilleCity_EventScript_BattleWallyPrompt
 	end
 
-MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
-	compare VAR_RESULT, 1
-	call_if_eq MauvilleCity_EventScript_1DF63A
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_EventScript_1DF683
+MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
+	compare VAR_RESULT, YES
+	call_if_eq MauvilleCity_EventScript_BattleWally
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle
 	closemessage
 	switch VAR_FACING
-	case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
-	case DIR_EAST, MauvilleCity_EventScript_1DF53D
+	case DIR_NORTH, MauvilleCity_EventScript_WallyAndUncleExitNorth
+	case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast
 	end
 
-MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF
-	applymovement 6, MauvilleCity_Movement_1DF6A8
-	applymovement 7, MauvilleCity_Movement_1DF6E2
+MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
+	applymovement 6, MauvilleCity_Movement_WallyExitNorth1
+	applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1
 	waitmovement 0
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
-	applymovement 7, MauvilleCity_Movement_1DF6F3
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
+	applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC
-	applymovement 7, MauvilleCity_Movement_1DF6FA
-	applymovement 6, MauvilleCity_Movement_1DF6B4
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
+	applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2
+	applymovement 6, MauvilleCity_Movement_WallyExitNorth2
 	waitmovement 0
-	goto MauvilleCity_EventScript_1DF593
+	goto MauvilleCity_EventScript_DefeatedWally
 	end
 
-MauvilleCity_EventScript_1DF53D:: @ 81DF53D
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC
-	applymovement 6, MauvilleCity_Movement_1DF6AE
-	applymovement 7, MauvilleCity_Movement_1DF6E8
+MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
+	applymovement 6, MauvilleCity_Movement_WallyExitEast1
+	applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1
 	waitmovement 0
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
-	applymovement 7, MauvilleCity_Movement_1DF6F7
+	applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0
-	applymovement 7, MauvilleCity_Movement_1DF703
-	applymovement 6, MauvilleCity_Movement_1DF6C0
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
+	applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2
+	applymovement 6, MauvilleCity_Movement_WallyExitEast2
 	waitmovement 0
-	goto MauvilleCity_EventScript_1DF593
+	goto MauvilleCity_EventScript_DefeatedWally
 	end
 
-MauvilleCity_EventScript_1DF593:: @ 81DF593
+MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
 	removeobject 6
 	removeobject 7
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
@@ -161,75 +161,75 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
 	setvar VAR_WALLY_CALL_STEP_COUNTER, 0
 	setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MauvilleCity_EventScript_1DF5F3
+	call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MauvilleCity_EventScript_1DF601
+	call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT
 	closemessage
 	addvar VAR_SCOTT_STATE, 1
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MauvilleCity_EventScript_1DF616
+	call_if_eq MauvilleCity_EventScript_ScottExitNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MauvilleCity_EventScript_1DF628
+	call_if_eq MauvilleCity_EventScript_ScottExitEast
 	removeobject 11
 	releaseall
 	end
 
-MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3
+MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3
 	addobject 11
-	applymovement 11, MauvilleCity_Movement_1DF70D
+	applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_1DF601:: @ 81DF601
+MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
 	setobjectxyperm 11, 12, 13
 	addobject 11
-	applymovement 11, MauvilleCity_Movement_1DF719
+	applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_1DF616:: @ 81DF616
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5
-	applymovement 11, MauvilleCity_Movement_1DF725
+MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
+	applymovement 11, MauvilleCity_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_1DF628:: @ 81DF628
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8
-	applymovement 11, MauvilleCity_Movement_1DF72F
+MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
+	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
+	applymovement 11, MauvilleCity_Movement_ScottExitEast
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_1DF63A:: @ 81DF63A
-	msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
+MauvilleCity_EventScript_BattleWally:: @ 81DF63A
+	msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
 	return
 
-MauvilleCity_EventScript_1DF683:: @ 81DF683
+MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683
 	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
-	msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF690:: @ 81DF690
+MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO
-	goto MauvilleCity_EventScript_1DF4AD
+	msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO
+	goto MauvilleCity_EventScript_BattleWallyPrompt
 	end
 
-MauvilleCity_Movement_1DF6A8: @ 81DF6A8
+MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8
 	walk_left
 	walk_left
 	walk_down
@@ -237,7 +237,7 @@ MauvilleCity_Movement_1DF6A8: @ 81DF6A8
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF6AE: @ 81DF6AE
+MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE
 	walk_down
 	walk_down
 	walk_left
@@ -245,7 +245,7 @@ MauvilleCity_Movement_1DF6AE: @ 81DF6AE
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF6B4: @ 81DF6B4
+MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4
 	delay_16
 	delay_16
 	walk_left
@@ -259,7 +259,7 @@ MauvilleCity_Movement_1DF6B4: @ 81DF6B4
 	delay_8
 	step_end
 
-MauvilleCity_Movement_1DF6C0: @ 81DF6C0
+MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0
 	delay_16
 	delay_16
 	walk_left
@@ -273,41 +273,41 @@ MauvilleCity_Movement_1DF6C0: @ 81DF6C0
 	delay_8
 	step_end
 
-MauvilleCity_Movement_1DF6CC: @ 81DF6CC
+MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_1DF6D0: @ 81DF6D0
+MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_1DF6D5: @ 81DF6D5
+MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_1DF6D8: @ 81DF6D8
+MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_1DF6DC: @ 81DF6DC
+MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-MauvilleCity_Movement_1DF6DF: @ 81DF6DF
+MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_1DF6E2: @ 81DF6E2
+MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2
 	walk_left
 	walk_left
 	walk_left
@@ -315,7 +315,7 @@ MauvilleCity_Movement_1DF6E2: @ 81DF6E2
 	walk_down
 	step_end
 
-MauvilleCity_Movement_1DF6E8: @ 81DF6E8
+MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8
 	walk_left
 	walk_down
 	walk_down
@@ -323,25 +323,25 @@ MauvilleCity_Movement_1DF6E8: @ 81DF6E8
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF6EE: @ 81DF6EE
+MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-MauvilleCity_Movement_1DF6F3: @ 81DF6F3
+MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MauvilleCity_Movement_1DF6F7: @ 81DF6F7
+MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7
 	walk_right
 	walk_up
 	step_end
 
-MauvilleCity_Movement_1DF6FA: @ 81DF6FA
+MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA
 	walk_left
 	walk_left
 	walk_left
@@ -352,7 +352,7 @@ MauvilleCity_Movement_1DF6FA: @ 81DF6FA
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF703: @ 81DF703
+MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703
 	walk_down
 	walk_left
 	walk_left
@@ -364,7 +364,7 @@ MauvilleCity_Movement_1DF703: @ 81DF703
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF70D: @ 81DF70D
+MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D
 	walk_up
 	walk_up
 	walk_up
@@ -378,7 +378,7 @@ MauvilleCity_Movement_1DF70D: @ 81DF70D
 	walk_in_place_fastest_up
 	step_end
 
-MauvilleCity_Movement_1DF719: @ 81DF719
+MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719
 	walk_up
 	walk_up
 	walk_up
@@ -392,7 +392,7 @@ MauvilleCity_Movement_1DF719: @ 81DF719
 	walk_up
 	step_end
 
-MauvilleCity_Movement_1DF725: @ 81DF725
+MauvilleCity_Movement_ScottExitNorth: @ 81DF725
 	walk_left
 	walk_left
 	walk_left
@@ -404,7 +404,7 @@ MauvilleCity_Movement_1DF725: @ 81DF725
 	walk_left
 	step_end
 
-MauvilleCity_Movement_1DF72F: @ 81DF72F
+MauvilleCity_Movement_ScottExitEast: @ 81DF72F
 	walk_down
 	walk_left
 	walk_left
@@ -417,47 +417,47 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
 	walk_left
 	step_end
 
-MauvilleCity_EventScript_1DF73A:: @ 81DF73A
+MauvilleCity_EventScript_Wattson:: @ 81DF73A
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
+	goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt
 	compare VAR_NEW_MAUVILLE_STATE, 2
-	goto_if_eq MauvilleCity_EventScript_1DF784
-	goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
-	msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT
+	goto_if_eq MauvilleCity_EventScript_CompletedNewMauville
+	goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville
+	msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT
 	giveitem_std ITEM_BASEMENT_KEY
 	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
-	msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF77A:: @ 81DF77A
-	msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
+MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A
+	msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF784:: @ 81DF784
-	msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
+MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
+	msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM24
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_GOT_TM24_FROM_WATTSON
-	msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
-	msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
+MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0
+	msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
+MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
 	lockall
-	pokenavcall MauvilleCity_Text_1DFDFB
+	pokenavcall MauvilleCity_Text_WallyPokenavCall
 	waitmessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -466,30 +466,30 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
 	releaseall
 	end
 
-MauvilleCity_Text_1DF7DC: @ 81DF7DC
+MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC
 	.string "UNCLE: It's because of POKéMON that\n"
 	.string "this boy's got more pep, I suppose…\l"
 	.string "But he's become a bit too peppy…$"
 
-MauvilleCity_Text_1DF845: @ 81DF845
+MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845
 	.string "WALLY: Aww, UNCLE, please?\p"
 	.string "I want to challenge this GYM and see\n"
 	.string "how much better I've become.\p"
 	.string "Please? May I, please?$"
 
-MauvilleCity_Text_1DF8B9: @ 81DF8B9
+MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9
 	.string "UNCLE: Now hold on, WALLY.\p"
 	.string "Since you started living with POKéMON,\n"
 	.string "you have grown quite a lot stronger.\p"
 	.string "But don't you think you're pushing it\n"
 	.string "to suddenly challenge a GYM?$"
 
-MauvilleCity_Text_1DF963: @ 81DF963
+MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963
 	.string "WALLY: I'm not pushing it.\p"
 	.string "If I combine forces with RALTS,\n"
 	.string "we can beat anyone!$"
 
-MauvilleCity_Text_1DF9B2: @ 81DF9B2
+MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2
 	.string "WALLY: Oh! Hi, {PLAYER}!\p"
 	.string "I've gotten a lot stronger since\n"
 	.string "we met.\p"
@@ -498,43 +498,43 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2
 	.string "{PLAYER}, please, will you have\n"
 	.string "a battle with me?$"
 
-MauvilleCity_Text_1DFA4A: @ 81DFA4A
+MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A
 	.string "WALLY: Oh… If you won't battle me,\n"
 	.string "{PLAYER}, my UNCLE won't know that I've\l"
 	.string "become really strong.$"
 
-MauvilleCity_Text_1DFAA5: @ 81DFAA5
+MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5
 	.string "UNCLE: {PLAYER}{KUN}, was it?\n"
 	.string "On WALLY's behalf, can I ask you to\l"
 	.string "battle with him just this once?\p"
 	.string "I don't think he's going to listen to\n"
 	.string "any reason the way he is now.$"
 
-MauvilleCity_Text_1DFB42: @ 81DFB42
+MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42
 	.string "WALLY: {PLAYER}, please!\n"
 	.string "Battle with me, please.$"
 
-MauvilleCity_Text_1DFB6D: @ 81DFB6D
+MauvilleCity_Text_WallyHereICome: @ 81DFB6D
 	.string "WALLY: {PLAYER}, thank you.\p"
 	.string "Okay… Here I come!$"
 
-MauvilleCity_Text_1DFB96: @ 81DFB96
+MauvilleCity_Text_WallyDefeat: @ 81DFB96
 	.string "WALLY: … … … … … … …\p"
 	.string "… … … … … … … …\p"
 	.string "I lost…$"
 
-MauvilleCity_Text_1DFBC3: @ 81DFBC3
+MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3
 	.string "WALLY: UNCLE…\n"
 	.string "I'll go back to VERDANTURF…$"
 
-MauvilleCity_Text_1DFBED: @ 81DFBED
+MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED
 	.string "{PLAYER}, thank you.\n"
 	.string "Being a TRAINER is tough, isn't it?\p"
 	.string "It's not enough just to have POKéMON\n"
 	.string "and make them battle. That isn't what\l"
 	.string "being a real TRAINER is about.$"
 
-MauvilleCity_Text_1DFC8A: @ 81DFC8A
+MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A
 	.string "UNCLE: WALLY, there's no need to be so\n"
 	.string "down on yourself.\p"
 	.string "Why, what's keeping you from becoming\n"
@@ -542,7 +542,7 @@ MauvilleCity_Text_1DFC8A: @ 81DFC8A
 	.string "Come on, let's go home.\n"
 	.string "Everyone's waiting for you.$"
 
-MauvilleCity_Text_1DFD34: @ 81DFD34
+MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34
 	.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
 	.string "that you must be the TRAINER who kept\l"
 	.string "an eye out for WALLY when he caught\l"
@@ -552,7 +552,7 @@ MauvilleCity_Text_1DFD34: @ 81DFD34
 	.string "I'm sure WALLY would enjoy it.$"
 
 
-MauvilleCity_Text_1DFDFB: @ 81DFDFB
+MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "WALLY: Oh, hello, {PLAYER}!\p"
@@ -563,11 +563,11 @@ MauvilleCity_Text_1DFDFB: @ 81DFDFB
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MauvilleCity_Text_1DFEB4: @ 81DFEB4
+MauvilleCity_Text_RegisteredWally: @ 81DFEB4
 	.string "Registered WALLY\n"
 	.string "in the POKéNAV.$"
 
-MauvilleCity_Text_1DFED5: @ 81DFED5
+MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5
 	.string "SCOTT: Hehe…\n"
 	.string "I was watching that match!\p"
 	.string "You're friends with that boy WALLY,\n"
@@ -580,7 +580,7 @@ MauvilleCity_Text_1DFED5: @ 81DFED5
 	.string "… … … … … …\n"
 	.string "I'll be cheering for you!$"
 
-MauvilleCity_Text_1DFFE4: @ 81DFFE4
+MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4
 	.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
 	.string "You look like you have a lot of zip!\l"
 	.string "That's a good thing, wahahahaha!\p"
@@ -595,7 +595,7 @@ MauvilleCity_Text_1DFFE4: @ 81DFFE4
 	.string "Here, this is the KEY to get into\n"
 	.string "NEW MAUVILLE.$"
 
-MauvilleCity_Text_1E0154: @ 81E0154
+MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154
 	.string "WATTSON: Don't you worry about it.\n"
 	.string "It won't be a challenge to you.\p"
 	.string "The entrance to NEW MAUVILLE is just\n"
@@ -603,7 +603,7 @@ MauvilleCity_Text_1E0154: @ 81E0154
 	.string "That's it, then, you have my trust!\n"
 	.string "Wahahahaha!$"
 
-MauvilleCity_Text_1E020E: @ 81E020E
+MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E
 	.string "WATTSON: Wahahahaha!\p"
 	.string "I knew it, {PLAYER}{KUN}! I knew I'd made\n"
 	.string "the right choice asking you!\p"
@@ -611,51 +611,51 @@ MauvilleCity_Text_1E020E: @ 81E020E
 	.string "THUNDERBOLT!\p"
 	.string "Go on, you've earned it!$"
 
-MauvilleCity_Text_1E02AA: @ 81E02AA
+MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA
 	.string "WATTSON: Wahahahaha!\p"
 	.string "It pleases me to no end to see\n"
 	.string "the young step up and take charge!$"
 
-MauvilleCity_Text_1E0301: @ 81E0301
+MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301
 	.string "You know, it's cool to have POKéMON\n"
 	.string "battles and stuff…\p"
 	.string "But if your POKéMON gets hurt,\n"
 	.string "you have to nurse it back to health.$"
 
-MauvilleCity_Text_1E037C: @ 81E037C
+MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C
 	.string "The roads of this town stretch north\n"
 	.string "and south, and east and west.\p"
 	.string "Because of that, we get all sorts of\n"
 	.string "people coming through.$"
 
-MauvilleCity_Text_1E03FB: @ 81E03FB
+MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB
 	.string "Have you been to RYDEL'S CYCLES yet?\p"
 	.string "RYDEL, the owner, is a very generous\n"
 	.string "man.$"
 
-MauvilleCity_Text_1E044A: @ 81E044A
+MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A
 	.string "Even if you're riding a BIKE,\n"
 	.string "wild POKéMON could jump you.$"
 
-MauvilleCity_Text_1E0485: @ 81E0485
+MauvilleCity_Text_CitySign: @ 81E0485
 	.string "MAUVILLE CITY\n"
 	.string "“The bright and shiny city of fun!”$"
 
-MauvilleCity_Text_1E04B7: @ 81E04B7
+MauvilleCity_Text_GymSign: @ 81E04B7
 	.string "MAUVILLE CITY POKéMON GYM\n"
 	.string "LEADER: WATTSON\l"
 	.string "“The cheerfully electrifying man!”$"
 
-MauvilleCity_Text_1E0504: @ 81E0504
+MauvilleCity_Text_BikeShopSign: @ 81E0504
 	.string "“Ride in gravel and shake up your\n"
 	.string "soul!”\l"
 	.string "RYDEL'S CYCLES$"
 
-MauvilleCity_Text_1E053C: @ 81E053C
+MauvilleCity_Text_GameCornerSign: @ 81E053C
 	.string "“The play spot for all!”\n"
 	.string "MAUVILLE GAME CORNER$"
 
-MauvilleCity_Text_1E056A: @ 81E056A
+MauvilleCity_Text_ExplainTV: @ 81E056A
 	.string "Hi, do you check out TV at all?\p"
 	.string "They've added a bunch of cool new\n"
 	.string "shows recently.\p"
@@ -667,5 +667,5 @@ MauvilleCity_Text_1E056A: @ 81E056A
 	.string "That's why I think you should check\n"
 	.string "out TVs whenever you can.$"
 
-MauvilleCity_Text_1E0699: @ 81E0699
+MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699
 	.string "Hi, have you been checking out TVs?$"
diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json
index 98c1fcee1..488ab5a4e 100644
--- a/data/maps/MauvilleCity_BikeShop/map.json
+++ b/data/maps/MauvilleCity_BikeShop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_BikeShop_EventScript_20EBBC",
+      "script": "MauvilleCity_BikeShop_EventScript_Rydel",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_BikeShop_EventScript_20ED31",
+      "script": "MauvilleCity_BikeShop_EventScript_Assistant",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_BikeShop_EventScript_20ED3A"
+      "script": "MauvilleCity_BikeShop_EventScript_MachBikeHandbook"
     },
     {
       "type": "sign",
@@ -73,7 +73,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_BikeShop_EventScript_20EDAE"
+      "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 4c4afd8e2..4b0372eac 100644
--- a/data/maps/MauvilleCity_BikeShop/scripts.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
@@ -1,203 +1,204 @@
 MauvilleCity_BikeShop_MapScripts:: @ 820EBBB
 	.byte 0
 
-MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC
+MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_20EC94
-	goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_20EBF7
-	msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT
-	msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D
+	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_AskSwitchBikes
+	goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting
+	msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT
+	msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
 	end
 
-MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7
-	msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D
+MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
+	msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16
-	message MauvilleCity_BikeShop_Text_20EF32
+MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16
+	message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne
 	waitmessage
 	multichoice 21, 8, MULTI_BIKE, 1
 	switch VAR_RESULT
-	case 0, MauvilleCity_BikeShop_EventScript_20EC53
-	case 1, MauvilleCity_BikeShop_EventScript_20EC6D
+	case 0, MauvilleCity_BikeShop_EventScript_GetMachBike
+	case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D
+MauvilleCity_BikeShop_EventScript_NotFar:: @ 820EC3D
 	setflag FLAG_DECLINED_BIKE
-	msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT
+	msgbox MauvilleCity_BikeShop_Text_GuessYouDontNeedBike, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A
+MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A
 	setflag FLAG_RECEIVED_BIKE
-	goto MauvilleCity_BikeShop_EventScript_20EC16
+	goto MauvilleCity_BikeShop_EventScript_ChooseBike
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53
-	msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53
+	msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
 	giveitem_std ITEM_MACH_BIKE
-	goto MauvilleCity_BikeShop_EventScript_20EC87
+	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D
-	msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D
+	msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
 	giveitem_std ITEM_ACRO_BIKE
-	goto MauvilleCity_BikeShop_EventScript_20EC87
+	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87
-	msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87
+	msgbox MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes, MSGBOX_DEFAULT
 	special SwapRegisteredBike
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94
-	msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20ECB3
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20ECE5
+MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94
+	msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike
 	end
 
-MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3
-	msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT
+@ If the player does not have a bike on them Rydel assumes its stored in the PC
+MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 820ECB3
+	msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT
 	checkitem ITEM_ACRO_BIKE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20ECEF
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchAcroForMach
 	checkitem ITEM_MACH_BIKE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_BikeShop_EventScript_20ED10
-	msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchMachForAcro
+	msgbox MauvilleCity_BikeShop_Text_OhYourBikeIsInPC, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5
-	msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5
+	msgbox MauvilleCity_BikeShop_Text_HappyYouLikeIt, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF
+MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
 	incrementgamestat GAME_STAT_TRADED_BIKES
-	msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT
+	msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT
 	takeitem ITEM_ACRO_BIKE, 1
 	giveitem_std ITEM_MACH_BIKE
-	goto MauvilleCity_BikeShop_EventScript_20EC87
+	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10
+MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
 	incrementgamestat GAME_STAT_TRADED_BIKES
-	msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT
+	msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT
 	takeitem ITEM_MACH_BIKE, 1
 	giveitem_std ITEM_ACRO_BIKE
-	goto MauvilleCity_BikeShop_EventScript_20EC87
+	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31
-	msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC
+MauvilleCity_BikeShop_EventScript_Assistant:: @ 820ED31
+	msgbox MauvilleCity_BikeShop_Text_HandbooksAreInBack, MSGBOX_NPC
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A
-	message MauvilleCity_BikeShop_Text_20F445
+MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 820ED3A
+	message MauvilleCity_BikeShop_Text_MachHandbookWhichPage
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20ED46
+	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46
+MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46
 	multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_BikeShop_EventScript_20ED88
-	case 1, MauvilleCity_BikeShop_EventScript_20ED94
-	case 2, MauvilleCity_BikeShop_EventScript_20EDA0
-	case 3, MauvilleCity_BikeShop_EventScript_20EDAC
-	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EDAC
+	case 0, MauvilleCity_BikeShop_EventScript_HowToRide
+	case 1, MauvilleCity_BikeShop_EventScript_HowToTurn
+	case 2, MauvilleCity_BikeShop_EventScript_SandySlopes
+	case 3, MauvilleCity_BikeShop_EventScript_ExitMachHandbook
+	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitMachHandbook
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88
-	message MauvilleCity_BikeShop_Text_20F487
+MauvilleCity_BikeShop_EventScript_HowToRide:: @ 820ED88
+	message MauvilleCity_BikeShop_Text_HowToRideMachBike
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20ED46
+	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20ED94:: @ 820ED94
-	message MauvilleCity_BikeShop_Text_20F550
+MauvilleCity_BikeShop_EventScript_HowToTurn:: @ 820ED94
+	message MauvilleCity_BikeShop_Text_HowToTurnMachBike
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20ED46
+	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EDA0:: @ 820EDA0
-	message MauvilleCity_BikeShop_Text_20F61A
+MauvilleCity_BikeShop_EventScript_SandySlopes:: @ 820EDA0
+	message MauvilleCity_BikeShop_Text_SandySlopes
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20ED46
+	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EDAC:: @ 820EDAC
+MauvilleCity_BikeShop_EventScript_ExitMachHandbook:: @ 820EDAC
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE
-	message MauvilleCity_BikeShop_Text_20F6ED
+MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 820EDAE
+	message MauvilleCity_BikeShop_Text_AcroHandbookWhichPage
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20EDBA
+	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA
+MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA
 	multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_BikeShop_EventScript_20EDFC
-	case 1, MauvilleCity_BikeShop_EventScript_20EE08
-	case 2, MauvilleCity_BikeShop_EventScript_20EE14
-	case 3, MauvilleCity_BikeShop_EventScript_20EE20
-	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EE20
+	case 0, MauvilleCity_BikeShop_EventScript_Wheelies
+	case 1, MauvilleCity_BikeShop_EventScript_BunnyHops
+	case 2, MauvilleCity_BikeShop_EventScript_Jumps
+	case 3, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook
+	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook
 	end
 
-MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC
-	message MauvilleCity_BikeShop_Text_20F72F
+MauvilleCity_BikeShop_EventScript_Wheelies:: @ 820EDFC
+	message MauvilleCity_BikeShop_Text_Wheelies
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20EDBA
+	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EE08:: @ 820EE08
-	message MauvilleCity_BikeShop_Text_20F7F5
+MauvilleCity_BikeShop_EventScript_BunnyHops:: @ 820EE08
+	message MauvilleCity_BikeShop_Text_BunnyHops
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20EDBA
+	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EE14:: @ 820EE14
-	message MauvilleCity_BikeShop_Text_20F898
+MauvilleCity_BikeShop_EventScript_Jumps:: @ 820EE14
+	message MauvilleCity_BikeShop_Text_Jumps
 	waitmessage
-	goto MauvilleCity_BikeShop_EventScript_20EDBA
+	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_20EE20:: @ 820EE20
+MauvilleCity_BikeShop_EventScript_ExitAcroHandbook:: @ 820EE20
 	release
 	end
 
-MauvilleCity_BikeShop_Text_20EE22: @ 820EE22
+MauvilleCity_BikeShop_Text_RydelGreeting: @ 820EE22
 	.string "Well, well, what have we here?\n"
 	.string "A most energetic customer!\p"
 	.string "Me? You may call me RYDEL.\n"
 	.string "I'm the owner of this cycle shop.$"
 
-MauvilleCity_BikeShop_Text_20EE99: @ 820EE99
+MauvilleCity_BikeShop_Text_DidYouComeFromFarAway: @ 820EE99
 	.string "RYDEL: Your RUNNING SHOES…\n"
 	.string "They're awfully filthy.\p"
 	.string "Did you come from far away?$"
 
-MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8
+MauvilleCity_BikeShop_Text_GuessYouDontNeedBike: @ 820EEE8
 	.string "RYDEL: Is that right?\p"
 	.string "Then, I guess you have no need for\n"
 	.string "any of my BIKES.$"
 
-MauvilleCity_BikeShop_Text_20EF32: @ 820EF32
+MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne: @ 820EF32
 	.string "RYDEL: Hm, hm… … … … …\p"
 	.string "You're saying that you came all this\n"
 	.string "way from LITTLEROOT?\p"
@@ -221,37 +222,37 @@ MauvilleCity_BikeShop_Text_20EF32: @ 820EF32
 	.string "have whichever one you like!\p"
 	.string "Which one will you choose?$"
 
-MauvilleCity_BikeShop_Text_20F18D: @ 820F18D
+MauvilleCity_BikeShop_Text_ChoseMachBike: @ 820F18D
 	.string "{PLAYER} chose the MACH BIKE.$"
 
-MauvilleCity_BikeShop_Text_20F1A5: @ 820F1A5
+MauvilleCity_BikeShop_Text_ChoseAcroBike: @ 820F1A5
 	.string "{PLAYER} chose the ACRO BIKE.$"
 
-MauvilleCity_BikeShop_Text_20F1BD: @ 820F1BD
+MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes: @ 820F1BD
 	.string "RYDEL: If you get the urge to switch\n"
 	.string "BIKES, just come see me!$"
 
-MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB
+MauvilleCity_BikeShop_Text_WantToSwitchBikes: @ 820F1FB
 	.string "RYDEL: Oh? Were you thinking about\n"
 	.string "switching BIKES?$"
 
-MauvilleCity_BikeShop_Text_20F22F: @ 820F22F
+MauvilleCity_BikeShop_Text_IllSwitchBikes: @ 820F22F
 	.string "RYDEL: Okay, no problem!\n"
 	.string "I'll switch BIKES for you!$"
 
-MauvilleCity_BikeShop_Text_20F263: @ 820F263
+MauvilleCity_BikeShop_Text_ExchangedMachForAcro: @ 820F263
 	.string "{PLAYER} got the MACH BIKE exchanged\n"
 	.string "for an ACRO BIKE.$"
 
-MauvilleCity_BikeShop_Text_20F294: @ 820F294
+MauvilleCity_BikeShop_Text_ExchangedAcroForMach: @ 820F294
 	.string "{PLAYER} got the ACRO BIKE exchanged\n"
 	.string "for a MACH BIKE.$"
 
-MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4
+MauvilleCity_BikeShop_Text_HappyYouLikeIt: @ 820F2C4
 	.string "RYDEL: Good, good!\n"
 	.string "I'm happy that you like it!$"
 
-MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3
+MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3
 	.string "Oh? What happened to that BIKE\n"
 	.string "I gave you?\p"
 	.string "Oh, I get it, you stored it using your PC.\p"
@@ -260,18 +261,18 @@ MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3
 	.string "May the wind always be at your back\n"
 	.string "on your adventure!$"
 
-MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3
+MauvilleCity_BikeShop_Text_HandbooksAreInBack: @ 820F3C3
 	.string "I'm learning about BIKES while\n"
 	.string "I work here.\p"
 	.string "If you need advice on how to ride your\n"
 	.string "BIKE, there're a couple handbooks in\l"
 	.string "the back.$"
 
-MauvilleCity_BikeShop_Text_20F445: @ 820F445
+MauvilleCity_BikeShop_Text_MachHandbookWhichPage: @ 820F445
 	.string "It's a handbook on the MACH BIKE.\p"
 	.string "Which page do you want to read?$"
 
-MauvilleCity_BikeShop_Text_20F487: @ 820F487
+MauvilleCity_BikeShop_Text_HowToRideMachBike: @ 820F487
 	.string "A BIKE moves in the direction that\n"
 	.string "the + Control Pad is pressed.\p"
 	.string "It will speed up once it gets rolling.\p"
@@ -279,7 +280,7 @@ MauvilleCity_BikeShop_Text_20F487: @ 820F487
 	.string "The BIKE will slow to a stop.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_20F550: @ 820F550
+MauvilleCity_BikeShop_Text_HowToTurnMachBike: @ 820F550
 	.string "A MACH BIKE is speedy, but it can't\n"
 	.string "stop very quickly.\p"
 	.string "It gets a little tricky to get around\n"
@@ -288,7 +289,7 @@ MauvilleCity_BikeShop_Text_20F550: @ 820F550
 	.string "before the corner and slow down.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_20F61A: @ 820F61A
+MauvilleCity_BikeShop_Text_SandySlopes: @ 820F61A
 	.string "There are small sandy slopes\n"
 	.string "throughout the HOENN region.\p"
 	.string "The loose, crumbly sand makes it\n"
@@ -297,11 +298,11 @@ MauvilleCity_BikeShop_Text_20F61A: @ 820F61A
 	.string "zip up a sandy slope.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED
+MauvilleCity_BikeShop_Text_AcroHandbookWhichPage: @ 820F6ED
 	.string "It's a handbook on the ACRO BIKE.\p"
 	.string "Which page do you want to read?$"
 
-MauvilleCity_BikeShop_Text_20F72F: @ 820F72F
+MauvilleCity_BikeShop_Text_Wheelies: @ 820F72F
 	.string "Press the B Button while riding,\n"
 	.string "and the front wheel lifts up.\p"
 	.string "You can zip around with the front\n"
@@ -309,14 +310,14 @@ MauvilleCity_BikeShop_Text_20F72F: @ 820F72F
 	.string "This technique is called a wheelie.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_20F7F5: @ 820F7F5
+MauvilleCity_BikeShop_Text_BunnyHops: @ 820F7F5
 	.string "Keeping the B Button pressed,\n"
 	.string "your BIKE can hop on the spot.\p"
 	.string "This technique is called a bunny hop.\p"
 	.string "You can ride while hopping, too.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_20F898: @ 820F898
+MauvilleCity_BikeShop_Text_Jumps: @ 820F898
 	.string "Press the B Button and the + Control\n"
 	.string "Pad at the same time to jump.\p"
 	.string "Press the + Control Pad to the side\n"
diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json
index c811cd7fd..efebc685a 100644
--- a/data/maps/MauvilleCity_GameCorner/map.json
+++ b/data/maps/MauvilleCity_GameCorner/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_210125",
+      "script": "MauvilleCity_GameCorner_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_21012E",
+      "script": "MauvilleCity_GameCorner_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_20FBB9",
+      "script": "MauvilleCity_GameCorner_EventScript_CoinsClerk",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_20FCF1",
+      "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerDolls",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_210137",
+      "script": "MauvilleCity_GameCorner_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_21021D",
+      "script": "MauvilleCity_GameCorner_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_210279",
+      "script": "MauvilleCity_GameCorner_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_210289",
+      "script": "MauvilleCity_GameCorner_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_20FE9F",
+      "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerTMs",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_210299",
+      "script": "MauvilleCity_GameCorner_EventScript_Man",
       "flag": "0"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_2102B6",
+      "script": "MauvilleCity_GameCorner_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_GameCorner_EventScript_2102C6",
+      "script": "MauvilleCity_GameCorner_EventScript_Woman",
       "flag": "0"
     }
   ],
@@ -195,7 +195,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_2102D6"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine0"
     },
     {
       "type": "sign",
@@ -203,7 +203,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_2102F6"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine1"
     },
     {
       "type": "sign",
@@ -211,7 +211,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_210316"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine2"
     },
     {
       "type": "sign",
@@ -219,7 +219,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_210336"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine3"
     },
     {
       "type": "sign",
@@ -227,7 +227,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_210356"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine4"
     },
     {
       "type": "sign",
@@ -235,7 +235,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_210376"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine5"
     },
     {
       "type": "sign",
@@ -243,7 +243,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_210396"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine6"
     },
     {
       "type": "sign",
@@ -251,7 +251,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_2103B6"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine7"
     },
     {
       "type": "sign",
@@ -259,7 +259,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
-      "script": "MauvilleCity_GameCorner_EventScript_2103D6"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine8"
     },
     {
       "type": "sign",
@@ -267,7 +267,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_2103F6"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine9"
     },
     {
       "type": "sign",
@@ -275,7 +275,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_210416"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine10"
     },
     {
       "type": "sign",
@@ -283,7 +283,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
-      "script": "MauvilleCity_GameCorner_EventScript_210436"
+      "script": "MauvilleCity_GameCorner_EventScript_SlotMachine11"
     },
     {
       "type": "sign",
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 6f6366c59..2bafd056e 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -1,539 +1,541 @@
 MauvilleCity_GameCorner_MapScripts:: @ 820FBB8
 	.byte 0
 
-MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9
+    @ Game Corner prices
+	.set TM32_COINS,  1500
+	.set TM29_COINS,  3500
+	.set TM35_COINS,  4000
+	.set TM24_COINS,  4000
+	.set TM13_COINS,  4000
+	.set DOLL_COINS,  1000
+
+	.set COINS_PRICE_50,  1000
+	.set COINS_PRICE_500, 10000
+
+MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCB7
-	message MauvilleCity_GameCorner_Text_2104DF
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NeedCoinCase
+	message MauvilleCity_GameCorner_Text_WereYouLookingForCoins
 	waitmessage
 	showmoneybox 0, 0, 0
 	showcoinsbox 1, 6
-	goto MauvilleCity_GameCorner_EventScript_20FBE5
+	goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50
 
-MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5
+MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5
 	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_GameCorner_EventScript_20FC33
-	case 1, MauvilleCity_GameCorner_EventScript_20FC75
-	goto MauvilleCity_GameCorner_EventScript_20FCD1
+	case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
+	case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins
+	goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins
 	end
 
-MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C
+@ Unused
+MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C
 	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_GameCorner_EventScript_20FC33
-	case 1, MauvilleCity_GameCorner_EventScript_20FC75
-	goto MauvilleCity_GameCorner_EventScript_20FCD1
+	case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
+	case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins
+	goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins
 	end
 
-MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
+MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9950
-	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 1000, 0
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
+	compare VAR_TEMP_1, MAX_COINS + 1 - 50
+	goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins
+	checkmoney COINS_PRICE_50, 0
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney
 	givecoins 50
-	takemoney 1000, 0
+	takemoney COINS_PRICE_50, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75
+MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9500
-	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 10000, 0
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
+	compare VAR_TEMP_1, MAX_COINS + 1 - 500
+	goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins
+	checkmoney COINS_PRICE_500, 0
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney
 	givecoins 500
-	takemoney 10000, 0
+	takemoney COINS_PRICE_500, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7
-	msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7
+	msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1
-	msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1
+	msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1
-	msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1
+	msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1
-	msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1
+	msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1
+MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 820FCF1
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FD0D
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D
-	message MauvilleCity_GameCorner_Text_21060D
+MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage:: @ 820FD0D
+	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	setvar VAR_TEMP_1, 0
 	showcoinsbox 1, 1
-	goto MauvilleCity_GameCorner_EventScript_20FD2B
+	goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize
 
-MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20
-	message MauvilleCity_GameCorner_Text_21060D
+MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 820FD20
+	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
-	goto MauvilleCity_GameCorner_EventScript_20FD2B
+	goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize
 
-MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B
+MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B
 	multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_GameCorner_EventScript_20FD67
-	case 1, MauvilleCity_GameCorner_EventScript_20FD75
-	case 2, MauvilleCity_GameCorner_EventScript_20FD83
-	case 3, MauvilleCity_GameCorner_EventScript_20FE92
-	goto MauvilleCity_GameCorner_EventScript_20FE92
+	case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll
+	case 1, MauvilleCity_GameCorner_EventScript_TorchicDoll
+	case 2, MauvilleCity_GameCorner_EventScript_MudkipDoll
+	case 3, MauvilleCity_GameCorner_EventScript_CancelDollSelect
+	goto MauvilleCity_GameCorner_EventScript_CancelDollSelect
 	end
 
-MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67
+MauvilleCity_GameCorner_EventScript_TreeckoDoll:: @ 820FD67
 	setvar VAR_TEMP_1, 1
 	bufferdecorationname 0, DECOR_TREECKO_DOLL
-	goto MauvilleCity_GameCorner_EventScript_20FD91
+	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75
+MauvilleCity_GameCorner_EventScript_TorchicDoll:: @ 820FD75
 	setvar VAR_TEMP_1, 2
 	bufferdecorationname 0, DECOR_TORCHIC_DOLL
-	goto MauvilleCity_GameCorner_EventScript_20FD91
+	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83
+MauvilleCity_GameCorner_EventScript_MudkipDoll:: @ 820FD83
 	setvar VAR_TEMP_1, 3
 	bufferdecorationname 0, DECOR_MUDKIP_DOLL
-	goto MauvilleCity_GameCorner_EventScript_20FD91
+	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91
-	msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92
+MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 820FD91
+	msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_GameCorner_EventScript_CancelDollSelect
 	switch VAR_TEMP_1
-	case 1, MauvilleCity_GameCorner_EventScript_20FDCB
-	case 2, MauvilleCity_GameCorner_EventScript_20FE05
-	case 3, MauvilleCity_GameCorner_EventScript_20FE3F
+	case 1, MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll
+	case 2, MauvilleCity_GameCorner_EventScript_BuyTorchicDoll
+	case 3, MauvilleCity_GameCorner_EventScript_BuyMudkipDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB
+MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 1000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
+	compare VAR_TEMP_2, DOLL_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
 	bufferdecorationname 1, DECOR_TREECKO_DOLL
 	checkdecorspace DECOR_TREECKO_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
-	takecoins 1000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
+	takecoins DOLL_COINS
 	givedecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FD20
+	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05
+MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 1000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
+	compare VAR_TEMP_2, DOLL_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
 	bufferdecorationname 1, DECOR_TORCHIC_DOLL
 	checkdecorspace DECOR_TORCHIC_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
-	takecoins 1000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
+	takecoins DOLL_COINS
 	givedecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FD20
+	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F
+MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 1000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
+	compare VAR_TEMP_2, DOLL_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
 	bufferdecorationname 1, DECOR_MUDKIP_DOLL
 	checkdecorspace DECOR_MUDKIP_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
-	takecoins 1000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
+	takecoins DOLL_COINS
 	givedecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FD20
+	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79
-	msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FD20
+MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll:: @ 820FE79
+	msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87
-	call Common_EventScript_NoRoomLeftForAnother
-	goto MauvilleCity_GameCorner_EventScript_20FD20
+MauvilleCity_GameCorner_EventScript_NoRoomForDoll:: @ 820FE87
+	call Common_EventScript_NoRoomForDecor
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92
-	msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_CancelDollSelect:: @ 820FE92
+	msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F
+MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 820FE9F
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_GameCorner_EventScript_20FEBB
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB
-	message MauvilleCity_GameCorner_Text_21060D
+MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage:: @ 820FEBB
+	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	setvar VAR_TEMP_1, 0
 	showcoinsbox 1, 1
-	goto MauvilleCity_GameCorner_EventScript_20FED9
+	goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE
-	message MauvilleCity_GameCorner_Text_21060D
+MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 820FECE
+	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
-	goto MauvilleCity_GameCorner_EventScript_20FED9
+	goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9
+MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9
 	multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0
 	switch VAR_RESULT
-	case 0, MauvilleCity_GameCorner_EventScript_20FF2B
-	case 1, MauvilleCity_GameCorner_EventScript_20FF3E
-	case 2, MauvilleCity_GameCorner_EventScript_20FF51
-	case 3, MauvilleCity_GameCorner_EventScript_20FF64
-	case 4, MauvilleCity_GameCorner_EventScript_20FF77
-	case 5, MauvilleCity_GameCorner_EventScript_210118
-	goto MauvilleCity_GameCorner_EventScript_210118
+	case 0, MauvilleCity_GameCorner_EventScript_TM32
+	case 1, MauvilleCity_GameCorner_EventScript_TM29
+	case 2, MauvilleCity_GameCorner_EventScript_TM35
+	case 3, MauvilleCity_GameCorner_EventScript_TM24
+	case 4, MauvilleCity_GameCorner_EventScript_TM13
+	case 5, MauvilleCity_GameCorner_EventScript_CancelTMSelect
+	goto MauvilleCity_GameCorner_EventScript_CancelTMSelect
 	end
 
-MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B
+MauvilleCity_GameCorner_EventScript_TM32:: @ 820FF2B
 	setvar VAR_TEMP_1, 1
 	bufferitemname 0, ITEM_TM32
-	setvar VAR_0x8004, 320
-	goto MauvilleCity_GameCorner_EventScript_20FF8A
+	setvar VAR_0x8004, ITEM_TM32
+	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E
+MauvilleCity_GameCorner_EventScript_TM29:: @ 820FF3E
 	setvar VAR_TEMP_1, 2
 	bufferitemname 0, ITEM_TM29
-	setvar VAR_0x8004, 317
-	goto MauvilleCity_GameCorner_EventScript_20FF8A
+	setvar VAR_0x8004, ITEM_TM29
+	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51
+MauvilleCity_GameCorner_EventScript_TM35:: @ 820FF51
 	setvar VAR_TEMP_1, 3
 	bufferitemname 0, ITEM_TM35
-	setvar VAR_0x8004, 323
-	goto MauvilleCity_GameCorner_EventScript_20FF8A
+	setvar VAR_0x8004, ITEM_TM35
+	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64
+MauvilleCity_GameCorner_EventScript_TM24:: @ 820FF64
 	setvar VAR_TEMP_1, 4
 	bufferitemname 0, ITEM_TM24
-	setvar VAR_0x8004, 312
-	goto MauvilleCity_GameCorner_EventScript_20FF8A
+	setvar VAR_0x8004, ITEM_TM24
+	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77
+MauvilleCity_GameCorner_EventScript_TM13:: @ 820FF77
 	setvar VAR_TEMP_1, 5
 	bufferitemname 0, ITEM_TM13
-	setvar VAR_0x8004, 301
-	goto MauvilleCity_GameCorner_EventScript_20FF8A
+	setvar VAR_0x8004, ITEM_TM13
+	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A
+MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 820FF8A
 	special BufferTMHMMoveName
-	msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210118
+	msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_GameCorner_EventScript_CancelTMSelect
 	switch VAR_TEMP_1
-	case 1, MauvilleCity_GameCorner_EventScript_20FFDD
-	case 2, MauvilleCity_GameCorner_EventScript_210017
-	case 3, MauvilleCity_GameCorner_EventScript_210051
-	case 4, MauvilleCity_GameCorner_EventScript_21008B
-	case 5, MauvilleCity_GameCorner_EventScript_2100C5
+	case 1, MauvilleCity_GameCorner_EventScript_BuyTM32
+	case 2, MauvilleCity_GameCorner_EventScript_BuyTM29
+	case 3, MauvilleCity_GameCorner_EventScript_BuyTM35
+	case 4, MauvilleCity_GameCorner_EventScript_BuyTM24
+	case 5, MauvilleCity_GameCorner_EventScript_BuyTM13
 	end
 
-MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD
+MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 1500
-	goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF
+	compare VAR_TEMP_2, TM32_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 	checkitemspace ITEM_TM32, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21010D
-	takecoins 1500
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
+	takecoins TM32_COINS
 	giveitem ITEM_TM32, 1
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_210017:: @ 8210017
+MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 3500
-	goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF
+	compare VAR_TEMP_2, TM29_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 	checkitemspace ITEM_TM29, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21010D
-	takecoins 3500
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
+	takecoins TM29_COINS
 	giveitem ITEM_TM29, 1
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_210051:: @ 8210051
+MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 4000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF
+	compare VAR_TEMP_2, TM35_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 	checkitemspace ITEM_TM35, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21010D
-	takecoins 4000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
+	takecoins TM35_COINS
 	giveitem ITEM_TM35, 1
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B
+MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 4000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF
+	compare VAR_TEMP_2, TM24_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 	checkitemspace ITEM_TM24, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21010D
-	takecoins 4000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
+	takecoins TM24_COINS
 	giveitem ITEM_TM24, 1
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5
+MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5
 	checkcoins VAR_TEMP_2
-	compare VAR_TEMP_2, 4000
-	goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF
+	compare VAR_TEMP_2, TM13_COINS
+	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 	checkitemspace ITEM_TM13, 1
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21010D
-	takecoins 4000
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
+	takecoins TM13_COINS
 	giveitem ITEM_TM13, 1
 	updatecoinsbox 1, 1
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF
-	msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM:: @ 82100FF
+	msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D
+MauvilleCity_GameCorner_EventScript_NoRoomForTM:: @ 821010D
 	call Common_EventScript_BagIsFull
-	goto MauvilleCity_GameCorner_EventScript_20FECE
+	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_210118:: @ 8210118
-	msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_CancelTMSelect:: @ 8210118
+	msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_210125:: @ 8210125
-	msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC
+MauvilleCity_GameCorner_EventScript_Woman2:: @ 8210125
+	msgbox MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay, MSGBOX_NPC
 	end
 
-MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E
-	msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC
+MauvilleCity_GameCorner_EventScript_Gentleman:: @ 821012E
+	msgbox MauvilleCity_GameCorner_Text_RouletteOnlyLuck, MSGBOX_NPC
 	end
 
-MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
+MauvilleCity_GameCorner_EventScript_Girl:: @ 8210137
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213
-	msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210209
+	goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
+	msgbox MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_GameCorner_EventScript_DeclineStarterDoll
 	switch VAR_STARTER_MON
-	case 0, MauvilleCity_GameCorner_EventScript_21017C
-	case 1, MauvilleCity_GameCorner_EventScript_2101A6
-	case 2, MauvilleCity_GameCorner_EventScript_2101D0
+	case 0, MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll
+	case 1, MauvilleCity_GameCorner_EventScript_GiveTorchicDoll
+	case 2, MauvilleCity_GameCorner_EventScript_GiveMudkipDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C
+MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C
 	bufferdecorationname 1, DECOR_TREECKO_DOLL
 	checkdecorspace DECOR_TREECKO_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
-	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
 	givedecoration_std DECOR_TREECKO_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
-	goto MauvilleCity_GameCorner_EventScript_210213
+	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6
+MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6
 	bufferdecorationname 1, DECOR_TORCHIC_DOLL
 	checkdecorspace DECOR_TORCHIC_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
-	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
 	givedecoration_std DECOR_TORCHIC_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
-	goto MauvilleCity_GameCorner_EventScript_210213
+	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
+MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0
 	bufferdecorationname 1, DECOR_MUDKIP_DOLL
 	checkdecorspace DECOR_MUDKIP_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
-	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
+	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
 	givedecoration_std DECOR_MUDKIP_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
-	goto MauvilleCity_GameCorner_EventScript_210213
+	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA
-	call Common_EventScript_NoRoomLeftForAnother
-	msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll:: @ 82101FA
+	call Common_EventScript_NoRoomForDecor
+	msgbox MauvilleCity_GameCorner_Text_YouWantItButNotNow, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_210209:: @ 8210209
-	msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_DeclineStarterDoll:: @ 8210209
+	msgbox MauvilleCity_GameCorner_Text_DontBeNegative, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_210213:: @ 8210213
-	msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll:: @ 8210213
+	msgbox MauvilleCity_GameCorner_Text_CantWinJackpot, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D
+MauvilleCity_GameCorner_EventScript_PokefanM:: @ 821021D
 	lock
 	faceplayer
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_GameCorner_EventScript_21023D
-	msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_GameCorner_EventScript_TryGive20Coins
+	msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D
-	goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_21026B
+MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D
+	goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 1
-	goto_if_ge MauvilleCity_GameCorner_EventScript_21026B
+	compare VAR_TEMP_1, 1  @ Only give 20 coins if player has no coins
+	goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	setflag FLAG_RECEIVED_20_COINS
 	givecoins 20
-	msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT
 	playse SE_REGI
-	goto MauvilleCity_GameCorner_EventScript_21026B
+	goto MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	end
 
-MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B
-	msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+MauvilleCity_GameCorner_EventScript_PokefanMNormal:: @ 821026B
+	msgbox MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_210279:: @ 8210279
+MauvilleCity_GameCorner_EventScript_OldMan:: @ 8210279
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	msgbox MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_210289:: @ 8210289
+MauvilleCity_GameCorner_EventScript_Cook:: @ 8210289
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	msgbox MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_210299:: @ 8210299
+MauvilleCity_GameCorner_EventScript_Man:: @ 8210299
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	msgbox MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9
+MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: @ 82102A9
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6
+MauvilleCity_GameCorner_EventScript_Maniac:: @ 82102B6
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	msgbox MauvilleCity_GameCorner_Text_DifficultToStopOn7, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6
+MauvilleCity_GameCorner_EventScript_Woman:: @ 82102C6
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT
-	goto MauvilleCity_GameCorner_EventScript_2102A9
+	msgbox MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo, MSGBOX_DEFAULT
+	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
+MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 82102D6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -541,10 +543,10 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
+MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 82102F6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -552,10 +554,10 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
+MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8210316
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 2
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -563,10 +565,10 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
+MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8210336
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 3
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -574,10 +576,10 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
+MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 8210356
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 4
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -585,10 +587,10 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
+MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 8210376
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 5
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -596,10 +598,10 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
+MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 8210396
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 6
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -607,10 +609,10 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
+MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 82103B6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 7
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -618,10 +620,10 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
+MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 82103D6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 8
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -629,10 +631,10 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
+MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 82103F6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 9
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -640,10 +642,10 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
+MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8210416
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 10
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -651,10 +653,10 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
+MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8210436
 	lockall
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 11
 	specialvar VAR_RESULT, GetSlotMachineId
@@ -667,139 +669,141 @@ MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456
 	releaseall
 	end
 
-MauvilleCity_GameCorner_Text_210460: @ 8210460
+MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner: @ 8210460
 	.string "This is MAUVILLE GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_21047E: @ 821047E
+MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins: @ 821047E
 	.string "Okay, you wanted some COINS for\n"
 	.string "the games?\p"
 	.string "But you don't have a COIN CASE for\n"
 	.string "stowing the COINS.$"
 
-MauvilleCity_GameCorner_Text_2104DF: @ 82104DF
+MauvilleCity_GameCorner_Text_WereYouLookingForCoins: @ 82104DF
 	.string "Were you looking for COINS?\p"
 	.string "It's ¥1000 for 50 COINS.\n"
 	.string "Would you like some?$"
 
-MauvilleCity_GameCorner_Text_210529: @ 8210529
+MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins: @ 8210529
 	.string "Thank you very much!\n"
 	.string "Here are your COINS!$"
 
-MauvilleCity_GameCorner_Text_210553: @ 8210553
+MauvilleCity_GameCorner_Text_DontHaveEnoughMoney: @ 8210553
 	.string "Um… You don't appear to have\n"
 	.string "enough money…$"
 
-MauvilleCity_GameCorner_Text_21057E: @ 821057E
+MauvilleCity_GameCorner_Text_CoinCaseIsFull: @ 821057E
 	.string "Oh?\n"
 	.string "Your COIN CASE is full.$"
 
-MauvilleCity_GameCorner_Text_21059A: @ 821059A
+MauvilleCity_GameCorner_Text_DontNeedCoinsThen: @ 821059A
 	.string "Oh… You don't need COINS, then?\n"
 	.string "Good luck on your adventure!$"
 
-MauvilleCity_GameCorner_Text_2105D7: @ 82105D7
+MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes: @ 82105D7
 	.string "Welcome.\p"
 	.string "You can exchange your COINS for\n"
 	.string "prizes here.$"
 
-MauvilleCity_GameCorner_Text_21060D: @ 821060D
+MauvilleCity_GameCorner_Text_WhichPrize: @ 821060D
 	.string "Which prize would you like?$"
 
-MauvilleCity_GameCorner_Text_210629: @ 8210629
+MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX: @ 8210629
 	.string "So your choice is\n"
 	.string "the {STR_VAR_1} {STR_VAR_2}?$"
 
-MauvilleCity_GameCorner_Text_210646: @ 8210646
+MauvilleCity_GameCorner_Text_SendToYourHomePC: @ 8210646
 	.string "Thank you!\n"
 	.string "We'll send it to your PC at home.$"
 
-MauvilleCity_GameCorner_Text_210673: @ 8210673
+MauvilleCity_GameCorner_Text_NotEnoughCoins: @ 8210673
 	.string "You don't have enough COINS.$"
 
-MauvilleCity_GameCorner_Text_210690: @ 8210690
+@ Unused
+MauvilleCity_GameCorner_Text_NoRoomForPlacingDecor: @ 8210690
 	.string "There isn't any room available for\n"
 	.string "placing {STR_VAR_1}.$"
 
-MauvilleCity_GameCorner_Text_2106BF: @ 82106BF
+MauvilleCity_GameCorner_Text_OhIsThatSo: @ 82106BF
 	.string "Oh, is that so? \n"
 	.string "You need to save some COINS before\l"
 	.string "coming back here.$"
 
-MauvilleCity_GameCorner_Text_210705: @ 8210705
+MauvilleCity_GameCorner_Text_SoYourChoiceIsX: @ 8210705
 	.string "So your choice is {STR_VAR_1}?$"
 
-MauvilleCity_GameCorner_Text_21071B: @ 821071B
+MauvilleCity_GameCorner_Text_HereYouGo: @ 821071B
 	.string "Here you go!$"
 
-MauvilleCity_GameCorner_Text_210728: @ 8210728
+@ Unused
+MauvilleCity_GameCorner_Text_CantCarryAnyMore: @ 8210728
 	.string "Oh, you can't carry any more than that.$"
 
-MauvilleCity_GameCorner_Text_210750: @ 8210750
+MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne: @ 8210750
 	.string "I made a mistake and got two of\n"
 	.string "the same DOLLS.\p"
 	.string "Would you like one of them?$"
 
-MauvilleCity_GameCorner_Text_21079C: @ 821079C
+MauvilleCity_GameCorner_Text_HereYouGo2: @ 821079C
 	.string "Here you go!$"
 
-MauvilleCity_GameCorner_Text_2107A9: @ 82107A9
+MauvilleCity_GameCorner_Text_YouWantItButNotNow: @ 82107A9
 	.string "Huh?\n"
 	.string "You want it, but not right now?$"
 
-MauvilleCity_GameCorner_Text_2107CE: @ 82107CE
+MauvilleCity_GameCorner_Text_DontBeNegative: @ 82107CE
 	.string "Oh, don't be so negative!\n"
 	.string "You can have this!$"
 
-MauvilleCity_GameCorner_Text_2107FB: @ 82107FB
+MauvilleCity_GameCorner_Text_CantWinJackpot: @ 82107FB
 	.string "There's a prize I want, but I can't win\n"
 	.string "the jackpot.$"
 
-MauvilleCity_GameCorner_Text_210830: @ 8210830
+MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor: @ 8210830
 	.string "Hey, kid, if you want to play here,\n"
 	.string "you need a COIN CASE.\p"
 	.string "I think the young lady next door\n"
 	.string "had one. Go see her!$"
 
-MauvilleCity_GameCorner_Text_2108A0: @ 82108A0
+MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins: @ 82108A0
 	.string "My luck can only last so long.\n"
 	.string "This is too much for me.\l"
 	.string "Here, take some COINS!$"
 
-MauvilleCity_GameCorner_Text_2108EF: @ 82108EF
+MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone: @ 82108EF
 	.string "MAUVILLE has something for\n"
 	.string "everyone.\p"
 	.string "For me, it's the GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_210932: @ 8210932
+MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates: @ 8210932
 	.string "The ROULETTE tables have different\n"
 	.string "rates.\p"
 	.string "Check your COINS if you're going to\n"
 	.string "pick a table.$"
 
-MauvilleCity_GameCorner_Text_21098E: @ 821098E
+MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime: @ 821098E
 	.string "It's easy to lose track of time in here. \n"
 	.string "I should get back to work.$"
 
-MauvilleCity_GameCorner_Text_2109D3: @ 82109D3
+MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay: @ 82109D3
 	.string "COINS are needed to play here\n"
 	.string "in the GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_210A05: @ 8210A05
+MauvilleCity_GameCorner_Text_RouletteOnlyLuck: @ 8210A05
 	.string "This ROULETTE thing…\n"
 	.string "It's rather demanding.\p"
 	.string "Win or lose, it's only by luck.$"
 
-MauvilleCity_GameCorner_Text_210A51: @ 8210A51
+MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed: @ 8210A51
 	.string "Up to three COINS can be used to play\n"
 	.string "the SLOTS.$"
 
-MauvilleCity_GameCorner_Text_210A82: @ 8210A82
+MauvilleCity_GameCorner_Text_DifficultToStopOn7: @ 8210A82
 	.string "It's very difficult to make it stop\n"
 	.string "right on “7.”\p"
 	.string "If it stops on “7” during the REEL TIME\n"
 	.string "bonus game, you'll receive extra COINS.$"
 
-MauvilleCity_GameCorner_Text_210B04: @ 8210B04
+MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo: @ 8210B04
 	.string "Here's some information for you\n"
 	.string "about the SLOTS.\p"
 	.string "The more lightning bolts you stock,\n"
diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json
index d7e148b31..9df540885 100644
--- a/data/maps/MauvilleCity_House1/map.json
+++ b/data/maps/MauvilleCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_House1_EventScript_20F976",
+      "script": "MauvilleCity_House1_EventScript_RockSmashDude",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc
index 50f84d87c..eff01eb94 100644
--- a/data/maps/MauvilleCity_House1/scripts.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
@@ -1,24 +1,24 @@
 MauvilleCity_House1_MapScripts:: @ 820F975
 	.byte 0
 
-MauvilleCity_House1_EventScript_20F976:: @ 820F976
+MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5
-	msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash
+	msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM06
 	setflag FLAG_RECEIVED_HM06
 	setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
-	msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT
+	msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5
-	msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT
+MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 820F9A5
+	msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House1_Text_20F9AF: @ 820F9AF
+MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF
 	.string "Woohoo!\p"
 	.string "I hear people call me the ROCK SMASH\n"
 	.string "GUY, but I find that sort of degrading.\p"
@@ -30,7 +30,7 @@ MauvilleCity_House1_Text_20F9AF: @ 820F9AF
 	.string "I like that!\n"
 	.string "Here, take this HIDDEN MACHINE!$"
 
-MauvilleCity_House1_Text_20FAA9: @ 820FAA9
+MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9
 	.string "That HM contains ROCK SMASH.\p"
 	.string "If you come across large boulders\n"
 	.string "that block your path…\p"
@@ -39,7 +39,7 @@ MauvilleCity_House1_Text_20FAA9: @ 820FAA9
 	.string "Yes, sir! Smash rocks aside, I say!\n"
 	.string "Woohoo!$"
 
-MauvilleCity_House1_Text_20FB67: @ 820FB67
+MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock: @ 820FB67
 	.string "Oh, yes, if you smash a rock, a POKéMON\n"
 	.string "could come flying out of hiding.\p"
 	.string "Woohoo!$"
diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json
index 272b60f0f..acdb4f504 100644
--- a/data/maps/MauvilleCity_House2/map.json
+++ b/data/maps/MauvilleCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_House2_EventScript_210C5D",
+      "script": "MauvilleCity_House2_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc
index b683b8c15..5dbf5d411 100644
--- a/data/maps/MauvilleCity_House2/scripts.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
@@ -1,67 +1,67 @@
 MauvilleCity_House2_MapScripts:: @ 8210C5C
 	.byte 0
 
-MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D
+MauvilleCity_House2_EventScript_Woman:: @ 8210C5D
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA
-	msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase
+	msgbox MauvilleCity_House2_Text_BuyHarborMailAtSlateport, MSGBOX_DEFAULT
 	checkitem ITEM_HARBOR_MAIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_House2_EventScript_210C82
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_House2_EventScript_AskToTradeForHarborMail
 	release
 	end
 
-MauvilleCity_House2_EventScript_210C82:: @ 8210C82
+MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82
 	playse SE_PIN
 	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_House2_EventScript_210CB8
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_House2_EventScript_210CE4
+	msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_House2_EventScript_AcceptTrade
+	compare VAR_RESULT, NO
+	goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade
 	end
 
-MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8
-	msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT
+MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
+	msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
 	takeitem ITEM_HARBOR_MAIL, 1
 	giveitem_std ITEM_COIN_CASE
 	setflag FLAG_RECEIVED_COIN_CASE
-	goto MauvilleCity_House2_EventScript_210CDA
+	goto MauvilleCity_House2_EventScript_ReceivedCoinCase
 	end
 
-MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA
-	msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT
+MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 8210CDA
+	msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4
-	msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT
+MauvilleCity_House2_EventScript_DeclineTrade:: @ 8210CE4
+	msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House2_Text_210CEE: @ 8210CEE
+MauvilleCity_House2_Text_BuyHarborMailAtSlateport: @ 8210CEE
 	.string "If I had a BIKE, it'd be easy to cycle to\n"
 	.string "SLATEPORT for some shopping.\p"
 	.string "I'd be able to buy HARBOR MAIL at the\n"
 	.string "POKéMON MART in SLATEPORT…$"
 
-MauvilleCity_House2_Text_210D76: @ 8210D76
+MauvilleCity_House2_Text_TradeHarborMailForCoinCase: @ 8210D76
 	.string "Oh! You have HARBOR MAIL?\n"
 	.string "Will you trade it for a COIN CASE?$"
 
-MauvilleCity_House2_Text_210DB3: @ 8210DB3
+MauvilleCity_House2_Text_IllTradeYouCoinCase: @ 8210DB3
 	.string "Oh, I'm so happy!\n"
 	.string "Okay, I'll trade you a COIN CASE!$"
 
-MauvilleCity_House2_Text_210DE7: @ 8210DE7
+MauvilleCity_House2_Text_UseCoinCaseAtGameCorner: @ 8210DE7
 	.string "That COIN CASE can be used\n"
 	.string "at the GAME CORNER.$"
 
-MauvilleCity_House2_Text_210E16: @ 8210E16
+MauvilleCity_House2_Text_ThatsDisappointing: @ 8210E16
 	.string "Oh, that's disappointing.\p"
 	.string "A COIN CASE is needed for the\n"
 	.string "GAME CORNER.$"
diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json
index 598ed6e52..72e323bfe 100644
--- a/data/maps/MauvilleCity_Mart/map.json
+++ b/data/maps/MauvilleCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_2110E6",
+      "script": "MauvilleCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_21111C",
+      "script": "MauvilleCity_Mart_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_211125",
+      "script": "MauvilleCity_Mart_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 25d52e015..b288d42b7 100644
--- a/data/maps/MauvilleCity_Mart/scripts.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 MauvilleCity_Mart_MapScripts:: @ 82110E5
 	.byte 0
 
-MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6
+MauvilleCity_Mart_EventScript_Clerk:: @ 82110E6
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart MauvilleCity_Mart_Pokemart_211100
+	pokemart MauvilleCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-MauvilleCity_Mart_Pokemart_211100: @ 8211100
+MauvilleCity_Mart_Pokemart: @ 8211100
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
@@ -29,15 +29,15 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100
 	release
 	end
 
-MauvilleCity_Mart_EventScript_21111C:: @ 821111C
-	msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC
+MauvilleCity_Mart_EventScript_ExpertM:: @ 821111C
+	msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_EventScript_211125:: @ 8211125
-	msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC
+MauvilleCity_Mart_EventScript_Man:: @ 8211125
+	msgbox MauvilleCity_Mart_Text_DecisionsDetermineBattle, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_Text_21112E: @ 821112E
+MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats: @ 821112E
 	.string "There are items that temporarily\n"
 	.string "elevate the stats of POKéMON.\p"
 	.string "The ones I know you use in battle\n"
@@ -45,7 +45,7 @@ MauvilleCity_Mart_Text_21112E: @ 821112E
 	.string "I do believe that there are others\n"
 	.string "like them.$"
 
-MauvilleCity_Mart_Text_2111D8: @ 82111D8
+MauvilleCity_Mart_Text_DecisionsDetermineBattle: @ 82111D8
 	.string "Use a certain move, or use an item\n"
 	.string "instead…\p"
 	.string "The TRAINER's decisions determine how\n"
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
index c024c2cba..6540334be 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index dd302167b..f37f362e2 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -6,14 +6,15 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
 	setrespawn HEAL_LOCATION_MAUVILLE_CITY
 	call Common_EventScript_UpdateBrineyLocation
-	goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
+	goto MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
+MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74
 	special ScrSpecial_SetMauvilleOldManEventObjGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
+@ VAR_0x800B is the Nurse's object event id
+MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8210E78
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -21,32 +22,32 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Woman1:: @ 8210E86
+	msgbox MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Woman2:: @ 8210E8F
+	msgbox MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Youngster:: @ 8210E98
+	msgbox MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1
+MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings: @ 8210EA1
 	.string "That man over there, he says weird\n"
 	.string "things!\p"
 	.string "He's funny in a weird way.\n"
 	.string "I doubt I'll forget about him!$"
 
-MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06
+MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner: @ 8210F06
 	.string "When I accessed the RECORD CORNER,\n"
 	.string "the data for what's hot in DEWFORD\l"
 	.string "got updated.\p"
 	.string "Now that bit of data is the same\n"
 	.string "as my friend's!$"
 
-MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A
+MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun: @ 8210F8A
 	.string "A RECORD CORNER opened upstairs in\n"
 	.string "the POKéMON CENTER.\p"
 	.string "I don't know what it's about, but it\n"
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
index 200c03e86..46e031857 100644
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_22BF25",
+      "script": "MeteorFalls_1F_1R_EventScript_ProfCozmo",
       "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO"
     }
   ],
@@ -197,7 +197,7 @@
       "elevation": 4,
       "var": "VAR_METEOR_FALLS_STATE",
       "var_value": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_22BD5F"
+      "script": "MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index dc81427bc..ad3eb3eb8 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -1,19 +1,19 @@
 MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
-	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30
+	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad
 	.byte 0
 
-MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
-	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A
+MeteorFalls_1F_1R_OnLoad: @ 822BD30
+	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave
 	end
 
-MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
+MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
 	setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
 	setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
 	setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
 	setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
 	return
 
-MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
+MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	lockall
 	playbgm MUS_MGM0, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
@@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	delay 30
 	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_WalkInPlaceFastestUp
 	applymovement 6, Common_Movement_WalkInPlaceFastestUp
@@ -31,11 +31,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0
+	applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT
 	closemessage
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
@@ -45,39 +45,39 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	addobject 8
 	addobject 9
 	playbgm MUS_AQA_0, 0
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BED9
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieArrive
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
 	waitmovement 0
 	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4
-	applymovement 6, MeteorFalls_1F_1R_Movement_22BECE
+	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay
+	applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit
+	applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit
 	waitmovement 0
 	removeobject 5
 	removeobject 6
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BF08
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT
 	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT
 	applymovement 7, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieExit
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 7
@@ -85,18 +85,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	removeobject 9
 	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	setflag FLAG_MET_ARCHIE_METEOR_FALLS
-	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	setvar VAR_METEOR_FALLS_STATE, 1
 	releaseall
 	end
 
-MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0
+MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
+MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -108,7 +108,7 @@ MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
+MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
+MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
 	walk_right
 	walk_right
 	walk_right
@@ -130,7 +130,7 @@ MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
+MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
 	delay_16
 	delay_16
 	walk_right
@@ -140,7 +140,7 @@ MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
+MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
 	delay_16
 	delay_16
 	walk_right
@@ -150,7 +150,7 @@ MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
+MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
 	walk_right
 	walk_right
 	walk_right
@@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
+MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
 	walk_right
 	walk_right
 	walk_up
@@ -168,7 +168,7 @@ MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
 	walk_in_place_fastest_left
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
+MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
 	walk_up
 	walk_up
 	walk_right
@@ -180,14 +180,14 @@ MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08
+MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
+MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
 	walk_up
 	walk_up
 	walk_up
@@ -200,14 +200,14 @@ MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18
+MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
+MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
 	walk_in_place_fastest_down
 	delay_4
 	walk_in_place_fastest_right
@@ -217,37 +217,37 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
 	face_right
 	step_end
 
-MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
+MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D
-	setflag FLAG_MET_PROF_COSMO
-	msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo
+	setflag FLAG_MET_PROF_COZMO
+	msgbox MeteorFalls_1F_1R_Text_MeetProfCozmo, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D
-	msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT
+MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D
+	msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_Text_22BF47: @ 822BF47
+MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47
 	.string "Hehehe!\p"
 	.string "With this METEORITE, that thing in\n"
 	.string "MT. CHIMNEY will…$"
 
-MeteorFalls_1F_1R_Text_22BF84: @ 822BF84
+MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84
 	.string "Heh?\p"
 	.string "I don't know who you are, but if you get\n"
 	.string "in the way of TEAM MAGMA, don't\l"
 	.string "expect any mercy!$"
 
-MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4
+MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4
 	.string "Hold it right there, TEAM MAGMA!\p"
 	.string "You're badly mistaken if you think you\n"
 	.string "can have your way with the world!$"
 
-MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
+MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
 	.string "Hehehe!\n"
 	.string "Even TEAM AQUA joins us!\p"
 	.string "But it's too much trouble to deal with\n"
@@ -258,7 +258,7 @@ MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
 	.string "Hehehe! Be seeing you, you TEAM\n"
 	.string "AQUA dingbats!$"
 
-MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
+MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
 	.string "ARCHIE: Didn't I see you before?\n"
 	.string "At SLATEPORT's MUSEUM?\p"
 	.string "Ah, so your name is {PLAYER}.\p"
@@ -273,22 +273,22 @@ MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
 	.string "They are the rivals to us,\n"
 	.string "the sea-loving TEAM AQUA!$"
 
-MeteorFalls_1F_1R_Text_22C268: @ 822C268
+MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268
 	.string "BOSS, we should give chase to\n"
 	.string "TEAM MAGMA…$"
 
-MeteorFalls_1F_1R_Text_22C292: @ 822C292
+MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292
 	.string "ARCHIE: Yes, yes, we must!\n"
 	.string "We've got to hurry.\p"
 	.string "There's no telling what TEAM MAGMA\n"
 	.string "will do at MT. CHIMNEY!$"
 
-MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC
+MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC
 	.string "ARCHIE: {PLAYER}, you should keep\n"
 	.string "an eye out for TEAM MAGMA, too.\p"
 	.string "Farewell!$"
 
-MeteorFalls_1F_1R_Text_22C342: @ 822C342
+MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
 	.string "I… I'm COZMO…\n"
 	.string "I'm a PROFESSOR…\p"
 	.string "TEAM MAGMA asked me to guide them\n"
@@ -303,7 +303,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
 
-MeteorFalls_1F_1R_Text_22C47D: @ 822C47D
+MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D
 	.string "PROF. COZMO: But that TEAM MAGMA…\p"
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json
index be52085cd..1b27e859e 100644
--- a/data/maps/MeteorFalls_1F_2R/map.json
+++ b/data/maps/MeteorFalls_1F_2R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C4DE",
+      "script": "MeteorFalls_1F_2R_EventScript_Nicolas",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C540",
+      "script": "MeteorFalls_1F_2R_EventScript_John",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C5A4",
+      "script": "MeteorFalls_1F_2R_EventScript_Jay",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index fee636e0b..0fa73212e 100644
--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -1,184 +1,184 @@
 MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
 	.byte 0
 
-MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE
-	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A
+MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
+	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C529
-	msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchNicolas
+	msgbox MeteorFalls_1F_2R_Text_NicolasPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A
-	special sub_80B4808
+MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_NICOLAS_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529
-	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD
-	msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529
+	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat
+	msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
-	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570
+MeteorFalls_1F_2R_EventScript_John:: @ 822C540
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C589
-	msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJohn
+	msgbox MeteorFalls_1F_2R_Text_JohnPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570
-	msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
+MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570
+	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589
-	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27
-	msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons
+	msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
-	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4
+MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED
-	msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJay
+	msgbox MeteorFalls_1F_2R_Text_JayPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4
-	msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
+MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4
+	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT  @ John speaks for both during register
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED
-	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB
-	msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons
+	msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_Text_22C608: @ 822C608
+MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608
 	.string "This is where we DRAGON users do our\n"
 	.string "training.\p"
 	.string "The CHAMPION even visits.\n"
 	.string "Now do you see how special it is here?$"
 
-MeteorFalls_1F_2R_Text_22C678: @ 822C678
+MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3
+MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3
 	.string "The road ahead remains long and harsh.\p"
 	.string "When will my POKéMON and I become\n"
 	.string "the best?$"
 
-MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6
+MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6
 	.string "I want to know more about your power.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MeteorFalls_1F_2R_Text_22C73F: @ 822C73F
+MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F
 	.string "Since we met, we have trained hard\n"
 	.string "with our sights on number one.\p"
 	.string "Help us see how much stronger we've\n"
 	.string "become!$"
 
-MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD
+MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8
+MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8
 	.string "You've obviously kept up your\n"
 	.string "POKéMON training.\p"
 	.string "So long as you remain strong, I, too,\n"
 	.string "can become stronger!$"
 
-MeteorFalls_1F_2R_Text_22C843: @ 822C843
+MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_22C89C: @ 822C89C
+MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1
+MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1
 	.string "JOHN: We've been married for\n"
 	.string "fifty years.\p"
 	.string "Come to think of it, I've yet to beat\n"
 	.string "my dear wife in a battle.$"
 
-MeteorFalls_1F_2R_Text_22C92B: @ 822C92B
+MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22C99C: @ 822C99C
+MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C
 	.string "JOHN: Young TRAINER, if the chance\n"
 	.string "arises, will you battle with us again?$"
 
-MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6
+MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "The bond we share as a couple could\n"
 	.string "never be broken.$"
 
-MeteorFalls_1F_2R_Text_22CA44: @ 822CA44
+MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_22CA70: @ 822CA70
+MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70
 	.string "JAY: Fifty years of marriage…\p"
 	.string "If we ever argued, we always settled\n"
 	.string "it with a POKéMON battle…$"
 
-MeteorFalls_1F_2R_Text_22CACD: @ 822CACD
+MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
 	.string "have to come back with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22CB47: @ 822CB47
+MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0
+MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5
+MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5
 	.string "JOHN: Married for fifty years…\p"
 	.string "On reflection, the dear wife and I,\n"
 	.string "we battled day in and day out…$"
 
-MeteorFalls_1F_2R_Text_22CC27: @ 822CC27
+MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22CC98: @ 822CC98
+MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "We've supported each other all that\n"
 	.string "time. We've made ourselves strong.$"
 
-MeteorFalls_1F_2R_Text_22CD08: @ 822CD08
+MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_22CD34: @ 822CD34
+MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34
 	.string "JAY: Fifty years of marriage…\n"
 	.string "Many things have happened.\p"
 	.string "I hope that we will continue to make\n"
 	.string "happy memories together.$"
 
-MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB
+MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json
index b23c3f952..c5ad26805 100644
--- a/data/maps/MeteorFalls_StevensCave/map.json
+++ b/data/maps/MeteorFalls_StevensCave/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_StevensCave_EventScript_23B182",
+      "script": "MeteorFalls_StevensCave_EventScript_Steven",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
index 31baad43c..71313be67 100644
--- a/data/maps/MeteorFalls_StevensCave/scripts.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
@@ -1,9 +1,9 @@
 MeteorFalls_StevensCave_MapScripts:: @ 823B181
 	.byte 0
 
-MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
+MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182
 	lock
-	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD
+	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated
 	waitse
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -12,21 +12,21 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	waitmovement 0
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
-	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
+	msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat
+	msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN
 	release
 	end
 
-MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD
+MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
+	msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1
+MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1
 	.string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n"
 	.string "I'm amazed you knew where to find me.\p"
 	.string "Do you, uh…maybe think of me as\n"
@@ -39,11 +39,11 @@ MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1
 	.string "Okay, {PLAYER}{KUN}, if you're going to mount\n"
 	.string "a serious challenge, expect the worst!$"
 
-MeteorFalls_StevensCave_Text_23B32D: @ 823B32D
+MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D
 	.string "You…\n"
 	.string "I had no idea you'd become so strong…$"
 
-MeteorFalls_StevensCave_Text_23B358: @ 823B358
+MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358
 	.string "STEVEN: Come to think of it, ever since\n"
 	.string "our paths first crossed in GRANITE\l"
 	.string "CAVE in DEWFORD, I had this feeling.\p"
diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json
index 45e5fa62b..71e080a23 100644
--- a/data/maps/MirageTower_4F/map.json
+++ b/data/maps/MirageTower_4F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_4F_EventScript_23AD48",
+      "script": "MirageTower_4F_EventScript_RootFossil",
       "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_4F_EventScript_23AD89",
+      "script": "MirageTower_4F_EventScript_ClawFossil",
       "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL"
     },
     {
diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc
index 5bb5308c3..d23cb160e 100644
--- a/data/maps/MirageTower_4F/scripts.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -1,49 +1,49 @@
 MirageTower_4F_MapScripts:: @ 823AD47
 	.byte 0
 
-MirageTower_4F_EventScript_23AD48:: @ 823AD48
+MirageTower_4F_EventScript_RootFossil:: @ 823AD48
 	lock
 	faceplayer
-	msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MirageTower_4F_EventScript_23AD7F
+	msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil
 	giveitem_std ITEM_ROOT_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
 	removeobject 1
 	delay 30
-	setflag FLAG_CHOSE_CLAW_FOSSIL
-	goto MirageTower_4F_EventScript_23ADCA
+	setflag FLAG_CHOSE_ROOT_FOSSIL
+	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_23AD7F:: @ 823AD7F
-	msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT
+MirageTower_4F_EventScript_LeaveRootFossil:: @ 823AD7F
+	msgbox MirageTower_4F_Text_LeftRootFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_23AD89:: @ 823AD89
+MirageTower_4F_EventScript_ClawFossil:: @ 823AD89
 	lock
 	faceplayer
-	msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MirageTower_4F_EventScript_23ADC0
+	msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil
 	giveitem_std ITEM_CLAW_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
 	removeobject 2
 	delay 30
-	setflag FLAG_CHOSE_ROOT_FOSSIL
-	goto MirageTower_4F_EventScript_23ADCA
+	setflag FLAG_CHOSE_CLAW_FOSSIL
+	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_23ADC0:: @ 823ADC0
-	msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT
+MirageTower_4F_EventScript_LeaveClawFossil:: @ 823ADC0
+	msgbox MirageTower_4F_Text_LeaveClawFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
+MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 1   @ horizontal pan
 	setvar VAR_0x8006, 32  @ num shakes
@@ -59,21 +59,21 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
 	release
 	end
 
-MirageTower_4F_Text_23ADF9: @ 823ADF9
+MirageTower_4F_Text_TakeRootFossil: @ 823ADF9
 	.string "You found the ROOT FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the ROOT FOSSIL anyway?$"
 
-MirageTower_4F_Text_23AE79: @ 823AE79
+MirageTower_4F_Text_LeftRootFossilAlone: @ 823AE79
 	.string "{PLAYER} left the ROOT FOSSIL alone.$"
 
-MirageTower_4F_Text_23AE98: @ 823AE98
+MirageTower_4F_Text_TakeClawFossil: @ 823AE98
 	.string "You found the CLAW FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the CLAW FOSSIL anyway?$"
 
-MirageTower_4F_Text_23AF18: @ 823AF18
+MirageTower_4F_Text_LeaveClawFossilAlone: @ 823AF18
 	.string "{PLAYER} left the CLAW FOSSIL alone.$"
 
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index 580b4ca62..e3b1af96b 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AD1",
+      "script": "MossdeepCity_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AF9",
+      "script": "MossdeepCity_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AB2",
+      "script": "MossdeepCity_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AF0",
+      "script": "MossdeepCity_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4B02",
+      "script": "MossdeepCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C10",
+      "script": "MossdeepCity_EventScript_Man",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4B0B",
+      "script": "MossdeepCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C26",
+      "script": "MossdeepCity_EventScript_KingsRockBoy",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C85",
+      "script": "MossdeepCity_EventScript_Scott",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C7C",
+      "script": "MossdeepCity_EventScript_BlackBelt",
       "flag": "0"
     }
   ],
@@ -332,7 +332,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -341,7 +341,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -350,7 +350,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -359,7 +359,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -368,7 +368,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -377,7 +377,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -386,7 +386,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -395,7 +395,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -404,7 +404,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -413,7 +413,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     }
   ],
   "bg_events": [
@@ -423,7 +423,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B26"
+      "script": "MossdeepCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -431,7 +431,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B1D"
+      "script": "MossdeepCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -455,7 +455,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B2F"
+      "script": "MossdeepCity_EventScript_SpaceCenterSign"
     },
     {
       "type": "sign",
@@ -479,7 +479,7 @@
       "y": 21,
       "elevation": 7,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B14"
+      "script": "MossdeepCity_EventScript_WhiteRock"
     }
   ]
 }
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index cbdec6b33..fe12da311 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -7,86 +7,86 @@ MossdeepCity_OnTransition: @ 81E4A9C
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
+MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7
-	msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_PokefanFMagmaGone
+	msgbox MossdeepCity_Text_SpaceCenterReceivedLetter, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
-	msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT
+MossdeepCity_EventScript_PokefanFMagmaGone:: @ 81E4AC7
+	msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
+MossdeepCity_EventScript_Sailor:: @ 81E4AD1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6
-	msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_SailorMagmaGone
+	msgbox MossdeepCity_Text_MossdeepTargetedByMagma, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6
-	msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT
+MossdeepCity_EventScript_SailorMagmaGone:: @ 81E4AE6
+	msgbox MossdeepCity_Text_FeelReliefOnLand, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0
-	msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC
+MossdeepCity_EventScript_NinjaBoy:: @ 81E4AF0
+	msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9
-	msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC
+MossdeepCity_EventScript_ExpertM:: @ 81E4AF9
+	msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B02:: @ 81E4B02
-	msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC
+MossdeepCity_EventScript_Girl:: @ 81E4B02
+	msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B
-	msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC
+MossdeepCity_EventScript_Woman:: @ 81E4B0B
+	msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B14:: @ 81E4B14
-	msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN
+MossdeepCity_EventScript_WhiteRock:: @ 81E4B14
+	msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D
-	msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN
+MossdeepCity_EventScript_GymSign:: @ 81E4B1D
+	msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B26:: @ 81E4B26
-	msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN
+MossdeepCity_EventScript_CitySign:: @ 81E4B26
+	msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F
-	msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN
+MossdeepCity_EventScript_SpaceCenterSign:: @ 81E4B2F
+	msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B38:: @ 81E4B38
+MossdeepCity_EventScript_VisitedMossdeep:: @ 81E4B38
 	setflag FLAG_VISITED_MOSSDEEP_CITY
 	setvar VAR_TEMP_1, 1
 	end
 
-MossdeepCity_EventScript_1E4B41:: @ 81E4B41
+MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41
 	lockall
-	applymovement 14, MossdeepCity_Movement_1E4BAD
+	applymovement 14, MossdeepCity_Movement_MaxieGestureToSpaceCenter
 	waitmovement 0
-	applymovement 10, MossdeepCity_Movement_1E4BB7
-	applymovement 11, MossdeepCity_Movement_1E4BB7
-	applymovement 12, MossdeepCity_Movement_1E4BB7
-	applymovement 13, MossdeepCity_Movement_1E4BB7
+	applymovement 10, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 11, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 12, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 13, MossdeepCity_Movement_GruntFaceSpaceCenter
 	waitmovement 0
-	applymovement 14, MossdeepCity_Movement_1E4BBC
-	applymovement 10, MossdeepCity_Movement_1E4BCA
-	applymovement 11, MossdeepCity_Movement_1E4BDD
-	applymovement 12, MossdeepCity_Movement_1E4BEF
-	applymovement 13, MossdeepCity_Movement_1E4C00
+	applymovement 14, MossdeepCity_Movement_MaxieEnterSpaceCenter
+	applymovement 10, MossdeepCity_Movement_Grunt1EnterSpaceCenter
+	applymovement 11, MossdeepCity_Movement_Grunt2EnterSpaceCenter
+	applymovement 12, MossdeepCity_Movement_Grunt3EnterSpaceCenter
+	applymovement 13, MossdeepCity_Movement_Grunt4EnterSpaceCenter
 	waitmovement 0
 	removeobject 14
 	removeobject 10
@@ -99,7 +99,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
 	releaseall
 	end
 
-MossdeepCity_Movement_1E4BAD: @ 81E4BAD
+MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD
 	delay_16
 	face_right
 	delay_16
@@ -111,14 +111,14 @@ MossdeepCity_Movement_1E4BAD: @ 81E4BAD
 	delay_16
 	step_end
 
-MossdeepCity_Movement_1E4BB7: @ 81E4BB7
+MossdeepCity_Movement_GruntFaceSpaceCenter: @ 81E4BB7
 	face_right
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-MossdeepCity_Movement_1E4BBC: @ 81E4BBC
+MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC
 	walk_down
 	walk_right
 	walk_right
@@ -134,7 +134,7 @@ MossdeepCity_Movement_1E4BBC: @ 81E4BBC
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BCA: @ 81E4BCA
+MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA
 	delay_16
 	delay_8
 	walk_down
@@ -155,7 +155,7 @@ MossdeepCity_Movement_1E4BCA: @ 81E4BCA
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BDD: @ 81E4BDD
+MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD
 	delay_16
 	delay_8
 	walk_down
@@ -175,7 +175,7 @@ MossdeepCity_Movement_1E4BDD: @ 81E4BDD
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BEF: @ 81E4BEF
+MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF
 	delay_16
 	delay_8
 	walk_down
@@ -194,7 +194,7 @@ MossdeepCity_Movement_1E4BEF: @ 81E4BEF
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4C00: @ 81E4C00
+MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00
 	delay_16
 	delay_8
 	walk_right
@@ -212,77 +212,77 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00
 	walk_right
 	step_end
 
-MossdeepCity_EventScript_1E4C10:: @ 81E4C10
+MossdeepCity_EventScript_Man:: @ 81E4C10
 	lock
 	faceplayer
-	msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT
+	msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_EventScript_1E4C26:: @ 81E4C26
+MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68
-	msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_EventScript_1E4C72
-	msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock
+	msgbox MossdeepCity_Text_WantKingsRockStevenGaveMe, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
+	msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_KINGS_ROCK
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 
-MossdeepCity_EventScript_1E4C68:: @ 81E4C68
-	msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT
+MossdeepCity_EventScript_ReceivedKingsRock:: @ 81E4C68
+	msgbox MossdeepCity_Text_StevensHouseOverThere, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4C72:: @ 81E4C72
-	msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT
+MossdeepCity_EventScript_DeclineKingsRock:: @ 81E4C72
+	msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C
-	msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC
+MossdeepCity_EventScript_BlackBelt:: @ 81E4C7C
+	msgbox MossdeepCity_Text_SootopolisNewGymLeader, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4C85:: @ 81E4C85
+MossdeepCity_EventScript_Scott:: @ 81E4C85
 	lock
 	faceplayer
-	msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
+	msgbox MossdeepCity_Text_ScottSomethingWrongWithTown, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MossdeepCity_EventScript_1E4CB0
+	call_if_eq MossdeepCity_EventScript_ScottExitNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MossdeepCity_EventScript_1E4CC2
+	call_if_eq MossdeepCity_EventScript_ScottExitEast
 	addvar VAR_SCOTT_STATE, 1
 	removeobject 16
 	release
 	end
 
-MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CD8
+MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0
+	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+	applymovement 16, MossdeepCity_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CE2
+MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2
+	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+	applymovement 16, MossdeepCity_Movement_ScottExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_Movement_1E4CD4: @ 81E4CD4
+MossdeepCity_Movement_PlayerWatchScottExit: @ 81E4CD4
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MossdeepCity_Movement_1E4CD8: @ 81E4CD8
+MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8
 	walk_left
 	walk_left
 	walk_left
@@ -294,7 +294,7 @@ MossdeepCity_Movement_1E4CD8: @ 81E4CD8
 	walk_left
 	step_end
 
-MossdeepCity_Movement_1E4CE2: @ 81E4CE2
+MossdeepCity_Movement_ScottExitEast: @ 81E4CE2
 	walk_down
 	walk_left
 	walk_left
@@ -307,26 +307,26 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2
 	walk_left
 	step_end
 
-MossdeepCity_Text_1E4CED: @ 81E4CED
+MossdeepCity_Text_WantKingsRockStevenGaveMe: @ 81E4CED
 	.string "I got this from STEVEN, but I don't\n"
 	.string "know what it's good for.\p"
 	.string "I think it's called KING'S ROCK.\n"
 	.string "Do you want it?$"
 
-MossdeepCity_Text_1E4D5B: @ 81E4D5B
+MossdeepCity_Text_YouCanKeepIt: @ 81E4D5B
 	.string "Why would you want it?\n"
 	.string "You're weird.\p"
 	.string "You can keep it, but keep it a secret\n"
 	.string "from STEVEN.$"
 
-MossdeepCity_Text_1E4DB3: @ 81E4DB3
+MossdeepCity_Text_StevensHouseOverThere: @ 81E4DB3
 	.string "STEVEN's house is right over there!$"
 
-MossdeepCity_Text_1E4DD7: @ 81E4DD7
+MossdeepCity_Text_WhatToDoWithWeirdRock: @ 81E4DD7
 	.string "Yeah, you think so, too! What are you\n"
 	.string "supposed to do with some weird rock?$"
 
-MossdeepCity_Text_1E4E22: @ 81E4E22
+MossdeepCity_Text_WailmerWatching: @ 81E4E22
 	.string "Around MOSSDEEP, you can see wild\n"
 	.string "WAILMER.\p"
 	.string "It's called, uh…\n"
@@ -334,17 +334,17 @@ MossdeepCity_Text_1E4E22: @ 81E4E22
 	.string "WAI, WAI, WAI…\p"
 	.string "WAILMER watching!$"
 
-MossdeepCity_Text_1E4E90: @ 81E4E90
+MossdeepCity_Text_SpaceCenterReceivedLetter: @ 81E4E90
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.\p"
 	.string "There's been some kind of an uproar\n"
 	.string "over a letter they received recently.$"
 
-MossdeepCity_Text_1E4F15: @ 81E4F15
+MossdeepCity_Text_SpaceCenterLaunchingRockets: @ 81E4F15
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.$"
 
-MossdeepCity_Text_1E4F50: @ 81E4F50
+MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50
 	.string "I heard from a SAILOR buddy that\n"
 	.string "TEAM AQUA set up shop in LILYCOVE.\p"
 	.string "I also heard that someone came along\n"
@@ -354,18 +354,18 @@ MossdeepCity_Text_1E4F50: @ 81E4F50
 	.string "If you want to know what they're up to,\n"
 	.string "go visit the SPACE CENTER.$"
 
-MossdeepCity_Text_1E5051: @ 81E5051
+MossdeepCity_Text_FeelReliefOnLand: @ 81E5051
 	.string "I'm a SAILOR, so the sea's obviously\n"
 	.string "more important to me.\p"
 	.string "But you know? When I get back on land\n"
 	.string "after a long voyage, I do feel relief!$"
 
-MossdeepCity_Text_1E50D9: @ 81E50D9
+MossdeepCity_Text_NiceIfWorldCoveredByFlowers: @ 81E50D9
 	.string "Wouldn't it be nice?\p"
 	.string "If the whole world was covered in\n"
 	.string "plants and flowers like this island?$"
 
-MossdeepCity_Text_1E5135: @ 81E5135
+MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135
 	.string "All life needs the sea to live, even\n"
 	.string "though it makes its home on the land.\p"
 	.string "Life, having run its course, becomes\n"
@@ -374,14 +374,14 @@ MossdeepCity_Text_1E5135: @ 81E5135
 	.string "the land.\p"
 	.string "Yes, like the very shoreline here.$"
 
-MossdeepCity_Text_1E5213: @ 81E5213
+MossdeepCity_Text_SurfExhilarating: @ 81E5213
 	.string "A voyage on a ship is fine.\p"
 	.string "But crossing the sea with POKéMON\n"
 	.string "using SURF…\p"
 	.string "Now that's an exhilarating trip!\n"
 	.string "Wouldn't you agree, youngster?$"
 
-MossdeepCity_Text_1E529D: @ 81E529D
+MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D
 	.string "This rock has a special meaning to\n"
 	.string "the people at the SPACE CENTER.\p"
 	.string "They put it here as their wish for\n"
@@ -391,23 +391,23 @@ MossdeepCity_Text_1E529D: @ 81E529D
 	.string "I use a wish tag to make it happen.\n"
 	.string "That's what I do.$"
 
-MossdeepCity_Text_1E5396: @ 81E5396
+MossdeepCity_Text_ItsAWhiteRock: @ 81E5396
 	.string "It's a white rock.$"
 
-MossdeepCity_Text_1E53A9: @ 81E53A9
+MossdeepCity_Text_GymSign: @ 81E53A9
 	.string "MOSSDEEP CITY POKéMON GYM\n"
 	.string "LEADERS: LIZA & TATE\p"
 	.string "“The mystic combination!”$"
 
-MossdeepCity_Text_1E53F2: @ 81E53F2
+MossdeepCity_Text_CitySign: @ 81E53F2
 	.string "MOSSDEEP CITY\n"
 	.string "“Our slogan: Cherish POKéMON!”$"
 
-MossdeepCity_Text_1E541F: @ 81E541F
+MossdeepCity_Text_SpaceCenterSign: @ 81E541F
 	.string "MOSSDEEP SPACE CENTER\n"
 	.string "“The closest place to space.”$"
 
-MossdeepCity_Text_1E5453: @ 81E5453
+MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453
 	.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
 	.string "I'm doing great!\p"
 	.string "I'd heard MOSSDEEP's GYM LEADER is\n"
@@ -420,7 +420,7 @@ MossdeepCity_Text_1E5453: @ 81E5453
 	.string "I don't think it concerns me in any\n"
 	.string "way, though.$"
 
-MossdeepCity_Text_1E5581: @ 81E5581
+MossdeepCity_Text_SootopolisNewGymLeader: @ 81E5581
 	.string "Ahh… It feels great letting the waves\n"
 	.string "wash over my feet…\p"
 	.string "Speaking of the waves, you know that\n"
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index fc6a45d84..ec5e2bb70 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -77,7 +77,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
 	setvar VAR_MOSSDEEP_CITY_STATE, 1
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 1
 	call MossdeepCity_Gym_EventScript_GiveCalmMind
 	closemessage
 	delay 30
diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json
index def086288..6b57ca6ef 100644
--- a/data/maps/MossdeepCity_House1/map.json
+++ b/data/maps/MossdeepCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House1_EventScript_221FD6",
+      "script": "MossdeepCity_House1_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House1_EventScript_222006",
+      "script": "MossdeepCity_House1_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 60d612fb2..3ad07e023 100644
--- a/data/maps/MossdeepCity_House1/scripts.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
@@ -1,42 +1,42 @@
 MossdeepCity_House1_MapScripts:: @ 8221FD5
 	.byte 0
 
-MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6
+MossdeepCity_House1_EventScript_BlackBelt:: @ 8221FD6
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House1_Text_HmmYourPokemon, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetPokeblockNameByMonNature
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_House1_EventScript_221FFC
-	msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_House1_EventScript_NeutralNature
+	msgbox MossdeepCity_House1_Text_ItLikesXPokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC
-	msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT
+MossdeepCity_House1_EventScript_NeutralNature:: @ 8221FFC
+	msgbox MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House1_EventScript_222006:: @ 8222006
-	msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC
+MossdeepCity_House1_EventScript_Woman:: @ 8222006
+	msgbox MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes, MSGBOX_NPC
 	end
 
-MossdeepCity_House1_Text_22200F: @ 822200F
+MossdeepCity_House1_Text_HmmYourPokemon: @ 822200F
 	.string "Hmm!\n"
 	.string "Your {STR_VAR_1}…$"
 
-MossdeepCity_House1_Text_22201D: @ 822201D
+MossdeepCity_House1_Text_ItLikesXPokeblocks: @ 822201D
 	.string "It likes {STR_VAR_1}S,\n"
 	.string "doesn't it?\p"
 	.string "No, I'm positive of it! It definitely\n"
 	.string "likes {STR_VAR_1}S!$"
 
-MossdeepCity_House1_Text_222068: @ 8222068
+MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks: @ 8222068
 	.string "It doesn't appear to like or dislike\n"
 	.string "any {POKEBLOCK}S.$"
 
-MossdeepCity_House1_Text_222099: @ 8222099
+MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes: @ 8222099
 	.string "My husband can tell what kind of\n"
 	.string "{POKEBLOCK}S a POKéMON likes at a glance.$"
 
diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json
index e63a1aee6..967fc0a55 100644
--- a/data/maps/MossdeepCity_House2/map.json
+++ b/data/maps/MossdeepCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220DF",
+      "script": "MossdeepCity_House2_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220E8",
+      "script": "MossdeepCity_House2_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220F1",
+      "script": "MossdeepCity_House2_EventScript_Wingull",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL"
     }
   ],
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index 792ee7fd1..8f77aede2 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -1,43 +1,43 @@
 MossdeepCity_House2_MapScripts:: @ 82220DE
 	.byte 0
 
-MossdeepCity_House2_EventScript_2220DF:: @ 82220DF
-	msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC
+MossdeepCity_House2_EventScript_Man:: @ 82220DF
+	msgbox MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_2220E8:: @ 82220E8
-	msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC
+MossdeepCity_House2_EventScript_Twin:: @ 82220E8
+	msgbox MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
+MossdeepCity_House2_EventScript_Wingull:: @ 82220F1
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House2_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	closemessage
 	setflag FLAG_WINGULL_DELIVERED_MAIL
 	clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MossdeepCity_House2_EventScript_222124
+	call_if_eq MossdeepCity_House2_EventScript_WingullExitNorth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq MossdeepCity_House2_EventScript_22212F
+	call_if_eq MossdeepCity_House2_EventScript_WingullExitWest
 	removeobject 3
 	release
 	end
 
-MossdeepCity_House2_EventScript_222124:: @ 8222124
-	applymovement 3, MossdeepCity_House2_Movement_22213A
+MossdeepCity_House2_EventScript_WingullExitNorth:: @ 8222124
+	applymovement 3, MossdeepCity_House2_Movement_WingullExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_House2_EventScript_22212F:: @ 822212F
-	applymovement 3, MossdeepCity_House2_Movement_222141
+MossdeepCity_House2_EventScript_WingullExitWest:: @ 822212F
+	applymovement 3, MossdeepCity_House2_Movement_WingullExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_House2_Movement_22213A: @ 822213A
+MossdeepCity_House2_Movement_WingullExitNorth: @ 822213A
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -46,25 +46,25 @@ MossdeepCity_House2_Movement_22213A: @ 822213A
 	delay_8
 	step_end
 
-MossdeepCity_House2_Movement_222141: @ 8222141
+MossdeepCity_House2_Movement_WingullExitEast: @ 8222141
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
 	delay_8
 	step_end
 
-MossdeepCity_House2_Text_222146: @ 8222146
+MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree: @ 8222146
 	.string "My little sister exchanges MAIL with\n"
 	.string "her boyfriend in FORTREE.\p"
 	.string "I don't envy her one bit at all.$"
 
-MossdeepCity_House2_Text_2221A6: @ 82221A6
+MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth: @ 82221A6
 	.string "Even though I can't see my friend in\n"
 	.string "FORTREE, my POKéMON carries MAIL\l"
 	.string "back and forth for us.\p"
 	.string "I'm not lonesome, even though we're\n"
 	.string "apart.$"
 
-MossdeepCity_House2_Text_22222E: @ 822222E
+MossdeepCity_House2_Text_Wingull: @ 822222E
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json
index 237a315ff..b2d7cb404 100644
--- a/data/maps/MossdeepCity_House3/map.json
+++ b/data/maps/MossdeepCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House3_EventScript_2225C3",
+      "script": "MossdeepCity_House3_EventScript_SuperRodFisherman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc
index 257b7cc82..96285cf25 100644
--- a/data/maps/MossdeepCity_House3/scripts.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
@@ -1,31 +1,31 @@
 MossdeepCity_House3_MapScripts:: @ 82225C2
 	.byte 0
 
-MossdeepCity_House3_EventScript_2225C3:: @ 82225C3
+MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602
-	msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_House3_EventScript_22260C
-	msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_ReceivedSuperRod
+	msgbox MossdeepCity_House3_Text_YouWantSuperRod, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod
+	msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUPER_ROD
 	setflag FLAG_RECEIVED_SUPER_ROD
-	msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_EventScript_222602:: @ 8222602
-	msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT
+MossdeepCity_House3_EventScript_ReceivedSuperRod:: @ 8222602
+	msgbox MossdeepCity_House3_Text_GoAfterSeafloorPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_EventScript_22260C:: @ 822260C
-	msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT
+MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 822260C
+	msgbox MossdeepCity_House3_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_Text_222616: @ 8222616
+MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616
 	.string "Hey there, TRAINER!\n"
 	.string "A SUPER ROD really is super!\p"
 	.string "Say all you want, but this baby can\n"
@@ -33,19 +33,19 @@ MossdeepCity_House3_Text_222616: @ 8222616
 	.string "What do you think?\n"
 	.string "You want it, don't you?$"
 
-MossdeepCity_House3_Text_2226B6: @ 82226B6
+MossdeepCity_House3_Text_SuperRodIsSuper: @ 82226B6
 	.string "You bet, you bet!\n"
 	.string "After all, a SUPER ROD is really super!$"
 
-MossdeepCity_House3_Text_2226F0: @ 82226F0
+MossdeepCity_House3_Text_TryDroppingRodInWater: @ 82226F0
 	.string "If there's any water, try dropping in\n"
 	.string "your ROD and see what bites!$"
 
-MossdeepCity_House3_Text_222733: @ 8222733
+MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733
 	.string "Hunh?\n"
 	.string "Don't you like to fish?$"
 
-MossdeepCity_House3_Text_222751: @ 8222751
+MossdeepCity_House3_Text_GoAfterSeafloorPokemon: @ 8222751
 	.string "Go after the seafloor POKéMON with\n"
 	.string "your SUPER ROD.$"
 
diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json
index 2d1b33335..7166674a3 100644
--- a/data/maps/MossdeepCity_House4/map.json
+++ b/data/maps/MossdeepCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222DD8",
+      "script": "MossdeepCity_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222DF7",
+      "script": "MossdeepCity_House4_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222E1E",
+      "script": "MossdeepCity_House4_EventScript_Skitty",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 4505b1f03..473c1cfbd 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -1,62 +1,62 @@
 MossdeepCity_House4_MapScripts:: @ 8222DD7
 	.byte 0
 
-MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8
+MossdeepCity_House4_EventScript_Woman:: @ 8222DD8
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_222DED
-	msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_CanBattleAtSecretBases
+	msgbox MossdeepCity_House4_Text_BrotherLikesToFindBases, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222DED:: @ 8222DED
-	msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT
+MossdeepCity_House4_EventScript_CanBattleAtSecretBases:: @ 8222DED
+	msgbox MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
+MossdeepCity_House4_EventScript_NinjaBoy:: @ 8222DF7
 	lock
 	faceplayer
 	special CheckPlayerHasSecretBase
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_House4_EventScript_222E14
+	compare VAR_RESULT, FALSE
+	goto_if_eq MossdeepCity_House4_EventScript_NoSecretBase
 	special GetSecretBaseNearbyMapName
-	msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House4_Text_YouMadeSecretBaseNearX, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222E14:: @ 8222E14
-	msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT
+MossdeepCity_House4_EventScript_NoSecretBase:: @ 8222E14
+	msgbox MossdeepCity_House4_Text_MakeSecretBase, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E
+MossdeepCity_House4_EventScript_Skitty:: @ 8222E1E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House4_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-MossdeepCity_House4_Text_222E31: @ 8222E31
+MossdeepCity_House4_Text_BrotherLikesToFindBases: @ 8222E31
 	.string "My little brother says he likes to go\n"
 	.string "find people's SECRET BASES.$"
 
-MossdeepCity_House4_Text_222E73: @ 8222E73
+MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle: @ 8222E73
 	.string "My little brother says he likes to\n"
 	.string "visit people's SECRET BASES and have\l"
 	.string "POKéMON battles.$"
 
-MossdeepCity_House4_Text_222ECC: @ 8222ECC
+MossdeepCity_House4_Text_YouMadeSecretBaseNearX: @ 8222ECC
 	.string "Was it you who made a SECRET BASE\n"
 	.string "near {STR_VAR_1}?$"
 
-MossdeepCity_House4_Text_222EF7: @ 8222EF7
+MossdeepCity_House4_Text_MakeSecretBase: @ 8222EF7
 	.string "You should make a SECRET BASE\n"
 	.string "somewhere. I'll go find it!$"
 
-MossdeepCity_House4_Text_222F31: @ 8222F31
+MossdeepCity_House4_Text_Skitty: @ 8222F31
 	.string "SKITTY: Miyaan?$"
 
diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json
index bd14a30c1..8be148fad 100644
--- a/data/maps/MossdeepCity_Mart/map.json
+++ b/data/maps/MossdeepCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223C8",
+      "script": "MossdeepCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223F6",
+      "script": "MossdeepCity_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223FF",
+      "script": "MossdeepCity_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_222408",
+      "script": "MossdeepCity_Mart_EventScript_Sailor",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index 1a555af48..c0d0ae311 100644
--- a/data/maps/MossdeepCity_Mart/scripts.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 MossdeepCity_Mart_MapScripts:: @ 82223C7
 	.byte 0
 
-MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8
+MossdeepCity_Mart_EventScript_Clerk:: @ 82223C8
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart MossdeepCity_Mart_Pokemart_2223E0
+	pokemart MossdeepCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
+MossdeepCity_Mart_Pokemart: @ 82223E0
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_NET_BALL
 	.2byte ITEM_DIVE_BALL
@@ -26,31 +26,31 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
 	release
 	end
 
-MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6
-	msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Woman:: @ 82223F6
+	msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF
-	msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Boy:: @ 82223FF
+	msgbox MossdeepCity_Mart_Text_MaxRepelLastsLongest, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_222408:: @ 8222408
-	msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Sailor:: @ 8222408
+	msgbox MossdeepCity_Mart_Text_NetAndDiveBallsRare, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_Text_222411: @ 8222411
+MossdeepCity_Mart_Text_ReviveIsFantastic: @ 8222411
 	.string "REVIVE is fantastic!\p"
 	.string "Give it to a fainted POKéMON,\n"
 	.string "and the POKéMON will arise.\p"
 	.string "But be careful, REVIVE doesn't restore\n"
 	.string "the used-up PP of moves.$"
 
-MossdeepCity_Mart_Text_2224A0: @ 82224A0
+MossdeepCity_Mart_Text_MaxRepelLastsLongest: @ 82224A0
 	.string "MAX REPEL keeps all weak POKéMON away.\p"
 	.string "Out of all the REPEL sprays, it lasts\n"
 	.string "the longest.$"
 
-MossdeepCity_Mart_Text_2224FA: @ 82224FA
+MossdeepCity_Mart_Text_NetAndDiveBallsRare: @ 82224FA
 	.string "The NET and DIVE BALLS are rare POKé\n"
 	.string "BALLS that are only made in MOSSDEEP.\p"
 	.string "A NET BALL is effective against\n"
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
index fc78cc967..c8018bc36 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 02e8b33b4..49c31dc6b 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
 	setrespawn HEAL_LOCATION_MOSSDEEP_CITY
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E
+@ VAR_0x800B is the Nurse's object event id
+MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 822224E
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,21 +16,21 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E
 	release
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C
-	msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC
+MossdeepCity_PokemonCenter_1F_EventScript_Woman:: @ 822225C
+	msgbox MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265
-	msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC
+MossdeepCity_PokemonCenter_1F_EventScript_Girl:: @ 8222265
+	msgbox MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E
+MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable: @ 822226E
 	.string "The GYM LEADERS in this town are\n"
 	.string "a formidable duo.\p"
 	.string "Their combination attacks are, like,\n"
 	.string "excellent and wow!$"
 
-MossdeepCity_PokemonCenter_1F_Text_2222D9: @ 82222D9
+MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves: @ 82222D9
 	.string "Depending on the special abilities of\n"
 	.string "POKéMON, some moves might change\l"
 	.string "or not work at all.$"
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
index 0d02d368a..22f008ed1 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -141,8 +141,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF",
-      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY"
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote",
+      "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_STEVEN",
@@ -154,7 +154,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Steven",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN"
     }
   ],
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 1058761c5..3499244ed 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -1,14 +1,14 @@
 MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
-	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition
 	.byte 0
 
 MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
+MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: @ 8222F58
 	setobjectxyperm 3, 1, 9
 	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm 5, 0, 8
@@ -18,291 +18,296 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
 	setobjectxyperm 1, 3, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
-	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
-	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2
-	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA
+	compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft
+	compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown
+	compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft:: @ 8222FAA
 	setobjectxyperm 9, 12, 2
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown:: @ 8222FB2
 	setobjectxyperm 9, 13, 3
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
+@ Functionally unused. See comment on MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight:: @ 8222FBA
 	setobjectxyperm 9, 14, 2
 	end
 
-MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
+MossdeepCity_SpaceCenter_1F_OnLoad: @ 8222FC2
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE
+	goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
+MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote:: @ 8222FCE
 	setmetatile 2, 5, METATILE_Facility_DataPad, 1
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
+MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 8222FD8
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma
 	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
 	compare VAR_RESULT, 0
-	call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012
+	call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet
 	compare VAR_RESULT, 1
-	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B
+	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet:: @ 8223012
+	msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber:: @ 822301B
+	msgbox MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
+MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: @ 8223024
 	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
 	compare VAR_RESULT, 0
-	call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051
+	call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma
 	compare VAR_RESULT, 1
-	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A
+	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma:: @ 8223051
+	msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma:: @ 822305A
+	msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
+MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 8223063
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma
+	msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: @ 822307A
+	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
+MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
-	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma
+	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone
+	msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0
+	msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
-	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_223119
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA
+	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma
+	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: @ 8223119
+	msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
+MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 822312D
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154
-	goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
+	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
+	goto MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal:: @ 8223154
+	msgbox MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma:: @ 822315E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
+MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 8223168
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
+	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F
-	goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
+	goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
+	goto MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
-	msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: @ 822318F
+	msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: @ 82231A4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9
+MossdeepCity_SpaceCenter_1F_EventScript_Steven:: @ 82231B9
 	lock
 	faceplayer
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF
+MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF
 	lockall
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA
-	trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt3:: @ 82231DA
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_3, MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1
-	trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt1:: @ 82231F1
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_1, MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208
-	trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt4:: @ 8223208
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_4, MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_22326E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2
+	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_2, MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat
 	setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
 	copyobjectxytoperm 9
 	switch VAR_FACING
-	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223278
-	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223289
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
+	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
+	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast  @ BUG: This was meant to be case DIR_EAST
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
 	waitmovement 0
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: @ 822326E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A
+MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ 8223278
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest
 	waitmovement 0
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E
+@ Functionally unused by mistake. The movement is handled anyway after the switch (see above)
+@ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3
+MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: @ 8223289
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast
 	waitmovement 0
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest: @ 822329A
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E
+@ Functionally unused. See above
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast: @ 822329E
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2
+@ This was meant to only handle the player facing North, but by mistake(?) it also handles the player facing East
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs: @ 82232A2
 	face_left
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7
+MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent: @ 82232A7
 	.string "The rocket's launch is imminent!$"
 
-MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8
+MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber: @ 82232C8
 	.string "The rocket launched safely!\n"
 	.string "That's successful launch no. {STR_VAR_1}!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305
+MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent: @ 8223305
 	.string "I know that things are a little\n"
 	.string "haywire right now, but…\p"
 	.string "The rocket's launch is imminent!$"
 
-MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E
+MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber: @ 822335E
 	.string "I know that things are a little\n"
 	.string "haywire right now, but…\p"
 	.string "The rocket launched safely!\n"
 	.string "That's successful launch no. {STR_VAR_1}!$"
 
-MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3
+MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection: @ 82233D3
 	.string "A rocket launch demands perfection.\n"
 	.string "Not even a 1% margin of error is allowed.\p"
 	.string "Even if it's 99% okay, the whole thing\n"
@@ -310,55 +315,55 @@ MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3
 	.string "Despite that, we never stop trying.\n"
 	.string "Why? It's a dream that never ends.$"
 
-MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7
+MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter: @ 82234B7
 	.string "Those MAGMA thugs have their sights\n"
 	.string "set on our SPACE CENTER.\p"
 	.string "But we can't allow anything that minor\n"
 	.string "to interfere with our rocket launch!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540
+MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt: @ 8223540
 	.string "I was taking a stroll down the beach\n"
 	.string "when I found this.\p"
 	.string "It's not anything I need, so you can\n"
 	.string "have it.$"
 
-MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6
+MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers: @ 82235A6
 	.string "The HOENN region has been famous for \n"
 	.string "its meteor showers for a long time.$"
 
-MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0
+MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis: @ 82235F0
 	.string "TEAM MAGMA can't be allowed to steal\n"
 	.string "the rocket fuel.\p"
 	.string "Oh, by the way, you can have this stone\n"
 	.string "I found on the beach.$"
 
-MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664
+MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma: @ 8223664
 	.string "With TEAM MAGMA around, I guess\n"
 	.string "strolls on the beach aren't safe.$"
 
-MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6
+MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace: @ 82236A6
 	.string "Some people claim that POKéMON came\n"
 	.string "from space. Could it be true?$"
 
-MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8
+MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma: @ 82236E8
 	.string "TEAM AQUA should take care of\n"
 	.string "TEAM MAGMA!\p"
 	.string "But if they did that, TEAM AQUA will\n"
 	.string "become bold and brazen, won't they?$"
 
-MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B
+MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind: @ 822375B
 	.string "A giant chunk of metal bursts through\n"
 	.string "the skies and flies into space…\p"
 	.string "It boggles my mind!$"
 
-MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5
+MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream: @ 82237B5
 	.string "A giant chunk of metal bursts through\n"
 	.string "the skies and flies into space…\p"
 	.string "But TEAM MAGMA wants to spoil\n"
 	.string "that dream of mine!\p"
 	.string "I'm not having any of that!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849
+MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849
 	.string "STEVEN: {PLAYER}{KUN}, have you read that\n"
 	.string "proclamation already?\p"
 	.string "TEAM MAGMA is coming after the rocket\n"
@@ -370,57 +375,57 @@ MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849
 	.string "In the meantime, why don't you go\n"
 	.string "check out the town?$"
 
-MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro: @ 822396C
 	.string "As promised, we've come for\n"
 	.string "the rocket fuel!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat: @ 8223999
 	.string "Ran out of fuel…$"
 
-MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA
+MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle: @ 82239AA
 	.string "Don't think you're on a roll just\n"
 	.string "because you've beaten me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro: @ 82239E6
 	.string "We gave you fair warning!\n"
 	.string "There's nothing sneaky about us!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat: @ 8223A21
 	.string "Grrr…\n"
 	.string "We should've used sneaky treachery…$"
 
-MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B
+MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle: @ 8223A4B
 	.string "Okay, I get it already! The next time,\n"
 	.string "we'll come unannounced.$"
 
-MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro: @ 8223A8A
 	.string "The rocket fuel the SPACE CENTER has\n"
 	.string "in storage--that's what we're after.\p"
 	.string "We mean to take every last bit of it!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat: @ 8223AFA
 	.string "Please, can you spare some fuel?\n"
 	.string "Even a chintzy cup will do!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37
+MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle: @ 8223B37
 	.string "What are we going to do with\n"
 	.string "the rocket fuel?\p"
 	.string "How would I know?\n"
 	.string "Ask our leader upstairs!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro: @ 8223B90
 	.string "Our leader said no one, but no one,\n"
 	.string "gets past me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat: @ 8223BC2
 	.string "Ack! Ack! Aaack!$"
 
-MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3
+MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle: @ 8223BD3
 	.string "Please, tell our leader that\n"
 	.string "I never abandoned my post.\l"
 	.string "That I stayed to the bitter end…$"
 
-MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C
+MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice: @ 8223C2C
 	.string "This is…\n"
 	.string "An intent-to-steal notice?\p"
 	.string "“To the staff of the SPACE CENTER:\n"
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
index 5c758bf3e..61729d003 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Steven",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt6",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt7",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Tabitha",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Maxie",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     }
   ],
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 32c34ed23..765b96482 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -1,16 +1,16 @@
 MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_OnFrame
 	.byte 0
 
 MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
-	compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
-	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F
+	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha
+	compare VAR_MOSSDEEP_SPACE_CENTER_STATE, 2
+	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
+MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha:: @ 8223D7A
 	clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
 	setobjectxyperm 3, 5, 3
 	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
@@ -20,193 +20,194 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
+MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts:: @ 8223D9F
 	setobjectxyperm 5, 11, 2
 	setobjectxyperm 7, 15, 2
 	setobjectxyperm 6, 13, 4
 	return
 
-MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
-	map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
+MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5
+	map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE, 1, MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts
 	.2byte 0
 
-MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
+MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF
 	playse SE_PIN
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
+	msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07
+	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit
 	waitmovement 0
 	warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1
 	waitstate
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07
+MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07
 	walk_up
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461
-	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
+MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
+	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499
-	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat
+	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
-	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat
+	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated
 	waitmovement 0
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2
 	copyobjectxytoperm 5
 	copyobjectxytoperm 7
 	copyobjectxytoperm 6
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81
+MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated: @ 8223E81
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85
+MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated: @ 8223E85
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89
+MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated: @ 8223E89
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
+MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 8223E8D
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
+	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
+	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal
+	goto MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal:: @ 8223EB4
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma:: @ 8223EBE
+	msgbox MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
+MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 8223EC8
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
+	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
+	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal
+	goto MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal:: @ 8223EEF
+	msgbox MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma:: @ 8223EF9
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 8223F03
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
+	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma
 	compare VAR_MOSSDEEP_CITY_STATE, 2
-	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
+	goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal
+	goto MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal:: @ 8223F2A
+	msgbox MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34
+	msgbox MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC
+@ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt6:: @ 8223F3E
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt7:: @ 8223F47
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt5:: @ 8223F50
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59
+MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59
 	lock
 	faceplayer
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F
+MossdeepCity_SpaceCenter_2F_EventScript_Maxie:: @ 8223F6F
 	lockall
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
+MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A
 	lockall
-	goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_223FDA
+	goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt
 	setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playse SE_KOUKA_L
 	switch VAR_FACING
-	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_223FBA
-	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6
+	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth
+	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFight
 	waitmovement 0
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA
-	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth:: @ 8223FBA
+	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth
 	waitmovement 0
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6
+MossdeepCity_SpaceCenter_2F_Movement_StevenFight: @ 8223FC6
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -217,7 +218,7 @@ MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6
 	walk_slow_down
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
+MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: @ 8223FCF
 	face_left
 	lock_facing_direction
 	walk_fast_right
@@ -230,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
 	face_down
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
+MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: @ 8223FDA
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle
+	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
+MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	special SavePlayerParty
@@ -251,30 +252,30 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032
+	goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle
 	special LoadPlayerParty
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
+	goto MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt
 
-MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
+MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
 	special ReducePlayerPartyToSelectedMons
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	switch VAR_RESULT
-	case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
+	case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha
 	fadescreen 1
 	special SetCB2WhiteOut
 	waitstate
 
-MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
@@ -285,12 +286,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	applymovement 8, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_MOSSDEEP_CITY_STATE, 3
 	fadedefaultbgm
 	fadescreen 1
-	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3
+	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
@@ -305,15 +306,15 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	turnobject 2, DIR_NORTH
 	setobjectxy 1, 6, 2
 	turnobject 1, DIR_NORTH
-	call MossdeepCity_SpaceCenter_2F_EventScript_224131
+	call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer
 	fadescreen 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT
+	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
 	setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	removeobject 4
-	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	setvar VAR_STEVENS_HOUSE_STATE, 1
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
@@ -324,142 +325,142 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	fadescreen 0
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131
 	switch VAR_FACING
-	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_22414D
-	case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_224152
+	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth
+	case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth:: @ 822414D
 	turnobject 4, DIR_NORTH
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152
 	turnobject 4, DIR_EAST
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
+MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
+MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
+MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193
+	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall
 	compare VAR_RESULT, FEMALE
-	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A
+	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall
 	closemessage
 	clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1
+MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall:: @ 8224193
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall
 	waitmessage
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6
+MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall:: @ 822419A
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall
 	waitmessage
 	return
 
-MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1
+MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets: @ 82241A1
 	.string "MOSSDEEP has mainly sunny weather,\n"
 	.string "and its winds are stable.\p"
 	.string "It's an ideal location for launching\n"
 	.string "rockets.$"
 
-MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C
+MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel: @ 822420C
 	.string "Why would TEAM MAGMA want to steal\n"
 	.string "our rocket fuel in the first place?$"
 
-MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253
+MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut: @ 8224253
 	.string "If only I was a little younger, I would\n"
 	.string "have liked being an astronaut…\p"
 	.string "No… It's not too late!\n"
 	.string "I can and will try!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5
+MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis: @ 82242C5
 	.string "If TEAM MAGMA takes the rocket fuel,\n"
 	.string "I won't be able to go to space!\p"
 	.string "They can't be allowed to get away\n"
 	.string "with such an outrage!$"
 
-MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342
+MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace: @ 8224342
 	.string "I wish ordinary people could go into\n"
 	.string "space one day…$"
 
-MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376
+MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace: @ 8224376
 	.string "TEAM MAGMA…\n"
 	.string "Do they want to go to space, too?$"
 
-MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4
+MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn: @ 82243A4
 	.string "What's wrong with you?\p"
 	.string "You're outnumbered three to one,\n"
 	.string "but you still want to take us on?$"
 
-MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE
+MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE
 	.string "Good answer!\n"
 	.string "That's what a smart person'll do!$"
 
-MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro: @ 822442D
 	.string "A reckless go-getter, are you?\n"
 	.string "Okay, I'll go first!$"
 
-MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat: @ 8224461
 	.string "I lost!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro: @ 822446E
 	.string "It's too soon to be relieved!\n"
 	.string "I'm up next!$"
 
-MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat: @ 8224499
 	.string "I lost, too!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro: @ 82244AB
 	.string "I bet you want to take a break.\n"
 	.string "But I'm not about to let you do that!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat: @ 82244F1
 	.string "We should've taken a break…\n"
 	.string "That's what we should've done…$"
 
-MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C
+MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle: @ 822452C
 	.string "Three of us here, and look at the sorry\n"
 	.string "mess we got ourselves into.$"
 
-MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570
+MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle: @ 8224570
 	.string "We three losing like this…\n"
 	.string "We look worse than usual by triple!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF
+MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle: @ 82245AF
 	.string "Are we being useful to our leader\n"
 	.string "at all?$"
 
-MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9
+MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou: @ 82245D9
 	.string "Hehehe!\p"
 	.string "We come all the way here to get some\n"
 	.string "fuel, and we're interfered with again!\p"
 	.string "If you're going to mess with us too,\n"
 	.string "we'll take care of you at the same time!$"
 
-MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B
+MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere: @ 822467B
 	.string "MAXIE: Clear out of the way!\n"
 	.string "Don't you dare interfere!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2
+MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel: @ 82246B2
 	.string "STEVEN: TEAM MAGMA…\p"
 	.string "What's the point of stealing rocket\n"
 	.string "fuel?$"
 
-MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0
+MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano: @ 82246F0
 	.string "MAXIE: Fufufu… Since you're so\n"
 	.string "curious, you deserve an explanation.\p"
 	.string "We're going to jettison the entire\n"
@@ -470,24 +471,24 @@ MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0
 	.string "the volcano erupt!\p"
 	.string "It will be savage!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF
+MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle: @ 82247FF
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "You're going to help me?\p"
 	.string "Let's go into battle together!\n"
 	.string "Are you ready?$"
 
-MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854
+MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly: @ 8224854
 	.string "STEVEN: Then, hurry!\n"
 	.string "Get ready quickly!$"
 
-MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C
+MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand: @ 822487C
 	.string "All I want…\n"
 	.string "I just want to expand the land mass…$"
 
-MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD
+MossdeepCity_SpaceCenter_Text_TabithaDefeat: @ 82248AD
 	.string "I'm with our leader…$"
 
-MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2
+MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided: @ 82248C2
 	.string "MAXIE: We failed to make the volcano\n"
 	.string "erupt…\p"
 	.string "We failed to control GROUDON after\n"
@@ -502,13 +503,13 @@ MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2
 	.string "Then might TEAM AQUA's goal to expand\n"
 	.string "the sea also be equally misguided?$"
 
-MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC
+MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp: @ 82249DC
 	.string "MAXIE: All right…\n"
 	.string "We will give up on the fuel…\p"
 	.string "There appear to be more important\n"
 	.string "matters that I must examine…$"
 
-MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A
+MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome: @ 8224A4A
 	.string "STEVEN: Whew, that was too tense.\n"
 	.string "{PLAYER}{KUN}, thank you.\p"
 	.string "I have something to give you as\n"
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
index 76844e258..c061999ef 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.json
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_222912",
+      "script": "MossdeepCity_StevensHouse_EventScript_Steven",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_222841",
+      "script": "MossdeepCity_StevensHouse_EventScript_BeldumPokeball",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_22291B",
+      "script": "MossdeepCity_StevensHouse_EventScript_Letter",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY"
     }
   ],
@@ -78,7 +78,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -86,7 +86,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -94,7 +94,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 6,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 33b30e1d0..c14314b16 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -1,32 +1,32 @@
 MossdeepCity_StevensHouse_MapScripts:: @ 8222784
-	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_OnFrame
 	.byte 0
 
-MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
-	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E
+MossdeepCity_StevensHouse_OnLoad: @ 8222794
+	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_HideStevensNote
 	end
 
-MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
+MossdeepCity_StevensHouse_EventScript_HideStevensNote:: @ 822279E
 	setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
 	return
 
 MossdeepCity_StevensHouse_OnTransition: @ 82227A8
 	compare VAR_STEVENS_HOUSE_STATE, 2
-	call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
+	call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos
 	end
 
-MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
+MossdeepCity_StevensHouse_EventScript_SetStevenPos:: @ 82227B4
 	setobjectxyperm 1, 6, 5
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
-	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA
+MossdeepCity_StevensHouse_OnFrame: @ 82227C0
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_StevenGivesDive
 	.2byte 0
 
-MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
+MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
@@ -35,16 +35,16 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
+	applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer
 	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 1, MossdeepCity_StevensHouse_Movement_22283B
+	applymovement 1, MossdeepCity_StevensHouse_Movement_StevenReturn
 	waitmovement 0
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
@@ -52,7 +52,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_Movement_222833: @ 8222833
+MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: @ 8222833
 	walk_left
 	walk_left
 	walk_left
@@ -62,7 +62,7 @@ MossdeepCity_StevensHouse_Movement_222833: @ 8222833
 	walk_in_place_fastest_down
 	step_end
 
-MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
+MossdeepCity_StevensHouse_Movement_StevenReturn: @ 822283B
 	walk_up
 	walk_right
 	walk_right
@@ -70,89 +70,90 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
 	walk_in_place_fastest_up
 	step_end
 
-MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841
+MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 8222841
 	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B
-	goto MossdeepCity_StevensHouse_EventScript_222865
+	msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_LeaveBeldum
+	goto MossdeepCity_StevensHouse_EventScript_GiveBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
-	msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT
+MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: @ 822285B
+	msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
+MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 8222865
 	setvar VAR_TEMP_1, SPECIES_BELDUM
 	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_222895
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumParty
 	compare VAR_RESULT, 1
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumPC
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
-	call MossdeepCity_StevensHouse_EventScript_2228EB
+MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: @ 8222895
+	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
+	compare VAR_RESULT, NO
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto MossdeepCity_StevensHouse_EventScript_222901
+	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
-	call MossdeepCity_StevensHouse_EventScript_2228EB
+MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: @ 82228BD
+	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
+	compare VAR_RESULT, NO
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto MossdeepCity_StevensHouse_EventScript_2228E0
+	goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
-	call MossdeepCity_StevensHouse_EventScript_2737A0
-	goto MossdeepCity_StevensHouse_EventScript_222901
+MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0
+	call Common_EventScript_TransferredToPC
+	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB
 	bufferspeciesname 1, SPECIES_BELDUM
 	removeobject 2
 	playfanfare MUS_FANFA4
-	message MossdeepCity_StevensHouse_Text_222BED
+	message MossdeepCity_StevensHouse_Text_ObtainedBeldum
 	waitmessage
 	waitfanfare
 	bufferspeciesname 0, SPECIES_BELDUM
 	return
 
-MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldum:: @ 8222901
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909
-	msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN
+MossdeepCity_StevensHouse_EventScript_RockDisplay:: @ 8222909
+	msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN
 	end
 
-MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912
-	msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC
+MossdeepCity_StevensHouse_EventScript_Steven:: @ 8222912
+	msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
+MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
 	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
+@ Unused, leftover from RS
+MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
 	giveitem_std ITEM_HM08, 1, 1
 	setflag FLAG_RECEIVED_HM08
 	end
 
-MossdeepCity_StevensHouse_Text_222936: @ 8222936
+MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: @ 8222936
 	.string "STEVEN: {PLAYER}{KUN}…\p"
 	.string "As you can see, there's not much here,\n"
 	.string "but this is my home.\p"
@@ -162,7 +163,7 @@ MossdeepCity_StevensHouse_Text_222936: @ 8222936
 	.string "No need to be shy--you've earned\n"
 	.string "this HM.$"
 
-MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
+MossdeepCity_StevensHouse_Text_ExplainDive: @ 8222A0E
 	.string "STEVEN: While you're using SURF, you\n"
 	.string "should notice dark patches of water.\p"
 	.string "Use DIVE if you come to deep water\n"
@@ -172,30 +173,30 @@ MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
 	.string "In some places, it won't be possible\n"
 	.string "for you to surface, though.$"
 
-MossdeepCity_StevensHouse_Text_222B11: @ 8222B11
+MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: @ 8222B11
 	.string "STEVEN: Apparently, there's an\n"
 	.string "underwater cavern between\l"
 	.string "MOSSDEEP and SOOTOPOLIS.\p"
 	.string "You know, the one that CAPT. STERN\n"
 	.string "found in his submarine.$"
 
-MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E
+MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
 	.string "{PLAYER} checked the POKé BALL.\p"
 	.string "It contained the POKéMON\n"
 	.string "BELDUM.\p"
 	.string "Take the POKé BALL?$"
 
-MossdeepCity_StevensHouse_Text_222BED: @ 8222BED
+MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
 	.string "{PLAYER} obtained a BELDUM.$"
 
 MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
 	.string "There is no space for another POKéMON.$"
 
-MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A
+MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A
 	.string "{PLAYER} left the POKé BALL where\n"
 	.string "it was.$"
 
-MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
+MossdeepCity_StevensHouse_Text_LetterFromSteven: @ 8222C4E
 	.string "It's a letter.\p"
 	.string "… … … … … …\p"
 	.string "To {PLAYER}{KUN}…\p"
@@ -212,7 +213,7 @@ MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
 	.string "May our paths cross someday.\p"
 	.string "STEVEN STONE$"
 
-MossdeepCity_StevensHouse_Text_222D97: @ 8222D97
+MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: @ 8222D97
 	.string "It's a collection of rare rocks and\n"
 	.string "stones assembled by STEVEN.$"
 
diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json
index 2b19e7f8d..52a795bdb 100644
--- a/data/maps/MtChimney/map.json
+++ b/data/maps/MtChimney/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22EDD5",
+      "script": "MtChimney_EventScript_Archie",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22EE0B",
+      "script": "MtChimney_EventScript_Maxie",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtChimney_EventScript_22F06E",
+      "script": "MtChimney_EventScript_Tabitha",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0C0",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt5",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0B7",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt4",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F05C",
+      "script": "MtChimney_EventScript_BusyAquaGrunt2",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F053",
+      "script": "MtChimney_EventScript_BusyAquaGrunt1",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F065",
+      "script": "MtChimney_EventScript_BusyAquaGrunt3",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22EEF3",
+      "script": "MtChimney_EventScript_LavaCookieLady",
       "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0C9",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt6",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0DB",
+      "script": "MtChimney_EventScript_AquaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0A5",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt2",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0AE",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt3",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F09C",
+      "script": "MtChimney_EventScript_BusyMagmaGrunt1",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -245,7 +245,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0DB",
+      "script": "MtChimney_EventScript_AquaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -258,7 +258,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -271,7 +271,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0DB",
+      "script": "MtChimney_EventScript_AquaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -284,7 +284,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -297,7 +297,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_22F085",
+      "script": "MtChimney_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -310,7 +310,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0DB",
+      "script": "MtChimney_EventScript_AquaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA"
     },
     {
@@ -323,7 +323,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_EventScript_22F0D2",
+      "script": "MtChimney_EventScript_MagmaPoochyena",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -336,7 +336,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_22F14A",
+      "script": "MtChimney_EventScript_Shelby",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
     },
     {
@@ -349,7 +349,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "MtChimney_EventScript_22F1AC",
+      "script": "MtChimney_EventScript_Melissa",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
     },
     {
@@ -362,7 +362,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_22F1C3",
+      "script": "MtChimney_EventScript_Sheila",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
     },
     {
@@ -375,7 +375,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_22F1DA",
+      "script": "MtChimney_EventScript_Shirley",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
     },
     {
@@ -388,7 +388,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_22F1F1",
+      "script": "MtChimney_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -401,7 +401,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "MtChimney_EventScript_22F208",
+      "script": "MtChimney_EventScript_Sawyer",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS"
     }
   ],
@@ -443,7 +443,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MtChimney_EventScript_22F0E4"
+      "script": "MtChimney_EventScript_MeteoriteMachine"
     },
     {
       "type": "sign",
@@ -451,7 +451,7 @@
       "y": 37,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MtChimney_EventScript_22F141"
+      "script": "MtChimney_EventScript_RouteSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 11e9b5c9f..a70d7e3ae 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -1,5 +1,5 @@
 MtChimney_MapScripts:: @ 822EDC1
-	map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2
+	map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition
 	.byte 0
 
@@ -7,15 +7,15 @@ MtChimney_OnTransition: @ 822EDCC
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
 	end
 
-MtChimney_MapScript1_22EDD2: @ 822EDD2
+MtChimney_OnResume: @ 822EDD2
 	setstepcallback STEP_CB_ASH
 	end
 
-MtChimney_EventScript_22EDD5:: @ 822EDD5
+MtChimney_EventScript_Archie:: @ 822EDD5
 	lock
 	faceplayer
-	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9
-	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02
+	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma
+	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -23,18 +23,18 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5
 	release
 	end
 
-MtChimney_EventScript_22EDF9:: @ 822EDF9
-	msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT
+MtChimney_EventScript_ArchieGoStopTeamMagma:: @ 822EDF9
+	msgbox MtChimney_Text_ArchieGoStopTeamMagma, MSGBOX_DEFAULT
 	return
 
-MtChimney_EventScript_22EE02:: @ 822EE02
-	msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT
+MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02
+	msgbox MtChimney_Text_ArchieIHaveMyHandsFull, MSGBOX_DEFAULT
 	return
 
-MtChimney_EventScript_22EE0B:: @ 822EE0B
+MtChimney_EventScript_Maxie:: @ 822EE0B
 	lockall
 	playbgm MUS_MGM0, 0
-	msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT
+	msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
@@ -42,9 +42,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF
-	msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT
+	msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat
+	msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	fadescreen 1
@@ -57,99 +57,91 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	setobjectxyperm 1, 10, 12
 	addobject 1
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MtChimney_EventScript_22EEC7
+	call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MtChimney_EventScript_22EED2
+	call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
+	msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MtChimney_EventScript_22EEDD
+	call_if_eq MtChimney_EventScript_ArchieExitEast
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MtChimney_EventScript_22EEE8
+	call_if_eq MtChimney_EventScript_ArchieExitNorth
 	removeobject 1
 	setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
 	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
+	clearflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO
 	setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO
 	clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
 	releaseall
 	end
 
-MtChimney_EventScript_22EEC7:: @ 822EEC7
-	applymovement 1, MtChimney_Movement_22EF83
+MtChimney_EventScript_ArchieApproachPlayerEast:: @ 822EEC7
+	applymovement 1, MtChimney_Movement_ArchieApproachPlayerEast
 	waitmovement 0
 	return
 
-MtChimney_EventScript_22EED2:: @ 822EED2
-	applymovement 1, MtChimney_Movement_22EF94
+MtChimney_EventScript_ArchieApproachPlayerNorth:: @ 822EED2
+	applymovement 1, MtChimney_Movement_ArchieApproachPlayerNorth
 	waitmovement 0
 	return
 
-MtChimney_EventScript_22EEDD:: @ 822EEDD
-	applymovement 1, MtChimney_Movement_22EF8B
+MtChimney_EventScript_ArchieExitEast:: @ 822EEDD
+	applymovement 1, MtChimney_Movement_ArchieExitEast
 	waitmovement 0
 	return
 
-MtChimney_EventScript_22EEE8:: @ 822EEE8
-	applymovement 1, MtChimney_Movement_22EF9C
+MtChimney_EventScript_ArchieExitNorth:: @ 822EEE8
+	applymovement 1, MtChimney_Movement_ArchieExitNorth
 	waitmovement 0
 	return
 
-MtChimney_EventScript_22EEF3:: @ 822EEF3
+MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
-	msgbox MtChimney_Text_22FE04, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MtChimney_EventScript_22EF69
+	msgbox MtChimney_Text_LavaCookiesJust200, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MtChimney_EventScript_DeclineLavaCookie
 	checkmoney 200, 0
-	compare VAR_RESULT, 0
-	goto_if_eq MtChimney_EventScript_22EF76
-	msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MtChimney_EventScript_NotEnoughMoney
+	msgbox MtChimney_Text_ThankYouDear, MSGBOX_DEFAULT
 	checkitemspace ITEM_LAVA_COOKIE, 1
-	compare VAR_RESULT, 1
-	call_if_eq MtChimney_EventScript_22EF5E
+	compare VAR_RESULT, TRUE
+	call_if_eq MtChimney_EventScript_TakeMoney
 	giveitem_std ITEM_LAVA_COOKIE
-	compare VAR_RESULT, 0
-	goto_if_eq MtChimney_EventScript_22EF51
+	compare VAR_RESULT, FALSE
+	goto_if_eq MtChimney_EventScript_BagIsFull
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-MtChimney_EventScript_22EF51:: @ 822EF51
+MtChimney_EventScript_BagIsFull:: @ 822EF51
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-MtChimney_EventScript_22EF5E:: @ 822EF5E
+MtChimney_EventScript_TakeMoney:: @ 822EF5E
 	takemoney 200, 0
 	updatemoneybox 0, 0
 	return
 
-MtChimney_EventScript_22EF69:: @ 822EF69
-	msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT
+MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69
+	msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-MtChimney_EventScript_22EF76:: @ 822EF76
-	msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT
+MtChimney_EventScript_NotEnoughMoney:: @ 822EF76
+	msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-MtChimney_Movement_22EF83: @ 822EF83
+MtChimney_Movement_ArchieApproachPlayerEast: @ 822EF83
 	walk_up
 	walk_up
 	walk_up
@@ -159,7 +151,7 @@ MtChimney_Movement_22EF83: @ 822EF83
 	walk_right
 	step_end
 
-MtChimney_Movement_22EF8B: @ 822EF8B
+MtChimney_Movement_ArchieExitEast: @ 822EF8B
 	walk_left
 	walk_down
 	walk_down
@@ -170,7 +162,7 @@ MtChimney_Movement_22EF8B: @ 822EF8B
 	walk_down
 	step_end
 
-MtChimney_Movement_22EF94: @ 822EF94
+MtChimney_Movement_ArchieApproachPlayerNorth: @ 822EF94
 	walk_up
 	walk_up
 	walk_up
@@ -180,7 +172,7 @@ MtChimney_Movement_22EF94: @ 822EF94
 	walk_right
 	step_end
 
-MtChimney_Movement_22EF9C: @ 822EF9C
+MtChimney_Movement_ArchieExitNorth: @ 822EF9C
 	walk_left
 	walk_left
 	walk_down
@@ -192,6 +184,7 @@ MtChimney_Movement_22EF9C: @ 822EF9C
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFA6: @ 822EFA6
 	walk_down
 	walk_down
@@ -212,6 +205,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFB8: @ 822EFB8
 	walk_down
 	walk_down
@@ -223,6 +217,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFC1: @ 822EFC1
 	walk_right
 	walk_down
@@ -240,6 +235,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFD0: @ 822EFD0
 	walk_fast_down
 	walk_fast_down
@@ -267,6 +263,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFE9: @ 822EFE9
 	delay_16
 	delay_16
@@ -280,6 +277,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22EFF4: @ 822EFF4
 	delay_16
 	walk_left
@@ -298,6 +296,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F004: @ 822F004
 	delay_16
 	walk_left
@@ -317,6 +316,7 @@ MtChimney_Movement_22F004: @ 822F004
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F015: @ 822F015
 	delay_16
 	walk_down
@@ -327,6 +327,7 @@ MtChimney_Movement_22F015: @ 822F015
 	walk_in_place_fastest_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F01D: @ 822F01D
 	walk_down
 	walk_down
@@ -343,10 +344,12 @@ MtChimney_Movement_22F01D: @ 822F01D
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F02B: @ 822F02B
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F02D: @ 822F02D
 	walk_down
 	walk_down
@@ -357,6 +360,7 @@ MtChimney_Movement_22F02D: @ 822F02D
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F035: @ 822F035
 	delay_16
 	delay_16
@@ -369,6 +373,7 @@ MtChimney_Movement_22F035: @ 822F035
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F03F: @ 822F03F
 	delay_16
 	delay_16
@@ -382,6 +387,7 @@ MtChimney_Movement_22F03F: @ 822F03F
 	walk_down
 	step_end
 
+@ Unused
 MtChimney_Movement_22F04A: @ 822F04A
 	lock_facing_direction
 	walk_fast_left
@@ -389,163 +395,164 @@ MtChimney_Movement_22F04A: @ 822F04A
 	face_right
 	step_end
 
+@ Unused
 MtChimney_Movement_22F04F: @ 822F04F
 	walk_left
 	walk_in_place_fastest_right
 	delay_16
 	step_end
 
-MtChimney_EventScript_22F053:: @ 822F053
-	msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN
+MtChimney_EventScript_BusyAquaGrunt1:: @ 822F053
+	msgbox MtChimney_Text_MagmaOutnumbersUs, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F05C:: @ 822F05C
-	msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN
+MtChimney_EventScript_BusyAquaGrunt2:: @ 822F05C
+	msgbox MtChimney_Text_LessHabitatForWaterPokemon, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F065:: @ 822F065
-	msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN
+MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065
+	msgbox MtChimney_Text_MagmasNameSimilar, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F06E:: @ 822F06E
-	trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
-	msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Tabitha:: @ 822F06E
+	trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
+	msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F085:: @ 822F085
-	trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
-	msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Grunt2:: @ 822F085
+	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_2, MtChimney_Text_Grunt2Intro, MtChimney_Text_Grunt2Defeat
+	msgbox MtChimney_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F09C:: @ 822F09C
-	msgbox MtChimney_Text_22F978, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C
+	msgbox MtChimney_Text_TeamAquaAlwaysMessingWithPlans, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0A5:: @ 822F0A5
-	msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt2:: @ 822F0A5
+	msgbox MtChimney_Text_MeteoritesPackAmazingPower, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0AE:: @ 822F0AE
-	msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt3:: @ 822F0AE
+	msgbox MtChimney_Text_YouBetterNotMessWithUs, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0B7:: @ 822F0B7
-	msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt4:: @ 822F0B7
+	msgbox MtChimney_Text_AquasNameSimilar, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0C0:: @ 822F0C0
-	msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt5:: @ 822F0C0
+	msgbox MtChimney_Text_DouseThemInFire, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0C9:: @ 822F0C9
-	msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN
+MtChimney_EventScript_BusyMagmaGrunt6:: @ 822F0C9
+	msgbox MtChimney_Text_KeepMakingMoreLand, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0D2:: @ 822F0D2
-	msgbox MtChimney_Text_22FACB, MSGBOX_SIGN
+MtChimney_EventScript_MagmaPoochyena:: @ 822F0D2
+	msgbox MtChimney_Text_Bufoh, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0DB:: @ 822F0DB
-	msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN
+MtChimney_EventScript_AquaPoochyena:: @ 822F0DB
+	msgbox MtChimney_Text_Bushaa, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F0E4:: @ 822F0E4
+MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4
 	lockall
-	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_22F137
-	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_22F12D
-	msgbox MtChimney_Text_22FF12, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq MtChimney_EventScript_22F123
-	msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT
+	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_MachineOn
+	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_MachineOff
+	msgbox MtChimney_Text_RemoveTheMeteorite, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq MtChimney_EventScript_LeaveMeteoriteAlone
+	msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT
 	giveitem_std ITEM_METEORITE
 	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end
 
-MtChimney_EventScript_22F123:: @ 822F123
-	msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT
+MtChimney_EventScript_LeaveMeteoriteAlone:: @ 822F123
+	msgbox MtChimney_Text_PlayerLeftMeteorite, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_22F12D:: @ 822F12D
-	msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT
+MtChimney_EventScript_MachineOff:: @ 822F12D
+	msgbox MtChimney_Text_MachineMakesNoResponse, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_22F137:: @ 822F137
-	msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT
+MtChimney_EventScript_MachineOn:: @ 822F137
+	msgbox MtChimney_Text_MetoriteFittedOnMachine, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_22F141:: @ 822F141
-	msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN
+MtChimney_EventScript_RouteSign:: @ 822F141
+	msgbox MtChimney_Text_RouteSign, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_22F14A:: @ 822F14A
-	trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
+MtChimney_EventScript_Shelby:: @ 822F14A
+	trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_ShelbyIntro, MtChimney_Text_ShelbyDefeat, MtChimney_EventScript_DefeatedShelby
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtChimney_EventScript_22F195
-	msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtChimney_EventScript_RematchShelby
+	msgbox MtChimney_Text_ShelbyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtChimney_EventScript_22F176:: @ 822F176
-	special sub_80B4808
+MtChimney_EventScript_DefeatedShelby:: @ 822F176
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT
+	msgbox MtChimney_Text_ShelbyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_SHELBY_1
 	release
 	end
 
-MtChimney_EventScript_22F195:: @ 822F195
-	trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB
-	msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_RematchShelby:: @ 822F195
+	trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_ShelbyRematchIntro, MtChimney_Text_ShelbyRematchDefeat
+	msgbox MtChimney_Text_ShelbyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F1AC:: @ 822F1AC
-	trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D
-	msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Melissa:: @ 822F1AC
+	trainerbattle_single TRAINER_MELISSA, MtChimney_Text_MelissaIntro, MtChimney_Text_MelissaDefeat
+	msgbox MtChimney_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F1C3:: @ 822F1C3
-	trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304
-	msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Sheila:: @ 822F1C3
+	trainerbattle_single TRAINER_SHEILA, MtChimney_Text_SheilaIntro, MtChimney_Text_SheilaDefeat
+	msgbox MtChimney_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F1DA:: @ 822F1DA
-	trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436
-	msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Shirley:: @ 822F1DA
+	trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_ShirleyIntro, MtChimney_Text_ShirleyDefeat
+	msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F1F1:: @ 822F1F1
-	trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921
-	msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Grunt1:: @ 822F1F1
+	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_1, MtChimney_Text_Grunt1Intro, MtChimney_Text_Grunt1Defeat
+	msgbox MtChimney_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_22F208:: @ 822F208
-	trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
+MtChimney_EventScript_Sawyer:: @ 822F208
+	trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_SawyerIntro, MtChimney_Text_SawyerDefeat, MtChimney_EventScript_SawyerDefeated
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtChimney_EventScript_22F253
-	msgbox MtChimney_Text_230519, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtChimney_EventScript_SawyerRematch
+	msgbox MtChimney_Text_SawyerPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtChimney_EventScript_22F234:: @ 822F234
-	special sub_80B4808
+MtChimney_EventScript_SawyerDefeated:: @ 822F234
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtChimney_Text_230557, MSGBOX_DEFAULT
+	msgbox MtChimney_Text_SawyerRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_SAWYER_1
 	release
 	end
 
-MtChimney_EventScript_22F253:: @ 822F253
-	trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3
-	msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_SawyerRematch:: @ 822F253
+	trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_SawyerRematchIntro, MtChimney_Text_SawyerRematchDefeat
+	msgbox MtChimney_Text_SawyerPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_Text_22F26A: @ 822F26A
+MtChimney_Text_MeteoriteWillActivateVolcano: @ 822F26A
 	.string "The power contained in the METEORITE…\p"
 	.string "By amplifying its power with this\n"
 	.string "machine, MT. CHIMNEY's volcanic\l"
@@ -554,7 +561,7 @@ MtChimney_Text_22F26A: @ 822F26A
 	.string "the crater and…\l"
 	.string "Fufufu…$"
 
-MtChimney_Text_22F32E: @ 822F32E
+MtChimney_Text_MaxieIntro: @ 822F32E
 	.string "MAXIE: Hm?\n"
 	.string "Who are you?\p"
 	.string "… … … … … …\n"
@@ -582,11 +589,11 @@ MtChimney_Text_22F32E: @ 822F32E
 	.string "I'll teach you the consequences of\l"
 	.string "meddling in our grand design!$"
 
-MtChimney_Text_22F5CF: @ 822F5CF
+MtChimney_Text_MaxieDefeat: @ 822F5CF
 	.string "What?!\p"
 	.string "I, MAXIE, was caught off guard?!$"
 
-MtChimney_Text_22F5F7: @ 822F5F7
+MtChimney_Text_MaxieYouHaventSeenLastOfMagma: @ 822F5F7
 	.string "MAXIE: But, enough.\n"
 	.string "I will back off this time.\p"
 	.string "But don't think that this is the last\n"
@@ -595,81 +602,81 @@ MtChimney_Text_22F5F7: @ 822F5F7
 	.string "Even without the METEORITE, if we\n"
 	.string "obtain that ORB… Fufufu…$"
 
-MtChimney_Text_22F6AA: @ 822F6AA
+MtChimney_Text_TabithaIntro: @ 822F6AA
 	.string "Hehehe!\p"
 	.string "So you've come all the way here!\p"
 	.string "But you're too late!\n"
 	.string "I've already delivered the METEORITE\l"
 	.string "from METEOR FALLS to the BOSS!$"
 
-MtChimney_Text_22F72C: @ 822F72C
+MtChimney_Text_TabithaDefeat: @ 822F72C
 	.string "Hehehe…\p"
 	.string "Even though I've lost, if our leader\n"
 	.string "awakens that thing…$"
 
-MtChimney_Text_22F76D: @ 822F76D
+MtChimney_Text_TabithaPostBattle: @ 822F76D
 	.string "BOSS, hurry!\n"
 	.string "Give it the METEORITE's energy!\p"
 	.string "Hehehe…$"
 
-MtChimney_Text_22F7A2: @ 822F7A2
+MtChimney_Text_Grunt2Intro: @ 822F7A2
 	.string "We of TEAM MAGMA are working hard for\n"
 	.string "everyone's sake.\p"
 	.string "Like, if that thing's power made more\n"
 	.string "land, there'd be more places to live.\p"
 	.string "Everyone'd be happy!$"
 
-MtChimney_Text_22F83A: @ 822F83A
+MtChimney_Text_Grunt2Defeat: @ 822F83A
 	.string "Hunh?\n"
 	.string "What do you mean I lost?$"
 
-MtChimney_Text_22F859: @ 822F859
+MtChimney_Text_Grunt2PostBattle: @ 822F859
 	.string "Our BOSS says, “It will make everyone\n"
 	.string "happy.”\p"
 	.string "But why does everyone keep getting\n"
 	.string "in our way?$"
 
-MtChimney_Text_22F8B6: @ 822F8B6
+MtChimney_Text_Grunt1Intro: @ 822F8B6
 	.string "If there were more land, I'd be able\n"
 	.string "to get a big house of my own!\p"
 	.string "I'm going to build it on hardened lava!$"
 
-MtChimney_Text_22F921: @ 822F921
+MtChimney_Text_Grunt1Defeat: @ 822F921
 	.string "My dream of a big house…$"
 
-MtChimney_Text_22F93A: @ 822F93A
+MtChimney_Text_Grunt1PostBattle: @ 822F93A
 	.string "A kid like you, you ought to be\n"
 	.string "splashing about in the waves!$"
 
-MtChimney_Text_22F978: @ 822F978
+MtChimney_Text_TeamAquaAlwaysMessingWithPlans: @ 822F978
 	.string "That annoying TEAM AQUA…\n"
 	.string "They always mess with our plans!$"
 
-MtChimney_Text_22F9B2: @ 822F9B2
+MtChimney_Text_MeteoritesPackAmazingPower: @ 822F9B2
 	.string "METEORITES pack amazing power!$"
 
-MtChimney_Text_22F9D1: @ 822F9D1
+MtChimney_Text_YouBetterNotMessWithUs: @ 822F9D1
 	.string "You'd better not mess with us!\p"
 	.string "We're trying to awaken that thing\n"
 	.string "for the benefit of everyone!$"
 
-MtChimney_Text_22FA2F: @ 822FA2F
+MtChimney_Text_AquasNameSimilar: @ 822FA2F
 	.string "We're TEAM MAGMA!\p"
 	.string "They're TEAM AQUA!\p"
 	.string "It totally annoys me that they'd\n"
 	.string "use a name like ours!$"
 
-MtChimney_Text_22FA8B: @ 822FA8B
+MtChimney_Text_DouseThemInFire: @ 822FA8B
 	.string "Yeah!\n"
 	.string "Douse them in fire!$"
 
-MtChimney_Text_22FAA5: @ 822FAA5
+MtChimney_Text_KeepMakingMoreLand: @ 822FAA5
 	.string "We're going to keep making more land!$"
 
-MtChimney_Text_22FACB: @ 822FACB
+MtChimney_Text_Bufoh: @ 822FACB
 	.string "Bufoh!$"
 
-MtChimney_Text_22FAD2: @ 822FAD2
+MtChimney_Text_ArchieGoStopTeamMagma: @ 822FAD2
 	.string "ARCHIE: Grr, {PLAYER}!\n"
 	.string "I should've guessed you'd show up!\p"
 	.string "See for yourself what the fanatics\n"
@@ -679,14 +686,14 @@ MtChimney_Text_22FAD2: @ 822FAD2
 	.string "Doing something like that will cause\n"
 	.string "the volcano's eruption!$"
 
-MtChimney_Text_22FBC7: @ 822FBC7
+MtChimney_Text_ArchieIHaveMyHandsFull: @ 822FBC7
 	.string "ARCHIE: Grrr…\p"
 	.string "I want to stop that MAXIE,\n"
 	.string "but I can't!\p"
 	.string "Not when I have my hands full battling\n"
 	.string "three opponents at once!$"
 
-MtChimney_Text_22FC3D: @ 822FC3D
+MtChimney_Text_ArchieThankYou: @ 822FC3D
 	.string "ARCHIE: {PLAYER}!\n"
 	.string "Thank you!\p"
 	.string "With your help, we thwarted TEAM\n"
@@ -698,161 +705,161 @@ MtChimney_Text_22FC3D: @ 822FC3D
 	.string "our pursuit of TEAM MAGMA.\p"
 	.string "{PLAYER}, we shall meet again!$"
 
-MtChimney_Text_22FD1F: @ 822FD1F
+MtChimney_Text_MagmaOutnumbersUs: @ 822FD1F
 	.string "Darn… TEAM MAGMA outnumbers us!\n"
 	.string "We can't keep up with them!$"
 
-MtChimney_Text_22FD5B: @ 822FD5B
+MtChimney_Text_LessHabitatForWaterPokemon: @ 822FD5B
 	.string "If they expand the land, there'll be\n"
 	.string "less habitats for WATER POKéMON!$"
 
-MtChimney_Text_22FDA1: @ 822FDA1
+MtChimney_Text_MagmasNameSimilar: @ 822FDA1
 	.string "We're TEAM AQUA!\p"
 	.string "They're TEAM MAGMA!\p"
 	.string "It burns me up that they'd use such\n"
 	.string "a confusing name!$"
 
-MtChimney_Text_22FDFC: @ 822FDFC
+MtChimney_Text_Bushaa: @ 822FDFC
 	.string "Bushaa!$"
 
-MtChimney_Text_22FE04: @ 822FE04
+MtChimney_Text_LavaCookiesJust200: @ 822FE04
 	.string "LAVA COOKIES are MT. CHIMNEY's local\n"
 	.string "specialty.\p"
 	.string "Try one. It's just ¥200.$"
 
-MtChimney_Text_22FE4D: @ 822FE4D
+MtChimney_Text_ThankYouDear: @ 822FE4D
 	.string "Thank you, dear!$"
 
-MtChimney_Text_22FE5E: @ 822FE5E
+MtChimney_Text_YouveNotGotTheMoney: @ 822FE5E
 	.string "Oh, dear. You can't buy a thing if\n"
 	.string "you've not got the money.$"
 
-MtChimney_Text_22FE9B: @ 822FE9B
+MtChimney_Text_OhFineThen: @ 822FE9B
 	.string "Oh, fine then.$"
 
-MtChimney_Text_22FEAA: @ 822FEAA
+MtChimney_Text_MetoriteFittedOnMachine: @ 822FEAA
 	.string "A METEORITE is fitted on a mysterious\n"
 	.string "machine…\p"
 	.string "The machine seems to be storing\n"
 	.string "energy in the METEORITE.$"
 
-MtChimney_Text_22FF12: @ 822FF12
+MtChimney_Text_RemoveTheMeteorite: @ 822FF12
 	.string "A METEORITE is fitted on a mysterious\n"
 	.string "machine…\p"
 	.string "Do you want to remove the METEORITE?$"
 
-MtChimney_Text_22FF66: @ 822FF66
+MtChimney_Text_PlayerRemovedMeteorite: @ 822FF66
 	.string "{PLAYER} removed the METEORITE from\n"
 	.string "the mysterious machine.$"
 
-MtChimney_Text_22FF9C: @ 822FF9C
+MtChimney_Text_PlayerLeftMeteorite: @ 822FF9C
 	.string "{PLAYER} left the METEORITE where\n"
 	.string "it was.$"
 
-MtChimney_Text_22FFC0: @ 822FFC0
+MtChimney_Text_MachineMakesNoResponse: @ 822FFC0
 	.string "This mysterious machine…\n"
 	.string "It makes no response whatsoever.$"
 
-MtChimney_Text_22FFFA: @ 822FFFA
+MtChimney_Text_RouteSign: @ 822FFFA
 	.string "{DOWN_ARROW} JAGGED PATH\n"
 	.string "LAVARIDGE TOWN AHEAD$"
 
-MtChimney_Text_23001D: @ 823001D
+MtChimney_Text_ShelbyIntro: @ 823001D
 	.string "I've been to the hot springs and\n"
 	.string "refreshed my tired bones.\l"
 	.string "Right now I'm feeling strong!$"
 
-MtChimney_Text_230076: @ 8230076
+MtChimney_Text_ShelbyDefeat: @ 8230076
 	.string "Oh, my goodness.\n"
 	.string "Now, aren't you something!$"
 
-MtChimney_Text_2300A2: @ 82300A2
+MtChimney_Text_ShelbyPostBattle: @ 82300A2
 	.string "Well, well, I've lost. I can't call\n"
 	.string "myself an EXPERT now, can I?$"
 
-MtChimney_Text_2300E3: @ 82300E3
+MtChimney_Text_ShelbyRegister: @ 82300E3
 	.string "Thank you, child. It was fun, as if\n"
 	.string "I were battling my own grandchild.\p"
 	.string "Please, come see me again for\n"
 	.string "a rematch.$"
 
-MtChimney_Text_230153: @ 8230153
+MtChimney_Text_ShelbyRematchIntro: @ 8230153
 	.string "If you can mesh your heart with those\n"
 	.string "of your POKéMON, why, you should be\l"
 	.string "able to achieve great things.$"
 
-MtChimney_Text_2301BB: @ 82301BB
+MtChimney_Text_ShelbyRematchDefeat: @ 82301BB
 	.string "Oh, my goodness.\n"
 	.string "Now, aren't you something!$"
 
-MtChimney_Text_2301E7: @ 82301E7
+MtChimney_Text_ShelbyPostRematch: @ 82301E7
 	.string "Perhaps your heart has become one\n"
 	.string "with the hearts of your POKéMON.$"
 
-MtChimney_Text_23022A: @ 823022A
+MtChimney_Text_MelissaIntro: @ 823022A
 	.string "I've got the fire in me, baby.\n"
 	.string "I can't stand it! I have to battle!$"
 
-MtChimney_Text_23026D: @ 823026D
+MtChimney_Text_MelissaDefeat: @ 823026D
 	.string "Ooh, that was a scorching-hot match!$"
 
-MtChimney_Text_230292: @ 8230292
+MtChimney_Text_MelissaPostBattle: @ 8230292
 	.string "The heat of MT. CHIMNEY warms\n"
 	.string "me up, baby!$"
 
-MtChimney_Text_2302BD: @ 82302BD
+MtChimney_Text_SheilaIntro: @ 82302BD
 	.string "I've finally made it to MT. CHIMNEY.\n"
 	.string "I want to make my POKéMON battle!$"
 
-MtChimney_Text_230304: @ 8230304
+MtChimney_Text_SheilaDefeat: @ 8230304
 	.string "The way you battle…\n"
 	.string "It's like a MT. CHIMNEY eruption!$"
 
-MtChimney_Text_23033A: @ 823033A
+MtChimney_Text_SheilaPostBattle: @ 823033A
 	.string "Like I said, I've finally made it to\n"
 	.string "MT. CHIMNEY. It would be a shame if\l"
 	.string "I only do a little sightseeing…\p"
 	.string "I want to get in some battles and buy\n"
 	.string "COOKIES as souvenirs.$"
 
-MtChimney_Text_2303DF: @ 82303DF
+MtChimney_Text_ShirleyIntro: @ 82303DF
 	.string "Since I bathed in the hot springs,\n"
 	.string "I've been feeling great!\l"
 	.string "I'm sure I'm going to win!$"
 
-MtChimney_Text_230436: @ 8230436
+MtChimney_Text_ShirleyDefeat: @ 8230436
 	.string "Yowch!\n"
 	.string "I'm getting a chill out of the water.$"
 
-MtChimney_Text_230463: @ 8230463
+MtChimney_Text_ShirleyPostBattle: @ 8230463
 	.string "I'll have to take another dip in the\n"
 	.string "hot springs. Want to join me?\p"
 	.string "Just joking!$"
 
-MtChimney_Text_2304B3: @ 82304B3
+MtChimney_Text_SawyerIntro: @ 82304B3
 	.string "This is one fine mountain! Plenty of\n"
 	.string "hot people around for company!$"
 
-MtChimney_Text_2304F7: @ 82304F7
+MtChimney_Text_SawyerDefeat: @ 82304F7
 	.string "Oh, you're a real firebrand, too!$"
 
-MtChimney_Text_230519: @ 8230519
+MtChimney_Text_SawyerPostBattle: @ 8230519
 	.string "I think I need a dip in LAVARIDGE\n"
 	.string "HOT SPRING with the locals!$"
 
-MtChimney_Text_230557: @ 8230557
+MtChimney_Text_SawyerRegister: @ 8230557
 	.string "I like little fireballs like you.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MtChimney_Text_23059C: @ 823059C
+MtChimney_Text_SawyerRematchIntro: @ 823059C
 	.string "I'm happily surrounded by hot people\n"
 	.string "around these parts. I won't lose!$"
 
-MtChimney_Text_2305E3: @ 82305E3
+MtChimney_Text_SawyerRematchDefeat: @ 82305E3
 	.string "Gosh, you're still the same\n"
 	.string "firebrand as before!$"
 
-MtChimney_Text_230614: @ 8230614
+MtChimney_Text_SawyerPostRematch: @ 8230614
 	.string "Actually, it really is hot here.\n"
 	.string "I'm overdressed for these parts.$"
 
diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json
index 1b0efd3d9..49d102878 100644
--- a/data/maps/MtChimney_CableCarStation/map.json
+++ b/data/maps/MtChimney_CableCarStation/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtChimney_CableCarStation_EventScript_22AC4B",
+      "script": "MtChimney_CableCarStation_EventScript_Attendant",
       "flag": "0"
     },
     {
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 4b8cd3fe5..32064ad04 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -1,26 +1,26 @@
 MtChimney_CableCarStation_MapScripts:: @ 822ABFA
 	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_OnFrame
 	.byte 0
 
 MtChimney_CableCarStation_OnTransition: @ 822AC05
 	compare VAR_CABLE_CAR_STATION_STATE, 1
-	call_if_eq MtChimney_CableCarStation_EventScript_22AC11
+	call_if_eq MtChimney_CableCarStation_EventScript_MoveAttendantAside
 	end
 
-MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
+MtChimney_CableCarStation_EventScript_MoveAttendantAside:: @ 822AC11
 	setobjectxyperm 1, 5, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
-	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27
+MtChimney_CableCarStation_OnFrame: @ 822AC1D
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_ExitCableCar
 	.2byte 0
 
-MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
+MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4
-	applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
+	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar
+	applymovement 1, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar
 	waitmovement 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
@@ -28,21 +28,21 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
 	releaseall
 	end
 
-MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B
+MtChimney_CableCarStation_EventScript_Attendant:: @ 822AC4B
 	lock
 	faceplayer
-	msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C
-	compare VAR_RESULT, 0
-	goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B
+	msgbox MtChimney_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MtChimney_CableCarStation_EventScript_RideCableCar
+	compare VAR_RESULT, NO
+	goto_if_eq MtChimney_CableCarStation_EventScript_DeclineRide
 	end
 
-MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
-	msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT
+MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C
+	msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, MtChimney_CableCarStation_Movement_22ACA5
-	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF
+	applymovement 1, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar
+	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar
 	waitmovement 0
 	setvar VAR_0x8004, 1
 	setvar VAR_CABLE_CAR_STATION_STATE, 2
@@ -53,46 +53,46 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
 	release
 	end
 
-MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B
-	msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT
+MtChimney_CableCarStation_EventScript_DeclineRide:: @ 822AC9B
+	msgbox MtChimney_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5
+MtChimney_CableCarStation_Movement_LeadPlayerToCableCar: @ 822ACA5
 	walk_up
 	walk_up
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA
+MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822ACAA
 	delay_16
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF
+MtChimney_CableCarStation_Movement_BoardCableCar: @ 822ACAF
 	walk_up
 	walk_up
 	walk_up
 	delay_16
 	step_end
 
-MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4
+MtChimney_CableCarStation_Movement_ExitCableCar: @ 822ACB4
 	walk_down
 	walk_down
 	walk_down
 	delay_16
 	step_end
 
-MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9
+MtChimney_CableCarStation_Text_CableCarReadyGetOn: @ 822ACB9
 	.string "The CABLE CAR is ready to go down.\n"
 	.string "Would you like to be on it?$"
 
-MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8
+MtChimney_CableCarStation_Text_StepThisWay: @ 822ACF8
 	.string "Please step this way.$"
 
-MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E
+MtChimney_CableCarStation_Text_RideAnotherTime: @ 822AD0E
 	.string "Please ride with us another time.$"
 
diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json
index 8b2e146f5..2e03ae728 100644
--- a/data/maps/MtPyre_1F/map.json
+++ b/data/maps/MtPyre_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F3F",
+      "script": "MtPyre_1F_EventScript_CleanseTagWoman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F78",
+      "script": "MtPyre_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F81",
+      "script": "MtPyre_1F_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
index a06f34a29..2574e6851 100644
--- a/data/maps/MtPyre_1F/scripts.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -1,48 +1,48 @@
 MtPyre_1F_MapScripts:: @ 8230F3E
 	.byte 0
 
-MtPyre_1F_EventScript_230F3F:: @ 8230F3F
+MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_230F6E
-	msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag
+	msgbox MtPyre_1F_Text_TakeThisForYourOwnGood, MSGBOX_DEFAULT
 	giveitem_std ITEM_CLEANSE_TAG
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 
-MtPyre_1F_EventScript_230F6E:: @ 8230F6E
-	msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT
+MtPyre_1F_EventScript_ReceivedCleanseTag:: @ 8230F6E
+	msgbox MtPyre_1F_Text_ExplainCleanseTag, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_1F_EventScript_230F78:: @ 8230F78
-	msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC
+MtPyre_1F_EventScript_PokefanF:: @ 8230F78
+	msgbox MtPyre_1F_Text_ComeToPayRespects, MSGBOX_NPC
 	end
 
-MtPyre_1F_EventScript_230F81:: @ 8230F81
-	msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC
+MtPyre_1F_EventScript_Man:: @ 8230F81
+	msgbox MtPyre_1F_Text_RestingPlaceOfZigzagoon, MSGBOX_NPC
 	end
 
-MtPyre_1F_Text_230F8A: @ 8230F8A
+MtPyre_1F_Text_TakeThisForYourOwnGood: @ 8230F8A
 	.string "All sorts of beings wander the slopes\n"
 	.string "of MT. PYRE…\p"
 	.string "There is no telling what may happen.\n"
 	.string "Take this. It's for your own good.$"
 
-MtPyre_1F_Text_231005: @ 8231005
+MtPyre_1F_Text_ExplainCleanseTag: @ 8231005
 	.string "Have a POKéMON hold that\n"
 	.string "CLEANSE TAG.\p"
 	.string "It will help ward off wild POKéMON.$"
 
-MtPyre_1F_Text_23104F: @ 823104F
+MtPyre_1F_Text_ComeToPayRespects: @ 823104F
 	.string "Did you come to pay your respect\n"
 	.string "to the spirits of departed POKéMON?\p"
 	.string "You must care for your POKéMON a lot.$"
 
-MtPyre_1F_Text_2310BA: @ 82310BA
+MtPyre_1F_Text_RestingPlaceOfZigzagoon: @ 82310BA
 	.string "This is the final resting place of my\n"
 	.string "ZIGZAGOON. I cherished it…$"
 
diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json
index 64657cb0d..e6882c311 100644
--- a/data/maps/MtPyre_2F/map.json
+++ b/data/maps/MtPyre_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_231128",
+      "script": "MtPyre_2F_EventScript_Mark",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_2F_EventScript_231116",
+      "script": "MtPyre_2F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_2F_EventScript_23111F",
+      "script": "MtPyre_2F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MtPyre_2F_EventScript_23115A",
+      "script": "MtPyre_2F_EventScript_Dez",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MtPyre_2F_EventScript_23113F",
+      "script": "MtPyre_2F_EventScript_Luke",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_23118C",
+      "script": "MtPyre_2F_EventScript_Zander",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_231175",
+      "script": "MtPyre_2F_EventScript_Leah",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index be98ac8e7..52c1a154c 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -9,83 +9,83 @@ MtPyre_2F_SetHoleWarp: @ 823110B
 	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
 	end
 
-MtPyre_2F_EventScript_231116:: @ 8231116
-	msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC
+MtPyre_2F_EventScript_Woman:: @ 8231116
+	msgbox MtPyre_2F_Text_MemoriesOfSkitty, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_23111F:: @ 823111F
-	msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC
+MtPyre_2F_EventScript_PokefanM:: @ 823111F
+	msgbox MtPyre_2F_Text_TumbledFromFloorAbove, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_231128:: @ 8231128
-	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
-	msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Mark:: @ 8231128
+	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_MarkIntro, MtPyre_2F_Text_MarkDefeat
+	msgbox MtPyre_2F_Text_MarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23113F:: @ 823113F
-	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
-	msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Luke:: @ 823113F
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_LukeIntro, MtPyre_2F_Text_LukeDefeat, MtPyre_2F_Text_LukeNotEnoughMons
+	msgbox MtPyre_2F_Text_LukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23115A:: @ 823115A
-	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
-	msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Dez:: @ 823115A
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_DezIntro, MtPyre_2F_Text_DezDefeat, MtPyre_2F_Text_DezNotEnoughMons
+	msgbox MtPyre_2F_Text_DezPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_231175:: @ 8231175
-	trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
-	msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Leah:: @ 8231175
+	trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_LeahIntro, MtPyre_2F_Text_LeahDefeat
+	msgbox MtPyre_2F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23118C:: @ 823118C
-	trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
-	msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Zander:: @ 823118C
+	trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_ZanderIntro, MtPyre_2F_Text_ZanderDefeat
+	msgbox MtPyre_2F_Text_ZanderPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_Text_2311A3: @ 82311A3
+MtPyre_2F_Text_MemoriesOfSkitty: @ 82311A3
 	.string "Memories of my darling SKITTY…\n"
 	.string "My eyes overflow thinking about it.$"
 
-MtPyre_2F_Text_2311E6: @ 82311E6
+MtPyre_2F_Text_TumbledFromFloorAbove: @ 82311E6
 	.string "Ooch, ouch… There are holes in the\n"
 	.string "ground here and there.\p"
 	.string "I didn't notice and took a tumble from\n"
 	.string "the floor above.$"
 
-MtPyre_2F_Text_231258: @ 8231258
+MtPyre_2F_Text_MarkIntro: @ 8231258
 	.string "Hey! Are you searching for POKéMON?\n"
 	.string "You came along after me! You're rude!$"
 
-MtPyre_2F_Text_2312A2: @ 82312A2
+MtPyre_2F_Text_MarkDefeat: @ 82312A2
 	.string "Ayieeeeh!\n"
 	.string "I'm sorry, forgive me, please!$"
 
-MtPyre_2F_Text_2312CB: @ 82312CB
+MtPyre_2F_Text_MarkPostBattle: @ 82312CB
 	.string "People don't come here often, so\n"
 	.string "I thought there'd be rare POKéMON.$"
 
-MtPyre_2F_Text_23130F: @ 823130F
+MtPyre_2F_Text_LukeIntro: @ 823130F
 	.string "LUKE: We're here on a dare.\p"
 	.string "Heheh, if I show her how cool I am,\n"
 	.string "she'll fall for me. I know it!\p"
 	.string "I know! I'll cream you and show her\n"
 	.string "how cool I am!$"
 
-MtPyre_2F_Text_2313A1: @ 82313A1
+MtPyre_2F_Text_LukeDefeat: @ 82313A1
 	.string "LUKE: Whoopsie!$"
 
-MtPyre_2F_Text_2313B1: @ 82313B1
+MtPyre_2F_Text_LukePostBattle: @ 82313B1
 	.string "LUKE: Well, we lost but that's okay!\n"
 	.string "I'm right here by your side.\l"
 	.string "We'll make it through this dare!$"
 
-MtPyre_2F_Text_231414: @ 8231414
+MtPyre_2F_Text_LukeNotEnoughMons: @ 8231414
 	.string "LUKE: If you want to take me on,\n"
 	.string "bring some more POKéMON.\p"
 	.string "If you don't, I won't be able to show\n"
 	.string "off to my girl how cool I am!$"
 
-MtPyre_2F_Text_231492: @ 8231492
+MtPyre_2F_Text_DezIntro: @ 8231492
 	.string "DEZ: I came here on a dare with my\n"
 	.string "boyfriend.\p"
 	.string "It's really scary, but I'm with my\n"
@@ -93,42 +93,42 @@ MtPyre_2F_Text_231492: @ 8231492
 	.string "I know! I'll get my boyfriend to look\n"
 	.string "cool by beating you!$"
 
-MtPyre_2F_Text_231534: @ 8231534
+MtPyre_2F_Text_DezDefeat: @ 8231534
 	.string "DEZ: Waaaah! I'm scared!$"
 
-MtPyre_2F_Text_23154D: @ 823154D
+MtPyre_2F_Text_DezPostBattle: @ 823154D
 	.string "DEZ: We're lovey-dovey, so we don't\n"
 	.string "care if we lose!$"
 
-MtPyre_2F_Text_231582: @ 8231582
+MtPyre_2F_Text_DezNotEnoughMons: @ 8231582
 	.string "DEZ: If you want to challenge us, you\n"
 	.string "should bring at least two POKéMON.\p"
 	.string "My boyfriend's strong.\n"
 	.string "Just one POKéMON won't do at all.$"
 
-MtPyre_2F_Text_231604: @ 8231604
+MtPyre_2F_Text_LeahIntro: @ 8231604
 	.string "You are an unfamiliar sight…\n"
 	.string "Depart before anything befalls you!$"
 
-MtPyre_2F_Text_231645: @ 8231645
+MtPyre_2F_Text_LeahDefeat: @ 8231645
 	.string "Hmm…\n"
 	.string "You're durable.$"
 
-MtPyre_2F_Text_23165A: @ 823165A
+MtPyre_2F_Text_LeahPostBattle: @ 823165A
 	.string "Our family has been TRAINERS here\n"
 	.string "since my great-grandmother's time…\p"
 	.string "It is my duty to protect this\n"
 	.string "mountain…$"
 
-MtPyre_2F_Text_2316C7: @ 82316C7
+MtPyre_2F_Text_ZanderIntro: @ 82316C7
 	.string "Kiyaaaaah!\n"
 	.string "I'm terrified!$"
 
-MtPyre_2F_Text_2316E1: @ 82316E1
+MtPyre_2F_Text_ZanderDefeat: @ 82316E1
 	.string "Nooooooo!\n"
 	.string "I lost my wits!$"
 
-MtPyre_2F_Text_2316FB: @ 82316FB
+MtPyre_2F_Text_ZanderPostBattle: @ 82316FB
 	.string "I get freaked out every time I see\n"
 	.string "anything move…\p"
 	.string "I shouldn't have come here to train…$"
diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json
index 3e06adf8c..058c4db0a 100644
--- a/data/maps/MtPyre_3F/map.json
+++ b/data/maps/MtPyre_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_231753",
+      "script": "MtPyre_3F_EventScript_William",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_23176A",
+      "script": "MtPyre_3F_EventScript_Kayla",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_231781",
+      "script": "MtPyre_3F_EventScript_Gabrielle",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index 558ab9999..02cea0c22 100644
--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -1,74 +1,74 @@
 MtPyre_3F_MapScripts:: @ 8231752
 	.byte 0
 
-MtPyre_3F_EventScript_231753:: @ 8231753
-	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
-	msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_William:: @ 8231753
+	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_WilliamIntro, MtPyre_3F_Text_WilliamDefeat
+	msgbox MtPyre_3F_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_23176A:: @ 823176A
-	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
-	msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_Kayla:: @ 823176A
+	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_KaylaIntro MtPyre_3F_Text_KaylaDefeat
+	msgbox MtPyre_3F_Text_KaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_231781:: @ 8231781
-	trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
+MtPyre_3F_EventScript_Gabrielle:: @ 8231781
+	trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleIntro, MtPyre_3F_Text_GabrielleDefeat, MtPyre_3F_EventScript_RegisterGabrielle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtPyre_3F_EventScript_2317CC
-	msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtPyre_3F_EventScript_RematchGabrielle
+	msgbox MtPyre_3F_Text_GabriellePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_3F_EventScript_2317AD:: @ 82317AD
-	special sub_80B4808
+MtPyre_3F_EventScript_RegisterGabrielle:: @ 82317AD
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT
+	msgbox MtPyre_3F_Text_GabrielleRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_GABRIELLE_1
 	release
 	end
 
-MtPyre_3F_EventScript_2317CC:: @ 82317CC
-	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
-	msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_RematchGabrielle:: @ 82317CC
+	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleRematchIntro, MtPyre_3F_Text_GabrielleRematchDefeat
+	msgbox MtPyre_3F_Text_GabriellePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_Text_2317E3: @ 82317E3
+MtPyre_3F_Text_WilliamIntro: @ 82317E3
 	.string "The rich atmosphere of the mountain\n"
 	.string "has elevated my psychic power!\p"
 	.string "A mere child like you…\n"
 	.string "You dream of winning?$"
 
-MtPyre_3F_Text_231853: @ 8231853
+MtPyre_3F_Text_WilliamDefeat: @ 8231853
 	.string "I drown in self-pity…$"
 
-MtPyre_3F_Text_231869: @ 8231869
+MtPyre_3F_Text_WilliamPostBattle: @ 8231869
 	.string "My psychic powers have surely\n"
 	.string "grown several times, but…$"
 
-MtPyre_3F_Text_2318A1: @ 82318A1
+MtPyre_3F_Text_KaylaIntro: @ 82318A1
 	.string "Ahahahaha!\p"
 	.string "This is no place for children, least\n"
 	.string "of all you!$"
 
-MtPyre_3F_Text_2318DD: @ 82318DD
+MtPyre_3F_Text_KaylaDefeat: @ 82318DD
 	.string "I lost that cleanly…$"
 
-MtPyre_3F_Text_2318F2: @ 82318F2
+MtPyre_3F_Text_KaylaPostBattle: @ 82318F2
 	.string "This means my training is still not\n"
 	.string "enough…\p"
 	.string "I've got to keep working toward the\n"
 	.string "summit…\p"
 	.string "Go, me!$"
 
-MtPyre_3F_Text_231952: @ 8231952
+MtPyre_3F_Text_GabrielleIntro: @ 8231952
 	.string "Why have you come here?$"
 
-MtPyre_3F_Text_23196A: @ 823196A
+MtPyre_3F_Text_GabrielleDefeat: @ 823196A
 	.string "That was amazing!\n"
 	.string "You're a very special TRAINER.$"
 
-MtPyre_3F_Text_23199B: @ 823199B
+MtPyre_3F_Text_GabriellePostBattle: @ 823199B
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
@@ -76,21 +76,21 @@ MtPyre_3F_Text_23199B: @ 823199B
 	.string "They are all to be equally cherished.\n"
 	.string "Please remember that.$"
 
-MtPyre_3F_Text_231A49: @ 8231A49
+MtPyre_3F_Text_GabrielleRegister: @ 8231A49
 	.string "I would like to see your POKéMON\n"
 	.string "when they grow up some more…\p"
 	.string "Please, I need to see your POKéNAV.$"
 
-MtPyre_3F_Text_231AAB: @ 8231AAB
+MtPyre_3F_Text_GabrielleRematchIntro: @ 8231AAB
 	.string "Oh, it's you…\p"
 	.string "Have you come to show me your grown\n"
 	.string "POKéMON?$"
 
-MtPyre_3F_Text_231AE6: @ 8231AE6
+MtPyre_3F_Text_GabrielleRematchDefeat: @ 8231AE6
 	.string "How amazing!\n"
 	.string "You are a special person.$"
 
-MtPyre_3F_Text_231B0D: @ 8231B0D
+MtPyre_3F_Text_GabriellePostRematch: @ 8231B0D
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json
index 782a6221e..5c3d72ef8 100644
--- a/data/maps/MtPyre_4F/map.json
+++ b/data/maps/MtPyre_4F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_4F_EventScript_231C6E",
+      "script": "MtPyre_4F_EventScript_Tasha",
       "flag": "0"
     },
     {
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc
index 27883c8ed..683b38607 100644
--- a/data/maps/MtPyre_4F/scripts.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -1,20 +1,22 @@
 MtPyre_4F_MapScripts:: @ 8231BC8
 	.byte 0
 
-MtPyre_5F_EventScript_231BC9:: @ 8231BC9
-	trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08
-	msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE
+@ Seems like the scripts for the 4F and 5F were swapped
+
+MtPyre_5F_EventScript_Atsushi:: @ 8231BC9
+	trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_AtsushiIntro, MtPyre_5F_Text_AtsushiDefeat
+	msgbox MtPyre_5F_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_5F_Text_231BE0: @ 8231BE0
+MtPyre_5F_Text_AtsushiIntro: @ 8231BE0
 	.string "Teacher…\n"
 	.string "Please watch over my progress!$"
 
-MtPyre_5F_Text_231C08: @ 8231C08
+MtPyre_5F_Text_AtsushiDefeat: @ 8231C08
 	.string "Teacher…\n"
 	.string "Please forgive me!$"
 
-MtPyre_5F_Text_231C24: @ 8231C24
+MtPyre_5F_Text_AtsushiPostBattle: @ 8231C24
 	.string "Until I improve, my teacher, who rests\n"
 	.string "here, will never find true peace…$"
 
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json
index edd3544ca..1f814bda8 100644
--- a/data/maps/MtPyre_5F/map.json
+++ b/data/maps/MtPyre_5F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_5F_EventScript_231BC9",
+      "script": "MtPyre_5F_EventScript_Atsushi",
       "flag": "0"
     },
     {
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc
index cbd3b3afa..f27370d7c 100644
--- a/data/maps/MtPyre_5F/scripts.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -1,21 +1,23 @@
 MtPyre_5F_MapScripts:: @ 8231C6D
 	.byte 0
 
-MtPyre_4F_EventScript_231C6E:: @ 8231C6E
-	trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB
-	msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE
+@ Seems like the scripts for the 4F and 5F were swapped
+
+MtPyre_4F_EventScript_Tasha:: @ 8231C6E
+	trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_TashaIntro, MtPyre_4F_Text_TashaDefeat
+	msgbox MtPyre_4F_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_4F_Text_231C85: @ 8231C85
+MtPyre_4F_Text_TashaIntro: @ 8231C85
 	.string "I love all things horrifying…\n"
 	.string "It's like a disease…\p"
 	.string "When I'm here…\n"
 	.string "I shiver with fear…$"
 
-MtPyre_4F_Text_231CDB: @ 8231CDB
+MtPyre_4F_Text_TashaDefeat: @ 8231CDB
 	.string "Losing, I dislike…$"
 
-MtPyre_4F_Text_231CEE: @ 8231CEE
+MtPyre_4F_Text_TashaPostBattle: @ 8231CEE
 	.string "I want to see dreadful things…\n"
 	.string "I can't leave…\p"
 	.string "Stay…\n"
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
index 3c889a7e0..c2de09055 100644
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_6F_EventScript_231D3B",
+      "script": "MtPyre_6F_EventScript_Valerie",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_6F_EventScript_231D9D",
+      "script": "MtPyre_6F_EventScript_Cedric",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index f59edd7b1..e3bdd928e 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -1,69 +1,69 @@
 MtPyre_6F_MapScripts:: @ 8231D3A
 	.byte 0
 
-MtPyre_6F_EventScript_231D3B:: @ 8231D3B
-	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
+MtPyre_6F_EventScript_Valerie:: @ 8231D3B
+	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtPyre_6F_EventScript_231D86
-	msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtPyre_6F_EventScript_RematchValerie
+	msgbox MtPyre_6F_Text_ValeriePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_6F_EventScript_231D67:: @ 8231D67
-	special sub_80B4808
+MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT
+	msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_VALERIE_1
 	release
 	end
 
-MtPyre_6F_EventScript_231D86:: @ 8231D86
-	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
-	msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_RematchValerie:: @ 8231D86
+	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat
+	msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_EventScript_231D9D:: @ 8231D9D
-	trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
-	msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_Cedric:: @ 8231D9D
+	trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat
+	msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_Text_231DB4: @ 8231DB4
+MtPyre_6F_Text_ValerieIntro: @ 8231DB4
 	.string "When I'm here…\n"
 	.string "A curious power flows into me…$"
 
-MtPyre_6F_Text_231DE2: @ 8231DE2
+MtPyre_6F_Text_ValerieDefeat: @ 8231DE2
 	.string "The power is ebbing away…$"
 
-MtPyre_6F_Text_231DFC: @ 8231DFC
+MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC
 	.string "Perhaps the power is from the spirits\n"
 	.string "of POKéMON in fitful sleep here…$"
 
-MtPyre_6F_Text_231E43: @ 8231E43
+MtPyre_6F_Text_ValerieRegister: @ 8231E43
 	.string "Fufufu… I lost the match, but…\n"
 	.string "I have this little ability…\p"
 	.string "Without ever laying my hands on\n"
 	.string "your POKéNAV… Hiyah!$"
 
-MtPyre_6F_Text_231EB3: @ 8231EB3
+MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3
 	.string "Behind you…\n"
 	.string "What is it…$"
 
-MtPyre_6F_Text_231ECB: @ 8231ECB
+MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB
 	.string "Something faded away…$"
 
-MtPyre_6F_Text_231EE1: @ 8231EE1
+MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1
 	.string "The POKéMON at rest here…\n"
 	.string "Sometimes, they play…$"
 
-MtPyre_6F_Text_231F11: @ 8231F11
+MtPyre_6F_Text_CedricIntro: @ 8231F11
 	.string "Have you lost your bearings?\n"
 	.string "Have no fear for I am here!$"
 
-MtPyre_6F_Text_231F4A: @ 8231F4A
+MtPyre_6F_Text_CedricDefeat: @ 8231F4A
 	.string "Weren't you lost?$"
 
-MtPyre_6F_Text_231F5C: @ 8231F5C
+MtPyre_6F_Text_CedricPostBattle: @ 8231F5C
 	.string "I had this feeling that a lost TRAINER\n"
 	.string "would be panicked and easy to beat.\p"
 	.string "It's dirty and I won't try it again…$"
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index c7653bbd1..2fbcd5673 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -72,7 +72,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     },
     {
       "type": "trigger",
@@ -81,7 +81,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     },
     {
       "type": "trigger",
@@ -90,7 +90,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FF2"
+      "script": "MtPyre_Exterior_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -99,7 +99,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FF2"
+      "script": "MtPyre_Exterior_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -108,7 +108,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index b66c50374..11d3f987c 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -3,25 +3,25 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC
 	.byte 0
 
 MtPyre_Exterior_OnTransition: @ 8231FD2
-	call MtPyre_Exterior_EventScript_231FD8
+	call MtPyre_Exterior_EventScript_CheckEnterFromSummit
 	end
 
-MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8
+MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 12
-	goto_if_lt MtPyre_Exterior_EventScript_231FE9
+	goto_if_lt MtPyre_Exterior_EventScript_EnterFromSummit
 	return
 
-MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9
+MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
 	setweather WEATHER_FOG_1
 	return
 
-MtPyre_Exterior_EventScript_231FED:: @ 8231FED
+MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
 	setweather WEATHER_FOG_1
 	doweather
 	end
 
-MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2
+MtPyre_Exterior_EventScript_SunTrigger:: @ 8231FF2
 	setweather WEATHER_SUNNY
 	doweather
 	end
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
index 78780ba19..f032fbbdf 100644
--- a/data/maps/MtPyre_Summit/map.json
+++ b/data/maps/MtPyre_Summit/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_Summit_EventScript_23213C",
+      "script": "MtPyre_Summit_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_Summit_EventScript_2321A2",
+      "script": "MtPyre_Summit_EventScript_OldLady",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_2323FD",
+      "script": "MtPyre_Summit_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_232414",
+      "script": "MtPyre_Summit_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_23242B",
+      "script": "MtPyre_Summit_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_232442",
+      "script": "MtPyre_Summit_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -150,7 +150,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
-      "script": "MtPyre_Summit_EventScript_232018"
+      "script": "MtPyre_Summit_EventScript_TeamAquaTrigger0"
     },
     {
       "type": "trigger",
@@ -159,7 +159,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
-      "script": "MtPyre_Summit_EventScript_232024"
+      "script": "MtPyre_Summit_EventScript_TeamAquaTrigger1"
     },
     {
       "type": "trigger",
@@ -168,7 +168,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
-      "script": "MtPyre_Summit_EventScript_232030"
+      "script": "MtPyre_Summit_EventScript_TeamAquaTrigger2"
     },
     {
       "type": "trigger",
@@ -177,7 +177,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
-      "script": "MtPyre_Summit_EventScript_2321EC"
+      "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger0"
     },
     {
       "type": "trigger",
@@ -186,7 +186,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
-      "script": "MtPyre_Summit_EventScript_2321F8"
+      "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger1"
     },
     {
       "type": "trigger",
@@ -195,7 +195,7 @@
       "elevation": 3,
       "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
-      "script": "MtPyre_Summit_EventScript_232204"
+      "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger2"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 4049a1f29..577b87076 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -4,33 +4,33 @@ MtPyre_Summit_MapScripts:: @ 8231FF7
 
 MtPyre_Summit_OnTransition: @ 8231FFD
 	compare VAR_MT_PYRE_STATE, 2
-	call_if_eq MtPyre_Summit_EventScript_232009
+	call_if_eq MtPyre_Summit_EventScript_SetArchieMaxiePositions
 	end
 
-MtPyre_Summit_EventScript_232009:: @ 8232009
+MtPyre_Summit_EventScript_SetArchieMaxiePositions:: @ 8232009
 	setobjectxyperm 8, 23, 6
 	setobjectxyperm 2, 22, 6
 	end
 
-MtPyre_Summit_EventScript_232018:: @ 8232018
+MtPyre_Summit_EventScript_TeamAquaTrigger0:: @ 8232018
 	lockall
 	setvar VAR_0x8008, 0
-	goto MtPyre_Summit_EventScript_23203C
+	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_232024:: @ 8232024
+MtPyre_Summit_EventScript_TeamAquaTrigger1:: @ 8232024
 	lockall
 	setvar VAR_0x8008, 1
-	goto MtPyre_Summit_EventScript_23203C
+	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_232030:: @ 8232030
+MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030
 	lockall
 	setvar VAR_0x8008, 2
-	goto MtPyre_Summit_EventScript_23203C
+	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_23203C:: @ 823203C
+MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
 	playbgm MUS_AQA_0, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
@@ -38,12 +38,12 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	waitmovement 0
 	delay 50
 	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_2320E0
+	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer0
 	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_2320EB
+	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer1
 	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_2320EC
-	msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT
+	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2
+	msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
 	removeobject 2
@@ -58,164 +58,165 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	delay 20
 	setvar VAR_MT_PYRE_STATE, 1
 	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_2320F7
+	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_23210C
+	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_232117
-	msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT
+	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2
+	msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_MAGMA_EMBLEM
 	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
 	releaseall
 	end
 
-MtPyre_Summit_EventScript_2320E0:: @ 82320E0
-	applymovement 2, MtPyre_Summit_Movement_232136
+MtPyre_Summit_EventScript_ArchieFacePlayer0:: @ 82320E0
+	applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer0
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_2320EB:: @ 82320EB
+@ Archie is already facing player
+MtPyre_Summit_EventScript_ArchieFacePlayer1:: @ 82320EB
 	return
 
-MtPyre_Summit_EventScript_2320EC:: @ 82320EC
-	applymovement 2, MtPyre_Summit_Movement_232139
+MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC
+	applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer2
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_2320F7:: @ 82320F7
-	applymovement 3, MtPyre_Summit_Movement_23212C
+MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7
+	applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer0
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_23210C:: @ 823210C
-	applymovement 3, MtPyre_Summit_Movement_232130
+MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C
+	applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer1
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_232117:: @ 8232117
-	applymovement 3, MtPyre_Summit_Movement_232132
+MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117
+	applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer2
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-MtPyre_Summit_Movement_23212C: @ 823212C
+MtPyre_Summit_Movement_OldLadyApproachPlayer0: @ 823212C
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_232130: @ 8232130
+MtPyre_Summit_Movement_OldLadyApproachPlayer1: @ 8232130
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_232132: @ 8232132
+MtPyre_Summit_Movement_OldLadyApproachPlayer2: @ 8232132
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_232136: @ 8232136
+MtPyre_Summit_Movement_ArchieFacePlayer0: @ 8232136
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_232139: @ 8232139
+MtPyre_Summit_Movement_ArchieFacePlayer2: @ 8232139
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_EventScript_23213C:: @ 823213C
+MtPyre_Summit_EventScript_OldMan:: @ 823213C
 	lock
 	faceplayer
-	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_232167
-	msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq MtPyre_Summit_EventScript_232187
-	compare VAR_RESULT, 0
-	call_if_eq MtPyre_Summit_EventScript_232190
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_OldManAfterRayquaza
+	msgbox MtPyre_Summit_Text_WillYouHearOutMyTale, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq MtPyre_Summit_EventScript_OldManTale
+	compare VAR_RESULT, NO
+	call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale
 	release
 	end
 
-MtPyre_Summit_EventScript_232167:: @ 8232167
-	msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq MtPyre_Summit_EventScript_232199
-	compare VAR_RESULT, 0
-	call_if_eq MtPyre_Summit_EventScript_232190
+MtPyre_Summit_EventScript_OldManAfterRayquaza:: @ 8232167
+	msgbox MtPyre_Summit_Text_HearTheNewLegendOfHoenn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq MtPyre_Summit_EventScript_OldManNewTale
+	compare VAR_RESULT, NO
+	call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale
 	release
 	end
 
-MtPyre_Summit_EventScript_232187:: @ 8232187
-	msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_OldManTale:: @ 8232187
+	msgbox MtPyre_Summit_Text_GroudonKyogreTale, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_232190:: @ 8232190
-	msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_DeclineOldManTale:: @ 8232190
+	msgbox MtPyre_Summit_Text_WellThatTooIsFine, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_232199:: @ 8232199
-	msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_OldManNewTale:: @ 8232199
+	msgbox MtPyre_Summit_Text_HoennTrioTale, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_2321A2:: @ 82321A2
+MtPyre_Summit_EventScript_OldLady:: @ 82321A2
 	lock
 	faceplayer
-	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
+	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned
 	compare VAR_MT_PYRE_STATE, 3
-	call_if_ge MtPyre_Summit_EventScript_2321CB
-	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
-	msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
+	call_if_ge MtPyre_Summit_EventScript_OldLadyOrbsReturned
+	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_OldLadyLegendariesAwake
+	msgbox MtPyre_Summit_Text_OrbsHaveBeenTaken, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_Summit_EventScript_2321CB:: @ 82321CB
-	msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_OldLadyOrbsReturned:: @ 82321CB
+	msgbox MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs, MSGBOX_DEFAULT
 	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 
-MtPyre_Summit_EventScript_2321D8:: @ 82321D8
-	msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_OldLadyLegendariesAwake:: @ 82321D8
+	msgbox MtPyre_Summit_Text_GroudonKyogreAwakened, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_Summit_EventScript_2321E2:: @ 82321E2
-	msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT
+MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned:: @ 82321E2
+	msgbox MtPyre_Summit_Text_SuperAncientPokemonTaughtUs, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_Summit_EventScript_2321EC:: @ 82321EC
+MtPyre_Summit_EventScript_ArchieMaxieTrigger0:: @ 82321EC
 	lockall
 	setvar VAR_0x8008, 0
-	goto MtPyre_Summit_EventScript_232210
+	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_2321F8:: @ 82321F8
+MtPyre_Summit_EventScript_ArchieMaxieTrigger1:: @ 82321F8
 	lockall
 	setvar VAR_0x8008, 1
-	goto MtPyre_Summit_EventScript_232210
+	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_232204:: @ 8232204
+MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204
 	lockall
 	setvar VAR_0x8008, 2
-	goto MtPyre_Summit_EventScript_232210
+	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_232210:: @ 8232210
+MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 60
 	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_2322C4
+	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit0
 	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_2322DD
+	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit1
 	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_2322F6
+	call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit2
 	playse SE_PIN
 	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -223,22 +224,22 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_23230F
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_232328
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_232341
-	msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer2
+	msgbox MtPyre_Summit_Text_MaxieSilence, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq MtPyre_Summit_EventScript_23235A
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie0
 	compare VAR_0x8008, 1
-	call_if_eq MtPyre_Summit_EventScript_232376
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie1
 	compare VAR_0x8008, 2
-	call_if_eq MtPyre_Summit_EventScript_232392
+	call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie2
 	delay 30
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
+	applymovement 2, MtPyre_Summit_Movement_MaxieExit
+	applymovement 8, MtPyre_Summit_Movement_ArchieExit
 	waitmovement 0
 	removeobject 2
 	removeobject 8
@@ -246,85 +247,85 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	releaseall
 	end
 
-MtPyre_Summit_EventScript_2322C4:: @ 82322C4
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323C4
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0
+	applymovement 2, MtPyre_Summit_Movement_MaxieExit
+	applymovement 8, MtPyre_Summit_Movement_ArchieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_2322DD:: @ 82322DD
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323CB
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1
+	applymovement 2, MtPyre_Summit_Movement_MaxieExit
+	applymovement 8, MtPyre_Summit_Movement_ArchieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_2322F6:: @ 82322F6
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323D2
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2
+	applymovement 2, MtPyre_Summit_Movement_MaxieExit
+	applymovement 8, MtPyre_Summit_Movement_ArchieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_23230F:: @ 823230F
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323AE
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323D8
+MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0
+	applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer0
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_232328:: @ 8232328
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323DD
+MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie
+	applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer1
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_232341:: @ 8232341
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323E2
+MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie
+	applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer2
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_23235A:: @ 823235A
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323ED
+MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie0
 	waitmovement 0
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_232376:: @ 8232376
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323F3
+MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie1
 	waitmovement 0
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_232392:: @ 8232392
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323F8
+MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392
+	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
+	applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie2
 	waitmovement 0
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-MtPyre_Summit_Movement_2323AE: @ 82323AE
+MtPyre_Summit_Movement_PlayerFaceMaxie0: @ 82323AE
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_2323B2: @ 82323B2
+MtPyre_Summit_Movement_PlayerFaceMaxie: @ 82323B2
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_2323B6: @ 82323B6
+MtPyre_Summit_Movement_MaxieExit: @ 82323B6
 	walk_down
 	walk_down
 	walk_down
@@ -333,7 +334,7 @@ MtPyre_Summit_Movement_2323B6: @ 82323B6
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_2323BD: @ 82323BD
+MtPyre_Summit_Movement_ArchieExit: @ 82323BD
 	walk_down
 	walk_down
 	walk_down
@@ -342,7 +343,7 @@ MtPyre_Summit_Movement_2323BD: @ 82323BD
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_2323C4: @ 82323C4
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0: @ 82323C4
 	delay_16
 	delay_8
 	walk_left
@@ -351,7 +352,7 @@ MtPyre_Summit_Movement_2323C4: @ 82323C4
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_2323CB: @ 82323CB
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: @ 82323CB
 	delay_16
 	delay_8
 	walk_right
@@ -360,7 +361,7 @@ MtPyre_Summit_Movement_2323CB: @ 82323CB
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_2323D2: @ 82323D2
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: @ 82323D2
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
@@ -368,38 +369,38 @@ MtPyre_Summit_Movement_2323D2: @ 82323D2
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_2323D8: @ 82323D8
+MtPyre_Summit_Movement_MaxieApproachPlayer0: @ 82323D8
 	walk_up
 	walk_up
 	walk_up
 	walk_left
 	step_end
 
-MtPyre_Summit_Movement_2323DD: @ 82323DD
+MtPyre_Summit_Movement_MaxieApproachPlayer1: @ 82323DD
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_2323E2: @ 82323E2
+MtPyre_Summit_Movement_MaxieApproachPlayer2: @ 82323E2
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_2323E7: @ 82323E7
+MtPyre_Summit_Movement_ArchieWatchMaxie: @ 82323E7
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-MtPyre_Summit_Movement_2323EA: @ 82323EA
+MtPyre_Summit_Movement_PlayerWatchMaxie: @ 82323EA
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_2323ED: @ 82323ED
+MtPyre_Summit_Movement_MaxieApproachArchie0: @ 82323ED
 	walk_down
 	walk_right
 	walk_down
@@ -407,54 +408,54 @@ MtPyre_Summit_Movement_2323ED: @ 82323ED
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_2323F3: @ 82323F3
+MtPyre_Summit_Movement_MaxieApproachArchie1: @ 82323F3
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_2323F8: @ 82323F8
+MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_EventScript_2323FD:: @ 82323FD
-	trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
-	msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt1:: @ 82323FD
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_1, MtPyre_Summit_Text_Grunt1Intro, MtPyre_Summit_Text_Grunt1Defeat
+	msgbox MtPyre_Summit_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_232414:: @ 8232414
-	trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
-	msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt2:: @ 8232414
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_2, MtPyre_Summit_Text_Grunt2Intro, MtPyre_Summit_Text_Grunt2Defeat
+	msgbox MtPyre_Summit_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_23242B:: @ 823242B
-	trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
-	msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt3:: @ 823242B
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_3, MtPyre_Summit_Text_Grunt3Intro, MtPyre_Summit_Text_Grunt3Defeat
+	msgbox MtPyre_Summit_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_232442:: @ 8232442
-	trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
-	msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt4:: @ 8232442
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_4, MtPyre_Summit_Text_Grunt4Intro, MtPyre_Summit_Text_Grunt4Defeat
+	msgbox MtPyre_Summit_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_Text_232459: @ 8232459
+MtPyre_Summit_Text_Grunt1Intro: @ 8232459
 	.string "No! Those TEAM MAGMA goons got\n"
 	.string "here ahead of us!\p"
 	.string "We can't fall behind!$"
 
-MtPyre_Summit_Text_2324A0: @ 82324A0
+MtPyre_Summit_Text_Grunt1Defeat: @ 82324A0
 	.string "I thought you were one of the MAGMAS\n"
 	.string "who happened to come back…$"
 
-MtPyre_Summit_Text_2324E0: @ 82324E0
+MtPyre_Summit_Text_Grunt1PostBattle: @ 82324E0
 	.string "Yeah, so you are strong…\n"
 	.string "But there're a lot of us!$"
 
-MtPyre_Summit_Text_232513: @ 8232513
+MtPyre_Summit_Text_Grunt2Intro: @ 8232513
 	.string "Hah!\n"
 	.string "Too bad for you!\p"
 	.string "If you came earlier, you only would've\n"
@@ -462,46 +463,46 @@ MtPyre_Summit_Text_232513: @ 8232513
 	.string "But since you arrived now, you have\n"
 	.string "to take on us toughies!$"
 
-MtPyre_Summit_Text_2325B0: @ 82325B0
+MtPyre_Summit_Text_Grunt2Defeat: @ 82325B0
 	.string "Urgh… I should've let you take on\n"
 	.string "TEAM MAGMA first…$"
 
-MtPyre_Summit_Text_2325E4: @ 82325E4
+MtPyre_Summit_Text_Grunt2PostBattle: @ 82325E4
 	.string "You don't know anything!\n"
 	.string "So why are you messing with us?$"
 
-MtPyre_Summit_Text_23261D: @ 823261D
+MtPyre_Summit_Text_Grunt3Intro: @ 823261D
 	.string "You…\n"
 	.string "We saw you at MT. CHIMNEY.\p"
 	.string "You don't belong to either TEAM,\n"
 	.string "so why would you be here?$"
 
-MtPyre_Summit_Text_232678: @ 8232678
+MtPyre_Summit_Text_Grunt3Defeat: @ 8232678
 	.string "If you're going to mess with anyone,\n"
 	.string "let it be TEAM MAGMA…$"
 
-MtPyre_Summit_Text_2326B3: @ 82326B3
+MtPyre_Summit_Text_Grunt3PostBattle: @ 82326B3
 	.string "Heh, it doesn't matter!\n"
 	.string "We bought ourselves some time!\p"
 	.string "The BOSS should have snatched what\n"
 	.string "he was after!$"
 
-MtPyre_Summit_Text_23271B: @ 823271B
+MtPyre_Summit_Text_Grunt4Intro: @ 823271B
 	.string "Oh, I know!\n"
 	.string "You tried to join TEAM MAGMA,\l"
 	.string "but they wouldn't have you!\p"
 	.string "Well, don't think that we'll let you\n"
 	.string "join our TEAM AQUA!$"
 
-MtPyre_Summit_Text_23279A: @ 823279A
+MtPyre_Summit_Text_Grunt4Defeat: @ 823279A
 	.string "If you want to join TEAM AQUA that\n"
 	.string "badly, we can consider it…$"
 
-MtPyre_Summit_Text_2327D8: @ 82327D8
+MtPyre_Summit_Text_Grunt4PostBattle: @ 82327D8
 	.string "We have a great combination going\n"
 	.string "with us members and our leader.$"
 
-MtPyre_Summit_Text_23281A: @ 823281A
+MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo: @ 823281A
 	.string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n"
 	.string "of us, but we also got what we wanted.\p"
 	.string "The RED ORB preserved at MT. PYRE…\n"
@@ -511,7 +512,7 @@ MtPyre_Summit_Text_23281A: @ 823281A
 	.string "Okay, TEAM!\n"
 	.string "We're pulling out!$"
 
-MtPyre_Summit_Text_23290E: @ 823290E
+MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis: @ 823290E
 	.string "Oh, no…\n"
 	.string "This cannot happen…\p"
 	.string "Not only the BLUE ORB, but even\n"
@@ -531,13 +532,13 @@ MtPyre_Summit_Text_23290E: @ 823290E
 	.string "I would like you to have it.\n"
 	.string "Perhaps it will be useful in some way.$"
 
-MtPyre_Summit_Text_232AD8: @ 8232AD8
+MtPyre_Summit_Text_OrbsHaveBeenTaken: @ 8232AD8
 	.string "The BLUE ORB and RED ORB taken by\n"
 	.string "those sinister men…\p"
 	.string "They must never be apart…\n"
 	.string "I fear something terrible will happen…$"
 
-MtPyre_Summit_Text_232B4F: @ 8232B4F
+MtPyre_Summit_Text_GroudonKyogreAwakened: @ 8232B4F
 	.string "Oh, my goodness…\p"
 	.string "You say that both GROUDON and KYOGRE\n"
 	.string "have been awakened?\p"
@@ -551,13 +552,13 @@ MtPyre_Summit_Text_232B4F: @ 8232B4F
 	.string "It could be a human, or perhaps\n"
 	.string "a POKéMON, but no one knows.$"
 
-MtPyre_Summit_Text_232CA6: @ 8232CA6
+MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs: @ 8232CA6
 	.string "The two men who took the ORBS came\n"
 	.string "back to return them on their own.\p"
 	.string "Those men…\n"
 	.string "Perhaps they are not so evil after all…$"
 
-MtPyre_Summit_Text_232D1E: @ 8232D1E
+MtPyre_Summit_Text_SuperAncientPokemonTaughtUs: @ 8232D1E
 	.string "The embodiments of the land, sea,\n"
 	.string "and the sky…\p"
 	.string "That is said to be the identities of\n"
@@ -568,7 +569,7 @@ MtPyre_Summit_Text_232D1E: @ 8232D1E
 	.string "The super-ancient POKéMON have\n"
 	.string "taught us that…$"
 
-MtPyre_Summit_Text_232E0C: @ 8232E0C
+MtPyre_Summit_Text_WillYouHearOutMyTale: @ 8232E0C
 	.string "MT. PYRE is where we calm the spirits\n"
 	.string "of POKéMON that have passed on…\p"
 	.string "This is a high place where one can\n"
@@ -579,7 +580,7 @@ MtPyre_Summit_Text_232E0C: @ 8232E0C
 	.string "Will you hear out my tale? A tale long\n"
 	.string "told in the HOENN region?$"
 
-MtPyre_Summit_Text_232F27: @ 8232F27
+MtPyre_Summit_Text_GroudonKyogreTale: @ 8232F27
 	.string "It happened long, long ago…\p"
 	.string "The world was wracked by a ferocious\n"
 	.string "clash between the POKéMON of the land\l"
@@ -599,16 +600,16 @@ MtPyre_Summit_Text_232F27: @ 8232F27
 	.string "the sea where eventually they\l"
 	.string "disappeared…$"
 
-MtPyre_Summit_Text_233162: @ 8233162
+MtPyre_Summit_Text_WellThatTooIsFine: @ 8233162
 	.string "I see…\n"
 	.string "Well, that, too, is fine…$"
 
-MtPyre_Summit_Text_233183: @ 8233183
+MtPyre_Summit_Text_MaxieSilence: @ 8233183
 	.string "MAXIE: {PLAYER}…\p"
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-MtPyre_Summit_Text_2331A6: @ 82331A6
+MtPyre_Summit_Text_HearTheNewLegendOfHoenn: @ 82331A6
 	.string "It is my role to pass on the legends\n"
 	.string "of HOENN to future generations.\p"
 	.string "And the crisis that just ended in\n"
@@ -616,7 +617,7 @@ MtPyre_Summit_Text_2331A6: @ 82331A6
 	.string "Have you the time to hear the new\n"
 	.string "legend of HOENN?$"
 
-MtPyre_Summit_Text_23325D: @ 823325D
+MtPyre_Summit_Text_HoennTrioTale: @ 823325D
 	.string "It happened long, long ago…\p"
 	.string "The world was wracked by a ferocious\n"
 	.string "clash between the POKéMON of the land\l"
diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json
index ee324635b..1ae004107 100644
--- a/data/maps/NavelRock_Bottom/map.json
+++ b/data/maps/NavelRock_Bottom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NavelRock_Bottom_EventScript_2692A2",
+      "script": "NavelRock_Bottom_EventScript_Lugia",
       "flag": "FLAG_HIDE_LUGIA"
     }
   ],
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index a09b6ed13..e43f6d513 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -1,34 +1,34 @@
 NavelRock_Bottom_MapScripts:: @ 8269255
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284
+	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_OnResume
 	.byte 0
 
 NavelRock_Bottom_OnTransition: @ 8269260
-	call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273
-	call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277
+	call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_HideLugia
+	call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_TryShowLugia
 	end
 
-NavelRock_Bottom_EventScript_269273:: @ 8269273
+NavelRock_Bottom_EventScript_HideLugia:: @ 8269273
 	setflag FLAG_HIDE_LUGIA
 	return
 
-NavelRock_Bottom_EventScript_269277:: @ 8269277
+NavelRock_Bottom_EventScript_TryShowLugia:: @ 8269277
 	goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_LUGIA
 	return
 
-NavelRock_Bottom_MapScript1_269284: @ 8269284
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E
+NavelRock_Bottom_OnResume: @ 8269284
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_TryRemoveLugia
 	end
 
-NavelRock_Bottom_EventScript_26928E:: @ 826928E
+NavelRock_Bottom_EventScript_TryRemoveLugia:: @ 826928E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
-NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
+NavelRock_Bottom_EventScript_Lugia:: @ 82692A2
 	lock
 	faceplayer
 	waitse
@@ -53,7 +53,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	waitmoncry
 	delay 20
 	setvar VAR_0x8004, SPECIES_LUGIA
-	setvar VAR_0x8005, 70  @level
+	setvar VAR_0x8005, 70  @ level
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -62,22 +62,22 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq NavelRock_Bottom_EventScript_269336
+	goto_if_eq NavelRock_Bottom_EventScript_DefeatedLugia
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq NavelRock_Bottom_EventScript_269344
+	goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NavelRock_Bottom_EventScript_269344
+	goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia
 	setflag FLAG_CAUGHT_LUGIA
 	release
 	end
 
-NavelRock_Bottom_EventScript_269336:: @ 8269336
+NavelRock_Bottom_EventScript_DefeatedLugia:: @ 8269336
 	setflag FLAG_DEFEATED_LUGIA
 	setvar VAR_0x8004, SPECIES_LUGIA
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Bottom_EventScript_269344:: @ 8269344
+NavelRock_Bottom_EventScript_RanFromLugia:: @ 8269344
 	setvar VAR_0x8004, SPECIES_LUGIA
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index 7ea3ef0e7..e91dfa8d1 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NavelRock_Harbor_EventScript_2690BD",
+      "script": "NavelRock_Harbor_EventScript_Sailor",
       "flag": "0"
     },
     {
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
index 6538b2b8e..b138b7c5a 100644
--- a/data/maps/NavelRock_Harbor/scripts.inc
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -1,12 +1,12 @@
 NavelRock_Harbor_MapScripts:: @ 82690BC
 	.byte 0
 
-NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
+NavelRock_Harbor_EventScript_Sailor:: @ 82690BD
 	lock
 	faceplayer
 	msgbox NavelRock_Harbor_Text_SailorReturn, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq NavelRock_Harbor_EventScript_269102
+	compare VAR_RESULT, NO
+	goto_if_eq NavelRock_Harbor_EventScript_AsYouLike
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -14,13 +14,13 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
 	delay 30
 	hideobjectat 1, MAP_NAVEL_ROCK_HARBOR
 	setvar VAR_0x8004, 2
-	call NavelRock_Harbor_EventScript_272250
+	call Common_EventScript_FerryDepartIsland
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-NavelRock_Harbor_EventScript_269102:: @ 8269102
+NavelRock_Harbor_EventScript_AsYouLike:: @ 8269102
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json
index 4b025ccae..c906c4ceb 100644
--- a/data/maps/NavelRock_Top/map.json
+++ b/data/maps/NavelRock_Top/map.json
@@ -45,7 +45,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NavelRock_Top_EventScript_26916F"
+      "script": "NavelRock_Top_EventScript_HoOh"
     }
   ],
   "bg_events": [
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index 6734ef5f0..fcd043d3d 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -1,45 +1,45 @@
 NavelRock_Top_MapScripts:: @ 8269113
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151
+	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_OnResume
 	.byte 0
 
 NavelRock_Top_OnTransition: @ 826911E
-	call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131
-	call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A
+	call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_HideHoOh
+	call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_TryShowHoOh
 	end
 
-NavelRock_Top_EventScript_269131:: @ 8269131
+NavelRock_Top_EventScript_HideHoOh:: @ 8269131
 	setvar VAR_TEMP_1, 1
 	setflag FLAG_HIDE_HO_OH
 	return
 
-NavelRock_Top_EventScript_26913A:: @ 826913A
+NavelRock_Top_EventScript_TryShowHoOh:: @ 826913A
 	setvar VAR_TEMP_1, 1
 	goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn
 	setvar VAR_TEMP_1, 0
 	clearflag FLAG_HIDE_HO_OH
 	return
 
-NavelRock_Top_MapScript1_269151: @ 8269151
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B
+NavelRock_Top_OnResume: @ 8269151
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_TryRemoveHoOh
 	end
 
-NavelRock_Top_EventScript_26915B:: @ 826915B
+NavelRock_Top_EventScript_TryRemoveHoOh:: @ 826915B
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
-NavelRock_Top_EventScript_26916F:: @ 826916F
+NavelRock_Top_EventScript_HoOh:: @ 826916F
 	lockall
 	setvar VAR_TEMP_1, 1
 	special SpawnCameraObject
 	setvar VAR_0x8004, 3  @ num loops
 	setvar VAR_0x8005, 35 @ delay
 	special LoopWingFlapSE
-	applymovement 1, NavelRock_Top_Movement_269243
-	applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230
+	applymovement 1, NavelRock_Top_Movement_HoOhAppear
+	applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp
 	waitmovement 0
 	delay 50
 	setweather WEATHER_NONE
@@ -52,12 +52,12 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	setvar VAR_0x8004, 3  @ num loops
 	setvar VAR_0x8005, 35 @ delay
 	special LoopWingFlapSE
-	applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234
-	applymovement 1, NavelRock_Top_Movement_26923A
+	applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown
+	applymovement 1, NavelRock_Top_Movement_HoOhApproach
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_0x8004, SPECIES_HO_OH
-	setvar VAR_0x8005, 70 @level
+	setvar VAR_0x8005, 70 @ level
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -67,33 +67,33 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	setvar VAR_LAST_TALKED, 1
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq NavelRock_Top_EventScript_269217
+	goto_if_eq NavelRock_Top_EventScript_DefeatedHoOh
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq NavelRock_Top_EventScript_269225
+	goto_if_eq NavelRock_Top_EventScript_RanFromHoOh
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NavelRock_Top_EventScript_269225
+	goto_if_eq NavelRock_Top_EventScript_RanFromHoOh
 	setflag FLAG_CAUGHT_HO_OH
 	releaseall
 	end
 
-NavelRock_Top_EventScript_269217:: @ 8269217
+NavelRock_Top_EventScript_DefeatedHoOh:: @ 8269217
 	setflag FLAG_DEFEATED_HO_OH
 	setvar VAR_0x8004, SPECIES_HO_OH
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Top_EventScript_269225:: @ 8269225
+NavelRock_Top_EventScript_RanFromHoOh:: @ 8269225
 	setvar VAR_0x8004, SPECIES_HO_OH
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Top_Movement_269230: @ 8269230
+NavelRock_Top_Movement_CameraPanUp: @ 8269230
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-NavelRock_Top_Movement_269234: @ 8269234
+NavelRock_Top_Movement_CameraPanDown: @ 8269234
 	delay_16
 	delay_16
 	walk_down
@@ -101,7 +101,7 @@ NavelRock_Top_Movement_269234: @ 8269234
 	walk_down
 	step_end
 
-NavelRock_Top_Movement_26923A: @ 826923A
+NavelRock_Top_Movement_HoOhApproach: @ 826923A
 	walk_down
 	walk_down
 	walk_down
@@ -112,7 +112,7 @@ NavelRock_Top_Movement_26923A: @ 826923A
 	delay_16
 	step_end
 
-NavelRock_Top_Movement_269243: @ 8269243
+NavelRock_Top_Movement_HoOhAppear: @ 8269243
 	delay_16
 	delay_16
 	walk_in_place_down
diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json
index d36763350..593e23a62 100644
--- a/data/maps/NewMauville_Entrance/map.json
+++ b/data/maps/NewMauville_Entrance/map.json
@@ -38,7 +38,7 @@
       "elevation": 3,
       "var": "VAR_NEW_MAUVILLE_STATE",
       "var_value": "0",
-      "script": "NewMauville_Entrance_EventScript_2372FF"
+      "script": "NewMauville_Entrance_EventScript_Door"
     }
   ],
   "bg_events": []
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 9b31454fd..e9369b7ea 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -1,14 +1,14 @@
 NewMauville_Entrance_MapScripts:: @ 82372AD
-	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
 	.byte 0
 
-NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
+NewMauville_Entrance_OnLoad: @ 82372B8
 	compare VAR_NEW_MAUVILLE_STATE, 0
-	call_if_eq NewMauville_Entrance_EventScript_2372C4
+	call_if_eq NewMauville_Entrance_EventScript_CloseDoor
 	end
 
-NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
+NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4
 	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
 	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
 	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
@@ -21,18 +21,18 @@ NewMauville_Entrance_OnTransition: @ 82372FB
 	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end
 
-NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
+NewMauville_Entrance_EventScript_Door:: @ 82372FF
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT
+	msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT
 	checkitem ITEM_BASEMENT_KEY, 1
-	compare VAR_RESULT, 0
-	goto_if_eq NewMauville_Entrance_EventScript_237380
-	msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq NewMauville_Entrance_EventScript_237380
-	msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor
+	msgbox NewMauville_Entrance_Text_UseBasementKey, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor
+	msgbox NewMauville_Entrance_Text_UsedBasementKey, MSGBOX_DEFAULT
 	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
 	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
 	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
@@ -45,17 +45,17 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	releaseall
 	end
 
-NewMauville_Entrance_EventScript_237380:: @ 8237380
+NewMauville_Entrance_EventScript_DontOpenDoor:: @ 8237380
 	releaseall
 	end
 
-NewMauville_Entrance_Text_237382: @ 8237382
+NewMauville_Entrance_Text_DoorIsLocked: @ 8237382
 	.string "The door is locked.$"
 
-NewMauville_Entrance_Text_237396: @ 8237396
+NewMauville_Entrance_Text_UseBasementKey: @ 8237396
 	.string "Use the BASEMENT KEY?$"
 
-NewMauville_Entrance_Text_2373AC: @ 82373AC
+NewMauville_Entrance_Text_UsedBasementKey: @ 82373AC
 	.string "{PLAYER} used the BASEMENT KEY.\p"
 	.string "The door opened!$"
 
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
index e58588a47..8909fcbaa 100644
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_2377AF",
+      "script": "NewMauville_Inside_EventScript_Voltorb1",
       "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_2377FC",
+      "script": "NewMauville_Inside_EventScript_Voltorb2",
       "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_237849",
+      "script": "NewMauville_Inside_EventScript_Voltorb3",
       "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3"
     }
   ],
@@ -136,7 +136,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237459"
+      "script": "NewMauville_Inside_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -145,7 +145,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237471"
+      "script": "NewMauville_Inside_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -154,7 +154,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237459"
+      "script": "NewMauville_Inside_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -163,7 +163,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237459"
+      "script": "NewMauville_Inside_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -172,7 +172,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237471"
+      "script": "NewMauville_Inside_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -181,7 +181,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237471"
+      "script": "NewMauville_Inside_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -190,7 +190,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237459"
+      "script": "NewMauville_Inside_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -199,7 +199,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237459"
+      "script": "NewMauville_Inside_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -208,7 +208,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "NewMauville_Inside_EventScript_237471"
+      "script": "NewMauville_Inside_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -217,7 +217,7 @@
       "elevation": 3,
       "var": "VAR_NEW_MAUVILLE_STATE",
       "var_value": "1",
-      "script": "NewMauville_Inside_EventScript_237725"
+      "script": "NewMauville_Inside_EventScript_RedButton"
     }
   ],
   "bg_events": [
@@ -227,7 +227,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -235,7 +235,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -243,7 +243,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -251,7 +251,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -259,7 +259,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -267,7 +267,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -275,7 +275,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     },
     {
       "type": "sign",
@@ -283,7 +283,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "NewMauville_Inside_EventScript_23778F"
+      "script": "NewMauville_Inside_EventScript_Generator"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index be4e846eb..7675799eb 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -1,18 +1,18 @@
 NewMauville_Inside_MapScripts:: @ 82373D7
-	map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7
+	map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad
 	.byte 0
 
-NewMauville_Inside_MapScript1_2373E7: @ 82373E7
+NewMauville_Inside_OnResume: @ 82373E7
 	compare VAR_TEMP_1, 1
-	call_if_eq NewMauville_Inside_EventScript_237489
+	call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton
 	compare VAR_TEMP_2, 1
-	call_if_eq NewMauville_Inside_EventScript_2375D7
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407
+	call_if_eq NewMauville_Inside_EventScript_SetBarrierStateGreenButton
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb
 	end
 
-NewMauville_Inside_EventScript_237407:: @ 8237407
+NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -22,49 +22,49 @@ NewMauville_Inside_EventScript_237407:: @ 8237407
 NewMauville_Inside_OnTransition: @ 823741B
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
-	call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441
-	call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_237445
-	call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_237449
+	call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1
+	call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb2
+	call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3
 	end
 
-NewMauville_Inside_EventScript_237441:: @ 8237441
+NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
 	return
 
-NewMauville_Inside_EventScript_237445:: @ 8237445
+NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
 	return
 
-NewMauville_Inside_EventScript_237449:: @ 8237449
+NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
 	return
 
-NewMauville_Inside_MapScript1_23744D: @ 823744D
+NewMauville_Inside_OnLoad: @ 823744D
 	compare VAR_NEW_MAUVILLE_STATE, 2
-	call_if_eq NewMauville_Inside_EventScript_23773A
+	call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
 	end
 
-NewMauville_Inside_EventScript_237459:: @ 8237459
+NewMauville_Inside_EventScript_BlueButton:: @ 8237459
 	lockall
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_2, 0
 	playse SE_PIN
-	call NewMauville_Inside_EventScript_237489
+	call NewMauville_Inside_EventScript_SetBarrierStateBlueButton
 	special DrawWholeMapView
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_237471:: @ 8237471
+NewMauville_Inside_EventScript_GreenButton:: @ 8237471
 	lockall
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 1
 	playse SE_PIN
-	call NewMauville_Inside_EventScript_2375D7
+	call NewMauville_Inside_EventScript_SetBarrierStateGreenButton
 	special DrawWholeMapView
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_237489:: @ 8237489
+NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
 	setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
 	setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
 	setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
@@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_237489:: @ 8237489
 	setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
 	return
 
-NewMauville_Inside_EventScript_2375D7:: @ 82375D7
+NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
 	setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
 	setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
 	setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
@@ -144,15 +144,15 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7
 	setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
 	return
 
-NewMauville_Inside_EventScript_237725:: @ 8237725
+NewMauville_Inside_EventScript_RedButton:: @ 8237725
 	lockall
-	msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT
-	call NewMauville_Inside_EventScript_23773A
+	msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT
+	call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
 	setvar VAR_NEW_MAUVILLE_STATE, 2
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_23773A:: @ 823773A
+NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
 	setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
 	setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
 	setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
@@ -165,20 +165,20 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A
 	special DrawWholeMapView
 	return
 
-NewMauville_Inside_EventScript_23778F:: @ 823778F
+NewMauville_Inside_EventScript_Generator:: @ 823778F
 	lockall
 	compare VAR_NEW_MAUVILLE_STATE, 2
-	goto_if_eq NewMauville_Inside_EventScript_2377A5
-	msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT
+	goto_if_eq NewMauville_Inside_EventScript_GeneratorOff
+	msgbox NewMauville_Inside_Text_GeneratorRadiatingHeat, MSGBOX_DEFAULT
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_2377A5:: @ 82377A5
-	msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT
+NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5
+	msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_2377AF:: @ 82377AF
+NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -191,21 +191,21 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq NewMauville_Inside_EventScript_2377F3
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq NewMauville_Inside_EventScript_2377F3
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NewMauville_Inside_EventScript_2377F3
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
 	setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
 	release
 	end
 
-NewMauville_Inside_EventScript_2377F3:: @ 82377F3
+NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3
 	setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_EventScript_2377FC:: @ 82377FC
+NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -218,21 +218,21 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq NewMauville_Inside_EventScript_237840
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq NewMauville_Inside_EventScript_237840
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NewMauville_Inside_EventScript_237840
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
 	setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
 	release
 	end
 
-NewMauville_Inside_EventScript_237840:: @ 8237840
+NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840
 	setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_EventScript_237849:: @ 8237849
+NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -245,30 +245,30 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq NewMauville_Inside_EventScript_23788D
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq NewMauville_Inside_EventScript_23788D
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq NewMauville_Inside_EventScript_23788D
+	goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
 	setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
 	release
 	end
 
-NewMauville_Inside_EventScript_23788D:: @ 823788D
+NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D
 	setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_Text_237896: @ 8237896
+NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896
 	.string "The generator is radiating heat that\n"
 	.string "can be felt even at a distance.\p"
 	.string "It looks like it should be turned off\n"
 	.string "as soon as possible.$"
 
-NewMauville_Inside_Text_237916: @ 8237916
+NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916
 	.string "The generator quieted down.$"
 
-NewMauville_Inside_Text_237932: @ 8237932
+NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932
 	.string "{PLAYER} stepped on the switch.\p"
 	.string "Click…\p"
 	.string "… … … … … … … …\n"
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index 5f91e81ed..1644c76d6 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_EventScript_1E8EF3",
+      "script": "OldaleTown_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_EventScript_1E8EFC",
+      "script": "OldaleTown_EventScript_MartEmployee",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_EventScript_1E901F",
+      "script": "OldaleTown_EventScript_FootprintsMan",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_EventScript_1E9070",
+      "script": "OldaleTown_EventScript_Rival",
       "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL"
     }
   ],
@@ -121,7 +121,7 @@
       "elevation": 3,
       "var": "VAR_OLDALE_TOWN_STATE",
       "var_value": "0",
-      "script": "OldaleTown_EventScript_1E903F"
+      "script": "OldaleTown_EventScript_BlockedPath"
     },
     {
       "type": "trigger",
@@ -130,7 +130,7 @@
       "elevation": 3,
       "var": "VAR_OLDALE_RIVAL_STATE",
       "var_value": "1",
-      "script": "OldaleTown_EventScript_1E9086"
+      "script": "OldaleTown_EventScript_RivalTrigger1"
     },
     {
       "type": "trigger",
@@ -139,7 +139,7 @@
       "elevation": 3,
       "var": "VAR_OLDALE_RIVAL_STATE",
       "var_value": "1",
-      "script": "OldaleTown_EventScript_1E90A6"
+      "script": "OldaleTown_EventScript_RivalTrigger2"
     },
     {
       "type": "trigger",
@@ -148,7 +148,7 @@
       "elevation": 3,
       "var": "VAR_OLDALE_RIVAL_STATE",
       "var_value": "1",
-      "script": "OldaleTown_EventScript_1E90C6"
+      "script": "OldaleTown_EventScript_RivalTrigger3"
     }
   ],
   "bg_events": [
@@ -158,7 +158,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "OldaleTown_EventScript_1E8EEA"
+      "script": "OldaleTown_EventScript_CitySign"
     },
     {
       "type": "sign",
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 8e3950cae..88f73d39b 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -5,92 +5,93 @@ OldaleTown_MapScripts:: @ 81E8EA2
 OldaleTown_OnTransition: @ 81E8EA8
 	call Common_EventScript_SetupRivalGfxId
 	setflag FLAG_VISITED_OLDALE_TOWN
-	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2
-	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE
-	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ECC
+	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance
+	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_MoveMartEmployee
+	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_SetOldaleState
 	end
 
-OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
+@ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE
+OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC
 	setvar VAR_OLDALE_TOWN_STATE, 1
 	return
 
-OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
+OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2
 	setobjectxyperm 3, 1, 11
 	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
+OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE
 	setobjectxyperm 2, 13, 14
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-OldaleTown_EventScript_1E8EEA:: @ 81E8EEA
-	msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN
+OldaleTown_EventScript_CitySign:: @ 81E8EEA
+	msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
 	end
 
-OldaleTown_EventScript_1E8EF3:: @ 81E8EF3
-	msgbox OldaleTown_Text_1E918E, MSGBOX_NPC
+OldaleTown_EventScript_Girl:: @ 81E8EF3
+	msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC
 	end
 
-OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
+OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8FB9
-	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9
+	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion
+	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion
 	setflag FLAG_TEMP_1
 	playbgm MUS_TSURETEK, 0
-	msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT
+	msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
-	case DIR_SOUTH, OldaleTown_EventScript_1E8F47
-	case DIR_NORTH, OldaleTown_EventScript_1E8F5E
-	case DIR_EAST, OldaleTown_EventScript_1E8F75
+	case DIR_SOUTH, OldaleTown_EventScript_GoToMartSouth
+	case DIR_NORTH, OldaleTown_EventScript_GoToMartNorth
+	case DIR_EAST, OldaleTown_EventScript_GoToMartEast
 	end
 
-OldaleTown_EventScript_1E8F47:: @ 81E8F47
-	applymovement 2, OldaleTown_Movement_1E8FD7
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001
+OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47
+	applymovement 2, OldaleTown_Movement_EmployeeSouth
+	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth
 	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
+	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_1E8F5E:: @ 81E8F5E
-	applymovement 2, OldaleTown_Movement_1E8FE2
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B
+OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E
+	applymovement 2, OldaleTown_Movement_EmployeeNorth
+	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth
 	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
+	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_1E8F75:: @ 81E8F75
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9
-	applymovement 2, OldaleTown_Movement_1E8FCE
+OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
+	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast
+	applymovement 2, OldaleTown_Movement_EmployeeEast
 	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
+	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_1E8F8C:: @ 81E8F8C
-	msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT
+OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
+	msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT
 	giveitem_std ITEM_POTION
 	compare VAR_RESULT, 0
-	goto_if_eq OldaleTown_EventScript_1E8FC3
-	msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT
+	goto_if_eq OldaleTown_EventScript_BagIsFull
+	msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_POTION_OLDALE
 	fadedefaultbgm
 	release
 	end
 
-OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
-	msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT
+OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9
+	msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
+OldaleTown_EventScript_BagIsFull:: @ 81E8FC3
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	fadedefaultbgm
 	release
 	end
 
-OldaleTown_Movement_1E8FCE: @ 81E8FCE
+OldaleTown_Movement_EmployeeEast: @ 81E8FCE
 	walk_up
 	walk_up
 	walk_up
@@ -101,7 +102,7 @@ OldaleTown_Movement_1E8FCE: @ 81E8FCE
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_1E8FD7: @ 81E8FD7
+OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
 	walk_left
 	walk_up
 	walk_up
@@ -114,7 +115,7 @@ OldaleTown_Movement_1E8FD7: @ 81E8FD7
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_1E8FE2: @ 81E8FE2
+OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
 	walk_up
 	walk_up
 	walk_up
@@ -125,7 +126,7 @@ OldaleTown_Movement_1E8FE2: @ 81E8FE2
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_1E8FEB: @ 81E8FEB
+OldaleTown_Movement_Unknown1: @ 81E8FEB
 	walk_up
 	walk_up
 	walk_right
@@ -141,7 +142,7 @@ OldaleTown_Movement_1E8FEB: @ 81E8FEB
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_1E8FF9: @ 81E8FF9
+OldaleTown_Movement_PlayerEast: @ 81E8FF9
 	walk_right
 	walk_up
 	walk_up
@@ -151,7 +152,7 @@ OldaleTown_Movement_1E8FF9: @ 81E8FF9
 	walk_up
 	step_end
 
-OldaleTown_Movement_1E9001: @ 81E9001
+OldaleTown_Movement_PlayerSouth: @ 81E9001
 	delay_16
 	delay_16
 	delay_16
@@ -163,7 +164,7 @@ OldaleTown_Movement_1E9001: @ 81E9001
 	walk_up
 	step_end
 
-OldaleTown_Movement_1E900B: @ 81E900B
+OldaleTown_Movement_PlayerNorth: @ 81E900B
 	walk_up
 	walk_up
 	walk_up
@@ -173,7 +174,7 @@ OldaleTown_Movement_1E900B: @ 81E900B
 	walk_up
 	step_end
 
-OldaleTown_Movement_1E9013: @ 81E9013
+OldaleTown_Movement_Unknown2: @ 81E9013
 	walk_left
 	walk_up
 	walk_up
@@ -187,97 +188,97 @@ OldaleTown_Movement_1E9013: @ 81E9013
 	walk_up
 	step_end
 
-OldaleTown_EventScript_1E901F:: @ 81E901F
+OldaleTown_EventScript_FootprintsMan:: @ 81E901F
 	lock
 	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066
-	msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath
+	msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-OldaleTown_EventScript_1E903F:: @ 81E903F
+OldaleTown_EventScript_BlockedPath:: @ 81E903F
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182
-	applymovement 3, OldaleTown_Movement_1E9185
+	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
+	applymovement 3, OldaleTown_Movement_BackUp
 	waitmovement 0
-	msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT
+	msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, OldaleTown_Movement_1E918B
+	applymovement 3, OldaleTown_Movement_ReturnToOriginalPosition
 	waitmovement 0
 	releaseall
 	end
 
-OldaleTown_EventScript_1E9066:: @ 81E9066
-	msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT
+OldaleTown_EventScript_NotBlockingPath:: @ 81E9066
+	msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_EventScript_1E9070:: @ 81E9070
+OldaleTown_EventScript_Rival:: @ 81E9070
 	lockall
 	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	setvar VAR_0x8009, 0
-	goto OldaleTown_EventScript_1E90E6
+	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_1E9086:: @ 81E9086
+OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
 	lockall
-	applymovement 4, OldaleTown_Movement_1E9170
+	applymovement 4, OldaleTown_Movement_RivalApproachPlayer1
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
+	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_1E90A6:: @ 81E90A6
+OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
 	lockall
-	applymovement 4, OldaleTown_Movement_1E9173
+	applymovement 4, OldaleTown_Movement_RivalApproachPlayer2
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
+	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_1E90C6:: @ 81E90C6
+OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
 	lockall
-	applymovement 4, OldaleTown_Movement_1E9175
+	applymovement 4, OldaleTown_Movement_RivalApproachPlayer3
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
+	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_1E90E6:: @ 81E90E6
+OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq OldaleTown_EventScript_1E90FE
+	goto_if_eq OldaleTown_EventScript_ShowMayMessage
 	compare VAR_RESULT, FEMALE
-	goto_if_eq OldaleTown_EventScript_1E910C
+	goto_if_eq OldaleTown_EventScript_ShowBrendanMessage
 	end
 
-OldaleTown_EventScript_1E90FE:: @ 81E90FE
-	msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT
-	goto OldaleTown_EventScript_1E911A
+OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE
+	msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT
+	goto OldaleTown_EventScript_RivalFinish
 	end
 
-OldaleTown_EventScript_1E910C:: @ 81E910C
-	msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT
-	goto OldaleTown_EventScript_1E911A
+OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C
+	msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT
+	goto OldaleTown_EventScript_RivalFinish
 	end
 
-OldaleTown_EventScript_1E911A:: @ 81E911A
+OldaleTown_EventScript_RivalFinish:: @ 81E911A
 	closemessage
 	compare VAR_0x8009, 0
-	call_if_eq OldaleTown_EventScript_1E9148
+	call_if_eq OldaleTown_EventScript_DoExitMovement1
 	compare VAR_0x8009, 1
-	call_if_eq OldaleTown_EventScript_1E915E
-	applymovement 4, OldaleTown_Movement_1E9177
+	call_if_eq OldaleTown_EventScript_DoExitMovement2
+	applymovement 4, OldaleTown_Movement_RivalExit
 	waitmovement 0
 	removeobject 4
 	setvar VAR_OLDALE_RIVAL_STATE, 2
@@ -285,33 +286,33 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
 	releaseall
 	end
 
-OldaleTown_EventScript_1E9148:: @ 81E9148
+OldaleTown_EventScript_DoExitMovement1:: @ 81E9148
 	compare VAR_FACING, DIR_SOUTH
-	goto_if_ne OldaleTown_EventScript_1E915E
-	applymovement 4, OldaleTown_Movement_1E9177
+	goto_if_ne OldaleTown_EventScript_DoExitMovement2
+	applymovement 4, OldaleTown_Movement_RivalExit
 	waitmovement 0
 	return
 
-OldaleTown_EventScript_1E915E:: @ 81E915E
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E
-	applymovement 4, OldaleTown_Movement_1E9177
+OldaleTown_EventScript_DoExitMovement2:: @ 81E915E
+	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
+	applymovement 4, OldaleTown_Movement_RivalExit
 	waitmovement 0
 	return
 
-OldaleTown_Movement_1E9170: @ 81E9170
+OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170
 	walk_left
 	walk_left
 	step_end
 
-OldaleTown_Movement_1E9173: @ 81E9173
+OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173
 	walk_left
 	step_end
 
-OldaleTown_Movement_1E9175: @ 81E9175
+OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175
 	face_left
 	step_end
 
-OldaleTown_Movement_1E9177: @ 81E9177
+OldaleTown_Movement_RivalExit: @ 81E9177
 	walk_down
 	walk_down
 	walk_down
@@ -320,18 +321,18 @@ OldaleTown_Movement_1E9177: @ 81E9177
 	walk_down
 	step_end
 
-OldaleTown_Movement_1E917E: @ 81E917E
+OldaleTown_Movement_WatchRivalExit: @ 81E917E
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_1E9182: @ 81E9182
+OldaleTown_Movement_PlayerStepBack: @ 81E9182
 	delay_8
 	walk_right
 	step_end
 
-OldaleTown_Movement_1E9185: @ 81E9185
+OldaleTown_Movement_BackUp: @ 81E9185
 	walk_fast_up
 	walk_in_place_fastest_left
 	lock_facing_direction
@@ -339,21 +340,21 @@ OldaleTown_Movement_1E9185: @ 81E9185
 	unlock_facing_direction
 	step_end
 
-OldaleTown_Movement_1E918B: @ 81E918B
+OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B
 	walk_down
 	walk_left
 	step_end
 
-OldaleTown_Text_1E918E: @ 81E918E
+OldaleTown_Text_SavingMyProgress: @ 81E918E
 	.string "I want to take a rest, so I'm saving my\n"
 	.string "progress.$"
 
-OldaleTown_Text_1E91C0: @ 81E91C0
+OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0
 	.string "Hi!\n"
 	.string "I work at a POKéMON MART.\p"
 	.string "Can I get you to come with me?$"
 
-OldaleTown_Text_1E91FD: @ 81E91FD
+OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
 	.string "This is a POKéMON MART.\n"
 	.string "Just look for our blue roof.\p"
 	.string "We sell a variety of goods including\n"
@@ -361,12 +362,12 @@ OldaleTown_Text_1E91FD: @ 81E91FD
 	.string "Here, I'd like you to have this as\n"
 	.string "a promotional item.$"
 
-OldaleTown_Text_1E92AF: @ 81E92AF
+OldaleTown_Text_PotionExplanation: @ 81E92AF
 	.string "A POTION can be used anytime, so it's\n"
 	.string "even more useful than a POKéMON CENTER\l"
 	.string "in certain situations.$"
 
-OldaleTown_Text_1E9313: @ 81E9313
+OldaleTown_Text_WaitDontComeInHere: @ 81E9313
 	.string "Aaaaah! Wait!\n"
 	.string "Please don't come in here.\p"
 	.string "I just discovered the footprints of\n"
@@ -374,29 +375,29 @@ OldaleTown_Text_1E9313: @ 81E9313
 	.string "Wait until I finish sketching\n"
 	.string "them, okay?$"
 
-OldaleTown_Text_1E939A: @ 81E939A
+OldaleTown_Text_DiscoveredFootprints: @ 81E939A
 	.string "I just discovered the footprints of\n"
 	.string "a rare POKéMON!\p"
 	.string "Wait until I finish sketching\n"
 	.string "them, okay?$"
 
-OldaleTown_Text_1E93F8: @ 81E93F8
+OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8
 	.string "I finished sketching the footprints of\n"
 	.string "a rare POKéMON.\p"
 	.string "But it turns out they were only my\n"
 	.string "own footprints…$"
 
-OldaleTown_Text_1E9462: @ 81E9462
+OldaleTown_Text_MayLetsGoBack: @ 81E9462
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "Over here!\l"
 	.string "Let's hurry home!$"
 
-OldaleTown_Text_1E948A: @ 81E948A
+OldaleTown_Text_BrendanLetsGoBack: @ 81E948A
 	.string "BRENDAN: I'm heading back to my dad's\n"
 	.string "LAB now.\l"
 	.string "{PLAYER}, you should hustle back, too.$"
 
-OldaleTown_Text_1E94DA: @ 81E94DA
+OldaleTown_Text_CitySign: @ 81E94DA
 	.string "OLDALE TOWN\n"
 	.string "“Where things start off scarce.”$"
 
diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json
index aa837378c..03155a623 100644
--- a/data/maps/OldaleTown_House1/map.json
+++ b/data/maps/OldaleTown_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_House1_EventScript_1FBE86",
+      "script": "OldaleTown_House1_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc
index 71010116e..1cb5622ef 100644
--- a/data/maps/OldaleTown_House1/scripts.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
@@ -1,11 +1,11 @@
 OldaleTown_House1_MapScripts:: @ 81FBE85
 	.byte 0
 
-OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86
-	msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC
+OldaleTown_House1_EventScript_Woman:: @ 81FBE86
+	msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC
 	end
 
-OldaleTown_House1_Text_1FBE8F: @ 81FBE8F
+OldaleTown_House1_Text_LeftPokemonGoesOutFirst: @ 81FBE8F
 	.string "When a POKéMON battle starts, the one\n"
 	.string "at the left of the list goes out first.\p"
 	.string "So, when you get more POKéMON in your\n"
diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json
index fbcf968e7..754f98c49 100644
--- a/data/maps/OldaleTown_House2/map.json
+++ b/data/maps/OldaleTown_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_House2_EventScript_1FBF5B",
+      "script": "OldaleTown_House2_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_House2_EventScript_1FBF64",
+      "script": "OldaleTown_House2_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc
index 74a9a06d3..3259e319c 100644
--- a/data/maps/OldaleTown_House2/scripts.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
@@ -1,19 +1,19 @@
 OldaleTown_House2_MapScripts:: @ 81FBF5A
 	.byte 0
 
-OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B
-	msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC
+OldaleTown_House2_EventScript_Woman:: @ 81FBF5B
+	msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC
 	end
 
-OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64
-	msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC
+OldaleTown_House2_EventScript_Man:: @ 81FBF64
+	msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC
 	end
 
-OldaleTown_House2_Text_1FBF6D: @ 81FBF6D
+OldaleTown_House2_Text_PokemonLevelUp: @ 81FBF6D
 	.string "When POKéMON battle, they eventually\n"
 	.string "level up and become stronger.$"
 
-OldaleTown_House2_Text_1FBFB0: @ 81FBFB0
+OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon: @ 81FBFB0
 	.string "If the POKéMON with you become\n"
 	.string "stronger, you'll be able to go farther\l"
 	.string "away from here.$"
diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json
index 9f1f894ce..a27fad497 100644
--- a/data/maps/OldaleTown_Mart/map.json
+++ b/data/maps/OldaleTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_Mart_EventScript_1FC240",
+      "script": "OldaleTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_Mart_EventScript_1FC28A",
+      "script": "OldaleTown_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_Mart_EventScript_1FC2A9",
+      "script": "OldaleTown_Mart_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 38b978d45..33d26cbfb 100644
--- a/data/maps/OldaleTown_Mart/scripts.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 OldaleTown_Mart_MapScripts:: @ 81FC23F
 	.byte 0
 
-OldaleTown_Mart_EventScript_1FC240:: @ 81FC240
+OldaleTown_Mart_EventScript_Clerk:: @ 81FC240
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C
-	pokemart OldaleTown_Mart_Pokemart_1FC260
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_ExpandedItems
+	pokemart OldaleTown_Mart_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_Mart_Pokemart_1FC260: @ 81FC260
+OldaleTown_Mart_Pokemart_Basic: @ 81FC260
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -21,14 +21,14 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260
 	release
 	end
 
-OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C
-	pokemart OldaleTown_Mart_Pokemart_1FC27C
+OldaleTown_Mart_ExpandedItems:: @ 81FC26C
+	pokemart OldaleTown_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C
+OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
@@ -38,32 +38,32 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C
 	release
 	end
 
-OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A
+OldaleTown_Mart_EventScript_Woman:: @ 81FC28A
 	lock
 	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC29F
-	msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock
+	msgbox OldaleTown_Mart_Text_PokeBallsAreSoldOut, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F
-	msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT
+OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 81FC29F
+	msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9
-	msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC
+OldaleTown_Mart_EventScript_Boy:: @ 81FC2A9
+	msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC
 	end
 
-OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2
+OldaleTown_Mart_Text_PokeBallsAreSoldOut: @ 81FC2B2
 	.string "The clerk says they're all sold out.\n"
 	.string "I can't buy any POKé BALLS.$"
 
-OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3
+OldaleTown_Mart_Text_ImGoingToBuyPokeBalls: @ 81FC2F3
 	.string "I'm going to buy a bunch of POKé BALLS\n"
 	.string "and catch a bunch of POKéMON!$"
 
-OldaleTown_Mart_Text_1FC338: @ 81FC338
+OldaleTown_Mart_Text_RestoreHPWithPotion: @ 81FC338
 	.string "If a POKéMON gets hurt and loses its HP\n"
 	.string "and faints, it won't be able to battle.\p"
 	.string "To prevent your POKéMON from fainting,\n"
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json
index 7c9ed89a0..2f92a004c 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.json
+++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A",
+      "script": "OldaleTown_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index 9df202d09..df405376a 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A
+@ VAR_0x800B is the Nurse's object event id
+OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,46 +17,46 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028
-	msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC
+OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FC028
+	msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031
-	msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC
+OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 81FC031
+	msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A
+OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F
-	msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable
+	msgbox OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F
-	msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT
+OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 81FC04F
+	msgbox OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059
+OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: @ 81FC059
 	.string "That PC in the corner there is\n"
 	.string "for any POKéMON TRAINER to use.\p"
 	.string "Naturally, that means you're welcome\n"
 	.string "to use it, too.$"
 
-OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD
+OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: @ 81FC0CD
 	.string "POKéMON CENTERS are great!\p"
 	.string "You can use their services as much\n"
 	.string "as you like, and it's all for free.\l"
 	.string "You never have to worry!$"
 
-OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148
+OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable: @ 81FC148
 	.string "The POKéMON WIRELESS CLUB on\n"
 	.string "the second floor was built recently.\p"
 	.string "But they say they're still making\n"
 	.string "adjustments.$"
 
-OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9
+OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub: @ 81FC1B9
 	.string "The POKéMON WIRELESS CLUB on\n"
 	.string "the second floor was built recently.\p"
 	.string "I traded POKéMON right away.$"
diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json
index 3070d9c07..ff64a5967 100644
--- a/data/maps/PacifidlogTown/map.json
+++ b/data/maps/PacifidlogTown/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_EventScript_1EBACC",
+      "script": "PacifidlogTown_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_EventScript_1EBAD5",
+      "script": "PacifidlogTown_EventScript_Fisherman",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_EventScript_1EBAC3",
+      "script": "PacifidlogTown_EventScript_NinjaBoy",
       "flag": "0"
     }
   ],
@@ -125,7 +125,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PacifidlogTown_EventScript_1EBADE"
+      "script": "PacifidlogTown_EventScript_TownSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc
index 26e9924ed..fc491cfe3 100644
--- a/data/maps/PacifidlogTown/scripts.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
@@ -1,44 +1,44 @@
 PacifidlogTown_MapScripts:: @ 81EBAB1
 	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0
+	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume
 	.byte 0
 
 PacifidlogTown_OnTransition: @ 81EBABC
 	setflag FLAG_VISITED_PACIFIDLOG_TOWN
 	end
 
-PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0
+PacifidlogTown_OnResume: @ 81EBAC0
 	setstepcallback STEP_CB_PACIFIDLOG_BRIDGE
 	end
 
-PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3
-	msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC
+PacifidlogTown_EventScript_NinjaBoy:: @ 81EBAC3
+	msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_1EBACC:: @ 81EBACC
-	msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC
+PacifidlogTown_EventScript_Girl:: @ 81EBACC
+	msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5
-	msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC
+PacifidlogTown_EventScript_Fisherman:: @ 81EBAD5
+	msgbox PacifidlogTown_Text_SkyPillarTooScary, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_1EBADE:: @ 81EBADE
-	msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN
+PacifidlogTown_EventScript_TownSign:: @ 81EBADE
+	msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-PacifidlogTown_Text_1EBAE7: @ 81EBAE7
+PacifidlogTown_Text_FastRunningCurrent: @ 81EBAE7
 	.string "The sea between PACIFIDLOG and\n"
 	.string "SLATEPORT has a fast-running tide.\p"
 	.string "If you decide to SURF, you could end\n"
 	.string "up swept away somewhere else.$"
 
-PacifidlogTown_Text_1EBB6C: @ 81EBB6C
+PacifidlogTown_Text_NeatHousesOnWater: @ 81EBB6C
 	.string "See, isn't it neat?\n"
 	.string "These houses are on water!\p"
 	.string "I was born here!$"
 
-PacifidlogTown_Text_1EBBAC: @ 81EBBAC
+PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC
 	.string "The SKY PILLAR?\p"
 	.string "…Oh, you must mean that tall, tall\n"
 	.string "tower a little further out.\p"
@@ -47,7 +47,7 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC
 	.string "Life at sea level in PACIFIDLOG,\n"
 	.string "that suits me fine.$"
 
-PacifidlogTown_Text_1EBC7A: @ 81EBC7A
+PacifidlogTown_Text_TownSign: @ 81EBC7A
 	.string "PACIFIDLOG TOWN\p"
 	.string "“Where the morning sun smiles upon\n"
 	.string "the waters.”$"
diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json
index 1e48da85c..8f7357246 100644
--- a/data/maps/PacifidlogTown_House1/map.json
+++ b/data/maps/PacifidlogTown_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House1_EventScript_20365D",
+      "script": "PacifidlogTown_House1_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House1_EventScript_203666",
+      "script": "PacifidlogTown_House1_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index 937b645bc..7759cb29a 100644
--- a/data/maps/PacifidlogTown_House1/scripts.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House1_MapScripts:: @ 820365C
 	.byte 0
 
-PacifidlogTown_House1_EventScript_20365D:: @ 820365D
-	msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC
+PacifidlogTown_House1_EventScript_Man:: @ 820365D
+	msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC
 	end
 
-PacifidlogTown_House1_EventScript_203666:: @ 8203666
-	msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC
+PacifidlogTown_House1_EventScript_Woman:: @ 8203666
+	msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC
 	end
 
-PacifidlogTown_House1_Text_20366F: @ 820366F
+PacifidlogTown_House1_Text_RegiStory: @ 820366F
 	.string "In the HOENN region, there are three\n"
 	.string "POKéMON that represent the power of\l"
 	.string "rock, ice, and steel.\p"
@@ -18,7 +18,7 @@ PacifidlogTown_House1_Text_20366F: @ 820366F
 	.string "That's the story I heard when I was\n"
 	.string "just a little kid.$"
 
-PacifidlogTown_House1_Text_20373A: @ 820373A
+PacifidlogTown_House1_Text_SixDotsOpenThreeDoors: @ 820373A
 	.string "“Six dots open three doors.”\p"
 	.string "Grandpa used to say that, but I don't\n"
 	.string "know what he meant.$"
diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json
index d57720795..8c9cd91af 100644
--- a/data/maps/PacifidlogTown_House2/map.json
+++ b/data/maps/PacifidlogTown_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House2_EventScript_203792",
+      "script": "PacifidlogTown_House2_EventScript_FanClubYoungerBrother",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House2_EventScript_203891",
+      "script": "PacifidlogTown_House2_EventScript_HappyAzurill",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House2_EventScript_2038AC",
+      "script": "PacifidlogTown_House2_EventScript_UnhappyAzurill",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 4f646ff43..d22a87dc9 100644
--- a/data/maps/PacifidlogTown_House2/scripts.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
@@ -1,101 +1,101 @@
 PacifidlogTown_House2_MapScripts:: @ 8203791
 	.byte 0
 
-PacifidlogTown_House2_EventScript_203792:: @ 8203792
+PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792
 	lock
 	faceplayer
 	dotimebasedevents
-	call PacifidlogTown_House2_EventScript_2037DE
-	goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E
-	call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8
-	call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_203801
+	call PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag
+	goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_ComeBackInXDays
+	call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_MonAssessment
+	call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment
 	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	compare VAR_RESULT, 4
-	goto_if_ge PacifidlogTown_House2_EventScript_203816
+	goto_if_ge PacifidlogTown_House2_EventScript_GiveReturn
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	compare VAR_RESULT, 2
-	goto_if_ge PacifidlogTown_House2_EventScript_203845
-	goto PacifidlogTown_House2_EventScript_20384F
+	goto_if_ge PacifidlogTown_House2_EventScript_PutInEffort
+	goto PacifidlogTown_House2_EventScript_GiveFrustration
 	end
 
-PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
+PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 82037DE
 	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare VAR_RESULT, 0
-	call_if_eq PacifidlogTown_House2_EventScript_203812
+	call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM
 	return
 
-PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8
-	msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT
+PacifidlogTown_House2_EventScript_MonAssessment:: @ 82037F8
+	msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT
 	return
 
-PacifidlogTown_House2_EventScript_203801:: @ 8203801
-	msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT
-	msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT
+PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 8203801
+	msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT
 	return
 
-PacifidlogTown_House2_EventScript_203812:: @ 8203812
+PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812
 	clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	return
 
-PacifidlogTown_House2_EventScript_203816:: @ 8203816
-	msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT
+PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816
+	msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM27
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
-	msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_203845:: @ 8203845
-	msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT
+PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845
+	msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_20384F:: @ 820384F
-	msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT
+PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F
+	msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM21
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
-	msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_20387E:: @ 820387E
+PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 820387E
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	buffernumberstring 0, VAR_RESULT
-	msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_203891:: @ 8203891
+PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 0
-	msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT
 	waitmoncry
-	msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC
+PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 2
-	msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT
 	waitmoncry
-	msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_Text_2038C7: @ 82038C7
+PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7
 	.string "Er-hem!\p"
 	.string "I am the POKéMON FAN CLUB's most\n"
 	.string "important person, the CHAIRMAN's\l"
@@ -103,50 +103,50 @@ PacifidlogTown_House2_Text_2038C7: @ 82038C7
 	.string "I'm here enjoying my vacation with\n"
 	.string "POKéMON, yes, indeed.$"
 
-PacifidlogTown_House2_Text_20395B: @ 820395B
+PacifidlogTown_House2_Text_AhYourPokemon: @ 820395B
 	.string "Ah!\n"
 	.string "Your POKéMON…$"
 
-PacifidlogTown_House2_Text_20396D: @ 820396D
+PacifidlogTown_House2_Text_AdoringPokemonTakeThis: @ 820396D
 	.string "It clearly likes you very much.\p"
 	.string "A POKéMON that adoring and adorable\n"
 	.string "deserves a TM like this, no?$"
 
-PacifidlogTown_House2_Text_2039CE: @ 82039CE
+PacifidlogTown_House2_Text_PutInSomeMoreEffort: @ 82039CE
 	.string "Hmm…\n"
 	.string "It's not bad, but it's also not good.\p"
 	.string "You, as the TRAINER, need to put in\n"
 	.string "some more effort.$"
 
-PacifidlogTown_House2_Text_203A2F: @ 8203A2F
+PacifidlogTown_House2_Text_ViciousPokemonTakeThis: @ 8203A2F
 	.string "It has a vicious look to it.\p"
 	.string "A frightening POKéMON like that\n"
 	.string "deserves a TM like this.$"
 
-PacifidlogTown_House2_Text_203A85: @ 8203A85
+PacifidlogTown_House2_Text_ExplainReturnFrustration: @ 8203A85
 	.string "If a POKéMON likes you a lot, RETURN's\n"
 	.string "power is enhanced.\p"
 	.string "If it doesn't like you, FRUSTRATION's\n"
 	.string "power goes up.$"
 
-PacifidlogTown_House2_Text_203AF4: @ 8203AF4
+PacifidlogTown_House2_Text_GetGoodTMInXDays: @ 8203AF4
 	.string "Oh, yes. In about {STR_VAR_1} or so days,\n"
 	.string "I should be getting a good TM or two.\p"
 	.string "You should come see me then.\n"
 	.string "I'll give you a TM that's suitable for\l"
 	.string "your POKéMON.$"
 
-PacifidlogTown_House2_Text_203B8D: @ 8203B8D
+PacifidlogTown_House2_Text_Rurii: @ 8203B8D
 	.string "AZURILL: Rurii.$"
 
-PacifidlogTown_House2_Text_203B9D: @ 8203B9D
+PacifidlogTown_House2_Text_VeryFriendlyWithTrainer: @ 8203B9D
 	.string "It appears to be very friendly with the\n"
 	.string "TRAINER.$"
 
-PacifidlogTown_House2_Text_203BCE: @ 8203BCE
+PacifidlogTown_House2_Text_Rururi: @ 8203BCE
 	.string "AZURILL: Rururi!$"
 
-PacifidlogTown_House2_Text_203BDF: @ 8203BDF
+PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch: @ 8203BDF
 	.string "It doesn't appear to like the TRAINER\n"
 	.string "very much.$"
 
diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json
index 181d69a80..11bd0761b 100644
--- a/data/maps/PacifidlogTown_House3/map.json
+++ b/data/maps/PacifidlogTown_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House3_EventScript_203CB5",
+      "script": "PacifidlogTown_House3_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House3_EventScript_203C11",
+      "script": "PacifidlogTown_House3_EventScript_Trader",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 9633ddc8b..ea33c8d01 100644
--- a/data/maps/PacifidlogTown_House3/scripts.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
@@ -1,59 +1,59 @@
 PacifidlogTown_House3_MapScripts:: @ 8203C10
 	.byte 0
 
-PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
+PacifidlogTown_House3_EventScript_Trader:: @ 8203C11
 	lock
 	faceplayer
-	goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB
+	goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted
 	setvar VAR_0x8008, INGAME_TRADE_HORSEA
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House3_EventScript_203C93
-	special sub_81B94B0
+	msgbox PacifidlogTown_House3_Text_WillingToTradeIt, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, 255
-	goto_if_eq PacifidlogTown_House3_EventScript_203C93
+	goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne PacifidlogTown_House3_EventScript_203C9D
+	goto_if_ne PacifidlogTown_House3_EventScript_NotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
 	bufferspeciesname 0, VAR_0x8009
-	msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou, MSGBOX_DEFAULT
 	setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	release
 	end
 
-PacifidlogTown_House3_EventScript_203C93:: @ 8203C93
-	msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT
+PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8203C93
+	msgbox PacifidlogTown_House3_Text_NotDesperateOrAnything, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D
+PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 8203C9D
 	bufferspeciesname 0, VAR_0x8009
-	msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB
-	msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT
+PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8203CAB
+	msgbox PacifidlogTown_House3_Text_ReallyWantedToGetBagon, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5
-	msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC
+PacifidlogTown_House3_EventScript_Girl:: @ 8203CB5
+	msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC
 	end
 
-PacifidlogTown_House3_Text_203CBE: @ 8203CBE
+PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE
 	.string "Check out this {STR_VAR_2}!\p"
 	.string "It's the {STR_VAR_2} that I caught\n"
 	.string "yesterday to celebrate my birthday!\p"
@@ -62,29 +62,29 @@ PacifidlogTown_House3_Text_203CBE: @ 8203CBE
 	.string "I'll tell you what. I might be willing\n"
 	.string "to trade it for a {STR_VAR_1}.$"
 
-PacifidlogTown_House3_Text_203D87: @ 8203D87
+PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou: @ 8203D87
 	.string "Oh, so this is a {STR_VAR_1}?\p"
 	.string "It's sort of like a {STR_VAR_2},\n"
 	.string "and yet it's subtly different.\p"
 	.string "Thank you!$"
 
-PacifidlogTown_House3_Text_203DDE: @ 8203DDE
+PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon: @ 8203DDE
 	.string "No, no, no! I won't accept any\n"
 	.string "less than a real {STR_VAR_1}!$"
 
-PacifidlogTown_House3_Text_203E12: @ 8203E12
+PacifidlogTown_House3_Text_NotDesperateOrAnything: @ 8203E12
 	.string "Oh, so you're not going to go through\n"
 	.string "with this?\p"
 	.string "That's cool. I'm not desperate to make\n"
 	.string "a trade or anything.$"
 
-PacifidlogTown_House3_Text_203E7F: @ 8203E7F
+PacifidlogTown_House3_Text_ReallyWantedToGetBagon: @ 8203E7F
 	.string "I know I could go looking for one\n"
 	.string "on my own, but…\p"
 	.string "But I really wanted to get a BAGON\n"
 	.string "that another TRAINER caught…$"
 
-PacifidlogTown_House3_Text_203EF1: @ 8203EF1
+PacifidlogTown_House3_Text_IsThatAPokedex: @ 8203EF1
 	.string "Is that a POKéDEX?\p"
 	.string "Did you get to meet a lot of different\n"
 	.string "POKéMON?\p"
diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json
index d38384fc9..f196f6a8a 100644
--- a/data/maps/PacifidlogTown_House4/map.json
+++ b/data/maps/PacifidlogTown_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House4_EventScript_203F55",
+      "script": "PacifidlogTown_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House4_EventScript_203F4C",
+      "script": "PacifidlogTown_House4_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House4_EventScript_203F5E",
+      "script": "PacifidlogTown_House4_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index e9f5f19e7..42a988bc2 100644
--- a/data/maps/PacifidlogTown_House4/scripts.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
@@ -1,53 +1,53 @@
 PacifidlogTown_House4_MapScripts:: @ 8203F4B
 	.byte 0
 
-PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C
-	msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC
+PacifidlogTown_House4_EventScript_LittleGirl:: @ 8203F4C
+	msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC
 	end
 
-PacifidlogTown_House4_EventScript_203F55:: @ 8203F55
-	msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC
+PacifidlogTown_House4_EventScript_Woman:: @ 8203F55
+	msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC
 	end
 
-PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E
+PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E
 	lock
 	faceplayer
-	msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq PacifidlogTown_House4_EventScript_203F7F
-	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House4_EventScript_203F89
+	msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq PacifidlogTown_House4_EventScript_Yes
+	compare VAR_RESULT, NO
+	goto_if_eq PacifidlogTown_House4_EventScript_No
 	end
 
-PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F
-	msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT
+PacifidlogTown_House4_EventScript_Yes:: @ 8203F7F
+	msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House4_EventScript_203F89:: @ 8203F89
-	msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT
+PacifidlogTown_House4_EventScript_No:: @ 8203F89
+	msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House4_Text_203F93: @ 8203F93
+PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon: @ 8203F93
 	.string "People were saying they saw a POKéMON\n"
 	.string "flying high above HOENN.\p"
 	.string "Is it flying around all the time?\n"
 	.string "Doesn't it need to rest somewhere?$"
 
-PacifidlogTown_House4_Text_204017: @ 8204017
+PacifidlogTown_House4_Text_SkyPokemon: @ 8204017
 	.string "A sky POKéMON!\n"
 	.string "A sky POKéMON!$"
 
-PacifidlogTown_House4_Text_204035: @ 8204035
+PacifidlogTown_House4_Text_WhereDidYouComeFrom: @ 8204035
 	.string "Where did you come from?$"
 
-PacifidlogTown_House4_Text_20404E: @ 820404E
+PacifidlogTown_House4_Text_YesTown: @ 820404E
 	.string "Yes?\n"
 	.string "YES TOWN?\p"
 	.string "I've never heard of a place like that.$"
 
-PacifidlogTown_House4_Text_204084: @ 8204084
+PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere: @ 8204084
 	.string "No? That doesn't make any sense.\n"
 	.string "You have to come from somewhere.\p"
 	.string "Oh! Wait! You're not going to say you\n"
diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json
index db7e51c46..c828d7a29 100644
--- a/data/maps/PacifidlogTown_House5/map.json
+++ b/data/maps/PacifidlogTown_House5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House5_EventScript_204111",
+      "script": "PacifidlogTown_House5_EventScript_MirageIslandWatcher",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_House5_EventScript_204137",
+      "script": "PacifidlogTown_House5_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index cdc54fefe..f8be20f47 100644
--- a/data/maps/PacifidlogTown_House5/scripts.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
@@ -1,33 +1,33 @@
 PacifidlogTown_House5_MapScripts:: @ 8204110
 	.byte 0
 
-PacifidlogTown_House5_EventScript_204111:: @ 8204111
+PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsMirageIslandPresent
-	compare VAR_RESULT, 1
-	goto_if_eq PacifidlogTown_House5_EventScript_20412D
-	msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq PacifidlogTown_House5_EventScript_MirageIslandPresent
+	msgbox PacifidlogTown_House5_Text_CantSeeMirageIslandToday, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House5_EventScript_20412D:: @ 820412D
-	msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT
+PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 820412D
+	msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House5_EventScript_204137:: @ 8204137
-	msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC
+PacifidlogTown_House5_EventScript_Gentleman:: @ 8204137
+	msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC
 	end
 
-PacifidlogTown_House5_Text_204140: @ 8204140
+PacifidlogTown_House5_Text_CantSeeMirageIslandToday: @ 8204140
 	.string "I can't see MIRAGE ISLAND today…$"
 
-PacifidlogTown_House5_Text_204161: @ 8204161
+PacifidlogTown_House5_Text_CanSeeMirageIslandToday: @ 8204161
 	.string "Oh! Oh my!\n"
 	.string "I can see MIRAGE ISLAND today!$"
 
-PacifidlogTown_House5_Text_20418B: @ 820418B
+PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather: @ 820418B
 	.string "MIRAGE ISLAND…\p"
 	.string "It must become visible and invisible\n"
 	.string "depending on the weather conditions\l"
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
index 83fdd1f79..dd5dfcb9c 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index e51f6e89f..8b0f0805a 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
 	setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6
+@ VAR_0x800B is the Nurse's object event id
+PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: @ 82034B6
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,29 +16,29 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6
 	release
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_Girl:: @ 82034C4
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_Woman:: @ 82034CD
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_OldMan:: @ 82034D6
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF
+PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard: @ 82034DF
 	.string "What color is your TRAINER CARD?\n"
 	.string "Mine's copper!$"
 
-PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F
+PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola: @ 820350F
 	.string "PACIFIDLOG TOWN floats on top of\n"
 	.string "a colony of CORSOLA.\p"
 	.string "If I told you that, would you believe\n"
 	.string "me?$"
 
-PacifidlogTown_PokemonCenter_1F_Text_20356F: @ 820356F
+PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats: @ 820356F
 	.string "The ancestors of the people in\n"
 	.string "PACIFIDLOG were said to have been\l"
 	.string "born on boats and then lived and died \l"
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index f6a21b0b8..d9f299db2 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -791,9 +791,9 @@ PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8205137
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 85
 	msgbox PetalburgCity_Gym_Text_EnterSpeedRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -822,9 +822,9 @@ PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 98
 	msgbox PetalburgCity_Gym_Text_EnterAccuracyRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -835,9 +835,9 @@ PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 46
 	msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -848,9 +848,9 @@ PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -861,9 +861,9 @@ PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -874,9 +874,9 @@ PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 72
 	msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -887,9 +887,9 @@ PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -900,9 +900,9 @@ PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -913,9 +913,9 @@ PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -926,9 +926,9 @@ PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -939,9 +939,9 @@ PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
@@ -952,9 +952,9 @@ PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 60b56837c..151cd8afb 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -8,6 +8,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
+@ VAR_0x800B is the Nurse's object event id
 PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index 79179ffa6..4c53891fd 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -26,7 +26,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
 	applymovement 3, PetalburgWoods_Movement_AquaApproachPlayer
 	waitmovement 0
 	msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
+	trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
 	applymovement 3, PetalburgWoods_Movement_AquaBackOff
 	waitmovement 0
 	call PetalburgWoods_EventScript_DevonResearcherPostBattle
@@ -62,7 +62,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
+	trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
 	applymovement 3, PetalburgWoods_Movement_AquaBackOff
 	waitmovement 0
 	call PetalburgWoods_EventScript_DevonResearcherPostBattle
@@ -290,7 +290,7 @@ PetalburgWoods_EventScript_James:: @ 822E284
 	end
 
 PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5
-	special sub_80B4808
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames
 	release
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 7e8cfb959..71dbf96cc 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_1EBDFB",
+      "script": "Route101_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_1EBE16",
+      "script": "Route101_EventScript_BirchsBag",
       "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_1EBE04",
+      "script": "Route101_EventScript_Boy",
       "flag": "FLAG_HIDE_ROUTE_101_BOY"
     }
   ],
@@ -113,7 +113,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "1",
-      "script": "Route101_EventScript_1EBCDE"
+      "script": "Route101_EventScript_StartBirchRescue"
     },
     {
       "type": "trigger",
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "1",
-      "script": "Route101_EventScript_1EBCDE"
+      "script": "Route101_EventScript_StartBirchRescue"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD4E"
+      "script": "Route101_EventScript_PreventExitSouth"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD4E"
+      "script": "Route101_EventScript_PreventExitSouth"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD64"
+      "script": "Route101_EventScript_PreventExitWest"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD64"
+      "script": "Route101_EventScript_PreventExitWest"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD64"
+      "script": "Route101_EventScript_PreventExitWest"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD64"
+      "script": "Route101_EventScript_PreventExitWest"
     },
     {
       "type": "trigger",
@@ -185,7 +185,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE101_STATE",
       "var_value": "2",
-      "script": "Route101_EventScript_1EBD7A"
+      "script": "Route101_EventScript_PreventExitNorth"
     }
   ],
   "bg_events": [
@@ -195,7 +195,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route101_EventScript_1EBE0D"
+      "script": "Route101_EventScript_RouteSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 3b5b22b37..dca3dc47d 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,86 +1,86 @@
 Route101_MapScripts:: @ 81EBCBA
 	map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame
 	.byte 0
 
 Route101_OnTransition: @ 81EBCC5
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route101_MapScript2_1EBCCB: @ 81EBCCB
-	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5
+Route101_OnFrame: @ 81EBCCB
+	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup
 	.2byte 0
 
-Route101_EventScript_1EBCD5:: @ 81EBCD5
+Route101_EventScript_HideMapNamePopup:: @ 81EBCD5
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE101_STATE, 1
 	end
 
-Route101_EventScript_1EBCDE:: @ 81EBCDE
+Route101_EventScript_StartBirchRescue:: @ 81EBCDE
 	lockall
 	playbgm MUS_EVENT0, 1
-	msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT
+	msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT
 	closemessage
 	setobjectxy 2, 0, 15
 	setobjectxy 4, 0, 16
-	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBDC2
-	applymovement 2, Route101_Movement_1EBDE7
-	applymovement 4, Route101_Movement_1EBDB5
+	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene
+	applymovement 2, Route101_Movement_BirchRunAway1
+	applymovement 4, Route101_Movement_PoochyenaChase1
 	waitmovement 0
-	applymovement 4, Route101_Movement_1EBD96
-	applymovement 2, Route101_Movement_1EBDC8
+	applymovement 4, Route101_Movement_PoochyenaChaseInCircles
+	applymovement 2, Route101_Movement_BirchRunInCircles
 	waitmovement 0
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 4, Route101_Movement_1EBDBD
-	applymovement 2, Route101_Movement_1EBDEF
+	applymovement 4, Route101_Movement_PoochyenaFaceBirch
+	applymovement 2, Route101_Movement_BirchFacePoochyena
 	waitmovement 0
-	msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT
+	msgbox Route101_Text_PleaseHelp, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_ROUTE101_STATE, 2
 	releaseall
 	end
 
-Route101_EventScript_1EBD4E:: @ 81EBD4E
+Route101_EventScript_PreventExitSouth:: @ 81EBD4E
 	lockall
-	msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT
+	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD90
+	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth
 	waitmovement 0
 	releaseall
 	end
 
-Route101_EventScript_1EBD64:: @ 81EBD64
+Route101_EventScript_PreventExitWest:: @ 81EBD64
 	lockall
-	msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT
+	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD92
+	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest
 	waitmovement 0
 	releaseall
 	end
 
-Route101_EventScript_1EBD7A:: @ 81EBD7A
+Route101_EventScript_PreventExitNorth:: @ 81EBD7A
 	lockall
-	msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT
+	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD94
+	applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth
 	waitmovement 0
 	releaseall
 	end
 
-Route101_Movement_1EBD90: @ 81EBD90
+Route101_Movement_PreventExitSouth: @ 81EBD90
 	walk_up
 	step_end
 
-Route101_Movement_1EBD92: @ 81EBD92
+Route101_Movement_PreventExitWest: @ 81EBD92
 	walk_right
 	step_end
 
-Route101_Movement_1EBD94: @ 81EBD94
+Route101_Movement_PreventExitNorth: @ 81EBD94
 	walk_down
 	step_end
 
-Route101_Movement_1EBD96: @ 81EBD96
+Route101_Movement_PoochyenaChaseInCircles: @ 81EBD96
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -113,7 +113,7 @@ Route101_Movement_1EBD96: @ 81EBD96
 	walk_fast_left
 	step_end
 
-Route101_Movement_1EBDB5: @ 81EBDB5
+Route101_Movement_PoochyenaChase1: @ 81EBDB5
 	walk_fast_up
 	walk_fast_right
 	walk_fast_right
@@ -122,17 +122,17 @@ Route101_Movement_1EBDB5: @ 81EBDB5
 	walk_fast_up
 	step_end
 
-Route101_Movement_1EBDBC: @ 81EBDBC
+@ Leftover data? This command is unused.
 	step_end
 
-Route101_Movement_1EBDBD: @ 81EBDBD
+Route101_Movement_PoochyenaFaceBirch: @ 81EBDBD
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	step_end
 
-Route101_Movement_1EBDC2: @ 81EBDC2
+Route101_Movement_EnterScene: @ 81EBDC2
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -140,7 +140,7 @@ Route101_Movement_1EBDC2: @ 81EBDC2
 	walk_in_place_fastest_left
 	step_end
 
-Route101_Movement_1EBDC8: @ 81EBDC8
+Route101_Movement_BirchRunInCircles: @ 81EBDC8
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -173,7 +173,7 @@ Route101_Movement_1EBDC8: @ 81EBDC8
 	walk_fast_left
 	step_end
 
-Route101_Movement_1EBDE7: @ 81EBDE7
+Route101_Movement_BirchRunAway1: @ 81EBDE7
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -182,40 +182,40 @@ Route101_Movement_1EBDE7: @ 81EBDE7
 	walk_fast_up
 	step_end
 
-Route101_Movement_1EBDEE: @ 81EBDEE
+@ Leftover data? This command is unused.
 	step_end
 
-Route101_Movement_1EBDEF: @ 81EBDEF
+Route101_Movement_BirchFacePoochyena: @ 81EBDEF
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	step_end
 
-Route101_Movement_1EBDF4: @ 81EBDF4
+Route101_Movement_Unused1: @ 81EBDF4
 	walk_up
 	walk_up
 	step_end
 
-Route101_Movement_1EBDF7: @ 81EBDF7
+Route101_Movement_Unused2: @ 81EBDF7
 	walk_up
 	walk_left
 	walk_up
 	step_end
 
-Route101_EventScript_1EBDFB:: @ 81EBDFB
-	msgbox Route101_Text_1EBFDD, MSGBOX_NPC
+Route101_EventScript_Youngster:: @ 81EBDFB
+	msgbox Route101_Text_TakeTiredPokemonToPokeCenter, MSGBOX_NPC
 	end
 
-Route101_EventScript_1EBE04:: @ 81EBE04
-	msgbox Route101_Text_1EC04A, MSGBOX_NPC
+Route101_EventScript_Boy:: @ 81EBE04
+	msgbox Route101_Text_WildPokemonInTallGrass, MSGBOX_NPC
 	end
 
-Route101_EventScript_1EBE0D:: @ 81EBE0D
-	msgbox Route101_Text_1EC0C8, MSGBOX_SIGN
+Route101_EventScript_RouteSign:: @ 81EBE0D
+	msgbox Route101_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route101_EventScript_1EBE16:: @ 81EBE16
+Route101_EventScript_BirchsBag:: @ 81EBE16
 	lock
 	faceplayer
 	setflag FLAG_SYS_POKEMON_GET
@@ -227,9 +227,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	waitmovement 0
 	special ChooseStarter
 	waitstate
-	applymovement 2, Route101_Movement_1EBE8D
+	applymovement 2, Route101_Movement_BirchApproachPlayer
 	waitmovement 0
-	msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT
+	msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT
 	special HealPlayerParty
 	setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
@@ -239,40 +239,40 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq Route101_EventScript_1EBE85
+	call_if_eq Route101_EventScript_HideMayInBedroom
 	compare VAR_RESULT, FEMALE
-	call_if_eq Route101_EventScript_1EBE89
+	call_if_eq Route101_EventScript_HideBrendanInBedroom
 	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
 	waitstate
 	release
 	end
 
-Route101_EventScript_1EBE85:: @ 81EBE85
+Route101_EventScript_HideMayInBedroom:: @ 81EBE85
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	return
 
-Route101_EventScript_1EBE89:: @ 81EBE89
+Route101_EventScript_HideBrendanInBedroom:: @ 81EBE89
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	return
 
-Route101_Movement_1EBE8D: @ 81EBE8D
+Route101_Movement_BirchApproachPlayer: @ 81EBE8D
 	walk_right
 	step_end
 
-Route101_Text_1EBE8F: @ 81EBE8F
+Route101_Text_HelpMe: @ 81EBE8F
 	.string "H-help me!$"
 
-Route101_Text_1EBE9A: @ 81EBE9A
+Route101_Text_PleaseHelp: @ 81EBE9A
 	.string "Hello! You over there!\n"
 	.string "Please! Help!\p"
 	.string "In my BAG!\n"
 	.string "There's a POKé BALL!$"
 
-Route101_Text_1EBEDF: @ 81EBEDF
+Route101_Text_DontLeaveMe: @ 81EBEDF
 	.string "Wh-Where are you going?!\n"
 	.string "Don't leave me like this!$"
 
-Route101_Text_1EBF12: @ 81EBF12
+Route101_Text_YouSavedMe: @ 81EBF12
 	.string "PROF. BIRCH: Whew…\p"
 	.string "I was in the tall grass studying wild\n"
 	.string "POKéMON when I was jumped.\p"
@@ -283,19 +283,19 @@ Route101_Text_1EBF12: @ 81EBF12
 	.string "This is not the place to chat, so come\n"
 	.string "by my POKéMON LAB later, okay?$"
 
-Route101_Text_1EBFDD: @ 81EBFDD
+Route101_Text_TakeTiredPokemonToPokeCenter: @ 81EBFDD
 	.string "If POKéMON get tired, take them to\n"
 	.string "a POKéMON CENTER.\p"
 	.string "There's a POKéMON CENTER in OLDALE\n"
 	.string "TOWN right close by.$"
 
-Route101_Text_1EC04A: @ 81EC04A
+Route101_Text_WildPokemonInTallGrass: @ 81EC04A
 	.string "Wild POKéMON will jump out at you in\n"
 	.string "tall grass.\p"
 	.string "If you want to catch POKéMON, you have\n"
 	.string "to go into the tall grass and search.$"
 
-Route101_Text_1EC0C8: @ 81EC0C8
+Route101_Text_RouteSign: @ 81EC0C8
 	.string "ROUTE 101\n"
 	.string "{UP_ARROW} OLDALE TOWN$"
 
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index 323c4142b..f8930a21d 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route102_EventScript_1EC0E1",
+      "script": "Route102_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route102_EventScript_1EC105",
+      "script": "Route102_EventScript_Calvin",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route102_EventScript_1EC1B3",
+      "script": "Route102_EventScript_Rick",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route102_EventScript_1EC1CA",
+      "script": "Route102_EventScript_Tiana",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route102_EventScript_1EC0FC",
+      "script": "Route102_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route102_EventScript_1EC1E1",
+      "script": "Route102_EventScript_Allen",
       "flag": "0"
     }
   ],
@@ -152,7 +152,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route102_EventScript_1EC0F3"
+      "script": "Route102_EventScript_RouteSignPetalburg"
     },
     {
       "type": "sign",
@@ -160,7 +160,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route102_EventScript_1EC0EA"
+      "script": "Route102_EventScript_RouteSignOldale"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc
index 5e7f48c93..b14f204e5 100644
--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -1,78 +1,78 @@
 Route102_MapScripts:: @ 81EC0E0
 	.byte 0
 
-Route102_EventScript_1EC0E1:: @ 81EC0E1
-	msgbox Route102_Text_1EC2C0, MSGBOX_NPC
+Route102_EventScript_LittleBoy:: @ 81EC0E1
+	msgbox Route102_Text_ImNotVeryTall, MSGBOX_NPC
 	end
 
-Route102_EventScript_1EC0EA:: @ 81EC0EA
-	msgbox Route102_Text_1EC35B, MSGBOX_SIGN
+Route102_EventScript_RouteSignOldale:: @ 81EC0EA
+	msgbox Route102_Text_RouteSignOldale, MSGBOX_SIGN
 	end
 
-Route102_EventScript_1EC0F3:: @ 81EC0F3
-	msgbox Route102_Text_1EC373, MSGBOX_SIGN
+Route102_EventScript_RouteSignPetalburg:: @ 81EC0F3
+	msgbox Route102_Text_RouteSignPetalburg, MSGBOX_SIGN
 	end
 
-Route102_EventScript_1EC0FC:: @ 81EC0FC
-	msgbox Route102_Text_1EC32E, MSGBOX_NPC
+Route102_EventScript_Boy:: @ 81EC0FC
+	msgbox Route102_Text_CatchWholeBunchOfPokemon, MSGBOX_NPC
 	end
 
-Route102_EventScript_1EC105:: @ 81EC105
-	trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146
+Route102_EventScript_Calvin:: @ 81EC105
+	trainerbattle_single TRAINER_CALVIN_1, Route102_Text_CalvinIntro, Route102_Text_CalvinDefeated, Route102_EventScript_CalvinRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route102_EventScript_1EC19C
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route102_EventScript_CalvinRematch
 	setvar VAR_0x8004, TRAINER_CALVIN_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route102_EventScript_1EC170
-	msgbox Route102_Text_2945AC, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route102_EventScript_CalvinTryRegister
+	msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route102_EventScript_1EC146:: @ 81EC146
-	special sub_80B4808
+Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC157
+	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegisterMatchCall
 	release
 	end
 
-Route102_EventScript_1EC157:: @ 81EC157
-	msgbox Route102_Text_294668, MSGBOX_DEFAULT
+Route102_EventScript_CalvinRegisterMatchCall:: @ 81EC157
+	msgbox Route102_Text_CalvinRegisterShort, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CALVIN_1
 	release
 	end
 
-Route102_EventScript_1EC170:: @ 81EC170
-	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC183
-	msgbox Route102_Text_2945AC, MSGBOX_DEFAULT
+Route102_EventScript_CalvinTryRegister:: @ 81EC170
+	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegister
+	msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route102_EventScript_1EC183:: @ 81EC183
-	msgbox Route102_Text_2945EB, MSGBOX_DEFAULT
+Route102_EventScript_CalvinRegister:: @ 81EC183
+	msgbox Route102_Text_CalvinRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CALVIN_1
 	release
 	end
 
-Route102_EventScript_1EC19C:: @ 81EC19C
-	trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C
-	msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE
+Route102_EventScript_CalvinRematch:: @ 81EC19C
+	trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_CalvinRematchIntro, Route102_Text_CalvinRematchDefeated
+	msgbox Route102_Text_CalvinRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_1EC1B3:: @ 81EC1B3
-	trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847
-	msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE
+Route102_EventScript_Rick:: @ 81EC1B3
+	trainerbattle_single TRAINER_RICK, Route102_Text_RickIntro, Route102_Text_RickDefeated
+	msgbox Route102_Text_RickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_1EC1CA:: @ 81EC1CA
-	trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3
-	msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE
+Route102_EventScript_Tiana:: @ 81EC1CA
+	trainerbattle_single TRAINER_TIANA, Route102_Text_TianaIntro, Route102_Text_TianaDefeated
+	msgbox Route102_Text_TianaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_1EC1E1:: @ 81EC1E1
-	trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA
-	msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE
+Route102_EventScript_Allen:: @ 81EC1E1
+	trainerbattle_single TRAINER_ALLEN, Route102_Text_AllenIntro, Route102_Text_AllenDefeated
+	msgbox Route102_Text_AllenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 Route102_Text_WatchMeCatchPokemon: @ 81EC1F8
@@ -91,21 +91,21 @@ Route102_Text_LetsGoBack: @ 81EC297
 	.string "{PLAYER}, thank you!\n"
 	.string "Let's go back to the GYM!$"
 
-Route102_Text_1EC2C0: @ 81EC2C0
+Route102_Text_ImNotVeryTall: @ 81EC2C0
 	.string "I'm…not very tall, so I sink right\n"
 	.string "into tall grass.\p"
 	.string "The grass goes up my nose and…\n"
 	.string "Fwafwafwafwafwa…\p"
 	.string "Fwatchoo!$"
 
-Route102_Text_1EC32E: @ 81EC32E
+Route102_Text_CatchWholeBunchOfPokemon: @ 81EC32E
 	.string "I'm going to catch a whole bunch of\n"
 	.string "POKéMON!$"
 
-Route102_Text_1EC35B: @ 81EC35B
+Route102_Text_RouteSignOldale: @ 81EC35B
 	.string "ROUTE 102\n"
 	.string "{RIGHT_ARROW} OLDALE TOWN$"
 
-Route102_Text_1EC373: @ 81EC373
+Route102_Text_RouteSignPetalburg: @ 81EC373
 	.string "ROUTE 102\n"
 	.string "{LEFT_ARROW} PETALBURG CITY$"
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 8f5b9f2b3..0a870a06e 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_1EC5E2",
+      "script": "Route103_EventScript_Man",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_1EC3C1",
+      "script": "Route103_EventScript_Rival",
       "flag": "FLAG_HIDE_ROUTE_103_RIVAL"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route103_EventScript_1EC5F4",
+      "script": "Route103_EventScript_Daisy",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route103_EventScript_1EC66E",
+      "script": "Route103_EventScript_Liv",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route103_EventScript_1EC60B",
+      "script": "Route103_EventScript_Amy",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route103_EventScript_1EC6D1",
+      "script": "Route103_EventScript_Andrew",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_1EC5D9",
+      "script": "Route103_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route103_EventScript_1EC6E8",
+      "script": "Route103_EventScript_Miguel",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route103_EventScript_1EC761",
+      "script": "Route103_EventScript_Rhett",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route103_EventScript_1EC74A",
+      "script": "Route103_EventScript_Marcos",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route103_EventScript_1EC78F",
+      "script": "Route103_EventScript_Isabelle",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route103_EventScript_1EC778",
+      "script": "Route103_EventScript_Pete",
       "flag": "0"
     },
     {
@@ -303,7 +303,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route103_EventScript_1EC5EB"
+      "script": "Route103_EventScript_RouteSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 9a185aa14..c614dae1c 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -1,6 +1,6 @@
 Route103_MapScripts:: @ 81EC38E
 	map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4
+	map_script MAP_SCRIPT_ON_LOAD, Route103_OnLoad
 	.byte 0
 
 Route103_OnTransition: @ 81EC399
@@ -8,26 +8,26 @@ Route103_OnTransition: @ 81EC399
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route103_MapScript1_1EC3A4: @ 81EC3A4
-	call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE
+Route103_OnLoad: @ 81EC3A4
+	call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_OpenAlteringCave
 	end
 
-Route103_EventScript_1EC3AE:: @ 81EC3AE
+Route103_EventScript_OpenAlteringCave:: @ 81EC3AE
 	setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-Route103_EventScript_1EC3C1:: @ 81EC3C1
+Route103_EventScript_Rival:: @ 81EC3C1
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route103_EventScript_1EC3DA
+	goto_if_eq Route103_EventScript_RivalMay
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route103_EventScript_1EC434
+	goto_if_eq Route103_EventScript_RivalBrendan
 	end
 
-Route103_EventScript_1EC3DA:: @ 81EC3DA
-	msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT
+Route103_EventScript_RivalMay:: @ 81EC3DA
+	msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_GIRL_SUP, 1
 	applymovement 2, Common_Movement_FacePlayer
@@ -36,15 +36,15 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT
+	msgbox Route103_Text_MayLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_1EC48E
-	case 1, Route103_EventScript_1EC49E
-	case 2, Route103_EventScript_1EC4AE
+	case 0, Route103_EventScript_StartMayBattleTreecko
+	case 1, Route103_EventScript_StartMayBattleTorchic
+	case 2, Route103_EventScript_StartMayBattleMudkip
 	end
 
-Route103_EventScript_1EC434:: @ 81EC434
-	msgbox Route103_Text_1EC989, MSGBOX_DEFAULT
+Route103_EventScript_RivalBrendan:: @ 81EC434
+	msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_BOY_SUP, 1
 	applymovement 2, Common_Movement_FacePlayer
@@ -53,92 +53,92 @@ Route103_EventScript_1EC434:: @ 81EC434
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT
+	msgbox Route103_Text_BrendanLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_1EC4BE
-	case 1, Route103_EventScript_1EC4CE
-	case 2, Route103_EventScript_1EC4DE
+	case 0, Route103_EventScript_StartBrendanBattleTreecko
+	case 1, Route103_EventScript_StartBrendanBattleTorchic
+	case 2, Route103_EventScript_StartBrendanBattleMudkip
 	end
 
-Route103_EventScript_1EC48E:: @ 81EC48E
-	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
+Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E
+	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated
+	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_1EC49E:: @ 81EC49E
-	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
+Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E
+	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated
+	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_1EC4AE:: @ 81EC4AE
-	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
+Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE
+	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated
+	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_1EC4BE:: @ 81EC4BE
-	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
+Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE
+	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated
+	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_1EC4CE:: @ 81EC4CE
-	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
+Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE
+	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated
+	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_1EC4DE:: @ 81EC4DE
-	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
+Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE
+	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated
+	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_1EC4EE:: @ 81EC4EE
-	msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT
-	goto Route103_EventScript_1EC50A
+Route103_EventScript_AfterMayBattle:: @ 81EC4EE
+	msgbox Route103_Text_MayTimeToHeadBack, MSGBOX_DEFAULT
+	goto Route103_EventScript_RivalExit
 	end
 
-Route103_EventScript_1EC4FC:: @ 81EC4FC
-	msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT
-	goto Route103_EventScript_1EC50A
+Route103_EventScript_AfterBrendanBattle:: @ 81EC4FC
+	msgbox Route103_Text_BrendanTimeToHeadBack, MSGBOX_DEFAULT
+	goto Route103_EventScript_RivalExit
 	end
 
-Route103_EventScript_1EC50A:: @ 81EC50A
+Route103_EventScript_RivalExit:: @ 81EC50A
 	closemessage
 	switch VAR_FACING
-	case DIR_SOUTH, Route103_EventScript_1EC585
-	case DIR_NORTH, Route103_EventScript_1EC53D
-	case DIR_WEST, Route103_EventScript_1EC561
-	case DIR_EAST, Route103_EventScript_1EC561
+	case DIR_SOUTH, Route103_EventScript_RivalExitFacingSouth
+	case DIR_NORTH, Route103_EventScript_RivalExitFacingNorth
+	case DIR_WEST, Route103_EventScript_RivalExitFacingEastOrWest
+	case DIR_EAST, Route103_EventScript_RivalExitFacingEastOrWest
 	end
 
-Route103_EventScript_1EC53D:: @ 81EC53D
-	applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5C8
-	applymovement 2, Route103_Movement_1EC5BE
+Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D
+	applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth
+	applymovement 2, Route103_Movement_RivalExitFacingNorth1
 	waitmovement 0
 	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5C1
+	applymovement 2, Route103_EventScript_RivalExitFacingNorth2
 	waitmovement 0
-	goto Route103_EventScript_1EC5A2
+	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_1EC561:: @ 81EC561
-	applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5D6
-	applymovement 2, Route103_Movement_1EC5CE
+Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
+	applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest
+	applymovement 2, Route103_Movement_RivalExit1
 	waitmovement 0
 	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5D0
+	applymovement 2, Route103_Movement_RivalExit2
 	waitmovement 0
-	goto Route103_EventScript_1EC5A2
+	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_1EC585:: @ 81EC585
-	applymovement 2, Route103_Movement_1EC5CE
+Route103_EventScript_RivalExitFacingSouth:: @ 81EC585
+	applymovement 2, Route103_Movement_RivalExit1
 	waitmovement 0
 	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5D0
+	applymovement 2, Route103_Movement_RivalExit2
 	waitmovement 0
-	goto Route103_EventScript_1EC5A2
+	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_1EC5A2:: @ 81EC5A2
+Route103_EventScript_RivalEnd:: @ 81EC5A2
 	removeobject 2
 	setvar VAR_BIRCH_LAB_STATE, 4
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
@@ -150,12 +150,12 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2
 	releaseall
 	end
 
-Route103_Movement_1EC5BE: @ 81EC5BE
+Route103_Movement_RivalExitFacingNorth1: @ 81EC5BE
 	walk_left
 	walk_down
 	step_end
 
-Route103_Movement_1EC5C1: @ 81EC5C1
+Route103_EventScript_RivalExitFacingNorth2: @ 81EC5C1
 	jump_2_down
 	delay_16
 	walk_down
@@ -164,7 +164,7 @@ Route103_Movement_1EC5C1: @ 81EC5C1
 	walk_down
 	step_end
 
-Route103_Movement_1EC5C8: @ 81EC5C8
+Route103_Movement_WatchRivalExitFacingNorth: @ 81EC5C8
 	delay_16
 	delay_4
 	walk_in_place_fastest_left
@@ -172,11 +172,11 @@ Route103_Movement_1EC5C8: @ 81EC5C8
 	walk_in_place_fastest_down
 	step_end
 
-Route103_Movement_1EC5CE: @ 81EC5CE
+Route103_Movement_RivalExit1: @ 81EC5CE
 	walk_down
 	step_end
 
-Route103_Movement_1EC5D0: @ 81EC5D0
+Route103_Movement_RivalExit2: @ 81EC5D0
 	jump_2_down
 	delay_16
 	walk_down
@@ -184,118 +184,118 @@ Route103_Movement_1EC5D0: @ 81EC5D0
 	walk_down
 	step_end
 
-Route103_Movement_1EC5D6: @ 81EC5D6
+Route103_Movement_WatchRivalExitFacingEastOrWest: @ 81EC5D6
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-Route103_EventScript_1EC5D9:: @ 81EC5D9
-	msgbox Route103_Text_1ECB73, MSGBOX_NPC
+Route103_EventScript_Boy:: @ 81EC5D9
+	msgbox Route103_Text_ShouldHaveBroughtPotion, MSGBOX_NPC
 	end
 
-Route103_EventScript_1EC5E2:: @ 81EC5E2
-	msgbox Route103_Text_1ECBB5, MSGBOX_NPC
+Route103_EventScript_Man:: @ 81EC5E2
+	msgbox Route103_Text_ShortcutToOldale, MSGBOX_NPC
 	end
 
-Route103_EventScript_1EC5EB:: @ 81EC5EB
-	msgbox Route103_Text_1ECC1A, MSGBOX_SIGN
+Route103_EventScript_RouteSign:: @ 81EC5EB
+	msgbox Route103_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route103_EventScript_1EC5F4:: @ 81EC5F4
-	trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F
-	msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE
+Route103_EventScript_Daisy:: @ 81EC5F4
+	trainerbattle_single TRAINER_DAISY, Route103_Text_DaisyIntro, Route103_Text_DaisyDefeated
+	msgbox Route103_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC60B:: @ 81EC60B
-	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
+Route103_EventScript_Amy:: @ 81EC60B
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyIntro, Route103_Text_AmyDefeated, Route103_Text_AmyNotEnoughPokemon, Route102_EventScript_AmyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route103_EventScript_1EC653
-	msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route102_EventScript_AmyRematch
+	msgbox Route103_Text_AmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC63A:: @ 81EC63A
-	msgbox Route103_Text_294B8A, MSGBOX_DEFAULT
+Route102_EventScript_AmyRegisterMatchCallAfterBattle:: @ 81EC63A
+	msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
-Route103_EventScript_1EC653:: @ 81EC653
-	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
-	msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE
+Route102_EventScript_AmyRematch:: @ 81EC653
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyRematchIntro, Route103_Text_AmyRematchDefeated, Route103_Text_AmyRematchNotEnoughPokemon
+	msgbox Route103_Text_AmyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC66E:: @ 81EC66E
-	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
+Route103_EventScript_Liv:: @ 81EC66E
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivIntro, Route103_Text_LivDefeated, Route103_Text_LivNotEnoughPokemon, Route102_EventScript_LivRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route103_EventScript_1EC6B6
-	msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route102_EventScript_LivRematch
+	msgbox Route103_Text_LivPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC69D:: @ 81EC69D
-	msgbox Route103_Text_294B8A, MSGBOX_DEFAULT
+Route102_EventScript_LivRegisterMatchCallAfterBattle:: @ 81EC69D
+	msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
-Route103_EventScript_1EC6B6:: @ 81EC6B6
-	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
-	msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE
+Route102_EventScript_LivRematch:: @ 81EC6B6
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivRematchIntro, Route103_Text_LivRematchDefeated, Route103_Text_LivRematchNotEnoughPokemon
+	msgbox Route103_Text_LivRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC6D1:: @ 81EC6D1
-	trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92
-	msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE
+Route103_EventScript_Andrew:: @ 81EC6D1
+	trainerbattle_single TRAINER_ANDREW, Route103_Text_AndrewIntro, Route103_Text_AndrewDefeated
+	msgbox Route103_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC6E8:: @ 81EC6E8
-	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
+Route103_EventScript_Miguel:: @ 81EC6E8
+	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_MiguelIntro, Route103_Text_MiguelDefeated, Route102_EventScript_MiguelRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route103_EventScript_1EC733
-	msgbox Route103_Text_294F42, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route103_EventScript_MiguelRematch
+	msgbox Route103_Text_MiguelPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route103_EventScript_1EC714:: @ 81EC714
-	special sub_80B4808
+Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route103_Text_294F7E, MSGBOX_DEFAULT
+	msgbox Route103_Text_MiguelRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MIGUEL_1
 	release
 	end
 
-Route103_EventScript_1EC733:: @ 81EC733
-	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006
-	msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE
+Route103_EventScript_MiguelRematch:: @ 81EC733
+	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_MiguelRematchIntro, Route103_Text_MiguelRematchDefeated
+	msgbox Route103_Text_MiguelRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC74A:: @ 81EC74A
-	trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B
-	msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE
+Route103_EventScript_Marcos:: @ 81EC74A
+	trainerbattle_single TRAINER_MARCOS, Route103_Text_MarcosIntro, Route103_Text_MarcosDefeated
+	msgbox Route103_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC761:: @ 81EC761
-	trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6
-	msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE
+Route103_EventScript_Rhett:: @ 81EC761
+	trainerbattle_single TRAINER_RHETT, Route103_Text_RhettIntro, Route103_Text_RhettDefeated
+	msgbox Route103_Text_RhettPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC778:: @ 81EC778
-	trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093
-	msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE
+Route103_EventScript_Pete:: @ 81EC778
+	trainerbattle_single TRAINER_PETE, Route103_Text_PeteIntro, Route103_Text_PeteDefeated
+	msgbox Route103_Text_PetePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_1EC78F:: @ 81EC78F
-	trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146
-	msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE
+Route103_EventScript_Isabelle:: @ 81EC78F
+	trainerbattle_single TRAINER_ISABELLE, Route103_Text_IsabelleIntro, Route103_Text_IsabelleDefeated
+	msgbox Route103_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_Text_1EC7A6: @ 81EC7A6
+Route103_Text_MayRoute103Pokemon: @ 81EC7A6
 	.string "MAY: Let's see… The POKéMON found\n"
 	.string "on ROUTE 103 include…$"
 
-Route103_Text_1EC7DE: @ 81EC7DE
+Route103_Text_MayLetsBattle: @ 81EC7DE
 	.string "Oh, hi, {PLAYER}{KUN}!\p"
 	.string "…Oh, I see, my dad gave you\n"
 	.string "a POKéMON as a gift.\p"
@@ -304,11 +304,11 @@ Route103_Text_1EC7DE: @ 81EC7DE
 	.string "I'll give you a taste of what being\n"
 	.string "a TRAINER is like.$"
 
-Route103_Text_1EC881: @ 81EC881
+Route103_Text_MayDefeated: @ 81EC881
 	.string "Wow! That's great!\n"
 	.string "{PLAYER}{KUN}, you're pretty good!$"
 
-Route103_Text_1EC8AE: @ 81EC8AE
+Route103_Text_MayTimeToHeadBack: @ 81EC8AE
 	.string "MAY: I think I know why my dad has\n"
 	.string "an eye out for you now.\p"
 	.string "I mean, you just got that POKéMON,\n"
@@ -318,11 +318,11 @@ Route103_Text_1EC8AE: @ 81EC8AE
 	.string "Well, it's time to head back to\n"
 	.string "the LAB.$"
 
-Route103_Text_1EC989: @ 81EC989
+Route103_Text_BrendanRoute103Pokemon: @ 81EC989
 	.string "BRENDAN: Okay, so it's this one and\n"
 	.string "that one that live on ROUTE 103…$"
 
-Route103_Text_1EC9CE: @ 81EC9CE
+Route103_Text_BrendanLetsBattle: @ 81EC9CE
 	.string "Hey, it's {PLAYER}!\p"
 	.string "…Oh, yeah, Dad gave you a POKéMON.\p"
 	.string "Since we're here, how about a little\n"
@@ -330,10 +330,10 @@ Route103_Text_1EC9CE: @ 81EC9CE
 	.string "I'll teach you what being a TRAINER's\n"
 	.string "about!$"
 
-Route103_Text_1ECA59: @ 81ECA59
+Route103_Text_BrendanDefeated: @ 81ECA59
 	.string "Huh, {PLAYER}, you're not too shabby.$"
 
-Route103_Text_1ECA79: @ 81ECA79
+Route103_Text_BrendanTimeToHeadBack: @ 81ECA79
 	.string "BRENDAN: I think I get it.\n"
 	.string "I think I know why my dad has his eye\l"
 	.string "out for you now.\p"
@@ -343,16 +343,16 @@ Route103_Text_1ECA79: @ 81ECA79
 	.string "could befriend any POKéMON with ease.\p"
 	.string "We should head back to the LAB.$"
 
-Route103_Text_1ECB73: @ 81ECB73
+Route103_Text_ShouldHaveBroughtPotion: @ 81ECB73
 	.string "My POKéMON is staggeringly tired…\n"
 	.string "I should have brought a POTION…$"
 
-Route103_Text_1ECBB5: @ 81ECBB5
+Route103_Text_ShortcutToOldale: @ 81ECBB5
 	.string "If you cross the sea from here,\n"
 	.string "it'll be a shortcut to OLDALE TOWN.\p"
 	.string "Fufufu, that's useful, isn't it?$"
 
-Route103_Text_1ECC1A: @ 81ECC1A
+Route103_Text_RouteSign: @ 81ECC1A
 	.string "ROUTE 103\n"
 	.string "{DOWN_ARROW} OLDALE TOWN$"
 
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index a02a1e170..f31c512f7 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED00F",
+      "script": "Route104_EventScript_BugCatcher",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED006",
+      "script": "Route104_EventScript_Girl1",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route104_EventScript_1ED38D",
+      "script": "Route104_EventScript_Haley",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED045",
+      "script": "Route104_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED04E",
+      "script": "Route104_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED090",
+      "script": "Route104_EventScript_Girl2",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED35F",
+      "script": "Route104_EventScript_Ivan",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECF8C",
+      "script": "Route104_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECFCD",
+      "script": "Route104_EventScript_WhiteHerbFlorist",
       "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route104_EventScript_1ED597",
+      "script": "Route104_EventScript_Gina",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route104_EventScript_1ED5B6",
+      "script": "Route104_EventScript_Mia",
       "flag": "0"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route104_EventScript_1ED43B",
+      "script": "Route104_EventScript_Winston",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route104_EventScript_1ED4E9",
+      "script": "Route104_EventScript_Cindy",
       "flag": "0"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route104_EventScript_1ED376",
+      "script": "Route104_EventScript_Billy",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED057",
+      "script": "Route104_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED5D5",
+      "script": "Route104_EventScript_Darian",
       "flag": "0"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECC9E",
+      "script": "Route104_EventScript_Rival",
       "flag": "FLAG_HIDE_ROUTE_104_RIVAL"
     }
   ],
@@ -539,7 +539,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE104_STATE",
       "var_value": "1",
-      "script": "Route104_EventScript_1ECCB3"
+      "script": "Route104_EventScript_RivalTrigger"
     }
   ],
   "bg_events": [
@@ -549,7 +549,7 @@
       "y": 50,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED018"
+      "script": "Route104_EventScript_BrineysCottageSign"
     },
     {
       "type": "sign",
@@ -557,7 +557,7 @@
       "y": 66,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED021"
+      "script": "Route104_EventScript_RouteSignPetalburg"
     },
     {
       "type": "sign",
@@ -565,7 +565,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED02A"
+      "script": "Route104_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -573,7 +573,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED033"
+      "script": "Route104_EventScript_FlowerShopSign"
     },
     {
       "type": "sign",
@@ -581,7 +581,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED03C"
+      "script": "Route104_EventScript_TrainerTipsDoubleBattles"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index c943066f9..46dd80119 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -1,54 +1,54 @@
 Route104_MapScripts:: @ 81ECC32
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition
 	.byte 0
 
-Route104_MapScript2_1ECC3D: @ 81ECC3D
-	map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_1ECC47
+Route104_OnFrame: @ 81ECC3D
+	map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_StartSailToDewford
 	.2byte 0
 
-Route104_EventScript_1ECC47:: @ 81ECC47
+Route104_EventScript_StartSailToDewford:: @ 81ECC47
 	lockall
-	goto Route104_EventScript_1ED099
+	goto Route104_EventScript_SailToDewford
 	end
 
 Route104_OnTransition: @ 81ECC4E
 	call Common_EventScript_SetupRivalGfxId
-	call Route104_EventScript_1ECC78
-	call Route104_EventScript_1ECC5E
+	call Route104_EventScript_TrySetRivalPos
+	call Route104_EventScript_ShowOrHideWhiteHerbFlorist
 	end
 
-Route104_EventScript_1ECC5E:: @ 81ECC5E
-	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_1ECC74
-	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74
+Route104_EventScript_ShowOrHideWhiteHerbFlorist:: @ 81ECC5E
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_HideWhiteHerbFlorist
+	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_HideWhiteHerbFlorist
 	clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_1ECC74:: @ 81ECC74
+Route104_EventScript_HideWhiteHerbFlorist:: @ 81ECC74
 	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_1ECC78:: @ 81ECC78
+Route104_EventScript_TrySetRivalPos:: @ 81ECC78
 	compare VAR_BOARD_BRINEY_BOAT_STATE, 1
-	goto_if_ge Route104_EventScript_1ECC9D
-	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
-	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
+	goto_if_ge Route104_EventScript_DontSetRivalPos
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos
+	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_DontSetRivalPos
 	setobjectxyperm 34, 17, 52
 	return
 
-Route104_EventScript_1ECC9D:: @ 81ECC9D
+Route104_EventScript_DontSetRivalPos:: @ 81ECC9D
 	return
 
-Route104_EventScript_1ECC9E:: @ 81ECC9E
+Route104_EventScript_Rival:: @ 81ECC9E
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement 34, Common_Movement_FacePlayer
 	waitmovement 0
-	goto Route104_EventScript_1ECD33
+	goto Route104_EventScript_RivalEncounter
 
-Route104_EventScript_1ECCB3:: @ 81ECCB3
+Route104_EventScript_RivalTrigger:: @ 81ECCB3
 	lockall
-	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setvar VAR_RUSTBORO_CITY_STATE, 8
 	setvar VAR_ROUTE104_STATE, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -56,357 +56,358 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	delay 10
 	addobject 34
 	clearflag FLAG_HIDE_ROUTE_104_RIVAL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECF86
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECF8A
+	applymovement 34, Route104_Movement_RivalExitBrineysCottage
 	waitmovement 0
 	delay 20
 	setvar VAR_0x8008, 0
-	call Route104_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	playse SE_PIN
 	applymovement 34, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 34, Common_Movement_Delay48
 	waitmovement 0
-	goto Route104_EventScript_1ECD33
+	goto Route104_EventScript_RivalEncounter
 
-Route104_EventScript_1ECD11:: @ 81ECD11
+@ Unused, shares script with Rustboro encounter instead
+Route104_EventScript_PlayRivalMusic:: @ 81ECD11
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route104_EventScript_1ECD29
+	goto_if_eq Route104_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route104_EventScript_1ECD2E
+	goto_if_eq Route104_EventScript_PlayBrendanMusic
 	return
 
-Route104_EventScript_1ECD29:: @ 81ECD29
+Route104_EventScript_PlayMayMusic:: @ 81ECD29
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-Route104_EventScript_1ECD2E:: @ 81ECD2E
+Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E
 	playbgm MUS_BOY_SUP, 1
 	return
 
-Route104_EventScript_1ECD33:: @ 81ECD33
+Route104_EventScript_RivalEncounter:: @ 81ECD33
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route104_EventScript_1ECD4B
+	goto_if_eq Route104_EventScript_MayEncounter
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route104_EventScript_1ECE6F
+	goto_if_eq Route104_EventScript_BrendanEncounter
 	end
 
-Route104_EventScript_1ECD4B:: @ 81ECD4B
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECE1C
-	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECDD0
+Route104_EventScript_MayEncounter:: @ 81ECD4B
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_MayDefeated
+	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_MayAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
-	msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT
+	msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT
+	msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
+	applymovement 34, Route104_Movement_RivalWalkSlowLeft
+	msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT
 	closemessage
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
+	applymovement 34, Route104_Movement_RivalApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 34
-	msgbox Route104_Text_1EDCED, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
-	call Route104_EventScript_1ECE31
+	msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route104_EventScript_BattleMay
+	msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT
+	call Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_Movement_1ECDC8: @ 81ECDC8
+Route104_Movement_RivalWalkSlowLeft: @ 81ECDC8
 	walk_slow_left
 	step_end
 
-Route104_Movement_1ECDCA: @ 81ECDCA
+Route104_Movement_RivalApproachPlayer: @ 81ECDCA
 	walk_down
 	face_right
 	step_end
 
-Route104_Movement_1ECDCD: @ 81ECDCD
+Route104_Movement_PlayerFaceRival: @ 81ECDCD
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_1ECDD0:: @ 81ECDD0
-	msgbox Route104_Text_1EDD9F, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
+Route104_EventScript_MayAskToBattle:: @ 81ECDD0
+	msgbox Route104_Text_MayLetsBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route104_EventScript_BattleMay
+	msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_1ECDED:: @ 81ECDED
-	msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT
+Route104_EventScript_BattleMay:: @ 81ECDED
+	msgbox Route104_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route104_EventScript_1ECE36
-	case 1, Route104_EventScript_1ECE49
-	case 2, Route104_EventScript_1ECE5C
+	case 0, Route104_EventScript_BattleMayTreecko
+	case 1, Route104_EventScript_BattleMayTorchic
+	case 2, Route104_EventScript_BattleMayMudkip
 	end
 
-Route104_EventScript_1ECE1C:: @ 81ECE1C
-	msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT
+Route104_EventScript_MayDefeated:: @ 81ECE1C
+	msgbox Route104_Text_MayPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq Route104_EventScript_1ECE31
+	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECE31:: @ 81ECE31
+Route104_EventScript_RestoreMusic:: @ 81ECE31
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-Route104_EventScript_1ECE36:: @ 81ECE36
-	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18
+Route104_EventScript_BattleMayTreecko:: @ 81ECE36
+	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE49:: @ 81ECE49
-	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18
+Route104_EventScript_BattleMayTorchic:: @ 81ECE49
+	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE5C:: @ 81ECE5C
-	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18
+Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
+	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE6F:: @ 81ECE6F
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECF38
-	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECEEC
+Route104_EventScript_BrendanEncounter:: @ 81ECE6F
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_BrendanDefeated
+	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_BrendanAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
-	msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT
+	msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT
+	msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
+	applymovement 34, Route104_Movement_RivalWalkSlowLeft
+	msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT
 	closemessage
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
+	applymovement 34, Route104_Movement_RivalApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 34
-	msgbox Route104_Text_1EE009, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
-	call Route104_EventScript_1ECE31
+	msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route104_EventScript_BattleBrendan
+	msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT
+	call Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECEEC:: @ 81ECEEC
-	msgbox Route104_Text_1EE094, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
+Route104_EventScript_BrendanAskToBattle:: @ 81ECEEC
+	msgbox Route104_Text_BrendanLetsBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route104_EventScript_BattleBrendan
+	msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_1ECF09:: @ 81ECF09
-	msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT
+Route104_EventScript_BattleBrendan:: @ 81ECF09
+	msgbox Route104_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route104_EventScript_1ECF4D
-	case 1, Route104_EventScript_1ECF60
-	case 2, Route104_EventScript_1ECF73
+	case 0, Route104_EventScript_BattleBrendanTreecko
+	case 1, Route104_EventScript_BattleBrendanTorchic
+	case 2, Route104_EventScript_BattleBrendanMudkip
 	end
 
-Route104_EventScript_1ECF38:: @ 81ECF38
-	msgbox Route104_Text_1EE120, MSGBOX_DEFAULT
+Route104_EventScript_BrendanDefeated:: @ 81ECF38
+	msgbox Route104_Text_BrendanPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq Route104_EventScript_1ECE31
+	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECF4D:: @ 81ECF4D
-	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
+	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_1ECF60:: @ 81ECF60
-	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
+	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_1ECF73:: @ 81ECF73
-	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
+	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_Movement_1ECF86: @ 81ECF86
+Route104_Movement_PlayerBackUp: @ 81ECF86
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-Route104_Movement_1ECF8A: @ 81ECF8A
+Route104_Movement_RivalExitBrineysCottage: @ 81ECF8A
 	walk_down
 	step_end
 
-Route104_EventScript_1ECF8C:: @ 81ECF8C
+Route104_EventScript_ExpertF:: @ 81ECF8C
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_1ECFC3
-	msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry
+	msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHESTO_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104
-	msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
+	msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ECFC3:: @ 81ECFC3
-	msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedBerry:: @ 81ECFC3
+	msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ECFCD:: @ 81ECFCD
+Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_1ECFFC
-	msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb
+	msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_WHITE_HERB
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
 
-Route104_EventScript_1ECFFC:: @ 81ECFFC
-	msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedWhiteHerb:: @ 81ECFFC
+	msgbox Route104_Text_FlowerShopSellingSaplings, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED006:: @ 81ED006
-	msgbox Route104_Text_1ED5EC, MSGBOX_NPC
+Route104_EventScript_Girl1:: @ 81ED006
+	msgbox Route104_Text_BrineyLivesInSeasideCottage, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED00F:: @ 81ED00F
-	msgbox Route104_Text_1ED662, MSGBOX_SIGN
+Route104_EventScript_BugCatcher:: @ 81ED00F
+	msgbox Route104_Text_WhatsItLikeAtBottomOfSea, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED018:: @ 81ED018
-	msgbox Route104_Text_1EDA8C, MSGBOX_SIGN
+Route104_EventScript_BrineysCottageSign:: @ 81ED018
+	msgbox Route104_Text_MrBrineysCottage, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED021:: @ 81ED021
-	msgbox Route104_Text_1EDAA1, MSGBOX_SIGN
+Route104_EventScript_RouteSignPetalburg:: @ 81ED021
+	msgbox Route104_Text_RouteSignPetalburg, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED02A:: @ 81ED02A
-	msgbox Route104_Text_1EDABC, MSGBOX_SIGN
+Route104_EventScript_RouteSignRustboro:: @ 81ED02A
+	msgbox Route104_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED033:: @ 81ED033
-	msgbox Route104_Text_1EDAD6, MSGBOX_SIGN
+Route104_EventScript_FlowerShopSign:: @ 81ED033
+	msgbox Route104_Text_PrettyPetalFlowShop, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED03C:: @ 81ED03C
-	msgbox Route104_Text_1EDAEF, MSGBOX_SIGN
+Route104_EventScript_TrainerTipsDoubleBattles:: @ 81ED03C
+	msgbox Route104_Text_TrainerTipsDoubleBattles, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED045:: @ 81ED045
-	msgbox Route104_Text_1ED6A2, MSGBOX_NPC
+Route104_EventScript_Boy1:: @ 81ED045
+	msgbox Route104_Text_ThrowBallAtWeakenedPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED04E:: @ 81ED04E
-	msgbox Route104_Text_1ED735, MSGBOX_NPC
+Route104_EventScript_Woman:: @ 81ED04E
+	msgbox Route104_Text_OnlyThrowBallAtWildPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED057:: @ 81ED057
+Route104_EventScript_Boy2:: @ 81ED057
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_1ED086
-	msgbox Route104_Text_1ED838, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed
+	msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM09
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM09
 	release
 	end
 
-Route104_EventScript_1ED086:: @ 81ED086
-	msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedBulletSeed:: @ 81ED086
+	msgbox Route104_Text_TMsAreOneTimeUse, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED090:: @ 81ED090
-	msgbox Route104_Text_1ED7A2, MSGBOX_NPC
+Route104_EventScript_Girl2:: @ 81ED090
+	msgbox Route104_Text_ImNotATrainer, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED099:: @ 81ED099
+Route104_EventScript_SailToDewford:: @ 81ED099
 	setobjectpriority 8, MAP_ROUTE104, 0
 	setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0
-	applymovement 8, Route104_Movement_1ED359
+	applymovement 8, Route104_Movement_BrineyBoardBoat
 	waitmovement 0
 	removeobject 8
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat
 	waitmovement 0
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	call Common_EventScript_PlayBrineysBoatMusic
-	goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9
-	goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF
+	goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall
+	goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls
 	end
 
-Route104_EventScript_1ED0D9:: @ 81ED0D9
-	applymovement 7, Route104_Movement_1ED28C
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED28C
+Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9
+	applymovement 7, Route104_Movement_SailToDewford
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford
 	waitmovement 0
-	goto Route104_EventScript_1ED139
+	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_1ED0EF:: @ 81ED0EF
-	applymovement 7, Route104_Movement_1ED1C8
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8
+Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
+	applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
 	waitmovement 0
-	pokenavcall Route104_Text_1EE336
+	pokenavcall Route104_Text_DadPokenavCall
 	waitmessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EE463, MSGBOX_DEFAULT
+	msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_NORMAN_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A
-	applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
+	applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
 	waitmovement 7, MAP_ROUTE104
 	waitmovement 0
-	goto Route104_EventScript_1ED139
+	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_1ED139:: @ 81ED139
+Route104_EventScript_ArriveInDewford:: @ 81ED139
 	delay 50
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat
 	waitmovement 0
 	call Common_EventScript_StopBrineysBoatMusic
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
 	waitmovement 0
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	applymovement 2, Route104_Movement_1ED35C
+	applymovement 2, Route104_Movement_BrineyExitBoat
 	waitmovement 0
 	addobject 4
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
@@ -418,21 +419,21 @@ Route104_EventScript_1ED139:: @ 81ED139
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	copyobjectxytoperm 2
 	setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
-	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
-	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford
 	end
 
-Route104_EventScript_1ED1B4:: @ 81ED1B4
-	msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT
+Route104_EventScript_DeliverLetterReminder:: @ 81ED1B4
+	msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_1ED1BE:: @ 81ED1BE
-	msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT
+Route104_EventScript_LandedInDewford:: @ 81ED1BE
+	msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_Movement_1ED1C8: @ 81ED1C8
+Route104_Movement_SailToDewfordBeforeDadCalls: @ 81ED1C8
 	walk_down
 	walk_down
 	walk_down
@@ -532,7 +533,7 @@ Route104_Movement_1ED1C8: @ 81ED1C8
 	walk_fastest_down
 	step_end
 
-Route104_Movement_1ED22A: @ 81ED22A
+Route104_Movement_SailToDewfordAfterDadCalls: @ 81ED22A
 	walk_fastest_down
 	walk_fastest_down
 	walk_fastest_down
@@ -632,7 +633,7 @@ Route104_Movement_1ED22A: @ 81ED22A
 	walk_down
 	step_end
 
-Route104_Movement_1ED28C: @ 81ED28C
+Route104_Movement_SailToDewford: @ 81ED28C
 	walk_down
 	walk_down
 	walk_down
@@ -829,235 +830,235 @@ Route104_Movement_1ED28C: @ 81ED28C
 	walk_down
 	step_end
 
-Route104_Movement_1ED34F: @ 81ED34F
+Route104_Movement_PlayerBoardBoat: @ 81ED34F
 	walk_left
 	walk_down
 	walk_down
 	step_end
 
-Route104_Movement_1ED353: @ 81ED353
+Route104_Movement_PlayerExitBoat: @ 81ED353
 	walk_down
 	step_end
 
-Route104_Movement_1ED355: @ 81ED355
+Route104_Movement_PlayerMoveForBriney: @ 81ED355
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Route104_Movement_1ED359: @ 81ED359
+Route104_Movement_BrineyBoardBoat: @ 81ED359
 	walk_down
 	walk_down
 	step_end
 
-Route104_Movement_1ED35C: @ 81ED35C
+Route104_Movement_BrineyExitBoat: @ 81ED35C
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_1ED35F:: @ 81ED35F
-	trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509
-	msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE
+Route104_EventScript_Ivan:: @ 81ED35F
+	trainerbattle_single TRAINER_IVAN, Route104_Text_IvanIntro, Route104_Text_IvanDefeat
+	msgbox Route104_Text_IvanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED376:: @ 81ED376
-	trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4
-	msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE
+Route104_EventScript_Billy:: @ 81ED376
+	trainerbattle_single TRAINER_BILLY, Route104_Text_BillyIntro, Route104_Text_BillyDefeat
+	msgbox Route104_Text_BillyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED38D:: @ 81ED38D
-	trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
+Route104_EventScript_Haley:: @ 81ED38D
+	trainerbattle_single TRAINER_HALEY_1, Route104_Text_HaleyIntro, Route104_Text_HaleyDefeat, Route104_EventScript_TryRegisterHaleyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED424
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchHaley
 	setvar VAR_0x8004, TRAINER_HALEY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED3F8
-	msgbox Route104_Text_295689, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterHaley
+	msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED3CE:: @ 81ED3CE
-	special sub_80B4808
+Route104_EventScript_TryRegisterHaleyAfterBattle:: @ 81ED3CE
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaleyAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED3DF:: @ 81ED3DF
-	msgbox Route104_Text_29576B, MSGBOX_DEFAULT
+Route104_EventScript_RegisterHaleyAfterBattle:: @ 81ED3DF
+	msgbox Route104_Text_HaleyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_1ED3F8:: @ 81ED3F8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED40B
-	msgbox Route104_Text_295689, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterHaley:: @ 81ED3F8
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaley
+	msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED40B:: @ 81ED40B
-	msgbox Route104_Text_2956FF, MSGBOX_DEFAULT
+Route104_EventScript_RegisterHaley:: @ 81ED40B
+	msgbox Route104_Text_HaleyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_1ED424:: @ 81ED424
-	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0
-	msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchHaley:: @ 81ED424
+	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_HaleyRematchIntro, Route104_Text_HaleyRematchDefeat
+	msgbox Route104_Text_HaleyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED43B:: @ 81ED43B
-	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
+Route104_EventScript_Winston:: @ 81ED43B
+	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_WinstonIntro, Route104_Text_WinstonDefeat, Route104_EventScript_TryRegisterWinstonAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED4D2
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchWinston
 	setvar VAR_0x8004, TRAINER_WINSTON_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED4A6
-	msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterWinston
+	msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED47C:: @ 81ED47C
-	special sub_80B4808
+Route104_EventScript_TryRegisterWinstonAfterBattle:: @ 81ED47C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinstonAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED48D:: @ 81ED48D
-	msgbox Route104_Text_29595A, MSGBOX_DEFAULT
+Route104_EventScript_RegisterWinstonAfterBattle:: @ 81ED48D
+	msgbox Route104_Text_WinstonRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_1ED4A6:: @ 81ED4A6
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED4B9
-	msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterWinston:: @ 81ED4A6
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinston
+	msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED4B9:: @ 81ED4B9
-	msgbox Route104_Text_2958F8, MSGBOX_DEFAULT
+Route104_EventScript_RegisterWinston:: @ 81ED4B9
+	msgbox Route104_Text_WinstonRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_1ED4D2:: @ 81ED4D2
-	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC
-	msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchWinston:: @ 81ED4D2
+	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_WinstonRematchIntro, Route104_Text_WinstonRematchDefeat
+	msgbox Route104_Text_WinstonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED4E9:: @ 81ED4E9
-	trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
+Route104_EventScript_Cindy:: @ 81ED4E9
+	trainerbattle_single TRAINER_CINDY_1, Route104_Text_CindyIntro, Route104_Text_CindyDefeat, Route104_EventScript_TryRegisterCindyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED580
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchCindy
 	setvar VAR_0x8004, TRAINER_CINDY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED554
-	msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterCindy
+	msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED52A:: @ 81ED52A
-	special sub_80B4808
+Route104_EventScript_TryRegisterCindyAfterBattle:: @ 81ED52A
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindyAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED53B:: @ 81ED53B
-	msgbox Route104_Text_295B60, MSGBOX_DEFAULT
+Route104_EventScript_RegisterCindyAfterBattle:: @ 81ED53B
+	msgbox Route104_Text_CindyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_1ED554:: @ 81ED554
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED567
-	msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterCindy:: @ 81ED554
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindy
+	msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED567:: @ 81ED567
-	msgbox Route104_Text_295B01, MSGBOX_DEFAULT
+Route104_EventScript_RegisterCindy:: @ 81ED567
+	msgbox Route104_Text_CindyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_1ED580:: @ 81ED580
-	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA
-	msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchCindy:: @ 81ED580
+	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_CindyRematchIntro, Route104_Text_CindyRematchDefeat
+	msgbox Route104_Text_CindyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED597:: @ 81ED597
-	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
+Route104_EventScript_Gina:: @ 81ED597
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_GinaIntro, Route104_Text_GinaDefeat, Route104_Text_GinaNotEnoughMons
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_2952FE, MSGBOX_DEFAULT
+	msgbox Route104_Text_GinaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED5B6:: @ 81ED5B6
-	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
+Route104_EventScript_Mia:: @ 81ED5B6
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_MiaIntro, Route104_Text_MiaDefeat, Route104_Text_MiaNotEnoughMons
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_29540D, MSGBOX_DEFAULT
+	msgbox Route104_Text_MiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED5D5:: @ 81ED5D5
-	trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9
-	msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE
+Route104_EventScript_Darian:: @ 81ED5D5
+	trainerbattle_single TRAINER_DARIAN, Route104_Text_DarianIntro, Route104_Text_DarianDefeat
+	msgbox Route104_Text_DarianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_Text_1ED5EC: @ 81ED5EC
+Route104_Text_BrineyLivesInSeasideCottage: @ 81ED5EC
 	.string "That seaside cottage is where\n"
 	.string "MR. BRINEY lives.\p"
 	.string "He was once a mighty sailor who never\n"
 	.string "feared the sea, however stormy.$"
 
-Route104_Text_1ED662: @ 81ED662
+Route104_Text_WhatsItLikeAtBottomOfSea: @ 81ED662
 	.string "The sea, huh?\p"
 	.string "I wonder what it's like at the bottom\n"
 	.string "of the sea?$"
 
-Route104_Text_1ED6A2: @ 81ED6A2
+Route104_Text_ThrowBallAtWeakenedPokemon: @ 81ED6A2
 	.string "If you're going to throw a POKé BALL,\n"
 	.string "weaken the wild POKéMON first.\p"
 	.string "It will be easier to catch if it's been\n"
 	.string "poisoned, burned, or lulled to sleep.$"
 
-Route104_Text_1ED735: @ 81ED735
+Route104_Text_OnlyThrowBallAtWildPokemon: @ 81ED735
 	.string "You're a thief if you try to steal\n"
 	.string "someone else's POKéMON.\p"
 	.string "You should throw POKé BALLS only at\n"
 	.string "wild POKéMON.$"
 
-Route104_Text_1ED7A2: @ 81ED7A2
+Route104_Text_ImNotATrainer: @ 81ED7A2
 	.string "Oh, no, I'm not a TRAINER.\p"
 	.string "But that's right, if TRAINERS lock eyes,\n"
 	.string "it's a challenge to battle.\p"
 	.string "If you don't want to battle, stay out\n"
 	.string "of their sight.$"
 
-Route104_Text_1ED838: @ 81ED838
+Route104_Text_LikeFillingMouthWithSeedsTakeThis: @ 81ED838
 	.string "I like filling my mouth with seeds,\n"
 	.string "then spitting them out fast!\p"
 	.string "You can have this, so you try it out!\p"
 	.string "Use it on a POKéMON, and it will learn\n"
 	.string "a move for firing seeds rapidly.$"
 
-Route104_Text_1ED8E7: @ 81ED8E7
+Route104_Text_TMsAreOneTimeUse: @ 81ED8E7
 	.string "A word of advice!\p"
 	.string "A TM, TECHNICAL MACHINE, is good only\n"
 	.string "for one-time use.\p"
 	.string "Once you use it, it's gone.\n"
 	.string "Think twice before using it!$"
 
-Route104_Text_1ED96A: @ 81ED96A
+Route104_Text_DontNeedThisTakeIt: @ 81ED96A
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
@@ -1065,27 +1066,27 @@ Route104_Text_1ED96A: @ 81ED96A
 	.string "I don't need this WHITE HERB anymore.\n"
 	.string "Would you take it, please?$"
 
-Route104_Text_1EDA0F: @ 81EDA0F
+Route104_Text_FlowerShopSellingSaplings: @ 81EDA0F
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
 	.string "shopping. Where should I put them?$"
 
-Route104_Text_1EDA8C: @ 81EDA8C
+Route104_Text_MrBrineysCottage: @ 81EDA8C
 	.string "MR. BRINEY'S COTTAGE$"
 
-Route104_Text_1EDAA1: @ 81EDAA1
+Route104_Text_RouteSignPetalburg: @ 81EDAA1
 	.string "ROUTE 1O4\n"
 	.string "{RIGHT_ARROW} PETALBURG CITY$"
 
-Route104_Text_1EDABC: @ 81EDABC
+Route104_Text_RouteSignRustboro: @ 81EDABC
 	.string "ROUTE 1O4\n"
 	.string "{UP_ARROW} RUSTBORO CITY$"
 
-Route104_Text_1EDAD6: @ 81EDAD6
+Route104_Text_PrettyPetalFlowShop: @ 81EDAD6
 	.string "PRETTY PETAL FLOWER SHOP$"
 
-Route104_Text_1EDAEF: @ 81EDAEF
+Route104_Text_TrainerTipsDoubleBattles: @ 81EDAEF
 	.string "TRAINER TIPS\p"
 	.string "In the HOENN region there are pairs\n"
 	.string "of TRAINERS who challenge others\l"
@@ -1096,45 +1097,45 @@ Route104_Text_1EDAEF: @ 81EDAEF
 	.string "left of the list and the top one.\l"
 	.string "Watch how POKéMON are lined up.$"
 
-Route104_Text_1EDBFF: @ 81EDBFF
+Route104_Text_MayWeShouldRegister: @ 81EDBFF
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "DEVON upgraded your POKéNAV with\n"
 	.string "the MATCH CALL system, huh?\p"
 	.string "We should register each other so we\n"
 	.string "can get in contact anytime.$"
 
-Route104_Text_1EDC8F: @ 81EDC8F
+Route104_Text_RegisteredMay: @ 81EDC8F
 	.string "{PLAYER} registered MAY\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_1EDCB1: @ 81EDCB1
+Route104_Text_MayHowsYourPokedex: @ 81EDCB1
 	.string "MAY: Oh, by the way, {PLAYER}{KUN},\n"
 	.string "how's your POKéDEX coming along?$"
 
-Route104_Text_1EDCED: @ 81EDCED
+Route104_Text_MayMinesDecentLetsBattle: @ 81EDCED
 	.string "Mine's looking pretty decent.\n"
 	.string "So…\l"
 	.string "How about a little battle?$"
 
-Route104_Text_1EDD2A: @ 81EDD2A
+Route104_Text_MayHaventRaisedPokemon: @ 81EDD2A
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-Route104_Text_1EDD9F: @ 81EDD9F
+Route104_Text_MayLetsBattle: @ 81EDD9F
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-Route104_Text_1EDDDB: @ 81EDDDB
+Route104_Text_MayIntro: @ 81EDDDB
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-Route104_Text_1EDE18: @ 81EDE18
+Route104_Text_MayDefeat: @ 81EDE18
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-Route104_Text_1EDE3E: @ 81EDE3E
+Route104_Text_MayPostBattle: @ 81EDE3E
 	.string "MAY: I can tell you've gotten pretty\n"
 	.string "good with the way you handle POKéMON.\p"
 	.string "But instead of only making them\n"
@@ -1142,43 +1143,43 @@ Route104_Text_1EDE3E: @ 81EDE3E
 	.string "It's important to become friends with\n"
 	.string "POKéMON, too.$"
 
-Route104_Text_1EDF04: @ 81EDF04
+Route104_Text_BrendanWeShouldRegister: @ 81EDF04
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "Cool, you had DEVON install the MATCH\n"
 	.string "CALL system on your POKéNAV!\p"
 	.string "Let's register each other in our\n"
 	.string "POKéNAVS so we can keep in touch.$"
 
-Route104_Text_1EDFA0: @ 81EDFA0
+Route104_Text_RegisteredBrendan: @ 81EDFA0
 	.string "{PLAYER} registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_1EDFC6: @ 81EDFC6
+Route104_Text_BrendanHowsYourPokedex: @ 81EDFC6
 	.string "BRENDAN: {PLAYER}, how's your POKéDEX?\n"
 	.string "Have you filled in any pages yet?$"
 
-Route104_Text_1EE009: @ 81EE009
+Route104_Text_BrendanDoingGreatLetsBattle: @ 81EE009
 	.string "Me, I'm doing great!\p"
 	.string "Want to check out how good I am with\n"
 	.string "a battle?$"
 
-Route104_Text_1EE04D: @ 81EE04D
+Route104_Text_BrendanNoConfidence: @ 81EE04D
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-Route104_Text_1EE094: @ 81EE094
+Route104_Text_BrendanLetsBattle: @ 81EE094
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-Route104_Text_1EE0C7: @ 81EE0C7
+Route104_Text_BrendanIntro: @ 81EE0C7
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-Route104_Text_1EE107: @ 81EE107
+Route104_Text_BrendanDefeat: @ 81EE107
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-Route104_Text_1EE120: @ 81EE120
+Route104_Text_BrendanPostBattle: @ 81EE120
 	.string "BRENDAN: You've gotten pretty decent\n"
 	.string "at handling POKéMON.\p"
 	.string "But, you know, you shouldn't just be\n"
diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json
index 438d56b30..dc6c0ab4d 100644
--- a/data/maps/Route104_MrBrineysHouse/map.json
+++ b/data/maps/Route104_MrBrineysHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_MrBrineysHouse_EventScript_229D67",
+      "script": "Route104_MrBrineysHouse_EventScript_Briney",
       "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_MrBrineysHouse_EventScript_229E5D",
+      "script": "Route104_MrBrineysHouse_EventScript_Peeko",
       "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO"
     }
   ],
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index b2baff82b..10fdddee3 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -5,104 +5,104 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
 Route104_MrBrineysHouse_OnTransition: @ 8229D34
 	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare VAR_BRINEY_HOUSE_STATE, 1
-	call_if_eq Route104_MrBrineysHouse_EventScript_229D50
-	call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C
+	call_if_eq Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos
+	call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_HideRustboroRival
 	end
 
-Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
-	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C
+	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	return
 
-Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
+Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50
 	setobjectxyperm 1, 9, 3
 	setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
 	setobjectxyperm 2, 9, 6
 	setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
 	return
 
-Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
+Route104_MrBrineysHouse_EventScript_Briney:: @ 8229D67
 	lock
 	faceplayer
-	call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_229D8A
-	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_229DE1
-	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_229DFA
-	goto Route104_MrBrineysHouse_EventScript_229DAE
+	call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_SailingIntro
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_SailBothDeliveries
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_SailDeliverPackage
+	goto Route104_MrBrineysHouse_EventScript_WhereAreWeBound
 	end
 
-Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A
+Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
 	setflag FLAG_MR_BRINEY_SAILING_INTRO
-	msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT
-	msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
+	msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT
+	msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE
-	message Route104_MrBrineysHouse_Text_22A268
+Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
+	message Route104_MrBrineysHouse_Text_WhereAreWeBound
 	waitmessage
 	multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
 	switch VAR_RESULT
-	case 0, Route104_MrBrineysHouse_EventScript_229E27
-	case 1, Route104_MrBrineysHouse_EventScript_229E1D
-	case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_229E1D
+	case 0, Route104_MrBrineysHouse_EventScript_SailToDewford
+	case 1, Route104_MrBrineysHouse_EventScript_DeclineSailing
+	case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_DeclineSailing
 	end
 
-Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1
-	msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
+Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1
+	msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA
-	msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
+Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA
+	msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13
-	msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT
+Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing:: @ 8229E13
+	msgbox Route104_MrBrineysHouse_Text_DeclineDeliverySail, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
-	msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT
+Route104_MrBrineysHouse_EventScript_DeclineSailing:: @ 8229E1D
+	msgbox Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
-	msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
-	call Route104_MrBrineysHouse_EventScript_271E95
+Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27
+	msgbox Route104_MrBrineysHouse_Text_SetSailForDewford, MSGBOX_DEFAULT
+	call EventScript_BackupMrBrineyLocation
 	setvar VAR_BOARD_BRINEY_BOAT_STATE, 1
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_RUSTBORO_CITY_STATE, 8
 	setvar VAR_ROUTE104_STATE, 2
-	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
 	warp MAP_ROUTE104, 255, 13, 51
 	waitstate
 	releaseall
 	end
 
-Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D
+Route104_MrBrineysHouse_EventScript_Peeko:: @ 8229E5D
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT
+	msgbox Route104_MrBrineysHouse_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route104_MrBrineysHouse_Text_229E70: @ 8229E70
+Route104_MrBrineysHouse_Text_WaitUpPeeko: @ 8229E70
 	.string "MR. BRINEY: Hold on, lass!\n"
 	.string "Wait up, PEEKO!$"
 
-Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
+Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford: @ 8229E9B
 	.string "Hm? You're {PLAYER}{KUN}!\n"
 	.string "You saved my darling PEEKO!\l"
 	.string "We owe so much to you!\p"
@@ -117,18 +117,18 @@ Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
 	.string "You've come to the right man!\n"
 	.string "We'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9
+Route104_MrBrineysHouse_Text_SetSailForDewford: @ 8229FE9
 	.string "MR. BRINEY: DEWFORD it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-Route104_MrBrineysHouse_Text_22A041: @ 822A041
+Route104_MrBrineysHouse_Text_DeclineDeliverySail: @ 822A041
 	.string "MR. BRINEY: Is that so?\n"
 	.string "Your deliveries can wait?\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail!$"
 
-Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
+Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford: @ 822A0AD
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "I know exactly what you want to say!\p"
 	.string "You're to deliver a LETTER to DEWFORD\n"
@@ -137,7 +137,7 @@ Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
 	.string "at all--I'm the man for the job!\p"
 	.string "First, we'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
+Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford: @ 822A18F
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "I know exactly what you want to say!\p"
 	.string "You're to deliver a package to\n"
@@ -146,17 +146,17 @@ Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
 	.string "at all--I'm the man for the job!\p"
 	.string "First, we'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_22A268: @ 822A268
+Route104_MrBrineysHouse_Text_WhereAreWeBound: @ 822A268
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3
+Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail: @ 822A2C3
 	.string "MR. BRINEY: Is that so?\n"
 	.string "Well, PEEKO owes her life to you.\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail!$"
 
-Route104_MrBrineysHouse_Text_22A337: @ 822A337
+Route104_MrBrineysHouse_Text_Peeko: @ 822A337
 	.string "PEEKO: Pii piihyoro!$"
 
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json
index 9d3d30794..dcda9afeb 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.json
+++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_ShopOwner",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442",
+      "script": "Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 0b8d2217f..fe0dbf632 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -4,48 +4,48 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
 
 Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
 	setflag FLAG_LANDMARK_FLOWER_SHOP
-	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B
-	goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
+	goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
 	setflag FLAG_TEMP_1
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B
+Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: @ 822A36B
 	setobjectxyperm 1, 4, 6
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373
+Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT
-	goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A3B2
+	goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_SellDecorations
+	msgbox Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet
 	setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
-	compare VAR_RESULT, 0
-	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
+	msgbox Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries
+	compare VAR_RESULT, NO
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
-	compare VAR_RESULT, 0
-	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2
+	msgbox Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries
+	compare VAR_RESULT, NO
+	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries:: @ 822A3D2
+	msgbox Route104_PrettyPetalFlowerShop_Text_BerriesExplanation, MSGBOX_DEFAULT
 	return
 
-Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries:: @ 822A3DB
+	msgbox Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness, MSGBOX_DEFAULT
 	return
 
-Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
+Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4
 	message gText_PlayerWhatCanIDoForYou
 	waitmessage
 	pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
@@ -65,39 +65,39 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C
+Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C
 	lock
 	faceplayer
-	goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_22A421
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT
+	goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail
+	msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421
+	msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_WAILMER_PAIL
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT
+	msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_WAILMER_PAIL
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442
+Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry
+	msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT
 	random 8
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
+	msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482
-	msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry:: @ 822A482
+	msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index 4d447d4f8..bb6aadd54 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route105_EventScript_1EE261",
+      "script": "Route105_EventScript_Luis",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route105_EventScript_1EE278",
+      "script": "Route105_EventScript_Dominik",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route105_EventScript_1EE28F",
+      "script": "Route105_EventScript_Beverly",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route105_EventScript_1EE2A6",
+      "script": "Route105_EventScript_Imani",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route105_EventScript_1EE24A",
+      "script": "Route105_EventScript_Foster",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route105_EventScript_1EE2BD",
+      "script": "Route105_EventScript_Josue",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route105_EventScript_1EE2D4",
+      "script": "Route105_EventScript_Andres",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index ff4b3dbe1..e1292803d 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,18 +1,18 @@
 Route105_MapScripts:: @ 81EE1DB
-	map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB
+	map_script MAP_SCRIPT_ON_LOAD, Route105_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_OnFrame
 	.byte 0
 
-Route105_MapScript1_1EE1EB: @ 81EE1EB
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B
+Route105_OnLoad: @ 81EE1EB
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
 	end
 
-Route105_EventScript_1EE20B:: @ 81EE20B
+Route105_CloseRegiEntrance:: @ 81EE20B
 	setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
 	setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
 	return
@@ -26,63 +26,63 @@ Route105_OnTransition: @ 81EE21E
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route105_MapScript2_1EE240: @ 81EE240
+Route105_OnFrame: @ 81EE240
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route105_EventScript_1EE24A:: @ 81EE24A
-	trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
-	msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
+Route105_EventScript_Foster:: @ 81EE24A
+	trainerbattle_single TRAINER_FOSTER, Route105_Text_FosterIntro, Route105_Text_FosterDefeated
+	msgbox Route105_Text_FosterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE261:: @ 81EE261
-	trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
-	msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
+Route105_EventScript_Luis:: @ 81EE261
+	trainerbattle_single TRAINER_LUIS, Route105_Text_LuisIntro, Route105_Text_LuisDefeated
+	msgbox Route105_Text_LuisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE278:: @ 81EE278
-	trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
-	msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
+Route105_EventScript_Dominik:: @ 81EE278
+	trainerbattle_single TRAINER_DOMINIK, Route105_Text_DominikIntro, Route105_Text_DominikDefeated
+	msgbox Route105_Text_DominikPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE28F:: @ 81EE28F
-	trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
-	msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
+Route105_EventScript_Beverly:: @ 81EE28F
+	trainerbattle_single TRAINER_BEVERLY, Route105_Text_BeverlyIntro, Route105_Text_BeverlyDefeated
+	msgbox Route105_Text_PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE2A6:: @ 81EE2A6
-	trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
-	msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
+Route105_EventScript_Imani:: @ 81EE2A6
+	trainerbattle_single TRAINER_IMANI, Route105_Text_ImaniIntro, Route105_Text_ImaniDefeated
+	msgbox Route105_Text_ImaniPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE2BD:: @ 81EE2BD
-	trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
-	msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
+Route105_EventScript_Josue:: @ 81EE2BD
+	trainerbattle_single TRAINER_JOSUE, Route105_Text_JosueIntro, Route105_Text_JosueDefeated
+	msgbox Route105_Text_JosuePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_1EE2D4:: @ 81EE2D4
-	trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+Route105_EventScript_Andres:: @ 81EE2D4
+	trainerbattle_single TRAINER_ANDRES_1, Route105_Text_AndresIntro, Route105_Text_AndresDefeated, Route105_EventScript_AndresRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route105_EventScript_1EE31F
-	msgbox Route105_Text_2960FA, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route105_EventScript_AndresRematch
+	msgbox Route105_Text_AndresPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route105_EventScript_1EE300:: @ 81EE300
-	special sub_80B4808
+Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route105_Text_296159, MSGBOX_DEFAULT
+	msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANDRES_1
 	release
 	end
 
-Route105_EventScript_1EE31F:: @ 81EE31F
-	trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
-	msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
+Route105_EventScript_AndresRematch:: @ 81EE31F
+	trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_AndresRematchIntro, Route105_Text_AndresRematchDefeated
+	msgbox Route105_Text_AndresRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_Text_1EE336: @ 81EE336
+Route104_Text_DadPokenavCall: @ 81EE336
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "DAD: Oh, {PLAYER}?\p"
@@ -98,6 +98,6 @@ Route104_Text_1EE336: @ 81EE336
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-Route104_Text_1EE463: @ 81EE463
+Route104_Text_RegisteredDadInPokenav: @ 81EE463
 	.string "Registered DAD NORMAN\n"
 	.string "in the POKéNAV.$"
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 70558d26e..273f59aa5 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE493",
+      "script": "Route106_EventScript_Douglas",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE4AA",
+      "script": "Route106_EventScript_Kyla",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route106_EventScript_1EE4C1",
+      "script": "Route106_EventScript_Elliot",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE523",
+      "script": "Route106_EventScript_Ned",
       "flag": "0"
     },
     {
@@ -132,7 +132,7 @@
       "y": 13,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route106_EventScript_1EE48A"
+      "script": "Route106_EventScript_TrainerTipsSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
index f27ce9647..f9d3fb3b9 100644
--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -1,48 +1,48 @@
 Route106_MapScripts:: @ 81EE489
 	.byte 0
 
-Route106_EventScript_1EE48A:: @ 81EE48A
-	msgbox Route106_Text_1EE53A, MSGBOX_SIGN
+Route106_EventScript_TrainerTipsSign:: @ 81EE48A
+	msgbox Route106_Text_TrainerTips, MSGBOX_SIGN
 	end
 
-Route106_EventScript_1EE493:: @ 81EE493
-	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD
-	msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE
+Route106_EventScript_Douglas:: @ 81EE493
+	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_DouglasIntro, Route106_Text_DouglasDefeated
+	msgbox Route106_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE4AA:: @ 81EE4AA
-	trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674
-	msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE
+Route106_EventScript_Kyla:: @ 81EE4AA
+	trainerbattle_single TRAINER_KYLA, Route106_Text_KylaIntro, Route106_Text_KylaDefeated
+	msgbox Route106_Text_KylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE4C1:: @ 81EE4C1
-	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
+Route106_EventScript_Elliot:: @ 81EE4C1
+	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_ElliotIntro, Route106_Text_ElliotDefeated, Route106_EventScript_ElliotRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route106_EventScript_1EE50C
-	msgbox Route106_Text_29638C, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route106_EventScript_ElliotRematch
+	msgbox Route106_Text_ElliotPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route106_EventScript_1EE4ED:: @ 81EE4ED
-	special sub_80B4808
+Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route106_Text_2963E3, MSGBOX_DEFAULT
+	msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ELLIOT_1
 	release
 	end
 
-Route106_EventScript_1EE50C:: @ 81EE50C
-	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477
-	msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE
+Route106_EventScript_ElliotRematch:: @ 81EE50C
+	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_ElliotRematchIntro, Route106_Text_ElliotRematchDefeated
+	msgbox Route106_Text_ElliotRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE523:: @ 81EE523
-	trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553
-	msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE
+Route106_EventScript_Ned:: @ 81EE523
+	trainerbattle_single TRAINER_NED, Route106_Text_NedIntro, Route106_Text_NedDefeated
+	msgbox Route106_Text_NedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_Text_1EE53A: @ 81EE53A
+Route106_Text_TrainerTips: @ 81EE53A
 	.string "TRAINER TIPS\p"
 	.string "Advice on catching POKéMON with a ROD:\n"
 	.string "Press the A Button if you get a bite.$"
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index 3813f4795..b0bb63a14 100644
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route107_EventScript_1EE595",
+      "script": "Route107_EventScript_Darrin",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route107_EventScript_1EE5AC",
+      "script": "Route107_EventScript_Tony",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route107_EventScript_1EE60E",
+      "script": "Route107_EventScript_Denise",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route107_EventScript_1EE625",
+      "script": "Route107_EventScript_Beth",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route107_EventScript_1EE63C",
+      "script": "Route107_EventScript_Lisa",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route107_EventScript_1EE657",
+      "script": "Route107_EventScript_Ray",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route107_EventScript_1EE672",
+      "script": "Route107_EventScript_Camron",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
index 90f67a639..0642c457f 100644
--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -1,55 +1,55 @@
 Route107_MapScripts:: @ 81EE594
 	.byte 0
 
-Route107_EventScript_1EE595:: @ 81EE595
-	trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F
-	msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE
+Route107_EventScript_Darrin:: @ 81EE595
+	trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated
+	msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE5AC:: @ 81EE5AC
-	trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
+Route107_EventScript_Tony:: @ 81EE5AC
+	trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route107_EventScript_1EE5F7
-	msgbox Route107_Text_2967FF, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route107_EventScript_TonyRematch
+	msgbox Route107_Text_TonyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route107_EventScript_1EE5D8:: @ 81EE5D8
-	special sub_80B4808
+Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route107_Text_29685A, MSGBOX_DEFAULT
+	msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TONY_1
 	release
 	end
 
-Route107_EventScript_1EE5F7:: @ 81EE5F7
-	trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5
-	msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE
+Route107_EventScript_TonyRematch:: @ 81EE5F7
+	trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated
+	msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE60E:: @ 81EE60E
-	trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E
-	msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE
+Route107_EventScript_Denise:: @ 81EE60E
+	trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated
+	msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE625:: @ 81EE625
-	trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17
-	msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE
+Route107_EventScript_Beth:: @ 81EE625
+	trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated
+	msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE63C:: @ 81EE63C
-	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
-	msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE
+Route107_EventScript_Lisa:: @ 81EE63C
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon
+	msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE657:: @ 81EE657
-	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
-	msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE
+Route107_EventScript_Ray:: @ 81EE657
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon
+	msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_1EE672:: @ 81EE672
-	trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD
-	msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE
+Route107_EventScript_Camron:: @ 81EE672
+	trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated
+	msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index b8b188637..ecdb81f6f 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route108_EventScript_1EE68A",
+      "script": "Route108_EventScript_Jerome",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route108_EventScript_1EE6B8",
+      "script": "Route108_EventScript_Tara",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route108_EventScript_1EE6A1",
+      "script": "Route108_EventScript_Matthew",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route108_EventScript_1EE6CF",
+      "script": "Route108_EventScript_Missy",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route108_EventScript_1EE6E6",
+      "script": "Route108_EventScript_Carolina",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route108_EventScript_1EE6FD",
+      "script": "Route108_EventScript_Cory",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc
index 15a657a20..57f353bd1 100644
--- a/data/maps/Route108/scripts.inc
+++ b/data/maps/Route108/scripts.inc
@@ -1,50 +1,50 @@
 Route108_MapScripts:: @ 81EE689
 	.byte 0
 
-Route108_EventScript_1EE68A:: @ 81EE68A
-	trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
-	msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE
+Route108_EventScript_Jerome:: @ 81EE68A
+	trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated
+	msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_1EE6A1:: @ 81EE6A1
-	trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
-	msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE
+Route108_EventScript_Matthew:: @ 81EE6A1
+	trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated
+	msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_1EE6B8:: @ 81EE6B8
-	trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
-	msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE
+Route108_EventScript_Tara:: @ 81EE6B8
+	trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated
+	msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_1EE6CF:: @ 81EE6CF
-	trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
-	msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE
+Route108_EventScript_Missy:: @ 81EE6CF
+	trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated
+	msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_1EE6E6:: @ 81EE6E6
-	trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
-	msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE
+Route108_EventScript_Carolina:: @ 81EE6E6
+	trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated
+	msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_1EE6FD:: @ 81EE6FD
-	trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
+Route108_EventScript_Cory:: @ 81EE6FD
+	trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route108_EventScript_1EE748
-	msgbox Route108_Text_296FB0, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route108_EventScript_CoryRematch
+	msgbox Route108_Text_CoryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route108_EventScript_1EE729:: @ 81EE729
-	special sub_80B4808
+Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route108_Text_296FD8, MSGBOX_DEFAULT
+	msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CORY_1
 	release
 	end
 
-Route108_EventScript_1EE748:: @ 81EE748
-	trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036
-	msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE
+Route108_EventScript_CoryRematch:: @ 81EE748
+	trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated
+	msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index 361467266..4ba9baf9f 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -48,8 +48,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE910",
-      "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY"
+      "script": "Route109_EventScript_MrBriney",
+      "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route109_EventScript_1EEA3D",
+      "script": "Route109_EventScript_David",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route109_EventScript_1EEA54",
+      "script": "Route109_EventScript_Alice",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEA6B",
+      "script": "Route109_EventScript_Huey",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route109_EventScript_1EEA82",
+      "script": "Route109_EventScript_Edmond",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEA99",
+      "script": "Route109_EventScript_Ricky",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route109_EventScript_1EEAFB",
+      "script": "Route109_EventScript_Lola",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE995",
+      "script": "Route109_EventScript_SeashoreHouseGirl",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB74",
+      "script": "Route109_EventScript_Gwen",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB5D",
+      "script": "Route109_EventScript_Austina",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB8B",
+      "script": "Route109_EventScript_Carter",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE99E",
+      "script": "Route109_EventScript_SandCastleBoy",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE9B5",
+      "script": "Route109_EventScript_SoftSandGirl",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA06",
+      "script": "Route109_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEBBD",
+      "script": "Route109_EventScript_Mel",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEBA2",
+      "script": "Route109_EventScript_Paul",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA0F",
+      "script": "Route109_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA18",
+      "script": "Route109_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route109_EventScript_1EEBEF",
+      "script": "Route109_EventScript_Hailey",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route109_EventScript_1EEBD8",
+      "script": "Route109_EventScript_Chandler",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEC06",
+      "script": "Route109_EventScript_Elijah",
       "flag": "0"
     }
   ],
@@ -355,7 +355,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route109_EventScript_1EEA2B"
+      "script": "Route109_EventScript_SeashoreHouseSign"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 10,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route109_EventScript_1EEA34"
+      "script": "Route109_EventScript_TrainerTipsSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index a4ac60a9c..e7080ac50 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -1,59 +1,59 @@
 Route109_MapScripts:: @ 81EE75F
 	.byte 0
 
-Route109_EventScript_1EE760:: @ 81EE760
-	call Route109_EventScript_271E95
+Route109_EventScript_StartDepartForDewford:: @ 81EE760
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_ROUTE109, 0
 	setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0
-	applymovement 2, Route109_Movement_1EE90B
+	applymovement 2, Route109_Movement_BrineyEnterBoat
 	waitmovement 0
 	removeobject 2
 	switch VAR_FACING
-	case DIR_SOUTH, Route109_EventScript_1EE7A5
-	case DIR_WEST, Route109_EventScript_1EE7C5
-	case DIR_EAST, Route109_EventScript_1EE7B5
+	case DIR_SOUTH, Route109_EventScript_EnterBoatSouth
+	case DIR_WEST, Route109_EventScript_EnterBoatWest
+	case DIR_EAST, Route109_EventScript_EnterBoatEast
 	end
 
-Route109_EventScript_1EE7A5:: @ 81EE7A5
-	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD
+Route109_EventScript_EnterBoatSouth:: @ 81EE7A5
+	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
 	waitmovement 0
-	goto Route109_EventScript_1EE7D5
+	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_1EE7B5:: @ 81EE7B5
-	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905
+Route109_EventScript_EnterBoatEast:: @ 81EE7B5
+	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
 	waitmovement 0
-	goto Route109_EventScript_1EE7D5
+	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_1EE7C5:: @ 81EE7C5
-	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908
+Route109_EventScript_EnterBoatWest:: @ 81EE7C5
+	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
 	waitmovement 0
-	goto Route109_EventScript_1EE7D5
+	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_1EE7D5:: @ 81EE7D5
+Route109_EventScript_DoSailToDewford:: @ 81EE7D5
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
 	call Common_EventScript_PlayBrineysBoatMusic
-	applymovement 1, Route109_Movement_1EE84F
-	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F
+	applymovement 1, Route109_Movement_SailToDewford
+	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford
 	waitmovement 0
 	delay 50
 	call Common_EventScript_StopBrineysBoatMusic
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
-	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900
+	applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat
 	waitmovement 0
 	addobject 4
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	applymovement 2, Route109_Movement_1EE90D
+	applymovement 2, Route109_Movement_BrineyExitBoat
 	waitmovement 0
 	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	hideobjectat 1, MAP_ROUTE109
-	msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
+	msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
 	closemessage
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
@@ -62,7 +62,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
 	release
 	end
 
-Route109_Movement_1EE84F: @ 81EE84F
+Route109_Movement_SailToDewford: @ 81EE84F
 	walk_in_place_fastest_down
 	walk_down
 	walk_down
@@ -238,98 +238,98 @@ Route109_Movement_1EE84F: @ 81EE84F
 	walk_in_place_fastest_down
 	step_end
 
-Route109_Movement_1EE8FD: @ 81EE8FD
+Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD
 	walk_down
 	walk_down
 	step_end
 
-Route109_Movement_1EE900: @ 81EE900
+Route109_Movement_PlayerExitBoat: @ 81EE900
 	walk_down
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Route109_Movement_1EE905: @ 81EE905
+Route109_Movement_PlayerEnterBoatEast: @ 81EE905
 	walk_right
 	walk_down
 	step_end
 
-Route109_Movement_1EE908: @ 81EE908
+Route109_Movement_PlayerEnterBoatWest: @ 81EE908
 	walk_left
 	walk_down
 	step_end
 
-Route109_Movement_1EE90B: @ 81EE90B
+Route109_Movement_BrineyEnterBoat: @ 81EE90B
 	walk_down
 	step_end
 
-Route109_Movement_1EE90D: @ 81EE90D
+Route109_Movement_BrineyExitBoat: @ 81EE90D
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route109_EventScript_1EE910:: @ 81EE910
+Route109_EventScript_MrBriney:: @ 81EE910
 	lock
 	faceplayer
-	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921
-	goto Route109_EventScript_1EE93F
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood
+	goto Route109_EventScript_DeliveredDevonGoods
 	end
 
-Route109_EventScript_1EE921:: @ 81EE921
-	message Route109_Text_1EEC96
-	msgbox Route109_Text_1EEC96, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route109_EventScript_1EE981
-	goto Route109_EventScript_1EE972
+Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
+	message Route109_Text_BrineySailToDewfordQuestion
+	msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route109_EventScript_StayHere
+	goto Route109_EventScript_SailToDewford
 	end
 
-Route109_EventScript_1EE93F:: @ 81EE93F
-	message Route109_Text_1EEE17
+Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
+	message Route109_Text_BrineyWhereAreWeBound
 	waitmessage
 	multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
 	switch VAR_RESULT
-	case 0, Route109_EventScript_1EE972
-	case 1, Route109_EventScript_1EE98B
-	case MULTI_B_PRESSED, Route109_EventScript_1EE98B
+	case 0, Route109_EventScript_SailToDewford
+	case 1, Route109_EventScript_ChoseNotToSail
+	case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail
 	end
 
-Route109_EventScript_1EE972:: @ 81EE972
-	msgbox Route109_Text_1EED06, MSGBOX_DEFAULT
+Route109_EventScript_SailToDewford:: @ 81EE972
+	msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT
 	closemessage
-	goto Route109_EventScript_1EE760
+	goto Route109_EventScript_StartDepartForDewford
 	end
 
-Route109_EventScript_1EE981:: @ 81EE981
-	msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT
+Route109_EventScript_StayHere:: @ 81EE981
+	msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_1EE98B:: @ 81EE98B
-	msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT
+Route109_EventScript_ChoseNotToSail:: @ 81EE98B
+	msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_1EE995:: @ 81EE995
-	msgbox Route109_Text_1EEEB4, MSGBOX_NPC
+Route109_EventScript_SeashoreHouseGirl:: @ 81EE995
+	msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC
 	end
 
-Route109_EventScript_1EE99E:: @ 81EE99E
+Route109_EventScript_SandCastleBoy:: @ 81EE99E
 	lock
 	faceplayer
-	msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT
+	msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route109_EventScript_1EE9B5:: @ 81EE9B5
+Route109_EventScript_SoftSandGirl:: @ 81EE9B5
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2
-	msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand
+	msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOFT_SAND
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -340,207 +340,207 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
 	release
 	end
 
-Route109_EventScript_1EE9F2:: @ 81EE9F2
-	msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT
+Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2
+	msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route109_EventScript_1EEA06:: @ 81EEA06
-	msgbox Route109_Text_1EEF08, MSGBOX_NPC
+Route109_EventScript_Woman:: @ 81EEA06
+	msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC
 	end
 
-Route109_EventScript_1EEA0F:: @ 81EEA0F
-	msgbox Route109_Text_1EF080, MSGBOX_NPC
+Route109_EventScript_OldMan:: @ 81EEA0F
+	msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC
 	end
 
-Route109_EventScript_1EEA18:: @ 81EEA18
+Route109_EventScript_Zigzagoon:: @ 81EEA18
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox Route109_Text_1EF173, MSGBOX_DEFAULT
+	msgbox Route109_Text_ZigzagoonCry, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route109_EventScript_1EEA2B:: @ 81EEA2B
-	msgbox Route109_Text_1EF185, MSGBOX_SIGN
+Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B
+	msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_1EEA34:: @ 81EEA34
-	msgbox Route109_Text_1EF1D5, MSGBOX_SIGN
+Route109_EventScript_TrainerTipsSign:: @ 81EEA34
+	msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_1EEA3D:: @ 81EEA3D
-	trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
-	msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE
+Route109_EventScript_David:: @ 81EEA3D
+	trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated
+	msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEA54:: @ 81EEA54
-	trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
-	msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE
+Route109_EventScript_Alice:: @ 81EEA54
+	trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated
+	msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEA6B:: @ 81EEA6B
-	trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
-	msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE
+Route109_EventScript_Huey:: @ 81EEA6B
+	trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated
+	msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEA82:: @ 81EEA82
-	trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
-	msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE
+Route109_EventScript_Edmond:: @ 81EEA82
+	trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated
+	msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEA99:: @ 81EEA99
-	trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
+Route109_EventScript_Ricky:: @ 81EEA99
+	trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route109_EventScript_1EEAE4
-	msgbox Route109_Text_297380, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route109_EventScript_RickyRematch
+	msgbox Route109_Text_RickyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_1EEAC5:: @ 81EEAC5
-	special sub_80B4808
+Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route109_Text_2973C1, MSGBOX_DEFAULT
+	msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_RICKY_1
 	release
 	end
 
-Route109_EventScript_1EEAE4:: @ 81EEAE4
-	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437
-	msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE
+Route109_EventScript_RickyRematch:: @ 81EEAE4
+	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated
+	msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEAFB:: @ 81EEAFB
-	trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
+Route109_EventScript_Lola:: @ 81EEAFB
+	trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route109_EventScript_1EEB46
-	msgbox Route109_Text_2974D6, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route109_EventScript_LolaRematch
+	msgbox Route109_Text_LolaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_1EEB27:: @ 81EEB27
-	special sub_80B4808
+Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route109_Text_297520, MSGBOX_DEFAULT
+	msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LOLA_1
 	release
 	end
 
-Route109_EventScript_1EEB46:: @ 81EEB46
-	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576
-	msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE
+Route109_EventScript_LolaRematch:: @ 81EEB46
+	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated
+	msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEB5D:: @ 81EEB5D
-	trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
-	msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE
+Route109_EventScript_Austina:: @ 81EEB5D
+	trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated
+	msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEB74:: @ 81EEB74
-	trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
-	msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE
+Route109_EventScript_Gwen:: @ 81EEB74
+	trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated
+	msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEB8B:: @ 81EEB8B
-	trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
-	msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE
+Route109_EventScript_Carter:: @ 81EEB8B
+	trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated
+	msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEBA2:: @ 81EEBA2
-	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
-	msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE
+Route109_EventScript_Paul:: @ 81EEBA2
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon
+	msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEBBD:: @ 81EEBBD
-	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
-	msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE
+Route109_EventScript_Mel:: @ 81EEBBD
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon
+	msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEBD8:: @ 81EEBD8
-	trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
-	msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE
+Route109_EventScript_Chandler:: @ 81EEBD8
+	trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated
+	msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEBEF:: @ 81EEBEF
-	trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
-	msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE
+Route109_EventScript_Hailey:: @ 81EEBEF
+	trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated
+	msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_1EEC06:: @ 81EEC06
-	trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
-	msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE
+Route109_EventScript_Elijah:: @ 81EEC06
+	trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated
+	msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Text_1EEC1D: @ 81EEC1D
+DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've made land in SLATEPORT!\p"
 	.string "I suppose you're going to visit CAPT.\n"
 	.string "STERN and deliver the DEVON GOODS?$"
 
-Route109_Text_1EEC96: @ 81EEC96
+Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96
 	.string "MR. BRINEY: I thought you're supposed\n"
 	.string "to deliver the DEVON GOODS.\p"
 	.string "Would you like to sail back to\n"
 	.string "DEWFORD, then?$"
 
-Route109_Text_1EED06: @ 81EED06
+Route109_Text_BrineyDewfordItIs: @ 81EED06
 	.string "MR. BRINEY: DEWFORD it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-Route109_Text_1EED5E: @ 81EED5E
+Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E
 	.string "MR. BRINEY: Then you go on and deliver\n"
 	.string "the DEVON GOODS. I'll be waiting.$"
 
-DewfordTown_Text_1EEDA7: @ 81EEDA7
+DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7
 	.string "MR. BRINEY: Ahoy! We've made land in\n"
 	.string "SLATEPORT!\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail again!$"
 
-Route109_Text_1EEE17: @ 81EEE17
+Route109_Text_BrineyWhereAreWeBound: @ 81EEE17
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-Route109_Text_1EEE72: @ 81EEE72
+Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72
 	.string "MR. BRINEY: You just tell me whenever\n"
 	.string "you need to set sail again!$"
 
-Route109_Text_1EEEB4: @ 81EEEB4
+Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4
 	.string "Yo, TRAINERS!\n"
 	.string "Whether you're hot to trot,\l"
 	.string "or cool cat not,\l"
 	.string "chill at my papa's spot!$"
 
-Route109_Text_1EEF08: @ 81EEF08
+Route109_Text_LittleKidsDartAround: @ 81EEF08
 	.string "Little kids can dart around so quickly…\p"
 	.string "You don't dare take your eyes off them\n"
 	.string "for an instant. It's very taxing.\p"
 	.string "Mine are with my POKéMON, so they\n"
 	.string "should be okay, but…$"
 
-Route109_Text_1EEFB0: @ 81EEFB0
+Route109_Text_SandCastleTakingLongTime: @ 81EEFB0
 	.string "Our sand castle's taking a long time\n"
 	.string "to make.$"
 
-Route109_Text_1EEFDE: @ 81EEFDE
+Route109_Text_YouCanHaveThis: @ 81EEFDE
 	.string "You can have this!$"
 
-Route109_Text_1EEFF1: @ 81EEFF1
+Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1
 	.string "We're going to get all the sand from\n"
 	.string "the beach and make a big castle!\p"
 	.string "And then we're going to be a king and\n"
 	.string "queen.\p"
 	.string "We'll let you be a servant.$"
 
-Route109_Text_1EF080: @ 81EF080
+Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
 	.string "The water around these parts is clean.\p"
 	.string "But, I get my ZIGZAGOON to pick up\n"
 	.string "litter from the shoreline at times.\p"
@@ -549,15 +549,15 @@ Route109_Text_1EF080: @ 81EF080
 	.string "If we pollute the sea, it all comes\n"
 	.string "back to haunt us eventually.$"
 
-Route109_Text_1EF173: @ 81EF173
+Route109_Text_ZigzagoonCry: @ 81EF173
 	.string "ZIGZAGOON: Guguu?$"
 
-Route109_Text_1EF185: @ 81EF185
+Route109_Text_SeashoreHouseSign: @ 81EF185
 	.string "SEASHORE HOUSE\p"
 	.string "“May hot battles rage on hot sands!\n"
 	.string "The place for hot TRAINERS!”$"
 
-Route109_Text_1EF1D5: @ 81EF1D5
+Route109_Text_TrainerTipsSign: @ 81EF1D5
 	.string "TRAINER TIPS\p"
 	.string "POKéMON at the same level may not\n"
 	.string "always have identical stats.\p"
diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json
index 3f293b291..ebd5583c6 100644
--- a/data/maps/Route109_SeashoreHouse/map.json
+++ b/data/maps/Route109_SeashoreHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_SeashoreHouse_EventScript_2693FE",
+      "script": "Route109_SeashoreHouse_EventScript_Owner",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route109_SeashoreHouse_EventScript_2694E2",
+      "script": "Route109_SeashoreHouse_EventScript_Dwayne",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route109_SeashoreHouse_EventScript_269518",
+      "script": "Route109_SeashoreHouse_EventScript_Simon",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route109_SeashoreHouse_EventScript_2694FD",
+      "script": "Route109_SeashoreHouse_EventScript_Johanna",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index d74b6b671..dc54ab491 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -6,112 +6,104 @@ Route109_SeashoreHouse_OnTransition: @ 82693FA
 	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end
 
-Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE
+Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_269460
-	goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_269432
-	goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428
-	msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop
+	goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_DefeatedTrainers
+	goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction
+	msgbox Route109_SeashoreHouse_Text_SeashoreHouseIntro, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269428:: @ 8269428
-	msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428
+	msgbox Route109_SeashoreHouse_Text_ShowMeSomeHotMatches, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269432:: @ 8269432
-	msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
+	msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
 	giveitem_std ITEM_SODA_POP, 6
 	compare VAR_RESULT, 0
-	goto_if_eq Route109_SeashoreHouse_EventScript_269456
+	goto_if_eq Route109_SeashoreHouse_EventScript_BagFull
 	setflag FLAG_RECEIVED_6_SODA_POP
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269456:: @ 8269456
-	msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_BagFull:: @ 8269456
+	msgbox Route109_SeashoreHouse_Text_BagFull, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269460:: @ 8269460
+Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
 	showmoneybox 0, 0, 0
-	msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route109_SeashoreHouse_EventScript_269484
-	msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT
+	msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop
+	msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269484:: @ 8269484
+Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
 	checkmoney 300, 0
-	compare VAR_RESULT, 0
-	goto_if_eq Route109_SeashoreHouse_EventScript_2694C8
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney
 	checkitemspace ITEM_SODA_POP, 1
-	compare VAR_RESULT, 0
-	goto_if_eq Route109_SeashoreHouse_EventScript_2694D5
-	msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace
+	msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
 	takemoney 300, 0
 	updatemoneybox 0, 0
 	giveitem_std ITEM_SODA_POP
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8
-	msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8
+	msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
+Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
-	nop
-	nop
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2
-	trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533
-	msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Dwayne:: @ 82694E2
+	trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_DwayneIntro, Route109_SeashoreHouse_Text_DwayneDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+	msgbox Route109_SeashoreHouse_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD
-	trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533
-	msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Johanna:: @ 82694FD
+	trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_JohannaIntro, Route109_SeashoreHouse_Text_JohannaDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+	msgbox Route109_SeashoreHouse_Text_JohannaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_269518:: @ 8269518
-	trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533
-	msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Simon:: @ 8269518
+	trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_SimonIntro, Route109_SeashoreHouse_Text_SimonDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+	msgbox Route109_SeashoreHouse_Text_SimonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_269533:: @ 8269533
+Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
 	checktrainerflag TRAINER_DWAYNE
-	goto_if_lt Route109_SeashoreHouse_EventScript_269553
+	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	checktrainerflag TRAINER_JOHANNA
-	goto_if_lt Route109_SeashoreHouse_EventScript_269553
+	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	checktrainerflag TRAINER_SIMON
-	goto_if_lt Route109_SeashoreHouse_EventScript_269553
+	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	setflag FLAG_DEFEATED_SEASHORE_HOUSE
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_269553:: @ 8269553
+Route109_SeashoreHouse_EventScript_TrainersNotCompleted:: @ 8269553
 	release
 	end
 
-Route109_SeashoreHouse_Text_269555: @ 8269555
+Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555
 	.string "I'm the owner of the SEASHORE HOUSE.\n"
 	.string "But you can call me MR. SEA!\p"
 	.string "What I love above all is to see hot\n"
@@ -120,12 +112,12 @@ Route109_SeashoreHouse_Text_269555: @ 8269555
 	.string "If you can defeat all the TRAINERS\n"
 	.string "here, I'll reward your efforts.$"
 
-Route109_SeashoreHouse_Text_269635: @ 8269635
+Route109_SeashoreHouse_Text_ShowMeSomeHotMatches: @ 8269635
 	.string "Show me some hot matches!\p"
 	.string "I run this SEASHORE HOUSE just for\n"
 	.string "that reason alone!$"
 
-Route109_SeashoreHouse_Text_269685: @ 8269685
+Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685
 	.string "You're scorching hot!\n"
 	.string "Those battles blazed!\l"
 	.string "I'm more than just satisfied!\p"
@@ -133,59 +125,59 @@ Route109_SeashoreHouse_Text_269685: @ 8269685
 	.string "streak, I want you to take these.\p"
 	.string "It's half a dozen bottles of SODA POP!$"
 
-Route109_SeashoreHouse_Text_26973A: @ 826973A
+Route109_SeashoreHouse_Text_BagFull: @ 826973A
 	.string "Oh, but hey, your BAG's jammed full.\n"
 	.string "I'll hang on to these for you.$"
 
-Route109_SeashoreHouse_Text_26977E: @ 826977E
+Route109_SeashoreHouse_Text_WantToBuySodaPop: @ 826977E
 	.string "Want to buy some SODA POP?\n"
 	.string "POKéMON love it!\p"
 	.string "Just ¥300 a bottle!\n"
 	.string "Buy some!$"
 
-Route109_SeashoreHouse_Text_2697C8: @ 82697C8
+Route109_SeashoreHouse_Text_HereYouGo: @ 82697C8
 	.string "Here you go!$"
 
-Route109_SeashoreHouse_Text_2697D5: @ 82697D5
+Route109_SeashoreHouse_Text_NotEnoughMoney: @ 82697D5
 	.string "You don't have the money.$"
 
-Route109_SeashoreHouse_Text_2697EF: @ 82697EF
+Route109_SeashoreHouse_Text_ThatsTooBad: @ 82697EF
 	.string "No?\n"
 	.string "That's too bad.$"
 
-Route109_SeashoreHouse_Text_269803: @ 8269803
+Route109_SeashoreHouse_Text_DwayneIntro: @ 8269803
 	.string "If you're looking for a battle in the\n"
 	.string "SEASHORE HOUSE, you'll find no\l"
 	.string "hotter TRAINER than me, matey!$"
 
-Route109_SeashoreHouse_Text_269867: @ 8269867
+Route109_SeashoreHouse_Text_DwayneDefeated: @ 8269867
 	.string "That was a hot battle!\n"
 	.string "I can accept that loss, matey!$"
 
-Route109_SeashoreHouse_Text_26989D: @ 826989D
+Route109_SeashoreHouse_Text_DwaynePostBattle: @ 826989D
 	.string "Whenever I'm in SLATEPORT, I enjoy\n"
 	.string "hot battles and ice-cold SODA POP!$"
 
-Route109_SeashoreHouse_Text_2698E3: @ 82698E3
+Route109_SeashoreHouse_Text_JohannaIntro: @ 82698E3
 	.string "Boring battles aren't worth the effort.\p"
 	.string "Fiery hot battles are what toughen up\n"
 	.string "TRAINERS and POKéMON!$"
 
-Route109_SeashoreHouse_Text_269947: @ 8269947
+Route109_SeashoreHouse_Text_JohannaDefeated: @ 8269947
 	.string "That's hot!$"
 
-Route109_SeashoreHouse_Text_269953: @ 8269953
+Route109_SeashoreHouse_Text_JohannaPostBattle: @ 8269953
 	.string "Whew, I'm all thirsty.\n"
 	.string "Maybe I'll have a SODA POP.$"
 
-Route109_SeashoreHouse_Text_269986: @ 8269986
+Route109_SeashoreHouse_Text_SimonIntro: @ 8269986
 	.string "I'm going to show you how great\n"
 	.string "my POKéMON are, but don't cry!$"
 
-Route109_SeashoreHouse_Text_2699C5: @ 82699C5
+Route109_SeashoreHouse_Text_SimonDefeated: @ 82699C5
 	.string "…I lost, but I won't cry…$"
 
-Route109_SeashoreHouse_Text_2699DF: @ 82699DF
+Route109_SeashoreHouse_Text_SimonPostBattle: @ 82699DF
 	.string "If one of my POKéMON knew the move\n"
 	.string "for carrying me across water on its\l"
 	.string "back, I could get rid of this inner tube.$"
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index 570c38dcc..660f24ccc 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF338",
+      "script": "Route110_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF32F",
+      "script": "Route110_EventScript_CyclingGuy2",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF326",
+      "script": "Route110_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF314",
+      "script": "Route110_EventScript_CyclingGuy1",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF31D",
+      "script": "Route110_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF30B",
+      "script": "Route110_EventScript_CyclingGirl1",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF302",
+      "script": "Route110_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 14,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_EventScript_1EF529",
+      "script": "Route110_EventScript_Jasmine",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_EventScript_1EF4B0",
+      "script": "Route110_EventScript_Anthony",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route110_EventScript_1EF540",
+      "script": "Route110_EventScript_Abigail",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_EventScript_1EF4C7",
+      "script": "Route110_EventScript_Benjamin",
       "flag": "0"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route110_EventScript_1EF3F2",
+      "script": "Route110_EventScript_Edward",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_EventScript_1EF409",
+      "script": "Route110_EventScript_Jaclyn",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route110_EventScript_1EF420",
+      "script": "Route110_EventScript_Edwin",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_EventScript_1EF482",
+      "script": "Route110_EventScript_Dale",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF3B7",
+      "script": "Route110_EventScript_ChallengeGuy",
       "flag": "0"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF2AA",
+      "script": "Route110_EventScript_AquaGrunt1",
       "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF2C0",
+      "script": "Route110_EventScript_AquaGrunt2",
       "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF2D6",
+      "script": "Route110_EventScript_AquaGrunt3",
       "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_EventScript_1EF2EC",
+      "script": "Route110_EventScript_AquaGrunt4",
       "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_EventScript_1EF499",
+      "script": "Route110_EventScript_Jacob",
       "flag": "0"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_EventScript_1EF604",
+      "script": "Route110_EventScript_Timmy",
       "flag": "0"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_EventScript_1EF5A2",
+      "script": "Route110_EventScript_Isabel",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_EventScript_1EF61C",
+      "script": "Route110_EventScript_Kaleb",
       "flag": "0"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route110_EventScript_1EF64A",
+      "script": "Route110_EventScript_Alyssa",
       "flag": "0"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_EventScript_1EF633",
+      "script": "Route110_EventScript_Joseph",
       "flag": "0"
     },
     {
@@ -551,7 +551,7 @@
       "elevation": 3,
       "var": "VAR_CYCLING_CHALLENGE_STATE",
       "var_value": "2",
-      "script": "Route110_EventScript_1EF661"
+      "script": "Route110_EventScript_CyclingChallengeEnd"
     },
     {
       "type": "trigger",
@@ -560,7 +560,7 @@
       "elevation": 3,
       "var": "VAR_CYCLING_CHALLENGE_STATE",
       "var_value": "2",
-      "script": "Route110_EventScript_1EF661"
+      "script": "Route110_EventScript_CyclingChallengeEnd"
     },
     {
       "type": "trigger",
@@ -569,7 +569,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE110_STATE",
       "var_value": "0",
-      "script": "Route110_EventScript_1EF74D"
+      "script": "Route110_EventScript_RivalTrigger1"
     },
     {
       "type": "trigger",
@@ -578,7 +578,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE110_STATE",
       "var_value": "0",
-      "script": "Route110_EventScript_1EF758"
+      "script": "Route110_EventScript_RivalTrigger2"
     },
     {
       "type": "trigger",
@@ -587,7 +587,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE110_STATE",
       "var_value": "0",
-      "script": "Route110_EventScript_1EF763"
+      "script": "Route110_EventScript_RivalTrigger3"
     },
     {
       "type": "trigger",
@@ -596,7 +596,7 @@
       "elevation": 3,
       "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
-      "script": "Route110_EventScript_1EF9CB"
+      "script": "Route110_EventScript_BirchScene1"
     },
     {
       "type": "trigger",
@@ -605,7 +605,7 @@
       "elevation": 3,
       "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
-      "script": "Route110_EventScript_1EF9D6"
+      "script": "Route110_EventScript_BirchScene2"
     },
     {
       "type": "trigger",
@@ -614,7 +614,7 @@
       "elevation": 3,
       "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
-      "script": "Route110_EventScript_1EF9E1"
+      "script": "Route110_EventScript_BirchScene3"
     },
     {
       "type": "trigger",
@@ -623,7 +623,7 @@
       "elevation": 3,
       "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
-      "script": "Route110_EventScript_1EF9EC"
+      "script": "Route110_EventScript_BirchScene4"
     }
   ],
   "bg_events": [
@@ -633,7 +633,7 @@
       "y": 25,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF353"
+      "script": "Route110_EventScript_VandalizedSign"
     },
     {
       "type": "sign",
@@ -641,7 +641,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF365"
+      "script": "Route110_EventScript_SeasideParkingSign"
     },
     {
       "type": "sign",
@@ -649,7 +649,7 @@
       "y": 88,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF34A"
+      "script": "Route110_EventScript_CyclingRoadSign"
     },
     {
       "type": "sign",
@@ -657,7 +657,7 @@
       "y": 94,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF341"
+      "script": "Route110_EventScript_SlateportCitySign"
     },
     {
       "type": "sign",
@@ -665,7 +665,7 @@
       "y": 79,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF35C"
+      "script": "Route110_EventScript_Route103Sign"
     },
     {
       "type": "sign",
@@ -673,7 +673,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF36E"
+      "script": "Route110_EventScript_MauvilleCitySign"
     },
     {
       "type": "secret_base",
@@ -695,7 +695,7 @@
       "y": 39,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF377"
+      "script": "Route110_EventScript_TrainerTipsPrlzSleep"
     },
     {
       "type": "sign",
@@ -703,7 +703,7 @@
       "y": 70,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF380"
+      "script": "Route110_EventScript_TrainerTipsRegisterItems"
     },
     {
       "type": "sign",
@@ -711,7 +711,7 @@
       "y": 67,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF389"
+      "script": "Route110_EventScript_TrickHouseSign"
     },
     {
       "type": "sign",
@@ -719,7 +719,7 @@
       "y": 93,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF392"
+      "script": "Route110_EventScript_CyclingRoadResultsSign"
     },
     {
       "type": "hidden_item",
@@ -759,7 +759,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_EventScript_1EF34A"
+      "script": "Route110_EventScript_CyclingRoadSign"
     }
   ]
 }
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index cafd99a9c..bccc903f1 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -1,10 +1,10 @@
 Route110_MapScripts:: @ 81EF269
-	map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279
+	map_script MAP_SCRIPT_ON_RESUME, Route110_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_OnFrame
 	.byte 0
 
-Route110_MapScript1_1EF279: @ 81EF279
+Route110_OnResume: @ 81EF279
 	special UpdateCyclingRoadState
 	end
 
@@ -12,377 +12,377 @@ Route110_OnTransition: @ 81EF27D
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_CYCLING_CHALLENGE_STATE, 1
-	call_if_eq Route110_EventScript_1EF293
+	call_if_eq Route110_EventScript_SaveCyclingMusic
 	end
 
-Route110_EventScript_1EF293:: @ 81EF293
+Route110_EventScript_SaveCyclingMusic:: @ 81EF293
 	savebgm MUS_CYCLING
 	return
 
-Route110_MapScript2_1EF297: @ 81EF297
-	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1
+Route110_OnFrame: @ 81EF297
+	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_BeginCylcingRoadChallenge
 	.2byte 0
 
-Route110_EventScript_1EF2A1:: @ 81EF2A1
+Route110_EventScript_BeginCylcingRoadChallenge:: @ 81EF2A1
 	special Special_BeginCyclingRoadChallenge
 	setvar VAR_CYCLING_CHALLENGE_STATE, 2
 	return
 
-Route110_EventScript_1EF2AA:: @ 81EF2AA
+Route110_EventScript_AquaGrunt1:: @ 81EF2AA
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT
+	msgbox Route110_Text_WeCantTalkAboutAquaActivities, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route110_EventScript_1EF2C0:: @ 81EF2C0
+Route110_EventScript_AquaGrunt2:: @ 81EF2C0
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT
+	msgbox Route110_Text_KickUpARuckus, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route110_EventScript_1EF2D6:: @ 81EF2D6
+Route110_EventScript_AquaGrunt3:: @ 81EF2D6
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT
+	msgbox Route110_Text_MyFirstJobInAqua, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route110_EventScript_1EF2EC:: @ 81EF2EC
+Route110_EventScript_AquaGrunt4:: @ 81EF2EC
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT
+	msgbox Route110_Text_AquaActionsBringSmiles, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route110_EventScript_1EF302:: @ 81EF302
-	msgbox Route110_Text_1EFFC3, MSGBOX_NPC
+Route110_EventScript_Boy1:: @ 81EF302
+	msgbox Route110_Text_RideBikeAtFullSpeed, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF30B:: @ 81EF30B
-	msgbox Route110_Text_1F0006, MSGBOX_NPC
+Route110_EventScript_CyclingGirl1:: @ 81EF30B
+	msgbox Route110_Text_HairStreamsBehindMe, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF314:: @ 81EF314
-	msgbox Route110_Text_1F006A, MSGBOX_NPC
+Route110_EventScript_CyclingGuy1:: @ 81EF314
+	msgbox Route110_Text_YouGotBikeFromRydel, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF31D:: @ 81EF31D
-	msgbox Route110_Text_1F0261, MSGBOX_NPC
+Route110_EventScript_OldMan:: @ 81EF31D
+	msgbox Route110_Text_TwoRoads, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF326:: @ 81EF326
-	msgbox Route110_Text_1F02CA, MSGBOX_NPC
+Route110_EventScript_OldWoman:: @ 81EF326
+	msgbox Route110_Text_WalkOnTheLowRoad, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF32F:: @ 81EF32F
-	msgbox Route110_Text_1F030E, MSGBOX_NPC
+Route110_EventScript_CyclingGuy2:: @ 81EF32F
+	msgbox Route110_Text_BikeTechniques, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF338:: @ 81EF338
-	msgbox Route110_Text_1F0390, MSGBOX_NPC
+Route110_EventScript_Boy2:: @ 81EF338
+	msgbox Route110_Text_WhichShouldIChoose, MSGBOX_NPC
 	end
 
-Route110_EventScript_1EF341:: @ 81EF341
-	msgbox Route110_Text_1F0812, MSGBOX_SIGN
+Route110_EventScript_SlateportCitySign:: @ 81EF341
+	msgbox Route110_Text_SlateportCitySign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF34A:: @ 81EF34A
-	msgbox Route110_Text_1F082D, MSGBOX_SIGN
+Route110_EventScript_CyclingRoadSign:: @ 81EF34A
+	msgbox Route110_Text_CyclingRoadSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF353:: @ 81EF353
-	msgbox Route110_Text_1F0842, MSGBOX_SIGN
+Route110_EventScript_VandalizedSign:: @ 81EF353
+	msgbox Route110_Text_AquaWasHere, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF35C:: @ 81EF35C
-	msgbox Route110_Text_1F08CD, MSGBOX_SIGN
+Route110_EventScript_Route103Sign:: @ 81EF35C
+	msgbox Route110_Text_Route103Sign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF365:: @ 81EF365
-	msgbox Route110_Text_1F08E3, MSGBOX_SIGN
+Route110_EventScript_SeasideParkingSign:: @ 81EF365
+	msgbox Route110_Text_SeasideParkingSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF36E:: @ 81EF36E
-	msgbox Route110_Text_1F08F3, MSGBOX_SIGN
+Route110_EventScript_MauvilleCitySign:: @ 81EF36E
+	msgbox Route110_Text_MauvilleCitySign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF377:: @ 81EF377
-	msgbox Route110_Text_1F090D, MSGBOX_SIGN
+Route110_EventScript_TrainerTipsPrlzSleep:: @ 81EF377
+	msgbox Route110_Text_TrainerTipsPrlzSleep, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF380:: @ 81EF380
-	msgbox Route110_Text_1F0992, MSGBOX_SIGN
+Route110_EventScript_TrainerTipsRegisterItems:: @ 81EF380
+	msgbox Route110_Text_TrainerTipsRegisterItems, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF389:: @ 81EF389
-	msgbox Route110_Text_1F09DB, MSGBOX_SIGN
+Route110_EventScript_TrickHouseSign:: @ 81EF389
+	msgbox Route110_Text_TrickHouseSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_1EF392:: @ 81EF392
+Route110_EventScript_CyclingRoadResultsSign:: @ 81EF392
 	lockall
 	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
-	compare VAR_RESULT, 0
-	goto_if_eq Route110_EventScript_1EF3AD
-	msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route110_EventScript_NoRecordSet
+	msgbox Route110_Text_BestRecord, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_EventScript_1EF3AD:: @ 81EF3AD
-	msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT
+Route110_EventScript_NoRecordSet:: @ 81EF3AD
+	msgbox Route110_Text_ThereIsNoRecord, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_EventScript_1EF3B7:: @ 81EF3B7
+Route110_EventScript_ChallengeGuy:: @ 81EF3B7
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 1
-	goto_if_eq Route110_EventScript_1EF3E8
+	goto_if_eq Route110_EventScript_PlayerRidingAcroBike
 	compare VAR_CYCLING_CHALLENGE_STATE, 0
-	goto_if_eq Route110_EventScript_1EF3DE
-	msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT
+	goto_if_eq Route110_EventScript_PlayerNotRidingBike
+	msgbox Route110_Text_AlwaysAimHigher, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF3DE:: @ 81EF3DE
-	msgbox Route110_Text_1F0661, MSGBOX_DEFAULT
+Route110_EventScript_PlayerNotRidingBike:: @ 81EF3DE
+	msgbox Route110_Text_RatedForNumberOfCollisions, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF3E8:: @ 81EF3E8
-	msgbox Route110_Text_1F0755, MSGBOX_DEFAULT
+Route110_EventScript_PlayerRidingAcroBike:: @ 81EF3E8
+	msgbox Route110_Text_AcroBikesDoNotQualify, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF3F2:: @ 81EF3F2
-	trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064
-	msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE
+Route110_EventScript_Edward:: @ 81EF3F2
+	trainerbattle_single TRAINER_EDWARD, Route110_Text_EdwardIntro, Route110_Text_EdwardDefeated
+	msgbox Route110_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF409:: @ 81EF409
-	trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5
-	msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE
+Route110_EventScript_Jaclyn:: @ 81EF409
+	trainerbattle_single TRAINER_JACLYN, Route110_Text_JaclynIntro, Route110_Text_JaclynDefeated
+	msgbox Route110_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF420:: @ 81EF420
-	trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
+Route110_EventScript_Edwin:: @ 81EF420
+	trainerbattle_single TRAINER_EDWIN_1, Route110_Text_EdwinIntro, Route110_Text_EdwinDefeated, Route110_EventScript_EdwinRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_EventScript_1EF46B
-	msgbox Route110_Text_2981B3, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_EventScript_EdwinRematch
+	msgbox Route110_Text_EdwinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF44C:: @ 81EF44C
-	special sub_80B4808
+Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route110_Text_298201, MSGBOX_DEFAULT
+	msgbox Route110_Text_EdwinRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_EDWIN_1
 	release
 	end
 
-Route110_EventScript_1EF46B:: @ 81EF46B
-	trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288
-	msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE
+Route110_EventScript_EdwinRematch:: @ 81EF46B
+	trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_EdwinRematchIntro, Route110_Text_EdwinRematchDefeated
+	msgbox Route110_Text_EdwinRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF482:: @ 81EF482
-	trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5
-	msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE
+Route110_EventScript_Dale:: @ 81EF482
+	trainerbattle_single TRAINER_DALE, Route110_Text_DaleIntro, Route110_Text_DaleDefeated
+	msgbox Route110_Text_DalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF499:: @ 81EF499
-	trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77
-	msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE
+Route110_EventScript_Jacob:: @ 81EF499
+	trainerbattle_single TRAINER_JACOB, Route110_Text_JacobIntro, Route110_Text_JacobDefeated
+	msgbox Route110_Text_JacobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF4B0:: @ 81EF4B0
-	trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F
-	msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE
+Route110_EventScript_Anthony:: @ 81EF4B0
+	trainerbattle_single TRAINER_ANTHONY, Route110_Text_AnthonyIntro, Route110_Text_AnthonyDefeated
+	msgbox Route110_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF4C7:: @ 81EF4C7
-	trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
+Route110_EventScript_Benjamin:: @ 81EF4C7
+	trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_BenjaminIntro, Route110_Text_BenjaminDefeated, Route110_EventScript_BenjaminRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_EventScript_1EF512
-	msgbox Route110_Text_297CB4, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_EventScript_BenjaminRematch
+	msgbox Route110_Text_BenjaminPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF4F3:: @ 81EF4F3
-	special sub_80B4808
+Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route110_Text_297CFE, MSGBOX_DEFAULT
+	msgbox Route110_Text_BenjaminRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BENJAMIN_1
 	release
 	end
 
-Route110_EventScript_1EF512:: @ 81EF512
-	trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E
-	msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE
+Route110_EventScript_BenjaminRematch:: @ 81EF512
+	trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_BenjaminRematchIntro, Route110_Text_BenjaminRematchDefeated
+	msgbox Route110_Text_BenjaminRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF529:: @ 81EF529
-	trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0
-	msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE
+Route110_EventScript_Jasmine:: @ 81EF529
+	trainerbattle_single TRAINER_JASMINE, Route110_Text_JasmineIntro, Route110_Text_JasmineDefeated
+	msgbox Route110_Text_JasminePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF540:: @ 81EF540
-	trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
+Route110_EventScript_Abigail:: @ 81EF540
+	trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_AbigailIntro, Route110_Text_AbigailDefeated, Route110_EventScript_AbigailRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_EventScript_1EF58B
-	msgbox Route110_Text_297E88, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_EventScript_AbigailRematch
+	msgbox Route110_Text_AbigailPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF56C:: @ 81EF56C
-	special sub_80B4808
+Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route110_Text_297ECD, MSGBOX_DEFAULT
+	msgbox Route110_Text_AbigailRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ABIGAIL_1
 	release
 	end
 
-Route110_EventScript_1EF58B:: @ 81EF58B
-	trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37
-	msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE
+Route110_EventScript_AbigailRematch:: @ 81EF58B
+	trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_AbigailRematchIntro, Route110_Text_AbigailRematchDefeated
+	msgbox Route110_Text_AbigailRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF5A2:: @ 81EF5A2
-	trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
+Route110_EventScript_Isabel:: @ 81EF5A2
+	trainerbattle_single TRAINER_ISABEL_1, Route110_Text_IsabelIntro, Route110_Text_IsabelDefeated, Route110_EventScript_IsabelRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_EventScript_1EF5ED
-	msgbox Route110_Text_2983A2, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_EventScript_IsabelRematch
+	msgbox Route110_Text_IsabelPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_1EF5CE:: @ 81EF5CE
-	special sub_80B4808
+Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route110_Text_2983EE, MSGBOX_DEFAULT
+	msgbox Route110_Text_IsabelRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISABEL_1
 	release
 	end
 
-Route110_EventScript_1EF5ED:: @ 81EF5ED
-	trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF
-	msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE
+Route110_EventScript_IsabelRematch:: @ 81EF5ED
+	trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_IsabelRematchIntro, Route110_Text_IsabelRematchDefeated
+	msgbox Route110_Text_IsabelRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF604:: @ 81EF604
-	trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559
-	msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE
+Route110_EventScript_Timmy:: @ 81EF604
+	trainerbattle_single TRAINER_TIMMY, Route110_Text_TimmyIntro, Route110_Text_TimmyDefeated
+	msgbox Route110_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF61B:: @ 81EF61B
+Route110_EventScript_Unused:: @ 81EF61B
 	end
 
-Route110_EventScript_1EF61C:: @ 81EF61C
-	trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735
-	msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE
+Route110_EventScript_Kaleb:: @ 81EF61C
+	trainerbattle_single TRAINER_KALEB, Route110_Text_KalebIntro, Route110_Text_KalebDefeated
+	msgbox Route110_Text_KalebPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF633:: @ 81EF633
-	trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686
-	msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE
+Route110_EventScript_Joseph:: @ 81EF633
+	trainerbattle_single TRAINER_JOSEPH, Route110_Text_JosephIntro, Route110_Text_JosephDefeated
+	msgbox Route110_Text_JosephPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF64A:: @ 81EF64A
-	trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9
-	msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE
+Route110_EventScript_Alyssa:: @ 81EF64A
+	trainerbattle_single TRAINER_ALYSSA, Route110_Text_AlyssaIntro, Route110_Text_AlyssaDefeated
+	msgbox Route110_Text_AlyssaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_1EF661:: @ 81EF661
+Route110_EventScript_CyclingChallengeEnd:: @ 81EF661
 	lockall
 	applymovement 21, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call Route110_EventScript_1EF673
+	call Route110_EventScript_CyclingChallengeResults
 	releaseall
 	end
 
-Route110_EventScript_1EF673:: @ 81EF673
+Route110_EventScript_CyclingChallengeResults:: @ 81EF673
 	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT
+	msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT
 	switch VAR_RESULT
-	case 10, Route110_EventScript_1EF6FD
-	case 9, Route110_EventScript_1EF70B
-	case 8, Route110_EventScript_1EF70B
-	case 7, Route110_EventScript_1EF70B
-	case 6, Route110_EventScript_1EF719
-	case 5, Route110_EventScript_1EF719
-	case 4, Route110_EventScript_1EF719
-	case 3, Route110_EventScript_1EF727
-	case 2, Route110_EventScript_1EF727
-	case 1, Route110_EventScript_1EF727
-	case 0, Route110_EventScript_1EF735
+	case 10, Route110_EventScript_ChallengeReactionBest
+	case 9, Route110_EventScript_ChallengeReactionGood
+	case 8, Route110_EventScript_ChallengeReactionGood
+	case 7, Route110_EventScript_ChallengeReactionGood
+	case 6, Route110_EventScript_ChallengeReactionOk
+	case 5, Route110_EventScript_ChallengeReactionOk
+	case 4, Route110_EventScript_ChallengeReactionOk
+	case 3, Route110_EventScript_ChallengeReactionBad
+	case 2, Route110_EventScript_ChallengeReactionBad
+	case 1, Route110_EventScript_ChallengeReactionBad
+	case 0, Route110_EventScript_ChallengeReactionWorst
 	end
 
-Route110_EventScript_1EF6FD:: @ 81EF6FD
-	msgbox Route110_Text_1F0431, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF743
+Route110_EventScript_ChallengeReactionBest:: @ 81EF6FD
+	msgbox Route110_Text_ChallengeReactionBest, MSGBOX_DEFAULT
+	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_1EF70B:: @ 81EF70B
-	msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF743
+Route110_EventScript_ChallengeReactionGood:: @ 81EF70B
+	msgbox Route110_Text_ChallengeReactionGood, MSGBOX_DEFAULT
+	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_1EF719:: @ 81EF719
-	msgbox Route110_Text_1F0500, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF743
+Route110_EventScript_ChallengeReactionOk:: @ 81EF719
+	msgbox Route110_Text_ChallengeReactionOk, MSGBOX_DEFAULT
+	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_1EF727:: @ 81EF727
-	msgbox Route110_Text_1F0567, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF743
+Route110_EventScript_ChallengeReactionBad:: @ 81EF727
+	msgbox Route110_Text_ChallengeReactionBad, MSGBOX_DEFAULT
+	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_1EF735:: @ 81EF735
-	msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF743
+Route110_EventScript_ChallengeReactionWorst:: @ 81EF735
+	msgbox Route110_Text_ChallengeReactionWorst, MSGBOX_DEFAULT
+	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_1EF743:: @ 81EF743
+Route110_EventScript_EndChallenge:: @ 81EF743
 	setvar VAR_CYCLING_CHALLENGE_STATE, 3
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-Route110_EventScript_1EF74D:: @ 81EF74D
+Route110_EventScript_RivalTrigger1:: @ 81EF74D
 	setvar VAR_0x8008, 1
-	goto Route110_EventScript_1EF76E
+	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_1EF758:: @ 81EF758
+Route110_EventScript_RivalTrigger2:: @ 81EF758
 	setvar VAR_0x8008, 2
-	goto Route110_EventScript_1EF76E
+	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_1EF763:: @ 81EF763
+Route110_EventScript_RivalTrigger3:: @ 81EF763
 	setvar VAR_0x8008, 3
-	goto Route110_EventScript_1EF76E
+	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_1EF76E:: @ 81EF76E
+Route110_EventScript_RivalScene:: @ 81EF76E
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq Route110_EventScript_1EF7E1
+	call_if_eq Route110_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq Route110_EventScript_1EF7E6
+	call_if_eq Route110_EventScript_PlayBrendanMusic
 	applymovement 28, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 28, Common_Movement_ExclamationMark
@@ -391,110 +391,110 @@ Route110_EventScript_1EF76E:: @ 81EF76E
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 1
-	call_if_eq Route110_EventScript_1EF94E
+	call_if_eq Route110_EventScript_RivalApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq Route110_EventScript_1EF959
+	call_if_eq Route110_EventScript_RivalApproachPlayer2
 	compare VAR_0x8008, 3
-	call_if_eq Route110_EventScript_1EF964
+	call_if_eq Route110_EventScript_RivalApproachPlayer3
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route110_EventScript_1EF7EB
+	goto_if_eq Route110_EventScript_MayBattle
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route110_EventScript_1EF865
+	goto_if_eq Route110_EventScript_BrendanBattle
 	releaseall
 	end
 
-Route110_EventScript_1EF7E1:: @ 81EF7E1
+Route110_EventScript_PlayMayMusic:: @ 81EF7E1
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-Route110_EventScript_1EF7E6:: @ 81EF7E6
+Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6
 	playbgm MUS_BOY_SUP, 1
 	return
 
-Route110_EventScript_1EF7EB:: @ 81EF7EB
-	msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT
+Route110_EventScript_MayBattle:: @ 81EF7EB
+	msgbox Route110_Text_MayLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_1EF81A
-	case 1, Route110_EventScript_1EF82A
-	case 2, Route110_EventScript_1EF83A
+	case 0, Route110_EventScript_MayBattleTreecko
+	case 1, Route110_EventScript_MayBattleTorchic
+	case 2, Route110_EventScript_MayBattleMudkip
 	end
 
-Route110_EventScript_1EF81A:: @ 81EF81A
-	trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
+Route110_EventScript_MayBattleTreecko:: @ 81EF81A
+	trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated
+	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_1EF82A:: @ 81EF82A
-	trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
+Route110_EventScript_MayBattleTorchic:: @ 81EF82A
+	trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated
+	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_1EF83A:: @ 81EF83A
-	trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
+Route110_EventScript_MayBattleMudkip:: @ 81EF83A
+	trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated
+	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_1EF84A:: @ 81EF84A
-	msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT
-	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF8EC
+Route110_EventScript_MayDefeated:: @ 81EF84A
+	msgbox Route110_Text_MayTakeThis, MSGBOX_DEFAULT
+	call Route110_EventScript_GiveItemfinder
+	msgbox Route110_Text_MayExplainItemfinder, MSGBOX_DEFAULT
+	goto Route110_EventScript_RivalExit
 	end
 
-Route110_EventScript_1EF865:: @ 81EF865
-	msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT
+Route110_EventScript_BrendanBattle:: @ 81EF865
+	msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_1EF894
-	case 1, Route110_EventScript_1EF8A4
-	case 2, Route110_EventScript_1EF8B4
+	case 0, Route110_EventScript_BrendanBattleTreecko
+	case 1, Route110_EventScript_BrendanBattleTorchic
+	case 2, Route110_EventScript_BrendanBattleMudkip
 	end
 
-Route110_EventScript_1EF894:: @ 81EF894
-	trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
+Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
+	trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated
+	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_1EF8A4:: @ 81EF8A4
-	trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
+Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
+	trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated
+	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_1EF8B4:: @ 81EF8B4
-	trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
+Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
+	trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated
+	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_1EF8C4:: @ 81EF8C4
-	msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT
-	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT
-	goto Route110_EventScript_1EF8EC
+Route110_EventScript_BrendanDefeated:: @ 81EF8C4
+	msgbox Route110_Text_BrendanTakeThis, MSGBOX_DEFAULT
+	call Route110_EventScript_GiveItemfinder
+	msgbox Route110_Text_BrendanExplainItemfinder, MSGBOX_DEFAULT
+	goto Route110_EventScript_RivalExit
 	end
 
-Route110_EventScript_1EF8DF:: @ 81EF8DF
+Route110_EventScript_GiveItemfinder:: @ 81EF8DF
 	giveitem_std ITEM_ITEMFINDER
 	return
 
-Route110_EventScript_1EF8EC:: @ 81EF8EC
+Route110_EventScript_RivalExit:: @ 81EF8EC
 	closemessage
 	compare VAR_0x8008, 1
-	call_if_eq Route110_EventScript_1EF990
+	call_if_eq Route110_EventScript_MoveRival1
 	compare VAR_0x8008, 2
-	call_if_eq Route110_EventScript_1EF998
+	call_if_eq Route110_EventScript_MoveRival2
 	compare VAR_0x8008, 3
-	call_if_eq Route110_EventScript_1EF9A0
+	call_if_eq Route110_EventScript_MoveRival3
 	setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT
 	removeobject 28
 	addobject 29
 	delay 45
 	compare VAR_0x8008, 1
-	call_if_eq Route110_EventScript_1EF96F
+	call_if_eq Route110_EventScript_RivalExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route110_EventScript_1EF97A
+	call_if_eq Route110_EventScript_RivalExit2
 	compare VAR_0x8008, 3
-	call_if_eq Route110_EventScript_1EF985
+	call_if_eq Route110_EventScript_RivalExit3
 	removeobject 29
 	setvar VAR_ROUTE110_STATE, 1
 	savebgm MUS_DUMMY
@@ -502,65 +502,65 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC
 	releaseall
 	end
 
-Route110_EventScript_1EF94E:: @ 81EF94E
-	applymovement 28, Route110_Movement_1EF9A8
+Route110_EventScript_RivalApproachPlayer1:: @ 81EF94E
+	applymovement 28, Route110_Movement_RivalApproachPlayer1
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF959:: @ 81EF959
-	applymovement 28, Route110_Movement_1EF9AC
+Route110_EventScript_RivalApproachPlayer2:: @ 81EF959
+	applymovement 28, Route110_Movement_RivalApproachPlayer2
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF964:: @ 81EF964
-	applymovement 28, Route110_Movement_1EF9AE
+Route110_EventScript_RivalApproachPlayer3:: @ 81EF964
+	applymovement 28, Route110_Movement_RivalApproachPlayer3
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF96F:: @ 81EF96F
-	applymovement 29, Route110_Movement_1EF9B2
+Route110_EventScript_RivalExit1:: @ 81EF96F
+	applymovement 29, Route110_Movement_RivalExit1
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF97A:: @ 81EF97A
-	applymovement 29, Route110_Movement_1EF9BA
+Route110_EventScript_RivalExit2:: @ 81EF97A
+	applymovement 29, Route110_Movement_RivalExit2
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF985:: @ 81EF985
-	applymovement 29, Route110_Movement_1EF9C3
+Route110_EventScript_RivalExit3:: @ 81EF985
+	applymovement 29, Route110_Movement_RivalExit3
 	waitmovement 0
 	return
 
-Route110_EventScript_1EF990:: @ 81EF990
+Route110_EventScript_MoveRival1:: @ 81EF990
 	setobjectxyperm 29, 33, 55
 	return
 
-Route110_EventScript_1EF998:: @ 81EF998
+Route110_EventScript_MoveRival2:: @ 81EF998
 	setobjectxyperm 29, 34, 55
 	return
 
-Route110_EventScript_1EF9A0:: @ 81EF9A0
+Route110_EventScript_MoveRival3:: @ 81EF9A0
 	setobjectxyperm 29, 35, 55
 	return
 
-Route110_Movement_1EF9A8: @ 81EF9A8
+Route110_Movement_RivalApproachPlayer1: @ 81EF9A8
 	walk_down
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-Route110_Movement_1EF9AC: @ 81EF9AC
+Route110_Movement_RivalApproachPlayer2: @ 81EF9AC
 	walk_down
 	step_end
 
-Route110_Movement_1EF9AE: @ 81EF9AE
+Route110_Movement_RivalApproachPlayer3: @ 81EF9AE
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-Route110_Movement_1EF9B2: @ 81EF9B2
+Route110_Movement_RivalExit1: @ 81EF9B2
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -570,7 +570,7 @@ Route110_Movement_1EF9B2: @ 81EF9B2
 	walk_fast_up
 	step_end
 
-Route110_Movement_1EF9BA: @ 81EF9BA
+Route110_Movement_RivalExit2: @ 81EF9BA
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -581,7 +581,7 @@ Route110_Movement_1EF9BA: @ 81EF9BA
 	walk_fast_down
 	step_end
 
-Route110_Movement_1EF9C3: @ 81EF9C3
+Route110_Movement_RivalExit3: @ 81EF9C3
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -591,29 +591,29 @@ Route110_Movement_1EF9C3: @ 81EF9C3
 	walk_fast_up
 	step_end
 
-Route110_EventScript_1EF9CB:: @ 81EF9CB
+Route110_EventScript_BirchScene1:: @ 81EF9CB
 	lockall
 	setvar VAR_0x8008, 1
-	goto Route110_EventScript_1EF9F7
+	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_1EF9D6:: @ 81EF9D6
+Route110_EventScript_BirchScene2:: @ 81EF9D6
 	lockall
 	setvar VAR_0x8008, 2
-	goto Route110_EventScript_1EF9F7
+	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_1EF9E1:: @ 81EF9E1
+Route110_EventScript_BirchScene3:: @ 81EF9E1
 	lockall
 	setvar VAR_0x8008, 3
-	goto Route110_EventScript_1EF9F7
+	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_1EF9EC:: @ 81EF9EC
+Route110_EventScript_BirchScene4:: @ 81EF9EC
 	lockall
 	setvar VAR_0x8008, 4
-	goto Route110_EventScript_1EF9F7
+	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_1EF9F7:: @ 81EF9F7
+Route110_EventScript_BirchScene:: @ 81EF9F7
 	addobject 36
-	applymovement 36, Route110_Movement_1EFB30
+	applymovement 36, Route110_Movement_BirchEntrance
 	waitmovement 0
 	playse SE_PIN
 	applymovement 36, Common_Movement_ExclamationMark
@@ -621,14 +621,14 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	applymovement 36, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
-	call_if_eq Route110_EventScript_1EFAD8
+	call_if_eq Route110_EventScript_BirchApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq Route110_EventScript_1EFAE3
+	call_if_eq Route110_EventScript_BirchApproachPlayer2
 	compare VAR_0x8008, 3
-	call_if_eq Route110_EventScript_1EFAEE
+	call_if_eq Route110_EventScript_BirchApproachPlayer3
 	compare VAR_0x8008, 4
-	call_if_eq Route110_EventScript_1EFAF9
-	msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT
+	call_if_eq Route110_EventScript_BirchApproachPlayer4
+	msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	applymovement 36, Common_Movement_WalkInPlaceFastestLeft
@@ -640,101 +640,101 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	applymovement 36, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
-	msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT
+	msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT
+	msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL
-	msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT
+	msgbox Route110_Text_KeepAnEyeOutForRival, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 1
-	call_if_eq Route110_EventScript_1EFB04
+	call_if_eq Route110_EventScript_BirchExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route110_EventScript_1EFB0F
+	call_if_eq Route110_EventScript_BirchExit2
 	compare VAR_0x8008, 3
-	call_if_eq Route110_EventScript_1EFB1A
+	call_if_eq Route110_EventScript_BirchExit3
 	compare VAR_0x8008, 4
-	call_if_eq Route110_EventScript_1EFB25
+	call_if_eq Route110_EventScript_BirchExit4
 	removeobject 36
 	setvar VAR_REGISTER_BIRCH_STATE, 2
 	releaseall
 	end
 
-Route110_EventScript_1EFAD8:: @ 81EFAD8
-	applymovement 36, Route110_Movement_1EFB34
+Route110_EventScript_BirchApproachPlayer1:: @ 81EFAD8
+	applymovement 36, Route110_Movement_BirchApproachPlayer1
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFAE3:: @ 81EFAE3
-	applymovement 36, Route110_Movement_1EFB39
+Route110_EventScript_BirchApproachPlayer2:: @ 81EFAE3
+	applymovement 36, Route110_Movement_BirchApproachPlayer2
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFAEE:: @ 81EFAEE
-	applymovement 36, Route110_Movement_1EFB3D
+Route110_EventScript_BirchApproachPlayer3:: @ 81EFAEE
+	applymovement 36, Route110_Movement_BirchApproachPlayer3
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFAF9:: @ 81EFAF9
-	applymovement 36, Route110_Movement_1EFB40
+Route110_EventScript_BirchApproachPlayer4:: @ 81EFAF9
+	applymovement 36, Route110_Movement_BirchApproachPlayer4
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFB04:: @ 81EFB04
-	applymovement 36, Route110_Movement_1EFB44
+Route110_EventScript_BirchExit1:: @ 81EFB04
+	applymovement 36, Route110_Movement_BirchExit1
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFB0F:: @ 81EFB0F
-	applymovement 36, Route110_Movement_1EFB4B
+Route110_EventScript_BirchExit2:: @ 81EFB0F
+	applymovement 36, Route110_Movement_BirchExit2
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFB1A:: @ 81EFB1A
-	applymovement 36, Route110_Movement_1EFB51
+Route110_EventScript_BirchExit3:: @ 81EFB1A
+	applymovement 36, Route110_Movement_BirchExit3
 	waitmovement 0
 	return
 
-Route110_EventScript_1EFB25:: @ 81EFB25
-	applymovement 36, Route110_Movement_1EFB57
+Route110_EventScript_BirchExit4:: @ 81EFB25
+	applymovement 36, Route110_Movement_BirchExit4
 	waitmovement 0
 	return
 
-Route110_Movement_1EFB30: @ 81EFB30
+Route110_Movement_BirchEntrance: @ 81EFB30
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-Route110_Movement_1EFB34: @ 81EFB34
+Route110_Movement_BirchApproachPlayer1: @ 81EFB34
 	walk_down
 	walk_left
 	walk_left
 	walk_down
 	step_end
 
-Route110_Movement_1EFB39: @ 81EFB39
+Route110_Movement_BirchApproachPlayer2: @ 81EFB39
 	walk_down
 	walk_left
 	walk_down
 	step_end
 
-Route110_Movement_1EFB3D: @ 81EFB3D
+Route110_Movement_BirchApproachPlayer3: @ 81EFB3D
 	walk_down
 	walk_down
 	step_end
 
-Route110_Movement_1EFB40: @ 81EFB40
+Route110_Movement_BirchApproachPlayer4: @ 81EFB40
 	walk_down
 	walk_right
 	walk_down
 	step_end
 
-Route110_Movement_1EFB44: @ 81EFB44
+Route110_Movement_BirchExit1: @ 81EFB44
 	walk_up
 	walk_up
 	walk_right
@@ -743,7 +743,7 @@ Route110_Movement_1EFB44: @ 81EFB44
 	walk_up
 	step_end
 
-Route110_Movement_1EFB4B: @ 81EFB4B
+Route110_Movement_BirchExit2: @ 81EFB4B
 	walk_up
 	walk_up
 	walk_up
@@ -751,7 +751,7 @@ Route110_Movement_1EFB4B: @ 81EFB4B
 	walk_up
 	step_end
 
-Route110_Movement_1EFB51: @ 81EFB51
+Route110_Movement_BirchExit3: @ 81EFB51
 	walk_up
 	walk_up
 	walk_up
@@ -759,7 +759,7 @@ Route110_Movement_1EFB51: @ 81EFB51
 	walk_up
 	step_end
 
-Route110_Movement_1EFB57: @ 81EFB57
+Route110_Movement_BirchExit4: @ 81EFB57
 	walk_up
 	walk_up
 	walk_up
@@ -767,40 +767,40 @@ Route110_Movement_1EFB57: @ 81EFB57
 	walk_up
 	step_end
 
-Route110_Text_1EFB5D: @ 81EFB5D
+Route110_Text_WeCantTalkAboutAquaActivities: @ 81EFB5D
 	.string "TEAM AQUA's activities…\n"
 	.string "We can't talk about them yet.$"
 
-Route110_Text_1EFB93: @ 81EFB93
+Route110_Text_KickUpARuckus: @ 81EFB93
 	.string "I want to get going to SLATEPORT and\n"
 	.string "kick up a ruckus!$"
 
-Route110_Text_1EFBCA: @ 81EFBCA
+Route110_Text_MyFirstJobInAqua: @ 81EFBCA
 	.string "This is my first job after joining\n"
 	.string "TEAM AQUA. It's a little scary.$"
 
-Route110_Text_1EFC0D: @ 81EFC0D
+Route110_Text_AquaActionsBringSmiles: @ 81EFC0D
 	.string "TEAM AQUA's actions should bring\n"
 	.string "smiles to people's faces!$"
 
-Route110_Text_1EFC48: @ 81EFC48
+Route110_Text_MayLetsBattle: @ 81EFC48
 	.string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p"
 	.string "While I was searching for other\n"
 	.string "POKéMON, my POKéMON grew stronger.\p"
 	.string "So…\n"
 	.string "How about a little battle?$"
 
-Route110_Text_1EFCCB: @ 81EFCCB
+Route110_Text_MayDefeated: @ 81EFCCB
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-Route110_Text_1EFCF1: @ 81EFCF1
+Route110_Text_MayTakeThis: @ 81EFCF1
 	.string "MAY: {PLAYER}{KUN}, you've been busy\n"
 	.string "training, too, haven't you?\p"
 	.string "I think you deserve a reward!\n"
 	.string "This is from me!$"
 
-Route110_Text_1EFD58: @ 81EFD58
+Route110_Text_MayExplainItemfinder: @ 81EFD58
 	.string "MAY: That's an ITEMFINDER.\p"
 	.string "Try it out. If there is an item that's\n"
 	.string "not visible, it emits a sound.\p"
@@ -809,24 +809,24 @@ Route110_Text_1EFD58: @ 81EFD58
 	.string "me, but I think you should train a lot\l"
 	.string "harder for the next time.$"
 
-Route110_Text_1EFE3F: @ 81EFE3F
+Route110_Text_BrendayLetsBattle: @ 81EFE3F
 	.string "BRENDAN: Hey, {PLAYER}.\n"
 	.string "So this is where you were.\l"
 	.string "How's it going?\p"
 	.string "Have you been raising your POKéMON?\n"
 	.string "I'll check for you.$"
 
-Route110_Text_1EFEB4: @ 81EFEB4
+Route110_Text_BrendanDefeated: @ 81EFEB4
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-Route110_Text_1EFECD: @ 81EFECD
+Route110_Text_BrendanTakeThis: @ 81EFECD
 	.string "BRENDAN: {PLAYER}, you've trained\n"
 	.string "without me noticing…\p"
 	.string "Good enough!\n"
 	.string "Here, take this.$"
 
-Route110_Text_1EFF1C: @ 81EFF1C
+Route110_Text_BrendanExplainItemfinder: @ 81EFF1C
 	.string "BRENDAN: That's an ITEMFINDER.\p"
 	.string "Use it to root around for items that\n"
 	.string "aren't visible.\p"
@@ -835,16 +835,16 @@ Route110_Text_1EFF1C: @ 81EFF1C
 	.string "Anyway, I'm off to look for new\n"
 	.string "POKéMON.$"
 
-Route110_Text_1EFFC3: @ 81EFFC3
+Route110_Text_RideBikeAtFullSpeed: @ 81EFFC3
 	.string "Wouldn't it be great to ride a BIKE\n"
 	.string "at full speed on CYCLING ROAD?$"
 
-Route110_Text_1F0006: @ 81F0006
+Route110_Text_HairStreamsBehindMe: @ 81F0006
 	.string "How do you like the way my raven-\n"
 	.string "colored hair streams behind me?\p"
 	.string "I grew my hair out just for that.$"
 
-Route110_Text_1F006A: @ 81F006A
+Route110_Text_YouGotBikeFromRydel: @ 81F006A
 	.string "Oh, hey, you got that BIKE from RYDEL!\p"
 	.string "Oh, it's glaringly obvious.\n"
 	.string "It says right on your bike…\p"
@@ -861,139 +861,139 @@ Route110_Text_1F006A: @ 81F006A
 	.string "You should ride it around all over\n"
 	.string "the place--it's good advertising!$"
 
-Route110_Text_1F0261: @ 81F0261
+Route110_Text_TwoRoads: @ 81F0261
 	.string "The two roads, one above, one below…\p"
 	.string "A road each for people and POKéMON.\n"
 	.string "Perhaps that is right and fair.$"
 
-Route110_Text_1F02CA: @ 81F02CA
+Route110_Text_WalkOnTheLowRoad: @ 81F02CA
 	.string "I don't have a BIKE, so I'll take\n"
 	.string "a leisurely walk on the low road.$"
 
-Route110_Text_1F030E: @ 81F030E
+Route110_Text_BikeTechniques: @ 81F030E
 	.string "Learning techniques will make BIKE\n"
 	.string "riding even more fun.\p"
 	.string "There are some places that you can\n"
 	.string "reach only by using a BIKE technique.$"
 
-Route110_Text_1F0390: @ 81F0390
+Route110_Text_WhichShouldIChoose: @ 81F0390
 	.string "Which should I choose?\p"
 	.string "Make a beeline for MAUVILLE on\n"
 	.string "CYCLING ROAD, or take the low road\l"
 	.string "and look for POKéMON?$"
 
-Route110_Text_1F03FF: @ 81F03FF
+Route110_Text_CyclingChallengeResultSummary: @ 81F03FF
 	.string "Number of collisions:\n"
 	.string "… … {STR_VAR_1}!\p"
 	.string "Total time:\n"
 	.string "… … {STR_VAR_2}!$"
 
-Route110_Text_1F0431: @ 81F0431
+Route110_Text_ChallengeReactionBest: @ 81F0431
 	.string "Bravo! Splendid showing!\p"
 	.string "Your love of cycling comes from deep\n"
 	.string "within your heart.\l"
 	.string "You've shaken me to my very soul!$"
 
-Route110_Text_1F04A4: @ 81F04A4
+Route110_Text_ChallengeReactionGood: @ 81F04A4
 	.string "Your technique is remarkable.\p"
 	.string "I suggest you speed up a bit while\n"
 	.string "still avoiding collisions.$"
 
-Route110_Text_1F0500: @ 81F0500
+Route110_Text_ChallengeReactionOk: @ 81F0500
 	.string "I would consider you a work in\n"
 	.string "progress.\p"
 	.string "Still, I hope you don't forget the\n"
 	.string "sheer pleasure of cycling.$"
 
-Route110_Text_1F0567: @ 81F0567
+Route110_Text_ChallengeReactionBad: @ 81F0567
 	.string "My word… Your cycling skills border\n"
 	.string "on terrifying.\p"
 	.string "Most certainly, you need much more\n"
 	.string "practice riding.$"
 
-Route110_Text_1F05CE: @ 81F05CE
+Route110_Text_ChallengeReactionWorst: @ 81F05CE
 	.string "…I am aghast…\p"
 	.string "You're perhaps not cut out for this\n"
 	.string "unfortunate cycling business.\p"
 	.string "You ought to give serious thought to\n"
 	.string "returning that BIKE to RYDEL.$"
 
-Route110_Text_1F0661: @ 81F0661
+Route110_Text_RatedForNumberOfCollisions: @ 81F0661
 	.string "This is CYCLING ROAD.\p"
 	.string "If you were to ride from MAUVILLE to\n"
 	.string "SLATEPORT on a MACH BIKE, you would\l"
 	.string "be rated for the number of collisions\l"
 	.string "and your total time.$"
 
-Route110_Text_1F06FB: @ 81F06FB
+Route110_Text_AlwaysAimHigher: @ 81F06FB
 	.string "Regardless of the results, I count on\n"
 	.string "seeing more challenges from you.\l"
 	.string "Always aim higher!$"
 
-Route110_Text_1F0755: @ 81F0755
+Route110_Text_AcroBikesDoNotQualify: @ 81F0755
 	.string "On this CYCLING ROAD, those riding\n"
 	.string "MACH BIKES are rated for their number\l"
 	.string "of collisions and their total times.\p"
 	.string "ACRO BIKES do not qualify for rating.\n"
 	.string "They are easy to turn, so it's not fair.$"
 
-Route110_Text_1F0812: @ 81F0812
+Route110_Text_SlateportCitySign: @ 81F0812
 	.string "ROUTE 110\n"
 	.string "{DOWN_ARROW} SLATEPORT CITY$"
 
-Route110_Text_1F082D: @ 81F082D
+Route110_Text_CyclingRoadSign: @ 81F082D
 	.string "SEASIDE CYCLING ROAD$"
 
-Route110_Text_1F0842: @ 81F0842
+Route110_Text_AquaWasHere: @ 81F0842
 	.string "“TEAM AQUA was here!”\p"
 	.string "Someone painted that onto this sign,\n"
 	.string "but then someone else painted over it.\p"
 	.string "“TEAM MAGMA rules!” is what it\n"
 	.string "says now.$"
 
-Route110_Text_1F08CD: @ 81F08CD
+Route110_Text_Route103Sign: @ 81F08CD
 	.string "ROUTE 110\n"
 	.string "{LEFT_ARROW} ROUTE 103$"
 
-Route110_Text_1F08E3: @ 81F08E3
+Route110_Text_SeasideParkingSign: @ 81F08E3
 	.string "SEASIDE PARKING$"
 
-Route110_Text_1F08F3: @ 81F08F3
+Route110_Text_MauvilleCitySign: @ 81F08F3
 	.string "ROUTE 110\n"
 	.string "{UP_ARROW} MAUVILLE CITY$"
 
-Route110_Text_1F090D: @ 81F090D
+Route110_Text_TrainerTipsPrlzSleep: @ 81F090D
 	.string "TRAINER TIPS\p"
 	.string "The foe can be made helpless by\n"
 	.string "paralyzing it or causing it to sleep.\p"
 	.string "It is an important technique for\n"
 	.string "POKéMON battles.$"
 
-Route110_Text_1F0992: @ 81F0992
+Route110_Text_TrainerTipsRegisterItems: @ 81F0992
 	.string "TRAINER TIPS\p"
 	.string "The items in the BAG can be reorganized\n"
 	.string "by pressing SELECT.$"
 
-Route110_Text_1F09DB: @ 81F09DB
+Route110_Text_TrickHouseSign: @ 81F09DB
 	.string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n"
 	.string "to reach the wondrous TRICK HOUSE.”$"
 
-Route110_Text_1F0A1E: @ 81F0A1E
+Route110_Text_BestRecord: @ 81F0A1E
 	.string "THE BEST RECORD TO DATE…\p"
 	.string "No. of collisions: {STR_VAR_1}\p"
 	.string "Elapsed time: {STR_VAR_2}$"
 
-Route110_Text_1F0A5E: @ 81F0A5E
+Route110_Text_ThereIsNoRecord: @ 81F0A5E
 	.string "THE BEST RECORD TO DATE…\p"
 	.string "No one seems to have taken the\n"
 	.string "challenge. There is no record…$"
 
-Route110_Text_1F0AB5: @ 81F0AB5
+Route110_Text_ImagineSeeingYouHere: @ 81F0AB5
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "Imagine seeing you here!\p"
 	.string "And where might my {RIVAL} be?$"
 
-Route110_Text_1F0AFF: @ 81F0AFF
+Route110_Text_HeardYouInstallMatchCall: @ 81F0AFF
 	.string "Oh, I see!\n"
 	.string "You two are running separately.\l"
 	.string "Well, that's fine.\p"
@@ -1005,11 +1005,11 @@ Route110_Text_1F0AFF: @ 81F0AFF
 	.string "I can rate your POKéDEX anytime.\p"
 	.string "… … … … … …$"
 
-Route110_Text_1F0C0C: @ 81F0C0C
+Route110_Text_RegisteredBirchInPokenav: @ 81F0C0C
 	.string "Registered PROF. BIRCH\n"
 	.string "in the POKéNAV.$"
 
-Route110_Text_1F0C33: @ 81F0C33
+Route110_Text_KeepAnEyeOutForRival: @ 81F0C33
 	.string "PROF. BIRCH: {PLAYER}{KUN}…\p"
 	.string "Please keep an eye out for my {RIVAL}.\n"
 	.string "… … … … … …\p"
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
index b692426fd..f0aea1aec 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78",
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk",
       "flag": "0"
     }
   ],
@@ -66,7 +66,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84"
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck"
     },
     {
       "type": "trigger",
@@ -75,7 +75,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "1",
-      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6"
+      "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
index 687fff9a7..ba5dfd9f0 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -1,49 +1,49 @@
 Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77
 	.byte 0
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk:: @ 826EA78
 	lock
 	faceplayer
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 0
-	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F
+	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike
 	setflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4
+Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter: @ 826EAB4
 	walk_left
 	step_end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad:: @ 826EAB6
 	lockall
 	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 0
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1
+Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EAC1
 	.string "On CYCLING ROAD, you can go all out\n"
 	.string "and cycle as fast as you'd like.\p"
 	.string "It feels great to go that fast, but try\n"
 	.string "not to crash into anyone!$"
 
-Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48
+Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: @ 826EB48
 	.string "Sorry, you can't walk on CYCLING\n"
 	.string "ROAD. It's too dangerous.\p"
 	.string "Please come back with a BIKE.$"
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
index dcc9029e5..6077876f7 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4",
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk",
       "flag": "0"
     }
   ],
@@ -66,7 +66,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0"
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck"
     },
     {
       "type": "trigger",
@@ -75,7 +75,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "1",
-      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13"
+      "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
index 1d0ca55bb..4f839d72b 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -4,51 +4,51 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
 
 Route110_SeasideCyclingRoadSouthEntrance_OnTransition: @ 826EBA7
 	compare VAR_CYCLING_CHALLENGE_STATE, 3
-	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
+	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
 	compare VAR_CYCLING_CHALLENGE_STATE, 2
-	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
+	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge:: @ 826EBBE
 	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk:: @ 826EBC4
 	lock
 	faceplayer
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: @ 826EBD0
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 2
-	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6
+	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike
 	compare VAR_RESULT, 0
-	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC
+	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike
 	setflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6
 	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
+Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter: @ 826EC11
 	walk_left
 	step_end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: @ 826EC13
 	lockall
 	setvar VAR_CYCLING_CHALLENGE_STATE, 0
 	clearflag FLAG_SYS_CYCLING_ROAD
@@ -56,13 +56,13 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23
+Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EC23
 	.string "On CYCLING ROAD, you can go all out\n"
 	.string "and cycle as fast as you'd like.\p"
 	.string "It feels great to go that fast, but try\n"
 	.string "not to crash into anyone!$"
 
-Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA
+Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: @ 826ECAA
 	.string "Sorry, you can't walk on CYCLING\n"
 	.string "ROAD. It's too dangerous.\p"
 	.string "Please come back with a BIKE.$"
diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index 80a6ac3dd..ad469bc48 100644
--- a/data/maps/Route110_TrickHouseCorridor/scripts.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
@@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903
 	.byte 0
 
 Route110_TrickHouseCorridor_OnTransition: @ 826B909
-	setvar VAR_TRICK_HOUSE_STATE, 1
+	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
 	end
 
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json
index 62548fe8b..84233313b 100644
--- a/data/maps/Route110_TrickHouseEnd/map.json
+++ b/data/maps/Route110_TrickHouseEnd/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHouseEnd_EventScript_26AD17",
+      "script": "Route110_TrickHouseEnd_EventScript_TrickMaster",
       "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN"
     }
   ],
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHouseEnd_EventScript_26B041"
+      "script": "Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 46c4c316e..91d70160f 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,13 +1,13 @@
 Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_OnWarp
 	.byte 0
 
-Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
+Route110_TrickHouseEnd_OnResume: @ 826ACC4
 	compare VAR_TEMP_1, 1
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D
+	call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	end
 
 Route110_TrickHouseEnd_OnTransition: @ 826ACD0
@@ -16,306 +16,306 @@ Route110_TrickHouseEnd_OnTransition: @ 826ACD0
 	special SetTrickHouseEndRoomFlag
 	end
 
-Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
-	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8
+Route110_TrickHouseEnd_OnWarp: @ 826ACDE
+	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_SetTrickMasterPos
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
+Route110_TrickHouseEnd_EventScript_SetTrickMasterPos:: @ 826ACE8
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
 	turnobject 1, DIR_EAST
 	end
 
-Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
-	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF
+Route110_TrickHouseEnd_OnFrame: @ 826ACF5
+	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_CloseDoor
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
+Route110_TrickHouseEnd_EventScript_CloseDoor:: @ 826ACFF
 	setvar VAR_TEMP_1, 1
-	call Route110_TrickHouseEnd_EventScript_26AD0D
+	call Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	special DrawWholeMapView
 	end
 
-Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
+Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile:: @ 826AD0D
 	setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
+Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 826AD17
 	lock
 	faceplayer
-	msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouveMadeItToMe, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEnd_EventScript_26AD84
-	case 1, Route110_TrickHouseEnd_EventScript_26ADC0
-	case 2, Route110_TrickHouseEnd_EventScript_26ADFC
-	case 3, Route110_TrickHouseEnd_EventScript_26AE38
-	case 4, Route110_TrickHouseEnd_EventScript_26AE74
-	case 5, Route110_TrickHouseEnd_EventScript_26AEB0
-	case 6, Route110_TrickHouseEnd_EventScript_26AEEC
-	case 7, Route110_TrickHouseEnd_EventScript_26AF28
+	case 0, Route110_TrickHouseEnd_EventScript_CompletedPuzzle1
+	case 1, Route110_TrickHouseEnd_EventScript_CompletedPuzzle2
+	case 2, Route110_TrickHouseEnd_EventScript_CompletedPuzzle3
+	case 3, Route110_TrickHouseEnd_EventScript_CompletedPuzzle4
+	case 4, Route110_TrickHouseEnd_EventScript_CompletedPuzzle5
+	case 5, Route110_TrickHouseEnd_EventScript_CompletedPuzzle6
+	case 6, Route110_TrickHouseEnd_EventScript_CompletedPuzzle7
+	case 7, Route110_TrickHouseEnd_EventScript_CompletedPuzzle8
 	end
 
-Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
-	msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84
+	msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
-	msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0
+	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
-	msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC
+	msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
-	msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38
+	msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
-	msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74
+	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
-	msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0
+	msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
-	msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC
+	msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
-	msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
+	msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B015
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B020
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B02B
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B036
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	call Route110_TrickHouseEnd_EventScript_26AFA5
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B002
-	msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_ChooseTent
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent
+	msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	special ResetTrickHouseEndRoomFlag
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
+Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5
 	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHouseEnd_EventScript_26AFBF
-	goto Route110_TrickHouseEnd_EventScript_26AFC7
+	case 0, Route110_TrickHouseEnd_EventScript_GiveRedTent
+	goto Route110_TrickHouseEnd_EventScript_GiveBlueTent
 
-Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
+Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF
 	givedecoration_std DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
+Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
 	givedecoration_std DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E36
+Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
 	addvar VAR_TRICK_HOUSE_LEVEL, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
+Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF
 	call Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_NoRoomForThis, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
-	call Common_EventScript_NoRoomLeftForAnother
-	msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002
+	call Common_EventScript_NoRoomForDecor
+	msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 826B015
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 826B020
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 826B02B
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: @ 826B036
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
+Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041
 	lockall
 	turnobject 1, DIR_WEST
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 20
-	applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
+	applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise
 	waitmovement 0
 	playse SE_W153
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom
 	waitmovement 0
 	delay 4
 	turnobject 1, DIR_EAST
 	releaseall
 	end
 
-Route110_TrickHouseEnd_Movement_26B089: @ 826B089
+Route110_TrickHouseEnd_Movement_KeepPlayerInRoom: @ 826B089
 	walk_down
 	step_end
 
-Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
+Route110_TrickHouseEnd_Movement_TrickMasterSurprise: @ 826B08B
 	jump_in_place_left
 	step_end
 
-Route110_TrickHouseEnd_Text_26B08D: @ 826B08D
+Route110_TrickHouseEnd_Text_YouveMadeItToMe: @ 826B08D
 	.string "Aak!\n"
 	.string "You've made it to me?\l"
 	.string "Hmmm… You're sharp!$"
 
-Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC
+Route110_TrickHouseEnd_Text_AllNightToPlantTrees: @ 826B0BC
 	.string "It took me all night to plant all those\n"
 	.string "trees…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five, six places!$"
 
-Route110_TrickHouseEnd_Text_26B13B: @ 826B13B
+Route110_TrickHouseEnd_Text_AllNightToMakeMaze: @ 826B13B
 	.string "It took me all night to make the maze…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five places!$"
 
-Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD
+Route110_TrickHouseEnd_Text_AllNightToPreparePanels: @ 826B1AD
 	.string "It took me all night to prepare\n"
 	.string "the wall panels…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four places!$"
 
-Route110_TrickHouseEnd_Text_26B223: @ 826B223
+Route110_TrickHouseEnd_Text_AllNightToShoveBoulders: @ 826B223
 	.string "It took me all night to shove in those\n"
 	.string "boulders…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three places!$"
 
-Route110_TrickHouseEnd_Text_26B293: @ 826B293
+Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls: @ 826B293
 	.string "It took me all night to make MECHADOLLS\n"
 	.string "and another to think up the quiz…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two places!$"
 
-Route110_TrickHouseEnd_Text_26B315: @ 826B315
+Route110_TrickHouseEnd_Text_AllNightToInstallDoors: @ 826B315
 	.string "It took me all night to install\n"
 	.string "the doors…\p"
 	.string "You're almost my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_26B365: @ 826B365
+Route110_TrickHouseEnd_Text_AllNightSettingUpArrows: @ 826B365
 	.string "It took me all night setting up arrows…\p"
 	.string "You're my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB
+Route110_TrickHouseEnd_Text_AllNightPolishingFloors: @ 826B3AB
 	.string "It took me all night polishing floors…\p"
 	.string "You're above me in greatness!\n"
 	.string "Possibly…$"
 
-Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA
+Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry: @ 826B3FA
 	.string "Wh-what should I do?\n"
 	.string "My fountain of ideas for tricks has\l"
 	.string "run dry…\p"
 	.string "Perhaps it is time I toured the country\n"
 	.string "on a quest to devise new tricks…$"
 
-Route110_TrickHouseEnd_Text_26B485: @ 826B485
+Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent: @ 826B485
 	.string "I hate to admit defeat, but you have\n"
 	.string "bested me!\p"
 	.string "Still, you must have been reeled in by\n"
@@ -331,13 +331,13 @@ Route110_TrickHouseEnd_Text_26B485: @ 826B485
 	.string "a RED TENT and a BLUE TENT.\l"
 	.string "Which do you prefer?$"
 
-Route110_TrickHouseEnd_Text_26B615: @ 826B615
+Route110_TrickHouseEnd_Text_NoRoomInPC: @ 826B615
 	.string "What? No room in your PC?\n"
 	.string "What am I to make of that?\p"
 	.string "I wish I could say that, but I am much\n"
 	.string "too kind and caring, so come back later!$"
 
-Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
+Route110_TrickHouseEnd_Text_LeavingOnJourney: @ 826B69A
 	.string "… … … … … …\p"
 	.string "I am leaving on a journey of discovery.\n"
 	.string "A quest in search of new tricks.\p"
@@ -345,17 +345,17 @@ Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
 	.string "entertain me again.\p"
 	.string "And now, farewell!$"
 
-Route110_TrickHouseEnd_Text_26B73D: @ 826B73D
+Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward: @ 826B73D
 	.string "Fine!\n"
 	.string "You have earned this reward!$"
 
-Route110_TrickHouseEnd_Text_26B760: @ 826B760
+Route110_TrickHouseEnd_Text_NoRoomForThis: @ 826B760
 	.string "What? Have you no room for this?\n"
 	.string "What manner of items do you carry?\p"
 	.string "But fine, since you've reached me,\n"
 	.string "your reward will be with me till later.$"
 
-Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
+Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou: @ 826B7EF
 	.string "Scrub that smug smirk from your face!\n"
 	.string "It's much too early to think you've won!\p"
 	.string "I'll make new tricks to stump you, I will.\n"
@@ -363,7 +363,7 @@ Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
 	.string "Come back for the next exciting\n"
 	.string "installment!$"
 
-Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD
+Route110_TrickHouseEnd_Text_YoureIgnoringMe: @ 826B8BD
 	.string "Now, now! You're ignoring me now?\n"
 	.string "Now that, I consider heartbreaking!$"
 
diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json
index ce188feec..58ba81aea 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.json
+++ b/data/maps/Route110_TrickHouseEntrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_269D3B",
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMaster",
       "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN"
     }
   ],
@@ -57,36 +57,36 @@
       "x": 4,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 5,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 6,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 7,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     }
   ],
   "bg_events": [
@@ -96,7 +96,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A0D3"
+      "script": "Route110_TrickHouseEntrance_EventScript_Door"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 173151c37..0de4153cc 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -1,302 +1,310 @@
 Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_OnWarp
 	.byte 0
 
+	@ State descriptions for VAR_TRICK_HOUSE_ENTRANCE_STATE
+	@ 0: Trick Master is hiding
+	@ 1: Trick Master has left at start of challenge
+	@ 2: Trick Master ready to give normal reward from previous challenge (if bag was full)
+	@ 3: Trick Master still making next puzzle
+	@ 4: Finished final puzzle
+	@ 5: Completed previous challenge
+	@ 6: 'Trick Master' mechadoll ready to give Tent reward from final challenge (if bag was full)
+
 Route110_TrickHouseEntrance_OnTransition: @ 8269A60
 	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_TRICK_HOUSE_STATE, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
+	compare VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterFromCorridor
 	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
-	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
-	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
-	case 4, Route110_TrickHouseEntrance_EventScript_269BCD
-	end
-
-Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward
+	compare VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger
+	case 1, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1
+	case 3, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2
+	case 4, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3
+	end
+
+Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward:: @ 8269AD7
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
+Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward:: @ 8269AED
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 6
 	end
 
-Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
-	setvar VAR_TRICK_HOUSE_STATE, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_EnterFromCorridor:: @ 8269AF3
+	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8269B03
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B75
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B89
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B93
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FinishedPuzzles
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61
-	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2:: @ 8269B61
+	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B
-	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3:: @ 8269B6B
+	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75
-	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4:: @ 8269B75
+	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F
-	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5:: @ 8269B7F
+	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89
-	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6:: @ 8269B89
+	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93
-	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7:: @ 8269B93
+	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
-	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8:: @ 8269B9D
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
+Route110_TrickHouseEntrance_EventScript_FinishedPuzzles:: @ 8269BA7
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 4
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle:: @ 8269BAD
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
+Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor:: @ 8269BB3
 	setobjectxyperm 1, 5, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0
+Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger:: @ 8269BBB
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 0
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1:: @ 8269BC1
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2:: @ 8269BC7
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3:: @ 8269BCD
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF
+Route110_TrickHouseEntrance_OnWarp: @ 8269BD3
+	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_TrickMasterFound
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 1, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 2, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 3, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 4, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 5, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 6, Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
+Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	turnobject 1, DIR_EAST
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26
 	addobject 1
 	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_269C8C
-	case 1, Route110_TrickHouseEntrance_EventScript_269C94
-	case 2, Route110_TrickHouseEntrance_EventScript_269C9C
-	case 3, Route110_TrickHouseEntrance_EventScript_269CA4
-	case 4, Route110_TrickHouseEntrance_EventScript_269CAC
-	case 5, Route110_TrickHouseEntrance_EventScript_269CB4
-	case 6, Route110_TrickHouseEntrance_EventScript_269CBC
-	case 7, Route110_TrickHouseEntrance_EventScript_269CC4
+	case 0, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1
+	case 1, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2
+	case 2, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3
+	case 3, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4
+	case 4, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5
+	case 5, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6
+	case 6, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7
+	case 7, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1:: @ 8269C8C
 	setobjectxy 1, 6, 3
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2:: @ 8269C94
 	setobjectxy 1, 11, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3:: @ 8269C9C
 	setobjectxy 1, 9, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4:: @ 8269CA4
 	setobjectxy 1, 3, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5:: @ 8269CAC
 	setobjectxy 1, 0, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6:: @ 8269CB4
 	setobjectxy 1, 11, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7:: @ 8269CBC
 	setobjectxy 1, 8, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8:: @ 8269CC4
 	setobjectxy 1, 4, 4
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
+Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster:: @ 8269CCC
 	removeobject 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor:: @ 8269CD0
 	addobject 1
 	setobjectxy 1, 5, 2
 	turnobject 1, DIR_NORTH
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor:: @ 8269CDF
 	addobject 1
 	setobjectxy 1, 5, 2
 	turnobject 1, DIR_SOUTH
 	end
 
-Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8
+Route110_TrickHouseEntrance_OnFrame: @ 8269CEE
+	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_BeginChallenge
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
+Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8
 	lockall
 	delay 20
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHouseEntrance_EventScript_MeetTrickMaster
+	msgbox Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
+Route110_TrickHouseEntrance_EventScript_UnusedRelease:: @ 8269D39
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
+Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B
 	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
-	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
-	case 3, Route110_TrickHouseEntrance_EventScript_269E51
-	case 6, Route110_TrickHouseEntrance_EventScript_26A039
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_FoundTrickMaster
+	case 2, Route110_TrickHouseEntrance_EventScript_GiveReward
+	case 3, Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle
+	case 6, Route110_TrickHouseEntrance_EventScript_MechadollReward
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
+Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E
 	playse SE_PIN
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindTree
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E00
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInDresser
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E09
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E12
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInPlanter
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInCupboard
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E24
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindWindow
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion
 	closemessage
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
 	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE
-	msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk:: @ 8269DEE
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7
-	msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBehindTree:: @ 8269DF7
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindTree, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00
-	msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInDresser:: @ 8269E00
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInDresser, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09
-	msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow:: @ 8269E09
+	msgbox Route110_TrickHouseEntrance_Text_ConealedBeyondWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12
-	msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInPlanter:: @ 8269E12
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInPlanter, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B
-	msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInCupboard:: @ 8269E1B
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInCupboard, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24
-	msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBehindWindow:: @ 8269E24
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
-	msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion:: @ 8269E2D
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
-Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
+Route110_TrickHouse_Movement_TrickMasterSpin: @ 8269E36
 	face_up
 	delay_4
 	face_left
@@ -307,8 +315,7 @@ Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
 	delay_4
 	step_end
 
-Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
-Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
+Route110_TrickHouse_Movement_TrickMasterJumpAway: @ 8269E3F
 	face_up
 	disable_anim
 	slide_up
@@ -319,12 +326,12 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
 	slide_up
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: @ 8269E48
+	msgbox Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
-	msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8269E51
+	msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
@@ -333,280 +340,280 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
+Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward
 	end
 
-Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
+Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
 	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
+Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
 	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
+Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
 	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
+Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
 	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
+Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
 	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
+Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
 	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
+Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
 	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
+Route110_TrickHouseEntrance_EventScript_GotReward:: @ 826A023
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
+Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT
-	call Route110_TrickHouseEntrance_EventScript_26A070
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A
-	compare VAR_RESULT, 0
-	call_if_eq Common_EventScript_NoRoomLeftForAnother
-	msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT
+	call Route110_TrickHouseEntrance_EventScript_ChooseTent
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_ReceivedTent
+	compare VAR_RESULT, FALSE
+	call_if_eq Common_EventScript_NoRoomForDecor
+	msgbox Route110_TrickHouseEntrance_Text_PCFullAgain, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
+Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
 	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
-	goto Route110_TrickHouseEntrance_EventScript_26A092
+	case 0, Route110_TrickHouseEntrance_EventScript_GiveRedTent
+	goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
 
-Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
+Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A
 	givedecoration_std DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
+Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092
 	givedecoration_std DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
-	msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A
+	msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_26D632
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake
 	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
+Route110_TrickHouseEntrance_EventScript_Door:: @ 826A0D3
 	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_26A106
-	case 1, Route110_TrickHouseEntrance_EventScript_26A110
-	case 4, Route110_TrickHouseEntrance_EventScript_26A201
-	case 5, Route110_TrickHouseEntrance_EventScript_26A20B
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_ItsAScroll
+	case 1, Route110_TrickHouseEntrance_EventScript_GoInHolePrompt
+	case 4, Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote
+	case 5, Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106
-	msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_ItsAScroll:: @ 826A106
+	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
-	msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO
+Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 826A110
+	msgbox Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll, MSGBOX_YESNO
 	closemessage
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126
+	compare VAR_RESULT, YES
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126
 	setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
 	special DrawWholeMapView
 	delay 20
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom
 	waitmovement 0
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
-	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
-	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
-	case 3, Route110_TrickHouseEntrance_EventScript_26A1CA
-	case 4, Route110_TrickHouseEntrance_EventScript_26A1D5
-	case 5, Route110_TrickHouseEntrance_EventScript_26A1E0
-	case 6, Route110_TrickHouseEntrance_EventScript_26A1EB
-	case 7, Route110_TrickHouseEntrance_EventScript_26A1F6
+	case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1
+	case 1, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2
+	case 2, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3
+	case 3, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4
+	case 4, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5
+	case 5, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6
+	case 6, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7
+	case 7, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8
 	end
 
-Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
+Route110_TrickHouseEntrance_Movement_EnterRoom: @ 826A1A7
 	set_invisible
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1:: @ 826A1A9
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2:: @ 826A1B4
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3:: @ 826A1BF
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4:: @ 826A1CA
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5:: @ 826A1D5
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6:: @ 826A1E0
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7:: @ 826A1EB
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8:: @ 826A1F6
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote:: @ 826A201
+	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
+Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage:: @ 826A20B
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220
-	msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2
+	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2:: @ 826A220
+	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
+Route110_TrickHousePuzzle_EventScript_Door:: @ 826A22A
 	lockall
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_26A289
-	case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
-	case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
-	case 3, Route110_TrickHouseEntrance_EventScript_26A304
-	case 4, Route110_TrickHouseEntrance_EventScript_26A32D
-	case 5, Route110_TrickHouseEntrance_EventScript_26A356
-	case 6, Route110_TrickHouseEntrance_EventScript_26A37F
-	case 7, Route110_TrickHouseEntrance_EventScript_26A3A8
+	case 0, Route110_TrickHousePuzzle1_EventScript_Door
+	case 1, Route110_TrickHousePuzzle2_EventScript_Door
+	case 2, Route110_TrickHousePuzzle3_EventScript_Door
+	case 3, Route110_TrickHousePuzzle4_EventScript_Door
+	case 4, Route110_TrickHousePuzzle5_EventScript_Door
+	case 5, Route110_TrickHousePuzzle6_EventScript_Door
+	case 6, Route110_TrickHousePuzzle7_EventScript_Door
+	case 7, Route110_TrickHousePuzzle8_EventScript_Door
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
+Route110_TrickHousePuzzle1_EventScript_Door:: @ 826A289
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -614,10 +621,10 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
+Route110_TrickHousePuzzle2_EventScript_Door:: @ 826A2B2
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -625,10 +632,10 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
+Route110_TrickHousePuzzle3_EventScript_Door:: @ 826A2DB
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -636,10 +643,10 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
+Route110_TrickHousePuzzle4_EventScript_Door:: @ 826A304
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -647,10 +654,10 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
+Route110_TrickHousePuzzle5_EventScript_Door:: @ 826A32D
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -658,10 +665,10 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
+Route110_TrickHousePuzzle6_EventScript_Door:: @ 826A356
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -669,10 +676,10 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
+Route110_TrickHousePuzzle7_EventScript_Door:: @ 826A37F
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -680,10 +687,10 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
+Route110_TrickHousePuzzle8_EventScript_Door:: @ 826A3A8
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -691,123 +698,106 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1
-	msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle_EventScript_DoorLocked:: @ 826A3D1
+	msgbox Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB
-	msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB
+	msgbox Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5
 	playfanfare MUS_FANFA4
-	message Route110_TrickHousePuzzle1_Text_26ABE8
+	message Route110_TrickHousePuzzle_Text_FoundAScroll
 	waitfanfare
-	msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
+Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 826A3F8
 	lockall
-	msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_YoureBeingWatched, MSGBOX_DEFAULT
 	releaseall
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A429
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 3
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1:: @ 826A429
+	setvar VAR_0x8004, 6  @ x
+	setvar VAR_0x8005, 3  @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 5
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2:: @ 826A439
+	setvar VAR_0x8004, 11  @ x
+	setvar VAR_0x8005, 5   @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 2
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
+	setvar VAR_0x8004, 9  @ x
+	setvar VAR_0x8005, 2  @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
 	setvar VAR_0x8006, 0
-	setfieldeffectargument 0, VAR_0x8004
-	setfieldeffectargument 1, VAR_0x8005
-	setfieldeffectargument 2, VAR_0x8006
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle VAR_0x8004, VAR_0x8005, VAR_0x8006
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	return
 
-Route110_TrickHouseEntrance_Text_26A474: @ 826A474
+Route110_TrickHouseEntrance_Text_YoureBeingWatched: @ 826A474
 	.string "You're being watched…$"
 
-Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A
+Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk: @ 826A48A
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this desk? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA
+Route110_TrickHouseEntrance_Text_ConcealedBehindTree: @ 826A4DA
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this tree? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A529: @ 826A529
+Route110_TrickHouseEntrance_Text_ConcealedInDresser: @ 826A529
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this dresser? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A577: @ 826A577
+Route110_TrickHouseEntrance_Text_ConealedBeyondWindow: @ 826A577
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beyond this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8
+Route110_TrickHouseEntrance_Text_ConcealedInPlanter: @ 826A5C8
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this planter? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A616: @ 826A616
+Route110_TrickHouseEntrance_Text_ConcealedInCupboard: @ 826A616
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this cupboard? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A665: @ 826A665
+Route110_TrickHouseEntrance_Text_ConcealedBehindWindow: @ 826A665
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6
+Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion: @ 826A6B6
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this cushion? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A709: @ 826A709
+Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster: @ 826A709
 	.string "Behold!\p"
 	.string "For I am the greatest living mystery\n"
 	.string "of a man in all of HOENN!\l"
@@ -815,7 +805,7 @@ Route110_TrickHouseEntrance_Text_26A709: @ 826A709
 	.string "The TRICK MASTER!\n"
 	.string "Wahahaha! Glad to meet you!$"
 
-Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
+Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse: @ 826A78C
 	.string "You, you've come to challenge\n"
 	.string "my TRICK HOUSE, haven't you?\p"
 	.string "That's why you're here, isn't it?\n"
@@ -825,25 +815,25 @@ Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
 	.string "and let your challenge commence!\p"
 	.string "I shall be waiting in the back!$"
 
-Route110_TrickHouseEntrance_Text_26A878: @ 826A878
+Route110_TrickHouseEntrance_Text_ItsAScroll: @ 826A878
 	.string "It's a scroll.$"
 
-Route110_TrickHouseEntrance_Text_26A887: @ 826A887
+Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll: @ 826A887
 	.string "There is a big hole behind the scroll!\p"
 	.string "Want to go in?$"
 
-Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD
+Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote: @ 826A8BD
 	.string "There is a note affixed to the scroll…\p"
 	.string "“I am leaving on a journey.\n"
 	.string "Don't look for me. TRICK MASTER”$"
 
-Route110_TrickHouseEntrance_Text_26A921: @ 826A921
+Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick: @ 826A921
 	.string "For the next time, I'll use this trick,\n"
 	.string "and that scheme, and those ruses…\p"
 	.string "Mufufufu… If I may say so, it's\n"
 	.string "brilliantly difficult, even for me!$"
 
-Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
+Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges: @ 826A9AF
 	.string "Hah? What?!\n"
 	.string "Oh, it's you!\p"
 	.string "I'm in the midst of devising new tricky\n"
@@ -853,42 +843,42 @@ Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
 	.string "You wouldn't begrudge me that?\l"
 	.string "Come back in a little while!$"
 
-Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82
+Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward: @ 826AA82
 	.string "Ah, it's you! You're here to accept the\n"
 	.string "reward from before, isn't that right?\l"
 	.string "Yes, right I am!\p"
 	.string "Here!\n"
 	.string "I'll give it to you now!$"
 
-Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00
+Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward: @ 826AB00
 	.string "Hah?\n"
 	.string "Did you not come to claim your reward?$"
 
-Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C
+Route110_TrickHouseEntrance_Text_MechadollWhichTent: @ 826AB2C
 	.string "MECHADOLL 5 I AM!\n"
 	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
 	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
 	.string "RED TENT OR BLUE TENT,\n"
 	.string "WHICH DO YOU PREFER?$"
 
-Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE
+Route110_TrickHouseEntrance_Text_ThenFarewell: @ 826ABAE
 	.string "THEN FAREWELL.$"
 
-Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD
+Route110_TrickHouseEntrance_Text_PCFullAgain: @ 826ABBD
 	.string "YOUR PC STATUS: FULL AGAIN.\n"
 	.string "MEAN, YOU ARE.$"
 
-Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8
+Route110_TrickHousePuzzle_Text_FoundAScroll: @ 826ABE8
 	.string "{PLAYER} found a scroll.$"
 
-Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB
+Route110_TrickHousePuzzle_Text_MemorizedSecretCode: @ 826ABFB
 	.string "{PLAYER} memorized the secret code\n"
 	.string "written on the scroll.$"
 
-Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F
+Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt: @ 826AC2F
 	.string "A secret code is written on it.$"
 
-Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F
+Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere: @ 826AC4F
 	.string "The door is locked.\p"
 	.string "…On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
index 18dc10027..f656b0a48 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B948",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Sally",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B95F",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Eddie",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B976",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Robin",
       "flag": "0"
     },
     {
@@ -241,7 +241,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B92B"
+      "script": "Route110_TrickHousePuzzle1_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index ef81b03cf..3797ec29d 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,79 +1,79 @@
 Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
-	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_OnLoad
 	.byte 0
 
-Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
+Route110_TrickHousePuzzle1_OnLoad: @ 826B915
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
-	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921
+	goto_if_eq Route110_TrickHousePuzzle1_EventScript_OpenDoor
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
+Route110_TrickHousePuzzle1_EventScript_OpenDoor:: @ 826B921
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
+Route110_TrickHousePuzzle1_EventScript_Scroll:: @ 826B92B
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D
-	goto Route110_TrickHousePuzzle1_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle1_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
+Route110_TrickHousePuzzle1_EventScript_FoundScroll:: @ 826B93D
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
-	goto Route110_TrickHousePuzzle1_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948
-	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F
-	msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Sally:: @ 826B948
+	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_SallyIntro, Route110_TrickHousePuzzle1_Text_SallyDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_SallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F
-	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0
-	msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Eddie:: @ 826B95F
+	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_EddieIntro, Route110_TrickHousePuzzle1_Text_EddieDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_EddiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976
-	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E
-	msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Robin:: @ 826B976
+	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_RobinIntro, Route110_TrickHousePuzzle1_Text_RobinDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_RobinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D
+Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened:: @ 826B98D
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is fabulous.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB
+Route110_TrickHousePuzzle1_Text_SallyIntro: @ 826B9FB
 	.string "I'll hack and slash my way to victory\n"
 	.string "with the CUT we just learned!$"
 
-Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F
+Route110_TrickHousePuzzle1_Text_SallyDefeat: @ 826BA3F
 	.string "Why are you so serious?$"
 
-Route110_TrickHousePuzzle1_Text_26BA57: @ 826BA57
+Route110_TrickHousePuzzle1_Text_SallyPostBattle: @ 826BA57
 	.string "I never get tired of hacking\n"
 	.string "and slashing!$"
 
-Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82
+Route110_TrickHousePuzzle1_Text_EddieIntro: @ 826BA82
 	.string "I wandered into this weird house\n"
 	.string "by accident…$"
 
-Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0
+Route110_TrickHousePuzzle1_Text_EddieDefeat: @ 826BAB0
 	.string "And now I've lost…$"
 
-Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3
+Route110_TrickHousePuzzle1_Text_EddiePostBattle: @ 826BAC3
 	.string "I lost my way, I lost a battle, and I'm\n"
 	.string "now even more lost… I can't get out…$"
 
-Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10
+Route110_TrickHousePuzzle1_Text_RobinIntro: @ 826BB10
 	.string "Just who is the TRICK MASTER?$"
 
-Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E
+Route110_TrickHousePuzzle1_Text_RobinDefeat: @ 826BB2E
 	.string "I lost while I was lost in thought!$"
 
-Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52
+Route110_TrickHousePuzzle1_Text_RobinPostBattle: @ 826BB52
 	.string "You're strong!\n"
 	.string "Just who are you?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
index 3a9ed637d..71b3f8916 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC75",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Ted",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Paul",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Georgia",
       "flag": "0"
     },
     {
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button1"
     },
     {
       "type": "trigger",
@@ -120,7 +120,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button2"
     },
     {
       "type": "trigger",
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC03"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button3"
     },
     {
       "type": "trigger",
@@ -138,7 +138,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC16"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button4"
     }
   ],
   "bg_events": [
@@ -148,7 +148,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index 334637624..2b65ca95c 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -1,17 +1,17 @@
 Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E
+Route110_TrickHousePuzzle2_OnResume: @ 826BB7E
 	compare VAR_TEMP_1, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC29
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton1
 	compare VAR_TEMP_2, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC3C
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton2
 	compare VAR_TEMP_3, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC4F
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton3
 	compare VAR_TEMP_4, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton4
 	end
 
 Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB
@@ -21,126 +21,126 @@ Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB
 	setvar VAR_TEMP_4, 0
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0
+Route110_TrickHousePuzzle2_EventScript_Scroll:: @ 826BBC0
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2
-	goto Route110_TrickHousePuzzle2_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle2_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2
+Route110_TrickHousePuzzle2_EventScript_FoundScroll:: @ 826BBD2
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
-	goto Route110_TrickHousePuzzle2_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD
+Route110_TrickHousePuzzle2_EventScript_Button1:: @ 826BBDD
 	lockall
 	setvar VAR_TEMP_1, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC29
+	call Route110_TrickHousePuzzle2_EventScript_PressButton1
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0
+Route110_TrickHousePuzzle2_EventScript_Button2:: @ 826BBF0
 	lockall
 	setvar VAR_TEMP_2, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC3C
+	call Route110_TrickHousePuzzle2_EventScript_PressButton2
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03
+Route110_TrickHousePuzzle2_EventScript_Button3:: @ 826BC03
 	lockall
 	setvar VAR_TEMP_3, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC4F
+	call Route110_TrickHousePuzzle2_EventScript_PressButton3
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16
+Route110_TrickHousePuzzle2_EventScript_Button4:: @ 826BC16
 	lockall
 	setvar VAR_TEMP_4, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC62
+	call Route110_TrickHousePuzzle2_EventScript_PressButton4
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29
+Route110_TrickHousePuzzle2_EventScript_PressButton1:: @ 826BC29
 	setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C
+Route110_TrickHousePuzzle2_EventScript_PressButton2:: @ 826BC3C
 	setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F
+Route110_TrickHousePuzzle2_EventScript_PressButton3:: @ 826BC4F
 	setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62
+Route110_TrickHousePuzzle2_EventScript_PressButton4:: @ 826BC62
 	setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75
-	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45
-	msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Ted:: @ 826BC75
+	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_TedIntro, Route110_TrickHousePuzzle2_Text_TedDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_TedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C
-	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF
-	msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Paul:: @ 826BC8C
+	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_PaulIntro, Route110_TrickHousePuzzle2_Text_PaulDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3
-	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77
-	msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Georgia:: @ 826BCA3
+	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_GeorgiaIntro, Route110_TrickHousePuzzle2_Text_GeorgiaDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA
+Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 826BCBA
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is smart.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25
+Route110_TrickHousePuzzle2_Text_TedIntro: @ 826BD25
 	.string "Which switch closes which hole?$"
 
-Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45
+Route110_TrickHousePuzzle2_Text_TedDefeat: @ 826BD45
 	.string "After that battle, I'm even more\n"
 	.string "confused!$"
 
-Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70
+Route110_TrickHousePuzzle2_Text_TedPostBattle: @ 826BD70
 	.string "Can I get you to push all the buttons\n"
 	.string "for me?$"
 
-Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E
+Route110_TrickHousePuzzle2_Text_PaulIntro: @ 826BD9E
 	.string "Oh! You're on your second TRICK HOUSE\n"
 	.string "challenge!$"
 
-Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF
+Route110_TrickHousePuzzle2_Text_PaulDefeat: @ 826BDCF
 	.string "You're good at battling too?$"
 
-Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC
+Route110_TrickHousePuzzle2_Text_PaulPostBattle: @ 826BDEC
 	.string "The TRICK MASTER rigged all the tricks\n"
 	.string "in this house all by himself.$"
 
-Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31
+Route110_TrickHousePuzzle2_Text_GeorgiaIntro: @ 826BE31
 	.string "I want to make my own GYM one day.\n"
 	.string "So, I'm studying how to set traps.$"
 
-Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77
+Route110_TrickHousePuzzle2_Text_GeorgiaDefeat: @ 826BE77
 	.string "I didn't study battling enough!$"
 
-Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97
+Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle: @ 826BE97
 	.string "You're strong, aren't you?\n"
 	.string "Maybe even enough to be a GYM LEADER!$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index a37498fd2..612edc6bf 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Justin",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Martha",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Alan",
       "flag": "0"
     },
     {
@@ -137,7 +137,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button1"
     },
     {
       "type": "trigger",
@@ -146,7 +146,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button2"
     },
     {
       "type": "trigger",
@@ -155,7 +155,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button3"
     },
     {
       "type": "trigger",
@@ -164,7 +164,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button4"
     }
   ],
   "bg_events": [
@@ -174,7 +174,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index dfae2d359..ddad0d549 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -1,14 +1,14 @@
 Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3
-	call Route110_TrickHousePuzzle3_EventScript_26BF1E
+Route110_TrickHousePuzzle3_OnResume: @ 826BEE3
+	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
 	compare VAR_TEMP_9, 0
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1
 	end
 
 Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
@@ -20,38 +20,38 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
 	setvar VAR_TEMP_9, 0
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
+Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 826BF1E
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF79
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF83
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF8D
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F
+Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile:: @ 826BF6F
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79
+Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile:: @ 826BF79
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83
+Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile:: @ 826BF83
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D
+Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile:: @ 826BF8D
 	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 826BF97
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
@@ -128,7 +128,7 @@ Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 826C232
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
@@ -205,155 +205,155 @@ Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD
+Route110_TrickHousePuzzle3_EventScript_Button1:: @ 826C4CD
 	lockall
 	setvar VAR_TEMP_8, 1
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9
+Route110_TrickHousePuzzle3_EventScript_Button2:: @ 826C4D9
 	lockall
 	setvar VAR_TEMP_8, 2
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5
+Route110_TrickHousePuzzle3_EventScript_Button3:: @ 826C4E5
 	lockall
 	setvar VAR_TEMP_8, 3
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1
+Route110_TrickHousePuzzle3_EventScript_Button4:: @ 826C4F1
 	lockall
 	setvar VAR_TEMP_8, 4
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD
-	call Route110_TrickHousePuzzle3_EventScript_26C510
+Route110_TrickHousePuzzle3_EventScript_PressButton:: @ 826C4FD
+	call Route110_TrickHousePuzzle3_EventScript_SetButton
 	playse SE_PIN
-	call Route110_TrickHousePuzzle3_EventScript_26BF1E
-	goto Route110_TrickHousePuzzle3_EventScript_26C569
+	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
+	goto Route110_TrickHousePuzzle3_EventScript_AlternateDoors
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510
+Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 826C510
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_4, 0
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C551
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C557
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C55D
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C563
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton4
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551
+Route110_TrickHousePuzzle3_EventScript_SetButton1:: @ 826C551
 	setvar VAR_TEMP_1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557
+Route110_TrickHousePuzzle3_EventScript_SetButton2:: @ 826C557
 	setvar VAR_TEMP_2, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D
+Route110_TrickHousePuzzle3_EventScript_SetButton3:: @ 826C55D
 	setvar VAR_TEMP_3, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563
+Route110_TrickHousePuzzle3_EventScript_SetButton4:: @ 826C563
 	setvar VAR_TEMP_4, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569
+Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 826C569
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
 	compare VAR_TEMP_9, 0
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1
 	special DrawWholeMapView
 	compare VAR_TEMP_9, 1
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState
 	compare VAR_TEMP_9, 0
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5A0
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_SetAltDoorState
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599
+Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState:: @ 826C599
 	setvar VAR_TEMP_9, 0
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0
+Route110_TrickHousePuzzle3_EventScript_SetAltDoorState:: @ 826C5A0
 	setvar VAR_TEMP_9, 1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7
+Route110_TrickHousePuzzle3_EventScript_Scroll:: @ 826C5A7
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9
-	goto Route110_TrickHousePuzzle3_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
+Route110_TrickHousePuzzle3_EventScript_FoundScroll:: @ 826C5B9
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
-	goto Route110_TrickHousePuzzle3_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4
-	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D
-	msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Justin:: @ 826C5C4
+	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_JustinIntro, Route110_TrickHousePuzzle3_Text_JustinDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_JustinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB
-	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763
-	msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Martha:: @ 826C5DB
+	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_MarthaIntro, Route110_TrickHousePuzzle3_Text_MarthaDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2
-	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC
-	msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Alan:: @ 826C5F2
+	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_AlanIntro, Route110_TrickHousePuzzle3_Text_AlanDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_AlanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_Text_26C609: @ 826C609
+Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 826C609
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is coveted.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle3_Text_26C676: @ 826C676
+Route110_TrickHousePuzzle3_Text_JustinIntro: @ 826C676
 	.string "I keep coming back to this same place!$"
 
-Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D
+Route110_TrickHousePuzzle3_Text_JustinDefeat: @ 826C69D
 	.string "I'm already having trouble, and then\n"
 	.string "you have to beat me? It's not fair!$"
 
-Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6
+Route110_TrickHousePuzzle3_Text_JustinPostBattle: @ 826C6E6
 	.string "It's full of doors here!\n"
 	.string "It's too small and dark in here! Help!$"
 
-Route110_TrickHousePuzzle3_Text_26C726: @ 826C726
+Route110_TrickHousePuzzle3_Text_MarthaIntro: @ 826C726
 	.string "I don't know what's going on here.\n"
 	.string "I'm starting to feel sad…$"
 
-Route110_TrickHousePuzzle3_Text_26C763: @ 826C763
+Route110_TrickHousePuzzle3_Text_MarthaDefeat: @ 826C763
 	.string "You… You're awful!$"
 
-Route110_TrickHousePuzzle3_Text_26C776: @ 826C776
+Route110_TrickHousePuzzle3_Text_MarthaPostBattle: @ 826C776
 	.string "I know I'm weak!\n"
 	.string "And, I have no sense of direction!$"
 
-Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA
+Route110_TrickHousePuzzle3_Text_AlanIntro: @ 826C7AA
 	.string "I don't get it. What would anyone want\n"
 	.string "with a house this bizarre?$"
 
-Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC
+Route110_TrickHousePuzzle3_Text_AlanDefeat: @ 826C7EC
 	.string "I don't get it.\n"
 	.string "How did I lose?$"
 
-Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C
+Route110_TrickHousePuzzle3_Text_AlanPostBattle: @ 826C80C
 	.string "I don't get it.\n"
 	.string "How many traps are in this house?\p"
 	.string "You may be the one to solve that.$"
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
index f77fa9b22..26a58166f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C87E",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Cora",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Paula",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C895",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Yuji",
       "flag": "0"
     },
     {
@@ -228,7 +228,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C861"
+      "script": "Route110_TrickHousePuzzle4_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index fcb10b3ab..44610a10f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -1,71 +1,71 @@
 Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
 	.byte 0
 
-Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861
+Route110_TrickHousePuzzle4_EventScript_Scroll:: @ 826C861
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873
-	goto Route110_TrickHousePuzzle4_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle4_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
+Route110_TrickHousePuzzle4_EventScript_FoundScroll:: @ 826C873
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
-	goto Route110_TrickHousePuzzle4_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E
-	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E
-	msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Cora:: @ 826C87E
+	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_CoraIntro, Route110_TrickHousePuzzle4_Text_CoraDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_CoraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895
-	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20
-	msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Yuji:: @ 826C895
+	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_YujiIntro, Route110_TrickHousePuzzle4_Text_YujiDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC
-	trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB
-	msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Paula:: @ 826C8AC
+	trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_PaulaIntro, Route110_TrickHousePuzzle4_Text_PaulaDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3
+Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 826C8C3
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is cool.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D
+Route110_TrickHousePuzzle4_Text_CoraIntro: @ 826C92D
 	.string "It's too much bother to think this out.\n"
 	.string "I only wanted to battle!$"
 
-Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E
+Route110_TrickHousePuzzle4_Text_CoraDefeat: @ 826C96E
 	.string "Even though I lost, I still like battling\n"
 	.string "the best!$"
 
-Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2
+Route110_TrickHousePuzzle4_Text_CoraPostBattle: @ 826C9A2
 	.string "Wouldn't you agree? You would go\n"
 	.string "anywhere if TRAINERS were there.$"
 
-Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4
+Route110_TrickHousePuzzle4_Text_YujiIntro: @ 826C9E4
 	.string "Heh! Boulders like this, I can brush\n"
 	.string "aside with one finger!$"
 
-Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20
+Route110_TrickHousePuzzle4_Text_YujiDefeat: @ 826CA20
 	.string "I can push boulders, but I can't solve\n"
 	.string "the puzzle…$"
 
-Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53
+Route110_TrickHousePuzzle4_Text_YujiPostBattle: @ 826CA53
 	.string "It's not good enough to be brawny…\n"
 	.string "You have to use your head. Be brainy!$"
 
-Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C
+Route110_TrickHousePuzzle4_Text_PaulaIntro: @ 826CA9C
 	.string "The TRICK HOUSE is getting trickier,\n"
 	.string "isn't it?$"
 
-Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB
+Route110_TrickHousePuzzle4_Text_PaulaDefeat: @ 826CACB
 	.string "Aaak!$"
 
-Route110_TrickHousePuzzle4_Text_26CAD1: @ 826CAD1
+Route110_TrickHousePuzzle4_Text_PaulaPostBattle: @ 826CAD1
 	.string "Has anyone made it to the end?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json
index ae94ed240..30f4cfe47 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.json
+++ b/data/maps/Route110_TrickHousePuzzle5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB32",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB53",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB74",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB95",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0"
     },
     {
       "type": "trigger",
@@ -120,7 +120,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1"
     },
     {
       "type": "trigger",
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2"
     },
     {
       "type": "trigger",
@@ -138,7 +138,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3"
     },
     {
       "type": "trigger",
@@ -147,7 +147,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC13"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0"
     },
     {
       "type": "trigger",
@@ -156,7 +156,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1"
     },
     {
       "type": "trigger",
@@ -165,7 +165,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0"
     },
     {
       "type": "trigger",
@@ -174,7 +174,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC67"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1"
     },
     {
       "type": "trigger",
@@ -183,7 +183,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC73"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2"
     },
     {
       "type": "trigger",
@@ -192,7 +192,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC97"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0"
     },
     {
       "type": "trigger",
@@ -201,7 +201,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1"
     },
     {
       "type": "trigger",
@@ -210,7 +210,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0"
     },
     {
       "type": "trigger",
@@ -219,7 +219,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC07"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4"
     },
     {
       "type": "trigger",
@@ -228,7 +228,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2"
     },
     {
       "type": "trigger",
@@ -237,7 +237,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC37"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3"
     },
     {
       "type": "trigger",
@@ -246,7 +246,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC43"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4"
     },
     {
       "type": "trigger",
@@ -255,7 +255,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5"
     },
     {
       "type": "trigger",
@@ -264,7 +264,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3"
     },
     {
       "type": "trigger",
@@ -273,7 +273,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4"
     },
     {
       "type": "trigger",
@@ -282,7 +282,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2"
     },
     {
       "type": "trigger",
@@ -291,7 +291,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3"
     },
     {
       "type": "trigger",
@@ -300,7 +300,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4"
     }
   ],
   "bg_events": [
@@ -310,7 +310,7 @@
       "y": 21,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB15"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index b678840b6..ac260981f 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -11,207 +11,208 @@ Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6
 	setvar VAR_TEMP_8, 0
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
+Route110_TrickHousePuzzle5_EventScript_Scroll:: @ 826CB15
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27
-	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
+Route110_TrickHousePuzzle5_EventScript_FoundScroll:: @ 826CB27
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 826CB32
 	lockall
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_1, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 826CB53
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_2, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 826CB74
 	lockall
 	applymovement 3, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_3, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 826CB95
 	lockall
 	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_4, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 826CBB6
 	lockall
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_5, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0:: @ 826CBD7
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1:: @ 826CBE3
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2:: @ 826CBEF
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3:: @ 826CBFB
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4:: @ 826CC07
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0:: @ 826CC13
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1:: @ 826CC1F
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2:: @ 826CC2B
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3:: @ 826CC37
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4:: @ 826CC43
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5:: @ 826CC4F
 	lockall
 	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0:: @ 826CC5B
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1:: @ 826CC67
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2:: @ 826CC73
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3:: @ 826CC7F
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4:: @ 826CC8B
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0:: @ 826CC97
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1:: @ 826CCA3
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2:: @ 826CCAF
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3:: @ 826CCBB
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4:: @ 826CCC7
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3
+@ Unused
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger5:: @ 826CCD3
 	lockall
 	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0:: @ 826CCDF
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 826CCEB
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_8, 1
 	playse SE_PIN
@@ -220,22 +221,22 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CF45
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CF68
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 826CD6A
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_8, 2
 	playse SE_PIN
@@ -244,24 +245,24 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D304
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D33C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D374
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4
 	compare VAR_TEMP_9, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3AC
-	msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 826CDF4
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_8, 3
 	playse SE_PIN
@@ -270,22 +271,22 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
 	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D017
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D03A
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D05D
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 826CE73
 	setvar VAR_TEMP_4, 1
 	setvar VAR_TEMP_8, 4
 	playse SE_PIN
@@ -294,22 +295,22 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D080
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2
 	setvar VAR_TEMP_5, 1
 	setvar VAR_TEMP_8, 5
 	playse SE_PIN
@@ -317,567 +318,571 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D10C
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D12F
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
-	msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
-	msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
-	msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
-	msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
-	msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
-	msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
-	msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
-	msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
-	msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
-	msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
-	msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
-	msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
-	msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
-	msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F
-	msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152
+Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
 	waitse
 	playse SE_HAZURE
-	msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632
-	msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT
-	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	msgbox Route110_TrickHousePuzzle5_Text_Wahahahaha, MSGBOX_DEFAULT
+	waitmovement 0
+	msgbox Route110_TrickHousePuzzle5_Text_WaitForNextChallenge, MSGBOX_DEFAULT
 	closemessage
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0
+Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0
 	waitse
 	playse SE_SEIKAI
-	goto Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA
-	msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 826D1AA
+	msgbox Route110_TrickHousePuzzle5_Text_CorrectGoThrough, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4
+@ Absurd redundancy in movement scripts that could be resolved by using VAR_TEMP_8 for applymovement instead
+@ Many of the below movement scripts arent even used, see below
+@   Mechadoll 2 is the only mechadoll to walk right, all the other WalkRight scripts are unused
+@   Mechadoll 5 never walks, all the Mechadoll5Walk scripts are unused
+@   No mechadoll walks left 5 paces, all the WalkLeft5 scripts are unused
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1:: @ 826D1B4
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3E4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3EF
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3FA
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D405
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D410
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2:: @ 826D1EC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D41B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D426
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D431
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D43C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D447
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3:: @ 826D224
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D452
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D45D
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D468
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D473
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D47E
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4:: @ 826D25C
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D489
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D494
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D49F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4AA
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4B5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5:: @ 826D294
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4C0
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4CB
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4D6
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4E1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1:: @ 826D2CC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4F7
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D502
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D50D
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D518
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D523
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2:: @ 826D304
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D52E
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D539
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D544
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D54F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D55A
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3:: @ 826D33C
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D565
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D570
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D57B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D586
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D591
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4:: @ 826D374
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D59C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5A7
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5B2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5BD
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5C8
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: @ 826D3AC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5D3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5DE
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5E9
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5F4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5FF
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1:: @ 826D3E4
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1:: @ 826D3EF
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1:: @ 826D3FA
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1:: @ 826D405
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1:: @ 826D410
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2:: @ 826D41B
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2:: @ 826D426
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2:: @ 826D431
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2:: @ 826D43C
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2:: @ 826D447
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3:: @ 826D452
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3:: @ 826D45D
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3:: @ 826D468
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3:: @ 826D473
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3:: @ 826D47E
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4:: @ 826D489
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4:: @ 826D494
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4:: @ 826D49F
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4:: @ 826D4AA
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4:: @ 826D4B5
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0
-	applymovement 1, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5:: @ 826D4C0
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB
-	applymovement 2, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5:: @ 826D4CB
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6
-	applymovement 3, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5:: @ 826D4D6
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1
-	applymovement 4, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5:: @ 826D4E1
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC
-	applymovement 5, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5:: @ 826D4EC
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1:: @ 826D4F7
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1:: @ 826D502
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1:: @ 826D50D
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1:: @ 826D518
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1:: @ 826D523
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2:: @ 826D52E
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2:: @ 826D539
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2:: @ 826D544
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2:: @ 826D54F
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2:: @ 826D55A
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3:: @ 826D565
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3:: @ 826D570
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3:: @ 826D57B
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3:: @ 826D586
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3:: @ 826D591
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4:: @ 826D59C
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4:: @ 826D5A7
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4:: @ 826D5B2
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4:: @ 826D5BD
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4:: @ 826D5C8
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5:: @ 826D5D3
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5:: @ 826D5DE
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5:: @ 826D5E9
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5:: @ 826D5F4
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5:: @ 826D5FF
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A
+Route110_TrickHousePuzzle5_Movement_WalkLeft1: @ 826D60A
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
+Route110_TrickHousePuzzle5_Movement_WalkLeft2: @ 826D60C
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
+Route110_TrickHousePuzzle5_Movement_WalkLeft3: @ 826D60F
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
+Route110_TrickHousePuzzle5_Movement_WalkLeft4: @ 826D613
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-
-Movement_26D618: @ 826D618
+Route110_TrickHousePuzzle5_Movement_WalkLeft5: @ 826D618
 	walk_left
 	walk_left
 	walk_left
@@ -885,29 +890,29 @@ Movement_26D618: @ 826D618
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
+Route110_TrickHousePuzzle5_Movement_WalkRight1: @ 826D61E
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
+Route110_TrickHousePuzzle5_Movement_WalkRight2: @ 826D620
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
+Route110_TrickHousePuzzle5_Movement_WalkRight3: @ 826D623
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
+Route110_TrickHousePuzzle5_Movement_WalkRight4: @ 826D627
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
+Route110_TrickHousePuzzle5_Movement_WalkRight5: @ 826D62C
 	walk_right
 	walk_right
 	walk_right
@@ -915,8 +920,7 @@ Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
 	walk_right
 	step_end
 
-Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
-Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
+Route110_TrickHousePuzzle5_Movement_MechadollShake: @ 826D632
 	face_left
 	delay_2
 	face_right
@@ -964,128 +968,128 @@ Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
 	face_down
 	step_end
 
-Route110_TrickHousePuzzle5_Text_26D660: @ 826D660
+Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 826D660
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is a genius.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE
+Route110_TrickHousePuzzle5_Text_Mechadoll1Intro: @ 826D6CE
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 1 AM I!\p"
 	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
 	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
 	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
 
-Route110_TrickHousePuzzle5_Text_26D757: @ 826D757
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1: @ 826D757
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not found\n"
 	.string "on ROUTE 110. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2: @ 826D7AA
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not of the\n"
 	.string "WATER type. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3: @ 826D7FC
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON does not use\n"
 	.string "LEECH LIFE. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D
+Route110_TrickHousePuzzle5_Text_CorrectGoThrough: @ 826D84D
 	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
 	.string "GO THROUGH. PLEASE.$"
 
-Route110_TrickHousePuzzle5_Text_26D883: @ 826D883
+Route110_TrickHousePuzzle5_Text_DisappointmentError: @ 826D883
 	.string "BZZZT. DISAPPOINTMENT.\n"
 	.string "ERROR.$"
 
-Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1
+Route110_TrickHousePuzzle5_Text_Wahahahaha: @ 826D8A1
 	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
 	.string "CLICKETY-CLACK!$"
 
-Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9
+Route110_TrickHousePuzzle5_Text_WaitForNextChallenge: @ 826D8C9
 	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
 
-Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA
+Route110_TrickHousePuzzle5_Text_Mechadoll2Intro: @ 826D8EA
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 2 AM I!\p"
 	.string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n"
 	.string "IS SET TOO LOW.$"
 
-Route110_TrickHousePuzzle5_Text_26D940: @ 826D940
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1: @ 826D940
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did WALLY\n"
 	.string "borrow from your father?$"
 
-Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2: @ 826D98C
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON was chasing\n"
 	.string "PROF. BIRCH?$"
 
-Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3: @ 826D9CE
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did TEAM AQUA\n"
 	.string "use in PETALBURG FOREST?$"
 
-Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E
+Route110_TrickHousePuzzle5_Text_Mechadoll3Intro: @ 826DA1E
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 3 AM I!\p"
 	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
 
-Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1: @ 826DA64
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Which costs more?\n"
 	.string "Three HARBOR MAILS or one BURN HEAL?$"
 
-Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2: @ 826DAAD
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Sell one GREAT BALL and buy\n"
 	.string "one POTION. How much money remains?$"
 
-Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3: @ 826DAFF
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Do one REPEL and SODA POP cost\n"
 	.string "more than one SUPER POTION?$"
 
-Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C
+Route110_TrickHousePuzzle5_Text_Mechadoll4Intro: @ 826DB4C
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 4 THAT IS ME!\p"
 	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
 
-Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1: @ 826DB94
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In SEASHORE HOUSE, were there more men\n"
 	.string "or women?$"
 
-Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2: @ 826DBD7
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In LAVARIDGE TOWN, were there more\n"
 	.string "elderly men or elderly women?$"
 
-Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3: @ 826DC2A
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In the TRAINER'S SCHOOL, how many\n"
 	.string "girl students were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78
+Route110_TrickHousePuzzle5_Text_Mechadoll5Intro: @ 826DC78
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 5 AM I!\p"
 	.string "THE MASTER'S BEST AND PROUDEST\n"
 	.string "ACHIEVEMENT AM I.$"
 
-Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1: @ 826DCCB
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In SLATEPORT's POKéMON FAN CLUB,\n"
 	.string "how many POKéMON were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2: @ 826DD1B
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In FORTREE CITY, how many\n"
 	.string "tree houses were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3: @ 826DD5F
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "On the CYCLING ROAD, how many\n"
 	.string "TRIATHLETES were there?$"
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json
index aef182fbb..797bb9f60 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.json
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Sophia",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Benny",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Sebastian",
       "flag": "0"
     },
     {
@@ -98,7 +98,7 @@
       "y": 10,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4"
+      "script": "Route110_TrickHousePuzzle6_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 685a0170b..142b89f42 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,87 +1,87 @@
 Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_OnWarp
 	.byte 0
 
 Route110_TrickHousePuzzle6_OnTransition: @ 826DDB2
 	special RotatingGate_InitPuzzle
 	end
 
-Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6
-	map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0
+Route110_TrickHousePuzzle6_OnWarp: @ 826DDB6
+	map_script_2 VAR_TEMP_0, VAR_TEMP_0, Route110_TrickHousePuzzle6_EventScript_InitPuzzle
 	.2byte 0
 
-Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
+Route110_TrickHousePuzzle6_EventScript_InitPuzzle:: @ 826DDC0
 	special RotatingGate_InitPuzzleAndGraphics
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
+Route110_TrickHousePuzzle6_EventScript_Scroll:: @ 826DDC4
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6
-	goto Route110_TrickHousePuzzle6_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle6_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
+Route110_TrickHousePuzzle6_EventScript_FoundScroll:: @ 826DDD6
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
-	goto Route110_TrickHousePuzzle6_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1
-	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2
-	msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Sophia:: @ 826DDE1
+	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_SophiaIntro, Route110_TrickHousePuzzle6_Text_SophiaDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_SophiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8
-	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D
-	msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Benny:: @ 826DDF8
+	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_BennyIntro, Route110_TrickHousePuzzle6_Text_BennyDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_BennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F
-	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004
-	msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Sebastian:: @ 826DE0F
+	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_SebastianIntro, Route110_TrickHousePuzzle6_Text_SebastianDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26
+Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 826DE26
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is my life.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93
+Route110_TrickHousePuzzle6_Text_SophiaIntro: @ 826DE93
 	.string "When I heard there was a strange\n"
 	.string "house, I had to check it out.$"
 
-Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2
+Route110_TrickHousePuzzle6_Text_SophiaDefeat: @ 826DED2
 	.string "I've discovered a tough TRAINER!$"
 
-Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3
+Route110_TrickHousePuzzle6_Text_SophiaPostBattle: @ 826DEF3
 	.string "I'm sure having a good time checking\n"
 	.string "this place out.\p"
 	.string "It's a challenge I've found worth\n"
 	.string "repeating!$"
 
-Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55
+Route110_TrickHousePuzzle6_Text_BennyIntro: @ 826DF55
 	.string "Maybe I could get my BIRD POKéMON\n"
 	.string "to fly over the wall…$"
 
-Route110_TrickHousePuzzle6_Text_26DF8D: @ 826DF8D
+Route110_TrickHousePuzzle6_Text_BennyDefeat: @ 826DF8D
 	.string "Gwaaah! I blew it!$"
 
-Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0
+Route110_TrickHousePuzzle6_Text_BennyPostBattle: @ 826DFA0
 	.string "Ehehehe… I guess I lost because\n"
 	.string "I was trying to cheat.$"
 
-Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7
+Route110_TrickHousePuzzle6_Text_SebastianIntro: @ 826DFD7
 	.string "I'm getting dizzy from these rotating\n"
 	.string "doors…$"
 
-Route110_TrickHousePuzzle6_Text_26E004: @ 826E004
+Route110_TrickHousePuzzle6_Text_SebastianDefeat: @ 826E004
 	.string "Everything's spinning around and\n"
 	.string "around. I can't take this anymore…$"
 
-Route110_TrickHousePuzzle6_Text_26E048: @ 826E048
+Route110_TrickHousePuzzle6_Text_SebastianPostBattle: @ 826E048
 	.string "You don't seem to be affected at all.\n"
 	.string "Or do you have your poker face on?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
index 09fdafbe2..1e31e2f74 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E389",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Joshua",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Alexis",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Patricia",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Alvaro",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Mariela",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Everett",
       "flag": "0"
     },
     {
@@ -233,7 +233,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E31B"
+      "script": "Route110_TrickHousePuzzle7_EventScript_YellowButton"
     },
     {
       "type": "trigger",
@@ -242,7 +242,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E331"
+      "script": "Route110_TrickHousePuzzle7_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -251,7 +251,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E347"
+      "script": "Route110_TrickHousePuzzle7_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -260,7 +260,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E35D"
+      "script": "Route110_TrickHousePuzzle7_EventScript_PurpleButton"
     }
   ],
   "bg_events": [
@@ -270,7 +270,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0"
+      "script": "Route110_TrickHousePuzzle7_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index b5303bc24..6b7559389 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -1,75 +1,79 @@
 Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_OnFrame
 	.byte 0
 
-Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6
-	call Route110_TrickHousePuzzle7_EventScript_26E0AC
+@ Puzzle Room 7 in RSE uses whatever puzzle Mossdeep Gym uses
+@ Because Mossdeep Gym was redesigned for Emerald, theres a good deal of leftover script from the old R/S puzzle
+
+Route110_TrickHousePuzzle7_OnResume: @ 826E0A6
+	call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126
+Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
+@ Leftover from R/S, none of the below metatile scripts are ever called
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 826E0DA
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 826E0ED
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 826E100
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 826E113
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 826E126
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 826E139
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 826E14C
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 826E15F
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 826E172
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 826E185
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_OnTransition: @ 826E198
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
+	goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
@@ -77,35 +81,36 @@ Route110_TrickHousePuzzle7_OnTransition: @ 826E198
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
+Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 826E1B3
 	end
 
-Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
+Route110_TrickHousePuzzle7_OnLoad: @ 826E1B4
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC
+	call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
-	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
+Route110_TrickHousePuzzle7_OnFrame: @ 826E1C0
+	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2
 	.2byte 0
 
-Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
+Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 826E1CA
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
+Route110_TrickHousePuzzle7_EventScript_Scroll:: @ 826E1D0
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
-	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle7_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
+Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 826E1E2
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
-	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
+@ Unused, leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
 	lockall
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
@@ -113,112 +118,115 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
+@ All the below switch scripts are unused leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E139
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2E9
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2EE
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
+Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E14C
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F3
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F8
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
+Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E15F
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E2FD
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E302
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
+Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E172
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E307
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E30C
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
+Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E185
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E311
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E316
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9
+@ All the below switch scripts are unused leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 826E2E9
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 826E2EE
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 826E2F3
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 826E2F8
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 826E2FD
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 826E302
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 826E307
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 826E30C
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 826E311
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
+@ From here is where the new, actually used puzzle scripts begin
+Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -230,7 +238,7 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
+Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -242,7 +250,7 @@ Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
+Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -254,7 +262,7 @@ Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
+Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -266,7 +274,8 @@ Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
+@ Unused
+Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -278,109 +287,109 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
-	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
-	msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 826E389
+	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0
-	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
-	msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 826E3A0
+	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7
-	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
-	msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 826E3B7
+	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE
-	trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
-	msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Mariela:: @ 826E3CE
+	trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_MarielaIntro, Route110_TrickHousePuzzle7_Text_MarielaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_MarielaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5
-	trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
-	msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Alvaro:: @ 826E3E5
+	trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_AlvaroIntro, Route110_TrickHousePuzzle7_Text_AlvaroDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_AlvaroPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
-	trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
-	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Everett:: @ 826E3FC
+	trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_EverettIntro, Route110_TrickHousePuzzle7_Text_EverettDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_EverettPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413
+Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened:: @ 826E413
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is huggable.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle7_Text_26E481: @ 826E481
+Route110_TrickHousePuzzle7_Text_JoshuaIntro: @ 826E481
 	.string "The TRICK MASTER always vanishes\n"
 	.string "like smoke. How does he do it?$"
 
-Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1
+Route110_TrickHousePuzzle7_Text_JoshuaDefeat: @ 826E4C1
 	.string "Aiyeeeh! You're much too strong!\n"
 	.string "How do you do it?$"
 
-Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4
+Route110_TrickHousePuzzle7_Text_JoshuaPostBattle: @ 826E4F4
 	.string "I wish I could appear and disappear as\n"
 	.string "if I were smoke, too.$"
 
-Route110_TrickHousePuzzle7_Text_26E531: @ 826E531
+Route110_TrickHousePuzzle7_Text_PatriciaIntro: @ 826E531
 	.string "Going around the same spot…\n"
 	.string "It begets ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_26E564: @ 826E564
+Route110_TrickHousePuzzle7_Text_PatriciaDefeat: @ 826E564
 	.string "Defeated!\n"
 	.string "It's a bad sign…$"
 
-Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F
+Route110_TrickHousePuzzle7_Text_PatriciaPostBattle: @ 826E57F
 	.string "I've circled the same spot over ten\n"
 	.string "times now… It's ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0
+Route110_TrickHousePuzzle7_Text_AlexisIntro: @ 826E5C0
 	.string "Whoever wins will get through here\n"
 	.string "first. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_26E604: @ 826E604
+Route110_TrickHousePuzzle7_Text_AlexisDefeat: @ 826E604
 	.string "Oh!\n"
 	.string "Well, go ahead, then!$"
 
-Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E
+Route110_TrickHousePuzzle7_Text_AlexisPostBattle: @ 826E61E
 	.string "You're solving all the puzzles in the\n"
 	.string "TRICK HOUSE. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B
+Route110_TrickHousePuzzle7_Text_MarielaIntro: @ 826E66B
 	.string "Nufufufu, here at last!\n"
 	.string "Let's get right with it!$"
 
-Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C
+Route110_TrickHousePuzzle7_Text_MarielaDefeat: @ 826E69C
 	.string "You're so casual about winning!$"
 
-Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC
+Route110_TrickHousePuzzle7_Text_MarielaPostBattle: @ 826E6BC
 	.string "Humph! I'm not upset!\n"
 	.string "Not me!$"
 
-Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA
+Route110_TrickHousePuzzle7_Text_AlvaroIntro: @ 826E6DA
 	.string "I ever so closely watched you coming!$"
 
-Route110_TrickHousePuzzle7_Text_26E700: @ 826E700
+Route110_TrickHousePuzzle7_Text_AlvaroDefeat: @ 826E700
 	.string "This outcome I didn't see coming…$"
 
-Route110_TrickHousePuzzle7_Text_26E722: @ 826E722
+Route110_TrickHousePuzzle7_Text_AlvaroPostBattle: @ 826E722
 	.string "Well, anyway, we both picked a weird\n"
 	.string "place to get acquainted.\p"
 	.string "As one weirdo to another,\n"
 	.string "let's do our best!$"
 
-Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D
+Route110_TrickHousePuzzle7_Text_EverettIntro: @ 826E78D
 	.string "It's awfully cramped in here…$"
 
-Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB
+Route110_TrickHousePuzzle7_Text_EverettDefeat: @ 826E7AB
 	.string "Oh, yes, strong you are.$"
 
-Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4
+Route110_TrickHousePuzzle7_Text_EverettPostBattle: @ 826E7C4
 	.string "I was hoping to switch places with you\n"
 	.string "when I beat you, but…$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json
index b7a06abce..9e4be0cfc 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.json
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E81F",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Vincent",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E84D",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Leroy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E836",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Keira",
       "flag": "0"
     },
     {
@@ -98,7 +98,7 @@
       "y": 21,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E802"
+      "script": "Route110_TrickHousePuzzle8_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index dcb12e366..9e4218234 100644
--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -1,72 +1,72 @@
 Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
 	.byte 0
 
-Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802
+Route110_TrickHousePuzzle8_EventScript_Scroll:: @ 826E802
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814
-	goto Route110_TrickHousePuzzle8_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle8_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
+Route110_TrickHousePuzzle8_EventScript_FoundScroll:: @ 826E814
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
-	goto Route110_TrickHousePuzzle8_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F
-	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6
-	msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Vincent:: @ 826E81F
+	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_VincentIntro, Route110_TrickHousePuzzle8_Text_VincentDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836
-	trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F
-	msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Keira:: @ 826E836
+	trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_KeiraIntro, Route110_TrickHousePuzzle8_Text_KeiraDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_KeiraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D
-	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14
-	msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Leroy:: @ 826E84D
+	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_LeroyIntro, Route110_TrickHousePuzzle8_Text_LeroyDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864
+Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened:: @ 826E864
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER I love.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD
+Route110_TrickHousePuzzle8_Text_VincentIntro: @ 826E8CD
 	.string "Not many TRAINERS have made it\n"
 	.string "this far.$"
 
-Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6
+Route110_TrickHousePuzzle8_Text_VincentDefeat: @ 826E8F6
 	.string "That must mean you're tough, too…$"
 
-Route110_TrickHousePuzzle8_Text_26E918: @ 826E918
+Route110_TrickHousePuzzle8_Text_VincentPostBattle: @ 826E918
 	.string "You've beaten the POKéMON LEAGUE\n"
 	.string "CHAMPION? That's too much!$"
 
-Route110_TrickHousePuzzle8_Text_26E954: @ 826E954
+Route110_TrickHousePuzzle8_Text_KeiraIntro: @ 826E954
 	.string "Consider yourself lucky to be\n"
 	.string "battling me!$"
 
-Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F
+Route110_TrickHousePuzzle8_Text_KeiraDefeat: @ 826E97F
 	.string "This isn't right!\n"
 	.string "I can't lose!$"
 
-Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F
+Route110_TrickHousePuzzle8_Text_KeiraPostBattle: @ 826E99F
 	.string "It's a miracle that you beat me.\n"
 	.string "You can brag about it.$"
 
-Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7
+Route110_TrickHousePuzzle8_Text_LeroyIntro: @ 826E9D7
 	.string "You've been slugging through the TRICK\n"
 	.string "HOUSE challenge, too.$"
 
-Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14
+Route110_TrickHousePuzzle8_Text_LeroyDefeat: @ 826EA14
 	.string "I see…\n"
 	.string "You possess an extraordinary style.$"
 
-Route110_TrickHousePuzzle8_Text_26EA3F: @ 826EA3F
+Route110_TrickHousePuzzle8_Text_LeroyPostBattle: @ 826EA3F
 	.string "Seeing someone like you should please\n"
 	.string "the TRICK MASTER.$"
 
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index ef7e29999..5770ab0c0 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0FC5",
+      "script": "Route111_EventScript_Victor",
       "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F121B",
+      "script": "Route111_EventScript_Heidi",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1189",
+      "script": "Route111_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1204",
+      "script": "Route111_EventScript_Drew",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F1260",
+      "script": "Route111_EventScript_Dusty",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1232",
+      "script": "Route111_EventScript_Beau",
       "flag": "0"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1249",
+      "script": "Route111_EventScript_Becky",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CDF6",
+      "script": "GabbyAndTy_EventScript_TyBattle1",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CDD6",
+      "script": "GabbyAndTy_EventScript_GabbyBattle1",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0EB9",
+      "script": "Route111_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CE96",
+      "script": "GabbyAndTy_EventScript_GabbyBattle4",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CEB6",
+      "script": "GabbyAndTy_EventScript_TyBattle4",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12D9",
+      "script": "Route111_EventScript_Irene",
       "flag": "0"
     },
     {
@@ -404,7 +404,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F12C2",
+      "script": "Route111_EventScript_Travis",
       "flag": "0"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12F0",
+      "script": "Route111_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1369",
+      "script": "Route111_EventScript_Brooke",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1307",
+      "script": "Route111_EventScript_Wilton",
       "flag": "0"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_2765FF",
+      "script": "Route111_EventScript_SecretPowerMan",
       "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1192",
+      "script": "Route111_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -482,7 +482,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F13F9",
+      "script": "Route111_EventScript_Tyron",
       "flag": "0"
     },
     {
@@ -495,7 +495,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F1410",
+      "script": "Route111_EventScript_Celina",
       "flag": "0"
     },
     {
@@ -508,7 +508,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F13E2",
+      "script": "Route111_EventScript_Bianca",
       "flag": "0"
     },
     {
@@ -521,7 +521,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F13CB",
+      "script": "Route111_EventScript_Hayden",
       "flag": "0"
     },
     {
@@ -534,7 +534,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F143E",
+      "script": "Route111_EventScript_Bryan",
       "flag": "0"
     },
     {
@@ -547,7 +547,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route111_EventScript_1F1427",
+      "script": "Route111_EventScript_Celia",
       "flag": "0"
     },
     {
@@ -560,7 +560,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F1455",
+      "script": "Route111_EventScript_Branden",
       "flag": "0"
     },
     {
@@ -586,7 +586,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F119B",
+      "script": "Route111_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -625,7 +625,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F11E4",
+      "script": "Route111_EventScript_RockSmashTipFatMan",
       "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY"
     }
   ],
@@ -674,7 +674,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -683,7 +683,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -692,7 +692,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -701,7 +701,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -710,7 +710,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -719,7 +719,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -728,7 +728,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -737,7 +737,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -746,7 +746,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -755,7 +755,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -764,7 +764,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -773,7 +773,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -782,7 +782,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -791,7 +791,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -800,7 +800,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -809,7 +809,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -818,7 +818,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -827,7 +827,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -836,7 +836,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -845,7 +845,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -854,7 +854,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -863,7 +863,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -872,7 +872,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -881,7 +881,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -890,7 +890,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -899,7 +899,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -908,7 +908,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -917,7 +917,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -926,7 +926,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -935,7 +935,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -944,7 +944,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -953,7 +953,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -962,7 +962,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -971,7 +971,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     }
   ],
   "bg_events": [
@@ -981,7 +981,7 @@
       "y": 114,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F115C"
+      "script": "Route111_EventScript_WinstrateHouseSign"
     },
     {
       "type": "sign",
@@ -989,7 +989,7 @@
       "y": 126,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1153"
+      "script": "Route111_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -997,7 +997,7 @@
       "y": 66,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1165"
+      "script": "Route111_EventScript_RouteSign112"
     },
     {
       "type": "sign",
@@ -1005,7 +1005,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F116E"
+      "script": "Route111_EventScript_RouteSign113"
     },
     {
       "type": "secret_base",
@@ -1034,7 +1034,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1177"
+      "script": "Route111_EventScript_OldLadysRestStopSign"
     },
     {
       "type": "secret_base",
@@ -1071,7 +1071,7 @@
       "y": 84,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1180"
+      "script": "Route111_EventScript_TrainerTipsSpAtkSpDef"
     },
     {
       "type": "secret_base",
@@ -1109,7 +1109,7 @@
       "y": 116,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F146C"
+      "script": "Route111_EventScript_TrainerHillSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index fceacdfcc..b80ef6b84 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -1,22 +1,23 @@
 Route111_MapScripts:: @ 81F0CA7
-	map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC
+	map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame
 	.byte 0
 
-Route111_MapScript1_1F0CBC: @ 81F0CBC
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
+Route111_OnLoad: @ 81F0CBC
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0CE4
+	call_if_eq Route111_EventScript_ShowTemporaryMirageTower
 	end
 
-Route111_EventScript_1F0CD1:: @ 81F0CD1
+Route111_EventScript_CloseDesertRuins:: @ 81F0CD1
 	setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
 	setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route111_EventScript_1F0CE4:: @ 81F0CE4
+@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout
+Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4
 	setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
 	setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
 	setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
@@ -40,53 +41,51 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4
 Route111_OnTransition: @ 81F0D87
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special SetMirageTowerVisibility
-	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
+	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0DC2
+	call_if_eq Route111_EventScript_SetFallingPlayerGfx
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	call_if_eq Route111_EventScript_1F0E40
-	call Route111_EventScript_1F0DE6
-	call Route111_EventScript_28CCC7
+	call_if_eq Route111_EventScript_SetMirageTowerGone
+	call Route111_EventScript_CheckSetSandstorm
+	call GabbyAndTy_EventScript_UpdateLocation
 	checktrainerflag TRAINER_VICKY
-	goto_if_lt Route111_EventScript_1F0E26
+	goto_if_lt Route111_EventScript_SetWinstratesNotDefeated
 	end
 
-Route111_EventScript_1F0DC2:: @ 81F0DC2
+Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route111_EventScript_1F0DDA
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route111_EventScript_1F0DE0
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale
 	return
 
-Route111_EventScript_1F0DDA:: @ 81F0DDA
+Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-Route111_EventScript_1F0DE0:: @ 81F0DE0
+Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-Route111_EventScript_1F0DE6:: @ 81F0DE6
+Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 34
-	goto_if_lt Route111_EventScript_1F0E25
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 107
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 72
-	goto_if_gt Route111_EventScript_1F0E22
+	goto_if_gt Route111_EventScript_SetSandstorm
 	compare VAR_TEMP_0, 2000
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_0, 8
-	goto_if_lt Route111_EventScript_1F0E25
-
-Route111_EventScript_1F0E22:: @ 81F0E22
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
+Route111_EventScript_SetSandstorm:: @ 81F0E22
 	setweather WEATHER_SANDSTORM
-
-Route111_EventScript_1F0E25:: @ 81F0E25
+Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25
 	return
 
-Route111_EventScript_1F0E26:: @ 81F0E26
+Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26
 	clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -96,27 +95,27 @@ Route111_EventScript_1F0E26:: @ 81F0E26
 	cleartrainerflag TRAINER_VIVI
 	end
 
-Route111_EventScript_1F0E3C:: @ 81F0E3C
+Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C
 	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
-Route111_EventScript_1F0E40:: @ 81F0E40
+Route111_EventScript_SetMirageTowerGone:: @ 81F0E40
 	setvar VAR_MIRAGE_TOWER_STATE, 3
 	return
 
-Route111_MapScript2_1F0E46: @ 81F0E46
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50
+Route111_OnWarp: @ 81F0E46
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower
 	.2byte 0
 
-Route111_EventScript_1F0E50:: @ 81F0E50
+Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	end
 
-Route111_MapScript2_1F0E56: @ 81F0E56
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60
+Route111_OnFrame: @ 81F0E56
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear
 	.2byte 0
 
-Route111_EventScript_1F0E60:: @ 81F0E60
+Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
 	lockall
 	special StartMirageTowerShake
 	waitstate
@@ -136,17 +135,18 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	waitstate
 	setvar VAR_MIRAGE_TOWER_STATE, 2
 	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7
-	msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
+	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_RootFossilDisappeared
+	msgbox Route111_Text_ClawFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_EventScript_1F0EA7:: @ 81F0EA7
-	msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT
+Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7
+	msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_Movement_1F0EB1:: @ 81F0EB1
+@ Unused
+Route111_Movement_PlayerFall:: @ 81F0EB1
 	store_lock_anim
 	walk_fast_down
 	walk_fast_down
@@ -156,498 +156,500 @@ Route111_Movement_1F0EB1:: @ 81F0EB1
 	walk_fast_down
 	step_end
 
-Route111_EventScript_1F0EB9:: @ 81F0EB9
+Route111_EventScript_Girl:: @ 81F0EB9
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4
-	msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry
+	msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT
 	giveitem_std ITEM_RAZZ_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
 	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT
+	msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EF4:: @ 81F0EF4
-	msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT
+Route111_EventScript_ReceivedBerry:: @ 81F0EF4
+	msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EFE:: @ 81F0EFE
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE
 	lockall
 	setvar VAR_0x8004, 0
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F0A:: @ 81F0F0A
+Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A
 	lockall
 	setvar VAR_0x8004, 1
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F16:: @ 81F0F16
+Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16
 	lockall
 	setvar VAR_0x8004, 2
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F22:: @ 81F0F22
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22
 	lockall
 	setvar VAR_0x8004, 3
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F2E:: @ 81F0F2E
+Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E
 	checkitem ITEM_GO_GOGGLES, 1
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_1F0F45
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route111_EventScript_PreventRouteAccess
 	setvar VAR_TEMP_3, 1
 	releaseall
 	end
 
-Route111_EventScript_1F0F45:: @ 81F0F45
+Route111_EventScript_PreventRouteAccess:: @ 81F0F45
 	msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8004, 0
-	call_if_eq Route111_EventScript_1F0F7C
+	call_if_eq Route111_EventScript_PushUpFromRoute
 	compare VAR_0x8004, 1
-	call_if_eq Route111_EventScript_1F0F87
+	call_if_eq Route111_EventScript_PushDownFromRoute
 	compare VAR_0x8004, 2
-	call_if_eq Route111_EventScript_1F0F92
+	call_if_eq Route111_EventScript_PushLeftFromRoute
 	compare VAR_0x8004, 3
-	call_if_eq Route111_EventScript_1F0F9D
+	call_if_eq Route111_EventScript_PushRightFromRoute
 	releaseall
 	end
 
-Route111_EventScript_1F0F7C:: @ 81F0F7C
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8
+Route111_EventScript_PushUpFromRoute:: @ 81F0F7C
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F87:: @ 81F0F87
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA
+Route111_EventScript_PushDownFromRoute:: @ 81F0F87
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F92:: @ 81F0F92
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC
+Route111_EventScript_PushLeftFromRoute:: @ 81F0F92
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F9D:: @ 81F0F9D
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE
+Route111_EventScript_PushRightFromRoute:: @ 81F0F9D
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute
 	waitmovement 0
 	return
 
-Route111_Movement_1F0FA8: @ 81F0FA8
+Route111_Movement_PushUpFromRoute: @ 81F0FA8
 	walk_up
 	step_end
 
-Route111_Movement_1F0FAA: @ 81F0FAA
+Route111_Movement_PushDownFromRoute: @ 81F0FAA
 	walk_down
 	step_end
 
-Route111_Movement_1F0FAC: @ 81F0FAC
+Route111_Movement_PushLeftFromRoute: @ 81F0FAC
 	walk_left
 	step_end
 
-Route111_Movement_1F0FAE: @ 81F0FAE
+Route111_Movement_PushRightFromRoute: @ 81F0FAE
 	walk_right
 	step_end
 
-Route111_EventScript_1F0FB0:: @ 81F0FB0
+Route111_EventScript_SunTrigger:: @ 81F0FB0
 	setweather WEATHER_SUNNY
 	fadenewbgm MUS_DOORO_X1
 	doweather
 	setvar VAR_TEMP_3, 0
 	end
 
-Route111_EventScript_1F0FBD:: @ 81F0FBD
+Route111_EventScript_SandstormTrigger:: @ 81F0FBD
 	setweather WEATHER_SANDSTORM
 	fadenewbgm MUS_ASHROAD
 	doweather
 	end
 
-Route111_EventScript_1F0FC5:: @ 81F0FC5
+Route111_EventScript_Victor:: @ 81F0FC5
 	lock
 	faceplayer
 	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_1F1475, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F0FE7
-	msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT
+	msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route111_EventScript_BattleWinstrates
+	msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0FE7:: @ 81F0FE7
-	msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
+Route111_EventScript_BattleWinstrates:: @ 81F0FE7
+	msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F156F, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route111_Movement_1F114A
+	applymovement 1, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 1
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 2
-	applymovement 2, Route111_Movement_1F114D
+	applymovement 2, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat
 	applymovement 2, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F1645, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, Route111_Movement_1F114A
+	applymovement 2, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 2
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 3
-	applymovement 3, Route111_Movement_1F114D
+	applymovement 3, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat
 	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route111_Movement_1F114A
+	applymovement 3, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 3
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 4
-	applymovement 4, Route111_Movement_1F114D
+	applymovement 4, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
-	msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat
+	msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	applymovement 4, Route111_Movement_1F114A
+	call Route111_EventScript_OpenWinstrateDoor
+	applymovement 4, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 4
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
 	release
 	end
 
-Route111_EventScript_1F113C:: @ 81F113C
+Route111_EventScript_OpenWinstrateDoor:: @ 81F113C
 	opendoor 13, 113
 	waitdooranim
 	return
 
-Route111_EventScript_1F1143:: @ 81F1143
+Route111_EventScript_CloseWinstrateDoor:: @ 81F1143
 	closedoor 13, 113
 	waitdooranim
 	return
 
-Route111_Movement_1F114A: @ 81F114A
+Route111_Movement_WinstrateEnterHouse: @ 81F114A
 	walk_in_place_fastest_up
 	walk_up
 	step_end
 
-Route111_Movement_1F114D: @ 81F114D
+Route111_Movement_WinstrateExitHouse: @ 81F114D
 	walk_down
 	step_end
 
-Route111_Movement_1F114F: @ 81F114F
+Route111_Movement_WaitForNextWinstrate: @ 81F114F
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-Route111_EventScript_1F1153:: @ 81F1153
-	msgbox Route111_Text_1F18CE, MSGBOX_SIGN
+Route111_EventScript_RouteSignMauville:: @ 81F1153
+	msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F115C:: @ 81F115C
-	msgbox Route111_Text_1F18E8, MSGBOX_SIGN
+Route111_EventScript_WinstrateHouseSign:: @ 81F115C
+	msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1165:: @ 81F1165
-	msgbox Route111_Text_1F1921, MSGBOX_SIGN
+Route111_EventScript_RouteSign112:: @ 81F1165
+	msgbox Route111_Text_RouteSign112, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F116E:: @ 81F116E
-	msgbox Route111_Text_1F1937, MSGBOX_SIGN
+Route111_EventScript_RouteSign113:: @ 81F116E
+	msgbox Route111_Text_RouteSign113, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1177:: @ 81F1177
-	msgbox Route111_Text_1F194D, MSGBOX_SIGN
+Route111_EventScript_OldLadysRestStopSign:: @ 81F1177
+	msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1180:: @ 81F1180
-	msgbox Route111_Text_1F1987, MSGBOX_SIGN
+Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180
+	msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1189:: @ 81F1189
-	msgbox Route111_Text_1F17BA, MSGBOX_NPC
+Route111_EventScript_Man1:: @ 81F1189
+	msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F1192:: @ 81F1192
-	msgbox Route111_Text_1F186E, MSGBOX_NPC
+Route111_EventScript_Man2:: @ 81F1192
+	msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F119B:: @ 81F119B
+Route111_EventScript_Hiker:: @ 81F119B
 	lock
 	faceplayer
 	compare VAR_MIRAGE_TOWER_STATE, 3
-	goto_if_eq Route111_EventScript_1F11C6
+	goto_if_eq Route111_EventScript_HikerMirageTowerGone
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	goto_if_eq Route111_EventScript_1F11D0
-	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
-	msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
+	goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated
+	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible
+	msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11C6:: @ 81F11C6
-	msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6
+	msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11D0:: @ 81F11D0
-	msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0
+	msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11DA:: @ 81F11DA
-	msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA
+	msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11E4:: @ 81F11E4
+Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4
 	lockall
 	applymovement 46, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT
+	msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT
 	closemessage
 	applymovement 46, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route111_EventScript_1F1204:: @ 81F1204
-	trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A
-	msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE
+Route111_EventScript_Drew:: @ 81F1204
+	trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat
+	msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F121B:: @ 81F121B
-	trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908
-	msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE
+Route111_EventScript_Heidi:: @ 81F121B
+	trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat
+	msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1232:: @ 81F1232
-	trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6
-	msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE
+Route111_EventScript_Beau:: @ 81F1232
+	trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat
+	msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1249:: @ 81F1249
-	trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF
-	msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE
+Route111_EventScript_Becky:: @ 81F1249
+	trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat
+	msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1260:: @ 81F1260
-	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
+Route111_EventScript_Dusty:: @ 81F1260
+	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F12AB
-	msgbox Route111_Text_298B9A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchDusty
+	msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F128C:: @ 81F128C
-	special sub_80B4808
+Route111_EventScript_RegisterDusty:: @ 81F128C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_298C00, MSGBOX_DEFAULT
+	msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DUSTY_1
 	release
 	end
 
-Route111_EventScript_1F12AB:: @ 81F12AB
-	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2
-	msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchDusty:: @ 81F12AB
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat
+	msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12C2:: @ 81F12C2
-	trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8
-	msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE
+Route111_EventScript_Travis:: @ 81F12C2
+	trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat
+	msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12D9:: @ 81F12D9
-	trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E
-	msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE
+Route111_EventScript_Irene:: @ 81F12D9
+	trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat
+	msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12F0:: @ 81F12F0
-	trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14
-	msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE
+Route111_EventScript_Daisuke:: @ 81F12F0
+	trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat
+	msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1307:: @ 81F1307
-	trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
+Route111_EventScript_Wilton:: @ 81F1307
+	trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F1352
-	msgbox Route111_Text_298FD4, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchWilton
+	msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1333:: @ 81F1333
-	special sub_80B4808
+Route111_EventScript_RegisterWilton:: @ 81F1333
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29903D, MSGBOX_DEFAULT
+	msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WILTON_1
 	release
 	end
 
-Route111_EventScript_1F1352:: @ 81F1352
-	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE
-	msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchWilton:: @ 81F1352
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat
+	msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1369:: @ 81F1369
-	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
+Route111_EventScript_Brooke:: @ 81F1369
+	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F13B4
-	msgbox Route111_Text_2991C2, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchBrooke
+	msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1395:: @ 81F1395
-	special sub_80B4808
+Route111_EventScript_RegisterBrooke:: @ 81F1395
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29921D, MSGBOX_DEFAULT
+	msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BROOKE_1
 	release
 	end
 
-Route111_EventScript_1F13B4:: @ 81F13B4
-	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6
-	msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchBrooke:: @ 81F13B4
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat
+	msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13CB:: @ 81F13CB
-	trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE
-	msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE
+Route111_EventScript_Hayden:: @ 81F13CB
+	trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat
+	msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13E2:: @ 81F13E2
-	trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D
-	msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE
+Route111_EventScript_Bianca:: @ 81F13E2
+	trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat
+	msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13F9:: @ 81F13F9
-	trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549
-	msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE
+Route111_EventScript_Tyron:: @ 81F13F9
+	trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat
+	msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1410:: @ 81F1410
-	trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625
-	msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE
+Route111_EventScript_Celina:: @ 81F1410
+	trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat
+	msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1427:: @ 81F1427
-	trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384
-	msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE
+Route111_EventScript_Celia:: @ 81F1427
+	trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat
+	msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F143E:: @ 81F143E
-	trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431
-	msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE
+Route111_EventScript_Bryan:: @ 81F143E
+	trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat
+	msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1455:: @ 81F1455
-	trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5
-	msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE
+Route111_EventScript_Branden:: @ 81F1455
+	trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat
+	msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F146C:: @ 81F146C
-	msgbox Route111_Text_1F1D61, MSGBOX_SIGN
+Route111_EventScript_TrainerHillSign:: @ 81F146C
+	msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN
 	end
 
-Route111_Text_1F1475: @ 81F1475
+Route111_Text_BattleOurFamily: @ 81F1475
 	.string "Hello! I take it you're a traveler.\p"
 	.string "How's this? What do you say to taking\n"
 	.string "on our family of four in a series of\l"
 	.string "POKéMON battles?$"
 
-Route111_Text_1F14F5: @ 81F14F5
+Route111_Text_IsThatSo: @ 81F14F5
 	.string "Is that so?\n"
 	.string "Drop in, if you change your mind!$"
 
-Route111_Text_1F1523: @ 81F1523
+Route111_Text_VictorIntro: @ 81F1523
 	.string "That's the spirit! I like you!$"
 
-Route111_Text_1F1542: @ 81F1542
+Route111_Text_VictorDefeat: @ 81F1542
 	.string "Aiyah!\n"
 	.string "You're a lot tougher than I expected!$"
 
-Route111_Text_1F156F: @ 81F156F
+Route111_Text_VictorPostBattle: @ 81F156F
 	.string "Hey, all!\n"
 	.string "I've found a pretty strong TRAINER!$"
 
-Route111_Text_1F159D: @ 81F159D
+Route111_Text_VictoriaIntro: @ 81F159D
 	.string "Oh, my goodness! Aren't you young?\p"
 	.string "You must be quite the TRAINER to beat\n"
 	.string "my husband, though.\p"
 	.string "It's my turn to battle now!$"
 
-Route111_Text_1F1616: @ 81F1616
+Route111_Text_VictoriaDefeat: @ 81F1616
 	.string "Oh, gosh!\n"
 	.string "I can't get over how strong you are!$"
 
-Route111_Text_1F1645: @ 81F1645
+Route111_Text_VictoriaPostBattle: @ 81F1645
 	.string "There's a strong TRAINER here!\n"
 	.string "This one's really strong!$"
 
-Route111_Text_1F167E: @ 81F167E
+Route111_Text_ViviIntro: @ 81F167E
 	.string "You're stronger than Mommy? Wow!\p"
 	.string "But I'm strong, too!\n"
 	.string "Really! Honestly!$"
 
-Route111_Text_1F16C6: @ 81F16C6
+Route111_Text_ViviDefeat: @ 81F16C6
 	.string "Huh? Did I just lose?$"
 
-Route111_Text_1F16DC: @ 81F16DC
+Route111_Text_ViviPostBattle: @ 81F16DC
 	.string "This stinks…\p"
 	.string "…Snivel… Grandma!$"
 
-Route111_Text_1F16FB: @ 81F16FB
+Route111_Text_VickyIntro: @ 81F16FB
 	.string "How dare you make my granddaughter\n"
 	.string "cry!\p"
 	.string "For that, I'm going to smack you!\n"
 	.string "Prepare to lose!$"
 
-Route111_Text_1F1756: @ 81F1756
+Route111_Text_VickyDefeat: @ 81F1756
 	.string "Kwah! You are strong…\n"
 	.string "My granddaughter was right…$"
 
-Route111_Text_1F1788: @ 81F1788
+Route111_Text_VickyPostBattle: @ 81F1788
 	.string "If you're not in any hurry,\n"
 	.string "visit with us awhile.$"
 
-Route111_Text_1F17BA: @ 81F17BA
+Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA
 	.string "If you don't raise your POKéMON some\n"
 	.string "more, it could be tough to keep winning\l"
 	.string "up through the ranks.\p"
@@ -655,32 +657,32 @@ Route111_Text_1F17BA: @ 81F17BA
 	.string "ELITE FOUR are far stronger than\l"
 	.string "any GYM LEADER.$"
 
-Route111_Text_1F186E: @ 81F186E
+Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E
 	.string "I challenged the WINSTRATE family,\n"
 	.string "but four matches in a row is tough\l"
 	.string "going… They destroyed me.$"
 
-Route111_Text_1F18CE: @ 81F18CE
+Route111_Text_RouteSignMauville: @ 81F18CE
 	.string "ROUTE 111\n"
 	.string "{DOWN_ARROW} MAUVILLE CITY$"
 
-Route111_Text_1F18E8: @ 81F18E8
+Route111_Text_WinstrateHouseSign: @ 81F18E8
 	.string "“Our family's hearts beat as one!”\n"
 	.string "THE WINSTRATE'S HOUSE$"
 
-Route111_Text_1F1921: @ 81F1921
+Route111_Text_RouteSign112: @ 81F1921
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 112$"
 
-Route111_Text_1F1937: @ 81F1937
+Route111_Text_RouteSign113: @ 81F1937
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 113$"
 
-Route111_Text_1F194D: @ 81F194D
+Route111_Text_OldLadysRestStopSign: @ 81F194D
 	.string "OLD LADY'S REST STOP\n"
 	.string "“Come in and rest your tired bones.”$"
 
-Route111_Text_1F1987: @ 81F1987
+Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987
 	.string "TRAINER TIPS\p"
 	.string "One of the indicators of a POKéMON's\n"
 	.string "powerfulness is SP. ATK. It stands for\l"
@@ -688,14 +690,14 @@ Route111_Text_1F1987: @ 81F1987
 	.string "Likewise, SP. DEF stands for “SPECIAL\n"
 	.string "DEFENSE.”$"
 
-Route111_Text_1F1A22: @ 81F1A22
+Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22
 	.string "There should be a tower made of sand\n"
 	.string "around here somewhere.\p"
 	.string "But for some reason, it can be seen\n"
 	.string "sometimes, and sometimes not.\p"
 	.string "That's why I call it the MIRAGE TOWER.$"
 
-Route111_Text_1F1AC7: @ 81F1AC7
+Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7
 	.string "I see it!\n"
 	.string "The tower of sand!\p"
 	.string "The sand tower they called a mirage\n"
@@ -705,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7
 	.string "I want to go inside it, but I can't\n"
 	.string "get my courage up for it…$"
 
-Route111_Text_1F1B92: @ 81F1B92
+Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92
 	.string "Whoa…\n"
 	.string "That was shocking.\p"
 	.string "Sand rained down in chunks all of\n"
@@ -713,21 +715,21 @@ Route111_Text_1F1B92: @ 81F1B92
 	.string "What was it like inside?\n"
 	.string "Were there sandy ghosts and such?$"
 
-Route111_Text_1F1C12: @ 81F1C12
+Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12
 	.string "Since I spoke to you, the tower of sand\n"
 	.string "hasn't been seen.\p"
 	.string "Perhaps it really was\n"
 	.string "the MIRAGE TOWER…$"
 
-Route111_Text_1F1C74: @ 81F1C74
+Route111_Text_ClawFossilDisappeared: @ 81F1C74
 	.string "The CLAW FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1C9F: @ 81F1C9F
+Route111_Text_RootFossilDisappeared: @ 81F1C9F
 	.string "The ROOT FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1CCA: @ 81F1CCA
+Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA
 	.string "Oh, no!\p"
 	.string "My uncle in MAUVILLE told me to take\n"
 	.string "ROCK SMASH with me if I was going to\l"
@@ -735,7 +737,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
 	.string "My uncle? He lives across from\n"
 	.string "the bike shop in MAUVILLE.$"
 
-Route111_Text_1F1D61: @ 81F1D61
+Route111_Text_TrainerHillSign: @ 81F1D61
 	.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
 	.string "“Scale the heights, you hot-blooded\n"
 	.string "TRAINERS!”$"
diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json
index c915bfb95..71afc39f8 100644
--- a/data/maps/Route111_OldLadysRestStop/map.json
+++ b/data/maps/Route111_OldLadysRestStop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_OldLadysRestStop_EventScript_22A920",
+      "script": "Route111_OldLadysRestStop_EventScript_OldLady",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 017043eae..0df1e6b6e 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -6,49 +6,49 @@ Route111_OldLadysRestStop_OnTransition: @ 822A91C
 	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end
 
-Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920
+Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920
 	lock
 	faceplayer
-	msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_OldLadysRestStop_EventScript_22A941
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E
+	msgbox Route111_OldLadysRestStop_Text_RestUpHere, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route111_OldLadysRestStop_EventScript_Rest
+	compare VAR_RESULT, NO
+	goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
 	end
 
-Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941
-	msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT
+Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941
+	msgbox Route111_OldLadysRestStop_Text_TakeYourTimeRestUp, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
-	msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_OldLadysRestStop_EventScript_22A941
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E
+	msgbox Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route111_OldLadysRestStop_EventScript_Rest
+	compare VAR_RESULT, NO
+	goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
 	end
 
-Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E
-	msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT
+Route111_OldLadysRestStop_EventScript_DeclineRest:: @ 822A96E
+	msgbox Route111_OldLadysRestStop_Text_DontNeedToBeShy, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_OldLadysRestStop_Text_22A978: @ 822A978
+Route111_OldLadysRestStop_Text_RestUpHere: @ 822A978
 	.string "Oh, dear, dear.\n"
 	.string "Aren't your POKéMON exhausted?\p"
 	.string "If you'd like, rest up here.\n"
 	.string "That's a fine idea! You should do that.$"
 
-Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC
+Route111_OldLadysRestStop_Text_TakeYourTimeRestUp: @ 822A9EC
 	.string "That's right.\n"
 	.string "Take your time and rest up!$"
 
-Route111_OldLadysRestStop_Text_22AA16: @ 822AA16
+Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest: @ 822AA16
 	.string "Oh, dear, dear.\n"
 	.string "Are your POKéMON still tired?\p"
 	.string "You should take another rest here.\n"
 	.string "That's a fine idea. You should do that.$"
 
-Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F
+Route111_OldLadysRestStop_Text_DontNeedToBeShy: @ 822AA8F
 	.string "Is that so?\n"
 	.string "You don't need to be shy about it.$"
 
diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json
index fed3dab3f..640de23cb 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/map.json
+++ b/data/maps/Route111_WinstrateFamilysHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_Vivi",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_Victor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_Victoria",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD",
+      "script": "Route111_WinstrateFamilysHouse_EventScript_Vicky",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 312bf739f..387b8f630 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -1,63 +1,63 @@
 Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C
 	.byte 0
 
-Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D
+Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D
 	lock
 	faceplayer
 	setvar VAR_0x8008, 2
-	msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+	msgbox Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou, MSGBOX_DEFAULT
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2
+Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2
 	lock
 	faceplayer
 	setvar VAR_0x8008, 3
-	goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_22A4DA
-	msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace
+	msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT
 	giveitem_std ITEM_MACHO_BRACE
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MACHO_BRACE
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA
-	msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: @ 822A4DA
+	msgbox Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles, MSGBOX_DEFAULT
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8
+Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8
 	lock
 	faceplayer
 	setvar VAR_0x8008, 1
-	msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+	msgbox Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers, MSGBOX_DEFAULT
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD
+Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD
 	lock
 	faceplayer
 	setvar VAR_0x8008, 4
-	goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E
-	msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT
+	goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo
+	msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrong, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_4
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E
-	msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT
-	goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: @ 822A51E
+	msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort, MSGBOX_DEFAULT
+	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C
+Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: @ 822A52C
 	closemessage
 	applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539
+Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539
 	.string "You're the first TRAINER I've seen who\n"
 	.string "deploys POKéMON so masterfully.\p"
 	.string "But, I should tell you--my son is\n"
@@ -65,7 +65,7 @@ Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539
 	.string "He even took the POKéMON LEAGUE\n"
 	.string "challenge, I'll have you know.$"
 
-Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4
+Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4
 	.string "We use this MACHO BRACE to more\n"
 	.string "effectively strengthen our POKéMON\l"
 	.string "in training.\p"
@@ -73,18 +73,18 @@ Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4
 	.string "I don't know if you need it, but we\l"
 	.string "would like you to have our MACHO BRACE.$"
 
-Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4
+Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles: @ 822A6B4
 	.string "When it comes to POKéMON battles,\n"
 	.string "we tend to be pretty passionate.$"
 
-Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7
+Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers: @ 822A6F7
 	.string "Mommy is stronger than Daddy.\p"
 	.string "I'm stronger than Mommy.\p"
 	.string "And Grandma's stronger than me!\p"
 	.string "But my big brother is even stronger\n"
 	.string "than Grandma.$"
 
-Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780
+Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780
 	.string "There's no question that you're strong.\p"
 	.string "But if you were to battle my grandson,\n"
 	.string "you'd end up crying in frustration.\p"
@@ -95,7 +95,7 @@ Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780
 	.string "Knowing my grandson, he could be the\n"
 	.string "CHAMPION already!$"
 
-Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B
+Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort: @ 822A89B
 	.string "My grandson must be challenging the\n"
 	.string "POKéMON LEAGUE CHAMPION by now.\p"
 	.string "Knowing my grandson, he could be the\n"
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index b963c6c48..e52468f32 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route112_EventScript_1F1E6A",
+      "script": "Route112_EventScript_Brice",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EE3",
+      "script": "Route112_EventScript_Larry",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EFA",
+      "script": "Route112_EventScript_Carol",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1E81",
+      "script": "Route112_EventScript_Trent",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1E61",
+      "script": "Route112_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F11",
+      "script": "Route112_EventScript_Bryant",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F28",
+      "script": "Route112_EventScript_Shayla",
       "flag": "0"
     }
   ],
@@ -265,7 +265,7 @@
       "y": 44,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E4F"
+      "script": "Route112_EventScript_MtChimneySign"
     },
     {
       "type": "sign",
@@ -273,7 +273,7 @@
       "y": 37,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E46"
+      "script": "Route112_EventScript_MtChimneyCableCarSign"
     },
     {
       "type": "sign",
@@ -281,7 +281,7 @@
       "y": 49,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E58"
+      "script": "Route112_EventScript_RouteSignLavaridge"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index 0659095f6..4dd4fe112 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -7,13 +7,13 @@ Route112_OnTransition: @ 81F1DAE
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-Route112_EventScript_1F1DB7:: @ 81F1DB7
+Route112_EventScript_MagmaGrunts:: @ 81F1DB7
 	lockall
 	delay 40
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
+	msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
+	msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
+	msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -37,107 +37,107 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
+	msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route112_EventScript_1F1E46:: @ 81F1E46
-	msgbox Route112_Text_1F20C1, MSGBOX_SIGN
+Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46
+	msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E4F:: @ 81F1E4F
-	msgbox Route112_Text_1F20ED, MSGBOX_SIGN
+Route112_EventScript_MtChimneySign:: @ 81F1E4F
+	msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E58:: @ 81F1E58
-	msgbox Route112_Text_1F2138, MSGBOX_SIGN
+Route112_EventScript_RouteSignLavaridge:: @ 81F1E58
+	msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E61:: @ 81F1E61
-	msgbox Route112_Text_1F204E, MSGBOX_NPC
+Route112_EventScript_Hiker:: @ 81F1E61
+	msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC
 	end
 
-Route112_EventScript_1F1E6A:: @ 81F1E6A
-	trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
-	msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
+Route112_EventScript_Brice:: @ 81F1E6A
+	trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat
+	msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1E81:: @ 81F1E81
-	trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+Route112_EventScript_Trent:: @ 81F1E81
+	trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route112_EventScript_1F1ECC
-	msgbox Route112_Text_299896, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route112_EventScript_RematchTrent
+	msgbox Route112_Text_TrentPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route112_EventScript_1F1EAD:: @ 81F1EAD
-	special sub_80B4808
+Route112_EventScript_RegisterTrent:: @ 81F1EAD
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route112_Text_29993C, MSGBOX_DEFAULT
+	msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TRENT_1
 	release
 	end
 
-Route112_EventScript_1F1ECC:: @ 81F1ECC
-	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
-	msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
+Route112_EventScript_RematchTrent:: @ 81F1ECC
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat
+	msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EE3:: @ 81F1EE3
-	trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
-	msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
+Route112_EventScript_Larry:: @ 81F1EE3
+	trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat
+	msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EFA:: @ 81F1EFA
-	trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
-	msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
+Route112_EventScript_Carol:: @ 81F1EFA
+	trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat
+	msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F11:: @ 81F1F11
-	trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
-	msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
+Route112_EventScript_Bryant:: @ 81F1F11
+	trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat
+	msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F28:: @ 81F1F28
-	trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
-	msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
+Route112_EventScript_Shayla:: @ 81F1F28
+	trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat
+	msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_Text_1F1F3F: @ 81F1F3F
+Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F
 	.string "Hey, man, is our leader really going\n"
 	.string "to awaken that thing?$"
 
-Route112_Text_1F1F7A: @ 81F1F7A
+Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A
 	.string "Sounds like it, yeah. But I heard\n"
 	.string "we need a METEORITE to do it.$"
 
-Route112_Text_1F1FBA: @ 81F1FBA
+Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA
 	.string "Oh, I get it now. That's why the rest\n"
 	.string "of the crew went out to FALLARBOR.$"
 
-Route112_Text_1F2003: @ 81F2003
+Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003
 	.string "You got it. And until they come back,\n"
 	.string "we're not to let anyone pass, right.$"
 
-Route112_Text_1F204E: @ 81F204E
+Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E
 	.string "Eh, I'd like to get to MAUVILLE, but if\n"
 	.string "I went down these ledges, it'd be no\l"
 	.string "easy matter to get back to LAVARIDGE.$"
 
-Route112_Text_1F20C1: @ 81F20C1
+Route112_Text_MtChimneyCableCarSign: @ 81F20C1
 	.string "MT. CHIMNEY CABLE CAR\n"
 	.string "“A short walk {UP_ARROW} way!”$"
 
-Route112_Text_1F20ED: @ 81F20ED
+Route112_Text_MtChimneySign: @ 81F20ED
 	.string "MT. CHIMNEY\p"
 	.string "“For LAVARIDGE TOWN or the summit,\n"
 	.string "please take the CABLE CAR.”$"
 
-Route112_Text_1F2138: @ 81F2138
+Route112_Text_RouteSignLavaridge: @ 81F2138
 	.string "ROUTE 112\n"
 	.string "{LEFT_ARROW} LAVARIDGE TOWN$"
 
diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json
index 52958a4ee..5ed7fc4a7 100644
--- a/data/maps/Route112_CableCarStation/map.json
+++ b/data/maps/Route112_CableCarStation/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_CableCarStation_EventScript_22AB17",
+      "script": "Route112_CableCarStation_EventScript_Attendant",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index d3a98870b..0b0ad3dc9 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -1,27 +1,27 @@
 Route112_CableCarStation_MapScripts:: @ 822AABE
 	map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_OnFrame
 	.byte 0
 
 Route112_CableCarStation_OnTransition: @ 822AAC9
 	setescapewarp MAP_ROUTE112, 255, 28, 28
 	compare VAR_CABLE_CAR_STATION_STATE, 2
-	call_if_eq Route112_CableCarStation_EventScript_22AADD
+	call_if_eq Route112_CableCarStation_EventScript_MoveAttendantAside
 	end
 
-Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
+Route112_CableCarStation_EventScript_MoveAttendantAside:: @ 822AADD
 	setobjectxyperm 1, 7, 4
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
-	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3
+Route112_CableCarStation_OnFrame: @ 822AAE9
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_ExitCableCar
 	.2byte 0
 
-Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
+Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80
-	applymovement 1, Route112_CableCarStation_Movement_22AB76
+	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar
+	applymovement 1, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar
 	waitmovement 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
@@ -29,21 +29,21 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
 	releaseall
 	end
 
-Route112_CableCarStation_EventScript_22AB17:: @ 822AB17
+Route112_CableCarStation_EventScript_Attendant:: @ 822AB17
 	lock
 	faceplayer
-	msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route112_CableCarStation_EventScript_22AB38
-	compare VAR_RESULT, 0
-	goto_if_eq Route112_CableCarStation_EventScript_22AB67
+	msgbox Route112_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route112_CableCarStation_EventScript_RideCableCar
+	compare VAR_RESULT, NO
+	goto_if_eq Route112_CableCarStation_EventScript_DeclineRide
 	end
 
-Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
-	msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT
+Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38
+	msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route112_CableCarStation_Movement_22AB71
-	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B
+	applymovement 1, Route112_CableCarStation_Movement_LeadPlayerToCableCar
+	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar
 	waitmovement 0
 	setvar VAR_0x8004, 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 1
@@ -54,46 +54,46 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
 	release
 	end
 
-Route112_CableCarStation_EventScript_22AB67:: @ 822AB67
-	msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT
+Route112_CableCarStation_EventScript_DeclineRide:: @ 822AB67
+	msgbox Route112_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-Route112_CableCarStation_Movement_22AB71: @ 822AB71
+Route112_CableCarStation_Movement_LeadPlayerToCableCar: @ 822AB71
 	walk_up
 	walk_up
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-Route112_CableCarStation_Movement_22AB76: @ 822AB76
+Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822AB76
 	delay_16
 	walk_left
 	walk_down
 	walk_down
 	step_end
 
-Route112_CableCarStation_Movement_22AB7B: @ 822AB7B
+Route112_CableCarStation_Movement_BoardCableCar: @ 822AB7B
 	walk_up
 	walk_up
 	walk_up
 	delay_16
 	step_end
 
-Route112_CableCarStation_Movement_22AB80: @ 822AB80
+Route112_CableCarStation_Movement_ExitCableCar: @ 822AB80
 	walk_down
 	walk_down
 	walk_down
 	delay_16
 	step_end
 
-Route112_CableCarStation_Text_22AB85: @ 822AB85
+Route112_CableCarStation_Text_CableCarReadyGetOn: @ 822AB85
 	.string "The CABLE CAR is ready to go up.\n"
 	.string "Would you like to be on it?$"
 
-Route112_CableCarStation_Text_22ABC2: @ 822ABC2
+Route112_CableCarStation_Text_StepThisWay: @ 822ABC2
 	.string "Please step this way.$"
 
-Route112_CableCarStation_Text_22ABD8: @ 822ABD8
+Route112_CableCarStation_Text_RideAnotherTime: @ 822ABD8
 	.string "Please ride with us another time.$"
 
diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index bcff99de4..ba3cf2452 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F2193",
+      "script": "Route113_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F218A",
+      "script": "Route113_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21C0",
+      "script": "Route113_EventScript_Jaylen",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21D7",
+      "script": "Route113_EventScript_Dillon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route113_EventScript_1F21EE",
+      "script": "Route113_EventScript_Madeline",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F2250",
+      "script": "Route113_EventScript_Lao",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22B2",
+      "script": "Route113_EventScript_Lung",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22C9",
+      "script": "Route113_EventScript_Tori",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22E4",
+      "script": "Route113_EventScript_Tia",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route113_EventScript_1F2344",
+      "script": "Route113_EventScript_Wyatt",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F232D",
+      "script": "Route113_EventScript_Lawrence",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F22FF",
+      "script": "Route113_EventScript_Sophie",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F2316",
+      "script": "Route113_EventScript_Coby",
       "flag": "0"
     }
   ],
@@ -404,7 +404,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F219C"
+      "script": "Route113_EventScript_RouteSign111"
     },
     {
       "type": "sign",
@@ -412,7 +412,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21A5"
+      "script": "Route113_EventScript_RouteSignFallarbor"
     },
     {
       "type": "sign",
@@ -420,7 +420,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21B7"
+      "script": "Route113_EventScript_TrainerTipsRegisterKeyItems"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21AE"
+      "script": "Route113_EventScript_GlassWorkshopSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 3e1b1754f..612e4a864 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -1,170 +1,170 @@
 Route113_MapScripts:: @ 81F2153
-	map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E
+	map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition
 	.byte 0
 
-Route113_MapScript1_1F215E: @ 81F215E
+Route113_OnResume: @ 81F215E
 	setstepcallback STEP_CB_ASH
 	end
 
 Route113_OnTransition: @ 81F2161
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
-	call Route113_EventScript_1F216A
+	call Route113_EventScript_CheckSetAshWeather
 	end
 
-Route113_EventScript_1F216A:: @ 81F216A
+Route113_EventScript_CheckSetAshWeather:: @ 81F216A
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 19
-	goto_if_lt Route113_EventScript_1F2189
+	goto_if_lt Route113_EventScript_DontSetAshWeather
 	compare VAR_TEMP_0, 84
-	goto_if_gt Route113_EventScript_1F2189
+	goto_if_gt Route113_EventScript_DontSetAshWeather
 	setweather WEATHER_ASH
 	return
 
-Route113_EventScript_1F2189:: @ 81F2189
+Route113_EventScript_DontSetAshWeather:: @ 81F2189
 	return
 
-Route113_EventScript_1F218A:: @ 81F218A
-	msgbox Route113_Text_1F235B, MSGBOX_NPC
+Route113_EventScript_Gentleman:: @ 81F218A
+	msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F2193:: @ 81F2193
-	msgbox Route113_Text_1F23CA, MSGBOX_NPC
+Route113_EventScript_NinjaBoy:: @ 81F2193
+	msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F219C:: @ 81F219C
-	msgbox Route113_Text_1F2440, MSGBOX_SIGN
+Route113_EventScript_RouteSign111:: @ 81F219C
+	msgbox Route113_Text_RouteSign111, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21A5:: @ 81F21A5
-	msgbox Route113_Text_1F2456, MSGBOX_SIGN
+Route113_EventScript_RouteSignFallarbor:: @ 81F21A5
+	msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21AE:: @ 81F21AE
-	msgbox Route113_Text_1F24F8, MSGBOX_SIGN
+Route113_EventScript_GlassWorkshopSign:: @ 81F21AE
+	msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21B7:: @ 81F21B7
-	msgbox Route113_Text_1F2471, MSGBOX_SIGN
+Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7
+	msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21C0:: @ 81F21C0
-	trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
-	msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
+Route113_EventScript_Jaylen:: @ 81F21C0
+	trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat
+	msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21D7:: @ 81F21D7
-	trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
-	msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
+Route113_EventScript_Dillon:: @ 81F21D7
+	trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat
+	msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21EE:: @ 81F21EE
-	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
+Route113_EventScript_Madeline:: @ 81F21EE
+	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route113_EventScript_1F2239
-	msgbox Route113_Text_299F15, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route113_EventScript_RematchMadeline
+	msgbox Route113_Text_MadelinePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F221A:: @ 81F221A
-	special sub_80B4808
+Route113_EventScript_RegisterMadeline:: @ 81F221A
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_299F49, MSGBOX_DEFAULT
+	msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MADELINE_1
 	release
 	end
 
-Route113_EventScript_1F2239:: @ 81F2239
-	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
-	msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
+Route113_EventScript_RematchMadeline:: @ 81F2239
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat
+	msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2250:: @ 81F2250
-	trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
+Route113_EventScript_Lao:: @ 81F2250
+	trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route113_EventScript_1F229B
-	msgbox Route113_Text_29A067, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route113_EventScript_RematchLao
+	msgbox Route113_Text_LaoPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F227C:: @ 81F227C
-	special sub_80B4808
+Route113_EventScript_RegisterLao:: @ 81F227C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT
+	msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LAO_1
 	release
 	end
 
-Route113_EventScript_1F229B:: @ 81F229B
-	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
-	msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
+Route113_EventScript_RematchLao:: @ 81F229B
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat
+	msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22B2:: @ 81F22B2
-	trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
-	msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
+Route113_EventScript_Lung:: @ 81F22B2
+	trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat
+	msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22C9:: @ 81F22C9
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
-	msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
+Route113_EventScript_Tori:: @ 81F22C9
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons
+	msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22E4:: @ 81F22E4
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
-	msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
+Route113_EventScript_Tia:: @ 81F22E4
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons
+	msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22FF:: @ 81F22FF
-	trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
-	msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
+Route113_EventScript_Sophie:: @ 81F22FF
+	trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat
+	msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2316:: @ 81F2316
-	trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
-	msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
+Route113_EventScript_Coby:: @ 81F2316
+	trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat
+	msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F232D:: @ 81F232D
-	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
-	msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
+Route113_EventScript_Lawrence:: @ 81F232D
+	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat
+	msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2344:: @ 81F2344
-	trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
-	msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
+Route113_EventScript_Wyatt:: @ 81F2344
+	trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat
+	msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_Text_1F235B: @ 81F235B
+Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B
 	.string "Wahahaha! Today's technology is a\n"
 	.string "wondrous thing!\p"
 	.string "Take this volcanic ash here.\n"
 	.string "It can be fashioned into glass.$"
 
-Route113_Text_1F23CA: @ 81F23CA
+Route113_Text_FunWalkingThroughAsh: @ 81F23CA
 	.string "It's fun walking through the volcano's\n"
 	.string "ashes on the ground and grass.\p"
 	.string "You can see where you walked--it's\n"
 	.string "really neat!$"
 
-Route113_Text_1F2440: @ 81F2440
+Route113_Text_RouteSign111: @ 81F2440
 	.string "ROUTE 113\n"
 	.string "{RIGHT_ARROW} ROUTE 111$"
 
-Route113_Text_1F2456: @ 81F2456
+Route113_Text_RouteSignFallarbor: @ 81F2456
 	.string "ROUTE 113\n"
 	.string "{LEFT_ARROW} FALLARBOR TOWN$"
 
-Route113_Text_1F2471: @ 81F2471
+Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471
 	.string "TRAINER TIPS\p"
 	.string "You may register one of the KEY ITEMS\n"
 	.string "in your BAG as SELECT.\p"
 	.string "Simply press SELECT to use\n"
 	.string "the registered item conveniently.$"
 
-Route113_Text_1F24F8: @ 81F24F8
+Route113_Text_GlassWorkshopSign: @ 81F24F8
 	.string "GLASS WORKSHOP\n"
 	.string "“Turning Volcanic Ash into Glass Items”$"
 
diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json
index 70e342048..0f57ce2b8 100644
--- a/data/maps/Route113_GlassWorkshop/map.json
+++ b/data/maps/Route113_GlassWorkshop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_GlassWorkshop_EventScript_26ED1E",
+      "script": "Route113_GlassWorkshop_EventScript_GlassWorker",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_GlassWorkshop_EventScript_26F194",
+      "script": "Route113_GlassWorkshop_EventScript_NinjaBoy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 22acd676d..30d453abd 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -2,313 +2,322 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition
 	.byte 0
 
+	.set BLUE_FLUTE_PRICE,   250
+	.set YELLOW_FLUTE_PRICE, 500
+	.set RED_FLUTE_PRICE,    500
+	.set WHITE_FLUTE_PRICE,  1000
+	.set BLACK_FLUTE_PRICE,  1000
+	.set PRETTY_CHAIR_PRICE, 6000
+	.set PRETTY_DESK_PRICE,  8000
+	.set LOWEST_ASH_PRICE,   BLUE_FLUTE_PRICE
+
 Route113_GlassWorkshop_OnTransition: @ 826ED09
 	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare VAR_GLASS_WORKSHOP_STATE, 1
-	call_if_eq Route113_GlassWorkshop_EventScript_26ED18
+	call_if_eq Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack
 	end
 
-Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18
+Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack:: @ 826ED18
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	return
 
-Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E
+Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E
 	lock
 	faceplayer
 	compare VAR_GLASS_WORKSHOP_STATE, 10
-	goto_if_ge Route113_GlassWorkshop_EventScript_26F090
+	goto_if_ge Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom
 	compare VAR_GLASS_WORKSHOP_STATE, 2
-	goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E
+	goto_if_eq Route113_GlassWorkshop_EventScript_CheckCollectedAsh
 	compare VAR_GLASS_WORKSHOP_STATE, 1
-	goto_if_eq Route113_GlassWorkshop_EventScript_26ED64
-	msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT
+	goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack
+	msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOT_SACK
 	setvar VAR_GLASS_WORKSHOP_STATE, 1
-	msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT
+	msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64
-	msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_ExplainSootSack:: @ 826ED64
+	msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E
+Route113_GlassWorkshop_EventScript_CheckCollectedAsh:: @ 826ED6E
 	checkitem ITEM_SOOT_SACK, 1
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26ED9D
-	msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT
-	compare VAR_ASH_GATHER_COUNT, 250
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFD6
-	message Route113_GlassWorkshop_Text_26F40A
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route113_GlassWorkshop_EventScript_SootSackNotInBag
+	msgbox Route113_GlassWorkshop_Text_LetsSeeCollectedAshes, MSGBOX_DEFAULT
+	compare VAR_ASH_GATHER_COUNT, LOWEST_ASH_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAsh
+	message Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike
 	waitmessage
-	goto Route113_GlassWorkshop_EventScript_26EDA7
+	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D
-	msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_SootSackNotInBag:: @ 826ED9D
+	msgbox Route113_GlassWorkshop_Text_HaventGotYourSootSack, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
+Route113_GlassWorkshop_EventScript_ChooseGlassItem:: @ 826EDA7
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, Route113_GlassWorkshop_EventScript_26EE1E
-	case 1, Route113_GlassWorkshop_EventScript_26EE5A
-	case 2, Route113_GlassWorkshop_EventScript_26EE96
-	case 3, Route113_GlassWorkshop_EventScript_26EED2
-	case 4, Route113_GlassWorkshop_EventScript_26EF0E
-	case 5, Route113_GlassWorkshop_EventScript_26EF4A
-	case 6, Route113_GlassWorkshop_EventScript_26EF8B
-	case 7, Route113_GlassWorkshop_EventScript_26EFCC
-	case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_26EFCC
+	case 0, Route113_GlassWorkshop_EventScript_BlueFlute
+	case 1, Route113_GlassWorkshop_EventScript_YellowFlute
+	case 2, Route113_GlassWorkshop_EventScript_RedFlute
+	case 3, Route113_GlassWorkshop_EventScript_WhiteFlute
+	case 4, Route113_GlassWorkshop_EventScript_BlackFlute
+	case 5, Route113_GlassWorkshop_EventScript_PrettyChair
+	case 6, Route113_GlassWorkshop_EventScript_PrettyDesk
+	case 7, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect
+	case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect
 	end
 
-Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
+Route113_GlassWorkshop_EventScript_BlueFlute:: @ 826EE1E
 	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
-	setvar VAR_0x800A, 250
-	compare VAR_ASH_GATHER_COUNT, 250
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, BLUE_FLUTE_PRICE
+	compare VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 10
-	subvar VAR_ASH_GATHER_COUNT, 250
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
+Route113_GlassWorkshop_EventScript_YellowFlute:: @ 826EE5A
 	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
-	setvar VAR_0x800A, 500
-	compare VAR_ASH_GATHER_COUNT, 500
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, YELLOW_FLUTE_PRICE
+	compare VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 11
-	subvar VAR_ASH_GATHER_COUNT, 500
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
+Route113_GlassWorkshop_EventScript_RedFlute:: @ 826EE96
 	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
-	setvar VAR_0x800A, 500
-	compare VAR_ASH_GATHER_COUNT, 500
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, RED_FLUTE_PRICE
+	compare VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 12
-	subvar VAR_ASH_GATHER_COUNT, 500
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
+Route113_GlassWorkshop_EventScript_WhiteFlute:: @ 826EED2
 	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
-	setvar VAR_0x800A, 1000
-	compare VAR_ASH_GATHER_COUNT, 1000
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, WHITE_FLUTE_PRICE
+	compare VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 13
-	subvar VAR_ASH_GATHER_COUNT, 1000
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
+Route113_GlassWorkshop_EventScript_BlackFlute:: @ 826EF0E
 	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
-	setvar VAR_0x800A, 1000
-	compare VAR_ASH_GATHER_COUNT, 1000
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, BLACK_FLUTE_PRICE
+	compare VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 14
-	subvar VAR_ASH_GATHER_COUNT, 1000
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
+Route113_GlassWorkshop_EventScript_PrettyChair:: @ 826EF4A
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, VAR_0x8008
-	setvar VAR_0x800A, 6000
-	compare VAR_ASH_GATHER_COUNT, 6000
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, PRETTY_CHAIR_PRICE
+	compare VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 15
-	subvar VAR_ASH_GATHER_COUNT, 6000
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
+Route113_GlassWorkshop_EventScript_PrettyDesk:: @ 826EF8B
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, VAR_0x8008
-	setvar VAR_0x800A, 8000
-	compare VAR_ASH_GATHER_COUNT, 8000
-	goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE
-	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
+	setvar VAR_0x800A, PRETTY_DESK_PRICE
+	compare VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE
+	goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem
+	msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem
 	setvar VAR_GLASS_WORKSHOP_STATE, 16
-	subvar VAR_ASH_GATHER_COUNT, 8000
-	goto Route113_GlassWorkshop_EventScript_26F00F
+	subvar VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE
+	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC
-	msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_CancelGlassItemSelect:: @ 826EFCC
+	msgbox Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6
-	setvar VAR_0x800A, 250
+Route113_GlassWorkshop_EventScript_NotEnoughAsh:: @ 826EFD6
+	setvar VAR_0x800A, LOWEST_ASH_PRICE
 	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 0, VAR_0x800A
-	msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT
+	msgbox Route113_GlassWorkshop_Text_NotEnoughAshNeedX, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE
+Route113_GlassWorkshop_EventScript_NotEnoughAshForItem:: @ 826EFEE
 	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 1, VAR_0x800A
-	message Route113_GlassWorkshop_Text_26F543
+	message Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem
 	waitmessage
-	goto Route113_GlassWorkshop_EventScript_26EDA7
+	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26F003:: @ 826F003
-	message Route113_GlassWorkshop_Text_26F4B5
+Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003
+	message Route113_GlassWorkshop_Text_WhichWouldYouLike
 	waitmessage
-	goto Route113_GlassWorkshop_EventScript_26EDA7
+	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F
-	msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
+	msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
 	playse SE_SELECT
 	delay 30
 	fadescreen 0
-	msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT
+	msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
-	call_if_eq Route113_GlassWorkshop_EventScript_26F047
+	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute
 	compare VAR_0x8009, 1
-	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
+	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26F047:: @ 826F047
+Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047
 	giveitem_std VAR_0x8008
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F072
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute
 	return
 
-Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F
+Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F
 	givedecoration_std VAR_0x8008
-	compare VAR_RESULT, 0
-	goto_if_eq Route113_GlassWorkshop_EventScript_26F081
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor
 	return
 
-Route113_GlassWorkshop_EventScript_26F072:: @ 826F072
+Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072
 	call Common_EventScript_BagIsFull
-	msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT
+	msgbox Route113_GlassWorkshop_Text_NoRoomInBag, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26F081:: @ 826F081
-	call Common_EventScript_NoRoomLeftForAnother
-	msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081
+	call Common_EventScript_NoRoomForDecor
+	msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
+Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom:: @ 826F090
 	switch VAR_GLASS_WORKSHOP_STATE
-	case 10, Route113_GlassWorkshop_EventScript_26F0E3
-	case 11, Route113_GlassWorkshop_EventScript_26F0F7
-	case 12, Route113_GlassWorkshop_EventScript_26F10B
-	case 13, Route113_GlassWorkshop_EventScript_26F11F
-	case 14, Route113_GlassWorkshop_EventScript_26F133
-	case 15, Route113_GlassWorkshop_EventScript_26F147
-	case 16, Route113_GlassWorkshop_EventScript_26F15B
+	case 10, Route113_GlassWorkshop_EventScript_GiveBlueFlute
+	case 11, Route113_GlassWorkshop_EventScript_GiveYellowFlute
+	case 12, Route113_GlassWorkshop_EventScript_GiveRedFlute
+	case 13, Route113_GlassWorkshop_EventScript_GiveWhiteFlute
+	case 14, Route113_GlassWorkshop_EventScript_GiveBlackFlute
+	case 15, Route113_GlassWorkshop_EventScript_GivePrettyChair
+	case 16, Route113_GlassWorkshop_EventScript_GivePrettyDesk
 	end
 
-Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3
+Route113_GlassWorkshop_EventScript_GiveBlueFlute:: @ 826F0E3
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7
+Route113_GlassWorkshop_EventScript_GiveYellowFlute:: @ 826F0F7
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B
+Route113_GlassWorkshop_EventScript_GiveRedFlute:: @ 826F10B
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F
+Route113_GlassWorkshop_EventScript_GiveWhiteFlute:: @ 826F11F
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F133:: @ 826F133
+Route113_GlassWorkshop_EventScript_GiveBlackFlute:: @ 826F133
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F147:: @ 826F147
+Route113_GlassWorkshop_EventScript_GivePrettyChair:: @ 826F147
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, DECOR_PRETTY_CHAIR
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B
+Route113_GlassWorkshop_EventScript_GivePrettyDesk:: @ 826F15B
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, DECOR_PRETTY_DESK
-	goto Route113_GlassWorkshop_EventScript_26F16F
+	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F
-	msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT
+Route113_GlassWorkshop_EventScript_TryGiveItemAgain:: @ 826F16F
+	msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
-	call_if_eq Route113_GlassWorkshop_EventScript_26F047
+	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute
 	compare VAR_0x8009, 1
-	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
+	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_26F194:: @ 826F194
-	msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC
+Route113_GlassWorkshop_EventScript_NinjaBoy:: @ 826F194
+	msgbox Route113_GlassWorkshop_Text_FunToBlowGlassFlute, MSGBOX_NPC
 	end
 
-Route113_GlassWorkshop_Text_26F19D: @ 826F19D
+Route113_GlassWorkshop_Text_GoCollectAshWithThis: @ 826F19D
 	.string "This area is covered in volcanic ash,\n"
 	.string "huff-puff!\p"
 	.string "I'm specially gifted, huff-puff.\p"
@@ -316,7 +325,7 @@ Route113_GlassWorkshop_Text_26F19D: @ 826F19D
 	.string "and make items, huff-puff.\p"
 	.string "Go collect ashes with this, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F252: @ 826F252
+Route113_GlassWorkshop_Text_ExplainSootSack: @ 826F252
 	.string "Just take that SOOT SACK and walk\n"
 	.string "through piles of ash, huff-puff.\p"
 	.string "And it will fill up with the volcanic ash,\n"
@@ -324,11 +333,11 @@ Route113_GlassWorkshop_Text_26F252: @ 826F252
 	.string "Once you think you've collected a good\n"
 	.string "amount, come see me, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F312: @ 826F312
+Route113_GlassWorkshop_Text_LetsSeeCollectedAshes: @ 826F312
 	.string "Have you collected ashes, huff-puff?\n"
 	.string "Let me see, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F34E: @ 826F34E
+Route113_GlassWorkshop_Text_NotEnoughAshNeedX: @ 826F34E
 	.string "Hmmm…\n"
 	.string "There's not enough ash here, huff-puff.\l"
 	.string "I can't make glass with this, huff-puff.\p"
@@ -336,25 +345,25 @@ Route113_GlassWorkshop_Text_26F34E: @ 826F34E
 	.string "you'll need to walk for me to make you\l"
 	.string "a BLUE FLUTE, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F40A: @ 826F40A
+Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike: @ 826F40A
 	.string "Oh!\n"
 	.string "You've got a lot of ashes, huff-puff!\p"
 	.string "I'll make you a glass item, huff-puff!\n"
 	.string "Which one would you like, huff-puff?$"
 
-Route113_GlassWorkshop_Text_26F480: @ 826F480
+Route113_GlassWorkshop_Text_IsThatTheItemForYou: @ 826F480
 	.string "A {STR_VAR_1}, huff-puff?\n"
 	.string "Is that the one for you, huff-puff?$"
 
-Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5
+Route113_GlassWorkshop_Text_WhichWouldYouLike: @ 826F4B5
 	.string "Which one would you like, huff-puff?$"
 
-Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA
+Route113_GlassWorkshop_Text_IllMakeItemForYou: @ 826F4DA
 	.string "A {STR_VAR_1} it is, then, huff-puff!\p"
 	.string "Okay! I'll make it for you, huff-puff.\n"
 	.string "Just wait a little while, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F543: @ 826F543
+Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem: @ 826F543
 	.string "A {STR_VAR_1}, huff-puff?\p"
 	.string "There's not enough ash here to make\n"
 	.string "that, though, huff-puff.\p"
@@ -364,33 +373,33 @@ Route113_GlassWorkshop_Text_26F543: @ 826F543
 	.string "Which item would you rather have me\n"
 	.string "make instead, huff-puff?$"
 
-Route113_GlassWorkshop_Text_26F641: @ 826F641
+Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything: @ 826F641
 	.string "You've collected all that ash, but you\n"
 	.string "don't want anything, huff-puff?$"
 
-Route113_GlassWorkshop_Text_26F688: @ 826F688
+Route113_GlassWorkshop_Text_IveFinishedGlassItem: @ 826F688
 	.string "Ah, I've finished your {STR_VAR_1}.\n"
 	.string "Take it, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7
+Route113_GlassWorkshop_Text_NoRoomInBag: @ 826F6B7
 	.string "Oh?\n"
 	.string "You've no room in your BAG, huff-puff.\p"
 	.string "I'll hold on to it, so come back later,\n"
 	.string "huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F715: @ 826F715
+Route113_GlassWorkshop_Text_NoRoomInPC: @ 826F715
 	.string "Oh?\n"
 	.string "You've no room in your PC, huff-puff?\p"
 	.string "I'll hold on to it, so come back later,\n"
 	.string "huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F772: @ 826F772
+Route113_GlassWorkshop_Text_HaventGotYourSootSack: @ 826F772
 	.string "Hah? You haven't got your SOOT SACK\n"
 	.string "with you, huff-puff.\p"
 	.string "You have to keep it with you to collect\n"
 	.string "volcanic ash, huff-puff.$"
 
-Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC
+Route113_GlassWorkshop_Text_FunToBlowGlassFlute: @ 826F7EC
 	.string "It's fun to blow a glass flute while\n"
 	.string "my boss is talking.\p"
 	.string "Huff-huff! Puff-puff!$"
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 1aee2d422..76a9083f4 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route114_EventScript_1F2640",
+      "script": "Route114_EventScript_Lenny",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F2657",
+      "script": "Route114_EventScript_Lucas",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F266E",
+      "script": "Route114_EventScript_Shane",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F2685",
+      "script": "Route114_EventScript_Nancy",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F269C",
+      "script": "Route114_EventScript_Steve",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F25D1",
+      "script": "Route114_EventScript_RoarGentleman",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2612",
+      "script": "Route114_EventScript_Poochyena",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2582",
+      "script": "Route114_EventScript_Man",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2777",
+      "script": "Route114_EventScript_Nolan",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2760",
+      "script": "Route114_EventScript_Claude",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F26FE",
+      "script": "Route114_EventScript_Bernie",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F27A9",
+      "script": "Route114_EventScript_Ivy",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F278E",
+      "script": "Route114_EventScript_Tyra",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27DB",
+      "script": "Route114_EventScript_Charlotte",
       "flag": "0"
     },
     {
@@ -347,7 +347,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F27C4",
+      "script": "Route114_EventScript_Angelina",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27F2",
+      "script": "Route114_EventScript_Kai",
       "flag": "0"
     }
   ],
@@ -422,7 +422,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2625"
+      "script": "Route114_EventScript_MeteorFallsSign"
     },
     {
       "type": "sign",
@@ -430,7 +430,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F262E"
+      "script": "Route114_EventScript_FossilManiacsHouseSign"
     },
     {
       "type": "secret_base",
@@ -480,7 +480,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2637"
+      "script": "Route114_EventScript_LanettesHouseSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 3434d6753..1873f6f7a 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -1,7 +1,7 @@
 Route114_MapScripts:: @ 81F252F
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578
+	map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame
 	.byte 0
 
 Route114_OnTransition: @ 81F253F
@@ -13,199 +13,199 @@ Route114_OnTransition: @ 81F253F
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route114_MapScript1_1F2561: @ 81F2561
+Route114_OnLoad: @ 81F2561
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
 	end
 
-Route114_MapScript2_1F2578: @ 81F2578
+Route114_OnFrame: @ 81F2578
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route114_EventScript_1F2582:: @ 81F2582
+Route114_EventScript_Man:: @ 81F2582
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7
-	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
-	random 5
-	addvar VAR_RESULT, 15
+	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_ReceivedBerry
+	msgbox Route114_Text_LoveUsingBerryCrushShareBerry, MSGBOX_DEFAULT
+	random NUM_ROUTE_114_MAN_BERRIES
+	addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
-	msgbox Route114_Text_2A7034, MSGBOX_DEFAULT
+	msgbox Route114_Text_TryBerryCrushWithFriends, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25C7:: @ 81F25C7
-	msgbox Route114_Text_2A706E, MSGBOX_DEFAULT
+Route114_EventScript_ReceivedBerry:: @ 81F25C7
+	msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25D1:: @ 81F25D1
+Route114_EventScript_RoarGentleman:: @ 81F25D1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608
-	msgbox Route114_Text_1F2809, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar
+	msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM05
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2608:: @ 81F2608
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+Route114_EventScript_ReceivedRoar:: @ 81F2608
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2612:: @ 81F2612
+Route114_EventScript_Poochyena:: @ 81F2612
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_POOCHYENA, 2
-	msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT
+	msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route114_EventScript_1F2625:: @ 81F2625
-	msgbox Route114_Text_1F28B3, MSGBOX_SIGN
+Route114_EventScript_MeteorFallsSign:: @ 81F2625
+	msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F262E:: @ 81F262E
-	msgbox Route114_Text_1F28DB, MSGBOX_SIGN
+Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E
+	msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2637:: @ 81F2637
-	msgbox Route114_Text_1F2910, MSGBOX_SIGN
+Route114_EventScript_LanettesHouseSign:: @ 81F2637
+	msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2640:: @ 81F2640
-	trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707
-	msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE
+Route114_EventScript_Lenny:: @ 81F2640
+	trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat
+	msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2657:: @ 81F2657
-	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5
-	msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE
+Route114_EventScript_Lucas:: @ 81F2657
+	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat
+	msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F266E:: @ 81F266E
-	trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F
-	msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE
+Route114_EventScript_Shane:: @ 81F266E
+	trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat
+	msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2685:: @ 81F2685
-	trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E
-	msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE
+Route114_EventScript_Nancy:: @ 81F2685
+	trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat
+	msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F269C:: @ 81F269C
-	trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
+Route114_EventScript_Steve:: @ 81F269C
+	trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_EventScript_1F26E7
-	msgbox Route114_Text_29A981, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_EventScript_RematchSteve
+	msgbox Route114_Text_StevePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F26C8:: @ 81F26C8
-	special sub_80B4808
+Route114_EventScript_RegisterSteve:: @ 81F26C8
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT
+	msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_STEVE_1
 	release
 	end
 
-Route114_EventScript_1F26E7:: @ 81F26E7
-	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67
-	msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE
+Route114_EventScript_RematchSteve:: @ 81F26E7
+	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat
+	msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F26FE:: @ 81F26FE
-	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
+Route114_EventScript_Bernie:: @ 81F26FE
+	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_EventScript_1F2749
-	msgbox Route114_Text_29AB36, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_EventScript_RematchBernie
+	msgbox Route114_Text_BerniePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F272A:: @ 81F272A
-	special sub_80B4808
+Route114_EventScript_RegisterBernie:: @ 81F272A
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT
+	msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BERNIE_1
 	release
 	end
 
-Route114_EventScript_1F2749:: @ 81F2749
-	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10
-	msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE
+Route114_EventScript_RematchBernie:: @ 81F2749
+	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat
+	msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2760:: @ 81F2760
-	trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A
-	msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE
+Route114_EventScript_Claude:: @ 81F2760
+	trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat
+	msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2777:: @ 81F2777
-	trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05
-	msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE
+Route114_EventScript_Nolan:: @ 81F2777
+	trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat
+	msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F278E:: @ 81F278E
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
-	msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE
+Route114_EventScript_Tyra:: @ 81F278E
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons
+	msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27A9:: @ 81F27A9
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
-	msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE
+Route114_EventScript_Ivy:: @ 81F27A9
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons
+	msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27C4:: @ 81F27C4
-	trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C
-	msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE
+Route114_EventScript_Angelina:: @ 81F27C4
+	trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat
+	msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27DB:: @ 81F27DB
-	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB
-	msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE
+Route114_EventScript_Charlotte:: @ 81F27DB
+	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat
+	msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27F2:: @ 81F27F2
-	trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089
-	msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE
+Route114_EventScript_Kai:: @ 81F27F2
+	trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat
+	msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_Text_1F2809: @ 81F2809
+Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809
 	.string "All my POKéMON does is ROAR…\n"
 	.string "No one dares to come near me…\p"
 	.string "Sigh… If you would, please take\n"
 	.string "this TM away…$"
 
-Route114_Text_1F2872: @ 81F2872
+Route114_Text_ExplainRoar: @ 81F2872
 	.string "TM05 contains ROAR.\n"
 	.string "A ROAR sends POKéMON scurrying.$"
 
-Route114_Text_1F28A6: @ 81F28A6
+Route114_Text_Poochyena: @ 81F28A6
 	.string "Bow! Bowwow!$"
 
-Route114_Text_1F28B3: @ 81F28B3
+Route114_Text_MeteorFallsSign: @ 81F28B3
 	.string "METEOR FALLS\n"
 	.string "RUSTBORO CITY THROUGH HERE$"
 
-Route114_Text_1F28DB: @ 81F28DB
+Route114_Text_FossilManiacsHouseSign: @ 81F28DB
 	.string "FOSSIL MANIAC'S HOUSE\n"
 	.string "“Fossils gratefully accepted!”$"
 
-Route114_Text_1F2910: @ 81F2910
+Route114_Text_LanettesHouse: @ 81F2910
 	.string "LANETTE'S HOUSE$"
 
diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json
index 0c5c5ea77..7a629f44a 100644
--- a/data/maps/Route114_FossilManiacsHouse/map.json
+++ b/data/maps/Route114_FossilManiacsHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_FossilManiacsHouse_EventScript_22AD3A",
+      "script": "Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route114_FossilManiacsHouse_EventScript_22AD73"
+      "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -67,7 +67,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route114_FossilManiacsHouse_EventScript_22AD73"
+      "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -75,7 +75,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route114_FossilManiacsHouse_EventScript_22AD7C"
+      "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -83,7 +83,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route114_FossilManiacsHouse_EventScript_22AD7C"
+      "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index 83fade3e6..5313f8705 100644
--- a/data/maps/Route114_FossilManiacsHouse/scripts.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
@@ -6,32 +6,32 @@ Route114_FossilManiacsHouse_OnTransition: @ 822AD36
 	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end
 
-Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A
+Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69
-	msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig
+	msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM28
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM28
 	release
 	end
 
-Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69
-	msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT
+Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69
+	msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73
-	msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN
+Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73
+	msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN
 	end
 
-Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C
-	msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN
+Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C
+	msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN
 	end
 
-Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85
+Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85
 	.string "My big brother's the FOSSIL MANIAC…\n"
 	.string "He's a nice guy who loves FOSSILS…\p"
 	.string "He loves digging holes, too…\n"
@@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85
 	.string "You can have this, so you can DIG\n"
 	.string "holes just like my big brother…$"
 
-Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48
+Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48
 	.string "If you make a POKéMON DIG inside a\n"
 	.string "cave, you're returned to the entrance…$"
 
-Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92
+Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92
 	.string "Rocks in peculiar shapes fill\n"
 	.string "the display case…$"
 
-Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2
+Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2
 	.string "THE COMPOSITION OF STRATA…\n"
 	.string "HOW RAIN SHAPES THE LAND…\l"
 	.string "STONES, SOIL, AND ROCK…\p"
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json
index d0992f8fa..da3241ed1 100644
--- a/data/maps/Route114_FossilManiacsTunnel/map.json
+++ b/data/maps/Route114_FossilManiacsTunnel/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_FossilManiacsTunnel_EventScript_22AF87",
+      "script": "Route114_FossilManiacsTunnel_EventScript_FossilManiac",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_FOSSIL_MANIAC_STATE",
       "var_value": "1",
-      "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
+      "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_FOSSIL_MANIAC_STATE",
       "var_value": "1",
-      "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
+      "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 8c5ec779d..3bea9a501 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -1,61 +1,61 @@
 Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49
+	map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad
 	.byte 0
 
 Route114_FossilManiacsTunnel_OnTransition: @ 822AF33
-	call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D
+	call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac
 	end
 
-Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D
+Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D
 	setobjectxyperm 1, 6, 5
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49
-	call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53
+Route114_FossilManiacsTunnel_OnLoad: @ 822AF49
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass
 	end
 
-Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53
+Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53
 	setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
 	setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
 	return
 
-Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66
+Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT
+	msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT
 	setvar VAR_FOSSIL_MANIAC_STATE, 2
 	releaseall
 	end
 
-Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87
+Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6
+	goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil
 	checkitem ITEM_ROOT_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil
 	checkitem ITEM_CLAW_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC
-	msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil
+	msgbox Route114_FossilManiacsTunnel_Text_LookInDesertForFossils, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC
-	msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT
+Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC
+	msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6
-	msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT
+Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6
+	msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0
+Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0
 	.string "I'm the FOSSIL MANIAC…\n"
 	.string "I'm a nice guy who loves FOSSILS…\p"
 	.string "Do you want a FOSSIL?\p"
@@ -66,7 +66,7 @@ Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0
 	.string "are boulders and sand that may hide\l"
 	.string "FOSSILS…$"
 
-Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6
+Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6
 	.string "You found a FOSSIL, didn't you?\n"
 	.string "That's so nice… It's so dreamy…\p"
 	.string "What are you going to do with that\n"
@@ -77,11 +77,11 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6
 	.string "I love my FOSSILS, so I would never\n"
 	.string "do anything like that…$"
 
-Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC
+Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC
 	.string "FOSSILS are so… Wonderful…\n"
 	.string "It's so dreamy…$"
 
-Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7
+Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7
 	.string "Oh…\n"
 	.string "It's not safe that way…\p"
 	.string "I was digging away, you see…\n"
diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json
index b4b1b412b..6709d055e 100644
--- a/data/maps/Route114_LanettesHouse/map.json
+++ b/data/maps/Route114_LanettesHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_LanettesHouse_EventScript_22B2D2",
+      "script": "Route114_LanettesHouse_EventScript_Lanette",
       "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE"
     }
   ],
@@ -52,7 +52,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_LanettesHouse_EventScript_22B309"
+      "script": "Route114_LanettesHouse_EventScript_Notebook"
     },
     {
       "type": "sign",
@@ -60,7 +60,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_LanettesHouse_EventScript_22B345"
+      "script": "Route114_LanettesHouse_EventScript_PC"
     },
     {
       "type": "sign",
@@ -68,7 +68,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_LanettesHouse_EventScript_22B345"
+      "script": "Route114_LanettesHouse_EventScript_PC"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 85b22724b..b772228e4 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -6,49 +6,49 @@ Route114_LanettesHouse_OnTransition: @ 822B2CE
 	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end
 
-Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2
+Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF
+	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice
 	setflag FLAG_SYS_PC_LANETTE
-	msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT
+	msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT
 	givedecoration_std DECOR_LOTAD_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq Route114_LanettesHouse_EventScript_272067
+	compare VAR_RESULT, FALSE
+	goto_if_eq Common_EventScript_ShowNoRoomForDecor
 	setflag FLAG_RECEIVED_DOLL_LANETTE
 	release
 	end
 
-Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF
-	msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT
+Route114_LanettesHouse_EventScript_OfferAdvice:: @ 822B2FF
+	msgbox Route114_LanettesHouse_Text_OrganizeYourBoxes, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_LanettesHouse_EventScript_22B309:: @ 822B309
+Route114_LanettesHouse_EventScript_Notebook:: @ 822B309
 	lockall
-	msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_LanettesHouse_EventScript_22B327
-	msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT
+	msgbox Route114_LanettesHouse_Text_ResearchNotesPage1, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route114_LanettesHouse_EventScript_NotebookPage2
+	msgbox Route114_LanettesHouse_Text_ClosedTheNotebook, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route114_LanettesHouse_EventScript_22B327:: @ 822B327
-	msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq Route114_LanettesHouse_EventScript_22B33C
+Route114_LanettesHouse_EventScript_NotebookPage2:: @ 822B327
+	msgbox Route114_LanettesHouse_Text_ResearchNotesPage2, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq Route114_LanettesHouse_EventScript_NotebookPage3
 	releaseall
 	end
 
-Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C
-	msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT
+Route114_LanettesHouse_EventScript_NotebookPage3:: @ 822B33C
+	msgbox Route114_LanettesHouse_Text_ResearchNotesPage3, MSGBOX_DEFAULT
 	return
 
-Route114_LanettesHouse_EventScript_22B345:: @ 822B345
-	msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN
+Route114_LanettesHouse_EventScript_PC:: @ 822B345
+	msgbox Route114_LanettesHouse_Text_EmailFromBill, MSGBOX_SIGN
 	end
 
-Route114_LanettesHouse_Text_22B34E: @ 822B34E
+Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E
 	.string "LANETTE: Oh! {PLAYER}{KUN}!\p"
 	.string "I'm sorry everything is so cluttered…\n"
 	.string "When I get engrossed in research,\l"
@@ -56,13 +56,13 @@ Route114_LanettesHouse_Text_22B34E: @ 822B34E
 	.string "This is embarrassing… Please keep\n"
 	.string "this a secret in exchange for this.$"
 
-Route114_LanettesHouse_Text_22B407: @ 822B407
+Route114_LanettesHouse_Text_OrganizeYourBoxes: @ 822B407
 	.string "May I offer advice about my POKéMON\n"
 	.string "Storage System?\p"
 	.string "You should organize your BOXES so you\n"
 	.string "can tell which POKéMON are in them.$"
 
-Route114_LanettesHouse_Text_22B485: @ 822B485
+Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485
 	.string "It's LANETTE's research notes.\n"
 	.string "There's information about BOXES.\p"
 	.string "Design BOXES to hold 30 POKéMON each.\p"
@@ -70,7 +70,7 @@ Route114_LanettesHouse_Text_22B485: @ 822B485
 	.string "420 POKéMON on the PC system.\p"
 	.string "Keep reading?$"
 
-Route114_LanettesHouse_Text_22B53C: @ 822B53C
+Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C
 	.string "A marking system should be added to\n"
 	.string "make POKéMON easier to organize.\p"
 	.string "The name and wallpaper design of each\n"
@@ -78,7 +78,7 @@ Route114_LanettesHouse_Text_22B53C: @ 822B53C
 	.string "the stored POKéMON.\p"
 	.string "Keep reading?$"
 
-Route114_LanettesHouse_Text_22B5EF: @ 822B5EF
+Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF
 	.string "When storing a POKéMON, it should be\n"
 	.string "sent to the BOX inspected last.\p"
 	.string "If that BOX is full, the received\n"
@@ -87,10 +87,10 @@ Route114_LanettesHouse_Text_22B5EF: @ 822B5EF
 	.string "it is automatically selected as the BOX\l"
 	.string "to which POKéMON are sent.$"
 
-Route114_LanettesHouse_Text_22B6E4: @ 822B6E4
+Route114_LanettesHouse_Text_ClosedTheNotebook: @ 822B6E4
 	.string "{PLAYER} closed the notebook.$"
 
-Route114_LanettesHouse_Text_22B6FC: @ 822B6FC
+Route114_LanettesHouse_Text_EmailFromBill: @ 822B6FC
 	.string "There's an e-mail from someone on\n"
 	.string "the PC.\p"
 	.string "“… … … … … … …\p"
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 53ce80ce7..c9f1d8833 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_1F2973",
+      "script": "Route115_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route115_EventScript_1F298E",
+      "script": "Route115_EventScript_Timothy",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2A07",
+      "script": "Route115_EventScript_Nob",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2A69",
+      "script": "Route115_EventScript_Cyndy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F29F0",
+      "script": "Route115_EventScript_Koichi",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2ACB",
+      "script": "Route115_EventScript_Hector",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F2AE2",
+      "script": "Route115_EventScript_Kyra",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2AF9",
+      "script": "Route115_EventScript_Jaiden",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B27",
+      "script": "Route115_EventScript_Helene",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B10",
+      "script": "Route115_EventScript_Alix",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B3E",
+      "script": "Route115_EventScript_Marlene",
       "flag": "0"
     },
     {
@@ -370,7 +370,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F297C"
+      "script": "Route115_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -378,7 +378,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F2985"
+      "script": "Route115_EventScript_MeteorFallsSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 79d2caedc..74d0c6519 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -1,10 +1,10 @@
 Route115_MapScripts:: @ 81F2920
-	map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930
+	map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame
 	.byte 0
 
-Route115_MapScript1_1F2930: @ 81F2930
+Route115_OnLoad: @ 81F2930
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
@@ -20,134 +20,134 @@ Route115_OnTransition: @ 81F2947
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route115_MapScript2_1F2969: @ 81F2969
+Route115_OnFrame: @ 81F2969
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route115_EventScript_1F2973:: @ 81F2973
-	msgbox Route115_Text_1F2B55, MSGBOX_NPC
+Route115_EventScript_Woman:: @ 81F2973
+	msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC
 	end
 
-Route115_EventScript_1F297C:: @ 81F297C
-	msgbox Route115_Text_1F2BC9, MSGBOX_SIGN
+Route115_EventScript_RouteSignRustboro:: @ 81F297C
+	msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F2985:: @ 81F2985
-	msgbox Route115_Text_1F2BE3, MSGBOX_SIGN
+Route115_EventScript_MeteorFallsSign:: @ 81F2985
+	msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F298E:: @ 81F298E
-	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+Route115_EventScript_Timothy:: @ 81F298E
+	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F29D9
-	msgbox Route115_Text_29B258, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchTimothy
+	msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F29BA:: @ 81F29BA
-	special sub_80B4808
+Route115_EventScript_RegisterTimothy:: @ 81F29BA
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT
+	msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TIMOTHY_1
 	release
 	end
 
-Route115_EventScript_1F29D9:: @ 81F29D9
-	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
-	msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchTimothy:: @ 81F29D9
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat
+	msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F29F0:: @ 81F29F0
-	trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
-	msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
+Route115_EventScript_Koichi:: @ 81F29F0
+	trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat
+	msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A07:: @ 81F2A07
-	trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+Route115_EventScript_Nob:: @ 81F2A07
+	trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F2A52
-	msgbox Route115_Text_29B49D, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchNob
+	msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A33:: @ 81F2A33
-	special sub_80B4808
+Route115_EventScript_RegisterNob:: @ 81F2A33
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B50B, MSGBOX_DEFAULT
+	msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_NOB_1
 	release
 	end
 
-Route115_EventScript_1F2A52:: @ 81F2A52
-	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
-	msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchNob:: @ 81F2A52
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat
+	msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A69:: @ 81F2A69
-	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+Route115_EventScript_Cyndy:: @ 81F2A69
+	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F2AB4
-	msgbox Route115_Text_29B647, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchCyndy
+	msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A95:: @ 81F2A95
-	special sub_80B4808
+Route115_EventScript_RegisterCyndy:: @ 81F2A95
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT
+	msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CYNDY_1
 	release
 	end
 
-Route115_EventScript_1F2AB4:: @ 81F2AB4
-	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
-	msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchCyndy:: @ 81F2AB4
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat
+	msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2ACB:: @ 81F2ACB
-	trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
-	msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
+Route115_EventScript_Hector:: @ 81F2ACB
+	trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat
+	msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AE2:: @ 81F2AE2
-	trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
-	msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
+Route115_EventScript_Kyra:: @ 81F2AE2
+	trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat
+	msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AF9:: @ 81F2AF9
-	trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
-	msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
+Route115_EventScript_Jaiden:: @ 81F2AF9
+	trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat
+	msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B10:: @ 81F2B10
-	trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
-	msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
+Route115_EventScript_Alix:: @ 81F2B10
+	trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat
+	msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B27:: @ 81F2B27
-	trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
-	msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
+Route115_EventScript_Helene:: @ 81F2B27
+	trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat
+	msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B3E:: @ 81F2B3E
-	trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
-	msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
+Route115_EventScript_Marlene:: @ 81F2B3E
+	trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat
+	msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_Text_1F2B55: @ 81F2B55
+Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55
 	.string "Exploring a cave isn't like walking\n"
 	.string "on a road.\p"
 	.string "You never know when wild POKéMON will\n"
 	.string "appear. It's full of suspense.$"
 
-Route115_Text_1F2BC9: @ 81F2BC9
+Route115_Text_RouteSignRustboro: @ 81F2BC9
 	.string "ROUTE 115\n"
 	.string "{DOWN_ARROW} RUSTBORO CITY$"
 
-Route115_Text_1F2BE3: @ 81F2BE3
+Route115_Text_MeteorFallsSign: @ 81F2BE3
 	.string "METEOR FALLS\n"
 	.string "FALLARBOR TOWN THROUGH HERE$"
 
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 8a369e407..366fe1ed5 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2E89",
+      "script": "Route116_EventScript_Joey",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2EA0",
+      "script": "Route116_EventScript_Jose",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2D84",
+      "script": "Route116_EventScript_Briney",
       "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F65",
+      "script": "Route116_EventScript_Clark",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2F7C",
+      "script": "Route116_EventScript_Janice",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F93",
+      "script": "Route116_EventScript_Karen",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route116_EventScript_1F2EB7",
+      "script": "Route116_EventScript_Jerry",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2CA2",
+      "script": "Route116_EventScript_DevonEmployee",
       "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE"
     },
     {
@@ -295,8 +295,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2C70",
-      "flag": "FLAG_HIDE_ROUTE_116_TUNNELER"
+      "script": "Route116_EventScript_WandasBoyfriend",
+      "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_MANIAC",
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2DB6",
+      "script": "Route116_EventScript_GlassesMan",
       "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route116_EventScript_1F3041",
+      "script": "Route116_EventScript_Sarah",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F3058",
+      "script": "Route116_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F3086",
+      "script": "Route116_EventScript_Johnson",
       "flag": "0"
     },
     {
@@ -386,7 +386,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F306F",
+      "script": "Route116_EventScript_Devan",
       "flag": "0"
     }
   ],
@@ -435,7 +435,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE116_STATE",
       "var_value": "1",
-      "script": "Route116_EventScript_1F2D95"
+      "script": "Route116_EventScript_BrineyTrigger"
     }
   ],
   "bg_events": [
@@ -445,7 +445,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D57"
+      "script": "Route116_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -453,7 +453,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D60"
+      "script": "Route116_EventScript_RusturfTunnelSign"
     },
     {
       "type": "sign",
@@ -461,7 +461,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D69"
+      "script": "Route116_EventScript_TunnelersRestHouseSign"
     },
     {
       "type": "secret_base",
@@ -483,7 +483,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D72"
+      "script": "Route116_EventScript_TrainerTipsBToStopEvolution"
     },
     {
       "type": "sign",
@@ -491,7 +491,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D7B"
+      "script": "Route116_EventScript_TrainerTipsBagHasPockets"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index cef5051e0..1b69b312a 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,11 +1,11 @@
 Route116_MapScripts:: @ 81F2C0C
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
+	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
 Route116_OnTransition: @ 81F2C1C
-	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
@@ -14,90 +14,90 @@ Route116_OnTransition: @ 81F2C1C
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_1F2C47:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
 	setobjectxyperm 21, 38, 10
 	return
 
-Route116_MapScript1_1F2C4F: @ 81F2C4F
+Route116_OnLoad: @ 81F2C4F
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_MapScript2_1F2C66: @ 81F2C66
+Route116_OnFrame: @ 81F2C66
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_1F2C70:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	lock
 	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98
-	msgbox Route116_Text_1F3140, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel
+	msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C8E:: @ 81F2C8E
-	msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
+	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C98:: @ 81F2C98
-	msgbox Route116_Text_1F3166, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
+	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2CA2:: @ 81F2CA2
+Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B
-	msgbox Route116_Text_1F3317, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
+	msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2CBB:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem_std ITEM_REPEAT_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2D39
-	msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_NoRoomForRepeatBall
+	msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2D20
+	call_if_eq Route116_EventScript_DevonEmployeeExitEast
 	removeobject VAR_LAST_TALKED
 	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
-Route116_EventScript_1F2D15:: @ 81F2D15
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
+Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D20:: @ 81F2D20
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
+Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D2B:: @ 81F2D2B
-	msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
+	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2D39:: @ 81F2D39
-	msgbox Route116_Text_1F3593, MSGBOX_DEFAULT
+Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
+	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_1F2D43: @ 81F2D43
+Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	walk_left
 	walk_left
@@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_1F2D4C: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_down
 	walk_left
 	walk_left
@@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_1F2D57:: @ 81F2D57
-	msgbox Route116_Text_1F379D, MSGBOX_SIGN
+Route116_EventScript_RouteSignRustboro:: @ 81F2D57
+	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D60:: @ 81F2D60
-	msgbox Route116_Text_1F37B7, MSGBOX_SIGN
+Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
+	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D69:: @ 81F2D69
-	msgbox Route116_Text_1F380F, MSGBOX_SIGN
+Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
+	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D72:: @ 81F2D72
-	msgbox Route116_Text_1F3825, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
+	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D7B:: @ 81F2D7B
-	msgbox Route116_Text_1F38D4, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
+	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D84:: @ 81F2D84
+Route116_EventScript_Briney:: @ 81F2D84
 	lock
 	faceplayer
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
-Route116_EventScript_1F2D95:: @ 81F2D95
+Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	lockall
 	applymovement 11, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
 
-Route116_EventScript_1F2DB6:: @ 81F2DB6
+Route116_EventScript_GlassesMan:: @ 81F2DB6
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DF1
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_PlayerHasGlasses
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DE2
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2DE2:: @ 81F2DE2
-	msgbox Route116_Text_1F3718, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
+	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2DF1:: @ 81F2DF1
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
-	msgbox Route116_Text_1F3688, MSGBOX_DEFAULT
+Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
+	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2E1B
-	msgbox Route116_Text_1F375E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesOnPlayer
+	msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2E1B:: @ 81F2E1B
-	msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
+	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2E2A:: @ 81F2E2A
+Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	delay 20
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2E69
+	call_if_eq Route116_EventScript_GlassesManExitEast
 	removeobject VAR_LAST_TALKED
 	release
 	end
 
-Route116_EventScript_1F2E5E:: @ 81F2E5E
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
+Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2E69:: @ 81F2E69
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
+Route116_EventScript_GlassesManExitEast:: @ 81F2E69
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_1F2E74: @ 81F2E74
+Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_1F2E7E: @ 81F2E7E
+Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_up
 	walk_left
 	walk_left
@@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_1F2E89:: @ 81F2E89
-	trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
-	msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
+Route116_EventScript_Joey:: @ 81F2E89
+	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
+	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EA0:: @ 81F2EA0
-	trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
-	msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
+Route116_EventScript_Jose:: @ 81F2EA0
+	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
+	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EB7:: @ 81F2EB7
-	trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+Route116_EventScript_Jerry:: @ 81F2EB7
+	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2F4E
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchJerry
 	setvar VAR_0x8004, TRAINER_JERRY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2F22
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2EF8:: @ 81F2EF8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03
+Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2F03:: @ 81F2F03
-	special sub_80B4808
+Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29BE71, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F22:: @ 81F2F22
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterJerry:: @ 81F2F22
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2F35:: @ 81F2F35
-	msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT
+Route116_EventScript_RegisterJerry:: @ 81F2F35
+	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F4E:: @ 81F2F4E
-	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
-	msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchJerry:: @ 81F2F4E
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
+	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F65:: @ 81F2F65
-	trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
-	msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
+Route116_EventScript_Clark:: @ 81F2F65
+	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
+	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F7C:: @ 81F2F7C
-	trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
-	msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
+Route116_EventScript_Janice:: @ 81F2F7C
+	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
+	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F93:: @ 81F2F93
-	trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+Route116_EventScript_Karen:: @ 81F2F93
+	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F302A
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchKaren
 	setvar VAR_0x8004, TRAINER_KAREN_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2FFE
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2FD4:: @ 81F2FD4
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF
+Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2FDF:: @ 81F2FDF
-	special sub_80B4808
+Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29C096, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F2FFE:: @ 81F2FFE
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F3011:: @ 81F3011
-	msgbox Route116_Text_29C052, MSGBOX_DEFAULT
+Route116_EventScript_RegisterKaren:: @ 81F3011
+	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F302A:: @ 81F302A
-	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
-	msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchKaren:: @ 81F302A
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
+	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3041:: @ 81F3041
-	trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
-	msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
+Route116_EventScript_Sarah:: @ 81F3041
+	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
+	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3058:: @ 81F3058
-	trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
-	msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
+Route116_EventScript_Dawson:: @ 81F3058
+	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
+	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F306F:: @ 81F306F
-	trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
-	msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
+Route116_EventScript_Devan:: @ 81F306F
+	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
+	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3086:: @ 81F3086
-	trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
-	msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
+Route116_EventScript_Johnson:: @ 81F3086
+	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
+	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_1F309D: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_1F3140: @ 81F3140
+Route116_Text_WantToDigTunnel: @ 81F3140
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_1F3166: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_1F32C1: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_1F3317: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_1F3521: @ 81F3521
+Route116_Text_NewBallAvailableAtMart: @ 81F3521
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_1F3593: @ 81F3593
+Route116_Text_BagIsJamPacked: @ 81F3593
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_1F35CE: @ 81F35CE
+Route116_Text_TokenOfAppreciation: @ 81F35CE
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_1F3657: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_1F3688: @ 81F3688
+Route116_Text_MayISeeThoseGlasses: @ 81F3688
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_1F36B4: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_1F3718: @ 81F3718
+Route116_Text_CantFindGlassesNotHere: @ 81F3718
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_1F375E: @ 81F375E
+Route116_Text_NotWhatImLookingFor: @ 81F375E
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_1F379D: @ 81F379D
+Route116_Text_RouteSignRustboro: @ 81F379D
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_1F37B7: @ 81F37B7
+Route116_Text_RusturfTunnelSign: @ 81F37B7
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_1F380F: @ 81F380F
+Route116_Text_TunnelersRestHouse: @ 81F380F
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_1F3825: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_1F38D4: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"
diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json
index f9dfb484c..470ccadfe 100644
--- a/data/maps/Route116_TunnelersRestHouse/map.json
+++ b/data/maps/Route116_TunnelersRestHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_TunnelersRestHouse_EventScript_22B85A",
+      "script": "Route116_TunnelersRestHouse_EventScript_Tunneler1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_TunnelersRestHouse_EventScript_22B86C",
+      "script": "Route116_TunnelersRestHouse_EventScript_Tunneler3",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_TunnelersRestHouse_EventScript_22B863",
+      "script": "Route116_TunnelersRestHouse_EventScript_Tunneler2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index e4e943e61..42a80fc78 100644
--- a/data/maps/Route116_TunnelersRestHouse/scripts.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
@@ -6,28 +6,28 @@ Route116_TunnelersRestHouse_OnTransition: @ 822B856
 	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end
 
-Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A
-	msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC
+Route116_TunnelersRestHouse_EventScript_Tunneler1:: @ 822B85A
+	msgbox Route116_TunnelersRestHouse_Text_WeHadToStopBoring, MSGBOX_NPC
 	end
 
-Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863
-	msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC
+Route116_TunnelersRestHouse_EventScript_Tunneler2:: @ 822B863
+	msgbox Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf, MSGBOX_NPC
 	end
 
-Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C
+Route116_TunnelersRestHouse_EventScript_Tunneler3:: @ 822B86C
 	lock
 	faceplayer
-	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_22B881
-	msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_TunnelOpened
+	msgbox Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881
-	msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT
+Route116_TunnelersRestHouse_EventScript_TunnelOpened:: @ 822B881
+	msgbox Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B
+Route116_TunnelersRestHouse_Text_WeHadToStopBoring: @ 822B88B
 	.string "That RUSTURF TUNNEL there…\p"
 	.string "At first, we had a huge work crew boring\n"
 	.string "through rock with the latest machinery.\l"
@@ -38,7 +38,7 @@ Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B
 	.string "So, we've got nothing to do but loll\n"
 	.string "around here doing nothing.$"
 
-Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F
+Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf: @ 822B99F
 	.string "There's a man digging his way to\n"
 	.string "VERDANTURF all by his lonesome.\l"
 	.string "He's desperate to get through.\p"
@@ -48,13 +48,13 @@ Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F
 	.string "harming the natural environment.\p"
 	.string "I wonder if he made it through yet.$"
 
-Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF
+Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel: @ 822BAAF
 	.string "To get to VERDANTURF without using\n"
 	.string "this TUNNEL, you'd have to cross the\l"
 	.string "sea to DEWFORD, sail on to SLATEPORT,\l"
 	.string "then travel through MAUVILLE.$"
 
-Route116_TunnelersRestHouse_Text_22BB3B: @ 822BB3B
+Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough: @ 822BB3B
 	.string "Did you hear? The TUNNEL to VERDANTURF\n"
 	.string "has gone through!\p"
 	.string "Sometimes, if you hope strongly enough,\n"
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 12420784c..4bb513cdf 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F399A",
+      "script": "Route117_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39A3",
+      "script": "Route117_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3A94",
+      "script": "Route117_EventScript_Dylan",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route117_EventScript_1F3A32",
+      "script": "Route117_EventScript_Lydia",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F39D0",
+      "script": "Route117_EventScript_Isaac",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route117_EventScript_1F3AF6",
+      "script": "Route117_EventScript_Maria",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3B58",
+      "script": "Route117_EventScript_Derek",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3BD3",
+      "script": "Route117_EventScript_Meg",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3B6F",
+      "script": "Route117_EventScript_Anna",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39AC",
+      "script": "Route117_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C4E",
+      "script": "Route117_EventScript_Brandi",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C65",
+      "script": "Route117_EventScript_Aisha",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C37",
+      "script": "Route117_EventScript_Melina",
       "flag": "0"
     }
   ],
@@ -355,7 +355,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39B5"
+      "script": "Route117_EventScript_RouteSignVerdanturf"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39BE"
+      "script": "Route117_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39C7"
+      "script": "Route117_EventScript_DayCareSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 5435595ee..47d8eced9 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -3,211 +3,210 @@ Route117_MapScripts:: @ 81F397D
 	.byte 0
 
 Route117_OnTransition: @ 81F3983
-	call Route117_EventScript_1F3989
+	call Route117_EventScript_TryMoveDayCareMan
 	end
 
-Route117_EventScript_1F3989:: @ 81F3989
-	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999
+Route117_EventScript_TryMoveDayCareMan:: @ 81F3989
+	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan
 	setobjectxyperm 3, 47, 6
-
-Route117_EventScript_1F3999:: @ 81F3999
+Route117_EventScript_StopMoveDayCareMan:: @ 81F3999
 	return
 
-Route117_EventScript_1F399A:: @ 81F399A
-	msgbox Route117_Text_1F3CFD, MSGBOX_NPC
+Route117_EventScript_Woman:: @ 81F399A
+	msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39A3:: @ 81F39A3
-	msgbox Route117_Text_1F3D41, MSGBOX_NPC
+Route117_EventScript_LittleBoy:: @ 81F39A3
+	msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39AC:: @ 81F39AC
-	msgbox Route117_Text_1F3C7C, MSGBOX_NPC
+Route117_EventScript_Girl:: @ 81F39AC
+	msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39B5:: @ 81F39B5
-	msgbox Route117_Text_1F3D58, MSGBOX_SIGN
+Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5
+	msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39BE:: @ 81F39BE
-	msgbox Route117_Text_1F3D74, MSGBOX_SIGN
+Route117_EventScript_RouteSignMauville:: @ 81F39BE
+	msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39C7:: @ 81F39C7
-	msgbox Route117_Text_1F3D8E, MSGBOX_SIGN
+Route117_EventScript_DayCareSign:: @ 81F39C7
+	msgbox Route117_Text_DayCareSign, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39D0:: @ 81F39D0
-	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
+Route117_EventScript_Isaac:: @ 81F39D0
+	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3A1B
-	msgbox Route117_Text_29C498, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchIsaac
+	msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F39FC:: @ 81F39FC
-	special sub_80B4808
+Route117_EventScript_RegisterIsaac:: @ 81F39FC
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C508, MSGBOX_DEFAULT
+	msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISAAC_1
 	release
 	end
 
-Route117_EventScript_1F3A1B:: @ 81F3A1B
-	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B
-	msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchIsaac:: @ 81F3A1B
+	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat
+	msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A32:: @ 81F3A32
-	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
+Route117_EventScript_Lydia:: @ 81F3A32
+	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3A7D
-	msgbox Route117_Text_29C679, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchLydia
+	msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3A5E:: @ 81F3A5E
-	special sub_80B4808
+Route117_EventScript_RegisterLydia:: @ 81F3A5E
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT
+	msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LYDIA_1
 	release
 	end
 
-Route117_EventScript_1F3A7D:: @ 81F3A7D
-	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E
-	msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchLydia:: @ 81F3A7D
+	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat
+	msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A94:: @ 81F3A94
-	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
+Route117_EventScript_Dylan:: @ 81F3A94
+	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3ADF
-	msgbox Route117_Text_29C800, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchDylan
+	msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3AC0:: @ 81F3AC0
-	special sub_80B4808
+Route117_EventScript_RegisterDylan:: @ 81F3AC0
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C846, MSGBOX_DEFAULT
+	msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DYLAN_1
 	release
 	end
 
-Route117_EventScript_1F3ADF:: @ 81F3ADF
-	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3
-	msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchDylan:: @ 81F3ADF
+	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat
+	msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3AF6:: @ 81F3AF6
-	trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
+Route117_EventScript_Maria:: @ 81F3AF6
+	trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3B41
-	msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchMaria
+	msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B22:: @ 81F3B22
-	special sub_80B4808
+Route117_EventScript_RegisterMaria:: @ 81F3B22
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29CA32, MSGBOX_DEFAULT
+	msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MARIA_1
 	release
 	end
 
-Route117_EventScript_1F3B41:: @ 81F3B41
-	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC
-	msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchMaria:: @ 81F3B41
+	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat
+	msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B58:: @ 81F3B58
-	trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87
-	msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE
+Route117_EventScript_Derek:: @ 81F3B58
+	trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat
+	msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B6F:: @ 81F3B6F
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
+Route117_EventScript_Anna:: @ 81F3B6F
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3BB8
-	msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchAnna
+	msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B9F:: @ 81F3B9F
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+Route117_EventScript_RegisterAnna:: @ 81F3B9F
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3BB8:: @ 81F3BB8
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E
-	msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchAnna:: @ 81F3BB8
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons
+	msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3BD3:: @ 81F3BD3
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
+Route117_EventScript_Meg:: @ 81F3BD3
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3C1C
-	msgbox Route117_Text_29CE17, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchMeg
+	msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3C03:: @ 81F3C03
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+Route117_EventScript_RegisterMeg:: @ 81F3C03
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3C1C:: @ 81F3C1C
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053
-	msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchMeg:: @ 81F3C1C
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons
+	msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C37:: @ 81F3C37
-	trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1
-	msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE
+Route117_EventScript_Melina:: @ 81F3C37
+	trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat
+	msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C4E:: @ 81F3C4E
-	trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189
-	msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE
+Route117_EventScript_Brandi:: @ 81F3C4E
+	trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat
+	msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C65:: @ 81F3C65
-	trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206
-	msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE
+Route117_EventScript_Aisha:: @ 81F3C65
+	trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat
+	msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_Text_1F3C7C: @ 81F3C7C
+Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C
 	.string "I left my POKéMON at the DAY CARE.\p"
 	.string "When I got it back, it had a new move\n"
 	.string "that I didn't teach it.\l"
 	.string "I was really, really surprised.$"
 
-Route117_Text_1F3CFD: @ 81F3CFD
+Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD
 	.string "What do you think?\n"
 	.string "Aren't these flowers pretty?\p"
 	.string "I planted them all!$"
 
-Route117_Text_1F3D41: @ 81F3D41
+Route117_Text_AirIsTastyHere: @ 81F3D41
 	.string "The air is tasty here!$"
 
-Route117_Text_1F3D58: @ 81F3D58
+Route117_Text_RouteSignVerdanturf: @ 81F3D58
 	.string "ROUTE 117\n"
 	.string "{LEFT_ARROW} VERDANTURF TOWN$"
 
-Route117_Text_1F3D74: @ 81F3D74
+Route117_Text_RouteSignMauville: @ 81F3D74
 	.string "ROUTE 117\n"
 	.string "{RIGHT_ARROW} MAUVILLE CITY$"
 
-Route117_Text_1F3D8E: @ 81F3D8E
+Route117_Text_DayCareSign: @ 81F3D8E
 	.string "POKéMON DAY CARE\n"
 	.string "“Let us raise your POKéMON.”$"
 
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index e7737bf1e..d64adbb86 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4079",
+      "script": "Route118_EventScript_Perry",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CE16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle2",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CE36",
+      "script": "GabbyAndTy_EventScript_TyBattle2",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E73",
+      "script": "Route118_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CED6",
+      "script": "GabbyAndTy_EventScript_GabbyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CEF6",
+      "script": "GabbyAndTy_EventScript_TyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E14",
+      "script": "Route118_EventScript_GoodRodFisherman",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F3F87",
+      "script": "Route118_EventScript_Rose",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F4000",
+      "script": "Route118_EventScript_Wade",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4090",
+      "script": "Route118_EventScript_Chester",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route118_EventScript_1F3FE9",
+      "script": "Route118_EventScript_Barny",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4017",
+      "script": "Route118_EventScript_Dalton",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F40A7",
+      "script": "Route118_EventScript_Deandre",
       "flag": "0"
     }
   ],
@@ -328,7 +328,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3E8E"
+      "script": "Route118_EventScript_StevenTrigger0"
     },
     {
       "type": "trigger",
@@ -337,7 +337,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EAE"
+      "script": "Route118_EventScript_StevenTrigger1"
     },
     {
       "type": "trigger",
@@ -346,7 +346,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EC4"
+      "script": "Route118_EventScript_StevenTrigger2"
     }
   ],
   "bg_events": [
@@ -363,7 +363,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E7C"
+      "script": "Route118_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E85"
+      "script": "Route118_EventScript_RouteSign119"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 661bd938c..7b2326b13 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,11 +1,11 @@
 Route118_MapScripts:: @ 81F3DBC
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A
+	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
 Route118_OnTransition: @ 81F3DCC
-	call Route118_EventScript_28CCC7
+	call GabbyAndTy_EventScript_UpdateLocation
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
@@ -14,142 +14,142 @@ Route118_OnTransition: @ 81F3DCC
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route118_MapScript1_1F3DF3: @ 81F3DF3
+Route118_OnLoad: @ 81F3DF3
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_MapScript2_1F3E0A: @ 81F3E0A
+Route118_OnFrame: @ 81F3E0A
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_1F3E14:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69
-	msgbox Route118_Text_1F427B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F3E3E
-	compare VAR_RESULT, 0
-	goto_if_eq Route118_EventScript_1F3E5F
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
+	msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route118_EventScript_ReceiveGoodRod
+	compare VAR_RESULT, NO
+	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_1F3E3E:: @ 81F3E3E
-	msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT
+Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
+	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT
+	msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E5F:: @ 81F3E5F
-	msgbox Route118_Text_1F4319, MSGBOX_DEFAULT
+Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
+	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E69:: @ 81F3E69
-	msgbox Route118_Text_1F4331, MSGBOX_DEFAULT
+Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
+	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E73:: @ 81F3E73
-	msgbox Route118_Text_1F4367, MSGBOX_NPC
+Route118_EventScript_Girl:: @ 81F3E73
+	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_1F3E7C:: @ 81F3E7C
-	msgbox Route118_Text_1F43F4, MSGBOX_SIGN
+Route118_EventScript_RouteSignMauville:: @ 81F3E7C
+	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E85:: @ 81F3E85
-	msgbox Route118_Text_1F440E, MSGBOX_SIGN
+Route118_EventScript_RouteSign119:: @ 81F3E85
+	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E8E:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F61
+	applymovement 19, Route118_Movement_StevenApproachLedge0
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EAE:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EC4:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F63
+	applymovement 19, Route118_Movement_StevenApproachLedge2
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EE4:: @ 81F3EE4
+Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	playse SE_DANSA
-	applymovement 19, Route118_Movement_1F3F65
+	applymovement 19, Route118_Movement_StevenJumpLedge
 	waitmovement 0
 	delay 30
-	msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT
+	msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq Route118_EventScript_1F3F28
+	call_if_eq Route118_EventScript_StevenExit0
 	compare VAR_0x8008, 1
-	call_if_eq Route118_EventScript_1F3F3A
+	call_if_eq Route118_EventScript_StevenExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route118_EventScript_1F3F4C
+	call_if_eq Route118_EventScript_StevenExit2
 	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
 	end
 
-Route118_EventScript_1F3F28:: @ 81F3F28
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F69
+Route118_EventScript_StevenExit0:: @ 81F3F28
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F3A:: @ 81F3F3A
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F74
+Route118_EventScript_StevenExit1:: @ 81F3F3A
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F4C:: @ 81F3F4C
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F7E
+Route118_EventScript_StevenExit2:: @ 81F3F4C
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_1F3F5E: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_1F3F61: @ 81F3F61
+Route118_Movement_StevenApproachLedge0: @ 81F3F61
 	walk_left
 	step_end
 
-Route118_Movement_1F3F63: @ 81F3F63
+Route118_Movement_StevenApproachLedge2: @ 81F3F63
 	walk_right
 	step_end
 
-Route118_Movement_1F3F65: @ 81F3F65
+Route118_Movement_StevenJumpLedge: @ 81F3F65
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_1F3F69: @ 81F3F69
+Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_1F3F74: @ 81F3F74
+Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	walk_right
 	walk_right
@@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_1F3F7E: @ 81F3F7E
+Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	walk_right
 	walk_right
@@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_1F3F87:: @ 81F3F87
-	trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+Route118_EventScript_Rose:: @ 81F3F87
+	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F3FD2
-	msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchRose
+	msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3FB3:: @ 81F3FB3
-	special sub_80B4808
+Route118_EventScript_RegisterRose:: @ 81F3FB3
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D343, MSGBOX_DEFAULT
+	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROSE_1
 	release
 	end
 
-Route118_EventScript_1F3FD2:: @ 81F3FD2
-	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
-	msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchRose:: @ 81F3FD2
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
+	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F3FE9:: @ 81F3FE9
-	trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
-	msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
+Route118_EventScript_Barny:: @ 81F3FE9
+	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
+	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4000:: @ 81F4000
-	trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
-	msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
+Route118_EventScript_Wade:: @ 81F4000
+	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
+	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4017:: @ 81F4017
-	trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+Route118_EventScript_Dalton:: @ 81F4017
+	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F4062
-	msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchDalton
+	msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F4043:: @ 81F4043
-	special sub_80B4808
+Route118_EventScript_RegisterDalton:: @ 81F4043
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D74A, MSGBOX_DEFAULT
+	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DALTON_1
 	release
 	end
 
-Route118_EventScript_1F4062:: @ 81F4062
-	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
-	msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchDalton:: @ 81F4062
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
+	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4079:: @ 81F4079
-	trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
-	msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
+Route118_EventScript_Perry:: @ 81F4079
+	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
+	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4090:: @ 81F4090
-	trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
-	msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
+Route118_EventScript_Chester:: @ 81F4090
+	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
+	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F40A7:: @ 81F40A7
-	trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
-	msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
+Route118_EventScript_Deandre:: @ 81F40A7
+	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
+	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_1F40BE: @ 81F40BE
+Route118_Text_StevenQuestions: @ 81F40BE
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_1F427B: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_1F42AF: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_1F42E7: @ 81F42E7
+Route118_Text_TryYourLuckFishing: @ 81F42E7
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_1F4319: @ 81F4319
+Route118_Text_DontYouLikeToFish: @ 81F4319
 	.string "Don't you like to fish?$"
 
-Route118_Text_1F4331: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_1F4367: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf: @ 81F4367
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_1F43F4: @ 81F43F4
+Route118_Text_RouteSignMauville: @ 81F43F4
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_1F440E: @ 81F440E
+Route118_Text_RouteSign119: @ 81F440E
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"
 
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index badd5d14e..2d1be0635 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47E2",
+      "script": "Route119_EventScript_Greg",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47B4",
+      "script": "Route119_EventScript_Taylor",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F479D",
+      "script": "Route119_EventScript_Donald",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4810",
+      "script": "Route119_EventScript_Jackson",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F4786",
+      "script": "Route119_EventScript_Brent",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_EventScript_1F4872",
+      "script": "Route119_EventScript_Catherine",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47CB",
+      "script": "Route119_EventScript_Doug",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47F9",
+      "script": "Route119_EventScript_Kent",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F4902",
+      "script": "Route119_EventScript_Yasu",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4919",
+      "script": "Route119_EventScript_Takashi",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F48D4",
+      "script": "Route119_EventScript_Hugh",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route119_EventScript_1F48EB",
+      "script": "Route119_EventScript_Phil",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49A3",
+      "script": "Route119_EventScript_BridgeAquaGrunt1",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49BA",
+      "script": "Route119_EventScript_BridgeAquaGrunt2",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49D1",
+      "script": "Route119_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F476B",
+      "script": "Route119_EventScript_CyclingTriathleteM",
       "flag": "0"
     },
     {
@@ -451,7 +451,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49DA",
+      "script": "Route119_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4930",
+      "script": "Route119_EventScript_Hideo",
       "flag": "0"
     },
     {
@@ -503,7 +503,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F4947",
+      "script": "Route119_EventScript_Chris",
       "flag": "0"
     },
     {
@@ -516,7 +516,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route119_EventScript_1F498C",
+      "script": "Route119_EventScript_Rachel",
       "flag": "0"
     },
     {
@@ -529,7 +529,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4975",
+      "script": "Route119_EventScript_Dayton",
       "flag": "0"
     },
     {
@@ -542,7 +542,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route119_EventScript_1F495E",
+      "script": "Route119_EventScript_Fabian",
       "flag": "0"
     },
     {
@@ -609,7 +609,7 @@
       "elevation": 0,
       "var": "VAR_ROUTE119_STATE",
       "var_value": "0",
-      "script": "Route119_EventScript_1F4472"
+      "script": "Route119_EventScript_RivalTrigger1"
     },
     {
       "type": "trigger",
@@ -618,7 +618,7 @@
       "elevation": 0,
       "var": "VAR_ROUTE119_STATE",
       "var_value": "0",
-      "script": "Route119_EventScript_1F447D"
+      "script": "Route119_EventScript_RivalTrigger2"
     },
     {
       "type": "weather",
@@ -775,7 +775,7 @@
       "y": 33,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F477D"
+      "script": "Route119_EventScript_WeatherInstituteSign"
     },
     {
       "type": "sign",
@@ -783,7 +783,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F4774"
+      "script": "Route119_EventScript_RouteSignFortree"
     },
     {
       "type": "secret_base",
@@ -914,7 +914,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F49E3"
+      "script": "Route119_EventScript_TrainerTipsDecoration"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index ec1063c6d..36647e931 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -1,13 +1,13 @@
 Route119_MapScripts:: @ 81F4424
-	map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F
+	map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
 	.byte 0
 
-Route119_MapScript1_1F442F: @ 81F442F
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_1F4439
+Route119_OnResume: @ 81F442F
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_TryRemoveKecleon
 	end
 
-Route119_EventScript_1F4439:: @ 81F4439
+Route119_EventScript_TryRemoveKecleon:: @ 81F4439
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -18,231 +18,231 @@ Route119_OnTransition: @ 81F444D
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_EventScript_1F4466
+	call_if_eq Route119_EventScript_MoveInstituteWorkersDownstairs
 	special SetRoute119Weather
 	end
 
-Route119_EventScript_1F4466:: @ 81F4466
+Route119_EventScript_MoveInstituteWorkersDownstairs:: @ 81F4466
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
-Route119_EventScript_1F4472:: @ 81F4472
+Route119_EventScript_RivalTrigger1:: @ 81F4472
 	setvar VAR_TEMP_1, 1
-	goto Route119_EventScript_1F4488
+	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_1F447D:: @ 81F447D
+Route119_EventScript_RivalTrigger2:: @ 81F447D
 	setvar VAR_TEMP_1, 2
-	goto Route119_EventScript_1F4488
+	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_1F4488:: @ 81F4488
+Route119_EventScript_RivalEncounter:: @ 81F4488
 	lockall
-	addobject 25
+	addobject 25  @ Rival on bike
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq Route119_EventScript_1F4501
+	call_if_eq Route119_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq Route119_EventScript_1F4506
+	call_if_eq Route119_EventScript_PlayBrendanMusic
 	delay 65
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46C6
+	call_if_eq Route119_EventScript_RivalEnter1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46D1
+	call_if_eq Route119_EventScript_RivalEnter2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F4700
+	call_if_eq Route119_EventScript_SetRivalPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F470F
+	call_if_eq Route119_EventScript_SetRivalPos2
 	removeobject 25
-	addobject 16
+	addobject 16  @ Rival on foot
 	delay 30
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route119_EventScript_1F450B
+	goto_if_eq Route119_EventScript_BattleMay
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route119_EventScript_1F4585
+	goto_if_eq Route119_EventScript_BattleBrendan
 	releaseall
 	end
 
-Route119_EventScript_1F4501:: @ 81F4501
+Route119_EventScript_PlayMayMusic:: @ 81F4501
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-Route119_EventScript_1F4506:: @ 81F4506
+Route119_EventScript_PlayBrendanMusic:: @ 81F4506
 	playbgm MUS_BOY_SUP, 1
 	return
 
-Route119_EventScript_1F450B:: @ 81F450B
-	msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT
+Route119_EventScript_BattleMay:: @ 81F450B
+	msgbox Route119_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_1F453A
-	case 1, Route119_EventScript_1F454A
-	case 2, Route119_EventScript_1F455A
+	case 0, Route119_EventScript_BattleMayTreecko
+	case 1, Route119_EventScript_BattleMayTorchic
+	case 2, Route119_EventScript_BattleMayMudkip
 	end
 
-Route119_EventScript_1F453A:: @ 81F453A
-	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayTreecko:: @ 81F453A
+	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F454A:: @ 81F454A
-	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayTorchic:: @ 81F454A
+	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F455A:: @ 81F455A
-	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayMudkip:: @ 81F455A
+	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F456A:: @ 81F456A
-	msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT
-	goto Route119_EventScript_1F460F
+Route119_EventScript_DefeatedMay:: @ 81F456A
+	msgbox Route119_Text_MayPresentForYou, MSGBOX_DEFAULT
+	call Route119_EventScript_GiveFlyHM
+	msgbox Route119_Text_MayExplainFly, MSGBOX_DEFAULT
+	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_1F4585:: @ 81F4585
-	msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT
+Route119_EventScript_BattleBrendan:: @ 81F4585
+	msgbox Route119_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_1F45B4
-	case 1, Route119_EventScript_1F45C4
-	case 2, Route119_EventScript_1F45D4
+	case 0, Route119_EventScript_BattleBrendanTreecko
+	case 1, Route119_EventScript_BattleBrendanTorchic
+	case 2, Route119_EventScript_BattleBrendanMudkip
 	end
 
-Route119_EventScript_1F45B4:: @ 81F45B4
-	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
+	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45C4:: @ 81F45C4
-	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
+	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45D4:: @ 81F45D4
-	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
+	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45E4:: @ 81F45E4
-	msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT
-	goto Route119_EventScript_1F460F
+Route119_EventScript_DefeatedBrendan:: @ 81F45E4
+	msgbox Route119_Text_BrendanIllGiveYouThis, MSGBOX_DEFAULT
+	call Route119_EventScript_GiveFlyHM
+	msgbox Route119_Text_BrendanExplainFly, MSGBOX_DEFAULT
+	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_1F45FF:: @ 81F45FF
+Route119_EventScript_GiveFlyHM:: @ 81F45FF
 	giveitem_std ITEM_HM02
 	setflag FLAG_RECEIVED_HM02
 	return
 
-Route119_EventScript_1F460F:: @ 81F460F
+Route119_EventScript_RivalExitScottArrive:: @ 81F460F
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F4700
+	call_if_eq Route119_EventScript_SetRivalPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F470F
-	removeobject 16
-	addobject 25
+	call_if_eq Route119_EventScript_SetRivalPos2
+	removeobject 16  @ Rival on foot
+	addobject 25     @ Rival on bike
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46DC
+	call_if_eq Route119_EventScript_RivalExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46EE
+	call_if_eq Route119_EventScript_RivalExit2
 	removeobject 25
 	setvar VAR_ROUTE119_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	delay 60
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46A0
+	call_if_eq Route119_EventScript_SetScottPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46A8
-	addobject 43
-	applymovement 43, Route119_Movement_1F4752
+	call_if_eq Route119_EventScript_SetScottPos2
+	addobject 43  @ Scott
+	applymovement 43, Route119_Movement_ScottEnter
 	waitmovement 0
 	addvar VAR_SCOTT_STATE, 1
-	msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
+	msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46B0
+	call_if_eq Route119_EventScript_ScottExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46BB
+	call_if_eq Route119_EventScript_ScottExit2
 	removeobject 43
 	releaseall
 	end
 
-Route119_EventScript_1F46A0:: @ 81F46A0
+Route119_EventScript_SetScottPos1:: @ 81F46A0
 	setobjectxyperm 43, 27, 25
 	return
 
-Route119_EventScript_1F46A8:: @ 81F46A8
+Route119_EventScript_SetScottPos2:: @ 81F46A8
 	setobjectxyperm 43, 28, 25
 	return
 
-Route119_EventScript_1F46B0:: @ 81F46B0
-	applymovement 43, Route119_Movement_1F475A
+Route119_EventScript_ScottExit1:: @ 81F46B0
+	applymovement 43, Route119_Movement_ScottExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46BB:: @ 81F46BB
-	applymovement 43, Route119_Movement_1F4763
+Route119_EventScript_ScottExit2:: @ 81F46BB
+	applymovement 43, Route119_Movement_ScottExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46C6:: @ 81F46C6
-	applymovement 25, Route119_Movement_1F4728
+Route119_EventScript_RivalEnter1:: @ 81F46C6
+	applymovement 25, Route119_Movement_RivalEnter1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46D1:: @ 81F46D1
-	applymovement 25, Route119_Movement_1F4732
+Route119_EventScript_RivalEnter2:: @ 81F46D1
+	applymovement 25, Route119_Movement_RivalEnter2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46DC:: @ 81F46DC
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F471E
-	applymovement 25, Route119_Movement_1F473D
+Route119_EventScript_RivalExit1:: @ 81F46DC
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1
+	applymovement 25, Route119_Movement_RivalExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46EE:: @ 81F46EE
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F4723
-	applymovement 25, Route119_Movement_1F4747
+Route119_EventScript_RivalExit2:: @ 81F46EE
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2
+	applymovement 25, Route119_Movement_RivalExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F4700:: @ 81F4700
+Route119_EventScript_SetRivalPos1:: @ 81F4700
 	setobjectxyperm 16, 25, 32
 	setobjectxyperm 25, 25, 32
 	return
 
-Route119_EventScript_1F470F:: @ 81F470F
+Route119_EventScript_SetRivalPos2:: @ 81F470F
 	setobjectxyperm 16, 26, 32
 	setobjectxyperm 25, 26, 32
 	return
 
-Route119_Movement_1F471E: @ 81F471E
+Route119_Movement_PlayerWatchRivalExit1: @ 81F471E
 	delay_16
 	walk_in_place_fastest_right
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_1F4723: @ 81F4723
+Route119_Movement_PlayerWatchRivalExit2: @ 81F4723
 	delay_16
 	walk_in_place_fastest_left
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_1F4728: @ 81F4728
+Route119_Movement_RivalEnter1: @ 81F4728
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -254,7 +254,7 @@ Route119_Movement_1F4728: @ 81F4728
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4732: @ 81F4732
+Route119_Movement_RivalEnter2: @ 81F4732
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -267,7 +267,7 @@ Route119_Movement_1F4732: @ 81F4732
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F473D: @ 81F473D
+Route119_Movement_RivalExit1: @ 81F473D
 	walk_fast_right
 	walk_fast_up
 	walk_fast_up
@@ -279,7 +279,7 @@ Route119_Movement_1F473D: @ 81F473D
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4747: @ 81F4747
+Route119_Movement_RivalExit2: @ 81F4747
 	walk_fast_left
 	walk_fast_up
 	walk_fast_up
@@ -292,7 +292,7 @@ Route119_Movement_1F4747: @ 81F4747
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4752: @ 81F4752
+Route119_Movement_ScottEnter: @ 81F4752
 	walk_down
 	walk_down
 	walk_down
@@ -302,7 +302,7 @@ Route119_Movement_1F4752: @ 81F4752
 	walk_down
 	step_end
 
-Route119_Movement_1F475A: @ 81F475A
+Route119_Movement_ScottExit1: @ 81F475A
 	walk_up
 	walk_right
 	walk_right
@@ -313,7 +313,7 @@ Route119_Movement_1F475A: @ 81F475A
 	walk_up
 	step_end
 
-Route119_Movement_1F4763: @ 81F4763
+Route119_Movement_ScottExit2: @ 81F4763
 	walk_up
 	walk_right
 	walk_up
@@ -323,179 +323,179 @@ Route119_Movement_1F4763: @ 81F4763
 	walk_up
 	step_end
 
-Route119_EventScript_1F476B:: @ 81F476B
-	msgbox Route119_Text_1F5261, MSGBOX_NPC
+Route119_EventScript_CyclingTriathleteM:: @ 81F476B
+	msgbox Route119_Text_TallGrassSnaresBikeTires, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F4774:: @ 81F4774
-	msgbox Route119_Text_1F530E, MSGBOX_SIGN
+Route119_EventScript_RouteSignFortree:: @ 81F4774
+	msgbox Route119_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F477D:: @ 81F477D
-	msgbox Route119_Text_1F5327, MSGBOX_SIGN
+Route119_EventScript_WeatherInstituteSign:: @ 81F477D
+	msgbox Route119_Text_WeatherInstitute, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F4786:: @ 81F4786
-	trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0
-	msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
+Route119_EventScript_Brent:: @ 81F4786
+	trainerbattle_single TRAINER_BRENT, Route119_Text_BrentIntro, Route119_Text_BrentDefeat
+	msgbox Route119_Text_BrentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F479D:: @ 81F479D
-	trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C
-	msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
+Route119_EventScript_Donald:: @ 81F479D
+	trainerbattle_single TRAINER_DONALD, Route119_Text_DonaldIntro, Route119_Text_DonaldDefeat
+	msgbox Route119_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47B4:: @ 81F47B4
-	trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14
-	msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
+Route119_EventScript_Taylor:: @ 81F47B4
+	trainerbattle_single TRAINER_TAYLOR, Route119_Text_TaylorIntro, Route119_Text_TaylorDefeat
+	msgbox Route119_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47CB:: @ 81F47CB
-	trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC
-	msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
+Route119_EventScript_Doug:: @ 81F47CB
+	trainerbattle_single TRAINER_DOUG, Route119_Text_DougIntro, Route119_Text_DougDefeat
+	msgbox Route119_Text_DougPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47E2:: @ 81F47E2
-	trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66
-	msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
+Route119_EventScript_Greg:: @ 81F47E2
+	trainerbattle_single TRAINER_GREG, Route119_Text_GregIntro, Route119_Text_GregDefeat
+	msgbox Route119_Text_GregPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47F9:: @ 81F47F9
-	trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20
-	msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
+Route119_EventScript_Kent:: @ 81F47F9
+	trainerbattle_single TRAINER_KENT, Route119_Text_KentIntro, Route119_Text_KentDefeat
+	msgbox Route119_Text_KentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4810:: @ 81F4810
-	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
+Route119_EventScript_Jackson:: @ 81F4810
+	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_JacksonIntro, Route119_Text_JacksonDefeat, Route119_EventScript_RegisterJackson
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route119_EventScript_1F485B
-	msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route119_EventScript_RematchJackson
+	msgbox Route119_Text_JacksonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_EventScript_1F483C:: @ 81F483C
-	special sub_80B4808
+Route119_EventScript_RegisterJackson:: @ 81F483C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT
+	msgbox Route119_Text_JacksonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JACKSON_1
 	release
 	end
 
-Route119_EventScript_1F485B:: @ 81F485B
-	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5
-	msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
+Route119_EventScript_RematchJackson:: @ 81F485B
+	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_JacksonRematchIntro, Route119_Text_JacksonRematchDefeat
+	msgbox Route119_Text_JacksonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4872:: @ 81F4872
-	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
+Route119_EventScript_Catherine:: @ 81F4872
+	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_CatherineIntro, Route119_Text_CatherineDefeat, Route119_EventScript_RegisterCatherine
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route119_EventScript_1F48BD
-	msgbox Route119_Text_29DE88, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route119_EventScript_RematchCatherine
+	msgbox Route119_Text_CatherinePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_EventScript_1F489E:: @ 81F489E
-	special sub_80B4808
+Route119_EventScript_RegisterCatherine:: @ 81F489E
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT
+	msgbox Route119_Text_CatherineRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CATHERINE_1
 	release
 	end
 
-Route119_EventScript_1F48BD:: @ 81F48BD
-	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92
-	msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
+Route119_EventScript_RematchCatherine:: @ 81F48BD
+	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_CatherineRematchIntro, Route119_Text_CatherineRematchDefeat
+	msgbox Route119_Text_CatherinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F48D4:: @ 81F48D4
-	trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063
-	msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
+Route119_EventScript_Hugh:: @ 81F48D4
+	trainerbattle_single TRAINER_HUGH, Route119_Text_HughIntro, Route119_Text_HughDefeat
+	msgbox Route119_Text_HughPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F48EB:: @ 81F48EB
-	trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1
-	msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
+Route119_EventScript_Phil:: @ 81F48EB
+	trainerbattle_single TRAINER_PHIL, Route119_Text_PhilIntro, Route119_Text_PhilDefeat
+	msgbox Route119_Text_PhilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4902:: @ 81F4902
-	trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D
-	msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
+Route119_EventScript_Yasu:: @ 81F4902
+	trainerbattle_single TRAINER_YASU, Route119_Text_YasuIntro, Route119_Text_YasuDefeat
+	msgbox Route119_Text_YasuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4919:: @ 81F4919
-	trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B
-	msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
+Route119_EventScript_Takashi:: @ 81F4919
+	trainerbattle_single TRAINER_TAKASHI, Route119_Text_TakashiIntro, Route119_Text_TakashiDefeat
+	msgbox Route119_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4930:: @ 81F4930
-	trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288
-	msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
+Route119_EventScript_Hideo:: @ 81F4930
+	trainerbattle_single TRAINER_HIDEO, Route119_Text_HideoIntro, Route119_Text_HideoDefeat
+	msgbox Route119_Text_HideoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4947:: @ 81F4947
-	trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372
-	msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
+Route119_EventScript_Chris:: @ 81F4947
+	trainerbattle_single TRAINER_CHRIS, Route119_Text_ChrisIntro, Route119_Text_ChrisDefeat
+	msgbox Route119_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F495E:: @ 81F495E
-	trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F
-	msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
+Route119_EventScript_Fabian:: @ 81F495E
+	trainerbattle_single TRAINER_FABIAN, Route119_Text_FabianIntro, Route119_Text_FabianDefeat
+	msgbox Route119_Text_FabianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4975:: @ 81F4975
-	trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513
-	msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
+Route119_EventScript_Dayton:: @ 81F4975
+	trainerbattle_single TRAINER_DAYTON, Route119_Text_DaytonIntro, Route119_Text_DaytonDefeat
+	msgbox Route119_Text_DaytonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F498C:: @ 81F498C
-	trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1
-	msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
+Route119_EventScript_Rachel:: @ 81F498C
+	trainerbattle_single TRAINER_RACHEL, Route119_Text_RachelIntro, Route119_Text_RachelDefeat
+	msgbox Route119_Text_RachelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F49A3:: @ 81F49A3
+Route119_EventScript_BridgeAquaGrunt1:: @ 81F49A3
 	lock
 	faceplayer
-	msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
+	msgbox Route119_Text_StayAwayFromWeatherInstitute, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route119_EventScript_1F49BA:: @ 81F49BA
+Route119_EventScript_BridgeAquaGrunt2:: @ 81F49BA
 	lock
 	faceplayer
-	msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
+	msgbox Route119_Text_DontGoNearWeatherInstitute, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route119_EventScript_1F49D1:: @ 81F49D1
-	msgbox Route119_Text_1F51A2, MSGBOX_NPC
+Route119_EventScript_Boy1:: @ 81F49D1
+	msgbox Route119_Text_ThoughtFlyByCatchingBirdMons, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F49DA:: @ 81F49DA
-	msgbox Route119_Text_1F52B9, MSGBOX_NPC
+Route119_EventScript_Boy2:: @ 81F49DA
+	msgbox Route119_Text_CanYourMonMakeSecretBase, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F49E3:: @ 81F49E3
-	msgbox Route119_Text_1F5339, MSGBOX_SIGN
+Route119_EventScript_TrainerTipsDecoration:: @ 81F49E3
+	msgbox Route119_Text_TrainerTipsDecoration, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F49EC:: @ 81F49EC
+Route119_EventScript_ScottWonAtFortreeGymCall:: @ 81F49EC
 	lockall
-	pokenavcall Route119_Text_1F4FBA
+	pokenavcall Route119_Text_ScottYouWonAtFortreeGym
 	waitmessage
-	clearflag FLAG_REGISTER_WINONA_POKENAV
+	clearflag FLAG_SCOTT_CALL_FORTREE_GYM
 	addvar VAR_SCOTT_STATE, 1
 	releaseall
 	end
 
-Route119_Text_1F49FD: @ 81F49FD
+Route119_Text_MayIntro: @ 81F49FD
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "Where were you? I was looking for you!\p"
 	.string "How much stronger have you gotten?\n"
@@ -503,18 +503,18 @@ Route119_Text_1F49FD: @ 81F49FD
 	.string "Ready with your POKéMON?\n"
 	.string "Of course you are! Go!$"
 
-Route119_Text_1F4A98: @ 81F4A98
+Route119_Text_MayDefeat: @ 81F4A98
 	.string "Achah!\n"
 	.string "{PLAYER}{KUN}, you're strong!\p"
 	.string "I was worried that you might be\n"
 	.string "struggling with your training.$"
 
-Route119_Text_1F4AF3: @ 81F4AF3
+Route119_Text_MayPresentForYou: @ 81F4AF3
 	.string "MAY: But I had absolutely nothing to\n"
 	.string "worry about! Keep it up!\p"
 	.string "And, here! I have a present for you.$"
 
-Route119_Text_1F4B56: @ 81F4B56
+Route119_Text_MayExplainFly: @ 81F4B56
 	.string "MAY: Use FLY, and your POKéMON will\n"
 	.string "instantly carry you to any town you've\l"
 	.string "already visited.\p"
@@ -527,7 +527,7 @@ Route119_Text_1F4B56: @ 81F4B56
 	.string "{PLAYER}{KUN}.\p"
 	.string "Well, let's meet again somewhere!$"
 
-Route119_Text_1F4C9A: @ 81F4C9A
+Route119_Text_BrendanIntro: @ 81F4C9A
 	.string "BRENDAN: {PLAYER}! So this is where\n"
 	.string "you've been looking for POKéMON?\p"
 	.string "Let me see how good you got.\n"
@@ -535,17 +535,17 @@ Route119_Text_1F4C9A: @ 81F4C9A
 	.string "Now!\n"
 	.string "It's a battle, so battle!$"
 
-Route119_Text_1F4D24: @ 81F4D24
+Route119_Text_BrendanDefeat: @ 81F4D24
 	.string "Hmm…\n"
 	.string "You've gotten pretty darn decent.$"
 
-Route119_Text_1F4D4B: @ 81F4D4B
+Route119_Text_BrendanIllGiveYouThis: @ 81F4D4B
 	.string "BRENDAN: I'd say you're good enough\n"
 	.string "to search for POKéMON anywhere.\p"
 	.string "Here, I'll give you this.\n"
 	.string "Try it out.$"
 
-Route119_Text_1F4DB5: @ 81F4DB5
+Route119_Text_BrendanExplainFly: @ 81F4DB5
 	.string "BRENDAN: Use FLY, and your POKéMON\n"
 	.string "instantly carries you to any town\l"
 	.string "you've already visited.\p"
@@ -553,7 +553,7 @@ Route119_Text_1F4DB5: @ 81F4DB5
 	.string "to do that.\p"
 	.string "Anyway, I have to move along.$"
 
-Route119_Text_1F4E60: @ 81F4E60
+Route119_Text_ScottWayToGoBeSeeingYou: @ 81F4E60
 	.string "SCOTT: Hahahah!\n"
 	.string "Way to go, {PLAYER}{KUN}!\p"
 	.string "I just passed by a TRAINER riding\n"
@@ -568,7 +568,7 @@ Route119_Text_1F4E60: @ 81F4E60
 	.string "Well, I'll be seeing you!$"
 
 
-Route119_Text_1F4FBA: @ 81F4FBA
+Route119_Text_ScottYouWonAtFortreeGym: @ 81F4FBA
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p"
@@ -583,17 +583,17 @@ Route119_Text_1F4FBA: @ 81F4FBA
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-Route119_Text_1F50EB: @ 81F50EB
+Route119_Text_StayAwayFromWeatherInstitute: @ 81F50EB
 	.string "We're standing lookout here.\p"
 	.string "Hey, you! Stay away from the WEATHER\n"
 	.string "INSTITUTE. It's not safe.$"
 
-Route119_Text_1F5147: @ 81F5147
+Route119_Text_DontGoNearWeatherInstitute: @ 81F5147
 	.string "Lookout duty is surprisingly boring.\p"
 	.string "Hey, you! Please don't go near the\n"
 	.string "WEATHER INSTITUTE.$"
 
-Route119_Text_1F51A2: @ 81F51A2
+Route119_Text_ThoughtFlyByCatchingBirdMons: @ 81F51A2
 	.string "I thought you FLY by catching a whole\n"
 	.string "flock of BIRD POKéMON, and then\l"
 	.string "hanging on to them somehow.\p"
@@ -602,25 +602,25 @@ Route119_Text_1F51A2: @ 81F51A2
 	.string "I wish I'd known about that a long\n"
 	.string "time ago…$"
 
-Route119_Text_1F5261: @ 81F5261
+Route119_Text_TallGrassSnaresBikeTires: @ 81F5261
 	.string "Tch…\n"
 	.string "It's a no-go…\p"
 	.string "The tall grass snares BIKE tires.\n"
 	.string "There's no way you can cycle here.$"
 
-Route119_Text_1F52B9: @ 81F52B9
+Route119_Text_CanYourMonMakeSecretBase: @ 81F52B9
 	.string "Can your POKéMON use its SECRET POWER\n"
 	.string "on a big pile of grass and make a\l"
 	.string "SECRET BASE?$"
 
-Route119_Text_1F530E: @ 81F530E
+Route119_Text_RouteSignFortree: @ 81F530E
 	.string "ROUTE 119\n"
 	.string "{RIGHT_ARROW} FORTREE CITY$"
 
-Route119_Text_1F5327: @ 81F5327
+Route119_Text_WeatherInstitute: @ 81F5327
 	.string "WEATHER INSTITUTE$"
 
-Route119_Text_1F5339: @ 81F5339
+Route119_Text_TrainerTipsDecoration: @ 81F5339
 	.string "TRAINER TIPS\p"
 	.string "Up to sixteen decorations and\n"
 	.string "furniture items can be placed in\l"
diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json
index 31d84664f..f07156653 100644
--- a/data/maps/Route119_House/map.json
+++ b/data/maps/Route119_House/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_270966",
+      "script": "Route119_House_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_House_EventScript_27096F",
+      "script": "Route119_House_EventScript_Wingull",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc
index 4d4826bdf..b6915aaa3 100644
--- a/data/maps/Route119_House/scripts.inc
+++ b/data/maps/Route119_House/scripts.inc
@@ -1,27 +1,27 @@
 Route119_House_MapScripts:: @ 8270965
 	.byte 0
 
-Route119_House_EventScript_270966:: @ 8270966
-	msgbox Route119_House_Text_270982, MSGBOX_NPC
+Route119_House_EventScript_Woman:: @ 8270966
+	msgbox Route119_House_Text_RumorAboutCaveOfOrigin, MSGBOX_NPC
 	end
 
-Route119_House_EventScript_27096F:: @ 827096F
+Route119_House_EventScript_Wingull:: @ 827096F
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT
+	msgbox Route119_House_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route119_House_Text_270982: @ 8270982
+Route119_House_Text_RumorAboutCaveOfOrigin: @ 8270982
 	.string "I heard about a cave called the CAVE\n"
 	.string "OF ORIGIN.\p"
 	.string "People rumor that the spirits of\n"
 	.string "POKéMON are revived there. Could\l"
 	.string "something like that really happen?$"
 
-Route119_House_Text_270A17: @ 8270A17
+Route119_House_Text_Wingull: @ 8270A17
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json
index 8200c20df..626d008fc 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.json
+++ b/data/maps/Route119_WeatherInstitute_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB29",
+      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB40",
+      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F",
+      "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker2",
       "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8",
+      "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker1",
       "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4",
+      "script": "Route119_WeatherInstitute_1F_EventScript_LittleBoy",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+      "script": "Route119_WeatherInstitute_1F_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -119,7 +119,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+      "script": "Route119_WeatherInstitute_1F_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -127,7 +127,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+      "script": "Route119_WeatherInstitute_1F_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -135,7 +135,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_WeatherInstitute_1F_EventScript_26FB18"
+      "script": "Route119_WeatherInstitute_1F_EventScript_Bed"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index b4b309d80..0b7eb4f4a 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -4,111 +4,111 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86
 
 Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98
+	call_if_eq Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98
+Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: @ 826FA98
 	setobjectxyperm 5, 0, 5
 	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4
+Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE
-	msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT
+	goto_if_eq Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere
+	msgbox Route119_WeatherInstitute_1F_Text_WowYoureStrong, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE
-	msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT
+Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere:: @ 826FABE
+	msgbox Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8
+Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8
 	lock
 	faceplayer
-	goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05
+	goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_StudyingRain
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_26FAFF
-	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_26FAFF
-	compare VAR_0x8004, 2
-	goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05
-	msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT
+	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated
+	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated
+	compare VAR_0x8004, 2  @ Both defeated
+	goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain
+	msgbox Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF
+Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated:: @ 826FAFF
 	addvar VAR_0x8004, 1
 	return
 
-Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05
-	msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT
+Route119_WeatherInstitute_1F_EventScript_StudyingRain:: @ 826FB05
+	msgbox Route119_WeatherInstitute_1F_Text_ProfStudyingRain, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F
-	msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC
+Route119_WeatherInstitute_1F_EventScript_InstituteWorker2:: @ 826FB0F
+	msgbox Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo, MSGBOX_NPC
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18
+Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18
 	lockall
-	msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT
+	msgbox Route119_WeatherInstitute_1F_Text_TakeRestInBed, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
 	releaseall
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29
-	trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB
-	msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_1F_EventScript_Grunt1:: @ 826FB29
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_1, Route119_WeatherInstitute_1F_Text_Grunt1Intro, Route119_WeatherInstitute_1F_Text_Grunt1Defeat
+	msgbox Route119_WeatherInstitute_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40
-	trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52
-	msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_1F_EventScript_Grunt4:: @ 826FB40
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_4, Route119_WeatherInstitute_1F_Text_Grunt4Intro, Route119_WeatherInstitute_1F_Text_Grunt4Defeat
+	msgbox Route119_WeatherInstitute_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57
+Route119_WeatherInstitute_1F_Text_Grunt1Intro: @ 826FB57
 	.string "The BOSS got interested in\n"
 	.string "the research they have going here,\l"
 	.string "so he sent us out.\p"
 	.string "You quit meddling!$"
 
-Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB
+Route119_WeatherInstitute_1F_Text_Grunt1Defeat: @ 826FBBB
 	.string "Blast it…\n"
 	.string "Blasted by a kid…$"
 
-Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7
+Route119_WeatherInstitute_1F_Text_Grunt1PostBattle: @ 826FBD7
 	.string "Our BOSS knows everything.\p"
 	.string "But I'm just a GRUNT. What would I know\n"
 	.string "about what he's thinking?$"
 
-Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34
+Route119_WeatherInstitute_1F_Text_Grunt4Intro: @ 826FC34
 	.string "Huh?\n"
 	.string "What's a kid doing here?$"
 
-Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52
+Route119_WeatherInstitute_1F_Text_Grunt4Defeat: @ 826FC52
 	.string "Huh?\n"
 	.string "I lost?!$"
 
-Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60
+Route119_WeatherInstitute_1F_Text_Grunt4PostBattle: @ 826FC60
 	.string "Oh, no…\n"
 	.string "I'll catch an earful for losing to a kid…\p"
 	.string "I should just take a nap in the bed…$"
 
-Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7
+Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs: @ 826FCB7
 	.string "While I was sleeping, everyone went\n"
 	.string "upstairs!$"
 
-Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5
+Route119_WeatherInstitute_1F_Text_WowYoureStrong: @ 826FCE5
 	.string "Wow, you're really strong!\p"
 	.string "I wish I could be a POKéMON TRAINER\n"
 	.string "like you!$"
 
-Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E
+Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E
 	.string "The PROFESSOR loves rain.\n"
 	.string "That's a fact.\p"
 	.string "But if it keeps raining, people will be in\n"
@@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E
 	.string "And thus, the PROFESSOR is studying\n"
 	.string "if the rain can be put to good use.$"
 
-Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8
+Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather: @ 826FDE8
 	.string "On the 2nd floor of the INSTITUTE,\n"
 	.string "we study the weather patterns over\l"
 	.string "the HOENN region.\p"
@@ -124,13 +124,13 @@ Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8
 	.string "isolated cases of droughts and\l"
 	.string "heavy rain lately…$"
 
-Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94
+Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo: @ 826FE94
 	.string "Hello!\n"
 	.string "We've been saved by your actions!\p"
 	.string "What I don't understand is what on\n"
 	.string "earth the AQUAS were up to.$"
 
-Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC
+Route119_WeatherInstitute_1F_Text_TakeRestInBed: @ 826FEFC
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json
index 4b4534a8e..c8048db6f 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.json
+++ b/data/maps/Route119_WeatherInstitute_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_WeatherInstitute_2F_EventScript_26FF96",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Shelly",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_WeatherInstitute_2F_EventScript_27018B",
+      "script": "Route119_WeatherInstitute_2F_EventScript_WeatherScientist",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_WeatherInstitute_2F_EventScript_26FF68",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     }
   ],
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index ac47539c7..df1021530 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -4,62 +4,62 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
 
 Route119_WeatherInstitute_2F_OnTransition: @ 826FF24
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF50
-	call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_26FF5C
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone
+	call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear
 	end
 
-Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere:: @ 826FF44
 	setobjectxyperm 5, 1, 6
 	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone:: @ 826FF50
 	setobjectxyperm 5, 4, 6
 	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C
 	setobjectxyperm 5, 2, 2
 	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
 	return
 
-Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
-	trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
-	msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt5:: @ 826FF68
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_5, Route119_WeatherInstitute_2F_Text_Grunt5Intro, Route119_WeatherInstitute_2F_Text_Grunt5Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F
-	trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
-	msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt2:: @ 826FF7F
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_2, Route119_WeatherInstitute_2F_Text_Grunt2Intro, Route119_WeatherInstitute_2F_Text_Grunt2Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96
-	trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
-	msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_3, Route119_WeatherInstitute_2F_Text_Grunt3Intro, Route119_WeatherInstitute_2F_Text_Grunt3Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD
-	trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
-	msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
+	trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
+	msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
-	msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT
+Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
+	msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT
 	closemessage
-	addobject 7
-	applymovement 7, Route119_WeatherInstitute_2F_Movement_270170
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_27017C
+	addobject 7  @ Aqua grunt
+	applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay
 	waitmovement 0
-	msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT
+	msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT
 	closemessage
 	playse SE_PIN
 	applymovement 3, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT
+	msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_WEATHER_INSTITUTE_STATE, 1
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
@@ -72,106 +72,104 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 	removeobject 3
 	removeobject 8
 	removeobject 7
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_270184
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
 	waitmovement 0
 	fadescreen 0
-	applymovement 5, Route119_WeatherInstitute_2F_Movement_270187
+	applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 5
-	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
-	msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: @ 827004D
+	msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, SPECIES_CASTFORM
 	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
 	compare VAR_RESULT, 0
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty
 	compare VAR_RESULT, 1
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
-	call Route119_WeatherInstitute_2F_EventScript_2700DB
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty:: @ 8270085
+	call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
+	compare VAR_RESULT, NO
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_ExplainCastform
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+	goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
-	call Route119_WeatherInstitute_2F_EventScript_2700DB
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC:: @ 82700AD
+	call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0
+	compare VAR_RESULT, NO
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_SendCastformToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto Route119_WeatherInstitute_2F_EventScript_2700D0
+	goto Route119_WeatherInstitute_2F_EventScript_SendCastformToPC
 	end
 
-Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
-	call Route119_WeatherInstitute_2F_EventScript_2737A0
-	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0
+	call Common_EventScript_TransferredToPC
+	goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB
+Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB
 	playfanfare MUS_FANFA4
-	message Route119_WeatherInstitute_2F_Text_2706E8
+	message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
 	waitmessage
 	waitfanfare
 	bufferspeciesname 0, SPECIES_CASTFORM
 	return
 
-Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
-	msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT
+Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA
+	msgbox Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_CASTFORM
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
+Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7
 	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather
-	msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT
+	msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A
-    @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated
-    @ already.
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
-	call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
-	compare VAR_0x8004, 2
-	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated
-	call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather
+	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
+	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
+	compare VAR_0x8004, 2  @ Both defeated
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather
+	call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather
 	specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType
 	compare VAR_RESULT, 1
-	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage
-	msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather
+	msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT
 	release
 	end
 
-WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F
-	msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT
+Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F
+	msgbox Route119_WeatherInstitute_2F_Text_KyogreWeather, MSGBOX_DEFAULT
 	release
 	end
 
-WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159
+Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159
 	special CreateUnusualWeatherEvent
 	setflag FLAG_TEMP_2
 	return
 
-WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160
+Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated:: @ 8270160
 	addvar VAR_0x8004, 1
 	return
 
-WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166
-	msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT
+Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather:: @ 8270166
+	msgbox Route119_WeatherInstitute_2F_Text_NoAbnormalWeather, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
+Route119_WeatherInstitute_2F_Movement_GruntApproachShelly: @ 8270170
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -185,7 +183,7 @@ Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
 	walk_fast_left
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
+Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay: @ 827017C
 	delay_16
 	delay_16
 	delay_16
@@ -195,66 +193,66 @@ Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
 	walk_in_place_fastest_down
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_270184: @ 8270184
+Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition: @ 8270184
 	slide_down
 	walk_in_place_fastest_left
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_270187: @ 8270187
+Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer: @ 8270187
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B
+Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_2700F7
-	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather
+	goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
 	end
 
-Route119_WeatherInstitute_2F_Text_27019C: @ 827019C
+Route119_WeatherInstitute_2F_Text_Grunt2Intro: @ 827019C
 	.string "The INSTITUTE created a type of\n"
 	.string "POKéMON that has something to do with\l"
 	.string "the weather. We're here to take them!$"
 
-Route119_WeatherInstitute_2F_Text_270208: @ 8270208
+Route119_WeatherInstitute_2F_Text_Grunt2Defeat: @ 8270208
 	.string "Our plan's being spoiled by a kid?$"
 
-Route119_WeatherInstitute_2F_Text_27022B: @ 827022B
+Route119_WeatherInstitute_2F_Text_Grunt2PostBattle: @ 827022B
 	.string "If the POKéMON they made here can\n"
 	.string "control the weather freely, then we of\l"
 	.string "TEAM AQUA definitely need it!$"
 
-Route119_WeatherInstitute_2F_Text_270292: @ 8270292
+Route119_WeatherInstitute_2F_Text_Grunt3Intro: @ 8270292
 	.string "We're TEAM AQUA!\n"
 	.string "We appear wherever anything rare is\l"
 	.string "found!$"
 
-Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE
+Route119_WeatherInstitute_2F_Text_Grunt3Defeat: @ 82702CE
 	.string "You got me!$"
 
-Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA
+Route119_WeatherInstitute_2F_Text_Grunt3PostBattle: @ 82702DA
 	.string "You don't have any idea what we of\n"
 	.string "TEAM AQUA are working towards!\l"
 	.string "You stay out of our way!$"
 
-Route119_WeatherInstitute_2F_Text_270335: @ 8270335
+Route119_WeatherInstitute_2F_Text_Grunt5Intro: @ 8270335
 	.string "Don't tell me you're looking for that\n"
 	.string "weather POKéMON, too?\p"
 	.string "That's a no-no!\n"
 	.string "We were here to get it first!$"
 
-Route119_WeatherInstitute_2F_Text_27039F: @ 827039F
+Route119_WeatherInstitute_2F_Text_Grunt5Defeat: @ 827039F
 	.string "Oh, will you look at my POKéMON?$"
 
-Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0
+Route119_WeatherInstitute_2F_Text_Grunt5PostBattle: @ 82703C0
 	.string "Humph, so what?\n"
 	.string "What we want…\p"
 	.string "What we really want isn't here…\n"
 	.string "Ihihihihi…$"
 
-Route119_WeatherInstitute_2F_Text_270409: @ 8270409
+Route119_WeatherInstitute_2F_Text_ShellyIntro: @ 8270409
 	.string "Ahahahaha!\p"
 	.string "You're going to meddle in TEAM AQUA's\n"
 	.string "affairs?\p"
@@ -263,55 +261,56 @@ Route119_WeatherInstitute_2F_Text_270409: @ 8270409
 	.string "You're so cute, you're disgusting!\n"
 	.string "I'll put you down, kiddy!$"
 
-Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD
+Route119_WeatherInstitute_2F_Text_ShellyDefeat: @ 82704BD
 	.string "Ahahahaha!\n"
 	.string "You're disgustingly strong!$"
 
-Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4
+Route119_WeatherInstitute_2F_Text_ShellyPostBattle: @ 82704E4
 	.string "It's bad enough to have TEAM MAGMA\n"
 	.string "blunder about, but now there's you!\p"
 	.string "What makes you want to sniff around\n"
 	.string "in our business, anyway?$"
 
-Route119_WeatherInstitute_2F_Text_270568: @ 8270568
+Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy: @ 8270568
 	.string "We have a situation here!\p"
 	.string "A TEAM MAGMA mob just passed\n"
 	.string "the WEATHER INSTITUTE.\p"
 	.string "They appear to be headed for\n"
 	.string "MT. PYRE!$"
 
-Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD
+Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre: @ 82705DD
 	.string "What?!\p"
 	.string "We can't waste any more time here!\n"
 	.string "We have to hurry to MT. PYRE, too!\p"
 	.string "Ahahahaha!\n"
 	.string "TEAM MAGMA, just you wait!$"
 
-Route119_WeatherInstitute_2F_Text_270650: @ 8270650
+Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon: @ 8270650
 	.string "Thanks!\n"
 	.string "Thanks to you, we're safe!\p"
 	.string "It might be an odd way of thanking you,\n"
 	.string "but take this POKéMON.$"
 
-Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2
+@ Unused
+Route119_WeatherInstitute_2F_Text_NoRoomForPokemon: @ 82706B2
 	.string "Hm? You don't seem to have any room\n"
 	.string "for this POKéMON.$"
 
-Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8
+Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform: @ 82706E8
 	.string "{PLAYER} received CASTFORM!$"
 
-Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE
+Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather: @ 82706FE
 	.string "That POKéMON changes shape according\n"
 	.string "to the weather conditions.\p"
 	.string "There're plenty of them in the\n"
 	.string "INSTITUTE--go ahead and take it.$"
 
-Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
+Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous: @ 827077E
 	.string "I've been researching rain for many\n"
 	.string "years, but it's ridiculous to think that\l"
 	.string "humans can freely change the weather.$"
 
-WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1
+Route119_WeatherInstitute_2F_Text_GroudonWeather: @ 82707F1
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, a drought has been recorded\n"
@@ -319,7 +318,7 @@ WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873
+Route119_WeatherInstitute_2F_Text_KyogreWeather: @ 8270873
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, heavy rainfall has been\n"
@@ -327,7 +326,7 @@ WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC
+Route119_WeatherInstitute_2F_Text_NoAbnormalWeather: @ 82708FC
 	.string "Abnormal weather conditions are\n"
 	.string "no longer being reported.\p"
 	.string "The occasional rainfall is a blessing,\n"
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 47f472a3d..61e7d2892 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F57D7",
+      "script": "Route120_EventScript_Colin",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F57EE",
+      "script": "Route120_EventScript_Robert",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route120_EventScript_1F5850",
+      "script": "Route120_EventScript_Lorenzo",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route120_EventScript_1F5867",
+      "script": "Route120_EventScript_Jenna",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F587E",
+      "script": "Route120_EventScript_Jeffrey",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CE76",
+      "script": "GabbyAndTy_EventScript_TyBattle3",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CE56",
+      "script": "GabbyAndTy_EventScript_GabbyBattle3",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1F5527",
+      "script": "Route120_EventScript_BerryBeauty",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F58E0",
+      "script": "Route120_EventScript_Jennifer",
       "flag": "0"
     },
     {
@@ -347,7 +347,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F58F7",
+      "script": "Route120_EventScript_Chip",
       "flag": "0"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F590E",
+      "script": "Route120_EventScript_Clarissa",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5925",
+      "script": "Route120_EventScript_Angelica",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F593C",
+      "script": "Route120_EventScript_Keigo",
       "flag": "0"
     },
     {
@@ -477,7 +477,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5953",
+      "script": "Route120_EventScript_Riley",
       "flag": "0"
     },
     {
@@ -568,7 +568,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5981",
+      "script": "Route120_EventScript_Callie",
       "flag": "0"
     },
     {
@@ -581,7 +581,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F596A",
+      "script": "Route120_EventScript_Leonel",
       "flag": "0"
     },
     {
@@ -756,7 +756,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route120_EventScript_1F57C5"
+      "script": "Route120_EventScript_RouteSignFortree"
     },
     {
       "type": "sign",
@@ -764,7 +764,7 @@
       "y": 88,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route120_EventScript_1F57CE"
+      "script": "Route120_EventScript_RouteSign121"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 0629d8f0d..f4ef4da87 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -39,152 +39,152 @@ Route120_EventScript_RemoveKecleon:: @ 81F5460
 	return
 
 Route120_OnLoad: @ 81F5474
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490
-	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3
-	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_CloseAncientTomb
+	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeClearMetatiles
+	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeKecleonMovement
 	end
 
-Route120_EventScript_1F5490:: @ 81F5490
+Route120_EventScript_CloseAncientTomb:: @ 81F5490
 	setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
 	setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route120_EventScript_1F54A3:: @ 81F54A3
-	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
-	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
 	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
 	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	return
 
-Route120_EventScript_1F54C8:: @ 81F54C8
+Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8
 	setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route120_OnTransition: @ 81F54CD
-	call Route120_EventScript_28CCC7
-	call Route120_EventScript_1F54D8
+	call GabbyAndTy_EventScript_UpdateLocation
+	call Route120_EventScript_SetWeather
 	end
 
-Route120_EventScript_1F54D8:: @ 81F54D8
+Route120_EventScript_SetWeather:: @ 81F54D8
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 14
-	goto_if_le Route120_EventScript_1F5503
+	goto_if_le Route120_EventScript_SetSunnyWeather
 	compare VAR_TEMP_1, 60
-	goto_if_le Route120_EventScript_1F5507
+	goto_if_le Route120_EventScript_TrySetRainyWeather
 	compare VAR_TEMP_1, 61
-	goto_if_ge Route120_EventScript_1F54FF
+	goto_if_ge Route120_EventScript_SetCloudyWeather
 	return
 
-Route120_EventScript_1F54FF:: @ 81F54FF
+Route120_EventScript_SetCloudyWeather:: @ 81F54FF
 	setweather WEATHER_CLOUDS
 	return
 
-Route120_EventScript_1F5503:: @ 81F5503
+Route120_EventScript_SetSunnyWeather:: @ 81F5503
 	setweather WEATHER_SUNNY
 	return
 
-Route120_EventScript_1F5507:: @ 81F5507
+Route120_EventScript_TrySetRainyWeather:: @ 81F5507
 	compare VAR_TEMP_0, 7
-	goto_if_le Route120_EventScript_1F5523
+	goto_if_le Route120_EventScript_SetRainyWeather
 	compare VAR_TEMP_0, 19
-	goto_if_le Route120_EventScript_1F5503
-	goto Route120_EventScript_1F5523
+	goto_if_le Route120_EventScript_SetSunnyWeather
+	goto Route120_EventScript_SetRainyWeather
 	end
 
-Route120_EventScript_1F5523:: @ 81F5523
+Route120_EventScript_SetRainyWeather:: @ 81F5523
 	setweather WEATHER_RAIN_LIGHT
 	return
 
-Route120_EventScript_1F5527:: @ 81F5527
+Route120_EventScript_BerryBeauty:: @ 81F5527
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625
-	msgbox Route120_Text_2A70C7, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq Route120_EventScript_1F562F
-	compare VAR_RESULT, 0
-	call_if_eq Route120_EventScript_1F5638
+	goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_ReceivedBerry
+	msgbox Route120_Text_BerriesExpressionOfLoveIsntIt, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq Route120_EventScript_BerryLove
+	compare VAR_RESULT, NO
+	call_if_eq Route120_EventScript_BerryNotLove
 	specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit
 	switch VAR_RESULT
-	case 0, Route120_EventScript_1F55CA
-	case 5, Route120_EventScript_1F55CA
-	case 1, Route120_EventScript_1F55D5
-	case 6, Route120_EventScript_1F55D5
-	case 2, Route120_EventScript_1F55E0
-	case 7, Route120_EventScript_1F55E0
-	case 3, Route120_EventScript_1F55EB
-	case 8, Route120_EventScript_1F55EB
-	case 4, Route120_EventScript_1F55F6
-	case 9, Route120_EventScript_1F55F6
-	end
-
-Route120_EventScript_1F55CA:: @ 81F55CA
+	case 0, Route120_EventScript_GiveFigyBerry
+	case 5, Route120_EventScript_GiveFigyBerry
+	case 1, Route120_EventScript_GiveWikiBerry
+	case 6, Route120_EventScript_GiveWikiBerry
+	case 2, Route120_EventScript_GiveMagoBerry
+	case 7, Route120_EventScript_GiveMagoBerry
+	case 3, Route120_EventScript_GiveAguavBerry
+	case 8, Route120_EventScript_GiveAguavBerry
+	case 4, Route120_EventScript_GiveIapapaBerry
+	case 9, Route120_EventScript_GiveIapapaBerry
+	end
+
+Route120_EventScript_GiveFigyBerry:: @ 81F55CA
 	setvar VAR_0x8004, ITEM_FIGY_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55D5:: @ 81F55D5
+Route120_EventScript_GiveWikiBerry:: @ 81F55D5
 	setvar VAR_0x8004, ITEM_WIKI_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55E0:: @ 81F55E0
+Route120_EventScript_GiveMagoBerry:: @ 81F55E0
 	setvar VAR_0x8004, ITEM_MAGO_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55EB:: @ 81F55EB
+Route120_EventScript_GiveAguavBerry:: @ 81F55EB
 	setvar VAR_0x8004, ITEM_AGUAV_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55F6:: @ 81F55F6
+Route120_EventScript_GiveIapapaBerry:: @ 81F55F6
 	setvar VAR_0x8004, ITEM_IAPAPA_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F5601:: @ 81F5601
+Route120_EventScript_GiveBerry:: @ 81F5601
 	giveitem_std VAR_0x8004
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY
-	msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
+	msgbox Route120_Text_BerryIsRareRaiseItWithCare, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F5625:: @ 81F5625
-	msgbox Route120_Text_2A7217, MSGBOX_DEFAULT
+Route120_EventScript_ReceivedBerry:: @ 81F5625
+	msgbox Route120_Text_IllGetMoreBerriesFromBerryMaster, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F562F:: @ 81F562F
-	msgbox Route120_Text_2A7147, MSGBOX_DEFAULT
+Route120_EventScript_BerryLove:: @ 81F562F
+	msgbox Route120_Text_YesYouUnderstand, MSGBOX_DEFAULT
 	return
 
-Route120_EventScript_1F5638:: @ 81F5638
-	msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
+Route120_EventScript_BerryNotLove:: @ 81F5638
+	msgbox Route120_Text_MakeYourOwnImpressions, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_Steven:: @ 81F5641
 	lock
 	faceplayer
-	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672
+	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_StevenAskReadyForBattle
 	msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq Route120_EventScript_StevenNotReady
 	goto Route120_EventScript_StevenBattleKecleon
 	end
 
 Route120_EventScript_StevenNotReady:: @ 81F5665
-	msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
+	msgbox Route120_Text_StevenIllWaitHere, MSGBOX_DEFAULT
 	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120
 	release
 	end
 
-Route120_EventScript_1F5672:: @ 81F5672
+Route120_EventScript_StevenAskReadyForBattle:: @ 81F5672
 	msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq Route120_EventScript_StevenNotReady
 	goto Route120_EventScript_StevenBattleKecleon
 	end
@@ -249,8 +249,8 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
 	delay 15
 	removeobject 31
 	waitfieldeffect FLDEFF_NPCFLY_OUT
-	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
-	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
 	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
 	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	special DrawWholeMapView
@@ -276,111 +276,111 @@ Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
 	msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
 	end
 
-Route120_EventScript_1F57C5:: @ 81F57C5
-	msgbox Route120_Text_1F5DCB, MSGBOX_SIGN
+Route120_EventScript_RouteSignFortree:: @ 81F57C5
+	msgbox Route120_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route120_EventScript_1F57CE:: @ 81F57CE
-	msgbox Route120_Text_1F5DE4, MSGBOX_SIGN
+Route120_EventScript_RouteSign121:: @ 81F57CE
+	msgbox Route120_Text_RouteSign121, MSGBOX_SIGN
 	end
 
-Route120_EventScript_1F57D7:: @ 81F57D7
-	trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665
-	msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE
+Route120_EventScript_Colin:: @ 81F57D7
+	trainerbattle_single TRAINER_COLIN, Route120_Text_ColinIntro, Route120_Text_ColinDefeat
+	msgbox Route120_Text_ColinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F57EE:: @ 81F57EE
-	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
+Route120_EventScript_Robert:: @ 81F57EE
+	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_RobertIntro, Route120_Text_RobertDefeat, Route120_EventScript_RegisterRobert
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route120_EventScript_1F5839
-	msgbox Route120_Text_29E726, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route120_EventScript_RematchRobert
+	msgbox Route120_Text_RobertPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F581A:: @ 81F581A
-	special sub_80B4808
+Route120_EventScript_RegisterRobert:: @ 81F581A
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route120_Text_29E75D, MSGBOX_DEFAULT
+	msgbox Route120_Text_RobertRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROBERT_1
 	release
 	end
 
-Route120_EventScript_1F5839:: @ 81F5839
-	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1
-	msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE
+Route120_EventScript_RematchRobert:: @ 81F5839
+	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_RobertRematchIntro, Route120_Text_RobertRematchDefeat
+	msgbox Route120_Text_RobertPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5850:: @ 81F5850
-	trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884
-	msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE
+Route120_EventScript_Lorenzo:: @ 81F5850
+	trainerbattle_single TRAINER_LORENZO, Route120_Text_LorenzoIntro, Route120_Text_LorenzoDefeat
+	msgbox Route120_Text_LorenzoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5867:: @ 81F5867
-	trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980
-	msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE
+Route120_EventScript_Jenna:: @ 81F5867
+	trainerbattle_single TRAINER_JENNA, Route120_Text_JennaIntro, Route120_Text_JennaDefeat
+	msgbox Route120_Text_JennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F587E:: @ 81F587E
-	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
+Route120_EventScript_Jeffrey:: @ 81F587E
+	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_JeffreyIntro, Route120_Text_JeffreyDefeat, Route120_EventScript_RegisterJeffrey
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route120_EventScript_1F58C9
-	msgbox Route120_Text_29EA08, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route120_EventScript_RematchJeffrey
+	msgbox Route120_Text_JeffreyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F58AA:: @ 81F58AA
-	special sub_80B4808
+Route120_EventScript_RegisterJeffrey:: @ 81F58AA
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route120_Text_29EA31, MSGBOX_DEFAULT
+	msgbox Route120_Text_JeffreyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JEFFREY_1
 	release
 	end
 
-Route120_EventScript_1F58C9:: @ 81F58C9
-	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F
-	msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE
+Route120_EventScript_RematchJeffrey:: @ 81F58C9
+	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_JeffreyRematchIntro, Route120_Text_JeffreyRematchDefeat
+	msgbox Route120_Text_JeffreyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F58E0:: @ 81F58E0
-	trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53
-	msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE
+Route120_EventScript_Jennifer:: @ 81F58E0
+	trainerbattle_single TRAINER_JENNIFER, Route120_Text_JenniferIntro, Route120_Text_JenniferDefeat
+	msgbox Route120_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F58F7:: @ 81F58F7
-	trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25
-	msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE
+Route120_EventScript_Chip:: @ 81F58F7
+	trainerbattle_single TRAINER_CHIP, Route120_Text_ChipIntro, Route120_Text_ChipDefeat
+	msgbox Route120_Text_ChipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F590E:: @ 81F590E
-	trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF
-	msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE
+Route120_EventScript_Clarissa:: @ 81F590E
+	trainerbattle_single TRAINER_CLARISSA, Route120_Text_ClarissaIntro, Route120_Text_ClarissaDefeat
+	msgbox Route120_Text_ClarissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5925:: @ 81F5925
-	trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3
-	msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE
+Route120_EventScript_Angelica:: @ 81F5925
+	trainerbattle_single TRAINER_ANGELICA, Route120_Text_AngelicaIntro, Route120_Text_AngelicaDefeat
+	msgbox Route120_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F593C:: @ 81F593C
-	trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97
-	msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE
+Route120_EventScript_Keigo:: @ 81F593C
+	trainerbattle_single TRAINER_KEIGO, Route120_Text_KeigoIntro, Route120_Text_KeigoDefeat
+	msgbox Route120_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5953:: @ 81F5953
-	trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63
-	msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE
+Route120_EventScript_Riley:: @ 81F5953
+	trainerbattle_single TRAINER_RILEY, Route120_Text_RileyIntro, Route120_Text_RileyDefeat
+	msgbox Route120_Text_RileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F596A:: @ 81F596A
-	trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080
-	msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE
+Route120_EventScript_Leonel:: @ 81F596A
+	trainerbattle_single TRAINER_LEONEL, Route120_Text_LeonelIntro, Route120_Text_LeonelDefeat
+	msgbox Route120_Text_LeonelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5981:: @ 81F5981
-	trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1
-	msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
+Route120_EventScript_Callie:: @ 81F5981
+	trainerbattle_single TRAINER_CALLIE, Route120_Text_CallieIntro, Route120_Text_CallieDefeat
+	msgbox Route120_Text_CalliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 Route120_Text_StevenGreeting: @ 81F5998
@@ -396,7 +396,7 @@ Route120_Text_StevenGreeting: @ 81F5998
 	.string "{PLAYER}{KUN}, are your POKéMON ready for\n"
 	.string "battle?$"
 
-Route120_Text_1F5AAC: @ 81F5AAC
+Route120_Text_StevenIllWaitHere: @ 81F5AAC
 	.string "STEVEN: No?\p"
 	.string "I'll wait here, so you can get ready.$"
 
@@ -444,10 +444,10 @@ Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63
 	.string "visible!\p"
 	.string "The startled POKéMON attacked!$"
 
-Route120_Text_1F5DCB: @ 81F5DCB
+Route120_Text_RouteSignFortree: @ 81F5DCB
 	.string "ROUTE 120\n"
 	.string "{LEFT_ARROW} FORTREE CITY$"
 
-Route120_Text_1F5DE4: @ 81F5DE4
+Route120_Text_RouteSign121: @ 81F5DE4
 	.string "{RIGHT_ARROW} ROUTE 121\n"
 	.string "{LEFT_ARROW} ROUTE 120$"
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index 9382ab375..9d91c47d1 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_1F5DFD",
+      "script": "Route121_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route121_EventScript_1F5F04",
+      "script": "Route121_EventScript_Kate",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route121_EventScript_1F5F1F",
+      "script": "Route121_EventScript_Joy",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5E74",
+      "script": "Route121_EventScript_Vanessa",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route121_EventScript_1F5E8B",
+      "script": "Route121_EventScript_Walter",
       "flag": "0"
     },
     {
@@ -274,7 +274,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5EED",
+      "script": "Route121_EventScript_Tammy",
       "flag": "0"
     },
     {
@@ -287,7 +287,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5F3A",
+      "script": "Route121_EventScript_Jessica",
       "flag": "0"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route121_EventScript_1F5F9C",
+      "script": "Route121_EventScript_Cale",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5FB3",
+      "script": "Route121_EventScript_Myles",
       "flag": "0"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5FCA",
+      "script": "Route121_EventScript_Pat",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route121_EventScript_1F5FE1",
+      "script": "Route121_EventScript_Marcel",
       "flag": "0"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route121_EventScript_1F5FF8",
+      "script": "Route121_EventScript_Cristin",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -434,7 +434,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -443,7 +443,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -452,7 +452,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     }
   ],
   "bg_events": [
@@ -462,7 +462,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route121_EventScript_1F5E06"
+      "script": "Route121_EventScript_MtPyrePierSign"
     },
     {
       "type": "secret_base",
@@ -498,7 +498,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route121_EventScript_1F5E0F"
+      "script": "Route121_EventScript_SafariZoneSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index 6aa82857f..81330b6e8 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -1,28 +1,28 @@
 Route121_MapScripts:: @ 81F5DFC
 	.byte 0
 
-Route121_EventScript_1F5DFD:: @ 81F5DFD
-	msgbox Route121_Text_1F607F, MSGBOX_NPC
+Route121_EventScript_Woman:: @ 81F5DFD
+	msgbox Route121_Text_AheadLoomsMtPyre, MSGBOX_NPC
 	end
 
-Route121_EventScript_1F5E06:: @ 81F5E06
-	msgbox Route121_Text_1F60D3, MSGBOX_SIGN
+Route121_EventScript_MtPyrePierSign:: @ 81F5E06
+	msgbox Route121_Text_MtPyrePierSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_1F5E0F:: @ 81F5E0F
-	msgbox Route121_Text_1F611E, MSGBOX_SIGN
+Route121_EventScript_SafariZoneSign:: @ 81F5E0F
+	msgbox Route121_Text_SafariZoneSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_1F5E18:: @ 81F5E18
+Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18
 	lockall
 	playbgm MUS_AQA_0, 0
 	applymovement 13, Common_Movement_WalkInPlaceRight
 	waitmovement 0
-	msgbox Route121_Text_1F605A, MSGBOX_DEFAULT
+	msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, Route121_Movement_1F5E59
-	applymovement 13, Route121_Movement_1F5E62
-	applymovement 14, Route121_Movement_1F5E6B
+	applymovement 12, Route121_Movement_Grunt1Exit
+	applymovement 13, Route121_Movement_Grunt2Exit
+	applymovement 14, Route121_Movement_Grunt3Exit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 12
@@ -32,7 +32,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18
 	releaseall
 	end
 
-Route121_Movement_1F5E59: @ 81F5E59
+Route121_Movement_Grunt1Exit: @ 81F5E59
 	walk_down
 	walk_down
 	walk_down
@@ -43,7 +43,7 @@ Route121_Movement_1F5E59: @ 81F5E59
 	walk_down
 	step_end
 
-Route121_Movement_1F5E62: @ 81F5E62
+Route121_Movement_Grunt2Exit: @ 81F5E62
 	walk_down
 	walk_down
 	walk_down
@@ -54,7 +54,7 @@ Route121_Movement_1F5E62: @ 81F5E62
 	walk_down
 	step_end
 
-Route121_Movement_1F5E6B: @ 81F5E6B
+Route121_Movement_Grunt3Exit: @ 81F5E6B
 	walk_down
 	walk_down
 	walk_down
@@ -65,127 +65,127 @@ Route121_Movement_1F5E6B: @ 81F5E6B
 	walk_down
 	step_end
 
-Route121_EventScript_1F5E74:: @ 81F5E74
-	trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F
-	msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE
+Route121_EventScript_Vanessa:: @ 81F5E74
+	trainerbattle_single TRAINER_VANESSA, Route121_Text_VanessaIntro, Route121_Text_VanessaDefeat
+	msgbox Route121_Text_VanessaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5E8B:: @ 81F5E8B
-	trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
+Route121_EventScript_Walter:: @ 81F5E8B
+	trainerbattle_single TRAINER_WALTER_1, Route121_Text_WalterIntro, Route121_Text_WalterDefeat, Route121_EventScript_RegisterWalter
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F5ED6
-	msgbox Route121_Text_29F21E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchWalter
+	msgbox Route121_Text_WalterPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F5EB7:: @ 81F5EB7
-	special sub_80B4808
+Route121_EventScript_RegisterWalter:: @ 81F5EB7
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F25B, MSGBOX_DEFAULT
+	msgbox Route121_Text_WalterRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WALTER_1
 	release
 	end
 
-Route121_EventScript_1F5ED6:: @ 81F5ED6
-	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A
-	msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchWalter:: @ 81F5ED6
+	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_WalterRematchIntro, Route121_Text_WalterRematchDefeat
+	msgbox Route121_Text_WalterPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5EED:: @ 81F5EED
-	trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9
-	msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE
+Route121_EventScript_Tammy:: @ 81F5EED
+	trainerbattle_single TRAINER_TAMMY, Route121_Text_TammyIntro, Route121_Text_TammyDefeat
+	msgbox Route121_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F04:: @ 81F5F04
-	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
-	msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE
+Route121_EventScript_Kate:: @ 81F5F04
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_KateIntro, Route121_Text_KateDefeat, Route121_Text_KateNotEnoughMons
+	msgbox Route121_Text_KatePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F1F:: @ 81F5F1F
-	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
-	msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE
+Route121_EventScript_Joy:: @ 81F5F1F
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_JoyIntro, Route121_Text_JoyDefeat, Route121_Text_JoyNotEnoughMons
+	msgbox Route121_Text_JoyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F3A:: @ 81F5F3A
-	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
+Route121_EventScript_Jessica:: @ 81F5F3A
+	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_JessicaIntro, Route121_Text_JessicaDefeat, Route121_EventScript_RegisterJessica
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F5F85
-	msgbox Route121_Text_29F66F, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchJessica
+	msgbox Route121_Text_JessicaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F5F66:: @ 81F5F66
-	special sub_80B4808
+Route121_EventScript_RegisterJessica:: @ 81F5F66
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F69F, MSGBOX_DEFAULT
+	msgbox Route121_Text_JessicaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JESSICA_1
 	release
 	end
 
-Route121_EventScript_1F5F85:: @ 81F5F85
-	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710
-	msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchJessica:: @ 81F5F85
+	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_JessicaRematchIntro, Route121_Text_JessicaRematchDefeat
+	msgbox Route121_Text_JessicaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F9C:: @ 81F5F9C
-	trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B
-	msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE
+Route121_EventScript_Cale:: @ 81F5F9C
+	trainerbattle_single TRAINER_CALE, Route121_Text_CaleIntro, Route121_Text_CaleDefeat
+	msgbox Route121_Text_CalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FB3:: @ 81F5FB3
-	trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64
-	msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE
+Route121_EventScript_Myles:: @ 81F5FB3
+	trainerbattle_single TRAINER_MYLES, Route121_Text_MylesIntro, Route121_Text_MylesDefeat
+	msgbox Route121_Text_MylesPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FCA:: @ 81F5FCA
-	trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8
-	msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE
+Route121_EventScript_Pat:: @ 81F5FCA
+	trainerbattle_single TRAINER_PAT, Route121_Text_PatIntro, Route121_Text_PatDefeat
+	msgbox Route121_Text_PatPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FE1:: @ 81F5FE1
-	trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C
-	msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE
+Route121_EventScript_Marcel:: @ 81F5FE1
+	trainerbattle_single TRAINER_MARCEL, Route121_Text_MarcelIntro, Route121_Text_MarcelDefeat
+	msgbox Route121_Text_MarcelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FF8:: @ 81F5FF8
-	trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
+Route121_EventScript_Cristin:: @ 81F5FF8
+	trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_CristinIntro, Route121_Text_CristinDefeat, Route121_EventScript_RegisterCristin
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F6043
-	msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchCristin
+	msgbox Route121_Text_CristinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F6024:: @ 81F6024
-	special sub_80B4808
+Route121_EventScript_RegisterCristin:: @ 81F6024
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F80D, MSGBOX_DEFAULT
+	msgbox Route121_Text_CristinRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CRISTIN_1
 	release
 	end
 
-Route121_EventScript_1F6043:: @ 81F6043
-	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8
-	msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchCristin:: @ 81F6043
+	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_CristinRematchIntro, Route121_Text_CristinRematchDefeat
+	msgbox Route121_Text_CristinPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_Text_1F605A: @ 81F605A
+Route121_Text_OkayMoveOutToMtPyre: @ 81F605A
 	.string "Okay!\n"
 	.string "We're to move out to MT. PYRE!$"
 
-Route121_Text_1F607F: @ 81F607F
+Route121_Text_AheadLoomsMtPyre: @ 81F607F
 	.string "Ahead looms MT. PYRE…\p"
 	.string "It is a natural monument to the spirits \n"
 	.string "of departed POKéMON…$"
 
-Route121_Text_1F60D3: @ 81F60D3
+Route121_Text_MtPyrePierSign: @ 81F60D3
 	.string "MT. PYRE PIER\p"
 	.string "…The sign is old and worn out.\n"
 	.string "The words are barely legible…$"
 
-Route121_Text_1F611E: @ 81F611E
+Route121_Text_SafariZoneSign: @ 81F611E
 	.string "“Filled with rare POKéMON!”\n"
 	.string "SAFARI ZONE$"
 
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 054f6cee8..6da6396be 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -33,7 +33,7 @@ Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF
 	lock
 	faceplayer
 	msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo
 	msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT
 	release
@@ -50,7 +50,7 @@ Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18
 	waitmovement 0
 	showmoneybox 0, 0, 0
 	msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone
 	msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
@@ -75,8 +75,6 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
 	msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
 	closemessage
 	hidemoneybox
-	nop
-	nop
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone
 	waitmovement 0
 	special EnterSafariMode
@@ -113,8 +111,6 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
 Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
 	closemessage
 	hidemoneybox
-	nop
-	nop
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter
 	waitmovement 0
 	releaseall
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index c13d17a0c..fc4af6b3c 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F61C5",
+      "script": "Route123_EventScript_Wendy",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F61DC",
+      "script": "Route123_EventScript_Braxton",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_1F6151",
+      "script": "Route123_EventScript_GigaDrainGirl",
       "flag": "0"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F61F3",
+      "script": "Route123_EventScript_Violet",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F62E9",
+      "script": "Route123_EventScript_Yuki",
       "flag": "0"
     },
     {
@@ -386,7 +386,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F62CE",
+      "script": "Route123_EventScript_Miu",
       "flag": "0"
     },
     {
@@ -399,7 +399,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route123_EventScript_1F620A",
+      "script": "Route123_EventScript_Cameron",
       "flag": "0"
     },
     {
@@ -412,7 +412,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F626C",
+      "script": "Route123_EventScript_Jacki",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route123_EventScript_1F6304",
+      "script": "Route123_EventScript_Kindra",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F6377",
+      "script": "Route123_EventScript_Jonas",
       "flag": "0"
     },
     {
@@ -477,7 +477,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F6360",
+      "script": "Route123_EventScript_Kayley",
       "flag": "0"
     },
     {
@@ -490,7 +490,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route123_EventScript_1F6349",
+      "script": "Route123_EventScript_Ed",
       "flag": "0"
     },
     {
@@ -503,7 +503,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F63BC",
+      "script": "Route123_EventScript_Fernando",
       "flag": "0"
     },
     {
@@ -516,7 +516,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F6332",
+      "script": "Route123_EventScript_Alberto",
       "flag": "0"
     },
     {
@@ -529,7 +529,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F631B",
+      "script": "Route123_EventScript_Frederick",
       "flag": "0"
     },
     {
@@ -555,7 +555,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route123_EventScript_1F638E",
+      "script": "Route123_EventScript_Jazmyn",
       "flag": "0"
     },
     {
@@ -568,7 +568,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route123_EventScript_1F63A5",
+      "script": "Route123_EventScript_Davis",
       "flag": "0"
     },
     {
@@ -757,7 +757,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61B3"
+      "script": "Route123_EventScript_RouteSignMtPyre"
     },
     {
       "type": "secret_base",
@@ -779,7 +779,7 @@
       "y": 12,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61AA"
+      "script": "Route123_EventScript_RouteSign"
     },
     {
       "type": "hidden_item",
@@ -795,7 +795,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61BC"
+      "script": "Route123_EventScript_BerryMastersHouseSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index ce74cbadc..b74b16865 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -6,198 +6,198 @@ Route123_OnTransition: @ 81F614D
 	special SetRoute123Weather
 	end
 
-Route123_EventScript_1F6151:: @ 81F6151
+Route123_EventScript_GigaDrainGirl:: @ 81F6151
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_1F61A0
-	msgbox Route123_Text_1F641E, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain
+	msgbox Route123_Text_LoveGrassMonsHaveAny, MSGBOX_DEFAULT
 	special IsGrassTypeInParty
-	compare VAR_RESULT, 0
-	goto_if_eq Route123_EventScript_1F619E
-	msgbox Route123_Text_1F645D, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route123_EventScript_NoGrassMons
+	msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM19
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM19
-	msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT
+	msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F619E:: @ 81F619E
+Route123_EventScript_NoGrassMons:: @ 81F619E
 	release
 	end
 
-Route123_EventScript_1F61A0:: @ 81F61A0
-	msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT
+Route123_EventScript_ReceivedGigaDrain:: @ 81F61A0
+	msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F61AA:: @ 81F61AA
-	msgbox Route123_Text_1F6511, MSGBOX_SIGN
+Route123_EventScript_RouteSign:: @ 81F61AA
+	msgbox Route123_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61B3:: @ 81F61B3
-	msgbox Route123_Text_1F6529, MSGBOX_SIGN
+Route123_EventScript_RouteSignMtPyre:: @ 81F61B3
+	msgbox Route123_Text_RouteSignMtPyre, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61BC:: @ 81F61BC
-	msgbox Route123_Text_1F6557, MSGBOX_SIGN
+Route123_EventScript_BerryMastersHouseSign:: @ 81F61BC
+	msgbox Route123_Text_BerryMastersHouse, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61C5:: @ 81F61C5
-	trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23
-	msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE
+Route123_EventScript_Wendy:: @ 81F61C5
+	trainerbattle_single TRAINER_WENDY, Route123_Text_WendyIntro, Route123_Text_WendyDefeat
+	msgbox Route123_Text_WendyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F61DC:: @ 81F61DC
-	trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6
-	msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE
+Route123_EventScript_Braxton:: @ 81F61DC
+	trainerbattle_single TRAINER_BRAXTON, Route123_Text_BraxtonIntro, Route123_Text_BraxtonDefeat
+	msgbox Route123_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F61F3:: @ 81F61F3
-	trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53
-	msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE
+Route123_EventScript_Violet:: @ 81F61F3
+	trainerbattle_single TRAINER_VIOLET, Route123_Text_VioletIntro, Route123_Text_VioletDefeat
+	msgbox Route123_Text_VioletPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F620A:: @ 81F620A
-	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236
+Route123_EventScript_Cameron:: @ 81F620A
+	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F6255
-	msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchCameron
+	msgbox Route123_Text_CameronPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F6236:: @ 81F6236
-	special sub_80B4808
+Route123_EventScript_RegisterCameron:: @ 81F6236
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_29FE70, MSGBOX_DEFAULT
+	msgbox Route123_Text_CameronRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CAMERON_1
 	release
 	end
 
-Route123_EventScript_1F6255:: @ 81F6255
-	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B
-	msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchCameron:: @ 81F6255
+	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_CameronRematchIntro, Route123_Text_CameronRematchDefeat
+	msgbox Route123_Text_CameronPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F626C:: @ 81F626C
-	trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298
+Route123_EventScript_Jacki:: @ 81F626C
+	trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F62B7
-	msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchJacki
+	msgbox Route123_Text_JackiPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F6298:: @ 81F6298
-	special sub_80B4808
+Route123_EventScript_RegisterJacki:: @ 81F6298
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_2A0027, MSGBOX_DEFAULT
+	msgbox Route123_Text_JackiRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JACKI_1
 	release
 	end
 
-Route123_EventScript_1F62B7:: @ 81F62B7
-	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D
-	msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchJacki:: @ 81F62B7
+	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_JackiRematchIntro, Route123_Text_JackiRematchDefeat
+	msgbox Route123_Text_JackiPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F62CE:: @ 81F62CE
-	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D
-	msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE
+Route123_EventScript_Miu:: @ 81F62CE
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_MiuIntro, Route123_Text_MiuDefeat, Route123_Text_MiuNotEnoughMons
+	msgbox Route123_Text_MiuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F62E9:: @ 81F62E9
-	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224
-	msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE
+Route123_EventScript_Yuki:: @ 81F62E9
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_YukiIntro, Route123_Text_YukiDefeat, Route123_Text_YukiNotEnoughMons
+	msgbox Route123_Text_YukiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6304:: @ 81F6304
-	trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6
-	msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE
+Route123_EventScript_Kindra:: @ 81F6304
+	trainerbattle_single TRAINER_KINDRA, Route123_Text_KindraIntro, Route123_Text_KindraDefeat
+	msgbox Route123_Text_KindraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F631B:: @ 81F631B
-	trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631
-	msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE
+Route123_EventScript_Frederick:: @ 81F631B
+	trainerbattle_single TRAINER_FREDRICK, Route123_Text_FrederickIntro, Route123_Text_FrederickDefeat
+	msgbox Route123_Text_FrederickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6332:: @ 81F6332
-	trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704
-	msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE
+Route123_EventScript_Alberto:: @ 81F6332
+	trainerbattle_single TRAINER_ALBERTO, Route123_Text_AlbertoIntro, Route123_Text_AlbertoDefeat
+	msgbox Route123_Text_AlbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6349:: @ 81F6349
-	trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0
-	msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE
+Route123_EventScript_Ed:: @ 81F6349
+	trainerbattle_single TRAINER_ED, Route123_Text_EdIntro, Route123_Text_EdDefeat
+	msgbox Route123_Text_EdPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6360:: @ 81F6360
-	trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943
-	msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE
+Route123_EventScript_Kayley:: @ 81F6360
+	trainerbattle_single TRAINER_KAYLEY, Route123_Text_KayleyIntro, Route123_Text_KayleyDefeat
+	msgbox Route123_Text_KayleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6377:: @ 81F6377
-	trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A
-	msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE
+Route123_EventScript_Jonas:: @ 81F6377
+	trainerbattle_single TRAINER_JONAS, Route123_Text_JonasIntro, Route123_Text_JonasDefeat
+	msgbox Route123_Text_JonasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F638E:: @ 81F638E
-	trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592
-	msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE
+Route123_EventScript_Jazmyn:: @ 81F638E
+	trainerbattle_single TRAINER_JAZMYN, Route123_Text_JazmynIntro, Route123_Text_JazmynDefeat
+	msgbox Route123_Text_JazmynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F63A5:: @ 81F63A5
-	trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE
-	msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE
+Route123_EventScript_Davis:: @ 81F63A5
+	trainerbattle_single TRAINER_DAVIS, Route123_Text_DavisIntro, Route123_Text_DavisDefeat
+	msgbox Route123_Text_DavisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F63BC:: @ 81F63BC
-	trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8
+Route123_EventScript_Fernando:: @ 81F63BC
+	trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F6407
-	msgbox Route123_Text_2A0389, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchFernando
+	msgbox Route123_Text_FernandoPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F63E8:: @ 81F63E8
-	special sub_80B4808
+Route123_EventScript_RegisterFernando:: @ 81F63E8
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT
+	msgbox Route123_Text_FernandoRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_FERNANDO_1
 	release
 	end
 
-Route123_EventScript_1F6407:: @ 81F6407
-	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A
-	msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchFernando:: @ 81F6407
+	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_FernandoRematchIntro, Route123_Text_FernandoRematchDefeat
+	msgbox Route123_Text_FernandoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_Text_1F641E: @ 81F641E
+Route123_Text_LoveGrassMonsHaveAny: @ 81F641E
 	.string "I love GRASS-type POKéMON!\p"
 	.string "Do you have any GRASS-type POKéMON?$"
 
-Route123_Text_1F645D: @ 81F645D
+Route123_Text_YouLikeGrassMonsTooHaveThis: @ 81F645D
 	.string "Oh?\p"
 	.string "You like GRASS-type POKéMON, too,\n"
 	.string "don't you?\p"
 	.string "I'm so happy, you can have this!\n"
 	.string "It's a token of our friendship.$"
 
-Route123_Text_1F64CF: @ 81F64CF
+Route123_Text_CheckTreesWithMyGrassMon: @ 81F64CF
 	.string "I check trees with my GRASS-type\n"
 	.string "POKéMON. I'm like a tree doctor.$"
 
-Route123_Text_1F6511: @ 81F6511
+Route123_Text_RouteSign: @ 81F6511
 	.string "{RIGHT_ARROW} ROUTE 123\n"
 	.string "{LEFT_ARROW} ROUTE 118$"
 
-Route123_Text_1F6529: @ 81F6529
+Route123_Text_RouteSignMtPyre: @ 81F6529
 	.string "{UP_ARROW} MT. PYRE\n"
 	.string "“Forbidden to the faint of heart.”$"
 
-Route123_Text_1F6557: @ 81F6557
+Route123_Text_BerryMastersHouse: @ 81F6557
 	.string "BERRY MASTER'S HOUSE$"
 
diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json
index c87feb2bc..b7f2523af 100644
--- a/data/maps/Route123_BerryMastersHouse/map.json
+++ b/data/maps/Route123_BerryMastersHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_BerryMastersHouse_EventScript_26F845",
+      "script": "Route123_BerryMastersHouse_EventScript_BerryMaster",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_BerryMastersHouse_EventScript_26F8C0",
+      "script": "Route123_BerryMastersHouse_EventScript_BerryMastersWife",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 979509440..9e63dc608 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -6,141 +6,141 @@ Route123_BerryMastersHouse_OnTransition: @ 826F841
 	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end
 
-Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
+Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6
-	msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
-	random 10
-	addvar VAR_RESULT, 20
+	goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_ReceivedBerryToday
+	msgbox Route123_BerryMastersHouse_Text_YoureDeservingOfBerry, MSGBOX_DEFAULT
+	random NUM_BERRY_MASTER_BERRIES
+	addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY
-	msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
-	random 10
-	addvar VAR_RESULT, 20
+	msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT
+	random NUM_BERRY_MASTER_BERRIES
+	addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT
+	msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6
-	msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6
+	msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
+Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
-	msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday
+	msgbox Route123_BerryMastersHouse_Text_HeardAGoodSayingLately, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F909
-	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase
 	end
 
-Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7
-	msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT
-	msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7
+	msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT
+	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
-	compare VAR_0x8004, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C
-	compare VAR_0x8004, 1
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A
-	compare VAR_0x8004, 2
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB
-	compare VAR_0x8004, 3
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC
-	compare VAR_0x8004, 4
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D
-	compare VAR_0x8004, 5
-	goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E
+Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909
+	compare VAR_0x8004, NOT_SPECIAL_PHRASE
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	compare VAR_0x8004, PHRASE_GREAT_BATTLE
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry
+	compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry
+	compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry
+	compare VAR_0x8004, PHRASE_COOL_LATIOS
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry
+	compare VAR_0x8004, PHRASE_SUPER_HUSTLE
+	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
-	msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT
-	random 10
+Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C
+	msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT
+	random NUM_BERRY_MASTER_WIFE_BERRIES
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
-	goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C
-	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A
+	goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_SPELON_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SPELON_BERRY
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
-	goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C
-	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB
+	goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_PAMTRE_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_PAMTRE_BERRY
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
-	goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C
-	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC
+	goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_WATMEL_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WATMEL_BERRY
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
-	goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C
-	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D
+	goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_DURIN_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_DURIN_BERRY
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
-	goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C
-	msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E
+	goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
+	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_BELUE_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_BELUE_BERRY
-	goto Route123_BerryMastersHouse_EventScript_26FA79
+	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F
-	msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
+Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F
+	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79
+Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79
 	setflag FLAG_DAILY_BERRY_MASTERS_WIFE
-	msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT
+	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 913208954..01bc84377 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route124_EventScript_1F6585",
+      "script": "Route124_EventScript_Spencer",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route124_EventScript_1F659C",
+      "script": "Route124_EventScript_Roland",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route124_EventScript_1F65B3",
+      "script": "Route124_EventScript_Jenny",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 8,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route124_EventScript_1F6615",
+      "script": "Route124_EventScript_Grace",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route124_EventScript_1F662C",
+      "script": "Route124_EventScript_Chad",
       "flag": "0"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route124_EventScript_1F6643",
+      "script": "Route124_EventScript_Lila",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route124_EventScript_1F66A7",
+      "script": "Route124_EventScript_Roy",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route124_EventScript_1F670B",
+      "script": "Route124_EventScript_Declan",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route124_EventScript_1F6722",
+      "script": "Route124_EventScript_Isabella",
       "flag": "0"
     }
   ],
@@ -214,7 +214,7 @@
       "y": 48,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route124_EventScript_1F657C"
+      "script": "Route124_EventScript_HuntersHouseSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 9a11cec2c..8d0837320 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -3,105 +3,105 @@ Route124_MapScripts:: @ 81F656C
 	.byte 0
 
 Route124_OnTransition: @ 81F6572
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route124_EventScript_1F657C:: @ 81F657C
-	msgbox Route124_Text_1F6739, MSGBOX_SIGN
+Route124_EventScript_HuntersHouseSign:: @ 81F657C
+	msgbox Route124_Text_HuntersHouse, MSGBOX_SIGN
 	end
 
-Route124_EventScript_1F6585:: @ 81F6585
-	trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
-	msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
+Route124_EventScript_Spencer:: @ 81F6585
+	trainerbattle_single TRAINER_SPENCER, Route124_Text_SpencerIntro, Route124_Text_SpencerDefeat
+	msgbox Route124_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F659C:: @ 81F659C
-	trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
-	msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
+Route124_EventScript_Roland:: @ 81F659C
+	trainerbattle_single TRAINER_ROLAND, Route124_Text_RolandIntro, Route124_Text_RolandDefeat
+	msgbox Route124_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F65B3:: @ 81F65B3
-	trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
+Route124_EventScript_Jenny:: @ 81F65B3
+	trainerbattle_single TRAINER_JENNY_1, Route124_Text_JennyIntro, Route124_Text_JennyDefeat, Route124_EventScript_RegisterJenny
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F65FE
-	msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchJenny
+	msgbox Route124_Text_JennyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F65DF:: @ 81F65DF
-	special sub_80B4808
+Route124_EventScript_RegisterJenny:: @ 81F65DF
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT
+	msgbox Route124_Text_JennyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JENNY_1
 	release
 	end
 
-Route124_EventScript_1F65FE:: @ 81F65FE
-	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
-	msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchJenny:: @ 81F65FE
+	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_JennyRematchIntro, Route124_Text_JennyRematchDefeat
+	msgbox Route124_Text_JennyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6615:: @ 81F6615
-	trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
-	msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
+Route124_EventScript_Grace:: @ 81F6615
+	trainerbattle_single TRAINER_GRACE, Route124_Text_GraceIntro, Route124_Text_GraceDefeat
+	msgbox Route124_Text_GracePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F662C:: @ 81F662C
-	trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
-	msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
+Route124_EventScript_Chad:: @ 81F662C
+	trainerbattle_single TRAINER_CHAD, Route124_Text_ChadIntro, Route124_Text_ChadDefeat
+	msgbox Route124_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6643:: @ 81F6643
-	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
+Route124_EventScript_Lila:: @ 81F6643
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaIntro, Route124_Text_LilaDefeat, Route124_Text_LilaNotEnoughMons, Route124_EventScript_RegisterLila
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F668C
-	msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchLila
+	msgbox Route124_Text_LilaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F6673:: @ 81F6673
-	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterLila:: @ 81F6673
+	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_1F668C:: @ 81F668C
-	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
-	msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchLila:: @ 81F668C
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaRematchIntro, Route124_Text_LilaRematchDefeat, Route124_Text_LilaRematchNotEnoughMons
+	msgbox Route124_Text_LilaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F66A7:: @ 81F66A7
-	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
+Route124_EventScript_Roy:: @ 81F66A7
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyIntro, Route124_Text_RoyDefeat, Route124_Text_RoyNotEnoughMons, Route124_EventScript_RegisterRoy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F66F0
-	msgbox Route124_Text_2A103E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchRoy
+	msgbox Route124_Text_RoyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F66D7:: @ 81F66D7
-	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterRoy:: @ 81F66D7
+	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_1F66F0:: @ 81F66F0
-	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
-	msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchRoy:: @ 81F66F0
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyRematchIntro, Route124_Text_RoyRematchDefeat, Route124_Text_RoyRematchNotEnoughMons
+	msgbox Route124_Text_RoyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F670B:: @ 81F670B
-	trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
-	msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
+Route124_EventScript_Declan:: @ 81F670B
+	trainerbattle_single TRAINER_DECLAN, Route124_Text_DeclanIntro, Route124_Text_DeclanDefeat
+	msgbox Route124_Text_DeclanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6722:: @ 81F6722
-	trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
-	msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
+Route124_EventScript_Isabella:: @ 81F6722
+	trainerbattle_single TRAINER_ISABELLA, Route124_Text_IsabellaIntro, Route124_Text_IsabellaDefeat
+	msgbox Route124_Text_IsabellaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_Text_1F6739: @ 81F6739
+Route124_Text_HuntersHouse: @ 81F6739
 	.string "HUNTER'S HOUSE$"
 
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
index 2b61cd6fa..c8ec142f2 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32",
+      "script": "Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter",
       "flag": "0"
     }
   ],
@@ -52,7 +52,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63"
+      "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 0fa59783d..b2c00c1cc 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -6,338 +6,338 @@ Route124_DivingTreasureHuntersHouse_OnTransition: @ 8270A2E
 	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32
+Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter:: @ 8270A32
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_270A4E
-	msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting
+	msgbox Route124_DivingTreasureHuntersHouse_Text_Greeting, MSGBOX_DEFAULT
 	setflag FLAG_MET_DIVING_TREASURE_HUNTER
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C
+	goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E
-	msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C
+Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting:: @ 8270A4E
+	msgbox Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards, MSGBOX_DEFAULT
+	goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C
-	call Route124_DivingTreasureHuntersHouse_EventScript_270A72
+Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard:: @ 8270A5C
+	call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
 	compare VAR_TEMP_1, 0
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_NoShards
+	goto Route124_DivingTreasureHuntersHouse_EventScript_HasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72
+Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards:: @ 8270A72
 	setvar VAR_TEMP_1, 0
 	checkitem ITEM_RED_SHARD, 1
-	compare VAR_RESULT, 1
-	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AB8
+	compare VAR_RESULT, TRUE
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard
 	checkitem ITEM_YELLOW_SHARD, 1
-	compare VAR_RESULT, 1
-	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ABE
+	compare VAR_RESULT, TRUE
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard
 	checkitem ITEM_BLUE_SHARD, 1
-	compare VAR_RESULT, 1
-	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AC4
+	compare VAR_RESULT, TRUE
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard
 	checkitem ITEM_GREEN_SHARD, 1
-	compare VAR_RESULT, 1
-	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ACA
+	compare VAR_RESULT, TRUE
+	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8
+Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard:: @ 8270AB8
 	addvar VAR_TEMP_1, 1
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE
+Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard:: @ 8270ABE
 	addvar VAR_TEMP_1, 2
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4
+Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard:: @ 8270AC4
 	addvar VAR_TEMP_1, 4
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA
+Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard:: @ 8270ACA
 	addvar VAR_TEMP_1, 8
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0
-	msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE
+Route124_DivingTreasureHuntersHouse_EventScript_HasShard:: @ 8270AD0
+	msgbox Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou, MSGBOX_DEFAULT
+	goto Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE
-	message Route124_DivingTreasureHuntersHouse_Text_271117
+Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE
+	message Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade
 	waitmessage
 	switch VAR_TEMP_1
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB
-	case 4, Route124_DivingTreasureHuntersHouse_EventScript_270C0C
-	case 5, Route124_DivingTreasureHuntersHouse_EventScript_270C32
-	case 6, Route124_DivingTreasureHuntersHouse_EventScript_270C63
-	case 7, Route124_DivingTreasureHuntersHouse_EventScript_270C94
-	case 8, Route124_DivingTreasureHuntersHouse_EventScript_270CD0
-	case 9, Route124_DivingTreasureHuntersHouse_EventScript_270CF6
-	case 10, Route124_DivingTreasureHuntersHouse_EventScript_270D27
-	case 11, Route124_DivingTreasureHuntersHouse_EventScript_270D58
-	case 12, Route124_DivingTreasureHuntersHouse_EventScript_270D94
-	case 13, Route124_DivingTreasureHuntersHouse_EventScript_270DC5
-	case 14, Route124_DivingTreasureHuntersHouse_EventScript_270E01
-	case 15, Route124_DivingTreasureHuntersHouse_EventScript_270E3D
+	case 1,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR
+	case 2,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY
+	case 3,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY
+	case 4,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB
+	case 5,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB
+	case 6,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB
+	case 7,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB
+	case 8,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG
+	case 9,  Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG
+	case 10, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG
+	case 11, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG
+	case 12, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG
+	case 13, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG
+	case 14, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG
+	case 15, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
 	multichoice 0, 0, MULTI_SHARDS_R, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
 	multichoice 0, 0, MULTI_SHARDS_Y, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
 	multichoice 0, 0, MULTI_SHARDS_RY, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
 	multichoice 0, 0, MULTI_SHARDS_B, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
 	multichoice 0, 0, MULTI_SHARDS_RB, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
 	multichoice 0, 0, MULTI_SHARDS_YB, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
 	multichoice 0, 0, MULTI_SHARDS_RYB, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
 	multichoice 0, 0, MULTI_SHARDS_G, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
 	multichoice 0, 0, MULTI_SHARDS_RG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
 	multichoice 0, 0, MULTI_SHARDS_YG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
 	multichoice 0, 0, MULTI_SHARDS_RYG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
 	multichoice 0, 0, MULTI_SHARDS_BG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
 	multichoice 0, 0, MULTI_SHARDS_RBG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
 	multichoice 0, 0, MULTI_SHARDS_YBG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D
 	multichoice 0, 0, MULTI_SHARDS_RYBG, 0
 	switch VAR_RESULT
-	case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
-	case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
-	case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
-	case 3, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
-	case 4, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+	case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+	case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+	case 3, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+	case 4, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84
+Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard:: @ 8270E84
 	setvar VAR_0x8008, ITEM_RED_SHARD
 	setvar VAR_0x8009, ITEM_FIRE_STONE
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93
+Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard:: @ 8270E93
 	setvar VAR_0x8008, ITEM_YELLOW_SHARD
 	setvar VAR_0x8009, ITEM_THUNDER_STONE
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2
+Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard:: @ 8270EA2
 	setvar VAR_0x8008, ITEM_BLUE_SHARD
 	setvar VAR_0x8009, ITEM_WATER_STONE
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1
+Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard:: @ 8270EB1
 	setvar VAR_0x8008, ITEM_GREEN_SHARD
 	setvar VAR_0x8009, ITEM_LEAF_STONE
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0
+Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
 	bufferitemname 0, VAR_0x8008
 	bufferitemname 1, VAR_0x8009
-	msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	checkitemspace VAR_0x8009, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
 	checkitem VAR_0x8008, 2
-	compare VAR_RESULT, 0
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F43
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
+	goto Route124_DivingTreasureHuntersHouse_EventScript_BagFull
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01
+Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
 	takeitem VAR_0x8008, 1
 	giveitem_std VAR_0x8009
-	msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT
-	call Route124_DivingTreasureHuntersHouse_EventScript_270A72
+	msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT
+	call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
 	compare VAR_TEMP_1, 0
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61
-	msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE
-	goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade
+	msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
+	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43
-	msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_BagFull:: @ 8270F43
+	msgbox Route124_DivingTreasureHuntersHouse_Text_BagFull, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D
-	msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade:: @ 8270F4D
+	msgbox Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57
-	msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_NoShards:: @ 8270F57
+	msgbox Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61
+Route124_DivingTreasureHuntersHouse_EventScript_EndTrade:: @ 8270F61
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63
-	msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN
+Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard:: @ 8270F63
+	msgbox Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard, MSGBOX_SIGN
 	end
 
-Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C
+Route124_DivingTreasureHuntersHouse_Text_Greeting: @ 8270F6C
 	.string "I'm the DIVING TREASURE HUNTER!\p"
 	.string "I'm the awesome dude who makes\n"
 	.string "deep-sea dives to gather treasures\l"
 	.string "resting at the bottom.$"
 
-Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5
+Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards: @ 8270FE5
 	.string "Tell me, have you seen any SHARDS of\n"
 	.string "tools made in ancient times?$"
 
-Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027
+Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards: @ 8271027
 	.string "You haven't got any treasures\n"
 	.string "for me…\p"
 	.string "If you see any SHARDS, like the RED\n"
 	.string "SHARD, you've got to trade it with me!$"
 
-Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098
+Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou: @ 8271098
 	.string "Oh, hey! That…\n"
 	.string "That's a SHARD! I'm looking for those!\p"
 	.string "Oh, man, you've got to trade that\n"
 	.string "with me! I'll give you something good!$"
 
-Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117
+Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade: @ 8271117
 	.string "What do you want to trade?$"
 
-Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132
+Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone: @ 8271132
 	.string "You'll trade your {STR_VAR_1} for\n"
 	.string "my {STR_VAR_2}, then?$"
 
-Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158
+Route124_DivingTreasureHuntersHouse_Text_ItsADeal: @ 8271158
 	.string "It's a done deal!\n"
 	.string "Use that wisely!$"
 
-Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B
+Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse: @ 827117B
 	.string "Do you want to trade something else?$"
 
-Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0
+Route124_DivingTreasureHuntersHouse_Text_BagFull: @ 82711A0
 	.string "Whoops, your BAG's full.\n"
 	.string "Get rid of some items, friend!$"
 
-Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8
+Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind: @ 82711D8
 	.string "No? That's a downer.\n"
 	.string "Well, if you change your mind, come back.$"
 
-Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
+Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard: @ 8271217
 	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
 	.string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p"
 	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 27615a521..402c42932 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F67A4",
+      "script": "Route125_EventScript_Nolen",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F67BB",
+      "script": "Route125_EventScript_Stan",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F67D2",
+      "script": "Route125_EventScript_Tanya",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 9,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F67E9",
+      "script": "Route125_EventScript_Sharon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F6800",
+      "script": "Route125_EventScript_Ernest",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route125_EventScript_1F6862",
+      "script": "Route125_EventScript_Kim",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route125_EventScript_1F687D",
+      "script": "Route125_EventScript_Iris",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F6898",
+      "script": "Route125_EventScript_Presley",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F68AF",
+      "script": "Route125_EventScript_Auron",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index 62b66e3a6..5489c929e 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,11 +1,11 @@
 Route125_MapScripts:: @ 81F6748
 	map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A
+	map_script MAP_SCRIPT_ON_LOAD, Route125_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_OnFrame
 	.byte 0
 
 Route125_OnTransition: @ 81F6758
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
@@ -14,76 +14,76 @@ Route125_OnTransition: @ 81F6758
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route125_MapScript1_1F6783: @ 81F6783
+Route125_OnLoad: @ 81F6783
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
 	end
 
-Route125_MapScript2_1F679A: @ 81F679A
+Route125_OnFrame: @ 81F679A
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route125_EventScript_1F67A4:: @ 81F67A4
-	trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
-	msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE
+Route125_EventScript_Nolen:: @ 81F67A4
+	trainerbattle_single TRAINER_NOLEN, Route125_Text_NolenIntro, Route125_Text_NolenDefeat
+	msgbox Route125_Text_NolenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67BB:: @ 81F67BB
-	trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
-	msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE
+Route125_EventScript_Stan:: @ 81F67BB
+	trainerbattle_single TRAINER_STAN, Route125_Text_StanIntro, Route125_Text_StanDefeat
+	msgbox Route125_Text_StanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67D2:: @ 81F67D2
-	trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
-	msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE
+Route125_EventScript_Tanya:: @ 81F67D2
+	trainerbattle_single TRAINER_TANYA, Route125_Text_TanyaIntro, Route125_Text_TanyaDefeat
+	msgbox Route125_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67E9:: @ 81F67E9
-	trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
-	msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE
+Route125_EventScript_Sharon:: @ 81F67E9
+	trainerbattle_single TRAINER_SHARON, Route125_Text_SharonIntro, Route125_Text_SharonDefeat
+	msgbox Route125_Text_SharonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6800:: @ 81F6800
-	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
+Route125_EventScript_Ernest:: @ 81F6800
+	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route125_EventScript_1F684B
-	msgbox Route125_Text_2A1755, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route125_EventScript_RematchErnest
+	msgbox Route125_Text_ErnestPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route125_EventScript_1F682C:: @ 81F682C
-	special sub_80B4808
+Route125_EventScript_RegisterErnest:: @ 81F682C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT
+	msgbox Route125_Text_ErnestRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ERNEST_1
 	release
 	end
 
-Route125_EventScript_1F684B:: @ 81F684B
-	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851
-	msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE
+Route125_EventScript_RematchErnest:: @ 81F684B
+	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_ErnestRematchIntro, Route125_Text_ErnestRematchDefeat
+	msgbox Route125_Text_ErnestRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6862:: @ 81F6862
-	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
-	msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE
+Route125_EventScript_Kim:: @ 81F6862
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_KimIntro, Route125_Text_KimDefeat, Route125_Text_KimNotEnoughMons
+	msgbox Route125_Text_KimPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F687D:: @ 81F687D
-	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
-	msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE
+Route125_EventScript_Iris:: @ 81F687D
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_IrisIntro, Route125_Text_IrisDefeat, Route125_Text_IrisNotEnoughMons
+	msgbox Route125_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6898:: @ 81F6898
-	trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
-	msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE
+Route125_EventScript_Presley:: @ 81F6898
+	trainerbattle_single TRAINER_PRESLEY, Route125_Text_PresleyIntro, Route125_Text_PresleyDefeat
+	msgbox Route125_Text_PresleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F68AF:: @ 81F68AF
-	trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
-	msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE
+Route125_EventScript_Auron:: @ 81F68AF
+	trainerbattle_single TRAINER_AURON, Route125_Text_AuronIntro, Route125_Text_AuronDefeat
+	msgbox Route125_Text_AuronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index b8359bd84..db01091ac 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F68D6",
+      "script": "Route126_EventScript_Barry",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F68ED",
+      "script": "Route126_EventScript_Dean",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F6904",
+      "script": "Route126_EventScript_Nikki",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F691B",
+      "script": "Route126_EventScript_Brenda",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6960",
+      "script": "Route126_EventScript_Sienna",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6977",
+      "script": "Route126_EventScript_Pablo",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6949",
+      "script": "Route126_EventScript_Isobel",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6932",
+      "script": "Route126_EventScript_Leonardo",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 7a606e020..3624cc8a5 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -3,63 +3,63 @@ Route126_MapScripts:: @ 81F68C6
 	.byte 0
 
 Route126_OnTransition: @ 81F68CC
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route126_EventScript_1F68D6:: @ 81F68D6
-	trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
-	msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
+Route126_EventScript_Barry:: @ 81F68D6
+	trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat
+	msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F68ED:: @ 81F68ED
-	trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
-	msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
+Route126_EventScript_Dean:: @ 81F68ED
+	trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat
+	msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6904:: @ 81F6904
-	trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
-	msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
+Route126_EventScript_Nikki:: @ 81F6904
+	trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat
+	msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F691B:: @ 81F691B
-	trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
-	msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
+Route126_EventScript_Brenda:: @ 81F691B
+	trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat
+	msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6932:: @ 81F6932
-	trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
-	msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
+Route126_EventScript_Leonardo:: @ 81F6932
+	trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat
+	msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6949:: @ 81F6949
-	trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
-	msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
+Route126_EventScript_Isobel:: @ 81F6949
+	trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat
+	msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6960:: @ 81F6960
-	trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
-	msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
+Route126_EventScript_Sienna:: @ 81F6960
+	trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat
+	msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6977:: @ 81F6977
-	trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+Route126_EventScript_Pablo:: @ 81F6977
+	trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route126_EventScript_1F69C2
-	msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route126_EventScript_RematchPablo
+	msgbox Route126_Text_PabloPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route126_EventScript_1F69A3:: @ 81F69A3
-	special sub_80B4808
+Route126_EventScript_RegisterPablo:: @ 81F69A3
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT
+	msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_PABLO_1
 	release
 	end
 
-Route126_EventScript_1F69C2:: @ 81F69C2
-	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
-	msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
+Route126_EventScript_RematchPablo:: @ 81F69C2
+	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat
+	msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 08d39d971..626982ca2 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6A35",
+      "script": "Route127_EventScript_Camden",
       "flag": "0"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route127_EventScript_1F6A4C",
+      "script": "Route127_EventScript_Donny",
       "flag": "0"
     },
     {
@@ -97,7 +97,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A63",
+      "script": "Route127_EventScript_Jonah",
       "flag": "0"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A91",
+      "script": "Route127_EventScript_Roger",
       "flag": "0"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A7A",
+      "script": "Route127_EventScript_Henry",
       "flag": "0"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6AA8",
+      "script": "Route127_EventScript_Aidan",
       "flag": "0"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route127_EventScript_1F6AD6",
+      "script": "Route127_EventScript_Koji",
       "flag": "0"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6ABF",
+      "script": "Route127_EventScript_Athena",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index fcc666ec6..09d37dd7c 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,11 +1,11 @@
 Route127_MapScripts:: @ 81F69D9
 	map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B
+	map_script MAP_SCRIPT_ON_LOAD, Route127_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_OnFrame
 	.byte 0
 
 Route127_OnTransition: @ 81F69E9
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
@@ -14,71 +14,71 @@ Route127_OnTransition: @ 81F69E9
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route127_MapScript1_1F6A14: @ 81F6A14
+Route127_OnLoad: @ 81F6A14
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
 	end
 
-Route127_MapScript2_1F6A2B: @ 81F6A2B
+Route127_OnFrame: @ 81F6A2B
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route127_EventScript_1F6A35:: @ 81F6A35
-	trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
-	msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
+Route127_EventScript_Camden:: @ 81F6A35
+	trainerbattle_single TRAINER_CAMDEN, Route127_Text_CamdenIntro, Route127_Text_CamdenDefeat
+	msgbox Route127_Text_CamdenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A4C:: @ 81F6A4C
-	trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
-	msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Donny:: @ 81F6A4C
+	trainerbattle_single TRAINER_DONNY, Route127_Text_DonnyIntro, Route127_Text_DonnyDefeat
+	msgbox Route127_Text_DonnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A63:: @ 81F6A63
-	trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
-	msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Jonah:: @ 81F6A63
+	trainerbattle_single TRAINER_JONAH, Route127_Text_JonahIntro, Route127_Text_JonahDefeat
+	msgbox Route127_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A7A:: @ 81F6A7A
-	trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
-	msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
+Route127_EventScript_Henry:: @ 81F6A7A
+	trainerbattle_single TRAINER_HENRY, Route127_Text_HenryIntro, Route127_Text_HenryDefeat
+	msgbox Route127_Text_HenryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A91:: @ 81F6A91
-	trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
-	msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
+Route127_EventScript_Roger:: @ 81F6A91
+	trainerbattle_single TRAINER_ROGER, Route127_Text_RogerIntro, Route127_Text_RogerDefeat
+	msgbox Route127_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6AA8:: @ 81F6AA8
-	trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
-	msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
+Route127_EventScript_Aidan:: @ 81F6AA8
+	trainerbattle_single TRAINER_AIDAN, Route127_Text_AidanIntro, Route127_Text_AidanDefeat
+	msgbox Route127_Text_AidanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6ABF:: @ 81F6ABF
-	trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
-	msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
+Route127_EventScript_Athena:: @ 81F6ABF
+	trainerbattle_single TRAINER_ATHENA, Route127_Text_AthenaIntro, Route127_Text_AthenaDefeat
+	msgbox Route127_Text_AthenaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6AD6:: @ 81F6AD6
-	trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+Route127_EventScript_Koji:: @ 81F6AD6
+	trainerbattle_single TRAINER_KOJI_1, Route127_Text_KojiIntro, Route127_Text_KojiDefeat, Route127_EventScript_RegisterKoji
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route127_EventScript_1F6B21
-	msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route127_EventScript_RematchKoji
+	msgbox Route127_Text_KojiPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route127_EventScript_1F6B02:: @ 81F6B02
-	special sub_80B4808
+Route127_EventScript_RegisterKoji:: @ 81F6B02
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
+	msgbox Route127_Text_KojiRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KOJI_1
 	release
 	end
 
-Route127_EventScript_1F6B21:: @ 81F6B21
-	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
-	msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
+Route127_EventScript_RematchKoji:: @ 81F6B21
+	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_KojiRematchIntro, Route127_Text_KojiRematchDefeat
+	msgbox Route127_Text_KojiPostRematch, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 58246c247..a7de8ed19 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6CBE",
+      "script": "Route128_EventScript_Isaiah",
       "flag": "0"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route128_EventScript_1F6D20",
+      "script": "Route128_EventScript_Katelyn",
       "flag": "0"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route128_EventScript_1F6DB0",
+      "script": "Route128_EventScript_Wayne",
       "flag": "0"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6D99",
+      "script": "Route128_EventScript_Ruben",
       "flag": "0"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6D82",
+      "script": "Route128_EventScript_Alexa",
       "flag": "0"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route128_EventScript_1F6DDE",
+      "script": "Route128_EventScript_Carlee",
       "flag": "0"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route128_EventScript_1F6DC7",
+      "script": "Route128_EventScript_Harrison",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index a19c0edf9..16b1294fc 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -1,48 +1,48 @@
 Route128_MapScripts:: @ 81F6B38
 	map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_OnFrame
 	.byte 0
 
 Route128_OnTransition: @ 81F6B43
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route128_MapScript2_1F6B4D: @ 81F6B4D
-	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57
+Route128_OnFrame: @ 81F6B4D
+	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_KyogreAwakenedScene
 	.2byte 0
 
-Route128_EventScript_1F6B57:: @ 81F6B57
+Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
 	lockall
 	delay 20
-	applymovement 4, Route128_Movement_1F6C89
+	applymovement 4, Route128_Movement_ArchieLookAround
 	waitmovement 0
-	msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT
+	msgbox Route128_Text_ArchieWhatHappened, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route128_Movement_1F6C91
+	applymovement 4, Route128_Movement_ArchieBackUp
 	waitmovement 0
-	msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT
+	msgbox Route128_Text_ArchieIOnlyWanted, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, Route128_Movement_1F6CAD
+	applymovement 5, Route128_Movement_MaxieApproachArchie
 	waitmovement 0
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieDoYouUnderstandNow, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, Route128_Movement_1F6CBB
+	applymovement 5, Route128_Movement_MaxieApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route128_Movement_1F6C96
+	applymovement 4, Route128_Movement_ArchieRunLeft
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
-	applymovement 5, Route128_Movement_1F6CA8
+	applymovement 5, Route128_Movement_MaxieWalkLeft
 	waitmovement 0
-	msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT
 	closemessage
 	delay 40
-	applymovement 5, Route128_Movement_1F6CB0
-	applymovement 4, Route128_Movement_1F6C9B
+	applymovement 5, Route128_Movement_MaxieExit
+	applymovement 4, Route128_Movement_ArchieExit
 	waitmovement 0
 	removeobject 5
 	removeobject 4
@@ -51,19 +51,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	dofieldeffect FLDEFF_NPCFLY_OUT
 	waitfieldeffect FLDEFF_NPCFLY_OUT
 	addobject 3
-	applymovement 3, Route128_Movement_1F6C87
+	applymovement 3, Route128_Movement_StevenApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route128_Movement_1F6C85
+	applymovement 3, Route128_Movement_StevenWalkUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenImGoingToSootopolis, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -78,10 +78,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	releaseall
 	end
 
+@ Unused
 Route128_Movement_1F6C76: @ 81F6C76
 	walk_fast_left
 	step_end
 
+@ Unused
 Route128_Movement_1F6C78: @ 81F6C78
 	walk_left
 	walk_left
@@ -97,15 +99,15 @@ Route128_Movement_1F6C78: @ 81F6C78
 	walk_up
 	step_end
 
-Route128_Movement_1F6C85: @ 81F6C85
+Route128_Movement_StevenWalkUp: @ 81F6C85
 	walk_up
 	step_end
 
-Route128_Movement_1F6C87: @ 81F6C87
+Route128_Movement_StevenApproachPlayer: @ 81F6C87
 	walk_fast_left
 	step_end
 
-Route128_Movement_1F6C89: @ 81F6C89
+Route128_Movement_ArchieLookAround: @ 81F6C89
 	walk_fast_down
 	walk_in_place_fastest_left
 	delay_16
@@ -115,21 +117,21 @@ Route128_Movement_1F6C89: @ 81F6C89
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_1F6C91: @ 81F6C91
+Route128_Movement_ArchieBackUp: @ 81F6C91
 	lock_facing_direction
 	walk_slow_up
 	delay_16
 	unlock_facing_direction
 	step_end
 
-Route128_Movement_1F6C96: @ 81F6C96
+Route128_Movement_ArchieRunLeft: @ 81F6C96
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
 	walk_in_place_fastest_right
 	step_end
 
-Route128_Movement_1F6C9B: @ 81F6C9B
+Route128_Movement_ArchieExit: @ 81F6C9B
 	delay_16
 	delay_16
 	walk_fast_up
@@ -144,19 +146,19 @@ Route128_Movement_1F6C9B: @ 81F6C9B
 	walk_fast_up
 	step_end
 
-Route128_Movement_1F6CA8: @ 81F6CA8
+Route128_Movement_MaxieWalkLeft: @ 81F6CA8
 	walk_left
 	walk_left
 	delay_8
 	delay_4
 	step_end
 
-Route128_Movement_1F6CAD: @ 81F6CAD
+Route128_Movement_MaxieApproachArchie: @ 81F6CAD
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_1F6CB0: @ 81F6CB0
+Route128_Movement_MaxieExit: @ 81F6CB0
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -169,90 +171,90 @@ Route128_Movement_1F6CB0: @ 81F6CB0
 	walk_fast_up
 	step_end
 
-Route128_Movement_1F6CBB: @ 81F6CBB
+Route128_Movement_MaxieApproachPlayer: @ 81F6CBB
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-Route128_EventScript_1F6CBE:: @ 81F6CBE
-	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+Route128_EventScript_Isaiah:: @ 81F6CBE
+	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_IsaiahIntro, Route128_Text_IsaiahDefeat, Route128_EventScript_RegisterIsaiah
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route128_EventScript_1F6D09
-	msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route128_EventScript_RematchIsaiah
+	msgbox Route128_Text_IsaiahPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route128_EventScript_1F6CEA:: @ 81F6CEA
-	special sub_80B4808
+Route128_EventScript_RegisterIsaiah:: @ 81F6CEA
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route128_Text_2A2916, MSGBOX_DEFAULT
+	msgbox Route128_Text_IsaiahRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISAIAH_1
 	release
 	end
 
-Route128_EventScript_1F6D09:: @ 81F6D09
-	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8
-	msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchIsaiah:: @ 81F6D09
+	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_IsaiahRematchIntro, Route128_Text_IsaiahRematchDefeat
+	msgbox Route128_Text_IsaiahPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D20:: @ 81F6D20
-	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+Route128_EventScript_Katelyn:: @ 81F6D20
+	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_KatelynIntro, Route128_Text_KatelynDefeat, Route128_EventScript_RegisterKatelyn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route128_EventScript_1F6D6B
-	msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route128_EventScript_RematchKatelyn
+	msgbox Route128_Text_KatelynPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route128_EventScript_1F6D4C:: @ 81F6D4C
-	special sub_80B4808
+Route128_EventScript_RegisterKatelyn:: @ 81F6D4C
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT
+	msgbox Route128_Text_KatelynRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KATELYN_1
 	release
 	end
 
-Route128_EventScript_1F6D6B:: @ 81F6D6B
-	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB
-	msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchKatelyn:: @ 81F6D6B
+	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_KatelynRematchIntro, Route128_Text_KatelynRematchDefeat
+	msgbox Route128_Text_KatelynPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D82:: @ 81F6D82
-	trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
-	msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE
+Route128_EventScript_Alexa:: @ 81F6D82
+	trainerbattle_single TRAINER_ALEXA, Route128_Text_AlexaIntro, Route128_Text_AlexaDefeat
+	msgbox Route128_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D99:: @ 81F6D99
-	trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
-	msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE
+Route128_EventScript_Ruben:: @ 81F6D99
+	trainerbattle_single TRAINER_RUBEN, Route128_Text_RubenIntro, Route128_Text_RubenDefeat
+	msgbox Route128_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DB0:: @ 81F6DB0
-	trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
-	msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE
+Route128_EventScript_Wayne:: @ 81F6DB0
+	trainerbattle_single TRAINER_WAYNE, Route128_Text_WayneIntro, Route128_Text_WayneDefeat
+	msgbox Route128_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DC7:: @ 81F6DC7
-	trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
-	msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE
+Route128_EventScript_Harrison:: @ 81F6DC7
+	trainerbattle_single TRAINER_HARRISON, Route128_Text_HarrisonIntro, Route128_Text_HarrisonDefeat
+	msgbox Route128_Text_HarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DDE:: @ 81F6DDE
-	trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
-	msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE
+Route128_EventScript_Carlee:: @ 81F6DDE
+	trainerbattle_single TRAINER_CARLEE, Route128_Text_CarleeIntro, Route128_Text_CarleeDefeat
+	msgbox Route128_Text_CarleePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_Text_1F6DF5: @ 81F6DF5
+Route128_Text_ArchieWhatHappened: @ 81F6DF5
 	.string "ARCHIE: What happened…\n"
 	.string "What is this wretched scene…\p"
 	.string "Did I…make a horrible mistake?$"
 
-Route128_Text_1F6E48: @ 81F6E48
+Route128_Text_ArchieIOnlyWanted: @ 81F6E48
 	.string "I…\n"
 	.string "I only wanted…$"
 
-Route128_Text_1F6E5A: @ 81F6E5A
+Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A
 	.string "MAXIE: Do you understand now,\n"
 	.string "ARCHIE?\p"
 	.string "Do you finally see how disastrous\n"
@@ -261,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A
 	.string "something before the situation goes\l"
 	.string "completely out of control!$"
 
-Route128_Text_1F6F1E: @ 81F6F1E
+Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E
 	.string "MAXIE: {PLAYER}, don't say anything.\p"
 	.string "I know that I have no right to be\n"
 	.string "critical of ARCHIE…\p"
@@ -273,17 +275,17 @@ Route128_Text_1F6F1E: @ 81F6F1E
 	.string "The responsibility for putting an end\n"
 	.string "to this falls to ARCHIE and me…$"
 
-Route128_Text_1F704F: @ 81F704F
+Route128_Text_MaxieThisDefiesBelief: @ 81F704F
 	.string "MAXIE: This defies belief…\p"
 	.string "Those super-ancient POKéMON…\p"
 	.string "Their power is unbelievable.\n"
 	.string "They've upset the balance of nature…$"
 
-Route128_Text_1F70C9: @ 81F70C9
+Route128_Text_StevenWhatIsHappening: @ 81F70C9
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "What is happening?$"
 
-Route128_Text_1F70EA: @ 81F70EA
+Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA
 	.string "This is terrible…\p"
 	.string "After the scorching heat wave ended,\n"
 	.string "this deluge began.\p"
@@ -295,7 +297,7 @@ Route128_Text_1F70EA: @ 81F70EA
 	.string "There's no point arguing here…\n"
 	.string "SOOTOPOLIS might provide answers…$"
 
-Route128_Text_1F721B: @ 81F721B
+Route128_Text_StevenImGoingToSootopolis: @ 81F721B
 	.string "{PLAYER}{KUN}…\n"
 	.string "I don't know what you intend to do,\l"
 	.string "but don't do anything reckless.\p"
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index 3183f9821..6b19cc320 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route129_EventScript_1F72EC",
+      "script": "Route129_EventScript_Chase",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route129_EventScript_1F7303",
+      "script": "Route129_EventScript_Allison",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route129_EventScript_1F7331",
+      "script": "Route129_EventScript_Tisha",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route129_EventScript_1F731A",
+      "script": "Route129_EventScript_Reed",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route129_EventScript_1F7348",
+      "script": "Route129_EventScript_Clarence",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 43d828bcd..ae6c67e87 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,10 +1,10 @@
 Route129_MapScripts:: @ 81F7284
 	map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
+	map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame
 	.byte 0
 
-Route129_MapScript1_1F7294: @ 81F7294
+Route129_OnLoad: @ 81F7294
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
@@ -15,43 +15,43 @@ Route129_OnTransition: @ 81F72AB
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route129_EventScript_1F72D8
+	call_if_ge Route129_EventScript_CheckSetAlternatingWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
 	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route129_EventScript_1F72D8:: @ 81F72D8
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route129_MapScript2_1F72E2: @ 81F72E2
+Route129_OnFrame: @ 81F72E2
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route129_EventScript_1F72EC:: @ 81F72EC
-	trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
-	msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
+Route129_EventScript_Chase:: @ 81F72EC
+	trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat
+	msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7303:: @ 81F7303
-	trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
-	msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
+Route129_EventScript_Allison:: @ 81F7303
+	trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat
+	msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F731A:: @ 81F731A
-	trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
-	msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
+Route129_EventScript_Reed:: @ 81F731A
+	trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat
+	msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7331:: @ 81F7331
-	trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
-	msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
+Route129_EventScript_Tisha:: @ 81F7331
+	trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat
+	msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7348:: @ 81F7348
-	trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
-	msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
+Route129_EventScript_Clarence:: @ 81F7348
+	trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat
+	msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 18d168b17..c0b92a1a5 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route130_EventScript_1F73BF",
+      "script": "Route130_EventScript_Rodney",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route130_EventScript_1F73D6",
+      "script": "Route130_EventScript_Katie",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route130_EventScript_1F73ED",
+      "script": "Route130_EventScript_Santiago",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 18bccb185..f5bd7e051 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -4,10 +4,10 @@ Route130_MapScripts:: @ 81F735F
 
 Route130_OnTransition: @ 81F7365
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route130_EventScript_1F73B5
+	call_if_ge Route130_EventScript_CheckSetAlternatingWeather
 	specialvar VAR_RESULT, IsMirageIslandPresent
-	compare VAR_RESULT, 1
-	goto_if_eq Route130_EventScript_1F73B1
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route130_EventScript_SetMirageIslandLayout
 	setflag FLAG_TEMP_11
 	setflag FLAG_TEMP_12
 	setflag FLAG_TEMP_13
@@ -26,26 +26,26 @@ Route130_OnTransition: @ 81F7365
 	setmaplayoutindex LAYOUT_ROUTE130
 	end
 
-Route130_EventScript_1F73B1:: @ 81F73B1
+Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
 	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
-Route130_EventScript_1F73B5:: @ 81F73B5
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route130_EventScript_1F73BF:: @ 81F73BF
-	trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6
-	msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE
+Route130_EventScript_Rodney:: @ 81F73BF
+	trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat
+	msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_1F73D6:: @ 81F73D6
-	trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC
-	msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE
+Route130_EventScript_Katie:: @ 81F73D6
+	trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat
+	msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_1F73ED:: @ 81F73ED
-	trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D
-	msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE
+Route130_EventScript_Santiago:: @ 81F73ED
+	trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat
+	msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 379b15b3d..af73808b6 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route131_EventScript_1F7429",
+      "script": "Route131_EventScript_Richard",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route131_EventScript_1F7440",
+      "script": "Route131_EventScript_Herman",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route131_EventScript_1F7457",
+      "script": "Route131_EventScript_Susie",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route131_EventScript_1F746E",
+      "script": "Route131_EventScript_Kara",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route131_EventScript_1F7485",
+      "script": "Route131_EventScript_Reli",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route131_EventScript_1F74A0",
+      "script": "Route131_EventScript_Ian",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route131_EventScript_1F74D2",
+      "script": "Route131_EventScript_Kevin",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route131_EventScript_1F74BB",
+      "script": "Route131_EventScript_Talia",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index c1c3e26dc..d26100a10 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -4,55 +4,55 @@ Route131_MapScripts:: @ 81F7404
 
 Route131_OnTransition: @ 81F740A
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route131_EventScript_1F741F
-	call Route131_EventScript_1F741B
+	call_if_ge Route131_EventScript_CheckSetAlternatingWeather
+	call Route131_EventScript_SetLayout
 	end
 
-Route131_EventScript_1F741B:: @ 81F741B
+Route131_EventScript_SetLayout:: @ 81F741B
 	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
-Route131_EventScript_1F741F:: @ 81F741F
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route131_EventScript_1F7429:: @ 81F7429
-	trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D
-	msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Richard:: @ 81F7429
+	trainerbattle_single TRAINER_RICHARD, Route131_Text_RichardIntro, Route131_Text_RichardDefeat
+	msgbox Route131_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7440:: @ 81F7440
-	trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626
-	msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Herman:: @ 81F7440
+	trainerbattle_single TRAINER_HERMAN, Route131_Text_HermanIntro, Route131_Text_HermanDefeat
+	msgbox Route131_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7457:: @ 81F7457
-	trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB
-	msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE
+Route131_EventScript_Susie:: @ 81F7457
+	trainerbattle_single TRAINER_SUSIE, Route131_Text_SusieIntro, Route131_Text_SusieDefeat
+	msgbox Route131_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F746E:: @ 81F746E
-	trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A
-	msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kara:: @ 81F746E
+	trainerbattle_single TRAINER_KARA, Route131_Text_KaraIntro, Route131_Text_KaraDefeat
+	msgbox Route131_Text_KaraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7485:: @ 81F7485
-	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
-	msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE
+Route131_EventScript_Reli:: @ 81F7485
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_ReliIntro, Route131_Text_ReliDefeat, Route131_Text_ReliNotEnoughMons
+	msgbox Route131_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74A0:: @ 81F74A0
-	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
-	msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE
+Route131_EventScript_Ian:: @ 81F74A0
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_IanIntro, Route131_Text_IanDefeat, Route131_Text_IanNotEnoughMons
+	msgbox Route131_Text_IanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74BB:: @ 81F74BB
-	trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38
-	msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE
+Route131_EventScript_Talia:: @ 81F74BB
+	trainerbattle_single TRAINER_TALIA, Route131_Text_TaliaIntro, Route131_Text_TaliaDefeat
+	msgbox Route131_Text_TaliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74D2:: @ 81F74D2
-	trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC
-	msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kevin:: @ 81F74D2
+	trainerbattle_single TRAINER_KEVIN, Route131_Text_KevinIntro, Route131_Text_KevinDefeat
+	msgbox Route131_Text_KevinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 8a7597826..947f8d9cf 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route132_EventScript_1F74EA",
+      "script": "Route132_EventScript_Gilbert",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route132_EventScript_1F7501",
+      "script": "Route132_EventScript_Dana",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F752F",
+      "script": "Route132_EventScript_Kiyo",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route132_EventScript_1F7518",
+      "script": "Route132_EventScript_Ronald",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F7546",
+      "script": "Route132_EventScript_Paxton",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F755D",
+      "script": "Route132_EventScript_Darcy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F758B",
+      "script": "Route132_EventScript_Makayla",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F7574",
+      "script": "Route132_EventScript_Jonathan",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index aed4d0673..6b82102be 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -1,43 +1,43 @@
 Route132_MapScripts:: @ 81F74E9
 	.byte 0
 
-Route132_EventScript_1F74EA:: @ 81F74EA
-	trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
-	msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
+Route132_EventScript_Gilbert:: @ 81F74EA
+	trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat
+	msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7501:: @ 81F7501
-	trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
-	msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
+Route132_EventScript_Dana:: @ 81F7501
+	trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat
+	msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7518:: @ 81F7518
-	trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
-	msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Ronald:: @ 81F7518
+	trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat
+	msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F752F:: @ 81F752F
-	trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
-	msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
+Route132_EventScript_Kiyo:: @ 81F752F
+	trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat
+	msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7546:: @ 81F7546
-	trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
-	msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Paxton:: @ 81F7546
+	trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat
+	msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F755D:: @ 81F755D
-	trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
-	msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
+Route132_EventScript_Darcy:: @ 81F755D
+	trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat
+	msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7574:: @ 81F7574
-	trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
-	msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
+Route132_EventScript_Jonathan:: @ 81F7574
+	trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat
+	msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F758B:: @ 81F758B
-	trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
-	msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
+Route132_EventScript_Makayla:: @ 81F758B
+	trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat
+	msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 8622515f0..fe492458a 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75A3",
+      "script": "Route133_EventScript_Franklin",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75D1",
+      "script": "Route133_EventScript_Linda",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75BA",
+      "script": "Route133_EventScript_Debra",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route133_EventScript_1F75FF",
+      "script": "Route133_EventScript_Beck",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route133_EventScript_1F75E8",
+      "script": "Route133_EventScript_Warren",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F7616",
+      "script": "Route133_EventScript_Mollie",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F762D",
+      "script": "Route133_EventScript_Conor",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc
index a91eeead3..ebe28f5db 100644
--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -1,38 +1,38 @@
 Route133_MapScripts:: @ 81F75A2
 	.byte 0
 
-Route133_EventScript_1F75A3:: @ 81F75A3
-	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F
-	msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE
+Route133_EventScript_Franklin:: @ 81F75A3
+	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_FranklinIntro, Route133_Text_FranklinDefeat
+	msgbox Route133_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75BA:: @ 81F75BA
-	trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200
-	msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE
+Route133_EventScript_Debra:: @ 81F75BA
+	trainerbattle_single TRAINER_DEBRA, Route133_Text_DebraIntro, Route133_Text_DebraDefeat
+	msgbox Route133_Text_DebraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75D1:: @ 81F75D1
-	trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258
-	msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE
+Route133_EventScript_Linda:: @ 81F75D1
+	trainerbattle_single TRAINER_LINDA, Route133_Text_LindaIntro, Route133_Text_LindaDefeat
+	msgbox Route133_Text_LindaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75E8:: @ 81F75E8
-	trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0
-	msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE
+Route133_EventScript_Warren:: @ 81F75E8
+	trainerbattle_single TRAINER_WARREN, Route133_Text_WarrenIntro, Route133_Text_WarrenDefeat
+	msgbox Route133_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75FF:: @ 81F75FF
-	trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C
-	msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE
+Route133_EventScript_Beck:: @ 81F75FF
+	trainerbattle_single TRAINER_BECK, Route133_Text_BeckIntro, Route133_Text_BeckDefeat
+	msgbox Route133_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F7616:: @ 81F7616
-	trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A
-	msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE
+Route133_EventScript_Mollie:: @ 81F7616
+	trainerbattle_single TRAINER_MOLLIE, Route133_Text_MollieIntro, Route133_Text_MollieDefeat
+	msgbox Route133_Text_MolliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F762D:: @ 81F762D
-	trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505
-	msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE
+Route133_EventScript_Conor:: @ 81F762D
+	trainerbattle_single TRAINER_CONOR, Route133_Text_ConorIntro, Route133_Text_ConorDefeat
+	msgbox Route133_Text_ConorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index e45920576..fb4da1f92 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F7653",
+      "script": "Route134_EventScript_Jack",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route134_EventScript_1F766A",
+      "script": "Route134_EventScript_Laurel",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F7698",
+      "script": "Route134_EventScript_Aaron",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route134_EventScript_1F7681",
+      "script": "Route134_EventScript_Alex",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route134_EventScript_1F76AF",
+      "script": "Route134_EventScript_Hitoshi",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F76F4",
+      "script": "Route134_EventScript_Marley",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route134_EventScript_1F770B",
+      "script": "Route134_EventScript_Kelvin",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route134_EventScript_1F76DD",
+      "script": "Route134_EventScript_Reyna",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route134_EventScript_1F76C6",
+      "script": "Route134_EventScript_Hudson",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index a941e19b5..3da2781b9 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,53 +1,53 @@
 Route134_MapScripts:: @ 81F7644
-	map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A
+	map_script MAP_SCRIPT_ON_RESUME, Route134_OnResume
 	.byte 0
 
-Route134_MapScript1_1F764A: @ 81F764A
+Route134_OnResume: @ 81F764A
 	setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
 	end
 
-Route134_EventScript_1F7653:: @ 81F7653
-	trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB
-	msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE
+Route134_EventScript_Jack:: @ 81F7653
+	trainerbattle_single TRAINER_JACK, Route134_Text_JackIntro, Route134_Text_JackDefeat
+	msgbox Route134_Text_JackPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F766A:: @ 81F766A
-	trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643
-	msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE
+Route134_EventScript_Laurel:: @ 81F766A
+	trainerbattle_single TRAINER_LAUREL, Route134_Text_LaurelIntro, Route134_Text_LaurelDefeat
+	msgbox Route134_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F7681:: @ 81F7681
-	trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE
-	msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE
+Route134_EventScript_Alex:: @ 81F7681
+	trainerbattle_single TRAINER_ALEX, Route134_Text_AlexIntro, Route134_Text_AlexDefeat
+	msgbox Route134_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F7698:: @ 81F7698
-	trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1
-	msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Aaron:: @ 81F7698
+	trainerbattle_single TRAINER_AARON, Route134_Text_AaronIntro, Route134_Text_AaronDefeat
+	msgbox Route134_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76AF:: @ 81F76AF
-	trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745
-	msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hitoshi:: @ 81F76AF
+	trainerbattle_single TRAINER_HITOSHI, Route134_Text_HitoshiIntro, Route134_Text_HitoshiDefeat
+	msgbox Route134_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76C6:: @ 81F76C6
-	trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1
-	msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hudson:: @ 81F76C6
+	trainerbattle_single TRAINER_HUDSON, Route134_Text_HudsonIntro, Route134_Text_HudsonDefeat
+	msgbox Route134_Text_HudsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76DD:: @ 81F76DD
-	trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10
-	msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE
+Route134_EventScript_Reyna:: @ 81F76DD
+	trainerbattle_single TRAINER_REYNA, Route134_Text_ReynaIntro, Route134_Text_ReynaDefeat
+	msgbox Route134_Text_ReynaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76F4:: @ 81F76F4
-	trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B
-	msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE
+Route134_EventScript_Marley:: @ 81F76F4
+	trainerbattle_single TRAINER_MARLEY, Route134_Text_MarleyIntro, Route134_Text_MarleyDefeat
+	msgbox Route134_Text_MarleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F770B:: @ 81F770B
-	trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B
-	msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Kelvin:: @ 81F770B
+	trainerbattle_single TRAINER_KELVIN, Route134_Text_KelvinIntro, Route134_Text_KelvinDefeat
+	msgbox Route134_Text_KelvinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index d9fd0d8cc..9c0d41709 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E088A",
+      "script": "RustboroCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E085F",
+      "script": "RustboroCity_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E08DA",
+      "script": "RustboroCity_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E08D1",
+      "script": "RustboroCity_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E08B2",
+      "script": "RustboroCity_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E0893",
+      "script": "RustboroCity_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E0922",
+      "script": "RustboroCity_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E0938",
+      "script": "RustboroCity_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E0ADD",
+      "script": "RustboroCity_EventScript_DevonEmployee1",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E087E",
+      "script": "RustboroCity_EventScript_DevonEmployee2",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E094E",
+      "script": "RustboroCity_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -209,8 +209,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E0DB8",
-      "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL"
+      "script": "RustboroCity_EventScript_Rival",
+      "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
@@ -235,7 +235,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_EventScript_1E1236",
+      "script": "RustboroCity_EventScript_Boy1",
       "flag": "0"
     }
   ],
@@ -333,7 +333,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "1",
-      "script": "RustboroCity_EventScript_1E095A"
+      "script": "RustboroCity_EventScript_StolenGoodsTrigger0"
     },
     {
       "type": "trigger",
@@ -342,7 +342,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "1",
-      "script": "RustboroCity_EventScript_1E0971"
+      "script": "RustboroCity_EventScript_StolenGoodsTrigger1"
     },
     {
       "type": "trigger",
@@ -351,7 +351,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "1",
-      "script": "RustboroCity_EventScript_1E0988"
+      "script": "RustboroCity_EventScript_StolenGoodsTrigger2"
     },
     {
       "type": "trigger",
@@ -360,7 +360,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "1",
-      "script": "RustboroCity_EventScript_1E099F"
+      "script": "RustboroCity_EventScript_StolenGoodsTrigger3"
     },
     {
       "type": "trigger",
@@ -369,7 +369,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "1",
-      "script": "RustboroCity_EventScript_1E09B6"
+      "script": "RustboroCity_EventScript_StolenGoodsTrigger4"
     },
     {
       "type": "trigger",
@@ -378,7 +378,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "2",
-      "script": "RustboroCity_EventScript_1E0AFE"
+      "script": "RustboroCity_EventScript_HelpGetGoodsTrigger0"
     },
     {
       "type": "trigger",
@@ -387,7 +387,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "2",
-      "script": "RustboroCity_EventScript_1E0B0A"
+      "script": "RustboroCity_EventScript_HelpGetGoodsTrigger1"
     },
     {
       "type": "trigger",
@@ -396,7 +396,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "2",
-      "script": "RustboroCity_EventScript_1E0B16"
+      "script": "RustboroCity_EventScript_HelpGetGoodsTrigger2"
     },
     {
       "type": "trigger",
@@ -405,7 +405,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "2",
-      "script": "RustboroCity_EventScript_1E0B22"
+      "script": "RustboroCity_EventScript_HelpGetGoodsTrigger3"
     },
     {
       "type": "trigger",
@@ -414,7 +414,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "4",
-      "script": "RustboroCity_EventScript_1E0C2B"
+      "script": "RustboroCity_EventScript_ReturnGoodsTrigger0"
     },
     {
       "type": "trigger",
@@ -423,7 +423,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "4",
-      "script": "RustboroCity_EventScript_1E0C37"
+      "script": "RustboroCity_EventScript_ReturnGoodsTrigger1"
     },
     {
       "type": "trigger",
@@ -432,7 +432,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "4",
-      "script": "RustboroCity_EventScript_1E0C43"
+      "script": "RustboroCity_EventScript_ReturnGoodsTrigger2"
     },
     {
       "type": "trigger",
@@ -441,7 +441,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "4",
-      "script": "RustboroCity_EventScript_1E0C4F"
+      "script": "RustboroCity_EventScript_ReturnGoodsTrigger3"
     },
     {
       "type": "trigger",
@@ -450,7 +450,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0DF3"
+      "script": "RustboroCity_EventScript_RivalTrigger0"
     },
     {
       "type": "trigger",
@@ -459,7 +459,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0E33"
+      "script": "RustboroCity_EventScript_RivalTrigger1"
     },
     {
       "type": "trigger",
@@ -468,7 +468,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0E73"
+      "script": "RustboroCity_EventScript_RivalTrigger2"
     },
     {
       "type": "trigger",
@@ -477,7 +477,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0EB3"
+      "script": "RustboroCity_EventScript_RivalTrigger3"
     },
     {
       "type": "trigger",
@@ -486,7 +486,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0EF3"
+      "script": "RustboroCity_EventScript_RivalTrigger4"
     },
     {
       "type": "trigger",
@@ -495,7 +495,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0F33"
+      "script": "RustboroCity_EventScript_RivalTrigger5"
     },
     {
       "type": "trigger",
@@ -504,7 +504,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0F73"
+      "script": "RustboroCity_EventScript_RivalTrigger6"
     },
     {
       "type": "trigger",
@@ -513,7 +513,7 @@
       "elevation": 3,
       "var": "VAR_RUSTBORO_CITY_STATE",
       "var_value": "7",
-      "script": "RustboroCity_EventScript_1E0FB3"
+      "script": "RustboroCity_EventScript_RivalTrigger7"
     }
   ],
   "bg_events": [
@@ -523,7 +523,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E08F5"
+      "script": "RustboroCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -531,7 +531,7 @@
       "y": 35,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E0910"
+      "script": "RustboroCity_EventScript_TrainersSchoolSign"
     },
     {
       "type": "sign",
@@ -555,7 +555,7 @@
       "y": 49,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E0907"
+      "script": "RustboroCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -579,7 +579,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E08EC"
+      "script": "RustboroCity_EventScript_DevonCorpSign"
     },
     {
       "type": "sign",
@@ -587,7 +587,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E08E3"
+      "script": "RustboroCity_EventScript_TunnelSign"
     },
     {
       "type": "sign",
@@ -595,7 +595,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_EventScript_1E0919"
+      "script": "RustboroCity_EventScript_CuttersHouseSign"
     }
   ]
 }
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 28a5f8278..04c7ea505 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,45 +1,45 @@
 RustboroCity_MapScripts:: @ 81E06BD
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame
 	.byte 0
 
 RustboroCity_OnTransition: @ 81E06C8
 	setflag FLAG_VISITED_RUSTBORO_CITY
 	call Common_EventScript_SetupRivalGfxId
 	compare VAR_RUSTBORO_CITY_STATE, 6
-	call_if_eq RustboroCity_EventScript_1E0707
+	call_if_eq RustboroCity_EventScript_HideMapNamePopup
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_RUSTBORO_CITY_STATE, 6
-	goto_if_eq RustboroCity_EventScript_1E06EC
+	goto_if_eq RustboroCity_EventScript_PositionScientistForExit
 	end
 
-RustboroCity_EventScript_1E06EC:: @ 81E06EC
+RustboroCity_EventScript_PositionScientistForExit:: @ 81E06EC
 	compare VAR_TEMP_0, 11
-	goto_if_eq RustboroCity_EventScript_1E06FF
+	goto_if_eq RustboroCity_EventScript_PositionScientistLeftExit
 	setobjectxyperm 15, 12, 15
 	end
 
-RustboroCity_EventScript_1E06FF:: @ 81E06FF
+RustboroCity_EventScript_PositionScientistLeftExit:: @ 81E06FF
 	setobjectxyperm 15, 11, 15
 	end
 
-RustboroCity_EventScript_1E0707:: @ 81E0707
+RustboroCity_EventScript_HideMapNamePopup:: @ 81E0707
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-RustboroCity_MapScript2_1E070B: @ 81E070B
-	map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_1E0715
+RustboroCity_OnFrame: @ 81E070B
+	map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_ScientistAddMatchCall
 	.2byte 0
 
-RustboroCity_EventScript_1E0715:: @ 81E0715
+RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	lockall
 	setvar VAR_ROUTE104_STATE, 1
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850
+	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
 	waitmovement 0
 	playse SE_KAIDAN
 	delay 10
 	addobject 15
-	applymovement 15, RustboroCity_Movement_1E0852
+	applymovement 15, RustboroCity_Movement_ScientistApproachPlayer
 	waitmovement 0
 	playse SE_PIN
 	applymovement 15, Common_Movement_ExclamationMark
@@ -48,9 +48,9 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 15, RustboroCity_Movement_1E084E
+	applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown
 	waitmovement 0
-	msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HAS_MATCH_CALL
 	applymovement 15, Common_Movement_WalkInPlaceFastestLeft
@@ -65,36 +65,36 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
 	delay 20
 	applymovement 15, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	goto RustboroCity_EventScript_1E07BD
+	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_1E07AC:: @ 81E07AC
-	msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT
+RustboroCity_EventScript_PleaseSelectPokenav:: @ 81E07AC
+	msgbox RustboroCity_Text_PleaseSelectPokenav, MSGBOX_DEFAULT
 	closemessage
 	delay 10
-	goto RustboroCity_EventScript_1E07BD
+	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_1E07BD:: @ 81E07BD
+RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
 	setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV
 	special ScriptMenu_CreateStartMenuForPokenavTutorial
 	waitstate
 	switch VAR_RESULT
-	case 0, RustboroCity_EventScript_1E07AC
-	case 1, RustboroCity_EventScript_1E07AC
-	case 2, RustboroCity_EventScript_1E07AC
-	case 4, RustboroCity_EventScript_1E07AC
-	case 5, RustboroCity_EventScript_1E07AC
-	case 6, RustboroCity_EventScript_1E07AC
-	case 7, RustboroCity_EventScript_1E07AC
-	case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC
-	special sub_81C72A4
+	case 0, RustboroCity_EventScript_PleaseSelectPokenav
+	case 1, RustboroCity_EventScript_PleaseSelectPokenav
+	case 2, RustboroCity_EventScript_PleaseSelectPokenav
+	case 4, RustboroCity_EventScript_PleaseSelectPokenav
+	case 5, RustboroCity_EventScript_PleaseSelectPokenav
+	case 6, RustboroCity_EventScript_PleaseSelectPokenav
+	case 7, RustboroCity_EventScript_PleaseSelectPokenav
+	case MULTI_B_PRESSED, RustboroCity_EventScript_PleaseSelectPokenav
+	special OpenPokenavForTutorial
 	waitstate
 	delay 20
-	msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT
 	closemessage
-	applymovement 15, RustboroCity_Movement_1E085D
+	applymovement 15, RustboroCity_Movement_ScientistLeave
 	waitmovement 0
 	playse SE_KAIDAN
 	removeobject 15
@@ -104,20 +104,21 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	releaseall
 	end
 
-RustboroCity_Movement_1E084E: @ 81E084E
+RustboroCity_Movement_ScientistWalkInPlaceDown: @ 81E084E
 	walk_in_place_down
 	step_end
 
-RustboroCity_Movement_1E0850: @ 81E0850
+RustboroCity_Movement_PlayerWalkDown: @ 81E0850
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E0852: @ 81E0852
+RustboroCity_Movement_ScientistApproachPlayer: @ 81E0852
 	walk_down
 	delay_16
 	step_end
 
-RustboroCity_Movement_1E0855: @ 81E0855
+@ Unused
+RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855
 	delay_16
 	walk_left
 	walk_down
@@ -127,175 +128,176 @@ RustboroCity_Movement_1E0855: @ 81E0855
 	delay_16
 	step_end
 
-RustboroCity_Movement_1E085D: @ 81E085D
+RustboroCity_Movement_ScientistLeave: @ 81E085D
 	walk_up
 	step_end
 
-RustboroCity_EventScript_1E085F:: @ 81E085F
+RustboroCity_EventScript_FatMan:: @ 81E085F
 	lock
 	faceplayer
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_1E0874
-	msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt
+	msgbox RustboroCity_Text_WeShortenItToDevon, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E0874:: @ 81E0874
-	msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT
+RustboroCity_EventScript_FatManSawGrunt:: @ 81E0874
+	msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E087E:: @ 81E087E
+RustboroCity_EventScript_DevonEmployee2:: @ 81E087E
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E088A:: @ 81E088A
-	msgbox RustboroCity_Text_1E1480, MSGBOX_NPC
+RustboroCity_EventScript_Woman:: @ 81E088A
+	msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_1E0893:: @ 81E0893
+RustboroCity_EventScript_Man1:: @ 81E0893
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8
-	msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge
+	msgbox RustboroCity_Text_HaveYouChallengedGym, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E08A8:: @ 81E08A8
-	msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT
+RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8
+	msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E08B2:: @ 81E08B2
+RustboroCity_EventScript_Boy2:: @ 81E08B2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_1E08C7
-	msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_Boy2BrineyLeftTunnel
+	msgbox RustboroCity_Text_MrBrineyWalksInTheTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E08C7:: @ 81E08C7
-	msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT
+RustboroCity_EventScript_Boy2BrineyLeftTunnel:: @ 81E08C7
+	msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E08D1:: @ 81E08D1
-	msgbox RustboroCity_Text_1E1633, MSGBOX_NPC
+RustboroCity_EventScript_Twin:: @ 81E08D1
+	msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_1E08DA:: @ 81E08DA
-	msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN
+RustboroCity_EventScript_NinjaBoy:: @ 81E08DA
+	msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E08E3:: @ 81E08E3
-	msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN
+RustboroCity_EventScript_TunnelSign:: @ 81E08E3
+	msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E08EC:: @ 81E08EC
-	msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN
+RustboroCity_EventScript_DevonCorpSign:: @ 81E08EC
+	msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E08F5:: @ 81E08F5
-	msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN
+RustboroCity_EventScript_GymSign:: @ 81E08F5
+	msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E08FE:: @ 81E08FE
-	msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN
+@ Unused
+RustboroCity_EventScript_DevonCorpBranchOfficeSign:: @ 81E08FE
+	msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E0907:: @ 81E0907
-	msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN
+RustboroCity_EventScript_CitySign:: @ 81E0907
+	msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E0910:: @ 81E0910
-	msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN
+RustboroCity_EventScript_TrainersSchoolSign:: @ 81E0910
+	msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E0919:: @ 81E0919
-	msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN
+RustboroCity_EventScript_CuttersHouseSign:: @ 81E0919
+	msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_1E0922:: @ 81E0922
+RustboroCity_EventScript_LittleBoy:: @ 81E0922
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT
 	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RustboroCity_EventScript_1E0938:: @ 81E0938
+RustboroCity_EventScript_LittleGirl:: @ 81E0938
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RustboroCity_EventScript_1E094E:: @ 81E094E
+RustboroCity_EventScript_Man2:: @ 81E094E
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E095A:: @ 81E095A
+RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A
 	lockall
 	setobjectxyperm 9, 14, 21
 	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 0
-	goto RustboroCity_EventScript_1E09CD
+	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_1E0971:: @ 81E0971
+RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971
 	lockall
 	setobjectxyperm 9, 14, 21
 	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 1
-	goto RustboroCity_EventScript_1E09CD
+	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_1E0988:: @ 81E0988
+RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988
 	lockall
 	setobjectxyperm 9, 14, 21
 	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 2
-	goto RustboroCity_EventScript_1E09CD
+	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_1E099F:: @ 81E099F
+RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F
 	lockall
 	setobjectxyperm 9, 14, 21
 	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 3
-	goto RustboroCity_EventScript_1E09CD
+	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_1E09B6:: @ 81E09B6
+RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
 	lockall
 	setobjectxyperm 9, 14, 21
 	setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
 	setvar VAR_0x8004, 4
-	goto RustboroCity_EventScript_1E09CD
+	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_1E09CD:: @ 81E09CD
-	msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT
+RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
+	msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_AQA_0, 0
 	addobject 10
 	addobject 9
-	applymovement 10, RustboroCity_Movement_1E0AA0
+	applymovement 10, RustboroCity_Movement_GruntEscape
 	waitmovement 0
 	removeobject 10
-	applymovement 9, RustboroCity_Movement_1E0AB1
+	applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt1
 	waitmovement 0
-	msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT
 	closemessage
-	applymovement 9, RustboroCity_Movement_1E0AB9
+	applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt2
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 9
@@ -313,42 +315,50 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
 	releaseall
 	end
 
-RustboroCity_EventScript_1E0A3B:: @ 81E0A3B
-	msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT
+@ Unused
+RustboroCity_EventScript_ShadyCharacterTookOff:: @ 81E0A3B
+	msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT
 	return
 
-RustboroCity_EventScript_1E0A44:: @ 81E0A44
-	msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT
+@ Unused
+RustboroCity_EventScript_YouGotItThankYou:: @ 81E0A44
+	msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT
 	return
 
-RustboroCity_EventScript_1E0A4D:: @ 81E0A4D
-	applymovement 9, RustboroCity_Movement_1E0AC1
+@ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions
+RustboroCity_EventScript_EmployeeApproachUp:: @ 81E0A4D
+	applymovement 9, RustboroCity_Movement_EmployeeApproachUp
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0A58:: @ 81E0A58
-	applymovement 9, RustboroCity_Movement_1E0AC5
+@ Unused, see above
+RustboroCity_EventScript_EmployeeApproachLeft:: @ 81E0A58
+	applymovement 9, RustboroCity_Movement_EmployeeApproachLeft
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0A63:: @ 81E0A63
-	applymovement 9, RustboroCity_Movement_1E0ACA
+@ Unused, see above
+RustboroCity_EventScript_EmployeeApproachRight:: @ 81E0A63
+	applymovement 9, RustboroCity_Movement_EmployeeApproachRight
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
-	applymovement 9, RustboroCity_Movement_1E0ACF
+@ Unused, see above
+RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E
+	applymovement 9, RustboroCity_Movement_EmployeeApproachDown
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0A79:: @ 81E0A79
-	applymovement 9, RustboroCity_Movement_1E0AD5
+@ Unused, similar movement to the above scripts
+RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
+	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-RustboroCity_Movement_1E0A8E: @ 81E0A8E
+@ Unused
+RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -368,7 +378,7 @@ RustboroCity_Movement_1E0A8E: @ 81E0A8E
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_1E0AA0: @ 81E0AA0
+RustboroCity_Movement_GruntEscape: @ 81E0AA0
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -387,7 +397,7 @@ RustboroCity_Movement_1E0AA0: @ 81E0AA0
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_1E0AB1: @ 81E0AB1
+RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1
 	walk_right
 	walk_right
 	walk_right
@@ -397,7 +407,7 @@ RustboroCity_Movement_1E0AB1: @ 81E0AB1
 	walk_in_place_fastest_up
 	step_end
 
-RustboroCity_Movement_1E0AB9: @ 81E0AB9
+RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9
 	walk_up
 	walk_up
 	walk_up
@@ -407,27 +417,31 @@ RustboroCity_Movement_1E0AB9: @ 81E0AB9
 	walk_up
 	step_end
 
-RustboroCity_Movement_1E0AC1: @ 81E0AC1
+@ Functionally unused
+RustboroCity_Movement_EmployeeApproachUp: @ 81E0AC1
 	walk_down
 	walk_right
 	walk_right
 	step_end
 
-RustboroCity_Movement_1E0AC5: @ 81E0AC5
+@ Functionally unused
+RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5
 	walk_down
 	walk_down
 	walk_right
 	walk_right
 	step_end
 
-RustboroCity_Movement_1E0ACA: @ 81E0ACA
+@ Functionally unused
+RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA
 	walk_down
 	walk_down
 	walk_right
 	walk_right
 	step_end
 
-RustboroCity_Movement_1E0ACF: @ 81E0ACF
+@ Functionally unused
+RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF
 	walk_down
 	walk_down
 	walk_down
@@ -435,7 +449,8 @@ RustboroCity_Movement_1E0ACF: @ 81E0ACF
 	walk_right
 	step_end
 
-RustboroCity_Movement_1E0AD5: @ 81E0AD5
+@ Functionally unused
+RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5
 	walk_down
 	walk_down
 	walk_down
@@ -445,61 +460,62 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5
 	walk_in_place_fastest_down
 	step_end
 
-RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
+RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD
 	lock
 	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_1E0AF2
-	msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee
+	msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_1E0AF2:: @ 81E0AF2
+RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 81E0AF2
 	waitse
 	setvar VAR_TEMP_1, 4
-	goto RustboroCity_EventScript_1E0C5B
+	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_1E0AFE:: @ 81E0AFE
+RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 81E0AFE
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_1E0B2E
+	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_1E0B0A:: @ 81E0B0A
+RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 81E0B0A
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_1E0B2E
+	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_1E0B16:: @ 81E0B16
+RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 81E0B16
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_1E0B2E
+	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_1E0B22:: @ 81E0B22
+RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 81E0B22
 	lockall
 	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_1E0B2E
+	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
+RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E
 	compare VAR_TEMP_1, 0
-	call_if_eq RustboroCity_EventScript_1E0B6F
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1
 	compare VAR_TEMP_1, 1
-	call_if_eq RustboroCity_EventScript_1E0B9B
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft1
 	compare VAR_TEMP_1, 2
-	call_if_eq RustboroCity_EventScript_1E0BC7
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown1
 	compare VAR_TEMP_1, 3
-	call_if_eq RustboroCity_EventScript_1E0BF3
+	call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown1
 	setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
 	setvar VAR_RUSTBORO_CITY_STATE, 3
 	copyobjectxytoperm 9
-	msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
+@ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods
+RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
 	applymovement 9, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -511,7 +527,7 @@ RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
+RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
 	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -523,7 +539,7 @@ RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
+RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -535,7 +551,7 @@ RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
+RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -543,56 +559,56 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1E0C29
+	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-RustboroCity_Movement_1E0C29: @ 81E0C29
+RustboroCity_Movement_EmployeeApproachPlayerDown: @ 81E0C29
 	walk_down
 	step_end
 
-RustboroCity_EventScript_1E0C2B:: @ 81E0C2B
+RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 81E0C2B
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_1E0C5B
+	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_1E0C37:: @ 81E0C37
+RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 81E0C37
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_1E0C5B
+	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_1E0C43:: @ 81E0C43
+RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 81E0C43
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_1E0C5B
+	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_1E0C4F:: @ 81E0C4F
+RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 81E0C4F
 	lockall
 	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_1E0C5B
+	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
+RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
 	compare VAR_TEMP_1, 0
-	call_if_eq RustboroCity_EventScript_1E0CDC
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2
 	compare VAR_TEMP_1, 1
-	call_if_eq RustboroCity_EventScript_1E0D08
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft2
 	compare VAR_TEMP_1, 2
-	call_if_eq RustboroCity_EventScript_1E0D34
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown2
 	compare VAR_TEMP_1, 3
-	call_if_eq RustboroCity_EventScript_1E0D60
+	call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown2
 	compare VAR_TEMP_1, 4
-	call_if_eq RustboroCity_EventScript_1E0D96
-	msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight
+	msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT
 	giveitem_std ITEM_GREAT_BALL
-	compare VAR_RESULT, 0
-	call_if_eq RustboroCity_EventScript_1E0CD3
-	msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq RustboroCity_EventScript_BagFull
+	msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_RETURNED_DEVON_GOODS
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
@@ -603,11 +619,11 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
 	releaseall
 	end
 
-RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
-	msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT
+RustboroCity_EventScript_BagFull:: @ 81E0CD3
+	msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT
 	return
 
-RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
+RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
 	applymovement 9, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -619,7 +635,7 @@ RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0D08:: @ 81E0D08
+RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
 	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
@@ -631,7 +647,7 @@ RustboroCity_EventScript_1E0D08:: @ 81E0D08
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0D34:: @ 81E0D34
+RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -643,7 +659,7 @@ RustboroCity_EventScript_1E0D34:: @ 81E0D34
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0D60:: @ 81E0D60
+RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -651,13 +667,13 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1E0C29
+	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0D96:: @ 81E0D96
+RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96
 	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -667,33 +683,32 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
+RustboroCity_EventScript_Rival:: @ 81E0DB8
 	lockall
-	call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1
+	call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-Route104_EventScript_1E0DD1:: @ 81E0DD1
-RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
+RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq RustboroCity_EventScript_1E0DE9
+	goto_if_eq RustboroCity_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	goto_if_eq RustboroCity_EventScript_1E0DEE
+	goto_if_eq RustboroCity_EventScript_PlayBrendanMusic
 	return
 
-RustboroCity_EventScript_1E0DE9:: @ 81E0DE9
+RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
+RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE
 	playbgm MUS_BOY_SUP, 1
 	return
 
-RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
+RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -701,15 +716,15 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E120E
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer0
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0E33:: @ 81E0E33
+RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -717,15 +732,15 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1215
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer1
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0E73:: @ 81E0E73
+RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -733,15 +748,15 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E121B
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer2
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
+RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -749,15 +764,15 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1220
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer3
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
+RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -765,15 +780,15 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1224
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer4
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0F33:: @ 81E0F33
+RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -781,15 +796,15 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1227
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer5
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0F73:: @ 81E0F73
+RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -797,15 +812,15 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E122B
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer6
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
+RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
 	lockall
-	call RustboroCity_EventScript_1E0DD1
+	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement 14, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -813,29 +828,29 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
 	waitmovement 0
 	applymovement 14, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1230
+	applymovement 14, RustboroCity_Movement_RivalApproachPlayer7
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
+	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
+RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq RustboroCity_EventScript_1E100B
+	goto_if_eq RustboroCity_EventScript_MayEncounter
 	compare VAR_RESULT, FEMALE
-	goto_if_eq RustboroCity_EventScript_1E1114
+	goto_if_eq RustboroCity_EventScript_BrendanEncounter
 	end
 
-RustboroCity_EventScript_1E100B:: @ 81E100B
-	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E10C1
-	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1070
+RustboroCity_EventScript_MayEncounter:: @ 81E100B
+	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_MayBrineyHint
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_MayAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -843,126 +858,126 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
 	setvar VAR_RUSTBORO_CITY_STATE, 8
 	setvar VAR_ROUTE104_STATE, 2
 	setvar VAR_0x8008, 0
-	msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_EventScript_1E1092
-	msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
-	call RustboroCity_EventScript_1E10D6
+	msgbox RustboroCity_Text_MayPassedBrineyWantToBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq RustboroCity_EventScript_BattleMay
+	msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT
+	call RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_1E1070:: @ 81E1070
+RustboroCity_EventScript_MayAskToBattle:: @ 81E1070
 	setvar VAR_0x8008, 1
-	msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_EventScript_1E1092
-	msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_MayWantToBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq RustboroCity_EventScript_BattleMay
+	msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_EventScript_1E1092:: @ 81E1092
-	msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT
+RustboroCity_EventScript_BattleMay:: @ 81E1092
+	msgbox RustboroCity_Text_MayImNotGoingToLose, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, RustboroCity_EventScript_1E10DB
-	case 1, RustboroCity_EventScript_1E10EE
-	case 2, RustboroCity_EventScript_1E1101
+	case 0, RustboroCity_EventScript_BattleMayTreecko
+	case 1, RustboroCity_EventScript_BattleMayTorchic
+	case 2, RustboroCity_EventScript_BattleMayMudkip
 	end
 
-RustboroCity_EventScript_1E10C1:: @ 81E10C1
-	msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT
+RustboroCity_EventScript_MayBrineyHint:: @ 81E10C1
+	msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq RustboroCity_EventScript_1E10D6
+	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_1E10D6:: @ 81E10D6
+RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-RustboroCity_EventScript_1E10DB:: @ 81E10DB
-	trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1
+RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
+	trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E10C1
+	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_1E10EE:: @ 81E10EE
-	trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1
+RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
+	trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E10C1
+	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_1E1101:: @ 81E1101
-	trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1
+RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
+	trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E10C1
+	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_1E1114:: @ 81E1114
-	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E11C0
-	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1174
+RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
+	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanBrineyHint
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT
+	msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
 	setvar VAR_RUSTBORO_CITY_STATE, 8
 	setvar VAR_ROUTE104_STATE, 2
-	msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_EventScript_1E1191
-	msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
-	call RustboroCity_EventScript_1E10D6
+	msgbox RustboroCity_Text_BrendanPassedBrineyWantToBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq RustboroCity_EventScript_BattleBrendan
+	msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT
+	call RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_1E1174:: @ 81E1174
-	msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_EventScript_1E1191
-	msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
+RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174
+	msgbox RustboroCity_Text_BrendanWantToBattle, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq RustboroCity_EventScript_BattleBrendan
+	msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_EventScript_1E1191:: @ 81E1191
-	msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT
+RustboroCity_EventScript_BattleBrendan:: @ 81E1191
+	msgbox RustboroCity_Text_BrendanIWontGoEasy, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, RustboroCity_EventScript_1E11D5
-	case 1, RustboroCity_EventScript_1E11E8
-	case 2, RustboroCity_EventScript_1E11FB
+	case 0, RustboroCity_EventScript_BattleBrendanTreecko
+	case 1, RustboroCity_EventScript_BattleBrendanTorchic
+	case 2, RustboroCity_EventScript_BattleBrendanMudkip
 	end
 
-RustboroCity_EventScript_1E11C0:: @ 81E11C0
-	msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT
+RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
+	msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq RustboroCity_EventScript_1E10D6
+	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_1E11D5:: @ 81E11D5
-	trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9
+RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
+	trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E11C0
+	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_1E11E8:: @ 81E11E8
-	trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9
+RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
+	trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E11C0
+	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_1E11FB:: @ 81E11FB
-	trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9
+RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
+	trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
-	goto RustboroCity_EventScript_1E11C0
+	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_Movement_1E120E: @ 81E120E
+RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E
 	walk_down
 	walk_left
 	walk_left
@@ -971,7 +986,7 @@ RustboroCity_Movement_1E120E: @ 81E120E
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E1215: @ 81E1215
+RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215
 	walk_down
 	walk_left
 	walk_left
@@ -979,38 +994,38 @@ RustboroCity_Movement_1E1215: @ 81E1215
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E121B: @ 81E121B
+RustboroCity_Movement_RivalApproachPlayer2: @ 81E121B
 	walk_down
 	walk_left
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E1220: @ 81E1220
+RustboroCity_Movement_RivalApproachPlayer3: @ 81E1220
 	walk_down
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E1224: @ 81E1224
+RustboroCity_Movement_RivalApproachPlayer4: @ 81E1224
 	walk_down
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E1227: @ 81E1227
+RustboroCity_Movement_RivalApproachPlayer5: @ 81E1227
 	walk_down
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E122B: @ 81E122B
+RustboroCity_Movement_RivalApproachPlayer6: @ 81E122B
 	walk_down
 	walk_right
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_1E1230: @ 81E1230
+RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230
 	walk_down
 	walk_right
 	walk_right
@@ -1018,53 +1033,53 @@ RustboroCity_Movement_1E1230: @ 81E1230
 	walk_down
 	step_end
 
-RustboroCity_EventScript_1E1236:: @ 81E1236
-	msgbox RustboroCity_Text_1E249D, MSGBOX_NPC
+RustboroCity_EventScript_Boy1:: @ 81E1236
+	msgbox RustboroCity_Text_YouCanHave2On2Battle, MSGBOX_NPC
 	end
 
-RustboroCity_Text_1E123F: @ 81E123F
+RustboroCity_Text_WeShortenItToDevon: @ 81E123F
 	.string "The DEVON CORPORATION…\n"
 	.string "We all just shorten it to DEVON.\p"
 	.string "That company makes all sorts of\n"
 	.string "convenient products.$"
 
-RustboroCity_Text_1E12AC: @ 81E12AC
+RustboroCity_Text_SneakyLookingManWentAroundCorner: @ 81E12AC
 	.string "Hm? A sneaky-looking man?\p"
 	.string "Come to think of it, yes, a shady-\n"
 	.string "looking guy went around the corner.$"
 
-RustboroCity_Text_1E130D: @ 81E130D
+RustboroCity_Text_HaveYouChallengedGym: @ 81E130D
 	.string "Have you taken the POKéMON GYM\n"
 	.string "challenge?\p"
 	.string "When you get that shiny GYM BADGE\n"
 	.string "in hand, I guess TRAINERS begin to\l"
 	.string "realize what is required of them.$"
 
-RustboroCity_Text_1E139E: @ 81E139E
+RustboroCity_Text_HeyThatsRustborosGymBadge: @ 81E139E
 	.string "Hey, that's RUSTBORO's GYM BADGE!\p"
 	.string "Out of all the POKéMON GYM BADGES,\n"
 	.string "RUSTBORO's is the coolest, I'd say.$"
 
-RustboroCity_Text_1E1407: @ 81E1407
+RustboroCity_Text_YoureNewAroundHere: @ 81E1407
 	.string "Oh? Who might you be?\n"
 	.string "You're a new face around these parts.\p"
 	.string "Have you just transferred into the\n"
 	.string "POKéMON TRAINER'S SCHOOL?$"
 
-RustboroCity_Text_1E1480: @ 81E1480
+RustboroCity_Text_GymLeaderIsntEasyWithFire: @ 81E1480
 	.string "I challenged the GYM LEADER, but…\p"
 	.string "It's not going to be easy winning with\n"
 	.string "my FIRE-type POKéMON…\p"
 	.string "FIRE-type POKéMON don't match up\n"
 	.string "well against ROCK-type POKéMON…$"
 
-RustboroCity_Text_1E1520: @ 81E1520
+RustboroCity_Text_MrBrineyWalksInTheTunnel: @ 81E1520
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He goes for walks in the tunnel every\n"
 	.string "so often.$"
 
-RustboroCity_Text_1E1589: @ 81E1589
+RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He said he was going shopping in\n"
@@ -1072,40 +1087,40 @@ RustboroCity_Text_1E1589: @ 81E1589
 	.string "That old sea dog, he must really love\n"
 	.string "that PEEKO.$"
 
-RustboroCity_Text_1E1633: @ 81E1633
+RustboroCity_Text_WowYouHavePokemon: @ 81E1633
 	.string "Wow, you have POKéMON with you, too.\p"
 	.string "When I get bigger, I'm going to go\n"
 	.string "places with POKéMON, too.$"
 
-RustboroCity_Text_1E1695: @ 81E1695
+RustboroCity_Text_CatchRarePokemonIfIGoToSchool: @ 81E1695
 	.string "POKéMON TRAINER'S SCHOOL!\p"
 	.string "If I go to this school, will I be able\n"
 	.string "to catch rare POKéMON easily?$"
 
-RustboroCity_Text_1E16F4: @ 81E16F4
+RustboroCity_Text_PokemonCanChangeLookFromExp: @ 81E16F4
 	.string "If a POKéMON gains experience in\n"
 	.string "battles, it can sometimes change in\l"
 	.string "the way it looks.$"
 
-RustboroCity_Text_1E174B: @ 81E174B
+RustboroCity_Text_PokemonChangeShape: @ 81E174B
 	.string "A POKéMON changes shape?\n"
 	.string "If one did that, I would be shocked!$"
 
-RustboroCity_Text_1E1789: @ 81E1789
+RustboroCity_Text_TradePokemonGrowFast: @ 81E1789
 	.string "A POKéMON you get in a trade from\n"
 	.string "someone grows fast.\p"
 	.string "But if you don't have certain GYM\n"
 	.string "BADGES, it may not obey you…$"
 
-RustboroCity_Text_1E17FE: @ 81E17FE
+RustboroCity_Text_OutOfTheWay: @ 81E17FE
 	.string "Get out!\n"
 	.string "Out of the way!$"
 
-RustboroCity_Text_1E1817: @ 81E1817
+RustboroCity_Text_WaitDontTakeMyGoods: @ 81E1817
 	.string "Wait! Pleeeaaase!\p"
 	.string "Don't take my GOODS!$"
 
-RustboroCity_Text_1E183E: @ 81E183E
+RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E
 	.string "Oh, it's you!\p"
 	.string "You're that fantastic TRAINER who\n"
 	.string "helped me in PETALBURG WOODS!\p"
@@ -1114,11 +1129,11 @@ RustboroCity_Text_1E183E: @ 81E183E
 	.string "If I don't…\n"
 	.string "I'm going to be in serious trouble.$"
 
-RustboroCity_Text_1E1904: @ 81E1904
+RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel: @ 81E1904
 	.string "That shady character, I think he took\n"
 	.string "off towards the tunnel over there.$"
 
-RustboroCity_Text_1E194D: @ 81E194D
+RustboroCity_Text_YouGotItThankYou: @ 81E194D
 	.string "Oh! How did it go?\n"
 	.string "The DEVON GOODS?\p"
 	.string "You did!\n"
@@ -1127,15 +1142,15 @@ RustboroCity_Text_1E194D: @ 81E194D
 	.string "I know! As my thanks, I'll give you\n"
 	.string "another GREAT BALL!$"
 
-RustboroCity_Text_1E19E5: @ 81E19E5
+RustboroCity_Text_YoureLoadedWithItems: @ 81E19E5
 	.string "You're loaded with items.\n"
 	.string "I can't give you this GREAT BALL.$"
 
-RustboroCity_Text_1E1A21: @ 81E1A21
+RustboroCity_Text_PleaseComeWithMe: @ 81E1A21
 	.string "Excuse me, please!\n"
 	.string "Please come with me!$"
 
-RustboroCity_Text_1E1A49: @ 81E1A49
+RustboroCity_Text_MayHiLetsRegister: @ 81E1A49
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV!\p"
@@ -1143,11 +1158,11 @@ RustboroCity_Text_1E1A49: @ 81E1A49
 	.string "contact one another anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_1E1ADB: @ 81E1ADB
+RustboroCity_Text_RegisteredMay: @ 81E1ADB
 	.string "Registered MAY\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_1E1AFA: @ 81E1AFA
+RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA
 	.string "MAY: Oh, by the way, I passed\n"
 	.string "MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I guess he's on his way home to his\n"
@@ -1157,32 +1172,32 @@ RustboroCity_Text_1E1AFA: @ 81E1AFA
 	.string "So…\n"
 	.string "How about a little battle?$"
 
-RustboroCity_Text_1E1BD3: @ 81E1BD3
+RustboroCity_Text_MayOhHaventRaisedPokemonEnough: @ 81E1BD3
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-RustboroCity_Text_1E1C48: @ 81E1C48
+RustboroCity_Text_MayWantToBattle: @ 81E1C48
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-RustboroCity_Text_1E1C84: @ 81E1C84
+RustboroCity_Text_MayImNotGoingToLose: @ 81E1C84
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-RustboroCity_Text_1E1CC1: @ 81E1CC1
+RustboroCity_Text_MayDefeat: @ 81E1CC1
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-RustboroCity_Text_1E1CE7: @ 81E1CE7
+RustboroCity_Text_MayMrBrineyHint: @ 81E1CE7
 	.string "MAY: Oh, by the way, MR. BRINEY, who\n"
 	.string "I just passed…\p"
 	.string "{PLAYER}{KUN}, you just moved here so you\n"
 	.string "might not know this, but MR. BRINEY\l"
 	.string "was once a revered seafarer.$"
 
-RustboroCity_Text_1E1D7D: @ 81E1D7D
+RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV! Cool!\p"
@@ -1190,11 +1205,11 @@ RustboroCity_Text_1E1D7D: @ 81E1D7D
 	.string "get in touch anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_1E1E11: @ 81E1E11
+RustboroCity_Text_RegisteredBrendan: @ 81E1E11
 	.string "Registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_1E1E34: @ 81E1E34
+RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34
 	.string "BRENDAN: By the way, {PLAYER}, I walked\n"
 	.string "by MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I bet he was on his way home to his\n"
@@ -1205,72 +1220,72 @@ RustboroCity_Text_1E1E34: @ 81E1E34
 	.string "Want to have a battle to test how\n"
 	.string "far you've progressed?$"
 
-RustboroCity_Text_1E1F2F: @ 81E1F2F
+RustboroCity_Text_BrendanNoConfidenceInPokemon: @ 81E1F2F
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-RustboroCity_Text_1E1F76: @ 81E1F76
+RustboroCity_Text_BrendanWantToBattle: @ 81E1F76
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-RustboroCity_Text_1E1FA9: @ 81E1FA9
+RustboroCity_Text_BrendanIWontGoEasy: @ 81E1FA9
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-RustboroCity_Text_1E1FE9: @ 81E1FE9
+RustboroCity_Text_BrendanDefeat: @ 81E1FE9
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-RustboroCity_Text_1E2002: @ 81E2002
+RustboroCity_Text_BrendanMrBrineyHint: @ 81E2002
 	.string "BRENDAN: By the way, you know\n"
 	.string "MR. BRINEY? The guy I just passed?\p"
 	.string "I bet you didn't know this, since you\n"
 	.string "just moved here, {PLAYER}, but\l"
 	.string "MR. BRINEY was once a great sailor.$"
 
-RustboroCity_Text_1E20A6: @ 81E20A6
+RustboroCity_Text_TunnelNearingCompletion: @ 81E20A6
 	.string "“Timesaving tunnel nearing\n"
 	.string "completion!”\p"
 	.string "…Is what it says on the sign, but\n"
 	.string "there's also a big “X” splashed\l"
 	.string "across it in red paint…$"
 
-RustboroCity_Text_1E2128: @ 81E2128
+RustboroCity_Text_DevonCorpSign: @ 81E2128
 	.string "DEVON CORPORATION\p"
 	.string "“For all your living needs, we make\n"
 	.string "it all.”$"
 
-RustboroCity_Text_1E2167: @ 81E2167
+RustboroCity_Text_GymSign: @ 81E2167
 	.string "RUSTBORO CITY POKéMON GYM\n"
 	.string "LEADER: ROXANNE\p"
 	.string "“The ROCK-loving honors student!”$"
 
-RustboroCity_Text_1E21B3: @ 81E21B3
+RustboroCity_Text_DevonCorpBranchOfficeSign: @ 81E21B3
 	.string "DEVON CORP. BRANCH OFFICE\p"
 	.string "“Access limited to DEVON employees\n"
 	.string "and authorized personnel.”$"
 
-RustboroCity_Text_1E220B: @ 81E220B
+RustboroCity_Text_CitySign: @ 81E220B
 	.string "RUSTBORO CITY\p"
 	.string "“The city probing the integration of\n"
 	.string "nature and science.”$"
 
-RustboroCity_Text_1E2253: @ 81E2253
+RustboroCity_Text_TrainersSchoolSign: @ 81E2253
 	.string "POKéMON TRAINER'S SCHOOL\p"
 	.string "“We'll teach you anything about\n"
 	.string "POKéMON!”$"
 
-RustboroCity_Text_1E2296: @ 81E2296
+RustboroCity_Text_CuttersHouse: @ 81E2296
 	.string "CUTTER'S HOUSE$"
 
-RustboroCity_Text_1E22A5: @ 81E22A5
+RustboroCity_Text_DevelopedNewPokenavFeature: @ 81E22A5
 	.string "I've been developing an added feature\n"
 	.string "for the POKéNAV…\p"
 	.string "And it turned out great!\p"
 	.string "{PLAYER}, may I see that POKéNAV?\n"
 	.string "The one our PRESIDENT gave you?$"
 
-RustboroCity_Text_1E2331: @ 81E2331
+RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331
 	.string "There you go, {PLAYER}!\p"
 	.string "I added a new feature named\n"
 	.string "MATCH CALL to your POKéNAV.\p"
@@ -1282,14 +1297,14 @@ RustboroCity_Text_1E2331: @ 81E2331
 	.string "Test it out.\n"
 	.string "Please give our PRESIDENT a call.$"
 
-RustboroCity_Text_1E2449: @ 81E2449
+RustboroCity_Text_PleaseSelectPokenav: @ 81E2449
 	.string "Please select the POKéNAV.$"
 
-RustboroCity_Text_1E2464: @ 81E2464
+RustboroCity_Text_IdBetterGetBackToWork: @ 81E2464
 	.string "Okay, I'd better get back to work.\n"
 	.string "Please take care, {PLAYER}!$"
 
-RustboroCity_Text_1E249D: @ 81E249D
+RustboroCity_Text_YouCanHave2On2Battle: @ 81E249D
 	.string "Did you know this?\p"
 	.string "You can have a 2-on-2 battle even\n"
 	.string "if you're not with another TRAINER.\p"
diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json
index 134b9f726..a4bc47476 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.json
+++ b/data/maps/RustboroCity_CuttersHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_CuttersHouse_EventScript_215BD4",
+      "script": "RustboroCity_CuttersHouse_EventScript_Cutter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_CuttersHouse_EventScript_215C0A",
+      "script": "RustboroCity_CuttersHouse_EventScript_Lass",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index ab74d5340..f19d56a2d 100644
--- a/data/maps/RustboroCity_CuttersHouse/scripts.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
@@ -1,27 +1,27 @@
 RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3
 	.byte 0
 
-RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4
+RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_215C00
-	msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut
+	msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM01
 	setflag FLAG_RECEIVED_HM01
-	msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT
+	msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00
-	msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT
+RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8215C00
+	msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A
-	msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC
+RustboroCity_CuttersHouse_EventScript_Lass:: @ 8215C0A
+	msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC
 	end
 
-RustboroCity_CuttersHouse_Text_215C13: @ 8215C13
+RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse: @ 8215C13
 	.string "That determined expression…\n"
 	.string "That limber way you move…\l"
 	.string "And your well-trained POKéMON…\p"
@@ -33,7 +33,7 @@ RustboroCity_CuttersHouse_Text_215C13: @ 8215C13
 	.string "No need to be modest or shy.\n"
 	.string "Go on, take it!$"
 
-RustboroCity_CuttersHouse_Text_215D33: @ 8215D33
+RustboroCity_CuttersHouse_Text_ExplainCut: @ 8215D33
 	.string "That HIDDEN MACHINE, or HM for\n"
 	.string "short, is CUT.\p"
 	.string "An HM move is one that can be used\n"
@@ -44,7 +44,7 @@ RustboroCity_CuttersHouse_Text_215D33: @ 8215D33
 	.string "And, unlike a TM, an HM can be used\n"
 	.string "more than once.$"
 
-RustboroCity_CuttersHouse_Text_215E39: @ 8215E39
+RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees: @ 8215E39
 	.string "When they were expanding the city of\n"
 	.string "RUSTBORO, my dad helped out.\p"
 	.string "He made his POKéMON use CUT to clear\n"
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json
index 7eee74211..9223872b9 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_1F_EventScript_211261",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_Employee",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_1F_EventScript_211293",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_StairGuard",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE",
+      "script": "RustboroCity_DevonCorp_1F_EventScript_Greeter",
       "flag": "0"
     }
   ],
@@ -85,7 +85,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_DevonCorp_1F_EventScript_211312"
+      "script": "RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay"
     },
     {
       "type": "sign",
@@ -93,7 +93,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_DevonCorp_1F_EventScript_211309"
+      "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 788a403f2..3ee7e7dc8 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -3,121 +3,121 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245
 	.byte 0
 
 RustboroCity_DevonCorp_1F_OnTransition: @ 821124B
-	call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255
+	call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255
+RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8211255
 	setobjectxyperm 2, 14, 2
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261
+RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8211261
 	lock
 	faceplayer
-	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211289
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_21127F
-	msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright
+	msgbox RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F
-	msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 821127F
+	msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289
-	msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 8211289
+	msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293
+RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8211293
 	lock
 	faceplayer
-	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112BA
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112C4
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112C4
-	msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GotRobbed
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_GotRobbed
+	msgbox RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA
-	msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 82112BA
+	msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4
-	msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 82112C4
+	msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE
+RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 82112CE
 	lock
 	faceplayer
-	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112F5
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112FF
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112FF
-	msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT
+	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed
+	msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5
-	msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 82112F5
+	msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF
-	msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 82112FF
+	msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309
-	msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN
+RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay:: @ 8211309
+	msgbox RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312
-	msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN
+RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay:: @ 8211312
+	msgbox RustboroCity_DevonCorp_1F_Text_ProductDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B
+RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp: @ 821131B
 	.string "Hello and welcome to the DEVON\n"
 	.string "CORPORATION.\p"
 	.string "We're proud producers of items and\n"
 	.string "medicine that enhance your life.$"
 
-RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B
+RustboroCity_DevonCorp_1F_Text_StaffGotRobbed: @ 821138B
 	.string "One of our research staff stupidly\n"
 	.string "got robbed of an important parcel.$"
 
-RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1
+RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct: @ 82113D1
 	.string "Hey, those RUNNING SHOES!\n"
 	.string "They're one of our products!\p"
 	.string "It makes me happy when I see someone\n"
 	.string "using something we made.$"
 
-RustboroCity_DevonCorp_1F_Text_211446: @ 8211446
+RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright: @ 8211446
 	.string "That stolen parcel…\p"
 	.string "Well, sure it's important, but it's not\n"
 	.string "anything that anyone can use.\p"
 	.string "In my estimation, that robber must not\n"
 	.string "have been very bright.$"
 
-RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE
+RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered: @ 82114DE
 	.string "It sounds like they've recovered\n"
 	.string "the ripped-off DEVON GOODS.$"
 
-RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B
+RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter: @ 821151B
 	.string "I'm sorry, only authorized people\n"
 	.string "are allowed to enter here.$"
 
-RustboroCity_DevonCorp_1F_Text_211558: @ 8211558
+RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed: @ 8211558
 	.string "It's beyond stupid.\n"
 	.string "How could we get robbed?$"
 
-RustboroCity_DevonCorp_1F_Text_211585: @ 8211585
+RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere: @ 8211585
 	.string "Hi, there!\n"
 	.string "You're always welcome here!$"
 
-RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC
+RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay: @ 82115AC
 	.string "Samples of rocks and metal are\n"
 	.string "displayed in the glass case.\p"
 	.string "There's a panel with some writing\n"
@@ -131,7 +131,7 @@ RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC
 	.string "“DEVON is now a manufacturer of a wide\n"
 	.string "range of industrial products.”$"
 
-RustboroCity_DevonCorp_1F_Text_211722: @ 8211722
+RustboroCity_DevonCorp_1F_Text_ProductDisplay: @ 8211722
 	.string "Prototypes and test products fill\n"
 	.string "the glass display case.\p"
 	.string "There's a panel with a description…\p"
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json
index 9ab864774..b7dbdb3d5 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_21186F",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_211886",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_BallScientist",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavScientist",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 10,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_FossilScientist",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF",
+      "script": "RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 0784f523c..7b8dbdadf 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -4,305 +4,306 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
 
 RustboroCity_DevonCorp_2F_OnTransition: @ 821185D
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869
+RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 8211869
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
+RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 821186F
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
-	msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+	msgbox RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
+RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 8211886
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6
-	msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls
+	msgbox RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
-	msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 82118A6
+	msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
+RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 82118B0
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
-	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0
-	msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_HasPokenav
+	msgbox RustboroCity_DevonCorp_2F_Text_IMadePokenav, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
-	msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 82118D0
+	msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
+RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 82118DA
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
-	msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+	msgbox RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
+RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FossilMonReady
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
-	msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_StillRegenerating
+	msgbox RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils, MSGBOX_DEFAULT
 	checkitem ITEM_ROOT_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211933
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil
 	checkitem ITEM_CLAW_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211991
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933
+@ This whole section has needless duplication and could be condensed considerably
+RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933
 	closemessage
 	playse SE_PIN
 	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
+	msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil
 	checkitem ITEM_CLAW_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84
-	goto RustboroCity_DevonCorp_2F_EventScript_211974
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil
+	goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
+RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974
 	bufferitemname 0, ITEM_ROOT_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
 	takeitem ITEM_ROOT_FOSSIL, 1
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
 	setvar VAR_WHICH_FOSSIL_REVIVED, 1
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991
+RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991
 	closemessage
 	playse SE_PIN
 	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
+	msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil
 	checkitem ITEM_ROOT_FOSSIL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84
-	goto RustboroCity_DevonCorp_2F_EventScript_2119D2
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil
+	goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
+RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2
 	bufferitemname 0, ITEM_CLAW_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
 	takeitem ITEM_CLAW_FOSSIL, 1
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
 	setvar VAR_WHICH_FOSSIL_REVIVED, 2
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF
-	msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 82119EF
+	msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
-	msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 82119F9
+	msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
+RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 8211A03
 	compare VAR_WHICH_FOSSIL_REVIVED, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady
 	compare VAR_WHICH_FOSSIL_REVIVED, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A
+RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8211A1A
 	bufferspeciesname 1, SPECIES_LILEEP
-	msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
-	goto RustboroCity_DevonCorp_2F_EventScript_211A3E
+	msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
+	goto RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C
+RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 8211A2C
 	bufferspeciesname 1, SPECIES_ANORITH
-	msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
-	goto RustboroCity_DevonCorp_2F_EventScript_211AE1
+	msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
+	goto RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep:: @ 8211A3E
 	setvar VAR_TEMP_1, SPECIES_LILEEP
 	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty
 	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
-	call RustboroCity_DevonCorp_2F_EventScript_211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty:: @ 8211A6E
+	call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto RustboroCity_DevonCorp_2F_EventScript_211AD7
+	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
-	call RustboroCity_DevonCorp_2F_EventScript_211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC:: @ 8211A96
+	call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto RustboroCity_DevonCorp_2F_EventScript_211AB9
+	goto RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9
-	call RustboroCity_DevonCorp_2F_EventScript_2737A0
-	goto RustboroCity_DevonCorp_2F_EventScript_211AD7
+RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9
+	call Common_EventScript_TransferredToPC
+	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4
 	bufferspeciesname 1, SPECIES_LILEEP
 	playfanfare MUS_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_2122CB
+	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
 	waitmessage
 	waitfanfare
 	bufferspeciesname 0, SPECIES_LILEEP
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep:: @ 8211AD7
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith:: @ 8211AE1
 	setvar VAR_TEMP_1, SPECIES_ANORITH
 	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty
 	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
-	call RustboroCity_DevonCorp_2F_EventScript_211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty:: @ 8211B11
+	call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto RustboroCity_DevonCorp_2F_EventScript_211B7A
+	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
-	call RustboroCity_DevonCorp_2F_EventScript_211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC:: @ 8211B39
+	call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto RustboroCity_DevonCorp_2F_EventScript_211B5C
+	goto RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C
-	call RustboroCity_DevonCorp_2F_EventScript_2737A0
-	goto RustboroCity_DevonCorp_2F_EventScript_211B7A
+RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C
+	call Common_EventScript_TransferredToPC
+	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67
 	bufferspeciesname 1, SPECIES_ANORITH
 	playfanfare MUS_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_2122CB
+	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
 	waitmessage
 	waitfanfare
 	bufferspeciesname 0, SPECIES_ANORITH
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith:: @ 8211B7A
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84
-	message RustboroCity_DevonCorp_2F_Text_212092
+RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84
+	message RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne
 	waitmessage
 	multichoice 17, 6, MULTI_FOSSIL, 0
 	switch VAR_RESULT
-	case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1
-	case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7
-	case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD
-	case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_211BCD
+	case 0, RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil
+	case 1, RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil
+	case 2, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect
+	case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1
-	goto RustboroCity_DevonCorp_2F_EventScript_2119D2
+RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil:: @ 8211BC1
+	goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211BC7:: @ 8211BC7
-	goto RustboroCity_DevonCorp_2F_EventScript_211974
+RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil:: @ 8211BC7
+	goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD
+RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
+RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist:: @ 8211BCF
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
 	compare VAR_RUSTBORO_CITY_STATE, 6
-	goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1
-	msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
+	goto_if_ge RustboroCity_DevonCorp_2F_EventScript_WorkOnNext
+	msgbox RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1
-	msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_WorkOnNext:: @ 8211BF1
+	msgbox RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB
+RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon: @ 8211BFB
 	.string "We're developing a device for talking\n"
 	.string "with POKéMON.\p"
 	.string "But we haven't had much success…$"
 
-RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50
+RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls: @ 8211C50
 	.string "I'm developing new kinds of\n"
 	.string "POKé BALLS…\p"
 	.string "But I haven't made much headway…$"
 
-RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99
+RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls: @ 8211C99
 	.string "We finally made new kinds of\n"
 	.string "POKé BALLS!\p"
 	.string "The REPEAT BALL makes it easier to\n"
@@ -313,12 +314,12 @@ RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99
 	.string "the DEVON CORPORATION.\p"
 	.string "Please give them a try!$"
 
-RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F
+RustboroCity_DevonCorp_2F_Text_IMadePokenav: @ 8211D9F
 	.string "I made the POKéNAV!\p"
 	.string "As an engineer, I feel blessed to have\n"
 	.string "made something so great!$"
 
-RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3
+RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav: @ 8211DF3
 	.string "Oh, wow!\n"
 	.string "That's a POKéNAV!\p"
 	.string "It came about as a result of our\n"
@@ -329,18 +330,18 @@ RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3
 	.string "No, no. I think you'll find out just by\n"
 	.string "trying the POKéNAV out.$"
 
-RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0
+RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams: @ 8211EE0
 	.string "I'm trying to develop a device that\n"
 	.string "visually reproduces the dreams of\l"
 	.string "POKéMON…\p"
 	.string "But it's not going well.$"
 
-RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48
+RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils: @ 8211F48
 	.string "I've been trying to develop a device\n"
 	.string "that resurrects POKéMON from fossils…\p"
 	.string "And, it's working!$"
 
-RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6
+RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife: @ 8211FA6
 	.string "Wait! That thing you have there…\n"
 	.string "Is that a POKéMON fossil?\p"
 	.string "Would you like to bring that POKéMON\n"
@@ -348,12 +349,12 @@ RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6
 	.string "I can with my newly developed\n"
 	.string "FOSSIL REGENERATOR.$"
 
-RustboroCity_DevonCorp_2F_Text_212046: @ 8212046
+RustboroCity_DevonCorp_2F_Text_OhIsThatSo: @ 8212046
 	.string "Oh, is that so?\p"
 	.string "DEVON's technological expertise\n"
 	.string "is outstanding, I tell you.$"
 
-RustboroCity_DevonCorp_2F_Text_212092: @ 8212092
+RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne: @ 8212092
 	.string "Oh, now that's a surprise!\n"
 	.string "You have not one, but two, fossils?\p"
 	.string "Unfortunately, my machine can only\n"
@@ -361,13 +362,13 @@ RustboroCity_DevonCorp_2F_Text_212092: @ 8212092
 	.string "Would you like to pick one of your\n"
 	.string "fossils for regeneration?$"
 
-RustboroCity_DevonCorp_2F_Text_212153: @ 8212153
+RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher: @ 8212153
 	.string "Excellent!\n"
 	.string "Let's do this right away.\p"
 	.string "{PLAYER} handed the {STR_VAR_1} to\n"
 	.string "the DEVON RESEARCHER.$"
 
-RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2
+RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime: @ 82121A2
 	.string "The FOSSIL REGENERATOR, which I made,\n"
 	.string "is incredible.\p"
 	.string "But it has one drawback--it takes\n"
@@ -375,27 +376,28 @@ RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2
 	.string "So, uh… How about you go for a stroll\n"
 	.string "and look around for a while?$"
 
-RustboroCity_DevonCorp_2F_Text_212251: @ 8212251
+RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife: @ 8212251
 	.string "Thanks for waiting!\p"
 	.string "Your fossilized POKéMON has been\n"
 	.string "brought back to life!\p"
 	.string "The fossil was an ancient POKéMON.\n"
 	.string "{STR_VAR_2}, it was!$"
 
-RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB
+RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher: @ 82122CB
 	.string "{PLAYER} received {STR_VAR_2} from\n"
 	.string "the DEVON RESEARCHER.$"
 
-RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5
+@ Unused
+RustboroCity_DevonCorp_2F_Text_TooManyPokemon: @ 82122F5
 	.string "Uh-oh, you've got too many POKéMON.\n"
 	.string "You have no room for this one.$"
 
-RustboroCity_DevonCorp_2F_Text_212338: @ 8212338
+RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature: @ 8212338
 	.string "I'm trying to develop a new feature\n"
 	.string "for the POKéNAV…\p"
 	.string "But it's not going well.$"
 
-RustboroCity_DevonCorp_2F_Text_212386: @ 8212386
+RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext: @ 8212386
 	.string "Well, now what shall I work on\n"
 	.string "developing next?\p"
 	.string "Our company allows us to make our\n"
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json
index 0ed5d0b7e..8e0f6d2ae 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_Employee",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+      "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone",
       "flag": "0"
     }
   ],
@@ -71,7 +71,7 @@
       "y": 5,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+      "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay"
     },
     {
       "type": "sign",
@@ -79,7 +79,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+      "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 3ce08c9f1..143ff4543 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -1,77 +1,78 @@
 RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame
 	.byte 0
 
 RustboroCity_DevonCorp_3F_OnTransition: @ 821243D
 	compare VAR_DEVON_CORP_3F_STATE, 0
-	call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449
+	call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
+RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 8212449
 	setobjectxyperm 2, 3, 2
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
+RustboroCity_DevonCorp_3F_OnWarp: @ 8212455
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast
 	.2byte 0
 
-RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
+RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST
 	end
 
-RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
+RustboroCity_DevonCorp_3F_OnFrame: @ 8212464
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident
 	.2byte 0
 
-RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
+RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	lockall
-	msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen
 	waitmovement 0
 	delay 80
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_TSURETEK, 0
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212558
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident
+	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT
 	closemessage
 	fadedefaultbgm
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212566
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk
+	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT
 	giveitem_std ITEM_LETTER
-	msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message RustboroCity_DevonCorp_3F_Text_212820
+	message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav
 	waitfanfare
 	setflag FLAG_SYS_POKENAV_GET
 	setflag FLAG_RECEIVED_POKENAV
 	setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
-	msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
-	msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT
-	setflag FLAG_HIDE_ROUTE_116_TUNNELER
-	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
-	clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT
+	setflag FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
+	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_BRINEY_LOCATION, 1
-	clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	clearflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setvar VAR_DEVON_CORP_3F_STATE, 1
 	setvar VAR_RUSTBORO_CITY_STATE, 6
 	releaseall
 	end
 
+@ Unused
 RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
 	walk_up
 	walk_up
@@ -79,7 +80,7 @@ RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
 	walk_in_place_fastest_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
+RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident: @ 8212534
 	walk_right
 	walk_right
 	walk_right
@@ -96,12 +97,12 @@ RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
 	walk_in_place_fastest_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543
+RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk: @ 8212543
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
+RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen: @ 8212546
 	walk_right
 	walk_right
 	walk_right
@@ -112,7 +113,7 @@ RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
 	walk_right
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
+RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer: @ 821254F
 	walk_left
 	walk_left
 	walk_left
@@ -123,7 +124,7 @@ RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
 	walk_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
+RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident: @ 8212558
 	walk_right
 	walk_right
 	walk_right
@@ -139,7 +140,7 @@ RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
 	walk_right
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
+RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk: @ 8212566
 	delay_16
 	delay_16
 	walk_down
@@ -147,57 +148,57 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
 	walk_in_place_fastest_right
 	step_end
 
-RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
+RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_2125CC
-	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595
-	msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare
+	msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
-	msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595
+	msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT
 	giveitem_std ITEM_EXP_SHARE
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_EXP_SHARE
-	msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT
+	msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC
-	msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 82125CC
+	msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1
+RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 82125E1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_2125F6
-	msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls
+	msgbox RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6
-	msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 82125F6
+	msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600
-	msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN
+RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 8212600
+	msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
+RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor: @ 8212609
 	.string "I'm MR. STONE, the PRESIDENT of\n"
 	.string "the DEVON CORPORATION.\p"
 	.string "I'd just got word about you!\p"
@@ -212,17 +213,17 @@ RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
 	.string "I was hoping that you'd deliver a\n"
 	.string "LETTER to STEVEN in DEWFORD.$"
 
-RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C
+RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis: @ 821277C
 	.string "MR. STONE: Now, you should know that\n"
 	.string "I am a great PRESIDENT.\p"
 	.string "So, I'd never be so cheap as to ask\n"
 	.string "a favor for nothing in return.\p"
 	.string "That's why I want you to have this!$"
 
-RustboroCity_DevonCorp_3F_Text_212820: @ 8212820
+RustboroCity_DevonCorp_3F_Text_ReceivedPokenav: @ 8212820
 	.string "{PLAYER} received a POKéNAV.$"
 
-RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
+RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp: @ 8212837
 	.string "MR. STONE: That device…\p"
 	.string "It's a POKéMON NAVIGATOR, or POKéNAV\n"
 	.string "for short.\p"
@@ -237,20 +238,20 @@ RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
 	.string "I think it would be best if you rested\n"
 	.string "up before you go on your way.$"
 
-RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2
+RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare: @ 82129D2
 	.string "MR. STONE: Well, then, {PLAYER}{KUN},\n"
 	.string "go with caution and care!$"
 
-RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09
+RustboroCity_DevonCorp_3F_Text_CountingOnYou: @ 8212A09
 	.string "MR. STONE: I'm counting on you!$"
 
-RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29
+RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter: @ 8212A29
 	.string "MR. STONE: You delivered my LETTER?\n"
 	.string "Thank you kindly!\p"
 	.string "This is my way of thanking you.\n"
 	.string "It should help you, a TRAINER.$"
 
-RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
+RustboroCity_DevonCorp_3F_Text_ExplainExpShare: @ 8212A9E
 	.string "MR. STONE: A POKéMON holding that\n"
 	.string "EXP. SHARE will be given some of the\l"
 	.string "EXP Points from battle.\p"
@@ -259,7 +260,7 @@ RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
 	.string "I would say EXP. SHARE is quite useful\n"
 	.string "for raising weak POKéMON.$"
 
-RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
+RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends: @ 8212B78
 	.string "MR. STONE: Since my youth, I've immersed\n"
 	.string "myself in work.\p"
 	.string "Consequently, I'm not familiar with\n"
@@ -267,7 +268,7 @@ RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
 	.string "But do young people all want to be\n"
 	.string "TRAINERS in the POKéMON LEAGUE?$"
 
-RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
+RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere: @ 8212C37
 	.string "This is the DEVON CORPORATION's\n"
 	.string "third floor.\p"
 	.string "Our PRESIDENT's OFFICE is on\n"
@@ -285,24 +286,24 @@ RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
 	.string "Oh, that's right.\n"
 	.string "Could you wait here a second?$"
 
-RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8
+RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe: @ 8212DE8
 	.string "Our PRESIDENT would like to have\n"
 	.string "a word with you.\p"
 	.string "Please come with me.$"
 
-RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F
+RustboroCity_DevonCorp_3F_Text_PleaseGoAhead: @ 8212E2F
 	.string "Please, go ahead.$"
 
-RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41
+RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard: @ 8212E41
 	.string "If you visit the SHIPYARD in SLATEPORT,\n"
 	.string "you should go see CAPT. STERN.$"
 
-RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88
+RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular: @ 8212E88
 	.string "DEVON's new products, the REPEAT BALL\n"
 	.string "and TIMER BALL, have become hugely\l"
 	.string "popular among TRAINERS.$"
 
-RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9
+RustboroCity_DevonCorp_3F_Text_RareRocksDisplay: @ 8212EE9
 	.string "It's a collection of rare rocks and\n"
 	.string "stones assembled by the PRESIDENT.$"
 
diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json
index bc016aa2c..a35fe32cf 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.json
+++ b/data/maps/RustboroCity_Flat1_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_1F_EventScript_2150CE",
+      "script": "RustboroCity_Flat1_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_1F_EventScript_2150D7",
+      "script": "RustboroCity_Flat1_1F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index 9cff0b010..c52c7f069 100644
--- a/data/maps/RustboroCity_Flat1_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
@@ -1,18 +1,18 @@
 RustboroCity_Flat1_1F_MapScripts:: @ 82150CD
 	.byte 0
 
-RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE
-	msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC
+RustboroCity_Flat1_1F_EventScript_Man:: @ 82150CE
+	msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7
-	msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC
+RustboroCity_Flat1_1F_EventScript_Woman:: @ 82150D7
+	msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0
+RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility: @ 82150E0
 	.string "Every POKéMON has a special ability\n"
 	.string "that it can use.$"
 
-RustboroCity_Flat1_1F_Text_215115: @ 8215115
+RustboroCity_Flat1_1F_Text_PokemonStrange: @ 8215115
 	.string "POKéMON are such strange creatures.$"
 
diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json
index 5c047888e..b937d323a 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.json
+++ b/data/maps/RustboroCity_Flat1_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_21523D",
+      "script": "RustboroCity_Flat1_2F_EventScript_WaldasMom",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_21513A",
+      "script": "RustboroCity_Flat1_2F_EventScript_WaldasDad",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat1_2F_EventScript_215246",
+      "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index e5b6c493a..4295f0447 100644
--- a/data/maps/RustboroCity_Flat1_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
@@ -1,90 +1,90 @@
 RustboroCity_Flat1_2F_MapScripts:: @ 8215139
 	.byte 0
 
-RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A
+RustboroCity_Flat1_2F_EventScript_WaldasDad:: @ 821513A
 	lock
 	faceplayer
 	specialvar VAR_RESULT, TryBufferWaldaPhrase
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_21518D
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151AD
+	compare VAR_RESULT, FALSE
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase
 
-RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157
+RustboroCity_Flat1_2F_EventScript_GivePhrase:: @ 8215157
 	special DoWaldaNamingScreen
 	waitstate
 	compare VAR_0x8004, 1
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151D7
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGivePhrase
 	compare VAR_0x8004, 2
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151E1
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase
 	specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151F8
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_215221
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase
+	compare VAR_RESULT, FALSE
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase
 	end
 
-RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D
-	msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD
-	msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT
-	goto RustboroCity_Flat1_2F_EventScript_215157
-
-RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD
-	msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD
-	msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT
-	goto RustboroCity_Flat1_2F_EventScript_215157
-
-RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD
-	msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT
+RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase:: @ 821518D
+	msgbox RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
+	msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
+	goto RustboroCity_Flat1_2F_EventScript_GivePhrase
+
+RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase:: @ 82151AD
+	msgbox RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
+	msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
+	goto RustboroCity_Flat1_2F_EventScript_GivePhrase
+
+RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase:: @ 82151CD
+	msgbox RustboroCity_Flat1_2F_Text_OhIsThatRight, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7
-	msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT
+RustboroCity_Flat1_2F_EventScript_CancelGivePhrase:: @ 82151D7
+	msgbox RustboroCity_Flat1_2F_Text_OhYouDontKnowAny, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1
-	msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT
-	call RustboroCity_Flat1_2F_EventScript_215238
-	msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT
+RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase:: @ 82151E1
+	msgbox RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase, MSGBOX_DEFAULT
+	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
+	msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8
-	msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT
-	call RustboroCity_Flat1_2F_EventScript_215238
-	msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT
+RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: @ 82151F8
+	msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry2, MSGBOX_DEFAULT
+	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
+	msgbox RustboroCity_Flat1_2F_Text_OhShesLaughing, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT
+	msgbox RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221
-	msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT
-	call RustboroCity_Flat1_2F_EventScript_215238
-	msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT
+RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase:: @ 8215221
+	msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry, MSGBOX_DEFAULT
+	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
+	msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238
+RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda:: @ 8215238
 	turnobject 6, DIR_EAST
 	return
 
-RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D
-	msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC
+RustboroCity_Flat1_2F_EventScript_WaldasMom:: @ 821523D
+	msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246
-	msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN
+RustboroCity_Flat1_2F_EventScript_PokeDoll:: @ 8215246
+	msgbox RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll, MSGBOX_SIGN
 	end
 
-RustboroCity_Flat1_2F_Text_21524F: @ 821524F
+RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard: @ 821524F
 	.string "Oh, it's so hard every day…\p"
 	.string "What's hard?\n"
 	.string "You need to ask?\p"
@@ -93,7 +93,7 @@ RustboroCity_Flat1_2F_Text_21524F: @ 821524F
 	.string "It really isn't easy coming up with\n"
 	.string "meals every day.$"
 
-RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA
+RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase: @ 82152FA
 	.string "Oh, hello!\n"
 	.string "Welcome to the PEPPER household.\p"
 	.string "I have a question for you.\n"
@@ -107,62 +107,62 @@ RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA
 	.string "Do you know of a funny word or\n"
 	.string "phrase you can tell me?$"
 
-RustboroCity_Flat1_2F_Text_215448: @ 8215448
+RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase: @ 8215448
 	.string "I've been saying “{STR_VAR_1}”\n"
 	.string "to amuse her lately.\p"
 	.string "Do you know of a better word or\n"
 	.string "a phrase that might work?$"
 
-RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD
+RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion: @ 82154AD
 	.string "Oh, that's wonderful.\n"
 	.string "So, let's hear it, your suggestion.$"
 
-RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7
+RustboroCity_Flat1_2F_Text_OhIsThatRight: @ 82154E7
 	.string "Oh, is that right?\p"
 	.string "Well, if you come up with a good\n"
 	.string "suggestion, I'm all ears.$"
 
-RustboroCity_Flat1_2F_Text_215535: @ 8215535
+RustboroCity_Flat1_2F_Text_LetsGiveItATry2: @ 8215535
 	.string "Ah, I see.\n"
 	.string "Well, let's give it a try, shall we?$"
 
-RustboroCity_Flat1_2F_Text_215565: @ 8215565
+RustboroCity_Flat1_2F_Text_OhShesLaughing: @ 8215565
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Oh, yes! She's laughing!\n"
 	.string "Oh, I am as delighted as she!$"
 
-RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4
+RustboroCity_Flat1_2F_Text_LetsGiveItATry: @ 82155A4
 	.string "Ah, I see.\n"
 	.string "Well, let's give it a try, shall we?$"
 
-RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4
+RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll: @ 82155D4
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Hmmm… She's not smiling at all.\n"
 	.string "Maybe WALDA is one serious child…$"
 
-RustboroCity_Flat1_2F_Text_21561E: @ 821561E
+RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase: @ 821561E
 	.string "Oh, so you don't know any good words.\n"
 	.string "I'd better think for myself, then.\p"
 	.string "Hmm…\n"
 	.string "How about “{STR_VAR_1}”?\l"
 	.string "Let's see if that will work.$"
 
-RustboroCity_Flat1_2F_Text_215699: @ 8215699
+RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2: @ 8215699
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Hmmm… She's not smiling at all.\n"
 	.string "Maybe WALDA is one serious child…$"
 
-RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3
+RustboroCity_Flat1_2F_Text_OhYouDontKnowAny: @ 82156E3
 	.string "Oh, so you don't know any good words.\n"
 	.string "I guess I'll try to amuse her with\l"
 	.string "the saying I used before.\p"
 	.string "Anyways, if you have a good suggestion,\n"
 	.string "don't hesitate in telling me, okay?$"
 
-RustboroCity_Flat1_2F_Text_215792: @ 8215792
+RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper: @ 8215792
 	.string "Thank you!\p"
 	.string "Thanks to you, my darling WALDA\n"
 	.string "laughed for me!\p"
@@ -179,6 +179,6 @@ RustboroCity_Flat1_2F_Text_215792: @ 8215792
 	.string "That will give you access to the new\n"
 	.string "wallpaper patterns.$"
 
-RustboroCity_Flat1_2F_Text_215923: @ 8215923
+RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll: @ 8215923
 	.string "It's a POKéMON plush DOLL!$"
 
diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json
index 6d10fe9d8..6ca0fbd1b 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.json
+++ b/data/maps/RustboroCity_Flat2_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_1F_EventScript_215F80",
+      "script": "RustboroCity_Flat2_1F_EventScript_Skitty",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_1F_EventScript_215F77",
+      "script": "RustboroCity_Flat2_1F_EventScript_OldWoman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index 8fc7e4972..182060955 100644
--- a/data/maps/RustboroCity_Flat2_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
@@ -1,24 +1,24 @@
 RustboroCity_Flat2_1F_MapScripts:: @ 8215F76
 	.byte 0
 
-RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77
-	msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC
+RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8215F77
+	msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80
+RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8215F80
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT
+	msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-RustboroCity_Flat2_1F_Text_215F93: @ 8215F93
+RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere: @ 8215F93
 	.string "DEVON CORPORATION's workers live in\n"
 	.string "this building.$"
 
-RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6
+RustboroCity_Flat2_1F_Text_Skitty: @ 8215FC6
 	.string "SKITTY: Gyaaaah!$"
 
diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json
index a7d254e4d..9667ebf92 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.json
+++ b/data/maps/RustboroCity_Flat2_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_2F_EventScript_215FD8",
+      "script": "RustboroCity_Flat2_2F_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_2F_EventScript_215FE1",
+      "script": "RustboroCity_Flat2_2F_EventScript_NinjaBoy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index d4b940c9f..f328b71c1 100644
--- a/data/maps/RustboroCity_Flat2_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
@@ -1,15 +1,15 @@
 RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7
 	.byte 0
 
-RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8
-	msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC
+RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8215FD8
+	msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1
+RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_216010
-	msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall
+	msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_PREMIER_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -17,21 +17,21 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1
 	release
 	end
 
-RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010
-	msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT
+RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8216010
+	msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat2_2F_Text_21601A: @ 821601A
+RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays: @ 821601A
 	.string "Way back in the old days, DEVON was just\n"
 	.string "a teeny, tiny company.$"
 
-RustboroCity_Flat2_2F_Text_21605A: @ 821605A
+RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt: @ 821605A
 	.string "My daddy's working at the CORPORATION.\p"
 	.string "My daddy made this!\n"
 	.string "But I can't use it, so you can have it.$"
 
-RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD
+RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo: @ 82160BD
 	.string "My daddy's working at the CORPORATION.\p"
 	.string "When I grow up, I'm going to work for\n"
 	.string "DEVON, too.$"
diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json
index 2366b5392..a9c1e40cd 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.json
+++ b/data/maps/RustboroCity_Flat2_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_3F_EventScript_216117",
+      "script": "RustboroCity_Flat2_3F_EventScript_DevonEmployee",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Flat2_3F_EventScript_216120",
+      "script": "RustboroCity_Flat2_3F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index dd5a86dae..8af31531d 100644
--- a/data/maps/RustboroCity_Flat2_3F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
@@ -1,19 +1,19 @@
 RustboroCity_Flat2_3F_MapScripts:: @ 8216116
 	.byte 0
 
-RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117
-	msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC
+RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8216117
+	msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120
-	msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC
+RustboroCity_Flat2_3F_EventScript_Woman:: @ 8216120
+	msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_3F_Text_216129: @ 8216129
+RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones: @ 8216129
 	.string "DEVON's PRESIDENT likes to collect\n"
 	.string "rare stones.$"
 
-RustboroCity_Flat2_3F_Text_216159: @ 8216159
+RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones: @ 8216159
 	.string "I think the PRESIDENT's son also\n"
 	.string "collects rare stones.$"
 
diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json
index bc889d66b..5d3000846 100644
--- a/data/maps/RustboroCity_House1/map.json
+++ b/data/maps/RustboroCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House1_EventScript_21593F",
+      "script": "RustboroCity_House1_EventScript_Trader",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House1_EventScript_2159DF",
+      "script": "RustboroCity_House1_EventScript_Hiker",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc
index f0a0f4827..cf1cec610 100644
--- a/data/maps/RustboroCity_House1/scripts.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
@@ -1,58 +1,58 @@
 RustboroCity_House1_MapScripts:: @ 821593E
 	.byte 0
 
-RustboroCity_House1_EventScript_21593F:: @ 821593F
+RustboroCity_House1_EventScript_Trader:: @ 821593F
 	lock
 	faceplayer
-	goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5
+	goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted
 	setvar VAR_0x8008, INGAME_TRADE_SEEDOT
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_House1_EventScript_2159BD
-	special sub_81B94B0
+	msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq RustboroCity_House1_EventScript_DeclineTrade
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, 255
-	goto_if_eq RustboroCity_House1_EventScript_2159BD
+	goto_if_eq RustboroCity_House1_EventScript_DeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne RustboroCity_House1_EventScript_2159C7
+	goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
-	msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT
+	msgbox RustboroCity_House1_Text_PleaseBeGoodToMyPokemon, MSGBOX_DEFAULT
 	setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	release
 	end
 
-RustboroCity_House1_EventScript_2159BD:: @ 82159BD
-	msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT
+RustboroCity_House1_EventScript_DeclineTrade:: @ 82159BD
+	msgbox RustboroCity_House1_Text_YouDontWantToThatsOkay, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_2159C7:: @ 82159C7
+RustboroCity_House1_EventScript_NotRequestedMon:: @ 82159C7
 	bufferspeciesname 0, VAR_0x8009
-	msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT
+	msgbox RustboroCity_House1_Text_DoesntLookLikeMonToMe, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_2159D5:: @ 82159D5
-	msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT
+RustboroCity_House1_EventScript_TradeCompleted:: @ 82159D5
+	msgbox RustboroCity_House1_Text_AnyPokemonCanBeCute, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_2159DF:: @ 82159DF
-	msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC
+RustboroCity_House1_EventScript_Hiker:: @ 82159DF
+	msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC
 	end
 
-RustboroCity_House1_Text_2159E8: @ 82159E8
+RustboroCity_House1_Text_IllTradeIfYouWant: @ 82159E8
 	.string "Huh? My POKéMON is cute?\n"
 	.string "Sure, I knew that.\p"
 	.string "But if you really want, I'm willing\n"
@@ -60,23 +60,23 @@ RustboroCity_House1_Text_2159E8: @ 82159E8
 	.string "I'll trade you my {STR_VAR_2} for\n"
 	.string "a {STR_VAR_1} if you want.$"
 
-RustboroCity_House1_Text_215A77: @ 8215A77
+RustboroCity_House1_Text_PleaseBeGoodToMyPokemon: @ 8215A77
 	.string "Eheheh…\n"
 	.string "Please be good to my POKéMON.$"
 
-RustboroCity_House1_Text_215A9D: @ 8215A9D
+RustboroCity_House1_Text_DoesntLookLikeMonToMe: @ 8215A9D
 	.string "Huh? That doesn't look anything like\n"
 	.string "a {STR_VAR_1} to me.$"
 
-RustboroCity_House1_Text_215ACE: @ 8215ACE
+RustboroCity_House1_Text_YouDontWantToThatsOkay: @ 8215ACE
 	.string "Oh, if you don't want to, that's okay.\n"
 	.string "But my POKéMON is cute, you know…$"
 
-RustboroCity_House1_Text_215B17: @ 8215B17
+RustboroCity_House1_Text_AnyPokemonCanBeCute: @ 8215B17
 	.string "Any POKéMON can be cute if you raise\n"
 	.string "it with care and kindness.$"
 
-RustboroCity_House1_Text_215B57: @ 8215B57
+RustboroCity_House1_Text_AllSortsOfPlaces: @ 8215B57
 	.string "In all sorts of places, there are all\n"
 	.string "sorts of POKéMON and people.\p"
 	.string "I find that fascinating, so I go to all\n"
diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json
index b10b2c074..6dcd38ab4 100644
--- a/data/maps/RustboroCity_House2/map.json
+++ b/data/maps/RustboroCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House2_EventScript_215EB4",
+      "script": "RustboroCity_House2_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House2_EventScript_215EBD",
+      "script": "RustboroCity_House2_EventScript_LittleGirl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc
index 632eb6877..c8e80ee9f 100644
--- a/data/maps/RustboroCity_House2/scripts.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
@@ -1,20 +1,20 @@
 RustboroCity_House2_MapScripts:: @ 8215EB3
 	.byte 0
 
-RustboroCity_House2_EventScript_215EB4:: @ 8215EB4
-	msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC
+RustboroCity_House2_EventScript_PokefanF:: @ 8215EB4
+	msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC
 	end
 
-RustboroCity_House2_EventScript_215EBD:: @ 8215EBD
-	msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC
+RustboroCity_House2_EventScript_LittleGirl:: @ 8215EBD
+	msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC
 	end
 
-RustboroCity_House2_Text_215EC6: @ 8215EC6
+RustboroCity_House2_Text_TrainerSchoolExcellent: @ 8215EC6
 	.string "The TRAINER'S SCHOOL is excellent.\p"
 	.string "If you study there, you could even\n"
 	.string "become a GYM LEADER.$"
 
-RustboroCity_House2_Text_215F21: @ 8215F21
+RustboroCity_House2_Text_RoxanneKnowsALot: @ 8215F21
 	.string "ROXANNE, the GYM LEADER, really knows\n"
 	.string "a lot about POKéMON.\p"
 	.string "She's really strong, too!$"
diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json
index 50b5f1295..66fa98833 100644
--- a/data/maps/RustboroCity_House3/map.json
+++ b/data/maps/RustboroCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House3_EventScript_216191",
+      "script": "RustboroCity_House3_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House3_EventScript_21619A",
+      "script": "RustboroCity_House3_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_House3_EventScript_2161A3",
+      "script": "RustboroCity_House3_EventScript_Pekachu",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc
index 04992fbba..d55166e67 100644
--- a/data/maps/RustboroCity_House3/scripts.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
@@ -1,36 +1,37 @@
 RustboroCity_House3_MapScripts:: @ 8216190
 	.byte 0
 
-RustboroCity_House3_EventScript_216191:: @ 8216191
-	msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC
+RustboroCity_House3_EventScript_OldMan:: @ 8216191
+	msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC
 	end
 
-RustboroCity_House3_EventScript_21619A:: @ 821619A
-	msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC
+RustboroCity_House3_EventScript_OldWoman:: @ 821619A
+	msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC
 	end
 
-RustboroCity_House3_EventScript_2161A3:: @ 82161A3
+@ Misspelling on purpose, see nickname
+RustboroCity_House3_EventScript_Pekachu:: @ 82161A3
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIKACHU, 0
-	msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT
+	msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-RustboroCity_House3_Text_2161B6: @ 82161B6
+RustboroCity_House3_Text_IGivePerfectlySuitedNicknames: @ 82161B6
 	.string "For my own POKéMON, I give them\n"
 	.string "perfectly suited nicknames!\p"
 	.string "It's my expression of, uh…\n"
 	.string "originality, yes, that's it!$"
 
-RustboroCity_House3_Text_21622A: @ 821622A
+RustboroCity_House3_Text_NamingPikachuPekachu: @ 821622A
 	.string "But giving the name PEKACHU to\n"
 	.string "a PIKACHU? It seems pointless.\p"
 	.string "I suppose it is good to use a name\n"
 	.string "that's easy to understand, but…$"
 
-RustboroCity_House3_Text_2162AB: @ 82162AB
+RustboroCity_House3_Text_Pekachu: @ 82162AB
 	.string "PEKACHU: Peka!$"
 
diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json
index a2a5a846f..d56aa3095 100644
--- a/data/maps/RustboroCity_Mart/map.json
+++ b/data/maps/RustboroCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F06",
+      "script": "RustboroCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F7D",
+      "script": "RustboroCity_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F74",
+      "script": "RustboroCity_Mart_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F86",
+      "script": "RustboroCity_Mart_EventScript_BugCatcher",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc
index 88a540356..063c5b64f 100644
--- a/data/maps/RustboroCity_Mart/scripts.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
@@ -1,22 +1,22 @@
 RustboroCity_Mart_MapScripts:: @ 8214F05
 	.byte 0
 
-RustboroCity_Mart_EventScript_214F06:: @ 8214F06
+RustboroCity_Mart_EventScript_Clerk:: @ 8214F06
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48
+	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded
 	end
 
-RustboroCity_Mart_EventScript_214F21:: @ 8214F21
-	pokemart RustboroCity_Mart_Pokemart_214F30
+RustboroCity_Mart_EventScript_PokemartBasic:: @ 8214F21
+	pokemart RustboroCity_Mart_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Mart_Pokemart_214F30: @ 8214F30
+RustboroCity_Mart_Pokemart_Basic: @ 8214F30
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
@@ -31,14 +31,14 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30
 	release
 	end
 
-RustboroCity_Mart_EventScript_214F48:: @ 8214F48
-	pokemart RustboroCity_Mart_Pokemart_214F58
+RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8214F48
+	pokemart RustboroCity_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-RustboroCity_Mart_Pokemart_214F58: @ 8214F58
+RustboroCity_Mart_Pokemart_Expanded: @ 8214F58
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_TIMER_BALL
 	.2byte ITEM_REPEAT_BALL
@@ -55,31 +55,31 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58
 	release
 	end
 
-RustboroCity_Mart_EventScript_214F74:: @ 8214F74
-	msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC
+RustboroCity_Mart_EventScript_PokefanF:: @ 8214F74
+	msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D
-	msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC
+RustboroCity_Mart_EventScript_Boy:: @ 8214F7D
+	msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_214F86:: @ 8214F86
-	msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC
+RustboroCity_Mart_EventScript_BugCatcher:: @ 8214F86
+	msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_Text_214F8F: @ 8214F8F
+RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish: @ 8214F8F
 	.string "I'm buying some PARLYZ HEALS and\n"
 	.string "ANTIDOTES.\p"
 	.string "Just in case I run into SHROOMISH\n"
 	.string "in PETALBURG WOODS.$"
 
-RustboroCity_Mart_Text_214FF1: @ 8214FF1
+RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead: @ 8214FF1
 	.string "My POKéMON evolved.\n"
 	.string "It has a lot of HP now.\p"
 	.string "I should buy SUPER POTIONS for it\n"
 	.string "instead of ordinary POTIONS.$"
 
-RustboroCity_Mart_Text_21505C: @ 821505C
+RustboroCity_Mart_Text_GettingEscapeRopeJustInCase: @ 821505C
 	.string "I'm getting an ESCAPE ROPE just in\n"
 	.string "case I get lost in a cave.\p"
 	.string "I just need to use it to get back to\n"
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json
index b91dd25ac..db28ddcf3 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 46555ba28..ca10592b0 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
+@ VAR_0x800B is the Nurse's object event id
+RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,31 +17,31 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
 	release
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84
-	msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8214D84
+	msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D
-	msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8214D8D
+	msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96
-	msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8214D96
+	msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F
+RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities: @ 8214D9F
 	.string "My POKéMON has a NAIVE nature, and my\n"
 	.string "friend's has a JOLLY nature.\p"
 	.string "It's fascinating how POKéMON have\n"
 	.string "personalities!$"
 
-RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13
+RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon: @ 8214E13
 	.string "Just like people, there are male and\n"
 	.string "female POKéMON.\p"
 	.string "But no one seems to have any idea how\n"
 	.string "they're different.$"
 
-RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81
+RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor: @ 8214E81
 	.string "The man next door gave me an HM!\p"
 	.string "I used it to teach my POKéMON how to\n"
 	.string "CUT down skinny trees.$"
diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json
index 614b123c4..a60add1ee 100644
--- a/data/maps/RustboroCity_PokemonSchool/map.json
+++ b/data/maps/RustboroCity_PokemonSchool/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F5F",
+      "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F68",
+      "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid2",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F71",
+      "script": "RustboroCity_PokemonSchool_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F7A",
+      "script": "RustboroCity_PokemonSchool_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F83",
+      "script": "RustboroCity_PokemonSchool_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F95",
+      "script": "RustboroCity_PokemonSchool_EventScript_Teacher",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonSchool_EventScript_214040",
+      "script": "RustboroCity_PokemonSchool_EventScript_Scott",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT"
     }
   ],
@@ -130,7 +130,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+      "script": "RustboroCity_PokemonSchool_EventScript_Blackboard"
     },
     {
       "type": "sign",
@@ -138,7 +138,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+      "script": "RustboroCity_PokemonSchool_EventScript_Blackboard"
     },
     {
       "type": "sign",
@@ -146,7 +146,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+      "script": "RustboroCity_PokemonSchool_EventScript_Blackboard"
     },
     {
       "type": "sign",
@@ -154,7 +154,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_PokemonSchool_EventScript_213EA9"
+      "script": "RustboroCity_PokemonSchool_EventScript_Blackboard"
     },
     {
       "type": "sign",
@@ -162,7 +162,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "RustboroCity_PokemonSchool_EventScript_213F8C"
+      "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index db4bf21f0..9fb4146da 100644
--- a/data/maps/RustboroCity_PokemonSchool/scripts.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -1,88 +1,88 @@
 RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8
 	.byte 0
 
-RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9
+RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 8213EA9
 	lockall
-	msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8
-	message RustboroCity_PokemonSchool_Text_2140F9
+RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8
+	message RustboroCity_PokemonSchool_Text_ReadWhichTopic
 	waitmessage
 	multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, 0
 	switch VAR_RESULT
-	case 0, RustboroCity_PokemonSchool_EventScript_213F17
-	case 1, RustboroCity_PokemonSchool_EventScript_213F25
-	case 2, RustboroCity_PokemonSchool_EventScript_213F33
-	case 3, RustboroCity_PokemonSchool_EventScript_213F41
-	case 4, RustboroCity_PokemonSchool_EventScript_213F4F
-	case 5, RustboroCity_PokemonSchool_EventScript_213F5D
-	case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_213F5D
+	case 0, RustboroCity_PokemonSchool_EventScript_Poison
+	case 1, RustboroCity_PokemonSchool_EventScript_Paralysis
+	case 2, RustboroCity_PokemonSchool_EventScript_Sleep
+	case 3, RustboroCity_PokemonSchool_EventScript_Burn
+	case 4, RustboroCity_PokemonSchool_EventScript_Freeze
+	case 5, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect
+	case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17
-	msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+RustboroCity_PokemonSchool_EventScript_Poison:: @ 8213F17
+	msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25
-	msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8213F25
+	msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33
-	msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8213F33
+	msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41
-	msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+RustboroCity_PokemonSchool_EventScript_Burn:: @ 8213F41
+	msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F
-	msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
+RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8213F4F
+	msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D
+RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8213F5D
 	releaseall
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F
-	msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC
+RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8213F5F
+	msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68
-	msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC
+RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8213F68
+	msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71
-	msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC
+RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8213F71
+	msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A
-	msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC
+RustboroCity_PokemonSchool_EventScript_Lass:: @ 8213F7A
+	msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83
-	msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC
+RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8213F83
+	msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C
-	msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN
+RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8213F8C
+	msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN
 	end
 
-RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
+RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB
+	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw
 	compare VAR_FACING, DIR_EAST
-	call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5
+	call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0
-	msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
+	call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest
+	msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT
 	giveitem_std ITEM_QUICK_CLAW
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -93,25 +93,25 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027
+RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8213FE5
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast
 	waitmovement 0
 	return
 
-RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010
+RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8213FF0
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest
 	waitmovement 0
 	return
 
-RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
-	msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT
+RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8213FFB
+	msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	release
 	end
 
-RustboroCity_PokemonSchool_Movement_214010: @ 8214010
+RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest: @ 8214010
 	walk_left
 	walk_down
 	walk_down
@@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_214010: @ 8214010
 	walk_right
 	step_end
 
-RustboroCity_PokemonSchool_Movement_214027: @ 8214027
+RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast: @ 8214027
 	walk_right
 	walk_right
 	walk_down
@@ -163,53 +163,53 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027
 	walk_left
 	step_end
 
-RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
+RustboroCity_PokemonSchool_EventScript_Scott:: @ 8214040
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_2140A8
-	goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082
-	msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_ScottWatchStudents
+	goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge
+	msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut, MSGBOX_DEFAULT
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_RUSTBORO
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090
-	msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT
+RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready:: @ 821406F
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge
+	msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082
-	msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_21409E
+RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge:: @ 8214082
+	msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge
 	end
 
-RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
-	msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT
-	goto RustboroCity_PokemonSchool_EventScript_21409E
+RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge:: @ 8214090
+	msgbox RustboroCity_PokemonSchool_Text_ScottStoneBadge, MSGBOX_DEFAULT
+	goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge
 	end
 
-RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
+RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge:: @ 821409E
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8
-	msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT
+RustboroCity_PokemonSchool_EventScript_ScottWatchStudents:: @ 82140A8
+	msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2
+RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges: @ 82140B2
 	.string "The blackboard lists status changes\n"
 	.string "that may affect POKéMON in battle.$"
 
-RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9
+RustboroCity_PokemonSchool_Text_ReadWhichTopic: @ 82140F9
 	.string "Which topic do you want to read?$"
 
-RustboroCity_PokemonSchool_Text_21411A: @ 821411A
+RustboroCity_PokemonSchool_Text_ExplainPoison: @ 821411A
 	.string "If a POKéMON is poisoned, it will\n"
 	.string "steadily lose HP.\p"
 	.string "The effects of poison remain after\n"
@@ -218,7 +218,7 @@ RustboroCity_PokemonSchool_Text_21411A: @ 821411A
 	.string "while it is traveling.\p"
 	.string "Heal a poisoning using an ANTIDOTE.$"
 
-RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8
+RustboroCity_PokemonSchool_Text_ExplainParalysis: @ 82141D8
 	.string "If a POKéMON becomes paralyzed,\n"
 	.string "its SPEED drops.\p"
 	.string "It may also not be able to move while\n"
@@ -226,7 +226,7 @@ RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8
 	.string "Paralysis remains after battle.\n"
 	.string "Cure it using a PARLYZ HEAL.$"
 
-RustboroCity_PokemonSchool_Text_21427D: @ 821427D
+RustboroCity_PokemonSchool_Text_ExplainSleep: @ 821427D
 	.string "If a POKéMON falls asleep, it will be\n"
 	.string "unable to attack.\p"
 	.string "A POKéMON may wake up on its own,\n"
@@ -234,26 +234,26 @@ RustboroCity_PokemonSchool_Text_21427D: @ 821427D
 	.string "sleeping, it will stay asleep.\p"
 	.string "Wake it up using an AWAKENING.$"
 
-RustboroCity_PokemonSchool_Text_214336: @ 8214336
+RustboroCity_PokemonSchool_Text_ExplainBurn: @ 8214336
 	.string "A burn reduces ATTACK power, and it\n"
 	.string "steadily reduces the victim's HP.\p"
 	.string "A burn lingers after battle.\n"
 	.string "Cure a burn using a BURN HEAL.$"
 
-RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8
+RustboroCity_PokemonSchool_Text_ExplainFreeze: @ 82143B8
 	.string "If a POKéMON is frozen, it becomes\n"
 	.string "completely helpless.\p"
 	.string "It will remain frozen after battle.\n"
 	.string "Thaw it out using an ICE HEAL.$"
 
-RustboroCity_PokemonSchool_Text_214433: @ 8214433
+RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw: @ 8214433
 	.string "Students who don't study get a little\n"
 	.string "taste of my QUICK CLAW.\p"
 	.string "Whether or not you are a good student \n"
 	.string "will be evident from the way you use\l"
 	.string "this item.$"
 
-RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8
+RustboroCity_PokemonSchool_Text_ExplainQuickClaw: @ 82144C8
 	.string "A POKéMON holding the QUICK CLAW will\n"
 	.string "occasionally speed up and get to move\l"
 	.string "before its opponent.\p"
@@ -262,20 +262,20 @@ RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8
 	.string "Just those alone will give you many\n"
 	.string "topics to study!$"
 
-RustboroCity_PokemonSchool_Text_21459F: @ 821459F
+RustboroCity_PokemonSchool_Text_TradingRightNow: @ 821459F
 	.string "I'm trading POKéMON with my friend\n"
 	.string "right now.$"
 
-RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD
+RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot: @ 82145CD
 	.string "I always wanted a SEEDOT, and\n"
 	.string "I'm finally getting one!$"
 
-RustboroCity_PokemonSchool_Text_214604: @ 8214604
+RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems: @ 8214604
 	.string "POKéMON can hold items, but they\n"
 	.string "don't know what to do with man-made\l"
 	.string "items like POTION and ANTIDOTE.$"
 
-RustboroCity_PokemonSchool_Text_214669: @ 8214669
+RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself: @ 8214669
 	.string "You know how some POKéMON moves can\n"
 	.string "confuse a POKéMON?\p"
 	.string "A confused POKéMON will sometimes\n"
@@ -283,7 +283,7 @@ RustboroCity_PokemonSchool_Text_214669: @ 8214669
 	.string "But once it leaves battle, it will\n"
 	.string "return to normal.$"
 
-RustboroCity_PokemonSchool_Text_214719: @ 8214719
+RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry: @ 8214719
 	.string "A POKéMON holding a BERRY will heal\n"
 	.string "itself…\p"
 	.string "There are many kinds of items that\n"
@@ -291,7 +291,7 @@ RustboroCity_PokemonSchool_Text_214719: @ 8214719
 	.string "Boy, it sure is hard taking notes\n"
 	.string "down…$"
 
-RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2
+RustboroCity_PokemonSchool_Text_StudentsNotes: @ 82147A2
 	.string "It's this student's notebook…\p"
 	.string "POKéMON are to be caught using\n"
 	.string "POKé BALLS.\p"
@@ -304,7 +304,7 @@ RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2
 	.string "the strong TRAINERS who await\l"
 	.string "challengers in POKéMON GYMS.$"
 
-RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0
+RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut: @ 82148C0
 	.string "Hello? Didn't we meet before?\n"
 	.string "I think back in PETALBURG CITY.\p"
 	.string "Let me introduce myself.\n"
@@ -320,12 +320,12 @@ RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0
 	.string "If I remember correctly, someone in\n"
 	.string "this town has CUT.$"
 
-RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F
+RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown: @ 8214A5F
 	.string "SCOTT: Hmm…\p"
 	.string "The talent levels of the students here\n"
 	.string "are unknown. The potential's there.$"
 
-RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6
+RustboroCity_PokemonSchool_Text_ScottStoneBadge: @ 8214AB6
 	.string "SCOTT: Oh, what's that?\p"
 	.string "It's a STONE BADGE, isn't it?\n"
 	.string "That's pretty impressive, I'd say.\p"
@@ -334,7 +334,7 @@ RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6
 	.string "It's hard to tell what you're like as\n"
 	.string "a TRAINER from a LEAGUE BADGE.$"
 
-RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A
+RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge: @ 8214B8A
 	.string "Hello? Didn't we meet before?\n"
 	.string "I think back in PETALBURG CITY.\p"
 	.string "Let me introduce myself.\n"
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index bd5c8206d..b682f84a2 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -24,8 +24,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22CE76",
-      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN"
+      "script": "RusturfTunnel_EventScript_WandasBoyfriend",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN"
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22D0C2",
+      "script": "RusturfTunnel_EventScript_Grunt",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22D0AF",
+      "script": "RusturfTunnel_EventScript_Peeko",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "RusturfTunnel_EventScript_22D1B1",
+      "script": "RusturfTunnel_EventScript_Mike",
       "flag": "0"
     },
     {
@@ -141,8 +141,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22CE5F",
-      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN"
+      "script": "RusturfTunnel_EventScript_Wanda",
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDA"
     }
   ],
   "warp_events": [
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D071"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos1"
     },
     {
       "type": "trigger",
@@ -185,7 +185,7 @@
       "elevation": 3,
       "var": "VAR_RUSTURF_TUNNEL_STATE",
       "var_value": "2",
-      "script": "RusturfTunnel_EventScript_22D083"
+      "script": "RusturfTunnel_EventScript_AquaGruntBackUp"
     },
     {
       "type": "trigger",
@@ -194,7 +194,7 @@
       "elevation": 3,
       "var": "VAR_RUSTURF_TUNNEL_STATE",
       "var_value": "2",
-      "script": "RusturfTunnel_EventScript_22D083"
+      "script": "RusturfTunnel_EventScript_AquaGruntBackUp"
     },
     {
       "type": "trigger",
@@ -203,7 +203,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D077"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos2"
     },
     {
       "type": "trigger",
@@ -212,7 +212,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D07D"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos3"
     }
   ],
   "bg_events": []
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 9bdec7e8e..9219ba3e4 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -1,146 +1,146 @@
 RusturfTunnel_MapScripts:: @ 822CE27
 	map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame
 	.byte 0
 
-RusturfTunnel_MapScript2_22CE32: @ 822CE32
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE
+RusturfTunnel_OnFrame: @ 822CE32
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene
 	.2byte 0
 
 RusturfTunnel_OnTransition: @ 822CE44
 	compare VAR_RUSTURF_TUNNEL_STATE, 2
-	call_if_eq RusturfTunnel_EventScript_22CE50
+	call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos
 	end
 
-RusturfTunnel_EventScript_22CE50:: @ 822CE50
+RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50
 	setobjectxyperm 7, 13, 4
 	setobjectxyperm 6, 13, 5
 	return
 
-RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
+RusturfTunnel_EventScript_Wanda:: @ 822CE5F
 	lock
 	faceplayer
-	msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CE76:: @ 822CE76
+RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo
 	setflag FLAG_TEMP_1
-	msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_WhyCantTheyKeepDigging, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CE99:: @ 822CE99
-	msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
+RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
+	msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
+RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
 	lockall
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CFA7
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFBC
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend2
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFC7
-	call RusturfTunnel_EventScript_22CFFF
-	msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend3
+	call RusturfTunnel_EventScript_WandasBoyfriendNotice
+	msgbox RusturfTunnel_Text_YouShatteredBoulderTakeHM, MSGBOX_DEFAULT
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFC8
+	call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFC8
+	call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
 	giveitem_std ITEM_HM04
 	setflag FLAG_RECEIVED_HM04
-	msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CF5D
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CF6F
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda2
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CF8B
-	msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda3
+	msgbox RusturfTunnel_Text_WandaReunion, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CFD4
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFE6
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFE6
-	call RusturfTunnel_EventScript_272216
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit
+	call RusturfTunnel_EventScript_SetRusturfTunnelOpen
 	releaseall
 	end
 
-RusturfTunnel_EventScript_22CF5D:: @ 822CF5D
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042
-	applymovement 1, RusturfTunnel_Movement_22D067
+RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
+RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
+RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
+RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFBC:: @ 822CFBC
-	applymovement 1, RusturfTunnel_Movement_22D048
+RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC
+	applymovement 1, RusturfTunnel_Movement_BoyfriendFaceRight
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFC7:: @ 822CFC7
+RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7
 	return
 
-RusturfTunnel_EventScript_22CFC8:: @ 822CFC8
+RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8
 	closemessage
-	applymovement 1, RusturfTunnel_Movement_22D065
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFD4:: @ 822CFD4
-	applymovement 10, RusturfTunnel_Movement_22D017
-	applymovement 1, RusturfTunnel_Movement_22D04B
+RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4
+	applymovement 10, RusturfTunnel_Movement_WandaExit1
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F
-	applymovement 10, RusturfTunnel_Movement_22D023
-	applymovement 1, RusturfTunnel_Movement_22D058
+RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
+	applymovement 10, RusturfTunnel_Movement_WandaExit
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
+RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -148,7 +148,7 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
 	waitmovement 0
 	return
 
-RusturfTunnel_Movement_22D017: @ 822D017
+RusturfTunnel_Movement_WandaExit1: @ 822D017
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ RusturfTunnel_Movement_22D017: @ 822D017
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D023: @ 822D023
+RusturfTunnel_Movement_WandaExit: @ 822D023
 	walk_right
 	walk_right
 	walk_right
@@ -176,7 +176,7 @@ RusturfTunnel_Movement_22D023: @ 822D023
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D02F: @ 822D02F
+RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
 	delay_8
 	walk_in_place_fastest_up
 	delay_16
@@ -184,11 +184,13 @@ RusturfTunnel_Movement_22D02F: @ 822D02F
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D035: @ 822D035
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D038: @ 822D038
 	walk_down
 	walk_in_place_fastest_up
@@ -196,6 +198,7 @@ RusturfTunnel_Movement_22D038: @ 822D038
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D03D: @ 822D03D
 	walk_up
 	walk_in_place_fastest_down
@@ -203,22 +206,22 @@ RusturfTunnel_Movement_22D03D: @ 822D03D
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D042: @ 822D042
+RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D045: @ 822D045
+RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D048: @ 822D048
+RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D04B: @ 822D04B
+RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
 	walk_right
 	walk_right
 	walk_right
@@ -233,7 +236,7 @@ RusturfTunnel_Movement_22D04B: @ 822D04B
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D058: @ 822D058
+RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
 	walk_up
 	walk_right
 	walk_right
@@ -248,42 +251,42 @@ RusturfTunnel_Movement_22D058: @ 822D058
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D065: @ 822D065
+RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D067: @ 822D067
+RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067
 	walk_in_place_fast_up
 	walk_in_place_fast_up
 	walk_fast_up
 	walk_fast_right
 	step_end
 
-RusturfTunnel_Movement_22D06C: @ 822D06C
+RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_fast_right
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_EventScript_22D071:: @ 822D071
+RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071
 	setvar VAR_TEMP_1, 1
 	end
 
-RusturfTunnel_EventScript_22D077:: @ 822D077
+RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077
 	setvar VAR_TEMP_1, 2
 	end
 
-RusturfTunnel_EventScript_22D07D:: @ 822D07D
+RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D
 	setvar VAR_TEMP_1, 3
 	end
 
-RusturfTunnel_EventScript_22D083:: @ 822D083
+RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
 	lockall
-	msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, RusturfTunnel_Movement_22D0AB
-	applymovement 7, RusturfTunnel_Movement_22D0AB
+	applymovement 6, RusturfTunnel_Movement_GruntAndPeekoBackUp
+	applymovement 7, RusturfTunnel_Movement_GruntAndPeekoBackUp
 	waitmovement 0
 	copyobjectxytoperm 6
 	copyobjectxytoperm 7
@@ -291,55 +294,55 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
 	releaseall
 	end
 
-RusturfTunnel_Movement_22D0AB: @ 822D0AB
+RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
+RusturfTunnel_EventScript_Peeko:: @ 822D0AF
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
+RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	lock
 	faceplayer
 	playbgm MUS_AQA_0, 0
-	msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0
-	msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat
+	msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_GOODS
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178
-	applymovement 6, RusturfTunnel_Movement_22D181
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
+	applymovement 6, RusturfTunnel_Movement_GruntEscape
 	waitmovement 0
 	removeobject 6
 	delay 50
 	addobject 5
-	applymovement 5, RusturfTunnel_Movement_22D18B
+	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E
-	applymovement 5, RusturfTunnel_Movement_22D1A4
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney
+	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2
 	waitmovement 0
-	msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	message RusturfTunnel_Text_22D3BA
+	message RusturfTunnel_Text_ThankYouLetsGoHomePeeko
 	waitmessage
 	waitse
 	playmoncry SPECIES_WINGULL, 0
 	waitbuttonpress
 	waitmoncry
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F
-	applymovement 5, RusturfTunnel_Movement_22D193
-	applymovement 7, RusturfTunnel_Movement_22D1A7
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit
+	applymovement 5, RusturfTunnel_Movement_BrineyExit
+	applymovement 7, RusturfTunnel_Movement_PeekoExit
 	waitmovement 0
 	removeobject 5
 	removeobject 7
@@ -351,7 +354,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	release
 	end
 
-RusturfTunnel_Movement_22D178: @ 822D178
+RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
 	face_down
 	lock_facing_direction
 	walk_up
@@ -359,12 +362,12 @@ RusturfTunnel_Movement_22D178: @ 822D178
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D17E: @ 822D17E
+RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_Movement_22D181: @ 822D181
+RusturfTunnel_Movement_GruntEscape: @ 822D181
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -376,7 +379,7 @@ RusturfTunnel_Movement_22D181: @ 822D181
 	walk_fast_left
 	step_end
 
-RusturfTunnel_Movement_22D18B: @ 822D18B
+RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
 	walk_right
 	walk_right
 	walk_right
@@ -386,7 +389,7 @@ RusturfTunnel_Movement_22D18B: @ 822D18B
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D193: @ 822D193
+RusturfTunnel_Movement_BrineyExit: @ 822D193
 	walk_left
 	walk_left
 	walk_left
@@ -400,19 +403,19 @@ RusturfTunnel_Movement_22D193: @ 822D193
 	walk_left
 	step_end
 
-RusturfTunnel_Movement_22D19F: @ 822D19F
+RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D1A4: @ 822D1A4
+RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4
 	delay_16
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D1A7: @ 822D1A7
+RusturfTunnel_Movement_PeekoExit: @ 822D1A7
 	walk_left
 	walk_left
 	walk_left
@@ -424,19 +427,19 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7
 	walk_left
 	step_end
 
-RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
-	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
-	msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE
+RusturfTunnel_EventScript_Mike:: @ 822D1B1
+	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat
+	msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RusturfTunnel_Text_22D1C8: @ 822D1C8
+RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8
 	.string "What, are you coming?\n"
 	.string "Come and get some, then!$"
 
-RusturfTunnel_Text_22D1F7: @ 822D1F7
+RusturfTunnel_Text_Peeko: @ 822D1F7
 	.string "PEEKO: Pii pihyoh!$"
 
-RusturfTunnel_Text_22D20A: @ 822D20A
+RusturfTunnel_Text_GruntIntro: @ 822D20A
 	.string "Grah, keelhaul it all!\p"
 	.string "That hostage POKéMON turned out to\n"
 	.string "be worthless!\p"
@@ -445,11 +448,11 @@ RusturfTunnel_Text_22D20A: @ 822D20A
 	.string "Hey! You!\n"
 	.string "So you want to battle me?$"
 
-RusturfTunnel_Text_22D2B0: @ 822D2B0
+RusturfTunnel_Text_GruntDefeat: @ 822D2B0
 	.string "Urrrggh! My career in crime comes to\n"
 	.string "a dead end!$"
 
-RusturfTunnel_Text_22D2E1: @ 822D2E1
+RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
 	.string "This is plain not right…\p"
 	.string "The BOSS told me this would be a\n"
 	.string "slick-and-easy job to pull.\p"
@@ -458,11 +461,11 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1
 	.string "Tch!\n"
 	.string "You want it back that badly, take it!$"
 
-RusturfTunnel_Text_22D395: @ 822D395
+RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395
 	.string "PEEKO!\n"
 	.string "Am I glad to see you're safe!$"
 
-RusturfTunnel_Text_22D3BA: @ 822D3BA
+RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
 	.string "PEEKO owes her life to you!\p"
 	.string "They call me MR. BRINEY.\n"
 	.string "And, you are?\p"
@@ -478,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA
 	.string "home.\p"
 	.string "PEEKO: Pihyoh!$"
 
-RusturfTunnel_Text_22D510: @ 822D510
+RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
 	.string "… …\p"
 	.string "Why can't they keep digging?\n"
 	.string "Is the bedrock too hard?\p"
@@ -490,30 +493,30 @@ RusturfTunnel_Text_22D510: @ 822D510
 	.string "But this…\n"
 	.string "What am I to do?$"
 
-RusturfTunnel_Text_22D5F3: @ 822D5F3
+RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3
 	.string "To get from RUSTBORO to VERDANTURF,\n"
 	.string "you need to go to DEWFORD, then pass\l"
 	.string "through SLATEPORT and MAUVILLE…$"
 
-RusturfTunnel_Text_22D65C: @ 822D65C
+RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C
 	.string "Wow! You shattered that boulder\n"
 	.string "blocking the way.\p"
 	.string "To show you how much I appreciate it,\n"
 	.string "I'd like you to have this HM.$"
 
-RusturfTunnel_Text_22D6D2: @ 822D6D2
+RusturfTunnel_Text_ExplainStrength: @ 822D6D2
 	.string "That HM contains STRENGTH.\p"
 	.string "If a muscular POKéMON were to learn\n"
 	.string "that, it would be able to move even\l"
 	.string "large boulders.$"
 
-RusturfTunnel_Text_22D745: @ 822D745
+RusturfTunnel_Text_WandaReunion: @ 822D745
 	.string "WANDA!\n"
 	.string "Now I can see you anytime!\p"
 	.string "WANDA: That's…wonderful.\p"
 	.string "Please, take some rest at my home.$"
 
-RusturfTunnel_Text_22D7A3: @ 822D7A3
+RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
 	.string "On the other side of this rock…\n"
 	.string "My boyfriend is there.\p"
 	.string "He… He's not just digging the tunnel\n"
@@ -521,17 +524,17 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3
 	.string "He works his hands raw and rough\n"
 	.string "for the benefit of everyone.$"
 
-RusturfTunnel_Text_22D84D: @ 822D84D
+RusturfTunnel_Text_MikeIntro: @ 822D84D
 	.string "What do you call a wild man up in the\n"
 	.string "mountains? A mountain man, right?\p"
 	.string "So why don't they call a POKéMON in\n"
 	.string "the mountains a mountain POKéMON?$"
 
-RusturfTunnel_Text_22D8DB: @ 822D8DB
+RusturfTunnel_Text_MikeDefeat: @ 822D8DB
 	.string "My POKéMON…\n"
 	.string "Ran out of power…$"
 
-RusturfTunnel_Text_22D8F9: @ 822D8F9
+RusturfTunnel_Text_MikePostBattle: @ 822D8F9
 	.string "They halted development here to\n"
 	.string "protect POKéMON, right?\l"
 	.string "There's a feel-good story!$"
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
index ce6c3d2d0..3cf4b2cd0 100644
--- a/data/maps/SSTidalCorridor/map.json
+++ b/data/maps/SSTidalCorridor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C119",
+      "script": "SSTidalCorridor_EventScript_ExitSailor",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C1A3",
+      "script": "SSTidalCorridor_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0D9",
+      "script": "SSTidalCorridor_EventScript_Briney",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0E2",
+      "script": "SSTidalCorridor_EventScript_Peeko",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -153,7 +153,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -161,7 +161,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -169,7 +169,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -177,7 +177,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -185,7 +185,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -193,7 +193,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -201,7 +201,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -209,7 +209,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -217,7 +217,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0F5"
+      "script": "SSTidalCorridor_EventScript_Cabin1Sign"
     },
     {
       "type": "sign",
@@ -225,7 +225,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0FE"
+      "script": "SSTidalCorridor_EventScript_Cabin2Sign"
     },
     {
       "type": "sign",
@@ -233,7 +233,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C107"
+      "script": "SSTidalCorridor_EventScript_Cabin3Sign"
     },
     {
       "type": "sign",
@@ -241,7 +241,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C110"
+      "script": "SSTidalCorridor_EventScript_Cabin4Sign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index f91cc6a3b..6b88b7ae1 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,218 +1,218 @@
 SSTidalCorridor_MapScripts:: @ 823BFCF
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
 	.byte 0
 
-SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
-	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
-	map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
-	map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
-	map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
-	map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_OnFrame: @ 823BFD5
+	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_RIGHT, SSTidalCorridor_EventScript_HalfwayToLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
 	.2byte 0
 
-SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
+SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 2
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C015:: @ 823C015
-	setvar VAR_PORTHOLE_STATE, 6
+SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C028:: @ 823C028
+SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 7
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C03C:: @ 823C03C
+SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 4
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
-SSTidalCorridor_EventScript_23C050:: @ 823C050
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C067
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
 	end
 
-SSTidalCorridor_EventScript_23C067:: @ 823C067
+SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 3
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C07D:: @ 823C07D
+SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C093:: @ 823C093
+SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
-	switch VAR_PORTHOLE_STATE
-	case 2, SSTidalRooms_EventScript_23C03C
-	case 3, SSTidalRooms_EventScript_23C03C
-	case 6, SSTidalRooms_EventScript_23C028
-	case 7, SSTidalRooms_EventScript_23C093
+SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
+	switch VAR_SS_TIDAL_STATE
+	case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_DEPART_LILYCOVE, SSTidalRooms_EventScript_HalfwayToSlateport
+	case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
 	return
 
-SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9
-	msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC
+SSTidalCorridor_EventScript_Briney:: @ 823C0D9
+	msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
 	end
 
-SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2
+SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5
-	msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
+	msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE
-	msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
+	msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C107:: @ 823C107
-	msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
+	msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C110:: @ 823C110
-	msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
+	msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C119:: @ 823C119
+SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
 	lock
 	faceplayer
-	compare VAR_PORTHOLE_STATE, 4
-	goto_if_eq SSTidalCorridor_EventScript_23C13B
-	compare VAR_PORTHOLE_STATE, 8
-	goto_if_eq SSTidalCorridor_EventScript_23C15A
-	msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
+	goto_if_eq SSTidalCorridor_EventScript_ExitLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ExitSlateport
+	msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C13B:: @ 823C13B
+SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C15A:: @ 823C15A
+SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C179:: @ 823C179
+SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
 	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
-SSTidalCorridor_EventScript_23C17D:: @ 823C17D
+SSTidalCorridor_EventScript_Porthole:: @ 823C17D
 	lockall
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C19E:: @ 823C19E
-	special sub_80FB7A4
+SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
+	special LookThroughPorthole
 	waitstate
 	end
 
-SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
+SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD
-	call SSTidalCorridor_EventScript_23C1C7
-	msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
+	call SSTidalCorridor_EventScript_CheckIfTrainersDefeated
+	msgbox SSTidalCorridor_Text_VisitOtherCabins, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
-	msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT
+SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
+	msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
+SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
 	checktrainerflag TRAINER_PHILLIP
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEONARD
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_COLTON
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_MICAH
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_THOMAS
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEA_AND_JED
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_GARRET
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_NAOMI
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
-	goto SSTidalCorridor_EventScript_23C1BD
+	goto SSTidalCorridor_EventScript_EnjoyYourCruise
 	return
 
-SSTidalCorridor_EventScript_23C218:: @ 823C218
+SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
 	return
 
-SSTidalCorridor_EventScript_23C219:: @ 823C219
+SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	lockall
-	applymovement 5, SSTidalCorridor_Movement_23C26D
+	applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D
-	applymovement 1, SSTidalCorridor_Movement_23C284
-	applymovement 5, SSTidalCorridor_Movement_23C275
+	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit
+	applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott
+	applymovement 5, SSTidalCorridor_Movement_ScottExit
 	waitmovement 0
 	playse SE_KAIDAN
 	waitse
 	removeobject 5
-	applymovement 1, SSTidalCorridor_Movement_23C28B
+	applymovement 1, SSTidalCorridor_Movement_SailorReturn
 	waitmovement 0
 	delay 30
 	setflag FLAG_MET_SCOTT_ON_SS_TIDAL
@@ -220,7 +220,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	releaseall
 	end
 
-SSTidalCorridor_Movement_23C26D: @ 823C26D
+SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ SSTidalCorridor_Movement_23C26D: @ 823C26D
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C275: @ 823C275
+SSTidalCorridor_Movement_ScottExit: @ 823C275
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -240,7 +240,7 @@ SSTidalCorridor_Movement_23C275: @ 823C275
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C27D: @ 823C27D
+SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
 	delay_16
 	delay_16
 	delay_16
@@ -249,7 +249,7 @@ SSTidalCorridor_Movement_23C27D: @ 823C27D
 	walk_in_place_fastest_down
 	step_end
 
-SSTidalCorridor_Movement_23C284: @ 823C284
+SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
 	delay_16
 	walk_right
 	walk_right
@@ -258,13 +258,13 @@ SSTidalCorridor_Movement_23C284: @ 823C284
 	walk_in_place_fastest_left
 	step_end
 
-SSTidalCorridor_Movement_23C28B: @ 823C28B
+SSTidalCorridor_Movement_SailorReturn: @ 823C28B
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-SSTidalCorridor_Text_23C28F: @ 823C28F
+SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
 	.string "SCOTT: Well, hi, hi!\n"
 	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
 	.string "Something's come up, so I have to\n"
@@ -284,27 +284,25 @@ SSTidalCorridor_Text_23C28F: @ 823C28F
 	.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
 	.string "at the BATTLE FRONTIER!$"
 
-SSTidalCorridor_Text_23C462: @ 823C462
-SSTidalRooms_Text_23C462: @ 823C462
+SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
 	.string "This ferry is built to plow through\n"
 	.string "fast-running currents.\p"
 	.string "We hope you enjoy your voyage with us.\n"
 	.string "Feel free to explore the ship.$"
 
-SSTidalCorridor_Text_23C4E3: @ 823C4E3
+SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
 	.string "We hope you enjoy your voyage on\n"
 	.string "our ferry.$"
 
-SSTidalCorridor_Text_23C50F: @ 823C50F
-SSTidalRooms_Text_23C50F: @ 823C50F
+SSTidal_Text_MadeLandInSlateport: @ 823C50F
 	.string "We have made land in SLATEPORT CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalRooms_Text_23C553: @ 823C553
+SSTidal_Text_MadeLandInLilycove: @ 823C553
 	.string "We have made land in LILYCOVE CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalCorridor_Text_23C596: @ 823C596
+SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
 	.string "It'll be some time before we make land,\n"
 	.string "I reckon.\p"
 	.string "You can rest up in your cabin if you'd\n"
@@ -312,22 +310,22 @@ SSTidalCorridor_Text_23C596: @ 823C596
 	.string "The bed in there is soft and plushy.\n"
 	.string "I can attest to how comfy it is!$"
 
-SSTidalCorridor_Text_23C64F: @ 823C64F
+SSTidalCorridor_Text_WeveArrived: @ 823C64F
 	.string "We've arrived!$"
 
-SSTidalCorridor_Text_23C65E: @ 823C65E
+SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
 	.string "Go visit other cabins.\n"
 	.string "TRAINERS bored of the boat trip will\l"
 	.string "be itching to battle.$"
 
-SSTidalCorridor_Text_23C6B0: @ 823C6B0
+SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
 	.string "Enjoy your cruise!$"
 
-SSTidalCorridor_Text_23C6C3: @ 823C6C3
+SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
 	.string "The horizon spreads beyond\n"
 	.string "the porthole.$"
 
-SSTidalCorridor_Text_23C6EC: @ 823C6EC
+SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
 	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
 	.string "They made me honorary captain of\n"
 	.string "the S.S. TIDAL!\p"
@@ -337,17 +335,17 @@ SSTidalCorridor_Text_23C6EC: @ 823C6EC
 	.string "Let me just say, it stirred my sleeping\n"
 	.string "soul as a sailor!$"
 
-SSTidalCorridor_Text_23C7E1: @ 823C7E1
+SSTidalCorridor_Text_Peeko: @ 823C7E1
 	.string "PEEKO: Pihyo pihyohyo…$"
 
-SSTidalCorridor_Text_23C7F8: @ 823C7F8
+SSTidalCorridor_Text_Cabin1: @ 823C7F8
 	.string "Cabin 1$"
 
-SSTidalCorridor_Text_23C800: @ 823C800
+SSTidalCorridor_Text_Cabin2: @ 823C800
 	.string "Cabin 2$"
 
-SSTidalCorridor_Text_23C808: @ 823C808
+SSTidalCorridor_Text_Cabin3: @ 823C808
 	.string "Cabin 3$"
 
-SSTidalCorridor_Text_23C810: @ 823C810
+SSTidalCorridor_Text_Cabin4: @ 823C810
 	.string "Cabin 4$"
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
index 3e678ca8c..45610454a 100644
--- a/data/maps/SSTidalLowerDeck/map.json
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C819",
+      "script": "SSTidalLowerDeck_EventScript_Phillip",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C830",
+      "script": "SSTidalLowerDeck_EventScript_Leonard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 68761376d..c90366c23 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -1,38 +1,38 @@
 SSTidalLowerDeck_MapScripts:: @ 823C818
 	.byte 0
 
-SSTidalLowerDeck_EventScript_23C819:: @ 823C819
-	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
-	msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
+	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
+	msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_EventScript_23C830:: @ 823C830
-	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
-	msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
+	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
+	msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_Text_23C847: @ 823C847
+SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
 	.string "Arrrgh! I'm fed up and dog-tired of\n"
 	.string "cleaning this huge place!\p"
 	.string "Let's have a quick battle!$"
 
-SSTidalLowerDeck_Text_23C8A0: @ 823C8A0
+SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
 	.string "Little bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C8B4: @ 823C8B4
+SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
 
-SSTidalLowerDeck_Text_23C917: @ 823C917
+SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
 	.string "This is the bottom of the ship's hull.\n"
 	.string "There's plenty of room.\l"
 	.string "It'll be alright for a POKéMON battle.$"
 
-SSTidalLowerDeck_Text_23C97D: @ 823C97D
+SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
 	.string "Big bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C98E: @ 823C98E
+SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json
index 8fb4bd05d..b2da534c3 100644
--- a/data/maps/SSTidalRooms/map.json
+++ b/data/maps/SSTidalRooms/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA49",
+      "script": "SSTidalRooms_EventScript_Colton",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CA60",
+      "script": "SSTidalRooms_EventScript_Micah",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA77",
+      "script": "SSTidalRooms_EventScript_Thomas",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CA8E",
+      "script": "SSTidalRooms_EventScript_Jed",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CAA9",
+      "script": "SSTidalRooms_EventScript_Lea",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CAC4",
+      "script": "SSTidalRooms_EventScript_Garret",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CADB",
+      "script": "SSTidalRooms_EventScript_Naomi",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23C9F2",
+      "script": "SSTidalRooms_EventScript_SnatchGiver",
       "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER"
     }
   ],
@@ -213,7 +213,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -221,7 +221,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index 3b8df90a3..bf2c5e36b 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -1,175 +1,175 @@
 SSTidalRooms_MapScripts:: @ 823C9F1
 	.byte 0
 
-SSTidalRooms_EventScript_23C9F2:: @ 823C9F2
+SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29
-	msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch
+	msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM49
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM49
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA29:: @ 823CA29
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA33:: @ 823CA33
+SSTidalRooms_EventScript_Bed:: @ 823CA33
 	lockall
-	msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
-	call SSTidalRooms_EventScript_23C0A7
+	call SSTidalRooms_EventScript_ProgessCruiseAfterBed
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23CA49:: @ 823CA49
-	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58
-	msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Colton:: @ 823CA49
+	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat
+	msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA60:: @ 823CA60
-	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04
-	msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Micah:: @ 823CA60
+	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat
+	msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA77:: @ 823CA77
-	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A
-	msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Thomas:: @ 823CA77
+	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat
+	msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA8E:: @ 823CA8E
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6
-	msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Jed:: @ 823CA8E
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons
+	msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAA9:: @ 823CAA9
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0
-	msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Lea:: @ 823CAA9
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons
+	msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAC4:: @ 823CAC4
-	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36
-	msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Garret:: @ 823CAC4
+	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat
+	msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CADB:: @ 823CADB
-	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4
-	msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Naomi:: @ 823CADB
+	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat
+	msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_Text_23CAF2: @ 823CAF2
+SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
-SSTidalRooms_Text_23CB14: @ 823CB14
+SSTidalRooms_Text_ColtonIntro: @ 823CB14
 	.string "I often sail to LILYCOVE CITY.\p"
 	.string "I enjoy attending CONTESTS,\n"
 	.string "you see.$"
 
-SSTidalRooms_Text_23CB58: @ 823CB58
+SSTidalRooms_Text_ColtonDefeat: @ 823CB58
 	.string "That was an enjoyable match!$"
 
-SSTidalRooms_Text_23CB75: @ 823CB75
+SSTidalRooms_Text_ColtonPostBattle: @ 823CB75
 	.string "I get so excited imagining what kinds\n"
 	.string "of POKéMON I'll get to see in the next\l"
 	.string "CONTEST. The anticipation of it thrills!$"
 
-SSTidalRooms_Text_23CBEB: @ 823CBEB
+SSTidalRooms_Text_MicahIntro: @ 823CBEB
 	.string "Are your friends strong?$"
 
-SSTidalRooms_Text_23CC04: @ 823CC04
+SSTidalRooms_Text_MicahDefeat: @ 823CC04
 	.string "Your friends are, indeed, strong.$"
 
-SSTidalRooms_Text_23CC26: @ 823CC26
+SSTidalRooms_Text_MicahPostBattle: @ 823CC26
 	.string "Friends need not be human.\n"
 	.string "For me, POKéMON are treasured friends!$"
 
-SSTidalRooms_Text_23CC68: @ 823CC68
+SSTidalRooms_Text_ThomasIntro: @ 823CC68
 	.string "Child…\n"
 	.string "Did you knock on the door?$"
 
-SSTidalRooms_Text_23CC8A: @ 823CC8A
+SSTidalRooms_Text_ThomasDefeat: @ 823CC8A
 	.string "A loss is to be accepted without haste\n"
 	.string "or panic.$"
 
-SSTidalRooms_Text_23CCBB: @ 823CCBB
+SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB
 	.string "To be never ruffled in any situation is\n"
 	.string "the GENTLEMAN's code of conduct.$"
 
-SSTidalRooms_Text_23CD04: @ 823CD04
+SSTidalRooms_Text_JedIntro: @ 823CD04
 	.string "JED: I feel a little shy about this, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CD54: @ 823CD54
+SSTidalRooms_Text_JedDefeat: @ 823CD54
 	.string "JED: Sigh…$"
 
-SSTidalRooms_Text_23CD5F: @ 823CD5F
+SSTidalRooms_Text_JedPostBattle: @ 823CD5F
 	.string "JED: It's the first time that our lovey-\n"
 	.string "dovey power couldn't prevail!\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CDC6: @ 823CDC6
+SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6
 	.string "JED: You only have one POKéMON?\n"
 	.string "Isn't that just too lonesome?$"
 
-SSTidalRooms_Text_23CE04: @ 823CE04
+SSTidalRooms_Text_LeaIntro: @ 823CE04
 	.string "LEA: I feel a little silly, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CE4B: @ 823CE4B
+SSTidalRooms_Text_LeaDefeat: @ 823CE4B
 	.string "LEA: Oh, boo!$"
 
-SSTidalRooms_Text_23CE59: @ 823CE59
+SSTidalRooms_Text_LeaPostBattle: @ 823CE59
 	.string "LEA: I can't believe it!\n"
 	.string "Our lovey-dovey power failed…\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CEB0: @ 823CEB0
+SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0
 	.string "LEA: I wanted to battle…\n"
 	.string "But you don't even have two POKéMON…$"
 
-SSTidalRooms_Text_23CEEE: @ 823CEEE
+SSTidalRooms_Text_GarretIntro: @ 823CEEE
 	.string "Ah, you've come just in time.\p"
 	.string "I'm bored, you see.\n"
 	.string "You may entertain me.$"
 
-SSTidalRooms_Text_23CF36: @ 823CF36
+SSTidalRooms_Text_GarretDefeat: @ 823CF36
 	.string "…That will do.$"
 
-SSTidalRooms_Text_23CF45: @ 823CF45
+SSTidalRooms_Text_GarretPostBattle: @ 823CF45
 	.string "Perhaps I shall get Father to acquire\n"
 	.string "a yacht for me.\l"
 	.string "A yacht for me and POKéMON!$"
 
-SSTidalRooms_Text_23CF97: @ 823CF97
+SSTidalRooms_Text_NaomiIntro: @ 823CF97
 	.string "Oh, you're such an adorable TRAINER.\n"
 	.string "Would you like to have tea?\l"
 	.string "Or would you rather battle?$"
 
-SSTidalRooms_Text_23CFF4: @ 823CFF4
+SSTidalRooms_Text_NaomiDefeat: @ 823CFF4
 	.string "I see.\n"
 	.string "You're the active sort.$"
 
-SSTidalRooms_Text_23D013: @ 823D013
+SSTidalRooms_Text_NaomiPostBattle: @ 823D013
 	.string "A world cruise on a luxury liner has its\n"
 	.string "charms, I must say…\p"
 	.string "But, I will admit there is an appealing\n"
 	.string "side to touring HOENN by ferry.$"
 
-SSTidalRooms_Text_23D098: @ 823D098
+SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098
 	.string "Uh… Hi! I… I'm not acting suspicious!\n"
 	.string "Uh… You can have this! For free!\p"
 	.string "It… Honestly, I didn't SNATCH it from\n"
 	.string "someone! I'd never do such a thing!\l"
 	.string "It's clean! You can use it!$"
 
-SSTidalRooms_Text_23D145: @ 823D145
+SSTidalRooms_Text_ExplainSnatch: @ 823D145
 	.string "SNATCH steals the beneficial effects\n"
 	.string "of certain moves before they can be\l"
 	.string "used by a foe or ally.$"
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index 96a9a61ea..ed3703449 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -53,7 +53,7 @@ SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5
 	faceplayer
 	goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck
 	msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_South_EventScript_ExitEarly
 	msgbox SafariZone_South_Text_EnjoyTheRestOfYourAdventure, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json
index 88db72b4a..68cbba71d 100644
--- a/data/maps/SeafloorCavern_Room1/map.json
+++ b/data/maps/SeafloorCavern_Room1/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "SeafloorCavern_Room1_EventScript_2347EC",
+      "script": "SeafloorCavern_Room1_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room1_EventScript_234803",
+      "script": "SeafloorCavern_Room1_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index 92049e8ef..6baa9ca4e 100644
--- a/data/maps/SeafloorCavern_Room1/scripts.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
@@ -1,35 +1,35 @@
 SeafloorCavern_Room1_MapScripts:: @ 82347EB
 	.byte 0
 
-SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC
-	trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A
-	msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room1_EventScript_Grunt1:: @ 82347EC
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_1, SeafloorCavern_Room1_Text_Grunt1Intro, SeafloorCavern_Room1_Text_Grunt1Defeat
+	msgbox SeafloorCavern_Room1_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_EventScript_234803:: @ 8234803
-	trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD
-	msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room1_EventScript_Grunt2:: @ 8234803
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_2, SeafloorCavern_Room1_Text_Grunt2Intro, SeafloorCavern_Room1_Text_Grunt2Defeat
+	msgbox SeafloorCavern_Room1_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_Text_23481A: @ 823481A
+SeafloorCavern_Room1_Text_Grunt1Intro: @ 823481A
 	.string "We don't need a kid around!\n"
 	.string "Go on home already!$"
 
-SeafloorCavern_Room1_Text_23484A: @ 823484A
+SeafloorCavern_Room1_Text_Grunt1Defeat: @ 823484A
 	.string "I want to go home…$"
 
-SeafloorCavern_Room1_Text_23485D: @ 823485D
+SeafloorCavern_Room1_Text_Grunt1PostBattle: @ 823485D
 	.string "I want to get a promotion so I can\n"
 	.string "boss around the GRUNTS…$"
 
-SeafloorCavern_Room1_Text_234898: @ 8234898
+SeafloorCavern_Room1_Text_Grunt2Intro: @ 8234898
 	.string "That submarine… It's tiny inside.\n"
 	.string "I'm sore all over!$"
 
-SeafloorCavern_Room1_Text_2348CD: @ 82348CD
+SeafloorCavern_Room1_Text_Grunt2Defeat: @ 82348CD
 	.string "Losing makes me sore!$"
 
-SeafloorCavern_Room1_Text_2348E3: @ 82348E3
+SeafloorCavern_Room1_Text_Grunt2PostBattle: @ 82348E3
 	.string "That submarine we jacked, man,\n"
 	.string "it's brutal as a ride.\l"
 	.string "It's way too tight in there!$"
diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json
index 2a33c44cf..428070faf 100644
--- a/data/maps/SeafloorCavern_Room3/map.json
+++ b/data/maps/SeafloorCavern_Room3/map.json
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "SeafloorCavern_Room3_EventScript_234938",
+      "script": "SeafloorCavern_Room3_EventScript_Shelly",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "SeafloorCavern_Room3_EventScript_23494F",
+      "script": "SeafloorCavern_Room3_EventScript_Grunt5",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index 40913f407..29cd0dbed 100644
--- a/data/maps/SeafloorCavern_Room3/scripts.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
@@ -1,17 +1,17 @@
 SeafloorCavern_Room3_MapScripts:: @ 8234937
 	.byte 0
 
-SeafloorCavern_Room3_EventScript_234938:: @ 8234938
-	trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79
-	msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
+	trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
+	msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room3_EventScript_23494F:: @ 823494F
-	trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE
-	msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room3_EventScript_Grunt5:: @ 823494F
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_5, SeafloorCavern_Room3_Text_Grunt5Intro, SeafloorCavern_Room3_Text_Grunt5Defeat
+	msgbox SeafloorCavern_Room3_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room3_Text_234966: @ 8234966
+SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966
 	.string "Ahahahaha!\p"
 	.string "How did you manage to get here without\n"
 	.string "a submarine?\l"
@@ -23,11 +23,11 @@ SeafloorCavern_Room3_Text_234966: @ 8234966
 	.string "I'm going to give you a little taste\n"
 	.string "of pain! Resign yourself to it!$"
 
-SeafloorCavern_Room3_Text_234A79: @ 8234A79
+SeafloorCavern_Room3_Text_ShellyDefeat: @ 8234A79
 	.string "Ahahahaha!\p"
 	.string "Ouch!$"
 
-SeafloorCavern_Room3_Text_234A8A: @ 8234A8A
+SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A
 	.string "Ahahahaha!\n"
 	.string "You're so darn strong.\p"
 	.string "It's terribly disappointing that you're\n"
@@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_234A8A: @ 8234A8A
 	.string "world our BOSS has promised as\l"
 	.string "one of us…$"
 
-SeafloorCavern_Room3_Text_234B3A: @ 8234B3A
+SeafloorCavern_Room3_Text_Grunt5Intro: @ 8234B3A
 	.string "For our dream to become real, we need\n"
 	.string "the power of POKéMON.\p"
 	.string "But meddlers like you use the power of\n"
@@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_234B3A: @ 8234B3A
 	.string "Life just doesn't work the way we\n"
 	.string "need it to!$"
 
-SeafloorCavern_Room3_Text_234BFE: @ 8234BFE
+SeafloorCavern_Room3_Text_Grunt5Defeat: @ 8234BFE
 	.string "Gwah!$"
 
-SeafloorCavern_Room3_Text_234C04: @ 8234C04
+SeafloorCavern_Room3_Text_Grunt5PostBattle: @ 8234C04
 	.string "You know, we don't dare question\n"
 	.string "the motives of our leader.\p"
 	.string "But here you are, just some punk,\n"
diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json
index 0638ab4ed..c04e22e39 100644
--- a/data/maps/SeafloorCavern_Room4/map.json
+++ b/data/maps/SeafloorCavern_Room4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room4_EventScript_234C9C",
+      "script": "SeafloorCavern_Room4_EventScript_Grunt3",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room4_EventScript_234CB3",
+      "script": "SeafloorCavern_Room4_EventScript_Grunt4",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index 132d24a32..e2f32287a 100644
--- a/data/maps/SeafloorCavern_Room4/scripts.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
@@ -1,35 +1,35 @@
 SeafloorCavern_Room4_MapScripts:: @ 8234C9B
 	.byte 0
 
-SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C
-	trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3
-	msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room4_EventScript_Grunt3:: @ 8234C9C
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_3, SeafloorCavern_Room4_Text_Grunt3Intro, SeafloorCavern_Room4_Text_Grunt3Defeat
+	msgbox SeafloorCavern_Room4_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3
-	trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68
-	msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room4_EventScript_Grunt4:: @ 8234CB3
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_4, SeafloorCavern_Room4_Text_Grunt4Intro, SeafloorCavern_Room4_Text_Grunt4Defeat
+	msgbox SeafloorCavern_Room4_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_Text_234CCA: @ 8234CCA
+SeafloorCavern_Room4_Text_Grunt3Intro: @ 8234CCA
 	.string "Who are you?\n"
 	.string "Where did you come in from?$"
 
-SeafloorCavern_Room4_Text_234CF3: @ 8234CF3
+SeafloorCavern_Room4_Text_Grunt3Defeat: @ 8234CF3
 	.string "Lost it…$"
 
-SeafloorCavern_Room4_Text_234CFC: @ 8234CFC
+SeafloorCavern_Room4_Text_Grunt3PostBattle: @ 8234CFC
 	.string "I can't find the way out!\p"
 	.string "I'm not afraid. Don't get me wrong!$"
 
-SeafloorCavern_Room4_Text_234D3A: @ 8234D3A
+SeafloorCavern_Room4_Text_Grunt4Intro: @ 8234D3A
 	.string "Who are you?\n"
 	.string "Where do you think you're going?$"
 
-SeafloorCavern_Room4_Text_234D68: @ 8234D68
+SeafloorCavern_Room4_Text_Grunt4Defeat: @ 8234D68
 	.string "I failed to win!$"
 
-SeafloorCavern_Room4_Text_234D79: @ 8234D79
+SeafloorCavern_Room4_Text_Grunt4PostBattle: @ 8234D79
 	.string "My partner forgot the map in that\n"
 	.string "submarine!\p"
 	.string "How's that for being useless?$"
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
index 77dcdc169..9a2ab1d3e 100644
--- a/data/maps/SeafloorCavern_Room9/map.json
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -123,7 +123,7 @@
       "elevation": 3,
       "var": "VAR_SEAFLOOR_CAVERN_STATE",
       "var_value": "0",
-      "script": "SeafloorCavern_Room9_EventScript_234DC9"
+      "script": "SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 026c29700..43c503682 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -1,63 +1,60 @@
 SeafloorCavern_Room9_MapScripts:: @ 8234DC8
 	.byte 0
 
-SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
+SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
 	lockall
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 4
-	setvar VAR_0x8007, 5
+	setvar VAR_0x8004, 2  @ Archie
+	setvar VAR_0x8005, 3  @ Maxie
+	setvar VAR_0x8006, 4  @ Magma grunt 1
+	setvar VAR_0x8007, 5  @ Magma grunt 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C
+	applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32
 	waitmovement 0
 	playbgm MUS_AQA_0, 0
-	msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT
 	closemessage
 	addobject VAR_0x8004
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieSoItWasYou, MSGBOX_DEFAULT
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieBeholdKyogre, MSGBOX_DEFAULT
 	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
-	msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieYouMustDisappear, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_ArchieDefeat
+	msgbox SeafloorCavern_Room9_Text_ArchieWithThisRedOrb, MSGBOX_DEFAULT
 	setweather WEATHER_NONE
 	doweather
 	special Script_FadeOutMapMusic
 	waitstate
-	msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_RedOrbShinesByItself, MSGBOX_DEFAULT
 	special WaitWeather
 	waitstate
 	setvar VAR_RESULT, 1
 	playse SE_W197
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 16, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	closemessage
 	setvar VAR_RESULT, 0
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
-	special sub_80B0534
+	special DoOrbEffect
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 150
-	removeobject 7
-	addobject 1
+	removeobject 7  @ sleeping Kyogre
+	addobject 1     @ awakened Kyogre
 	waitstate
 	delay 60
-	applymovement 1, SeafloorCavern_Room9_Movement_235040
+	applymovement 1, SeafloorCavern_Room9_Movement_KyogreApproach
 	waitmovement 0
-	special sub_80B058C
+	special FadeOutOrbEffect
 	waitstate
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -65,7 +62,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 1, SeafloorCavern_Room9_Movement_23504B
+	applymovement 1, SeafloorCavern_Room9_Movement_KyogreExit
 	waitmovement 0
 	removeobject 1
 	delay 4
@@ -80,44 +77,44 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 5
-	msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT
 	playse SE_PC_LOGIN
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieListenMessage
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard, MSGBOX_DEFAULT
 	closemessage
 	playse SE_PC_OFF
 	delay 20
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear, MSGBOX_DEFAULT
 	closemessage
 	addobject VAR_0x8005
 	addobject VAR_0x8006
 	addobject VAR_0x8007
-	applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057
-	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
-	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
+	applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_MagmaGruntArrive
+	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_MagmaGruntArrive
+	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieArrive
 	waitmovement 0
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought, MSGBOX_DEFAULT
 	playse SE_PIN
 	applymovement VAR_0x8004, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement VAR_0x8004, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT
-	msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
+	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieExit
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieExit
 	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT
+	msgbox SeafloorCavern_Room9_Text_MaxieComeOnPlayer, MSGBOX_DEFAULT
 	setvar VAR_ROUTE128_STATE, 1
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
@@ -146,7 +143,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	releaseall
 	end
 
-SeafloorCavern_Room9_Movement_23502A: @ 823502A
+SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
 	walk_right
 	walk_right
 	walk_right
@@ -156,21 +153,23 @@ SeafloorCavern_Room9_Movement_23502A: @ 823502A
 	walk_right
 	step_end
 
+@ Unused
 SeafloorCavern_Room9_Movement_235032: @ 8235032
 	walk_left
 	walk_left
 	step_end
 
-SeafloorCavern_Room9_Movement_235035: @ 8235035
+SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035
 	walk_left
 	delay_16
 	step_end
 
+@ Unused
 SeafloorCavern_Room9_Movement_235038: @ 8235038
 	walk_right
 	step_end
 
-SeafloorCavern_Room9_Movement_23503A: @ 823503A
+SeafloorCavern_Room9_Movement_ArchieExit: @ 823503A
 	face_up
 	lock_facing_direction
 	walk_down
@@ -178,7 +177,7 @@ SeafloorCavern_Room9_Movement_23503A: @ 823503A
 	walk_in_place_fastest_right
 	step_end
 
-SeafloorCavern_Room9_Movement_235040: @ 8235040
+SeafloorCavern_Room9_Movement_KyogreApproach: @ 8235040
 	delay_16
 	delay_16
 	walk_slow_down
@@ -191,12 +190,12 @@ SeafloorCavern_Room9_Movement_235040: @ 8235040
 	delay_16
 	step_end
 
-SeafloorCavern_Room9_Movement_23504B: @ 823504B
+SeafloorCavern_Room9_Movement_KyogreExit: @ 823504B
 	slide_up
 	slide_up
 	step_end
 
-SeafloorCavern_Room9_Movement_23504E: @ 823504E
+SeafloorCavern_Room9_Movement_MaxieArrive: @ 823504E
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -204,49 +203,49 @@ SeafloorCavern_Room9_Movement_23504E: @ 823504E
 	walk_fast_right
 	step_end
 
-SeafloorCavern_Room9_Movement_235054: @ 8235054
+SeafloorCavern_Room9_Movement_MaxieExit: @ 8235054
 	walk_right
 	walk_right
 	step_end
 
-SeafloorCavern_Room9_Movement_235057: @ 8235057
+SeafloorCavern_Room9_Movement_MagmaGruntArrive: @ 8235057
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
 	step_end
 
-SeafloorCavern_Room9_Movement_23505C: @ 823505C
+SeafloorCavern_Room9_Movement_Delay32: @ 823505C
 	delay_16
 	delay_16
 	step_end
 
-SeafloorCavern_Room9_Text_23505F: @ 823505F
+SeafloorCavern_Room9_Text_ArchieHoldItRightThere: @ 823505F
 	.string "ARCHIE: Hold it right there.$"
 
-SeafloorCavern_Room9_Text_23507C: @ 823507C
+SeafloorCavern_Room9_Text_ArchieSoItWasYou: @ 823507C
 	.string "ARCHIE: Fufufu…\n"
 	.string "So it was you, after all.$"
 
-SeafloorCavern_Room9_Text_2350A6: @ 82350A6
+SeafloorCavern_Room9_Text_ArchieBeholdKyogre: @ 82350A6
 	.string "ARCHIE: Behold!\p"
 	.string "See how beautiful it is, the sleeping\n"
 	.string "form of the ancient POKéMON KYOGRE!\p"
 	.string "I have waited so long for this day to\n"
 	.string "come…$"
 
-SeafloorCavern_Room9_Text_23512C: @ 823512C
+SeafloorCavern_Room9_Text_ArchieYouMustDisappear: @ 823512C
 	.string "ARCHIE: It surprises me, how you've\n"
 	.string "managed to chase me here.\p"
 	.string "But that's all over now.\p"
 	.string "For the realization of my dream,\n"
 	.string "you must disappear now!$"
 
-SeafloorCavern_Room9_Text_2351BC: @ 82351BC
+SeafloorCavern_Room9_Text_ArchieDefeat: @ 82351BC
 	.string "What?!\n"
 	.string "I lost to a mere child like you?!$"
 
-SeafloorCavern_Room9_Text_2351E5: @ 82351E5
+SeafloorCavern_Room9_Text_ArchieWithThisRedOrb: @ 82351E5
 	.string "ARCHIE: Fufufu…\p"
 	.string "I commend you. I must recognize that\n"
 	.string "you are truly gifted.\p"
@@ -254,21 +253,21 @@ SeafloorCavern_Room9_Text_2351E5: @ 82351E5
 	.string "I have this in my possession!\p"
 	.string "With this RED ORB, I can make KYOGRE…$"
 
-SeafloorCavern_Room9_Text_235279: @ 8235279
+SeafloorCavern_Room9_Text_RedOrbShinesByItself: @ 8235279
 	.string "The RED ORB suddenly began shining\n"
 	.string "by itself!$"
 
-SeafloorCavern_Room9_Text_2352A7: @ 82352A7
+SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo: @ 82352A7
 	.string "ARCHIE: What?!\p"
 	.string "I didn't do anything.\n"
 	.string "Why did the RED ORB…\p"
 	.string "Where did KYOGRE go?$"
 
-SeafloorCavern_Room9_Text_2352F6: @ 82352F6
+SeafloorCavern_Room9_Text_ArchieAMessageFromOutside: @ 82352F6
 	.string "ARCHIE: Hm? It's a message from our\n"
 	.string "members outside…$"
 
-SeafloorCavern_Room9_Text_23532B: @ 823532B
+SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard: @ 823532B
 	.string "ARCHIE: Yes, what is it?\p"
 	.string "Hm…\n"
 	.string "It's raining heavily?\p"
@@ -284,7 +283,7 @@ SeafloorCavern_Room9_Text_23532B: @ 823532B
 	.string "Hold your position and monitor\n"
 	.string "the situation!$"
 
-SeafloorCavern_Room9_Text_23546F: @ 823546F
+SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear: @ 823546F
 	.string "ARCHIE: There's something wrong…\p"
 	.string "The RED ORB is supposed to awaken\n"
 	.string "and control KYOGRE…\p"
@@ -292,7 +291,7 @@ SeafloorCavern_Room9_Text_23546F: @ 823546F
 	.string "Why did KYOGRE disappear?\p"
 	.string "Why?!$"
 
-SeafloorCavern_Room9_Text_2354F0: @ 82354F0
+SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought: @ 82354F0
 	.string "MAXIE: What have you wrought?\p"
 	.string "ARCHIE… You've finally awoken KYOGRE,\n"
 	.string "haven't you?\p"
@@ -301,7 +300,7 @@ SeafloorCavern_Room9_Text_2354F0: @ 82354F0
 	.string "The world's landmass will drown in\n"
 	.string "the deepening sea…$"
 
-SeafloorCavern_Room9_Text_2355C2: @ 82355C2
+SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty: @ 82355C2
 	.string "ARCHIE: W-what?!\n"
 	.string "Don't get all high and mighty with me!\p"
 	.string "Wasn't it you, TEAM MAGMA, that\n"
@@ -310,13 +309,13 @@ SeafloorCavern_Room9_Text_2355C2: @ 82355C2
 	.string "I should be able to control KYOGRE…\p"
 	.string "I should be able to control it…$"
 
-SeafloorCavern_Room9_Text_235692: @ 8235692
+SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue: @ 8235692
 	.string "MAXIE: We don't have the time to\n"
 	.string "argue about it here!\p"
 	.string "Get outside and see for yourself!\p"
 	.string "See if what you've wrought is the\n"
 	.string "world that we desired!$"
 
-SeafloorCavern_Room9_Text_235723: @ 8235723
+SeafloorCavern_Room9_Text_MaxieComeOnPlayer: @ 8235723
 	.string "MAXIE: {PLAYER}, come on, you have\n"
 	.string "to get out of here, too!$"
diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json
index e0e6097ec..4549a1bbd 100644
--- a/data/maps/SealedChamber_InnerRoom/map.json
+++ b/data/maps/SealedChamber_InnerRoom/map.json
@@ -31,7 +31,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     },
     {
       "type": "sign",
@@ -39,7 +39,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239255"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart1"
     },
     {
       "type": "sign",
@@ -47,7 +47,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_23925F"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart2"
     },
     {
       "type": "sign",
@@ -55,7 +55,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239269"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart3"
     },
     {
       "type": "sign",
@@ -63,7 +63,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239273"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart4"
     },
     {
       "type": "sign",
@@ -71,7 +71,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_23927D"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart5"
     },
     {
       "type": "sign",
@@ -79,7 +79,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239287"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart6"
     },
     {
       "type": "sign",
@@ -87,7 +87,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     },
     {
       "type": "sign",
@@ -95,7 +95,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index b34355e3f..15c98e57e 100644
--- a/data/maps/SealedChamber_InnerRoom/scripts.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
@@ -1,15 +1,15 @@
 SealedChamber_InnerRoom_MapScripts:: @ 82391F7
 	.byte 0
 
-SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8
+SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6B99
+	braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
 	waitbuttonpress
-	hidebox2
-	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253
+	closebraillemessage
+	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect
 	specialvar VAR_RESULT, CheckRelicanthWailord
-	compare VAR_RESULT, 0
-	goto_if_eq SealedChamber_InnerRoom_EventScript_239253
+	compare VAR_RESULT, FALSE
+	goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect
 	fadeoutbgm 0
 	playse SE_TRACK_MOVE
 	special DoSealedChamberShakingEffect1
@@ -34,55 +34,55 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239253:: @ 8239253
+SealedChamber_InnerRoom_EventScript_NoEffect:: @ 8239253
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239255:: @ 8239255
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6BCA
+	braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6BEC
+	braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239269:: @ 8239269
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C0D
+	braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239273:: @ 8239273
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C34
+	braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C48
+	braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239287:: @ 8239287
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart6:: @ 8239287
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C73
+	braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json
index cc9c32272..54a10ee70 100644
--- a/data/maps/SealedChamber_OuterRoom/map.json
+++ b/data/maps/SealedChamber_OuterRoom/map.json
@@ -31,7 +31,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -39,7 +39,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -47,7 +47,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -55,7 +55,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -63,7 +63,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -71,7 +71,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -79,7 +79,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -87,7 +87,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -95,7 +95,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391B2"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePeriod"
     },
     {
       "type": "sign",
@@ -103,7 +103,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391C6"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleComma"
     },
     {
       "type": "sign",
@@ -111,7 +111,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391D0"
+      "script": "SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall"
     },
     {
       "type": "sign",
@@ -119,7 +119,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -127,7 +127,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -135,7 +135,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -143,7 +143,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -151,7 +151,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -159,7 +159,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -167,7 +167,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -175,7 +175,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -183,7 +183,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -191,7 +191,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -199,7 +199,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -207,7 +207,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -215,7 +215,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -223,7 +223,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -231,7 +231,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -239,7 +239,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -247,7 +247,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere"
     },
     {
       "type": "sign",
@@ -255,7 +255,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 4d9ed93d4..f3cd05a86 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -1,10 +1,10 @@
 SealedChamber_OuterRoom_MapScripts:: @ 8239106
-	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
+	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
+	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_OnLoad
 	.byte 0
 
-SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
+SealedChamber_OuterRoom_OnResume: @ 8239116
 	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	end
@@ -13,11 +13,11 @@ SealedChamber_OuterRoom_OnTransition: @ 8239127
 	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
-SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
-	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135
+SealedChamber_OuterRoom_OnLoad: @ 823912B
+	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance
 	end
 
-SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
+SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135
 	setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
@@ -26,105 +26,105 @@ SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
 	setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C
+SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B27
+	braillemessage SealedChamber_OuterRoom_Braille_ABC
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239176:: @ 8239176
+SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B31
+	braillemessage SealedChamber_OuterRoom_Braille_GHI
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239180:: @ 8239180
+SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B3B
+	braillemessage SealedChamber_OuterRoom_Braille_MNO
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A
+SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B45
+	braillemessage SealedChamber_OuterRoom_Braille_TUV
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239194:: @ 8239194
+SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B4F
+	braillemessage SealedChamber_OuterRoom_Braille_DEF
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E
+SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B59
+	braillemessage SealedChamber_OuterRoom_Braille_JKL
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8
+SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B63
+	braillemessage SealedChamber_OuterRoom_Braille_PQRS
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2
+SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B6E
+	braillemessage SealedChamber_OuterRoom_Braille_Period
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC
+SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B76
+	braillemessage SealedChamber_OuterRoom_Braille_WXYZ
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6
+SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B81
+	braillemessage SealedChamber_OuterRoom_Braille_Comma
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0
+SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall
+	braillemessage SealedChamber_OuterRoom_Braille_DigHere
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3
+SealedChamber_OuterRoom_EventScript_HoleInWall:: @ 82391E3
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED
+SealedChamber_OuterRoom_EventScript_BrailleDigHere:: @ 82391ED
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	braillemessage SealedChamber_OuterRoom_Braille_DigHere
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
index 4b5d23110..984537594 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9",
+      "script": "ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index 13d8f92d9..8713578cf 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -4,90 +4,91 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
 
 ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0
 	special UpdateShoalTideFlag
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1
-	goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide
+	goto ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1
+ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide:: @ 8236DD1
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5
+ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide:: @ 8236DD5
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
+ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9
 	lock
 	faceplayer
 	dotimebasedevents
-	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9
+	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems
 	checkitem ITEM_SHOAL_SALT, 4
-	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
+	compare VAR_RESULT, FALSE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells
 	checkitem ITEM_SHOAL_SHELL, 4
-	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF
+	compare VAR_RESULT, FALSE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells
+	msgbox ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell
 	checkitemspace ITEM_SHELL_BELL, 1
-	compare VAR_RESULT, 0
-	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69
+	compare VAR_RESULT, FALSE
+	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed
 	compare VAR_RESULT, 2
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell
+	msgbox ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway, MSGBOX_DEFAULT
 	takeitem ITEM_SHOAL_SALT, 4
 	takeitem ITEM_SHOAL_SHELL, 4
 	giveitem_std ITEM_SHELL_BELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT
+	msgbox ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69
+@ If the bag is full, check if a slot will be freed when 4 Shoal Salt or Shells are given
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed:: @ 8236E69
 	checkitem ITEM_SHOAL_SALT, 5
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells:: @ 8236E7A
 	checkitem ITEM_SHOAL_SHELL, 5
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B
+ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed:: @ 8236E8B
 	setvar VAR_RESULT, 2
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell:: @ 8236E91
+	msgbox ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B
+ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B
 	checkitem ITEM_SHOAL_SALT, 1
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell
 	checkitem ITEM_SHOAL_SHELL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell
+	msgbox ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell:: @ 8236EC5
+	msgbox ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell:: @ 8236ECF
+	msgbox ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9
+ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems:: @ 8236ED9
 	clearflag FLAG_RECEIVED_SHOAL_SALT_1
 	clearflag FLAG_RECEIVED_SHOAL_SALT_2
 	clearflag FLAG_RECEIVED_SHOAL_SALT_3
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json
index f9eec06c4..5bc7ef756 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json
@@ -94,7 +94,7 @@
       "y": 8,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 26,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2"
     },
     {
       "type": "sign",
@@ -110,7 +110,7 @@
       "y": 20,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1"
     },
     {
       "type": "sign",
@@ -118,7 +118,7 @@
       "y": 10,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2"
     },
     {
       "type": "sign",
@@ -126,7 +126,7 @@
       "y": 9,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_237028"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3"
     },
     {
       "type": "sign",
@@ -134,7 +134,7 @@
       "y": 13,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index c7f296319..089d38458 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -1,69 +1,69 @@
 ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F12
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetHighTide
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E
+ShoalCave_LowTideInnerRoom_EventScript_SetHighTide:: @ 8236F0E
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12
+ShoalCave_LowTideInnerRoom_EventScript_SetLowTide:: @ 8236F12
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
-	call ShoalCave_LowTideInnerRoom_EventScript_236F1C
+ShoalCave_LowTideInnerRoom_OnLoad: @ 8236F16
+	call ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles:: @ 8236F1C
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2:: @ 8236F3D
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3:: @ 8236F5E
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F76
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4:: @ 8236F76
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5:: @ 8236F8E
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6:: @ 8236FA6
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -71,16 +71,16 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC
-	msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC
+	msgbox ShoalCave_Text_WasShoallShellNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -88,11 +88,11 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -100,11 +100,11 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -112,11 +112,11 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
@@ -124,16 +124,16 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE
-	msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json
index fad5ddc00..6e8cbe8c9 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2",
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_BlackBelt",
       "flag": "0"
     }
   ],
@@ -79,7 +79,7 @@
       "y": 2,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideLowerRoom_EventScript_237176"
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 8492afe5b..2cbf8138d 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
@@ -1,60 +1,60 @@
 ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C
-	call ShoalCave_LowTideLowerRoom_EventScript_237162
+ShoalCave_LowTideLowerRoom_OnLoad: @ 823715C
+	call ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175
-	setmetatile 18, 2, 856, 1
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles:: @ 8237162
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd
+	setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176
+ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 18, 2, 858, 0
+	setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_4
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8
-	msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt:: @ 82371A8
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2
+ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_2371E1
-	msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand
+	msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT
 	giveitem_std ITEM_FOCUS_BAND
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1
-	msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand:: @ 82371E1
+	msgbox ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB
+ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus: @ 82371EB
 	.string "The penetrating cold around these\n"
 	.string "parts is an impediment to training.\p"
 	.string "But with focus, one can overcome!\p"
 	.string "With this FOCUS BAND, buckle down and\n"
 	.string "withstand the cold!$"
 
-ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D
+ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus: @ 823728D
 	.string "Everything starts with focus!$"
 
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json
index 4da33c163..7280cf140 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.json
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json
@@ -52,7 +52,7 @@
       "y": 11,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A"
+      "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 74b653a5f..32ec5b298 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
@@ -1,33 +1,33 @@
 ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100
-	call ShoalCave_LowTideStairsRoom_EventScript_237106
+ShoalCave_LowTideStairsRoom_OnLoad: @ 8237100
+	call ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119
-	setmetatile 11, 11, 856, 1
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles:: @ 8237106
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd
+	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A
+ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 11, 11, 858, 0
+	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_3
 	releaseall
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C
-	msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt:: @ 823714C
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc
deleted file mode 100644
index 06ed3ef16..000000000
--- a/data/maps/SingleBattleColosseum/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SingleBattleColosseum_MapScripts:: @ 823B77D
-	.byte 0
-
diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json
index 6a3764aa9..4c401ccf9 100644
--- a/data/maps/SkyPillar_Outside/map.json
+++ b/data/maps/SkyPillar_Outside/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SkyPillar_Outside_EventScript_2393F8",
+      "script": "SkyPillar_Outside_EventScript_Wallace",
       "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE"
     }
   ],
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 72748842b..dfb1ffdb0 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -1,44 +1,44 @@
 SkyPillar_Outside_MapScripts:: @ 82392A8
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA
+	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_OnFrame
 	.byte 0
 
 SkyPillar_Outside_OnTransition: @ 82392B8
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SkyPillar_Outside_EventScript_2392CF
+	call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge SkyPillar_Outside_EventScript_2392D3
+	call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather
 	end
 
-SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
+SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
-	call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_2392E7
+SkyPillar_Outside_OnLoad: @ 82392DD
+	call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_OpenDoor
 	end
 
-SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
+SkyPillar_Outside_EventScript_OpenDoor:: @ 82392E7
 	setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
 	setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
 	return
 
-SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_239304
+SkyPillar_Outside_OnFrame: @ 82392FA
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_WallaceScene
 	.2byte 0
 
-SkyPillar_Outside_EventScript_239304:: @ 8239304
+SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	lockall
-	applymovement 1, SkyPillar_Outside_Movement_2393D3
+	applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	setvar VAR_0x8004, 1  @ vertical pan
@@ -48,10 +48,10 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	special ShakeCamera
 	waitstate
 	delay 40
-	msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB
-	applymovement 1, SkyPillar_Outside_Movement_2393DE
+	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar
+	applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar
 	waitmovement 0
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 3   @ horizontal pan
@@ -69,7 +69,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
-	msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_SYS_WEATHER_CTRL
 	setweather WEATHER_ALTERNATING
@@ -77,7 +77,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	special WaitWeather
 	waitstate
 	delay 30
-	msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
 	closemessage
 	playse SE_KAIDAN
 	fadescreenswapbuffers 1
@@ -89,7 +89,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	releaseall
 	end
 
-SkyPillar_Outside_Movement_2393D3: @ 82393D3
+SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3
 	walk_down
 	walk_down
 	walk_down
@@ -102,7 +102,7 @@ SkyPillar_Outside_Movement_2393D3: @ 82393D3
 	walk_right
 	step_end
 
-SkyPillar_Outside_Movement_2393DE: @ 82393DE
+SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE
 	walk_left
 	walk_left
 	walk_left
@@ -117,7 +117,7 @@ SkyPillar_Outside_Movement_2393DE: @ 82393DE
 	walk_up
 	step_end
 
-SkyPillar_Outside_Movement_2393EB: @ 82393EB
+SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB
 	walk_left
 	walk_left
 	walk_left
@@ -132,17 +132,17 @@ SkyPillar_Outside_Movement_2393EB: @ 82393EB
 	walk_up
 	step_end
 
-SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
+SkyPillar_Outside_EventScript_Wallace:: @ 82393F8
 	end
 
-SkyPillar_Outside_EventScript_2393F9:: @ 82393F9
-	msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN
+SkyPillar_Outside_EventScript_ClosedDoor:: @ 82393F9
+	msgbox SkyPillar_Outside_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SkyPillar_Outside_Text_239402: @ 8239402
+SkyPillar_Outside_Text_DoorIsClosed: @ 8239402
 	.string "The door is closed.$"
 
-SkyPillar_Outside_Text_239416: @ 8239416
+SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416
 	.string "WALLACE: Oh, my, I'm terribly sorry!\p"
 	.string "In my haste, I didn't notice that\n"
 	.string "I'd left you behind!\p"
@@ -150,16 +150,16 @@ SkyPillar_Outside_Text_239416: @ 8239416
 	.string "the SKY PILLAR.\p"
 	.string "{PLAYER}{KUN}, let's be on our way!$"
 
-SkyPillar_Outside_Text_2394BC: @ 82394BC
+SkyPillar_Outside_Text_EarthquakeNotMomentToWaste: @ 82394BC
 	.string "WALLACE: It's an earthquake!\p"
 	.string "There's not a moment to waste!\n"
 	.string "We've got to hurry!$"
 
-SkyPillar_Outside_Text_23950C: @ 823950C
+SkyPillar_Outside_Text_SituationGettingWorse: @ 823950C
 	.string "WALLACE: Hmm…\n"
 	.string "The situation is getting worse…$"
 
-SkyPillar_Outside_Text_23953A: @ 823953A
+SkyPillar_Outside_Text_GotToGoBackForSootopolis: @ 823953A
 	.string "WALLACE: This isn't good…\p"
 	.string "The weather distortion is spreading\n"
 	.string "even here…\p"
diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json
index 2d1a6fa1a..eba1eff39 100644
--- a/data/maps/SkyPillar_Top/map.json
+++ b/data/maps/SkyPillar_Top/map.json
@@ -37,8 +37,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SkyPillar_Top_EventScript_239722",
-      "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT"
+      "script": "SkyPillar_Top_EventScript_Rayquaza",
+      "flag": "FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT"
     }
   ],
   "warp_events": [
@@ -58,7 +58,7 @@
       "elevation": 3,
       "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE",
       "var_value": "0",
-      "script": "SkyPillar_Top_EventScript_23979A"
+      "script": "SkyPillar_Top_EventScript_AwakenRayquaza"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index 95f430cbd..e12919082 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -1,14 +1,14 @@
 SkyPillar_Top_MapScripts:: @ 82396B8
-	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_OnWarp
 	.byte 0
 
-SkyPillar_Top_MapScript1_2396C8: @ 82396C8
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_2396D2
+SkyPillar_Top_OnResume: @ 82396C8
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_TryRemoveRayquaza
 	end
 
-SkyPillar_Top_EventScript_2396D2:: @ 82396D2
+SkyPillar_Top_EventScript_TryRemoveRayquaza:: @ 82396D2
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -17,33 +17,33 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2
 
 SkyPillar_Top_OnTransition: @ 82396E6
 	compare VAR_SKY_PILLAR_STATE, 2
-	call_if_lt SkyPillar_Top_EventScript_2396FD
+	call_if_lt SkyPillar_Top_EventScript_SetCleanLayout
 	compare VAR_SKY_PILLAR_STATE, 2
-	call_if_ge SkyPillar_Top_EventScript_239705
+	call_if_ge SkyPillar_Top_EventScript_TryShowRayquaza
 	end
 
-SkyPillar_Top_EventScript_2396FD:: @ 82396FD
+SkyPillar_Top_EventScript_SetCleanLayout:: @ 82396FD
 	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SkyPillar_Top_EventScript_239705:: @ 8239705
-	call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_23970F
+SkyPillar_Top_EventScript_TryShowRayquaza:: @ 8239705
+	call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_ShowRayquaza
 	return
 
-SkyPillar_Top_EventScript_23970F:: @ 823970F
-	clearflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
+SkyPillar_Top_EventScript_ShowRayquaza:: @ 823970F
+	clearflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT
 	return
 
-SkyPillar_Top_MapScript2_239713: @ 8239713
-	map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D
+SkyPillar_Top_OnWarp: @ 8239713
+	map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_RayquazaFaceDown
 	.2byte 0
 
-SkyPillar_Top_EventScript_23971D:: @ 823971D
+SkyPillar_Top_EventScript_RayquazaFaceDown:: @ 823971D
 	turnobject 1, DIR_SOUTH
 	end
 
-SkyPillar_Top_EventScript_239722:: @ 8239722
+SkyPillar_Top_EventScript_Rayquaza:: @ 8239722
 	lockall
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -56,33 +56,33 @@ SkyPillar_Top_EventScript_239722:: @ 8239722
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq SkyPillar_Top_EventScript_239768
+	goto_if_eq SkyPillar_Top_EventScript_DefeatedRayquaza
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq SkyPillar_Top_EventScript_239771
+	goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq SkyPillar_Top_EventScript_239771
+	goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza
 	setflag FLAG_DEFEATED_RAYQUAZA
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_239768:: @ 8239768
+SkyPillar_Top_EventScript_DefeatedRayquaza:: @ 8239768
 	setflag FLAG_DEFEATED_RAYQUAZA
-	goto SkyPillar_Top_EventScript_23977C
+	goto SkyPillar_Top_EventScript_DefeatedRayquaza2
 	end
 
-SkyPillar_Top_EventScript_239771:: @ 8239771
+SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771
 	setvar VAR_0x8004, SPECIES_RAYQUAZA
-	goto SkyPillar_Top_EventScript_239785
+	goto SkyPillar_Top_EventScript_RanFromRayquaza2
 	end
 
-SkyPillar_Top_EventScript_23977C:: @ 823977C
+SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C
 	fadescreenswapbuffers 1
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers 0
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_239785:: @ 8239785
+SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
 	fadescreenswapbuffers 1
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers 0
@@ -91,16 +91,16 @@ SkyPillar_Top_EventScript_239785:: @ 8239785
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_23979A:: @ 823979A
+SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A
 	lockall
 	fadeoutbgm 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858
+	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp
 	waitmovement 0
 	special RemoveCameraObject
-	applymovement 1, SkyPillar_Top_Movement_23983A
+	applymovement 1, SkyPillar_Top_Movement_RayquazaStir
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -119,15 +119,15 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	special ShakeCamera
 	waitstate
 	waitmoncry
-	applymovement 1, SkyPillar_Top_Movement_23984B
+	applymovement 1, SkyPillar_Top_Movement_RayquazaFlyOff
 	waitmovement 0
 	removeobject 1
-	msgbox SkyPillar_Top_Text_239860, MSGBOX_DEFAULT
+	msgbox SkyPillar_Top_Text_RayquazaFlewOff, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	fadeinbgm 1
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C
+	applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 5
@@ -136,7 +136,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	releaseall
 	end
 
-SkyPillar_Top_Movement_23983A: @ 823983A
+SkyPillar_Top_Movement_RayquazaStir: @ 823983A
 	delay_16
 	walk_in_place_fast_left
 	delay_16
@@ -155,7 +155,7 @@ SkyPillar_Top_Movement_23983A: @ 823983A
 	delay_16
 	step_end
 
-SkyPillar_Top_Movement_23984B: @ 823984B
+SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B
 	delay_16
 	walk_in_place_down
 	delay_8
@@ -170,18 +170,18 @@ SkyPillar_Top_Movement_23984B: @ 823984B
 	slide_up
 	step_end
 
-SkyPillar_Top_Movement_239858: @ 8239858
+SkyPillar_Top_Movement_CameraPanUp: @ 8239858
 	walk_slow_up
 	walk_slow_up
 	walk_slow_up
 	step_end
 
-SkyPillar_Top_Movement_23985C: @ 823985C
+SkyPillar_Top_Movement_CameraPanDown: @ 823985C
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
 	step_end
 
-SkyPillar_Top_Text_239860: @ 8239860
+SkyPillar_Top_Text_RayquazaFlewOff: @ 8239860
 	.string "The awakened RAYQUAZA flew off…$"
 
diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json
index f548b7349..53c482597 100644
--- a/data/maps/SlateportCity/map.json
+++ b/data/maps/SlateportCity/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCED9",
+      "script": "SlateportCity_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCEF6",
+      "script": "SlateportCity_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCEB8",
+      "script": "SlateportCity_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCF17",
+      "script": "SlateportCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD009",
+      "script": "SlateportCity_EventScript_AquaGrunt1",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE42",
+      "script": "SlateportCity_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE63",
+      "script": "SlateportCity_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE84",
+      "script": "SlateportCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD353",
+      "script": "SlateportCity_EventScript_Ty",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD35C",
+      "script": "SlateportCity_EventScript_Gabby",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD1F8",
+      "script": "SlateportCity_EventScript_CaptStern",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFE5",
+      "script": "SlateportCity_EventScript_Sailor1",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFEE",
+      "script": "SlateportCity_EventScript_Sailor2",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFF7",
+      "script": "SlateportCity_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD000",
+      "script": "SlateportCity_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFBB",
+      "script": "SlateportCity_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFDC",
+      "script": "SlateportCity_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD020",
+      "script": "SlateportCity_EventScript_AquaGrunt2",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -274,7 +274,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD037",
+      "script": "SlateportCity_EventScript_AquaGrunt3",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -287,7 +287,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD198",
+      "script": "SlateportCity_EventScript_DecorClerk",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD16A",
+      "script": "SlateportCity_EventScript_DollClerk",
       "flag": "0"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD365",
+      "script": "SlateportCity_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCDE4",
+      "script": "SlateportCity_EventScript_EffortRibbonWoman",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD1D8",
+      "script": "SlateportCity_EventScript_PowerTMClerk",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCDBD",
+      "script": "SlateportCity_EventScript_EnergyGuru",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD04E",
+      "script": "SlateportCity_EventScript_AquaGrunt4",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD065",
+      "script": "SlateportCity_EventScript_AquaGrunt5",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD07C",
+      "script": "SlateportCity_EventScript_AquaGrunt6",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -404,7 +404,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD093",
+      "script": "SlateportCity_EventScript_AquaGrunt7",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD0AA",
+      "script": "SlateportCity_EventScript_AquaGrunt8",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD0C1",
+      "script": "SlateportCity_EventScript_AquaGrunt9",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD14A",
+      "script": "SlateportCity_EventScript_AquaGrunt10",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD153",
+      "script": "SlateportCity_EventScript_AquaGrunt11",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD36E",
+      "script": "SlateportCity_EventScript_BerryPowderClerk",
       "flag": "0"
     },
     {
@@ -533,7 +533,7 @@
       "x": 5,
       "y": 19,
       "elevation": 0,
-      "dest_map": "MAP_SLATEPORT_CITY_HOUSE1",
+      "dest_map": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
       "dest_warp_id": 0
     },
     {
@@ -561,7 +561,7 @@
       "x": 21,
       "y": 44,
       "elevation": 0,
-      "dest_map": "MAP_SLATEPORT_CITY_HOUSE2",
+      "dest_map": "MAP_SLATEPORT_CITY_HOUSE",
       "dest_warp_id": 0
     }
   ],
@@ -573,7 +573,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE",
       "var_value": "2",
-      "script": "SlateportCity_EventScript_1DD5DC"
+      "script": "SlateportCity_EventScript_ScottBattleTentScene"
     }
   ],
   "bg_events": [
@@ -583,7 +583,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCFB2"
+      "script": "SlateportCity_EventScript_NameRatersHouseSign"
     },
     {
       "type": "sign",
@@ -615,7 +615,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF94"
+      "script": "SlateportCity_EventScript_HarborSign"
     },
     {
       "type": "sign",
@@ -631,7 +631,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF8B"
+      "script": "SlateportCity_EventScript_MarketSign"
     },
     {
       "type": "sign",
@@ -639,7 +639,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF79"
+      "script": "SlateportCity_EventScript_OceanicMuseumSign"
     },
     {
       "type": "sign",
@@ -647,7 +647,7 @@
       "y": 22,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF82"
+      "script": "SlateportCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -655,7 +655,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF70"
+      "script": "SlateportCity_EventScript_PokemonFanClubSign"
     },
     {
       "type": "sign",
@@ -663,7 +663,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF36"
+      "script": "SlateportCity_EventScript_BattleTentSign"
     },
     {
       "type": "sign",
@@ -671,7 +671,7 @@
       "y": 38,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF3F"
+      "script": "SlateportCity_EventScript_SternsShipyardSign"
     },
     {
       "type": "sign",
@@ -679,7 +679,7 @@
       "y": 36,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1DD643"
+      "script": "SlateportCity_EventScript_BerryCrushRankingsSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index d7fab0171..9f951e83d 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -1,24 +1,24 @@
 SlateportCity_MapScripts:: @ 81DCC61
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
 	.byte 0
 
 SlateportCity_OnTransition: @ 81DCC6C
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
-	call SlateportCity_EventScript_1DCC8D
+	call SlateportCity_EventScript_EnterSlateport
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCC99
+	call_if_eq SlateportCity_EventScript_MovePeopleForSternInterview
 	compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCCE7
+	call_if_eq SlateportCity_EventScript_SetReadyForScottScene
 	end
 
-SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
+SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
 	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
-SlateportCity_EventScript_1DCC99:: @ 81DCC99
+SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99
 	setobjectxyperm 11, 28, 13
 	setobjectxyperm 7, 25, 13
 	setobjectxyperm 3, 25, 14
@@ -35,50 +35,50 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
+SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
-	goto_if_eq SlateportCity_EventScript_1DCD06
+	goto_if_eq SlateportCity_EventScript_MoveScottLeft
 	setobjectxyperm 35, 23, 27
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_EventScript_1DCD06:: @ 81DCD06
+SlateportCity_EventScript_MoveScottLeft:: @ 81DCD06
 	setobjectxyperm 35, 22, 27
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_MapScript2_1DCD12: @ 81DCD12
-	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C
+SlateportCity_OnFrame: @ 81DCD12
+	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_ScottScene
 	.2byte 0
 
-SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
+SlateportCity_EventScript_ScottScene:: @ 81DCD1C
 	lockall
 	addobject 35
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DCDA8
-	applymovement 35, SlateportCity_Movement_1DCDAC
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
+	applymovement 35, SlateportCity_Movement_ScottApproachPlayer
 	waitmovement 0
-	msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT
 	closemessage
 	applymovement 35, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 60
-	msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT
 	applymovement 35, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_SCOTT_MATCH_CALL
-	msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement 35, SlateportCity_Movement_1DCDB4
+	applymovement 35, SlateportCity_Movement_ScottExit
 	waitmovement 0
 	removeobject 35
 	setobjectxyperm 35, 10, 12
@@ -89,13 +89,13 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	releaseall
 	end
 
-SlateportCity_Movement_1DCDA8: @ 81DCDA8
+SlateportCity_Movement_PlayerFaceScott: @ 81DCDA8
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DCDAC: @ 81DCDAC
+SlateportCity_Movement_ScottApproachPlayer: @ 81DCDAC
 	walk_right
 	walk_right
 	walk_right
@@ -105,7 +105,7 @@ SlateportCity_Movement_1DCDAC: @ 81DCDAC
 	walk_right
 	step_end
 
-SlateportCity_Movement_1DCDB4: @ 81DCDB4
+SlateportCity_Movement_ScottExit: @ 81DCDB4
 	walk_left
 	walk_left
 	walk_left
@@ -116,17 +116,17 @@ SlateportCity_Movement_1DCDB4: @ 81DCDB4
 	walk_left
 	step_end
 
-SlateportCity_EventScript_1DCDBD:: @ 81DCDBD
+SlateportCity_EventScript_EnergyGuru:: @ 81DCDBD
 	lock
 	faceplayer
-	message SlateportCity_Text_1DD64A
+	message SlateportCity_Text_EnergyGuruSellWhatYouNeed
 	waitmessage
-	pokemart SlateportCity_Pokemart_1DCDD4
+	pokemart SlateportCity_Pokemart_EnergyGuru
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
+SlateportCity_Pokemart_EnergyGuru: @ 81DCDD4
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
 	.2byte ITEM_CARBOS
@@ -137,304 +137,305 @@ SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
 	release
 	end
 
-SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
+SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_OhYourPokemon, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, LeadMonHasEffortRibbon
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_EventScript_1DCE38
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_EventScript_MonHasEffortRibbon
 	specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut
-	compare VAR_RESULT, 0
-	call_if_eq SlateportCity_EventScript_1DCE2E
-	msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq SlateportCity_EventScript_MonEVsNotMaxed
+	msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message SlateportCity_Text_1DD6E3
+	message SlateportCity_Text_ReceivedEffortRibbon
 	waitfanfare
-	msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT
 	special GiveLeadMonEffortRibbon
 	release
 	end
 
-SlateportCity_EventScript_1DCE2E:: @ 81DCE2E
-	msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT
+SlateportCity_EventScript_MonEVsNotMaxed:: @ 81DCE2E
+	msgbox SlateportCity_Text_GoForItLittleHarder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE38:: @ 81DCE38
-	msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT
+SlateportCity_EventScript_MonHasEffortRibbon:: @ 81DCE38
+	msgbox SlateportCity_Text_EffortRibbonLooksGoodOnIt, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE42:: @ 81DCE42
+SlateportCity_EventScript_Cook:: @ 81DCE42
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCE59
-	msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_CookSternInterview
+	msgbox SlateportCity_Text_SeaweedFullOfLife, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE59:: @ 81DCE59
-	msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT
+SlateportCity_EventScript_CookSternInterview:: @ 81DCE59
+	msgbox SlateportCity_Text_CaptainComeBackWithBigFish, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE63:: @ 81DCE63
+SlateportCity_EventScript_OldWoman:: @ 81DCE63
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCE7A
-	msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_OldWomanSternInterview
+	msgbox SlateportCity_Text_HowTownIsBornAndGrows, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
-	msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT
+SlateportCity_EventScript_OldWomanSternInterview:: @ 81DCE7A
+	msgbox SlateportCity_Text_CaptSternBeingInterviewed, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE84:: @ 81DCE84
+SlateportCity_EventScript_Girl:: @ 81DCE84
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCEA4
-	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE
-	msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_GirlSternInterview
+	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_GirlSecretBase
+	msgbox SlateportCity_Text_SlateportWonderfulPlace, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEA4:: @ 81DCEA4
-	msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT
+SlateportCity_EventScript_GirlSternInterview:: @ 81DCEA4
+	msgbox SlateportCity_Text_InterviewerSoCool, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
-	msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT
+SlateportCity_EventScript_GirlSecretBase:: @ 81DCEAE
+	msgbox SlateportCity_Text_BuyBricksSoDecorWontGetDirty, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
+SlateportCity_EventScript_RichBoy:: @ 81DCEB8
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCECF
-	msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_RichBoySternInterview
+	msgbox SlateportCity_Text_GoingToCompeteInBattleTent, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCECF:: @ 81DCECF
-	msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT
+SlateportCity_EventScript_RichBoySternInterview:: @ 81DCECF
+	msgbox SlateportCity_Text_SternSaysDiscoveredSomething, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCED9:: @ 81DCED9
+SlateportCity_EventScript_FatMan:: @ 81DCED9
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	goto_if_eq SlateportCity_EventScript_1DCEED
-	msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC
+	goto_if_eq SlateportCity_EventScript_FatManSternInterview
+	msgbox SlateportCity_Text_BushedHikingFromMauville, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCEED:: @ 81DCEED
-	msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN
+SlateportCity_EventScript_FatManSternInterview:: @ 81DCEED
+	msgbox SlateportCity_Text_AmIOnTV, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
+SlateportCity_EventScript_Man1:: @ 81DCEF6
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCF0D
-	msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_Man1SternInterview
+	msgbox SlateportCity_Text_EveryoneCallsHimCaptStern, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF0D:: @ 81DCF0D
-	msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT
+SlateportCity_EventScript_Man1SternInterview:: @ 81DCF0D
+	msgbox SlateportCity_Text_CaptainsACelebrity, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF17:: @ 81DCF17
+SlateportCity_EventScript_Woman1:: @ 81DCF17
 	lock
 	faceplayer
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_1DCF2C
-	msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_Woman1AquaGone
+	msgbox SlateportCity_Text_WhatsLongLineOverThere, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF2C:: @ 81DCF2C
-	msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT
+SlateportCity_EventScript_Woman1AquaGone:: @ 81DCF2C
+	msgbox SlateportCity_Text_VisitedMuseumOften, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF36:: @ 81DCF36
-	msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN
+SlateportCity_EventScript_BattleTentSign:: @ 81DCF36
+	msgbox SlateportCity_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF3F:: @ 81DCF3F
+SlateportCity_EventScript_SternsShipyardSign:: @ 81DCF3F
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCF66
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_1DCF5C
-	msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_SternsShipyardFerryComplete
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_SternsShipyardNearsCompletion
+	msgbox SlateportCity_Text_SternsShipyardWantedSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF5C:: @ 81DCF5C
-	msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT
+SlateportCity_EventScript_SternsShipyardNearsCompletion:: @ 81DCF5C
+	msgbox SlateportCity_Text_SternsShipyardNearsCompletion, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF66:: @ 81DCF66
-	msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT
+SlateportCity_EventScript_SternsShipyardFerryComplete:: @ 81DCF66
+	msgbox SlateportCity_Text_SternsShipyardFerryComplete, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF70:: @ 81DCF70
-	msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN
+SlateportCity_EventScript_PokemonFanClubSign:: @ 81DCF70
+	msgbox SlateportCity_Text_PokemonFanClubSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF79:: @ 81DCF79
-	msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN
+SlateportCity_EventScript_OceanicMuseumSign:: @ 81DCF79
+	msgbox SlateportCity_Text_OceanicMuseumSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF82:: @ 81DCF82
-	msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN
+SlateportCity_EventScript_CitySign:: @ 81DCF82
+	msgbox SlateportCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF8B:: @ 81DCF8B
-	msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN
+SlateportCity_EventScript_MarketSign:: @ 81DCF8B
+	msgbox SlateportCity_Text_MarketSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF94:: @ 81DCF94
+SlateportCity_EventScript_HarborSign:: @ 81DCF94
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCFA8
-	msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_HarborSignFerryComplete
+	msgbox SlateportCity_Text_HarborFerryUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCFA8:: @ 81DCFA8
-	msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT
+SlateportCity_EventScript_HarborSignFerryComplete:: @ 81DCFA8
+	msgbox SlateportCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
-	msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN
+SlateportCity_EventScript_NameRatersHouseSign:: @ 81DCFB2
+	msgbox SlateportCity_Text_NameRatersHouseSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
+SlateportCity_EventScript_Maniac:: @ 81DCFBB
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCFD2
-	msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_ManiacSternInterview
+	msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCFD2:: @ 81DCFD2
-	msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
+@ Unclear if the text here was meant to be different, but its not
+SlateportCity_EventScript_ManiacSternInterview:: @ 81DCFD2
+	msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCFDC:: @ 81DCFDC
-	msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC
+SlateportCity_EventScript_Woman2:: @ 81DCFDC
+	msgbox SlateportCity_Text_CantChangeTradeMonName, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFE5:: @ 81DCFE5
-	msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC
+SlateportCity_EventScript_Sailor1:: @ 81DCFE5
+	msgbox SlateportCity_Text_SeaIsSoWet, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFEE:: @ 81DCFEE
-	msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC
+SlateportCity_EventScript_Sailor2:: @ 81DCFEE
+	msgbox SlateportCity_Text_SinkOldBoats, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFF7:: @ 81DCFF7
-	msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC
+SlateportCity_EventScript_PokefanF:: @ 81DCFF7
+	msgbox SlateportCity_Text_BuyTooMuch, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD000:: @ 81DD000
-	msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC
+SlateportCity_EventScript_Man2:: @ 81DD000
+	msgbox SlateportCity_Text_BattleTentBuiltRecently, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD009:: @ 81DD009
+SlateportCity_EventScript_AquaGrunt1:: @ 81DD009
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD020:: @ 81DD020
+SlateportCity_EventScript_AquaGrunt2:: @ 81DD020
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT
 	closemessage
 	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD037:: @ 81DD037
+SlateportCity_EventScript_AquaGrunt3:: @ 81DD037
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT
 	closemessage
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD04E:: @ 81DD04E
+SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT
 	closemessage
 	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD065:: @ 81DD065
+SlateportCity_EventScript_AquaGrunt5:: @ 81DD065
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT
 	closemessage
 	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD07C:: @ 81DD07C
+SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT
 	closemessage
 	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD093:: @ 81DD093
+SlateportCity_EventScript_AquaGrunt7:: @ 81DD093
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT
 	closemessage
 	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD0AA:: @ 81DD0AA
+SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT
 	closemessage
 	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
+SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1
 	lock
 	faceplayer
 	playse SE_PIN
@@ -442,51 +443,51 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
 	waitmovement 0
 	applymovement 31, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
 	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_Movement_1DD147: @ 81DD147
+SlateportCity_Movement_DelayAquaGrunt: @ 81DD147
 	delay_16
 	delay_16
 	step_end
 
-SlateportCity_EventScript_1DD14A:: @ 81DD14A
-	msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN
+SlateportCity_EventScript_AquaGrunt10:: @ 81DD14A
+	msgbox SlateportCity_Text_ShouldveBroughtMyGameBoy, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD153:: @ 81DD153
+SlateportCity_EventScript_AquaGrunt11:: @ 81DD153
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT
 	closemessage
 	applymovement 33, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD16A:: @ 81DD16A
+SlateportCity_EventScript_DollClerk:: @ 81DD16A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -505,23 +506,23 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184
 	release
 	end
 
-SlateportCity_EventScript_1DD18E:: @ 81DD18E
+SlateportCity_EventScript_ComeBackWithSecretPower:: @ 81DD18E
 	msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD198:: @ 81DD198
+SlateportCity_EventScript_DecorClerk:: @ 81DD198
 	lock
 	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemartdecoration SlateportCity_PokemartDecor_1DD1B8
+	pokemartdecoration SlateportCity_PokemartDecor
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
+SlateportCity_PokemartDecor: @ 81DD1B8
 	.2byte DECOR_RED_BRICK
 	.2byte DECOR_BLUE_BRICK
 	.2byte DECOR_YELLOW_BRICK
@@ -540,28 +541,29 @@ SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
 	release
 	end
 
-SlateportCity_EventScript_1DD1D8:: @ 81DD1D8
+SlateportCity_EventScript_PowerTMClerk:: @ 81DD1D8
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SlateportCity_Pokemart_1DD1F0
+	pokemart SlateportCity_Pokemart_PowerTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-SlateportCity_Pokemart_1DD1F0: @ 81DD1F0
-	.2byte ITEM_TM10
-	.2byte ITEM_TM43
+SlateportCity_Pokemart_PowerTMs: @ 81DD1F0
+	.2byte ITEM_TM10  @ Hidden Power
+	.2byte ITEM_TM43  @ Secret Power
 	.2byte ITEM_NONE
 	release
 	end
 
-SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
+@ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine
+SlateportCity_EventScript_CaptStern:: @ 81DD1F8
 	lockall
-	msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT
-	msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT
 	closemessage
 	applymovement 10, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
@@ -569,28 +571,28 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25
-	applymovement 11, SlateportCity_Movement_1DD33C
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD34A
-	applymovement 10, SlateportCity_Movement_1DD319
-	applymovement 9, SlateportCity_Movement_1DD326
+	applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
+	applymovement 10, SlateportCity_Movement_GabbyExit
+	applymovement 9, SlateportCity_Movement_TyExit
 	waitmovement 0
 	removeobject 10
 	removeobject 9
-	msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT
 	applymovement 11, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT
 	playbgm MUS_AQA_0, 0
-	msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
-	applymovement 7, SlateportCity_Movement_1DD309
+	applymovement 7, SlateportCity_Movement_OldWomanConcern
 	applymovement 3, Common_Movement_QuestionMark
-	applymovement 2, SlateportCity_Movement_1DD311
+	applymovement 2, SlateportCity_Movement_ManConcern
 	waitmovement 0
 	applymovement 11, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT
 	playse SE_PIN
 	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -598,11 +600,11 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	waitmovement 0
 	applymovement 11, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT
-	msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, SlateportCity_Movement_1DD337
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD344
+	applymovement 11, SlateportCity_Movement_SternEnterHarbor
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
 	waitmovement 0
 	removeobject 11
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
@@ -615,7 +617,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	releaseall
 	end
 
-SlateportCity_Movement_1DD309: @ 81DD309
+SlateportCity_Movement_OldWomanConcern: @ 81DD309
 	delay_16
 	delay_16
 	emote_question_mark
@@ -625,7 +627,7 @@ SlateportCity_Movement_1DD309: @ 81DD309
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DD311: @ 81DD311
+SlateportCity_Movement_ManConcern: @ 81DD311
 	emote_question_mark
 	walk_in_place_fastest_up
 	delay_16
@@ -635,7 +637,7 @@ SlateportCity_Movement_1DD311: @ 81DD311
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DD319: @ 81DD319
+SlateportCity_Movement_GabbyExit: @ 81DD319
 	delay_16
 	walk_left
 	walk_left
@@ -650,7 +652,7 @@ SlateportCity_Movement_1DD319: @ 81DD319
 	walk_left
 	step_end
 
-SlateportCity_Movement_1DD326: @ 81DD326
+SlateportCity_Movement_TyExit: @ 81DD326
 	walk_down
 	walk_left
 	walk_left
@@ -666,19 +668,20 @@ SlateportCity_Movement_1DD326: @ 81DD326
 	walk_left
 	step_end
 
+@ Unused
 SlateportCity_Movement_1DD334: @ 81DD334
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Movement_1DD337: @ 81DD337
+SlateportCity_Movement_SternEnterHarbor: @ 81DD337
 	walk_right
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_Movement_1DD33C: @ 81DD33C
+SlateportCity_Movement_SternWatchGabbyAndTyExit: @ 81DD33C
 	delay_16
 	delay_16
 	delay_16
@@ -688,7 +691,7 @@ SlateportCity_Movement_1DD33C: @ 81DD33C
 	walk_left
 	step_end
 
-SlateportCity_Movement_1DD344: @ 81DD344
+SlateportCity_Movement_PlayerEnterHarbor: @ 81DD344
 	walk_in_place_fastest_right
 	delay_16
 	delay_16
@@ -696,7 +699,7 @@ SlateportCity_Movement_1DD344: @ 81DD344
 	walk_up
 	step_end
 
-SlateportCity_Movement_1DD34A: @ 81DD34A
+SlateportCity_Movement_PlayerFaceStern: @ 81DD34A
 	delay_16
 	delay_16
 	delay_16
@@ -707,198 +710,198 @@ SlateportCity_Movement_1DD34A: @ 81DD34A
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_EventScript_1DD353:: @ 81DD353
-	msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN
+SlateportCity_EventScript_Ty:: @ 81DD353
+	msgbox SlateportCity_Text_BigSmileForCamera, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD35C:: @ 81DD35C
-	msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN
+SlateportCity_EventScript_Gabby:: @ 81DD35C
+	msgbox SlateportCity_Text_MostInvaluableExperience, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD365:: @ 81DD365
-	msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC
+SlateportCity_EventScript_Man3:: @ 81DD365
+	msgbox SlateportCity_Text_WonderIfLighthouseStartlesPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD36E:: @ 81DD36E
+SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_1DD39A
-	msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar
+	msgbox SlateportCity_Text_ExplainBerries, MSGBOX_DEFAULT
 	giveitem_std ITEM_POWDER_JAR
 	setflag FLAG_RECEIVED_POWDER_JAR
-	msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD39A:: @ 81DD39A
+SlateportCity_EventScript_ReceivedPowderJar:: @ 81DD39A
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, HasEnoughBerryPowder
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD3C0
-	msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_ExplainBerryPowder
+	msgbox SlateportCity_Text_BroughtMeSomeBerryPowder, MSGBOX_DEFAULT
 	special DisplayBerryPowderVendorMenu
-	goto SlateportCity_EventScript_1DD3CA
+	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
-	msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT
+SlateportCity_EventScript_ExplainBerryPowder:: @ 81DD3C0
+	msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
-	message SlateportCity_Text_1DEE67
+SlateportCity_EventScript_ChooseBerryPowderItem:: @ 81DD3CA
+	message SlateportCity_Text_ExchangeWhatWithIt
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, SlateportCity_EventScript_1DD46E
-	case 1, SlateportCity_EventScript_1DD482
-	case 2, SlateportCity_EventScript_1DD496
-	case 3, SlateportCity_EventScript_1DD4AA
-	case 4, SlateportCity_EventScript_1DD4BE
-	case 5, SlateportCity_EventScript_1DD4D2
-	case 6, SlateportCity_EventScript_1DD4E6
-	case 7, SlateportCity_EventScript_1DD4FA
-	case 8, SlateportCity_EventScript_1DD50E
-	case 9, SlateportCity_EventScript_1DD522
-	case 10, SlateportCity_EventScript_1DD536
-	case 11, SlateportCity_EventScript_1DD54A
-	case MULTI_B_PRESSED, SlateportCity_EventScript_1DD54A
-	end
-
-SlateportCity_EventScript_1DD46E:: @ 81DD46E
+	case 0, SlateportCity_EventScript_EnergyPowder
+	case 1, SlateportCity_EventScript_EnergyRoot
+	case 2, SlateportCity_EventScript_HealPowder
+	case 3, SlateportCity_EventScript_RevivalHerb
+	case 4, SlateportCity_EventScript_Protein
+	case 5, SlateportCity_EventScript_Iron
+	case 6, SlateportCity_EventScript_Carbos
+	case 7, SlateportCity_EventScript_Calcium
+	case 8, SlateportCity_EventScript_Zinc
+	case 9, SlateportCity_EventScript_HPUp
+	case 10, SlateportCity_EventScript_PPUp
+	case 11, SlateportCity_EventScript_CancelPowderItemSelect
+	case MULTI_B_PRESSED, SlateportCity_EventScript_CancelPowderItemSelect
+	end
+
+SlateportCity_EventScript_EnergyPowder:: @ 81DD46E
 	bufferitemname 0, ITEM_ENERGY_POWDER
 	setvar VAR_0x8008, ITEM_ENERGY_POWDER
 	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD482:: @ 81DD482
+SlateportCity_EventScript_EnergyRoot:: @ 81DD482
 	bufferitemname 0, ITEM_ENERGY_ROOT
 	setvar VAR_0x8008, ITEM_ENERGY_ROOT
 	setvar VAR_0x8009, 80
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD496:: @ 81DD496
+SlateportCity_EventScript_HealPowder:: @ 81DD496
 	bufferitemname 0, ITEM_HEAL_POWDER
 	setvar VAR_0x8008, ITEM_HEAL_POWDER
 	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4AA:: @ 81DD4AA
+SlateportCity_EventScript_RevivalHerb:: @ 81DD4AA
 	bufferitemname 0, ITEM_REVIVAL_HERB
 	setvar VAR_0x8008, ITEM_REVIVAL_HERB
 	setvar VAR_0x8009, 300
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4BE:: @ 81DD4BE
+SlateportCity_EventScript_Protein:: @ 81DD4BE
 	bufferitemname 0, ITEM_PROTEIN
 	setvar VAR_0x8008, ITEM_PROTEIN
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4D2:: @ 81DD4D2
+SlateportCity_EventScript_Iron:: @ 81DD4D2
 	bufferitemname 0, ITEM_IRON
 	setvar VAR_0x8008, ITEM_IRON
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4E6:: @ 81DD4E6
+SlateportCity_EventScript_Carbos:: @ 81DD4E6
 	bufferitemname 0, ITEM_CARBOS
 	setvar VAR_0x8008, ITEM_CARBOS
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4FA:: @ 81DD4FA
+SlateportCity_EventScript_Calcium:: @ 81DD4FA
 	bufferitemname 0, ITEM_CALCIUM
 	setvar VAR_0x8008, ITEM_CALCIUM
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD50E:: @ 81DD50E
+SlateportCity_EventScript_Zinc:: @ 81DD50E
 	bufferitemname 0, ITEM_ZINC
 	setvar VAR_0x8008, ITEM_ZINC
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD522:: @ 81DD522
+SlateportCity_EventScript_HPUp:: @ 81DD522
 	bufferitemname 0, ITEM_HP_UP
 	setvar VAR_0x8008, ITEM_HP_UP
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD536:: @ 81DD536
+SlateportCity_EventScript_PPUp:: @ 81DD536
 	bufferitemname 0, ITEM_PP_UP
 	setvar VAR_0x8008, ITEM_PP_UP
 	setvar VAR_0x8009, 3000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD54A:: @ 81DD54A
-	msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT
+SlateportCity_EventScript_CancelPowderItemSelect:: @ 81DD54A
+	msgbox SlateportCity_Text_ComeBackToTradeBerryPowder, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD557:: @ 81DD557
-	msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD3CA
+SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557
+	msgbox SlateportCity_Text_ExchangeBerryPowderForItem, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, HasEnoughBerryPowder
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD5CE
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_NotEnoughBerryPowder
 	giveitem_std VAR_0x8008
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD5C1
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_NoRoomForBerryPowderItem
 	copyvar VAR_0x8004, VAR_0x8009
 	special TakeBerryPowder
 	special PrintPlayerBerryPowderAmount
-	msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_EventScript_1DD3CA
-	msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_FineBerryPowderTradeSomethingElse, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem
+	msgbox SlateportCity_Text_WhenYouGetMoreBringItToMe, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD5C1:: @ 81DD5C1
+SlateportCity_EventScript_NoRoomForBerryPowderItem:: @ 81DD5C1
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD5CE:: @ 81DD5CE
-	msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT
-	goto SlateportCity_EventScript_1DD3CA
+SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE
+	msgbox SlateportCity_Text_DontHaveEnoughBerryPowder, MSGBOX_DEFAULT
+	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
+SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	opendoor 10, 12
 	waitdooranim
 	addobject 35
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD630
-	applymovement 35, SlateportCity_Movement_1DD637
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
+	applymovement 35, SlateportCity_Movement_ScottExitBattleTent
 	waitmovement 0
 	closedoor 10, 12
 	waitdooranim
-	msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD634
-	applymovement 35, SlateportCity_Movement_1DD63A
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit
+	applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent
 	waitmovement 0
 	removeobject 35
 	addvar VAR_SCOTT_STATE, 1
@@ -906,23 +909,23 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
 	releaseall
 	end
 
-SlateportCity_Movement_1DD630: @ 81DD630
+SlateportCity_Movement_PushPlayerDown: @ 81DD630
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-SlateportCity_Movement_1DD634: @ 81DD634
+SlateportCity_Movement_PlayerWatchScottExit: @ 81DD634
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SlateportCity_Movement_1DD637: @ 81DD637
+SlateportCity_Movement_ScottExitBattleTent: @ 81DD637
 	delay_8
 	walk_down
 	step_end
 
-SlateportCity_Movement_1DD63A: @ 81DD63A
+SlateportCity_Movement_ScottExitAfterBattleTent: @ 81DD63A
 	walk_right
 	walk_right
 	walk_right
@@ -933,193 +936,193 @@ SlateportCity_Movement_1DD63A: @ 81DD63A
 	walk_right
 	step_end
 
-SlateportCity_EventScript_1DD643:: @ 81DD643
+SlateportCity_EventScript_BerryCrushRankingsSign:: @ 81DD643
 	lockall
-	special sub_80224D0
+	special ShowBerryCrushRankings
 	waitstate
 	releaseall
 	end
 
-SlateportCity_Text_1DD64A: @ 81DD64A
+SlateportCity_Text_EnergyGuruSellWhatYouNeed: @ 81DD64A
 	.string "I'm the ENERGY GURU! I'll go for it and\n"
 	.string "sell you what you need!$"
 
-SlateportCity_Text_1DD68A: @ 81DD68A
+SlateportCity_Text_OhYourPokemon: @ 81DD68A
 	.string "Oh?\n"
 	.string "Your {STR_VAR_1}…$"
 
-SlateportCity_Text_1DD697: @ 81DD697
+SlateportCity_Text_PleaseGiveItThisEffortRibbon: @ 81DD697
 	.string "Went for it stupendously!\p"
 	.string "As its reward, please give it this\n"
 	.string "EFFORT RIBBON.$"
 
-SlateportCity_Text_1DD6E3: @ 81DD6E3
+SlateportCity_Text_ReceivedEffortRibbon: @ 81DD6E3
 	.string "{PLAYER} received the EFFORT RIBBON.$"
 
-SlateportCity_Text_1DD702: @ 81DD702
+SlateportCity_Text_PutEffortRibbonOnMon: @ 81DD702
 	.string "{PLAYER} put the EFFORT RIBBON\n"
 	.string "on {STR_VAR_1}.$"
 
-SlateportCity_Text_1DD722: @ 81DD722
+SlateportCity_Text_GoForItLittleHarder: @ 81DD722
 	.string "You have to go for it a little harder.\p"
 	.string "If you do, I'll give your POKéMON\n"
 	.string "something nice.$"
 
-SlateportCity_Text_1DD77B: @ 81DD77B
+SlateportCity_Text_EffortRibbonLooksGoodOnIt: @ 81DD77B
 	.string "Oh! Your {STR_VAR_1}, that EFFORT\n"
 	.string "RIBBON looks good on it!$"
 
-SlateportCity_Text_1DD7AD: @ 81DD7AD
+SlateportCity_Text_WonderIfLighthouseStartlesPokemon: @ 81DD7AD
 	.string "The light of the lighthouse reaches\n"
 	.string "dozens of miles away.\p"
 	.string "I wonder if it doesn't startle POKéMON\n"
 	.string "in the sea.$"
 
-SlateportCity_Text_1DD81A: @ 81DD81A
+SlateportCity_Text_SeaweedFullOfLife: @ 81DD81A
 	.string "Ooh, look at this!\p"
 	.string "The seaweed you can get around these\n"
 	.string "parts is fresh and full of life.\p"
 	.string "Why, it looks like it can even rear up\n"
 	.string "and attack!$"
 
-SlateportCity_Text_1DD8A6: @ 81DD8A6
+SlateportCity_Text_HowTownIsBornAndGrows: @ 81DD8A6
 	.string "Where the water is clean, the fruits\n"
 	.string "of bountiful harvest gather.\p"
 	.string "And where people gather, a market\n"
 	.string "soon starts.\p"
 	.string "That is how a town is born and grows.$"
 
-SlateportCity_Text_1DD93D: @ 81DD93D
+SlateportCity_Text_SlateportWonderfulPlace: @ 81DD93D
 	.string "Shopping where you can breathe the\n"
 	.string "scent of the ocean…\p"
 	.string "SLATEPORT is such a wonderful place!$"
 
-SlateportCity_Text_1DD999: @ 81DD999
+SlateportCity_Text_BuyBricksSoDecorWontGetDirty: @ 81DD999
 	.string "If you put DOLLS or CUSHIONS on\n"
 	.string "the floor, they'll get dirty.\p"
 	.string "I'm going to buy some BRICKS so my\n"
 	.string "DOLLS and CUSHIONS won't get dirty\l"
 	.string "when I leave them out.$"
 
-SlateportCity_Text_1DDA34: @ 81DDA34
+SlateportCity_Text_GoingToCompeteInBattleTent: @ 81DDA34
 	.string "Wroooar! I'm going to compete in\n"
 	.string "the BATTLE TENT, too!\p"
 	.string "But before that, I need to catch\n"
 	.string "some POKéMON!$"
 
-SlateportCity_Text_1DDA9A: @ 81DDA9A
+SlateportCity_Text_BushedHikingFromMauville: @ 81DDA9A
 	.string "Whew… I'm just bushed…\p"
 	.string "I hiked over from MAUVILLE CITY.\n"
 	.string "But, boy, this city's huge.\p"
 	.string "If I'd known this, I would've ridden\n"
 	.string "my BIKE here.$"
 
-SlateportCity_Text_1DDB21: @ 81DDB21
+SlateportCity_Text_EveryoneCallsHimCaptStern: @ 81DDB21
 	.string "STERN, the fellow who built the\n"
 	.string "MUSEUM, also happens to be the leader\l"
 	.string "of an undersea exploration team.\p"
 	.string "So, everyone calls him CAPT. STERN.$"
 
-SlateportCity_Text_1DDBAC: @ 81DDBAC
+SlateportCity_Text_WhatsLongLineOverThere: @ 81DDBAC
 	.string "What is that over there?\n"
 	.string "That long line…$"
 
-SlateportCity_Text_1DDBD5: @ 81DDBD5
+SlateportCity_Text_VisitedMuseumOften: @ 81DDBD5
 	.string "When I was a child, I visited\n"
 	.string "the MUSEUM often.\p"
 	.string "I used to dream about the mysteries of\n"
 	.string "the sea after seeing the exhibits.$"
 
-SlateportCity_Text_1DDC4F: @ 81DDC4F
+SlateportCity_Text_QuitPushing: @ 81DDC4F
 	.string "Hey, there! Quit pushing!\n"
 	.string "This is the line, can't you see?$"
 
-SlateportCity_Text_1DDC8A: @ 81DDC8A
+SlateportCity_Text_AquaHasPolicy: @ 81DDC8A
 	.string "TEAM AQUA has a policy of\n"
 	.string "assembling and dispersing at\l"
 	.string "the operation site.$"
 
-SlateportCity_Text_1DDCD5: @ 81DDCD5
+SlateportCity_Text_BossIsBrilliant: @ 81DDCD5
 	.string "Our BOSS is brilliant.\p"
 	.string "What would he want to do with\n"
 	.string "a MUSEUM now?$"
 
-SlateportCity_Text_1DDD18: @ 81DDD18
+SlateportCity_Text_WhatsNewSchemeIWonder: @ 81DDD18
 	.string "What's the new scheme, I wonder?\p"
 	.string "Our BOSS is scary when he's mad, so\n"
 	.string "I'd better not screw things up…$"
 
-SlateportCity_Text_1DDD7D: @ 81DDD7D
+SlateportCity_Text_ShouldTakeItAll: @ 81DDD7D
 	.string "If there's something we need in\n"
 	.string "the MUSEUM, we should take it all!$"
 
-SlateportCity_Text_1DDDC0: @ 81DDDC0
+SlateportCity_Text_DontButtIn: @ 81DDDC0
 	.string "Hey, you there!\n"
 	.string "Don't butt in!$"
 
-SlateportCity_Text_1DDDDF: @ 81DDDDF
+SlateportCity_Text_RemindsMeOfLongLineForGames: @ 81DDDDF
 	.string "A long line, huh?\p"
 	.string "It reminds me of the times I lined up to\n"
 	.string "buy smash-hit games…$"
 
-SlateportCity_Text_1DDE2F: @ 81DDE2F
+SlateportCity_Text_WhyAreWeLiningUp: @ 81DDE2F
 	.string "Why are we even lining up and paying?\n"
 	.string "We should just march in!$"
 
-SlateportCity_Text_1DDE6E: @ 81DDE6E
+SlateportCity_Text_WhatDoYouWant: @ 81DDE6E
 	.string "What?\n"
 	.string "What do you want?$"
 
-SlateportCity_Text_1DDE86: @ 81DDE86
+SlateportCity_Text_IllReadSignForYou: @ 81DDE86
 	.string "You want to read this sign?\n"
 	.string "I'll read it for you!$"
 
-SlateportCity_Text_1DDEB8: @ 81DDEB8
+SlateportCity_Text_SaysSomethingLikeSeaIsEndless: @ 81DDEB8
 	.string "Let's see…\p"
 	.string "Um… I think it says something like\n"
 	.string "“the life in the sea is endless.”\p"
 	.string "Yup, I'm pretty sure that's what\n"
 	.string "it says.$"
 
-SlateportCity_Text_1DDF32: @ 81DDF32
+SlateportCity_Text_ShouldveBroughtMyGameBoy: @ 81DDF32
 	.string "Grumble…\p"
 	.string "I should've brought my Game Boy\n"
 	.string "Advance so I wouldn't get bored in line…\p"
 	.string "Grumble…$"
 
-SlateportCity_Text_1DDF8D: @ 81DDF8D
+SlateportCity_Text_HotSpringsAfterOperation: @ 81DDF8D
 	.string "When this operation's over, I'll take\n"
 	.string "you to a hot spring spa!\p"
 	.string "That's what our leader said.\n"
 	.string "I can't wait!$"
 
-SlateportCity_Text_1DDFF7: @ 81DDFF7
+SlateportCity_Text_SeaIsSoWet: @ 81DDFF7
 	.string "The sea is just so vast…\p"
 	.string "Could the sea have been made by\n"
 	.string "the tears shed by POKéMON?$"
 
-SlateportCity_Text_1DE04B: @ 81DE04B
+SlateportCity_Text_SinkOldBoats: @ 81DE04B
 	.string "Do you know what they do with old\n"
 	.string "ships that become too creaky to sail?\p"
 	.string "They sink them in the sea so they\n"
 	.string "become habitats for POKéMON.$"
 
-SlateportCity_Text_1DE0D2: @ 81DE0D2
+SlateportCity_Text_BuyTooMuch: @ 81DE0D2
 	.string "Whenever I visit here, I get carried\n"
 	.string "away and buy too much.$"
 
-SlateportCity_Text_1DE10E: @ 81DE10E
+SlateportCity_Text_GetNameRaterToHelpYou: @ 81DE10E
 	.string "If you want to change your POKéMON's\n"
 	.string "nickname, you'll have to get the NAME\l"
 	.string "RATER to help you.$"
 
-SlateportCity_Text_1DE16C: @ 81DE16C
+SlateportCity_Text_CantChangeTradeMonName: @ 81DE16C
 	.string "Any POKéMON you get in a trade,\n"
 	.string "you can't change its nickname.\p"
 	.string "The original TRAINER's love for that\n"
 	.string "POKéMON is in the nickname.$"
 
-SlateportCity_Text_1DE1EC: @ 81DE1EC
+SlateportCity_Text_BattleTentBuiltRecently: @ 81DE1EC
 	.string "Recently, a BATTLE TENT was built\n"
 	.string "in SLATEPORT.\p"
 	.string "GYMS are fun, but the BATTLE TENT's\n"
@@ -1127,62 +1130,62 @@ SlateportCity_Text_1DE1EC: @ 81DE1EC
 	.string "You should go find tough POKéMON\n"
 	.string "for the BATTLE TENT!$"
 
-SlateportCity_Text_1DE28E: @ 81DE28E
+SlateportCity_Text_CaptSternBeingInterviewed: @ 81DE28E
 	.string "I was hoping that it was a famous star\n"
 	.string "so I could get an autograph.\p"
 	.string "But who's that being interviewed?\n"
 	.string "Isn't that CAPT. STERN?$"
 
-SlateportCity_Text_1DE30C: @ 81DE30C
+SlateportCity_Text_InterviewerSoCool: @ 81DE30C
 	.string "That lady interviewer is so cool\n"
 	.string "and pretty.\p"
 	.string "When I grow up, I'm going to be\n"
 	.string "an international journalist!$"
 
-SlateportCity_Text_1DE376: @ 81DE376
+SlateportCity_Text_SternSaysDiscoveredSomething: @ 81DE376
 	.string "CAPT. STERN says they discovered\n"
 	.string "something at the bottom of the sea.\p"
 	.string "I wonder what it is?\n"
 	.string "What could it be?$"
 
-SlateportCity_Text_1DE3E2: @ 81DE3E2
+SlateportCity_Text_CaptainComeBackWithBigFish: @ 81DE3E2
 	.string "What's going on here?\p"
 	.string "Did the good CAPTAIN come back with\n"
 	.string "a big fish from the ocean floor?$"
 
-SlateportCity_Text_1DE43D: @ 81DE43D
+SlateportCity_Text_AmIOnTV: @ 81DE43D
 	.string "Hey! Are you watching?\n"
 	.string "Am I on TV?$"
 
-SlateportCity_Text_1DE460: @ 81DE460
+SlateportCity_Text_CaptainsACelebrity: @ 81DE460
 	.string "A TV interview! Here!\n"
 	.string "The CAPTAIN's a celebrity!$"
 
-SlateportCity_Text_1DE491: @ 81DE491
+SlateportCity_Text_BigSmileForCamera: @ 81DE491
 	.string "TY: Okay, CAPT. STERN, a big smile\n"
 	.string "for the camera!$"
 
-SlateportCity_Text_1DE4C4: @ 81DE4C4
+SlateportCity_Text_MostInvaluableExperience: @ 81DE4C4
 	.string "GABBY: I see, I see. You've had a most\n"
 	.string "invaluable experience…$"
 
-SlateportCity_Text_1DE502: @ 81DE502
+SlateportCity_Text_SternMoveAheadWithExploration: @ 81DE502
 	.string "CAPT. STERN: Yes, indeed. We intend to\n"
 	.string "move ahead with our exploration.$"
 
-SlateportCity_Text_1DE54A: @ 81DE54A
+SlateportCity_Text_GabbyWonderfulThanksForInterview: @ 81DE54A
 	.string "GABBY: That's wonderful, CAPT. STERN!\n"
 	.string "Thank you for taking the time from\l"
 	.string "your busy schedule to talk to us.\p"
 	.string "We hope we can interview you again\n"
 	.string "with news of more discoveries!$"
 
-SlateportCity_Text_1DE5F7: @ 81DE5F7
+SlateportCity_Text_SternWhewFirstInterview: @ 81DE5F7
 	.string "CAPT. STERN: Whew…\p"
 	.string "That was my first time to be filmed for\n"
 	.string "TV. That was nerve-wracking.$"
 
-SlateportCity_Text_1DE64F: @ 81DE64F
+SlateportCity_Text_OhPlayerWeMadeDiscovery: @ 81DE64F
 	.string "Oh! {PLAYER}{KUN}!\n"
 	.string "You're looking great!\p"
 	.string "We made a huge discovery on our last\n"
@@ -1192,7 +1195,7 @@ SlateportCity_Text_1DE64F: @ 81DE64F
 	.string "We think it's the habitat of a POKéMON\n"
 	.string "that's said to have been long extinct.$"
 
-SlateportCity_Text_1DE724: @ 81DE724
+SlateportCity_Text_AquaWillAssumeControlOfSubmarine: @ 81DE724
 	.string "Fufufu…\n"
 	.string "CAPT. STERN, I presume.\p"
 	.string "We of TEAM AQUA will assume\n"
@@ -1203,77 +1206,77 @@ SlateportCity_Text_1DE724: @ 81DE724
 	.string "Just watch and learn what TEAM\l"
 	.string "AQUA has planned!$"
 
-SlateportCity_Text_1DE7F7: @ 81DE7F7
+SlateportCity_Text_SternWhatWasAllThat: @ 81DE7F7
 	.string "CAPT. STERN: What was that all about?\p"
 	.string "It sounded like someone using\n"
 	.string "a megaphone…\p"
 	.string "Where did it come from?$"
 
-SlateportCity_Text_1DE860: @ 81DE860
+SlateportCity_Text_FromHarborTryingToTakeSub: @ 81DE860
 	.string "It's from the HARBOR!\p"
 	.string "The submarine!\n"
 	.string "They're trying to take it!$"
 
-SlateportCity_Text_1DE8A0: @ 81DE8A0
+SlateportCity_Text_PleaseComeWithMe: @ 81DE8A0
 	.string "{PLAYER}{KUN}!\n"
 	.string "Please, come with me!$"
 
-SlateportCity_Text_1DE8BC: @ 81DE8BC
+SlateportCity_Text_BattleTentSign: @ 81DE8BC
 	.string "BATTLE TENT SLATEPORT SITE\n"
 	.string "“Find it! The ultimate POKéMON!”$"
 
-SlateportCity_Text_1DE8F8: @ 81DE8F8
+SlateportCity_Text_SternsShipyardWantedSign: @ 81DE8F8
 	.string "STERN'S SHIPYARD\p"
 	.string "“Wanted: A sailor capable of sailing\n"
 	.string "in all currents.”$"
 
-SlateportCity_Text_1DE940: @ 81DE940
+SlateportCity_Text_SternsShipyardNearsCompletion: @ 81DE940
 	.string "STERN'S SHIPYARD\p"
 	.string "“The ferry S.S. TIDAL nears\n"
 	.string "completion for serving the ports of\l"
 	.string "SLATEPORT and LILYCOVE.”$"
 
-SlateportCity_Text_1DE9AA: @ 81DE9AA
+SlateportCity_Text_SternsShipyardFerryComplete: @ 81DE9AA
 	.string "STERN'S SHIPYARD\p"
 	.string "“Boarding of the SLATEPORT-LILYCOVE\n"
 	.string "ferry S.S. TIDAL is handled at the\l"
 	.string "HARBOR.”$"
 
-SlateportCity_Text_1DEA0B: @ 81DEA0B
+SlateportCity_Text_PokemonFanClubSign: @ 81DEA0B
 	.string "POKéMON FAN CLUB\n"
 	.string "“Calling all fans of POKéMON!”$"
 
-SlateportCity_Text_1DEA3B: @ 81DEA3B
+SlateportCity_Text_OceanicMuseumSign: @ 81DEA3B
 	.string "“The endless sea sustains\n"
 	.string "all life.”\p"
 	.string "OCEANIC MUSEUM$"
 
-SlateportCity_Text_1DEA6F: @ 81DEA6F
+SlateportCity_Text_CitySign: @ 81DEA6F
 	.string "SLATEPORT CITY\p"
 	.string "“The port where people and POKéMON\n"
 	.string "cross paths.”$"
 
-SlateportCity_Text_1DEAAF: @ 81DEAAF
+SlateportCity_Text_MarketSign: @ 81DEAAF
 	.string "SLATEPORT MARKET\n"
 	.string "“Unique items found nowhere else!”$"
 
-SlateportCity_Text_1DEAE3: @ 81DEAE3
+SlateportCity_Text_HarborFerryUnderConstruction: @ 81DEAE3
 	.string "SLATEPORT HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in the SHIPYARD.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-SlateportCity_Text_1DEB5A: @ 81DEB5A
+SlateportCity_Text_HarborSign: @ 81DEB5A
 	.string "SLATEPORT HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-SlateportCity_Text_1DEBA0: @ 81DEBA0
+SlateportCity_Text_NameRatersHouseSign: @ 81DEBA0
 	.string "NAME RATER'S HOUSE\n"
 	.string "“POKéMON nicknames rated.”$"
 
-SlateportCity_Text_1DEBCE: @ 81DEBCE
+SlateportCity_Text_ExplainBerries: @ 81DEBCE
 	.string "If a wild POKéMON gets hurt, it heals\n"
 	.string "itself by chewing on BERRIES.\p"
 	.string "Did you know that?\p"
@@ -1288,7 +1291,7 @@ SlateportCity_Text_1DEBCE: @ 81DEBCE
 	.string "I've got something good for someone\n"
 	.string "like you.$"
 
-SlateportCity_Text_1DED27: @ 81DED27
+SlateportCity_Text_ExplainBerryPowder: @ 81DED27
 	.string "I recently had machines installed at\n"
 	.string "POKéMON CENTERS for crushing BERRIES.\p"
 	.string "The BERRY CRUSH machines are at\n"
@@ -1299,39 +1302,39 @@ SlateportCity_Text_1DED27: @ 81DED27
 	.string "I can make you all sorts of medicine\n"
 	.string "if you bring me lots of BERRY POWDER.$"
 
-SlateportCity_Text_1DEE40: @ 81DEE40
+SlateportCity_Text_BroughtMeSomeBerryPowder: @ 81DEE40
 	.string "Have you brought me some\n"
 	.string "BERRY POWDER?$"
 
-SlateportCity_Text_1DEE67: @ 81DEE67
+SlateportCity_Text_ExchangeWhatWithIt: @ 81DEE67
 	.string "What would you like to exchange\n"
 	.string "it with?$"
 
-SlateportCity_Text_1DEE90: @ 81DEE90
+SlateportCity_Text_ExchangeBerryPowderForItem: @ 81DEE90
 	.string "Okay, you want to exchange your\n"
 	.string "BERRY POWDER for one {STR_VAR_1}?$"
 
-SlateportCity_Text_1DEEC9: @ 81DEEC9
+SlateportCity_Text_DontHaveEnoughBerryPowder: @ 81DEEC9
 	.string "Oh, dear. You don't have enough\n"
 	.string "BERRY POWDER.$"
 
-SlateportCity_Text_1DEEF7: @ 81DEEF7
+SlateportCity_Text_FineBerryPowderTradeSomethingElse: @ 81DEEF7
 	.string "This is fine BERRY POWDER.\n"
 	.string "It will make excellent medicine.\p"
 	.string "Would you like to trade more of your\n"
 	.string "BERRY POWDER for something else?$"
 
-SlateportCity_Text_1DEF79: @ 81DEF79
+SlateportCity_Text_WhenYouGetMoreBringItToMe: @ 81DEF79
 	.string "Okay! When you get some more\n"
 	.string "BERRY POWDER, bring it to me, please!$"
 
-SlateportCity_Text_1DEFBC: @ 81DEFBC
+SlateportCity_Text_ComeBackToTradeBerryPowder: @ 81DEFBC
 	.string "Come back if you'd like to trade your\n"
 	.string "BERRY POWDER for some medicine.\p"
 	.string "I'm always running a bazaar here.\p"
 	.string "Did you know?$"
 
-SlateportCity_Text_1DF032: @ 81DF032
+SlateportCity_Text_YouDroveTeamAquaAway: @ 81DF032
 	.string "SCOTT: Huh?\n"
 	.string "I'm sure I met you somewhere before.\p"
 	.string "Have I introduced myself to you?\n"
@@ -1340,22 +1343,22 @@ SlateportCity_Text_1DF032: @ 81DF032
 	.string "here like they were stung.\p"
 	.string "Let me guess--you drove them away?$"
 
-SlateportCity_Text_1DF0FE: @ 81DF0FE
+SlateportCity_Text_MaybeThisTrainer: @ 81DF0FE
 	.string "SCOTT: Hmm…\n"
 	.string "Maybe, just maybe, this TRAINER…$"
 
-SlateportCity_Text_1DF12B: @ 81DF12B
+SlateportCity_Text_LetsRegisterEachOther: @ 81DF12B
 	.string "SCOTT: All right! I think you're going\n"
 	.string "to become a good friend.\p"
 	.string "So, let's register each other in our\n"
 	.string "POKéNAVS.\p"
 	.string "… … … … … …$"
 
-SlateportCity_Text_1DF1A6: @ 81DF1A6
+SlateportCity_Text_RegisteredScott: @ 81DF1A6
 	.string "Registered this SCOTT person\n"
 	.string "in the POKéNAV.$"
 
-SlateportCity_Text_1DF1D3: @ 81DF1D3
+SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou: @ 81DF1D3
 	.string "SCOTT: What I'd like to do is tag along\n"
 	.string "with you, but I do want to keep an eye\l"
 	.string "on the talents of other people, too.\p"
@@ -1363,7 +1366,7 @@ SlateportCity_Text_1DF1D3: @ 81DF1D3
 	.string "a bit more.\p"
 	.string "Be seeing you, {PLAYER}{KUN}!$"
 
-SlateportCity_Text_1DF28C: @ 81DF28C
+SlateportCity_Text_TakingBattleTentChallenge: @ 81DF28C
 	.string "SCOTT: Oh, hey!\n"
 	.string "If it isn't {PLAYER}{KUN}!\p"
 	.string "{PLAYER}{KUN}, let me guess--you're going\n"
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index e178155a9..e5195dce2 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -63,7 +63,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
 
 SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -72,11 +72,11 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
 	waitstate
 
 SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -89,7 +89,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
 
 SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B
 SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index fcbfa025c..a8abf0cb6 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
 	special HealPlayerParty
 
 SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -84,9 +84,9 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
 SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
 	msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D
-	case 1, SlateportCity_BattleTentCorridor_EventScript_209022
-	case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D
+	case NO, SlateportCity_BattleTentCorridor_EventScript_208F0D
+	case YES, SlateportCity_BattleTentCorridor_EventScript_209022
+	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
 
 SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
 	message SlateportCity_BattleTentCorridor_Text_25A37A
@@ -102,8 +102,8 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
 	special sub_81B9D08
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1
+	case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
+	case YES, SlateportCity_BattleTentCorridor_EventScript_208FF1
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4
 
 SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
@@ -135,7 +135,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 80545a7f2..8f453c147 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -21,7 +21,7 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
 	.2byte 0
 
 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -29,12 +29,12 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
 	lockall
 	msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -47,7 +47,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
 	waitmessage
 	setvar VAR_0x8004, 4
 	special sub_81B9D08
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -63,7 +63,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
 	special sub_81B9D08
 	switch VAR_RESULT
 	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -81,7 +81,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
 	lockall
 	message SlateportCity_BattleTentLobby_Text_2C5BA2
 	waitmessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -107,7 +107,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
 	special sub_81B9D08
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -138,28 +138,28 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
 SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
 	setvar VAR_FRONTIER_FACILITY, 4
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 2
 	special CallFrontierUtilFunc
 	msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
-	case 1, SlateportCity_BattleTentLobby_EventScript_208950
-	case 127, SlateportCity_BattleTentLobby_EventScript_208A2B
+	case NO, SlateportCity_BattleTentLobby_EventScript_208A2B
+	case YES, SlateportCity_BattleTentLobby_EventScript_208950
+	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2B
 
 SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
 	special sub_81B9D08
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -221,7 +221,7 @@ SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
 	goto SlateportCity_BattleTentLobby_EventScript_2088CA
 
 SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json
index c61c5a5e6..c9aaf1d7a 100644
--- a/data/maps/SlateportCity_Harbor/map.json
+++ b/data/maps/SlateportCity_Harbor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CAF1",
+      "script": "SlateportCity_Harbor_EventScript_FerryAttendant",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CC52",
+      "script": "SlateportCity_Harbor_EventScript_Sailor",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CC99",
+      "script": "SlateportCity_Harbor_EventScript_FatMan",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CCA2",
+      "script": "SlateportCity_Harbor_EventScript_CaptStern",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN"
     },
     {
@@ -157,7 +157,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9BB"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger0"
     },
     {
       "type": "trigger",
@@ -166,7 +166,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9C7"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger1"
     },
     {
       "type": "trigger",
@@ -175,7 +175,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9D3"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger2"
     },
     {
       "type": "trigger",
@@ -184,7 +184,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9DF"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger3"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index aa0eaab77..1abb66b57 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -6,58 +6,58 @@ SlateportCity_Harbor_OnTransition: @ 820C983
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
 	compare VAR_SLATEPORT_HARBOR_STATE, 1
-	call_if_eq SlateportCity_Harbor_EventScript_20C9A9
-	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5
+	call_if_eq SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene
+	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_ShowSSTidal
 	end
 
-SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
+SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	return
 
-SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
+SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9
 	savebgm MUS_AQA_0
 	setobjectxyperm 4, 12, 13
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
 	return
 
-SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger0:: @ 820C9BB
 	lockall
 	setvar VAR_0x8008, 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger1:: @ 820C9C7
 	lockall
 	setvar VAR_0x8008, 1
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3
 	lockall
 	setvar VAR_0x8008, 2
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF
 	lockall
 	setvar VAR_0x8008, 3
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CAEF
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp
 	waitmovement 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
+SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
 	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 6, Common_Movement_WalkInPlaceFastestDown
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 7, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 8, SlateportCity_Harbor_Movement_20CAD2
+	applymovement 6, SlateportCity_Harbor_Movement_AquaBoardSub
+	applymovement 7, SlateportCity_Harbor_Movement_AquaBoardSub
+	applymovement 8, SlateportCity_Harbor_Movement_SubmarineExit
 	waitmovement 0
 	removeobject 6
 	removeobject 7
@@ -66,14 +66,14 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	setflag FLAG_MET_TEAM_AQUA_HARBOR
 	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
-	call_if_eq SlateportCity_Harbor_EventScript_20CA89
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq SlateportCity_Harbor_EventScript_20CA9E
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq SlateportCity_Harbor_EventScript_20CAB3
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer
 	compare VAR_0x8008, 3
-	call_if_eq SlateportCity_Harbor_EventScript_20CAB3
-	msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer
+	msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
@@ -82,42 +82,43 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	releaseall
 	end
 
-SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE0
+SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE6
+SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
-	applymovement 4, SlateportCity_Harbor_Movement_20CAEB
+SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8
+SlateportCity_Harbor_Movement_AquaBoardSub: @ 820CAC8
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
 	step_end
 
-SlateportCity_Harbor_Movement_20CACD: @ 820CACD
+@ Unused, Archie instead shares above identical movement script with Grunt
+SlateportCity_Harbor_Movement_ArchieBoardSub: @ 820CACD
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
 	step_end
 
-SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
+SlateportCity_Harbor_Movement_SubmarineExit: @ 820CAD2
 	delay_16
 	delay_16
 	delay_16
@@ -133,7 +134,7 @@ SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
 	walk_fast_right
 	step_end
 
-SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
+SlateportCity_Harbor_Movement_SternApproachPlayer0: @ 820CAE0
 	walk_left
 	walk_left
 	walk_left
@@ -141,305 +142,305 @@ SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
 	walk_up
 	step_end
 
-SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
+SlateportCity_Harbor_Movement_SternApproachPlayer1: @ 820CAE6
 	walk_left
 	walk_left
 	walk_up
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
+SlateportCity_Harbor_Movement_SternApproachPlayer: @ 820CAEB
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
+SlateportCity_Harbor_Movement_PlayerWalkUp: @ 820CAEF
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1
+SlateportCity_Harbor_EventScript_FerryAttendant:: @ 820CAF1
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CB06
-	msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_AskForTicket
+	msgbox SlateportCity_Harbor_Text_FerryServiceUnavailable, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06
-	msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT
-	message SlateportCity_Harbor_Text_20CF1C
+SlateportCity_Harbor_EventScript_AskForTicket:: @ 820CB06
+	msgbox SlateportCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
+	message SlateportCity_Harbor_Text_FlashedTicketWhereTo
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
+	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
-	goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50
+SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
+	goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier
 	multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CC2D
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D
+	case 0, SlateportCity_Harbor_EventScript_Lilycove
+	case 1, SlateportCity_Harbor_EventScript_CancelDestinationSelect
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect
 	end
 
-SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50
+SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50
 	multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CBBA
-	case 2, SlateportCity_Harbor_EventScript_20CC2D
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D
+	case 0, SlateportCity_Harbor_EventScript_Lilycove
+	case 1, SlateportCity_Harbor_EventScript_BattleFrontier
+	case 2, SlateportCity_Harbor_EventScript_CancelDestinationSelect
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect
 	end
 
-SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88
-	msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT
+@ Unused. Should be impossible for player to reach Ferry without having received SS Tidal ticket
+SlateportCity_Harbor_EventScript_NoTicket:: @ 820CB88
+	msgbox SlateportCity_Harbor_Text_YouMustHaveTicket, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
-	msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_20CBDD
-	setvar VAR_PORTHOLE_STATE, 1
-	call SlateportCity_Harbor_EventScript_20CBE9
+SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
+	msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT
+	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA
-	msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_20CBDD
-	call SlateportCity_Harbor_EventScript_20CBE9
+SlateportCity_Harbor_EventScript_BattleFrontier:: @ 820CBBA
+	msgbox SlateportCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
+	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
 	waitstate
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
-	message SlateportCity_Harbor_Text_20CFFA
+SlateportCity_Harbor_EventScript_ChooseNewDestination:: @ 820CBDD
+	message SlateportCity_Harbor_Text_WhereWouldYouLikeToGo
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
+	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
-	msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9
+	msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SlateportCity_Harbor_EventScript_20CC42
+	call_if_eq SlateportCity_Harbor_EventScript_BoardFerryNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SlateportCity_Harbor_EventScript_20CC37
+	call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast
 	delay 30
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 5
 	call Common_EventScript_FerryDepart
 	return
 
-SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D
-	msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D
+	msgbox SlateportCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC4D
+SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC50
+SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D
+SlateportCity_Harbor_Movement_BoardFerryEast: @ 820CC4D
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Harbor_Movement_20CC50: @ 820CC50
+SlateportCity_Harbor_Movement_BoardFerryNorth: @ 820CC50
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52
+SlateportCity_Harbor_EventScript_Sailor:: @ 820CC52
 	lock
 	faceplayer
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_20CC93
-	call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_20CC93
-	compare VAR_0x8004, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_20CC89
-	msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT
+	call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_CountDefeatedLegendary
+	call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_CountDefeatedLegendary
+	compare VAR_0x8004, 2  @ Defeated both
+	goto_if_eq SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather
+	msgbox SlateportCity_Harbor_Text_AbnormalWeather, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89
-	msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather:: @ 820CC89
+	msgbox SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93
+SlateportCity_Harbor_EventScript_CountDefeatedLegendary:: @ 820CC93
 	addvar VAR_0x8004, 1
 	return
 
-SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99
-	msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC
+SlateportCity_Harbor_EventScript_FatMan:: @ 820CC99
+	msgbox SlateportCity_Harbor_Text_SubTooSmallForMe, MSGBOX_NPC
 	end
 
-SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
+SlateportCity_Harbor_EventScript_CaptStern:: @ 820CCA2
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_NeedDive
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive
 	compare VAR_SLATEPORT_HARBOR_STATE, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_20CCDF
-	msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT
+	goto_if_eq SlateportCity_Harbor_EventScript_WhyStealSubmarine
+	msgbox SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF
-	msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_WhyStealSubmarine:: @ 820CCDF
+	msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9
+SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive:: @ 820CCE9
 	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_TeamAquaLeftNeedDive, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6
-	msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_NeedDive:: @ 820CCF6
+	msgbox SlateportCity_Harbor_Text_NeedDiveToCatchSub, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00
+SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 820CD00
 	compare VAR_TEMP_1, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE11
+	goto_if_eq SlateportCity_Harbor_EventScript_TradedScanner
 	checkitem ITEM_SCANNER, 1
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_20CD38
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CD2E
-	msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_Harbor_EventScript_AskToTradeScanner
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_FerryFinished
+	msgbox SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E
-	msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_FerryFinished:: @ 820CD2E
+	msgbox SlateportCity_Harbor_Text_FinishedMakingFerry, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38
-	message SlateportCity_Harbor_Text_20D76C
+SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 820CD38
+	message SlateportCity_Harbor_Text_WouldYouTradeScanner
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
+	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44
+SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44
 	multichoice 0, 0, MULTI_STERN_DEEPSEA, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CD7B
-	case 1, SlateportCity_Harbor_EventScript_20CDBB
-	case 2, SlateportCity_Harbor_EventScript_20CDFB
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CDFB
+	case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth
+	case 1, SlateportCity_Harbor_EventScript_DeepSeaScale
+	case 2, SlateportCity_Harbor_EventScript_DeclineTrade
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_DeclineTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
-	msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
+SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B
+	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
 	giveitem_std ITEM_DEEP_SEA_TOOTH
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_20CE11
+	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
-	msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
+SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB
+	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
 	giveitem_std ITEM_DEEP_SEA_SCALE
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_20CE11
+	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB
-	msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_DeclineTrade:: @ 820CDFB
+	msgbox SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05
-	message SlateportCity_Harbor_Text_20D926
+SlateportCity_Harbor_EventScript_ChooseDifferentTrade:: @ 820CE05
+	message SlateportCity_Harbor_Text_WhichOneDoYouWant
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
+	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11
+SlateportCity_Harbor_EventScript_TradedScanner:: @ 820CE11
 	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_ThisWillHelpResearch, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_Text_20CE20: @ 820CE20
+SlateportCity_Harbor_Text_FerryServiceUnavailable: @ 820CE20
 	.string "I beg your pardon?\n"
 	.string "You're looking for a ship?\p"
 	.string "I'm sorry, the ferry service isn't\n"
 	.string "available at present…$"
 
-SlateportCity_Harbor_Text_20CE87: @ 820CE87
+SlateportCity_Harbor_Text_MayISeeYourTicket: @ 820CE87
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-
-SlateportCity_Harbor_Text_20CEC1: @ 820CEC1
+SlateportCity_Harbor_Text_YouMustHaveTicket: @ 820CEC1
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-SlateportCity_Harbor_Text_20CF1C: @ 820CF1C
+SlateportCity_Harbor_Text_FlashedTicketWhereTo: @ 820CF1C
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-SlateportCity_Harbor_Text_20CF71: @ 820CF71
+SlateportCity_Harbor_Text_SailAnotherTime: @ 820CF71
 	.string "Please sail with us another time!$"
 
-SlateportCity_Harbor_Text_20CF93: @ 820CF93
+SlateportCity_Harbor_Text_LilycoveItIs: @ 820CF93
 	.string "LILYCOVE CITY it is, then!$"
 
-SlateportCity_Harbor_Text_20CFAE: @ 820CFAE
+SlateportCity_Harbor_Text_BattleFrontierItIs: @ 820CFAE
 	.string "BATTLE FRONTIER it is, then!$"
 
-SlateportCity_Harbor_Text_20CFCB: @ 820CFCB
+SlateportCity_Harbor_Text_PleaseBoardFerry: @ 820CFCB
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-SlateportCity_Harbor_Text_20CFFA: @ 820CFFA
+SlateportCity_Harbor_Text_WhereWouldYouLikeToGo: @ 820CFFA
 	.string "Then, where would you like to go?$"
 
-SlateportCity_Harbor_Text_20D01C: @ 820D01C
+SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday: @ 820D01C
 	.string "A journey to the bottom of the sea…\n"
 	.string "I wonder what it'd be like?\p"
 	.string "I'd love to go deep underwater like\n"
 	.string "that someday.$"
 
-SlateportCity_Harbor_Text_20D08E: @ 820D08E
+SlateportCity_Harbor_Text_AbnormalWeather: @ 820D08E
 	.string "For a ship to sail safely, we need to\n"
 	.string "know about the weather!\p"
 	.string "Speaking of weather, I heard something\n"
@@ -449,19 +450,19 @@ SlateportCity_Harbor_Text_20D08E: @ 820D08E
 	.string "You should visit the WEATHER INSTITUTE\n"
 	.string "and ask around!$"
 
-SlateportCity_Harbor_Text_20D194: @ 820D194
+SlateportCity_Harbor_Text_SubTooSmallForMe: @ 820D194
 	.string "I wanted to go with CAPT. STERN on\n"
 	.string "the ocean floor exploration.\p"
 	.string "But the sub's too small for me.\p"
 	.string "If I squeezed in, there wouldn't be\n"
 	.string "any room for the CAPTAIN…$"
 
-SlateportCity_Harbor_Text_20D232: @ 820D232
+SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum: @ 820D232
 	.string "CAPT. STERN: Those thugs…\p"
 	.string "They're the same lot who tried to rob\n"
 	.string "the DEVON GOODS at the MUSEUM.$"
 
-SlateportCity_Harbor_Text_20D291: @ 820D291
+SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove: @ 820D291
 	.string "ARCHIE: Oh?\n"
 	.string "Not you again…\p"
 	.string "You are tenacious to track us here,\n"
@@ -472,7 +473,7 @@ SlateportCity_Harbor_Text_20D291: @ 820D291
 	.string "HIDEOUT in LILYCOVE CITY?\p"
 	.string "Fwahahahaha…$"
 
-SlateportCity_Harbor_Text_20D35A: @ 820D35A
+SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine: @ 820D35A
 	.string "CAPT. STERN: Why…\p"
 	.string "Why would TEAM AQUA steal my\n"
 	.string "SUBMARINE EXPLORER 1?\p"
@@ -481,7 +482,7 @@ SlateportCity_Harbor_Text_20D35A: @ 820D35A
 	.string "But even if I were to chase them,\n"
 	.string "I don't stand a chance against them…$"
 
-SlateportCity_Harbor_Text_20D42B: @ 820D42B
+SlateportCity_Harbor_Text_TeamAquaLeftNeedDive: @ 820D42B
 	.string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p"
 	.string "Okay… So TEAM AQUA left before you\n"
 	.string "could stop them…\p"
@@ -496,7 +497,7 @@ SlateportCity_Harbor_Text_20D42B: @ 820D42B
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_20D58A: @ 820D58A
+SlateportCity_Harbor_Text_NeedDiveToCatchSub: @ 820D58A
 	.string "CAPT. STERN: Trying to catch a\n"
 	.string "submarine… It's impossible.\p"
 	.string "You would need a POKéMON that knows\n"
@@ -506,13 +507,13 @@ SlateportCity_Harbor_Text_20D58A: @ 820D58A
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_20D65C: @ 820D65C
+SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry: @ 820D65C
 	.string "CAPT. STERN: Oh, yes.\n"
 	.string "MR. BRINEY came to our SHIPYARD.\p"
 	.string "It won't be long now before we finish\n"
 	.string "making the ferry!$"
 
-SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
+SlateportCity_Harbor_Text_FinishedMakingFerry: @ 820D6CB
 	.string "CAPT. STERN: {PLAYER}{KUN}!\p"
 	.string "We finally finished making the ferry\n"
 	.string "S.S. TIDAL!\p"
@@ -520,7 +521,7 @@ SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
 	.string "your friend MR. BRINEY.\p"
 	.string "Please go for a short cruise on it!$"
 
-SlateportCity_Harbor_Text_20D76C: @ 820D76C
+SlateportCity_Harbor_Text_WouldYouTradeScanner: @ 820D76C
 	.string "CAPT. STERN: Oh?\n"
 	.string "{PLAYER}{KUN}, that item you have…\p"
 	.string "That's a SCANNER! That would sure\n"
@@ -530,27 +531,27 @@ SlateportCity_Harbor_Text_20D76C: @ 820D76C
 	.string "Like, say, a DEEPSEATOOTH or\n"
 	.string "a DEEPSEASCALE that I have?$"
 
-SlateportCity_Harbor_Text_20D841: @ 820D841
+SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow: @ 820D841
 	.string "CAPT. STERN: Are you certain?\n"
 	.string "It's useless to you, {PLAYER}{KUN}…\p"
 	.string "Well, okay, then. If you want to trade\n"
 	.string "your SCANNER, let me know.$"
 
-SlateportCity_Harbor_Text_20D8BC: @ 820D8BC
+SlateportCity_Harbor_Text_TradeForDeepSeaTooth: @ 820D8BC
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEATOOTH?$"
 
-SlateportCity_Harbor_Text_20D8F1: @ 820D8F1
+SlateportCity_Harbor_Text_TradeForDeepSeaScale: @ 820D8F1
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEASCALE?$"
 
-SlateportCity_Harbor_Text_20D926: @ 820D926
+SlateportCity_Harbor_Text_WhichOneDoYouWant: @ 820D926
 	.string "CAPT. STERN: Which one do you want?$"
 
-SlateportCity_Harbor_Text_20D94A: @ 820D94A
+SlateportCity_Harbor_Text_HandedScannerToStern: @ 820D94A
 	.string "{PLAYER} handed the SCANNER to\n"
 	.string "CAPT. STERN.$"
 
-SlateportCity_Harbor_Text_20D970: @ 820D970
+SlateportCity_Harbor_Text_ThisWillHelpResearch: @ 820D970
 	.string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n"
 	.string "This will help our research a lot!$"
diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House/map.json
index a6a686cf7..9052e19b1 100644
--- a/data/maps/SlateportCity_House2/map.json
+++ b/data/maps/SlateportCity_House/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SLATEPORT_CITY_HOUSE2",
-  "name": "SlateportCity_House2",
+  "id": "MAP_SLATEPORT_CITY_HOUSE",
+  "name": "SlateportCity_House",
   "layout": "LAYOUT_HOUSE2",
   "music": "MUS_FINECITY",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House2_EventScript_20D9AF",
+      "script": "SlateportCity_House_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House2_EventScript_20D9B8",
+      "script": "SlateportCity_House_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_House/scripts.inc b/data/maps/SlateportCity_House/scripts.inc
new file mode 100644
index 000000000..13b0caf91
--- /dev/null
+++ b/data/maps/SlateportCity_House/scripts.inc
@@ -0,0 +1,23 @@
+SlateportCity_House_MapScripts:: @ 820D9AE
+	.byte 0
+
+SlateportCity_House_EventScript_PokefanM:: @ 820D9AF
+	msgbox SlateportCity_House_Text_NatureToDoWithStatGains, MSGBOX_NPC
+	end
+
+SlateportCity_House_EventScript_Girl:: @ 820D9B8
+	msgbox SlateportCity_House_Text_MustBeGoingToBattleTent, MSGBOX_NPC
+	end
+
+SlateportCity_House_Text_NatureToDoWithStatGains: @ 820D9C1
+	.string "My POKéMON has a HASTY nature.\p"
+	.string "It has higher SPEED compared to\n"
+	.string "my other POKéMON.\p"
+	.string "Maybe their nature has something to\n"
+	.string "do with the stat gains of POKéMON.$"
+
+SlateportCity_House_Text_MustBeGoingToBattleTent: @ 820DA59
+	.string "You're a TRAINER, aren't you?\p"
+	.string "Since you came to SLATEPORT CITY,\n"
+	.string "you must be going to the BATTLE TENT.$"
+
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
deleted file mode 100644
index 1203c2333..000000000
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-SlateportCity_House1_MapScripts:: @ 8209AA4
-	.byte 0
-
-SlateportCity_House1_EventScript_209AA5:: @ 8209AA5
-	lock
-	faceplayer
-	msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209AC6
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209AC6:: @ 8209AC6
-	msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT
-	special sub_81B94B0
-	waitstate
-	compare VAR_0x8004, 255
-	goto_if_ne SlateportCity_House1_EventScript_209AF3
-	compare VAR_0x8004, 255
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209AE9:: @ 8209AE9
-	msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
-	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, SPECIES_EGG
-	goto_if_eq SlateportCity_House1_EventScript_209B46
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	special TV_CheckMonOTIDEqualsPlayerID
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B50
-	specialvar VAR_RESULT, MonOTNameMatchesPlayer
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B50
-	msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B5A
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209B46:: @ 8209B46
-	msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B50:: @ 8209B50
-	msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B5A:: @ 8209B5A
-	msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT
-	call Common_EventScript_NameReceivedPartyMon
-	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B84
-	msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B84:: @ 8209B84
-	msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_Text_209B8E: @ 8209B8E
-	.string "Hi, hi! I'm the NAME RATER!\n"
-	.string "I'm the fortune-teller of names!\p"
-	.string "I shall be pleased to rate your\n"
-	.string "POKéMON's nickname.$"
-
-SlateportCity_House1_Text_209BFF: @ 8209BFF
-	.string "Which POKéMON's nickname should\n"
-	.string "I critique?$"
-
-SlateportCity_House1_Text_209C2B: @ 8209C2B
-	.string "Hmmm… {STR_VAR_1}, is it? That is\n"
-	.string "quite a fine name you bestowed.\p"
-	.string "But! What say you, if I were to\n"
-	.string "suggest a slightly better name?$"
-
-SlateportCity_House1_Text_209CA4: @ 8209CA4
-	.string "Ah, good. Then, what shall the new\n"
-	.string "nickname be?$"
-
-SlateportCity_House1_Text_209CD4: @ 8209CD4
-	.string "Done! From now on, this POKéMON\n"
-	.string "shall be known as {STR_VAR_1}!\p"
-	.string "It is a better name than before!\n"
-	.string "How fortunate for you!$"
-
-SlateportCity_House1_Text_209D42: @ 8209D42
-	.string "I see.\n"
-	.string "Do come visit again.$"
-
-SlateportCity_House1_Text_209D5E: @ 8209D5E
-	.string "Done! From now on, this POKéMON\n"
-	.string "shall be known as {STR_VAR_1}!\p"
-	.string "It looks no different from before,\n"
-	.string "and yet, this is vastly superior!\p"
-	.string "How fortunate for you!$"
-
-SlateportCity_House1_Text_209DF0: @ 8209DF0
-	.string "Hmmm… {STR_VAR_1} it is!\p"
-	.string "This is a magnificent nickname!\n"
-	.string "It is impeccably beyond reproach!\p"
-	.string "You'll do well to cherish your\n"
-	.string "{STR_VAR_1} now and beyond.$"
-
-SlateportCity_House1_Text_209E74: @ 8209E74
-	.string "Now, now.\n"
-	.string "That is merely an EGG!$"
-
diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc
deleted file mode 100644
index 1661d8fc5..000000000
--- a/data/maps/SlateportCity_House2/scripts.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SlateportCity_House2_MapScripts:: @ 820D9AE
-	.byte 0
-
-SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF
-	msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC
-	end
-
-SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8
-	msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC
-	end
-
-SlateportCity_House2_Text_20D9C1: @ 820D9C1
-	.string "My POKéMON has a HASTY nature.\p"
-	.string "It has higher SPEED compared to\n"
-	.string "my other POKéMON.\p"
-	.string "Maybe their nature has something to\n"
-	.string "do with the stat gains of POKéMON.$"
-
-SlateportCity_House2_Text_20DA59: @ 820DA59
-	.string "You're a TRAINER, aren't you?\p"
-	.string "Since you came to SLATEPORT CITY,\n"
-	.string "you must be going to the BATTLE TENT.$"
-
diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json
index 597abbf06..ca1c23717 100644
--- a/data/maps/SlateportCity_Mart/map.json
+++ b/data/maps/SlateportCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC49",
+      "script": "SlateportCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC76",
+      "script": "SlateportCity_Mart_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC7F",
+      "script": "SlateportCity_Mart_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc
index 63042338b..a1c557ad2 100644
--- a/data/maps/SlateportCity_Mart/scripts.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
@@ -1,17 +1,17 @@
 SlateportCity_Mart_MapScripts:: @ 820DC48
 	.byte 0
 
-SlateportCity_Mart_EventScript_20DC49:: @ 820DC49
+SlateportCity_Mart_EventScript_Clerk:: @ 820DC49
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SlateportCity_Mart_Pokemart_20DC60
+	pokemart SlateportCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Mart_Pokemart_20DC60: @ 820DC60
+SlateportCity_Mart_Pokemart: @ 820DC60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
@@ -25,21 +25,21 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60
 	release
 	end
 
-SlateportCity_Mart_EventScript_20DC76:: @ 820DC76
-	msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC
+SlateportCity_Mart_EventScript_BlackBelt:: @ 820DC76
+	msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F
-	msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC
+SlateportCity_Mart_EventScript_Man:: @ 820DC7F
+	msgbox SlateportCity_Mart_Text_GreatBallIsBetter, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_Text_20DC88: @ 820DC88
+SlateportCity_Mart_Text_SomeItemsOnlyAtMart: @ 820DC88
 	.string "The MARKET does have some interesting\n"
 	.string "merchandise.\p"
 	.string "But there are some items you can only\n"
 	.string "get at a POKéMON MART.$"
 
-SlateportCity_Mart_Text_20DCF8: @ 820DCF8
+SlateportCity_Mart_Text_GreatBallIsBetter: @ 820DCF8
 	.string "A GREAT BALL is better than a POKé BALL\n"
 	.string "at catching POKéMON.\p"
 	.string "With this, I should be able to get that\n"
diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json
index 47943e517..1e464b9fd 100644
--- a/data/maps/SlateportCity_House1/map.json
+++ b/data/maps/SlateportCity_NameRatersHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SLATEPORT_CITY_HOUSE1",
-  "name": "SlateportCity_House1",
+  "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
+  "name": "SlateportCity_NameRatersHouse",
   "layout": "LAYOUT_HOUSE_WITH_BED",
   "music": "MUS_FINECITY",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House1_EventScript_209AA5",
+      "script": "SlateportCity_NameRatersHouse_EventScript_NameRater",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_NameRatersHouse/scripts.inc b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
new file mode 100644
index 000000000..92c6b7a02
--- /dev/null
+++ b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
@@ -0,0 +1,121 @@
+SlateportCity_NameRatersHouse_MapScripts:: @ 8209AA4
+	.byte 0
+
+SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 8209AA5
+	lock
+	faceplayer
+	msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 8209AC6
+	msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT
+	special ChoosePartyMon
+	waitstate
+	compare VAR_0x8004, 255
+	goto_if_ne SlateportCity_NameRatersHouse_EventScript_RateMonNickname
+	compare VAR_0x8004, 255
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_DeclineNameRate:: @ 8209AE9
+	msgbox SlateportCity_NameRatersHouse_Text_DoVisitAgain, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 8209AF3
+	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
+	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg
+	special BufferMonNickname
+	special IsMonOTIDNotPlayers
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
+	specialvar VAR_RESULT, MonOTNameNotPlayer
+	special BufferMonNickname
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
+	msgbox SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChangeNickname
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_CantRateEgg:: @ 8209B46
+	msgbox SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT:: @ 8209B50
+	msgbox SlateportCity_NameRatersHouse_Text_MagnificentName, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8209B5A
+	msgbox SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe, MSGBOX_DEFAULT
+	call Common_EventScript_NameReceivedPartyMon
+	specialvar VAR_RESULT, TryPutNameRaterShowOnTheAir
+	special BufferMonNickname
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_NewNameDifferent
+	msgbox SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_NewNameDifferent:: @ 8209B84
+	msgbox SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname: @ 8209B8E
+	.string "Hi, hi! I'm the NAME RATER!\n"
+	.string "I'm the fortune-teller of names!\p"
+	.string "I shall be pleased to rate your\n"
+	.string "POKéMON's nickname.$"
+
+SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname: @ 8209BFF
+	.string "Which POKéMON's nickname should\n"
+	.string "I critique?$"
+
+SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne: @ 8209C2B
+	.string "Hmmm… {STR_VAR_1}, is it? That is\n"
+	.string "quite a fine name you bestowed.\p"
+	.string "But! What say you, if I were to\n"
+	.string "suggest a slightly better name?$"
+
+SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe: @ 8209CA4
+	.string "Ah, good. Then, what shall the new\n"
+	.string "nickname be?$"
+
+SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName: @ 8209CD4
+	.string "Done! From now on, this POKéMON\n"
+	.string "shall be known as {STR_VAR_1}!\p"
+	.string "It is a better name than before!\n"
+	.string "How fortunate for you!$"
+
+SlateportCity_NameRatersHouse_Text_DoVisitAgain: @ 8209D42
+	.string "I see.\n"
+	.string "Do come visit again.$"
+
+SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior: @ 8209D5E
+	.string "Done! From now on, this POKéMON\n"
+	.string "shall be known as {STR_VAR_1}!\p"
+	.string "It looks no different from before,\n"
+	.string "and yet, this is vastly superior!\p"
+	.string "How fortunate for you!$"
+
+SlateportCity_NameRatersHouse_Text_MagnificentName: @ 8209DF0
+	.string "Hmmm… {STR_VAR_1} it is!\p"
+	.string "This is a magnificent nickname!\n"
+	.string "It is impeccably beyond reproach!\p"
+	.string "You'll do well to cherish your\n"
+	.string "{STR_VAR_1} now and beyond.$"
+
+SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg: @ 8209E74
+	.string "Now, now.\n"
+	.string "That is merely an EGG!$"
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
index eefb843f4..87fc0f6ee 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883",
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_Reporter",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     }
   ],
@@ -228,7 +228,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
       "var_value": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft"
     },
     {
       "type": "trigger",
@@ -237,7 +237,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
       "var_value": "0",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight"
     }
   ],
   "bg_events": [
@@ -247,7 +247,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment"
     },
     {
       "type": "sign",
@@ -255,7 +255,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment"
     },
     {
       "type": "sign",
@@ -263,7 +263,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay"
     },
     {
       "type": "sign",
@@ -271,7 +271,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay"
     },
     {
       "type": "sign",
@@ -279,7 +279,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay"
     },
     {
       "type": "sign",
@@ -287,7 +287,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay"
     },
     {
       "type": "sign",
@@ -295,7 +295,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1"
     },
     {
       "type": "sign",
@@ -303,7 +303,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2"
     },
     {
       "type": "sign",
@@ -311,7 +311,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3"
     },
     {
       "type": "sign",
@@ -319,7 +319,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay"
     },
     {
       "type": "sign",
@@ -327,7 +327,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay"
     },
     {
       "type": "sign",
@@ -335,7 +335,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine"
     },
     {
       "type": "sign",
@@ -343,7 +343,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB"
+      "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index f0a4305c1..a6e6541da 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -1,155 +1,147 @@
 SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95
 	.byte 0
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96
+	msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
+	goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
+	goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
 	showmoneybox 0, 0, 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8
+	msgbox SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee
 	closemessage
 	hidemoneybox
-	nop
-	nop
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
+SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
 	checkmoney 50, 0
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney
 	playse SE_REGI
 	takemoney 50, 0
 	updatemoneybox 0, 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
-	nop
-	nop
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
-	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_20AE39
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway
+	msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	closemessage
 	hidemoneybox
-	nop
-	nop
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39
+	msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
-	nop
-	nop
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B
+SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter: @ 820AE4B
 	walk_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1:: @ 820AE4D
+	msgbox SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2:: @ 820AE56
+	msgbox SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3:: @ 820AE5F
+	msgbox SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4:: @ 820AE68
+	msgbox SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5:: @ 820AE71
+	msgbox SlateportCity_OceanicMuseum_1F_Text_RustboroBungled, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6:: @ 820AE7A
+	msgbox SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment:: @ 820AE83
+	msgbox SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment:: @ 820AE8C
+	msgbox SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay:: @ 820AE95
+	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay:: @ 820AE9E
+	msgbox SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1:: @ 820AEA7
+	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2:: @ 820AEB0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3:: @ 820AEB9
+	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay:: @ 820AEC2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_FossilDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine:: @ 820AECB
+	msgbox SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1:: @ 820AED4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2:: @ 820AEDD
+	msgbox SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3:: @ 820AEE6
+	msgbox SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4:: @ 820AEEF
+	msgbox SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
 	lock
 	faceplayer
 	delay 8
@@ -158,68 +150,68 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
 	waitmovement 0
 	applymovement 13, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM46
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief
 	setflag FLAG_RECEIVED_TM46
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth
 	compare VAR_FACING, DIR_WEST
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast
 	compare VAR_FACING, DIR_EAST
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFBF
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth
 	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
 	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFC4
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
 	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
 	playse SE_KAIDAN
 	removeobject 13
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief:: @ 820AFB5
+	msgbox SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF
+SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth: @ 820AFBF
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4
+SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast: @ 820AFC4
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7
+SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit: @ 820AFC7
 	face_down
 	walk_fast_down
 	walk_fast_down
@@ -228,7 +220,7 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE
+SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth: @ 820AFCE
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -237,71 +229,71 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5
+SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter: @ 820AFD5
 	.string "Welcome to the OCEANIC MUSEUM.\p"
 	.string "The entrance fee is ¥50.\n"
 	.string "Would you like to enter?$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026
+SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself: @ 820B026
 	.string "Please enjoy yourself.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D
+SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney: @ 820B03D
 	.string "Oh? I'm sorry, but you don't seem to\n"
 	.string "have enough money.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075
+SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup: @ 820B075
 	.string "Oh? You're with that group that\n"
 	.string "went in earlier?\p"
 	.string "You're the only one who's late.\n"
 	.string "You'd better go catch up to them!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8
+SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll: @ 820B0E8
 	.string "We, TEAM AQUA, exist for the good\n"
 	.string "of all!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112
+SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere: @ 820B112
 	.string "We were told to assemble here,\n"
 	.string "so we did, but…\p"
 	.string "Our BOSS, the linchpin, isn't here.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165
+SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich: @ 820B165
 	.string "If I ripped off the stuff here,\n"
 	.string "would it make me rich?$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C
+SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds: @ 820B19C
 	.string "What I learn here, I can put to use on\n"
 	.string "nefarious deeds…$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4
+SlateportCity_OceanicMuseum_1F_Text_RustboroBungled: @ 820B1D4
 	.string "If our goons didn't bungle things\n"
 	.string "in RUSTBORO, we wouldn't be here!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218
+SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney: @ 820B218
 	.string "I didn't have ¥50, so it took a long\n"
 	.string "time getting by the receptionist.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F
+SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling: @ 820B25F
 	.string "I want to learn about the sea and\n"
 	.string "use that knowledge for battling.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2
+SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel: @ 820B2A2
 	.string "I get all giddy and gooey when\n"
 	.string "I see the sea!\p"
 	.string "For me, CAPT. STERN is the number\n"
 	.string "one role model!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302
+SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow: @ 820B302
 	.string "The sea is vast without end, and\n"
 	.string "infinitely deep…\p"
 	.string "There must be many POKéMON that\n"
 	.string "we don't know about.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369
+SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon: @ 820B369
 	.string "I want a sea POKéMON.\p"
 	.string "I think it would feel cool and nice\n"
 	.string "to hug.$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB
+SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis: @ 820B3AB
 	.string "Aiyeeeh!\n"
 	.string "What are you doing here?\p"
 	.string "Me? I'm the TEAM AQUA member\n"
@@ -310,29 +302,29 @@ SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB
 	.string "Here, take this!\n"
 	.string "You have to forgive me!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449
+SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain: @ 820B449
 	.string "That TM, it suits you more than it\n"
 	.string "does me.\p"
 	.string "Hope I never see you again!\n"
 	.string "Wahahaha!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B
+SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis: @ 820B49B
 	.string "Awww, come on!\n"
 	.string "You have to take this and let me go!$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF
+SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment: @ 820B4CF
 	.string "A blue fluid is spiraling inside\n"
 	.string "a glass vessel.\p"
 	.string "“This is an experiment to create a\n"
 	.string "WHIRLPOOL artificially using wind.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547
+SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment: @ 820B547
 	.string "A red ball is bobbing up and down\n"
 	.string "inside a glass vessel.\p"
 	.string "“This is an experiment simulating a\n"
 	.string "WATERFALL using the ball's buoyancy.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA
+SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay: @ 820B5CA
 	.string "It's a sample of soil from the ocean\n"
 	.string "floor.\p"
 	.string "“Over many years, the remains of\n"
@@ -341,7 +333,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA
 	.string "“By analyzing these layers, the\n"
 	.string "ancient past is revealed.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699
+SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay: @ 820B699
 	.string "It's a sample of beach sand.\p"
 	.string "“Stones from mountains are washed\n"
 	.string "down by rivers where they are\l"
@@ -349,7 +341,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699
 	.string "“They are reduced to grains and end\n"
 	.string "up as sand on beaches.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1: @ 820B74B
 	.string "“OCEANIC MINIFACT 1\n"
 	.string "Why is seawater blue?\p"
 	.string "“Light is composed of many colors.\p"
@@ -358,7 +350,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B
 	.string "“However, blue light retains its\n"
 	.string "color, making the sea appear blue.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2: @ 820B81F
 	.string "“OCEANIC MINIFACT 2\n"
 	.string "Why is the sea salty?\p"
 	.string "“Seawater contains dissolved salt in\n"
@@ -368,7 +360,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F
 	.string "“The concentration of dissolved salt\n"
 	.string "makes the sea salty.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3: @ 820B912
 	.string "“OCEANIC MINIFACT 3\n"
 	.string "Which is bigger? The sea or land?\p"
 	.string "“The sea covers about 70% of\n"
@@ -376,7 +368,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912
 	.string "“The sea is therefore more than twice\n"
 	.string "the size of land.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0
+SlateportCity_OceanicMuseum_1F_Text_FossilDisplay: @ 820B9C0
 	.string "It's a fossil with wavy ridges on it.\p"
 	.string "“Soil on the ocean floor gets scoured\n"
 	.string "by the tide.\p"
@@ -385,7 +377,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0
 	.string "“If this soil becomes fossilized, it is\n"
 	.string "called a ripple mark.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C
+SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine: @ 820BA9C
 	.string "A strange machine is rotating under\n"
 	.string "a glass dome.\p"
 	.string "Maybe it's for measuring the depth\n"
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
index 6eaecba97..0c45541e4 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_CaptStern",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76",
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3",
       "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
     }
   ],
@@ -123,7 +123,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1"
     },
     {
       "type": "sign",
@@ -131,7 +131,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2"
     },
     {
       "type": "sign",
@@ -139,7 +139,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica"
     },
     {
       "type": "sign",
@@ -147,7 +147,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica"
     },
     {
       "type": "sign",
@@ -155,7 +155,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica"
     },
     {
       "type": "sign",
@@ -163,7 +163,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica"
     },
     {
       "type": "sign",
@@ -171,7 +171,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica"
     },
     {
       "type": "sign",
@@ -179,7 +179,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica"
     },
     {
       "type": "sign",
@@ -187,7 +187,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica"
     },
     {
       "type": "sign",
@@ -195,7 +195,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica"
     },
     {
       "type": "sign",
@@ -203,7 +203,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica"
     },
     {
       "type": "sign",
@@ -211,7 +211,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay"
     },
     {
       "type": "sign",
@@ -219,7 +219,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay"
     },
     {
       "type": "sign",
@@ -227,7 +227,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay"
     },
     {
       "type": "sign",
@@ -235,7 +235,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay"
     },
     {
       "type": "sign",
@@ -243,7 +243,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel"
     },
     {
       "type": "sign",
@@ -251,7 +251,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel"
     },
     {
       "type": "sign",
@@ -259,7 +259,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment"
     },
     {
       "type": "sign",
@@ -267,7 +267,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment"
     },
     {
       "type": "sign",
@@ -275,7 +275,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica"
     },
     {
       "type": "sign",
@@ -283,7 +283,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40"
+      "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index ab47c1dea..9facd0937 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -1,63 +1,63 @@
 SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF
 	.byte 0
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
+SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	lock
 	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_AQA_0, 1
 	addobject 3
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter
 	waitmovement 0
 	addobject 4
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter
 	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach
 	waitmovement 0
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts
+	msgbox SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts, MSGBOX_DEFAULT
 	compare VAR_FACING, DIR_EAST
-	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT
+	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle
 	waitmovement 0
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
-	trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest
+	trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat
+	msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
 	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
+	msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
 	waitmovement 0
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_MeddlingKid, MSGBOX_DEFAULT
 	closemessage
 	delay 35
 	addobject 2
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT
 	closemessage
 	savebgm MUS_DUMMY
 	fadedefaultbgm
@@ -70,10 +70,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_DEVON_GOODS
 	call Common_EventScript_PlayerHandedOverTheItem
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
 	playfanfare MUS_ME_ASA
@@ -82,7 +82,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	removeobject 1
 	setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA
 	compare VAR_REGISTER_BIRCH_STATE, 0
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch
 	setflag FLAG_DELIVERED_DEVON_GOODS
 	clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
@@ -91,37 +91,37 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	release
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
+SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C
 	setvar VAR_REGISTER_BIRCH_STATE, 1
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D
+SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCBE
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCC2
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE
+SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth: @ 820BCBE
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2
+SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
 	walk_up
 	walk_left
 	walk_left
@@ -129,6 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2
 	walk_in_place_fastest_left
 	step_end
 
+@ Unused
 SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
 	walk_up
 	walk_left
@@ -145,11 +146,11 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6
+SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer: @ 820BCD6
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8
+SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter: @ 820BCD8
 	walk_down
 	walk_down
 	walk_down
@@ -161,17 +162,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2
+SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle: @ 820BCE2
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4
+SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter: @ 820BCE4
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8
+SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach: @ 820BCE8
 	walk_down
 	walk_down
 	walk_down
@@ -180,17 +181,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF
+SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated: @ 820BCEF
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3
+SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter: @ 820BCF3
 	walk_down
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5
+SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach: @ 820BCF5
 	walk_down
 	walk_down
 	walk_down
@@ -201,7 +202,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE
+SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie: @ 820BCFE
 	delay_16
 	delay_16
 	delay_16
@@ -215,65 +216,65 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1:: @ 820BD0A
+	msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2:: @ 820BD13
+	msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment:: @ 820BD1C
+	msgbox SlateportCity_OceanicMuseum_2F_Text_PressureExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_HoennModel:: @ 820BD25
+	msgbox SlateportCity_OceanicMuseum_2F_Text_HoennModel, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay:: @ 820BD2E
+	msgbox SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay:: @ 820BD37
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica:: @ 820BD40
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica:: @ 820BD49
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica:: @ 820BD52
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN
+SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica:: @ 820BD5B
+	msgbox SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1:: @ 820BD64
+	msgbox SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2:: @ 820BD6D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 820BD76
 	lock
 	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D
+SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts: @ 820BD8D
 	.string "Yes? If you're looking for STERN,\n"
 	.string "that would be me.\p"
 	.string "Ah! Those must be the parts I ordered\n"
@@ -281,47 +282,47 @@ SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D
 	.string "Thank you! That's great!\n"
 	.string "We can prepare for our expedition now.$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40
+SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts: @ 820BE40
 	.string "Hehehe, hold it!\n"
 	.string "We'll take those parts!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69
+SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou: @ 820BE69
 	.string "CAPT. STERN: Wh-what?\n"
 	.string "Who are you people?$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93
+SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93
 	.string "We're TEAM AQUA!\p"
 	.string "Our BOSS wants those parts!\n"
 	.string "Shut your yap and fork them over!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2
+SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat: @ 820BEE2
 	.string "Awaaaah!\n"
 	.string "A kid beat me!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA
+SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious: @ 820BEFA
 	.string "Oh, man, what a disaster…\n"
 	.string "The BOSS is going to be furious…$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35
+SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35
 	.string "Humph, sniveling wimp!\n"
 	.string "Let me take care of this!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66
+SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat: @ 820BF66
 	.string "What?!\n"
 	.string "I lost, too!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A
+SlateportCity_OceanicMuseum_2F_Text_MeddlingKid: @ 820BF7A
 	.string "Now what? If we don't get the parts,\n"
 	.string "we're in for it!\p"
 	.string "Arrgh, I didn't count on being meddled\n"
 	.string "with by some meddling kid!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2
+SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong: @ 820BFF2
 	.string "I came to see what was taking so\n"
 	.string "long to snatch some parts, and you\l"
 	.string "simps are held up by a mere child?$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059
+SlateportCity_OceanicMuseum_2F_Text_ArchieWarning: @ 820C059
 	.string "We are TEAM AQUA,\n"
 	.string "and we love the sea!\p"
 	.string "And I am TEAM AQUA's leader,\n"
@@ -348,7 +349,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059
 	.string "dearly!\p"
 	.string "And don't you forget it!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE
+SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs: @ 820C2BE
 	.string "CAPT. STERN: You're…\n"
 	.string "Ah, okay, you're {PLAYER}{KUN}…\p"
 	.string "Anyway, that was a tense situation!\n"
@@ -356,7 +357,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE
 	.string "Oh, yes, I almost forgot that you\n"
 	.string "even brought the parts from DEVON!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C
+SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo: @ 820C36C
 	.string "CAPT. STERN: Whoops!\n"
 	.string "There's no time to lose!\p"
 	.string "We have to set out on our ocean-floor\n"
@@ -366,32 +367,32 @@ SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C
 	.string "Feel free to wander around and check\n"
 	.string "out our facilities, though.$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F
+SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip: @ 820C43F
 	.string "I saw a model of a ship here.\p"
 	.string "It reminded me of the ABANDONED SHIP\n"
 	.string "near DEWFORD TOWN…$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495
+SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum: @ 820C495
 	.string "Don't you dare run around inside\n"
 	.string "the MUSEUM!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2
+SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine: @ 820C4C2
 	.string "Wow, the submarine's awesome!\n"
 	.string "I want to go for a ride!$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9
+SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1: @ 820C4F9
 	.string "“WATER QUALITY SAMPLE 1,” the\n"
 	.string "label says.\p"
 	.string "The sea is all connected, but the\n"
 	.string "water seems to differ by region.$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566
+SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2: @ 820C566
 	.string "“WATER QUALITY SAMPLE 2,” the\n"
 	.string "label says.\p"
 	.string "Does the saltiness of seawater differ\n"
 	.string "by region, too?$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6
+SlateportCity_OceanicMuseum_2F_Text_PressureExperiment: @ 820C5C6
 	.string "A rubber ball is expanding and\n"
 	.string "shrinking.\p"
 	.string "“In the sea, the weight of water itself\n"
@@ -402,39 +403,39 @@ SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6
 	.string "the pressure can reach even tens of\l"
 	.string "thousands of tons on a small area.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7
+SlateportCity_OceanicMuseum_2F_Text_HoennModel: @ 820C6C7
 	.string "“MODEL OF HOENN REGION”\p"
 	.string "It's a miniature diorama of the\n"
 	.string "HOENN region.\p"
 	.string "Where is LITTLEROOT TOWN on this?$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F
+SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay: @ 820C72F
 	.string "It's a display on the flow of seawater.\p"
 	.string "“Near the bottom of the sea, water\n"
 	.string "flows due to differences in such\l"
 	.string "factors as temperature and salinity.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1
+SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay: @ 820C7C1
 	.string "It's a display on the flow of seawater.\p"
 	.string "“Toward the surface, seawater flows\n"
 	.string "as currents driven by the winds.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F
+SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica: @ 820C82F
 	.string "“THE FERRY S.S. TIDAL\p"
 	.string "“A scale replica of the ship under\n"
 	.string "construction at STERN'S SHIPYARD.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B
+SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica: @ 820C88B
 	.string "“SUBMARINE EXPLORER 1\p"
 	.string "“A replica of the high-performance\n"
 	.string "ocean floor exploration submarine.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8
+SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica: @ 820C8E8
 	.string "“SUBMERSIBLE POD\p"
 	.string "“A replica of a compact, unmanned\n"
 	.string "pod for seafloor exploration.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A
+SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica: @ 820C93A
 	.string "“S.S. ANNE\p"
 	.string "“A replica of the luxury liner that\n"
 	.string "circles the globe.”$"
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json
index 3e87ae256..4f8cefda9 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/map.json
+++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index f148e5d3f..ba4319cba 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3
+@ VAR_0x800B is the Nurse's object event id
+SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 820DAD3
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,15 +17,15 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3
 	release
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1
-	msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC
+SlateportCity_PokemonCenter_1F_EventScript_Sailor:: @ 820DAE1
+	msgbox SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA
-	msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC
+SlateportCity_PokemonCenter_1F_EventScript_Woman:: @ 820DAEA
+	msgbox SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3
+SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon: @ 820DAF3
 	.string "Want a tip for battling?\p"
 	.string "I'd say it's raising different kinds\n"
 	.string "of POKéMON in a balanced manner.\p"
@@ -33,7 +34,7 @@ SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3
 	.string "If it has a type disadvantage,\n"
 	.string "it might not stand a chance.$"
 
-SlateportCity_PokemonCenter_1F_Text_20DBBC: @ 820DBBC
+SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend: @ 820DBBC
 	.string "I trade POKéMON with my friends.\p"
 	.string "If a traded POKéMON is holding an\n"
 	.string "item, it makes me twice as happy!$"
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json
index faf7e7db2..5e0e0616c 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.json
+++ b/data/maps/SlateportCity_PokemonFanClub/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_28C943",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Reporter",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A17E",
+      "script": "SlateportCity_PokemonFanClub_EventScript_SootheBellWoman",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_209E96",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Chairman",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A20D",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Skitty",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A220",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Azumarill",
       "flag": "0"
     },
     {
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 866bf2963..25de15889 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -1,272 +1,272 @@
 SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95
 	.byte 0
 
-SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
+SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
 	lock
 	faceplayer
-	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152
-	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172
+	goto_if_unset FLAG_ENTERED_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
+	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman
 	switch VAR_SLATEPORT_FAN_CLUB_STATE
-	case 0, SlateportCity_PokemonFanClub_EventScript_209ED2
-	case 1, SlateportCity_PokemonFanClub_EventScript_209EE5
-	case 2, SlateportCity_PokemonFanClub_EventScript_209F3B
+	case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment
+	case 1, SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon
+	case 2, SlateportCity_PokemonFanClub_EventScript_NoMoreScarves
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
+SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment:: @ 8209ED2
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
-	msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_209F45
+	msgbox SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
+SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 8209EE5
 	setvar VAR_TEMP_2, 0
-	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	compare VAR_TEMP_2, 5
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA
+	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	compare VAR_TEMP_2, CONTEST_CATEGORIES_COUNT
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves
 	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B
-	msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_209F45
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoMoreScarves
+	msgbox SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B
-	msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoMoreScarves:: @ 8209F3B
+	msgbox SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
-	msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8209F45
+	msgbox SlateportCity_PokemonFanClub_Text_HmHmISee, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, 0
-	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_20A13B
-	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_20A124
-	call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_20A10D
-	call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0F6
-	call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0DF
+	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonTough
+	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonSmart
+	call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCute
+	call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty
+	call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCool
 	bufferleadmonspeciesname 0
 	switch VAR_TEMP_1
-	case 0, SlateportCity_PokemonFanClub_EventScript_209FD6
-	case 1, SlateportCity_PokemonFanClub_EventScript_209FE0
-	case 2, SlateportCity_PokemonFanClub_EventScript_20A011
-	case 3, SlateportCity_PokemonFanClub_EventScript_20A042
-	case 4, SlateportCity_PokemonFanClub_EventScript_20A073
-	case 5, SlateportCity_PokemonFanClub_EventScript_20A0A4
+	case 0, SlateportCity_PokemonFanClub_EventScript_NoHighConditions
+	case 1, SlateportCity_PokemonFanClub_EventScript_GiveRedScarf
+	case 2, SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf
+	case 3, SlateportCity_PokemonFanClub_EventScript_GivePinkScarf
+	case 4, SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf
+	case 5, SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA
+SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves:: @ 8209FCA
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0
+SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf:: @ 8209FD0
 	addvar VAR_TEMP_2, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6
-	msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoHighConditions:: @ 8209FD6
+	msgbox SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0
+SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0
 	checkitemspace ITEM_RED_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_RED_SCARF
 	giveitem_std ITEM_RED_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainRedScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011
+SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011
 	checkitemspace ITEM_BLUE_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_BLUE_SCARF
 	giveitem_std ITEM_BLUE_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainBlueScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042
+SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042
 	checkitemspace ITEM_PINK_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_PINK_SCARF
 	giveitem_std ITEM_PINK_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainPinkScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073
+SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073
 	checkitemspace ITEM_GREEN_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_GREEN_SCARF
 	giveitem_std ITEM_GREEN_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainGreenScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4
+SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4
 	checkitemspace ITEM_YELLOW_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_YELLOW_SCARF
 	giveitem_std ITEM_YELLOW_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainYellowScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf:: @ 820A0D5
+	msgbox SlateportCity_PokemonFanClub_Text_NoSpaceForReward, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF
+SlateportCity_PokemonFanClub_EventScript_CheckMonCool:: @ 820A0DF
 	specialvar VAR_RESULT, CheckLeadMonCool
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCool
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0
+SlateportCity_PokemonFanClub_EventScript_SetMonCool:: @ 820A0F0
 	setvar VAR_TEMP_1, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6
+SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty:: @ 820A0F6
 	specialvar VAR_RESULT, CheckLeadMonBeauty
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonBeauty
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107
+SlateportCity_PokemonFanClub_EventScript_SetMonBeauty:: @ 820A107
 	setvar VAR_TEMP_1, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D
+SlateportCity_PokemonFanClub_EventScript_CheckMonCute:: @ 820A10D
 	specialvar VAR_RESULT, CheckLeadMonCute
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCute
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E
+SlateportCity_PokemonFanClub_EventScript_SetMonCute:: @ 820A11E
 	setvar VAR_TEMP_1, 3
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124
+SlateportCity_PokemonFanClub_EventScript_CheckMonSmart:: @ 820A124
 	specialvar VAR_RESULT, CheckLeadMonSmart
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonSmart
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135
+SlateportCity_PokemonFanClub_EventScript_SetMonSmart:: @ 820A135
 	setvar VAR_TEMP_1, 4
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B
+SlateportCity_PokemonFanClub_EventScript_CheckMonTough:: @ 820A13B
 	specialvar VAR_RESULT, CheckLeadMonTough
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonTough
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C
+SlateportCity_PokemonFanClub_EventScript_SetMonTough:: @ 820A14C
 	setvar VAR_TEMP_1, 5
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152
-	goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A168
-	msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest:: @ 820A152
+	goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest
+	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168
-	msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest:: @ 820A168
+	msgbox SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172
-	msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_MeetChairman:: @ 820A172
+	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
+SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 820A17E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_20A1DE
-	msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell
+	msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	compare VAR_RESULT, 4
-	goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3
+	goto_if_ge SlateportCity_PokemonFanClub_EventScript_GiveSootheBell
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
+SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3
 	playse SE_PIN
 	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOTHE_BELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE
-	msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell:: @ 820A1DE
+	msgbox SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8
-	msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC
+SlateportCity_PokemonFanClub_EventScript_Man:: @ 820A1E8
+	msgbox SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1
-	msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC
+SlateportCity_PokemonFanClub_EventScript_Twin:: @ 820A1F1
+	msgbox SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA
+SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 820A1FA
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D
+SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 820A20D
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220
+SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 820A220
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_Text_20A233: @ 820A233
+SlateportCity_PokemonFanClub_Text_MeetChairman: @ 820A233
 	.string "Er-hem! I am the CHAIRMAN of the\n"
 	.string "POKéMON FAN CLUB!\p"
 	.string "Being the CHAIRMAN, I am naturally\n"
@@ -283,12 +283,12 @@ SlateportCity_PokemonFanClub_Text_20A233: @ 820A233
 	.string "off our POKéMON, and have others\l"
 	.string "show us theirs.$"
 
-SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE
+SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon: @ 820A3EE
 	.string "The POKéMON of a TRAINER who has\n"
 	.string "entered a POKéMON CONTEST…\l"
 	.string "That, I would like to see.$"
 
-SlateportCity_PokemonFanClub_Text_20A445: @ 820A445
+SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon: @ 820A445
 	.string "Er-hem! I see you've participated in\n"
 	.string "a POKéMON CONTEST!\p"
 	.string "Please! Allow me to examine how you\n"
@@ -306,15 +306,15 @@ SlateportCity_PokemonFanClub_Text_20A445: @ 820A445
 	.string "Please! Allow me to examine how much\n"
 	.string "your POKéMON has grown!$"
 
-SlateportCity_PokemonFanClub_Text_20A62A: @ 820A62A
+SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing: @ 820A62A
 	.string "How is your POKéMON growing?\n"
 	.string "Allow me to examine it.$"
 
-SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F
+SlateportCity_PokemonFanClub_Text_HmHmISee: @ 820A65F
 	.string "Hm, hm…\n"
 	.string "I see…$"
 
-SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E
+SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks: @ 820A66E
 	.string "Hmmm… It's not bad, but it's not\n"
 	.string "good, either…\p"
 	.string "You, the TRAINER, must put more\n"
@@ -322,53 +322,53 @@ SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E
 	.string "For instance, may I suggest that\n"
 	.string "you give it more {POKEBLOCK}S?$"
 
-SlateportCity_PokemonFanClub_Text_20A719: @ 820A719
+SlateportCity_PokemonFanClub_Text_NoSpaceForReward: @ 820A719
 	.string "Oh, my…\p"
 	.string "Your POKéMON is growing quite well,\n"
 	.string "so you deserve a reward.\p"
 	.string "Unfortunately, you have no space for\n"
 	.string "this in your BAG.$"
 
-SlateportCity_PokemonFanClub_Text_20A795: @ 820A795
+SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis: @ 820A795
 	.string "Your {STR_VAR_1}, it is growing in\n"
 	.string "a most impressive manner!\l"
 	.string "It is one fine specimen!\p"
 	.string "But! If you were to give it this,\n"
 	.string "it would grow even better! Indeed!$"
 
-SlateportCity_PokemonFanClub_Text_20A827: @ 820A827
+SlateportCity_PokemonFanClub_Text_ExplainRedScarf: @ 820A827
 	.string "Let a POKéMON hold that RED SCARF.\p"
 	.string "Everyone will recognize the coolness\n"
 	.string "of that POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_20A880: @ 820A880
+SlateportCity_PokemonFanClub_Text_ExplainBlueScarf: @ 820A880
 	.string "Let a POKéMON hold that BLUE SCARF.\p"
 	.string "Its beauty will be accentuated much\n"
 	.string "more than now!$"
 
-SlateportCity_PokemonFanClub_Text_20A8D7: @ 820A8D7
+SlateportCity_PokemonFanClub_Text_ExplainPinkScarf: @ 820A8D7
 	.string "Let a POKéMON hold that PINK SCARF.\p"
 	.string "It will draw out the cuteness of\n"
 	.string "the POKéMON some more!$"
 
-SlateportCity_PokemonFanClub_Text_20A933: @ 820A933
+SlateportCity_PokemonFanClub_Text_ExplainGreenScarf: @ 820A933
 	.string "Let a POKéMON hold that GREEN SCARF.\p"
 	.string "That will enhance the\n"
 	.string "smartness of POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_20A984: @ 820A984
+SlateportCity_PokemonFanClub_Text_ExplainYellowScarf: @ 820A984
 	.string "Let a POKéMON hold that YELLOW SCARF.\p"
 	.string "It will bolster your POKéMON's\n"
 	.string "toughness so much more!$"
 
-SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1
+SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou: @ 820A9E1
 	.string "I'm sorry, but I've nothing else to\n"
 	.string "give you! None at all!\p"
 	.string "After all, you're blessed with the gift\n"
 	.string "of raising POKéMON without resorting\l"
 	.string "to any items!$"
 
-SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77
+SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou: @ 820AA77
 	.string "I love seeing POKéMON that love\n"
 	.string "their TRAINERS.\p"
 	.string "POKéMON are very sensitive to\n"
@@ -378,18 +378,18 @@ SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77
 	.string "When your POKéMON grow to love you,\n"
 	.string "please come show me.$"
 
-SlateportCity_PokemonFanClub_Text_20AB63: @ 820AB63
+SlateportCity_PokemonFanClub_Text_PokemonAdoresYou: @ 820AB63
 	.string "Your POKéMON really adores you.\p"
 	.string "For you, a most compassionate\n"
 	.string "TRAINER, a gift from the FAN CLUB!$"
 
-SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4
+SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove: @ 820ABC4
 	.string "POKéMON are very sensitive to\n"
 	.string "the feelings of their TRAINERS.\p"
 	.string "If you treat your POKéMON with love\n"
 	.string "and care, they'll love you back.$"
 
-SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47
+SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting: @ 820AC47
 	.string "If you keep letting a POKéMON faint\n"
 	.string "in battle, it'll come to resent it.\p"
 	.string "Soon, it will become less trusting\n"
@@ -397,18 +397,18 @@ SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47
 	.string "In other words, it certainly won't\n"
 	.string "like you very much.$"
 
-SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9
+SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein: @ 820ACF9
 	.string "Do POKéMON enjoy having items used\n"
 	.string "on them?\p"
 	.string "Mine acted really happy when I gave\n"
 	.string "it some PROTEIN.$"
 
-SlateportCity_PokemonFanClub_Text_20AD5A: @ 820AD5A
+SlateportCity_PokemonFanClub_Text_Skitty: @ 820AD5A
 	.string "SKITTY: Fffnyaaaah…$"
 
-SlateportCity_PokemonFanClub_Text_20AD6E: @ 820AD6E
+SlateportCity_PokemonFanClub_Text_Zigzagoon: @ 820AD6E
 	.string "ZIGZAGOON: Kyuuu…$"
 
-SlateportCity_PokemonFanClub_Text_20AD80: @ 820AD80
+SlateportCity_PokemonFanClub_Text_Azumarill: @ 820AD80
 	.string "AZUMARILL: Marimari?$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json
index 351431280..d5d8fce4e 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Dock",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Briney",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY"
     }
   ],
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 6c554387a..4939f5407 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -1,16 +1,16 @@
 SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F
 	.byte 0
 
-SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
+SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8207F40
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6
-	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA
-	msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_FerryReady
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined
+	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_GoFindStern
+	msgbox SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -19,50 +19,50 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92
+SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: @ 8207F92
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6
+SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: @ 8207FA6
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA
+SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 8207FBA
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9
+SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: @ 8207FD9
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED
-	msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Scientist1:: @ 8207FED
+	msgbox SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6
-	msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Scientist2:: @ 8207FF6
+	msgbox SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF
-	msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Briney:: @ 8207FFF
+	msgbox SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008
+SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails: @ 8208008
 	.string "Umm… If this goes here, and that\n"
 	.string "goes over there…\p"
 	.string "Then where does this thing go?\n"
@@ -70,7 +70,7 @@ SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008
 	.string "Aaargh! I can't make heads or tails\n"
 	.string "of this!$"
 
-SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5
+SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern: @ 82080A5
 	.string "Hm?\n"
 	.string "Hi, I'm DOCK.\p"
 	.string "CAPT. STERN commissioned me to\n"
@@ -84,26 +84,26 @@ SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5
 	.string "Could I get you to go find CAPT.\n"
 	.string "STERN and deliver that to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5
+SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern: @ 82081A5
 	.string "DOCK: Where could CAPT. STERN have\n"
 	.string "gone off to?\p"
 	.string "Could you go find CAPT. STERN and\n"
 	.string "deliver that parcel to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213
+SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran: @ 8208213
 	.string "DOCK: Shipbuilding is an art.\p"
 	.string "A lot of things can't be figured out\n"
 	.string "just by calculating.\p"
 	.string "I really could use advice from a veteran\n"
 	.string "who knows the seas…$"
 
-SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8
+SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs: @ 82082A8
 	.string "DOCK: Hi! MR. BRINEY's joined us to\n"
 	.string "lend us his help.\p"
 	.string "Thanks to the veteran sailor, the\n"
 	.string "ferry is steadily coming together.$"
 
-SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323
+SlateportCity_SternsShipyard_1F_Text_FerryIsReady: @ 8208323
 	.string "DOCK: The ferry is finally ready!\p"
 	.string "The new S.S. TIDAL is truly a marvel\n"
 	.string "of technology!\p"
@@ -112,7 +112,7 @@ SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323
 	.string "You know, there's never an end to\n"
 	.string "technology's march.$"
 
-SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE
+SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock: @ 82083EE
 	.string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n"
 	.string "It's been too long!\p"
 	.string "Aye, since I met you, this old sea dog's\n"
@@ -127,7 +127,7 @@ SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE
 	.string "my experience, I'm sure that we can\l"
 	.string "build one great ship, aye!$"
 
-SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558
+SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing: @ 8208558
 	.string "The seasons, the weather, where\n"
 	.string "the moon sits in the sky…\p"
 	.string "These and other conditions make\n"
@@ -135,7 +135,7 @@ SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558
 	.string "That's right!\n"
 	.string "The sea is like a living thing!$"
 
-SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF
+SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily: @ 82085FF
 	.string "I get seasick real easily.\n"
 	.string "So I get to help out here instead.$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json
index 2e57c63fd..78b39989f 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_2F_EventScript_208647",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index 6fa410dfe..fff96bc65 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
@@ -1,20 +1,20 @@
 SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D
 	.byte 0
 
-SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E
-	msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC
+SlateportCity_SternsShipyard_2F_EventScript_Scientist1:: @ 820863E
+	msgbox SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647
-	msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC
+SlateportCity_SternsShipyard_2F_EventScript_Scientist2:: @ 8208647
+	msgbox SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650
+SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding: @ 8208650
 	.string "Designing a large ship is more like\n"
 	.string "making a big building than putting\l"
 	.string "together a transportation vehicle.$"
 
-SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA
+SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy: @ 82086BA
 	.string "Don't you think it's strange that\n"
 	.string "a ship made of heavy iron floats?\p"
 	.string "It floats because of a principle\n"
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
index 183c3ce46..946206347 100644
--- a/data/maps/SootopolisCity/map.json
+++ b/data/maps/SootopolisCity/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5E8D",
+      "script": "SootopolisCity_EventScript_CaveOfOriginExpert",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5FE2",
+      "script": "SootopolisCity_EventScript_Woman2",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5ED8",
+      "script": "SootopolisCity_EventScript_Kiri",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E608E",
+      "script": "SootopolisCity_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E60E3",
+      "script": "SootopolisCity_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6017",
+      "script": "SootopolisCity_EventScript_Man",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6166",
+      "script": "SootopolisCity_EventScript_Steven",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6038",
+      "script": "SootopolisCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6411",
+      "script": "SootopolisCity_EventScript_Maniac",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E63DB",
+      "script": "SootopolisCity_EventScript_Girl",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6393",
+      "script": "SootopolisCity_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E635D",
+      "script": "SootopolisCity_EventScript_Boy2",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E64F2",
+      "script": "SootopolisCity_EventScript_Maxie",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E651F",
+      "script": "SootopolisCity_EventScript_Archie",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE"
     },
     {
@@ -245,7 +245,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6446",
+      "script": "SootopolisCity_EventScript_Wallace",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE"
     }
   ],
@@ -350,7 +350,7 @@
       "y": 34,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_EventScript_1E614B"
+      "script": "SootopolisCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -390,7 +390,7 @@
       "y": 37,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_EventScript_1E6154"
+      "script": "SootopolisCity_EventScript_CitySign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 817ae4402..a936929d8 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -1,21 +1,21 @@
 SootopolisCity_MapScripts:: @ 81E565C
-	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_OnWarp
 	.byte 0
 
-SootopolisCity_MapScript1_1E5676: @ 81E5676
-	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E56E5
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_1E5692
-	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E5693
+SootopolisCity_OnLoad: @ 81E5676
+	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockGymDoor
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_LegendariesNotArrived
+	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockHouseDoors
 	end
 
-SootopolisCity_EventScript_1E5692:: @ 81E5692
+SootopolisCity_EventScript_LegendariesNotArrived:: @ 81E5692
 	end
 
-SootopolisCity_EventScript_1E5693:: @ 81E5693
+SootopolisCity_EventScript_LockHouseDoors:: @ 81E5693
 	setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
@@ -27,45 +27,45 @@ SootopolisCity_EventScript_1E5693:: @ 81E5693
 	setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
 	return
 
-SootopolisCity_EventScript_1E56E5:: @ 81E56E5
+SootopolisCity_EventScript_LockGymDoor:: @ 81E56E5
 	setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
 	return
 
 SootopolisCity_OnTransition: @ 81E56EF
 	setflag FLAG_VISITED_SOOTOPOLIS_CITY
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5781
+	call_if_eq SootopolisCity_EventScript_HideMapNamePopup
 	compare VAR_SKY_PILLAR_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5781
-	call SootopolisCity_EventScript_1E5805
-	call SootopolisCity_EventScript_1E57B2
+	call_if_eq SootopolisCity_EventScript_HideMapNamePopup
+	call SootopolisCity_EventScript_SetWeather
+	call SootopolisCity_EventScript_SetLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5842
+	call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SootopolisCity_EventScript_1E5842
+	call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_eq SootopolisCity_EventScript_1E585B
+	call_if_eq SootopolisCity_EventScript_SetExitCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	call_if_eq SootopolisCity_EventScript_1E5871
+	call_if_eq SootopolisCity_EventScript_SetOutsideGymObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	call_if_eq SootopolisCity_EventScript_1E58D3
+	call_if_eq SootopolisCity_EventScript_SetExpertBlockCaveEntrance
 	end
 
-SootopolisCity_EventScript_1E5781:: @ 81E5781
+SootopolisCity_EventScript_HideMapNamePopup:: @ 81E5781
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SootopolisCity_EventScript_1E5785:: @ 81E5785
+SootopolisCity_EventScript_SetBattleSpectators:: @ 81E5785
 	setobjectxyperm 3, 13, 48
 	setobjectxyperm 5, 46, 32
 	setobjectxyperm 4, 48, 41
@@ -76,140 +76,141 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
 	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SootopolisCity_EventScript_1E57B2:: @ 81E57B2
+SootopolisCity_EventScript_SetLayout:: @ 81E57B2
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq SootopolisCity_EventScript_1E5800
+	goto_if_eq SootopolisCity_EventScript_SetNormalLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5800
+	goto_if_ge SootopolisCity_EventScript_SetNormalLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E5801
+	goto_if_le SootopolisCity_EventScript_SetLegendariesLayout
 	return
 
-SootopolisCity_EventScript_1E5800:: @ 81E5800
+SootopolisCity_EventScript_SetNormalLayout:: @ 81E5800
 	return
 
-SootopolisCity_EventScript_1E5801:: @ 81E5801
+SootopolisCity_EventScript_SetLegendariesLayout:: @ 81E5801
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
-SootopolisCity_EventScript_1E5805:: @ 81E5805
+SootopolisCity_EventScript_SetWeather:: @ 81E5805
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq SootopolisCity_EventScript_1E583D
+	goto_if_eq SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E583D
+	goto_if_ge SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E583E
+	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E583E
+	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_le Common_EventScript_SetWeather15
+	goto_if_le Common_EventScript_SetAlternatingWeather
 	return
 
-SootopolisCity_EventScript_1E583D:: @ 81E583D
+SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D
 	return
 
-SootopolisCity_EventScript_1E583E:: @ 81E583E
+SootopolisCity_EventScript_SetHeavyRain:: @ 81E583E
 	setweather WEATHER_RAIN_HEAVY
 	return
 
-SootopolisCity_EventScript_1E5842:: @ 81E5842
-	goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E584C
+SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842
+	goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos
 	return
 
-SootopolisCity_EventScript_1E584C:: @ 81E584C
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 7, 32, 18
+SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos:: @ 81E584C
+	setobjectxyperm 1, 30, 18   @ Expert
+	setobjectxyperm 7, 32, 18   @ Steven
 	return
 
-SootopolisCity_EventScript_1E585B:: @ 81E585B
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 18, 31, 18
-	setobjectxyperm 7, 32, 18
+SootopolisCity_EventScript_SetExitCaveOfOriginObjPos:: @ 81E585B
+	setobjectxyperm 1, 30, 18   @ Expert
+	setobjectxyperm 18, 31, 18  @ Wallace
+	setobjectxyperm 7, 32, 18   @ Steven
 	end
 
-SootopolisCity_EventScript_1E5871:: @ 81E5871
-	setobjectxyperm 1, 31, 18
-	setobjectxyperm 7, 29, 33
-	setobjectxyperm 16, 33, 35
-	setobjectxyperm 17, 34, 35
+SootopolisCity_EventScript_SetOutsideGymObjPos:: @ 81E5871
+	setobjectxyperm 1, 31, 18   @ Expert
+	setobjectxyperm 7, 29, 33   @ Steven
+	setobjectxyperm 16, 33, 35  @ Maxie
+	setobjectxyperm 17, 34, 35  @ Archie
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 0
-	call_if_eq SootopolisCity_EventScript_1E58AF
+	call_if_eq SootopolisCity_EventScript_SetWallaceMiddle
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E58BB
+	call_if_eq SootopolisCity_EventScript_SetWallaceRight
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E58C7
+	call_if_eq SootopolisCity_EventScript_SetWallaceLeft
 	return
 
-SootopolisCity_EventScript_1E58AF:: @ 81E58AF
+SootopolisCity_EventScript_SetWallaceMiddle:: @ 81E58AF
 	setobjectxyperm 18, 31, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58BB:: @ 81E58BB
+SootopolisCity_EventScript_SetWallaceRight:: @ 81E58BB
 	setobjectxyperm 18, 32, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58C7:: @ 81E58C7
+SootopolisCity_EventScript_SetWallaceLeft:: @ 81E58C7
 	setobjectxyperm 18, 30, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58D3:: @ 81E58D3
-	setobjectxyperm 1, 31, 18
+SootopolisCity_EventScript_SetExpertBlockCaveEntrance:: @ 81E58D3
+	setobjectxyperm 1, 31, 18   @ Expert
 	return
 
-SootopolisCity_MapScript2_1E58DB: @ 81E58DB
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_1E58E5
+SootopolisCity_OnWarp: @ 81E58DB
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_PlayerFaceLegendaries
 	.2byte 0
 
-SootopolisCity_EventScript_1E58E5:: @ 81E58E5
+SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5
 	compare VAR_SKY_PILLAR_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E58FC
+	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries1
 	compare VAR_SKY_PILLAR_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5901
+	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries2
 	end
 
-SootopolisCity_EventScript_1E58FC:: @ 81E58FC
+SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	return
 
-SootopolisCity_EventScript_1E5901:: @ 81E5901
+SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	setvar VAR_SKY_PILLAR_STATE, 3
 	return
 
-SootopolisCity_MapScript1_1E590B: @ 81E590B
+SootopolisCity_OnResume: @ 81E590B
 	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
 	end
 
-SootopolisCity_MapScript2_1E5914: @ 81E5914
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_1E5926
-	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE
+SootopolisCity_OnFrame: @ 81E5914
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_StartLegendariesScene
+	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_StartRayquazaScene
 	.2byte 0
 
-SootopolisCity_EventScript_1E5926:: @ 81E5926
+@ If not at PokeCenter, assumed to have arrived via Dive
+SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
-	goto_if_ne SootopolisCity_EventScript_1E5A82
+	goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
 	compare VAR_0x8005, 32
-	goto_if_ne SootopolisCity_EventScript_1E5A82
-	goto SootopolisCity_EventScript_1E5946
+	goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
+	goto SootopolisCity_EventScript_LegendariesSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_1E5946:: @ 81E5946
+SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
@@ -225,8 +226,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	delay 60
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -234,13 +235,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
+	applymovement 10, SootopolisCity_Movement_GroudonAttack
+	applymovement 9, SootopolisCity_Movement_KyogreDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -248,13 +249,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -262,13 +263,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	special SpawnCameraObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75
+	applymovement 10, SootopolisCity_Movement_KyogreIdle
+	applymovement 9, SootopolisCity_Movement_GroudonIdle
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -276,7 +277,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	releaseall
 	end
 
-SootopolisCity_Movement_1E5A68: @ 81E5A68
+SootopolisCity_Movement_PanToActionFromPokeCenter: @ 81E5A68
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
@@ -291,7 +292,7 @@ SootopolisCity_Movement_1E5A68: @ 81E5A68
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_1E5A75: @ 81E5A75
+SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -306,10 +307,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75
 	walk_slow_diag_northeast
 	step_end
 
-SootopolisCity_EventScript_1E5A82:: @ 81E5A82
+SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
@@ -325,8 +326,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	delay 60
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -334,13 +335,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
+	applymovement 10, SootopolisCity_Movement_GroudonAttack
+	applymovement 9, SootopolisCity_Movement_KyogreDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -348,13 +349,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -362,13 +363,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	special SpawnCameraObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE
+	applymovement 10, SootopolisCity_Movement_KyogreIdle
+	applymovement 9, SootopolisCity_Movement_GroudonIdle
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToDive
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -376,7 +377,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	releaseall
 	end
 
-SootopolisCity_Movement_1E5BA4: @ 81E5BA4
+SootopolisCity_Movement_PanToActionFromDive: @ 81E5BA4
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_up
@@ -388,7 +389,7 @@ SootopolisCity_Movement_1E5BA4: @ 81E5BA4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5BAE: @ 81E5BAE
+SootopolisCity_Movement_PanBackToDive: @ 81E5BAE
 	walk_down
 	walk_down
 	walk_down
@@ -400,7 +401,7 @@ SootopolisCity_Movement_1E5BAE: @ 81E5BAE
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_1E5BB8: @ 81E5BB8
+SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -412,7 +413,7 @@ SootopolisCity_Movement_1E5BB8: @ 81E5BB8
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_1E5BC2: @ 81E5BC2
+SootopolisCity_Movement_GroudonAttack: @ 81E5BC2
 	delay_16
 	delay_16
 	delay_16
@@ -427,7 +428,7 @@ SootopolisCity_Movement_1E5BC2: @ 81E5BC2
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_1E5BCF: @ 81E5BCF
+SootopolisCity_Movement_KyogreMoveBack: @ 81E5BCF
 	lock_facing_direction
 	walk_right
 	delay_16
@@ -436,7 +437,7 @@ SootopolisCity_Movement_1E5BCF: @ 81E5BCF
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_1E5BD6: @ 81E5BD6
+SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -445,7 +446,7 @@ SootopolisCity_Movement_1E5BD6: @ 81E5BD6
 	walk_in_place_slow_left
 	step_end
 
-SootopolisCity_Movement_1E5BDD: @ 81E5BDD
+SootopolisCity_Movement_KyogreDefend: @ 81E5BDD
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -455,7 +456,7 @@ SootopolisCity_Movement_1E5BDD: @ 81E5BDD
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_1E5BE5: @ 81E5BE5
+SootopolisCity_Movement_GroudonDefend: @ 81E5BE5
 	delay_16
 	delay_16
 	delay_16
@@ -468,7 +469,7 @@ SootopolisCity_Movement_1E5BE5: @ 81E5BE5
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_1E5BF0: @ 81E5BF0
+SootopolisCity_Movement_GroudonMoveBack: @ 81E5BF0
 	lock_facing_direction
 	walk_left
 	delay_16
@@ -477,7 +478,7 @@ SootopolisCity_Movement_1E5BF0: @ 81E5BF0
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_1E5BF7: @ 81E5BF7
+SootopolisCity_Movement_GroudonIdle: @ 81E5BF7
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -486,25 +487,26 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7
 	walk_in_place_slow_right
 	step_end
 
-SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
+@ If not at PokeCenter, assumed to have arrived via Dive
+SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
-	goto_if_ne SootopolisCity_EventScript_1E5CCE
+	goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
 	compare VAR_0x8005, 32
-	goto_if_ne SootopolisCity_EventScript_1E5CCE
-	goto SootopolisCity_EventScript_1E5C1E
+	goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
+	goto SootopolisCity_EventScript_RayquazaSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
+SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
+	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
 	addobject 11
@@ -513,7 +515,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitstate
 	playse SE_T_KAMI
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -534,7 +536,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitmoncry
 	setweather WEATHER_NONE
 	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
+	applymovement 11, SootopolisCity_Movement_RayquazaFlyOff
 	waitmovement 0
 	removeobject 11
 	special WaitWeather
@@ -549,15 +551,15 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
+SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
+	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
 	addobject 11
@@ -565,8 +567,8 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	special Script_DoRayquazaScene
 	waitstate
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E5E68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -587,7 +589,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	waitmoncry
 	setweather WEATHER_NONE
 	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
+	applymovement 11, SootopolisCity_Movement_RayquazaFlyOff
 	waitmovement 0
 	removeobject 11
 	special WaitWeather
@@ -602,7 +604,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E5D82:: @ 81E5D82
+SootopolisCity_EventScript_SetRoughWater:: @ 81E5D82
 	setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
@@ -629,7 +631,7 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82
 	setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
 	return
 
-SootopolisCity_Movement_1E5E5B: @ 81E5E5B
+SootopolisCity_Movement_RayquazaFlyOff: @ 81E5E5B
 	walk_fast_up
 	walk_fastest_up
 	walk_fastest_up
@@ -639,28 +641,30 @@ SootopolisCity_Movement_1E5E5B: @ 81E5E5B
 	walk_fastest_up
 	step_end
 
-SootopolisCity_Movement_1E5E63: @ 81E5E63
+SootopolisCity_Movement_PanUp: @ 81E5E63
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5E68: @ 81E5E68
+SootopolisCity_Movement_PlayerApproachLegendaries: @ 81E5E68
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5E6D: @ 81E5E6D
+@ Unused
+SootopolisCity_Movement_PlayerApproachLegendariesDown: @ 81E5E6D
 	walk_down
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-SootopolisCity_Movement_1E5E72: @ 81E5E72
+@ Unused
+SootopolisCity_Movement_UnusedPanUp: @ 81E5E72
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -675,7 +679,8 @@ SootopolisCity_Movement_1E5E72: @ 81E5E72
 	walk_right
 	step_end
 
-SootopolisCity_Movement_1E5E7F: @ 81E5E7F
+@ Unused
+SootopolisCity_Movement_UnusedPanBack: @ 81E5E7F
 	walk_down
 	walk_down
 	walk_down
@@ -691,311 +696,312 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
+SootopolisCity_EventScript_CaveOfOriginExpert:: @ 81E5E8D
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5EC4
+	goto_if_ge SootopolisCity_EventScript_ExpertPostLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E5ECE
+	goto_if_eq SootopolisCity_EventScript_ExpertLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_ge SootopolisCity_EventScript_1E5EBA
-	msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_ExpertLeadToCave
+	msgbox SootopolisCity_Text_CaveOfOriginPleaseLeave, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA
-	msgbox SootopolisCity_Text_1E6DFE, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertLeadToCave:: @ 81E5EBA
+	msgbox SootopolisCity_Text_LeadSuperiorTrainerToCave, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4
-	msgbox SootopolisCity_Text_1E6F38, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertPostLegendaries:: @ 81E5EC4
+	msgbox SootopolisCity_Text_CaveOfOriginSleepsToo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
-	msgbox SootopolisCity_Text_1E6ED4, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertLegendaries:: @ 81E5ECE
+	msgbox SootopolisCity_Text_AwakenedPokemonClash, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
+SootopolisCity_EventScript_Kiri:: @ 81E5ED8
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E5F1B
+	goto_if_le SootopolisCity_EventScript_KiriGiveBerry
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5F1B
+	goto_if_ge SootopolisCity_EventScript_KiriGiveBerry
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E5F10
-	msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_KiriRayquaza
+	msgbox SootopolisCity_Text_BigPokemonFighting, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E5F10:: @ 81E5F10
-	msgbox SootopolisCity_Text_1E6C53, MSGBOX_DEFAULT
+SootopolisCity_EventScript_KiriRayquaza:: @ 81E5F10
+	msgbox SootopolisCity_Text_PrettyMonCameFromSky, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
-SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
+@ Gives 2 berries daily. First ranges from FIRST_KIRI_BERRY to LAST_KIRI_BERRY, second is always Figy or Iapapa
+SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
 	dotimebasedevents
 	special GetPlayerBigGuyGirlString
-	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_1E5FBB
-	msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
-	random 10
-	addvar VAR_RESULT, 20
+	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_KiriReceivedBerry
+	msgbox SootopolisCity_Text_NameIsKiriHaveOneOfThese, MSGBOX_DEFAULT
+	random NUM_KIRI_BERRIES
+	addvar VAR_RESULT, NUM_KIRI_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
-	msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_GiveYouThisBerryToo, MSGBOX_DEFAULT
 	random 2
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1E5F79
+	goto_if_eq SootopolisCity_EventScript_GiveFigyBerry
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_EventScript_1E5F9A
+	goto_if_eq SootopolisCity_EventScript_GiveIapapaBerry
 	end
 
-SootopolisCity_EventScript_1E5F79:: @ 81E5F79
+SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
 	giveitem_std ITEM_FIGY_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
+SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A
 	giveitem_std ITEM_IAPAPA_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
-	msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_EventScript_1E5FD8
-	msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT
+SootopolisCity_EventScript_KiriReceivedBerry:: @ 81E5FBB
+	msgbox SootopolisCity_Text_LikeSeasonBornIn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SootopolisCity_EventScript_KiriLikeSeasonBornIn
+	msgbox SootopolisCity_Text_OhDoesntMatter, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
-	msgbox SootopolisCity_Text_2A7D80, MSGBOX_DEFAULT
+SootopolisCity_EventScript_KiriLikeSeasonBornIn:: @ 81E5FD8
+	msgbox SootopolisCity_Text_ThenILoveAutumn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
+SootopolisCity_EventScript_Woman2:: @ 81E5FE2
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E600D
-	msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_Woman2Rayquaza
+	msgbox SootopolisCity_Text_WeatherWentWild, MSGBOX_DEFAULT
 	closemessage
 	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E600D:: @ 81E600D
-	msgbox SootopolisCity_Text_1E728C, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman2Rayquaza:: @ 81E600D
+	msgbox SootopolisCity_Text_YouBroughtFlyingMon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6017:: @ 81E6017
+SootopolisCity_EventScript_Man:: @ 81E6017
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E602E
-	msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_ManPostLegendaries
+	msgbox SootopolisCity_Text_NoOrdinaryTourist, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E602E:: @ 81E602E
-	msgbox SootopolisCity_Text_1E6D57, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ManPostLegendaries:: @ 81E602E
+	msgbox SootopolisCity_Text_CityRegainedCalm, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6038:: @ 81E6038
+SootopolisCity_EventScript_Woman1:: @ 81E6038
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E607A
+	goto_if_ge SootopolisCity_EventScript_Woman1PostLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6084
+	goto_if_eq SootopolisCity_EventScript_Woman1Rayquaza
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_ge SootopolisCity_EventScript_1E6065
-	msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_Woman1Legendaries
+	msgbox SootopolisCity_Text_SootopolisSkyBeautiful, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6065:: @ 81E6065
-	msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1Legendaries:: @ 81E6065
+	msgbox SootopolisCity_Text_GiganticPokemonFight, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E607A:: @ 81E607A
-	msgbox SootopolisCity_Text_1E710B, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1PostLegendaries:: @ 81E607A
+	msgbox SootopolisCity_Text_NightSkyFavoriteScenery, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6084:: @ 81E6084
-	msgbox SootopolisCity_Text_1E70D4, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1Rayquaza:: @ 81E6084
+	msgbox SootopolisCity_Text_FearedWorstWhenPokemonFlewDown, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E608E:: @ 81E608E
+SootopolisCity_EventScript_NinjaBoy:: @ 81E608E
 	lockall
 	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E60D9
+	goto_if_eq SootopolisCity_EventScript_NinjaBoyRayquaza
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E60CF
+	goto_if_ge SootopolisCity_EventScript_NinjaBoyNormal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E60CF
-	msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
+	goto_if_le SootopolisCity_EventScript_NinjaBoyNormal
+	msgbox SootopolisCity_Text_ThisIsWicked, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E60CF:: @ 81E60CF
-	msgbox SootopolisCity_Text_1E68A1, MSGBOX_DEFAULT
+SootopolisCity_EventScript_NinjaBoyNormal:: @ 81E60CF
+	msgbox SootopolisCity_Text_WonderWhatWorldIsLike, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E60D9:: @ 81E60D9
-	msgbox SootopolisCity_Text_1E6920, MSGBOX_DEFAULT
+SootopolisCity_EventScript_NinjaBoyRayquaza:: @ 81E60D9
+	msgbox SootopolisCity_Text_ThatWasWicked, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E60E3:: @ 81E60E3
+SootopolisCity_EventScript_Boy1:: @ 81E60E3
 	lockall
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E612D
-	goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137
+	goto_if_eq SootopolisCity_EventScript_Boy1Rayquaza
+	goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_Boy1GameClear
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E6141
+	goto_if_ge SootopolisCity_EventScript_Boy1Normal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E6141
-	msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
+	goto_if_le SootopolisCity_EventScript_Boy1Normal
+	msgbox SootopolisCity_Text_GiantPokemonSuddenlyAppeared, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E612D:: @ 81E612D
-	msgbox SootopolisCity_Text_1E6750, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1Rayquaza:: @ 81E612D
+	msgbox SootopolisCity_Text_WhatIsThatGreenPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6137:: @ 81E6137
-	msgbox SootopolisCity_Text_1E677F, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1GameClear:: @ 81E6137
+	msgbox SootopolisCity_Text_WhereDidLegendariesGo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6141:: @ 81E6141
-	msgbox SootopolisCity_Text_1E6618, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1Normal:: @ 81E6141
+	msgbox SootopolisCity_Text_PhysicallyFitLivingHere, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E614B:: @ 81E614B
-	msgbox SootopolisCity_Text_1E656F, MSGBOX_SIGN
+SootopolisCity_EventScript_GymSign:: @ 81E614B
+	msgbox SootopolisCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_1E6154:: @ 81E6154
-	msgbox SootopolisCity_Text_1E65C8, MSGBOX_SIGN
+SootopolisCity_EventScript_CitySign:: @ 81E6154
+	msgbox SootopolisCity_Text_CitySign, MSGBOX_SIGN
 	end
 
 EventScript_ClosedSootopolisDoor:: @ 81E615D
-	msgbox SootopolisCity_Text_1E6604, MSGBOX_SIGN
+	msgbox SootopolisCity_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_1E6166:: @ 81E6166
+SootopolisCity_EventScript_Steven:: @ 81E6166
 	lockall
 	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
-	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC
+	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_eq SootopolisCity_EventScript_1E61AE
+	goto_if_eq SootopolisCity_EventScript_StevenHelpWallace
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	goto_if_eq SootopolisCity_EventScript_1E61C2
+	goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E61C2
-	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8
-	msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_StevenMaxieArchieLeft
+	msgbox SootopolisCity_Text_SoThatsRayquaza, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61AE:: @ 81E61AE
-	msgbox SootopolisCity_Text_1E7866, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenHelpWallace:: @ 81E61AE
+	msgbox SootopolisCity_Text_KnowWhatsNeededToHelpHim, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61B8:: @ 81E61B8
-	msgbox SootopolisCity_Text_1E794B, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenMaxieArchieLeft:: @ 81E61B8
+	msgbox SootopolisCity_Text_MaxieArchieLeft, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61C2:: @ 81E61C2
-	msgbox SootopolisCity_Text_1E789A, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenHelpedWallace:: @ 81E61C2
+	msgbox SootopolisCity_Text_NeverBeenToSkyPillar, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61CC:: @ 81E61CC
-	msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
+	msgbox SootopolisCity_Text_InvolvedWithCrisisComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_EventScript_1E6243
+	call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginWest
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_EventScript_1E6255
-	msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT
+	call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth
+	msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, SootopolisCity_Movement_1E62D4
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E630E
+	applymovement 7, SootopolisCity_Movement_StevenWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin
 	waitmovement 0
 	delay 120
-	applymovement 1, SootopolisCity_Movement_1E6341
+	applymovement 1, SootopolisCity_Movement_ExpertMoveAside
 	waitmovement 0
-	applymovement 7, SootopolisCity_Movement_1E6344
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E634F
+	applymovement 7, SootopolisCity_Movement_StevenArriveCaveEntrance
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin
 	waitmovement 0
 	warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E6243:: @ 81E6243
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E628C
+SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243
+	applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest
 	waitmovement 0
 	return
 
-SootopolisCity_EventScript_1E6255:: @ 81E6255
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E62B0
+SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255
+	applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth
 	waitmovement 0
 	return
 
-SootopolisCity_Movement_1E6267: @ 81E6267
+SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin: @ 81E6267
 	walk_up
 	walk_up
 	walk_up
@@ -1034,7 +1040,7 @@ SootopolisCity_Movement_1E6267: @ 81E6267
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_1E628C: @ 81E628C
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest: @ 81E628C
 	walk_left
 	walk_up
 	walk_up
@@ -1072,7 +1078,7 @@ SootopolisCity_Movement_1E628C: @ 81E628C
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E62B0: @ 81E62B0
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth: @ 81E62B0
 	walk_up
 	walk_up
 	walk_up
@@ -1110,7 +1116,7 @@ SootopolisCity_Movement_1E62B0: @ 81E62B0
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E62D4: @ 81E62D4
+SootopolisCity_Movement_StevenWalkToCaveOfOrigin: @ 81E62D4
 	walk_up
 	walk_up
 	walk_right
@@ -1170,7 +1176,7 @@ SootopolisCity_Movement_1E62D4: @ 81E62D4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E630E: @ 81E630E
+SootopolisCity_Movement_PlayerWalkToCaveOfOrigin: @ 81E630E
 	walk_up
 	walk_up
 	walk_up
@@ -1223,12 +1229,12 @@ SootopolisCity_Movement_1E630E: @ 81E630E
 	walk_right
 	step_end
 
-SootopolisCity_Movement_1E6341: @ 81E6341
+SootopolisCity_Movement_ExpertMoveAside: @ 81E6341
 	walk_slow_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_1E6344: @ 81E6344
+SootopolisCity_Movement_StevenArriveCaveEntrance: @ 81E6344
 	walk_down
 	walk_down
 	walk_left
@@ -1241,7 +1247,7 @@ SootopolisCity_Movement_1E6344: @ 81E6344
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_Movement_1E634F: @ 81E634F
+SootopolisCity_Movement_PlayerArriveCaveEntrance: @ 81E634F
 	delay_16
 	delay_16
 	delay_16
@@ -1254,182 +1260,182 @@ SootopolisCity_Movement_1E634F: @ 81E634F
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_1E635A: @ 81E635A
+SootopolisCity_Movement_PlayerEnterCaveOfOrigin: @ 81E635A
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_EventScript_1E635D:: @ 81E635D
+SootopolisCity_EventScript_Boy2:: @ 81E635D
 	lockall
 	applymovement 15, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6388
-	msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_Boy2Rayquaza
+	msgbox SootopolisCity_Text_TwoPokemonArentAngry, MSGBOX_DEFAULT
 	closemessage
 	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6388:: @ 81E6388
-	msgbox SootopolisCity_Text_1E6853, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy2Rayquaza:: @ 81E6388
+	msgbox SootopolisCity_Text_FlyingMonStoppedRampage, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6393:: @ 81E6393
+SootopolisCity_EventScript_BlackBelt:: @ 81E6393
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E63C7
-	msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_BlackBeltRayquaza
+	msgbox SootopolisCity_Text_GoRedAndBlueMon, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_DoYouKnowMonNames, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E63C7:: @ 81E63C7
+SootopolisCity_EventScript_BlackBeltRayquaza:: @ 81E63C7
 	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_GreenOneSettlesThings, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E63DB:: @ 81E63DB
+SootopolisCity_EventScript_Girl:: @ 81E63DB
 	lockall
 	applymovement 13, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6406
-	msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_GirlRayquaza
+	msgbox SootopolisCity_Text_SootopolisWillBeWrecked, MSGBOX_DEFAULT
 	closemessage
 	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6406:: @ 81E6406
-	msgbox SootopolisCity_Text_1E6CA6, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GirlRayquaza:: @ 81E6406
+	msgbox SootopolisCity_Text_SootopolisDidntGetWrecked, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6411:: @ 81E6411
+SootopolisCity_EventScript_Maniac:: @ 81E6411
 	lockall
 	applymovement 12, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E643C
-	msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_ManiacRayquaza
+	msgbox SootopolisCity_Text_SeeingLegendWithOwnEyes, MSGBOX_DEFAULT
 	closemessage
 	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E643C:: @ 81E643C
-	msgbox SootopolisCity_Text_1E6B2A, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ManiacRayquaza:: @ 81E643C
+	msgbox SootopolisCity_Text_SawLegendWithOwnEyes, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6446:: @ 81E6446
+SootopolisCity_EventScript_Wallace:: @ 81E6446
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E64D8
-	goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2
-	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F
-	msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_GoToSkyPillar
+	goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_GoToGym
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_GiveWaterfall
+	msgbox SootopolisCity_Text_AquaMagmaDidntMeanHarm, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E646F:: @ 81E646F
-	msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F
+	msgbox SootopolisCity_Text_ThankYouForHelpAcceptThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM07
 	setflag FLAG_RECEIVED_HM07
-	msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_ExplainWaterfallGoToGym, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_EventScript_1E64B2
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SootopolisCity_EventScript_1E64B2
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_EventScript_1E64C5
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGymWest
 	release
 	end
 
-SootopolisCity_EventScript_1E64B2:: @ 81E64B2
-	applymovement 18, SootopolisCity_Movement_1E64EC
+SootopolisCity_EventScript_WallaceMoveFromGym:: @ 81E64B2
+	applymovement 18, SootopolisCity_Movement_WallaceMoveFromGym
 	waitmovement 0
 	copyobjectxytoperm 18
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1
 	return
 
-SootopolisCity_EventScript_1E64C5:: @ 81E64C5
-	applymovement 18, SootopolisCity_Movement_1E64EF
+SootopolisCity_EventScript_WallaceMoveFromGymWest:: @ 81E64C5
+	applymovement 18, SootopolisCity_Movement_WallaceMoveFromGymWest
 	waitmovement 0
 	copyobjectxytoperm 18
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2
 	return
 
-SootopolisCity_EventScript_1E64D8:: @ 81E64D8
-	msgbox SootopolisCity_Text_1E79C8, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GoToSkyPillar:: @ 81E64D8
+	msgbox SootopolisCity_Text_HaventYouScaledSkyPillar, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E64E2:: @ 81E64E2
-	msgbox SootopolisCity_Text_1E7CBC, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GoToGym:: @ 81E64E2
+	msgbox SootopolisCity_Text_DazzledByMentor, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Movement_1E64EC: @ 81E64EC
+SootopolisCity_Movement_WallaceMoveFromGym: @ 81E64EC
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_1E64EF: @ 81E64EF
+SootopolisCity_Movement_WallaceMoveFromGymWest: @ 81E64EF
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_EventScript_1E64F2:: @ 81E64F2
+SootopolisCity_EventScript_Maxie:: @ 81E64F2
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6509
-	msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_MaxieRayquaza
+	msgbox SootopolisCity_Text_GroudonPleaseStop, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6509:: @ 81E6509
-	msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT
+SootopolisCity_EventScript_MaxieRayquaza:: @ 81E6509
+	msgbox SootopolisCity_Text_AfterAllOurScheming, MSGBOX_DEFAULT
 	setflag FLAG_MET_MAXIE_SOOTOPOLIS
-	goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C
+	goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E651F:: @ 81E651F
+SootopolisCity_EventScript_Archie:: @ 81E651F
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6536
-	msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_ArchieRayquaza
+	msgbox SootopolisCity_Text_KyogreCalmDown, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6536:: @ 81E6536
-	msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ArchieRayquaza:: @ 81E6536
+	msgbox SootopolisCity_Text_TryingMeaninglessToPokemon, MSGBOX_DEFAULT
 	setflag FLAG_MET_ARCHIE_SOOTOPOLIS
-	goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C
+	goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E654C:: @ 81E654C
+SootopolisCity_EventScript_MaxieArchieLeave:: @ 81E654C
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE
@@ -1441,36 +1447,37 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C
 	releaseall
 	end
 
-SootopolisCity_Movement_1E656B:: @ 81E656B
+@ Unused
+SootopolisCity_Movement_Levitate:: @ 81E656B
 	levitate
 	step_end
 
-SootopolisCity_Movement_1E656D:: @ 81E656D
+@ Unused
+SootopolisCity_Movement_DestroyTask:: @ 81E656D
 	destroy_extra_task
 	step_end
 
-SootopolisCity_Text_1E656F: @ 81E656F
+SootopolisCity_Text_GymSign: @ 81E656F
 	.string "SOOTOPOLIS CITY POKéMON GYM\n"
 	.string "LEADER: JUAN\p"
 	.string "“The GYM LEADER with the beauty\n"
 	.string "of pure water!”$"
 
-SootopolisCity_Text_1E65C8: @ 81E65C8
+SootopolisCity_Text_CitySign: @ 81E65C8
 	.string "SOOTOPOLIS CITY\p"
 	.string "“The mystical city where history\n"
 	.string "slumbers.”$"
 
-
-SootopolisCity_Text_1E6604: @ 81E6604
+SootopolisCity_Text_DoorIsClosed: @ 81E6604
 	.string "The door is closed.$"
 
-SootopolisCity_Text_1E6618: @ 81E6618
+SootopolisCity_Text_PhysicallyFitLivingHere: @ 81E6618
 	.string "Diving in the sea. Climbing up and\n"
 	.string "down stairs all the time…\p"
 	.string "If you live in this town, you end up\n"
 	.string "getting physically fit.$"
 
-SootopolisCity_Text_1E6692: @ 81E6692
+SootopolisCity_Text_GiantPokemonSuddenlyAppeared: @ 81E6692
 	.string "These giant POKéMON suddenly appeared\n"
 	.string "in the middle of the city!\p"
 	.string "And, I've never seen them before!\p"
@@ -1479,56 +1486,56 @@ SootopolisCity_Text_1E6692: @ 81E6692
 	.string "Why can't they be friends, those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_1E6750: @ 81E6750
+SootopolisCity_Text_WhatIsThatGreenPokemon: @ 81E6750
 	.string "What? What? What?\n"
 	.string "What is that green POKéMON?!$"
 
-SootopolisCity_Text_1E677F: @ 81E677F
+SootopolisCity_Text_WhereDidLegendariesGo: @ 81E677F
 	.string "GROUDON and KYOGRE…\n"
 	.string "Where did they go?\p"
 	.string "Will they cause droughts or downpours\n"
 	.string "somewhere else?$"
 
-SootopolisCity_Text_1E67DC: @ 81E67DC
+SootopolisCity_Text_TwoPokemonArentAngry: @ 81E67DC
 	.string "I just get this sense somehow that\n"
 	.string "the two POKéMON aren't angry.\p"
 	.string "I think… They probably can't control\n"
 	.string "their own power…$"
 
-SootopolisCity_Text_1E6853: @ 81E6853
+SootopolisCity_Text_FlyingMonStoppedRampage: @ 81E6853
 	.string "That flying POKéMON came down from\n"
 	.string "the sky and stopped the rampaging\l"
 	.string "POKéMON…$"
 
-SootopolisCity_Text_1E68A1: @ 81E68A1
+SootopolisCity_Text_WonderWhatWorldIsLike: @ 81E68A1
 	.string "I… I've never been out of this city.\p"
 	.string "I wonder what the world is like on\n"
 	.string "the other side of this round sky?$"
 
-SootopolisCity_Text_1E690B: @ 81E690B
+SootopolisCity_Text_ThisIsWicked: @ 81E690B
 	.string "Wow!\n"
 	.string "This is wicked!$"
 
-SootopolisCity_Text_1E6920: @ 81E6920
+SootopolisCity_Text_ThatWasWicked: @ 81E6920
 	.string "Wow!\n"
 	.string "That was wicked!$"
 
-SootopolisCity_Text_1E6936: @ 81E6936
+SootopolisCity_Text_GoRedAndBlueMon: @ 81E6936
 	.string "Go for it, red POKéMON!\n"
 	.string "Don't back off, blue POKéMON!$"
 
-SootopolisCity_Text_1E696C: @ 81E696C
+SootopolisCity_Text_DoYouKnowMonNames: @ 81E696C
 	.string "… … … … … …\p"
 	.string "Hi, do you know the names of those\n"
 	.string "POKéMON fighting over there?$"
 
-SootopolisCity_Text_1E69B8: @ 81E69B8
+SootopolisCity_Text_GreenOneSettlesThings: @ 81E69B8
 	.string "I was wondering which one would win,\n"
 	.string "the red one or the blue one, but, oh no,\l"
 	.string "it's the green one that settles things!\p"
 	.string "Talk about a huge turn of events!$"
 
-SootopolisCity_Text_1E6A50: @ 81E6A50
+SootopolisCity_Text_SeeingLegendWithOwnEyes: @ 81E6A50
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1537,7 +1544,7 @@ SootopolisCity_Text_1E6A50: @ 81E6A50
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_1E6B2A: @ 81E6B2A
+SootopolisCity_Text_SawLegendWithOwnEyes: @ 81E6B2A
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1546,40 +1553,40 @@ SootopolisCity_Text_1E6B2A: @ 81E6B2A
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_1E6BFF: @ 81E6BFF
+SootopolisCity_Text_BigPokemonFighting: @ 81E6BFF
 	.string "A big POKéMON is fighting with\n"
 	.string "another big POKéMON!\p"
 	.string "Please, someone make them stop!$"
 
-SootopolisCity_Text_1E6C53: @ 81E6C53
+SootopolisCity_Text_PrettyMonCameFromSky: @ 81E6C53
 	.string "A pretty POKéMON came down from\n"
 	.string "the sky…$"
 
-SootopolisCity_Text_1E6C7C: @ 81E6C7C
+SootopolisCity_Text_SootopolisWillBeWrecked: @ 81E6C7C
 	.string "Oh, no!\n"
 	.string "SOOTOPOLIS CITY will get wrecked!$"
 
-SootopolisCity_Text_1E6CA6: @ 81E6CA6
+SootopolisCity_Text_SootopolisDidntGetWrecked: @ 81E6CA6
 	.string "SOOTOPOLIS CITY didn't get wrecked!$"
 
-SootopolisCity_Text_1E6CCA: @ 81E6CCA
+SootopolisCity_Text_NoOrdinaryTourist: @ 81E6CCA
 	.string "Hm!\n"
 	.string "You've come all the way to SOOTOPOLIS?\l"
 	.string "You're no ordinary tourist.\p"
 	.string "But I suppose that doesn't make you\n"
 	.string "an extraordinary tourist, either.$"
 
-SootopolisCity_Text_1E6D57: @ 81E6D57
+SootopolisCity_Text_CityRegainedCalm: @ 81E6D57
 	.string "The city has regained its calm…$"
 
-SootopolisCity_Text_1E6D77: @ 81E6D77
+SootopolisCity_Text_CaveOfOriginPleaseLeave: @ 81E6D77
 	.string "Who might you be?\p"
 	.string "This is the CAVE OF ORIGIN.\p"
 	.string "The spirits of POKéMON, becalmed at\n"
 	.string "MT. PYRE, are said to be revived here.\p"
 	.string "Please leave.$"
 
-SootopolisCity_Text_1E6DFE: @ 81E6DFE
+SootopolisCity_Text_LeadSuperiorTrainerToCave: @ 81E6DFE
 	.string "A person with a strong will and\n"
 	.string "superior talent…\p"
 	.string "A TRAINER who has knowledge and\n"
@@ -1588,18 +1595,18 @@ SootopolisCity_Text_1E6DFE: @ 81E6DFE
 	.string "instructed by WALLACE to lead that\l"
 	.string "TRAINER to this CAVE.$"
 
-SootopolisCity_Text_1E6ED4: @ 81E6ED4
+SootopolisCity_Text_AwakenedPokemonClash: @ 81E6ED4
 	.string "Oh, my…\p"
 	.string "The clash between the two awakened\n"
 	.string "POKéMON was quelled by the awakening\l"
 	.string "of a third POKéMON…$"
 
-SootopolisCity_Text_1E6F38: @ 81E6F38
+SootopolisCity_Text_CaveOfOriginSleepsToo: @ 81E6F38
 	.string "This is the CAVE OF ORIGIN…\p"
 	.string "With the passing of the crisis,\n"
 	.string "the cave, too, shall sleep…$"
 
-SootopolisCity_Text_1E6F90: @ 81E6F90
+SootopolisCity_Text_SootopolisSkyBeautiful: @ 81E6F90
 	.string "SOOTOPOLIS sprang up as a town in\n"
 	.string "the crater of a volcano.\p"
 	.string "If you look up at the sky, the lip of\n"
@@ -1608,23 +1615,23 @@ SootopolisCity_Text_1E6F90: @ 81E6F90
 	.string "But that's what makes the sky above\n"
 	.string "SOOTOPOLIS the most beautiful.$"
 
-SootopolisCity_Text_1E7078: @ 81E7078
+SootopolisCity_Text_GiganticPokemonFight: @ 81E7078
 	.string "When two POKéMON that gigantic\n"
 	.string "are fighting that savagely, there's\l"
 	.string "not much that we can do.$"
 
-SootopolisCity_Text_1E70D4: @ 81E70D4
+SootopolisCity_Text_FearedWorstWhenPokemonFlewDown: @ 81E70D4
 	.string "When that third POKéMON flew down,\n"
 	.string "I feared the worst.$"
 
-SootopolisCity_Text_1E710B: @ 81E710B
+SootopolisCity_Text_NightSkyFavoriteScenery: @ 81E710B
 	.string "A circle of a night sky framed by\n"
 	.string "the crater of a volcano…\p"
 	.string "And in that ring, stars flicker and\n"
 	.string "blink as if they were alive…\l"
 	.string "It's my favorite scenery.$"
 
-SootopolisCity_Text_1E71A1: @ 81E71A1
+SootopolisCity_Text_WeatherWentWild: @ 81E71A1
 	.string "The weather was clear this morning,\n"
 	.string "but…\p"
 	.string "All of a sudden, dark clouds brewed up,\n"
@@ -1635,20 +1642,20 @@ SootopolisCity_Text_1E71A1: @ 81E71A1
 	.string "Is all of this because of those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_1E728C: @ 81E728C
+SootopolisCity_Text_YouBroughtFlyingMon: @ 81E728C
 	.string "Oh?\p"
 	.string "It was you who brought that flying\n"
 	.string "POKéMON here?\p"
 	.string "Well, aren't you amazing!$"
 
-SootopolisCity_Text_1E72DB: @ 81E72DB
+SootopolisCity_Text_GroudonPleaseStop: @ 81E72DB
 	.string "MAXIE: G… GROUDON…\n"
 	.string "Please! Stop what you're doing!\p"
 	.string "I know the extent of your power now!\p"
 	.string "If you keep going, all HOENN, not just\n"
 	.string "SOOTOPOLIS, will be utterly ruined!$"
 
-SootopolisCity_Text_1E737E: @ 81E737E
+SootopolisCity_Text_AfterAllOurScheming: @ 81E737E
 	.string "MAXIE: So the super-ancient POKéMON\n"
 	.string "weren't only GROUDON and KYOGRE…\p"
 	.string "After all our fruitless scheming and\n"
@@ -1658,7 +1665,7 @@ SootopolisCity_Text_1E737E: @ 81E737E
 	.string "Fu…\n"
 	.string "Fuhahaha…$"
 
-SootopolisCity_Text_1E7460: @ 81E7460
+SootopolisCity_Text_KyogreCalmDown: @ 81E7460
 	.string "ARCHIE: KYOGRE! What's wrong?!\n"
 	.string "Look over here! It's the RED ORB!\l"
 	.string "Calm down! KYOGRE!\p"
@@ -1667,7 +1674,7 @@ SootopolisCity_Text_1E7460: @ 81E7460
 	.string "It's no good!\n"
 	.string "It's not responding at all!$"
 
-SootopolisCity_Text_1E74F6: @ 81E74F6
+SootopolisCity_Text_TryingMeaninglessToPokemon: @ 81E74F6
 	.string "ARCHIE: KYOGRE and GROUDON both\n"
 	.string "flew off to who knows where.\p"
 	.string "The weather in HOENN has returned\n"
@@ -1678,7 +1685,7 @@ SootopolisCity_Text_1E74F6: @ 81E74F6
 	.string "something small, even meaningless,\l"
 	.string "to POKéMON…$"
 
-SootopolisCity_Text_1E75CB: @ 81E75CB
+SootopolisCity_Text_InvolvedWithCrisisComeWithMe: @ 81E75CB
 	.string "STEVEN: Those POKéMON fighting…\n"
 	.string "GROUDON… And KYOGRE…\p"
 	.string "The two super-ancient POKéMON\n"
@@ -1693,7 +1700,7 @@ SootopolisCity_Text_1E75CB: @ 81E75CB
 	.string "I'd like you to meet.\p"
 	.string "Come with me, please.$"
 
-SootopolisCity_Text_1E7737: @ 81E7737
+SootopolisCity_Text_DoesThisMakeYourFearPokemon: @ 81E7737
 	.string "STEVEN: Listen, {PLAYER}{KUN}.\p"
 	.string "Does seeing GROUDON and KYOGRE make\n"
 	.string "you think POKéMON are to be feared?\p"
@@ -1702,34 +1709,34 @@ SootopolisCity_Text_1E7737: @ 81E7737
 	.string "…Why am I asking you this?\n"
 	.string "You already know.$"
 
-SootopolisCity_Text_1E77F0: @ 81E77F0
+SootopolisCity_Text_HereWereAreHelpWallace: @ 81E77F0
 	.string "STEVEN: Okay, here we are!\p"
 	.string "Inside here you'll find someone named\n"
 	.string "WALLACE.\p"
 	.string "I think you have what's needed to\n"
 	.string "help him…$"
 
-SootopolisCity_Text_1E7866: @ 81E7866
+SootopolisCity_Text_KnowWhatsNeededToHelpHim: @ 81E7866
 	.string "STEVEN: I think you have what's\n"
 	.string "needed to help him…$"
 
-SootopolisCity_Text_1E789A: @ 81E789A
+SootopolisCity_Text_NeverBeenToSkyPillar: @ 81E789A
 	.string "STEVEN: The SKY PILLAR…\p"
 	.string "I've never been there.\n"
 	.string "I wonder where it could be?$"
 
-SootopolisCity_Text_1E78E5: @ 81E78E5
+SootopolisCity_Text_SoThatsRayquaza: @ 81E78E5
 	.string "STEVEN: So that's RAYQUAZA…\p"
 	.string "It's incredible how the two rampaging\n"
 	.string "POKéMON would flee from it in fear…$"
 
-SootopolisCity_Text_1E794B: @ 81E794B
+SootopolisCity_Text_MaxieArchieLeft: @ 81E794B
 	.string "STEVEN: It looks like both MAXIE and\n"
 	.string "ARCHIE have gone away somewhere.\p"
 	.string "Perhaps they've gone to MT. PYRE to\n"
 	.string "return those ORBS…$"
 
-SootopolisCity_Text_1E79C8: @ 81E79C8
+SootopolisCity_Text_HaventYouScaledSkyPillar: @ 81E79C8
 	.string "WALLACE: Oh?\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "Haven't you scaled the SKY PILLAR\n"
@@ -1737,14 +1744,14 @@ SootopolisCity_Text_1E79C8: @ 81E79C8
 	.string "I'm sure that you can make it to\n"
 	.string "the top of the SKY PILLAR…$"
 
-SootopolisCity_Text_1E7A3E: @ 81E7A3E
+SootopolisCity_Text_AquaMagmaDidntMeanHarm: @ 81E7A3E
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "The leaders of TEAM MAGMA and AQUA,\n"
 	.string "I don't think they meant harm.\p"
 	.string "It wouldn't hurt to hear what they\n"
 	.string "have to say for themselves.$"
 
-SootopolisCity_Text_1E7ACF: @ 81E7ACF
+SootopolisCity_Text_ThankYouForHelpAcceptThis: @ 81E7ACF
 	.string "WALLACE: {PLAYER}{KUN}…\n"
 	.string "My eyes didn't deceive me.\p"
 	.string "Thanks to your help, SOOTOPOLIS…\n"
@@ -1753,7 +1760,7 @@ SootopolisCity_Text_1E7ACF: @ 81E7ACF
 	.string "This is a gift from me.\n"
 	.string "Please accept it.$"
 
-SootopolisCity_Text_1E7B86: @ 81E7B86
+SootopolisCity_Text_ExplainWaterfallGoToGym: @ 81E7B86
 	.string "That HIDDEN MACHINE contains\n"
 	.string "WATERFALL.\p"
 	.string "If you have the RAIN BADGE, a POKéMON\n"
@@ -1766,7 +1773,7 @@ SootopolisCity_Text_1E7B86: @ 81E7B86
 	.string "When you're all set to go, step through\n"
 	.string "that door.$"
 
-SootopolisCity_Text_1E7CBC: @ 81E7CBC
+SootopolisCity_Text_DazzledByMentor: @ 81E7CBC
 	.string "WALLACE: I'm sure that you will be\n"
 	.string "dazzled by my mentor's breathtakingly\l"
 	.string "elegant battle style.$"
diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json
index 2be2adebe..bd1488d14 100644
--- a/data/maps/SootopolisCity_House1/map.json
+++ b/data/maps/SootopolisCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House1_EventScript_22694D",
+      "script": "SootopolisCity_House1_EventScript_BrickBreakBlackBelt",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House1_EventScript_22698E",
+      "script": "SootopolisCity_House1_EventScript_Kecleon",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 13b581c71..d38e35494 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -1,44 +1,44 @@
 SootopolisCity_House1_MapScripts:: @ 822694C
 	.byte 0
 
-SootopolisCity_House1_EventScript_22694D:: @ 822694D
+SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 822694D
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_226984
-	msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_ReceivedBrickBreak
+	msgbox SootopolisCity_House1_Text_DevelopedThisTM, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM31
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM31
-	msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House1_EventScript_226984:: @ 8226984
-	msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT
+SootopolisCity_House1_EventScript_ReceivedBrickBreak:: @ 8226984
+	msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House1_EventScript_22698E:: @ 822698E
+SootopolisCity_House1_EventScript_Kecleon:: @ 822698E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox SootopolisCity_House1_Text_226A60, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SootopolisCity_House1_Text_2269A1: @ 82269A1
+SootopolisCity_House1_Text_DevelopedThisTM: @ 82269A1
 	.string "For thirty years I've remained in\n"
 	.string "SOOTOPOLIS honing my skills.\p"
 	.string "I developed a shattering TM.\n"
 	.string "I bequeath it to you!$"
 
-SootopolisCity_House1_Text_226A13: @ 8226A13
+SootopolisCity_House1_Text_ExplainBrickBreak: @ 8226A13
 	.string "TM31 contains BRICK BREAK! It's a move\n"
 	.string "so horrible that I can't describe it.$"
 
-SootopolisCity_House1_Text_226A60: @ 8226A60
+SootopolisCity_House1_Text_Kecleon: @ 8226A60
 	.string "KECLEON: Puu puhyaah.$"
 
diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json
index af03fdff5..ae30df6c6 100644
--- a/data/maps/SootopolisCity_House2/map.json
+++ b/data/maps/SootopolisCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House2_EventScript_226A77",
+      "script": "SootopolisCity_House2_EventScript_ExpertF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 9e45a09bf..31388cbb4 100644
--- a/data/maps/SootopolisCity_House2/scripts.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
@@ -1,36 +1,36 @@
 SootopolisCity_House2_MapScripts:: @ 8226A76
 	.byte 0
 
-SootopolisCity_House2_EventScript_226A77:: @ 8226A77
+SootopolisCity_House2_EventScript_ExpertF:: @ 8226A77
 	lock
 	faceplayer
-	msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	call_if_eq SootopolisCity_House2_EventScript_226A99
-	compare VAR_RESULT, 0
-	call_if_eq SootopolisCity_House2_EventScript_226AA2
+	msgbox SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	call_if_eq SootopolisCity_House2_EventScript_KnowAboutOrbs
+	compare VAR_RESULT, NO
+	call_if_eq SootopolisCity_House2_EventScript_DontKnowAboutOrbs
 	release
 	end
 
-SootopolisCity_House2_EventScript_226A99:: @ 8226A99
-	msgbox SootopolisCity_House2_Text_226AF1, MSGBOX_DEFAULT
+SootopolisCity_House2_EventScript_KnowAboutOrbs:: @ 8226A99
+	msgbox SootopolisCity_House2_Text_YesTwoOrbsSideBySide, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2
-	msgbox SootopolisCity_House2_Text_226B41, MSGBOX_DEFAULT
+SootopolisCity_House2_EventScript_DontKnowAboutOrbs:: @ 8226AA2
+	msgbox SootopolisCity_House2_Text_OughtToVisitAndSee, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_Text_226AAB: @ 8226AAB
+SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs: @ 8226AAB
 	.string "MT. PYRE…\p"
 	.string "At its peak are two orbs placed side\n"
 	.string "by side. Did you know?$"
 
-SootopolisCity_House2_Text_226AF1: @ 8226AF1
+SootopolisCity_House2_Text_YesTwoOrbsSideBySide: @ 8226AF1
 	.string "Yes, two orbs side by side…\p"
 	.string "The sight of them together…\n"
 	.string "It is somehow soothing…$"
 
-SootopolisCity_House2_Text_226B41: @ 8226B41
+SootopolisCity_House2_Text_OughtToVisitAndSee: @ 8226B41
 	.string "Is that so?\n"
 	.string "Perhaps you ought to visit and see…$"
 
diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json
index af925c4c9..b87274eee 100644
--- a/data/maps/SootopolisCity_House3/map.json
+++ b/data/maps/SootopolisCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House3_EventScript_226B72",
+      "script": "SootopolisCity_House3_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House3_EventScript_226B9B",
+      "script": "SootopolisCity_House3_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc
index d7439f18d..c22a29a94 100644
--- a/data/maps/SootopolisCity_House3/scripts.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
@@ -1,41 +1,41 @@
 SootopolisCity_House3_MapScripts:: @ 8226B71
 	.byte 0
 
-SootopolisCity_House3_EventScript_226B72:: @ 8226B72
+SootopolisCity_House3_EventScript_Woman:: @ 8226B72
 	lock
 	faceplayer
-	msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_House3_EventScript_226B91
-	msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House3_Text_JuanHasManyFansDoYou, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SootopolisCity_House3_EventScript_HaveFans
+	msgbox SootopolisCity_House3_Text_LonesomeTryWorkingHarder, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House3_EventScript_226B91:: @ 8226B91
-	msgbox SootopolisCity_House3_Text_226C20, MSGBOX_DEFAULT
+SootopolisCity_House3_EventScript_HaveFans:: @ 8226B91
+	msgbox SootopolisCity_House3_Text_YouMustBePrettyStrong, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B
-	msgbox SootopolisCity_House3_Text_226C9C, MSGBOX_NPC
+SootopolisCity_House3_EventScript_Girl:: @ 8226B9B
+	msgbox SootopolisCity_House3_Text_TrainerFanClubWasWild, MSGBOX_NPC
 	end
 
-SootopolisCity_House3_Text_226BA4: @ 8226BA4
+SootopolisCity_House3_Text_JuanHasManyFansDoYou: @ 8226BA4
 	.string "You're a POKéMON TRAINER, aren't you?\p"
 	.string "SOOTOPOLIS's JUAN has many fans.\n"
 	.string "Even more than his student WALLACE!\p"
 	.string "Do you have any?$"
 
-SootopolisCity_House3_Text_226C20: @ 8226C20
+SootopolisCity_House3_Text_YouMustBePrettyStrong: @ 8226C20
 	.string "Oh, then you must be pretty strong.$"
 
-SootopolisCity_House3_Text_226C44: @ 8226C44
+SootopolisCity_House3_Text_LonesomeTryWorkingHarder: @ 8226C44
 	.string "Oh, dear…\n"
 	.string "That's a little lonesome.\p"
 	.string "Try working a little harder to get\n"
 	.string "a fan following.$"
 
-SootopolisCity_House3_Text_226C9C: @ 8226C9C
+SootopolisCity_House3_Text_TrainerFanClubWasWild: @ 8226C9C
 	.string "Dedicated fans come over from even\n"
 	.string "outside of HOENN.\p"
 	.string "It was really wild when I went to the\n"
diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json
index db7ffd5d4..586c88e90 100644
--- a/data/maps/SootopolisCity_House4/map.json
+++ b/data/maps/SootopolisCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D16",
+      "script": "SootopolisCity_House4_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D1F",
+      "script": "SootopolisCity_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D28",
+      "script": "SootopolisCity_House4_EventScript_Azumarill",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc
index a8aa58548..861da06d2 100644
--- a/data/maps/SootopolisCity_House4/scripts.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
@@ -1,25 +1,25 @@
 SootopolisCity_House4_MapScripts:: @ 8226D15
 	.byte 0
 
-SootopolisCity_House4_EventScript_226D16:: @ 8226D16
-	msgbox SootopolisCity_House4_Text_226D3B, MSGBOX_NPC
+SootopolisCity_House4_EventScript_Man:: @ 8226D16
+	msgbox SootopolisCity_House4_Text_AncientTreasuresWaitingInSea, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F
-	msgbox SootopolisCity_House4_Text_226DEA, MSGBOX_NPC
+SootopolisCity_House4_EventScript_Woman:: @ 8226D1F
+	msgbox SootopolisCity_House4_Text_StrollUnderwaterWithPokemon, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_226D28:: @ 8226D28
+SootopolisCity_House4_EventScript_Azumarill:: @ 8226D28
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SootopolisCity_House4_Text_226E7F, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House4_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SootopolisCity_House4_Text_226D3B: @ 8226D3B
+SootopolisCity_House4_Text_AncientTreasuresWaitingInSea: @ 8226D3B
 	.string "Listen up, and I'll tell you something\n"
 	.string "good.\p"
 	.string "There's supposed to be an ancient\n"
@@ -27,13 +27,13 @@ SootopolisCity_House4_Text_226D3B: @ 8226D3B
 	.string "There could be treasures just waiting\n"
 	.string "to be discovered down there.$"
 
-SootopolisCity_House4_Text_226DEA: @ 8226DEA
+SootopolisCity_House4_Text_StrollUnderwaterWithPokemon: @ 8226DEA
 	.string "Ancient treasures…\p"
 	.string "It would be nice if they existed, but\n"
 	.string "even if they didn't, it would be so\l"
 	.string "beautiful to take an underwater\l"
 	.string "stroll with my POKéMON.$"
 
-SootopolisCity_House4_Text_226E7F: @ 8226E7F
+SootopolisCity_House4_Text_Azumarill: @ 8226E7F
 	.string "AZUMARILL: Marurii.$"
 
diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json
index 5e20e33df..fcfce0abb 100644
--- a/data/maps/SootopolisCity_House5/map.json
+++ b/data/maps/SootopolisCity_House5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House5_EventScript_226E94",
+      "script": "SootopolisCity_House5_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House5_EventScript_226E9D",
+      "script": "SootopolisCity_House5_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 04b9feca2..027a35bcf 100644
--- a/data/maps/SootopolisCity_House5/scripts.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
@@ -1,20 +1,20 @@
 SootopolisCity_House5_MapScripts:: @ 8226E93
 	.byte 0
 
-SootopolisCity_House5_EventScript_226E94:: @ 8226E94
-	msgbox SootopolisCity_House5_Text_226EA6, MSGBOX_NPC
+SootopolisCity_House5_EventScript_Maniac:: @ 8226E94
+	msgbox SootopolisCity_House5_Text_SootopolisMtPyreConnection, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D
-	msgbox SootopolisCity_House5_Text_226F35, MSGBOX_NPC
+SootopolisCity_House5_EventScript_Girl:: @ 8226E9D
+	msgbox SootopolisCity_House5_Text_BrotherUsedToStudySea, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_Text_226EA6: @ 8226EA6
+SootopolisCity_House5_Text_SootopolisMtPyreConnection: @ 8226EA6
 	.string "There appears to be some connection\n"
 	.string "between SOOTOPOLIS and MT. PYRE.\p"
 	.string "My friends and I did some research on\n"
 	.string "it at the lab where I used to work.$"
 
-SootopolisCity_House5_Text_226F35: @ 8226F35
+SootopolisCity_House5_Text_BrotherUsedToStudySea: @ 8226F35
 	.string "My big brother used to study the sea.$"
 
diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json
index 717590318..bd7e23882 100644
--- a/data/maps/SootopolisCity_House6/map.json
+++ b/data/maps/SootopolisCity_House6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House6_EventScript_226F5C",
+      "script": "SootopolisCity_House6_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc
index bd9c8fe51..bd3ce0742 100644
--- a/data/maps/SootopolisCity_House6/scripts.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
@@ -1,55 +1,55 @@
 SootopolisCity_House6_MapScripts:: @ 8226F5B
 	.byte 0
 
-SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C
+SootopolisCity_House6_EventScript_Woman:: @ 8226F5C
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_226FA3
-	msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	call_if_eq SootopolisCity_House6_EventScript_226F99
-	msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_ReceivedWailmerDoll
+	msgbox SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	call_if_eq SootopolisCity_House6_EventScript_DeclineWailmerDoll
+	msgbox SootopolisCity_House6_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
 	givedecoration_std DECOR_WAILMER_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_House6_EventScript_226FAD
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_House6_EventScript_NoRoomForWailmerDoll
 	setflag FLAG_RECEIVED_WAILMER_DOLL
 	release
 	end
 
-SootopolisCity_House6_EventScript_226F99:: @ 8226F99
-	msgbox SootopolisCity_House6_Text_22708F, MSGBOX_DEFAULT
+SootopolisCity_House6_EventScript_DeclineWailmerDoll:: @ 8226F99
+	msgbox SootopolisCity_House6_Text_DontWantThisDoll, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3
-	msgbox SootopolisCity_House6_Text_2270B7, MSGBOX_DEFAULT
+SootopolisCity_House6_EventScript_ReceivedWailmerDoll:: @ 8226FA3
+	msgbox SootopolisCity_House6_Text_LovePlushDolls, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD
+SootopolisCity_House6_EventScript_NoRoomForWailmerDoll:: @ 8226FAD
 	bufferdecorationname 1, DECOR_WAILMER_DOLL
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
-	msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House6_Text_IllHoldItForYou, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_Text_226FC3: @ 8226FC3
+SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll: @ 8226FC3
 	.string "Hello! You're our first guest in\n"
 	.string "a good while.\p"
 	.string "You've brightened up my day, so I'll\n"
 	.string "give you a big WAILMER DOLL.$"
 
-SootopolisCity_House6_Text_227034: @ 8227034
+SootopolisCity_House6_Text_TakeGoodCareOfIt: @ 8227034
 	.string "Take good care of it!$"
 
-SootopolisCity_House6_Text_22704A: @ 822704A
+SootopolisCity_House6_Text_IllHoldItForYou: @ 822704A
 	.string "Oh, you want it, but not right now?\n"
 	.string "Okay, then I'll hold it for you.$"
 
-SootopolisCity_House6_Text_22708F: @ 822708F
+SootopolisCity_House6_Text_DontWantThisDoll: @ 822708F
 	.string "Are you sure?\n"
 	.string "You don't want this DOLL?$"
 
-SootopolisCity_House6_Text_2270B7: @ 82270B7
+SootopolisCity_House6_Text_LovePlushDolls: @ 82270B7
 	.string "I love plush DOLLS!$"
 
diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json
index 4d500fcb0..497b36bba 100644
--- a/data/maps/SootopolisCity_House7/map.json
+++ b/data/maps/SootopolisCity_House7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House7_EventScript_2270CC",
+      "script": "SootopolisCity_House7_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House7_EventScript_2270D5",
+      "script": "SootopolisCity_House7_EventScript_PokefanF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc
index eac8ef346..b7b11208e 100644
--- a/data/maps/SootopolisCity_House7/scripts.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House7_MapScripts:: @ 82270CB
 	.byte 0
 
-SootopolisCity_House7_EventScript_2270CC:: @ 82270CC
-	msgbox SootopolisCity_House7_Text_2270DE, MSGBOX_NPC
+SootopolisCity_House7_EventScript_OldMan:: @ 82270CC
+	msgbox SootopolisCity_House7_Text_CityFromEruptedVolcano, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_EventScript_2270D5:: @ 82270D5
-	msgbox SootopolisCity_House7_Text_227190, MSGBOX_NPC
+SootopolisCity_House7_EventScript_PokefanF:: @ 82270D5
+	msgbox SootopolisCity_House7_Text_CaveMadeToKeepSomething, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_Text_2270DE: @ 82270DE
+SootopolisCity_House7_Text_CityFromEruptedVolcano: @ 82270DE
 	.string "An underwater volcano erupted and\n"
 	.string "forced itself up from the depths.\p"
 	.string "Its crater emerged from the sea and\n"
@@ -17,7 +17,7 @@ SootopolisCity_House7_Text_2270DE: @ 82270DE
 	.string "That's how SOOTOPOLIS CITY came into\n"
 	.string "being.$"
 
-SootopolisCity_House7_Text_227190: @ 8227190
+SootopolisCity_House7_Text_CaveMadeToKeepSomething: @ 8227190
 	.string "The cave that links SOOTOPOLIS and\n"
 	.string "the outside world…\p"
 	.string "It seems as if the cave was made to\n"
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
index d7ed8b980..bf19b4e03 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D"
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord"
     },
     {
       "type": "sign",
@@ -73,7 +73,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B"
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
index 17debe321..a9f3ffdf4 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
@@ -1,119 +1,119 @@
 SootopolisCity_LotadAndSeedotHouse_MapScripts:: @ 822722A
 	.byte 0
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother:: @ 822722B
 	special GetSeedotSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT
-	special sub_81B94B0
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot, MSGBOX_DEFAULT
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, 255
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot
 	special CompareSeedotSize
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot
 	compare VAR_RESULT, 2
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot
 	compare VAR_RESULT, 3
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot:: @ 8227272
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot:: @ 822727C
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot:: @ 8227286
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT
 	giveitem_std ITEM_ELIXIR
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1
 	closemessage
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1:: @ 82272B2
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother:: @ 82272BC
 	special GetLotadSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT
-	special sub_81B94B0
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad, MSGBOX_DEFAULT
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, 255
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad
 	special CompareLotadSize
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad
 	compare VAR_RESULT, 2
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad
 	compare VAR_RESULT, 3
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad:: @ 8227303
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad:: @ 822730D
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad:: @ 8227317
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT
 	giveitem_std ITEM_ELIXIR
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2
 	closemessage
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2:: @ 8227343
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord:: @ 822734D
 	special GetSeedotSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord:: @ 822735B
 	special GetLotadSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot: @ 8227369
 	.string "Do you know the POKéMON SEEDOT?\n"
 	.string "It's hardly ever seen in SOOTOPOLIS.\p"
 	.string "Anyway, I love big SEEDOT.\n"
@@ -125,7 +125,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369
 	.string "Huh? Do you have a SEEDOT with you?\n"
 	.string "P-p-please, show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480
+SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad: @ 8227480
 	.string "{STR_VAR_2} inches!\n"
 	.string "Oh, my gosh, this is a big one!\p"
 	.string "It might even beat the big LOTAD\n"
@@ -133,35 +133,36 @@ SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480
 	.string "Thanks for showing me.\n"
 	.string "This is my thanks!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22750E: @ 822750E
+@ Unused
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion1: @ 822750E
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1: @ 8227524
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot: @ 8227544
 	.string "{STR_VAR_2} inches, is it?\p"
 	.string "Hmm… I've seen a bigger SEEDOT\n"
 	.string "than this one.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot: @ 8227584
 	.string "Oh, now this is quite something…\n"
 	.string "But it's not a SEEDOT!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot: @ 82275BC
 	.string "You don't have a big SEEDOT?\n"
 	.string "That's too bad…\p"
 	.string "If you get a big SEEDOT, please\n"
 	.string "come show me.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory: @ 8227617
 	.string "The biggest SEEDOT in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p"
 	.string "A SEEDOT bigger than a LOTAD\n"
 	.string "always wanted!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad: @ 8227676
 	.string "Do you know the POKéMON LOTAD?\n"
 	.string "It's rarely seen in SOOTOPOLIS.\p"
 	.string "I love, I mean love, big LOTAD!\p"
@@ -172,7 +173,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676
 	.string "Hunh? Do you have a LOTAD?\n"
 	.string "P-p-please show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C
+SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot: @ 822776C
 	.string "{STR_VAR_2} inches!\n"
 	.string "Wow, that is big!\p"
 	.string "It might be even bigger than the huge\n"
@@ -180,29 +181,30 @@ SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C
 	.string "Thanks for showing me!\n"
 	.string "This is my thanks!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2277F4: @ 82277F4
+@ Unused
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion2: @ 82277F4
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2: @ 822780A
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad: @ 822782A
 	.string "{STR_VAR_2} inches?\p"
 	.string "Hmm… I've seen a bigger LOTAD\n"
 	.string "than this one here.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad: @ 8227867
 	.string "Well, isn't this something!\n"
 	.string "But it's no LOTAD!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad: @ 8227896
 	.string "Don't you have a big LOTAD?\n"
 	.string "How disappointing…\p"
 	.string "If you get a big LOTAD, please\n"
 	.string "come show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory: @ 82278F2
 	.string "The biggest LOTAD in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p"
 	.string "A LOTAD bigger than a SEEDOT\n"
diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json
index e9b978013..9d8ef277d 100644
--- a/data/maps/SootopolisCity_Mart/map.json
+++ b/data/maps/SootopolisCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_226795",
+      "script": "SootopolisCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_2267C2",
+      "script": "SootopolisCity_Mart_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_2267EC",
+      "script": "SootopolisCity_Mart_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 0b477ce47..f7856916c 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -1,17 +1,17 @@
 SootopolisCity_Mart_MapScripts:: @ 8226794
 	.byte 0
 
-SootopolisCity_Mart_EventScript_226795:: @ 8226795
+SootopolisCity_Mart_EventScript_Clerk:: @ 8226795
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SootopolisCity_Mart_Pokemart_2267AC
+	pokemart SootopolisCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
+SootopolisCity_Mart_Pokemart: @ 82267AC
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -25,54 +25,54 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2
+SootopolisCity_Mart_EventScript_FatMan:: @ 82267C2
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_Mart_EventScript_2267E2
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2
-	msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_Mart_EventScript_FatManNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_FatManNoLegendaries
+	msgbox SootopolisCity_Mart_Text_TooScaryOutside, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2
-	msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT
+SootopolisCity_Mart_EventScript_FatManNoLegendaries:: @ 82267E2
+	msgbox SootopolisCity_Mart_Text_PPUpIsGreat, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC
+SootopolisCity_Mart_EventScript_Gentleman:: @ 82267EC
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_Mart_EventScript_22680C
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C
-	msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_Mart_EventScript_GentlemanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_GentlemanNoLegendaries
+	msgbox SootopolisCity_Mart_Text_DidSomethingAwaken, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_22680C:: @ 822680C
-	msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT
+SootopolisCity_Mart_EventScript_GentlemanNoLegendaries:: @ 822680C
+	msgbox SootopolisCity_Mart_Text_FullRestoreItemOfDreams, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_Text_226816: @ 8226816
+SootopolisCity_Mart_Text_PPUpIsGreat: @ 8226816
 	.string "PP UP is great!\p"
 	.string "It raises the POWER POINTS, the PP,\n"
 	.string "of a POKéMON move.$"
 
-SootopolisCity_Mart_Text_22685D: @ 822685D
+SootopolisCity_Mart_Text_TooScaryOutside: @ 822685D
 	.string "What…\n"
 	.string "What is happening?\p"
 	.string "I really want to know, but it's too\n"
 	.string "scary to go outside.$"
 
-SootopolisCity_Mart_Text_2268AF: @ 82268AF
+SootopolisCity_Mart_Text_FullRestoreItemOfDreams: @ 82268AF
 	.string "Do you know FULL RESTORE?\p"
 	.string "Full restoration of HP!\n"
 	.string "Eradication of all status problems!\p"
 	.string "It's truly an item of your dreams!$"
 
-SootopolisCity_Mart_Text_226928: @ 8226928
+SootopolisCity_Mart_Text_DidSomethingAwaken: @ 8226928
 	.string "This weather…\n"
 	.string "Did something awaken?$"
 
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
index 791b9fdaa..014a07dde 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24",
+      "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index e6e522908..beb7e2455 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -1,240 +1,243 @@
 SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_OnFrame
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
-	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
+	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
+SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
+SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor:: @ 8227991
 	setobjectxyperm 1, 2, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+SootopolisCity_MysteryEventsHouse_1F_OnFrame: @ 822799D
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279B7
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs
 	waitmovement 0
-	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
+	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer
 	waitmovement 0
 	copyobjectxytoperm 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment
 	special LoadPlayerParty
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment:: @ 8227A04
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment:: @ 8227A0D
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment:: @ 8227A16
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs: @ 8227A1F
 	walk_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer: @ 8227A21
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan:: @ 8227A24
 	lock
 	faceplayer
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer
 	compare VAR_TEMP_1, 1
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer:: @ 8227A4E
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
+SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting:: @ 8227A58
 	special SavePlayerParty
 	special BufferEReaderTrainerName
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
+	call SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
 	special LoadPlayerParty
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
 	special SavePlayerParty
 	special ReducePlayerPartyToSelectedMons
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest
 	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
 	waitstate
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
+SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
 	special LoadPlayerParty
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth:: @ 8227AFE
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast:: @ 8227B10
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest:: @ 8227B22
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth: @ 8227B34
 	delay_16
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast: @ 8227B38
 	delay_16
 	walk_right
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest: @ 8227B3C
 	delay_16
 	walk_left
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft: @ 8227B40
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight: @ 8227B43
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46
+SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles: @ 8227B46
 	.string "When I was young, I traveled the world\n"
 	.string "as a POKéMON TRAINER.\p"
 	.string "Now that I've become an old buzzard,\n"
 	.string "my only amusement is watching young\l"
 	.string "TRAINERS battle.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD
+SootopolisCity_MysteryEventsHouse_1F_Text_DoorAppearsToBeLocked: @ 8227BDD
 	.string "The door appears to be locked.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC
+SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer: @ 8227BFC
 	.string "A TRAINER named {STR_VAR_1}\n"
 	.string "is visiting my home.\p"
 	.string "Would you like to challenge\n"
 	.string "{STR_VAR_1}?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44
+SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle: @ 8227C44
 	.string "You won't battle? I'm disappointed\n"
 	.string "that I can't see you battle…$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84
+SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3: @ 8227C84
 	.string "Oh, good, good!\p"
 	.string "But my house isn't all that sturdy.\p"
 	.string "Could I ask you to keep it down to\n"
 	.string "a 3-on-3 match?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB
+SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle: @ 8227CEB
 	.string "Before you two battle, you should\n"
 	.string "save your progress.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21
+SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch: @ 8227D21
 	.string "I hope to see a good match!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Tie: @ 8227D3D
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40
+SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw: @ 8227D40
 	.string "The match ended up a draw.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B
+SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff: @ 8227D5B
 	.string "So, it became a standoff.\p"
 	.string "It was a brilliant match in which\n"
 	.string "neither side conceded a step!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Won: @ 8227DB5
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8
+SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative: @ 8227DB8
 	.string "That was superlative!\p"
 	.string "Why, it was like seeing myself in\n"
 	.string "my youth again!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Lost: @ 8227E00
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03
+SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou: @ 8227E03
 	.string "Ah, too bad for you!\p"
 	.string "But it was a good match.\n"
 	.string "I hope you can win next time.$"
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
index 16533649c..9699eb5e8 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
@@ -1,19 +1,19 @@
 SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_OnFrame
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_B1F_OnTransition: @ 8227E5A
 	special SetEReaderTrainerGfxId
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E
-	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68
+SootopolisCity_MysteryEventsHouse_B1F_OnFrame: @ 8227E5E
+	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227E68
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement
 	waitmovement 0
 	special CopyEReaderTrainerGreeting
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -23,14 +23,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	special DoSpecialTrainerBattle
 	waitstate
 	compare VAR_RESULT, 3
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie
 	compare VAR_RESULT, 1
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon
 	compare VAR_RESULT, 2
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost
 	closemessage
 	special HealPlayerParty
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement
 	waitmovement 0
 	special LoadPlayerParty
 	setvar VAR_TEMP_1, 1
@@ -39,26 +39,26 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie:: @ 8227ECF
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
-	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon:: @ 8227EDD
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost:: @ 8227EE8
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement: @ 8227EF3
 	walk_down
 	walk_down
 	walk_down
@@ -66,7 +66,7 @@ SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
 	walk_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement: @ 8227EF9
 	walk_left
 	walk_left
 	walk_up
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
index a2307dc10..4a5eec747 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index d2b546831..d8ff4e7f6 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC
 	setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
+@ VAR_0x800B is the Nurse's object event id
+SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: @ 8226500
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,37 +16,37 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E
+SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 822650E
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E
-	msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries
+	msgbox SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E
-	msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT
+SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries:: @ 822652E
+	msgbox SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538
+SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 8226538
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558
-	msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries
+	msgbox SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558
-	msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT
+SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries:: @ 8226558
+	msgbox SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562
+SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn: @ 8226562
 	.string "WALLACE is rumored to be the toughest\n"
 	.string "TRAINER in the whole HOENN region.\p"
 	.string "This town's GYM is led by the TRAINER\n"
@@ -54,19 +55,19 @@ SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562
 	.string "even stronger than WALLACE's mentor.\p"
 	.string "How strong could they be?$"
 
-SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B
+SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge: @ 822664B
 	.string "Everyone in town has taken refuge\n"
 	.string "and won't come out of their homes.\p"
 	.string "Even I would rather not venture\n"
 	.string "outside.$"
 
-SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9
+SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon: @ 82266B9
 	.string "Whenever, wherever, and whatever\n"
 	.string "happens, I will always be friends with\l"
 	.string "POKéMON.\p"
 	.string "Because it's fun to be with POKéMON!$"
 
-SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F
+SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends: @ 822672F
 	.string "Aren't POKéMON our friends?\p"
 	.string "Why are they going wild this way?$"
 
diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json
index 26447c163..cf8be2227 100644
--- a/data/maps/SouthernIsland_Exterior/map.json
+++ b/data/maps/SouthernIsland_Exterior/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SouthernIsland_Exterior_EventScript_2429D2",
+      "script": "SouthernIsland_Exterior_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -65,7 +65,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SouthernIsland_Exterior_EventScript_242A3C"
+      "script": "SouthernIsland_Exterior_EventScript_Sign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index f5879e1e8..17ff25fdb 100644
--- a/data/maps/SouthernIsland_Exterior/scripts.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -6,12 +6,12 @@ SouthernIsland_Exterior_OnTransition: @ 82429CE
 	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end
 
-SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
+SouthernIsland_Exterior_EventScript_Sailor:: @ 82429D2
 	lock
 	faceplayer
 	msgbox EventTicket_Text_SouthernIslandSailBack, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq SouthernIsland_Exterior_EventScript_242A17
+	compare VAR_RESULT, NO
+	goto_if_eq SouthernIsland_Exterior_EventScript_AsYouLike
 	msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -19,37 +19,37 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
 	delay 30
 	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
 	setvar VAR_0x8004, 2
-	call SouthernIsland_Exterior_EventScript_272250
+	call Common_EventScript_FerryDepartIsland
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17
+SouthernIsland_Exterior_EventScript_AsYouLike:: @ 8242A17
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A37
+Ferry_EventScript_DepartIslandSouth:: @ 8242A21
+	applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A39
+Ferry_EventScript_DepartIslandWest:: @ 8242A2C
+	applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37
+Ferry_EventScript_DepartIslandBoardSouth: @ 8242A37
 	walk_down
 	step_end
 
-BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39
+Ferry_EventScript_DepartIslandBoardWest: @ 8242A39
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C
+SouthernIsland_Exterior_EventScript_Sign:: @ 8242A3C
 	msgbox SouthernIsland_Exterior_Text_Sign, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json
index 5fd8354f6..a647076ba 100644
--- a/data/maps/SouthernIsland_Interior/map.json
+++ b/data/maps/SouthernIsland_Interior/map.json
@@ -65,7 +65,7 @@
       "y": 11,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SouthernIsland_Interior_EventScript_242AC4"
+      "script": "SouthernIsland_Interior_EventScript_TryLatiEncounter"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 7f4a55f29..7a2a04771 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -1,13 +1,13 @@
 SouthernIsland_Interior_MapScripts:: @ 8242A45
-	map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50
+	map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition
 	.byte 0
 
-SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_242A5A
+SouthernIsland_Interior_OnResume: @ 8242A50
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_TryRemoveLati
 	end
 
-SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
+SouthernIsland_Interior_EventScript_TryRemoveLati:: @ 8242A5A
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -16,53 +16,53 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
 
 SouthernIsland_Interior_OnTransition: @ 8242A6E
 	compare VAR_ROAMER_POKEMON, 0
-	call_if_eq SouthernIsland_Interior_EventScript_242A8A
+	call_if_eq SouthernIsland_Interior_EventScript_SetUpLatios
 	compare VAR_ROAMER_POKEMON, 0
-	call_if_ne SouthernIsland_Interior_EventScript_242A95
-	call SouthernIsland_Interior_EventScript_242AA0
+	call_if_ne SouthernIsland_Interior_EventScript_SetUpLatias
+	call SouthernIsland_Interior_EventScript_SetUpPlayerGfx
 	end
 
-SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A
+SouthernIsland_Interior_EventScript_SetUpLatios:: @ 8242A8A
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS
 	setvar VAR_TEMP_4, SPECIES_LATIOS
 	return
 
-SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
+SouthernIsland_Interior_EventScript_SetUpLatias:: @ 8242A95
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS
 	setvar VAR_TEMP_4, SPECIES_LATIAS
 	return
 
-SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
+SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq SouthernIsland_Interior_EventScript_242AB8
+	goto_if_eq SouthernIsland_Interior_EventScript_SetBrendanGfx
 	compare VAR_RESULT, FEMALE
-	goto_if_eq SouthernIsland_Interior_EventScript_242ABE
+	goto_if_eq SouthernIsland_Interior_EventScript_SetMayGfx
 	end
 
-SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8
+SouthernIsland_Interior_EventScript_SetBrendanGfx:: @ 8242AB8
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE
+SouthernIsland_Interior_EventScript_SetMayGfx:: @ 8242ABE
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4
+SouthernIsland_Interior_EventScript_TryLatiEncounter:: @ 8242AC4
 	lockall
 	setvar VAR_0x8008, 12
-	goto SouthernIsland_Interior_EventScript_242AD0
+	goto SouthernIsland_Interior_EventScript_Lati
 	end
 
-SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
-	goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A
-	goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A
-	goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A
+SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0
+	goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_Sign
+	goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
+	goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_Sign
 	setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS
 	setflag FLAG_TEMP_2
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCA
+	applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp
 	waitmovement 0
 	delay 50
 	waitse
@@ -71,68 +71,68 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	waitmoncry
 	addobject 2
 	delay 30
-	applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCE
-	applymovement 2, SouthernIsland_Interior_Movement_242BDA
+	applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown
+	applymovement 2, SouthernIsland_Interior_Movement_LatiApproach
 	waitmovement 0
 	delay 50
 	special RemoveCameraObject
 	setvar VAR_LAST_TALKED, 2
 	compare VAR_ROAMER_POKEMON, 0
-	call_if_eq SouthernIsland_Interior_EventScript_242BA4
+	call_if_eq SouthernIsland_Interior_EventScript_SetLatiosBattleVars
 	compare VAR_ROAMER_POKEMON, 0
-	call_if_ne SouthernIsland_Interior_EventScript_242BB7
+	call_if_ne SouthernIsland_Interior_EventScript_SetLatiasBattleVars
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLatiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq SouthernIsland_Interior_EventScript_242B81
+	goto_if_eq SouthernIsland_Interior_EventScript_LatiDefeated
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq SouthernIsland_Interior_EventScript_242B8F
+	goto_if_eq SouthernIsland_Interior_EventScript_RanFromLati
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq SouthernIsland_Interior_EventScript_242B8F
+	goto_if_eq SouthernIsland_Interior_EventScript_RanFromLati
 	setflag FLAG_CAUGHT_LATIAS_OR_LATIOS
 	releaseall
 	end
 
-SouthernIsland_Interior_EventScript_242B81:: @ 8242B81
+SouthernIsland_Interior_EventScript_LatiDefeated:: @ 8242B81
 	setflag FLAG_DEFEATED_LATIAS_OR_LATIOS
 	copyvar VAR_0x8004, VAR_TEMP_4
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F
+SouthernIsland_Interior_EventScript_RanFromLati:: @ 8242B8F
 	copyvar VAR_0x8004, VAR_TEMP_4
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A
+SouthernIsland_Interior_EventScript_Sign:: @ 8242B9A
 	msgbox SouthernIsland_Interior_Text_Sign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4
+SouthernIsland_Interior_EventScript_SetLatiosBattleVars:: @ 8242BA4
 	setvar VAR_0x8004, SPECIES_LATIOS
-	setvar VAR_0x8005, 50 @level
+	setvar VAR_0x8005, 50 @ level
 	setvar VAR_0x8006, ITEM_SOUL_DEW
 	special CreateObedientEnemyMon
 	return
 
-SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7
+SouthernIsland_Interior_EventScript_SetLatiasBattleVars:: @ 8242BB7
 	setvar VAR_0x8004, SPECIES_LATIAS
-	setvar VAR_0x8005, 50 @level
+	setvar VAR_0x8005, 50 @ level
 	setvar VAR_0x8006, ITEM_SOUL_DEW
 	special CreateObedientEnemyMon
 	return
 
-SouthernIsland_Interior_Movement_242BCA: @ 8242BCA
+SouthernIsland_Interior_Movement_CameraPanUp: @ 8242BCA
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SouthernIsland_Interior_Movement_242BCE: @ 8242BCE
+SouthernIsland_Interior_Movement_CameraPanDown: @ 8242BCE
 	delay_16
 	delay_16
 	delay_16
@@ -146,7 +146,7 @@ SouthernIsland_Interior_Movement_242BCE: @ 8242BCE
 	walk_in_place_fastest_up
 	step_end
 
-SouthernIsland_Interior_Movement_242BDA: @ 8242BDA
+SouthernIsland_Interior_Movement_LatiApproach: @ 8242BDA
 	walk_down
 	walk_down
 	walk_down
diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json
index 991743d63..2854ec975 100644
--- a/data/maps/TerraCave_End/map.json
+++ b/data/maps/TerraCave_End/map.json
@@ -45,7 +45,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "1",
-      "script": "TerraCave_End_EventScript_23B0EC"
+      "script": "TerraCave_End_EventScript_Groudon"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index efab053aa..2a7d912f1 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -1,13 +1,13 @@
 TerraCave_End_MapScripts:: @ 823B0B0
-	map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB
+	map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_OnTransition
 	.byte 0
 
-TerraCave_End_MapScript1_23B0BB: @ 823B0BB
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_23B0C5
+TerraCave_End_OnResume: @ 823B0BB
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_TryRemoveGroudon
 	end
 
-TerraCave_End_EventScript_23B0C5:: @ 823B0C5
+TerraCave_End_EventScript_TryRemoveGroudon:: @ 823B0C5
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -15,19 +15,19 @@ TerraCave_End_EventScript_23B0C5:: @ 823B0C5
 	return
 
 TerraCave_End_OnTransition: @ 823B0D9
-	call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_23B0E3
+	call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_ShowGroudon
 	end
 
-TerraCave_End_EventScript_23B0E3:: @ 823B0E3
+TerraCave_End_EventScript_ShowGroudon:: @ 823B0E3
 	clearflag FLAG_HIDE_TERRA_CAVE_GROUDON
 	setvar VAR_TEMP_1, 1
 	return
 
-TerraCave_End_EventScript_23B0EC:: @ 823B0EC
+TerraCave_End_EventScript_Groudon:: @ 823B0EC
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 1, TerraCave_End_Movement_23B16E
+	applymovement 1, TerraCave_End_Movement_GroudonApproach
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_GROUDON, 2
@@ -42,28 +42,28 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC
 	setvar VAR_TEMP_1, 0
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq TerraCave_End_EventScript_23B155
+	goto_if_eq TerraCave_End_EventScript_DefeatedGroudon
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq TerraCave_End_EventScript_23B163
+	goto_if_eq TerraCave_End_EventScript_RanFromGroudon
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq TerraCave_End_EventScript_23B163
+	goto_if_eq TerraCave_End_EventScript_RanFromGroudon
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	releaseall
 	end
 
-TerraCave_End_EventScript_23B155:: @ 823B155
+TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-TerraCave_End_EventScript_23B163:: @ 823B163
+TerraCave_End_EventScript_RanFromGroudon:: @ 823B163
 	setvar VAR_0x8004, SPECIES_GROUDON
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-TerraCave_End_Movement_23B16E: @ 823B16E
+TerraCave_End_Movement_GroudonApproach: @ 823B16E
 	init_affine_anim
 	walk_down_start_affine
 	delay_16
diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc
index e726f8566..59f90b8bd 100644
--- a/data/maps/TrainerHill_1F/scripts.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_1F_MapScripts:: @ 8268F71
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc
index dd1f356de..0e8775cd5 100644
--- a/data/maps/TrainerHill_2F/scripts.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_2F_MapScripts:: @ 8268F81
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc
index b4793f457..eee6bd99d 100644
--- a/data/maps/TrainerHill_3F/scripts.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_3F_MapScripts:: @ 8268F91
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc
index 66b8ed3bb..74ce0bf08 100644
--- a/data/maps/TrainerHill_4F/scripts.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_4F_MapScripts:: @ 8268F9C
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json
index 03354b0da..07cdaa80d 100644
--- a/data/maps/TrainerHill_Elevator/map.json
+++ b/data/maps/TrainerHill_Elevator/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Elevator_EventScript_26935F",
+      "script": "TrainerHill_Elevator_EventScript_Attendant",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index bf3d0f9f7..498f7a3c0 100644
--- a/data/maps/TrainerHill_Elevator/scripts.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -1,89 +1,89 @@
 TrainerHill_Elevator_MapScripts:: @ 826934F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_OnFrame
 	.byte 0
 
-TrainerHill_Elevator_MapScript2_269355: @ 8269355
-	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375
+TrainerHill_Elevator_OnFrame: @ 8269355
+	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_EnterElevator
 	.2byte 0
 
-TrainerHill_Elevator_EventScript_26935F:: @ 826935F
+TrainerHill_Elevator_EventScript_Attendant:: @ 826935F
 	end
 
-TrainerHill_Elevator_EventScript_269360:: @ 8269360
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693EB
+TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof
 	waitmovement 0
 	releaseall
 	warp MAP_TRAINER_HILL_ROOF, 255, 15, 5
 	waitstate
 	end
 
-TrainerHill_Elevator_EventScript_269375:: @ 8269375
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E4
+TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant
 	waitmovement 0
-	applymovement 1, TrainerHill_Elevator_Movement_2693EE
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFacePlayer
 	waitmovement 0
 	lockall
-	msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Elevator_EventScript_269360
+	msgbox TrainerHill_Elevator_Text_ReturnToReception, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq TrainerHill_Elevator_EventScript_ExitToRoof
 	releaseall
-	applymovement 1, TrainerHill_Elevator_Movement_2693F0
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFaceDown
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693DF
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator
 	waitmovement 0
-	call TrainerHill_Elevator_EventScript_2693D9
+	call TrainerHill_Elevator_EventScript_MoveElevator
 	delay 25
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E7
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator
 	waitmovement 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8
 	waitstate
 	end
 
 @ Unused
-TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
-	goto TrainerHill_Elevator_EventScript_2693D4
+TrainerHill_Elevator_EventScript_ExitFloorSelect:: @ 82693CE
+	goto TrainerHill_Elevator_EventScript_CloseFloorSelect
 	end
 
 @ Functionally unused
-TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
+TrainerHill_Elevator_EventScript_CloseFloorSelect:: @ 82693D4
 	special CloseDeptStoreElevatorWindow
 	releaseall
 	end
 
-TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
+TrainerHill_Elevator_EventScript_MoveElevator:: @ 82693D9
 	waitse
 	special MoveElevator
 	waitstate
 	return
 
-TrainerHill_Elevator_Movement_2693DF: @ 82693DF
+TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator: @ 82693DF
 	walk_up
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693E4: @ 82693E4
+TrainerHill_Elevator_Movement_PlayerApproachAttendant: @ 82693E4
 	delay_16
 	walk_left
 	step_end
 
-TrainerHill_Elevator_Movement_2693E7: @ 82693E7
+TrainerHill_Elevator_Movement_PlayerExitElevator: @ 82693E7
 	delay_16
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693EB: @ 82693EB
+TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof: @ 82693EB
 	face_down
 	delay_16
 	step_end
 
-TrainerHill_Elevator_Movement_2693EE: @ 82693EE
+TrainerHill_Elevator_Movement_AttendantFacePlayer: @ 82693EE
 	face_right
 	step_end
 
-TrainerHill_Elevator_Movement_2693F0: @ 82693F0
+TrainerHill_Elevator_Movement_AttendantFaceDown: @ 82693F0
 	face_down
 	step_end
 
diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json
index 42f1daa9d..f581988b6 100644
--- a/data/maps/TrainerHill_Entrance/map.json
+++ b/data/maps/TrainerHill_Entrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681FD",
+      "script": "TrainerHill_Entrance_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681EF",
+      "script": "TrainerHill_Entrance_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683C7",
+      "script": "TrainerHill_Entrance_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683AC",
+      "script": "TrainerHill_Entrance_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_268391",
+      "script": "TrainerHill_Entrance_EventScript_Man",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TRAINER_HILL_IS_ACTIVE",
       "var_value": "0",
-      "script": "TrainerHill_Entrance_EventScript_268229"
+      "script": "TrainerHill_Entrance_EventScript_EntryTrigger"
     }
   ],
   "bg_events": [
@@ -121,7 +121,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "TrainerHill_Entrance_EventScript_268388"
+      "script": "TrainerHill_Entrance_EventScript_Records"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 3b9fb77a4..909aaaf9f 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -1,9 +1,9 @@
 TrainerHill_Entrance_MapScripts:: @ 82680AC
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
 	map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E
+	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_OnFrame
 	.byte 0
 
 TrainerHill_Entrance_OnTransition: @ 82680C6
@@ -11,58 +11,59 @@ TrainerHill_Entrance_OnTransition: @ 82680C6
 	getplayerxy VAR_TEMP_D, VAR_RESULT
 	end
 
-TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
+@ Unused
+TrainerHill_Entrance_OnWarp: @ 82680CF
 	end
 
-TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
+TrainerHill_Entrance_OnResume: @ 82680D0
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_2680FF
+	compare VAR_RESULT, 0  @ VAR_RESULT always 0 here
+	goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
 	setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_16
+TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_26811A
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_26811A:: @ 826811A
+TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A
 	end
 
-TrainerHill_Entrance_MapScript1_26811B: @ 826811B
+TrainerHill_Entrance_OnReturn: @ 826811B
 	addobject 2
 	addobject 1
 	addobject 5
 	addobject 4
 	end
 
-TrainerHill_Entrance_MapScript1_268128: @ 8268128
+TrainerHill_Entrance_OnLoad: @ 8268128
 	compare VAR_TEMP_D, 17
-	call_if_eq TrainerHill_Entrance_EventScript_268134
+	call_if_eq TrainerHill_Entrance_EventScript_OpenCounterDoor
 	end
 
-TrainerHill_Entrance_EventScript_268134:: @ 8268134
+TrainerHill_Entrance_EventScript_OpenCounterDoor:: @ 8268134
 	setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
 	return
 
-TrainerHill_Entrance_MapScript2_26813E: @ 826813E
-	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182
-	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160
-	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF
+TrainerHill_Entrance_OnFrame: @ 826813E
+	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_ExitChallenge
+	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_ExitElevator
+	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_EntryTrigger
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
-TrainerHill_Entrance_EventScript_268160:: @ 8268160
+TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
 	waitmovement 0
 	setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
 	special DrawWholeMapView
@@ -72,38 +73,36 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268182:: @ 8268182
+TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	setvar VAR_TEMP_0, 1
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5
-	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA
-	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE
+	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_ExitChallengeLost
+	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
+	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_EndExitChallenge
 
-TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
+TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_2681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_PlayerExitChallenge
 
-TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
+TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special HealPlayerParty
 	releaseall
-
-TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
+TrainerHill_Entrance_EventScript_EndExitChallenge:: @ 82681EE
 	end
 
-TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
+TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 	setvar VAR_0x800B, 2
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -111,128 +110,127 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
 	release
 	end
 
-TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
+TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26821F
-	msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_268227
-
-TrainerHill_Entrance_EventScript_26821F:: @ 826821F
-	msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_268227:: @ 8268227
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_ThanksForPlaying
+	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AttendantEnd
+
+TrainerHill_Entrance_EventScript_ThanksForPlaying:: @ 826821F
+	msgbox TrainerHill_Entrance_Text_ThankYouForPlaying, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268229:: @ 8268229
+TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
-	msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_13
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
+	msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	call_if_eq TrainerHill_Entrance_EventScript_26832E
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_8
+	compare VAR_RESULT, FALSE
+	call_if_eq TrainerHill_Entrance_EventScript_SaveGame
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_268275
-	msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
-
-TrainerHill_Entrance_EventScript_268275:: @ 8268275
-	msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_26827D:: @ 826827D
-	message TrainerHill_Entrance_Text_2685F8
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_AllFloorsUsed
+	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
+
+TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
+	msgbox TrainerHill_Entrance_Text_TrainersInEveryRoom, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
+	message TrainerHill_Entrance_Text_LikeToChallengeTrainers
 	waitmessage
 	multichoice 15, 6, MULTI_YESNOINFO, 0
 	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2682C8
-	case 1, TrainerHill_Entrance_EventScript_268314
-	case 2, TrainerHill_Entrance_EventScript_2682BA
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 0, TrainerHill_Entrance_EventScript_ChooseChallenge
+	case 1, TrainerHill_Entrance_EventScript_CancelEntry
+	case 2, TrainerHill_Entrance_EventScript_Info
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA
-	msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
+TrainerHill_Entrance_EventScript_Info:: @ 82682BA
+	msgbox TrainerHill_Entrance_Text_ExplainTrainerHill, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
 	end
 
-TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
+TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	multichoice 13, 2, MULTI_TAG_MATCH_TYPE, 0
 	switch VAR_RESULT
-	case 4, TrainerHill_Entrance_EventScript_268314
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 4, TrainerHill_Entrance_EventScript_CancelEntry
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
 	copyvar VAR_0x8005, VAR_RESULT
 	special CallTrainerHillFunction
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
-	msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_TimeProgessGetSetGo, MSGBOX_DEFAULT
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
 	special CallTrainerHillFunction
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268314:: @ 8268314
+TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 	setvar VAR_TEMP_5, 0
-	msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_26832E:: @ 826832E
-	msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
+	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_5, 1
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_SaveFailed
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	return
 
-TrainerHill_Entrance_EventScript_26835C:: @ 826835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_15
+TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
 	special CallTrainerHillFunction
-	goto TrainerHill_Entrance_EventScript_268314
+	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_26836A:: @ 826836A
-	msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_Closed:: @ 826836A
+	msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_Movement_26837F: @ 826837F
+TrainerHill_Entrance_Movement_PlayerFaceAttendant: @ 826837F
 	face_right
 	step_end
 
-TrainerHill_Entrance_Movement_268381: @ 8268381
+TrainerHill_Entrance_Movement_PushPlayerBackFromCounter: @ 8268381
 	walk_down
 	step_end
 
-TrainerHill_Entrance_Movement_268383: @ 8268383
+@ Unused
+TrainerHill_Entrance_Movement_FaceUp: @ 8268383
 	face_up
 	step_end
 
-TrainerHill_Entrance_Movement_268385: @ 8268385
+TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Entrance_EventScript_268388:: @ 8268388
+TrainerHill_Entrance_EventScript_Records:: @ 8268388
 	lockall
 	fadescreen 1
 	special ShowTrainerHillRecords
@@ -240,37 +238,37 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268391:: @ 8268391
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3
-	msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Man:: @ 8268391
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ManTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
-	msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_ManTrainerHillClosed:: @ 82683A3
+	msgbox TrainerHill_Entrance_Text_CantWaitToTestTheWaters, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE
-	msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Girl:: @ 82683AC
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_GirlTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE
-	msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_GirlTrainerHillClosed:: @ 82683BE
+	msgbox TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
+TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402
-	pokemart TrainerHill_Entrance_Pokemart_2683E8
+	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ExpandedPokemart
+	pokemart TrainerHill_Entrance_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
+TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -286,14 +284,14 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268402:: @ 8268402
-	pokemart TrainerHill_Entrance_Pokemart_268414
+TrainerHill_Entrance_EventScript_ExpandedPokemart:: @ 8268402
+	pokemart TrainerHill_Entrance_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_268414: @ 8268414
+TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_FULL_RESTORE
@@ -310,69 +308,69 @@ TrainerHill_Entrance_Pokemart_268414: @ 8268414
 	release
 	end
 
-TrainerHill_Entrance_Text_268430: @ 8268430
+TrainerHill_Entrance_Text_StillGettingReady: @ 8268430
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS.\p"
 	.string "Unfortunately, we're still getting\n"
 	.string "things ready. Please come back later!$"
 
-TrainerHill_Entrance_Text_2684C6: @ 82684C6
+TrainerHill_Entrance_Text_WelcomeToTrainerHill: @ 82684C6
 	.string "Welcome!\p"
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS!$"
 
-TrainerHill_Entrance_Text_26851C: @ 826851C
+TrainerHill_Entrance_Text_SaveGameBeforeEnter: @ 826851C
 	.string "Is this your first visit here?\p"
 	.string "Before you enter, please save\n"
 	.string "your game.$"
 
-TrainerHill_Entrance_Text_268564: @ 8268564
+TrainerHill_Entrance_Text_TrainersUpToFloorX: @ 8268564
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "Up to floor no. {STR_VAR_1}.$"
 
-TrainerHill_Entrance_Text_26859E: @ 826859E
+TrainerHill_Entrance_Text_TrainersInEveryRoom: @ 826859E
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "There appear to be TRAINERS gathered\n"
 	.string "in every room.$"
 
-TrainerHill_Entrance_Text_2685F8: @ 82685F8
+TrainerHill_Entrance_Text_LikeToChallengeTrainers: @ 82685F8
 	.string "Would you like to challenge the\n"
 	.string "waiting TRAINERS?$"
 
-TrainerHill_Entrance_Text_26862A: @ 826862A
+TrainerHill_Entrance_Text_TimeProgessGetSetGo: @ 826862A
 	.string "I will time your progress.\n"
 	.string "Best of luck!\p"
 	.string "On your marks…\p"
 	.string "Get set…\p"
 	.string "Go!$"
 
-TrainerHill_Entrance_Text_26866F: @ 826866F
+TrainerHill_Entrance_Text_PleaseVisitUsAgain: @ 826866F
 	.string "Please do visit us again!$"
 
-TrainerHill_Entrance_Text_268689: @ 8268689
+TrainerHill_Entrance_Text_TooBadTremendousEffort: @ 8268689
 	.string "That was too bad.\p"
 	.string "I think you put in a tremendous\n"
 	.string "effort in your battling.\p"
 	.string "Please come back and try again!$"
 
-TrainerHill_Entrance_Text_2686F4: @ 82686F4
+TrainerHill_Entrance_Text_HopeYouGiveItYourBest: @ 82686F4
 	.string "I hope you give it your best.$"
 
-TrainerHill_Entrance_Text_268712: @ 8268712
+TrainerHill_Entrance_Text_MovedReceptionHereForSwitch: @ 8268712
 	.string "When the TRAINERS switch places,\n"
 	.string "the movement can be hectic.\p"
 	.string "To avoid the stampede, we moved\n"
 	.string "the reception counter here.\p"
 	.string "I'm sorry for the inconvenience.$"
 
-TrainerHill_Entrance_Text_2687AC: @ 82687AC
+TrainerHill_Entrance_Text_ThankYouForPlaying: @ 82687AC
 	.string "Thank you for playing!$"
 
-TrainerHill_Entrance_Text_2687C3: @ 82687C3
+TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
 	.string "Here at the TRAINER HILL, we conduct\n"
 	.string "an event called the Time Attack.\p"
 	.string "It is a race that measures how long\n"
@@ -385,13 +383,14 @@ TrainerHill_Entrance_Text_2687C3: @ 82687C3
 	.string "neither Exp. Points nor money will\l"
 	.string "be awarded.$"
 
-TrainerHill_Entrance_Text_26890D: @ 826890D
+@ Unused
+TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon: @ 826890D
 	.string "Oh, I'm sorry, but you appear to have\n"
 	.string "only one POKéMON with you.\p"
 	.string "You will need at least two POKéMON\n"
 	.string "to enter this event.$"
 
-TrainerHill_Roof_Text_268986: @ 8268986
+TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
 	.string "Hm! Hm!\p"
 	.string "You finally came!\n"
 	.string "Yes, you have arrived!\p"
@@ -407,15 +406,15 @@ TrainerHill_Roof_Text_268986: @ 8268986
 	.string "Anyway, I watched you on your way up.\n"
 	.string "Marvelous battling! Bravo, indeed!$"
 
-TrainerHill_Roof_Text_268AC5: @ 8268AC5
+TrainerHill_Roof_Text_HaveTheMostMarvelousGift: @ 8268AC5
 	.string "For a marvelous someone like you,\n"
 	.string "I have the most marvelous gift!$"
 
-TrainerHill_Roof_Text_268B07: @ 8268B07
+TrainerHill_Roof_Text_FullUpBeBackLaterForThis: @ 8268B07
 	.string "Oh, no, full up with things!\n"
 	.string "You'll be back later for this!$"
 
-TrainerHill_Roof_Text_268B43: @ 8268B43
+TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
 	.string "Oh, hold on here! Did you possibly get\n"
 	.string "here marvelously quickly?\p"
 	.string "How splendid! You needn't have\n"
@@ -423,50 +422,51 @@ TrainerHill_Roof_Text_268B43: @ 8268B43
 	.string "That is so delightful. I'll have the Time\n"
 	.string "Board at the reception updated!$"
 
-TrainerHill_Roof_Text_268C03: @ 8268C03
+TrainerHill_Roof_Text_YouWerentVeryQuick: @ 8268C03
 	.string "But, oh…\n"
 	.string "You weren't very quick getting here.$"
 
-TrainerHill_Roof_Text_268C31: @ 8268C31
+TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
 	.string "Perhaps it would please me more if you\n"
 	.string "arrived zippier next time.\p"
 	.string "Then, I should be pleased to form\n"
 	.string "a tag team with you!\p"
 	.string "Until we meet again, amigo!$"
 
-TrainerHill_Roof_Text_268CC6: @ 8268CC6
+@ Unused
+TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner: @ 8268CC6
 	.string "I had the TRAINER HILL built for but\n"
 	.string "one reason and one only!\p"
 	.string "To find the most suitable partner\n"
 	.string "with whom I may form a tag team!$"
 
-TrainerHill_Entrance_Text_268D47: @ 8268D47
+TrainerHill_Entrance_Text_ChallengeTime: @ 8268D47
 	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-TrainerHill_Entrance_Text_268D5A: @ 8268D5A
+TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead: @ 8268D5A
 	.string "Who knows what sort of TRAINERS\n"
 	.string "and POKéMON combos are ahead?\p"
 	.string "All I know is that I'll knock aside\n"
 	.string "anyone that stands in my way!$"
 
-TrainerHill_Entrance_Text_268DDA: @ 8268DDA
+TrainerHill_Entrance_Text_CantWaitToTestTheWaters: @ 8268DDA
 	.string "I heard tough TRAINERS come to this\n"
 	.string "TRAINER HILL from all over.\p"
 	.string "I can't wait to test the waters!\p"
 	.string "I'll knock aside anyone that stands\n"
 	.string "in my way!$"
 
-TrainerHill_Entrance_Text_268E6A: @ 8268E6A
+TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop: @ 8268E6A
 	.string "Do you see the Time Board over there?\p"
 	.string "My friends and I are trying to see who\n"
 	.string "can reach the top in the least time.$"
 
-TrainerHill_Entrance_Text_268EDC: @ 8268EDC
+TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen: @ 8268EDC
 	.string "Do you know when they're opening\n"
 	.string "this place up?\p"
 	.string "I'm waiting here to be the first\n"
 	.string "challenger ever!$"
 
-TrainerHill_Elevator_Text_268F3E: @ 8268F3E
+TrainerHill_Elevator_Text_ReturnToReception: @ 8268F3E
 	.string "Would you like to return to\n"
 	.string "the reception counter?$"
diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json
index 8a623028e..280494788 100644
--- a/data/maps/TrainerHill_Roof/map.json
+++ b/data/maps/TrainerHill_Roof/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Roof_EventScript_268FB2",
+      "script": "TrainerHill_Roof_EventScript_Owner",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index f7ced5d07..af4c9ea5a 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -1,70 +1,66 @@
 TrainerHill_Roof_MapScripts:: @ 8268FA7
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
-TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_1
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_268FEA
-	case 1, TrainerHill_Roof_EventScript_268FF2
-	case 2, TrainerHill_Roof_EventScript_2690A8
-
-TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
-	msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT
-
-TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_2
+	case 0, TrainerHill_Roof_EventScript_Arrived
+	case 1, TrainerHill_Roof_EventScript_GivePrize
+	case 2, TrainerHill_Roof_EventScript_AlreadyReceivedPrize
+TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
+	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269020
-	case 1, TrainerHill_Roof_EventScript_269037
-	case 2, TrainerHill_Roof_EventScript_269054
-
-TrainerHill_Roof_EventScript_269020:: @ 8269020
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+	case 0, TrainerHill_Roof_EventScript_ReceivePrize
+	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
+	case 2, TrainerHill_Roof_EventScript_CheckFinalTime
+TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA1
 	message gText_ObtainedTheItem
 	waitfanfare
 	waitmessage
-	goto TrainerHill_Roof_EventScript_269054
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269037:: @ 8269037
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
-	msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_269054
+	msgbox TrainerHill_Roof_Text_FullUpBeBackLaterForThis, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269054:: @ 8269054
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_3
+TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269082
-	case 1, TrainerHill_Roof_EventScript_269090
-	case 2, TrainerHill_Roof_EventScript_26909E
-
-TrainerHill_Roof_EventScript_269082:: @ 8269082
-	msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+	case 0, TrainerHill_Roof_EventScript_NewRecord
+	case 1, TrainerHill_Roof_EventScript_NoNewRecord
+	case 2, TrainerHill_Roof_EventScript_EndSpeakToOwner
+TrainerHill_Roof_EventScript_NewRecord:: @ 8269082
+	msgbox TrainerHill_Roof_Text_GotHereMarvelouslyQuickly, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_269090:: @ 8269090
-	msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+TrainerHill_Roof_EventScript_NoNewRecord:: @ 8269090
+	msgbox TrainerHill_Roof_Text_YouWerentVeryQuick, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_26909E:: @ 826909E
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_EndSpeakToOwner:: @ 826909E
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
-TrainerHill_Roof_EventScript_2690A8:: @ 82690A8
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_AlreadyReceivedPrize:: @ 82690A8
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc
index 53b80053f..81435cf7b 100644
--- a/data/maps/Underwater3/scripts.inc
+++ b/data/maps/Underwater3/scripts.inc
@@ -1,8 +1,8 @@
 Underwater3_MapScripts:: @ 81F7724
-	map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A
+	map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume
 	.byte 0
 
-Underwater3_MapScript1_1F772A: @ 81F772A
+Underwater3_OnResume: @ 81F772A
 	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc
index fe068207e..6c435a44d 100644
--- a/data/maps/Underwater5/scripts.inc
+++ b/data/maps/Underwater5/scripts.inc
@@ -1,8 +1,8 @@
 Underwater5_MapScripts:: @ 81F7731
-	map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737
+	map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume
 	.byte 0
 
-Underwater5_MapScript1_1F7737: @ 81F7737
+Underwater5_OnResume: @ 81F7737
 	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
index d5a11c1bf..655dbde9f 100644
--- a/data/maps/Underwater6/scripts.inc
+++ b/data/maps/Underwater6/scripts.inc
@@ -1,8 +1,8 @@
 Underwater6_MapScripts:: @ 81F773D
-	map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743
+	map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
 	.byte 0
 
-Underwater6_MapScript1_1F7743: @ 81F7743
+Underwater6_OnResume: @ 81F7743
 	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc
index c3bee154e..5146731a4 100644
--- a/data/maps/Underwater7/scripts.inc
+++ b/data/maps/Underwater7/scripts.inc
@@ -1,8 +1,8 @@
 Underwater7_MapScripts:: @ 81F7749
-	map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F
+	map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume
 	.byte 0
 
-Underwater7_MapScript1_1F774F: @ 81F774F
+Underwater7_OnResume: @ 81F774F
 	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc
index 248854dd7..b1cc353f0 100644
--- a/data/maps/Underwater_MarineCave/scripts.inc
+++ b/data/maps/Underwater_MarineCave/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_MarineCave_MapScripts:: @ 823AFB8
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition
 	.byte 0
 
@@ -7,7 +7,7 @@ Underwater_MarineCave_OnTransition: @ 823AFC3
 	setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT
 	end
 
-Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7
+Underwater_MarineCave_OnResume: @ 823AFC7
 	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17
 	end
 
diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc
index acffa23a2..ef62997de 100644
--- a/data/maps/Underwater_Route134/scripts.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
@@ -1,8 +1,8 @@
 Underwater_Route134_MapScripts:: @ 82390B5
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_OnResume
 	.byte 0
 
-Underwater_Route134_MapScript1_2390BB: @ 82390BB
+Underwater_Route134_OnResume: @ 82390BB
 	setdivewarp MAP_ROUTE134, 255, 60, 31
 	end
 
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index ca94964cf..118632461 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -1,23 +1,23 @@
 Underwater_SeafloorCavern_MapScripts:: @ 823433B
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C
+	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_OnLoad
 	.byte 0
 
 Underwater_SeafloorCavern_OnTransition: @ 823434B
 	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
-	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358
+	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_HideSubmarine
 	end
 
-Underwater_SeafloorCavern_EventScript_234358:: @ 8234358
+Underwater_SeafloorCavern_EventScript_HideSubmarine:: @ 8234358
 	setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
 	end
 
-Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
-	call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234366
+Underwater_SeafloorCavern_OnLoad: @ 823435C
+	call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles
 	end
 
-Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
+Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366
 	setmetatile 5, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 6, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 7, 3, METATILE_Underwater_RockWall, 1
@@ -32,7 +32,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
 	setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
 	return
 
-Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
+Underwater_SeafloorCavern_OnResume: @ 82343D3
 	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
 	end
 
diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json
index 2256ee670..7579f15d5 100644
--- a/data/maps/Underwater_SealedChamber/map.json
+++ b/data/maps/Underwater_SealedChamber/map.json
@@ -31,7 +31,7 @@
       "y": 43,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Underwater_SealedChamber_EventScript_2390FC"
+      "script": "Underwater_SealedChamber_EventScript_Braille"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 9ec884781..b1fb5e71a 100644
--- a/data/maps/Underwater_SealedChamber/scripts.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -1,28 +1,28 @@
 Underwater_SealedChamber_MapScripts:: @ 82390C4
-	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA
+	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_OnDive
 	.byte 0
 
-Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA
+Underwater_SealedChamber_OnDive: @ 82390CA
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 12
-	goto_if_ne Underwater_SealedChamber_EventScript_2390EA
+	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
 	compare VAR_0x8005, 44
-	goto_if_ne Underwater_SealedChamber_EventScript_2390EA
-	goto Underwater_SealedChamber_EventScript_2390F3
+	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
+	goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber
 
-Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA
+Underwater_SealedChamber_EventScript_SurfaceRoute134:: @ 82390EA
 	setdivewarp MAP_ROUTE134, 255, 60, 31
 	end
 
-Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3
+Underwater_SealedChamber_EventScript_SurfaceSealedChamber:: @ 82390F3
 	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
 	end
 
-Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC
+Underwater_SealedChamber_EventScript_Braille:: @ 82390FC
 	lockall
-	braillemessage Underwater_SealedChamber_Braille_2A6B15
+	braillemessage Underwater_SealedChamber_Braille_GoUpHere
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index d5040dba0..ec639604b 100644
--- a/data/maps/Underwater_SootopolisCity/scripts.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
@@ -1,8 +1,8 @@
 Underwater_SootopolisCity_MapScripts:: @ 822D94C
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_OnResume
 	.byte 0
 
-Underwater_SootopolisCity_MapScript1_22D952: @ 822D952
+Underwater_SootopolisCity_OnResume: @ 822D952
 	setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	end
 
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index c42cd362c..4c7b487fb 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D236",
+      "script": "UnionRoom_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D204",
+      "script": "UnionRoom_EventScript_Player4",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D22C",
+      "script": "UnionRoom_EventScript_Player8",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D222",
+      "script": "UnionRoom_EventScript_Player7",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D218",
+      "script": "UnionRoom_EventScript_Player6",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D20E",
+      "script": "UnionRoom_EventScript_Player5",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1FA",
+      "script": "UnionRoom_EventScript_Player3",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1F0",
+      "script": "UnionRoom_EventScript_Player2",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1E6",
+      "script": "UnionRoom_EventScript_Player1",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
     }
   ],
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index c2f375e0f..eac27fb5c 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,9 +1,9 @@
 UnionRoom_MapScripts:: @ 823D1A6
-	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1
+	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
 	.byte 0
 
-UnionRoom_MapScript1_23D1B1: @ 823D1B1
+UnionRoom_OnResume: @ 823D1B1
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
@@ -26,7 +26,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1
 UnionRoom_OnTransition: @ 823D1E5
 	end
 
-UnionRoom_EventScript_23D1E6:: @ 823D1E6
+UnionRoom_EventScript_Player1:: @ 823D1E6
 	lock
 	faceplayer
 	setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_23D1E6:: @ 823D1E6
 	release
 	end
 
-UnionRoom_EventScript_23D1F0:: @ 823D1F0
+UnionRoom_EventScript_Player2:: @ 823D1F0
 	lock
 	faceplayer
 	setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_23D1F0:: @ 823D1F0
 	release
 	end
 
-UnionRoom_EventScript_23D1FA:: @ 823D1FA
+UnionRoom_EventScript_Player3:: @ 823D1FA
 	lock
 	faceplayer
 	setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_23D1FA:: @ 823D1FA
 	release
 	end
 
-UnionRoom_EventScript_23D204:: @ 823D204
+UnionRoom_EventScript_Player4:: @ 823D204
 	lock
 	faceplayer
 	setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_23D204:: @ 823D204
 	release
 	end
 
-UnionRoom_EventScript_23D20E:: @ 823D20E
+UnionRoom_EventScript_Player5:: @ 823D20E
 	lock
 	faceplayer
 	setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_23D20E:: @ 823D20E
 	release
 	end
 
-UnionRoom_EventScript_23D218:: @ 823D218
+UnionRoom_EventScript_Player6:: @ 823D218
 	lock
 	faceplayer
 	setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_23D218:: @ 823D218
 	release
 	end
 
-UnionRoom_EventScript_23D222:: @ 823D222
+UnionRoom_EventScript_Player7:: @ 823D222
 	lock
 	faceplayer
 	setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_23D222:: @ 823D222
 	release
 	end
 
-UnionRoom_EventScript_23D22C:: @ 823D22C
+UnionRoom_EventScript_Player8:: @ 823D22C
 	lock
 	faceplayer
 	setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_23D22C:: @ 823D22C
 	release
 	end
 
-UnionRoom_EventScript_23D236:: @ 823D236
+UnionRoom_EventScript_Attendant:: @ 823D236
 	lock
 	faceplayer
 	setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_23D236:: @ 823D236
 	release
 	end
 
-UnionRoom_EventScript_23D240:: @ 823D240
+UnionRoom_EventScript_Unused:: @ 823D240
 	lockall
 	setvar VAR_RESULT, 10
 	waitstate
diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
index 3e4387b6a..bcad9e1d7 100644
--- a/data/maps/UnknownLinkContestRoom_25_29/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
index 42a719c17..4a6708006 100644
--- a/data/maps/UnknownLinkContestRoom_25_30/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
index ad18b00af..da7f875b3 100644
--- a/data/maps/UnknownLinkContestRoom_25_31/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
index 0e1528e59..8d5b033db 100644
--- a/data/maps/UnknownLinkContestRoom_25_32/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
index 8765e9771..89c95c51b 100644
--- a/data/maps/UnknownLinkContestRoom_25_33/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
index c7220897b..3e2878962 100644
--- a/data/maps/UnknownLinkContestRoom_25_34/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index 7aef48724..e3fa08b03 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_EventScript_1EB5A8",
+      "script": "VerdanturfTown_EventScript_Man",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_EventScript_1EB575",
+      "script": "VerdanturfTown_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_EventScript_1EB5BA",
+      "script": "VerdanturfTown_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_EventScript_1EB5B1",
+      "script": "VerdanturfTown_EventScript_Camper",
       "flag": "0"
     }
   ],
@@ -145,7 +145,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "VerdanturfTown_EventScript_1EB5D9"
+      "script": "VerdanturfTown_EventScript_TownSign"
     },
     {
       "type": "sign",
@@ -161,7 +161,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "VerdanturfTown_EventScript_1EB5E2"
+      "script": "VerdanturfTown_EventScript_WandasHouseSign"
     },
     {
       "type": "sign",
@@ -185,7 +185,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "VerdanturfTown_EventScript_1EB5EB"
+      "script": "VerdanturfTown_EventScript_BattleTentSign"
     },
     {
       "type": "sign",
@@ -193,7 +193,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "VerdanturfTown_EventScript_1EB5F4"
+      "script": "VerdanturfTown_EventScript_RusturfTunnelSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index bd8328db8..2f075346c 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -4,64 +4,64 @@ VerdanturfTown_MapScripts:: @ 81EB566
 
 VerdanturfTown_OnTransition: @ 81EB56C
 	setflag FLAG_VISITED_VERDANTURF_TOWN
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	end
 
-VerdanturfTown_EventScript_1EB575:: @ 81EB575
+VerdanturfTown_EventScript_Twin:: @ 81EB575
 	lock
 	faceplayer
-	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594
-	msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen
+	msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-VerdanturfTown_EventScript_1EB594:: @ 81EB594
-	msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT
+VerdanturfTown_EventScript_TwinTunnelOpen:: @ 81EB594
+	msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8
-	msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC
+VerdanturfTown_EventScript_Man:: @ 81EB5A8
+	msgbox VerdanturfTown_Text_AirCleanHere, MSGBOX_NPC
 	end
 
-VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1
-	msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC
+VerdanturfTown_EventScript_Camper:: @ 81EB5B1
+	msgbox VerdanturfTown_Text_MakeBattleTentDebut, MSGBOX_NPC
 	end
 
-VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA
+VerdanturfTown_EventScript_Boy:: @ 81EB5BA
 	lock
 	faceplayer
-	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB5CF
-	msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_BoyTunnelOpen
+	msgbox VerdanturfTown_Text_GuyTryingToBustThroughCave, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF
-	msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT
+VerdanturfTown_EventScript_BoyTunnelOpen:: @ 81EB5CF
+	msgbox VerdanturfTown_Text_EasyToGetToRustboroNow, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9
-	msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN
+VerdanturfTown_EventScript_TownSign:: @ 81EB5D9
+	msgbox VerdanturfTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2
-	msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN
+VerdanturfTown_EventScript_WandasHouseSign:: @ 81EB5E2
+	msgbox VerdanturfTown_Text_WandasHouse, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB
-	msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN
+VerdanturfTown_EventScript_BattleTentSign:: @ 81EB5EB
+	msgbox VerdanturfTown_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4
-	msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN
+VerdanturfTown_EventScript_RusturfTunnelSign:: @ 81EB5F4
+	msgbox VerdanturfTown_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_Text_1EB5FD: @ 81EB5FD
+VerdanturfTown_Text_ManTryingToDigTunnel: @ 81EB5FD
 	.string "My papa told me.\p"
 	.string "He says this tunnel is full of\n"
 	.string "timid POKéMON.\p"
@@ -72,25 +72,25 @@ VerdanturfTown_Text_1EB5FD: @ 81EB5FD
 	.string "But there's one man. He's trying to dig\n"
 	.string "the tunnel by himself!$"
 
-VerdanturfTown_Text_1EB6E0: @ 81EB6E0
+VerdanturfTown_Text_ManDugTunnelForLove: @ 81EB6E0
 	.string "There was a man who dug a tunnel for\n"
 	.string "a lady he loved.\p"
 	.string "I don't really get it, but hey!$"
 
-VerdanturfTown_Text_1EB736: @ 81EB736
+VerdanturfTown_Text_AirCleanHere: @ 81EB736
 	.string "The way the winds blow, volcanic ash\n"
 	.string "is never blown in this direction.\p"
 	.string "The air is clean and delicious here.\n"
 	.string "Living here should do wonders for even\l"
 	.string "frail and sickly people.$"
 
-VerdanturfTown_Text_1EB7E2: @ 81EB7E2
+VerdanturfTown_Text_MakeBattleTentDebut: @ 81EB7E2
 	.string "My POKéMON and I, we've been riding\n"
 	.string "a hot winning streak.\p"
 	.string "So I decided to make my BATTLE TENT\n"
 	.string "debut in this town.$"
 
-VerdanturfTown_Text_1EB854: @ 81EB854
+VerdanturfTown_Text_GuyTryingToBustThroughCave: @ 81EB854
 	.string "Did you see the cave next to the\n"
 	.string "POKéMON MART?\p"
 	.string "There's a guy in there who's trying to\n"
@@ -99,25 +99,25 @@ VerdanturfTown_Text_1EB854: @ 81EB854
 	.string "It'd be great if we could go through…\n"
 	.string "It'll make it easy to visit RUSTBORO.$"
 
-VerdanturfTown_Text_1EB935: @ 81EB935
+VerdanturfTown_Text_EasyToGetToRustboroNow: @ 81EB935
 	.string "That cave next to the POKéMON MART\n"
 	.string "is now a tunnel to the other side.\p"
 	.string "It's great--it's easy to go shop for\n"
 	.string "new DEVON products in RUSTBORO now.$"
 
-VerdanturfTown_Text_1EB9C4: @ 81EB9C4
+VerdanturfTown_Text_TownSign: @ 81EB9C4
 	.string "VERDANTURF TOWN\p"
 	.string "“The windswept highlands with the\n"
 	.string "sweet fragrance of grass.”$"
 
-VerdanturfTown_Text_1EBA11: @ 81EBA11
+VerdanturfTown_Text_WandasHouse: @ 81EBA11
 	.string "WANDA'S HOUSE$"
 
-VerdanturfTown_Text_1EBA1F: @ 81EBA1F
+VerdanturfTown_Text_BattleTentSign: @ 81EBA1F
 	.string "BATTLE TENT VERDANTURF SITE\n"
 	.string "“Feast Your Eyes on Battles!”$"
 
-VerdanturfTown_Text_1EBA59: @ 81EBA59
+VerdanturfTown_Text_RusturfTunnelSign: @ 81EBA59
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index 9a764cd58..e7d7d2fb4 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -34,15 +34,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
 	showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 2
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
 	waitmovement 0
@@ -55,7 +55,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
 	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -64,11 +64,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
 	waitstate
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -83,15 +83,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
@@ -107,9 +107,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
 VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A
 	msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F
-	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8
 	message VerdanturfTown_BattleTentBattleRoom_Text_25005A
@@ -128,7 +128,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
 	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
@@ -145,7 +145,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
 	special CallFrontierUtilFunc
 	end
 
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 5bc309663..88c98fc1a 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -21,7 +21,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
 	.2byte 0
 
 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
 	special CallFrontierUtilFunc
 	end
 
@@ -29,12 +29,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
 	lockall
 	msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -48,7 +48,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
 	waitmessage
 	setvar VAR_0x8004, 6
 	special sub_81B99B4
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -64,7 +64,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
 	special sub_81B99B4
 	switch VAR_RESULT
 	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -96,7 +96,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
 	lockall
 	message VerdanturfTown_BattleTentLobby_Text_2C56B8
 	waitmessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -121,7 +121,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
 	special sub_81B99B4
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -152,11 +152,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
 	setvar VAR_FRONTIER_FACILITY, 2
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
 	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
 	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 2
 	special CallFrontierUtilFunc
@@ -170,22 +170,22 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
 	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201954
-	case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34
+	case NO, VerdanturfTown_BattleTentLobby_EventScript_201A34
+	case YES, VerdanturfTown_BattleTentLobby_EventScript_201954
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A34
 
 VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
 	special sub_81B99B4
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
@@ -199,8 +199,8 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 
 VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
 	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
+	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special CallFrontierUtilFunc
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT
 	closemessage
@@ -228,7 +228,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
 	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
 
 VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
index 955e00a83..fa620e682 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031",
+      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA",
+      "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 01b1e5030..993188cb2 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
@@ -1,104 +1,104 @@
 VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030
 	.byte 0
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031
+VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8203031
 	lock
 	faceplayer
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	switch VAR_RESULT
-	case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094
-	case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E
-	case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8
-	case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2
-	case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC
-	case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6
-	case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0
+	case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
+	case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
+	case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
+	case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
+	case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
+	case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
+	case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou:: @ 8203094
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary:: @ 820309E
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryWary, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou:: @ 82030A8
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou:: @ 82030B2
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot:: @ 82030BC
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy:: @ 82030C6
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou:: @ 82030D0
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA
+VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 82030DA
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIKACHU, 0
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_Pikachu, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED
+VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou: @ 82030ED
 	.string "Let me see your POKéMON.\n"
 	.string "I'll check to see how much it likes you.\p"
 	.string "Oh.\n"
 	.string "Your POKéMON…$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141
+VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou: @ 8203141
 	.string "It adores you.\n"
 	.string "It can't possibly love you any more.\l"
 	.string "I even feel happy seeing it.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192
+VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy: @ 8203192
 	.string "It seems to be very happy.\n"
 	.string "It obviously likes you a whole lot.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1
+VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot: @ 82031D1
 	.string "It likes you quite a lot.\n"
 	.string "It seems to want to be babied a little.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213
+VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou: @ 8203213
 	.string "It's getting used to you.\n"
 	.string "It seems to believe in you.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249
+VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou: @ 8203249
 	.string "It's not very used to you yet.\n"
 	.string "It neither loves nor hates you.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288
+VerdanturfTown_FriendshipRatersHouse_Text_VeryWary: @ 8203288
 	.string "It's very wary.\n"
 	.string "It has scary viciousness in its eyes.\l"
 	.string "It doesn't like you much at all.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF
+VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou: @ 82032DF
 	.string "This is a little hard for me to say…\p"
 	.string "Your POKéMON simply detests you.\n"
 	.string "Doesn't that make you uncomfortable?$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A
+VerdanturfTown_FriendshipRatersHouse_Text_Pikachu: @ 820334A
 	.string "PIKACHU: Pika pika!$"
 
diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json
index 9a357b495..f50e62a4e 100644
--- a/data/maps/VerdanturfTown_House/map.json
+++ b/data/maps/VerdanturfTown_House/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_House_EventScript_20335F",
+      "script": "VerdanturfTown_House_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_House_EventScript_203368",
+      "script": "VerdanturfTown_House_EventScript_Woman2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc
index c6028c784..5f47e52fa 100644
--- a/data/maps/VerdanturfTown_House/scripts.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
@@ -1,21 +1,21 @@
 VerdanturfTown_House_MapScripts:: @ 820335E
 	.byte 0
 
-VerdanturfTown_House_EventScript_20335F:: @ 820335F
-	msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC
+VerdanturfTown_House_EventScript_Woman1:: @ 820335F
+	msgbox VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague, MSGBOX_NPC
 	end
 
-VerdanturfTown_House_EventScript_203368:: @ 8203368
-	msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC
+VerdanturfTown_House_EventScript_Woman2:: @ 8203368
+	msgbox VerdanturfTown_House_Text_DefeatEliteFourInARow, MSGBOX_NPC
 	end
 
-VerdanturfTown_House_Text_203371: @ 8203371
+VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague: @ 8203371
 	.string "Far away, deep in EVER GRANDE CITY,\n"
 	.string "is the POKéMON LEAGUE.\p"
 	.string "The TRAINERS who gather there are\n"
 	.string "all frighteningly well skilled.$"
 
-VerdanturfTown_House_Text_2033EE: @ 82033EE
+VerdanturfTown_House_Text_DefeatEliteFourInARow: @ 82033EE
 	.string "In the POKéMON LEAGUE, I think the\n"
 	.string "rules say that you have to battle the\l"
 	.string "ELITE FOUR all in a row.\p"
diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json
index 4f9b8296e..702a70f3d 100644
--- a/data/maps/VerdanturfTown_Mart/map.json
+++ b/data/maps/VerdanturfTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_202587",
+      "script": "VerdanturfTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025BA",
+      "script": "VerdanturfTown_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025C3",
+      "script": "VerdanturfTown_Mart_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025CC",
+      "script": "VerdanturfTown_Mart_EventScript_Lass",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index 2b3ccfc3a..cc4694fe1 100644
--- a/data/maps/VerdanturfTown_Mart/scripts.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 VerdanturfTown_Mart_MapScripts:: @ 8202586
 	.byte 0
 
-VerdanturfTown_Mart_EventScript_202587:: @ 8202587
+VerdanturfTown_Mart_EventScript_Clerk:: @ 8202587
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart VerdanturfTown_Mart_Pokemart_2025A0
+	pokemart VerdanturfTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0
+VerdanturfTown_Mart_Pokemart: @ 82025A0
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_NEST_BALL
 	.2byte ITEM_SUPER_POTION
@@ -28,31 +28,31 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0
 	release
 	end
 
-VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA
-	msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_Boy:: @ 82025BA
+	msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3
-	msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_ExpertF:: @ 82025C3
+	msgbox VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC
-	msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_Lass:: @ 82025CC
+	msgbox VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_Text_2025D5: @ 82025D5
+VerdanturfTown_Mart_Text_XSpecialIsCrucial: @ 82025D5
 	.string "For any POKéMON match, X SPECIAL\n"
 	.string "is crucial.\p"
 	.string "It jacks up the power of some moves\n"
 	.string "even though it's only for one battle.$"
 
-VerdanturfTown_Mart_Text_20264C: @ 820264C
+VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent: @ 820264C
 	.string "They don't seem to sell any winning\n"
 	.string "strategy guides for the BATTLE TENT…\p"
 	.string "It seems one must rely on one's\n"
 	.string "own wits after all…$"
 
-VerdanturfTown_Mart_Text_2026C9: @ 82026C9
+VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon: @ 82026C9
 	.string "The NEST BALL works better on\n"
 	.string "weakened POKéMON.\p"
 	.string "VERDANTURF is the only place you can\n"
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
index c437aeece..056e82ed1 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 32cecf152..040e69a16 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A
+@ VAR_0x800B is the Nurse's object event id
+VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 820273A
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,15 +17,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A
 	release
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC
+VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8202748
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC
+VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8202751
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A
+VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon: @ 820275A
 	.string "You can't consider yourself a real\n"
 	.string "TRAINER if you don't have faith\l"
 	.string "in your POKéMON.\p"
@@ -32,7 +33,7 @@ VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A
 	.string "in their battling POKéMON can win\l"
 	.string "through to the very end.$"
 
-VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B
+VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent: @ 820280B
 	.string "The reason why anyone would visit\n"
 	.string "VERDANTURF…\p"
 	.string "It's the BATTLE TENT. It goes without\n"
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json
index 514b2581e..c09a61274 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.json
+++ b/data/maps/VerdanturfTown_WandasHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_WandasHouse_EventScript_2028BF",
+      "script": "VerdanturfTown_WandasHouse_EventScript_Wally",
       "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY"
     },
     {
@@ -37,8 +37,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_WandasHouse_EventScript_202913",
-      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN"
+      "script": "VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_WandasHouse_EventScript_2028E1",
+      "script": "VerdanturfTown_WandasHouse_EventScript_WallysUncle",
       "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_WandasHouse_EventScript_20294E",
+      "script": "VerdanturfTown_WandasHouse_EventScript_WallysAunt",
       "flag": "0"
     },
     {
@@ -76,8 +76,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_WandasHouse_EventScript_20291C",
-      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN"
+      "script": "VerdanturfTown_WandasHouse_EventScript_Wanda",
+      "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA"
     }
   ],
   "warp_events": [
diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index c63aa3fa1..25d37a762 100644
--- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
@@ -1,88 +1,88 @@
 VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE
 	.byte 0
 
-VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF
+VerdanturfTown_WandasHouse_EventScript_Wally:: @ 82028BF
 	lock
 	faceplayer
-	goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_2028D7
-	msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT
+	goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech
+	msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeech, MSGBOX_DEFAULT
 	setflag FLAG_WALLY_SPEECH
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7
-	msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech:: @ 82028D7
+	msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeechShort, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1
+VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 82028E1
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202909
-	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_2028FF
-	msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff
+	msgbox VerdanturfTown_WandasHouse_Text_WallysNextDoor, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF
-	msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff:: @ 82028FF
+	msgbox VerdanturfTown_WandasHouse_Text_WallySlippedOff, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909
-	msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande:: @ 8202909
+	msgbox VerdanturfTown_WandasHouse_Text_WallyGoneThatFar, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913
-	msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC
+VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend:: @ 8202913
+	msgbox VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay, MSGBOX_NPC
 	end
 
-VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C
+VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 820291C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_202944
-	goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_20293A
-	msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WandaDontWorry
+	goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_MeetWanda
+	msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A
-	msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_MeetWanda:: @ 820293A
+	msgbox VerdanturfTown_WandasHouse_Text_MeetWanda, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944
-	msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WandaDontWorry:: @ 8202944
+	msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E
+VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 820294E
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202989
-	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_20297F
-	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975
-	msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened
+	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen
+	msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975
-	msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen:: @ 8202975
+	msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F
-	msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened:: @ 820297F
+	msgbox VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989
-	msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande:: @ 8202989
+	msgbox VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_Text_202993: @ 8202993
+VerdanturfTown_WandasHouse_Text_StrongerSpeech: @ 8202993
 	.string "WALLY: I lost to you, {PLAYER}, but I'm\n"
 	.string "not feeling down anymore.\p"
 	.string "Because I have a new purpose in life.\n"
@@ -94,13 +94,13 @@ VerdanturfTown_WandasHouse_Text_202993: @ 8202993
 	.string "When I do, I'm going to challenge you\n"
 	.string "to another battle.$"
 
-VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE
+VerdanturfTown_WandasHouse_Text_StrongerSpeechShort: @ 8202ABE
 	.string "WALLY: Please watch me, {PLAYER}.\n"
 	.string "I'm going to get stronger than you.\p"
 	.string "When I do, I'm going to challenge you\n"
 	.string "to another battle.$"
 
-VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37
+VerdanturfTown_WandasHouse_Text_WallysNextDoor: @ 8202B37
 	.string "UNCLE: Oh! {PLAYER}{KUN}!\n"
 	.string "WALLY's next door.\p"
 	.string "But, boy, there's something I have to\n"
@@ -111,18 +111,18 @@ VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37
 	.string "It could be POKéMON that are giving\l"
 	.string "the boy hope.$"
 
-VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20
+VerdanturfTown_WandasHouse_Text_WallySlippedOff: @ 8202C20
 	.string "WALLY's gone away…\n"
 	.string "He slipped off on his own…$"
 
-VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E
+VerdanturfTown_WandasHouse_Text_WallyGoneThatFar: @ 8202C4E
 	.string "UNCLE: Is that right?\n"
 	.string "WALLY's gone away that far all by\l"
 	.string "himself…\p"
 	.string "Well, I have to give him credit--he is\n"
 	.string "my little brother's son.$"
 
-VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF
+VerdanturfTown_WandasHouse_Text_MeetWanda: @ 8202CCF
 	.string "WANDA: You are?\n"
 	.string "Oh, right, I get it!\p"
 	.string "You're the {PLAYER} who WALLY was\n"
@@ -132,18 +132,18 @@ VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF
 	.string "I think WALLY's become a lot more lively\n"
 	.string "and healthy since he came here.$"
 
-VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91
+VerdanturfTown_WandasHouse_Text_DontWorryAboutWally: @ 8202D91
 	.string "WANDA: Don't worry about WALLY.\n"
 	.string "He'll be just fine.\p"
 	.string "I know my little cousin, and he has\n"
 	.string "POKéMON with him, too.$"
 
-VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00
+VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay: @ 8202E00
 	.string "Thanks to you, I can see my girlfriend\n"
 	.string "every day.\l"
 	.string "Happy? You bet I am!$"
 
-VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven: @ 8202E47
 	.string "My daughter's boyfriend is a very\n"
 	.string "driven and passionate sort of person.\p"
 	.string "He's been digging a tunnel nonstop\n"
@@ -151,17 +151,17 @@ VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47
 	.string "My daughter's a little concerned,\n"
 	.string "so she goes out to the tunnel a lot.$"
 
-VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging: @ 8202F19
 	.string "It's amazing. My daughter's boyfriend\n"
 	.string "was digging the tunnel by hand!\p"
 	.string "It's so incredible!$"
 
-VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73
+VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally: @ 8202F73
 	.string "If anything were to happen to WALLY,\n"
 	.string "I would never be able to look his\l"
 	.string "parents in PETALBURG in the eye…$"
 
-VerdanturfTown_WandasHouse_Text_202FDB: @ 8202FDB
+VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande: @ 8202FDB
 	.string "WALLY was in EVER GRANDE?\p"
 	.string "His parents in PETALBURG would be\n"
 	.string "astonished to hear that!$"
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 8685f3341..d76915648 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_1F_EventScript_235E73",
+      "script": "VictoryRoad_1F_EventScript_Edgar",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_1F_EventScript_235EA1",
+      "script": "VictoryRoad_1F_EventScript_Hope",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_1F_EventScript_235E8A",
+      "script": "VictoryRoad_1F_EventScript_Albert",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_1F_EventScript_235E2C",
+      "script": "VictoryRoad_1F_EventScript_EntranceWally",
       "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_1F_EventScript_235E35",
+      "script": "VictoryRoad_1F_EventScript_ExitWally",
       "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_1F_EventScript_235ECF",
+      "script": "VictoryRoad_1F_EventScript_Katelynn",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_1F_EventScript_235EB8",
+      "script": "VictoryRoad_1F_EventScript_Quincy",
       "flag": "0"
     }
   ],
@@ -177,7 +177,7 @@
       "elevation": 4,
       "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
-      "script": "VictoryRoad_1F_EventScript_235DAF"
+      "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger1"
     },
     {
       "type": "trigger",
@@ -186,7 +186,7 @@
       "elevation": 4,
       "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
-      "script": "VictoryRoad_1F_EventScript_235DC8"
+      "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger2"
     }
   ],
   "bg_events": [
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 9b7c00c62..6536be934 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -4,45 +4,45 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A
 
 VictoryRoad_1F_OnTransition: @ 8235D80
 	compare VAR_VICTORY_ROAD_1F_STATE, 1
-	call_if_eq VictoryRoad_1F_EventScript_235D97
+	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1
 	compare VAR_VICTORY_ROAD_1F_STATE, 2
-	call_if_eq VictoryRoad_1F_EventScript_235DA3
+	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2
 	end
 
-VictoryRoad_1F_EventScript_235D97:: @ 8235D97
+VictoryRoad_1F_EventScript_SetEntranceWallyPos1:: @ 8235D97
 	setobjectxyperm 4, 2, 24
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
+VictoryRoad_1F_EventScript_SetEntranceWallyPos2:: @ 8235DA3
 	setobjectxyperm 4, 3, 24
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF
+VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF
 	lockall
 	setvar VAR_0x8008, 1
 	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E15
+	applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer1
 	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
+	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
+VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8
 	lockall
 	setvar VAR_0x8008, 2
 	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E21
+	applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer2
 	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
+	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
+VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC
-	msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT
+	msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat
+	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	copyobjectxytoperm 4
 	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
@@ -50,7 +50,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	releaseall
 	end
 
-VictoryRoad_1F_Movement_235E15: @ 8235E15
+VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15
 	walk_left
 	walk_left
 	walk_left
@@ -64,7 +64,7 @@ VictoryRoad_1F_Movement_235E15: @ 8235E15
 	walk_up
 	step_end
 
-VictoryRoad_1F_Movement_235E21: @ 8235E21
+VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21
 	walk_left
 	walk_left
 	walk_left
@@ -77,49 +77,51 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21
 	walk_up
 	step_end
 
-VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
-	msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC
+@ This Wally appears near the entrance once his battle is triggered and remains there until the Hall of Fame is entered
+VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
+	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC
 	end
 
-VictoryRoad_1F_EventScript_235E35:: @ 8235E35
-	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+@ This Wally appears and remains at the exit after the Hall of Fame is entered 
+VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
+	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq VictoryRoad_1F_EventScript_235E5C
-	msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq VictoryRoad_1F_EventScript_RematchWally
+	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
-	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
-	msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
+	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
+	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E73:: @ 8235E73
-	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
-	msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Edgar:: @ 8235E73
+	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat
+	msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
-	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
-	msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Albert:: @ 8235E8A
+	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat
+	msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
-	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
-	msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Hope:: @ 8235EA1
+	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat
+	msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
-	trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
-	msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Quincy:: @ 8235EB8
+	trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_QuincyIntro, VictoryRoad_1F_Text_QuincyDefeat
+	msgbox VictoryRoad_1F_Text_QuincyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
-	trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
-	msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Katelynn:: @ 8235ECF
+	trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_KatelynnIntro, VictoryRoad_1F_Text_KatelynnDefeat
+	msgbox VictoryRoad_1F_Text_KatelynnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_Text_235EE6: @ 8235EE6
+VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I bet you're surprised to see me here!\p"
 	.string "I made it all the way here, and it's\n"
@@ -131,89 +133,89 @@ VictoryRoad_1F_Text_235EE6: @ 8235EE6
 	.string "gave me courage and strength!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_235FFC: @ 8235FFC
+VictoryRoad_1F_Text_WallyEntranceDefeat: @ 8235FFC
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_236020: @ 8236020
+VictoryRoad_1F_Text_WallyPostEntranceBattle: @ 8236020
 	.string "WALLY: I couldn't beat you today,\n"
 	.string "{PLAYER}, but one of these days, I'll\l"
 	.string "catch up to you!$"
 
-VictoryRoad_1F_Text_236073: @ 8236073
+VictoryRoad_1F_Text_WallyIntro: @ 8236073
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I've gotten stronger since that last\n"
 	.string "time! I wanted to show you, {PLAYER}!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_2360DA: @ 82360DA
+VictoryRoad_1F_Text_WallyDefeat: @ 82360DA
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_2360FE: @ 82360FE
+VictoryRoad_1F_Text_WallyPostBattle: @ 82360FE
 	.string "WALLY: I couldn't beat you this time,\n"
 	.string "too… But one of these days, {PLAYER},\l"
 	.string "I'm going to catch up to you…\p"
 	.string "And challenge the POKéMON LEAGUE!$"
 
-VictoryRoad_1F_Text_236184: @ 8236184
+VictoryRoad_1F_Text_EdgarIntro: @ 8236184
 	.string "I've made it this far a couple times,\n"
 	.string "but the last stretch is so long…$"
 
-VictoryRoad_1F_Text_2361CB: @ 82361CB
+VictoryRoad_1F_Text_EdgarDefeat: @ 82361CB
 	.string "My dream ends here again…$"
 
-VictoryRoad_1F_Text_2361E5: @ 82361E5
+VictoryRoad_1F_Text_EdgarPostBattle: @ 82361E5
 	.string "You've made it this far. Keep the\n"
 	.string "momentum going and become the\l"
 	.string "CHAMPION! If anyone can, it's you!$"
 
-VictoryRoad_1F_Text_236248: @ 8236248
+VictoryRoad_1F_Text_AlbertIntro: @ 8236248
 	.string "I didn't come all this way to lose now.\n"
 	.string "That possibility doesn't exist!$"
 
-VictoryRoad_1F_Text_236290: @ 8236290
+VictoryRoad_1F_Text_AlbertDefeat: @ 8236290
 	.string "Impossible…\n"
 	.string "I lost?$"
 
-VictoryRoad_1F_Text_2362A4: @ 82362A4
+VictoryRoad_1F_Text_AlbertPostBattle: @ 82362A4
 	.string "I lost here…\p"
 	.string "That means I lack the qualifications\n"
 	.string "to become the CHAMPION…$"
 
-VictoryRoad_1F_Text_2362EE: @ 82362EE
+VictoryRoad_1F_Text_HopeIntro: @ 82362EE
 	.string "This seemingly infinite and harsh road\n"
 	.string "lives up to its name of VICTORY.$"
 
-VictoryRoad_1F_Text_236336: @ 8236336
+VictoryRoad_1F_Text_HopeDefeat: @ 8236336
 	.string "Your battle style is fantastic…$"
 
-VictoryRoad_1F_Text_236356: @ 8236356
+VictoryRoad_1F_Text_HopePostBattle: @ 8236356
 	.string "You seem to have the potential for\n"
 	.string "becoming the CHAMPION.$"
 
-VictoryRoad_1F_Text_236390: @ 8236390
+VictoryRoad_1F_Text_QuincyIntro: @ 8236390
 	.string "What is the VICTORY ROAD?\n"
 	.string "I'll tell you if you win!$"
 
-VictoryRoad_1F_Text_2363C4: @ 82363C4
+VictoryRoad_1F_Text_QuincyDefeat: @ 82363C4
 	.string "Okay!\n"
 	.string "Well done!$"
 
-VictoryRoad_1F_Text_2363D5: @ 82363D5
+VictoryRoad_1F_Text_QuincyPostBattle: @ 82363D5
 	.string "Getting through here safely--that's\n"
 	.string "the final test for any TRAINER aiming\l"
 	.string "to become the POKéMON CHAMPION.\p"
 	.string "That's why it's called the VICTORY\n"
 	.string "ROAD.$"
 
-VictoryRoad_1F_Text_236468: @ 8236468
+VictoryRoad_1F_Text_KatelynnIntro: @ 8236468
 	.string "I have nothing to say to anyone\n"
 	.string "that's come this far. Come on!$"
 
-VictoryRoad_1F_Text_2364A7: @ 82364A7
+VictoryRoad_1F_Text_KatelynnDefeat: @ 82364A7
 	.string "This is a disgrace…$"
 
-VictoryRoad_1F_Text_2364BB: @ 82364BB
+VictoryRoad_1F_Text_KatelynnPostBattle: @ 82364BB
 	.string "Humph, go right on ahead.\n"
 	.string "See if I care.$"
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
index b8f00f4fb..3241c1364 100644
--- a/data/maps/VictoryRoad_B1F/map.json
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_B1F_EventScript_2364E5",
+      "script": "VictoryRoad_B1F_EventScript_Samuel",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B1F_EventScript_2364FC",
+      "script": "VictoryRoad_B1F_EventScript_Shannon",
       "flag": "0"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B1F_EventScript_236513",
+      "script": "VictoryRoad_B1F_EventScript_Michelle",
       "flag": "0"
     },
     {
@@ -271,7 +271,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B1F_EventScript_23652A",
+      "script": "VictoryRoad_B1F_EventScript_Mitchell",
       "flag": "0"
     },
     {
@@ -284,7 +284,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_B1F_EventScript_236541",
+      "script": "VictoryRoad_B1F_EventScript_Halle",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index c2fb918cc..fd175599c 100644
--- a/data/maps/VictoryRoad_B1F/scripts.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
@@ -1,88 +1,88 @@
 VictoryRoad_B1F_MapScripts:: @ 82364E4
 	.byte 0
 
-VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5
-	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
-	msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Samuel:: @ 82364E5
+	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat
+	msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC
-	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
-	msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Shannon:: @ 82364FC
+	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat
+	msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_236513:: @ 8236513
-	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
-	msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Michelle:: @ 8236513
+	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat
+	msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_23652A:: @ 823652A
-	trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
-	msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Mitchell:: @ 823652A
+	trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_MitchellIntro, VictoryRoad_B1F_Text_MitchellDefeat
+	msgbox VictoryRoad_B1F_Text_MitchellPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_236541:: @ 8236541
-	trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
-	msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Halle:: @ 8236541
+	trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_HalleIntro, VictoryRoad_B1F_Text_HalleDefeat
+	msgbox VictoryRoad_B1F_Text_HallePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_Text_236558: @ 8236558
+VictoryRoad_B1F_Text_SamuelIntro: @ 8236558
 	.string "The thought that I'm getting closer to\n"
 	.string "the POKéMON LEAGUE…\p"
 	.string "I'm getting stage fright…$"
 
-VictoryRoad_B1F_Text_2365AD: @ 82365AD
+VictoryRoad_B1F_Text_SamuelDefeat: @ 82365AD
 	.string "I couldn't do a thing…$"
 
-VictoryRoad_B1F_Text_2365C4: @ 82365C4
+VictoryRoad_B1F_Text_SamuelPostBattle: @ 82365C4
 	.string "The POKéMON LEAGUE became distant\n"
 	.string "again… What a letdown…$"
 
-VictoryRoad_B1F_Text_2365FD: @ 82365FD
+VictoryRoad_B1F_Text_ShannonIntro: @ 82365FD
 	.string "To win your way through the POKéMON\n"
 	.string "LEAGUE, you need the trust of your\l"
 	.string "POKéMON.$"
 
-VictoryRoad_B1F_Text_23664D: @ 823664D
+VictoryRoad_B1F_Text_ShannonDefeat: @ 823664D
 	.string "Your relationship is based on\n"
 	.string "solid trust.$"
 
-VictoryRoad_B1F_Text_236678: @ 8236678
+VictoryRoad_B1F_Text_ShannonPostBattle: @ 8236678
 	.string "By being together all the time, trust\n"
 	.string "grows between POKéMON and TRAINERS.$"
 
-VictoryRoad_B1F_Text_2366C2: @ 82366C2
+VictoryRoad_B1F_Text_MichelleIntro: @ 82366C2
 	.string "This isn't the goal. It's only a place\n"
 	.string "on the way to the POKéMON LEAGUE.$"
 
-VictoryRoad_B1F_Text_23670B: @ 823670B
+VictoryRoad_B1F_Text_MichelleDefeat: @ 823670B
 	.string "That's the way!$"
 
-VictoryRoad_B1F_Text_23671B: @ 823671B
+VictoryRoad_B1F_Text_MichellePostBattle: @ 823671B
 	.string "You'll do fine, for sure!\n"
 	.string "Your POKéMON are all eager to go!$"
 
-VictoryRoad_B1F_Text_236757: @ 8236757
+VictoryRoad_B1F_Text_MitchellIntro: @ 8236757
 	.string "My POKéMON are cosmically\n"
 	.string "awe inspiring!$"
 
-VictoryRoad_B1F_Text_236780: @ 8236780
+VictoryRoad_B1F_Text_MitchellDefeat: @ 8236780
 	.string "I've never met anyone like you before.$"
 
-VictoryRoad_B1F_Text_2367A7: @ 82367A7
+VictoryRoad_B1F_Text_MitchellPostBattle: @ 82367A7
 	.string "Even outside of battle, I sense\n"
 	.string "incredible power emanating from you\l"
 	.string "and your POKéMON.$"
 
-VictoryRoad_B1F_Text_2367FD: @ 82367FD
+VictoryRoad_B1F_Text_HalleIntro: @ 82367FD
 	.string "Okay, no need to get your back up!\n"
 	.string "Relax, let's take it easy!$"
 
-VictoryRoad_B1F_Text_23683B: @ 823683B
+VictoryRoad_B1F_Text_HalleDefeat: @ 823683B
 	.string "Whoa!\n"
 	.string "Wonderful!$"
 
-VictoryRoad_B1F_Text_23684C: @ 823684C
+VictoryRoad_B1F_Text_HallePostBattle: @ 823684C
 	.string "Sure, this is VICTORY ROAD.\p"
 	.string "But it's not all that different from\n"
 	.string "the path you've taken so far.\p"
diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json
index de10ef891..d78339b52 100644
--- a/data/maps/VictoryRoad_B2F/map.json
+++ b/data/maps/VictoryRoad_B2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_2368D5",
+      "script": "VictoryRoad_B2F_EventScript_Vito",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B2F_EventScript_2368EC",
+      "script": "VictoryRoad_B2F_EventScript_Owen",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236903",
+      "script": "VictoryRoad_B2F_EventScript_Caroline",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_23691A",
+      "script": "VictoryRoad_B2F_EventScript_Julie",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236948",
+      "script": "VictoryRoad_B2F_EventScript_Dianne",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236931",
+      "script": "VictoryRoad_B2F_EventScript_Felix",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 732878de3..9db635a85 100644
--- a/data/maps/VictoryRoad_B2F/scripts.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
@@ -1,108 +1,108 @@
 VictoryRoad_B2F_MapScripts:: @ 82368D4
 	.byte 0
 
-VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5
-	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3
-	msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Vito:: @ 82368D5
+	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat
+	msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC
-	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92
-	msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Owen:: @ 82368EC
+	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat
+	msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236903:: @ 8236903
-	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14
-	msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Caroline:: @ 8236903
+	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat
+	msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_23691A:: @ 823691A
-	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A
-	msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Julie:: @ 823691A
+	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat
+	msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236931:: @ 8236931
-	trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB
-	msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Felix:: @ 8236931
+	trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_FelixIntro, VictoryRoad_B2F_Text_FelixDefeat
+	msgbox VictoryRoad_B2F_Text_FelixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236948:: @ 8236948
-	trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E
-	msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Dianne:: @ 8236948
+	trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_DianneIntro, VictoryRoad_B2F_Text_DianneDefeat
+	msgbox VictoryRoad_B2F_Text_DiannePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_Text_23695F: @ 823695F
+VictoryRoad_B2F_Text_VitoIntro: @ 823695F
 	.string "I trained together with my whole family,\n"
 	.string "every one of us!\l"
 	.string "I'm not losing to anyone!$"
 
-VictoryRoad_B2F_Text_2369B3: @ 82369B3
+VictoryRoad_B2F_Text_VitoDefeat: @ 82369B3
 	.string "Better than my family?!\n"
 	.string "Is that possible?!$"
 
-VictoryRoad_B2F_Text_2369DE: @ 82369DE
+VictoryRoad_B2F_Text_VitoPostBattle: @ 82369DE
 	.string "I was better than everyone in my\n"
 	.string "family. I've never lost before…\p"
 	.string "I've lost my confidence…\n"
 	.string "Maybe I'll go home…$"
 
-VictoryRoad_B2F_Text_236A4C: @ 8236A4C
+VictoryRoad_B2F_Text_OwenIntro: @ 8236A4C
 	.string "I'd heard that there was a tough\n"
 	.string "little kid around. Do they mean you?$"
 
-VictoryRoad_B2F_Text_236A92: @ 8236A92
+VictoryRoad_B2F_Text_OwenDefeat: @ 8236A92
 	.string "The little shrimp is tough!$"
 
-VictoryRoad_B2F_Text_236AAE: @ 8236AAE
+VictoryRoad_B2F_Text_OwenPostBattle: @ 8236AAE
 	.string "The rumors I heard, that tough little\n"
 	.string "kid is from PETALBURG CITY.$"
 
-VictoryRoad_B2F_Text_236AF0: @ 8236AF0
+VictoryRoad_B2F_Text_CarolineIntro: @ 8236AF0
 	.string "You must be getting a little tired.$"
 
-VictoryRoad_B2F_Text_236B14: @ 8236B14
+VictoryRoad_B2F_Text_CarolineDefeat: @ 8236B14
 	.string "No signs of tiring at all!$"
 
-VictoryRoad_B2F_Text_236B2F: @ 8236B2F
+VictoryRoad_B2F_Text_CarolinePostBattle: @ 8236B2F
 	.string "VICTORY ROAD and the POKéMON LEAGUE\n"
 	.string "are long and grueling challenges.\l"
 	.string "Beware of fatigue!$"
 
-VictoryRoad_B2F_Text_236B88: @ 8236B88
+VictoryRoad_B2F_Text_JulieIntro: @ 8236B88
 	.string "You shouldn't get complacent just\n"
 	.string "because you have a lot of GYM BADGES.\p"
 	.string "There's always going to be someone\n"
 	.string "who's better than you!$"
 
-VictoryRoad_B2F_Text_236C0A: @ 8236C0A
+VictoryRoad_B2F_Text_JulieDefeat: @ 8236C0A
 	.string "You're better than me!$"
 
-VictoryRoad_B2F_Text_236C21: @ 8236C21
+VictoryRoad_B2F_Text_JuliePostBattle: @ 8236C21
 	.string "Gaze on your collected BADGES and\n"
 	.string "remember the TRAINERS you've faced.$"
 
-VictoryRoad_B2F_Text_236C67: @ 8236C67
+VictoryRoad_B2F_Text_FelixIntro: @ 8236C67
 	.string "I've come this far, but the tension's\n"
 	.string "giving me awful stomach pain…$"
 
-VictoryRoad_B2F_Text_236CAB: @ 8236CAB
+VictoryRoad_B2F_Text_FelixDefeat: @ 8236CAB
 	.string "Ooh…\n"
 	.string "It hurts…$"
 
-VictoryRoad_B2F_Text_236CBA: @ 8236CBA
+VictoryRoad_B2F_Text_FelixPostBattle: @ 8236CBA
 	.string "I can't help getting all tense knowing\n"
 	.string "that I'm nearing the POKéMON LEAGUE.\p"
 	.string "It's all I can do to feign calm.$"
 
-VictoryRoad_B2F_Text_236D27: @ 8236D27
+VictoryRoad_B2F_Text_DianneIntro: @ 8236D27
 	.string "The elite among the elite gather in\n"
 	.string "this cave.\p"
 	.string "How are you finding it?$"
 
-VictoryRoad_B2F_Text_236D6E: @ 8236D6E
+VictoryRoad_B2F_Text_DianneDefeat: @ 8236D6E
 	.string "Not rattled in the least bit!$"
 
-VictoryRoad_B2F_Text_236D8C: @ 8236D8C
+VictoryRoad_B2F_Text_DiannePostBattle: @ 8236D8C
 	.string "You do have guts! I like that!\n"
 	.string "Keep it going!$"
 
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 4088ddbb5..4035bc3f3 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -132,8 +132,8 @@
     "FallarborTown_BattleTentBattleRoom",
     "FallarborTown_PokemonCenter_1F",
     "FallarborTown_PokemonCenter_2F",
-    "FallarborTown_House1",
-    "FallarborTown_House2"
+    "FallarborTown_CozmosHouse",
+    "FallarborTown_MoveRelearnersHouse"
   ],
   "gMapGroup6": [
     "VerdanturfTown_BattleTentLobby",
@@ -170,12 +170,12 @@
     "SlateportCity_BattleTentLobby",
     "SlateportCity_BattleTentCorridor",
     "SlateportCity_BattleTentBattleRoom",
-    "SlateportCity_House1",
+    "SlateportCity_NameRatersHouse",
     "SlateportCity_PokemonFanClub",
     "SlateportCity_OceanicMuseum_1F",
     "SlateportCity_OceanicMuseum_2F",
     "SlateportCity_Harbor",
-    "SlateportCity_House2",
+    "SlateportCity_House",
     "SlateportCity_PokemonCenter_1F",
     "SlateportCity_PokemonCenter_2F",
     "SlateportCity_Mart"
@@ -456,22 +456,22 @@
     "SecretBase_YellowCave4",
     "SecretBase_Tree4",
     "SecretBase_Shrub4",
-    "SingleBattleColosseum",
+    "BattleColosseum2P",
     "TradeCenter",
     "RecordCorner",
-    "DoubleBattleColosseum",
-    "LinkContestRoom1",
+    "BattleColosseum4P",
+    "ContestHall",
     "UnknownLinkContestRoom_25_29",
     "UnknownLinkContestRoom_25_30",
     "UnknownLinkContestRoom_25_31",
     "UnknownLinkContestRoom_25_32",
     "UnknownLinkContestRoom_25_33",
     "UnknownLinkContestRoom_25_34",
-    "LinkContestRoom2",
-    "LinkContestRoom3",
-    "LinkContestRoom4",
-    "LinkContestRoom5",
-    "LinkContestRoom6",
+    "ContestHallBeauty",
+    "ContestHallTough",
+    "ContestHallCool",
+    "ContestHallSmart",
+    "ContestHallCute",
     "InsideOfTruck",
     "SSTidalCorridor",
     "SSTidalLowerDeck",
@@ -537,7 +537,7 @@
     "BattleFrontier_BattlePikeRandomRoom3",
     "BattleFrontier_RankingHall",
     "BattleFrontier_Lounge1",
-    "BattleFrontier_BattlePointExchangeServiceCorner",
+    "BattleFrontier_ExchangeServiceCorner",
     "BattleFrontier_Lounge2",
     "BattleFrontier_Lounge3",
     "BattleFrontier_Lounge4",
diff --git a/data/mystery_event.s b/data/mystery_event.s
new file mode 100644
index 000000000..d707731b6
--- /dev/null
+++ b/data/mystery_event.s
@@ -0,0 +1,25 @@
+#include "constants/global.h"
+#include "constants/flags.h"
+#include "constants/items.h"
+#include "constants/map_scripts.h"
+#include "constants/mevent.h"
+#include "constants/moves.h"
+#include "constants/region_map_sections.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/vars.h"
+	.include "asm/macros.inc"
+	.include "asm/macros/event.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+	.include "data/scripts/mevent_stamp_card.inc"
+	.include "data/scripts/mevent_pichu.inc"
+	.include "data/scripts/mevent_trainer.inc"
+	.include "data/scripts/mevent_battle_card.inc"
+	.include "data/scripts/mevent_aurora_ticket.inc"
+	.include "data/scripts/mevent_mystic_ticket.inc"
+	.include "data/scripts/mevent_altering_cave.inc"
+	.include "data/scripts/mevent_old_sea_map.inc"
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
deleted file mode 100644
index 33af5269c..000000000
--- a/data/mystery_event_msg.s
+++ /dev/null
@@ -1,344 +0,0 @@
-#include "constants/flags.h"
-#include "constants/items.h"
-#include "constants/map_scripts.h"
-#include "constants/moves.h"
-#include "constants/region_map_sections.h"
-#include "constants/songs.h"
-#include "constants/species.h"
-#include "constants/vars.h"
-	.include "asm/macros.inc"
-	.include "asm/macros/event.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-
-MysteryEventScript_StampCard:: @ 8674CB0
-	setvaddress MysteryEventScript_StampCard
-	setorcopyvar VAR_RESULT, 1
-	specialvar VAR_0x8008, sub_813986C
-	setorcopyvar VAR_RESULT, 0
-	specialvar VAR_0x8009, sub_813986C
-	subvar VAR_0x8008, VAR_0x8009
-	buffernumberstring 0, VAR_0x8008
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftStampCard
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysteryGiftStampCard:
-	.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"
-
-MysteryEventScript_SurfPichu:: @ 8674D3D
-	setvaddress MysteryEventScript_SurfPichu
-	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if 0, SurfPichu_GiveIfPossible
-	returnram
-
-SurfPichu_GiveIfPossible: @ 8674D4C
-	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 6
-	vgoto_if 1, SurfPichu_FullParty
-	setflag FLAG_MYSTERY_EVENT_DONE
-	vcall SurfPichu_GiveEgg
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftEgg
-	waitmessage
-	waitbuttonpress
-	playfanfare MUS_FANFA4
-	waitfanfare
-	release
-	end
-
-SurfPichu_FullParty: @ 8674D73
-	lock
-	faceplayer
-	vmessage sText_FullParty
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-SurfPichu_GiveEgg: @ 8674D7E
-	giveegg SPECIES_PICHU
-	setmonobedient VAR_EVENT_PICHU_SLOT
-	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
-	vgoto_if 1, SurfPichu_Slot1
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
-	vgoto_if 1, SurfPichu_Slot2
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
-	vgoto_if 1, SurfPichu_Slot3
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
-	vgoto_if 1, SurfPichu_Slot4
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
-	vgoto_if 1, SurfPichu_Slot5
-	return
-
-SurfPichu_Slot1: @ 8674DC0
-	setmonmove 1, 2, MOVE_SURF
-	return
-
-SurfPichu_Slot2:: @ 8674DC6
-	setmonmove 2, 2, MOVE_SURF
-	return
-
-SurfPichu_Slot3: @ 8674DCC
-	setmonmove 3, 2, MOVE_SURF
-	return
-
-SurfPichu_Slot4: @ 8674DD2
-	setmonmove 4, 2, MOVE_SURF
-	return
-
-SurfPichu_Slot5: @ 8674DD8
-	setmonmove 5, 2, MOVE_SURF
-	return
-
-sText_MysteryGiftEgg:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$"
-
-sText_FullParty:
-	.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$"
-
-MysteryEventScript_VisitingTrainer:: @ 8674EC1
-	setvaddress MysteryEventScript_VisitingTrainer
-	special ValidateEReaderTrainer
-	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, MysteryEventScript_VisitingTrainerArrived
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftVisitingTrainer
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftVisitingTrainer_2
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysteryGiftVisitingTrainer:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$"
-
-sText_MysteryGiftVisitingTrainer_2:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$"
-
-MysteryEventScript_BattleCard:: @ 867513C
-	setvaddress MysteryEventScript_BattleCard
-	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if 1, MysteryEventScript_BattleCardInfo
-	setorcopyvar VAR_RESULT, 2
-	specialvar VAR_0x8008, sub_813986C
-	compare_var_to_value VAR_0x8008, 3
-	vgoto_if 0, MysteryEventScript_BattleCardInfo
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftBattleCountCard_2
-	waitmessage
-	waitbuttonpress
-	giveitem_std ITEM_POTION
-	release
-	setflag FLAG_MYSTERY_EVENT_DONE
-	end
-
-MysteryEventScript_BattleCardInfo: @ 8675179
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftBattleCountCard
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysteryGiftBattleCountCard:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$"
-
-sText_MysteryGiftBattleCountCard_2:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$"
-
-MysteryEventScript_AuroraTicket:: @ 867533C
-	setvaddress MysteryEventScript_AuroraTicket
-	lock
-	faceplayer
-	checkflag FLAG_RECEIVED_AURORA_TICKET
-	vgoto_if 1, AuroraTicket_Obtained
-	checkflag FLAG_BATTLED_DEOXYS
-	vgoto_if 1, AuroraTicket_Obtained
-	checkitem ITEM_AURORA_TICKET, 1
-	compare_var_to_value VAR_RESULT, 1
-	vgoto_if 1, AuroraTicket_Obtained
-	vmessage sText_AuroraTicket1
-	waitmessage
-	waitbuttonpress
-	checkitemspace ITEM_AURORA_TICKET, 1
-	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, AuroraTicket_NoBagSpace
-	giveitem_std ITEM_AURORA_TICKET
-	setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
-	setflag FLAG_RECEIVED_AURORA_TICKET
-	vmessage sText_AuroraTicket2
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-AuroraTicket_NoBagSpace: @ 8675397
-	vmessage sText_AuroraTicketNoPlace
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-AuroraTicket_Obtained: @ 86753A0
-	vmessage sText_AuroraTicketGot
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_AuroraTicket1:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
-
-sText_AuroraTicket2:
-	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
-
-sText_AuroraTicketGot:
-	.string "Thank you for using the MYSTERY\nGIFT System.$"
-
-sText_AuroraTicketNoPlace:
-	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
-
-MysteryEventScript_MysticTicket:: @ 867550B
-	setvaddress MysteryEventScript_MysticTicket
-	lock
-	faceplayer
-	checkflag FLAG_RECEIVED_MYSTIC_TICKET
-	vgoto_if 1, MysticTicket_Obtained
-	checkflag FLAG_CAUGHT_LUGIA
-	vgoto_if 1, MysticTicket_Obtained
-	checkflag FLAG_CAUGHT_HO_OH
-	vgoto_if 1, MysticTicket_Obtained
-	checkitem ITEM_MYSTIC_TICKET, 1
-	compare_var_to_value VAR_RESULT, 1
-	vgoto_if 1, MysticTicket_Obtained
-	vmessage sText_MysticTicket2
-	waitmessage
-	waitbuttonpress
-	checkitemspace ITEM_MYSTIC_TICKET, 1
-	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, MysticTicket_NoBagSpace
-	giveitem_std ITEM_MYSTIC_TICKET
-	setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
-	setflag FLAG_RECEIVED_MYSTIC_TICKET
-	vmessage sText_MysticTicket1
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-MysticTicket_NoBagSpace: @ 867556F
-	vmessage sText_MysticTicketNoPlace
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-MysticTicket_Obtained: @ 8675578
-	vmessage sText_MysticTicketGot
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysticTicket2:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
-
-sText_MysticTicket1:
-	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
-
-sText_MysticTicketGot:
-	.string "Thank you for using the MYSTERY\nGIFT System.$"
-
-sText_MysticTicketNoPlace:
-	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
-
-MysteryEventScript_AlteringCave:: @ 86756E3
-	setvaddress MysteryEventScript_AlteringCave
-	addvar VAR_ALTERING_CAVE_WILD_SET, 1
-	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
-	vgoto_if 0, MysteryEventScript_AlteringCave_
-	setvar VAR_ALTERING_CAVE_WILD_SET, 0
-MysteryEventScript_AlteringCave_: @ 86756FD
-	lock
-	faceplayer
-	vmessage sText_MysteryGiftAlteringCave
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysteryGiftAlteringCave::
-	.string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$"
-
-MysteryEventScript_OldSeaMap:: @ 86757F4
-	setvaddress MysteryEventScript_OldSeaMap
-	lock
-	faceplayer
-	checkflag FLAG_RECEIVED_OLD_SEA_MAP
-	vgoto_if 1, OldSeaMap_Obtained
-	checkflag FLAG_CAUGHT_MEW
-	vgoto_if 1, OldSeaMap_Obtained
-	checkitem ITEM_OLD_SEA_MAP, 1
-	compare_var_to_value VAR_RESULT, 1
-	vgoto_if 1, OldSeaMap_Obtained
-	vmessage sText_MysteryGiftOldSeaMap
-	waitmessage
-	waitbuttonpress
-	checkitemspace ITEM_OLD_SEA_MAP, 1
-	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, OldSeaMap_NoBagSpace
-	giveitem_std ITEM_OLD_SEA_MAP
-	setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
-	setflag FLAG_RECEIVED_OLD_SEA_MAP
-	vmessage sText_MysteryGiftOldSeaMap_1
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-OldSeaMap_NoBagSpace: @ 867584F
-	vmessage sText_MysteryGiftOldSeaMap_3
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-OldSeaMap_Obtained: @ 8675858
-	vmessage sText_MysteryGiftOldSeaMap_2
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-sText_MysteryGiftOldSeaMap:
-	.string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$"
-
-sText_MysteryGiftOldSeaMap_1:
-	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
-
-sText_MysteryGiftOldSeaMap_2:
-	.string "Thank you for using the MYSTERY\nGIFT System.$"
-
-sText_MysteryGiftOldSeaMap_3:
-	.string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 5a6a1e613..006167443 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -218,7 +218,7 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_warpmossdeepgym
 	.4byte ScrCmd_cmdD8
 	.4byte ScrCmd_cmdD9
-	.4byte ScrCmd_cmdDA
+	.4byte ScrCmd_closebraillemessage
 	.4byte ScrCmd_cmdDB
 	.4byte ScrCmd_fadescreenswapbuffers
 	.4byte ScrCmd_buffertrainerclassname
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index 7eae99dcf..53b43a1f9 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -1,327 +1,253 @@
-#include "constants/apprentice.h"
-
-.macro apprentice_msg waitbuttonpress which
-setvar VAR_0x8004, 8
-setvar VAR_0x8005, \waitbuttonpress
-setvar VAR_0x8006, \which
-special CallApprenticeFunction
-waitstate
-.endm
-
-.macro apprentice_buff whichstringvar tobuff
-setvar VAR_0x8004, 16
-setvar VAR_0x8005, \whichstringvar
-setvar VAR_0x8006, \tobuff
-special CallApprenticeFunction
-.endm
-
-.macro apprentice_menu which
-setvar VAR_0x8004, 7
-setvar VAR_0x8005, \which
-special CallApprenticeFunction
-waitstate
-.endm
-
-EventScript_Apprentice:: @ 82B688D
+BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D
 	lock
 	faceplayer
-	setvar VAR_0x8004, 0
-	special CallApprenticeFunction
-	compare VAR_RESULT, 0
-	goto_if_eq Script_Apprentice_FirstMeeting
-	setvar VAR_0x8004, 10
-	special CallApprenticeFunction
-	compare VAR_0x8004, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE
-	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd
-
-BattleFrontier_BattleTowerLobby_EventScript_2B68BE:
-	setvar VAR_0x8004, 11
-	special CallApprenticeFunction
-	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3
-	compare VAR_RESULT, 4
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF
-	compare VAR_RESULT, 3
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C
-	compare VAR_RESULT, 5
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4
+	apprentice_gavelvlmode
+	compare VAR_RESULT, FALSE
+	goto_if_eq Apprentice_EventScript_FirstMeeting
+	apprentice_shouldcheckgone
+	compare VAR_0x8004, FALSE  @ Always TRUE here
+	goto_if_eq Apprentice_EventScript_AskQuestion
+	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Apprentice_EventScript_Gone
+Apprentice_EventScript_AskQuestion: @ 82B68BE
+	apprentice_getquestion
+	compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON
+	goto_if_eq Apprentice_EventScript_UseWhichMon
+	compare VAR_RESULT, APPRENTICE_QUESTION_WHAT_ITEM
+	goto_if_eq Apprentice_EventScript_UseWhatHeldItem
+	compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MOVE
+	goto_if_eq Apprentice_EventScript_UseWhichMove
+	compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_FIRST
+	goto_if_eq Apprentice_EventScript_PutWhichMonFirst
+	compare VAR_RESULT, APPRENTICE_QUESTION_WIN_SPEECH
+	goto_if_eq Apprentice_EventScript_PickWinSpeech
 	release
 	releaseall
 	end
 
-Script_Apprentice_FirstMeeting:
+Apprentice_EventScript_FirstMeeting: @ 82B6900
 	apprentice_buff 0, APPRENTICE_BUFF_NAME
-	apprentice_msg FALSE, 0
-
-Script_Apprentice_FirstMeetingNag:
+	apprentice_msg FALSE, APPRENTICE_MSG_PLEASE_TEACH
+Apprentice_EventScript_WhichLvlMode: @ 82B6925
 	apprentice_menu APPRENTICE_ASK_YES_NO
 	compare VAR_RESULT, 1
-	goto_if_eq Script_Apprentice_FirstMeetingAskAgain
-	apprentice_msg FALSE, 2
+	goto_if_eq Apprentice_EventScript_RejectTeach
+	apprentice_msg FALSE, APPRENTICE_MSG_WHICH_LVL_MODE
 	apprentice_menu APPRENTICE_ASK_WHICH_LEVEL
-	setvar VAR_0x8004, 1
-	setorcopyvar VAR_0x8005, VAR_RESULT
-	addvar VAR_0x8005, 1
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 3
-	special CallApprenticeFunction
+	apprentice_setlvlmode VAR_RESULT
+	apprentice_shufflespecies
 	apprentice_buff 0, APPRENTICE_BUFF_LEVEL
-	apprentice_msg TRUE, 3
-	call Script_Apprentice_SetLeavingFlags
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_LVL_MODE
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-Script_Apprentice_FirstMeetingAskAgain:
-	apprentice_msg FALSE, 1
-	goto Script_Apprentice_FirstMeetingNag
+@ Its impossible to fully reject an Apprentice, they just keep asking for you to teach them
+Apprentice_EventScript_RejectTeach: @ 82B69BB
+	apprentice_msg FALSE, APPRENTICE_MSG_REJECT
+	goto Apprentice_EventScript_WhichLvlMode
 
-BattleFrontier_BattleTowerLobby_EventScript_2B69D3:
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 2
-	special CallApprenticeFunction
+Apprentice_EventScript_UseWhichMon: @ 82B69D3
+	apprentice_initquestion APPRENTICE_QUESTION_WHICH_MON
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES1
 	apprentice_buff 1, APPRENTICE_BUFF_SPECIES2
-	apprentice_msg FALSE, 6
+	apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON
 	apprentice_menu APPRENTICE_ASK_2SPECIES
 	copyvar VAR_0x8005, VAR_RESULT
 	compare VAR_0x8005, 0
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA
+	call_if_eq Apprentice_EventScript_ChoseFirstMon
 	compare VAR_0x8005, 1
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0
-	setvar VAR_0x8004, 12
-	special CallApprenticeFunction
-	copyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 13
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 5
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 12
-	special CallApprenticeFunction
-	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	copyvar VAR_0x8006, VAR_0x8007
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 15
-	special CallApprenticeFunction
-	apprentice_msg TRUE, 7
-	call Script_Apprentice_SetLeavingFlags
+	call_if_eq Apprentice_EventScript_ChoseSecondMon
+	apprentice_getnumpartymons
+	apprentice_setpartymon VAR_RESULT
+	apprentice_answeredquestion
+	apprentice_getnumpartymons
+	compare VAR_RESULT, MULTI_PARTY_SIZE
+	call_if_eq Apprentice_EventScript_LastMonSelected
+	apprentice_buff 0, VAR_0x8007
+	apprentice_freequestion
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6ABA:
-	setvar VAR_0x8007, 0
+Apprentice_EventScript_ChoseFirstMon: @ 82B6ABA
+	setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES1
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6AC0:
-	setvar VAR_0x8007, 1
+Apprentice_EventScript_ChoseSecondMon: @ 82B6AC0
+	setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES2
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6AC6:
-	setvar VAR_0x8004, 4
-	special CallApprenticeFunction
+Apprentice_EventScript_LastMonSelected: @ 82B6AC6
+	apprentice_randomizequestions
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6ACF:
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special CallApprenticeFunction
+Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF
+	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
-	apprentice_msg TRUE, 10
-	setvar VAR_0x8004, 15
-	special CallApprenticeFunction
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6B09:
+	apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM
+	apprentice_freequestion
+Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
 	fadescreen 1
 	setvar VAR_RESULT, 0
-	setvar VAR_0x8004, 19
-	special CallApprenticeFunction
-	waitstate
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81
-	setvar VAR_0x8004, 20
-	special CallApprenticeFunction
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C
+	apprentice_openbag
+	compare VAR_RESULT, FALSE
+	goto_if_eq Apprentice_EventScript_ConfirmHoldNothing
+	apprentice_trysetitem
+	compare VAR_RESULT, FALSE
+	goto_if_eq Apprentice_EventScript_AlreadySuggestedItem
 	apprentice_buff 0, APPRENTICE_BUFF_ITEM
-	apprentice_msg TRUE, 12
-	setvar VAR_0x8004, 5
-	special CallApprenticeFunction
-	call Script_Apprentice_SetLeavingFlags
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_HELD_ITEM
+	apprentice_answeredquestion
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6B81:
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special CallApprenticeFunction
+Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81
+	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
-	apprentice_msg FALSE, 13
+	apprentice_msg FALSE, APPRENTICE_MSG_HOLD_NOTHING
 	apprentice_menu APPRENTICE_ASK_GIVE
-	setvar VAR_0x8004, 15
-	special CallApprenticeFunction
+	apprentice_freequestion
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:
-	apprentice_msg TRUE, 14
-	setvar VAR_0x8004, 5
-	special CallApprenticeFunction
-	call Script_Apprentice_SetLeavingFlags
+	goto_if_eq Apprentice_EventScript_ChooseHoldItem
+Apprentice_EventScript_HoldNothing: @ 82B6BD4
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM
+	apprentice_answeredquestion
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6C0C:
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special CallApprenticeFunction
+@ Because Battle Tower mons may not hold the same item, the player must suggest a
+@ different item if theyve already told the Apprentice to use it for another mon
+Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C
+	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_ITEM
 	apprentice_buff 1, APPRENTICE_BUFF_SPECIES3
-	apprentice_msg FALSE, 16
+	apprentice_msg FALSE, APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED
 	apprentice_menu APPRENTICE_ASK_GIVE
-	setvar VAR_0x8004, 15
-	special CallApprenticeFunction
+	apprentice_freequestion
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4
+	goto_if_eq Apprentice_EventScript_ChooseHoldItem
+	goto Apprentice_EventScript_HoldNothing
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6C77:
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 3
-	special CallApprenticeFunction
+Apprentice_EventScript_UseWhichMove: @ 82B6C77
+	apprentice_initquestion APPRENTICE_QUESTION_WHICH_MOVE
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
 	apprentice_buff 1, APPRENTICE_BUFF_MOVE1
 	apprentice_buff 2, APPRENTICE_BUFF_MOVE2
-	apprentice_msg FALSE, 8
+	apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MOVE
 	apprentice_menu APPRENTICE_ASK_MOVES
 	copyvar VAR_0x8005, VAR_RESULT
 	compare VAR_0x8005, 0
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50
+	call_if_eq Apprentice_EventScript_ChoseMove1
 	compare VAR_0x8005, 1
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56
-	setvar VAR_0x8004, 17
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 5
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	copyvar VAR_0x8006, VAR_0x8007
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 15
-	special CallApprenticeFunction
-	apprentice_msg TRUE, 9
-	call Script_Apprentice_SetLeavingFlags
+	call_if_eq Apprentice_EventScript_ChoseMove2
+	apprentice_setmove
+	apprentice_answeredquestion
+	apprentice_buff 0, VAR_0x8007
+	apprentice_freequestion
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6D50:
-	setvar VAR_0x8007, 3
+Apprentice_EventScript_ChoseMove1: @ 82B6D50
+	setvar VAR_0x8007, APPRENTICE_BUFF_MOVE1
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6D56:
-	setvar VAR_0x8007, 4
+Apprentice_EventScript_ChoseMove2: @ 82B6D56
+	setvar VAR_0x8007, APPRENTICE_BUFF_MOVE2
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6D5C:
-	apprentice_msg FALSE, 4
+Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C
+	apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON_FIRST
 	apprentice_menu APPRENTICE_ASK_3SPECIES
-	copyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 18
-	special CallApprenticeFunction
-	setvar VAR_0x8004, 5
-	special CallApprenticeFunction
-	apprentice_buff 0, APPRENTICE_BUFF_SPECIES4
-	apprentice_msg TRUE, 5
-	call Script_Apprentice_SetLeavingFlags
+	apprentice_setleadmon VAR_RESULT
+	apprentice_answeredquestion
+	apprentice_buff 0, APPRENTICE_BUFF_LEAD_MON_SPECIES
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON_FIRST
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
-	apprentice_msg TRUE, 11
-	setvar VAR_0x8004, 25
-	special CallApprenticeFunction
+@ Last question, after which the Apprentice leaves (and is saved) to be replaced by another
+Apprentice_EventScript_PickWinSpeech: @ 82B6DD4
+	apprentice_msg TRUE, APPRENTICE_MSG_PICK_WIN_SPEECH
+	apprentice_shiftsaved
 	setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
-	setvar VAR_0x8004, 21
-	special CallApprenticeFunction
-	apprentice_buff 0, APPRENTICE_BUFF_EASY_CHAT
-	apprentice_msg TRUE, 15
-	setvar VAR_0x8004, 9
-	special CallApprenticeFunction
-	call Script_Apprentice_SetLeavingFlags
+	apprentice_save
+	apprentice_buff 0, APPRENTICE_BUFF_WIN_SPEECH
+	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_WIN_SPEECH
+	apprentice_reset
+	call Apprentice_EventScript_SetHideFlags
 	release
 	releaseall
 	switch VAR_FACING
-	case DIR_NORTH, Script_Apprentice_LeaveGoRight
-	goto Script_Apprentice_Leave
+	case DIR_NORTH, Apprentice_EventScript_LeaveNorth
+	goto Apprentice_EventScript_Leave
 	end
 
-Script_Apprentice_SetLeavingFlags:
+Apprentice_EventScript_SetHideFlags: @ 82B6E4D
 	setflag FLAG_HIDE_APPRENTICE
 	setflag FLAG_DAILY_APPRENTICE_LEAVES
 	return
 
-Script_Apprentice_LeaveGoRight:
-	setvar VAR_0x8004, 24
-	special CallApprenticeFunction
-	compare VAR_0x8004, 0
-	goto_if_eq Script_Apprentice_End
-	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94
+Apprentice_EventScript_LeaveNorth: @ 82B6E54
+	apprentice_shouldleave
+	compare VAR_0x8004, FALSE  @ Always TRUE here
+	goto_if_eq Apprentice_EventScript_DontMove
+	applymovement 6, Apprentice_Movement_LeaveNorth
 	waitmovement 0
 	end
 
-Script_Apprentice_Leave:
-	setvar VAR_0x8004, 24
-	special CallApprenticeFunction
-	compare VAR_0x8004, 0
-	goto_if_eq Script_Apprentice_End
-	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95
+Apprentice_EventScript_Leave: @ 82B6E72
+	apprentice_shouldleave
+	compare VAR_0x8004, FALSE  @ Always TRUE here
+	goto_if_eq Apprentice_EventScript_DontMove
+	applymovement 6, Apprentice_Movement_Leave
 	waitmovement 0
 	end
 
-Script_Apprentice_ReleaseAndEnd:
+Apprentice_EventScript_Gone: @ 82B6E90
 	release
 	releaseall
 	end
 
-Script_Apprentice_End:
+Apprentice_EventScript_DontMove: @ 82B6E93
 	end
 
-BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
+Apprentice_Movement_LeaveNorth: @ 82B6E94
 	walk_fast_right
-
-BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
+Apprentice_Movement_Leave: @ 82B6E95
 	walk_fast_down
 	walk_fast_down
 	walk_fast_right
@@ -338,2531 +264,3 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
 	slide_down
 	slide_down
 	step_end
-
-gText_082B6EA5:: @ 82B6EA5
-	.string "Um, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
-	.string "Snivel… This tension is getting to me…$"
-
-gText_082B6EEC:: @ 82B6EEC
-	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
-	.string "Here we come!$"
-
-gText_082B6F16:: @ 82B6F16
-	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n"
-	.string "Accept my challenge!$"
-
-gText_082B6F4C:: @ 82B6F4C
-	.string "Um… I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…\n"
-	.string "Do you think someone like me can win?$"
-
-gText_082B6F92:: @ 82B6F92
-	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
-	.string "I'll let you challenge me!$"
-
-gText_082B6FC9:: @ 82B6FC9
-	.string "I'm horribly busy, but I also happen\n"
-	.string "to be {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$"
-
-gText_082B700C:: @ 82B700C
-	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
-	.string "Glad to meet you!$"
-
-gText_082B703A:: @ 82B703A
-	.string "I serve as {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
-	.string "May I begin?$"
-
-gText_082B706A:: @ 82B706A
-	.string "Eek! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
-	.string "I'll do my best!$"
-
-gText_082B709C:: @ 82B709C
-	.string "Yeehaw! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
-	.string "Put 'em up!$"
-
-gText_082B70CC:: @ 82B70CC
-	.string "I'm {STR_VAR_1}'s 1,000th apprentice!\n"
-	.string "Actually, I'm no. {STR_VAR_2}! Here goes!$"
-
-gText_082B710A:: @ 82B710A
-	.string "Yeah, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
-	.string "Let's get rockin' and a-rollin'!$"
-
-gText_082B714D:: @ 82B714D
-	.string "Yippee-yahoo! I'm what you call\n"
-	.string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
-
-gText_082B7185:: @ 82B7185
-	.string "Cough! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
-	.string "Good to meet you! Cough!$"
-
-gText_082B71C1:: @ 82B71C1
-	.string "This is nerve-racking…\n"
-	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
-
-gText_082B71F9:: @ 82B71F9
-	.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n"
-	.string "and that's no lie.$"
-
-gText_082B7229:: @ 82B7229
-	.string "Are you… {PLAYER}?\n"
-	.string "Oh! Sniff…sob…\p"
-	.string "Oh! S-sorry…\n"
-	.string "I'm so nervous, I can't help crying…\p"
-	.string "I'm {STR_VAR_1}, and I really look up\n"
-	.string "to you, {PLAYER}.\p"
-	.string "I… I had this dream of one day meeting\n"
-	.string "you and asking you about POKéMON.\p"
-	.string "Please, please, {PLAYER}!\n"
-	.string "Please teach me about POKéMON!$"
-
-gText_082B731C:: @ 82B731C
-	.string "Oh… B-but…\n"
-	.string "Snivel… Waaaaaaah!\p"
-	.string "Please!\n"
-	.string "I'm begging you, please!$"
-
-gText_082B735B:: @ 82B735B
-	.string "Oh, really? You will?\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Oh… I'm sorry…\n"
-	.string "I'm so happy, I'm crying…\p"
-	.string "Um… Then please tell me!\n"
-	.string "It's about the BATTLE TOWER.\p"
-	.string "Which would be better for me: Level 50\n"
-	.string "or the Open Level?$"
-
-gText_082B7423:: @ 82B7423
-	.string "{STR_VAR_1}?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I'm so sorry!\n"
-	.string "You've made me happy by choosing\l"
-	.string "the level for me, and it's made me cry…\p"
-	.string "Snivel…\n"
-	.string "Thank you so much!\l"
-	.string "Please talk with me again!$"
-
-gText_082B74C1:: @ 82B74C1
-	.string "Wowee! You're {PLAYER}, aren't you?\n"
-	.string "You're awesomely strong, aren't you?\p"
-	.string "I'm {STR_VAR_1}!\n"
-	.string "I just became a TRAINER!\p"
-	.string "Please, {PLAYER}!\n"
-	.string "Can you be my teacher and tell me\l"
-	.string "lots about being a TRAINER?$"
-
-gText_082B756F:: @ 82B756F
-	.string "Aww, why?\n"
-	.string "Oh, please? Pretty please?\l"
-	.string "Please be my teacher, please!$"
-
-gText_082B75B2:: @ 82B75B2
-	.string "Yay! Great!\p"
-	.string "The first thing I wanted to ask you is\n"
-	.string "about the BATTLE TOWER!\p"
-	.string "The Level 50 and Open Level Rooms…\n"
-	.string "Which would be perfect for me?$"
-
-gText_082B763F:: @ 82B763F
-	.string "{STR_VAR_1}, huh? That's true!\n"
-	.string "I'll do my best there!\p"
-	.string "If we meet here again, please teach\n"
-	.string "me something else, teacher!$"
-
-gText_082B76AC:: @ 82B76AC
-	.string "Um… Are you {PLAYER}?\n"
-	.string "My name is {STR_VAR_1}.\p"
-	.string "I want to become a POKéMON TRAINER,\n"
-	.string "but I don't know what to do…\p"
-	.string "So I thought maybe I could ask you for\n"
-	.string "advice because you're so famous.\p"
-	.string "{PLAYER}, could you give me advice?$"
-
-gText_082B7772:: @ 82B7772
-	.string "Oh, but…\p"
-	.string "I sincerely want to become a POKéMON\n"
-	.string "TRAINER!\p"
-	.string "Please, can you answer my questions?$"
-
-gText_082B77CE:: @ 82B77CE
-	.string "Thank you!\n"
-	.string "Here's my first question right away!\p"
-	.string "The BATTLE TOWER has two levels,\n"
-	.string "Level 50 and Open Level, right?\p"
-	.string "Which level do you think is more\n"
-	.string "suitable for me?$"
-
-gText_082B7871:: @ 82B7871
-	.string "Oh, the {STR_VAR_1} challenge?\n"
-	.string "Understood!\p"
-	.string "If I have another question, I'll come\n"
-	.string "back here for your advice!$"
-
-gText_082B78D4:: @ 82B78D4
-	.string "Oh? Huh? You're…\n"
-	.string "No, that can't be true.\p"
-	.string "There isn't any way that someone\n"
-	.string "like me could meet {PLAYER}.\p"
-	.string "…You really are {PLAYER}?\n"
-	.string "I can't believe I'm talking to you!\p"
-	.string "When something this good happens,\n"
-	.string "only terrible things will happen to me\l"
-	.string "now, I just know it…\p"
-	.string "…I'm sorry…\n"
-	.string "I'm… {STR_VAR_1}…\p"
-	.string "There isn't anything special about\n"
-	.string "me that I can be proud of…\p"
-	.string "I shouldn't even say anything about\n"
-	.string "myself because you'll forget…\p"
-	.string "I had this dream that if I ever met\n"
-	.string "you, {PLAYER}, that maybe I could ask\l"
-	.string "you for advice as a TRAINER.\p"
-	.string "But I don't think you would agree\n"
-	.string "to that.\p"
-	.string "…Or will you be so kind as to give\n"
-	.string "me advice?$"
-
-gText_082B7B1A:: @ 82B7B1A
-	.string "I knew it…\p"
-	.string "It had to happen because I'm such\n"
-	.string "a really boring nobody…\p"
-	.string "But I thought just maybe…\n"
-	.string "You won't reconsider, will you?\p"
-	.string "But I can't give up just like that.\n"
-	.string "I'll ask you while I'm still lucky!\p"
-	.string "Please, will you be so kind as to give\n"
-	.string "me advice?$"
-
-gText_082B7C13:: @ 82B7C13
-	.string "Really? I can't believe it!\n"
-	.string "I can't believe you'll advise me!\l"
-	.string "I… I'm so happy…\p"
-	.string "What I want to ask you is really\n"
-	.string "trivial, but I can't decide…\p"
-	.string "At the BATTLE TOWER, they let you\n"
-	.string "choose Level 50 or Open Level.\p"
-	.string "Which course do you think even I may\n"
-	.string "have a chance at?$"
-
-gText_082B7D18:: @ 82B7D18
-	.string "{STR_VAR_1}? Okay!\n"
-	.string "But do you really think someone like\l"
-	.string "me would have a chance?\p"
-	.string "I'll do my best, even though I don't\n"
-	.string "think it will work.\p"
-	.string "Thank you very much for spending\n"
-	.string "time with someone like me.$"
-
-gText_082B7DD4:: @ 82B7DD4
-	.string "Oh! You're {PLAYER}{KUN}, aren't you?\p"
-	.string "I've heard that you're tough at\n"
-	.string "POKéMON!\p"
-	.string "I'm {STR_VAR_1}!\n"
-	.string "I'll be your friend!\p"
-	.string "Did you know?\p"
-	.string "You can't win at the BATTLE FRONTIER\n"
-	.string "if all you know is what they teach at\l"
-	.string "the TRAINER'S SCHOOL.\p"
-	.string "I'm willing to listen to your advice.\n"
-	.string "You'll agree, of course?$"
-
-gText_082B7EE5:: @ 82B7EE5
-	.string "Huh? Why are you refusing me?\n"
-	.string "It's me who's asking you!\l"
-	.string "You have to reconsider!$"
-
-gText_082B7F35:: @ 82B7F35
-	.string "Okay, so there is this something.\n"
-	.string "I want you to decide it for me.\p"
-	.string "You know that the BATTLE TOWER has\n"
-	.string "Level 50 and Open Level Rooms?\p"
-	.string "Which do you think would be good\n"
-	.string "for me, {PLAYER}{KUN}?$"
-
-gText_082B7FE8:: @ 82B7FE8
-	.string "Okay, {STR_VAR_1} is suitable for me?\n"
-	.string "Thank you!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082B8087:: @ 82B8087
-	.string "Oh, hi, there! {PLAYER}{KUN}!\n"
-	.string "I know you because you're famous!\l"
-	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
-	.string "I'm a TRIATHLETE, so I keep myself\n"
-	.string "fit even while I raise POKéMON.\p"
-	.string "I'm also involved with other things\n"
-	.string "like work, napping, ballroom dancing…\p"
-	.string "Being this busy, it's not so easy for\n"
-	.string "me to become a decent TRAINER.\p"
-	.string "So, I have a proposition!\p"
-	.string "There must be a reason why we met.\n"
-	.string "So, {PLAYER}{KUN}, how about sharing your\l"
-	.string "wisdom with me every so often?$"
-
-gText_082B822B:: @ 82B822B
-	.string "Oh, but, please?\n"
-	.string "A guy like me needs someone like\l"
-	.string "you, {PLAYER}{KUN}!\p"
-	.string "Honestly, I need your advice!$"
-
-gText_082B8286:: @ 82B8286
-	.string "Thank you! That's more like it!\n"
-	.string "So, let's start with an easy one!\p"
-	.string "You know about the BATTLE TOWER's\n"
-	.string "two courses, right?\l"
-	.string "You know, Level 50 and Open Level.\p"
-	.string "Me being a busy guy, which one should\n"
-	.string "I gear up for?$"
-
-gText_082B8356:: @ 82B8356
-	.string "{STR_VAR_1}, huh? Okay, gotcha.\n"
-	.string "I'll find time somehow and give it a go!\p"
-	.string "…Whoops, I'd better go to work!\n"
-	.string "Thanks! See you around!$"
-
-gText_082B83CE:: @ 82B83CE
-	.string "No way! Uh-uh!\n"
-	.string "Are you maybe the real {PLAYER}?\p"
-	.string "A-hah! Awesome! I'm {STR_VAR_1},\n"
-	.string "so pleased to meet you!\p"
-	.string "{PLAYER}, you're very strong,\n"
-	.string "aren't you?\p"
-	.string "Everyone's talking about you!\p"
-	.string "Oh! I just had this great idea!\n"
-	.string "I'll get advice off you, {PLAYER}!\l"
-	.string "I'm sure it will make me tougher!\p"
-	.string "Isn't it a great idea?\n"
-	.string "Please, I want your advice!$"
-
-gText_082B84FC:: @ 82B84FC
-	.string "Ahahaha, you can pretend to be mean,\n"
-	.string "but you can't fool me!\l"
-	.string "You really mean okay, don't you?$"
-
-gText_082B8559:: @ 82B8559
-	.string "Yay! I knew you'd have a big heart,\n"
-	.string "{PLAYER}!\p"
-	.string "What should I ask you first?\n"
-	.string "…Oh, I thought of something!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I were to take a BATTLE TOWER\n"
-	.string "challenge, which way should I go?\p"
-	.string "Level 50 or Open Level?\n"
-	.string "Which suits me more?$"
-
-gText_082B8656:: @ 82B8656
-	.string "Oh-oh-oh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thank you for a totally cool reply!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082B86EA:: @ 82B86EA
-	.string "I beg your pardon, but…\n"
-	.string "Are you {PLAYER}?\p"
-	.string "I'm {STR_VAR_1}, and I am delighted to\n"
-	.string "make your acquaintance.\p"
-	.string "I have long been an admirer\n"
-	.string "of yours…\p"
-	.string "… … … … … …\p"
-	.string "Um… I hope you don't find this\n"
-	.string "request too much of a burden, but…\p"
-	.string "May I become your apprentice,\n"
-	.string "{PLAYER}?$"
-
-gText_082B87DA:: @ 82B87DA
-	.string "Oh…!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "…I must have fainted from shock.\n"
-	.string "I'm sorry, I must have misheard you.\p"
-	.string "Please! Please say that you will\n"
-	.string "accept me as your apprentice!$"
-
-gText_082B887C:: @ 82B887C
-	.string "Oh… I'm delighted!\p"
-	.string "I don't wish to waste your time,\n"
-	.string "so please advise me on this.\p"
-	.string "I plan to take a BATTLE TOWER\n"
-	.string "challenge soon.\p"
-	.string "However, there are two levels…\p"
-	.string "Which would be most suitable for me?\n"
-	.string "Level 50 or Open Level?$"
-
-gText_082B8957:: @ 82B8957
-	.string "{STR_VAR_1} is your choice!\n"
-	.string "I see. I will do my best!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082B89C6:: @ 82B89C6
-	.string "Eek! Eek! {PLAYER}!\n"
-	.string "You spoke to me!\l"
-	.string "I… I'm overjoyed!\p"
-	.string "Me! My name is {STR_VAR_1}!\n"
-	.string "I just became a TRAINER!\p"
-	.string "I'm delighted I met you, {PLAYER},\n"
-	.string "the big name in POKéMON circles!\p"
-	.string "Oh-oh-oh, I know!\n"
-	.string "May I ask a huge favor, {PLAYER}?\p"
-	.string "Please take me in as your apprentice!\n"
-	.string "I want to learn from you!$"
-
-gText_082B8ACF:: @ 82B8ACF
-	.string "Waaaah!\n"
-	.string "{PLAYER} turned me down…\l"
-	.string "It… It's an invaluable experience!\p"
-	.string "{PLAYER}, please! I want to hear\n"
-	.string "an affirmative answer this time!\p"
-	.string "I beg you for your guidance!$"
-
-gText_082B8B66:: @ 82B8B66
-	.string "Hieeeeh! {PLAYER} said yes!\n"
-	.string "{PLAYER} said yes!\p"
-	.string "I won't be able to sleep tonight…\n"
-	.string "Thank you ever so much!\p"
-	.string "Then, here's my question!\p"
-	.string "At the BATTLE TOWER, what is right\n"
-	.string "for me, Level 50 or Open Level?$"
-
-gText_082B8C20:: @ 82B8C20
-	.string "{STR_VAR_1}! Perfectly understood!\n"
-	.string "I understand perfectly!\l"
-	.string "I'm deliriously delighted!\p"
-	.string "I hope you'll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082B8CAA:: @ 82B8CAA
-	.string "Whoa! Could you be…\n"
-	.string "Might you be… {PLAYER}{KUN}?!\l"
-	.string "That strong and famous TRAINER?\l"
-	.string "Well, hello, aren't I just the luckiest!\p"
-	.string "Hello, the name's {STR_VAR_1}!\p"
-	.string "I've been on the lookout for\n"
-	.string "a POKéMON teacher.\p"
-	.string "And with impeccably good timing,\n"
-	.string "along came you, {PLAYER}{KUN}!\p"
-	.string "So, there you have it, {PLAYER}{KUN}!\n"
-	.string "Let me apprentice under you!$"
-
-gText_082B8DD3:: @ 82B8DD3
-	.string "Gwaaaah!\n"
-	.string "You're quite cool and tough…\p"
-	.string "Don't be that way, please.\n"
-	.string "I'm asking you!$"
-
-gText_082B8E24:: @ 82B8E24
-	.string "Oh, yeah! That's a solid reply!\n"
-	.string "Excellent, I might add!\p"
-	.string "So how about a first piece of advice\n"
-	.string "on the BATTLE TOWER?\p"
-	.string "If I were to go, what would be better?\n"
-	.string "Level 50 or Open Level?$"
-
-gText_082B8ED5:: @ 82B8ED5
-	.string "Uh-huh, {STR_VAR_1} it is!\n"
-	.string "OK, A-OK!\l"
-	.string "I'll go show my mettle, like, jam!\p"
-	.string "All right, I'll look to you as my mentor!\n"
-	.string "Adios!$"
-
-gText_082B8F45:: @ 82B8F45
-	.string "Oh, hey, {PLAYER}{KUN}, right?\n"
-	.string "The police were looking for you!\p"
-	.string "… … …\n"
-	.string "Of course I'm lying!\p"
-	.string "Me, I'm {STR_VAR_1}. Despite the way\n"
-	.string "I look, I'm the POKéMON CHAMPION!\l"
-	.string "…That's a lie, too!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at battling.\p"
-	.string "So, how about you becoming my master\n"
-	.string "about all things POKéMON?$"
-
-gText_082B905F:: @ 82B905F
-	.string "If you're going to act cold like that,\n"
-	.string "I'll show you what I'll do!\p"
-	.string "Waaah! Waaah! Waaah!\n"
-	.string "Hiccup!\p"
-	.string "Hahaha, that was my FAKE TEARS!\p"
-	.string "Come on, will you please be\n"
-	.string "my POKéMON master?$"
-
-gText_082B910E:: @ 82B910E
-	.string "Yippee!\n"
-	.string "I'll buy you a boat for that!\p"
-	.string "Of course I'm lying again!\n"
-	.string "But… Thank you, master!\p"
-	.string "You know how there's Level 50 and\n"
-	.string "Open Level at the BATTLE TOWER?\p"
-	.string "I'm having trouble deciding which\n"
-	.string "level I should challenge…\p"
-	.string "Can you decide for me, master?$"
-
-gText_082B9204:: @ 82B9204
-	.string "Okay, so {STR_VAR_1} is better!\n"
-	.string "I'll go to the other level, then!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082B929C:: @ 82B929C
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy, and it means hi!\p"
-	.string "I'm {STR_VAR_1}, the rappin' SAILOR\n"
-	.string "am I!\p"
-	.string "Your turn now, tell me a little about\n"
-	.string "yourself, give it a try!\p"
-	.string "Uh-huh, uh-huh!\n"
-	.string "{PLAYER}{KUN}'s your name,\l"
-	.string "and POKéMON's your game!\p"
-	.string "And you're at a delicate age\n"
-	.string "when all the world's your stage!\p"
-	.string "Anyway, I just want to say,\n"
-	.string "that you're the tenth TRAINER\l"
-	.string "I've spoken to today.\p"
-	.string "Let's make that a celebration!\n"
-	.string "Become my mentor for commemoration!$"
-
-gText_082B9438:: @ 82B9438
-	.string "But!\n"
-	.string "You have to work with me!\p"
-	.string "Don't be such a tease!\n"
-	.string "Become my mentor, please!$"
-
-gText_082B9488:: @ 82B9488
-	.string "That's it!\n"
-	.string "{PLAYER}, you've got the spirit!\p"
-	.string "So here's my first question\n"
-	.string "that begs your suggestion!\p"
-	.string "It's about the BATTLE TOWER,\n"
-	.string "and it hinges on my power!\p"
-	.string "Level 50 and Open Level there be,\n"
-	.string "which is the one that's good for me?$"
-
-gText_082B9564:: @ 82B9564
-	.string "Okay, {STR_VAR_1} it is, you say!\n"
-	.string "I'll go and take it on my way!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082B95D8:: @ 82B95D8
-	.string "Say, hey, aren't you {PLAYER}?\n"
-	.string "What should I do? Talk to you?\l"
-	.string "Why not? I'm already talking to you!\p"
-	.string "{PLAYER}, are you surprised at me?\n"
-	.string "I'd better tell you who I happen to be!\p"
-	.string "{STR_VAR_1} is what you can call me.\n"
-	.string "The brightest star in guitardom,\l"
-	.string "that's me!\p"
-	.string "Are you receiving me?\n"
-	.string "You are receiving me!\p"
-	.string "My luck's at its best,\n"
-	.string "I'll hit you with a request!\p"
-	.string "{PLAYER}, let me be your underling!\n"
-	.string "I want you to teach me everything!$"
-
-gText_082B9763:: @ 82B9763
-	.string "You're turning me down, then?\n"
-	.string "I'll just have to ask you again!\p"
-	.string "{PLAYER}, I beg to be your underling!\n"
-	.string "I need you to teach me everything!$"
-
-gText_082B97E5:: @ 82B97E5
-	.string "Lucky, yeah, woohoo!\n"
-	.string "Should I pop a question to you?\p"
-	.string "Since we're near the BATTLE TOWER,\n"
-	.string "how about a question about its power?\p"
-	.string "Of the choices you see,\n"
-	.string "which is the right one for me?$"
-
-gText_082B989A:: @ 82B989A
-	.string "If {STR_VAR_1} is what you suggest,\n"
-	.string "it must be the very best!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082B992D:: @ 82B992D
-	.string "Oh, hi! You there!\n"
-	.string "Can I get you to massage my shoulder?\p"
-	.string "…Yes, there! That's it!\n"
-	.string "Ouch, ouch! Oooh, that feels great!\p"
-	.string "My name's {STR_VAR_1}.\n"
-	.string "I take karate training, but my body's\l"
-	.string "not built to take the abuse…\p"
-	.string "I decided I'll battle POKéMON and\n"
-	.string "toughen myself up.\p"
-	.string "You're {PLAYER}{KUN}, aren't you?\n"
-	.string "The POKéMON LEAGUE CHAMP?\p"
-	.string "Listen, can I get you to give me\n"
-	.string "advice?$"
-
-gText_082B9A84:: @ 82B9A84
-	.string "Oh, why?\p"
-	.string "I won't be a big bother, I promise!\n"
-	.string "Please?$"
-
-gText_082B9AB9:: @ 82B9AB9
-	.string "Thank you. Mighty good of you!\n"
-	.string "…Cough! Cough!\p"
-	.string "Oogh, I have to toughen up quick…\p"
-	.string "I'll be heading off to the BATTLE TOWER\n"
-	.string "right away, but what would be better\l"
-	.string "for me? Level 50 or Open Level?$"
-
-gText_082B9B76:: @ 82B9B76
-	.string "Hm, all right. That's {STR_VAR_1}.\n"
-	.string "I'll go there right away.\p"
-	.string "I hope I can keep hitting you up for\n"
-	.string "help--after all, you're my mentor!$"
-
-gText_082B9BF2:: @ 82B9BF2
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}…?\p"
-	.string "Please, don't look at me that way.\n"
-	.string "You're making me all self-conscious.\p"
-	.string "I… I'm {STR_VAR_1}.\p"
-	.string "I'm really embarrassed to say this,\n"
-	.string "but I explore ancient ruins and such.\p"
-	.string "I'm even more embarrassed to admit\n"
-	.string "I'm interested in the BATTLE FRONTIER.\p"
-	.string "{PLAYER}{KUN}, you have a reputation as\n"
-	.string "a tough TRAINER…\p"
-	.string "It's hard for me to say this,\n"
-	.string "but I want to ask something.\p"
-	.string "Could you become my teacher and\n"
-	.string "give me advice?$"
-
-gText_082B9D83:: @ 82B9D83
-	.string "Please don't brush me off like this!\n"
-	.string "I can't live with the humiliation.\p"
-	.string "Please become my teacher!\n"
-	.string "I need your advice!$"
-
-gText_082B9DF9:: @ 82B9DF9
-	.string "Th-thank you…\p"
-	.string "But please don't look at me like that.\n"
-	.string "It makes me all flustered.\p"
-	.string "Please, answer me without looking\n"
-	.string "at my eyes.\p"
-	.string "At the BATTLE TOWER…\n"
-	.string "Which level should I attempt?$"
-
-gText_082B9EAA:: @ 82B9EAA
-	.string "Oh… Okay!\n"
-	.string "I'll try my hand at that.\p"
-	.string "I hope I can make a valiant challenge\n"
-	.string "without getting all flustered…\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082B9F55:: @ 82B9F55
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really real?\p"
-	.string "You may call me {STR_VAR_1}.\p"
-	.string "I have been toying with the idea of\n"
-	.string "apprenticing under a strong TRAINER.\p"
-	.string "So, I must say I'm lucky you came along!\n"
-	.string "…You really are {PLAYER}{KUN}, yes?\p"
-	.string "No, no, if you are real, it's fine.\n"
-	.string "I merely want you to recognize me\l"
-	.string "as your apprentice.$"
-
-gText_082BA084:: @ 82BA084
-	.string "Oh?\n"
-	.string "But what would compel you to refuse?\p"
-	.string "I apologize for being skeptical about\n"
-	.string "your identity.\p"
-	.string "Please accept my apology and\n"
-	.string "accept me as your apprentice.$"
-
-gText_082BA11D:: @ 82BA11D
-	.string "You really are accepting me?\n"
-	.string "I don't wish to celebrate prematurely.\p"
-	.string "If it is true, I apologize.\n"
-	.string "But now, I need your advice.\p"
-	.string "If I were to enter the BATTLE TOWER,\n"
-	.string "what would be worthy of me?\l"
-	.string "Level 50 or Open Level?$"
-
-gText_082BA1F3:: @ 82BA1F3
-	.string "{STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I realize I can annoy, but it delights\n"
-	.string "me that you have accepted me.\p"
-	.string "Let us meet again!$"
-
-gText_082BA2A3:: @ 82BA2A3
-	.string "Sigh… Sob…\n"
-	.string "Oh, {PLAYER}!\p"
-	.string "I'm all tangled up in a dilemma\n"
-	.string "that I can't decide.\p"
-	.string "I can't decide what I should make\n"
-	.string "my {STR_VAR_1} hold.\p"
-	.string "Please tell me, {PLAYER}.\n"
-	.string "What item should I make it hold?$"
-
-gText_082BA34E:: @ 82BA34E
-	.string "Oh, really? I shouldn't make\n"
-	.string "my {STR_VAR_1} hold anything?$"
-
-gText_082BA380:: @ 82BA380
-	.string "Oh, okay! I'm delighted it's settled!\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Thank you so much!$"
-
-gText_082BA3D2:: @ 82BA3D2
-	.string "Oh, I'm so glad…\n"
-	.string "I think I have that {STR_VAR_1}, too.\p"
-	.string "I'm delighted it's settled!\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Thank you so much!$"
-
-gText_082BA448:: @ 82BA448
-	.string "Waaaah! Please don't be mean!\p"
-	.string "That item {STR_VAR_1} was already\n"
-	.string "recommended to me before, sob…\p"
-	.string "Or do you mean I shouldn't make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BA4D3:: @ 82BA4D3
-	.string "Yay! It's {PLAYER}!\n"
-	.string "Great! I wanted to ask you something!\p"
-	.string "Do you make your POKéMON hold items?\n"
-	.string "I want to make mine hold items, but…\p"
-	.string "What item would be good for\n"
-	.string "{STR_VAR_1} to hold?\p"
-	.string "What do you think?$"
-
-gText_082BA58C:: @ 82BA58C
-	.string "Huh? You mean my {STR_VAR_1} doesn't\n"
-	.string "have to hold anything?$"
-
-gText_082BA5BF:: @ 82BA5BF
-	.string "Oh, I get it! I'll do that!\n"
-	.string "Thanks for teaching me!$"
-
-gText_082BA5F3:: @ 82BA5F3
-	.string "Oh, wow! One {STR_VAR_1}, huh?\n"
-	.string "Okay, I'll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BA635:: @ 82BA635
-	.string "Oh, uh, no, that's not what I meant.\n"
-	.string "I want to know about a different item\l"
-	.string "than the ones I already know.\p"
-	.string "Or do you mean that my POKéMON doesn't\n"
-	.string "have to hold anything this time?$"
-
-gText_082BA6E6:: @ 82BA6E6
-	.string "{PLAYER}, hello!\n"
-	.string "It's about my {STR_VAR_1}…\p"
-	.string "I want to make it hold a good item.\n"
-	.string "What would be good for it?$"
-
-gText_082BA742:: @ 82BA742
-	.string "Oh, then my {STR_VAR_1} doesn't have\n"
-	.string "to hold anything?$"
-
-gText_082BA770:: @ 82BA770
-	.string "Okay, I got it!\n"
-	.string "See you again!$"
-
-gText_082BA78F:: @ 82BA78F
-	.string "Oh, the item {STR_VAR_1}?\n"
-	.string "Understood!\p"
-	.string "I'll do my best to find one!\n"
-	.string "See you again!$"
-
-gText_082BA7D8:: @ 82BA7D8
-	.string "Somebody taught me about\n"
-	.string "the {STR_VAR_1} already.\p"
-	.string "I want my POKéMON to hold a different\n"
-	.string "kind of item.\p"
-	.string "Or do you think {STR_VAR_2} doesn't\n"
-	.string "have to hold anything?$"
-
-gText_082BA867:: @ 82BA867
-	.string "Hello, {PLAYER}…\n"
-	.string "I'm sorry to disturb you, but I have\l"
-	.string "something else I wanted to ask you.\p"
-	.string "I don't think I'm good enough to win\n"
-	.string "matches on my own, so I'm thinking of\l"
-	.string "making my {STR_VAR_1} hold an item.\p"
-	.string "But I don't know what would be good.\p"
-	.string "{PLAYER}, please, could you decide\n"
-	.string "for me?$"
-
-gText_082BA96B:: @ 82BA96B
-	.string "A POKéMON belonging to someone like me\n"
-	.string "would be better off without an item?$"
-
-gText_082BA9B7:: @ 82BA9B7
-	.string "I understand…\n"
-	.string "You're saying I shouldn't rely on items.\l"
-	.string "I'll do my best not to!\p"
-	.string "Thank you very much!$"
-
-gText_082BAA1B:: @ 82BAA1B
-	.string "The item {STR_VAR_1}, okay.\n"
-	.string "I'm not sure if I can get one…\l"
-	.string "No! I'll do my best to get it.\p"
-	.string "Thank you very much!$"
-
-gText_082BAA81:: @ 82BAA81
-	.string "Oh, but…\n"
-	.string "I think I've heard about that before…\p"
-	.string "Is it maybe because I haven't handled\n"
-	.string "the item {STR_VAR_1} very well?\p"
-	.string "Or do you mean I shouldn't make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BAB22:: @ 82BAB22
-	.string "Oh, {PLAYER}{KUN}.\n"
-	.string "There's something I wanted to ask you.\p"
-	.string "You know how you decided which\n"
-	.string "POKéMON I should have for me?\p"
-	.string "But I never asked you what item\n"
-	.string "it should be holding.\p"
-	.string "Since you already gave me advice,\n"
-	.string "how about seeing this to the end?\p"
-	.string "What would be good? I want to make\n"
-	.string "my {STR_VAR_1} hold something.$"
-
-gText_082BAC43:: @ 82BAC43
-	.string "Oh! So my {STR_VAR_1} should do\n"
-	.string "the best it can empty-handed?$"
-
-gText_082BAC78:: @ 82BAC78
-	.string "If you think that's best, I'll do that.\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BAD17:: @ 82BAD17
-	.string "The item {STR_VAR_1}, huh?\n"
-	.string "Not bad. I'll use it!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BADB6:: @ 82BADB6
-	.string "Huh? What are you saying?\n"
-	.string "You told me about the {STR_VAR_1}\l"
-	.string "already before.\p"
-	.string "Or do you mean my {STR_VAR_2} should\n"
-	.string "do the best it can empty-handed?$"
-
-gText_082BAE36:: @ 82BAE36
-	.string "Yo, {PLAYER}{KUN}!\p"
-	.string "We're both busy, but we seem to run\n"
-	.string "into each other often anyway!\p"
-	.string "Today I have to do some walking,\n"
-	.string "cleaning, and brushing.\p"
-	.string "I haven't even had the time to buy\n"
-	.string "my precious {STR_VAR_1} anything.\p"
-	.string "I don't have any time, so how about\n"
-	.string "giving me advice on what I should make\l"
-	.string "my {STR_VAR_1} hold?$"
-
-gText_082BAF4E:: @ 82BAF4E
-	.string "Oh, so me being a busy guy, you say\n"
-	.string "my {STR_VAR_1} doesn't need anything?$"
-
-gText_082BAF8F:: @ 82BAF8F
-	.string "Okay, gotcha.\n"
-	.string "I won't need any time for that.\p"
-	.string "Thanks today!\n"
-	.string "See you around!$"
-
-gText_082BAFDB:: @ 82BAFDB
-	.string "Okay, gotcha.\n"
-	.string "I'll find time somehow and find\l"
-	.string "that {STR_VAR_1} you recommended.\p"
-	.string "I'm glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082BB05F:: @ 82BB05F
-	.string "Huh? I already know about\n"
-	.string "that {STR_VAR_1}.\p"
-	.string "Oh, right, I get it.\n"
-	.string "So me being a busy guy, you say\l"
-	.string "my {STR_VAR_2} doesn't need anything?$"
-
-gText_082BB0D4:: @ 82BB0D4
-	.string "Hiya, {PLAYER}! It's me!\n"
-	.string "I need to tap your mind again today.\l"
-	.string "Please, I need your advice!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I want to make my {STR_VAR_1} hold\n"
-	.string "an item, what should it be?$"
-
-gText_082BB18C:: @ 82BB18C
-	.string "Is that right? My {STR_VAR_1} doesn't\n"
-	.string "need to hold an item, you're saying.$"
-
-gText_082BB1CE:: @ 82BB1CE
-	.string "Okay, that's what I'll do!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BB242:: @ 82BB242
-	.string "Uh-huh! One {STR_VAR_1}.\n"
-	.string "What a cool choice!\l"
-	.string "I'll definitely try that!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BB2D9:: @ 82BB2D9
-	.string "Ahahah! That's silly!\n"
-	.string "You already told me about that\l"
-	.string "{STR_VAR_1} before!\p"
-	.string "Are you feeling okay, {PLAYER}?\p"
-	.string "Oh, wait! My {STR_VAR_2} doesn't\n"
-	.string "need to hold an item, you're saying.$"
-
-gText_082BB370:: @ 82BB370
-	.string "Hello, {PLAYER}. I hope you've been\n"
-	.string "keeping well.\p"
-	.string "May I approach you for advice?\p"
-	.string "In a recent battle, my opponent\n"
-	.string "seemed to have given his POKéMON\l"
-	.string "an item to hold.\p"
-	.string "As a result, I was defeated…\p"
-	.string "I don't wish to be left behind.\n"
-	.string "I would like to make my {STR_VAR_1}\l"
-	.string "hold an item, too.\p"
-	.string "It would please me if you could decide\n"
-	.string "what would be right for my POKéMON…$"
-
-gText_082BB4C3:: @ 82BB4C3
-	.string "In other words… My POKéMON has\n"
-	.string "no need to hold an item?$"
-
-gText_082BB4FB:: @ 82BB4FB
-	.string "I understand clearly now!\n"
-	.string "I will keep trying like this.\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BB575:: @ 82BB575
-	.string "One {STR_VAR_1} it is!\n"
-	.string "I will order it right away.\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BB5E1:: @ 82BB5E1
-	.string "You've already told me about that,\n"
-	.string "and I already have it.\p"
-	.string "Or are you saying… My POKéMON has\n"
-	.string "no need to hold an item?$"
-
-gText_082BB656:: @ 82BB656
-	.string "Eek! {PLAYER}!\n"
-	.string "I… I'm overjoyed to see you again!\p"
-	.string "Oh-oh-oh! There's something I just\n"
-	.string "had to ask you, {PLAYER}!\p"
-	.string "Please decide what my {STR_VAR_1}\n"
-	.string "should be holding!$"
-
-gText_082BB6E5:: @ 82BB6E5
-	.string "Oh, wow! I didn't expect that answer!\n"
-	.string "So, a hold item isn't necessary?$"
-
-gText_082BB72C:: @ 82BB72C
-	.string "Perfectly understood!\n"
-	.string "I'll keep at this without an item!\p"
-	.string "I hope you'll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BB7A2:: @ 82BB7A2
-	.string "{STR_VAR_1}! I'll use that!\p"
-	.string "Um… Could it be, {PLAYER}, you also\n"
-	.string "make your POKéMON hold that item?\p"
-	.string "I'll be sure to get it!\n"
-	.string "I hope you'll be willing to teach me\l"
-	.string "some more another time.$"
-
-gText_082BB84A:: @ 82BB84A
-	.string "Oh? You recommended that\n"
-	.string "{STR_VAR_1} before, too.\p"
-	.string "Or is it the best thing to hold?\n"
-	.string "Or do you mean that my {STR_VAR_2}\l"
-	.string "doesn't need anything to hold?$"
-
-gText_082BB8CD:: @ 82BB8CD
-	.string "Hola!\n"
-	.string "My maestro, {PLAYER}{KUN}!\p"
-	.string "I want to hit you up for advice on\n"
-	.string "POKéMON tools.\p"
-	.string "What do you think would be good for\n"
-	.string "my {STR_VAR_1} to hold?\p"
-	.string "Don't be shy now.\n"
-	.string "Let's blurt it out!$"
-
-gText_082BB970:: @ 82BB970
-	.string "Oh? So, you're saying my {STR_VAR_1}\n"
-	.string "can win without holding any item?$"
-
-gText_082BB9AE:: @ 82BB9AE
-	.string "Si, bueno!\n"
-	.string "I'll give it my best shot, like, slam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BBA05:: @ 82BBA05
-	.string "Uh-huh, that's one {STR_VAR_1}?\n"
-	.string "Si, bueno!\l"
-	.string "I'll go find me one, like, bam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BBA6C:: @ 82BBA6C
-	.string "No, no! You already told me about\n"
-	.string "that {STR_VAR_1} thing before.\p"
-	.string "Oh, now wait just one minute here…\n"
-	.string "So, you're saying my {STR_VAR_2}\l"
-	.string "can win without holding any item?$"
-
-gText_082BBB01:: @ 82BBB01
-	.string "{PLAYER}{KUN}, something unbelievable\n"
-	.string "has happened!\p"
-	.string "I woke up this morning, and my POKéMON\n"
-	.string "had 10 NUGGETS!\p"
-	.string "Of course I'm lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at thinking about\l"
-	.string "what items POKéMON should hold.\p"
-	.string "So, how about deciding for me what\n"
-	.string "my {STR_VAR_1} should hold, master?$"
-
-gText_082BBC1C:: @ 82BBC1C
-	.string "What's that mean?\n"
-	.string "Don't make it hold anything?$"
-
-gText_082BBC4B:: @ 82BBC4B
-	.string "Okay, so it shouldn't hold anything.\n"
-	.string "Then, I'd better get something for it!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082BBCF6:: @ 82BBCF6
-	.string "Okay, so it's one {STR_VAR_1}!\n"
-	.string "I'll make it hold anything but that!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082BBD90:: @ 82BBD90
-	.string "Um, you told me about that before,\n"
-	.string "didn't you?\p"
-	.string "Isn't there something else?\p"
-	.string "Or do you mean, don't make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BBE0B:: @ 82BBE0B
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin' SAILOR am I!\n"
-	.string "I present to you a question\l"
-	.string "that's pretty fly!\p"
-	.string "It's an item question\n"
-	.string "that begs your suggestion!\p"
-	.string "My {STR_VAR_1} needs an item to hold,\n"
-	.string "What should it be, if I may be bold?$"
-
-gText_082BBEE5:: @ 82BBEE5
-	.string "Is that right?\n"
-	.string "My {STR_VAR_1} doesn't need to be\l"
-	.string "holding anything tight?$"
-
-gText_082BBF25:: @ 82BBF25
-	.string "Okay, I hear you, sure I do!\n"
-	.string "My POKéMON will go empty-handed, too!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082BBFA4:: @ 82BBFA4
-	.string "Okay, one {STR_VAR_1},\n"
-	.string "that's what I'll use.\l"
-	.string "I was right to make you choose!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082BC024:: @ 82BC024
-	.string "Okay, one {STR_VAR_1}, you say?\n"
-	.string "You told me that the other day.\l"
-	.string "I need a new idea, a brand new way.\p"
-	.string "Or, what, is that right?\n"
-	.string "My POKéMON doesn't need to hold\l"
-	.string "anything tight?$"
-
-gText_082BC0C8:: @ 82BC0C8
-	.string "Say, hey, {PLAYER}!\n"
-	.string "I found you again today!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I'm already talking to you!\p"
-	.string "{PLAYER}, are you getting sick of me?\n"
-	.string "Nah, no way, that can't be.\p"
-	.string "Will you hear me out?\n"
-	.string "I'm looking for advice--that's what\l"
-	.string "I'm talking about.\p"
-	.string "It's about a hold item for\n"
-	.string "my {STR_VAR_1} that'd be good.\l"
-	.string "My indecision is making me brood.$"
-
-gText_082BC213:: @ 82BC213
-	.string "My {STR_VAR_1} needs nothing?\n"
-	.string "Doesn't need to hold anything?$"
-
-gText_082BC247:: @ 82BC247
-	.string "If holding nothing is the best,\n"
-	.string "I'll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BC2DD:: @ 82BC2DD
-	.string "If holding that {STR_VAR_1} is\n"
-	.string "the best, I'll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BC373:: @ 82BC373
-	.string "Haven't I heard about that\n"
-	.string "{STR_VAR_1} before?\l"
-	.string "I'm certain I have, that's for sure!\p"
-	.string "I need a new something!\n"
-	.string "Or, my {STR_VAR_2} needs nothing?\l"
-	.string "Doesn't need to hold anything?$"
-
-gText_082BC40E:: @ 82BC40E
-	.string "Gwah! Ouch! {PLAYER}{KUN}, my arm's broken!\n"
-	.string "Don't touch it, please!\p"
-	.string "I must've broken it while I was trying\n"
-	.string "out different hold items with my posse\l"
-	.string "of POKéMON.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{KUN}, what do you think would be\n"
-	.string "good for my {STR_VAR_1} to hold?$"
-
-gText_082BC514:: @ 82BC514
-	.string "Ouch…\p"
-	.string "So your suggestion is my {STR_VAR_1}\n"
-	.string "doesn't have to hold anything?$"
-
-gText_082BC555:: @ 82BC555
-	.string "Hm, all right. That would be easier\n"
-	.string "for me, the way things are now.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BC5CE:: @ 82BC5CE
-	.string "Hm, all right. That's one {STR_VAR_1}.\n"
-	.string "My POKéMON's arm is fine, so I'll make\l"
-	.string "it hold that item right away.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BC666:: @ 82BC666
-	.string "No, no, you told me about that\n"
-	.string "{STR_VAR_1} before, remember?\p"
-	.string "How about telling me something\n"
-	.string "even better?\p"
-	.string "Oh, wait a second.\n"
-	.string "So your suggestion is my {STR_VAR_2}\l"
-	.string "doesn't have to hold anything?$"
-
-gText_082BC714:: @ 82BC714
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}…\p"
-	.string "Please, don't look at me that way.\n"
-	.string "My POKéMON don't have anything.\p"
-	.string "I… I'm really embarrassed about this,\n"
-	.string "but I really need your advice.\p"
-	.string "I can't decide what hold item would\n"
-	.string "make my {STR_VAR_1} strong.\p"
-	.string "{PLAYER}{KUN}, what do you think would\n"
-	.string "be good?$"
-
-gText_082BC808:: @ 82BC808
-	.string "Oh… Then, you think it would be better\n"
-	.string "if my {STR_VAR_1} didn't have an item?$"
-
-gText_082BC84D:: @ 82BC84D
-	.string "Oh… Okay!\n"
-	.string "I'll go without an item.\p"
-	.string "This is nerve-racking, though.\n"
-	.string "Wouldn't it be too cool?\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BC8EA:: @ 82BC8EA
-	.string "Oh… Okay!\n"
-	.string "I'll go with that {STR_VAR_1}.\p"
-	.string "This is nerve-racking, though.\n"
-	.string "Wouldn't it be too cool?\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BC984:: @ 82BC984
-	.string "B-but I already heard about that.\p"
-	.string "Please don't brush me off like this!\n"
-	.string "I can't live with the humiliation.\p"
-	.string "Oh… Am I jumping to conclusions?\n"
-	.string "Do you think it would be better if\l"
-	.string "my {STR_VAR_2} didn't have an item?$"
-
-gText_082BCA4D:: @ 82BCA4D
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps you're a twin?\p"
-	.string "Oh, no, no, no, don't worry!\n"
-	.string "If you really are {PLAYER}, please\l"
-	.string "forget about my rudeness.\p"
-	.string "What I would like is some more of\n"
-	.string "your fine advice.\p"
-	.string "I have here my {STR_VAR_1} that I wish\n"
-	.string "to make hold a convenient item.\p"
-	.string "What would be worthy of it?$"
-
-gText_082BCB75:: @ 82BCB75
-	.string "It's better if it held nothing?\n"
-	.string "Are you certain?$"
-
-gText_082BCBA6:: @ 82BCBA6
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "Let us meet again!$"
-
-gText_082BCBFC:: @ 82BCBFC
-	.string "One {STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope my POKéMON will be able to\n"
-	.string "put it to good use.\p"
-	.string "Let us meet again!$"
-
-gText_082BCCA4:: @ 82BCCA4
-	.string "No, no, wait a minute.\n"
-	.string "I believe you taught me that before.\p"
-	.string "I would like you to recommend\n"
-	.string "something different this time.\p"
-	.string "Perhaps you're suggesting that\n"
-	.string "my {STR_VAR_2} should hold nothing?\l"
-	.string "Are you certain?$"
-
-gText_082BCD68:: @ 82BCD68
-	.string "Waah, {PLAYER}!\n"
-	.string "I have a dilemma, sob…\p"
-	.string "I want to begin battling other people,\n"
-	.string "but I don't know what to do.\p"
-	.string "How should I line up my POKéMON\n"
-	.string "so they'll be at their strongest?\p"
-	.string "Please tell me, {PLAYER}.\n"
-	.string "If you were me, which of these POKéMON\l"
-	.string "would you send out first?$"
-
-gText_082BCE64:: @ 82BCE64
-	.string "My {STR_VAR_1} should go first?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I'm so sorry!\n"
-	.string "You've made me happy by choosing\l"
-	.string "my first POKéMON, and it's made me cry…\p"
-	.string "Thank you so much!$"
-
-gText_082BCEF2:: @ 82BCEF2
-	.string "Yay! It's {PLAYER}!\n"
-	.string "Great! I wanted to ask you something!\p"
-	.string "Um, of my POKéMON, which do you\n"
-	.string "think should go out first?$"
-
-gText_082BCF61:: @ 82BCF61
-	.string "My {STR_VAR_1}? That's true.\n"
-	.string "Okay, I'll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BCFA1:: @ 82BCFA1
-	.string "{PLAYER}, hello!\p"
-	.string "I think, in a battle, it's very important\n"
-	.string "which POKéMON comes out first.\p"
-	.string "Out of the POKéMON that I have,\n"
-	.string "which would be good to send out first?$"
-
-gText_082BD03C:: @ 82BD03C
-	.string "My {STR_VAR_1} goes first?\n"
-	.string "Okay, I got it!\p"
-	.string "See you again!$"
-
-gText_082BD06D:: @ 82BD06D
-	.string "Hello, {PLAYER}…\n"
-	.string "I'm sorry to disturb you again with\l"
-	.string "another question.\p"
-	.string "I have so little confidence, I don't\n"
-	.string "know what I'd do without you, {PLAYER}.\p"
-	.string "It may be a waste of time for me to\n"
-	.string "even worry about it, but I just can't\l"
-	.string "decide something…\p"
-	.string "Which of my POKéMON should I send\n"
-	.string "out first in a battle?$"
-
-gText_082BD18A:: @ 82BD18A
-	.string "My {STR_VAR_1}?\n"
-	.string "Understood!\p"
-	.string "I can't believe that you would bother\n"
-	.string "to answer my questions so often!\p"
-	.string "I'm so grateful that you would even\n"
-	.string "speak with me… Thank you!$"
-
-gText_082BD222:: @ 82BD222
-	.string "Oh, {PLAYER}{KUN}! It's me!\n"
-	.string "I'm so glad to see you because I have\l"
-	.string "this little problem.\p"
-	.string "I can't decide how my POKéMON should\n"
-	.string "be lined up. Could you decide for me?\p"
-	.string "Oh, you don't need to decide the whole\n"
-	.string "party right now.\p"
-	.string "How about deciding just the first\n"
-	.string "POKéMON for me?$"
-
-gText_082BD325:: @ 82BD325
-	.string "My {STR_VAR_1}? That's great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BD3B1:: @ 82BD3B1
-	.string "Hi, my teacher {PLAYER}{KUN}!\n"
-	.string "I'm busy again today!\p"
-	.string "I have to do some cycling, shopping,\n"
-	.string "and humming.\p"
-	.string "I haven't even had the time to decide\n"
-	.string "how to line up my POKéMON team.\p"
-	.string "So, how about checking out my team?\n"
-	.string "Which one should go first?$"
-
-gText_082BD493:: @ 82BD493
-	.string "Okay, gotcha.\n"
-	.string "I have enough time at least to put\l"
-	.string "my {STR_VAR_1} at the head of the line!\p"
-	.string "Whoops, my girlfriend's waiting!\n"
-	.string "Thanks! See you around!$"
-
-gText_082BD51C:: @ 82BD51C
-	.string "Yoohoo! Hiya, {PLAYER}!\n"
-	.string "You always walk around looking tough!\p"
-	.string "Listen, I need something from you\n"
-	.string "again! It's the usual thing!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is about my team.\p"
-	.string "Which POKéMON of mine should be first\n"
-	.string "to go out in a battle?$"
-
-gText_082BD609:: @ 82BD609
-	.string "Hmhm!\n"
-	.string "My {STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BD697:: @ 82BD697
-	.string "Thank you so much for stopping to\n"
-	.string "chat with me, {PLAYER}.\p"
-	.string "I know I'm taking advantage of your\n"
-	.string "kindness, but may I ask for advice?\p"
-	.string "I would like you to decide on the order\n"
-	.string "of my POKéMON team.\p"
-	.string "It would please me if you could decide\n"
-	.string "which POKéMON should come first.$"
-
-gText_082BD797:: @ 82BD797
-	.string "My {STR_VAR_1} it is!\n"
-	.string "I will put it first right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BD806:: @ 82BD806
-	.string "Eek! {PLAYER}!\n"
-	.string "I… I'm overjoyed to see you again!\p"
-	.string "My POKéMON have become much\n"
-	.string "stronger!\p"
-	.string "But I don't always win. It seems to\n"
-	.string "depend on which POKéMON goes first.\p"
-	.string "{PLAYER}, please, I need your help!\p"
-	.string "Please decide which of my POKéMON\n"
-	.string "should go out first!$"
-
-gText_082BD8F5:: @ 82BD8F5
-	.string "Sigh… I'm overwhelmed with happiness…\p"
-	.string "It's like a dream having you decide\n"
-	.string "for me, {PLAYER}.\p"
-	.string "But perfectly understood!\n"
-	.string "I will go with my {STR_VAR_1} first!\p"
-	.string "I hope you'll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BD9BE:: @ 82BD9BE
-	.string "Hello, hello!\n"
-	.string "My mentor, {PLAYER}{KUN}!\l"
-	.string "Hit me with your sage advice today!\p"
-	.string "You see, I pulled together a team of\n"
-	.string "three POKéMON. So far so good.\p"
-	.string "But the team's battling order's not\n"
-	.string "settled yet.\p"
-	.string "This is where you come in, {PLAYER}{KUN}!\n"
-	.string "You decide which POKéMON leads off!\p"
-	.string "Don't be shy now.\n"
-	.string "Let's blurt it out!$"
-
-gText_082BDAE1:: @ 82BDAE1
-	.string "Uh-huh, my {STR_VAR_1} leads off!\n"
-	.string "OK, A-OK!\l"
-	.string "I'll reorder the lineup, like, wham!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BDB4E:: @ 82BDB4E
-	.string "{PLAYER}{KUN}, listen!\n"
-	.string "It's a crisis!\p"
-	.string "My POKéMON, all three of them, go into\n"
-	.string "battle at once!\p"
-	.string "Of course that's impossible!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at thinking about\l"
-	.string "how I should line up my POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "POKéMON should go first, master?$"
-
-gText_082BDC6B:: @ 82BDC6B
-	.string "Okay, so it's my {STR_VAR_1} you chose?\n"
-	.string "I'll let any but that one go first!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082BDD0D:: @ 82BDD0D
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin' SAILOR am I!\n"
-	.string "I present to you a question\l"
-	.string "that's pretty fly!\p"
-	.string "It's a team lineup question\n"
-	.string "that begs your suggestion!\p"
-	.string "Out of this lot, which should go first\n"
-	.string "as the first on the spot?$"
-
-gText_082BDDEC:: @ 82BDDEC
-	.string "Okay, I hear you, sure I do!\n"
-	.string "I'll switch them up, that I'll do!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082BDE68:: @ 82BDE68
-	.string "Yahoo, {PLAYER}!\n"
-	.string "How do you do?\p"
-	.string "What should I do? Go ahead and ask?\n"
-	.string "Uh-huh, I have something to ask!\l"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\p"
-	.string "You have to decide, which of my\n"
-	.string "POKéMON is the first to ride!\l"
-	.string "Into battle, I mean to say.$"
-
-gText_082BDF4D:: @ 82BDF4D
-	.string "My {STR_VAR_1}? Yes!\n"
-	.string "That'll do, there's no distress!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BDFD8:: @ 82BDFD8
-	.string "…Oof…ooch… {PLAYER}{KUN}…\n"
-	.string "My stomach's hurting all of a sudden…\p"
-	.string "…It's getting better now…\p"
-	.string "I must've worried myself sick racking\n"
-	.string "my brains on how I should line up\l"
-	.string "my posse of POKéMON.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{KUN}, which of my POKéMON should\n"
-	.string "go first? So I'd win, I mean.$"
-
-gText_082BE0FD:: @ 82BE0FD
-	.string "Hm, all right.\n"
-	.string "My {STR_VAR_1} goes first.\p"
-	.string "I'll fix the lineup like that after\n"
-	.string "I have my supper.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BE189:: @ 82BE189
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}?\p"
-	.string "Please, don't look at me that way.\n"
-	.string "You're making me feel all flustered.\p"
-	.string "Um…\n"
-	.string "I really need your advice.\p"
-	.string "It makes me bashful to say this,\n"
-	.string "but I chose my 3-POKéMON team.\l"
-	.string "I can't decide on the order, though.\p"
-	.string "Which POKéMON should I send out first\n"
-	.string "so I at least look capable?$"
-
-gText_082BE2A5:: @ 82BE2A5
-	.string "Oh… Okay!\n"
-	.string "I'll lead with my {STR_VAR_1}.\p"
-	.string "I hope I can do my best without\n"
-	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BE33E:: @ 82BE33E
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps you're a clever look-alike?\p"
-	.string "Oh, no, no, no, don't worry!\n"
-	.string "If you really are {PLAYER}, please\l"
-	.string "forget about my rudeness.\p"
-	.string "What I would like is your fine advice.\p"
-	.string "I have here my POKéMON team.\n"
-	.string "I would like you to tell me which one\l"
-	.string "should go first in a battle.$"
-
-gText_082BE46C:: @ 82BE46C
-	.string "My {STR_VAR_1}…\n"
-	.string "You aren't pulling my leg?\p"
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I am as you see, but I shall do\n"
-	.string "my best.\p"
-	.string "Let us meet again!$"
-
-gText_082BE50D:: @ 82BE50D
-	.string "Snivel…\n"
-	.string "Oh, {PLAYER}!\p"
-	.string "What perfect timing!\n"
-	.string "There's something I just can't decide…\p"
-	.string "I can't decide which POKéMON I should\n"
-	.string "be using.\p"
-	.string "I can't decide between the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}…\p"
-	.string "{PLAYER}, which do you think will give\n"
-	.string "even me a chance at winning?$"
-
-gText_082BE5F5:: @ 82BE5F5
-	.string "Snivel… I… I understand!\n"
-	.string "Oh! I'm so sorry!\l"
-	.string "You've made me so happy, I'm crying…\p"
-	.string "I'll do my best to catch one\n"
-	.string "{STR_VAR_1}!\p"
-	.string "Thank you so much!$"
-
-gText_082BE679:: @ 82BE679
-	.string "Yay! It's {PLAYER}!\n"
-	.string "Yay, you came at the right time, too!\l"
-	.string "I need your advice again!\p"
-	.string "Um, I'm all mixed up--should I use\n"
-	.string "my {STR_VAR_1} or {STR_VAR_2}…\p"
-	.string "Which do you think I should raise,\n"
-	.string "{PLAYER}?$"
-
-gText_082BE71E:: @ 82BE71E
-	.string "Oh, so my {STR_VAR_1} is better!\n"
-	.string "Okay, I'll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BE762:: @ 82BE762
-	.string "{PLAYER}, hello!\n"
-	.string "I have a question I wanted to ask.\p"
-	.string "I'm in a dilemma over whether I should\n"
-	.string "raise one {STR_VAR_1} or {STR_VAR_2}.\p"
-	.string "Which POKéMON do you think will\n"
-	.string "be stronger?$"
-
-gText_082BE7F8:: @ 82BE7F8
-	.string "{STR_VAR_1} is your choice?\n"
-	.string "Okay, I got it!\p"
-	.string "I'll go catch a strong {STR_VAR_1}\n"
-	.string "right away!\p"
-	.string "See you again!$"
-
-gText_082BE850:: @ 82BE850
-	.string "Hello, {PLAYER}…\p"
-	.string "Um, you've probably already forgotten\n"
-	.string "about someone like me…\p"
-	.string "…But that doesn't matter if you\n"
-	.string "could give me advice…\p"
-	.string "I can't decide on the one kind of\n"
-	.string "POKéMON I should raise…\p"
-	.string "I've narrowed the field to the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, but that's\l"
-	.string "where I became stuck…\p"
-	.string "{PLAYER}, you probably don't want to\n"
-	.string "bother, but please decide for me.$"
-
-gText_082BE99C:: @ 82BE99C
-	.string "But will a wild {STR_VAR_1} even pay\n"
-	.string "attention to me?\p"
-	.string "I will try!\p"
-	.string "But will I even be able to catch one…\n"
-	.string "No! I'll do my best!\p"
-	.string "Thank you!$"
-
-gText_082BEA1B:: @ 82BEA1B
-	.string "Oh, {PLAYER}{KUN}! I'm so glad to see you!\n"
-	.string "I was about to go looking for you!\p"
-	.string "Can you decide what kind of POKéMON\n"
-	.string "I should use?\p"
-	.string "For instance…\n"
-	.string "How about the POKéMON {STR_VAR_1}\l"
-	.string "and {STR_VAR_2}?\p"
-	.string "Which one do you think would be\n"
-	.string "better?$"
-
-gText_082BEAE9:: @ 82BEAE9
-	.string "{STR_VAR_1}? That's great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BEB72:: @ 82BEB72
-	.string "If it isn't {PLAYER}{KUN}! How's it going?\n"
-	.string "I'm busy again as always!\p"
-	.string "I want to do good with POKéMON, too,\n"
-	.string "but I haven't been able to decide\l"
-	.string "which POKéMON I should use.\p"
-	.string "You know how {STR_VAR_1} look strong?\n"
-	.string "But {STR_VAR_2} are tough to ignore.\p"
-	.string "{PLAYER}{KUN}, give me some of your good\n"
-	.string "advice! Which one'd be good for me?$"
-
-gText_082BEC8E:: @ 82BEC8E
-	.string "Okay, gotcha.\n"
-	.string "I'll find time somehow and catch me\l"
-	.string "that {STR_VAR_1} you recommended.\p"
-	.string "I'm glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082BED16:: @ 82BED16
-	.string "Oh!\n"
-	.string "Yay, it's {PLAYER}!\p"
-	.string "I didn't waste any time boasting to\n"
-	.string "my friends about meeting you!\p"
-	.string "I need to tap your mind again today.\n"
-	.string "It's an easy one for you!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I were to raise a POKéMON,\n"
-	.string "and the choices were one {STR_VAR_1}\l"
-	.string "or {STR_VAR_2}, which should it be?$"
-
-gText_082BEE29:: @ 82BEE29
-	.string "Ahhh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BEEB4:: @ 82BEEB4
-	.string "Oh, is it you, {PLAYER}?\n"
-	.string "I'm delighted to see you again!\p"
-	.string "Ever since I became your apprentice,\n"
-	.string "my confidence has been blooming.\p"
-	.string "I think I'm ready to raise a POKéMON\n"
-	.string "of my own!\p"
-	.string "{PLAYER}, may I impose on you to choose\n"
-	.string "which POKéMON I should raise?\p"
-	.string "The choices are the POKéMON\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}…\l"
-	.string "Which POKéMON is right for me?$"
-
-gText_082BEFE2:: @ 82BEFE2
-	.string "One {STR_VAR_1} it is!\n"
-	.string "I will find one right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BF04E:: @ 82BF04E
-	.string "Eek! {PLAYER}! I met you again!\n"
-	.string "I… I'm overjoyed!\p"
-	.string "Oh-oh-oh, I know!\n"
-	.string "I shouldn't pass up this opportunity!\p"
-	.string "May I ask a huge favor, {PLAYER}?\n"
-	.string "Please choose a POKéMON for me!\p"
-	.string "Please decide which would be better,\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}!$"
-
-gText_082BF11D:: @ 82BF11D
-	.string "Wow! You decided for me!\n"
-	.string "One {STR_VAR_1} is what I'll raise to\l"
-	.string "the best of my ability.\p"
-	.string "I hope you'll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BF1A8:: @ 82BF1A8
-	.string "Hey, hey!\n"
-	.string "My mentor, {PLAYER}{KUN}!\p"
-	.string "Hello, I've been looking for you\n"
-	.string "for some more of your sage advice!\p"
-	.string "Which kind of POKéMON would be right\n"
-	.string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p"
-	.string "Don't be shy now.\n"
-	.string "Let's blurt it out!$"
-
-gText_082BF268:: @ 82BF268
-	.string "Uh-huh, one {STR_VAR_1} it is!\n"
-	.string "OK, A-OK!\l"
-	.string "I'll get one in a BALL, like, cram!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BF2D1:: @ 82BF2D1
-	.string "{PLAYER}{KUN}, listen! Big news!\n"
-	.string "I caught a mirage POKéMON!\p"
-	.string "Of course I'm lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at catching\l"
-	.string "POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "kind of POKéMON I should catch,\l"
-	.string "master?\p"
-	.string "Which would be better?\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}?$"
-
-gText_082BF3CF:: @ 82BF3CF
-	.string "Okay, so it's {STR_VAR_1} you chose?\n"
-	.string "I'll grab the other kind, then!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082BF46A:: @ 82BF46A
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin' SAILOR am I!\n"
-	.string "Surely you remember who am I?\p"
-	.string "Today, I have a POKéMON question\n"
-	.string "that begs your suggestion!\p"
-	.string "I have the choice between this\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, you see.\l"
-	.string "Which is the one to catch for me?$"
-
-gText_082BF551:: @ 82BF551
-	.string "{STR_VAR_1}, you say, hey, hey!\n"
-	.string "I'll go get me one right away!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082BF5C3:: @ 82BF5C3
-	.string "Oh, wow, if it isn't {PLAYER}!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I'm already talking to you!\p"
-	.string "It's been a long time. Let me break\n"
-	.string "the ice. I'm also looking for advice!\l"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\p"
-	.string "My POKéMON--which should I use?\n"
-	.string "It's either {STR_VAR_1} or {STR_VAR_2}.\l"
-	.string "Which do you choose?$"
-
-gText_082BF6E5:: @ 82BF6E5
-	.string "If that {STR_VAR_1} is the best,\n"
-	.string "I'll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BF773:: @ 82BF773
-	.string "Oh, hi, {PLAYER}{KUN}…\n"
-	.string "I have this horrible headache…\p"
-	.string "I must've worried too much about\n"
-	.string "the kind of POKéMON I should raise.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{KUN}, if I had to choose between\n"
-	.string "the POKéMON {STR_VAR_1} and\l"
-	.string "{STR_VAR_2}, which should it be?$"
-
-gText_082BF869:: @ 82BF869
-	.string "Hm, one {STR_VAR_1}, all right.\n"
-	.string "I'll go look for one when I get better.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BF8DD:: @ 82BF8DD
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}…?\p"
-	.string "Please, don't look at me that way.\n"
-	.string "I'm getting all flustered…\l"
-	.string "I… I need your advice.\p"
-	.string "I… I'm really embarrassed, but I can't\n"
-	.string "decide which POKéMON to use.\p"
-	.string "If the choices were {STR_VAR_1} or\n"
-	.string "{STR_VAR_2}, which would be better?$"
-
-gText_082BF9BA:: @ 82BF9BA
-	.string "Oh… Okay!\n"
-	.string "I'll do my best with one {STR_VAR_1}.\p"
-	.string "I hope I can do my best without\n"
-	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BFA5A:: @ 82BFA5A
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really real?\p"
-	.string "No, no, if you are real, it's fine.\n"
-	.string "Incidentally, I would like to obtain\l"
-	.string "your advice.\p"
-	.string "It's about the POKéMON I am to use.\p"
-	.string "If the choices are the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, which is\l"
-	.string "more worthy of me?$"
-
-gText_082BFB4E:: @ 82BFB4E
-	.string "{STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope it is something even I can\n"
-	.string "handle with aplomb.\p"
-	.string "Let us meet again!$"
-
-gText_082BFBF2:: @ 82BFBF2
-	.string "Waaah! Oh, {PLAYER}!\n"
-	.string "Snivel… Hiccup…\p"
-	.string "I have a dilemma!\n"
-	.string "I can't decide on a move for\l"
-	.string "my {STR_VAR_1}…\p"
-	.string "Please, please, {PLAYER}.\n"
-	.string "Can you decide for me?\p"
-	.string "For my {STR_VAR_1}, which move would\n"
-	.string "be the better choice: {STR_VAR_2}\l"
-	.string "or {STR_VAR_3}?$"
-
-gText_082BFCAE:: @ 82BFCAE
-	.string "{STR_VAR_1}?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I'm so sorry, {PLAYER}!\n"
-	.string "You've made me so happy by deciding\l"
-	.string "the move, I'm crying…\p"
-	.string "Snivel…\n"
-	.string "Thank you so much!$"
-
-gText_082BFD26:: @ 82BFD26
-	.string "Yay! Hi, {PLAYER}!\n"
-	.string "I need your advice again!\p"
-	.string "I want to teach my {STR_VAR_1}\n"
-	.string "a cool move.\p"
-	.string "I like either of the moves\n"
-	.string "{STR_VAR_2} or {STR_VAR_3}.\l"
-	.string "What's your recommendation?$"
-
-gText_082BFDB1:: @ 82BFDB1
-	.string "{STR_VAR_1} is better? I guess so!\n"
-	.string "Okay, I'll go with that!\p"
-	.string "If we meet here again, please teach\n"
-	.string "me something else, teacher!$"
-
-gText_082BFE24:: @ 82BFE24
-	.string "{PLAYER}, hello!\n"
-	.string "It's about my {STR_VAR_1}, but I'm\l"
-	.string "worried about its moves.\p"
-	.string "You see, it's the moves {STR_VAR_2}\n"
-	.string "and {STR_VAR_3}.\p"
-	.string "Which is stronger and better for\n"
-	.string "my {STR_VAR_1}?$"
-
-gText_082BFEAD:: @ 82BFEAD
-	.string "{STR_VAR_1} is your choice?\n"
-	.string "Okay, I got it!\p"
-	.string "I'll go teach {STR_VAR_1} to\n"
-	.string "my POKéMON right away!\p"
-	.string "See you again!$"
-
-gText_082BFF0A:: @ 82BFF0A
-	.string "Ohhh, {PLAYER}…\n"
-	.string "I'm hopeless, no, really!\p"
-	.string "I've decided to raise a POKéMON,\n"
-	.string "but now I can't even decide what\l"
-	.string "move I should let it learn…\p"
-	.string "I know that it doesn't mean anything\n"
-	.string "to you, {PLAYER}.\p"
-	.string "But it means a lot to me…\p"
-	.string "Please, {PLAYER}, could you choose\n"
-	.string "a move for my {STR_VAR_1}?\p"
-	.string "If you could even choose between\n"
-	.string "{STR_VAR_2} and {STR_VAR_3}…$"
-
-gText_082C0032:: @ 82C0032
-	.string "I understand!\p"
-	.string "But will it even be willing to learn\n"
-	.string "{STR_VAR_1} for me…\l"
-	.string "No! I'll do my best!\p"
-	.string "Thank you!$"
-
-gText_082C0090:: @ 82C0090
-	.string "Oh, {PLAYER}{KUN}!\n"
-	.string "I was just hoping to see you, too!\p"
-	.string "I was wondering what move would\n"
-	.string "be suitable for my {STR_VAR_1}.\p"
-	.string "I can't decide, so can you decide\n"
-	.string "for me instead?\p"
-	.string "For instance… How about the moves\n"
-	.string "{STR_VAR_2} and {STR_VAR_3}?\l"
-	.string "Which one would be better?$"
-
-gText_082C016E:: @ 82C016E
-	.string "{STR_VAR_1}? That's great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{KUN}, I won't be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I'll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082C01F7:: @ 82C01F7
-	.string "How could things be this busy?\n"
-	.string "Hey, if it isn't {PLAYER}{KUN}!\l"
-	.string "How's it going?\p"
-	.string "Since I got up this morning, I've done\n"
-	.string "my jogging, swimming, and cooking!\p"
-	.string "You wouldn't believe how busy I am!\p"
-	.string "I can't even decide what move\n"
-	.string "my {STR_VAR_1} should learn!\p"
-	.string "{STR_VAR_2} looks good, huh?\n"
-	.string "But {STR_VAR_3}'s also decent.\p"
-	.string "{PLAYER}{KUN}, give me some of your good\n"
-	.string "advice! Which move'd be good for me?$"
-
-gText_082C034C:: @ 82C034C
-	.string "Okay, gotcha.\n"
-	.string "I'll make room in my schedule and\l"
-	.string "teach that move.\p"
-	.string "I'm glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082C03CA:: @ 82C03CA
-	.string "Oh! Lucky!\n"
-	.string "I met you again, {PLAYER}!\l"
-	.string "I need to tap your mind again today.\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "For my {STR_VAR_1}, which is the move\n"
-	.string "best suited, {STR_VAR_2} or\l"
-	.string "{STR_VAR_3}?$"
-
-gText_082C046E:: @ 82C046E
-	.string "Ahhh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that's about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let's meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082C04F9:: @ 82C04F9
-	.string "Oh, hello, {PLAYER}.\n"
-	.string "I trust you've been well?\p"
-	.string "I have to seek your advice again.\n"
-	.string "It's about my dearest {STR_VAR_1}.\p"
-	.string "What would be the ideal move for\n"
-	.string "my lovable {STR_VAR_1}?\l"
-	.string "{STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C0598:: @ 82C0598
-	.string "{STR_VAR_1} it is!\n"
-	.string "I will teach that right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082C0602:: @ 82C0602
-	.string "Eek! {PLAYER}! I met you again!\n"
-	.string "I… I'm overjoyed!\p"
-	.string "Whenever I'm in need, you're always\n"
-	.string "there for me, {PLAYER}!\p"
-	.string "Today, I want you to recommend\n"
-	.string "a move for me!\p"
-	.string "Please choose a move for\n"
-	.string "my {STR_VAR_1}!\p"
-	.string "Which move would be better,\n"
-	.string "{STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C06D8:: @ 82C06D8
-	.string "Oh-oh-oh! Thank you!\n"
-	.string "{STR_VAR_1} is it!\l"
-	.string "Perfectly understood!\p"
-	.string "I hope you'll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082C074A:: @ 82C074A
-	.string "Hola, {PLAYER}{KUN}, bueno!\n"
-	.string "I'm hoping for some more of\l"
-	.string "your sage advice today!\p"
-	.string "What would be the best move for\n"
-	.string "my {STR_VAR_1}?\p"
-	.string "It should be something that'll\n"
-	.string "let me win just like that!\p"
-	.string "Would it be {STR_VAR_2}?\n"
-	.string "Or {STR_VAR_3}?$"
-
-gText_082C0809:: @ 82C0809
-	.string "Uh-huh, {STR_VAR_1} it is!\n"
-	.string "Si, bueno!\l"
-	.string "I'll get it taught, like, ka-blam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082C086E:: @ 82C086E
-	.string "{PLAYER}{KUN}, it's completely wild!\p"
-	.string "My POKéMON!\n"
-	.string "It learned six moves!\p"
-	.string "Of course I'm lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at choosing moves\l"
-	.string "for my POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "kind of move I should teach?\p"
-	.string "{STR_VAR_2} or {STR_VAR_3}--which\n"
-	.string "would go with my {STR_VAR_1} best?$"
-
-gText_082C0982:: @ 82C0982
-	.string "Okay, so it's {STR_VAR_1} you chose?\n"
-	.string "I'll choose another move, then!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you'll keep teaching me!$"
-
-gText_082C0A1D:: @ 82C0A1D
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin' SAILOR am I!\n"
-	.string "I'm always with it, don't ask me why.\p"
-	.string "Today, I have a move question\n"
-	.string "that begs your suggestion!\p"
-	.string "{STR_VAR_2} and {STR_VAR_3} are\n"
-	.string "the moves. What would be the best\l"
-	.string "for my {STR_VAR_1} so it grooves?$"
-
-gText_082C0AFD:: @ 82C0AFD
-	.string "{STR_VAR_1}, you say, hey, hey!\n"
-	.string "I'll go teach that right away!\p"
-	.string "If it's advice I ever need,\n"
-	.string "{PLAYER}, your word I'll always heed!$"
-
-gText_082C0B6F:: @ 82C0B6F
-	.string "Oh, yeahah, if it isn't {PLAYER}!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I'm already talking to you!\p"
-	.string "{PLAYER}, are you surprised by me?\n"
-	.string "I want your advice, can't you see?\p"
-	.string "Are you receiving me?\n"
-	.string "You are receiving me!\p"
-	.string "My {STR_VAR_1}--what should it use?\n"
-	.string "It's {STR_VAR_2} or {STR_VAR_3},\l"
-	.string "what do you choose?$"
-
-gText_082C0C7D:: @ 82C0C7D
-	.string "If that {STR_VAR_1} is the best,\n"
-	.string "I'll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082C0D0B:: @ 82C0D0B
-	.string "Gahack! Gaah! Oh, {PLAYER}{KUN}…\n"
-	.string "I have this lousy cold, I do…\p"
-	.string "I want to pick a move for my POKéMON,\n"
-	.string "but I'm not up to it…\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{KUN}, if I had to choose between\n"
-	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
-	.string "my {STR_VAR_1}, which would it be?$"
-
-gText_082C0DFE:: @ 82C0DFE
-	.string "Hm, {STR_VAR_1}, all right. Cough!\n"
-	.string "I'll go teach it when I get better.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082C0E71:: @ 82C0E71
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}…?\p"
-	.string "Please, don't look at me that way.\n"
-	.string "I'm getting all flustered…\l"
-	.string "I… I need your advice.\p"
-	.string "I… I'm really embarrassed, but I can't\n"
-	.string "decide what move I should teach\l"
-	.string "my POKéMON.\p"
-	.string "It's for my {STR_VAR_1}.\n"
-	.string "If the choices were {STR_VAR_2} or\l"
-	.string "{STR_VAR_3}, which would be better?$"
-
-gText_082C0F6D:: @ 82C0F6D
-	.string "Oh… Okay!\n"
-	.string "I'll try that {STR_VAR_1}.\p"
-	.string "I hope I can teach that move…\n"
-	.string "This is so nerve-racking…\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082C1003:: @ 82C1003
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really real?\p"
-	.string "Perhaps you're one of those popular\n"
-	.string "mimics?\p"
-	.string "No, no, if you are real, it's fine.\n"
-	.string "No need to be upset, I assure you!\p"
-	.string "Incidentally, I would like to obtain\n"
-	.string "your advice.\p"
-	.string "It's about my {STR_VAR_1}.\p"
-	.string "Which move would be better for it to\n"
-	.string "use, {STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C1122:: @ 82C1122
-	.string "{STR_VAR_1}?\n"
-	.string "There's no question about that?\p"
-	.string "I see. If that's the case, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope it is something even\n"
-	.string "my POKéMON can learn.\p"
-	.string "Let us meet again!$"
-
-gText_082C11D1:: @ 82C11D1
-	.string "Oh… {PLAYER}?\n"
-	.string "It is {PLAYER}!\l"
-	.string "Oh! Sniff…sob… Please, listen!\p"
-	.string "I… When I battle, I get so nervous,\n"
-	.string "I can't help crying even if I win…\p"
-	.string "I wish I could say something cool\n"
-	.string "when I win…\p"
-	.string "Please, please, {PLAYER}!\n"
-	.string "Could you maybe teach me something\l"
-	.string "cool to say when I win so I don't cry?$"
-
-gText_082C12D5:: @ 82C12D5
-	.string "{STR_VAR_1}\p"
-	.string "Awesome! Wicked! Awoooh!\n"
-	.string "It's really cool!\p"
-	.string "Oh… I'm sorry…\n"
-	.string "I'm so happy, I'm crying…\p"
-	.string "Snivel… {PLAYER}!\n"
-	.string "Thank you so much for everything!\p"
-	.string "I will battle the best I can for\n"
-	.string "your sake, {PLAYER}!\p"
-	.string "{PLAYER}…\n"
-	.string "Next time… We should battle!$"
-
-gText_082C13AB:: @ 82C13AB
-	.string "Yay! It's {PLAYER}! Hello!\n"
-	.string "I wanted to ask you something!\p"
-	.string "I want to say something cool when\n"
-	.string "I win a match.\p"
-	.string "Do you have a cool saying that\n"
-	.string "you could recommend?$"
-
-gText_082C1444:: @ 82C1444
-	.string "{STR_VAR_1}\p"
-	.string "Oh, wow! That is so cool!\n"
-	.string "Okay, I'll say that!\p"
-	.string "Thanks for teaching me all this time!\n"
-	.string "I'm going to do the best I can\l"
-	.string "wherever I go from now on!\p"
-	.string "When we meet again, it'll be for\n"
-	.string "a battle!$"
-
-gText_082C1501:: @ 82C1501
-	.string "{PLAYER}, hello!\p"
-	.string "My POKéMON and I are ready for\n"
-	.string "anything, except for one thing.\p"
-	.string "I think it would be good if I had\n"
-	.string "something to shout when I win.\p"
-	.string "Could you think up something good\n"
-	.string "to say?$"
-
-gText_082C15B6:: @ 82C15B6
-	.string "{STR_VAR_1}\p"
-	.string "…Cool!\n"
-	.string "I will use that!\p"
-	.string "I'm going out to battle all over\n"
-	.string "the place.\p"
-	.string "Who knows, I may even get to battle\n"
-	.string "you one day, {PLAYER}.\p"
-	.string "Next time, let's meet at a place\n"
-	.string "of battle!$"
-
-gText_082C165E:: @ 82C165E
-	.string "Hello, {PLAYER}…\n"
-	.string "I'm sorry to bug you, but I'm hopeless…\p"
-	.string "Even when…\n"
-	.string "Even when I win, I don't have anything\l"
-	.string "special to say…\p"
-	.string "I know that it doesn't mean anything\n"
-	.string "to you, {PLAYER}.\p"
-	.string "But it means a lot to me…\p"
-	.string "Please, {PLAYER}, what should I say\n"
-	.string "if I win a battle?$"
-
-gText_082C174F:: @ 82C174F
-	.string "{STR_VAR_1}\p"
-	.string "That's inspired…\p"
-	.string "Uh… Is it okay for someone like me\n"
-	.string "to even say that?\p"
-	.string "No! I'll do my best!\p"
-	.string "{PLAYER}, thank you so much for\n"
-	.string "putting up with me for so long…\p"
-	.string "I promise to do my best from now on.\p"
-	.string "I'm sure you'll quickly forget about\n"
-	.string "someone like me, but let's meet\l"
-	.string "somewhere again!$"
-
-gText_082C1862:: @ 82C1862
-	.string "Oh, {PLAYER}{KUN}.\n"
-	.string "There's something I want you to hear.\p"
-	.string "I know that I don't always sound\n"
-	.string "nice or polite…\p"
-	.string "When I win a battle, I think I come\n"
-	.string "across as being arrogant.\p"
-	.string "I don't want people to dislike me,\n"
-	.string "so I want to say something nice to\l"
-	.string "someone I beat.\p"
-	.string "But I can't think of anything good!\n"
-	.string "Could you think something up for me?$"
-
-gText_082C19A0:: @ 82C19A0
-	.string "{STR_VAR_1}\p"
-	.string "Not bad!\n"
-	.string "Yup, that's what I'll go with!\p"
-	.string "I'm going to hit the road and do what\n"
-	.string "I can with what you taught me in\l"
-	.string "my head and heart.\p"
-	.string "I'm sorry that I've been so pushy\n"
-	.string "with you!\p"
-	.string "Next time, we battle, okay?\n"
-	.string "See you!$"
-
-gText_082C1A76:: @ 82C1A76
-	.string "Oh, I can't get over how busy I am!\n"
-	.string "Oh, hey, I was looking for you, {PLAYER}{KUN}.\p"
-	.string "Are you well as usual?\n"
-	.string "Things haven't changed for me at all.\p"
-	.string "I've got running, fighting, and mapping\n"
-	.string "to do. Why am I so busy?\p"
-	.string "But even though I'm busy, it'd be rude\n"
-	.string "to just turn on my heels and walk away\l"
-	.string "from a win without saying a word.\p"
-	.string "So, what would be a cool saying to\n"
-	.string "underline my coolness when I'm done\l"
-	.string "and walking away? {PLAYER}{KUN}, help me!$"
-
-gText_082C1C16:: @ 82C1C16
-	.string "{STR_VAR_1}\p"
-	.string "Okay, gotcha.\n"
-	.string "I can find time to say that!\p"
-	.string "Honestly, I'm glad I met a good mentor\n"
-	.string "like you.\p"
-	.string "I'm going to make time somehow so\n"
-	.string "I can get into battling.\p"
-	.string "Thanks for everything, {PLAYER}{KUN}!\n"
-	.string "We have to battle, you and me, one day!$"
-
-gText_082C1CF5:: @ 82C1CF5
-	.string "I lucked out again!\n"
-	.string "{PLAYER}! Am I glad to see you!\l"
-	.string "Like usual, I need your advice!\p"
-	.string "Drum roll, please!\n"
-	.string "The last question I have is…\p"
-	.string "If I win a battle and want to end\n"
-	.string "it with a cool flourish, what\l"
-	.string "should I say?$"
-
-gText_082C1DC1:: @ 82C1DC1
-	.string "{STR_VAR_1}\p"
-	.string "That… That's fabulous!\n"
-	.string "It's dignified and cool! I claim it!\p"
-	.string "…Listen, I think I'm getting decent\n"
-	.string "at this, huh?\p"
-	.string "So, I'm thinking of challenging other\n"
-	.string "TRAINERS from now on.\p"
-	.string "{PLAYER}, your advice really helped me.\p"
-	.string "Maybe one day, there'll be a time when\n"
-	.string "we battle!\p"
-	.string "Thank you for everything!$"
-
-gText_082C1EDC:: @ 82C1EDC
-	.string "Oh, {PLAYER}.\n"
-	.string "I'm so glad I met you!\p"
-	.string "I no longer have any concerns with\n"
-	.string "regard to my POKéMON.\p"
-	.string "It's myself that worries me…\p"
-	.string "Do you know how a TRAINER says\n"
-	.string "a few things upon winning a battle?\p"
-	.string "Definitely, I wish I could do that,\n"
-	.string "too!\p"
-	.string "Please, what should I say when\n"
-	.string "I win a battle?$"
-
-gText_082C1FEC:: @ 82C1FEC
-	.string "{STR_VAR_1}\p"
-	.string "Ah! That saying! It refreshes me\n"
-	.string "and makes me feel reborn!\p"
-	.string "I must use that right away!\p"
-	.string "And now, I must take my leave,\n"
-	.string "{PLAYER}…\p"
-	.string "I will go out to battle many others,\n"
-	.string "but never will I forget your teachings.\p"
-	.string "Perhaps one day…\n"
-	.string "Farewell!$"
-
-gText_082C20D1:: @ 82C20D1
-	.string "Eek! I spotted {PLAYER}!\n"
-	.string "I… I'm overjoyed to see you!\p"
-	.string "Oh-oh-oh! There's something I just\n"
-	.string "had to ask you!\p"
-	.string "A little while ago, I won a battle.\n"
-	.string "That part was giddying!\p"
-	.string "But it made me so overjoyed that\n"
-	.string "I choked up and couldn't say a thing!\p"
-	.string "So now, {PLAYER}, please, I want you to\n"
-	.string "think up an exit line for when I win!$"
-
-gText_082C21FF:: @ 82C21FF
-	.string "{STR_VAR_1}\p"
-	.string "Waaaaah!\n"
-	.string "I'm going to say that?!\l"
-	.string "I… I'm delirious with joy!\p"
-	.string "Th-th-thank you!\n"
-	.string "I have nothing left to regret now!\p"
-	.string "I'm going to travel now and battle\n"
-	.string "all sorts of people.\p"
-	.string "Everything, I owe it to you, {PLAYER}.\n"
-	.string "Really, really, thank you!\p"
-	.string "I've got to go now, but let's meet\n"
-	.string "in battle one day!$"
-
-gText_082C231C:: @ 82C231C
-	.string "Hola, bueno!\n"
-	.string "{PLAYER}{KUN}!\p"
-	.string "You know, I'm getting the itch to roam\n"
-	.string "and battle where I may.\p"
-	.string "But before I do, I want your advice\n"
-	.string "once again, please!\p"
-	.string "If I were to win a battle, what would\n"
-	.string "be a good boast I could say to my\l"
-	.string "fallen TRAINER opponent?$"
-
-gText_082C2407:: @ 82C2407
-	.string "{STR_VAR_1}\p"
-	.string "Uh-huh, that's sweet!\n"
-	.string "Si, bueno!\l"
-	.string "I'll try saying that, like, ham!\p"
-	.string "And now, it's time to say good-bye!\n"
-	.string "Thanks for all sorts of things!\p"
-	.string "Give me a battle one day, OK?\n"
-	.string "Adios!$"
-
-gText_082C24B5:: @ 82C24B5
-	.string "{PLAYER}{KUN}, there's big trouble!\p"
-	.string "When I win a battle, I brag about it\n"
-	.string "for an hour at least!\p"
-	.string "Of course I'm lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I'm not very good at chatting.\p"
-	.string "So, how about deciding for me what\n"
-	.string "I should say after winning a battle,\l"
-	.string "master?$"
-
-gText_082C25B1:: @ 82C25B1
-	.string "{STR_VAR_1}\p"
-	.string "That's what I should say, huh?\n"
-	.string "Then, I'll stay away from that!\p"
-	.string "Just kidding!\n"
-	.string "I'll obey your teaching, master!\p"
-	.string "Thanks for teaching me all this time,\n"
-	.string "master!\p"
-	.string "I'm finally understanding what being\n"
-	.string "a TRAINER is about.\p"
-	.string "I'm going to go out and win battles\n"
-	.string "against any TRAINER.\p"
-	.string "Maybe it'll be you one day, master!\p"
-	.string "That's all!\n"
-	.string "Farewell, my master!$"
-
-gText_082C2707:: @ 82C2707
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin' SAILOR am I!\n"
-	.string "This will be my last question,\l"
-	.string "don't you cry!\p"
-	.string "It's a saying question\n"
-	.string "that begs your suggestion!\p"
-	.string "If I win a match, what can I say\n"
-	.string "in a real cool way?$"
-
-gText_082C27D4:: @ 82C27D4
-	.string "{STR_VAR_1}\p"
-	.string "Perfect! That's what I'll use.\n"
-	.string "I was right to make you choose!\p"
-	.string "And now, I think it'd be best,\n"
-	.string "if I were to fly the nest!\p"
-	.string "Thanks for all you taught me.\n"
-	.string "I'll be off on a battle spree!\p"
-	.string "B-O-N-V-O-Y-A-G-E!\n"
-	.string "And that spells bon voyage,\l"
-	.string "to you this is my homage!$"
-
-gText_082C28D6:: @ 82C28D6
-	.string "Oh, yeah, {PLAYER}!\n"
-	.string "I found you again today!\p"
-	.string "What should I do? Ask you again?\n"
-	.string "Why not? I'm already asking you!\p"
-	.string "Anyways, {PLAYER}…\n"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\l"
-	.string "I need some more advice for me!\p"
-	.string "It's about what I should yell.\n"
-	.string "Something cool to holler when\l"
-	.string "a battle ends well.\p"
-	.string "Come on, I wanna hear you say it!$"
-
-gText_082C2A0B:: @ 82C2A0B
-	.string "{STR_VAR_1}\p"
-	.string "All right, all right!\n"
-	.string "I'll use that because it's so tight!\p"
-	.string "I'm out of things to ask you.\n"
-	.string "Waving bye is all that's left to do.\p"
-	.string "But maybe one day we'll meet, with one\n"
-	.string "destined to go down in defeat.\p"
-	.string "But, it really is time to say farewell.\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don't you forget about me!\p"
-	.string "Take care, {PLAYER}!\n"
-	.string "Love ya!$"
-
-gText_082C2B50:: @ 82C2B50
-	.string "{PLAYER}{KUN}, I'm finished…\n"
-	.string "My nose won't stop dripping…\p"
-	.string "I was trying to think up something\n"
-	.string "cool to say when I win a battle.\p"
-	.string "It inspired me so much, it made me cry,\n"
-	.string "and now my nose won't stop running…\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me, {PLAYER}{KUN}.\p"
-	.string "When I win a battle,\n"
-	.string "what should I say?$"
-
-gText_082C2C77:: @ 82C2C77
-	.string "{STR_VAR_1}\p"
-	.string "… … …That's good.\n"
-	.string "No, it's awe inspiring!\l"
-	.string "It's bringing fresh tears to my eyes!\p"
-	.string "But in spite of my tears and runny\n"
-	.string "nose, I will use that saying!\p"
-	.string "I'm plumb out of things to ask you,\n"
-	.string "{PLAYER}{KUN}.\p"
-	.string "From now on, we're rivals!\n"
-	.string "Thanks for everything!$"
-
-gText_082C2D67:: @ 82C2D67
-	.string "Er… Um…\n"
-	.string "{PLAYER}{KUN}…\p"
-	.string "Please, don't look at me that way.\n"
-	.string "You're making me all nervous.\p"
-	.string "I… I need your advice again.\n"
-	.string "I'll make it my last, though…\p"
-	.string "It's really embarrassing to ask,\n"
-	.string "but what if I win a battle?\l"
-	.string "What should I say?$"
-
-gText_082C2E41:: @ 82C2E41
-	.string "{STR_VAR_1}\p"
-	.string "Oh… Okay!\n"
-	.string "I'll try to say that!\l"
-	.string "I might be too nervous to say it…\p"
-	.string "Thank you, {PLAYER}{KUN}.\n"
-	.string "I have to say good-bye now.\p"
-	.string "I'll obey all that you've taught me,\n"
-	.string "{PLAYER}{KUN}, and do the best I can.$"
-
-gText_082C2EF5:: @ 82C2EF5
-	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps a clever {PLAYER} DOLL?\p"
-	.string "Oh, no, no, no, don't worry!\n"
-	.string "If you really are real, please\l"
-	.string "forget about my rudeness.\p"
-	.string "No need to be so angry. All I wish for\n"
-	.string "is more of your fine advice.\p"
-	.string "It concerns a saying.\p"
-	.string "More precisely, what should I say\n"
-	.string "if I win a battle?$"
-
-gText_082C3023:: @ 82C3023
-	.string "{STR_VAR_1}\p"
-	.string "… … … … … …\n"
-	.string "When I win a match…\p"
-	.string "{STR_VAR_1}\p"
-	.string "…Are you serious?\p"
-	.string "I see. If you are serious, that's fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope even I will be able to\n"
-	.string "put that saying to good use.\p"
-	.string "I seem to have run dry on what advice\n"
-	.string "I need.\p"
-	.string "I do believe it's high time I bid you\n"
-	.string "farewell and strike out on my own.\p"
-	.string "Thank you, my mentor!\n"
-	.string "I apologize for my skepticism!$"
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 9892ffb7b..2a6da1a58 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -100,11 +100,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -181,11 +181,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -245,11 +245,11 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 2
 	special CallFrontierUtilFunc
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 2
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallFrontierUtilFunc
@@ -276,7 +276,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D
 	end
 
 BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
@@ -287,7 +287,7 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
 BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E
 BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E
 	setorcopyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 0
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 2
@@ -302,7 +302,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271
 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
 	special CallFrontierUtilFunc
 	return
 
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
new file mode 100644
index 000000000..1d0862a65
--- /dev/null
+++ b/data/scripts/berry_blender.inc
@@ -0,0 +1,747 @@
+BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE
+	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
+	.string "with this old-timer?$"
+
+BerryBlender_Text_Excellent: @ 8292E28
+	.string "Excellent!$"
+
+BerryBlender_Text_MadeOldTimerSad: @ 8292E33
+	.string "Oh…\n"
+	.string "You've made this old-timer sad…$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57
+	.string "Do you know how to make a {POKEBLOCK}?$"
+
+BerryBlender_Text_LetsBerryBlender: @ 8292E78
+	.string "Let's get started, then!\p"
+	.string "Let's BERRY BLENDER!$"
+
+BerryBlender_Text_ExplainBerryBlending: @ 8292EA6
+	.string "Okay, a little explanation, then.\p"
+	.string "Oh, don't worry, it's quite simple.\p"
+	.string "When the BLENDER's arrow comes to\n"
+	.string "your marker, just press the A Button.\p"
+	.string "That's all you have to do.\n"
+	.string "You'll see how easy it is when you try.$"
+
+BerryBlender_Text_DontHaveAnyBerries: @ 8292F77
+	.string "Oh?\n"
+	.string "You don't have any BERRIES?\p"
+	.string "If you don't have any BERRIES,\n"
+	.string "you can't make any {POKEBLOCK}S.$"
+
+BerryBlender_Text_CanHaveOneOfMyBerries: @ 8292FD1
+	.string "Well, that won't do at all now, will it?\p"
+	.string "If you don't mind leftovers, you can\n"
+	.string "have one of my BERRIES.\p"
+	.string "That way, we could make some {POKEBLOCK}S\n"
+	.string "together using the BERRY BLENDER.$"
+
+BerryBlender_Text_DontHaveAnyBerriesToSpare: @ 829307D
+	.string "If I had some BERRIES left over,\n"
+	.string "I'd gladly give you one…\p"
+	.string "But, I don't have any to spare today.\n"
+	.string "We'll have to do this another time.$"
+
+BerryBlender_Text_PokeblockCaseIsFull: @ 8293101
+	.string "But your {POKEBLOCK} CASE is full.\p"
+	.string "You should use some {POKEBLOCK}S before\n"
+	.string "you come see me again.$"
+
+BerryBlender_Text_DontHavePokeblockCase: @ 8293157
+	.string "But you don't have a {POKEBLOCK} CASE.\p"
+	.string "You should get a {POKEBLOCK} CASE and then\n"
+	.string "come see me.$"
+
+BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA
+	.string "Let's get blending already!$"
+
+BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
+	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
+	.string "This is so exciting!$"
+
+BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201
+	.string "Hi, there! Did you want to blend some\n"
+	.string "{POKEBLOCK}S with us?$"
+
+BerryBlender_Text_Okay: @ 8293237
+	.string "Okay!$"
+
+BerryBlender_Text_ThatsTooBad: @ 829323D
+	.string "That's too bad…\p"
+	.string "But we'll always be around whenever\n"
+	.string "you get the urge to blend!$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C
+	.string "Of course, you do know how to\n"
+	.string "blend {POKEBLOCK}S, don't you?$"
+
+BerryBlender_Text_LetsBerryBlender2: @ 82932C3
+	.string "Let's get started, then!\p"
+	.string "Let's BERRY BLENDER!$"
+
+BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
+	.string "Okay!\n"
+	.string "Let me explain it to you!\p"
+	.string "When the spinning BLENDER's arrow\n"
+	.string "reaches your marker, just press\l"
+	.string "the A Button.\p"
+	.string "That's all it takes.\n"
+	.string "Pretty easy, don't you think?$"
+
+BerryBlender_Text_DontHaveAnyBerries2: @ 8293394
+	.string "Oh, but wait a second here…\n"
+	.string "You don't have any BERRIES.\p"
+	.string "You can't make any {POKEBLOCK}S without\n"
+	.string "BERRIES…\p"
+	.string "We'll always be around whenever you\n"
+	.string "get hold of some BERRIES to blend.$"
+
+BerryBlender_Text_PokeblockCaseIsFull2: @ 829343E
+	.string "Oh, but wait a second here…\n"
+	.string "Your {POKEBLOCK} CASE is full.\p"
+	.string "You should use some {POKEBLOCK}S and\n"
+	.string "then come back.$"
+
+BerryBlender_Text_DontHavePokeblockCase2: @ 82934A2
+	.string "Oh, but wait a second here…\n"
+	.string "You don't have a {POKEBLOCK} CASE.\p"
+	.string "You should get a {POKEBLOCK} CASE and\n"
+	.string "then come back.$"
+
+@ Unused
+BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B
+	.string "Oh, hello! Did you want to make some\n"
+	.string "{POKEBLOCK}S with our little group?$"
+
+BerryBlender_Text_OhDear: @ 829354E
+	.string "Oh, dear!$"
+
+BerryBlender_Text_LeftUsInShock: @ 8293558
+	.string "Oh, dear me…\p"
+	.string "You've left us in shock!$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E
+	.string "Naturally, you know how to make\n"
+	.string "{POKEBLOCK}S, don't you?$"
+
+BerryBlender_Text_LetsBerryBlender3: @ 82935B1
+	.string "Okay, dear!\n"
+	.string "Let's get started!\p"
+	.string "Let's BERRY BLENDER!$"
+
+BerryBlender_Text_ExplainBerryBlending3: @ 82935E5
+	.string "Oh, dear!\p"
+	.string "Then, I'll explain it to you nicely.\p"
+	.string "When the BLENDER's arrow spins to\n"
+	.string "your marker, press the A Button.\p"
+	.string "That's all it takes.\n"
+	.string "Isn't it simple?$"
+
+BerryBlender_Text_DontHaveAnyBerries3: @ 829367D
+	.string "You don't have any BERRIES,\n"
+	.string "do you?\p"
+	.string "If you don't have any BERRIES,\n"
+	.string "you can't make any {POKEBLOCK}S.\p"
+	.string "We'll always be making {POKEBLOCK}S here,\n"
+	.string "so let's make some together when\l"
+	.string "you get a BERRY or two.$"
+
+BerryBlender_Text_PokeblockCaseIsFull3: @ 8293738
+	.string "Your {POKEBLOCK} CASE is full,\n"
+	.string "it looks like.\p"
+	.string "You should use some {POKEBLOCK}S up\n"
+	.string "and then come back.$"
+
+BerryBlender_Text_DontHavePokeblockCase3: @ 8293792
+	.string "You haven't gotten a {POKEBLOCK} CASE\n"
+	.string "yet, it looks like.\p"
+	.string "You need to get a {POKEBLOCK} CASE before\n"
+	.string "you come back.$"
+
+BerryBlender_Text_SetNewBlenderRecord: @ 82937F9
+	.string "Okay! Today's going to be the day that\n"
+	.string "I set a new BLENDER speed record!$"
+
+BerryBlender_Text_LookGoodAtBlendingJoinUs: @ 8293842
+	.string "Oh, dear!\n"
+	.string "You look as if you're good at blending.\l"
+	.string "Would you like to join us?$"
+
+BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F
+	.string "I'm going to make delicious {POKEBLOCK}S\n"
+	.string "and make my POKéMON cuter.$"
+
+BerryBlender_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
+	.string "{POKEBLOCK}S will be made with your friends \n"
+	.string "from BERRIES in the BERRY BLENDER.\p"
+	.string "Is it okay to save the game before\n"
+	.string "linking with your friends?$"
+
+BerryBlender_Text_SearchingForFriends: @ 8293955
+	.string "Searching for your friends…\n"
+	.string "… … B Button: Cancel$"
+
+BerryBlender_Text_Player1Arrived: @ 8293986
+	.string "{STR_VAR_1} arrived.$"
+
+BerryBlender_Text_Player1And2Arrived: @ 8293992
+	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
+
+BerryBlender_Text_AllPlayersArrived: @ 82939A5
+	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
+	.string "{STR_VAR_3} arrived.$"
+
+BerryBlender_Text_NoBerriesLink: @ 82939BD
+	.string "You have no BERRIES.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3
+	.string "Your {POKEBLOCK} CASE is full.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D
+	.string "You don't have a {POKEBLOCK} CASE.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B
+	.string "I love making {POKEBLOCK}S.\p"
+	.string "I always have some BERRIES with me.$"
+
+BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
+	.string "If you'd like, we could make some\n"
+	.string "{POKEBLOCK}S together using the\l"
+	.string "BERRY BLENDER.$"
+
+BerryBlender_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
+	.string "Oh?\n"
+	.string "You don't have any BERRIES?\p"
+	.string "Well, that won't do at all now, will it?\p"
+	.string "If you don't mind leftovers, you can\n"
+	.string "have one of my BERRIES.$"
+
+BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76
+	.string "We'll use it to make {POKEBLOCK}S together\n"
+	.string "using the BERRY BLENDER.$"
+
+BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
+	.string "Oh?\n"
+	.string "You don't have any BERRIES?\p"
+	.string "If I had some left over, I'd gladly\n"
+	.string "give you one…\p"
+	.string "But, I don't have any to spare today.\n"
+	.string "Sorry about that.$"
+
+BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
+	lockall
+	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
+	setvar VAR_0x8009, 1
+	applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1
+	goto BerryBlender_EventScript_DeclineBlender1
+	end
+
+BerryBlender_EventScript_DeclineBlender1: @ 8293C70
+	msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A
+	msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
+	dotimebasedevents
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries
+	goto BerryBlender_EventScript_Blender1GiveSpareBerry
+	end
+
+BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
+	msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
+	msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
+	goto BerryBlender_EventScript_UseBerryBlender1
+	end
+
+BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender1
+	goto BerryBlender_EventScript_ExplainBlending1
+	end
+
+BerryBlender_EventScript_StartBlender1: @ 8293CD2
+	msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending1: @ 8293CE0
+	msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender1
+	end
+
+BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender1NoCase
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender1CaseFull
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender1NoBerries
+	msgbox BerryBlender_Text_Excellent, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_UseBerryBlender1
+	end
+
+@ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left
+BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
+	copyvar VAR_0x8004, VAR_0x8009
+	fadescreen 1
+	special DoBerryBlending
+	waitstate
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1CaseFull: @ 8293D39
+	msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1NoCase: @ 8293D43
+	msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
+	lockall
+	setvar VAR_0x8009, 2
+	applymovement 10, Common_Movement_FaceOriginalDirection
+	applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2
+	goto BerryBlender_EventScript_DeclineBlender2
+	end
+
+BerryBlender_EventScript_DeclineBlender2: @ 8293D7D
+	msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2NoBerries: @ 8293D87
+	msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_UseBerryBlender2: @ 8293D91
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender2
+	goto BerryBlender_EventScript_ExplainBlending2
+	end
+
+BerryBlender_EventScript_StartBlender2: @ 8293DAA
+	msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending2: @ 8293DB8
+	msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender2
+	end
+
+BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender2NoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender2NoCase
+	msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender2
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender2CaseFull
+	end
+
+BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A
+	msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2NoCase: @ 8293E14
+	msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BerryBlender3:: @ 8293E1E
+	lockall
+	setvar VAR_0x8008, 15
+	setvar VAR_0x8009, 3
+	applymovement 9, Common_Movement_FaceOriginalDirection
+	applymovement 17, Common_Movement_FaceOriginalDirection
+	applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBlender3
+	goto BerryBlender_EventScript_DeclineBlender3
+	end
+
+BerryBlender_EventScript_DeclineBlender3: @ 8293E5A
+	msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender3NoBerries: @ 8293E64
+	msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender3
+	goto BerryBlender_EventScript_ExplainBlending3
+	end
+
+BerryBlender_EventScript_StartBlender3: @ 8293E87
+	msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending3: @ 8293E95
+	msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender3
+	end
+
+BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender3NoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender3NoCase
+	msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender3
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender3CaseFull
+	end
+
+BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7
+	msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender3NoCase: @ 8293EF1
+	msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
+	lockall
+	setvar VAR_0x8009, 1
+	msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster
+	msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E
+	msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
+	end
+
+BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
+	msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
+	msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85
+	msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
+	return
+
+BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E
+	msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98
+	msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2Man:: @ 8293FA2
+	msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender2Twin:: @ 8293FB4
+	msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD
+	setvar VAR_0x8008, 15
+	goto BerryBlender_EventScript_ExpertMCheckGiveBerry
+	end
+
+BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
+	lock
+	faceplayer
+	msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, TRUE
+	goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
+	end
+
+BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
+	msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
+	dotimebasedevents
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries
+	goto BerryBlender_EventScript_ExpertMGiveBerry
+	end
+
+BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
+	msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
+	msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
+	msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053
+	walk_in_place_fastest_right
+	step_end
+
+BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
+	lockall
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
+	end
+
+BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
+	msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
+	compare VAR_RESULT, NO
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
+	end
+
+BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1
+	msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
+	compare VAR_RESULT, TRUE
+	goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader
+	message BerryBlender_Text_SearchingForFriends
+	waitmessage
+	special TryBerryBlenderLinkup
+	waitstate
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_SpawnLinkPartners
+	compare VAR_RESULT, 2
+	goto_if_eq BerryBlender_EventScript_CloseLinkNotReady
+	compare VAR_RESULT, 3
+	goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_CloseLink
+	compare VAR_RESULT, 6
+	goto_if_eq BerryBlender_EventScript_LinkError
+	end
+
+BerryBlender_EventScript_TwoPlayerLink: @ 829411D
+	msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_ThreePlayerLink: @ 829412B
+	msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_FourPlayerLink: @ 8294139
+	msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
+	setvar VAR_0x8004, 0
+	fadescreen 1
+	removeobject 240
+	removeobject 239
+	removeobject 238
+	removeobject 237
+	special DoBerryBlending
+	waitstate
+	releaseall
+	end
+
+BerryBlender_EventScript_CancelLinkBlender: @ 8294160
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162
+	msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C
+	msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLinkNotReady: @ 8294176
+	special CloseLink
+	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183
+	special CloseLink
+	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLink: @ 8294190
+	special CloseLink
+	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkError: @ 829419D
+	special CloseLink
+	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
+	fadescreen 1
+	specialvar VAR_RESULT, GetLinkPartnerNames
+	copyvar VAR_0x8008, VAR_RESULT
+	copyvar VAR_0x8004, VAR_0x8008
+	special SpawnLinkPartnerEventObject
+	goto BerryBlender_EventScript_LinkPlayersArrived
+	end
+
+BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
+	fadescreen 0
+	switch VAR_0x8008
+	case 2, BerryBlender_EventScript_TwoPlayerLink
+	case 3, BerryBlender_EventScript_ThreePlayerLink
+	case 4, BerryBlender_EventScript_FourPlayerLink
+	end
+
+BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
+	setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER
+	goto BerryBlender_EventScript_DecideLinkLeader
+	end
+
+BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
+	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
+	waitmessage
+	multichoice 16, 6, MULTI_LINK_LEADER, 0
+	switch VAR_RESULT
+	case 0, BerryBlender_EventScript_TryJoinGroup
+	case 1, BerryBlender_EventScript_TryLeadGroup
+	case 2, BerryBlender_EventScript_CloseLink
+	case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink
+	end
+
+BerryBlender_EventScript_TryLeadGroup: @ 8294235
+	call BerryBlender_EventScript_TryBecomeLinkLeader
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
+	compare VAR_RESULT, 8
+	goto_if_eq BerryBlender_EventScript_TryLeadGroup
+	release
+	end
+
+BerryBlender_EventScript_TryJoinGroup: @ 829425D
+	call BerryBlender_EventScript_TryJoinLinkGroup
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
+	compare VAR_RESULT, 8
+	goto_if_eq BerryBlender_EventScript_TryJoinGroup
+	release
+	end
+
+BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285
+	special TryBecomeLinkLeader
+	waitstate
+	return
+
+BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A
+	special TryJoinLinkGroup
+	waitstate
+	return
+
+BerryBlender_EventScript_LinkLeaderDecided: @ 829428F
+	goto BerryBlender_EventScript_SpawnLinkPartners
+	end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 6de5ccf47..6b2da5ccb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -32,9 +32,9 @@ BerryTree_EventScript_CheckSoil:: @ 8274359
 
 BerryTree_EventScript_WantToPlant:: @ 8274374
 	msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_CancelPlanting
 	end
 
@@ -110,9 +110,9 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
 	faceplayer
 	special EventObjectInteractionGetBerryCountString
 	msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_PickBerry
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_CancelPickingBerry
 
 BerryTree_EventScript_PickBerry:: @ 8274448
@@ -159,9 +159,9 @@ BerryTree_EventScript_WantToWater:: @ 827448D
 	goto_if_eq BerryTree_EventScript_DontWater
 	special EventObjectInteractionGetBerryName
 	msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_WaterBerry
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_DontWater
 
 BerryTree_EventScript_DontWater:: @ 82744BE
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 6962d17f8..1b2e3f60f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	waitdooranim
 	release
 	compare VAR_0x8004, USING_MULTI_BATTLE
-	goto_if_eq CableClub_EventScript_WarpToDoubleColosseum
+	goto_if_eq CableClub_EventScript_WarpTo4PColosseum
 	special SetCableClubWarp
-	warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
+	warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
 	waitmovement 0
 	return
 
-CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036
+CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
 	special SetCableClubWarp
-	warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
+	warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
 	releaseall
 	end
 
-EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
+EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374
 	setvar VAR_0x8005, 0
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
+EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
 	setvar VAR_0x8005, 1
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
+EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 0
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
+EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 1
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
+EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 2
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
+EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 3
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
+EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4
 	end
 
 EventScript_TradeCenter_Chair0:: @ 82773F5
@@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
 	closemessage
 	end
 
-SingleBattleColosseum_EventScript_Attendant:: @ 82774A6
+BattleColosseum2P_EventScript_Attendant:: @ 82774A6
 	special Script_FacePlayer
-	msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
+	msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
 	special Script_ClearHeldMovement
 	closemessage
 	end
@@ -890,7 +890,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
 
 EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
 	msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_TerminateLink
 	erasebox 0, 0, 29, 19
 	releaseall
@@ -911,7 +911,7 @@ EventScript_DoLinkRoomExit:: @ 8277513
 CableClub_EventScript_UnionRoomAttendant:: @ 827751B
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 8
+	setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
 	specialvar VAR_RESULT, IsBadEggInParty
 	compare VAR_RESULT, TRUE
@@ -1005,7 +1005,7 @@ CableClub_EventScript_WirelessClubAttendant:: @ 8277672
 	faceplayer
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
 	msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_DontAskAboutLinking
 	msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT
 	release
@@ -1019,7 +1019,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 827769A
 CableClub_EventScript_DirectCornerAttendant:: @ 82776A4
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 9
+	setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER  @ Set preemptively for multi battles, ignored otherwise
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
 	specialvar VAR_RESULT, IsBadEggInParty
 	compare VAR_RESULT, TRUE
@@ -1080,12 +1080,12 @@ CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
 
 CableClub_EventScript_WirelessTrade:: @ 827780D
 	msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
 	call CableClub_EventScript_CheckPartyTradeRequirements
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, LINK_GROUP_TRADE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1103,7 +1103,7 @@ CableClub_EventScript_WirelessBattleSelect:: @ 827783B
 	end
 
 CableClub_EventScript_WirelessSingleBattle:: @ 827788E
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1111,7 +1111,7 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 8277899
 	special HasEnoughMonsForDoubleBattle
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
 	goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1121,7 +1121,7 @@ CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2
 	end
 
 CableClub_EventScript_WirelessMultiBattle:: @ 82778C0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1132,20 +1132,20 @@ CableClub_EventScript_WirelessBattleInfo:: @ 82778CB
 
 CableClub_EventScript_WirelessRecordMix:: @ 82778D9
 	msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, LINK_GROUP_RECORD_CORNER
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
 CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
 	msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
 	special HasAtLeastOneBerry
 	compare VAR_RESULT, FALSE
 	goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1159,12 +1159,12 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
 	switch VAR_0x8004
-	case 3, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 0, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 1, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 2, CableClub_EventScript_ChooseLinkLeaderFrom4
-	case 5, CableClub_EventScript_ChooseLinkLeader
-	case 12, CableClub_EventScript_ChooseLinkLeader
+	case LINK_GROUP_TRADE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_SINGLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_DOUBLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_MULTI_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom4
+	case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader
+	case LINK_GROUP_RECORD_CORNER, CableClub_EventScript_ChooseLinkLeader
 	end
 
 CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
@@ -1416,7 +1416,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
@@ -1435,7 +1435,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
@@ -1500,7 +1500,7 @@ MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48
 
 MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55
 	msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
 	compare VAR_0x8005, 0
 	call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index da4a97761..52a1da84f 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -1,32 +1,32 @@
 @ All unused / leftover scripts from RS
-EventScript_272274:: @ 8272274
+CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274
 	lockall
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, 2  @ SPECIES_GROUDON in Ruby
 	waitmoncry
 	setvar VAR_TEMP_5, 1
 	releaseall
 	end
 
-EventScript_272283:: @ 8272283
+CaveOfOrigin_EventScript_Shake1:: @ 8272283
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_2722A7
+	goto CaveOfOrigin_EventScript_Shake
 	end
 
-EventScript_27228F:: @ 827228F
+CaveOfOrigin_EventScript_Shake2:: @ 827228F
 	lockall
 	setvar VAR_TEMP_2, 1
-	goto EventScript_2722A7
+	goto CaveOfOrigin_EventScript_Shake
 	end
 
-EventScript_27229B:: @ 827229B
+CaveOfOrigin_EventScript_Shake3:: @ 827229B
 	lockall
 	setvar VAR_TEMP_3, 1
-	goto EventScript_2722A7
+	goto CaveOfOrigin_EventScript_Shake
 	end
 
-EventScript_2722A7:: @ 82722A7
+CaveOfOrigin_EventScript_Shake:: @ 82722A7
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -36,10 +36,7 @@ EventScript_2722A7:: @ 82722A7
 	releaseall
 	end
 
-CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1
-CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1
-CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1
-CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1
+CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_3, 1
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 9a9816a5f..cabf923b6 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1,498 +1,509 @@
-LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
+@ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry
+LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist:: @ 8279CC5
 	lock
 	faceplayer
 	compare VAR_CONTEST_PRIZE_PICKUP, 0
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
-	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
-	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
-	goto LilycoveCity_ContestLobby_EventScript_279D5A
+	goto_if_ne LilycoveCity_ContestLobby_EventScript_PickUpPrize
+	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_ReceptionWelcome
+	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_GivePokeblockCase
+	goto LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA
-	msgbox LilycoveCity_ContestLobby_Text_27AEA8, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA
+	msgbox LilycoveCity_ContestLobby_Text_ContestReception, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
-	msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3
+	msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
 	giveitem_std ITEM_POKEBLOCK_CASE
 	setflag FLAG_RECEIVED_POKEBLOCK_CASE
-	msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
-	msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13
+	msgbox LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize, MSGBOX_DEFAULT
 	switch VAR_CONTEST_PRIZE_PICKUP
-	case 4, LilycoveCity_ContestLobby_EventScript_279D2C
+	case 4, LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
+LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
 	giveitem_std ITEM_LUXURY_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter
 	setvar VAR_CONTEST_PRIZE_PICKUP, 0
 	closemessage
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
+LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
 	call Common_EventScript_BagIsFull
-	msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A
-	message LilycoveCity_ContestLobby_Text_27AF28
+LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
+	message LilycoveCity_ContestLobby_Text_EnterContest1
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E62
-	case 1, LilycoveCity_ContestLobby_EventScript_279D97
-	case 2, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank
+	case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97
-	message LilycoveCity_ContestLobby_Text_27AF5E
+LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
+	message LilycoveCity_ContestLobby_Text_WhichTopic1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_INFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279DDF
-	case 1, LilycoveCity_ContestLobby_EventScript_279DED
-	case 2, LilycoveCity_ContestLobby_EventScript_279DFB
-	case 3, LilycoveCity_ContestLobby_EventScript_279D5A
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A
+	case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests
+	case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes
+	case 2, LilycoveCity_ContestLobby_EventScript_ExplainContestRanks
+	case 3, LilycoveCity_ContestLobby_EventScript_AskEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF
-	msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContests:: @ 8279DDF
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContests, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED
-	msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContestTypes:: @ 8279DED
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContestTypes, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB
-	msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContestRanks:: @ 8279DFB
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContestRanks, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09
-	msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_CancelEnterContest:: @ 8279E09
+	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
-	msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
+	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon1, MSGBOX_DEFAULT
 	choosecontestmon
 	compare VAR_0x8004, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09
-	special sub_80F7F30
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87
-	compare VAR_RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45
-	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69
-	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	special TryEnterContestMon
+	compare VAR_RESULT, CANT_ENTER_CONTEST
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterLowRank
+	compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMon
+	compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon
+	compare VAR_RESULT, CANT_ENTER_CONTEST_EGG
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterEgg
+	compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62
-	message LilycoveCity_ContestLobby_Text_27B3FF
+LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
+	message LilycoveCity_ContestLobby_Text_EnterWhichRank
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_RANK, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279EB5
-	case 1, LilycoveCity_ContestLobby_EventScript_279EC0
-	case 2, LilycoveCity_ContestLobby_EventScript_279ECB
-	case 3, LilycoveCity_ContestLobby_EventScript_279ED6
-	case 4, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank
+	case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank
+	case 2, LilycoveCity_ContestLobby_EventScript_EnterHyperRank
+	case 3, LilycoveCity_ContestLobby_EventScript_EnterMasterRank
+	case 4, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5
-	setvar VAR_CONTEST_RANK, 0
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterNormalRank:: @ 8279EB5
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_NORMAL
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EC0:: @ 8279EC0
-	setvar VAR_CONTEST_RANK, 1
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterSuperRank:: @ 8279EC0
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_SUPER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279ECB:: @ 8279ECB
-	setvar VAR_CONTEST_RANK, 2
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterHyperRank:: @ 8279ECB
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_HYPER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6
-	setvar VAR_CONTEST_RANK, 3
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1
-	message LilycoveCity_ContestLobby_Text_27B423
+@ The multichoice selection IDs are equal to the CATEGORY values
+@ So rather than list the cases they just copy VAR_RESULT for a valid selection into VAR_CONTEST_CATEGORY
+LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
+	message LilycoveCity_ContestLobby_Text_EnterWhichContest1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, 0
 	switch VAR_RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12
-	msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterLowRank:: @ 8279F12
+	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21
-	msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO
+@ Unused
+LilycoveCity_ContestLobby_EventScript_ConfirmEntry:: @ 8279F21
+	msgbox LilycoveCity_ContestLobby_Text_ConfirmContestMon, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E13
-	case 1, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
+	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45
-	msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO
+LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon:: @ 8279F45
+	msgbox LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway, MSGBOX_YESNO
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E13
-	case 1, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
+	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69
-	msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterEgg:: @ 8279F69
+	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78
-	msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterFainted:: @ 8279F78
+	msgbox LilycoveCity_ContestLobby_Text_MonInNoConditionForContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
-	msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
+@ The return here is back to LilycoveCity_ContestLobby_EventScript_ContestReceptionist
+LilycoveCity_ContestLobby_EventScript_EnterMon:: @ 8279F87
+	msgbox LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
+	setvar VAR_CONTEST_HALL_STATE, 1
 	return
 
-LinkContestRoom1_EventScript_279F97:: @ 8279F97
-	special sub_80F90DC
+ContestHall_EventScript_DoContest:: @ 8279F97
+	special LinkContestTryShowWirelessIndicator
 	setvar VAR_0x8006, 0
 	lockall
-	applymovement 14, LinkContestRoom1_Movement_27AD43
+	applymovement 14, ContestHall_Movement_Player4FaceUp
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD09
+	applymovement 1, ContestHall_Movement_MCWalkDown
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_279FF2
-	call LinkContestRoom1_EventScript_27A03C
-	call LinkContestRoom1_EventScript_27A097
-	call LinkContestRoom1_EventScript_27A0F5
-	call LinkContestRoom1_EventScript_27A801
-	call LinkContestRoom1_EventScript_27A8A5
-	call LinkContestRoom1_EventScript_27A987
-	call LinkContestRoom1_EventScript_27A9D4
-	call LinkContestRoom1_EventScript_27AA1B
-	call LinkContestRoom1_EventScript_27AB36
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 2
-	return
-
-LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_GetContestRankStringId
+	call ContestHall_EventScript_GetContestCategory
+	call ContestHall_EventScript_ContestGettingStarted
+	call ContestHall_EventScript_ShowContestMons
+	call ContestHall_EventScript_DoContestAppeals
+	call ContestHall_EventScript_ContestResults
+	call ContestHall_EventScript_GetWinnerObjEventId
+	call ContestHall_EventScript_CongratulateWinner
+	call ContestHall_EventScript_AudienceLookAround
+	call ContestHall_EventScript_GiveWinnerPrize
+	setvar VAR_CONTEST_HALL_STATE, 2
+	return
+
+ContestHall_EventScript_GetContestRankStringId:: @ 8279FF2
 	switch VAR_CONTEST_RANK
-	case 0, LinkContestRoom1_EventScript_27A024
-	case 1, LinkContestRoom1_EventScript_27A02A
-	case 2, LinkContestRoom1_EventScript_27A030
-	case 3, LinkContestRoom1_EventScript_27A036
+	case CONTEST_RANK_NORMAL, ContestHall_EventScript_GetNormalStringId
+	case CONTEST_RANK_SUPER, ContestHall_EventScript_GetSuperStringId
+	case CONTEST_RANK_HYPER, ContestHall_EventScript_GetHyperStringId
+	case CONTEST_RANK_MASTER, ContestHall_EventScript_GetMasterStringId
 	return
 
-LinkContestRoom1_EventScript_27A024:: @ 827A024
+ContestHall_EventScript_GetNormalStringId:: @ 827A024
 	setvar VAR_0x8009, STDSTRING_NORMAL
 	return
 
-LinkContestRoom1_EventScript_27A02A:: @ 827A02A
+ContestHall_EventScript_GetSuperStringId:: @ 827A02A
 	setvar VAR_0x8009, STDSTRING_SUPER
 	return
 
-LinkContestRoom1_EventScript_27A030:: @ 827A030
+ContestHall_EventScript_GetHyperStringId:: @ 827A030
 	setvar VAR_0x8009, STDSTRING_HYPER
 	return
 
-LinkContestRoom1_EventScript_27A036:: @ 827A036
+ContestHall_EventScript_GetMasterStringId:: @ 827A036
 	setvar VAR_0x8009, STDSTRING_MASTER
 	return
 
-LinkContestRoom1_EventScript_27A03C:: @ 827A03C
+@ This whole switch is equivalent to copyvar VAR_0x8008, VAR_CONTEST_CATEGORY
+ContestHall_EventScript_GetContestCategory:: @ 827A03C
 	switch VAR_CONTEST_CATEGORY
-	case 0, LinkContestRoom1_EventScript_27A079
-	case 1, LinkContestRoom1_EventScript_27A07F
-	case 2, LinkContestRoom1_EventScript_27A085
-	case 3, LinkContestRoom1_EventScript_27A08B
-	case 4, LinkContestRoom1_EventScript_27A091
+	case CONTEST_CATEGORY_COOL, ContestHall_EventScript_GetCategoryCool
+	case CONTEST_CATEGORY_BEAUTY, ContestHall_EventScript_GetCategoryBeauty
+	case CONTEST_CATEGORY_CUTE, ContestHall_EventScript_GetCategoryCute
+	case CONTEST_CATEGORY_SMART, ContestHall_EventScript_GetCategorySmart
+	case CONTEST_CATEGORY_TOUGH, ContestHall_EventScript_GetCategoryTough
 	return
 
-LinkContestRoom1_EventScript_27A079:: @ 827A079
+ContestHall_EventScript_GetCategoryCool:: @ 827A079
 	setvar VAR_0x8008, CONTEST_CATEGORY_COOL
 	return
 
-LinkContestRoom1_EventScript_27A07F:: @ 827A07F
+ContestHall_EventScript_GetCategoryBeauty:: @ 827A07F
 	setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
 	return
 
-LinkContestRoom1_EventScript_27A085:: @ 827A085
+ContestHall_EventScript_GetCategoryCute:: @ 827A085
 	setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
 	return
 
-LinkContestRoom1_EventScript_27A08B:: @ 827A08B
+ContestHall_EventScript_GetCategorySmart:: @ 827A08B
 	setvar VAR_0x8008, CONTEST_CATEGORY_SMART
 	return
 
-LinkContestRoom1_EventScript_27A091:: @ 827A091
+ContestHall_EventScript_GetCategoryTough:: @ 827A091
 	setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
 	return
 
-LinkContestRoom1_EventScript_27A097:: @ 827A097
+ContestHall_EventScript_ContestGettingStarted:: @ 827A097
 	buffercontesttypestring 1, VAR_0x8008
 	bufferstdstring 2, VAR_0x8009
-	call LinkContestRoom1_EventScript_27A0B1
+	call ContestHall_EventScript_GettingStarted
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD0B
+	applymovement 1, ContestHall_Movement_MCBackUp
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A0C7
+ContestHall_EventScript_GettingStarted:: @ 827A0B1
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_GettingStartedLink
 	lockall
-	msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_GettingStartedParticipantsAsFollows, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A0DE
-	messageautoscroll LinkContestRoom1_Text_27B78F
+ContestHall_EventScript_GettingStartedLink:: @ 827A0C7
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_GettingStartedWireless
+	messageautoscroll ContestHall_Text_GettingStartedParticipantsAsFollowsLink
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A0DE:: @ 827A0DE
-	messageautoscroll LinkContestRoom1_Text_27C929
+ContestHall_EventScript_GettingStartedWireless:: @ 827A0DE
+	messageautoscroll ContestHall_Text_GettingStartedWireless
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27C972
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ParticipantsAsFollows
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
-	call LinkContestRoom1_EventScript_27A149
-	call LinkContestRoom1_EventScript_27A1D2
-	call LinkContestRoom1_EventScript_27A34F
-	call LinkContestRoom1_EventScript_27A2D5
-	call LinkContestRoom1_EventScript_27A77A
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_ShowContestMons:: @ 827A0F5
+	call ContestHall_EventScript_ContestantWalkToCenter
+	call ContestHall_EventScript_ShowContestMonPic
+	call ContestHall_EventScript_AudienceHeartEmotes
+	call ContestHall_EventScript_AudienceReactToContestant
+	call ContestHall_EventScript_ContestantReturn
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_TryWaitForLink
 	addvar VAR_0x8006, 1
-	compare VAR_0x8006, 4
-	goto_if_ne LinkContestRoom1_EventScript_27A0F5
-	call LinkContestRoom1_EventScript_27A230
+	compare VAR_0x8006, CONTESTANT_COUNT
+	goto_if_ne ContestHall_EventScript_ShowContestMons
+	call ContestHall_EventScript_AudienceVote
 	setvar VAR_TEMP_1, 6
 	return
 
-LinkContestRoom1_EventScript_27A133:: @ 827A133
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A144
+ContestHall_EventScript_TryWaitForLink:: @ 827A133
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_WaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A144:: @ 827A144
-	special sub_80F905C
+ContestHall_EventScript_WaitForLink:: @ 827A144
+	special LinkContestWaitForConnection
 	waitstate
 	return
 
-LinkContestRoom1_EventScript_27A149:: @ 827A149
+ContestHall_EventScript_ContestantWalkToCenter:: @ 827A149
 	compare VAR_0x8006, 0
-	goto_if_eq LinkContestRoom1_EventScript_27A176
+	goto_if_eq ContestHall_EventScript_Player1WalkToCenter
 	compare VAR_0x8006, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A18D
+	goto_if_eq ContestHall_EventScript_Player2WalkToCenter
 	compare VAR_0x8006, 2
-	goto_if_eq LinkContestRoom1_EventScript_27A1A4
+	goto_if_eq ContestHall_EventScript_Player3WalkToCenter
 	compare VAR_0x8006, 3
-	goto_if_eq LinkContestRoom1_EventScript_27A1BB
+	goto_if_eq ContestHall_EventScript_Player4WalkToCenter
 	return
 
-LinkContestRoom1_EventScript_27A176:: @ 827A176
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player1WalkToCenter:: @ 827A176
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 3, LinkContestRoom1_Movement_27AD52
+	applymovement 3, ContestHall_Movement_Player1WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 3
 	return
 
-LinkContestRoom1_EventScript_27A18D:: @ 827A18D
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player2WalkToCenter:: @ 827A18D
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 4, LinkContestRoom1_Movement_27AD5E
+	applymovement 4, ContestHall_Movement_Player2WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 4
 	return
 
-LinkContestRoom1_EventScript_27A1A4:: @ 827A1A4
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player3WalkToCenter:: @ 827A1A4
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 5, LinkContestRoom1_Movement_27AD66
+	applymovement 5, ContestHall_Movement_Player3WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 5
 	return
 
-LinkContestRoom1_EventScript_27A1BB:: @ 827A1BB
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player4WalkToCenter:: @ 827A1BB
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 14, LinkContestRoom1_Movement_27AD6E
+	applymovement 14, ContestHall_Movement_Player4WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 14
 	return
 
-LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
-	special sub_80F8850
+ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
+	special BufferContestTrainerAndMonNames
 	addvar VAR_0x8006, 1
 	buffernumberstring 1, VAR_0x8006
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20
+	applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27AD80
-	addobject 13
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_CheckIfContestWithRSPlayer
+	addobject 13  @ Place Poke Ball down
 	playse SE_DANSA
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20
+	applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
 	waitmovement 0
 	releaseall
-	addvar VAR_0x8006, 65535
+	addvar VAR_0x8006, -1
 	playse SE_BOWA2
 	special ShowContestEntryMonPic
-	call LinkContestRoom1_EventScript_27A217
+	call ContestHall_EventScript_EntryXTrainersMon
 	return
 
-LinkContestRoom1_EventScript_27A217:: @ 827A217
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A229
-	message LinkContestRoom1_Text_27B815
+ContestHall_EventScript_EntryXTrainersMon:: @ 827A217
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_EntryXTrainersMonLink
+	message ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A229:: @ 827A229
-	messageautoscroll LinkContestRoom1_Text_27B815
+ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
+	messageautoscroll ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A230:: @ 827A230
-	call LinkContestRoom1_EventScript_27A26C
-	call LinkContestRoom1_EventScript_27A2B9
+ContestHall_EventScript_AudienceVote:: @ 827A230
+	call ContestHall_EventScript_AudienceWillVote
+	call ContestHall_EventScript_VotingUnderWay
 	playse SE_W227B
 	waitmessage
-	call LinkContestRoom1_EventScript_27AA1B
-	applymovement 1, LinkContestRoom1_Movement_27AD23
+	call ContestHall_EventScript_AudienceLookAround
+	applymovement 1, ContestHall_Movement_MCFaceJudge2
 	waitmovement 0
-	applymovement 2, LinkContestRoom1_Movement_27AD25
+	applymovement 2, ContestHall_Movement_JudgeFaceMC
 	waitmovement 0
 	delay 20
-	applymovement 1, LinkContestRoom1_Movement_27AD13
-	applymovement 2, LinkContestRoom1_Movement_27AD13
+	applymovement 1, ContestHall_Movement_FaceContestants
+	applymovement 2, ContestHall_Movement_FaceContestants
 	waitmovement 0
 	return
 
-LinkContestRoom1_EventScript_27A26C:: @ 827A26C
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A280
-	msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
+ContestHall_EventScript_AudienceWillVote:: @ 827A26C
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_AudienceWillVoteLink
+	msgbox ContestHall_Text_SeenContestantsAudienceWillVote, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A280:: @ 827A280
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A297
-	messageautoscroll LinkContestRoom1_Text_27B830
+ContestHall_EventScript_AudienceWillVoteLink:: @ 827A280
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_AudienceWillVoteWireless
+	messageautoscroll ContestHall_Text_SeenContestantsAudienceWillVote
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A297:: @ 827A297
-	messageautoscroll LinkContestRoom1_Text_27C9AF
+ContestHall_EventScript_AudienceWillVoteWireless:: @ 827A297
+	messageautoscroll ContestHall_Text_WeveSeenContestants
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA04
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_AudienceWillVote
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA42
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_LetVotingBegin
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A2CA
-	message LinkContestRoom1_Text_27B8F2
+ContestHall_EventScript_VotingUnderWay:: @ 827A2B9
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_VotingUnderWayLink
+	message ContestHall_Text_VotingUnderWay
 	return
 
-LinkContestRoom1_EventScript_27A2CA:: @ 827A2CA
-	messageautoscroll LinkContestRoom1_Text_27B8F2
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_VotingUnderWayLink:: @ 827A2CA
+	messageautoscroll ContestHall_Text_VotingUnderWay
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD33
+ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
 	playse SE_W227B
-	call LinkContestRoom1_EventScript_27AA6F
-	applymovement 9, LinkContestRoom1_Movement_27AD3B
-	applymovement 12, LinkContestRoom1_Movement_27AD3F
-	applymovement 7, LinkContestRoom1_Movement_27AD3B
+	call ContestHall_EventScript_VObjectAudienceLookAround
+	applymovement 9, ContestHall_Movement_AudienceMemberLookRight
+	applymovement 12, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 7, ContestHall_Movement_AudienceMemberLookRight
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD3B
+	applymovement 1, ContestHall_Movement_AudienceMemberLookRight
 	waitmovement 0
-	applymovement 10, LinkContestRoom1_Movement_27AD33
-	applymovement 11, LinkContestRoom1_Movement_27AD3F
-	applymovement 6, LinkContestRoom1_Movement_27AD37
-	applymovement 8, LinkContestRoom1_Movement_27AD33
+	applymovement 10, ContestHall_Movement_AudienceMemberLookLeft
+	applymovement 11, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 6, ContestHall_Movement_AudienceMemberLookUp
+	applymovement 8, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD45
+	applymovement 1, ContestHall_Movement_MCLookAtJudge
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD4E
-	applymovement 2, LinkContestRoom1_Movement_27AD49
+	applymovement 1, ContestHall_Movement_MCWalkInPlaceDown
+	applymovement 2, ContestHall_Movement_JudgeLookAtMC
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	return
-
-LinkContestRoom1_EventScript_27A34F:: @ 827A34F
-	special sub_80F82FC
-	compare VAR_CONTEST_LOCATION, 1
-	call_if_eq LinkContestRoom1_EventScript_27A454
-	compare VAR_CONTEST_LOCATION, 2
-	call_if_eq LinkContestRoom1_EventScript_27A4B2
-	compare VAR_CONTEST_LOCATION, 3
-	call_if_eq LinkContestRoom1_EventScript_27A510
-	compare VAR_CONTEST_LOCATION, 4
-	call_if_eq LinkContestRoom1_EventScript_27A56E
-	compare VAR_CONTEST_LOCATION, 5
-	call_if_eq LinkContestRoom1_EventScript_27A5CC
+	call ContestHall_EventScript_TryWaitForLink
+	return
+
+@ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience
+@ The number of hearts to try to display is based on the condition of the presented pokemon and the rank
+@ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart
+@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects
+@    and are set to 9 if they havent displayed a heart yet, and 1 if they have
+ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
+	special GetContestMonCondition
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsNormal
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsSuper
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsHyper
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsMaster
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsLink
 	setvar VAR_TEMP_1, 9
 	setvar VAR_TEMP_2, 9
 	setvar VAR_TEMP_3, 9
@@ -502,7 +513,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	setvar VAR_TEMP_7, 9
 	setvar VAR_TEMP_8, 9
 	compare VAR_TEMP_0, 0
-	call_if_gt LinkContestRoom1_EventScript_27A3E5
+	call_if_gt ContestHall_EventScript_DisplayHearts
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -513,505 +524,505 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	setvar VAR_TEMP_8, 0
 	return
 
-LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
+ContestHall_EventScript_DisplayHearts:: @ 827A3E5
 	setvar VAR_RESULT, 8
 	special ScriptRandom
 	compare VAR_RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_27A65A
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
 	compare VAR_RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_27A67E
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember2
 	compare VAR_RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_27A6A2
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember3
 	compare VAR_RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_27A6C6
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember4
 	compare VAR_RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_27A6EA
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember5
 	compare VAR_RESULT, 5
-	call_if_eq LinkContestRoom1_EventScript_27A70E
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember6
 	compare VAR_RESULT, 6
-	call_if_eq LinkContestRoom1_EventScript_27A732
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember7
 	compare VAR_RESULT, 7
-	call_if_eq LinkContestRoom1_EventScript_27A756
-	compare VAR_TEMP_0, 0
-	goto_if_gt LinkContestRoom1_EventScript_27A3E5
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember8
+	compare VAR_TEMP_0, 0  @ Still more hearts to display
+	goto_if_gt ContestHall_EventScript_DisplayHearts
 	waitmovement 0
 	return
 
-LinkContestRoom1_EventScript_27A454:: @ 827A454
+ContestHall_EventScript_GetNumberOfHeartsNormal:: @ 827A454
 	compare VAR_0x8004, 80
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 70
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 60
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 50
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 40
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 30
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 20
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 10
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2
+ContestHall_EventScript_GetNumberOfHeartsSuper:: @ 827A4B2
 	compare VAR_0x8004, 230
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 210
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 190
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 170
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 150
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 130
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 110
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 90
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A510:: @ 827A510
+ContestHall_EventScript_GetNumberOfHeartsHyper:: @ 827A510
 	compare VAR_0x8004, 380
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 350
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 320
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 290
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 260
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 230
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 200
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 170
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A56E:: @ 827A56E
+ContestHall_EventScript_GetNumberOfHeartsMaster:: @ 827A56E
 	compare VAR_0x8004, 600
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 560
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 520
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 480
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 440
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 400
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 360
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 320
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC
+ContestHall_EventScript_GetNumberOfHeartsLink:: @ 827A5CC
 	compare VAR_0x8004, 600
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 550
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 500
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 450
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 400
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 300
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 200
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 100
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A62A:: @ 827A62A
+ContestHall_EventScript_Set1Heart:: @ 827A62A
 	setvar VAR_TEMP_0, 1
 	return
 
-LinkContestRoom1_EventScript_27A630:: @ 827A630
+ContestHall_EventScript_Set2Hearts:: @ 827A630
 	setvar VAR_TEMP_0, 2
 	return
 
-LinkContestRoom1_EventScript_27A636:: @ 827A636
+ContestHall_EventScript_Set3Hearts:: @ 827A636
 	setvar VAR_TEMP_0, 3
 	return
 
-LinkContestRoom1_EventScript_27A63C:: @ 827A63C
+ContestHall_EventScript_Set4Hearts:: @ 827A63C
 	setvar VAR_TEMP_0, 4
 	return
 
-LinkContestRoom1_EventScript_27A642:: @ 827A642
+ContestHall_EventScript_Set5Hearts:: @ 827A642
 	setvar VAR_TEMP_0, 5
 	return
 
-LinkContestRoom1_EventScript_27A648:: @ 827A648
+ContestHall_EventScript_Set6Hearts:: @ 827A648
 	setvar VAR_TEMP_0, 6
 	return
 
-LinkContestRoom1_EventScript_27A64E:: @ 827A64E
+ContestHall_EventScript_Set7Hearts:: @ 827A64E
 	setvar VAR_TEMP_0, 7
 	return
 
-LinkContestRoom1_EventScript_27A654:: @ 827A654
+ContestHall_EventScript_Set8Hearts:: @ 827A654
 	setvar VAR_TEMP_0, 8
 	return
 
-LinkContestRoom1_EventScript_27A65A:: @ 827A65A
+ContestHall_EventScript_TryDisplayHeartAudienceMember1:: @ 827A65A
 	compare VAR_TEMP_1, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A67D
-	applymovement 6, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember1AlreadyEmoted
+	applymovement 6, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_1, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A67D:: @ 827A67D
+ContestHall_EventScript_AudienceMember1AlreadyEmoted:: @ 827A67D
 	return
 
-LinkContestRoom1_EventScript_27A67E:: @ 827A67E
+ContestHall_EventScript_TryDisplayHeartAudienceMember2:: @ 827A67E
 	compare VAR_TEMP_2, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6A1
-	applymovement 12, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember2AlreadyEmoted
+	applymovement 12, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_2, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1
+ContestHall_EventScript_AudienceMember2AlreadyEmoted:: @ 827A6A1
 	return
 
-LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2
+ContestHall_EventScript_TryDisplayHeartAudienceMember3:: @ 827A6A2
 	compare VAR_TEMP_3, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6C5
-	applymovement 7, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember3AlreadyEmoted
+	applymovement 7, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_3, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5
+ContestHall_EventScript_AudienceMember3AlreadyEmoted:: @ 827A6C5
 	return
 
-LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6
+ContestHall_EventScript_TryDisplayHeartAudienceMember4:: @ 827A6C6
 	compare VAR_TEMP_4, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6E9
-	applymovement 8, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_Audience4MemberAlreadyEmoted
+	applymovement 8, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_4, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9
+ContestHall_EventScript_Audience4MemberAlreadyEmoted:: @ 827A6E9
 	return
 
-LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA
+ContestHall_EventScript_TryDisplayHeartAudienceMember5:: @ 827A6EA
 	compare VAR_TEMP_5, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A70D
-	applymovement 9, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember5AlreadyEmoted
+	applymovement 9, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_5, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A70D:: @ 827A70D
+ContestHall_EventScript_AudienceMember5AlreadyEmoted:: @ 827A70D
 	return
 
-LinkContestRoom1_EventScript_27A70E:: @ 827A70E
+ContestHall_EventScript_TryDisplayHeartAudienceMember6:: @ 827A70E
 	compare VAR_TEMP_6, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A731
-	applymovement 10, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember6AlreadyEmoted
+	applymovement 10, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_6, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A731:: @ 827A731
+ContestHall_EventScript_AudienceMember6AlreadyEmoted:: @ 827A731
 	return
 
-LinkContestRoom1_EventScript_27A732:: @ 827A732
+ContestHall_EventScript_TryDisplayHeartAudienceMember7:: @ 827A732
 	compare VAR_TEMP_7, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A755
-	applymovement 11, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember7AlreadyEmoted
+	applymovement 11, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_7, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A755:: @ 827A755
+ContestHall_EventScript_AudienceMember7AlreadyEmoted:: @ 827A755
 	return
 
-LinkContestRoom1_EventScript_27A756:: @ 827A756
+ContestHall_EventScript_TryDisplayHeartAudienceMember8:: @ 827A756
 	compare VAR_TEMP_8, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A779
-	applymovement 15, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember8AlreadyEmoted
+	applymovement 15, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_8, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A779:: @ 827A779
+ContestHall_EventScript_AudienceMember8AlreadyEmoted:: @ 827A779
 	return
 
-LinkContestRoom1_EventScript_27A77A:: @ 827A77A
+ContestHall_EventScript_ContestantReturn:: @ 827A77A
 	closemessage
 	release
-	removeobject 13
-	special sub_80F8EB8
-	call LinkContestRoom1_EventScript_27A133
+	removeobject 13  @ Poke Ball
+	special HideContestEntryMonPic
+	call ContestHall_EventScript_TryWaitForLink
 	switch VAR_0x8006
-	case 0, LinkContestRoom1_EventScript_27A7B9
-	case 1, LinkContestRoom1_EventScript_27A7CB
-	case 2, LinkContestRoom1_EventScript_27A7DD
-	case 3, LinkContestRoom1_EventScript_27A7EF
+	case 0, ContestHall_EventScript_Player1WalkBack
+	case 1, ContestHall_EventScript_Player2WalkBack
+	case 2, ContestHall_EventScript_Player3WalkBack
+	case 3, ContestHall_EventScript_Player4WalkBack
 	return
 
-LinkContestRoom1_EventScript_27A7B9:: @ 827A7B9
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player1WalkBack:: @ 827A7B9
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD58
+	applymovement VAR_0x800B, ContestHall_Movement_Player1WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7CB:: @ 827A7CB
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player2WalkBack:: @ 827A7CB
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD62
+	applymovement VAR_0x800B, ContestHall_Movement_Player2WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7DD:: @ 827A7DD
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player3WalkBack:: @ 827A7DD
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD6A
+	applymovement VAR_0x800B, ContestHall_Movement_Player3WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7EF:: @ 827A7EF
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player4WalkBack:: @ 827A7EF
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD74
+	applymovement VAR_0x800B, ContestHall_Movement_Player4WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A801:: @ 827A801
+ContestHall_EventScript_DoContestAppeals:: @ 827A801
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD27
+	applymovement 1, ContestHall_Movement_FaceContestants2
 	waitmovement 0
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A853
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_LetsAppeal
 	waitmessage
-	applymovement 1, LinkContestRoom1_Movement_27AD15
-	applymovement 2, LinkContestRoom1_Movement_27AD19
+	applymovement 1, ContestHall_Movement_WalkStageLeft
+	applymovement 2, ContestHall_Movement_WalkStageRight
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	setvar VAR_TEMP_9, 1
-	special sub_80F910C
+	special LinkContestTryHideWirelessIndicator
 	startcontest
-	special sub_80F90DC
+	special LinkContestTryShowWirelessIndicator
 	setvar VAR_TEMP_9, 0
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD19
-	applymovement 2, LinkContestRoom1_Movement_27AD15
+	applymovement 1, ContestHall_Movement_WalkStageRight
+	applymovement 2, ContestHall_Movement_WalkStageLeft
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A853:: @ 827A853
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A867
-	msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
+ContestHall_EventScript_LetsAppeal:: @ 827A853
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_LetsAppealLink
+	msgbox ContestHall_Text_VotingCompleteLetsAppeal, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A867:: @ 827A867
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A87E
-	messageautoscroll LinkContestRoom1_Text_27B904
+ContestHall_EventScript_LetsAppealLink:: @ 827A867
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_LetsAppealWireless
+	messageautoscroll ContestHall_Text_VotingCompleteLetsAppeal
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A87E:: @ 827A87E
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA71
+ContestHall_EventScript_LetsAppealWireless:: @ 827A87E
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_VotingComplete
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CAD0
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_SecondStageOfJudging
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CB55
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_LetsAppeal
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A8FB
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A91E
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD0F
+ContestHall_EventScript_ContestResults:: @ 827A8A5
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_ThatsItForJudging
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_ThankYouForAppeals
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_MCFaceJudge
 	waitmovement 0
-	call LinkContestRoom1_EventScript_27A941
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A964
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD13
+	call ContestHall_EventScript_JudgeLooksReady
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_WeWillDeclareWinner
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_FaceContestants
 	waitmovement 0
 	closemessage
 	releaseall
-	special sub_80F910C
+	special LinkContestTryHideWirelessIndicator
 	setvar VAR_TEMP_9, 1
 	showcontestresults
 	setvar VAR_TEMP_9, 0
 	playbgm MUS_CON_FAN, 0
 	return
 
-LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A90F
-	msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
+ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_ThatsItForJudgingLink
+	msgbox ContestHall_Text_ThatsItForJudging, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A90F:: @ 827A90F
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BA15
+ContestHall_EventScript_ThatsItForJudgingLink:: @ 827A90F
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ThatsItForJudging
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A91E:: @ 827A91E
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A932
-	msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
+ContestHall_EventScript_ThankYouForAppeals:: @ 827A91E
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_ThankYouForAppealsLink
+	msgbox ContestHall_Text_ThankYouForAppeals, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A932:: @ 827A932
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BA30
+ContestHall_EventScript_ThankYouForAppealsLink:: @ 827A932
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ThankYouForAppeals
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A941:: @ 827A941
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A955
-	msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
+ContestHall_EventScript_JudgeLooksReady:: @ 827A941
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_JudgeLooksReadyLink
+	msgbox ContestHall_Text_JudgeLooksReady, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A955:: @ 827A955
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BAAC
+ContestHall_EventScript_JudgeLooksReadyLink:: @ 827A955
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_JudgeLooksReady
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A964:: @ 827A964
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A978
-	msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
+ContestHall_EventScript_WeWillDeclareWinner:: @ 827A964
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_WeWillDeclareWinnerLink
+	msgbox ContestHall_Text_WeWillNowDeclareWinner, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A978:: @ 827A978
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BB25
+ContestHall_EventScript_WeWillDeclareWinnerLink:: @ 827A978
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_WeWillNowDeclareWinner
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A987:: @ 827A987
-	special sub_80F831C
+ContestHall_EventScript_GetWinnerObjEventId:: @ 827A987
+	special GetContestWinnerId
 	switch VAR_0x8005
-	case 0, LinkContestRoom1_EventScript_27A9BC
-	case 1, LinkContestRoom1_EventScript_27A9C2
-	case 2, LinkContestRoom1_EventScript_27A9C8
-	case 3, LinkContestRoom1_EventScript_27A9CE
+	case 0, ContestHall_EventScript_GetPlayer1ObjEventId
+	case 1, ContestHall_EventScript_GetPlayer2ObjEventId
+	case 2, ContestHall_EventScript_GetPlayer3ObjEventId
+	case 3, ContestHall_EventScript_GetPlayer4ObjEventId
 	return
 
-LinkContestRoom1_EventScript_27A9BC:: @ 827A9BC
+ContestHall_EventScript_GetPlayer1ObjEventId:: @ 827A9BC
 	setvar VAR_TEMP_3, 3
 	return
 
-LinkContestRoom1_EventScript_27A9C2:: @ 827A9C2
+ContestHall_EventScript_GetPlayer2ObjEventId:: @ 827A9C2
 	setvar VAR_TEMP_3, 4
 	return
 
-LinkContestRoom1_EventScript_27A9C8:: @ 827A9C8
+ContestHall_EventScript_GetPlayer3ObjEventId:: @ 827A9C8
 	setvar VAR_TEMP_3, 5
 	return
 
-LinkContestRoom1_EventScript_27A9CE:: @ 827A9CE
+ContestHall_EventScript_GetPlayer4ObjEventId:: @ 827A9CE
 	setvar VAR_TEMP_3, 14
 	return
 
-LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
-	special sub_80F834C
-	special sub_80F8390
+ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
+	special BufferContestWinnerTrainerName
+	special BufferContestWinnerMonName
 	addvar VAR_0x8005, 1
 	buffernumberstring 1, VAR_0x8005
-	addvar VAR_0x8005, 65535
-	call LinkContestRoom1_EventScript_27AA00
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD1D
+	addvar VAR_0x8005, -1
+	call ContestHall_EventScript_CongratsWinner
+	applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp
 	waitmovement 0
 	playse SE_W227B
 	setvar VAR_TEMP_1, 0
 	return
 
-LinkContestRoom1_EventScript_27AA00:: @ 827AA00
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27AA14
-	msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
+ContestHall_EventScript_CongratsWinner:: @ 827AA00
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_CongratsWinnerLink
+	msgbox ContestHall_Text_CongratsTrainerXandMon, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27AA14:: @ 827AA14
-	messageautoscroll LinkContestRoom1_Text_27BB4C
+ContestHall_EventScript_CongratsWinnerLink:: @ 827AA14
+	messageautoscroll ContestHall_Text_CongratsTrainerXandMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
+ContestHall_EventScript_AudienceLookAround:: @ 827AA1B
 	addvar VAR_TEMP_1, 1
 	lockall
-	compare VAR_CONTEST_LOCATION, 1
-	call_if_gt LinkContestRoom1_EventScript_27AA6F
-	applymovement 9, LinkContestRoom1_Movement_27AD3B
-	applymovement 12, LinkContestRoom1_Movement_27AD3F
-	applymovement 7, LinkContestRoom1_Movement_27AD3B
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
+	call_if_gt ContestHall_EventScript_VObjectAudienceLookAround
+	applymovement 9, ContestHall_Movement_AudienceMemberLookRight
+	applymovement 12, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 7, ContestHall_Movement_AudienceMemberLookRight
 	delay 30
-	applymovement 10, LinkContestRoom1_Movement_27AD33
-	applymovement 11, LinkContestRoom1_Movement_27AD3F
-	applymovement 6, LinkContestRoom1_Movement_27AD37
-	applymovement 8, LinkContestRoom1_Movement_27AD33
+	applymovement 10, ContestHall_Movement_AudienceMemberLookLeft
+	applymovement 11, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 6, ContestHall_Movement_AudienceMemberLookUp
+	applymovement 8, ContestHall_Movement_AudienceMemberLookLeft
 	compare VAR_TEMP_1, 4
-	goto_if_ne LinkContestRoom1_EventScript_27AA1B
+	goto_if_ne ContestHall_EventScript_AudienceLookAround
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
+ContestHall_EventScript_VObjectAudienceLookAround:: @ 827AA6F
 	turnvobject 0, DIR_SOUTH
 	turnvobject 2, DIR_SOUTH
 	turnvobject 4, DIR_EAST
@@ -1080,233 +1091,236 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
 	delay 10
 	return
 
-LinkContestRoom1_EventScript_27AB36:: @ 827AB36
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27ABD8
-	call LinkContestRoom1_EventScript_27AB9E
-	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
+ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_EndLinkContest
+	call ContestHall_EventScript_CheckShouldSkipPrize
+	goto_if_set FLAG_TEMP_2, ContestHall_EventScript_SkipPrize
 	lockall
-	msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_AcceptYourPrize, MSGBOX_DEFAULT
 	releaseall
-	call LinkContestRoom1_EventScript_27ABF8
-	call LinkContestRoom1_EventScript_27AC5E
+	call ContestHall_EventScript_WinnerApproachForPrize
+	call ContestHall_EventScript_GivePrizeIfWinner
 	playse SE_W227B
 	setvar VAR_TEMP_1, 0
-	call LinkContestRoom1_EventScript_27AA1B
+	call ContestHall_EventScript_AudienceLookAround
 	delay 30
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABD2
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-LinkContestRoom1_EventScript_27AB82:: @ 827AB82
+ContestHall_EventScript_SkipPrize:: @ 827AB82
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	delay 90
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABD2
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E
-	specialvar VAR_RESULT, sub_80F7F7C
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABAF
+ContestHall_EventScript_CheckShouldSkipPrize:: @ 827AB9E
+	specialvar VAR_RESULT, HasMonWonThisContestBefore
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_CheckPlayerWon
 	return
 
-LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
-	special sub_80F831C
+ContestHall_EventScript_CheckPlayerWon:: @ 827ABAF
+	special GetContestWinnerId
 	compare VAR_0x8005, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ABBE
+	goto_if_eq ContestHall_EventScript_CheckRankIsMaster
 	return
 
-LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
-	compare VAR_CONTEST_RANK, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ABCD
+ContestHall_EventScript_CheckRankIsMaster:: @ 827ABBE
+	compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto_if_eq ContestHall_EventScript_DontSkipPrize
 	setflag FLAG_TEMP_2
 	return
 
-LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
+ContestHall_EventScript_DontSkipPrize:: @ 827ABCD
 	return
 
-LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
+@ This flag is never read
+ContestHall_EventScript_SetSketchFlag:: @ 827ABCE
 	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
-LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
+ContestHall_EventScript_SetReadyForContestArtist:: @ 827ABD2
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	return
 
-LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
+ContestHall_EventScript_EndLinkContest:: @ 827ABD8
 	delay 60
-	special sub_80F84B0
-	special sub_80F831C
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABF1
+	special GetContestPlayerId
+	special GetContestWinnerId
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForLinkContestArtist
 	closemessage
 	return
 
-LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1
+ContestHall_EventScript_SetReadyForLinkContestArtist:: @ 827ABF1
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
 	return
 
-LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7
+@ Unused
+ContestHall_EventScript_Ret:: @ 827ABF7
 	return
 
-LinkContestRoom1_EventScript_27ABF8:: @ 827ABF8
+ContestHall_EventScript_WinnerApproachForPrize:: @ 827ABF8
 	switch VAR_0x8005
-	case 0, LinkContestRoom1_EventScript_27AC2A
-	case 1, LinkContestRoom1_EventScript_27AC37
-	case 2, LinkContestRoom1_EventScript_27AC44
-	case 3, LinkContestRoom1_EventScript_27AC51
+	case 0, ContestHall_EventScript_Player1ApproachForPrize
+	case 1, ContestHall_EventScript_Player2ApproachForPrize
+	case 2, ContestHall_EventScript_Player3ApproachForPrize
+	case 3, ContestHall_EventScript_Player4ApproachForPrize
 	return
 
-LinkContestRoom1_EventScript_27AC2A:: @ 827AC2A
+ContestHall_EventScript_Player1ApproachForPrize:: @ 827AC2A
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7A
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC37:: @ 827AC37
+ContestHall_EventScript_Player2ApproachForPrize:: @ 827AC37
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7E
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC44:: @ 827AC44
+ContestHall_EventScript_Player3ApproachForPrize:: @ 827AC44
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD29
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC51:: @ 827AC51
+ContestHall_EventScript_Player4ApproachForPrize:: @ 827AC51
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD2D
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
-	special sub_80F831C
+@ In NPC Contests, the player is always entry 4 (id number 3)
+ContestHall_EventScript_GivePrizeIfWinner:: @ 827AC5E
+	special GetContestWinnerId
 	compare VAR_0x8005, 3
-	goto_if_eq LinkContestRoom1_EventScript_27AC77
+	goto_if_eq ContestHall_EventScript_GiveContestPrizes
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC77:: @ 827AC77
-	compare VAR_CONTEST_LOCATION, 2
-	call_if_eq LinkContestRoom1_EventScript_27ABCE
-	specialvar VAR_RESULT, sub_80F7F7C
-	compare VAR_RESULT, 0
-	goto_if_eq LinkContestRoom1_EventScript_27ACDF
-	compare VAR_CONTEST_RANK, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ACBD
+ContestHall_EventScript_GiveContestPrizes:: @ 827AC77
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
+	call_if_eq ContestHall_EventScript_SetSketchFlag
+	specialvar VAR_RESULT, HasMonWonThisContestBefore
+	compare VAR_RESULT, FALSE
+	goto_if_eq ContestHall_EventScript_ReceiveContestRibbon
+	compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto_if_eq ContestHall_EventScript_GiveLuxuryBall
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
+ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
 	lockall
 	call Common_EventScript_BagIsFull
-	msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_PickUpPrizeAtCounterLater, MSGBOX_DEFAULT
 	releaseall
 	setvar VAR_CONTEST_PRIZE_PICKUP, 4
 	return
 
-LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
+ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
 	giveitem_std ITEM_LUXURY_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq LinkContestRoom1_EventScript_27ACA8
+	compare VAR_RESULT, FALSE
+	goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF
-	special sub_80F7FFC
+ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
+	special GiveMonContestRibbon
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
-	msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT
 	waitfanfare
-	special sub_80F8390
-	msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT
+	special BufferContestWinnerMonName
+	msgbox ContestHall_Text_PutRibbonOnMon, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_Movement_27AD09: @ 827AD09
+ContestHall_Movement_MCWalkDown: @ 827AD09
 	walk_down
 	step_end
 
-LinkContestRoom1_Movement_27AD0B: @ 827AD0B
+ContestHall_Movement_MCBackUp: @ 827AD0B
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD0F: @ 827AD0F
+ContestHall_Movement_MCFaceJudge: @ 827AD0F
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD11: @ 827AD11
+ContestHall_Movement_Heart: @ 827AD11
 	emote_heart
 	step_end
 
-LinkContestRoom1_Movement_27AD13: @ 827AD13
+ContestHall_Movement_FaceContestants: @ 827AD13
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD15: @ 827AD15
+ContestHall_Movement_WalkStageLeft: @ 827AD15
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD19: @ 827AD19
+ContestHall_Movement_WalkStageRight: @ 827AD19
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD1D: @ 827AD1D
+ContestHall_Movement_WinningPlayerWalkUp: @ 827AD1D
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD20: @ 827AD20
+ContestHall_Movement_ContestantDelay32: @ 827AD20
 	delay_16
 	delay_16
 	step_end
 
-LinkContestRoom1_Movement_27AD23: @ 827AD23
+ContestHall_Movement_MCFaceJudge2: @ 827AD23
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD25: @ 827AD25
+ContestHall_Movement_JudgeFaceMC: @ 827AD25
 	walk_in_place_fastest_left
 	step_end
 
-LinkContestRoom1_Movement_27AD27: @ 827AD27
+ContestHall_Movement_FaceContestants2: @ 827AD27
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD29: @ 827AD29
+ContestHall_Movement_Player3ApproachForPrize: @ 827AD29
 	walk_left
 	walk_left
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD2D: @ 827AD2D
+ContestHall_Movement_Player4ApproachForPrize: @ 827AD2D
 	walk_left
 	walk_left
 	walk_left
@@ -1314,54 +1328,54 @@ LinkContestRoom1_Movement_27AD2D: @ 827AD2D
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD33: @ 827AD33
+ContestHall_Movement_AudienceMemberLookLeft: @ 827AD33
 	face_left
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD37: @ 827AD37
+ContestHall_Movement_AudienceMemberLookUp: @ 827AD37
 	face_up
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD3B: @ 827AD3B
+ContestHall_Movement_AudienceMemberLookRight: @ 827AD3B
 	face_right
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD3F: @ 827AD3F
+ContestHall_Movement_AudienceMemberLookDown: @ 827AD3F
 	face_down
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD43: @ 827AD43
+ContestHall_Movement_Player4FaceUp: @ 827AD43
 	face_up
 	step_end
 
-LinkContestRoom1_Movement_27AD45: @ 827AD45
+ContestHall_Movement_MCLookAtJudge: @ 827AD45
 	face_up
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD49: @ 827AD49
+ContestHall_Movement_JudgeLookAtMC: @ 827AD49
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD4E: @ 827AD4E
+ContestHall_Movement_MCWalkInPlaceDown: @ 827AD4E
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD52: @ 827AD52
+ContestHall_Movement_Player1WalkToCenter: @ 827AD52
 	walk_up
 	walk_right
 	walk_right
@@ -1369,7 +1383,7 @@ LinkContestRoom1_Movement_27AD52: @ 827AD52
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD58: @ 827AD58
+ContestHall_Movement_Player1WalkBack: @ 827AD58
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -1377,31 +1391,31 @@ LinkContestRoom1_Movement_27AD58: @ 827AD58
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD5E: @ 827AD5E
+ContestHall_Movement_Player2WalkToCenter: @ 827AD5E
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD62: @ 827AD62
+ContestHall_Movement_Player2WalkBack: @ 827AD62
 	walk_fast_left
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD66: @ 827AD66
+ContestHall_Movement_Player3WalkToCenter: @ 827AD66
 	walk_up
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD6A: @ 827AD6A
+ContestHall_Movement_Player3WalkBack: @ 827AD6A
 	walk_fast_right
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD6E: @ 827AD6E
+ContestHall_Movement_Player4WalkToCenter: @ 827AD6E
 	walk_up
 	walk_left
 	walk_left
@@ -1409,7 +1423,7 @@ LinkContestRoom1_Movement_27AD6E: @ 827AD6E
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD74: @ 827AD74
+ContestHall_Movement_Player4WalkBack: @ 827AD74
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -1417,36 +1431,37 @@ LinkContestRoom1_Movement_27AD74: @ 827AD74
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD7A: @ 827AD7A
+ContestHall_Movement_Player1ApproachForPrize: @ 827AD7A
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD7E: @ 827AD7E
+ContestHall_Movement_Player2ApproachForPrize: @ 827AD7E
 	walk_up
 	step_end
 
-LinkContestRoom1_EventScript_27AD80:: @ 827AD80
-	specialvar VAR_RESULT, sub_80F9134
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27AD91
+@ IsContestWithRSPlayer has no side effect, so this is nop
+ContestHall_EventScript_CheckIfContestWithRSPlayer:: @ 827AD80
+	specialvar VAR_RESULT, IsContestWithRSPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_RetRSPlayer
 	return
 
-LinkContestRoom1_EventScript_27AD91:: @ 827AD91
+ContestHall_EventScript_RetRSPlayer:: @ 827AD91
 	return
 
-LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92
-	specialvar VAR_RESULT, sub_80F9134
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3
+LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer:: @ 827AD92
+	specialvar VAR_RESULT, IsContestWithRSPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer
 	return
 
-LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3
+LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer:: @ 827ADA3
 	delay 9
 	return
 
-LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7
+LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase: @ 827ADA7
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.\p"
@@ -1455,31 +1470,32 @@ LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7
 	.string "In that case, we need to provide you\n"
 	.string "with this!$"
 
-LilycoveCity_ContestLobby_Text_27AE47: @ 827AE47
+LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp: @ 827AE47
 	.string "Okay, now that we've cleared that\n"
 	.string "up…\p"
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_27AEA8: @ 827AEA8
+LilycoveCity_ContestLobby_Text_ContestReception: @ 827AEA8
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_27AEE3: @ 827AEE3
+@ Unused
+LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests: @ 827AEE3
 	.string "Hello!\p"
 	.string "This reception counter is only\n"
 	.string "for 4-player POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_27AF28: @ 827AF28
+LilycoveCity_ContestLobby_Text_EnterContest1: @ 827AF28
 	.string "Would you like to enter your POKéMON\n"
 	.string "in our CONTESTS?$"
 
-LilycoveCity_ContestLobby_Text_27AF5E: @ 827AF5E
+LilycoveCity_ContestLobby_Text_WhichTopic1: @ 827AF5E
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A
+LilycoveCity_ContestLobby_Text_ExplainContests: @ 827AF7A
 	.string "A POKéMON CONTEST involves four\n"
 	.string "TRAINERS entering one POKéMON each\l"
 	.string "in competitive judging.\p"
@@ -1498,14 +1514,14 @@ LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A
 	.string "The POKéMON garnering the highest\n"
 	.string "score is declared the winner.$"
 
-LilycoveCity_ContestLobby_Text_27B17D: @ 827B17D
+LilycoveCity_ContestLobby_Text_ExplainContestTypes: @ 827B17D
 	.string "There are five kinds of CONTESTS.\p"
 	.string "COOL, BEAUTY, CUTE, SMART, and\n"
 	.string "TOUGH are the five categories.\p"
 	.string "Choose the CONTEST that is right for\n"
 	.string "the POKéMON you plan to enter.$"
 
-LilycoveCity_ContestLobby_Text_27B221: @ 827B221
+LilycoveCity_ContestLobby_Text_ExplainContestRanks: @ 827B221
 	.string "There are four ranks of POKéMON\n"
 	.string "CONTESTS.\p"
 	.string "NORMAL, SUPER, HYPER, and MASTER\n"
@@ -1523,77 +1539,77 @@ LilycoveCity_ContestLobby_Text_27B221: @ 827B221
 	.string "may compete in the MASTER Rank as\l"
 	.string "often as its TRAINER wants.$"
 
-LilycoveCity_ContestLobby_Text_27B3FF: @ 827B3FF
+LilycoveCity_ContestLobby_Text_EnterWhichRank: @ 827B3FF
 	.string "Which Rank would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B423: @ 827B423
+LilycoveCity_ContestLobby_Text_EnterWhichContest1: @ 827B423
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B44A: @ 827B44A
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon1: @ 827B44A
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B471: @ 827B471
+LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank: @ 827B471
 	.string "I'm terribly sorry, but your POKéMON\n"
 	.string "is not qualified to compete at this\l"
 	.string "Rank yet…$"
 
-LilycoveCity_ContestLobby_Text_27B4C4: @ 827B4C4
+LilycoveCity_ContestLobby_Text_EggCannotTakePart: @ 827B4C4
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_27B501: @ 827B501
+LilycoveCity_ContestLobby_Text_MonInNoConditionForContest: @ 827B501
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_27B547: @ 827B547
+LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway: @ 827B547
 	.string "Oh, but that RIBBON…\p"
 	.string "Your POKéMON has won this CONTEST\n"
 	.string "before, hasn't it?\p"
 	.string "Would you like to enter it in this\n"
 	.string "CONTEST anyway?$"
 
-LilycoveCity_ContestLobby_Text_27B5C4: @ 827B5C4
+LilycoveCity_ContestLobby_Text_ConfirmContestMon: @ 827B5C4
 	.string "Is that your CONTEST POKéMON?$"
 
-LilycoveCity_ContestLobby_Text_27B5E2: @ 827B5E2
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4: @ 827B5E2
 	.string "Okay, your POKéMON will be entered\n"
 	.string "in this CONTEST.\p"
 	.string "Your POKéMON is Entry No. 4.\n"
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_27B653: @ 827B653
+LilycoveCity_ContestLobby_Text_ComeThroughHere: @ 827B653
 	.string "Please come in through here.\n"
 	.string "Good luck!$"
 
-LilycoveCity_ContestLobby_Text_27B67B: @ 827B67B
+LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize: @ 827B67B
 	.string "Congratulations! Your POKéMON is the\n"
 	.string "CONTEST winner!\p"
 	.string "We have your prize right here.\n"
 	.string "Please, right this way!$"
 
-LilycoveCity_ContestLobby_Text_27B6E7: @ 827B6E7
+LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater: @ 827B6E7
 	.string "Please come back for your prize\n"
 	.string "later on.$"
 
-LinkContestRoom1_Text_27B711: @ 827B711
+ContestHall_Text_GettingStartedParticipantsAsFollows: @ 827B711
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a {STR_VAR_3} Rank POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27B78F: @ 827B78F
+ContestHall_Text_GettingStartedParticipantsAsFollowsLink: @ 827B78F
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27B815: @ 827B815
+ContestHall_Text_EntryXTrainersMon: @ 827B815
 	.string "MC: Entry No. {STR_VAR_2}!\n"
 	.string "{STR_VAR_1}'s {STR_VAR_3}!$"
 
-LinkContestRoom1_Text_27B830: @ 827B830
+ContestHall_Text_SeenContestantsAudienceWillVote: @ 827B830
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!\p"
@@ -1602,10 +1618,10 @@ LinkContestRoom1_Text_27B830: @ 827B830
 	.string "Without any further ado, let the\n"
 	.string "voting begin!$"
 
-LinkContestRoom1_Text_27B8F2: @ 827B8F2
+ContestHall_Text_VotingUnderWay: @ 827B8F2
 	.string "Voting under way…$"
 
-LinkContestRoom1_Text_27B904: @ 827B904
+ContestHall_Text_VotingCompleteLetsAppeal: @ 827B904
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!\p"
@@ -1616,72 +1632,75 @@ LinkContestRoom1_Text_27B904: @ 827B904
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
 
-LinkContestRoom1_Text_27BA15: @ 827BA15
+ContestHall_Text_ThatsItForJudging: @ 827BA15
 	.string "MC: That's it for judging!$"
 
-LinkContestRoom1_Text_27BA30: @ 827BA30
+ContestHall_Text_ThankYouForAppeals: @ 827BA30
 	.string "Thank you all for a most wonderful\n"
 	.string "display of quality appeals!\p"
 	.string "This concludes all judging!\n"
 	.string "Thank you for your fine efforts!$"
 
-LinkContestRoom1_Text_27BAAC: @ 827BAAC
+ContestHall_Text_JudgeLooksReady: @ 827BAAC
 	.string "Now, all that remains is the pulse-\n"
 	.string "pounding proclamation of the winner.\p"
 	.string "The JUDGE looks ready to make\n"
 	.string "the announcement!$"
 
-LinkContestRoom1_Text_27BB25: @ 827BB25
+ContestHall_Text_WeWillNowDeclareWinner: @ 827BB25
 	.string "JUDGE: We will now declare the winner!$"
 
-LinkContestRoom1_Text_27BB4C: @ 827BB4C
+ContestHall_Text_CongratsTrainerXandMon: @ 827BB4C
 	.string "MC: Entry No. {STR_VAR_2}!\p"
 	.string "{STR_VAR_3} and {STR_VAR_1},\n"
 	.string "congratulations!$"
 
-LinkContestRoom1_Text_27BB7A: @ 827BB7A
+ContestHall_Text_CongratsPleaseCompeteAgain: @ 827BB7A
 	.string "MC: Congratulations!\n"
 	.string "Please do compete again!$"
 
-LinkContestRoom1_Text_27BBA8: @ 827BBA8
+ContestHall_Text_AcceptYourPrize: @ 827BBA8
 	.string "MC: Here you are!\n"
 	.string "Please accept your prize!$"
 
-LinkContestRoom1_Text_27BBD4: @ 827BBD4
+ContestHall_Text_ConferRibbonAsPrize: @ 827BBD4
 	.string "We confer on you this RIBBON\n"
 	.string "as your prize!$"
 
-LinkContestRoom1_Text_27BC00: @ 827BC00
+ContestHall_Text_ReceivedRibbon: @ 827BC00
 	.string "{PLAYER} received a RIBBON.$"
 
-LinkContestRoom1_Text_27BC16: @ 827BC16
+ContestHall_Text_PutRibbonOnMon: @ 827BC16
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-LinkContestRoom1_Text_27BC2F: @ 827BC2F
+ContestHall_Text_PickUpPrizeAtCounterLater: @ 827BC2F
 	.string "Please pick up your prize at\n"
 	.string "the reception counter later.\l"
 	.string "Please do compete again!$"
 
-LinkContestRoom1_Text_27BC82: @ 827BC82
+@ Unused
+ContestHall_Text_OnlyRegister4Players: @ 827BC82
 	.string "I only register four players for\n"
 	.string "POKéMON CONTESTS.\p"
 	.string "If three other players link up, all\n"
 	.string "four may enter the same CONTEST.\p"
 	.string "Would you like to take part?$"
 
-LilycoveCity_ContestLobby_Text_27BD17: @ 827BD17
+LilycoveCity_ContestLobby_Text_ProgressWillBeSaved: @ 827BD17
 	.string "Before entering a CONTEST, your\n"
 	.string "progress will be saved.$"
 
-LilycoveCity_ContestLobby_Text_27BD4F: @ 827BD4F
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime: @ 827BD4F
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
-LilycoveCity_ContestLobby_Text_27BD7A: @ 827BD7A
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterContest2: @ 827BD7A
 	.string "Would you like to enter a CONTEST?$"
 
-LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D
+@ Unused
+LilycoveCity_ContestLobby_Text_Explain4PlayerContest: @ 827BD9D
 	.string "When four players are ready, connect\n"
 	.string "over a Game Link cable, and register\l"
 	.string "with me, please.\p"
@@ -1692,79 +1711,83 @@ LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D
 	.string "After that, the usual CONTEST rules\n"
 	.string "apply.$"
 
-LilycoveCity_ContestLobby_Text_27BE9E: @ 827BE9E
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterWhichContest2: @ 827BE9E
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27BEC5: @ 827BEC5
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon2: @ 827BEC5
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27BEEC: @ 827BEEC
+LilycoveCity_ContestLobby_Text_Transmitting: @ 827BEEC
 	.string "Transmitting…$"
 
-LilycoveCity_ContestLobby_Text_27BEFA: @ 827BEFA
+LilycoveCity_ContestLobby_Text_TransmissionError: @ 827BEFA
 	.string "Transmission error…$"
 
-LilycoveCity_ContestLobby_Text_27BF0E: @ 827BF0E
+LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest: @ 827BF0E
 	.string "You may have chosen a different\n"
 	.string "CONTEST than another player.$"
 
-LilycoveCity_ContestLobby_Text_27BF4B: @ 827BF4B
+LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice: @ 827BF4B
 	.string "You may have made a different\n"
 	.string "choice than another player.$"
 
-LilycoveCity_ContestLobby_Text_27BF85: @ 827BF85
+LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel: @ 827BF85
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
-LilycoveCity_ContestLobby_Text_27BFA7: @ 827BFA7
+@ Unused
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime2: @ 827BFA7
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
-LilycoveCity_ContestLobby_Text_27BFD2: @ 827BFD2
+@ Unused
+LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain: @ 827BFD2
 	.string "Transmission error.\n"
 	.string "Please try again.$"
 
-LilycoveCity_ContestLobby_Text_27BFF8: @ 827BFF8
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX: @ 827BFF8
 	.string "Your POKéMON will be entered in\n"
 	.string "the CONTEST.\p"
 	.string "Your POKéMON is Entry No. {STR_VAR_2}.$"
 
-LilycoveCity_ContestLobby_Text_27C043: @ 827C043
+LilycoveCity_ContestLobby_Text_ContestBeginShortly: @ 827C043
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_27C063: @ 827C063
+LilycoveCity_ContestLobby_Text_LinkContestReception: @ 827C063
 	.string "Welcome! This is the POKéMON CONTEST\n"
 	.string "link reception counter.\p"
 	.string "You may enter CONTESTS together with\n"
 	.string "one or more friends.$"
 
-LilycoveCity_ContestLobby_Text_27C0DA: @ 827C0DA
+LilycoveCity_ContestLobby_Text_WhichTopic2: @ 827C0DA
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_27C0F6: @ 827C0F6
+LilycoveCity_ContestLobby_Text_EnterContest3: @ 827C0F6
 	.string "Would you like to enter a CONTEST?$"
 
-LilycoveCity_ContestLobby_Text_27C119: @ 827C119
+LilycoveCity_ContestLobby_Text_EnterWhichContest3: @ 827C119
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27C140: @ 827C140
+LilycoveCity_ContestLobby_Text_MonInNoCondition2: @ 827C140
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_27C186: @ 827C186
+LilycoveCity_ContestLobby_Text_EggCannotTakePart2: @ 827C186
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon3: @ 827C1C3
 	.string "Which POKéMON would you like to enter?$"
 
-Text_DecideLinkLeader: @ 827C1EA
+LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader: @ 827C1EA
 	.string "Please decide which of you will\n"
 	.string "become the GROUP LEADER.\p"
 	.string "The other players must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-LilycoveCity_ContestLobby_Text_27C254: @ 827C254
+LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode: @ 827C254
 	.string "At least one player has entered using\n"
 	.string "the 4-player reception counter.\p"
 	.string "There must be four players connected\n"
@@ -1773,7 +1796,7 @@ LilycoveCity_ContestLobby_Text_27C254: @ 827C254
 	.string "select G-MODE (GLOBAL MODE),\l"
 	.string "then register to enter again, please.$"
 
-LilycoveCity_ContestLobby_Text_27C340: @ 827C340
+LilycoveCity_ContestLobby_Text_ExplainLinkContest: @ 827C340
 	.string "This is a CONTEST for two to four\n"
 	.string "players linked using a Wireless\l"
 	.string "Adapter or a GBA Game Link cable.\p"
@@ -1794,7 +1817,7 @@ LilycoveCity_ContestLobby_Text_27C340: @ 827C340
 	.string "After that, a CONTEST will start in\n"
 	.string "the usual manner.$"
 
-LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1
+LilycoveCity_ContestLobby_Text_ExplainEMode: @ 827C5B1
 	.string "In E-MODE (EMERALD MODE),\n"
 	.string "a LINK CONTEST can be held with\l"
 	.string "two to four players. Each player must\l"
@@ -1808,7 +1831,7 @@ LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1
 	.string "Please be aware that E-MODE is not\n"
 	.string "available in POKéMON Ruby or Sapphire.$"
 
-LilycoveCity_ContestLobby_Text_27C742: @ 827C742
+LilycoveCity_ContestLobby_Text_ExplainGMode: @ 827C742
 	.string "G-MODE (GLOBAL MODE) is specifically\n"
 	.string "for four players who are linked using\l"
 	.string "GBA Game Link cables.\p"
@@ -1819,50 +1842,50 @@ LilycoveCity_ContestLobby_Text_27C742: @ 827C742
 	.string "enter through the 4-player reception\l"
 	.string "counter (POKéMON Ruby or Sapphire).$"
 
-LilycoveCity_ContestLobby_Text_27C879: @ 827C879
+LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode: @ 827C879
 	.string "I'm terribly sorry.\p"
 	.string "G-MODE does not function\n"
 	.string "with Wireless Adapters.\p"
 	.string "Please select E-MODE or try\n"
 	.string "again using a GBA Game Link cable.$"
 
-LilycoveCity_ContestLobby_Text_27C8FD: @ 827C8FD
+LilycoveCity_ContestLobby_Text_WhichContestMode: @ 827C8FD
 	.string "Which CONTEST MODE would you like\n"
 	.string "to enter?$"
 
-LinkContestRoom1_Text_27C929: @ 827C929
+ContestHall_Text_GettingStartedWireless: @ 827C929
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!$"
 
-LinkContestRoom1_Text_27C972: @ 827C972
+ContestHall_Text_ParticipantsAsFollows: @ 827C972
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27C9AF: @ 827C9AF
+ContestHall_Text_WeveSeenContestants: @ 827C9AF
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!$"
 
-LinkContestRoom1_Text_27CA04: @ 827CA04
+ContestHall_Text_AudienceWillVote: @ 827CA04
 	.string "The audience will vote on their\n"
 	.string "favorite POKéMON contestants.$"
 
-LinkContestRoom1_Text_27CA42: @ 827CA42
+ContestHall_Text_LetVotingBegin: @ 827CA42
 	.string "Without any further ado,\n"
 	.string "let the voting begin!$"
 
-LinkContestRoom1_Text_27CA71: @ 827CA71
+ContestHall_Text_VotingComplete: @ 827CA71
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!$"
 
-LinkContestRoom1_Text_27CAD0: @ 827CAD0
+ContestHall_Text_SecondStageOfJudging: @ 827CAD0
 	.string "The second stage of judging is\n"
 	.string "the much-anticipated appeal time!\p"
 	.string "May the contestants amaze us with\n"
 	.string "superb appeals of dazzling moves!$"
 
-LinkContestRoom1_Text_27CB55: @ 827CB55
+ContestHall_Text_LetsAppeal: @ 827CB55
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 062fd9f5a..61763ba17 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -15,10 +15,10 @@ Route117_EventScript_DaycareMan:: @ 8291C18
 
 Route117_EventScript_DaycareEggWaiting:: @ 8291C4D
 	msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_DaycareAcceptEgg
 	msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_DaycareAcceptEgg
 	msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT
 	clearflag FLAG_PENDING_DAYCARE_EGG
@@ -88,9 +88,9 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
 	compare VAR_RESULT, DAYCARE_TWO_MONS
 	goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare
 	msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
-	msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT
+	msgbox Route117_PokemonDayCare_Text_FineThenComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA
 
 Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4
 	msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -170,10 +170,10 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
 	msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -197,7 +197,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D
 Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC
 	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -229,7 +229,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
 
 Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24
 	msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
@@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
 	setvar VAR_0x8004, 1
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
 	msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
 	release
@@ -375,7 +375,7 @@ Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF
 Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6
 	.string "My husband was looking for you.$"
 
-Route117_PokemonDayCare_Text_292416: @ 8292416
+Route117_PokemonDayCare_Text_FineThenComeAgain: @ 8292416
 	.string "Oh, fine, then.\n"
 	.string "Come again.$"
 
@@ -402,7 +402,8 @@ Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF
 	.string "Your POKéMON team is full.\n"
 	.string "Make room, then come see me.$"
 
-Route117_PokemonDayCare_Text_292527: @ 8292527
+@ Unused
+Route117_PokemonDayCare_Text_TakeBackWhichMon: @ 8292527
 	.string "Which POKéMON will you take back?$"
 
 Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index bd98a3676..56e3297b6 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -9,7 +9,7 @@ EventScript_CutTree:: @ 82906BB
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_CUT
 	msgbox Text_WantToCut, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelCut
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -68,7 +68,7 @@ EventScript_RockSmash:: @ 82907A6
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_ROCK_SMASH
 	msgbox Text_WantToSmash, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelSmash
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -133,7 +133,7 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToStrength, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_CancelStrength
 	closemessage
 	dofieldeffect FLDEFF_USE_STRENGTH
@@ -195,7 +195,7 @@ EventScript_UseWaterfall:: @ 8290A49
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToWaterfall, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndWaterfall
 	msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_WATERFALL
@@ -231,7 +231,7 @@ EventScript_UseDive:: @ 8290B0F
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_WantToDive, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndDive
 	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
@@ -256,7 +256,7 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_WantToSurface, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq EventScript_EndSurface
 	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 2ca9c7b06..d45b480d1 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
 	special Script_FadeOutMapMusic
 	waitstate
 	fadescreen 1
-	call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
+	call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
 	special SetCB2WhiteOut
 	waitstate
 	end
@@ -39,7 +39,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_1F_EventScript_Lost
diff --git a/data/scripts/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..456f56f45 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
+GabbyAndTy_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
+GabbyAndTy_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
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D0E1
-	msgbox Route111_Text_28B433, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_Interview:: @ 828D0A7
+	compare VAR_RESULT, NO
+	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/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
new file mode 100644
index 000000000..91a88f348
--- /dev/null
+++ b/data/scripts/hall_of_fame.inc
@@ -0,0 +1,53 @@
+EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
+	special SetChampionSaveWarp
+	setflag FLAG_IS_CHAMPION
+	call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
+	compare VAR_FOSSIL_MANIAC_STATE, 0
+	call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady
+	clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
+	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
+	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
+	setvar VAR_STEVENS_HOUSE_STATE, 2
+	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
+	clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
+	clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
+	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
+	clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
+	setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
+	special UpdateTrainerFanClubGameClear
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0
+	call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
+	clearflag FLAG_DEFEATED_MEW
+	clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
+	clearflag FLAG_DEFEATED_DEOXYS
+	clearflag FLAG_DEFEATED_LUGIA
+	clearflag FLAG_DEFEATED_HO_OH
+	return
+
+EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839
+	setvar VAR_FOSSIL_MANIAC_STATE, 1
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3
+	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
+	return
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 2ad8b305e..f968577f3 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -1,27 +1,25 @@
-BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9
-LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9
-SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9
-SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9
+Interview_EventScript_EndInterview:: @ 828C7E9
 	special InterviewAfter
 	incrementgamestat GAME_STAT_GOT_INTERVIEWED
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
-	setvar VAR_0x8005, 1
+@ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS
+SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
+	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2
 	copyvar VAR_0x8009, VAR_0x8006
-	msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C
+	msgbox SlateportCity_PokemonFanClub_Text_InterviewRequest, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview2
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
-	msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
+	msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
@@ -29,54 +27,54 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_SubmitResponse2
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C
-	msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C
+	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866
-	msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT
-	setvar VAR_0x8005, 1
-	goto SlateportCity_PokemonFanClub_EventScript_28C7E9
+SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866
+	msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT
+	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
+	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879
-	msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879
+	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883
+SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
 	lock
 	faceplayer
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed
 	copyvar VAR_0x8009, VAR_0x8006
-	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8
+	goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort
 	setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
-	msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+	msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequest, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
-	msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
+	msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
-	msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
+	msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
@@ -84,71 +82,71 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C
-	msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C
+	msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926
-	msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT
-	setvar VAR_0x8005, 2
-	goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9
+SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926
+	msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT
+	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
+	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939
-	msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939
+	msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943
+SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
 	lock
 	faceplayer
-	specialvar VAR_RESULT, sub_80EF8F8
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0
-	setvar VAR_0x8005, 3
+	specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname
+	setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed
 	copyvar VAR_0x8009, VAR_0x8006
-	msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
+	msgbox SlateportCity_PokemonFanClub_Text_InterviewRequestHasName, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C
-	msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
+	msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT
 	random 3
 	copyvar VAR_0x800A, VAR_RESULT
 	switch VAR_RESULT
-	case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3
-	case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1
-	case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF
+	case 0, SlateportCity_PokemonFanClub_EventScript_RandomQuestion1
+	case 1, SlateportCity_PokemonFanClub_EventScript_RandomQuestion2
+	case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3
-	msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3
+	msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1
-	msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1
+	msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
-	msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF
+	msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
+SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
@@ -156,48 +154,48 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
-	msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
+	msgbox SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou, MSGBOX_DEFAULT
 	setvar VAR_0x8006, 1
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
-	msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
+	msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview, MSGBOX_DEFAULT
 	copyvar VAR_0x8007, VAR_0x800A
-	setvar VAR_0x8005, 3
-	goto SlateportCity_PokemonFanClub_EventScript_28C7E9
+	setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
+	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45
-	msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45
+	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F
-	msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F
+	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
+LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21
-	setvar VAR_0x8005, 6
+	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
 	copyvar VAR_0x8009, VAR_0x8006
-	msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
+	msgbox LilycoveCity_ContestLobby_Text_InterviewRequest, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_AcceptInterview
+	compare VAR_RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
-	msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
+	msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
@@ -205,20 +203,20 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SubmitResponse
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0
-	msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0
+	msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
+LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
 	setvar VAR_0x8004, 24
 	special SetContestCategoryStringVarForInterview
-	msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 1
@@ -226,121 +224,121 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
-	msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
+	msgbox LilycoveCity_ContestLobby_Text_ThatsAllForInterview, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
-	setvar VAR_0x8005, 6
-	goto LilycoveCity_ContestLobby_EventScript_28C7E9
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
+	goto Interview_EventScript_EndInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
-	msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21
+	msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
-	compare VAR_LINK_CONTEST_ROOM_STATE, 2
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95
-	setvar VAR_0x8005, 6
+LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
+	compare VAR_CONTEST_HALL_STATE, 2
+	goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95
-	switch VAR_CONTEST_LOCATION
-	case 0, LilycoveCity_ContestLobby_EventScript_28CB95
-	case 2, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 1, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 3, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 4, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 5, LilycoveCity_ContestLobby_EventScript_28CB95
-	end
-
-LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	switch VAR_CONTEST_TYPE
+	case 0, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	case 2, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 1, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 3, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 4, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	end
+
+LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
+LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
+BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A
-	setvar VAR_0x8005, 7
+	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
+	compare VAR_RESULT, TRUE
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
 	copyvar VAR_0x8009, VAR_0x8006
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E
+	msgbox BattleFrontier_BattleTowerLobby_Text_InterviewRequest, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
-	message BattleFrontier_BattleTowerLobby_Text_27F7BA
+BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
+	message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
 	waitmessage
 	multichoice 20, 8, MULTI_SATISFACTION, 1
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied
+	msgbox BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E
+	msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38
+	msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41
+	msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
+BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
-	msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
+	msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	copyvar VAR_0x8004, VAR_0x8008
-	setvar VAR_0x8005, 7
-	goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
+	goto Interview_EventScript_EndInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70
-	msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70
+	msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
-	msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A
+	msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
+BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
 	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
-	setvar VAR_0x8005, 7
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
+	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
+	compare VAR_RESULT, TRUE
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
 	clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6
+BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index ac0931fd8..659cd027b 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -57,7 +57,7 @@ EventScript_Kecleon:: @ 8272336
 
 EventScript_AskUseDevonScope:: @ 8272350
 	msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq EventScript_BattleKecleon
 	release
 	end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 77b842d3d..f553ea0ad 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
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E
+LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO
+    compare VAR_RESULT, NO
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
+    compare VAR_RESULT, YES
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E
+    msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
+    compare VAR_RESULT, NO
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612
+    msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
+    compare VAR_RESULT, NO
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz
+    compare VAR_RESULT, NO
+    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
+    compare VAR_RESULT, FALSE
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
+LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759
+    msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz
+    compare VAR_RESULT, NO
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF
+    msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
+    compare VAR_RESULT, NO
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8
+    msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
+    compare VAR_RESULT, NO
+    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, 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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase
+    msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO
+    compare VAR_RESULT, NO
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
+    compare VAR_RESULT, YES
+    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
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO
+    compare VAR_RESULT, YES
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
+    compare VAR_RESULT, NO
+    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..34622775a 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
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong
+	compare VAR_RESULT, NO
+	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
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
+MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
+	compare VAR_RESULT, NO
+	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
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
+	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	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
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	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
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
+	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, NO
+	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, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor
+	msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	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
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	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, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
+	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, NO
+	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
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A
+	msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale
+	compare VAR_RESULT, NO
+	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/mevent.inc b/data/scripts/mevent.inc
index 88f44e002..731154315 100644
--- a/data/scripts/mevent.inc
+++ b/data/scripts/mevent.inc
@@ -1,7 +1,7 @@
 EventScript_Questionnaire:: @ 827381B
 	lockall
 	msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq Mevent_EventScript_Release
 	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
 	call Common_ShowEasyChatScreen
diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc
new file mode 100644
index 000000000..072005934
--- /dev/null
+++ b/data/scripts/mevent_altering_cave.inc
@@ -0,0 +1,24 @@
+MysteryEventScript_AlteringCave:: @ 86756E3
+	setvaddress MysteryEventScript_AlteringCave
+	addvar VAR_ALTERING_CAVE_WILD_SET, 1
+	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+	vgoto_if_ne MysteryEventScript_AlteringCave_
+	setvar VAR_ALTERING_CAVE_WILD_SET, 0
+MysteryEventScript_AlteringCave_: @ 86756FD
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftAlteringCave
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftAlteringCave::
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "There appears to be a rumor about\n"
+	.string "rare POKéMON sightings.\p"
+	.string "The sightings reportedly came from\n"
+	.string "the ALTERING CAVE on ROUTE 103.\p"
+	.string "Perhaps it would be worthwhile for\n"
+	.string "you to investigate this rumor.$"
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
new file mode 100644
index 000000000..811c840aa
--- /dev/null
+++ b/data/scripts/mevent_aurora_ticket.inc
@@ -0,0 +1,61 @@
+MysteryEventScript_AuroraTicket:: @ 867533C
+	setvaddress MysteryEventScript_AuroraTicket
+	lock
+	faceplayer
+	checkflag FLAG_RECEIVED_AURORA_TICKET
+	vgoto_if_eq AuroraTicket_Obtained
+	checkflag FLAG_BATTLED_DEOXYS
+	vgoto_if_eq AuroraTicket_Obtained
+	checkitem ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, TRUE
+	vgoto_if_eq AuroraTicket_Obtained
+	vmessage sText_AuroraTicketForYou
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, FALSE
+	vgoto_if_eq AuroraTicket_NoBagSpace
+	giveitem_std ITEM_AURORA_TICKET
+	setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
+	setflag FLAG_RECEIVED_AURORA_TICKET
+	vmessage sText_AuroraTicketUseAtPort
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+AuroraTicket_NoBagSpace: @ 8675397
+	vmessage sText_AuroraTicketBagFull
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+AuroraTicket_Obtained: @ 86753A0
+	vmessage sText_AuroraTicketThankYou
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_AuroraTicketForYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "You must be {PLAYER}.\n"
+	.string "There is a ticket here for you.$"
+
+sText_AuroraTicketUseAtPort:
+	.string "It appears to be for use at the\n"
+	.string "LILYCOVE CITY port.\p"
+	.string "Why not give it a try and see what\n"
+	.string "it is about?$"
+
+sText_AuroraTicketThankYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.$"
+
+sText_AuroraTicketBagFull:
+	.string "Oh, I'm sorry, {PLAYER}.\n"
+	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Please store something on your PC,\n"
+	.string "then come back for this.$"
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc
new file mode 100644
index 000000000..8c36ed63a
--- /dev/null
+++ b/data/scripts/mevent_battle_card.inc
@@ -0,0 +1,47 @@
+MysteryEventScript_BattleCard:: @ 867513C
+	setvaddress MysteryEventScript_BattleCard
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if_eq MysteryEventScript_BattleCardInfo
+	setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
+	specialvar VAR_0x8008, GetMysteryEventCardVal
+	compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES
+	vgoto_if_ne MysteryEventScript_BattleCardInfo
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard_WonPrize
+	waitmessage
+	waitbuttonpress
+	giveitem_std ITEM_POTION
+	release
+	setflag FLAG_MYSTERY_EVENT_DONE
+	end
+
+MysteryEventScript_BattleCardInfo: @ 8675179
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftBattleCountCard:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "Your BATTLE COUNT CARD keeps\n"
+	.string "track of your battle record against\l"
+	.string "TRAINERS with the same CARD.\p"
+	.string "Look for and battle TRAINERS who\n"
+	.string "have the same CARD as you.\p"
+	.string "You may check the overall rankings\n"
+	.string "by reading the NEWS.\p"
+	.string "Please do give it a try!$"
+
+sText_MysteryGiftBattleCountCard_WonPrize:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "Congratulations!\p"
+	.string "You have won a prize for winning\n"
+	.string "three battles!\p"
+	.string "We hope you will be inspired to\n"
+	.string "battle some more.$"
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
new file mode 100644
index 000000000..0264fb77f
--- /dev/null
+++ b/data/scripts/mevent_mystic_ticket.inc
@@ -0,0 +1,63 @@
+MysteryEventScript_MysticTicket:: @ 867550B
+	setvaddress MysteryEventScript_MysticTicket
+	lock
+	faceplayer
+	checkflag FLAG_RECEIVED_MYSTIC_TICKET
+	vgoto_if_eq MysticTicket_Obtained
+	checkflag FLAG_CAUGHT_LUGIA
+	vgoto_if_eq MysticTicket_Obtained
+	checkflag FLAG_CAUGHT_HO_OH
+	vgoto_if_eq MysticTicket_Obtained
+	checkitem ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, TRUE
+	vgoto_if_eq MysticTicket_Obtained
+	vmessage sText_MysticTicketForYou
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, FALSE
+	vgoto_if_eq MysticTicket_NoBagSpace
+	giveitem_std ITEM_MYSTIC_TICKET
+	setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
+	setflag FLAG_RECEIVED_MYSTIC_TICKET
+	vmessage sText_MysticTicketUseAtPort
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MysticTicket_NoBagSpace: @ 867556F
+	vmessage sText_MysticTicketBagFull
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MysticTicket_Obtained: @ 8675578
+	vmessage sText_MysticTicketThankYou
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysticTicketForYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "You must be {PLAYER}.\n"
+	.string "There is a ticket here for you.$"
+
+sText_MysticTicketUseAtPort:
+	.string "It appears to be for use at the\n"
+	.string "LILYCOVE CITY port.\p"
+	.string "Why not give it a try and see what\n"
+	.string "it is about?$"
+
+sText_MysticTicketThankYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.$"
+
+sText_MysticTicketBagFull:
+	.string "Oh, I'm sorry, {PLAYER}.\n"
+	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Please store something on your PC,\n"
+	.string "then come back for this.$"
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
new file mode 100644
index 000000000..dffb56caa
--- /dev/null
+++ b/data/scripts/mevent_old_sea_map.inc
@@ -0,0 +1,62 @@
+MysteryEventScript_OldSeaMap:: @ 86757F4
+	setvaddress MysteryEventScript_OldSeaMap
+	lock
+	faceplayer
+	checkflag FLAG_RECEIVED_OLD_SEA_MAP
+	vgoto_if_eq OldSeaMap_Obtained
+	checkflag FLAG_CAUGHT_MEW
+	vgoto_if_eq OldSeaMap_Obtained
+	checkitem ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, TRUE
+	vgoto_if_eq OldSeaMap_Obtained
+	vmessage sText_MysteryGiftOldSeaMapForYou
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, FALSE
+	vgoto_if_eq OldSeaMap_NoBagSpace
+	giveitem_std ITEM_OLD_SEA_MAP
+	setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
+	setflag FLAG_RECEIVED_OLD_SEA_MAP
+	vmessage sText_MysteryGiftOldSeaMapUseAtPort
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+OldSeaMap_NoBagSpace: @ 867584F
+	vmessage sText_MysteryGiftOldSeaMapBagFull
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+OldSeaMap_Obtained: @ 8675858
+	vmessage sText_MysteryGiftOldSeaMapThankYou
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftOldSeaMapForYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "Let me confirm--you are {PLAYER}?\p"
+	.string "We received this OLD SEA MAP\n"
+	.string "addressed to you.$"
+
+sText_MysteryGiftOldSeaMapUseAtPort:
+	.string "It appears to be for use at the\n"
+	.string "LILYCOVE CITY port.\p"
+	.string "Why not give it a try and see what\n"
+	.string "it is about?$"
+
+sText_MysteryGiftOldSeaMapThankYou:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.$"
+
+sText_MysteryGiftOldSeaMapBagFull:
+	.string "Oh, I'm sorry, {PLAYER}.\n"
+	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Please store something on your PC,\n"
+	.string "then come back for this.$"
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
new file mode 100644
index 000000000..4df317564
--- /dev/null
+++ b/data/scripts/mevent_pichu.inc
@@ -0,0 +1,79 @@
+MysteryEventScript_SurfPichu:: @ 8674D3D
+	setvaddress MysteryEventScript_SurfPichu
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if_ne SurfPichu_GiveIfPossible
+	returnram
+
+SurfPichu_GiveIfPossible: @ 8674D4C
+	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE
+	vgoto_if_eq SurfPichu_FullParty
+	setflag FLAG_MYSTERY_EVENT_DONE
+	vcall SurfPichu_GiveEgg
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftEgg
+	waitmessage
+	waitbuttonpress
+	playfanfare MUS_FANFA4
+	waitfanfare
+	release
+	end
+
+SurfPichu_FullParty: @ 8674D73
+	lock
+	faceplayer
+	vmessage sText_FullParty
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+SurfPichu_GiveEgg: @ 8674D7E
+	giveegg SPECIES_PICHU
+	setmonobedient VAR_EVENT_PICHU_SLOT
+	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+	vgoto_if_eq SurfPichu_Slot1
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+	vgoto_if_eq SurfPichu_Slot2
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+	vgoto_if_eq SurfPichu_Slot3
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+	vgoto_if_eq SurfPichu_Slot4
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+	vgoto_if_eq SurfPichu_Slot5
+	return
+
+SurfPichu_Slot1: @ 8674DC0
+	setmonmove 1, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot2:: @ 8674DC6
+	setmonmove 2, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot3: @ 8674DCC
+	setmonmove 3, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot4: @ 8674DD2
+	setmonmove 4, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot5: @ 8674DD8
+	setmonmove 5, 2, MOVE_SURF
+	return
+
+sText_MysteryGiftEgg:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "From the POKéMON CENTER we\n"
+	.string "have a gift--a POKéMON EGG!\p"
+	.string "Please raise it with love and\n"
+	.string "kindness.$"
+
+sText_FullParty:
+	.string "Oh, your party appears to be full.\p"
+	.string "Please come see me after storing\n"
+	.string "a POKéMON on a PC.$"
diff --git a/data/scripts/mevent_stamp_card.inc b/data/scripts/mevent_stamp_card.inc
new file mode 100644
index 000000000..dcef80a50
--- /dev/null
+++ b/data/scripts/mevent_stamp_card.inc
@@ -0,0 +1,21 @@
+MysteryEventScript_StampCard:: @ 8674CB0
+	setvaddress MysteryEventScript_StampCard
+	setorcopyvar VAR_RESULT, GET_MAX_STAMPS
+	specialvar VAR_0x8008, GetMysteryEventCardVal
+	setorcopyvar VAR_RESULT, GET_NUM_STAMPS
+	specialvar VAR_0x8009, GetMysteryEventCardVal
+	subvar VAR_0x8008, VAR_0x8009
+	buffernumberstring 0, VAR_0x8008
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftStampCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftStampCard:
+	.string "Thank you for using the STAMP CARD\n"
+	.string "System.\p"
+	.string "You have {STR_VAR_1} more to collect to\n"
+	.string "fill your STAMP CARD.$"
diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc
new file mode 100644
index 000000000..1b0117078
--- /dev/null
+++ b/data/scripts/mevent_trainer.inc
@@ -0,0 +1,49 @@
+MysteryEventScript_VisitingTrainer:: @ 8674EC1
+	setvaddress MysteryEventScript_VisitingTrainer
+	special ValidateEReaderTrainer
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainerInstructions
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainerArrived
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftVisitingTrainerInstructions:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "By holding this WONDER CARD, you\n"
+	.string "may take part in a survey at a\l"
+	.string "POKéMON MART.\p"
+	.string "Use these surveys to invite\n"
+	.string "TRAINERS to SOOTOPOLIS CITY.\p"
+	.string "…Let me give you a secret\n"
+	.string "password for a survey:\p"
+	.string "“GIVE ME\n"
+	.string "AWESOME TRAINER”\p"
+	.string "Write that in on a survey and send\n"
+	.string "it to the WIRELESS\l"
+	.string "COMMUNICATION SYSTEM.$"
+
+sText_MysteryGiftVisitingTrainerArrived:
+	.string "Thank you for using the MYSTERY\n"
+	.string "GIFT System.\p"
+	.string "A TRAINER has arrived in\n"
+	.string "SOOTOPOLIS CITY looking for you.\p"
+	.string "We hope you will enjoy\n"
+	.string "battling the visiting TRAINER.\p"
+	.string "You may invite other TRAINERS by\n"
+	.string "entering other passwords.\p"
+	.string "Try looking for other passwords\n"
+	.string "that may work.$"
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index b6ba75e0d..a7807ce51 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -3,10 +3,10 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
 	msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SwaggerDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SwaggerDeclined
 	msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
@@ -32,10 +32,10 @@ MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
 	msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_RolloutDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_RolloutDeclined
 	msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
@@ -61,10 +61,10 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
 	msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
 	msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
@@ -90,10 +90,10 @@ LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
 	msgbox MoveTutor_MimicTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MimicDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MimicDeclined
 	msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_MIMIC
@@ -119,10 +119,10 @@ FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
 	msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MetronomeDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_MetronomeDeclined
 	msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_METRONOME
@@ -148,10 +148,10 @@ FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
 	msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
 	msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
@@ -177,10 +177,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
 	msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SubstituteDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_SubstituteDeclined
 	msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
@@ -206,10 +206,10 @@ MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
 	msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
 	msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
@@ -235,10 +235,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
 	msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
 	msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
@@ -264,10 +264,10 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
 	msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_ExplosionDeclined
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq MoveTutor_EventScript_ExplosionDeclined
 	msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
@@ -289,7 +289,7 @@ MoveTutor_EventScript_ExplosionTaught:: @ 82C831C
 	end
 
 MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326
-	special OpenPartyMenuForMoveTutor
+	special ChooseMonForMoveTutor
 	waitstate
 	lock
 	faceplayer
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 1df0ed88c..6687bbd47 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,97 +1,98 @@
 MysteryEventClub_EventScript_Man:: @ 8291539
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5
+	goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore
 	msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT
-	goto MysteryEventClub_EventScript_291552
+	goto MysteryEventClub_EventScript_AskToSeeProfile
 	end
 
-MysteryEventClub_EventScript_291552:: @ 8291552
-	msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
+	msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, 0
 	switch VAR_RESULT
-	case 0, MysteryEventClub_EventScript_29159F
-	case 1, MysteryEventClub_EventScript_2915EB
-	case 2, MysteryEventClub_EventScript_291591
-	case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB
+	case 0, MysteryEventClub_EventScript_CreateProfile
+	case 1, MysteryEventClub_EventScript_DeclineShowProfile
+	case 2, MysteryEventClub_EventScript_Info
+	case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile
 	end
 
-MysteryEventClub_EventScript_291591:: @ 8291591
+MysteryEventClub_EventScript_Info:: @ 8291591
 	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
-	goto MysteryEventClub_EventScript_291552
+	goto MysteryEventClub_EventScript_AskToSeeProfile
 	end
 
-MysteryEventClub_EventScript_29159F:: @ 829159F
-	msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CreateProfile:: @ 829159F
+	msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq MysteryEventClub_EventScript_2915CB
+	goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
 	compare VAR_RESULT, 1
-	goto_if_eq MysteryEventClub_EventScript_2915D5
+	goto_if_eq MysteryEventClub_EventScript_ShowProfile
 	end
 
-MysteryEventClub_EventScript_2915CB:: @ 82915CB
-	msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB
+	msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_2915D5:: @ 82915D5
+MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
 	setvar VAR_0x8004, 0
 	special sub_811EECC
 	waitmessage
 	delay 80
-	msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT
+	msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_2915EB:: @ 82915EB
-	msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_DeclineShowProfile:: @ 82915EB
+	msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_2915F5:: @ 82915F5
+MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5
 	msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
-	goto MysteryEventClub_EventScript_291603
+	goto MysteryEventClub_EventScript_AskToSeeNewProfile
 	end
 
-MysteryEventClub_EventScript_291603:: @ 8291603
+MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
 	msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, 0
 	switch VAR_RESULT
-	case 0, MysteryEventClub_EventScript_291650
-	case 1, MysteryEventClub_EventScript_29167C
-	case 2, MysteryEventClub_EventScript_291642
-	case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C
+	case 0, MysteryEventClub_EventScript_CreateNewProfile
+	case 1, MysteryEventClub_EventScript_DeclineNewProfile
+	case 2, MysteryEventClub_EventScript_InfoNewProfile
+	case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile
 	end
 
-MysteryEventClub_EventScript_291642:: @ 8291642
+MysteryEventClub_EventScript_InfoNewProfile:: @ 8291642
 	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
-	goto MysteryEventClub_EventScript_291603
+	goto MysteryEventClub_EventScript_AskToSeeNewProfile
 	end
 
-MysteryEventClub_EventScript_291650:: @ 8291650
-	msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650
+	msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq MysteryEventClub_EventScript_2915CB
+	goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
 	compare VAR_RESULT, 1
-	goto_if_eq MysteryEventClub_EventScript_2915D5
+	goto_if_eq MysteryEventClub_EventScript_ShowProfile
 	end
 
-MysteryEventClub_EventScript_29167C:: @ 829167C
-	msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_DeclineNewProfile:: @ 829167C
+	msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_291686:: @ 8291686
+@ Unused
+MysteryEventClub_EventScript_Ret:: @ 8291686
 	return
 
 MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
@@ -100,7 +101,7 @@ MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
 	.string "I have a hobby--collecting the profiles\n"
 	.string "of POKéMON TRAINERS.$"
 
-MysteryEventClub_Text_2916FF: @ 82916FF
+MysteryEventClub_Text_MayISeeYourProfile: @ 82916FF
 	.string "So, how about it?\n"
 	.string "May I see your profile?$"
 
@@ -123,16 +124,16 @@ MysteryEventClub_Text_EasyChatExplanation: @ 8291729
 	.string "Repeat for the remaining text choices,\n"
 	.string "and you'll have your very own profile.$"
 
-MysteryEventClub_Text_291969: @ 8291969
+MysteryEventClub_Text_LetsSeeItThen: @ 8291969
 	.string "Yes! Thank you!\n"
 	.string "So, let's see it, then.$"
 
-MysteryEventClub_Text_291991: @ 8291991
+MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile: @ 8291991
 	.string "Oh, no, really?\p"
 	.string "I imagine someone like you would have\n"
 	.string "a wonderful profile…$"
 
-MysteryEventClub_Text_2919DC: @ 82919DC
+MysteryEventClub_Text_NotIntoItRightNow: @ 82919DC
 	.string "Oh? You're not into it right now?\p"
 	.string "Well, anytime is good by me!$"
 
@@ -143,17 +144,17 @@ MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B
 MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F
 	.string "May I see your new profile?$"
 
-MysteryEventClub_Text_291A6B: @ 8291A6B
+MysteryEventClub_Text_EvenBetterThanLastProfile: @ 8291A6B
 	.string "Yes! Thank you!\p"
 	.string "I hope it's even better than the profile\n"
 	.string "you showed me before.$"
 
-MysteryEventClub_Text_291ABA: @ 8291ABA
+MysteryEventClub_Text_LikeProfileWayItIs: @ 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.$"
 
-MysteryEventClub_Text_291B22: @ 8291B22
+MysteryEventClub_Text_FantasticProfile: @ 8291B22
 	.string "F-fantastic!\p"
 	.string "Your profile, it's wonderful!\n"
 	.string "It really says what you're about.\p"
@@ -161,7 +162,8 @@ MysteryEventClub_Text_291B22: @ 8291B22
 	.string "be captivated by you!\p"
 	.string "Thank you!$"
 
-MysteryEventClub_Text_291BB7: @ 8291BB7
+@ Unused
+MysteryEventClub_Text_YouKnowSecretSaying: @ 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 e8cfc34a0..74fff4aea 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -82,7 +82,7 @@ EventScript_ResetAllBerries:: @ 827149D
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
-	setflag FLAG_LINK_CONTEST_POKE_BALL
+	setflag FLAG_HIDE_CONTEST_POKE_BALL
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
@@ -95,14 +95,14 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_UNKNOWN_0x363
 	setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
-	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
+	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	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
@@ -138,9 +138,9 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
-	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
-	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
 	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
 	setflag FLAG_HIDE_PETALBURG_GYM_WALLY
@@ -166,12 +166,12 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
 	setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
-	setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY
 	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
-	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
-	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
@@ -199,12 +199,12 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
 	setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
-	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
-	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
+	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
+	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
 	setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
 	setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
 	setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
-	setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
+	setflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
 	setflag FLAG_HIDE_ROUTE_128_STEVEN
 	setflag FLAG_HIDE_ROUTE_128_ARCHIE
@@ -234,12 +234,12 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
-	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	setflag FLAG_HIDE_SKY_PILLAR_WALLACE
-	setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
+	setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT
 	call EventScript_ResetAllBerries
 	end
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..cc583022d
--- /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, TRUE
+	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/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 0d4be2c0d..a26e9e22a 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -6,9 +6,9 @@ Common_EventScript_PkmnCenterNurse:: @ 827191E
     compare VAR_RESULT, 4
     goto_if_eq EventScript_PkmnCenterNurse_GoldCard
     msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_HealPkmn
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq EventScript_PkmnCenterNurse_Goodbye
     end
 
@@ -91,9 +91,9 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
 
 EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43
     specialvar VAR_RESULT, IsPokerusInParty
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, TRUE
     goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, FALSE
     goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
     end
 
@@ -112,14 +112,14 @@ EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68
     applymovement VAR_0x800B, Common_Movement_Delay48
     waitmovement 0
     msgbox gText_NoticesGoldCard, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn
     message gText_WeHopeToSeeYouAgain2
     return
 
 EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC
     msgbox gText_YouWantTheUsual, MSGBOX_YESNO
-    compare VAR_RESULT, 1
+    compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn
     message gText_WeHopeToSeeYouAgain2
     return
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index f88d3af6c..1b706e603 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
-	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
+	compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
+	goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
+	compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
+	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
+	compare VAR_RESULT, FALSE
 	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,220 +443,220 @@ 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
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
 	releaseall
 	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/pokeblocks.inc b/data/scripts/pokeblocks.inc
deleted file mode 100644
index 9590f3140..000000000
--- a/data/scripts/pokeblocks.inc
+++ /dev/null
@@ -1,759 +0,0 @@
-@ The scripts there concern pokeblock events in LilyCove City's Contest Lobby 
-
-@ 'PblockX' number of offline opponents
-@ 'Ask' talking with a blender machine
-@ 'Yes' agreeing to blend
-@ 'No' refusing to blend
-@ 'KnowHow' asking if the player knows the blending process
-@ 'Explain' explaining the blender process
-@ 'Start' start blending
-@ 'TalkX' talking with a person next to a blender machine
-@ 'NoBerries' can't blend cause they have no berries
-@ 'FullPokeblock' can't blend cause full pokeblock case
-@ 'NoPokeblock' can't blend cause they have no pokeblock case
-
-Text_Pblock1_Ask: @ 8292DEE
-	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
-	.string "with this old-timer?$"
-
-Text_Pblock1_Yes: @ 8292E28
-	.string "Excellent!$"
-
-Text_Pblock1_No: @ 8292E33
-	.string "Oh…\n"
-	.string "You've made this old-timer sad…$"
-
-Text_Pblock1_KnowHow: @ 8292E57
-	.string "Do you know how to make a {POKEBLOCK}?$"
-
-Text_Pblock1_Start: @ 8292E78
-	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
-
-Text_Pblock1_Explain: @ 8292EA6
-	.string "Okay, a little explanation, then.\p"
-	.string "Oh, don't worry, it's quite simple.\p"
-	.string "When the BLENDER's arrow comes to\n"
-	.string "your marker, just press the A Button.\p"
-	.string "That's all you have to do.\n"
-	.string "You'll see how easy it is when you try.$"
-
-Text_Pblock1_NoBerries: @ 8292F77
-	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
-	.string "If you don't have any BERRIES,\n"
-	.string "you can't make any {POKEBLOCK}S.$"
-
-LilycoveCity_ContestLobby_Text_292FD1: @ 8292FD1
-	.string "Well, that won't do at all now, will it?\p"
-	.string "If you don't mind leftovers, you can\n"
-	.string "have one of my BERRIES.\p"
-	.string "That way, we could make some {POKEBLOCK}S\n"
-	.string "together using the BERRY BLENDER.$"
-
-LilycoveCity_ContestLobby_Text_29307D: @ 829307D
-	.string "If I had some BERRIES left over,\n"
-	.string "I'd gladly give you one…\p"
-	.string "But, I don't have any to spare today.\n"
-	.string "We'll have to do this another time.$"
-
-Text_Pblock1_FullPokeblock: @ 8293101
-	.string "But your {POKEBLOCK} CASE is full.\p"
-	.string "You should use some {POKEBLOCK}S before\n"
-	.string "you come see me again.$"
-
-Text_Pblock1_NoPokeblock: @ 8293157
-	.string "But you don't have a {POKEBLOCK} CASE.\p"
-	.string "You should get a {POKEBLOCK} CASE and then\n"
-	.string "come see me.$"
-
-LilycoveCity_ContestLobby_Text_2931AA: @ 82931AA
-	.string "Let's get blending already!$"
-
-LilycoveCity_ContestLobby_Text_2931C6: @ 82931C6
-	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
-	.string "This is so exciting!$"
-
-LilycoveCity_ContestLobby_Text_293201: @ 8293201
-	.string "Hi, there! Did you want to blend some\n"
-	.string "{POKEBLOCK}S with us?$"
-
-LilycoveCity_ContestLobby_Text_293237: @ 8293237
-	.string "Okay!$"
-
-LilycoveCity_ContestLobby_Text_29323D: @ 829323D
-	.string "That's too bad…\p"
-	.string "But we'll always be around whenever\n"
-	.string "you get the urge to blend!$"
-
-LilycoveCity_ContestLobby_Text_29328C: @ 829328C
-	.string "Of course, you do know how to\n"
-	.string "blend {POKEBLOCK}S, don't you?$"
-
-LilycoveCity_ContestLobby_Text_2932C3: @ 82932C3
-	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
-
-LilycoveCity_ContestLobby_Text_2932F1: @ 82932F1
-	.string "Okay!\n"
-	.string "Let me explain it to you!\p"
-	.string "When the spinning BLENDER's arrow\n"
-	.string "reaches your marker, just press\l"
-	.string "the A Button.\p"
-	.string "That's all it takes.\n"
-	.string "Pretty easy, don't you think?$"
-
-LilycoveCity_ContestLobby_Text_293394: @ 8293394
-	.string "Oh, but wait a second here…\n"
-	.string "You don't have any BERRIES.\p"
-	.string "You can't make any {POKEBLOCK}S without\n"
-	.string "BERRIES…\p"
-	.string "We'll always be around whenever you\n"
-	.string "get hold of some BERRIES to blend.$"
-
-LilycoveCity_ContestLobby_Text_29343E: @ 829343E
-	.string "Oh, but wait a second here…\n"
-	.string "Your {POKEBLOCK} CASE is full.\p"
-	.string "You should use some {POKEBLOCK}S and\n"
-	.string "then come back.$"
-
-LilycoveCity_ContestLobby_Text_2934A2: @ 82934A2
-	.string "Oh, but wait a second here…\n"
-	.string "You don't have a {POKEBLOCK} CASE.\p"
-	.string "You should get a {POKEBLOCK} CASE and\n"
-	.string "then come back.$"
-
-LilycoveCity_ContestLobby_Text_29350B: @ 829350B
-	.string "Oh, hello! Did you want to make some\n"
-	.string "{POKEBLOCK}S with our little group?$"
-
-LilycoveCity_ContestLobby_Text_29354E: @ 829354E
-	.string "Oh, dear!$"
-
-LilycoveCity_ContestLobby_Text_293558: @ 8293558
-	.string "Oh, dear me…\p"
-	.string "You've left us in shock!$"
-
-LilycoveCity_ContestLobby_Text_29357E: @ 829357E
-	.string "Naturally, you know how to make\n"
-	.string "{POKEBLOCK}S, don't you?$"
-
-LilycoveCity_ContestLobby_Text_2935B1: @ 82935B1
-	.string "Okay, dear!\n"
-	.string "Let's get started!\p"
-	.string "Let's BERRY BLENDER!$"
-
-LilycoveCity_ContestLobby_Text_2935E5: @ 82935E5
-	.string "Oh, dear!\p"
-	.string "Then, I'll explain it to you nicely.\p"
-	.string "When the BLENDER's arrow spins to\n"
-	.string "your marker, press the A Button.\p"
-	.string "That's all it takes.\n"
-	.string "Isn't it simple?$"
-
-LilycoveCity_ContestLobby_Text_29367D: @ 829367D
-	.string "You don't have any BERRIES,\n"
-	.string "do you?\p"
-	.string "If you don't have any BERRIES,\n"
-	.string "you can't make any {POKEBLOCK}S.\p"
-	.string "We'll always be making {POKEBLOCK}S here,\n"
-	.string "so let's make some together when\l"
-	.string "you get a BERRY or two.$"
-
-LilycoveCity_ContestLobby_Text_293738: @ 8293738
-	.string "Your {POKEBLOCK} CASE is full,\n"
-	.string "it looks like.\p"
-	.string "You should use some {POKEBLOCK}S up\n"
-	.string "and then come back.$"
-
-LilycoveCity_ContestLobby_Text_293792: @ 8293792
-	.string "You haven't gotten a {POKEBLOCK} CASE\n"
-	.string "yet, it looks like.\p"
-	.string "You need to get a {POKEBLOCK} CASE before\n"
-	.string "you come back.$"
-
-LilycoveCity_ContestLobby_Text_2937F9: @ 82937F9
-	.string "Okay! Today's going to be the day that\n"
-	.string "I set a new BLENDER speed record!$"
-
-LilycoveCity_ContestLobby_Text_293842: @ 8293842
-	.string "Oh, dear!\n"
-	.string "You look as if you're good at blending.\l"
-	.string "Would you like to join us?$"
-
-LilycoveCity_ContestLobby_Text_29388F: @ 829388F
-	.string "I'm going to make delicious {POKEBLOCK}S\n"
-	.string "and make my POKéMON cuter.$"
-
-Text_PblockLink_Ask: @ 82938CD
-	.string "{POKEBLOCK}S will be made with your friends \n"
-	.string "from BERRIES in the BERRY BLENDER.\p"
-	.string "Is it okay to save the game before\n"
-	.string "linking with your friends?$"
-
-Text_PblockLink_Searching: @ 8293955
-	.string "Searching for your friends…\n"
-	.string "… … B Button: Cancel$"
-
-Text_PblockLink_1Arrived: @ 8293986
-	.string "{STR_VAR_1} arrived.$"
-
-Text_PblockLink_2Arrived: @ 8293992
-	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
-
-Text_PblockLink_3Arrived: @ 82939A5
-	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
-	.string "{STR_VAR_3} arrived.$"
-
-Text_PblockLink_NoBerries: @ 82939BD
-	.string "You have no BERRIES.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_PblockLink_FullPokeblock: @ 82939F3
-	.string "Your {POKEBLOCK} CASE is full.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_PblockLink_NoPokeblock: @ 8293A2D
-	.string "You don't have a {POKEBLOCK} CASE.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_Pblock1_Talk_0: @ 8293A6B
-	.string "I love making {POKEBLOCK}S.\p"
-	.string "I always have some BERRIES with me.$"
-
-Text_Pblock1_Talk_1: @ 8293AA5
-	.string "If you'd like, we could make some\n"
-	.string "{POKEBLOCK}S together using the\l"
-	.string "BERRY BLENDER.$"
-
-LilycoveCity_ContestLobby_Text_293AF0: @ 8293AF0
-	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
-	.string "Well, that won't do at all now, will it?\p"
-	.string "If you don't mind leftovers, you can\n"
-	.string "have one of my BERRIES.$"
-
-LilycoveCity_ContestLobby_Text_293B76: @ 8293B76
-	.string "We'll use it to make {POKEBLOCK}S together\n"
-	.string "using the BERRY BLENDER.$"
-
-LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
-	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
-	.string "If I had some left over, I'd gladly\n"
-	.string "give you one…\p"
-	.string "But, I don't have any to spare today.\n"
-	.string "Sorry about that.$"
-
-EventScript_Pblock1_Ask:: @ 8293C3E
-	lockall
-	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS, LilycoveCity_ContestLobby_EventScript_293EFB
-	setvar VAR_0x8009, 1
-	applymovement 16, LilycoveCity_ContestLobby_Movement_294053
-	waitmovement 0
-	msgbox Text_Pblock1_Ask, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_Pblock1_Yes
-	goto EventScript_Pblock1_No
-	end
-
-EventScript_Pblock1_No: @ 8293C70
-	msgbox Text_Pblock1_No, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_Pblock1_NoBerries: @ 8293C7A
-	msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
-	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
-	goto LilycoveCity_ContestLobby_EventScript_293C9C
-	end
-
-LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
-	msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
-	msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	goto EventScript_Pblock1_KnowHow
-	end
-
-EventScript_Pblock1_KnowHow: @ 8293CB9
-	msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_Pblock1_Start
-	goto EventScript_Pblock1_Explain
-	end
-
-EventScript_Pblock1_Start: @ 8293CD2
-	msgbox Text_Pblock1_Start, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-EventScript_Pblock1_Explain: @ 8293CE0
-	msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT
-	goto EventScript_Pblock1_Start
-	end
-
-EventScript_Pblock1_Yes: @ 8293CEE
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_Pblock1_NoPokeblock
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_eq EventScript_Pblock1_FullPokeblock
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_Pblock1_NoBerries
-	msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT
-	goto EventScript_Pblock1_KnowHow
-	end
-
-EventScript_StartBlending: @ 8293D2C
-	copyvar VAR_0x8004, VAR_0x8009
-	fadescreen 1
-	special DoBerryBlending
-	waitstate
-	releaseall
-	end
-
-EventScript_Pblock1_FullPokeblock: @ 8293D39
-	msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_Pblock1_NoPokeblock: @ 8293D43
-	msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
-	lockall
-	setvar VAR_0x8009, 2
-	applymovement 10, Common_Movement_FaceOriginalDirection
-	applymovement 3, LilycoveCity_ContestLobby_Movement_294053
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6
-	goto LilycoveCity_ContestLobby_EventScript_293D7D
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D
-	msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
-	msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
-	msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA
-	goto LilycoveCity_ContestLobby_EventScript_293DB8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA
-	msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8
-	msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_293DAA
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293D87
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E14
-	msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293D91
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E0A
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A
-	msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14
-	msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
-	lockall
-	setvar VAR_0x8008, 15
-	setvar VAR_0x8009, 3
-	applymovement 9, Common_Movement_FaceOriginalDirection
-	applymovement 17, Common_Movement_FaceOriginalDirection
-	applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3
-	goto LilycoveCity_ContestLobby_EventScript_293E5A
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A
-	msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
-	msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
-	msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87
-	goto LilycoveCity_ContestLobby_EventScript_293E95
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87
-	msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95
-	msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_293E87
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E64
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EF1
-	msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293E6E
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EE7
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7
-	msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1
-	msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB
-	lockall
-	setvar VAR_0x8009, 1
-	msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F28
-	msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E
-	msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F8E
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F1E
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293F64
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F98
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64
-	msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_293F85
-	msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85
-	msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT
-	return
-
-LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E
-	msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98
-	msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2
-	msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB
-	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4
-	msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
-	setvar VAR_0x8008, 15
-	goto LilycoveCity_ContestLobby_EventScript_293FC8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8
-	lock
-	faceplayer
-	msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293FEE
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293FF8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE
-	msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
-	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
-	goto LilycoveCity_ContestLobby_EventScript_294032
-	end
-
-LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
-	msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
-	msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_Movement_294053: @ 8294053
-	walk_in_place_fastest_right
-	step_end
-
-EventScript_PblockLink:: @ 8294055
-	lockall
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_NoBerries
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_NoPokeblock
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne EventScript_PblocLink_Ask
-	compare VAR_RESULT, 65535
-	goto_if_eq EventScript_PblocLink_FullPokeblock
-	end
-
-EventScript_PblocLink_Ask: @ 8294092
-	msgbox Text_PblockLink_Ask, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_TryConnect
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_End
-	end
-
-EventScript_PblocLink_NoBerries: @ 82940B1
-	msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_TryConnect: @ 82940BB
-	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_End
-	specialvar VAR_RESULT, IsWirelessAdapterConnected
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_2941ED
-	message Text_PblockLink_Searching
-	waitmessage
-	special sub_80B2FD8
-	waitstate
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_PblocLink_SomeoneNotReady
-	compare VAR_RESULT, 3
-	goto_if_eq EventScript_PblocLink_DifferentSelections
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_CloseLink
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_PblocLink_LinkError
-	end
-
-EventScript_PblocLink_1Arrived: @ 829411D
-	msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_2Arrived: @ 829412B
-	msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_3Arrived: @ 8294139
-	msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_StartLinkBlending: @ 8294147
-	setvar VAR_0x8004, 0
-	fadescreen 1
-	removeobject 240
-	removeobject 239
-	removeobject 238
-	removeobject 237
-	special DoBerryBlending
-	waitstate
-	releaseall
-	end
-
-EventScript_PblocLink_End: @ 8294160
-	releaseall
-	end
-
-EventScript_PblocLink_FullPokeblock: @ 8294162
-	msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_NoPokeblock: @ 829416C
-	msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_SomeoneNotReady: @ 8294176
-	special CloseLink
-	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_DifferentSelections: @ 8294183
-	special CloseLink
-	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_CloseLink: @ 8294190
-	special CloseLink
-	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_LinkError: @ 829419D
-	special CloseLink
-	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_SpawnPartners: @ 82941AA
-	fadescreen 1
-	specialvar VAR_RESULT, GetLinkPartnerNames
-	copyvar VAR_0x8008, VAR_RESULT
-	copyvar VAR_0x8004, VAR_0x8008
-	special SpawnLinkPartnerEventObject
-	goto EventScript_PblocLink_Arrived
-	end
-
-EventScript_PblocLink_Arrived: @ 82941C4
-	fadescreen 0
-	switch VAR_0x8008
-	case 2, EventScript_PblocLink_1Arrived
-	case 3, EventScript_PblocLink_2Arrived
-	case 4, EventScript_PblocLink_3Arrived
-	end
-
-LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED
-	setvar VAR_0x8004, 13
-	goto EventScript_PblocLink_DecideLeader
-	end
-
-EventScript_PblocLink_DecideLeader: @ 82941F8
-	message Text_DecideLinkLeader
-	waitmessage
-	multichoice 16, 6, MULTI_LINK_LEADER, 0
-	switch VAR_RESULT
-	case 0, EventScript_PblocLink_TryJoinGroup
-	case 1, EventScript_PblocLink_TryBecomeLeader
-	case 2, EventScript_PblocLink_CloseLink
-	case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink
-	end
-
-EventScript_PblocLink_TryBecomeLeader: @ 8294235
-	call EventScript_PblocLink_BecomeLeader
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners_
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_DecideLeader
-	compare VAR_RESULT, 8
-	goto_if_eq EventScript_PblocLink_TryBecomeLeader
-	release
-	end
-
-EventScript_PblocLink_TryJoinGroup: @ 829425D
-	call EventScript_PblocLink_JoinGroup
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners_
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_DecideLeader
-	compare VAR_RESULT, 8
-	goto_if_eq EventScript_PblocLink_TryJoinGroup
-	release
-	end
-
-EventScript_PblocLink_BecomeLeader: @ 8294285
-	special TryBecomeLinkLeader
-	waitstate
-	return
-
-EventScript_PblocLink_JoinGroup: @ 829428A
-	special TryJoinLinkGroup
-	waitstate
-	return
-
-EventScript_PblocLink_SpawnPartners_: @ 829428F
-	goto EventScript_PblocLink_SpawnPartners
-	end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index 50284d590..b89d2fbd0 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -49,7 +49,7 @@ ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
 
 ProfBirch_EventScript_AskRatePokedex:: @ 8272155
 	msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq ProfBirch_EventScript_DeclineRating
 	call ProfBirch_EventScript_RatePokedex
 	release
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
new file mode 100644
index 000000000..23f224ae4
--- /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, YES
+	goto_if_eq EventScript_MixRecords
+	compare VAR_RESULT, NO
+	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/roulette.inc b/data/scripts/roulette.inc
index 791069088..9aea65054 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,10 +1,10 @@
 Roulette_EventScript_Table1:: @ 82A5AB1
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 0
 	getpricereduction POKENEWS_GAME_CORNER
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Roulette_EventScript_Play
 	addvar VAR_0x8004, 128
 	goto Roulette_EventScript_Play
@@ -12,11 +12,11 @@ Roulette_EventScript_Table1:: @ 82A5AB1
 
 Roulette_EventScript_Table2:: @ 82A5ADF
 	checkitem ITEM_COIN_CASE, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 1
 	getpricereduction POKENEWS_GAME_CORNER
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Roulette_EventScript_Play
 	addvar VAR_0x8004, 128
 	goto Roulette_EventScript_Play
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 83cf5d16d..72d1d3c92 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -14,7 +14,7 @@ SafariZone_EventScript_Exit:: @ 82A4B5D
 SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	lockall
 	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_EventScript_Retire
 	releaseall
 	end
@@ -46,7 +46,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
 	compare VAR_RESULT, 0xFFFF
 	goto_if_ne SafariZone_EventScript_PokeblockPresent
 	msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_EventScript_ChoosePokeblock
 	releaseall
 	end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index f2a99cd36..617b19b42 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -27,7 +27,7 @@ SecretBase_Text_DiscoveredSmallEntrance: @ 8274883
 SecretBase_EventScript_CheckEntrance:: @ 82759F1
 	special GetSecretBaseTypeInFrontOfPlayer
 	special CheckPlayerHasSecretBase
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase
 	checkpartymove MOVE_SECRET_POWER
 	setfieldeffectargument 0, VAR_RESULT
@@ -52,7 +52,7 @@ SecretBase_EventScript_Cave:: @ 8275A50
 	goto_if_eq SecretBase_EventScript_CaveNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -84,7 +84,7 @@ SecretBase_EventScript_Tree:: @ 8275AA9
 	goto_if_eq SecretBase_EventScript_TreeNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -116,7 +116,7 @@ SecretBase_EventScript_Shrub:: @ 8275B02
 	goto_if_eq SecretBase_EventScript_ShrubNoSecretPower
 	bufferpartymonnick 0, VAR_RESULT
 	msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
 	closemessage
@@ -161,7 +161,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
 	waitmovement 0
 	setvar VAR_INIT_SECRET_BASE, 1
 	msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, YES
 	goto_if_eq SecretBase_EventScript_SetAsBase
 	closemessage
 	playse SE_KAIDAN
@@ -185,7 +185,7 @@ SecretBase_EventScript_Enter:: @ 8275BB7
 	setvar VAR_INIT_SECRET_BASE, 1
 	playse SE_KAIDAN
 	special IsCurSecretBaseOwnedByAnotherPlayer
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq SecretBase_EventScript_EnterPlayersBase
 	clearflag FLAG_DECORATION_0
 	special EnterSecretBase
@@ -209,17 +209,17 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
 	lockall
 	special GetSecretBaseNearbyMapName
 	msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	fadescreenswapbuffers 1
 	special MoveOutOfSecretBaseFromOutside
 	closemessage
 	fadescreenswapbuffers 0
 	msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
 	bufferpartymonnick 0, VAR_0x8004
 	buffermovename 1, MOVE_SECRET_POWER
@@ -347,7 +347,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer0PostBattle
 	msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -384,7 +384,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer1PostBattle
 	msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -421,7 +421,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer2PostBattle
 	msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -458,7 +458,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer3PostBattle
 	msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -495,7 +495,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer4PostBattle
 	msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -532,7 +532,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer5PostBattle
 	msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -569,7 +569,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer6PostBattle
 	msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -606,7 +606,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer7PostBattle
 	msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -643,7 +643,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer8PostBattle
 	msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
@@ -680,7 +680,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_Trainer9PostBattle
 	msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle
 	setvar VAR_RESULT, 1
 	special SetBattledOwnerFromResult
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 51a327142..7be69ec58 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -1,4 +1,4 @@
-Route111_Text_2762C9: @ 82762C9
+Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9
 	.string "What's that?\n"
 	.string "What am I doing?\p"
 	.string "I'm thinking about making my own room\n"
@@ -6,7 +6,7 @@ Route111_Text_2762C9: @ 82762C9
 	.string "I know! I'll give you this TM.\n"
 	.string "Will you use it to make your own room?$"
 
-Route111_Text_27636E: @ 827636E
+Route111_Text_ExplainSecretPower: @ 827636E
 	.string "Find a big tree that looks like it might\n"
 	.string "drop some vines.\p"
 	.string "Use SECRET POWER in front of the tree.\n"
@@ -24,59 +24,59 @@ Route111_Text_27636E: @ 827636E
 	.string "I'm going to look for other places, too.\n"
 	.string "Okay, bye!$"
 
-Route111_Text_27655C: @ 827655C
+Route111_Text_DontWantThis: @ 827655C
 	.string "Oh, you don't want this?\n"
 	.string "If you change your mind, tell me, okay?$"
 
-Route111_Text_27659D: @ 827659D
+Route111_Text_DontHaveAnyRoom: @ 827659D
 	.string "Oh, you don't have any room for this.\p"
 	.string "I'll hold on to it, so come back for it\n"
 	.string "another time, okay?$"
 
-Route111_EventScript_2765FF:: @ 82765FF
+Route111_EventScript_SecretPowerMan:: @ 82765FF
 	lock
 	faceplayer
-	msgbox Route111_Text_2762C9, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_27661E
-	msgbox Route111_Text_27655C, MSGBOX_DEFAULT
+	msgbox Route111_Text_MakingRoomUseTMToMakeYourOwn, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route111_EventScript_GiveSecretPower
+	msgbox Route111_Text_DontWantThis, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_27661E:: @ 827661E
+Route111_EventScript_GiveSecretPower:: @ 827661E
 	giveitem_std ITEM_TM43
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_276680
-	msgbox Route111_Text_27636E, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route111_EventScript_NoRoomForSecretPower
+	msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_RECEIVED_SECRET_POWER
 	clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route111_EventScript_27666A
+	call_if_eq Route111_EventScript_SecretPowerManExit
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route111_EventScript_27666A
+	call_if_eq Route111_EventScript_SecretPowerManExit
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route111_EventScript_276675
+	call_if_eq Route111_EventScript_SecretPowerManExitNorth
 	removeobject VAR_LAST_TALKED
 	release
 	end
 
-Route111_EventScript_27666A:: @ 827666A
-	applymovement VAR_LAST_TALKED, Route111_Movement_27668A
+Route111_EventScript_SecretPowerManExit:: @ 827666A
+	applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit
 	waitmovement 0
 	return
 
-Route111_EventScript_276675:: @ 8276675
-	applymovement VAR_LAST_TALKED, Route111_Movement_276696
+Route111_EventScript_SecretPowerManExitNorth:: @ 8276675
+	applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth
 	waitmovement 0
 	return
 
-Route111_EventScript_276680:: @ 8276680
-	msgbox Route111_Text_27659D, MSGBOX_DEFAULT
+Route111_EventScript_NoRoomForSecretPower:: @ 8276680
+	msgbox Route111_Text_DontHaveAnyRoom, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_Movement_27668A: @ 827668A
+Route111_Movement_SecretPowerManExit: @ 827668A
 	walk_down
 	walk_down
 	walk_down
@@ -90,7 +90,7 @@ Route111_Movement_27668A: @ 827668A
 	walk_down
 	step_end
 
-Route111_Movement_276696: @ 8276696
+Route111_Movement_SecretPowerManExitNorth: @ 8276696
 	walk_left
 	walk_down
 	walk_down
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 3f83e38b0..de5dcc703 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -1,25 +1,25 @@
 SecretBase_MapScripts::
-    map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp
-    map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition
-    map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame
-    map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume
+    map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp
+    map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition
+    map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame
+    map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume
     .byte 0
 
-SecretBase_MapScript2_OnWarp: @ 823B498
+SecretBase_OnWarp: @ 823B498
     map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations
     .2byte 0
 
-SecretBase_MapScript1_OnTransition: @ 823B4A2
+SecretBase_OnTransition: @ 823B4A2
     call SecretBase_EventScript_SetDecorationFlags
     special SetSecretBaseOwnerGfxId
     special InitSecretBaseVars
     end
 
-SecretBase_MapScript2_OnFrame: @ 823B4AE
+SecretBase_OnFrame: @ 823B4AE
     map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance
     .2byte 0
 
-SecretBase_MapScript1_OnResume: @ 823B4B8
+SecretBase_OnResume: @ 823B4B8
     setstepcallback STEP_CB_SECRET_BASE
     end
 
@@ -68,7 +68,7 @@ SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
 
 SecretBase_EventScript_PCPackUp:: @ 823B568
     msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCShowMainMenu
     closemessage
     special MoveOutOfSecretBase
@@ -120,7 +120,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0
     goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases
     special CopyCurSecretBaseOwnerName_StrVar1
     msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCRegisterMenu
     msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN
     special ToggleCurSecretBaseRegistry
@@ -130,7 +130,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0
 
 SecretBase_EventScript_AlreadyRegistered:: @ 823B62F
     msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO
-    compare VAR_RESULT, 0
+    compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCRegisterMenu
     msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN
     special ToggleCurSecretBaseRegistry
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
new file mode 100644
index 000000000..af6cac1da
--- /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, NO
+	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_hill.inc b/data/scripts/trainer_hill.inc
index 7d898a93d..805c63264 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -1,12 +1,8 @@
-TrainerHill_1F_MapScript1_2C8336: @ 82C8336
-TrainerHill_2F_MapScript1_2C8336: @ 82C8336
-TrainerHill_3F_MapScript1_2C8336: @ 82C8336
-TrainerHill_4F_MapScript1_2C8336: @ 82C8336
-TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
+TrainerHill_OnResume: @ 82C8336
 	setvar VAR_TEMP_2, 0
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, B_OUTCOME_LOST
@@ -17,67 +13,64 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
 	goto_if_eq TrainerHill_1F_EventScript_Lost
 	end
 
-TrainerHill_1F_MapScript2_2C8372: @ 82C8372
-TrainerHill_2F_MapScript2_2C8372: @ 82C8372
-	map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C
+TrainerHill_OnWarp: @ 82C8372
+	map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_DummyOnWarp
 	.2byte 0
 
-TrainerHill_1F_EventScript_2C837C:: @ 82C837C
+TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
 	setvar VAR_TEMP_3, 1
 @ forced stop
 
-TrainerHill_1F_MapScript2_2C8381: @ 82C8381
-TrainerHill_2F_MapScript2_2C8381: @ 82C8381
-TrainerHill_3F_MapScript2_2C8381: @ 82C8381
-TrainerHill_4F_MapScript2_2C8381: @ 82C8381
-TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
-	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
+TrainerHill_OnFrame: @ 82C8381
+	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
 EventScript_TrainerHillTimer:: @ 82C8393
 	lockall
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_7
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME
 	special CallTrainerHillFunction
-	msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT
 	releaseall
 	end
 
-TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
+TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_1F_EventScript_2C83BF
+	compare VAR_RESULT, 1  @ VAR_RESULT always 0 here
+	goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
 	end
 
-TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
+@ Never reached
+TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF
 	warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
 TrainerHill_1F_EventScript_Lost:: @ 82C83C9
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_1, 1
 	end
 
-TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF
-TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
+TrainerHill_EventScript_WarpToEntranceCounter:: @ 82C83DF
 	setvar VAR_TEMP_1, 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
-TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
+@ Unused
+TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE
 	set_invisible
 	step_end
 
-EventScript_2C83F0:: @ 82C83F0
-	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_11
+@ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here
+TrainerHill_EventScript_TrainerBattle:: @ 82C83F0
+	trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT
 	special CallTrainerHillFunction
 	waitmessage
 	waitbuttonpress
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..a2d5473b1 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -4,47 +4,47 @@ 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_unset FLAG_SYS_TV_START, EventScript_27EE8A
-	goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A
+	goto_if_eq EventScript_PlayersHouseLatiNewsFlash
+	goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
+	goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
 	specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_27EEFF
-	goto EventScript_27EEE9
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_DoInSearchOfTrainers
+	goto EventScript_TryDoPokeNews
 	end
 
-EventScript_27EE54:: @ 827EE54
-	specialvar VAR_0x8004, special_0x44
+EventScript_TryDoTVShow:: @ 827EE54
+	specialvar VAR_0x8004, GetRandomActiveShowIdx
 	compare VAR_0x8004, 255
-	goto_if_eq EventScript_27EED8
-	specialvar VAR_RESULT, special_0x4a
+	goto_if_eq EventScript_MomDadMightLikeThis2
+	specialvar VAR_RESULT, GetNextActiveShowIfMassOutbreak
 	compare VAR_RESULT, 255
-	goto_if_eq EventScript_27EED8
+	goto_if_eq EventScript_MomDadMightLikeThis2
 	copyvar VAR_0x8004, VAR_RESULT
-	specialvar VAR_RESULT, special_0x45
+	specialvar VAR_RESULT, GetSelectedTVShow
 	compare VAR_RESULT, 0
-	goto_if_ne EventScript_27EEBA
+	goto_if_ne EventScript_DoTVShow
 	end
 
-EventScript_27EE8A:: @ 827EE8A
+EventScript_MomDadMightLikeThis1:: @ 827EE8A
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
 	special TurnOffTVScreen
 	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
-	@ 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.
+@ special InitRoamer 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.
+EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
+	msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
 	special InitRoamer
 	clearflag FLAG_SYS_TV_LATIAS_LATIOS
 	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
@@ -52,41 +52,41 @@ EventScript_27EEA4:: @ 827EEA4
 	releaseall
 	end
 
-EventScript_27EEBA:: @ 827EEBA
+EventScript_DoTVShow:: @ 827EEBA
 	special DoTVShow
 	waitmessage
 	waitbuttonpress
 	compare VAR_RESULT, 1
-	goto_if_ne EventScript_27EEBA
-	goto EventScript_27EED0
+	goto_if_ne EventScript_DoTVShow
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EED0:: @ 827EED0
+EventScript_TurnOffTV:: @ 827EED0
 	special TurnOffTVScreen
 	setflag FLAG_SYS_TV_WATCH
 	releaseall
 	end
 
-EventScript_27EED8:: @ 827EED8
+EventScript_MomDadMightLikeThis2:: @ 827EED8
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
-	goto EventScript_27EED0
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EEE9:: @ 827EEE9
+EventScript_TryDoPokeNews:: @ 827EEE9
 	special DoPokeNews
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_27EE54
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_TryDoTVShow
 	waitmessage
 	waitbuttonpress
-	goto EventScript_27EED0
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EEFF:: @ 827EEFF
+EventScript_DoInSearchOfTrainers:: @ 827EEFF
 	special DoTVShowInSearchOfTrainers
 	waitmessage
 	waitbuttonpress
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_27EEFF
-	goto EventScript_27EED0
+	goto_if_eq EventScript_DoInSearchOfTrainers
+	goto EventScript_TurnOffTV
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 5ab98e24d..4b23995f2 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64
 	def_special PlayerEnteredTradeSeat
 	def_special nullsub_37
 	def_special sub_80B3254
-	def_special sub_80B2FD8
+	def_special TryBerryBlenderLinkup
 	def_special GetLinkPartnerNames
 	def_special SpawnLinkPartnerEventObject
 	def_special SavePlayerParty
@@ -76,34 +76,34 @@ gSpecials:: @ 81DBA64
 	def_special TurnOffTVScreen
 	def_special DoTVShow
 	def_special DoPokeNews
-	def_special special_0x44
-	def_special special_0x45
+	def_special GetRandomActiveShowIdx
+	def_special GetSelectedTVShow
 	def_special InterviewBefore
 	def_special InterviewAfter
-	def_special sub_80EF8F8
+	def_special IsLeadMonNicknamedOrNotEnglish
 	def_special SetContestCategoryStringVarForInterview
-	def_special special_0x4a
+	def_special GetNextActiveShowIfMassOutbreak
 	def_special TV_IsScriptShowKindAlreadyInQueue
 	def_special CheckForBigMovieOrEmergencyNewsOnTV
 	def_special GetMomOrDadStringForTVMessage
 	def_special ResetTVShowState
-	def_special sub_80F831C
-	def_special sub_80F84B0
+	def_special GetContestWinnerId
+	def_special GetContestPlayerId
 	def_special sub_80F8814
-	def_special sub_80F834C
-	def_special sub_80F8390
-	def_special sub_80F8850
-	def_special sub_80F82B4
+	def_special BufferContestWinnerTrainerName
+	def_special BufferContestWinnerMonName
+	def_special BufferContestTrainerAndMonNames
+	def_special GetContestMonConditionRanking
 	def_special SetContestTrainerGfxIds
-	def_special sub_80F7F30
+	def_special TryEnterContestMon
 	def_special sub_80F8970
-	def_special sub_80F8AFC
-	def_special sub_80F82FC
-	def_special sub_80F7F7C
-	def_special sub_80F7FFC
-	def_special sub_80F8D24
+	def_special SetLinkContestPlayerGfx
+	def_special GetContestMonCondition
+	def_special HasMonWonThisContestBefore
+	def_special GiveMonContestRibbon
+	def_special IsContestDebugActive
 	def_special GiveMonArtistRibbon
-	def_special sub_80B3000
+	def_special TryContestGModeLinkup
 	def_special SaveGame
 	def_special DoWateringBerryTreeAnim
 	def_special ShowEasyChatScreen
@@ -134,9 +134,9 @@ gSpecials:: @ 81DBA64
 	def_special CompareSeedotSize
 	def_special GetLotadSizeRecordInfo
 	def_special CompareLotadSize
-	def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged
-	def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	def_special TV_CheckMonOTIDEqualsPlayerID
+	def_special TryPutNameRaterShowOnTheAir
+	def_special BufferMonNickname
+	def_special IsMonOTIDNotPlayers
 	def_special BufferTrendyPhraseString
 	def_special TrendyPhraseIsOld
 	def_special sub_811EF6C
@@ -145,8 +145,8 @@ gSpecials:: @ 81DBA64
 	def_special CalculatePlayerPartyCount
 	def_special CountPartyNonEggMons
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
-	def_special sub_80F88E8
-	def_special sub_80F88DC
+	def_special ShouldReadyContestArtist
+	def_special SaveMuseumContestPainting
 	def_special sub_80F8864
 	def_special CountPlayerContestPaintings
 	def_special ShowContestWinner
@@ -161,7 +161,7 @@ gSpecials:: @ 81DBA64
 	def_special GetPlayerTrainerIdOnesDigit
 	def_special GetPlayerBigGuyGirlString
 	def_special GetRivalSonDaughterString
-	def_special SetFlagInVar
+	def_special SetHiddenItemFlag
 	def_special CableCarWarp
 	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
@@ -170,18 +170,18 @@ gSpecials:: @ 81DBA64
 	def_special ChooseStarter
 	def_special StartWallyTutorialBattle
 	def_special ChangePokemonNickname
-	def_special sub_81B94B0
+	def_special ChoosePartyMon
 	def_special GetFirstFreePokeblockSlot
 	def_special DoBerryBlending
 	def_special PlayRoulette
-	def_special ShouldMoveLilycoveFanClubMember
-	def_special GetNumMovedLilycoveFanClubMembers
-	def_special BufferStreakTrainerText
-	def_special sub_813BA30
-	def_special UpdateMovedLilycoveFanClubMembers
-	def_special sub_813BF60
-	def_special sub_813BA60
-	def_special sub_813BF7C
+	def_special IsFanClubMemberFanOfPlayer
+	def_special GetNumFansOfPlayerInTrainerFanClub
+	def_special BufferFanClubTrainerName
+	def_special TryLoseFansFromPlayTimeAfterLinkBattle
+	def_special TryLoseFansFromPlayTime
+	def_special SetPlayerGotFirstFans
+	def_special UpdateTrainerFanClubGameClear
+	def_special Script_TryGainNewFanFromCounter
 	def_special RockSmashWildEncounter
 	def_special GabbyAndTyGetBattleNum
 	def_special GabbyAndTyAfterInterview
@@ -230,11 +230,11 @@ gSpecials:: @ 81DBA64
 	def_special SetDeptStoreFloor
 	def_special DoLotteryCornerComputerEffect
 	def_special EndLotteryCornerComputerEffect
-	def_special sub_81B951C
-	def_special sub_81B968C
-	def_special sub_81B9770
-	def_special sub_81B9718
-	def_special sub_81B96D0
+	def_special ChooseMonForMoveRelearner
+	def_special MoveDeleterChooseMoveToForget
+	def_special MoveDeleterForgetMove
+	def_special BufferMoveDeleterNicknameAndMove
+	def_special GetNumMovesSelectedMonHas
 	def_special TeachMoveRelearnerMove
 	def_special GetRecordedCyclingRoadResults
 	def_special Special_BeginCyclingRoadChallenge
@@ -243,7 +243,7 @@ gSpecials:: @ 81DBA64
 	def_special UpdateCyclingRoadState
 	def_special GetLeadMonFriendshipScore
 	def_special CallFrontierUtilFunc
-	def_special sub_8161F74
+	def_special CallBattleTowerFunc
 	def_special CallBattleDomeFunction
 	def_special CallBattlePalaceFunction
 	def_special CopyEReaderTrainerGreeting
@@ -281,7 +281,7 @@ gSpecials:: @ 81DBA64
 	def_special CheckLeadMonCute
 	def_special CheckLeadMonSmart
 	def_special CheckLeadMonTough
-	def_special sub_80FB7A4
+	def_special LookThroughPorthole
 	def_special DoSoftReset
 	def_special GameClear
 	def_special MoveElevator
@@ -292,8 +292,8 @@ gSpecials:: @ 81DBA64
 	def_special GetSecretBaseNearbyMapName
 	def_special CheckRelicanthWailord
 	def_special ShouldDoBrailleRegirockEffectOld
-	def_special sub_80B0534
-	def_special sub_80B058C
+	def_special DoOrbEffect
+	def_special FadeOutOrbEffect
 	def_special WaitWeather
 	def_special BufferEReaderTrainerName
 	def_special GetSlotMachineId
@@ -310,7 +310,7 @@ gSpecials:: @ 81DBA64
 	def_special InitRoamer
 	def_special TryUpdateRusturfTunnelState
 	def_special IsGrassTypeInParty
-	def_special sub_80AFC60
+	def_special DoContestHallWarp
 	def_special PutZigzagoonInPlayerParty
 	def_special IsStarterInParty
 	def_special CopyCurSecretBaseOwnerName_StrVar1
@@ -331,14 +331,14 @@ gSpecials:: @ 81DBA64
 	def_special DoDiveWarp
 	def_special DoFallWarp
 	def_special ShowContestEntryMonPic
-	def_special sub_80F8EB8
+	def_special HideContestEntryMonPic
 	def_special SetEReaderTrainerGfxId
 	def_special BattleSetup_StartLatiBattle
 	def_special SetRoute119Weather
 	def_special SetRoute123Weather
 	def_special ScriptGetMultiplayerId
 	def_special ScriptGetPartyMonSpecies
-	def_special sub_81B98DC
+	def_special IsSelectedMonEgg
 	def_special TryInitBattleTowerAwardManEventObject
 	def_special MoveOutOfSecretBaseFromOutside
 	def_special LoadPlayerBag
@@ -346,16 +346,16 @@ gSpecials:: @ 81DBA64
 	def_special SetPacifidlogTMReceivedDay
 	def_special GetDaysUntilPacifidlogTMAvailable
 	def_special HasAllHoennMons
-	def_special MonOTNameMatchesPlayer
+	def_special MonOTNameNotPlayer
 	def_special BufferLottoTicketNumber
 	def_special sub_81653CC
 	def_special DoesPartyHaveEnigmaBerry
 	def_special ScriptRandom
-	def_special sub_81AFDD0
-	def_special sub_80EDCE8
-	def_special sub_80EE2CC
-	def_special sub_80EE72C
-	def_special sub_80EE7C0
+	def_special SetChampionSaveWarp
+	def_special TryPutTreasureInvestigatorsOnAir
+	def_special TryPutLotteryWinnerReportOnAir
+	def_special TrySetUpTrainerFanClubSpecial
+	def_special ShouldHideFanClubInterviewer
 	def_special ShowGlassWorkshopMenu
 	def_special PutFanClubSpecialOnTheAir
 	def_special IncrementDailyPlantedBerries
@@ -400,7 +400,7 @@ gSpecials:: @ 81DBA64
 	def_special ClearQuizLadyQuestionAndAnswer
 	def_special QuizLadySetCustomQuestion
 	def_special QuizLadyTakePrizeForCustomQuiz
-	def_special sub_813986C
+	def_special GetMysteryEventCardVal
 	def_special QuizLadyRecordCustomQuizData
 	def_special QuizLadySetWaitingForChallenger
 	def_special BufferQuizCorrectAnswer
@@ -443,24 +443,24 @@ gSpecials:: @ 81DBA64
 	def_special OffsetCameraForBattle
 	def_special GetDeptStoreDefaultFloorChoice
 	def_special BufferVarsForIVRater
-	def_special sub_80F905C
+	def_special LinkContestWaitForConnection
 	def_special sub_800B518
-	def_special sub_80F90DC
-	def_special sub_80F910C
-	def_special sub_80F9160
+	def_special LinkContestTryShowWirelessIndicator
+	def_special LinkContestTryHideWirelessIndicator
+	def_special IsWirelessContest
 	def_special ShowRankingHallRecordsWindow
 	def_special ScrollRankingHallRecordsWindow
 	def_special ShowFrontierManiacMessage
-	def_special sub_80F9134
-	def_special sub_80F9154
-	def_special sub_80B3028
+	def_special IsContestWithRSPlayer
+	def_special ClearLinkContestFlags
+	def_special TryContestEModeLinkup
 	def_special ShowScrollableMultichoice
 	def_special sub_813A630
 	def_special BufferBattleTowerElevatorFloors
-	def_special sub_81C6A94
+	def_special TryStoreHeldItemsInPyramidBag
 	def_special sub_81C4F24
-	def_special sub_81B95E0
-	def_special sub_81B9620
+	def_special DoBattlePyramidMonsHaveHeldItem
+	def_special BattlePyramidChooseMonHeldItems
 	def_special SetBattleTowerLinkPlayerGfx
 	def_special ShowNatureGirlMessage
 	def_special ShowBattlePointsWindow
@@ -479,17 +479,17 @@ gSpecials:: @ 81DBA64
 	def_special ShowFrontierGamblerLookingMessage
 	def_special ShowFrontierGamblerGoMessage
 	def_special Script_DoRayquazaScene
-	def_special sub_81C72A4
+	def_special OpenPokenavForTutorial
 	def_special ScriptMenu_CreateStartMenuForPokenavTutorial
 	def_special CountPlayerTrainerStars
 	def_special BufferBattleFrontierTutorMoveName
 	def_special CloseBattleFrontierTutorWindow
 	def_special sub_813ADD4
-	def_special OpenPartyMenuForMoveTutor
+	def_special ChooseMonForMoveTutor
 	def_special GetBattleFrontierTutorMoveIndex
 	def_special sub_813AF48
 	def_special DoDeoxysRockInteraction
-	def_special sub_813B1D0
+	def_special SetDeoxysRockPalette
 	def_special CreateObedientEnemyMon
 	def_special StartMirageTowerDisintegration
 	def_special StartMirageTowerShake
@@ -519,17 +519,17 @@ gSpecials:: @ 81DBA64
 	def_special Script_DoRayquazaScene @ Listed twice
 	def_special LoopWingFlapSE
 	def_special sub_81D4BEC
-	def_special sub_80224D0
+	def_special ShowBerryCrushRankings
 	def_special TryBufferWaldaPhrase
 	def_special DoWaldaNamingScreen
 	def_special TryGetWallpaperWithWaldaPhrase
 	def_special PlayerNotAtTrainerHillEntrance
 	def_special GetBattlePyramidHint
-	def_special sub_80F8B94
+	def_special LoadLinkContestPlayerPalettes
 	def_special ShowTrainerHillRecords
-	def_special sub_80B4808
+	def_special PlayerFaceTrainerAfterBattle
 	def_special ResetHealLocationFromDewford
-	def_special sub_81B9918
+	def_special IsLastMonThatKnowsSurf
 	def_special CountPartyAliveNonEggMons
 	def_special TryPrepareSecondApproachingTrainer
 	def_special RemoveRecordsWindow
diff --git a/data/text/apprentice.inc b/data/text/apprentice.inc
new file mode 100644
index 000000000..7d5bab198
--- /dev/null
+++ b/data/text/apprentice.inc
@@ -0,0 +1,2527 @@
+gText_ApprenticeChallenge0:: @ 82B6EA5
+	.string "Um, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
+	.string "Snivel… This tension is getting to me…$"
+
+gText_ApprenticeChallenge1:: @ 82B6EEC
+	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
+	.string "Here we come!$"
+
+gText_ApprenticeChallenge2:: @ 82B6F16
+	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n"
+	.string "Accept my challenge!$"
+
+gText_ApprenticeChallenge3:: @ 82B6F4C
+	.string "Um… I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…\n"
+	.string "Do you think someone like me can win?$"
+
+gText_ApprenticeChallenge4:: @ 82B6F92
+	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
+	.string "I'll let you challenge me!$"
+
+gText_ApprenticeChallenge5:: @ 82B6FC9
+	.string "I'm horribly busy, but I also happen\n"
+	.string "to be {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$"
+
+gText_ApprenticeChallenge6:: @ 82B700C
+	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
+	.string "Glad to meet you!$"
+
+gText_ApprenticeChallenge7:: @ 82B703A
+	.string "I serve as {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
+	.string "May I begin?$"
+
+gText_ApprenticeChallenge8:: @ 82B706A
+	.string "Eek! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
+	.string "I'll do my best!$"
+
+gText_ApprenticeChallenge9:: @ 82B709C
+	.string "Yeehaw! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
+	.string "Put 'em up!$"
+
+gText_ApprenticeChallenge10:: @ 82B70CC
+	.string "I'm {STR_VAR_1}'s 1,000th apprentice!\n"
+	.string "Actually, I'm no. {STR_VAR_2}! Here goes!$"
+
+gText_ApprenticeChallenge11:: @ 82B710A
+	.string "Yeah, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
+	.string "Let's get rockin' and a-rollin'!$"
+
+gText_ApprenticeChallenge12:: @ 82B714D
+	.string "Yippee-yahoo! I'm what you call\n"
+	.string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
+
+gText_ApprenticeChallenge13:: @ 82B7185
+	.string "Cough! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
+	.string "Good to meet you! Cough!$"
+
+gText_ApprenticeChallenge14:: @ 82B71C1
+	.string "This is nerve-racking…\n"
+	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
+
+gText_ApprenticeChallenge15:: @ 82B71F9
+	.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n"
+	.string "and that's no lie.$"
+
+gText_ApprenticePleaseTeach0:: @ 82B7229
+	.string "Are you… {PLAYER}?\n"
+	.string "Oh! Sniff…sob…\p"
+	.string "Oh! S-sorry…\n"
+	.string "I'm so nervous, I can't help crying…\p"
+	.string "I'm {STR_VAR_1}, and I really look up\n"
+	.string "to you, {PLAYER}.\p"
+	.string "I… I had this dream of one day meeting\n"
+	.string "you and asking you about POKéMON.\p"
+	.string "Please, please, {PLAYER}!\n"
+	.string "Please teach me about POKéMON!$"
+
+gText_ApprenticeRejectTeaching0:: @ 82B731C
+	.string "Oh… B-but…\n"
+	.string "Snivel… Waaaaaaah!\p"
+	.string "Please!\n"
+	.string "I'm begging you, please!$"
+
+gText_ApprenticeWhichLevelMode0:: @ 82B735B
+	.string "Oh, really? You will?\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Oh… I'm sorry…\n"
+	.string "I'm so happy, I'm crying…\p"
+	.string "Um… Then please tell me!\n"
+	.string "It's about the BATTLE TOWER.\p"
+	.string "Which would be better for me: Level 50\n"
+	.string "or the Open Level?$"
+
+gText_ApprenticeLevelModeThanks0:: @ 82B7423
+	.string "{STR_VAR_1}?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I'm so sorry!\n"
+	.string "You've made me happy by choosing\l"
+	.string "the level for me, and it's made me cry…\p"
+	.string "Snivel…\n"
+	.string "Thank you so much!\l"
+	.string "Please talk with me again!$"
+
+gText_ApprenticePleaseTeach1:: @ 82B74C1
+	.string "Wowee! You're {PLAYER}, aren't you?\n"
+	.string "You're awesomely strong, aren't you?\p"
+	.string "I'm {STR_VAR_1}!\n"
+	.string "I just became a TRAINER!\p"
+	.string "Please, {PLAYER}!\n"
+	.string "Can you be my teacher and tell me\l"
+	.string "lots about being a TRAINER?$"
+
+gText_ApprenticeRejectTeaching1:: @ 82B756F
+	.string "Aww, why?\n"
+	.string "Oh, please? Pretty please?\l"
+	.string "Please be my teacher, please!$"
+
+gText_ApprenticeWhichLevelMode1:: @ 82B75B2
+	.string "Yay! Great!\p"
+	.string "The first thing I wanted to ask you is\n"
+	.string "about the BATTLE TOWER!\p"
+	.string "The Level 50 and Open Level Rooms…\n"
+	.string "Which would be perfect for me?$"
+
+gText_ApprenticeLevelModeThanks1:: @ 82B763F
+	.string "{STR_VAR_1}, huh? That's true!\n"
+	.string "I'll do my best there!\p"
+	.string "If we meet here again, please teach\n"
+	.string "me something else, teacher!$"
+
+gText_ApprenticePleaseTeach2:: @ 82B76AC
+	.string "Um… Are you {PLAYER}?\n"
+	.string "My name is {STR_VAR_1}.\p"
+	.string "I want to become a POKéMON TRAINER,\n"
+	.string "but I don't know what to do…\p"
+	.string "So I thought maybe I could ask you for\n"
+	.string "advice because you're so famous.\p"
+	.string "{PLAYER}, could you give me advice?$"
+
+gText_ApprenticeRejectTeaching2:: @ 82B7772
+	.string "Oh, but…\p"
+	.string "I sincerely want to become a POKéMON\n"
+	.string "TRAINER!\p"
+	.string "Please, can you answer my questions?$"
+
+gText_ApprenticeWhichLevelMode2:: @ 82B77CE
+	.string "Thank you!\n"
+	.string "Here's my first question right away!\p"
+	.string "The BATTLE TOWER has two levels,\n"
+	.string "Level 50 and Open Level, right?\p"
+	.string "Which level do you think is more\n"
+	.string "suitable for me?$"
+
+gText_ApprenticeLevelModeThanks2:: @ 82B7871
+	.string "Oh, the {STR_VAR_1} challenge?\n"
+	.string "Understood!\p"
+	.string "If I have another question, I'll come\n"
+	.string "back here for your advice!$"
+
+gText_ApprenticePleaseTeach3:: @ 82B78D4
+	.string "Oh? Huh? You're…\n"
+	.string "No, that can't be true.\p"
+	.string "There isn't any way that someone\n"
+	.string "like me could meet {PLAYER}.\p"
+	.string "…You really are {PLAYER}?\n"
+	.string "I can't believe I'm talking to you!\p"
+	.string "When something this good happens,\n"
+	.string "only terrible things will happen to me\l"
+	.string "now, I just know it…\p"
+	.string "…I'm sorry…\n"
+	.string "I'm… {STR_VAR_1}…\p"
+	.string "There isn't anything special about\n"
+	.string "me that I can be proud of…\p"
+	.string "I shouldn't even say anything about\n"
+	.string "myself because you'll forget…\p"
+	.string "I had this dream that if I ever met\n"
+	.string "you, {PLAYER}, that maybe I could ask\l"
+	.string "you for advice as a TRAINER.\p"
+	.string "But I don't think you would agree\n"
+	.string "to that.\p"
+	.string "…Or will you be so kind as to give\n"
+	.string "me advice?$"
+
+gText_ApprenticeRejectTeaching3:: @ 82B7B1A
+	.string "I knew it…\p"
+	.string "It had to happen because I'm such\n"
+	.string "a really boring nobody…\p"
+	.string "But I thought just maybe…\n"
+	.string "You won't reconsider, will you?\p"
+	.string "But I can't give up just like that.\n"
+	.string "I'll ask you while I'm still lucky!\p"
+	.string "Please, will you be so kind as to give\n"
+	.string "me advice?$"
+
+gText_ApprenticeWhichLevelMode3:: @ 82B7C13
+	.string "Really? I can't believe it!\n"
+	.string "I can't believe you'll advise me!\l"
+	.string "I… I'm so happy…\p"
+	.string "What I want to ask you is really\n"
+	.string "trivial, but I can't decide…\p"
+	.string "At the BATTLE TOWER, they let you\n"
+	.string "choose Level 50 or Open Level.\p"
+	.string "Which course do you think even I may\n"
+	.string "have a chance at?$"
+
+gText_ApprenticeLevelModeThanks3:: @ 82B7D18
+	.string "{STR_VAR_1}? Okay!\n"
+	.string "But do you really think someone like\l"
+	.string "me would have a chance?\p"
+	.string "I'll do my best, even though I don't\n"
+	.string "think it will work.\p"
+	.string "Thank you very much for spending\n"
+	.string "time with someone like me.$"
+
+gText_ApprenticePleaseTeach4:: @ 82B7DD4
+	.string "Oh! You're {PLAYER}{KUN}, aren't you?\p"
+	.string "I've heard that you're tough at\n"
+	.string "POKéMON!\p"
+	.string "I'm {STR_VAR_1}!\n"
+	.string "I'll be your friend!\p"
+	.string "Did you know?\p"
+	.string "You can't win at the BATTLE FRONTIER\n"
+	.string "if all you know is what they teach at\l"
+	.string "the TRAINER'S SCHOOL.\p"
+	.string "I'm willing to listen to your advice.\n"
+	.string "You'll agree, of course?$"
+
+gText_ApprenticeRejectTeaching4:: @ 82B7EE5
+	.string "Huh? Why are you refusing me?\n"
+	.string "It's me who's asking you!\l"
+	.string "You have to reconsider!$"
+
+gText_ApprenticeWhichLevelMode4:: @ 82B7F35
+	.string "Okay, so there is this something.\n"
+	.string "I want you to decide it for me.\p"
+	.string "You know that the BATTLE TOWER has\n"
+	.string "Level 50 and Open Level Rooms?\p"
+	.string "Which do you think would be good\n"
+	.string "for me, {PLAYER}{KUN}?$"
+
+gText_ApprenticeLevelModeThanks4:: @ 82B7FE8
+	.string "Okay, {STR_VAR_1} is suitable for me?\n"
+	.string "Thank you!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticePleaseTeach5:: @ 82B8087
+	.string "Oh, hi, there! {PLAYER}{KUN}!\n"
+	.string "I know you because you're famous!\l"
+	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
+	.string "I'm a TRIATHLETE, so I keep myself\n"
+	.string "fit even while I raise POKéMON.\p"
+	.string "I'm also involved with other things\n"
+	.string "like work, napping, ballroom dancing…\p"
+	.string "Being this busy, it's not so easy for\n"
+	.string "me to become a decent TRAINER.\p"
+	.string "So, I have a proposition!\p"
+	.string "There must be a reason why we met.\n"
+	.string "So, {PLAYER}{KUN}, how about sharing your\l"
+	.string "wisdom with me every so often?$"
+
+gText_ApprenticeRejectTeaching5:: @ 82B822B
+	.string "Oh, but, please?\n"
+	.string "A guy like me needs someone like\l"
+	.string "you, {PLAYER}{KUN}!\p"
+	.string "Honestly, I need your advice!$"
+
+gText_ApprenticeWhichLevelMode5:: @ 82B8286
+	.string "Thank you! That's more like it!\n"
+	.string "So, let's start with an easy one!\p"
+	.string "You know about the BATTLE TOWER's\n"
+	.string "two courses, right?\l"
+	.string "You know, Level 50 and Open Level.\p"
+	.string "Me being a busy guy, which one should\n"
+	.string "I gear up for?$"
+
+gText_ApprenticeLevelModeThanks5:: @ 82B8356
+	.string "{STR_VAR_1}, huh? Okay, gotcha.\n"
+	.string "I'll find time somehow and give it a go!\p"
+	.string "…Whoops, I'd better go to work!\n"
+	.string "Thanks! See you around!$"
+
+gText_ApprenticePleaseTeach6:: @ 82B83CE
+	.string "No way! Uh-uh!\n"
+	.string "Are you maybe the real {PLAYER}?\p"
+	.string "A-hah! Awesome! I'm {STR_VAR_1},\n"
+	.string "so pleased to meet you!\p"
+	.string "{PLAYER}, you're very strong,\n"
+	.string "aren't you?\p"
+	.string "Everyone's talking about you!\p"
+	.string "Oh! I just had this great idea!\n"
+	.string "I'll get advice off you, {PLAYER}!\l"
+	.string "I'm sure it will make me tougher!\p"
+	.string "Isn't it a great idea?\n"
+	.string "Please, I want your advice!$"
+
+gText_ApprenticeRejectTeaching6:: @ 82B84FC
+	.string "Ahahaha, you can pretend to be mean,\n"
+	.string "but you can't fool me!\l"
+	.string "You really mean okay, don't you?$"
+
+gText_ApprenticeWhichLevelMode6:: @ 82B8559
+	.string "Yay! I knew you'd have a big heart,\n"
+	.string "{PLAYER}!\p"
+	.string "What should I ask you first?\n"
+	.string "…Oh, I thought of something!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I were to take a BATTLE TOWER\n"
+	.string "challenge, which way should I go?\p"
+	.string "Level 50 or Open Level?\n"
+	.string "Which suits me more?$"
+
+gText_ApprenticeLevelModeThanks6:: @ 82B8656
+	.string "Oh-oh-oh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thank you for a totally cool reply!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticePleaseTeach7:: @ 82B86EA
+	.string "I beg your pardon, but…\n"
+	.string "Are you {PLAYER}?\p"
+	.string "I'm {STR_VAR_1}, and I am delighted to\n"
+	.string "make your acquaintance.\p"
+	.string "I have long been an admirer\n"
+	.string "of yours…\p"
+	.string "… … … … … …\p"
+	.string "Um… I hope you don't find this\n"
+	.string "request too much of a burden, but…\p"
+	.string "May I become your apprentice,\n"
+	.string "{PLAYER}?$"
+
+gText_ApprenticeRejectTeaching7:: @ 82B87DA
+	.string "Oh…!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "…I must have fainted from shock.\n"
+	.string "I'm sorry, I must have misheard you.\p"
+	.string "Please! Please say that you will\n"
+	.string "accept me as your apprentice!$"
+
+gText_ApprenticeWhichLevelMode7:: @ 82B887C
+	.string "Oh… I'm delighted!\p"
+	.string "I don't wish to waste your time,\n"
+	.string "so please advise me on this.\p"
+	.string "I plan to take a BATTLE TOWER\n"
+	.string "challenge soon.\p"
+	.string "However, there are two levels…\p"
+	.string "Which would be most suitable for me?\n"
+	.string "Level 50 or Open Level?$"
+
+gText_ApprenticeLevelModeThanks7:: @ 82B8957
+	.string "{STR_VAR_1} is your choice!\n"
+	.string "I see. I will do my best!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticePleaseTeach8:: @ 82B89C6
+	.string "Eek! Eek! {PLAYER}!\n"
+	.string "You spoke to me!\l"
+	.string "I… I'm overjoyed!\p"
+	.string "Me! My name is {STR_VAR_1}!\n"
+	.string "I just became a TRAINER!\p"
+	.string "I'm delighted I met you, {PLAYER},\n"
+	.string "the big name in POKéMON circles!\p"
+	.string "Oh-oh-oh, I know!\n"
+	.string "May I ask a huge favor, {PLAYER}?\p"
+	.string "Please take me in as your apprentice!\n"
+	.string "I want to learn from you!$"
+
+gText_ApprenticeRejectTeaching8:: @ 82B8ACF
+	.string "Waaaah!\n"
+	.string "{PLAYER} turned me down…\l"
+	.string "It… It's an invaluable experience!\p"
+	.string "{PLAYER}, please! I want to hear\n"
+	.string "an affirmative answer this time!\p"
+	.string "I beg you for your guidance!$"
+
+gText_ApprenticeWhichLevelMode8:: @ 82B8B66
+	.string "Hieeeeh! {PLAYER} said yes!\n"
+	.string "{PLAYER} said yes!\p"
+	.string "I won't be able to sleep tonight…\n"
+	.string "Thank you ever so much!\p"
+	.string "Then, here's my question!\p"
+	.string "At the BATTLE TOWER, what is right\n"
+	.string "for me, Level 50 or Open Level?$"
+
+gText_ApprenticeLevelModeThanks8:: @ 82B8C20
+	.string "{STR_VAR_1}! Perfectly understood!\n"
+	.string "I understand perfectly!\l"
+	.string "I'm deliriously delighted!\p"
+	.string "I hope you'll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_ApprenticePleaseTeach9:: @ 82B8CAA
+	.string "Whoa! Could you be…\n"
+	.string "Might you be… {PLAYER}{KUN}?!\l"
+	.string "That strong and famous TRAINER?\l"
+	.string "Well, hello, aren't I just the luckiest!\p"
+	.string "Hello, the name's {STR_VAR_1}!\p"
+	.string "I've been on the lookout for\n"
+	.string "a POKéMON teacher.\p"
+	.string "And with impeccably good timing,\n"
+	.string "along came you, {PLAYER}{KUN}!\p"
+	.string "So, there you have it, {PLAYER}{KUN}!\n"
+	.string "Let me apprentice under you!$"
+
+gText_ApprenticeRejectTeaching9:: @ 82B8DD3
+	.string "Gwaaaah!\n"
+	.string "You're quite cool and tough…\p"
+	.string "Don't be that way, please.\n"
+	.string "I'm asking you!$"
+
+gText_ApprenticeWhichLevelMode9:: @ 82B8E24
+	.string "Oh, yeah! That's a solid reply!\n"
+	.string "Excellent, I might add!\p"
+	.string "So how about a first piece of advice\n"
+	.string "on the BATTLE TOWER?\p"
+	.string "If I were to go, what would be better?\n"
+	.string "Level 50 or Open Level?$"
+
+gText_ApprenticeLevelModeThanks9:: @ 82B8ED5
+	.string "Uh-huh, {STR_VAR_1} it is!\n"
+	.string "OK, A-OK!\l"
+	.string "I'll go show my mettle, like, jam!\p"
+	.string "All right, I'll look to you as my mentor!\n"
+	.string "Adios!$"
+
+gText_ApprenticePleaseTeach10:: @ 82B8F45
+	.string "Oh, hey, {PLAYER}{KUN}, right?\n"
+	.string "The police were looking for you!\p"
+	.string "… … …\n"
+	.string "Of course I'm lying!\p"
+	.string "Me, I'm {STR_VAR_1}. Despite the way\n"
+	.string "I look, I'm the POKéMON CHAMPION!\l"
+	.string "…That's a lie, too!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at battling.\p"
+	.string "So, how about you becoming my master\n"
+	.string "about all things POKéMON?$"
+
+gText_ApprenticeRejectTeaching10:: @ 82B905F
+	.string "If you're going to act cold like that,\n"
+	.string "I'll show you what I'll do!\p"
+	.string "Waaah! Waaah! Waaah!\n"
+	.string "Hiccup!\p"
+	.string "Hahaha, that was my FAKE TEARS!\p"
+	.string "Come on, will you please be\n"
+	.string "my POKéMON master?$"
+
+gText_ApprenticeWhichLevelMode10:: @ 82B910E
+	.string "Yippee!\n"
+	.string "I'll buy you a boat for that!\p"
+	.string "Of course I'm lying again!\n"
+	.string "But… Thank you, master!\p"
+	.string "You know how there's Level 50 and\n"
+	.string "Open Level at the BATTLE TOWER?\p"
+	.string "I'm having trouble deciding which\n"
+	.string "level I should challenge…\p"
+	.string "Can you decide for me, master?$"
+
+gText_ApprenticeLevelModeThanks10:: @ 82B9204
+	.string "Okay, so {STR_VAR_1} is better!\n"
+	.string "I'll go to the other level, then!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticePleaseTeach11:: @ 82B929C
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy, and it means hi!\p"
+	.string "I'm {STR_VAR_1}, the rappin' SAILOR\n"
+	.string "am I!\p"
+	.string "Your turn now, tell me a little about\n"
+	.string "yourself, give it a try!\p"
+	.string "Uh-huh, uh-huh!\n"
+	.string "{PLAYER}{KUN}'s your name,\l"
+	.string "and POKéMON's your game!\p"
+	.string "And you're at a delicate age\n"
+	.string "when all the world's your stage!\p"
+	.string "Anyway, I just want to say,\n"
+	.string "that you're the tenth TRAINER\l"
+	.string "I've spoken to today.\p"
+	.string "Let's make that a celebration!\n"
+	.string "Become my mentor for commemoration!$"
+
+gText_ApprenticeRejectTeaching11:: @ 82B9438
+	.string "But!\n"
+	.string "You have to work with me!\p"
+	.string "Don't be such a tease!\n"
+	.string "Become my mentor, please!$"
+
+gText_ApprenticeWhichLevelMode11:: @ 82B9488
+	.string "That's it!\n"
+	.string "{PLAYER}, you've got the spirit!\p"
+	.string "So here's my first question\n"
+	.string "that begs your suggestion!\p"
+	.string "It's about the BATTLE TOWER,\n"
+	.string "and it hinges on my power!\p"
+	.string "Level 50 and Open Level there be,\n"
+	.string "which is the one that's good for me?$"
+
+gText_ApprenticeLevelModeThanks11:: @ 82B9564
+	.string "Okay, {STR_VAR_1} it is, you say!\n"
+	.string "I'll go and take it on my way!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticePleaseTeach12:: @ 82B95D8
+	.string "Say, hey, aren't you {PLAYER}?\n"
+	.string "What should I do? Talk to you?\l"
+	.string "Why not? I'm already talking to you!\p"
+	.string "{PLAYER}, are you surprised at me?\n"
+	.string "I'd better tell you who I happen to be!\p"
+	.string "{STR_VAR_1} is what you can call me.\n"
+	.string "The brightest star in guitardom,\l"
+	.string "that's me!\p"
+	.string "Are you receiving me?\n"
+	.string "You are receiving me!\p"
+	.string "My luck's at its best,\n"
+	.string "I'll hit you with a request!\p"
+	.string "{PLAYER}, let me be your underling!\n"
+	.string "I want you to teach me everything!$"
+
+gText_ApprenticeRejectTeaching12:: @ 82B9763
+	.string "You're turning me down, then?\n"
+	.string "I'll just have to ask you again!\p"
+	.string "{PLAYER}, I beg to be your underling!\n"
+	.string "I need you to teach me everything!$"
+
+gText_ApprenticeWhichLevelMode12:: @ 82B97E5
+	.string "Lucky, yeah, woohoo!\n"
+	.string "Should I pop a question to you?\p"
+	.string "Since we're near the BATTLE TOWER,\n"
+	.string "how about a question about its power?\p"
+	.string "Of the choices you see,\n"
+	.string "which is the right one for me?$"
+
+gText_ApprenticeLevelModeThanks12:: @ 82B989A
+	.string "If {STR_VAR_1} is what you suggest,\n"
+	.string "it must be the very best!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticePleaseTeach13:: @ 82B992D
+	.string "Oh, hi! You there!\n"
+	.string "Can I get you to massage my shoulder?\p"
+	.string "…Yes, there! That's it!\n"
+	.string "Ouch, ouch! Oooh, that feels great!\p"
+	.string "My name's {STR_VAR_1}.\n"
+	.string "I take karate training, but my body's\l"
+	.string "not built to take the abuse…\p"
+	.string "I decided I'll battle POKéMON and\n"
+	.string "toughen myself up.\p"
+	.string "You're {PLAYER}{KUN}, aren't you?\n"
+	.string "The POKéMON LEAGUE CHAMP?\p"
+	.string "Listen, can I get you to give me\n"
+	.string "advice?$"
+
+gText_ApprenticeRejectTeaching13:: @ 82B9A84
+	.string "Oh, why?\p"
+	.string "I won't be a big bother, I promise!\n"
+	.string "Please?$"
+
+gText_ApprenticeWhichLevelMode13:: @ 82B9AB9
+	.string "Thank you. Mighty good of you!\n"
+	.string "…Cough! Cough!\p"
+	.string "Oogh, I have to toughen up quick…\p"
+	.string "I'll be heading off to the BATTLE TOWER\n"
+	.string "right away, but what would be better\l"
+	.string "for me? Level 50 or Open Level?$"
+
+gText_ApprenticeLevelModeThanks13:: @ 82B9B76
+	.string "Hm, all right. That's {STR_VAR_1}.\n"
+	.string "I'll go there right away.\p"
+	.string "I hope I can keep hitting you up for\n"
+	.string "help--after all, you're my mentor!$"
+
+gText_ApprenticePleaseTeach14:: @ 82B9BF2
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}…?\p"
+	.string "Please, don't look at me that way.\n"
+	.string "You're making me all self-conscious.\p"
+	.string "I… I'm {STR_VAR_1}.\p"
+	.string "I'm really embarrassed to say this,\n"
+	.string "but I explore ancient ruins and such.\p"
+	.string "I'm even more embarrassed to admit\n"
+	.string "I'm interested in the BATTLE FRONTIER.\p"
+	.string "{PLAYER}{KUN}, you have a reputation as\n"
+	.string "a tough TRAINER…\p"
+	.string "It's hard for me to say this,\n"
+	.string "but I want to ask something.\p"
+	.string "Could you become my teacher and\n"
+	.string "give me advice?$"
+
+gText_ApprenticeRejectTeaching14:: @ 82B9D83
+	.string "Please don't brush me off like this!\n"
+	.string "I can't live with the humiliation.\p"
+	.string "Please become my teacher!\n"
+	.string "I need your advice!$"
+
+gText_ApprenticeWhichLevelMode14:: @ 82B9DF9
+	.string "Th-thank you…\p"
+	.string "But please don't look at me like that.\n"
+	.string "It makes me all flustered.\p"
+	.string "Please, answer me without looking\n"
+	.string "at my eyes.\p"
+	.string "At the BATTLE TOWER…\n"
+	.string "Which level should I attempt?$"
+
+gText_ApprenticeLevelModeThanks14:: @ 82B9EAA
+	.string "Oh… Okay!\n"
+	.string "I'll try my hand at that.\p"
+	.string "I hope I can make a valiant challenge\n"
+	.string "without getting all flustered…\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticePleaseTeach15:: @ 82B9F55
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really real?\p"
+	.string "You may call me {STR_VAR_1}.\p"
+	.string "I have been toying with the idea of\n"
+	.string "apprenticing under a strong TRAINER.\p"
+	.string "So, I must say I'm lucky you came along!\n"
+	.string "…You really are {PLAYER}{KUN}, yes?\p"
+	.string "No, no, if you are real, it's fine.\n"
+	.string "I merely want you to recognize me\l"
+	.string "as your apprentice.$"
+
+gText_ApprenticeRejectTeaching15:: @ 82BA084
+	.string "Oh?\n"
+	.string "But what would compel you to refuse?\p"
+	.string "I apologize for being skeptical about\n"
+	.string "your identity.\p"
+	.string "Please accept my apology and\n"
+	.string "accept me as your apprentice.$"
+
+gText_ApprenticeWhichLevelMode15:: @ 82BA11D
+	.string "You really are accepting me?\n"
+	.string "I don't wish to celebrate prematurely.\p"
+	.string "If it is true, I apologize.\n"
+	.string "But now, I need your advice.\p"
+	.string "If I were to enter the BATTLE TOWER,\n"
+	.string "what would be worthy of me?\l"
+	.string "Level 50 or Open Level?$"
+
+gText_ApprenticeLevelModeThanks15:: @ 82BA1F3
+	.string "{STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I realize I can annoy, but it delights\n"
+	.string "me that you have accepted me.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticeWhatHeldItem0:: @ 82BA2A3
+	.string "Sigh… Sob…\n"
+	.string "Oh, {PLAYER}!\p"
+	.string "I'm all tangled up in a dilemma\n"
+	.string "that I can't decide.\p"
+	.string "I can't decide what I should make\n"
+	.string "my {STR_VAR_1} hold.\p"
+	.string "Please tell me, {PLAYER}.\n"
+	.string "What item should I make it hold?$"
+
+gText_ApprenticeHoldNothing0:: @ 82BA34E
+	.string "Oh, really? I shouldn't make\n"
+	.string "my {STR_VAR_1} hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem0:: @ 82BA380
+	.string "Oh, okay! I'm delighted it's settled!\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Thank you so much!$"
+
+gText_ApprenticeThanksHeldItem0:: @ 82BA3D2
+	.string "Oh, I'm so glad…\n"
+	.string "I think I have that {STR_VAR_1}, too.\p"
+	.string "I'm delighted it's settled!\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Thank you so much!$"
+
+gText_ApprenticeItemAlreadyRecommended0:: @ 82BA448
+	.string "Waaaah! Please don't be mean!\p"
+	.string "That item {STR_VAR_1} was already\n"
+	.string "recommended to me before, sob…\p"
+	.string "Or do you mean I shouldn't make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_ApprenticeWhatHeldItem1:: @ 82BA4D3
+	.string "Yay! It's {PLAYER}!\n"
+	.string "Great! I wanted to ask you something!\p"
+	.string "Do you make your POKéMON hold items?\n"
+	.string "I want to make mine hold items, but…\p"
+	.string "What item would be good for\n"
+	.string "{STR_VAR_1} to hold?\p"
+	.string "What do you think?$"
+
+gText_ApprenticeHoldNothing1:: @ 82BA58C
+	.string "Huh? You mean my {STR_VAR_1} doesn't\n"
+	.string "have to hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem1:: @ 82BA5BF
+	.string "Oh, I get it! I'll do that!\n"
+	.string "Thanks for teaching me!$"
+
+gText_ApprenticeThanksHeldItem1:: @ 82BA5F3
+	.string "Oh, wow! One {STR_VAR_1}, huh?\n"
+	.string "Okay, I'll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_ApprenticeItemAlreadyRecommended1:: @ 82BA635
+	.string "Oh, uh, no, that's not what I meant.\n"
+	.string "I want to know about a different item\l"
+	.string "than the ones I already know.\p"
+	.string "Or do you mean that my POKéMON doesn't\n"
+	.string "have to hold anything this time?$"
+
+gText_ApprenticeWhatHeldItem2:: @ 82BA6E6
+	.string "{PLAYER}, hello!\n"
+	.string "It's about my {STR_VAR_1}…\p"
+	.string "I want to make it hold a good item.\n"
+	.string "What would be good for it?$"
+
+gText_ApprenticeHoldNothing2:: @ 82BA742
+	.string "Oh, then my {STR_VAR_1} doesn't have\n"
+	.string "to hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem2:: @ 82BA770
+	.string "Okay, I got it!\n"
+	.string "See you again!$"
+
+gText_ApprenticeThanksHeldItem2:: @ 82BA78F
+	.string "Oh, the item {STR_VAR_1}?\n"
+	.string "Understood!\p"
+	.string "I'll do my best to find one!\n"
+	.string "See you again!$"
+
+gText_ApprenticeItemAlreadyRecommended2:: @ 82BA7D8
+	.string "Somebody taught me about\n"
+	.string "the {STR_VAR_1} already.\p"
+	.string "I want my POKéMON to hold a different\n"
+	.string "kind of item.\p"
+	.string "Or do you think {STR_VAR_2} doesn't\n"
+	.string "have to hold anything?$"
+
+gText_ApprenticeWhatHeldItem3:: @ 82BA867
+	.string "Hello, {PLAYER}…\n"
+	.string "I'm sorry to disturb you, but I have\l"
+	.string "something else I wanted to ask you.\p"
+	.string "I don't think I'm good enough to win\n"
+	.string "matches on my own, so I'm thinking of\l"
+	.string "making my {STR_VAR_1} hold an item.\p"
+	.string "But I don't know what would be good.\p"
+	.string "{PLAYER}, please, could you decide\n"
+	.string "for me?$"
+
+gText_ApprenticeHoldNothing3:: @ 82BA96B
+	.string "A POKéMON belonging to someone like me\n"
+	.string "would be better off without an item?$"
+
+gText_ApprenticeThanksNoHeldItem3:: @ 82BA9B7
+	.string "I understand…\n"
+	.string "You're saying I shouldn't rely on items.\l"
+	.string "I'll do my best not to!\p"
+	.string "Thank you very much!$"
+
+gText_ApprenticeThanksHeldItem3:: @ 82BAA1B
+	.string "The item {STR_VAR_1}, okay.\n"
+	.string "I'm not sure if I can get one…\l"
+	.string "No! I'll do my best to get it.\p"
+	.string "Thank you very much!$"
+
+gText_ApprenticeItemAlreadyRecommended3:: @ 82BAA81
+	.string "Oh, but…\n"
+	.string "I think I've heard about that before…\p"
+	.string "Is it maybe because I haven't handled\n"
+	.string "the item {STR_VAR_1} very well?\p"
+	.string "Or do you mean I shouldn't make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_ApprenticeWhatHeldItem4:: @ 82BAB22
+	.string "Oh, {PLAYER}{KUN}.\n"
+	.string "There's something I wanted to ask you.\p"
+	.string "You know how you decided which\n"
+	.string "POKéMON I should have for me?\p"
+	.string "But I never asked you what item\n"
+	.string "it should be holding.\p"
+	.string "Since you already gave me advice,\n"
+	.string "how about seeing this to the end?\p"
+	.string "What would be good? I want to make\n"
+	.string "my {STR_VAR_1} hold something.$"
+
+gText_ApprenticeHoldNothing4:: @ 82BAC43
+	.string "Oh! So my {STR_VAR_1} should do\n"
+	.string "the best it can empty-handed?$"
+
+gText_ApprenticeThanksNoHeldItem4:: @ 82BAC78
+	.string "If you think that's best, I'll do that.\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticeThanksHeldItem4:: @ 82BAD17
+	.string "The item {STR_VAR_1}, huh?\n"
+	.string "Not bad. I'll use it!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticeItemAlreadyRecommended4:: @ 82BADB6
+	.string "Huh? What are you saying?\n"
+	.string "You told me about the {STR_VAR_1}\l"
+	.string "already before.\p"
+	.string "Or do you mean my {STR_VAR_2} should\n"
+	.string "do the best it can empty-handed?$"
+
+gText_ApprenticeWhatHeldItem5:: @ 82BAE36
+	.string "Yo, {PLAYER}{KUN}!\p"
+	.string "We're both busy, but we seem to run\n"
+	.string "into each other often anyway!\p"
+	.string "Today I have to do some walking,\n"
+	.string "cleaning, and brushing.\p"
+	.string "I haven't even had the time to buy\n"
+	.string "my precious {STR_VAR_1} anything.\p"
+	.string "I don't have any time, so how about\n"
+	.string "giving me advice on what I should make\l"
+	.string "my {STR_VAR_1} hold?$"
+
+gText_ApprenticeHoldNothing5:: @ 82BAF4E
+	.string "Oh, so me being a busy guy, you say\n"
+	.string "my {STR_VAR_1} doesn't need anything?$"
+
+gText_ApprenticeThanksNoHeldItem5:: @ 82BAF8F
+	.string "Okay, gotcha.\n"
+	.string "I won't need any time for that.\p"
+	.string "Thanks today!\n"
+	.string "See you around!$"
+
+gText_ApprenticeThanksHeldItem5:: @ 82BAFDB
+	.string "Okay, gotcha.\n"
+	.string "I'll find time somehow and find\l"
+	.string "that {STR_VAR_1} you recommended.\p"
+	.string "I'm glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_ApprenticeItemAlreadyRecommended5:: @ 82BB05F
+	.string "Huh? I already know about\n"
+	.string "that {STR_VAR_1}.\p"
+	.string "Oh, right, I get it.\n"
+	.string "So me being a busy guy, you say\l"
+	.string "my {STR_VAR_2} doesn't need anything?$"
+
+gText_ApprenticeWhatHeldItem6:: @ 82BB0D4
+	.string "Hiya, {PLAYER}! It's me!\n"
+	.string "I need to tap your mind again today.\l"
+	.string "Please, I need your advice!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I want to make my {STR_VAR_1} hold\n"
+	.string "an item, what should it be?$"
+
+gText_ApprenticeHoldNothing6:: @ 82BB18C
+	.string "Is that right? My {STR_VAR_1} doesn't\n"
+	.string "need to hold an item, you're saying.$"
+
+gText_ApprenticeThanksNoHeldItem6:: @ 82BB1CE
+	.string "Okay, that's what I'll do!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticeThanksHeldItem6:: @ 82BB242
+	.string "Uh-huh! One {STR_VAR_1}.\n"
+	.string "What a cool choice!\l"
+	.string "I'll definitely try that!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticeItemAlreadyRecommended6:: @ 82BB2D9
+	.string "Ahahah! That's silly!\n"
+	.string "You already told me about that\l"
+	.string "{STR_VAR_1} before!\p"
+	.string "Are you feeling okay, {PLAYER}?\p"
+	.string "Oh, wait! My {STR_VAR_2} doesn't\n"
+	.string "need to hold an item, you're saying.$"
+
+gText_ApprenticeWhatHeldItem7:: @ 82BB370
+	.string "Hello, {PLAYER}. I hope you've been\n"
+	.string "keeping well.\p"
+	.string "May I approach you for advice?\p"
+	.string "In a recent battle, my opponent\n"
+	.string "seemed to have given his POKéMON\l"
+	.string "an item to hold.\p"
+	.string "As a result, I was defeated…\p"
+	.string "I don't wish to be left behind.\n"
+	.string "I would like to make my {STR_VAR_1}\l"
+	.string "hold an item, too.\p"
+	.string "It would please me if you could decide\n"
+	.string "what would be right for my POKéMON…$"
+
+gText_ApprenticeHoldNothing7:: @ 82BB4C3
+	.string "In other words… My POKéMON has\n"
+	.string "no need to hold an item?$"
+
+gText_ApprenticeThanksNoHeldItem7:: @ 82BB4FB
+	.string "I understand clearly now!\n"
+	.string "I will keep trying like this.\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticeThanksHeldItem7:: @ 82BB575
+	.string "One {STR_VAR_1} it is!\n"
+	.string "I will order it right away.\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticeItemAlreadyRecommended7:: @ 82BB5E1
+	.string "You've already told me about that,\n"
+	.string "and I already have it.\p"
+	.string "Or are you saying… My POKéMON has\n"
+	.string "no need to hold an item?$"
+
+gText_ApprenticeWhatHeldItem8:: @ 82BB656
+	.string "Eek! {PLAYER}!\n"
+	.string "I… I'm overjoyed to see you again!\p"
+	.string "Oh-oh-oh! There's something I just\n"
+	.string "had to ask you, {PLAYER}!\p"
+	.string "Please decide what my {STR_VAR_1}\n"
+	.string "should be holding!$"
+
+gText_ApprenticeHoldNothing8:: @ 82BB6E5
+	.string "Oh, wow! I didn't expect that answer!\n"
+	.string "So, a hold item isn't necessary?$"
+
+gText_ApprenticeThanksNoHeldItem8:: @ 82BB72C
+	.string "Perfectly understood!\n"
+	.string "I'll keep at this without an item!\p"
+	.string "I hope you'll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_ApprenticeThanksHeldItem8:: @ 82BB7A2
+	.string "{STR_VAR_1}! I'll use that!\p"
+	.string "Um… Could it be, {PLAYER}, you also\n"
+	.string "make your POKéMON hold that item?\p"
+	.string "I'll be sure to get it!\n"
+	.string "I hope you'll be willing to teach me\l"
+	.string "some more another time.$"
+
+gText_ApprenticeItemAlreadyRecommended8:: @ 82BB84A
+	.string "Oh? You recommended that\n"
+	.string "{STR_VAR_1} before, too.\p"
+	.string "Or is it the best thing to hold?\n"
+	.string "Or do you mean that my {STR_VAR_2}\l"
+	.string "doesn't need anything to hold?$"
+
+gText_ApprenticeWhatHeldItem9:: @ 82BB8CD
+	.string "Hola!\n"
+	.string "My maestro, {PLAYER}{KUN}!\p"
+	.string "I want to hit you up for advice on\n"
+	.string "POKéMON tools.\p"
+	.string "What do you think would be good for\n"
+	.string "my {STR_VAR_1} to hold?\p"
+	.string "Don't be shy now.\n"
+	.string "Let's blurt it out!$"
+
+gText_ApprenticeHoldNothing9:: @ 82BB970
+	.string "Oh? So, you're saying my {STR_VAR_1}\n"
+	.string "can win without holding any item?$"
+
+gText_ApprenticeThanksNoHeldItem9:: @ 82BB9AE
+	.string "Si, bueno!\n"
+	.string "I'll give it my best shot, like, slam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_ApprenticeThanksHeldItem9:: @ 82BBA05
+	.string "Uh-huh, that's one {STR_VAR_1}?\n"
+	.string "Si, bueno!\l"
+	.string "I'll go find me one, like, bam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_ApprenticeItemAlreadyRecommended9:: @ 82BBA6C
+	.string "No, no! You already told me about\n"
+	.string "that {STR_VAR_1} thing before.\p"
+	.string "Oh, now wait just one minute here…\n"
+	.string "So, you're saying my {STR_VAR_2}\l"
+	.string "can win without holding any item?$"
+
+gText_ApprenticeWhatHeldItem10:: @ 82BBB01
+	.string "{PLAYER}{KUN}, something unbelievable\n"
+	.string "has happened!\p"
+	.string "I woke up this morning, and my POKéMON\n"
+	.string "had 10 NUGGETS!\p"
+	.string "Of course I'm lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at thinking about\l"
+	.string "what items POKéMON should hold.\p"
+	.string "So, how about deciding for me what\n"
+	.string "my {STR_VAR_1} should hold, master?$"
+
+gText_ApprenticeHoldNothing10:: @ 82BBC1C
+	.string "What's that mean?\n"
+	.string "Don't make it hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem10:: @ 82BBC4B
+	.string "Okay, so it shouldn't hold anything.\n"
+	.string "Then, I'd better get something for it!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticeThanksHeldItem10:: @ 82BBCF6
+	.string "Okay, so it's one {STR_VAR_1}!\n"
+	.string "I'll make it hold anything but that!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticeItemAlreadyRecommended10:: @ 82BBD90
+	.string "Um, you told me about that before,\n"
+	.string "didn't you?\p"
+	.string "Isn't there something else?\p"
+	.string "Or do you mean, don't make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_ApprenticeWhatHeldItem11:: @ 82BBE0B
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin' SAILOR am I!\n"
+	.string "I present to you a question\l"
+	.string "that's pretty fly!\p"
+	.string "It's an item question\n"
+	.string "that begs your suggestion!\p"
+	.string "My {STR_VAR_1} needs an item to hold,\n"
+	.string "What should it be, if I may be bold?$"
+
+gText_ApprenticeHoldNothing11:: @ 82BBEE5
+	.string "Is that right?\n"
+	.string "My {STR_VAR_1} doesn't need to be\l"
+	.string "holding anything tight?$"
+
+gText_ApprenticeThanksNoHeldItem11:: @ 82BBF25
+	.string "Okay, I hear you, sure I do!\n"
+	.string "My POKéMON will go empty-handed, too!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticeThanksHeldItem11:: @ 82BBFA4
+	.string "Okay, one {STR_VAR_1},\n"
+	.string "that's what I'll use.\l"
+	.string "I was right to make you choose!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticeItemAlreadyRecommended11:: @ 82BC024
+	.string "Okay, one {STR_VAR_1}, you say?\n"
+	.string "You told me that the other day.\l"
+	.string "I need a new idea, a brand new way.\p"
+	.string "Or, what, is that right?\n"
+	.string "My POKéMON doesn't need to hold\l"
+	.string "anything tight?$"
+
+gText_ApprenticeWhatHeldItem12:: @ 82BC0C8
+	.string "Say, hey, {PLAYER}!\n"
+	.string "I found you again today!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I'm already talking to you!\p"
+	.string "{PLAYER}, are you getting sick of me?\n"
+	.string "Nah, no way, that can't be.\p"
+	.string "Will you hear me out?\n"
+	.string "I'm looking for advice--that's what\l"
+	.string "I'm talking about.\p"
+	.string "It's about a hold item for\n"
+	.string "my {STR_VAR_1} that'd be good.\l"
+	.string "My indecision is making me brood.$"
+
+gText_ApprenticeHoldNothing12:: @ 82BC213
+	.string "My {STR_VAR_1} needs nothing?\n"
+	.string "Doesn't need to hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem12:: @ 82BC247
+	.string "If holding nothing is the best,\n"
+	.string "I'll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticeThanksHeldItem12:: @ 82BC2DD
+	.string "If holding that {STR_VAR_1} is\n"
+	.string "the best, I'll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticeItemAlreadyRecommended12:: @ 82BC373
+	.string "Haven't I heard about that\n"
+	.string "{STR_VAR_1} before?\l"
+	.string "I'm certain I have, that's for sure!\p"
+	.string "I need a new something!\n"
+	.string "Or, my {STR_VAR_2} needs nothing?\l"
+	.string "Doesn't need to hold anything?$"
+
+gText_ApprenticeWhatHeldItem13:: @ 82BC40E
+	.string "Gwah! Ouch! {PLAYER}{KUN}, my arm's broken!\n"
+	.string "Don't touch it, please!\p"
+	.string "I must've broken it while I was trying\n"
+	.string "out different hold items with my posse\l"
+	.string "of POKéMON.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{KUN}, what do you think would be\n"
+	.string "good for my {STR_VAR_1} to hold?$"
+
+gText_ApprenticeHoldNothing13:: @ 82BC514
+	.string "Ouch…\p"
+	.string "So your suggestion is my {STR_VAR_1}\n"
+	.string "doesn't have to hold anything?$"
+
+gText_ApprenticeThanksNoHeldItem13:: @ 82BC555
+	.string "Hm, all right. That would be easier\n"
+	.string "for me, the way things are now.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_ApprenticeThanksHeldItem13:: @ 82BC5CE
+	.string "Hm, all right. That's one {STR_VAR_1}.\n"
+	.string "My POKéMON's arm is fine, so I'll make\l"
+	.string "it hold that item right away.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_ApprenticeItemAlreadyRecommended13:: @ 82BC666
+	.string "No, no, you told me about that\n"
+	.string "{STR_VAR_1} before, remember?\p"
+	.string "How about telling me something\n"
+	.string "even better?\p"
+	.string "Oh, wait a second.\n"
+	.string "So your suggestion is my {STR_VAR_2}\l"
+	.string "doesn't have to hold anything?$"
+
+gText_ApprenticeWhatHeldItem14:: @ 82BC714
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}…\p"
+	.string "Please, don't look at me that way.\n"
+	.string "My POKéMON don't have anything.\p"
+	.string "I… I'm really embarrassed about this,\n"
+	.string "but I really need your advice.\p"
+	.string "I can't decide what hold item would\n"
+	.string "make my {STR_VAR_1} strong.\p"
+	.string "{PLAYER}{KUN}, what do you think would\n"
+	.string "be good?$"
+
+gText_ApprenticeHoldNothing14:: @ 82BC808
+	.string "Oh… Then, you think it would be better\n"
+	.string "if my {STR_VAR_1} didn't have an item?$"
+
+gText_ApprenticeThanksNoHeldItem14:: @ 82BC84D
+	.string "Oh… Okay!\n"
+	.string "I'll go without an item.\p"
+	.string "This is nerve-racking, though.\n"
+	.string "Wouldn't it be too cool?\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticeThanksHeldItem14:: @ 82BC8EA
+	.string "Oh… Okay!\n"
+	.string "I'll go with that {STR_VAR_1}.\p"
+	.string "This is nerve-racking, though.\n"
+	.string "Wouldn't it be too cool?\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticeItemAlreadyRecommended14:: @ 82BC984
+	.string "B-but I already heard about that.\p"
+	.string "Please don't brush me off like this!\n"
+	.string "I can't live with the humiliation.\p"
+	.string "Oh… Am I jumping to conclusions?\n"
+	.string "Do you think it would be better if\l"
+	.string "my {STR_VAR_2} didn't have an item?$"
+
+gText_ApprenticeWhatHeldItem15:: @ 82BCA4D
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps you're a twin?\p"
+	.string "Oh, no, no, no, don't worry!\n"
+	.string "If you really are {PLAYER}, please\l"
+	.string "forget about my rudeness.\p"
+	.string "What I would like is some more of\n"
+	.string "your fine advice.\p"
+	.string "I have here my {STR_VAR_1} that I wish\n"
+	.string "to make hold a convenient item.\p"
+	.string "What would be worthy of it?$"
+
+gText_ApprenticeHoldNothing15:: @ 82BCB75
+	.string "It's better if it held nothing?\n"
+	.string "Are you certain?$"
+
+gText_ApprenticeThanksNoHeldItem15:: @ 82BCBA6
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticeThanksHeldItem15:: @ 82BCBFC
+	.string "One {STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope my POKéMON will be able to\n"
+	.string "put it to good use.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticeItemAlreadyRecommended15:: @ 82BCCA4
+	.string "No, no, wait a minute.\n"
+	.string "I believe you taught me that before.\p"
+	.string "I would like you to recommend\n"
+	.string "something different this time.\p"
+	.string "Perhaps you're suggesting that\n"
+	.string "my {STR_VAR_2} should hold nothing?\l"
+	.string "Are you certain?$"
+
+gText_ApprenticeWhichMonFirst0:: @ 82BCD68
+	.string "Waah, {PLAYER}!\n"
+	.string "I have a dilemma, sob…\p"
+	.string "I want to begin battling other people,\n"
+	.string "but I don't know what to do.\p"
+	.string "How should I line up my POKéMON\n"
+	.string "so they'll be at their strongest?\p"
+	.string "Please tell me, {PLAYER}.\n"
+	.string "If you were me, which of these POKéMON\l"
+	.string "would you send out first?$"
+
+gText_ApprenticeMonFirstThanks0:: @ 82BCE64
+	.string "My {STR_VAR_1} should go first?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I'm so sorry!\n"
+	.string "You've made me happy by choosing\l"
+	.string "my first POKéMON, and it's made me cry…\p"
+	.string "Thank you so much!$"
+
+gText_ApprenticeWhichMonFirst1:: @ 82BCEF2
+	.string "Yay! It's {PLAYER}!\n"
+	.string "Great! I wanted to ask you something!\p"
+	.string "Um, of my POKéMON, which do you\n"
+	.string "think should go out first?$"
+
+gText_ApprenticeMonFirstThanks1:: @ 82BCF61
+	.string "My {STR_VAR_1}? That's true.\n"
+	.string "Okay, I'll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_ApprenticeWhichMonFirst2:: @ 82BCFA1
+	.string "{PLAYER}, hello!\p"
+	.string "I think, in a battle, it's very important\n"
+	.string "which POKéMON comes out first.\p"
+	.string "Out of the POKéMON that I have,\n"
+	.string "which would be good to send out first?$"
+
+gText_ApprenticeMonFirstThanks2:: @ 82BD03C
+	.string "My {STR_VAR_1} goes first?\n"
+	.string "Okay, I got it!\p"
+	.string "See you again!$"
+
+gText_ApprenticeWhichMonFirst3:: @ 82BD06D
+	.string "Hello, {PLAYER}…\n"
+	.string "I'm sorry to disturb you again with\l"
+	.string "another question.\p"
+	.string "I have so little confidence, I don't\n"
+	.string "know what I'd do without you, {PLAYER}.\p"
+	.string "It may be a waste of time for me to\n"
+	.string "even worry about it, but I just can't\l"
+	.string "decide something…\p"
+	.string "Which of my POKéMON should I send\n"
+	.string "out first in a battle?$"
+
+gText_ApprenticeMonFirstThanks3:: @ 82BD18A
+	.string "My {STR_VAR_1}?\n"
+	.string "Understood!\p"
+	.string "I can't believe that you would bother\n"
+	.string "to answer my questions so often!\p"
+	.string "I'm so grateful that you would even\n"
+	.string "speak with me… Thank you!$"
+
+gText_ApprenticeWhichMonFirst4:: @ 82BD222
+	.string "Oh, {PLAYER}{KUN}! It's me!\n"
+	.string "I'm so glad to see you because I have\l"
+	.string "this little problem.\p"
+	.string "I can't decide how my POKéMON should\n"
+	.string "be lined up. Could you decide for me?\p"
+	.string "Oh, you don't need to decide the whole\n"
+	.string "party right now.\p"
+	.string "How about deciding just the first\n"
+	.string "POKéMON for me?$"
+
+gText_ApprenticeMonFirstThanks4:: @ 82BD325
+	.string "My {STR_VAR_1}? That's great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticeWhichMonFirst5:: @ 82BD3B1
+	.string "Hi, my teacher {PLAYER}{KUN}!\n"
+	.string "I'm busy again today!\p"
+	.string "I have to do some cycling, shopping,\n"
+	.string "and humming.\p"
+	.string "I haven't even had the time to decide\n"
+	.string "how to line up my POKéMON team.\p"
+	.string "So, how about checking out my team?\n"
+	.string "Which one should go first?$"
+
+gText_ApprenticeMonFirstThanks5:: @ 82BD493
+	.string "Okay, gotcha.\n"
+	.string "I have enough time at least to put\l"
+	.string "my {STR_VAR_1} at the head of the line!\p"
+	.string "Whoops, my girlfriend's waiting!\n"
+	.string "Thanks! See you around!$"
+
+gText_ApprenticeWhichMonFirst6:: @ 82BD51C
+	.string "Yoohoo! Hiya, {PLAYER}!\n"
+	.string "You always walk around looking tough!\p"
+	.string "Listen, I need something from you\n"
+	.string "again! It's the usual thing!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is about my team.\p"
+	.string "Which POKéMON of mine should be first\n"
+	.string "to go out in a battle?$"
+
+gText_ApprenticeMonFirstThanks6:: @ 82BD609
+	.string "Hmhm!\n"
+	.string "My {STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticeWhichMonFirst7:: @ 82BD697
+	.string "Thank you so much for stopping to\n"
+	.string "chat with me, {PLAYER}.\p"
+	.string "I know I'm taking advantage of your\n"
+	.string "kindness, but may I ask for advice?\p"
+	.string "I would like you to decide on the order\n"
+	.string "of my POKéMON team.\p"
+	.string "It would please me if you could decide\n"
+	.string "which POKéMON should come first.$"
+
+gText_ApprenticeMonFirstThanks7:: @ 82BD797
+	.string "My {STR_VAR_1} it is!\n"
+	.string "I will put it first right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticeWhichMonFirst8:: @ 82BD806
+	.string "Eek! {PLAYER}!\n"
+	.string "I… I'm overjoyed to see you again!\p"
+	.string "My POKéMON have become much\n"
+	.string "stronger!\p"
+	.string "But I don't always win. It seems to\n"
+	.string "depend on which POKéMON goes first.\p"
+	.string "{PLAYER}, please, I need your help!\p"
+	.string "Please decide which of my POKéMON\n"
+	.string "should go out first!$"
+
+gText_ApprenticeMonFirstThanks8:: @ 82BD8F5
+	.string "Sigh… I'm overwhelmed with happiness…\p"
+	.string "It's like a dream having you decide\n"
+	.string "for me, {PLAYER}.\p"
+	.string "But perfectly understood!\n"
+	.string "I will go with my {STR_VAR_1} first!\p"
+	.string "I hope you'll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_ApprenticeWhichMonFirst9:: @ 82BD9BE
+	.string "Hello, hello!\n"
+	.string "My mentor, {PLAYER}{KUN}!\l"
+	.string "Hit me with your sage advice today!\p"
+	.string "You see, I pulled together a team of\n"
+	.string "three POKéMON. So far so good.\p"
+	.string "But the team's battling order's not\n"
+	.string "settled yet.\p"
+	.string "This is where you come in, {PLAYER}{KUN}!\n"
+	.string "You decide which POKéMON leads off!\p"
+	.string "Don't be shy now.\n"
+	.string "Let's blurt it out!$"
+
+gText_ApprenticeMonFirstThanks9:: @ 82BDAE1
+	.string "Uh-huh, my {STR_VAR_1} leads off!\n"
+	.string "OK, A-OK!\l"
+	.string "I'll reorder the lineup, like, wham!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_ApprenticeWhichMonFirst10:: @ 82BDB4E
+	.string "{PLAYER}{KUN}, listen!\n"
+	.string "It's a crisis!\p"
+	.string "My POKéMON, all three of them, go into\n"
+	.string "battle at once!\p"
+	.string "Of course that's impossible!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at thinking about\l"
+	.string "how I should line up my POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "POKéMON should go first, master?$"
+
+gText_ApprenticeMonFirstThanks10:: @ 82BDC6B
+	.string "Okay, so it's my {STR_VAR_1} you chose?\n"
+	.string "I'll let any but that one go first!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticeWhichMonFirst11:: @ 82BDD0D
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin' SAILOR am I!\n"
+	.string "I present to you a question\l"
+	.string "that's pretty fly!\p"
+	.string "It's a team lineup question\n"
+	.string "that begs your suggestion!\p"
+	.string "Out of this lot, which should go first\n"
+	.string "as the first on the spot?$"
+
+gText_ApprenticeMonFirstThanks11:: @ 82BDDEC
+	.string "Okay, I hear you, sure I do!\n"
+	.string "I'll switch them up, that I'll do!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticeWhichMonFirst12:: @ 82BDE68
+	.string "Yahoo, {PLAYER}!\n"
+	.string "How do you do?\p"
+	.string "What should I do? Go ahead and ask?\n"
+	.string "Uh-huh, I have something to ask!\l"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\p"
+	.string "You have to decide, which of my\n"
+	.string "POKéMON is the first to ride!\l"
+	.string "Into battle, I mean to say.$"
+
+gText_ApprenticeMonFirstThanks12:: @ 82BDF4D
+	.string "My {STR_VAR_1}? Yes!\n"
+	.string "That'll do, there's no distress!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticeWhichMonFirst13:: @ 82BDFD8
+	.string "…Oof…ooch… {PLAYER}{KUN}…\n"
+	.string "My stomach's hurting all of a sudden…\p"
+	.string "…It's getting better now…\p"
+	.string "I must've worried myself sick racking\n"
+	.string "my brains on how I should line up\l"
+	.string "my posse of POKéMON.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{KUN}, which of my POKéMON should\n"
+	.string "go first? So I'd win, I mean.$"
+
+gText_ApprenticeMonFirstThanks13:: @ 82BE0FD
+	.string "Hm, all right.\n"
+	.string "My {STR_VAR_1} goes first.\p"
+	.string "I'll fix the lineup like that after\n"
+	.string "I have my supper.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_ApprenticeWhichMonFirst14:: @ 82BE189
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}?\p"
+	.string "Please, don't look at me that way.\n"
+	.string "You're making me feel all flustered.\p"
+	.string "Um…\n"
+	.string "I really need your advice.\p"
+	.string "It makes me bashful to say this,\n"
+	.string "but I chose my 3-POKéMON team.\l"
+	.string "I can't decide on the order, though.\p"
+	.string "Which POKéMON should I send out first\n"
+	.string "so I at least look capable?$"
+
+gText_ApprenticeMonFirstThanks14:: @ 82BE2A5
+	.string "Oh… Okay!\n"
+	.string "I'll lead with my {STR_VAR_1}.\p"
+	.string "I hope I can do my best without\n"
+	.string "getting all flustered.\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticeWhichMonFirst15:: @ 82BE33E
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps you're a clever look-alike?\p"
+	.string "Oh, no, no, no, don't worry!\n"
+	.string "If you really are {PLAYER}, please\l"
+	.string "forget about my rudeness.\p"
+	.string "What I would like is your fine advice.\p"
+	.string "I have here my POKéMON team.\n"
+	.string "I would like you to tell me which one\l"
+	.string "should go first in a battle.$"
+
+gText_ApprenticeMonFirstThanks15:: @ 82BE46C
+	.string "My {STR_VAR_1}…\n"
+	.string "You aren't pulling my leg?\p"
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I am as you see, but I shall do\n"
+	.string "my best.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticeWhichMon0:: @ 82BE50D
+	.string "Snivel…\n"
+	.string "Oh, {PLAYER}!\p"
+	.string "What perfect timing!\n"
+	.string "There's something I just can't decide…\p"
+	.string "I can't decide which POKéMON I should\n"
+	.string "be using.\p"
+	.string "I can't decide between the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}…\p"
+	.string "{PLAYER}, which do you think will give\n"
+	.string "even me a chance at winning?$"
+
+gText_ApprenticeMonThanks0:: @ 82BE5F5
+	.string "Snivel… I… I understand!\n"
+	.string "Oh! I'm so sorry!\l"
+	.string "You've made me so happy, I'm crying…\p"
+	.string "I'll do my best to catch one\n"
+	.string "{STR_VAR_1}!\p"
+	.string "Thank you so much!$"
+
+gText_ApprenticeWhichMon1:: @ 82BE679
+	.string "Yay! It's {PLAYER}!\n"
+	.string "Yay, you came at the right time, too!\l"
+	.string "I need your advice again!\p"
+	.string "Um, I'm all mixed up--should I use\n"
+	.string "my {STR_VAR_1} or {STR_VAR_2}…\p"
+	.string "Which do you think I should raise,\n"
+	.string "{PLAYER}?$"
+
+gText_ApprenticeMonThanks1:: @ 82BE71E
+	.string "Oh, so my {STR_VAR_1} is better!\n"
+	.string "Okay, I'll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_ApprenticeWhichMon2:: @ 82BE762
+	.string "{PLAYER}, hello!\n"
+	.string "I have a question I wanted to ask.\p"
+	.string "I'm in a dilemma over whether I should\n"
+	.string "raise one {STR_VAR_1} or {STR_VAR_2}.\p"
+	.string "Which POKéMON do you think will\n"
+	.string "be stronger?$"
+
+gText_ApprenticeMonThanks2:: @ 82BE7F8
+	.string "{STR_VAR_1} is your choice?\n"
+	.string "Okay, I got it!\p"
+	.string "I'll go catch a strong {STR_VAR_1}\n"
+	.string "right away!\p"
+	.string "See you again!$"
+
+gText_ApprenticeWhichMon3:: @ 82BE850
+	.string "Hello, {PLAYER}…\p"
+	.string "Um, you've probably already forgotten\n"
+	.string "about someone like me…\p"
+	.string "…But that doesn't matter if you\n"
+	.string "could give me advice…\p"
+	.string "I can't decide on the one kind of\n"
+	.string "POKéMON I should raise…\p"
+	.string "I've narrowed the field to the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, but that's\l"
+	.string "where I became stuck…\p"
+	.string "{PLAYER}, you probably don't want to\n"
+	.string "bother, but please decide for me.$"
+
+gText_ApprenticeMonThanks3:: @ 82BE99C
+	.string "But will a wild {STR_VAR_1} even pay\n"
+	.string "attention to me?\p"
+	.string "I will try!\p"
+	.string "But will I even be able to catch one…\n"
+	.string "No! I'll do my best!\p"
+	.string "Thank you!$"
+
+gText_ApprenticeWhichMon4:: @ 82BEA1B
+	.string "Oh, {PLAYER}{KUN}! I'm so glad to see you!\n"
+	.string "I was about to go looking for you!\p"
+	.string "Can you decide what kind of POKéMON\n"
+	.string "I should use?\p"
+	.string "For instance…\n"
+	.string "How about the POKéMON {STR_VAR_1}\l"
+	.string "and {STR_VAR_2}?\p"
+	.string "Which one do you think would be\n"
+	.string "better?$"
+
+gText_ApprenticeMonThanks4:: @ 82BEAE9
+	.string "{STR_VAR_1}? That's great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticeWhichMon5:: @ 82BEB72
+	.string "If it isn't {PLAYER}{KUN}! How's it going?\n"
+	.string "I'm busy again as always!\p"
+	.string "I want to do good with POKéMON, too,\n"
+	.string "but I haven't been able to decide\l"
+	.string "which POKéMON I should use.\p"
+	.string "You know how {STR_VAR_1} look strong?\n"
+	.string "But {STR_VAR_2} are tough to ignore.\p"
+	.string "{PLAYER}{KUN}, give me some of your good\n"
+	.string "advice! Which one'd be good for me?$"
+
+gText_ApprenticeMonThanks5:: @ 82BEC8E
+	.string "Okay, gotcha.\n"
+	.string "I'll find time somehow and catch me\l"
+	.string "that {STR_VAR_1} you recommended.\p"
+	.string "I'm glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_ApprenticeWhichMon6:: @ 82BED16
+	.string "Oh!\n"
+	.string "Yay, it's {PLAYER}!\p"
+	.string "I didn't waste any time boasting to\n"
+	.string "my friends about meeting you!\p"
+	.string "I need to tap your mind again today.\n"
+	.string "It's an easy one for you!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I were to raise a POKéMON,\n"
+	.string "and the choices were one {STR_VAR_1}\l"
+	.string "or {STR_VAR_2}, which should it be?$"
+
+gText_ApprenticeMonThanks6:: @ 82BEE29
+	.string "Ahhh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticeWhichMon7:: @ 82BEEB4
+	.string "Oh, is it you, {PLAYER}?\n"
+	.string "I'm delighted to see you again!\p"
+	.string "Ever since I became your apprentice,\n"
+	.string "my confidence has been blooming.\p"
+	.string "I think I'm ready to raise a POKéMON\n"
+	.string "of my own!\p"
+	.string "{PLAYER}, may I impose on you to choose\n"
+	.string "which POKéMON I should raise?\p"
+	.string "The choices are the POKéMON\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}…\l"
+	.string "Which POKéMON is right for me?$"
+
+gText_ApprenticeMonThanks7:: @ 82BEFE2
+	.string "One {STR_VAR_1} it is!\n"
+	.string "I will find one right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticeWhichMon8:: @ 82BF04E
+	.string "Eek! {PLAYER}! I met you again!\n"
+	.string "I… I'm overjoyed!\p"
+	.string "Oh-oh-oh, I know!\n"
+	.string "I shouldn't pass up this opportunity!\p"
+	.string "May I ask a huge favor, {PLAYER}?\n"
+	.string "Please choose a POKéMON for me!\p"
+	.string "Please decide which would be better,\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}!$"
+
+gText_ApprenticeMonThanks8:: @ 82BF11D
+	.string "Wow! You decided for me!\n"
+	.string "One {STR_VAR_1} is what I'll raise to\l"
+	.string "the best of my ability.\p"
+	.string "I hope you'll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_ApprenticeWhichMon9:: @ 82BF1A8
+	.string "Hey, hey!\n"
+	.string "My mentor, {PLAYER}{KUN}!\p"
+	.string "Hello, I've been looking for you\n"
+	.string "for some more of your sage advice!\p"
+	.string "Which kind of POKéMON would be right\n"
+	.string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p"
+	.string "Don't be shy now.\n"
+	.string "Let's blurt it out!$"
+
+gText_ApprenticeMonThanks9:: @ 82BF268
+	.string "Uh-huh, one {STR_VAR_1} it is!\n"
+	.string "OK, A-OK!\l"
+	.string "I'll get one in a BALL, like, cram!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_ApprenticeWhichMon10:: @ 82BF2D1
+	.string "{PLAYER}{KUN}, listen! Big news!\n"
+	.string "I caught a mirage POKéMON!\p"
+	.string "Of course I'm lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at catching\l"
+	.string "POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "kind of POKéMON I should catch,\l"
+	.string "master?\p"
+	.string "Which would be better?\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}?$"
+
+gText_ApprenticeMonThanks10:: @ 82BF3CF
+	.string "Okay, so it's {STR_VAR_1} you chose?\n"
+	.string "I'll grab the other kind, then!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticeWhichMon11:: @ 82BF46A
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin' SAILOR am I!\n"
+	.string "Surely you remember who am I?\p"
+	.string "Today, I have a POKéMON question\n"
+	.string "that begs your suggestion!\p"
+	.string "I have the choice between this\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, you see.\l"
+	.string "Which is the one to catch for me?$"
+
+gText_ApprenticeMonThanks11:: @ 82BF551
+	.string "{STR_VAR_1}, you say, hey, hey!\n"
+	.string "I'll go get me one right away!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticeWhichMon12:: @ 82BF5C3
+	.string "Oh, wow, if it isn't {PLAYER}!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I'm already talking to you!\p"
+	.string "It's been a long time. Let me break\n"
+	.string "the ice. I'm also looking for advice!\l"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\p"
+	.string "My POKéMON--which should I use?\n"
+	.string "It's either {STR_VAR_1} or {STR_VAR_2}.\l"
+	.string "Which do you choose?$"
+
+gText_ApprenticeMonThanks12:: @ 82BF6E5
+	.string "If that {STR_VAR_1} is the best,\n"
+	.string "I'll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticeWhichMon13:: @ 82BF773
+	.string "Oh, hi, {PLAYER}{KUN}…\n"
+	.string "I have this horrible headache…\p"
+	.string "I must've worried too much about\n"
+	.string "the kind of POKéMON I should raise.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{KUN}, if I had to choose between\n"
+	.string "the POKéMON {STR_VAR_1} and\l"
+	.string "{STR_VAR_2}, which should it be?$"
+
+gText_ApprenticeMonThanks13:: @ 82BF869
+	.string "Hm, one {STR_VAR_1}, all right.\n"
+	.string "I'll go look for one when I get better.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_ApprenticeWhichMon14:: @ 82BF8DD
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}…?\p"
+	.string "Please, don't look at me that way.\n"
+	.string "I'm getting all flustered…\l"
+	.string "I… I need your advice.\p"
+	.string "I… I'm really embarrassed, but I can't\n"
+	.string "decide which POKéMON to use.\p"
+	.string "If the choices were {STR_VAR_1} or\n"
+	.string "{STR_VAR_2}, which would be better?$"
+
+gText_ApprenticeMonThanks14:: @ 82BF9BA
+	.string "Oh… Okay!\n"
+	.string "I'll do my best with one {STR_VAR_1}.\p"
+	.string "I hope I can do my best without\n"
+	.string "getting all flustered.\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticeWhichMon15:: @ 82BFA5A
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really real?\p"
+	.string "No, no, if you are real, it's fine.\n"
+	.string "Incidentally, I would like to obtain\l"
+	.string "your advice.\p"
+	.string "It's about the POKéMON I am to use.\p"
+	.string "If the choices are the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, which is\l"
+	.string "more worthy of me?$"
+
+gText_ApprenticeMonThanks15:: @ 82BFB4E
+	.string "{STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope it is something even I can\n"
+	.string "handle with aplomb.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticeWhichMove0:: @ 82BFBF2
+	.string "Waaah! Oh, {PLAYER}!\n"
+	.string "Snivel… Hiccup…\p"
+	.string "I have a dilemma!\n"
+	.string "I can't decide on a move for\l"
+	.string "my {STR_VAR_1}…\p"
+	.string "Please, please, {PLAYER}.\n"
+	.string "Can you decide for me?\p"
+	.string "For my {STR_VAR_1}, which move would\n"
+	.string "be the better choice: {STR_VAR_2}\l"
+	.string "or {STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks0:: @ 82BFCAE
+	.string "{STR_VAR_1}?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I'm so sorry, {PLAYER}!\n"
+	.string "You've made me so happy by deciding\l"
+	.string "the move, I'm crying…\p"
+	.string "Snivel…\n"
+	.string "Thank you so much!$"
+
+gText_ApprenticeWhichMove1:: @ 82BFD26
+	.string "Yay! Hi, {PLAYER}!\n"
+	.string "I need your advice again!\p"
+	.string "I want to teach my {STR_VAR_1}\n"
+	.string "a cool move.\p"
+	.string "I like either of the moves\n"
+	.string "{STR_VAR_2} or {STR_VAR_3}.\l"
+	.string "What's your recommendation?$"
+
+gText_ApprenticeMoveThanks1:: @ 82BFDB1
+	.string "{STR_VAR_1} is better? I guess so!\n"
+	.string "Okay, I'll go with that!\p"
+	.string "If we meet here again, please teach\n"
+	.string "me something else, teacher!$"
+
+gText_ApprenticeWhichMove2:: @ 82BFE24
+	.string "{PLAYER}, hello!\n"
+	.string "It's about my {STR_VAR_1}, but I'm\l"
+	.string "worried about its moves.\p"
+	.string "You see, it's the moves {STR_VAR_2}\n"
+	.string "and {STR_VAR_3}.\p"
+	.string "Which is stronger and better for\n"
+	.string "my {STR_VAR_1}?$"
+
+gText_ApprenticeMoveThanks2:: @ 82BFEAD
+	.string "{STR_VAR_1} is your choice?\n"
+	.string "Okay, I got it!\p"
+	.string "I'll go teach {STR_VAR_1} to\n"
+	.string "my POKéMON right away!\p"
+	.string "See you again!$"
+
+gText_ApprenticeWhichMove3:: @ 82BFF0A
+	.string "Ohhh, {PLAYER}…\n"
+	.string "I'm hopeless, no, really!\p"
+	.string "I've decided to raise a POKéMON,\n"
+	.string "but now I can't even decide what\l"
+	.string "move I should let it learn…\p"
+	.string "I know that it doesn't mean anything\n"
+	.string "to you, {PLAYER}.\p"
+	.string "But it means a lot to me…\p"
+	.string "Please, {PLAYER}, could you choose\n"
+	.string "a move for my {STR_VAR_1}?\p"
+	.string "If you could even choose between\n"
+	.string "{STR_VAR_2} and {STR_VAR_3}…$"
+
+gText_ApprenticeMoveThanks3:: @ 82C0032
+	.string "I understand!\p"
+	.string "But will it even be willing to learn\n"
+	.string "{STR_VAR_1} for me…\l"
+	.string "No! I'll do my best!\p"
+	.string "Thank you!$"
+
+gText_ApprenticeWhichMove4:: @ 82C0090
+	.string "Oh, {PLAYER}{KUN}!\n"
+	.string "I was just hoping to see you, too!\p"
+	.string "I was wondering what move would\n"
+	.string "be suitable for my {STR_VAR_1}.\p"
+	.string "I can't decide, so can you decide\n"
+	.string "for me instead?\p"
+	.string "For instance… How about the moves\n"
+	.string "{STR_VAR_2} and {STR_VAR_3}?\l"
+	.string "Which one would be better?$"
+
+gText_ApprenticeMoveThanks4:: @ 82C016E
+	.string "{STR_VAR_1}? That's great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I'll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_ApprenticeWhichMove5:: @ 82C01F7
+	.string "How could things be this busy?\n"
+	.string "Hey, if it isn't {PLAYER}{KUN}!\l"
+	.string "How's it going?\p"
+	.string "Since I got up this morning, I've done\n"
+	.string "my jogging, swimming, and cooking!\p"
+	.string "You wouldn't believe how busy I am!\p"
+	.string "I can't even decide what move\n"
+	.string "my {STR_VAR_1} should learn!\p"
+	.string "{STR_VAR_2} looks good, huh?\n"
+	.string "But {STR_VAR_3}'s also decent.\p"
+	.string "{PLAYER}{KUN}, give me some of your good\n"
+	.string "advice! Which move'd be good for me?$"
+
+gText_ApprenticeMoveThanks5:: @ 82C034C
+	.string "Okay, gotcha.\n"
+	.string "I'll make room in my schedule and\l"
+	.string "teach that move.\p"
+	.string "I'm glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_ApprenticeWhichMove6:: @ 82C03CA
+	.string "Oh! Lucky!\n"
+	.string "I met you again, {PLAYER}!\l"
+	.string "I need to tap your mind again today.\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "For my {STR_VAR_1}, which is the move\n"
+	.string "best suited, {STR_VAR_2} or\l"
+	.string "{STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks6:: @ 82C046E
+	.string "Ahhh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that's about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let's meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_ApprenticeWhichMove7:: @ 82C04F9
+	.string "Oh, hello, {PLAYER}.\n"
+	.string "I trust you've been well?\p"
+	.string "I have to seek your advice again.\n"
+	.string "It's about my dearest {STR_VAR_1}.\p"
+	.string "What would be the ideal move for\n"
+	.string "my lovable {STR_VAR_1}?\l"
+	.string "{STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks7:: @ 82C0598
+	.string "{STR_VAR_1} it is!\n"
+	.string "I will teach that right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_ApprenticeWhichMove8:: @ 82C0602
+	.string "Eek! {PLAYER}! I met you again!\n"
+	.string "I… I'm overjoyed!\p"
+	.string "Whenever I'm in need, you're always\n"
+	.string "there for me, {PLAYER}!\p"
+	.string "Today, I want you to recommend\n"
+	.string "a move for me!\p"
+	.string "Please choose a move for\n"
+	.string "my {STR_VAR_1}!\p"
+	.string "Which move would be better,\n"
+	.string "{STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks8:: @ 82C06D8
+	.string "Oh-oh-oh! Thank you!\n"
+	.string "{STR_VAR_1} is it!\l"
+	.string "Perfectly understood!\p"
+	.string "I hope you'll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_ApprenticeWhichMove9:: @ 82C074A
+	.string "Hola, {PLAYER}{KUN}, bueno!\n"
+	.string "I'm hoping for some more of\l"
+	.string "your sage advice today!\p"
+	.string "What would be the best move for\n"
+	.string "my {STR_VAR_1}?\p"
+	.string "It should be something that'll\n"
+	.string "let me win just like that!\p"
+	.string "Would it be {STR_VAR_2}?\n"
+	.string "Or {STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks9:: @ 82C0809
+	.string "Uh-huh, {STR_VAR_1} it is!\n"
+	.string "Si, bueno!\l"
+	.string "I'll get it taught, like, ka-blam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_ApprenticeWhichMove10:: @ 82C086E
+	.string "{PLAYER}{KUN}, it's completely wild!\p"
+	.string "My POKéMON!\n"
+	.string "It learned six moves!\p"
+	.string "Of course I'm lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at choosing moves\l"
+	.string "for my POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "kind of move I should teach?\p"
+	.string "{STR_VAR_2} or {STR_VAR_3}--which\n"
+	.string "would go with my {STR_VAR_1} best?$"
+
+gText_ApprenticeMoveThanks10:: @ 82C0982
+	.string "Okay, so it's {STR_VAR_1} you chose?\n"
+	.string "I'll choose another move, then!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you'll keep teaching me!$"
+
+gText_ApprenticeWhichMove11:: @ 82C0A1D
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin' SAILOR am I!\n"
+	.string "I'm always with it, don't ask me why.\p"
+	.string "Today, I have a move question\n"
+	.string "that begs your suggestion!\p"
+	.string "{STR_VAR_2} and {STR_VAR_3} are\n"
+	.string "the moves. What would be the best\l"
+	.string "for my {STR_VAR_1} so it grooves?$"
+
+gText_ApprenticeMoveThanks11:: @ 82C0AFD
+	.string "{STR_VAR_1}, you say, hey, hey!\n"
+	.string "I'll go teach that right away!\p"
+	.string "If it's advice I ever need,\n"
+	.string "{PLAYER}, your word I'll always heed!$"
+
+gText_ApprenticeWhichMove12:: @ 82C0B6F
+	.string "Oh, yeahah, if it isn't {PLAYER}!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I'm already talking to you!\p"
+	.string "{PLAYER}, are you surprised by me?\n"
+	.string "I want your advice, can't you see?\p"
+	.string "Are you receiving me?\n"
+	.string "You are receiving me!\p"
+	.string "My {STR_VAR_1}--what should it use?\n"
+	.string "It's {STR_VAR_2} or {STR_VAR_3},\l"
+	.string "what do you choose?$"
+
+gText_ApprenticeMoveThanks12:: @ 82C0C7D
+	.string "If that {STR_VAR_1} is the best,\n"
+	.string "I'll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_ApprenticeWhichMove13:: @ 82C0D0B
+	.string "Gahack! Gaah! Oh, {PLAYER}{KUN}…\n"
+	.string "I have this lousy cold, I do…\p"
+	.string "I want to pick a move for my POKéMON,\n"
+	.string "but I'm not up to it…\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{KUN}, if I had to choose between\n"
+	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
+	.string "my {STR_VAR_1}, which would it be?$"
+
+gText_ApprenticeMoveThanks13:: @ 82C0DFE
+	.string "Hm, {STR_VAR_1}, all right. Cough!\n"
+	.string "I'll go teach it when I get better.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_ApprenticeWhichMove14:: @ 82C0E71
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}…?\p"
+	.string "Please, don't look at me that way.\n"
+	.string "I'm getting all flustered…\l"
+	.string "I… I need your advice.\p"
+	.string "I… I'm really embarrassed, but I can't\n"
+	.string "decide what move I should teach\l"
+	.string "my POKéMON.\p"
+	.string "It's for my {STR_VAR_1}.\n"
+	.string "If the choices were {STR_VAR_2} or\l"
+	.string "{STR_VAR_3}, which would be better?$"
+
+gText_ApprenticeMoveThanks14:: @ 82C0F6D
+	.string "Oh… Okay!\n"
+	.string "I'll try that {STR_VAR_1}.\p"
+	.string "I hope I can teach that move…\n"
+	.string "This is so nerve-racking…\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_ApprenticeWhichMove15:: @ 82C1003
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really real?\p"
+	.string "Perhaps you're one of those popular\n"
+	.string "mimics?\p"
+	.string "No, no, if you are real, it's fine.\n"
+	.string "No need to be upset, I assure you!\p"
+	.string "Incidentally, I would like to obtain\n"
+	.string "your advice.\p"
+	.string "It's about my {STR_VAR_1}.\p"
+	.string "Which move would be better for it to\n"
+	.string "use, {STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_ApprenticeMoveThanks15:: @ 82C1122
+	.string "{STR_VAR_1}?\n"
+	.string "There's no question about that?\p"
+	.string "I see. If that's the case, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope it is something even\n"
+	.string "my POKéMON can learn.\p"
+	.string "Let us meet again!$"
+
+gText_ApprenticePickWinSpeech0:: @ 82C11D1
+	.string "Oh… {PLAYER}?\n"
+	.string "It is {PLAYER}!\l"
+	.string "Oh! Sniff…sob… Please, listen!\p"
+	.string "I… When I battle, I get so nervous,\n"
+	.string "I can't help crying even if I win…\p"
+	.string "I wish I could say something cool\n"
+	.string "when I win…\p"
+	.string "Please, please, {PLAYER}!\n"
+	.string "Could you maybe teach me something\l"
+	.string "cool to say when I win so I don't cry?$"
+
+gText_ApprenticeWinSpeechThanks0:: @ 82C12D5
+	.string "{STR_VAR_1}\p"
+	.string "Awesome! Wicked! Awoooh!\n"
+	.string "It's really cool!\p"
+	.string "Oh… I'm sorry…\n"
+	.string "I'm so happy, I'm crying…\p"
+	.string "Snivel… {PLAYER}!\n"
+	.string "Thank you so much for everything!\p"
+	.string "I will battle the best I can for\n"
+	.string "your sake, {PLAYER}!\p"
+	.string "{PLAYER}…\n"
+	.string "Next time… We should battle!$"
+
+gText_ApprenticePickWinSpeech1:: @ 82C13AB
+	.string "Yay! It's {PLAYER}! Hello!\n"
+	.string "I wanted to ask you something!\p"
+	.string "I want to say something cool when\n"
+	.string "I win a match.\p"
+	.string "Do you have a cool saying that\n"
+	.string "you could recommend?$"
+
+gText_ApprenticeWinSpeechThanks1:: @ 82C1444
+	.string "{STR_VAR_1}\p"
+	.string "Oh, wow! That is so cool!\n"
+	.string "Okay, I'll say that!\p"
+	.string "Thanks for teaching me all this time!\n"
+	.string "I'm going to do the best I can\l"
+	.string "wherever I go from now on!\p"
+	.string "When we meet again, it'll be for\n"
+	.string "a battle!$"
+
+gText_ApprenticePickWinSpeech2:: @ 82C1501
+	.string "{PLAYER}, hello!\p"
+	.string "My POKéMON and I are ready for\n"
+	.string "anything, except for one thing.\p"
+	.string "I think it would be good if I had\n"
+	.string "something to shout when I win.\p"
+	.string "Could you think up something good\n"
+	.string "to say?$"
+
+gText_ApprenticeWinSpeechThanks2:: @ 82C15B6
+	.string "{STR_VAR_1}\p"
+	.string "…Cool!\n"
+	.string "I will use that!\p"
+	.string "I'm going out to battle all over\n"
+	.string "the place.\p"
+	.string "Who knows, I may even get to battle\n"
+	.string "you one day, {PLAYER}.\p"
+	.string "Next time, let's meet at a place\n"
+	.string "of battle!$"
+
+gText_ApprenticePickWinSpeech3:: @ 82C165E
+	.string "Hello, {PLAYER}…\n"
+	.string "I'm sorry to bug you, but I'm hopeless…\p"
+	.string "Even when…\n"
+	.string "Even when I win, I don't have anything\l"
+	.string "special to say…\p"
+	.string "I know that it doesn't mean anything\n"
+	.string "to you, {PLAYER}.\p"
+	.string "But it means a lot to me…\p"
+	.string "Please, {PLAYER}, what should I say\n"
+	.string "if I win a battle?$"
+
+gText_ApprenticeWinSpeechThanks3:: @ 82C174F
+	.string "{STR_VAR_1}\p"
+	.string "That's inspired…\p"
+	.string "Uh… Is it okay for someone like me\n"
+	.string "to even say that?\p"
+	.string "No! I'll do my best!\p"
+	.string "{PLAYER}, thank you so much for\n"
+	.string "putting up with me for so long…\p"
+	.string "I promise to do my best from now on.\p"
+	.string "I'm sure you'll quickly forget about\n"
+	.string "someone like me, but let's meet\l"
+	.string "somewhere again!$"
+
+gText_ApprenticePickWinSpeech4:: @ 82C1862
+	.string "Oh, {PLAYER}{KUN}.\n"
+	.string "There's something I want you to hear.\p"
+	.string "I know that I don't always sound\n"
+	.string "nice or polite…\p"
+	.string "When I win a battle, I think I come\n"
+	.string "across as being arrogant.\p"
+	.string "I don't want people to dislike me,\n"
+	.string "so I want to say something nice to\l"
+	.string "someone I beat.\p"
+	.string "But I can't think of anything good!\n"
+	.string "Could you think something up for me?$"
+
+gText_ApprenticeWinSpeechThanks4:: @ 82C19A0
+	.string "{STR_VAR_1}\p"
+	.string "Not bad!\n"
+	.string "Yup, that's what I'll go with!\p"
+	.string "I'm going to hit the road and do what\n"
+	.string "I can with what you taught me in\l"
+	.string "my head and heart.\p"
+	.string "I'm sorry that I've been so pushy\n"
+	.string "with you!\p"
+	.string "Next time, we battle, okay?\n"
+	.string "See you!$"
+
+gText_ApprenticePickWinSpeech5:: @ 82C1A76
+	.string "Oh, I can't get over how busy I am!\n"
+	.string "Oh, hey, I was looking for you, {PLAYER}{KUN}.\p"
+	.string "Are you well as usual?\n"
+	.string "Things haven't changed for me at all.\p"
+	.string "I've got running, fighting, and mapping\n"
+	.string "to do. Why am I so busy?\p"
+	.string "But even though I'm busy, it'd be rude\n"
+	.string "to just turn on my heels and walk away\l"
+	.string "from a win without saying a word.\p"
+	.string "So, what would be a cool saying to\n"
+	.string "underline my coolness when I'm done\l"
+	.string "and walking away? {PLAYER}{KUN}, help me!$"
+
+gText_ApprenticeWinSpeechThanks5:: @ 82C1C16
+	.string "{STR_VAR_1}\p"
+	.string "Okay, gotcha.\n"
+	.string "I can find time to say that!\p"
+	.string "Honestly, I'm glad I met a good mentor\n"
+	.string "like you.\p"
+	.string "I'm going to make time somehow so\n"
+	.string "I can get into battling.\p"
+	.string "Thanks for everything, {PLAYER}{KUN}!\n"
+	.string "We have to battle, you and me, one day!$"
+
+gText_ApprenticePickWinSpeech6:: @ 82C1CF5
+	.string "I lucked out again!\n"
+	.string "{PLAYER}! Am I glad to see you!\l"
+	.string "Like usual, I need your advice!\p"
+	.string "Drum roll, please!\n"
+	.string "The last question I have is…\p"
+	.string "If I win a battle and want to end\n"
+	.string "it with a cool flourish, what\l"
+	.string "should I say?$"
+
+gText_ApprenticeWinSpeechThanks6:: @ 82C1DC1
+	.string "{STR_VAR_1}\p"
+	.string "That… That's fabulous!\n"
+	.string "It's dignified and cool! I claim it!\p"
+	.string "…Listen, I think I'm getting decent\n"
+	.string "at this, huh?\p"
+	.string "So, I'm thinking of challenging other\n"
+	.string "TRAINERS from now on.\p"
+	.string "{PLAYER}, your advice really helped me.\p"
+	.string "Maybe one day, there'll be a time when\n"
+	.string "we battle!\p"
+	.string "Thank you for everything!$"
+
+gText_ApprenticePickWinSpeech7:: @ 82C1EDC
+	.string "Oh, {PLAYER}.\n"
+	.string "I'm so glad I met you!\p"
+	.string "I no longer have any concerns with\n"
+	.string "regard to my POKéMON.\p"
+	.string "It's myself that worries me…\p"
+	.string "Do you know how a TRAINER says\n"
+	.string "a few things upon winning a battle?\p"
+	.string "Definitely, I wish I could do that,\n"
+	.string "too!\p"
+	.string "Please, what should I say when\n"
+	.string "I win a battle?$"
+
+gText_ApprenticeWinSpeechThanks7:: @ 82C1FEC
+	.string "{STR_VAR_1}\p"
+	.string "Ah! That saying! It refreshes me\n"
+	.string "and makes me feel reborn!\p"
+	.string "I must use that right away!\p"
+	.string "And now, I must take my leave,\n"
+	.string "{PLAYER}…\p"
+	.string "I will go out to battle many others,\n"
+	.string "but never will I forget your teachings.\p"
+	.string "Perhaps one day…\n"
+	.string "Farewell!$"
+
+gText_ApprenticePickWinSpeech8:: @ 82C20D1
+	.string "Eek! I spotted {PLAYER}!\n"
+	.string "I… I'm overjoyed to see you!\p"
+	.string "Oh-oh-oh! There's something I just\n"
+	.string "had to ask you!\p"
+	.string "A little while ago, I won a battle.\n"
+	.string "That part was giddying!\p"
+	.string "But it made me so overjoyed that\n"
+	.string "I choked up and couldn't say a thing!\p"
+	.string "So now, {PLAYER}, please, I want you to\n"
+	.string "think up an exit line for when I win!$"
+
+gText_ApprenticeWinSpeechThanks8:: @ 82C21FF
+	.string "{STR_VAR_1}\p"
+	.string "Waaaaah!\n"
+	.string "I'm going to say that?!\l"
+	.string "I… I'm delirious with joy!\p"
+	.string "Th-th-thank you!\n"
+	.string "I have nothing left to regret now!\p"
+	.string "I'm going to travel now and battle\n"
+	.string "all sorts of people.\p"
+	.string "Everything, I owe it to you, {PLAYER}.\n"
+	.string "Really, really, thank you!\p"
+	.string "I've got to go now, but let's meet\n"
+	.string "in battle one day!$"
+
+gText_ApprenticePickWinSpeech9:: @ 82C231C
+	.string "Hola, bueno!\n"
+	.string "{PLAYER}{KUN}!\p"
+	.string "You know, I'm getting the itch to roam\n"
+	.string "and battle where I may.\p"
+	.string "But before I do, I want your advice\n"
+	.string "once again, please!\p"
+	.string "If I were to win a battle, what would\n"
+	.string "be a good boast I could say to my\l"
+	.string "fallen TRAINER opponent?$"
+
+gText_ApprenticeWinSpeechThanks9:: @ 82C2407
+	.string "{STR_VAR_1}\p"
+	.string "Uh-huh, that's sweet!\n"
+	.string "Si, bueno!\l"
+	.string "I'll try saying that, like, ham!\p"
+	.string "And now, it's time to say good-bye!\n"
+	.string "Thanks for all sorts of things!\p"
+	.string "Give me a battle one day, OK?\n"
+	.string "Adios!$"
+
+gText_ApprenticePickWinSpeech10:: @ 82C24B5
+	.string "{PLAYER}{KUN}, there's big trouble!\p"
+	.string "When I win a battle, I brag about it\n"
+	.string "for an hour at least!\p"
+	.string "Of course I'm lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I'm not very good at chatting.\p"
+	.string "So, how about deciding for me what\n"
+	.string "I should say after winning a battle,\l"
+	.string "master?$"
+
+gText_ApprenticeWinSpeechThanks10:: @ 82C25B1
+	.string "{STR_VAR_1}\p"
+	.string "That's what I should say, huh?\n"
+	.string "Then, I'll stay away from that!\p"
+	.string "Just kidding!\n"
+	.string "I'll obey your teaching, master!\p"
+	.string "Thanks for teaching me all this time,\n"
+	.string "master!\p"
+	.string "I'm finally understanding what being\n"
+	.string "a TRAINER is about.\p"
+	.string "I'm going to go out and win battles\n"
+	.string "against any TRAINER.\p"
+	.string "Maybe it'll be you one day, master!\p"
+	.string "That's all!\n"
+	.string "Farewell, my master!$"
+
+gText_ApprenticePickWinSpeech11:: @ 82C2707
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin' SAILOR am I!\n"
+	.string "This will be my last question,\l"
+	.string "don't you cry!\p"
+	.string "It's a saying question\n"
+	.string "that begs your suggestion!\p"
+	.string "If I win a match, what can I say\n"
+	.string "in a real cool way?$"
+
+gText_ApprenticeWinSpeechThanks11:: @ 82C27D4
+	.string "{STR_VAR_1}\p"
+	.string "Perfect! That's what I'll use.\n"
+	.string "I was right to make you choose!\p"
+	.string "And now, I think it'd be best,\n"
+	.string "if I were to fly the nest!\p"
+	.string "Thanks for all you taught me.\n"
+	.string "I'll be off on a battle spree!\p"
+	.string "B-O-N-V-O-Y-A-G-E!\n"
+	.string "And that spells bon voyage,\l"
+	.string "to you this is my homage!$"
+
+gText_ApprenticePickWinSpeech12:: @ 82C28D6
+	.string "Oh, yeah, {PLAYER}!\n"
+	.string "I found you again today!\p"
+	.string "What should I do? Ask you again?\n"
+	.string "Why not? I'm already asking you!\p"
+	.string "Anyways, {PLAYER}…\n"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\l"
+	.string "I need some more advice for me!\p"
+	.string "It's about what I should yell.\n"
+	.string "Something cool to holler when\l"
+	.string "a battle ends well.\p"
+	.string "Come on, I wanna hear you say it!$"
+
+gText_ApprenticeWinSpeechThanks12:: @ 82C2A0B
+	.string "{STR_VAR_1}\p"
+	.string "All right, all right!\n"
+	.string "I'll use that because it's so tight!\p"
+	.string "I'm out of things to ask you.\n"
+	.string "Waving bye is all that's left to do.\p"
+	.string "But maybe one day we'll meet, with one\n"
+	.string "destined to go down in defeat.\p"
+	.string "But, it really is time to say farewell.\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don't you forget about me!\p"
+	.string "Take care, {PLAYER}!\n"
+	.string "Love ya!$"
+
+gText_ApprenticePickWinSpeech13:: @ 82C2B50
+	.string "{PLAYER}{KUN}, I'm finished…\n"
+	.string "My nose won't stop dripping…\p"
+	.string "I was trying to think up something\n"
+	.string "cool to say when I win a battle.\p"
+	.string "It inspired me so much, it made me cry,\n"
+	.string "and now my nose won't stop running…\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me, {PLAYER}{KUN}.\p"
+	.string "When I win a battle,\n"
+	.string "what should I say?$"
+
+gText_ApprenticeWinSpeechThanks13:: @ 82C2C77
+	.string "{STR_VAR_1}\p"
+	.string "… … …That's good.\n"
+	.string "No, it's awe inspiring!\l"
+	.string "It's bringing fresh tears to my eyes!\p"
+	.string "But in spite of my tears and runny\n"
+	.string "nose, I will use that saying!\p"
+	.string "I'm plumb out of things to ask you,\n"
+	.string "{PLAYER}{KUN}.\p"
+	.string "From now on, we're rivals!\n"
+	.string "Thanks for everything!$"
+
+gText_ApprenticePickWinSpeech14:: @ 82C2D67
+	.string "Er… Um…\n"
+	.string "{PLAYER}{KUN}…\p"
+	.string "Please, don't look at me that way.\n"
+	.string "You're making me all nervous.\p"
+	.string "I… I need your advice again.\n"
+	.string "I'll make it my last, though…\p"
+	.string "It's really embarrassing to ask,\n"
+	.string "but what if I win a battle?\l"
+	.string "What should I say?$"
+
+gText_ApprenticeWinSpeechThanks14:: @ 82C2E41
+	.string "{STR_VAR_1}\p"
+	.string "Oh… Okay!\n"
+	.string "I'll try to say that!\l"
+	.string "I might be too nervous to say it…\p"
+	.string "Thank you, {PLAYER}{KUN}.\n"
+	.string "I have to say good-bye now.\p"
+	.string "I'll obey all that you've taught me,\n"
+	.string "{PLAYER}{KUN}, and do the best I can.$"
+
+gText_ApprenticePickWinSpeech15:: @ 82C2EF5
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps a clever {PLAYER} DOLL?\p"
+	.string "Oh, no, no, no, don't worry!\n"
+	.string "If you really are real, please\l"
+	.string "forget about my rudeness.\p"
+	.string "No need to be so angry. All I wish for\n"
+	.string "is more of your fine advice.\p"
+	.string "It concerns a saying.\p"
+	.string "More precisely, what should I say\n"
+	.string "if I win a battle?$"
+
+gText_ApprenticeWinSpeechThanks15:: @ 82C3023
+	.string "{STR_VAR_1}\p"
+	.string "… … … … … …\n"
+	.string "When I win a match…\p"
+	.string "{STR_VAR_1}\p"
+	.string "…Are you serious?\p"
+	.string "I see. If you are serious, that's fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope even I will be able to\n"
+	.string "put that saying to good use.\p"
+	.string "I seem to have run dry on what advice\n"
+	.string "I need.\p"
+	.string "I do believe it's high time I bid you\n"
+	.string "farewell and strike out on my own.\p"
+	.string "Thank you, my mentor!\n"
+	.string "I apologize for my skepticism!$"
diff --git a/data/text/berries.inc b/data/text/berries.inc
index ca9481f52..152690e20 100644
--- a/data/text/berries.inc
+++ b/data/text/berries.inc
@@ -3,14 +3,14 @@ PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D
 	.string "I just received a very rare BERRY.\n"
 	.string "I'd like you to have it.$"
 
-Route104_Text_2A6D86: @ 82A6D86
+Route104_Text_PlantBerriesInSoilTakeThis: @ 82A6D86
 	.string "If you see BERRIES growing in loamy\n"
 	.string "soil, feel free to take them.\p"
 	.string "But make sure you plant a BERRY in the\n"
 	.string "same spot. That's common courtesy.\p"
 	.string "Here, I'll share this with you.$"
 
-Route104_Text_2A6E32: @ 82A6E32
+Route104_Text_TrainersOftenMakeMonHoldBerries: @ 82A6E32
 	.string "The way you look, you must be a\n"
 	.string "TRAINER, no?\p"
 	.string "TRAINERS often make POKéMON hold\n"
@@ -18,139 +18,139 @@ Route104_Text_2A6E32: @ 82A6E32
 	.string "It's up to you whether to grow BERRIES\n"
 	.string "or use them.$"
 
-Route111_Text_2A6EBD: @ 82A6EBD
+Route111_Text_WateredPlantsEveryDayTakeBerry: @ 82A6EBD
 	.string "I watered the plants every day.\n"
 	.string "They grew lots of flowers.\p"
 	.string "And they gave me lots of BERRIES, too.\p"
 	.string "Here you go!\n"
 	.string "You can have it!$"
 
-Route111_Text_2A6F3D: @ 82A6F3D
+Route111_Text_GoingToTryToMakeDifferentColorBerries: @ 82A6F3D
 	.string "I'm going to try really hard and make\n"
 	.string "BERRIES in different colors.\p"
 	.string "I hope you try hard, too!$"
 
-Route111_Text_2A6F9A: @ 82A6F9A
+Route111_Text_WhatColorBerriesToLookForToday: @ 82A6F9A
 	.string "I wonder what color BERRIES I'll look\n"
 	.string "for today?$"
 
-Route114_Text_2A6FCB: @ 82A6FCB
+Route114_Text_LoveUsingBerryCrushShareBerry: @ 82A6FCB
 	.string "I love using the BERRY CRUSH machine,\n"
 	.string "so I'm collecting BERRIES.\p"
 	.string "I'll share one with you, if you'd like.$"
 
-Route114_Text_2A7034: @ 82A7034
+Route114_Text_TryBerryCrushWithFriends: @ 82A7034
 	.string "You should try the BERRY CRUSH\n"
 	.string "machine with your friends.$"
 
-Route114_Text_2A706E: @ 82A706E
+Route114_Text_FunToThinkAboutBerries: @ 82A706E
 	.string "Which BERRY should be planted?\n"
 	.string "Should you use or hoard BERRIES?\p"
 	.string "It's fun to think about.$"
 
-Route120_Text_2A70C7: @ 82A70C7
+Route120_Text_BerriesExpressionOfLoveIsntIt: @ 82A70C7
 	.string "BERRIES grow by soaking up sunlight.\p"
 	.string "We help the BERRIES grow by watering\n"
 	.string "them regularly.\p"
 	.string "It's an expression of love, isn't it?$"
 
-Route120_Text_2A7147: @ 82A7147
+Route120_Text_YesYouUnderstand: @ 82A7147
 	.string "Yes, yes.\n"
 	.string "You understand what I mean.\p"
 	.string "You should take this.$"
 
-Route120_Text_2A7183: @ 82A7183
+Route120_Text_MakeYourOwnImpressions: @ 82A7183
 	.string "Oh… But it is important to make your\n"
 	.string "own impressions, I guess…\p"
 	.string "You can have this.$"
 
-Route120_Text_2A71D5: @ 82A71D5
+Route120_Text_BerryIsRareRaiseItWithCare: @ 82A71D5
 	.string "I think that BERRY is rare.\n"
 	.string "I hope you raise it with loving care.$"
 
-Route120_Text_2A7217: @ 82A7217
+Route120_Text_IllGetMoreBerriesFromBerryMaster: @ 82A7217
 	.string "I'll get more BERRIES from\n"
 	.string "the BERRY MASTER.$"
 
-LilycoveCity_Text_2A7244: @ 82A7244
+LilycoveCity_Text_BerrySuitsYou: @ 82A7244
 	.string "When it gets right down to it…\p"
 	.string "The same way suits suit me perfectly,\n"
 	.string "a crisp breeze suits the sea.\p"
 	.string "And you, a BERRY suits you to a “T”…\p"
 	.string "Why should that be so?$"
 
-LilycoveCity_Text_2A72E3: @ 82A72E3
+LilycoveCity_Text_BecauseYoureTrainer: @ 82A72E3
 	.string "When it gets right down to it…\p"
 	.string "It's because you're a TRAINER!$"
 
-LilycoveCity_Text_2A7321: @ 82A7321
+LilycoveCity_Text_PokeblocksSuitPokemon: @ 82A7321
 	.string "When it gets right down to it…\p"
 	.string "The way dignified simplicity suits me,\n"
 	.string "{POKEBLOCK}S perfectly suit POKéMON.$"
 
-Route123_BerryMastersHouse_Text_2A7386: @ 82A7386
+Route123_BerryMastersHouse_Text_YoureDeservingOfBerry: @ 82A7386
 	.string "You may call me the BERRY MASTER.\p"
 	.string "I dream of filling the world with\n"
 	.string "beautiful flowers, so I raise BERRIES\l"
 	.string "and hand them out to everyone.\p"
 	.string "You're deserving of one!$"
 
-Route123_BerryMastersHouse_Text_2A7428: @ 82A7428
+Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother: @ 82A7428
 	.string "Why be stingy?\n"
 	.string "Take another!$"
 
-Route123_BerryMastersHouse_Text_2A7445: @ 82A7445
+Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop: @ 82A7445
 	.string "Be sure to visit the PRETTY PETAL\n"
 	.string "flower shop near RUSTBORO.\p"
 	.string "Let flowers fill the world!$"
 
-Route123_BerryMastersHouse_Text_2A749E: @ 82A749E
+Route123_BerryMastersHouse_Text_DoneForToday: @ 82A749E
 	.string "I'm done for today.\n"
 	.string "Come again another day.\p"
 	.string "Let flowers fill the world!$"
 
-Route123_BerryMastersHouse_Text_2A74E6: @ 82A74E6
+Route123_BerryMastersHouse_Text_HeardAGoodSayingLately: @ 82A74E6
 	.string "The way my husband grows BERRIES,\n"
 	.string "oh, he's the best in the world.\p"
 	.string "He makes me proud, that he does.\p"
 	.string "Incidentally, child, have you heard\n"
 	.string "a good saying lately?$"
 
-Route123_BerryMastersHouse_Text_2A7583: @ 82A7583
+Route123_BerryMastersHouse_Text_InspirationalTakeThis: @ 82A7583
 	.string "Ah! What a remarkable saying!\n"
 	.string "Inspirational, it is!\p"
 	.string "I want you to have this.$"
 
-Route123_BerryMastersHouse_Text_2A75D0: @ 82A75D0
+Route123_BerryMastersHouse_Text_GoodSayingTakeThis: @ 82A75D0
 	.string "Oh! A good saying it is.\n"
 	.string "You're quite remarkable.\p"
 	.string "I want you to have this.$"
 
-Route123_BerryMastersHouse_Text_2A761B: @ 82A761B
+Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife: @ 82A761B
 	.string "Our four grandchildren should become\n"
 	.string "more accomplished than my husband.\p"
 	.string "Joy never goes out of my life!$"
 
-Route123_BerryMastersHouse_Text_2A7682: @ 82A7682
+Route123_BerryMastersHouse_Text_Ah: @ 82A7682
 	.string "Ah…$"
 
-Route104_PrettyPetalFlowerShop_Text_2A7686: @ 82A7686
+Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686
 	.string "Hello!\p"
 	.string "This is the PRETTY PETAL flower shop.\n"
 	.string "Spreading flowers all over the world!$"
 
-Route104_PrettyPetalFlowerShop_Text_2A76D9: @ 82A76D9
+Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries: @ 82A76D9
 	.string "{PLAYER}{KUN}, would you like to learn about\n"
 	.string "BERRIES?$"
 
-Route104_PrettyPetalFlowerShop_Text_2A7706: @ 82A7706
+Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries: @ 82A7706
 	.string "Your name is?\p"
 	.string "{PLAYER}{KUN}.\n"
 	.string "That's a nice name.\p"
 	.string "{PLAYER}{KUN}, would you like to learn about\n"
 	.string "BERRIES?$"
 
-Route104_PrettyPetalFlowerShop_Text_2A775B: @ 82A775B
+Route104_PrettyPetalFlowerShop_Text_BerriesExplanation: @ 82A775B
 	.string "BERRIES grow on trees that thrive\n"
 	.string "only in soft, loamy soil.\p"
 	.string "If you take some BERRIES, be sure to\n"
@@ -164,18 +164,18 @@ Route104_PrettyPetalFlowerShop_Text_2A775B: @ 82A775B
 	.string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n"
 	.string "and bring more flowers into the world.$"
 
-Route104_PrettyPetalFlowerShop_Text_2A78DF: @ 82A78DF
+Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness: @ 82A78DF
 	.string "Flowers bring so much happiness to\n"
 	.string "people, don't they?$"
 
-Route104_PrettyPetalFlowerShop_Text_2A7916: @ 82A7916
+Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis: @ 82A7916
 	.string "Hello!\p"
 	.string "The more attention you give to flowers,\n"
 	.string "the more beautifully they bloom.\p"
 	.string "You'll like tending flowers. I'm sure\n"
 	.string "of it. You can have this.$"
 
-Route104_PrettyPetalFlowerShop_Text_2A79A6: @ 82A79A6
+Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation: @ 82A79A6
 	.string "While BERRY plants are growing,\n"
 	.string "water them with the WAILMER PAIL.\p"
 	.string "Oh, another thing.\p"
@@ -185,13 +185,13 @@ Route104_PrettyPetalFlowerShop_Text_2A79A6: @ 82A79A6
 	.string "Isn't that awesome?\n"
 	.string "It's like they have the will to live.$"
 
-Route104_PrettyPetalFlowerShop_Text_2A7A98: @ 82A7A98
+Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers: @ 82A7A98
 	.string "I'm trying to be like my big sisters.\n"
 	.string "I'm growing flowers, too!\p"
 	.string "Here you go!\n"
 	.string "It's for you!$"
 
-Route104_PrettyPetalFlowerShop_Text_2A7AF3: @ 82A7AF3
+Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries: @ 82A7AF3
 	.string "You can plant a BERRY and grow it big,\n"
 	.string "or you can make a POKéMON hold it.\p"
 	.string "But now they have a machine that mixes\n"
@@ -199,7 +199,7 @@ Route104_PrettyPetalFlowerShop_Text_2A7AF3: @ 82A7AF3
 	.string "for POKéMON.\p"
 	.string "I want some candy, too.$"
 
-SootopolisCity_Text_2A7BB0: @ 82A7BB0
+SootopolisCity_Text_NameIsKiriHaveOneOfThese: @ 82A7BB0
 	.string "Hi, what's your name?\p"
 	.string "… … …  … … …  … … …\n"
 	.string "Okay. That's nice!\p"
@@ -209,26 +209,26 @@ SootopolisCity_Text_2A7BB0: @ 82A7BB0
 	.string "That's what they wished.\p"
 	.string "You can have one of these.$"
 
-SootopolisCity_Text_2A7C7C: @ 82A7C7C
+SootopolisCity_Text_GiveYouThisBerryToo: @ 82A7C7C
 	.string "KIRI will give you this BERRY, too!\n"
 	.string "I really like it lots!$"
 
-SootopolisCity_Text_2A7CB7: @ 82A7CB7
+SootopolisCity_Text_WhatKindOfWishInYourName: @ 82A7CB7
 	.string "I wonder what kind of wish is included\n"
 	.string "in your name.$"
 
-SootopolisCity_Text_2A7CEC: @ 82A7CEC
+SootopolisCity_Text_LikeSeasonBornIn: @ 82A7CEC
 	.string "Spring, summer, autumn, and winter.\p"
 	.string "If you're born in springtime, do you like\n"
 	.string "the spring, and if you're born in the\l"
 	.string "summer, do you like the summer?$"
 
-SootopolisCity_Text_2A7D80: @ 82A7D80
+SootopolisCity_Text_ThenILoveAutumn: @ 82A7D80
 	.string "Then KIRI was born in the autumn,\n"
 	.string "so I love the autumn!\p"
 	.string "Which season do you like?$"
 
-SootopolisCity_Text_2A7DD2: @ 82A7DD2
+SootopolisCity_Text_OhDoesntMatter: @ 82A7DD2
 	.string "Oh…\n"
 	.string "It doesn't matter…\p"
 	.string "There's so much that I want to know…$"
diff --git a/data/text/contest_hall.inc b/data/text/blend_master.inc
index 21753d35c..31315bbd5 100644
--- a/data/text/contest_hall.inc
+++ b/data/text/blend_master.inc
@@ -1,34 +1,34 @@
-LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C
+BerryBlender_Text_BlendWithTheBlendMaster: @ 82C427C
 	.string "BLEND MASTER: Indeed I am!\n"
 	.string "The BLEND MASTER am I!\p"
 	.string "Blend with me, and you shall witness\n"
 	.string "the mastery I bring to blending!$"
 
-LilycoveCity_ContestLobby_Text_2C42F4: @ 82C42F4
+BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
 	.string "BLEND MASTER: Hmmm! So, you wish to\n"
 	.string "see my mastery in action?$"
 
-LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332
+BerryBlender_Text_TooBusyNowIsee: @ 82C4332
 	.string "Hmmm!\p"
 	.string "So, you are too busy now, I see!\p"
 	.string "But fear not!\n"
 	.string "I shall be here all day!\l"
 	.string "Hurry back from your errand!$"
 
-LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D
+BerryBlender_Text_BlendMasterNoBerries: @ 82C439D
 	.string "Hmmm!\p"
 	.string "You haven't got a single BERRY!\p"
 	.string "I shall be here all day!\n"
 	.string "Hurry back with some BERRIES!$"
 
-LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA
+BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
 	.string "Of course!\n"
 	.string "Of course!\p"
 	.string "Incidentally…\n"
 	.string "You do know how to blend {POKEBLOCK}S\l"
 	.string "from BERRIES?$"
 
-LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C
+BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
 	.string "Hmmm!\p"
 	.string "Ah, but it is a simple process!\p"
 	.string "When the BLENDER's arrow comes to\n"
@@ -37,40 +37,40 @@ LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C
 	.string "When you see how precisely I press\n"
 	.string "the A Button, you will understand.$"
 
-LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B
+BerryBlender_Text_BlendMasterLetsBerryBlender: @ 82C451B
 	.string "Fine!\p"
 	.string "Let's get started, then!\p"
 	.string "All together with the BLEND MASTER,\n"
 	.string "let's BERRY BLENDER!$"
 
-LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573
+BerryBlender_Text_BlendMasterNoPokeblockCase: @ 82C4573
 	.string "Hmmm!\p"
 	.string "You don't appear to have gotten\n"
 	.string "the {POKEBLOCK} CASE!\p"
 	.string "I shall be here all day!\n"
 	.string "Obtain the {POKEBLOCK} CASE and hurry back!$"
 
-LilycoveCity_ContestLobby_Text_2C45E8: @ 82C45E8
+BerryBlender_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
 	.string "Hmmm!\p"
 	.string "Your {POKEBLOCK} CASE appears to be full!\p"
 	.string "I shall be here all day!\n"
 	.string "Use some {POKEBLOCK}S and hurry back!$"
 
-LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B
+BerryBlender_Text_WhoaAwesome: @ 82C464B
 	.string "Whoa!\n"
 	.string "Awesome!$"
 
-LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A
+BerryBlender_Text_WickedlyFast: @ 82C465A
 	.string "Wickedly fast!$"
 
-LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669
+BerryBlender_Text_WhatAnExpert: @ 82C4669
 	.string "What an expert!$"
 
-LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679
+BerryBlender_Text_MadeAmazingPokeblocksWithMaster: @ 82C4679
 	.string "When I blended with the MASTER,\n"
 	.string "we made amazing {POKEBLOCK}S!$"
 
-LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
+BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
 	.string "Eyes that track the arrow with\n"
 	.string "machinelike intensity…\p"
 	.string "A hand that taps the A Button\n"
@@ -78,7 +78,7 @@ LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
 	.string "Possessing these qualities makes\n"
 	.string "the BLEND MASTER truly great.$"
 
-LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763
+BerryBlender_Text_MasterWorksOnSkillsInMountains: @ 82C4763
 	.string "The BLEND MASTER's supposed to work\n"
 	.string "on his skills deep in the mountains.\p"
 	.string "Sometimes, he comes to LILYCOVE\n"
diff --git a/data/text/braille.inc b/data/text/braille.inc
index 3d4b8e116..30f9b44d4 100644
--- a/data/text/braille.inc
+++ b/data/text/braille.inc
@@ -1,4 +1,4 @@
-Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15
+Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15
 	.byte 4
 	.byte 6
 	.byte 26
@@ -7,7 +7,7 @@ Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15
 	.byte 9
 	.braille "GO UP HERE.$"
 
-SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27
+SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27
 	.byte 7
 	.byte 6
 	.byte 21
@@ -16,7 +16,7 @@ SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27
 	.byte 9
 	.braille "ABC$"
 
-SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31
+SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31
 	.byte 7
 	.byte 6
 	.byte 21
@@ -25,7 +25,7 @@ SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31
 	.byte 9
 	.braille "GHI$"
 
-SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B
+SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B
 	.byte 7
 	.byte 6
 	.byte 21
@@ -34,7 +34,7 @@ SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B
 	.byte 9
 	.braille "MNO$"
 
-SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45
+SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45
 	.byte 7
 	.byte 6
 	.byte 21
@@ -43,7 +43,7 @@ SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45
 	.byte 9
 	.braille "TUV$"
 
-SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F
+SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F
 	.byte 7
 	.byte 6
 	.byte 21
@@ -52,7 +52,7 @@ SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F
 	.byte 9
 	.braille "DEF$"
 
-SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59
+SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59
 	.byte 7
 	.byte 6
 	.byte 21
@@ -61,7 +61,7 @@ SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59
 	.byte 9
 	.braille "JKL$"
 
-SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63
+SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63
 	.byte 7
 	.byte 6
 	.byte 21
@@ -70,7 +70,7 @@ SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63
 	.byte 9
 	.braille "PQRS$"
 
-SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E
+SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E
 	.byte 9
 	.byte 6
 	.byte 19
@@ -79,7 +79,7 @@ SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E
 	.byte 9
 	.braille ".$"
 
-SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76
+SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76
 	.byte 7
 	.byte 6
 	.byte 21
@@ -88,7 +88,7 @@ SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76
 	.byte 9
 	.braille "WXYZ$"
 
-SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81
+SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81
 	.byte 9
 	.byte 6
 	.byte 19
@@ -97,7 +97,7 @@ SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81
 	.byte 9
 	.braille ",$"
 
-SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89
+SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89
 	.byte 7
 	.byte 4
 	.byte 23
@@ -106,7 +106,7 @@ SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89
 	.byte 7
 	.braille "DIG HERE.$"
 
-SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99
+SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99
 	.byte 0
 	.byte 0
 	.byte 29
@@ -118,7 +118,7 @@ SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99
 	.braille "LAST COMES\n"
 	.braille "RELICANTH.$"
 
-SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA
+SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA
 	.byte 2
 	.byte 0
 	.byte 26
@@ -130,7 +130,7 @@ SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA
 	.braille "HAVE\n"
 	.braille "LIVED.$"
 
-SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC
+SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC
 	.byte 7
 	.byte 2
 	.byte 23
@@ -141,7 +141,7 @@ SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC
 	.braille "TO THE\n"
 	.braille "POKEMON.$"
 
-SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D
+SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D
 	.byte 3
 	.byte 0
 	.byte 25
@@ -153,7 +153,7 @@ SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D
 	.braille "POKEMON\n"
 	.braille "AWAY.$"
 
-SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34
+SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34
 	.byte 5
 	.byte 6
 	.byte 25
@@ -162,7 +162,7 @@ SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34
 	.byte 9
 	.braille "WE FEARED IT.$"
 
-SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48
+SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48
 	.byte 6
 	.byte 0
 	.byte 24
@@ -174,7 +174,7 @@ SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48
 	.braille "THOSE WITH\n"
 	.braille "HOPE.$"
 
-SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73
+SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73
 	.byte 3
 	.byte 2
 	.byte 27
@@ -186,7 +186,7 @@ SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73
 	.braille "POKEMON\n"
 	.braille "WAITS.$"
 
-DesertRuins_Braille_2A6CA0: @ 82A6CA0
+DesertRuins_Braille_UseRockSmash: @ 82A6CA0
 	.byte 1
 	.byte 0
 	.byte 27
@@ -198,7 +198,7 @@ DesertRuins_Braille_2A6CA0: @ 82A6CA0
 	.braille "THEN, USE\n"
 	.braille "ROCK SMASH.$"
 
-IslandCave_Braille_2A6CD4: @ 82A6CD4
+IslandCave_Braille_RunLapAroundWall: @ 82A6CD4
 	.byte 5
 	.byte 0
 	.byte 25
@@ -210,7 +210,7 @@ IslandCave_Braille_2A6CD4: @ 82A6CD4
 	.braille "RUN AROUND\n"
 	.braille "ONE LAP.$"
 
-AncientTomb_Braille_2A6D06: @ 82A6D06
+AncientTomb_Braille_ShineInTheMiddle: @ 82A6D06
 	.byte 3
 	.byte 0
 	.byte 25
diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc
index 85e0e4edb..7e98d9fc7 100644
--- a/data/text/cable_club.inc
+++ b/data/text/cable_club.inc
@@ -123,7 +123,7 @@ CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
 	.string "TRAINER CARD!\p"
 	.string "It's a {STR_VAR_2} card!$"
 
-SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4
+BattleColosseum2P_Text_TakePlaceStartBattle: @ 82784B4
 	.string "Please take your place and start\n"
 	.string "your battle.$"
 
diff --git a/data/text/contest_link.inc b/data/text/contest_link.inc
index 649f760fa..d9873904f 100644
--- a/data/text/contest_link.inc
+++ b/data/text/contest_link.inc
@@ -1,36 +1,38 @@
-gUnknown_0827E8CE:: @ 827E8CE
+@ With the exception of Link standby, none of the below texts are used
+
+gTest_MissedTurn:: @ 827E8CE
 	.string "Missed turn$"
 
 gText_LinkStandby4:: @ 827E8DA
 	.string "Link standby!$"
 
-gUnknown_0827E8E8:: @ 827E8E8
+gText_WinnerIsPlayersMonCongrats:: @ 827E8E8
 	.string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n"
 	.string "Congratulations!$"
 
-gUnknown_0827E910:: @ 827E910
+gText_WinnerIsPlayersMon:: @ 827E910
 	.string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E929:: @ 827E929
+gText_PrimaryJudgingNumX:: @ 827E929
 	.string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E943:: @ 827E943
+gText_SecondaryJudgingNumX:: @ 827E943
 	.string "Secondary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E95F:: @ 827E95F
+gText_SetEventNumX:: @ 827E95F
 	.string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E973:: @ 827E973
+gText_MoveUsedMostOften:: @ 827E973
 	.string "The move used most often:\n"
 	.string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E992:: @ 827E992
+gText_MostImpressiveMon:: @ 827E992
 	.string "The most impressive POKéMON:\n"
 	.string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E9B9:: @ 827E9B9
+gText_SetEventNumX2:: @ 827E9B9
 	.string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_0827E9CD:: @ 827E9CD
+gText_LinkTVProgramWillNotBeMadeTrainerLost:: @ 827E9CD
 	.string "A link TV program will not be made\n"
 	.string "because the TRAINER lost.{PAUSE_UNTIL_PRESS}$"
diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc
index e332e16bb..3cebef526 100644
--- a/data/text/contest_strings.inc
+++ b/data/text/contest_strings.inc
@@ -1,191 +1,191 @@
-@ contest move effect descriptions
+@ Contest move effect descriptions
 
-gContestEffect00hDescription:: @ 827CB82
+gText_HighlyAppealingMove:: @ 827CB82
 	.string "A highly appealing move.$"
 
-gContestEffect01hDescription:: @ 827CB9B
+gText_UserMoreEasilyStartled:: @ 827CB9B
 	.string "After this move, the user is\nmore easily startled.$"
 
-gContestEffect02hDescription:: @ 827CBCE
+gText_GreatAppealButNoMoreToEnd:: @ 827CBCE
 	.string "Makes a great appeal, but\nallows no more to the end.$"
 
-gContestEffect03hDescription:: @ 827CC03
+gText_UsedRepeatedlyWithoutBoringJudge:: @ 827CC03
 	.string "Can be repeatedly used\nwithout boring the JUDGE.$"
 
-gContestEffect04hDescription:: @ 827CC34
+gText_AvoidStartledByOthersOnce:: @ 827CC34
 	.string "Can avoid being startled\nby others once.$"
 
-gContestEffect05hDescription:: @ 827CC5D
+gText_AvoidStartledByOthers:: @ 827CC5D
 	.string "Can avoid being startled\nby others.$"
 
-gContestEffect06hDescription:: @ 827CC81
+gText_AvoidStartledByOthersLittle:: @ 827CC81
 	.string "Can avoid being startled\nby others a little.$"
 
-gContestEffect07hDescription:: @ 827CCAE
+gText_UserLessLikelyStartled:: @ 827CCAE
 	.string "After this move, the user is\nless likely to be startled.$"
 
-gContestEffect08hDescription:: @ 827CCE7
+gText_SlightlyStartleFrontMon:: @ 827CCE7
 	.string "Slightly startles the\nPOKéMON in front.$"
 
-gContestEffect09hDescription:: @ 827CD0F
+gText_SlightlyStartleAppealed:: @ 827CD0F
 	.string "Slightly startles those\nthat have made appeals.$"
 
-gContestEffect0AhDescription:: @ 827CD3F
+gText_StartleAppealedBeforeUser:: @ 827CD3F
 	.string "Startles the POKéMON that\nappealed before the user.$"
 
-gContestEffect0BhDescription:: @ 827CD73
+gText_StartleAllAppealed:: @ 827CD73
 	.string "Startles all POKéMON that\nhave done their appeals.$"
 
-gContestEffect0ChDescription:: @ 827CDA6
+gText_BadlyStartleFrontMon:: @ 827CDA6
 	.string "Badly startles the\nPOKéMON in front.$"
 
-gContestEffect0DhDescription:: @ 827CDCB
+gText_BadlyStartleAppealed:: @ 827CDCB
 	.string "Badly startles those that\nhave made appeals.$"
 
-gContestEffect0EhDescription:: @ 827CDF8
+gText_StartleAppealedBeforeUser2:: @ 827CDF8
 	.string "Startles the POKéMON that\nappealed before the user.$"
 
-gContestEffect0FhDescription:: @ 827CE2C
+gText_StartleAllAppealed2:: @ 827CE2C
 	.string "Startles all POKéMON that\nhave done their appeals.$"
 
-gContestEffect10hDescription:: @ 827CE5F
+gText_ShiftJudgesAttentionFromOthers:: @ 827CE5F
 	.string "Shifts the JUDGE's\nattention from others.$"
 
-gContestEffect11hDescription:: @ 827CE89
+gText_StartleMonHasJudgesAttention:: @ 827CE89
 	.string "Startles the POKéMON that\nhas the JUDGE's attention.$"
 
-gContestEffect12hDescription:: @ 827CEBE
+gText_JamOthersMissesTurn:: @ 827CEBE
 	.string "Jams the others, and misses\none turn of appeals.$"
 
-gContestEffect13hDescription:: @ 827CEEF
+gText_StartleMonsMadeSameTypeAppeal:: @ 827CEEF
 	.string "Startles POKéMON that\nmade a same-type appeal.$"
 
-gContestEffect14hDescription:: @ 827CF1E
+gText_BadlyStartleCoolAppeals:: @ 827CF1E
 	.string "Badly startles POKéMON\nthat made COOL appeals.$"
 
-gContestEffect15hDescription:: @ 827CF4D
+gText_BadlyStartleBeautyAppeals:: @ 827CF4D
 	.string "Badly startles POKéMON\nthat made BEAUTY appeals.$"
 
-gContestEffect16hDescription:: @ 827CF7E
+gText_BadlyStartleCuteAppeals:: @ 827CF7E
 	.string "Badly startles POKéMON\nthat made CUTE appeals.$"
 
-gContestEffect17hDescription:: @ 827CFAD
+gText_BadlyStartleSmartAppeals:: @ 827CFAD
 	.string "Badly startles POKéMON\nthat made SMART appeals.$"
 
-gContestEffect18hDescription:: @ 827CFDD
+gText_BadlyStartleToughAppeals:: @ 827CFDD
 	.string "Badly startles POKéMON\nthat made TOUGH appeals.$"
 
-gContestEffect19hDescription:: @ 827D00D
+gText_MakeMonAfterUserNervous:: @ 827D00D
 	.string "Makes one POKéMON after\nthe user nervous.$"
 
-gContestEffect1AhDescription:: @ 827D037
+gText_MakeAllMonsAfterUserNervous:: @ 827D037
 	.string "Makes all POKéMON after\nthe user nervous.$"
 
-gContestEffect1BhDescription:: @ 827D061
+gText_WorsenConditionOfThoseMadeAppeals:: @ 827D061
 	.string "Worsens the condition of\nthose that made appeals.$"
 
-gContestEffect1ChDescription:: @ 827D093
+gText_BadlyStartleMonsGoodCondition:: @ 827D093
 	.string "Badly startles POKéMON in\ngood condition.$"
 
-gContestEffect1DhDescription:: @ 827D0BD
+gText_AppealGreatIfPerformedFirst:: @ 827D0BD
 	.string "The appeal works great if\nperformed first.$"
 
-gContestEffect1EhDescription:: @ 827D0E8
+gText_AppealGreatIfPerformedLast:: @ 827D0E8
 	.string "The appeal works great if\nperformed last.$"
 
-gContestEffect1FhDescription:: @ 827D112
+gText_AppealAsGoodAsThoseBeforeIt:: @ 827D112
 	.string "Makes the appeal as good\nas those before it.$"
 
-gContestEffect20hDescription:: @ 827D13F
+gText_AppealAsGoodAsOneBeforeIt:: @ 827D13F
 	.string "Makes the appeal as good\nas the one before it.$"
 
-gContestEffect21hDescription:: @ 827D16E
+gText_AppealBetterLaterItsPerformed:: @ 827D16E
 	.string "The appeal works better\nthe later it is performed.$"
 
-gContestEffect22hDescription:: @ 827D1A1
+gText_AppealVariesDependingOnTiming:: @ 827D1A1
 	.string "The appeal's quality varies\ndepending on its timing.$"
 
-gContestEffect23hDescription:: @ 827D1D6
+gText_WorksWellIfSameTypeAsBefore:: @ 827D1D6
 	.string "Works well if it's the same\ntype as the one before.$"
 
-gContestEffect24hDescription:: @ 827D20A
+gText_WorksWellIfDifferentTypeAsBefore:: @ 827D20A
 	.string "Works well if different in\ntype than the one before.$"
 
-gContestEffect25hDescription:: @ 827D23F
+gText_AffectedByAppealInFront:: @ 827D23F
 	.string "Affected by how well the\nappeal in front goes.$"
 
-gContestEffect26hDescription:: @ 827D26E
+gText_UpsConditionHelpsPreventNervousness:: @ 827D26E
 	.string "Ups the user's condition.\nHelps prevent nervousness.$"
 
-gContestEffect27hDescription:: @ 827D2A3
+gText_AppealWorksWellIfConditionGood:: @ 827D2A3
 	.string "The appeal works well if the\nuser's condition is good.$"
 
-gContestEffect28hDescription:: @ 827D2DA
+gText_NextAppealMadeEarlier:: @ 827D2DA
 	.string "The next appeal can be\nmade earlier next turn.$"
 
-gContestEffect29hDescription:: @ 827D309
+gText_NextAppealMadeLater:: @ 827D309
 	.string "The next appeal can be\nmade later next turn.$"
 
-gContestEffect2AhDescription:: @ 827D336
+gText_TurnOrderMoreEasilyScrambled:: @ 827D336
 	.string "Makes the next turn's order\nmore easily scrambled.$"
 
-gContestEffect2BhDescription:: @ 827D369
+gText_ScrambleOrderOfNextAppeals:: @ 827D369
 	.string "Scrambles the order of\nappeals on the next turn.$"
 
-gContestEffect2ChDescription:: @ 827D39A
+gText_AppealExcitesAudienceInAnyContest:: @ 827D39A
 	.string "An appeal that excites the\naudience in any CONTEST.$"
 
-gContestEffect2DhDescription:: @ 827D3CE
+gText_BadlyStartlesMonsGoodAppeals:: @ 827D3CE
 	.string "Badly startles all POKéMON\nthat made good appeals.$"
 
-gContestEffect2EhDescription:: @ 827D401
+gText_AppealBestMoreCrowdExcited:: @ 827D401
 	.string "The appeal works best the\nmore the crowd is excited.$"
 
-gContestEffect2FhDescription:: @ 827D436
+gText_TemporarilyStopCrowdExcited:: @ 827D436
 	.string "Temporarily stops the\ncrowd from growing excited.$"
 
-@ unused move names
+@ Unused move names
 
-gUnusedContestMoveName0:: @ 827D468
+gText_RainDance:: @ 827D468
 	.string "RAIN DANCE$"
 
-gUnusedContestMoveName1:: @ 827D473
+gText_Rage:: @ 827D473
 	.string "RAGE$"
 
-gUnusedContestMoveName2:: @ 827D478
+gText_FocusEnergy:: @ 827D478
 	.string "FOCUS ENERGY$"
 
-gUnusedContestMoveName3:: @ 827D485
+gText_Hypnosis:: @ 827D485
 	.string "HYPNOSIS$"
 
-gUnusedContestMoveName4:: @ 827D48E
+gText_Softboiled:: @ 827D48E
 	.string "SOFTBOILED$"
 
-gUnusedContestMoveName5:: @ 827D499
+gText_HornAttack:: @ 827D499
 	.string "HORN ATTACK$"
 
-gUnusedContestMoveName6:: @ 827D4A5
+gText_SwordsDance:: @ 827D4A5
 	.string "SWORDS DANCE$"
 
-gUnusedContestMoveName7:: @ 827D4B2
+gText_Conversion:: @ 827D4B2
 	.string "CONVERSION$"
 
-gUnusedContestMoveName8:: @ 827D4BD
+gText_SunnyDay:: @ 827D4BD
 	.string "SUNNY DAY$"
 
-gUnusedContestMoveName9:: @ 827D4C7
+gText_Rest2:: @ 827D4C7
 	.string "REST$"
 
-gUnusedContestMoveName10:: @ 827D4CC
+gText_Vicegrip:: @ 827D4CC
 	.string "VICEGRIP$"
 
-gUnusedContestMoveName11:: @ 827D4D5
+gText_DefenseCurl:: @ 827D4D5
 	.string "DEFENSE CURL$"
 
-gUnusedContestMoveName12:: @ 827D4E2
+gText_LockOn:: @ 827D4E2
 	.string "LOCK-ON$"
 
-@ contest type names
+@ Contest type names
 
 gContestMoveTypeCoolText:: @ 827D4EA
 	.string "COOL$"
@@ -202,434 +202,441 @@ gContestMoveTypeSmartText:: @ 827D4FB
 gContestMoveTypeToughText:: @ 827D501
 	.string "TOUGH$"
 
-gText_0827D507:: @ 827D507
+gText_AppealNumWhichMoveWillBePlayed:: @ 827D507
 	.string "Appeal no. {STR_VAR_1}!\n"
 	.string "Which move will be played?$"
 
-gText_0827D531:: @ 827D531
+gText_AppealNumButItCantParticipate:: @ 827D531
 	.string "Appeal no. {STR_VAR_1}!\n"
 	.string "But it can't participate!$"
 
-gText_0827D55A:: @ 827D55A
+gText_MonAppealedWithMove:: @ 827D55A
 	.string "{STR_VAR_1} appealed with\n"
 	.string "{STR_VAR_2}!$"
 
-gText_0827D56F:: @ 827D56F
+gText_MonWasWatchingOthers:: @ 827D56F
 	.string "{STR_VAR_1} was watching\n"
 	.string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827D597:: @ 827D597
+gText_AllOutOfAppealTime:: @ 827D597
 	.string "We're all out of\n"
 	.string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827D5C1:: @ 827D5C1
+@ Unused appeal result texts
+
+gText_ButAppealWasJammed:: @ 827D5C1
 	.string "But the appeal was\n"
 	.string "jammed.$"
 
-gText_0827D5DC:: @ 827D5DC
+gText_FollowedAnotherMonsLead:: @ 827D5DC
 	.string "It followed another\n"
 	.string "POKéMON's lead.$"
 
-gText_0827D600:: @ 827D600
+gText_ButItMessedUp:: @ 827D600
 	.string "But it messed up.$"
 
-gText_0827D612:: @ 827D612
+gText_WentBetterThanUsual:: @ 827D612
 	.string "It went better than\n"
 	.string "usual.$"
 
-gText_0827D62D:: @ 827D62D
+gText_JudgeLookedAwayForSomeReason:: @ 827D62D
 	.string "The JUDGE looked away\n"
 	.string "for some reason.$"
 
-gText_0827D654:: @ 827D654
+gText_WorkedHardToBuildOnPastMistakes:: @ 827D654
 	.string "It worked hard to build on\n"
 	.string "past mistakes.$"
 
-gText_0827D67E:: @ 827D67E
+gText_CantMakeAnyMoreMoves:: @ 827D67E
 	.string "It can't make any more\n"
 	.string "moves.$"
 
-gText_0827D69C:: @ 827D69C
+gText_WorkedFrighteninglyWell:: @ 827D69C
 	.string "It worked frighteningly\n"
 	.string "well.$"
 
-gText_0827D6BA:: @ 827D6BA
+gText_WorkedHardAsStandoutMon:: @ 827D6BA
 	.string "It worked as hard as the\n"
 	.string "standout POKéMON.$"
 
-gText_0827D6E5:: @ 827D6E5
+gText_JudgedLookedOnExpectantly:: @ 827D6E5
 	.string "The JUDGE looked on\n"
 	.string "expectantly.$"
 
-gText_0827D706:: @ 827D706
+gText_WorkedRatherWell:: @ 827D706
 	.string "It worked rather well.$"
 
-gText_0827D71D:: @ 827D71D
+gText_WorkedLittleBetterThanUsual:: @ 827D71D
 	.string "It worked a little better\n"
 	.string "than usual.$"
 
-gText_0827D743:: @ 827D743
+@ Round result texts
+
+gText_MonFailedToStandOutAtAll:: @ 827D743
 	.string "{STR_VAR_1} failed to\n"
 	.string "stand out at all…{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D764:: @ 827D764
+gText_MonDidntStandOutVeryMuch:: @ 827D764
 	.string "{STR_VAR_1} didn't stand\n"
 	.string "out very much…{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D785:: @ 827D785
+gText_MonCaughtALittleAttention:: @ 827D785
 	.string "{STR_VAR_1} caught a\n"
 	.string "little attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D7A5:: @ 827D7A5
+gText_MonAttractedALotOfAttention:: @ 827D7A5
 	.string "{STR_VAR_1} attracted a\n"
 	.string "lot of attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D7C8:: @ 827D7C8
+gText_MonCommandedTotalAttention:: @ 827D7C8
 	.string "{STR_VAR_1} commanded\n"
 	.string "total attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D7E8:: @ 827D7E8
+gText_MonHasntMadeItsAppeal:: @ 827D7E8
 	.string "{STR_VAR_1} hasn't made\n"
 	.string "its appeal.{PAUSE_UNTIL_PRESS}$"
 
-gText_0827D805:: @ 827D805
+@ Unused
+gText_AnticipationSwelledForMonsAppealNext2:: @ 827D805
 	.string "Anticipation swelled for\n"
 	.string "{STR_VAR_1}'s appeal next.$"
 
-gText_0827D830:: @ 827D830
+gText_EmptyContestString:: @ 827D830
 	.string "$"
 
-gText_0827D831:: @ 827D831
+gText_JudgesViewsOnMonHeldFirm:: @ 827D831
 	.string "The JUDGE 's views on\n"
 	.string "{STR_VAR_1} held firm.$"
 
-gText_0827D855:: @ 827D855
+gText_MonsXChangedPerceptions:: @ 827D855
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "changed perceptions.$"
 
-gText_0827D872:: @ 827D872
+gText_MonsAppealEffectWoreOff:: @ 827D872
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "effect wore off.$"
 
-gText_0827D88F:: @ 827D88F
+gText_SpecialAppealsEffectWoreOff:: @ 827D88F
 	.string "The special appeal's\n"
 	.string "effect wore off.$"
 
-gText_0827D8B5:: @ 827D8B5
+gText_EveryonesAppealsMadeToLookSame:: @ 827D8B5
 	.string "Everyone's appeals were\n"
 	.string "made to look the same.$"
 
-gText_0827D8E4:: @ 827D8E4
+gText_CheapenedMonsAppeal:: @ 827D8E4
 	.string "It cheapened\n"
 	.string "{STR_VAR_2}'s appeal.$"
 
-gText_0827D8FE:: @ 827D8FE
+gText_CheapenedAppealOfThoseAhead:: @ 827D8FE
 	.string "It cheapened the appeal\n"
 	.string "of those ahead.$"
 
-gText_0827D926:: @ 827D926
+gText_StoleAttentionAwayFromMon:: @ 827D926
 	.string "It stole attention away\n"
 	.string "from {STR_VAR_2}.$"
 
-gText_0827D947:: @ 827D947
+gText_CheapenedMonsAppeal2:: @ 827D947
 	.string "It cheapened\n"
 	.string "{STR_VAR_2}'s appeal.$"
 
-gText_0827D961:: @ 827D961
+gText_SeverelyCheapenedOtherAppeals:: @ 827D961
 	.string "It severely cheapened\n"
 	.string "other appeals.$"
 
-gText_0827D986:: @ 827D986
+gText_AnticipationSwelledForMonsAppealNext:: @ 827D986
 	.string "Anticipation swelled for\n"
 	.string "{STR_VAR_1}'s appeal next.$"
 
-gText_0827D9B1:: @ 827D9B1
+gText_CheapenedAppealOfThoseAhead2:: @ 827D9B1
 	.string "It cheapened the appeal\n"
 	.string "of those ahead.$"
 
-gText_0827D9D9:: @ 827D9D9
+gText_CheapenedJudgesFavoriteAppeal:: @ 827D9D9
 	.string "It cheapened the JUDGE's\n"
 	.string "favorite appeal.$"
 
-gText_0827DA03:: @ 827DA03
+gText_AppealsOfOthersCheapenedByHalf:: @ 827DA03
 	.string "The appeals of others\n"
 	.string "were cheapened by half.$"
 
-gText_0827DA31:: @ 827DA31
+gText_StoodOutToMakeUpForBeingJammed:: @ 827DA31
 	.string "It stood out to make up\n"
 	.string "for being jammed.$"
 
-gText_0827DA5B:: @ 827DA5B
+gText_CantParticipateInAppealsAnyMore:: @ 827DA5B
 	.string "It can't participate in\n"
 	.string "appeals any more.$"
 
-gText_0827DA85:: @ 827DA85
+gText_TouchedJudgeForFantasticAppeal:: @ 827DA85
 	.string "It touched the JUDGE for\n"
 	.string "a fantastic appeal.$"
 
-gText_0827DAB2:: @ 827DAB2
+gText_AnticipationRoseForUpcomingAppeals:: @ 827DAB2
 	.string "Anticipation rose for\n"
 	.string "upcoming appeals.$"
 
-gText_0827DADA:: @ 827DADA
+gText_StoodOutAsMuchAsSpecialAppeals:: @ 827DADA
 	.string "It stood out as much as\n"
 	.string "special appeals.$"
 
-gText_0827DB03:: @ 827DB03
+gText_StoodOutAsMuchAsMon:: @ 827DB03
 	.string "It stood out as much as\n"
 	.string "{STR_VAR_1}.$"
 
-gText_0827DB1F:: @ 827DB1F
+gText_JammedAppealsMadeEvenLessNoticeable:: @ 827DB1F
 	.string "Jammed appeals were made\n"
 	.string "even less noticeable.$"
 
-gText_0827DB4E:: @ 827DB4E
+gText_EveryonesAppealsMadeSame:: @ 827DB4E
 	.string "Everyone's appeals were\n"
 	.string "made the same.$"
 
-gText_827DB75:: @ 827DB75
+@ Appeal result texts
+
+gText_BecameMoreConsciousOfOtherMons:: @ 827DB75
 	.string "It became more conscious\n"
 	.string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DBB0:: @ 827DBB0
+gText_MonCantMakeAnAppealAfterThis:: @ 827DBB0
 	.string "{STR_VAR_1} can't make an\n"
 	.string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DBE0:: @ 827DBE0
+gText_SettledDownJustLittleBit:: @ 827DBE0
 	.string "It settled down just a\n"
 	.string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DC0F:: @ 827DC0F
+gText_BecameObliviousToOtherMons:: @ 827DC0F
 	.string "It became oblivious to\n"
 	.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DC45:: @ 827DC45
+gText_BecameLessAwareOfOtherMons:: @ 827DC45
 	.string "It became less aware of\n"
 	.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DC7C:: @ 827DC7C
+gText_StoppedCaringAboutOtherMons:: @ 827DC7C
 	.string "It stopped caring about\n"
 	.string "other POKéMON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DCB4:: @ 827DCB4
+gText_TriedToStartleOtherMons:: @ 827DCB4
 	.string "It tried to startle the\n"
 	.string "other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DCE7:: @ 827DCE7
+gText_TriedToDazzleOthers:: @ 827DCE7
 	.string "It tried to dazzle the\n"
 	.string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DD12:: @ 827DD12
+gText_JudgeLookedAwayFromMon:: @ 827DD12
 	.string "The JUDGE looked away\n"
 	.string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DD3D:: @ 827DD3D
+gText_TriedToUnnerveNextMon:: @ 827DD3D
 	.string "It tried to unnerve the\n"
 	.string "next POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DD6F:: @ 827DD6F
+gText_MonBecameNervous:: @ 827DD6F
 	.string "{STR_VAR_1} became\n"
 	.string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DD8E:: @ 827DD8E
+gText_AppealTriedToUnnerveWaitingMons:: @ 827DD8E
 	.string "The appeal tried to\n"
 	.string "unnerve waiting POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DDC7:: @ 827DDC7
+gText_TauntedMonsDoingWell:: @ 827DDC7
 	.string "It taunted POKéMON\n"
 	.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DDF2:: @ 827DDF2
+gText_MonRegainedItsForm:: @ 827DDF2
 	.string "{STR_VAR_1} regained its\n"
 	.string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DE14:: @ 827DE14
+gText_TriedToJamMonDoingWell:: @ 827DE14
 	.string "It tried to jam POKéMON\n"
 	.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DE44:: @ 827DE44
+gText_StandoutMonHustledEvenMore:: @ 827DE44
 	.string "The standout {STR_VAR_1}\n"
 	.string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DE73:: @ 827DE73
+gText_LargelyUnnoticedMonWorkedHard:: @ 827DE73
 	.string "The largely unnoticed\n"
 	.string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DEA5:: @ 827DEA5
+gText_WorkedAsMuchAsMonBefore:: @ 827DEA5
 	.string "It worked as much as\n"
 	.string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DED9:: @ 827DED9
+gText_MonsAppealDidNotGoWell:: @ 827DED9
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DF02:: @ 827DF02
+gText_WorkedAsMuchAsPrecedingMon:: @ 827DF02
 	.string "It worked as much as the\n"
 	.string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DF3A:: @ 827DF3A
+gText_MonsAppealDidNotGoWell2:: @ 827DF3A
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DF63:: @ 827DF63
+gText_MonsAppealDidNotGoWell3:: @ 827DF63
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DF8C:: @ 827DF8C
+gText_MonsAppealWentSlightlyWell:: @ 827DF8C
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DFB8:: @ 827DFB8
+gText_MonsAppealWentPrettyWell:: @ 827DFB8
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827DFE2:: @ 827DFE2
+gText_MonsAppealWentExcellently:: @ 827DFE2
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E00C:: @ 827E00C
+gText_MonsAppealWasDud:: @ 827E00C
 	.string "{STR_VAR_1}'s appeal was\n"
 	.string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E02F:: @ 827E02F
+gText_MonsAppealDidNotWorkVeryWell:: @ 827E02F
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E05F:: @ 827E05F
+gText_MonsAppealWentSlightlyWell2:: @ 827E05F
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E08B:: @ 827E08B
+gText_MonsAppealWentPrettyWell2:: @ 827E08B
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E0B5:: @ 827E0B5
+gText_MonsAppealWentVeryWell:: @ 827E0B5
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E0DD:: @ 827E0DD
+gText_MonsAppealWentExcellently2:: @ 827E0DD
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E107:: @ 827E107
+gText_SameTypeAsOneBeforeGood:: @ 827E107
 	.string "It's the same type as the\n"
 	.string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E143:: @ 827E143
+gText_NotSameTypeAsOneBeforeGood:: @ 827E143
 	.string "It's not the same type as\n"
 	.string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E17F:: @ 827E17F
+gText_StoodOutMuchMoreThanMonBefore:: @ 827E17F
 	.string "It stood out much more\n"
 	.string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E1BB:: @ 827E1BB
+gText_DidntDoAsWellAsMonBefore:: @ 827E1BB
 	.string "It didn't do as well as the\n"
 	.string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E1F3:: @ 827E1F3
+gText_MonsConditionRoseAboveUsual:: @ 827E1F3
 	.string "{STR_VAR_1}'s condition\n"
 	.string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E220:: @ 827E220
+gText_MonsHotStatusMadeGreatAppeal:: @ 827E220
 	.string "{STR_VAR_1}'s hot status\n"
 	.string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E254:: @ 827E254
+gText_MovedUpInLineForNextAppeal:: @ 827E254
 	.string "It moved up in line for\n"
 	.string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E289:: @ 827E289
+gText_MovedBackInLineForNextAppeal:: @ 827E289
 	.string "It moved back in line once\n"
 	.string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_827E2C5:: @ 827E2C5
+gText_ScrambledUpOrderForNextTurn:: @ 827E2C5
 	.string "It scrambled up the\n"
 	.string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_0827E2FE:: @ 827E2FE
+gText_JudgeLookedAtMonExpectantly:: @ 827E2FE
 	.string "The JUDGE looked at\n"
 	.string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E32E:: @ 827E32E
+gText_AppealComboWentOverWell:: @ 827E32E
 	.string "The appeal combo went\n"
 	.string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E35B:: @ 827E35B
+gText_AppealComboWentOverVeryWell:: @ 827E35B
 	.string "The appeal combo went\n"
 	.string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E38D:: @ 827E38D
+gText_AppealComboWentOverExcellently:: @ 827E38D
 	.string "The appeal combo went\n"
 	.string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E3C1:: @ 827E3C1
+gText_MonManagedToAvertGaze:: @ 827E3C1
 	.string "{STR_VAR_1} managed to\n"
 	.string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E3EB:: @ 827E3EB
+gText_MonManagedToAvoidSeeingIt:: @ 827E3EB
 	.string "{STR_VAR_1} managed to\n"
 	.string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E416:: @ 827E416
+gText_MonIsntFazedByThatSortOfThing:: @ 827E416
 	.string "{STR_VAR_1} isn't fazed\n"
 	.string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E448:: @ 827E448
+gText_MonBecameALittleDistracted:: @ 827E448
 	.string "{STR_VAR_1} became a\n"
 	.string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E473:: @ 827E473
+gText_TriedToStartleOtherPokemon:: @ 827E473
 	.string "It tried to startle the\n"
 	.string "other POKéMON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E4A6:: @ 827E4A6
+gText_MonLookedDownOutOfDistraction:: @ 827E4A6
 	.string "{STR_VAR_1} looked down\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E4D5:: @ 827E4D5
+gText_MonTurnedBackOutOfDistraction:: @ 827E4D5
 	.string "{STR_VAR_1} turned back\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E504:: @ 827E504
+gText_MonCouldntHelpUtteringCry:: @ 827E504
 	.string "{STR_VAR_1} couldn't help\n"
 	.string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E531:: @ 827E531
+gText_MonCouldntHelpLeapingUp:: @ 827E531
 	.string "{STR_VAR_1} couldn't help\n"
 	.string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E55A:: @ 827E55A
+gText_MonTrippedOutOfDistraction:: @ 827E55A
 	.string "{STR_VAR_1} tripped over\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E58A:: @ 827E58A
+gText_MonWasTooNervousToMove:: @ 827E58A
 	.string "{STR_VAR_1} was too\n"
 	.string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E5B2:: @ 827E5B2
+gText_ButItMessedUp2:: @ 827E5B2
 	.string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E5D0:: @ 827E5D0
+gText_ButItFailedToMakeTargetNervous:: @ 827E5D0
 	.string "But it failed to make\n"
 	.string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E606:: @ 827E606
+gText_ButItFailedToMakeAnyoneNervous:: @ 827E606
 	.string "But it failed to make\n"
 	.string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E638:: @ 827E638
+gText_ButItWasIgnored:: @ 827E638
 	.string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E658:: @ 827E658
+gText_CouldntImproveItsCondition:: @ 827E658
 	.string "But it couldn't improve\n"
 	.string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E68B:: @ 827E68B
+gText_BadConditionResultedInWeakAppeal:: @ 827E68B
 	.string "Its bad condition\n"
 	.string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E6C4:: @ 827E6C4
+gText_MonWasUnaffected:: @ 827E6C4
 	.string "{STR_VAR_1} was\n"
 	.string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
@@ -637,31 +644,31 @@ gText_RepeatedAppeal:: @ 827E6E3
 	.string "{STR_VAR_1} disappointed\n"
 	.string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E717:: @ 827E717
+gText_MonsXWentOverGreat:: @ 827E717
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E73C:: @ 827E73C
+gText_MonsXDidntGoOverWell:: @ 827E73C
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "didn't go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E76A:: @ 827E76A
+gText_MonsXGotTheCrowdGoing:: @ 827E76A
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E793:: @ 827E793
+gText_MonCantAppealNextTurn:: @ 827E793
 	.string "{STR_VAR_1} can't appeal\n"
 	.string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E7BA:: @ 827E7BA
+gText_AttractedCrowdsAttention:: @ 827E7BA
 	.string "It attracted the crowd's\n"
 	.string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E7EA:: @ 827E7EA
+gText_CrowdContinuesToWatchMon:: @ 827E7EA
 	.string "The crowd continues to\n"
 	.string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_0827E817:: @ 827E817
+gText_MonsMoveIsIgnored:: @ 827E817
 	.string "{STR_VAR_1}'s\n"
 	.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
@@ -680,38 +687,39 @@ gText_Contest_Hesitancy:: @ 827E850
 gText_Contest_Fear:: @ 827E85A
 	.string "fear$"
 
-gText_0827E85F:: @ 827E85F
+gText_Contest_Coolness:: @ 827E85F
 	.string "coolness$"
 
-gText_0827E868:: @ 827E868
+gText_Contest_Beauty:: @ 827E868
 	.string "beauty$"
 
-gText_0827E86F:: @ 827E86F
+gText_Contest_Cuteness:: @ 827E86F
 	.string "cuteness$"
 
-gText_0827E878:: @ 827E878
+gText_Contest_Smartness:: @ 827E878
 	.string "smartness$"
 
-gText_0827E882:: @ 827E882
+gText_Contest_Toughness:: @ 827E882
 	.string "toughness$"
 
-gText_0827E88C:: @ 827E88C
+@ Unused
+gText_Tension:: @ 827E88C
 	.string "TENSION$"
 
-gText_0827E894:: @ 827E894
+gText_CoolMove:: @ 827E894
 	.string "COOL Move$"
 
-gText_0827E89E:: @ 827E89E
+gText_BeautyMove:: @ 827E89E
 	.string "BEAUTY Move$"
 
-gText_0827E8AA:: @ 827E8AA
+gText_CuteMove:: @ 827E8AA
 	.string "CUTE Move$"
 
-gText_0827E8B4:: @ 827E8B4
+gText_SmartMove:: @ 827E8B4
 	.string "SMART Move$"
 
-gText_0827E8BF:: @ 827E8BF
+gText_ToughMove:: @ 827E8BF
 	.string "TOUGH Move$"
 
-gText_0827E8CA:: @ 827E8CA
+gText_3QuestionMarks:: @ 827E8CA
 	.string "???$"
diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc
index 674fed52e..102e6b4a2 100644
--- a/data/text/lottery_corner.inc
+++ b/data/text/lottery_corner.inc
@@ -1,4 +1,4 @@
-LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390
+LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket: @ 82A6390
 	.string "This is the POKéMON LOTTERY CORNER.\p"
 	.string "All shoppers at our DEPARTMENT STORE\n"
 	.string "get to draw a POKéMON LOTO TICKET.\p"
@@ -8,70 +8,70 @@ LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390
 	.string "Would you like to draw a POKéMON\n"
 	.string "LOTO TICKET?$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6496: @ 82A6496
+LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow: @ 82A6496
 	.string "Please come back tomorrow.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A64B1: @ 82A64B1
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain: @ 82A64B1
 	.string "Please do visit again.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A64C8: @ 82A64C8
+LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket: @ 82A64C8
 	.string "Please pick a LOTO TICKET.\n"
 	.string "…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A650B: @ 82A650B
+LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait: @ 82A650B
 	.string "The LOTO TICKET number is {STR_VAR_1}.\p"
 	.string "I need to run a check on this number\n"
 	.string "to see if it matches any of your\l"
 	.string "POKéMON's ID numbers. Please wait.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6592: @ 82A6592
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon: @ 82A6592
 	.string "Congratulations!\p"
 	.string "The ID number of your team's\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A65E6: @ 82A65E6
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon: @ 82A65E6
 	.string "Congratulations!\p"
 	.string "The ID number of your PC-boxed\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A663C: @ 82A663C
+LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched: @ 82A663C
 	.string "I'm sorry.\n"
 	.string "None of the numbers matched.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6664: @ 82A6664
+LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched: @ 82A6664
 	.string "Two digits matched, so you win the\n"
 	.string "third prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A66A7: @ 82A66A7
+LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched: @ 82A66A7
 	.string "Three digits matched, so you win the\n"
 	.string "second prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A66ED: @ 82A66ED
+LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched: @ 82A66ED
 	.string "Four digits matched, so you win the\n"
 	.string "first prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6731: @ 82A6731
+LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched: @ 82A6731
 	.string "Oh, my goodness, all five digits\n"
 	.string "matched!\p"
 	.string "You've won the jackpot prize!\n"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A678C: @ 82A678C
+LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis: @ 82A678C
 	.string "Oh?\n"
 	.string "You seem to have no room for this.\p"
 	.string "Please make room in your BAG and\n"
 	.string "let me know.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A67E1: @ 82A67E1
+LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding: @ 82A67E1
 	.string "{PLAYER}?\n"
 	.string "Yes, I've been expecting you.\p"
 	.string "This is the prize we've been holding\n"
 	.string "for you.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6831: @ 82A6831
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2: @ 82A6831
 	.string "Please do visit again.$"
diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc
new file mode 100644
index 000000000..2357963be
--- /dev/null
+++ b/data/text/mart_clerk.inc
@@ -0,0 +1,10 @@
+gText_HowMayIServeYou:: @ 8272A21
+	.string "Welcome!\p"
+	.string "How may I serve you?$"
+
+gText_PleaseComeAgain:: @ 8272A3F
+	.string "Please come again!$"
+
+gText_PlayerWhatCanIDoForYou:: @ 8272A52
+	.string "{PLAYER}{STRING 5}, welcome!\p"
+	.string "What can I do for you?$"
diff --git a/data/text/match_call.inc b/data/text/match_call.inc
index 376f36750..9ecdd03c7 100644
--- a/data/text/match_call.inc
+++ b/data/text/match_call.inc
@@ -2306,7 +2306,7 @@ gText_Wallace_Pokenav_2B3790:: @ 82B3790
 	.string "But what is a rare stone exactly?\n"
 	.string "All I can think of is a METEORITE…$"
 
-MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1
+MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall: @ 82B38C1
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
@@ -2321,7 +2321,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
+MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall: @ 82B39C6
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "BRENDAN: Hey, {PLAYER}!\n"
@@ -2831,7 +2831,7 @@ gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
 	.string "I hope we can meet again\n"
 	.string "somewhere!$"
 
-Route101_Text_2B5F52: @ 82B5F52
+MatchCall_Text_BirchRegisterCall: @ 82B5F52
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "I've already heard about you!\p"
 	.string "It seems your POKéNAV's been\n"
@@ -2842,10 +2842,11 @@ Route101_Text_2B5F52: @ 82B5F52
 	.string "out in the field.\p"
 	.string "… … … … … …$"
 
-Route101_Text_2B603A: @ 82B603A
+MatchCall_Text_RegisteredBirch: @ 82B603A
 	.string "Registered PROF. BIRCH\n"
 	.string "in the POKéNAV.$"
 
+MatchCall_Text_UnusedProfBirch:
 	.string "PROF. BIRCH: When one has both\n"
 	.string "the POKéDEX and POKéNAV, studying\l"
 	.string "POKéMON becomes more fun, eh?$"
diff --git a/data/text/mauville_man.inc b/data/text/mauville_man.inc
index 141808444..6326f5d8c 100644
--- a/data/text/mauville_man.inc
+++ b/data/text/mauville_man.inc
@@ -1,3 +1,4 @@
+@ Only contains a portion of the mauville_man text. The rest is in scripts/mauville_man.inc
 gText_SoPretty:: @ 8294295
 	.string " so pretty!$"
 
diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc
new file mode 100644
index 000000000..d263388f5
--- /dev/null
+++ b/data/text/obtain_item.inc
@@ -0,0 +1,31 @@
+gText_ObtainedTheItem:: @ 8272A78
+	.string "Obtained the {STR_VAR_2}!$"
+
+gText_TheBagIsFull:: @ 8272A89
+	.string "The BAG is full…$"
+
+gText_PutItemInPocket:: @ 8272A9A
+	.string "{PLAYER} put away the {STR_VAR_2}\n"
+	.string "in the {STR_VAR_3} POCKET.$"
+
+gText_PlayerFoundOneItem:: @ 8272ABF
+	.string "{PLAYER} found one {STR_VAR_2}!$"
+
+gText_TooBadBagIsFull:: @ 8272AD0
+	.string "Too bad!\n"
+	.string "The BAG is full…$"
+
+gText_PlayerPutItemInBag:: @ 8272AEA
+	.string "{PLAYER} put away the {STR_VAR_2}\n"
+	.string "in the BAG.$"
+
+gText_ObtainedTheDecor:: @ 8272B09
+	.string "Obtained the {STR_VAR_2}!$"
+
+gText_NoRoomLeftForAnother:: @ 8272B1A
+	.string "Too bad! There's no room left for\n"
+	.string "another {STR_VAR_2}…$"
+
+gText_TheDecorWasTransferredToThePC:: @ 8272B48
+	.string "The {STR_VAR_2} was transferred\n"
+	.string "to the PC.$"
diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc
new file mode 100644
index 000000000..216e0b570
--- /dev/null
+++ b/data/text/pc_transfer.inc
@@ -0,0 +1,31 @@
+gText_PkmnTransferredSomeonesPC:: @ 8273216
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "SOMEONE'S PC.\p"
+	.string "It was placed in \n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+gText_PkmnTransferredLanettesPC:: @ 8273256
+	.string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p"
+	.string "It was placed in \n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+gText_PkmnTransferredSomeonesPCBoxFull:: @ 8273296
+	.string "BOX “{STR_VAR_3}” on\n"
+	.string "SOMEONE'S PC was full.\p"
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+gText_PkmnTransferredLanettesPCBoxFull:: @ 82732D9
+	.string "BOX “{STR_VAR_3}” on\n"
+	.string "LANETTE'S PC was full.\p"
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "BOX “{STR_VAR_1}.”$"
+
+gText_NoMoreRoomForPokemon:: @ 827331C
+	.string "There's no more room for POKéMON!\p"
+	.string "The POKéMON BOXES are full and\n"
+	.string "can't accept any more!$"
+
+gText_NicknameThisPokemon:: @ 8273374
+	.string "Do you want to give a nickname to\n"
+	.string "this {STR_VAR_1}?$"
diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc
new file mode 100644
index 000000000..1270c0c0a
--- /dev/null
+++ b/data/text/record_mix.inc
@@ -0,0 +1,6 @@
+Text_WouldYouLikeToMixRecords: @ 827260D
+	.string "Would you like to mix records with\n"
+	.string "other TRAINERS?$"
+
+Text_WeHopeToSeeYouAgain: @ 8272640
+	.string "We hope to see you again!$"
diff --git a/data/text/save.inc b/data/text/save.inc
index bef7f3d6b..4719f34d3 100644
--- a/data/text/save.inc
+++ b/data/text/save.inc
@@ -1,3 +1,4 @@
+	.align 2
 gText_ConfirmSave:: @ 82C87B4
 	.string "Would you like to save the game?$"
 
diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc
index 52ab9fc48..4a15e7498 100644
--- a/data/text/shoal_cave.inc
+++ b/data/text/shoal_cave.inc
@@ -1,4 +1,4 @@
-ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E
+ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E
 	.string "Are you planning on going deep\n"
 	.string "in there?\p"
 	.string "How about bringing me back some\n"
@@ -6,27 +6,27 @@ ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E
 	.string "I can make you something good if\n"
 	.string "you bring me the ingredients.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7EB3: @ 82A7EB3
+ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells: @ 82A7EB3
 	.string "If you bring me four each of the\n"
 	.string "SHOAL SALT and SHOAL SHELLS,\l"
 	.string "I can make you a SHELL BELL…\p"
 	.string "You can get those ingredients\n"
 	.string "every day.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7F37: @ 82A7F37
+ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell: @ 82A7F37
 	.string "Oh, hey! SHOAL SALT and SHOAL SHELLS!\n"
 	.string "And enough of them, too!\p"
 	.string "Would you like me to make you\n"
 	.string "a SHELL BELL with them?$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC
+ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway: @ 82A7FAC
 	.string "All righty, then! I'll make you\n"
 	.string "a SHELL BELL right away.\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "There! Done!$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012
+ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012
 	.string "Have a POKéMON hold on to that.\n"
 	.string "It'll love it, that's for certain.\p"
 	.string "Why, the SHELL BELL's chime…\n"
@@ -34,22 +34,20 @@ ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012
 	.string "You can get its ingredients every day,\n"
 	.string "so I can make you more.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A80C6: @ 82A80C6
+ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell: @ 82A80C6
 	.string "Oh… Is that so…\n"
 	.string "I wanted to make a SHELL BELL…$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A80F5: @ 82A80F5
+ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag: @ 82A80F5
 	.string "You don't have space in your BAG\n"
 	.string "if I were to make it for you.\p"
 	.string "You should make room and come back\n"
 	.string "for a SHELL BELL.$"
 
-ShoalCave_LowTideInnerRoom_Text_2A8169: @ 82A8169
-ShoalCave_LowTideLowerRoom_Text_2A8169: @ 82A8169
-ShoalCave_LowTideStairsRoom_Text_2A8169: @ 82A8169
+ShoalCave_Text_WasShoalSaltNowNothing: @ 82A8169
 	.string "There was some SHOAL SALT here.\n"
 	.string "But, there's nothing here now.$"
 
-ShoalCave_LowTideInnerRoom_Text_2A81A8: @ 82A81A8
+ShoalCave_Text_WasShoallShellNowNothing: @ 82A81A8
 	.string "There was a SHOAL SHELL here.\n"
 	.string "But, there's nothing here now.$"
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index a6432006c..9e971b223 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -1,1322 +1,1322 @@
-Route102_Text_294513: @ 8294513
+Route102_Text_CalvinIntro: @ 8294513
 	.string "If you have POKéMON with you, then\n"
 	.string "you're an official POKéMON TRAINER!\l"
 	.string "You can't say no to my challenge!$"
 
-Route102_Text_29457C: @ 829457C
+Route102_Text_CalvinDefeated: @ 829457C
 	.string "Arrgh, I lost…\n"
 	.string "I should have trained mine more…$"
 
-Route102_Text_2945AC: @ 82945AC
+Route102_Text_CalvinPostBattle: @ 82945AC
 	.string "Listen, you. If you're strong,\n"
 	.string "you should have told me before!$"
 
-Route102_Text_2945EB: @ 82945EB
+Route102_Text_CalvinRegister: @ 82945EB
 	.string "I've been working hard at this since\n"
 	.string "I saw you before.\p"
 	.string "I'd like to battle you again, so can\n"
 	.string "you register me in your POKéNAV?$"
 
-Route102_Text_294668: @ 8294668
+Route102_Text_CalvinRegisterShort: @ 8294668
 	.string "I'd like to battle you again, so can\n"
 	.string "you register me in your POKéNAV?$"
 
-Route102_Text_2946AE: @ 82946AE
+Route102_Text_CalvinRematchIntro: @ 82946AE
 	.string "Ever since I lost to you, I desperately\n"
 	.string "trained my POKéMON.\l"
 	.string "You can't say no to my challenge!$"
 
-Route102_Text_29470C: @ 829470C
+Route102_Text_CalvinRematchDefeated: @ 829470C
 	.string "Arrgh, I lost…\n"
 	.string "Is my training method not right?$"
 
-Route102_Text_29473C: @ 829473C
+Route102_Text_CalvinRematchPostBattle: @ 829473C
 	.string "If you're going to get stronger,\n"
 	.string "I'll get stronger, too.$"
 
-Route102_Text_294775: @ 8294775
+Route102_Text_AllenIntro: @ 8294775
 	.string "Did you just become a TRAINER?\n"
 	.string "We're both beginners!$"
 
-Route102_Text_2947AA: @ 82947AA
+Route102_Text_AllenDefeated: @ 82947AA
 	.string "I called you because I thought\n"
 	.string "I could beat you…$"
 
-Route102_Text_2947DB: @ 82947DB
+Route102_Text_AllenPostBattle: @ 82947DB
 	.string "I haven't won once yet…\n"
 	.string "I wish I would win soon…$"
 
-Route102_Text_29480C: @ 829480C
+Route102_Text_RickIntro: @ 829480C
 	.string "Hahah! Our eyes met!\n"
 	.string "I'll take you on with my BUG POKéMON!$"
 
-Route102_Text_294847: @ 8294847
+Route102_Text_RickDefeated: @ 8294847
 	.string "Ow! Down and out!$"
 
-Route102_Text_294859: @ 8294859
+Route102_Text_RickPostBattle: @ 8294859
 	.string "If you lock eyes with a TRAINER,\n"
 	.string "you have to challenge! It's a rule!$"
 
-Route102_Text_29489E: @ 829489E
+Route102_Text_TianaIntro: @ 829489E
 	.string "I'm going to keep winning and aim\n"
 	.string "to be the best TRAINER.\p"
 	.string "Help me further my career!$"
 
-Route102_Text_2948F3: @ 82948F3
+Route102_Text_TianaDefeated: @ 82948F3
 	.string "I ended up furthering your career…$"
 
-Route102_Text_294916: @ 8294916
+Route102_Text_TianaPostBattle: @ 8294916
 	.string "To keep winning my way up, I see that\n"
 	.string "I have to catch more POKéMON.$"
 
-Route103_Text_29495A: @ 829495A
+Route103_Text_DaisyIntro: @ 829495A
 	.string "Did you feel the tug of our\n"
 	.string "soul-soothing fragrance?$"
 
-Route103_Text_29498F: @ 829498F
+Route103_Text_DaisyDefeated: @ 829498F
 	.string "You weren't led astray by our aroma…$"
 
-Route103_Text_2949B4: @ 82949B4
+Route103_Text_DaisyPostBattle: @ 82949B4
 	.string "Aromatherapy is a form of mental\n"
 	.string "healing that works with fragrances.$"
 
-Route103_Text_2949F9: @ 82949F9
+Route103_Text_AmyIntro: @ 82949F9
 	.string "AMY: I'm AMY.\n"
 	.string "And this is my little sister LIV.\l"
 	.string "We battle together!$"
 
-Route103_Text_294A3D: @ 8294A3D
+Route103_Text_AmyDefeated: @ 8294A3D
 	.string "AMY: Uh-oh, we lost.$"
 
-Route103_Text_294A52: @ 8294A52
+Route103_Text_AmyPostBattle: @ 8294A52
 	.string "AMY: You have to think about all\n"
 	.string "kinds of things when you're battling\l"
 	.string "against two TRAINERS.$"
 
-Route103_Text_294AAE: @ 8294AAE
+Route103_Text_AmyNotEnoughPokemon: @ 8294AAE
 	.string "AMY: Uh-oh, you have only one\n"
 	.string "POKéMON with you.\l"
 	.string "You can't battle us like that.$"
 
-Route103_Text_294AFD: @ 8294AFD
+Route103_Text_LivIntro: @ 8294AFD
 	.string "LIV: We battle together as one\n"
 	.string "team.$"
 
-Route103_Text_294B22: @ 8294B22
+Route103_Text_LivDefeated: @ 8294B22
 	.string "LIV: Oh, we lost, big sister…$"
 
-Route103_Text_294B40: @ 8294B40
+Route103_Text_LivPostBattle: @ 8294B40
 	.string "LIV: We work perfectly together,\n"
 	.string "me and my big sister…\p"
 	.string "But we still lost…$"
 
-Route103_Text_294B8A: @ 8294B8A
+Route103_Text_AmyLivRegister: @ 8294B8A
 	.string "LIV: Really, we're a lot better…\n"
 	.string "It's true! We'll show you next time!$"
 
-Route103_Text_294BD0: @ 8294BD0
+Route103_Text_LivNotEnoughPokemon: @ 8294BD0
 	.string "LIV: If you want to battle us,\n"
 	.string "you have to have two POKéMON!\l"
 	.string "It's not fair if you don't!$"
 
-Route103_Text_294C29: @ 8294C29
+Route103_Text_AmyRematchIntro: @ 8294C29
 	.string "AMY: I'm AMY.\n"
 	.string "And this is my little sister LIV.\l"
 	.string "We battle together!$"
 
-Route103_Text_294C6D: @ 8294C6D
+Route103_Text_AmyRematchDefeated: @ 8294C6D
 	.string "AMY: Aww, boo!\n"
 	.string "We couldn't win again…$"
 
-Route103_Text_294C93: @ 8294C93
+Route103_Text_AmyRematchPostBattle: @ 8294C93
 	.string "AMY: You have to think about all\n"
 	.string "kinds of things when you're battling\l"
 	.string "against two TRAINERS.$"
 
-Route103_Text_294CEF: @ 8294CEF
+Route103_Text_AmyRematchNotEnoughPokemon: @ 8294CEF
 	.string "AMY: Uh-oh, you have only one\n"
 	.string "POKéMON with you.\l"
 	.string "You can't battle us like that.$"
 
-Route103_Text_294D3E: @ 8294D3E
+Route103_Text_LivRematchIntro: @ 8294D3E
 	.string "LIV: We battle together as one\n"
 	.string "team.$"
 
-Route103_Text_294D63: @ 8294D63
+Route103_Text_LivRematchDefeated: @ 8294D63
 	.string "LIV: Awww, we lost again…\n"
 	.string "Big sister…$"
 
-Route103_Text_294D89: @ 8294D89
+Route103_Text_LivRematchPostBattle: @ 8294D89
 	.string "LIV: We work perfectly together,\n"
 	.string "me and my big sister…\p"
 	.string "But why did we lose again?$"
 
-Route103_Text_294DDB: @ 8294DDB
+Route103_Text_LivRematchNotEnoughPokemon: @ 8294DDB
 	.string "LIV: If you want to battle us, you\n"
 	.string "have to have two POKéMON!\l"
 	.string "It's not fair if you don't!$"
 
-Route103_Text_294E34: @ 8294E34
+Route103_Text_AndrewIntro: @ 8294E34
 	.string "Gah! My fishing line's all snarled up!\n"
 	.string "I'm getting frustrated and mean!\l"
 	.string "That's it! Battle me!$"
 
-Route103_Text_294E92: @ 8294E92
+Route103_Text_AndrewDefeated: @ 8294E92
 	.string "Gah! Lost it!\n"
 	.string "I'm even more annoyed now!$"
 
-Route103_Text_294EBB: @ 8294EBB
+Route103_Text_AndrewPostBattle: @ 8294EBB
 	.string "Gah, I'm still boiling mad…\n"
 	.string "Grrrrr…$"
 
-Route103_Text_294EDF: @ 8294EDF
+Route103_Text_MiguelIntro: @ 8294EDF
 	.string "My POKéMON is delightfully adorable!\n"
 	.string "Don't be shy--I'll show you!$"
 
-Route103_Text_294F21: @ 8294F21
+Route103_Text_MiguelDefeated: @ 8294F21
 	.string "Oh, my gosh!\n"
 	.string "My darling POKéMON!$"
 
-Route103_Text_294F42: @ 8294F42
+Route103_Text_MiguelPostBattle: @ 8294F42
 	.string "My delightful POKéMON looks darling\n"
 	.string "even when it's fainted!$"
 
-Route103_Text_294F7E: @ 8294F7E
+Route103_Text_MiguelRegister: @ 8294F7E
 	.string "I'll get you to come out and look in\n"
 	.string "on my delightful POKéMON again!$"
 
-Route103_Text_294FC3: @ 8294FC3
+Route103_Text_MiguelRematchIntro: @ 8294FC3
 	.string "Hi, you! My delightfully adorable\n"
 	.string "POKéMON has become more darling!$"
 
-Route103_Text_295006: @ 8295006
+Route103_Text_MiguelRematchDefeated: @ 8295006
 	.string "Oh!\n"
 	.string "My darling POKéMON!$"
 
-Route103_Text_29501E: @ 829501E
+Route103_Text_MiguelRematchPostBattle: @ 829501E
 	.string "The more I spend time with it,\n"
 	.string "the more adorable my POKéMON becomes.$"
 
-Route103_Text_295063: @ 8295063
+Route103_Text_PeteIntro: @ 8295063
 	.string "This sort of distance…\n"
 	.string "You should just swim it!$"
 
-Route103_Text_295093: @ 8295093
+Route103_Text_PeteDefeated: @ 8295093
 	.string "Oh, that's good going!$"
 
-Route103_Text_2950AA: @ 82950AA
+Route103_Text_PetePostBattle: @ 82950AA
 	.string "Oh, I understand where you're coming\n"
 	.string "from now.\p"
 	.string "If I had a POKéMON that trusty,\n"
 	.string "I'd want to SURF on it, too!$"
 
-Route103_Text_295116: @ 8295116
+Route103_Text_IsabelleIntro: @ 8295116
 	.string "Watch where you're going!\n"
 	.string "We're going to crash!$"
 
-Route103_Text_295146: @ 8295146
+Route103_Text_IsabelleDefeated: @ 8295146
 	.string "Groan…$"
 
-Route103_Text_29514D: @ 829514D
+Route103_Text_IsabellePostBattle: @ 829514D
 	.string "I'm a poor swimmer so I was practicing…\n"
 	.string "Sorry for almost crashing into you.$"
 
-Route103_Text_295199: @ 8295199
+Route103_Text_RhettIntro: @ 8295199
 	.string "Whoa!\n"
 	.string "How'd you get into a space this small?$"
 
-Route103_Text_2951C6: @ 82951C6
+Route103_Text_RhettDefeated: @ 82951C6
 	.string "Whoa!\n"
 	.string "The kid can rock!$"
 
-Route103_Text_2951DE: @ 82951DE
+Route103_Text_RhettPostBattle: @ 82951DE
 	.string "Do you like cramped quarters\n"
 	.string "like this?$"
 
-Route103_Text_295206: @ 8295206
+Route103_Text_MarcosIntro: @ 8295206
 	.string "Did my guitar's wailing draw you in?$"
 
-Route103_Text_29522B: @ 829522B
+Route103_Text_MarcosDefeated: @ 829522B
 	.string "My one-man show is ruined…$"
 
-Route103_Text_295246: @ 8295246
+Route103_Text_MarcosPostBattle: @ 8295246
 	.string "I was playing my guitar where few\n"
 	.string "people were around, but a lot of fans\l"
 	.string "have gathered.\p"
 	.string "Heh, maybe I should turn pro.$"
 
-Route104_Text_2952BB: @ 82952BB
+Route104_Text_GinaIntro: @ 82952BB
 	.string "GINA: Okay, let's battle with our\n"
 	.string "POKéMON!$"
 
-Route104_Text_2952E6: @ 82952E6
+Route104_Text_GinaDefeat: @ 82952E6
 	.string "GINA: Losing upsets me!$"
 
-Route104_Text_2952FE: @ 82952FE
+Route104_Text_GinaPostBattle: @ 82952FE
 	.string "GINA: You are strong!\n"
 	.string "We have to train lots more!$"
 
-Route104_Text_295330: @ 8295330
+Route104_Text_GinaNotEnoughMons: @ 8295330
 	.string "GINA: Oh? Only one POKéMON?\n"
 	.string "Then, we don't battle with you.\p"
 	.string "If there's only one POKéMON, it will\n"
 	.string "be lonesome. That's not nice.$"
 
-Route104_Text_2953AF: @ 82953AF
+Route104_Text_MiaIntro: @ 82953AF
 	.string "MIA: We are twins, so we battle\n"
 	.string "POKéMON together.$"
 
-Route104_Text_2953E1: @ 82953E1
+Route104_Text_MiaDefeat: @ 82953E1
 	.string "MIA: We battled together, but we\n"
 	.string "both lost…$"
 
-Route104_Text_29540D: @ 829540D
+Route104_Text_MiaPostBattle: @ 829540D
 	.string "MIA: We will train our POKéMON more\n"
 	.string "and be strong like you.$"
 
-Route104_Text_295449: @ 8295449
+Route104_Text_MiaNotEnoughMons: @ 8295449
 	.string "MIA: You want to battle with us?\p"
 	.string "It's a big no-no if you don't have two\n"
 	.string "POKéMON with you.\l"
 	.string "We're too strong for you!$"
 
-Route104_Text_2954BD: @ 82954BD
+Route104_Text_IvanIntro: @ 82954BD
 	.string "Why keep it a secret?\n"
 	.string "I'm the WATER POKéMON expert!\p"
 	.string "Huh?\n"
 	.string "You don't know me?$"
 
-Route104_Text_295509: @ 8295509
+Route104_Text_IvanDefeat: @ 8295509
 	.string "I thought I wasn't too bad, if I may\n"
 	.string "say so, but I guess not… Bleah…$"
 
-Route104_Text_29554E: @ 829554E
+Route104_Text_IvanPostBattle: @ 829554E
 	.string "I got too into fishing.\n"
 	.string "I forgot I had to raise my POKéMON…$"
 
-Route104_Text_29558A: @ 829558A
+Route104_Text_BillyIntro: @ 829558A
 	.string "Leaving footprints in the sand is\n"
 	.string "so fun!$"
 
-Route104_Text_2955B4: @ 82955B4
+Route104_Text_BillyDefeat: @ 82955B4
 	.string "Waah! I got sand in my runners!\n"
 	.string "They're all gritty!$"
 
-Route104_Text_2955E8: @ 82955E8
+Route104_Text_BillyPostBattle: @ 82955E8
 	.string "I want to leave my footprints in\n"
 	.string "the sand everywhere, but they\l"
 	.string "disappear quickly…$"
 
-Route104_Text_29563A: @ 829563A
+Route104_Text_HaleyIntro: @ 829563A
 	.string "Should I…\n"
 	.string "Or shouldn't I?\p"
 	.string "Okay, sure, I will battle!$"
 
-Route104_Text_29566F: @ 829566F
+Route104_Text_HaleyDefeat: @ 829566F
 	.string "I shouldn't have battled…$"
 
-Route104_Text_295689: @ 8295689
+Route104_Text_HaleyPostBattle: @ 8295689
 	.string "If you're faced with a decision and\n"
 	.string "you let someone else choose for you,\l"
 	.string "you will regret it, however things\l"
 	.string "turn out.$"
 
-Route104_Text_2956FF: @ 82956FF
+Route104_Text_HaleyRegister1: @ 82956FF
 	.string "You're strong, but should I register\n"
 	.string "you in my POKéNAV?\l"
 	.string "Maybe I shouldn't…\p"
 	.string "Okay, sure, I will register you!$"
 
-Route104_Text_29576B: @ 829576B
+Route104_Text_HaleyRegister2: @ 829576B
 	.string "You're strong, but should I register\n"
 	.string "you in my POKéNAV?\l"
 	.string "Maybe I shouldn't…\p"
 	.string "Okay, sure, I will register you!$"
 
-Route104_Text_2957D7: @ 82957D7
+Route104_Text_HaleyRematchIntro: @ 82957D7
 	.string "Come on, battle with me!$"
 
-Route104_Text_2957F0: @ 82957F0
+Route104_Text_HaleyRematchDefeat: @ 82957F0
 	.string "Ohh…\n"
 	.string "I thought I could win…$"
 
-Route104_Text_29580C: @ 829580C
+Route104_Text_HaleyPostRematch: @ 829580C
 	.string "I made the decision to battle, so\n"
 	.string "I can accept this loss with grace.\p"
 	.string "I am still upset about losing!$"
 
-Route104_Text_295870: @ 8295870
+Route104_Text_WinstonIntro: @ 8295870
 	.string "Oh, sure, I'll accept your challenge.\n"
 	.string "I have a lot of money.$"
 
-Route104_Text_2958AD: @ 82958AD
+Route104_Text_WinstonDefeat: @ 82958AD
 	.string "Why couldn't I win?$"
 
-Route104_Text_2958C1: @ 82958C1
+Route104_Text_WinstonPostBattle: @ 82958C1
 	.string "There are some things money can't buy.\n"
 	.string "That's POKéMON…$"
 
-Route104_Text_2958F8: @ 82958F8
+Route104_Text_WinstonRegister1: @ 82958F8
 	.string "Hm?\n"
 	.string "Ah, you've obtained a POKéNAV.\p"
 	.string "I will gladly register you.\n"
 	.string "After all, I have plenty of money.$"
 
-Route104_Text_29595A: @ 829595A
+Route104_Text_WinstonRegister2: @ 829595A
 	.string "Hm?\n"
 	.string "Ah, you've obtained a POKéNAV.\p"
 	.string "I will gladly register you.\n"
 	.string "After all, I have plenty of money.$"
 
-Route104_Text_2959BC: @ 82959BC
+Route104_Text_WinstonRematchIntro: @ 82959BC
 	.string "After I lost to you, I learned a bunch\n"
 	.string "of things about POKéMON.$"
 
-Route104_Text_2959FC: @ 82959FC
+Route104_Text_WinstonRematchDefeat: @ 82959FC
 	.string "I lost again?\n"
 	.string "Why couldn't I win?$"
 
-Route104_Text_295A1E: @ 8295A1E
+Route104_Text_WinstonPostRematch: @ 8295A1E
 	.string "I'm fabulously wealthy, but I can't\n"
 	.string "seem to win at POKéMON…\p"
 	.string "It's so deep, the world of POKéMON…$"
 
-Route104_Text_295A7E: @ 8295A7E
+Route104_Text_CindyIntro: @ 8295A7E
 	.string "We must have been fated to meet.\n"
 	.string "May I ask you for a battle?$"
 
-Route104_Text_295ABB: @ 8295ABB
+Route104_Text_CindyDefeat: @ 8295ABB
 	.string "Oh, my!$"
 
-Route104_Text_295AC3: @ 8295AC3
+Route104_Text_CindyPostBattle: @ 8295AC3
 	.string "“Hello” is the beginning of “good-bye.”\n"
 	.string "I hope we meet again.$"
 
-Route104_Text_295B01: @ 8295B01
+Route104_Text_CindyRegister1: @ 8295B01
 	.string "Hello, we meet again.\p"
 	.string "We seem to be drawn together. Let's\n"
 	.string "register each other in our POKéNAVS.$"
 
-Route104_Text_295B60: @ 8295B60
+Route104_Text_CindyRegister2: @ 8295B60
 	.string "We should commemorate how we seem\n"
 	.string "to be drawn to each other.\p"
 	.string "Let's register each other in our\n"
 	.string "POKéNAVS.$"
 
-Route104_Text_295BC8: @ 8295BC8
+Route104_Text_CindyRematchIntro: @ 8295BC8
 	.string "Hello, we meet again.\n"
 	.string "May I ask you for a battle?$"
 
-Route104_Text_295BFA: @ 8295BFA
+Route104_Text_CindyRematchDefeat: @ 8295BFA
 	.string "Oh, my…\n"
 	.string "I did the best that I could…$"
 
-Route104_Text_295C1F: @ 8295C1F
+Route104_Text_CindyPostRematch: @ 8295C1F
 	.string "“Hello” is the beginning of “good-bye.”\n"
 	.string "I hope we meet again.$"
 
-Route104_Text_295C5D: @ 8295C5D
+Route104_Text_DarianIntro: @ 8295C5D
 	.string "I fished up a tough-looking POKéMON!\p"
 	.string "It has this magical quality to it!\n"
 	.string "It surely looks tough, yes it does!$"
 
-Route104_Text_295CC9: @ 8295CC9
+Route104_Text_DarianDefeat: @ 8295CC9
 	.string "What the…$"
 
-Route104_Text_295CD3: @ 8295CD3
+Route104_Text_DarianPostBattle: @ 8295CD3
 	.string "Hey, MAGIKARP, you sure don't live up\n"
 	.string "to your name, do you?$"
 
-Route105_Text_295D0F: @ 8295D0F
+Route105_Text_FosterIntro: @ 8295D0F
 	.string "There's supposed to be a mystical\n"
 	.string "rock around here.\l"
 	.string "Do you know anything about it?$"
 
-Route105_Text_295D62: @ 8295D62
+Route105_Text_FosterDefeated: @ 8295D62
 	.string "I was thinking too much about that\n"
 	.string "rock, while my POKéMON remained weak…$"
 
-Route105_Text_295DAB: @ 8295DAB
+Route105_Text_FosterPostBattle: @ 8295DAB
 	.string "I can spend hours and hours staring\n"
 	.string "at a nice rock without growing bored.$"
 
-Route105_Text_295DF5: @ 8295DF5
+Route105_Text_LuisIntro: @ 8295DF5
 	.string "Whew! I was worried that a kid was\n"
 	.string "drowning when I saw you.\p"
 	.string "You seem to be okay, so what do you\n"
 	.string "say to a battle?$"
 
-Route105_Text_295E66: @ 8295E66
+Route105_Text_LuisDefeated: @ 8295E66
 	.string "Glub… Glub…$"
 
-Route105_Text_295E72: @ 8295E72
+Route105_Text_LuisPostBattle: @ 8295E72
 	.string "If you are drowning, the signal is to\n"
 	.string "wave one arm toward the beach.$"
 
-Route105_Text_295EB7: @ 8295EB7
+Route105_Text_DominikIntro: @ 8295EB7
 	.string "Swimming the deep blue sea…\n"
 	.string "It feels the greatest!$"
 
-Route105_Text_295EEA: @ 8295EEA
+Route105_Text_DominikDefeated: @ 8295EEA
 	.string "I lost…\n"
 	.string "Now I'm feeling blue…$"
 
-Route105_Text_295F08: @ 8295F08
+Route105_Text_DominikPostBattle: @ 8295F08
 	.string "Why is the sea blue?\p"
 	.string "I learned about that at the MUSEUM in\n"
 	.string "SLATEPORT, but I forgot.$"
 
-Route105_Text_295F5C: @ 8295F5C
+Route105_Text_BeverlyIntro: @ 8295F5C
 	.string "My body feels lighter in the water.\n"
 	.string "It's as if I've gotten slimmer!$"
 
-Route105_Text_295FA0: @ 8295FA0
+Route105_Text_BeverlyDefeated: @ 8295FA0
 	.string "I'm floating…$"
 
-Route105_Text_295FAE: @ 8295FAE
+Route105_Text_PostBattle: @ 8295FAE
 	.string "Your body weight is reduced to just\n"
 	.string "one tenth in the water.\p"
 	.string "That would make me…\n"
 	.string "Whoops! I'm not telling you my weight!$"
 
-Route105_Text_296025: @ 8296025
+Route105_Text_ImaniIntro: @ 8296025
 	.string "The blue, blue sky…\n"
 	.string "The vast sea…\l"
 	.string "It's so peaceful…$"
 
-Route105_Text_296059: @ 8296059
+Route105_Text_ImaniDefeated: @ 8296059
 	.string "I lost while I was lounging!$"
 
-Route105_Text_296076: @ 8296076
+Route105_Text_ImaniPostBattle: @ 8296076
 	.string "I want to be told I'm relaxing to be\n"
 	.string "with. Giggle.$"
 
-Route105_Text_2960A9: @ 82960A9
+Route105_Text_AndresIntro: @ 82960A9
 	.string "I'm convinced that the sea keeps\n"
 	.string "secrets from us.$"
 
-Route105_Text_2960DB: @ 82960DB
+Route105_Text_AndresDefeated: @ 82960DB
 	.string "Yes…\n"
 	.string "I am no good at battling…$"
 
-Route105_Text_2960FA: @ 82960FA
+Route105_Text_AndresPostBattle: @ 82960FA
 	.string "I'm sure there are many secrets to be\n"
 	.string "discovered in the world's seas.\p"
 	.string "I mean to find them all!$"
 
-Route105_Text_296159: @ 8296159
+Route105_Text_AndresRegister: @ 8296159
 	.string "Huh? I'm so weak, but you're willing\n"
 	.string "to register me in your POKéNAV?$"
 
-Route105_Text_29619E: @ 829619E
+Route105_Text_AndresRematchIntro: @ 829619E
 	.string "I've told you that I'm weak…\n"
 	.string "Are you sure you want to do this?$"
 
-Route105_Text_2961DD: @ 82961DD
+Route105_Text_AndresRematchDefeated: @ 82961DD
 	.string "Yes…\n"
 	.string "I didn't think I could win.$"
 
-Route105_Text_2961FE: @ 82961FE
+Route105_Text_AndresRematchPostBattle: @ 82961FE
 	.string "I may be weak at battling, but my\n"
 	.string "drive to explore can't be bested.\p"
 	.string "I will travel the seas all around\n"
 	.string "the world!$"
 
-Route105_Text_29626F: @ 829626F
+Route105_Text_JosueIntro: @ 829626F
 	.string "I'm exhausted from swimming.\n"
 	.string "I'm just not used to it.\p"
 	.string "I need a battle for a change of pace!$"
 
-Route105_Text_2962CB: @ 82962CB
+Route105_Text_JosueDefeated: @ 82962CB
 	.string "I lost because I battled at sea.$"
 
-Route105_Text_2962EC: @ 82962EC
+Route105_Text_JosuePostBattle: @ 82962EC
 	.string "Yeah, for me, the sky is a much better\n"
 	.string "match than the sea.$"
 
-Route106_Text_296327: @ 8296327
+Route106_Text_ElliotIntro: @ 8296327
 	.string "Which do you prefer, fishing in the\n"
 	.string "sea or a stream?$"
 
-Route106_Text_29635C: @ 829635C
+Route106_Text_ElliotDefeated: @ 829635C
 	.string "Like in deep-sea fishing, I lost\n"
 	.string "spectacularly!$"
 
-Route106_Text_29638C: @ 829638C
+Route106_Text_ElliotPostBattle: @ 829638C
 	.string "Fishing is the greatest whether it's\n"
 	.string "in the sea or a stream.\l"
 	.string "You agree with me, right?$"
 
-Route106_Text_2963E3: @ 82963E3
+Route106_Text_ElliotRegister: @ 82963E3
 	.string "Fishing's great, but so is battling.\n"
 	.string "If you don't mind, can we meet again?$"
 
-Route106_Text_29642E: @ 829642E
+Route106_Text_ElliotRematchIntro: @ 829642E
 	.string "I caught a bunch of POKéMON fishing.\n"
 	.string "I'll show you an impressive battle!$"
 
-Route106_Text_296477: @ 8296477
+Route106_Text_ElliotRematchDefeated: @ 8296477
 	.string "I lost again spectacularly!$"
 
-Route106_Text_296493: @ 8296493
+Route106_Text_ElliotRematchPostBattle: @ 8296493
 	.string "Win or lose, POKéMON are the greatest!\n"
 	.string "You agree with me, right?$"
 
-Route106_Text_2964D4: @ 82964D4
+Route106_Text_NedIntro: @ 82964D4
 	.string "What do people do if they need to go\n"
 	.string "to a washroom?\p"
 	.string "What if my ROD hooks a big one while\n"
 	.string "I'm in the washroom? I just can't go…$"
 
-Route106_Text_296553: @ 8296553
+Route106_Text_NedDefeated: @ 8296553
 	.string "I lost because I'm trying to not go\n"
 	.string "to the washroom…$"
 
-Route106_Text_296588: @ 8296588
+Route106_Text_NedPostBattle: @ 8296588
 	.string "Oh, no! I've got this feeling I'll hook\n"
 	.string "a big one!$"
 
-Route106_Text_2965BB: @ 82965BB
+Route106_Text_DouglasIntro: @ 82965BB
 	.string "Hahahah! I'm a lousy runner, but in\n"
 	.string "the water you can't catch me!$"
 
-Route106_Text_2965FD: @ 82965FD
+Route106_Text_DouglasDefeated: @ 82965FD
 	.string "I give up!$"
 
-Route106_Text_296608: @ 8296608
+Route106_Text_DouglasPostBattle: @ 8296608
 	.string "I wouldn't lose in a swim race…$"
 
-Route106_Text_296628: @ 8296628
+Route106_Text_KylaIntro: @ 8296628
 	.string "The sea is my backyard. I'm not going\n"
 	.string "to take it easy because you're a kid!$"
 
-Route106_Text_296674: @ 8296674
+Route106_Text_KylaDefeated: @ 8296674
 	.string "Did you take it easy on me by any\n"
 	.string "chance?$"
 
-Route106_Text_29669E: @ 829669E
+Route106_Text_KylaPostBattle: @ 829669E
 	.string "Drifting along with the waves…\n"
 	.string "I love it! Why don't you give it a try?$"
 
-Route107_Text_2966E5: @ 82966E5
+Route107_Text_DarrinIntro: @ 82966E5
 	.string "Yawn…\p"
 	.string "I must have drifted off to sleep while\n"
 	.string "I was drifting in the waves.$"
 
-Route107_Text_29672F: @ 829672F
+Route107_Text_DarrinDefeated: @ 829672F
 	.string "Ahaha, I lost…\n"
 	.string "I'll take a snooze, I think…$"
 
-Route107_Text_29675B: @ 829675B
+Route107_Text_DarrinPostBattle: @ 829675B
 	.string "Floating and being rocked by\n"
 	.string "the waves--it's like sleeping in\l"
 	.string "a plush, comfy bed.$"
 
-Route107_Text_2967AD: @ 82967AD
+Route107_Text_TonyIntro: @ 82967AD
 	.string "The sea is like my backyard.\n"
 	.string "Let's battle!$"
 
-Route107_Text_2967D8: @ 82967D8
+Route107_Text_TonyDefeated: @ 82967D8
 	.string "I lost on my home field…\n"
 	.string "I'm in shock!$"
 
-Route107_Text_2967FF: @ 82967FF
+Route107_Text_TonyPostBattle: @ 82967FF
 	.string "I swim the seas with a heart full of\n"
 	.string "dreams…\p"
 	.string "It's a song!\n"
 	.string "Anyways, I'm swimming some more.$"
 
-Route107_Text_29685A: @ 829685A
+Route107_Text_TonyRegister: @ 829685A
 	.string "You've shocked me to the bone!\n"
 	.string "Well, so you won't forget me…$"
 
-Route107_Text_296897: @ 8296897
+Route107_Text_TonyRematchIntro: @ 8296897
 	.string "Swimming in the big, wide sea,\n"
 	.string "my POKéMON has grown stronger!$"
 
-Route107_Text_2968D5: @ 82968D5
+Route107_Text_TonyRematchDefeated: @ 82968D5
 	.string "What a shock!\p"
 	.string "My POKéMON has gotten stronger, but\n"
 	.string "I stayed weak as a TRAINER!$"
 
-Route107_Text_296923: @ 8296923
+Route107_Text_TonyRematchPostBattle: @ 8296923
 	.string "What you learn in battle makes you\n"
 	.string "a stronger TRAINER.\l"
 	.string "The waves taught me that.$"
 
-Route107_Text_296974: @ 8296974
+Route107_Text_DeniseIntro: @ 8296974
 	.string "Do you know a little town called\n"
 	.string "DEWFORD?$"
 
-Route107_Text_29699E: @ 829699E
+Route107_Text_DeniseDefeated: @ 829699E
 	.string "I hate this!$"
 
-Route107_Text_2969AB: @ 82969AB
+Route107_Text_DenisePostBattle: @ 82969AB
 	.string "A weird saying is getting really\n"
 	.string "trendy at DEWFORD HALL.$"
 
-Route107_Text_2969E4: @ 82969E4
+Route107_Text_BethIntro: @ 82969E4
 	.string "Did you want to battle me?\n"
 	.string "Sure, I'll go with you!$"
 
-Route107_Text_296A17: @ 8296A17
+Route107_Text_BethDefeated: @ 8296A17
 	.string "I wasn't good enough for you.$"
 
-Route107_Text_296A35: @ 8296A35
+Route107_Text_BethPostBattle: @ 8296A35
 	.string "I think you're going to keep getting\n"
 	.string "better. I'll go for it, too!$"
 
-Route107_Text_296A77: @ 8296A77
+Route107_Text_LisaIntro: @ 8296A77
 	.string "LISA: We challenge you as a sister\n"
 	.string "and brother!$"
 
-Route107_Text_296AA7: @ 8296AA7
+Route107_Text_LisaDefeated: @ 8296AA7
 	.string "LISA: Awesome.\n"
 	.string "You're in a different class of tough.$"
 
-Route107_Text_296ADC: @ 8296ADC
+Route107_Text_LisaPostBattle: @ 8296ADC
 	.string "LISA: Do you have any friends who\n"
 	.string "would go to the beach with you?$"
 
-Route107_Text_296B1E: @ 8296B1E
+Route107_Text_LisaNotEnoughPokemon: @ 8296B1E
 	.string "LISA: If you want to battle with us,\n"
 	.string "bring more POKéMON.$"
 
-Route107_Text_296B57: @ 8296B57
+Route107_Text_RayIntro: @ 8296B57
 	.string "RAY: We always battle POKéMON,\n"
 	.string "me and my sister.\p"
 	.string "I always lose, but we can beat you\n"
 	.string "2-on-2!$"
 
-Route107_Text_296BB3: @ 8296BB3
+Route107_Text_RayDefeated: @ 8296BB3
 	.string "RAY: Wowee, you're at a higher level\n"
 	.string "than us!$"
 
-Route107_Text_296BE1: @ 8296BE1
+Route107_Text_RayPostBattle: @ 8296BE1
 	.string "RAY: My sister gave me my POKéMON.\n"
 	.string "I raised it, and now it's my important\l"
 	.string "partner!$"
 
-Route107_Text_296C34: @ 8296C34
+Route107_Text_RayNotEnoughPokemon: @ 8296C34
 	.string "RAY: If you want to battle us,\n"
 	.string "go bring some more POKéMON!$"
 
-Route107_Text_296C6F: @ 8296C6F
+Route107_Text_CamronIntro: @ 8296C6F
 	.string "I'm in the middle of a triathlon,\n"
 	.string "but I'm nowhere near tired!$"
 
-Route107_Text_296CAD: @ 8296CAD
+Route107_Text_CamronDefeated: @ 8296CAD
 	.string "That exhausted me…$"
 
-Route107_Text_296CC0: @ 8296CC0
+Route107_Text_CamronPostBattle: @ 8296CC0
 	.string "I still have swimming and running left\n"
 	.string "to do after this.\p"
 	.string "Am I going to be okay?$"
 
-Route108_Text_296D10: @ 8296D10
+Route108_Text_JeromeIntro: @ 8296D10
 	.string "My dream is to swim the world's seven\n"
 	.string "seas!$"
 
-Route108_Text_296D3C: @ 8296D3C
+Route108_Text_JeromeDefeated: @ 8296D3C
 	.string "I won't be able to swim the seven seas\n"
 	.string "like this…$"
 
-Route108_Text_296D6E: @ 8296D6E
+Route108_Text_JeromePostBattle: @ 8296D6E
 	.string "Playing with marine POKéMON is one of\n"
 	.string "the pleasures of swimming!$"
 
-Route108_Text_296DAF: @ 8296DAF
+Route108_Text_MatthewIntro: @ 8296DAF
 	.string "Ahoy, there! Are you going out to\n"
 	.string "the ABANDONED SHIP, too?$"
 
-Route108_Text_296DEA: @ 8296DEA
+Route108_Text_MatthewDefeated: @ 8296DEA
 	.string "I'm sinking!\n"
 	.string "Glub… Glub…$"
 
-Route108_Text_296E03: @ 8296E03
+Route108_Text_MatthewPostBattle: @ 8296E03
 	.string "Some people even go inside that\n"
 	.string "ABANDONED SHIP.$"
 
-Route108_Text_296E33: @ 8296E33
+Route108_Text_TaraIntro: @ 8296E33
 	.string "My liar of a boyfriend told me that\n"
 	.string "I look great in a bikini…$"
 
-Route108_Text_296E71: @ 8296E71
+Route108_Text_TaraDefeated: @ 8296E71
 	.string "Oh, boo!$"
 
-Route108_Text_296E7A: @ 8296E7A
+Route108_Text_TaraPostBattle: @ 8296E7A
 	.string "Even if it's a lie, I love being told\n"
 	.string "I look great…\l"
 	.string "We girls are so complex…$"
 
-Route108_Text_296EC7: @ 8296EC7
+Route108_Text_MissyIntro: @ 8296EC7
 	.string "I love the sea!\n"
 	.string "I forget all my worries when I swim!$"
 
-Route108_Text_296EFC: @ 8296EFC
+Route108_Text_MissyDefeated: @ 8296EFC
 	.string "When I lose a battle, I get all\n"
 	.string "stressed out!$"
 
-Route108_Text_296F2A: @ 8296F2A
+Route108_Text_MissyPostBattle: @ 8296F2A
 	.string "Work off your stress by swimming!\n"
 	.string "It's so healthy!$"
 
-Route108_Text_296F5D: @ 8296F5D
+Route108_Text_CoryIntro: @ 8296F5D
 	.string "I love WATER-type POKéMON.\n"
 	.string "I love other POKéMON, too!$"
 
-Route108_Text_296F93: @ 8296F93
+Route108_Text_CoryDefeated: @ 8296F93
 	.string "Waaah! I lost!\n"
 	.string "Waaah! Waaah!$"
 
-Route108_Text_296FB0: @ 8296FB0
+Route108_Text_CoryPostBattle: @ 8296FB0
 	.string "Shouting is good for me!\n"
 	.string "It uplifts me!$"
 
-Route108_Text_296FD8: @ 8296FD8
+Route108_Text_CoryRegister: @ 8296FD8
 	.string "I love tough TRAINERS, too!\n"
 	.string "Register me in your POKéNAV!$"
 
-Route108_Text_297011: @ 8297011
+Route108_Text_CoryRematchIntro: @ 8297011
 	.string "Win or lose, I love battling at sea!$"
 
-Route108_Text_297036: @ 8297036
+Route108_Text_CoryRematchDefeated: @ 8297036
 	.string "Waaah! I lost again!\n"
 	.string "Waaah! Waaah!$"
 
-Route108_Text_297059: @ 8297059
+Route108_Text_CoryRematchPostBattle: @ 8297059
 	.string "If you're faced with a challenge,\n"
 	.string "try shouting at the sea!$"
 
-Route108_Text_297094: @ 8297094
+Route108_Text_CarolinaIntro: @ 8297094
 	.string "I take huge pride in my POKéMON.\n"
 	.string "We'll show you one speedy battle!$"
 
-Route108_Text_2970D7: @ 82970D7
+Route108_Text_CarolinaDefeated: @ 82970D7
 	.string "That wasn't cute at all.$"
 
-Route108_Text_2970F0: @ 82970F0
+Route108_Text_CarolinaPostBattle: @ 82970F0
 	.string "Since I'm at sea like this, I wouldn't\n"
 	.string "mind putting on a pink, frilly swimsuit…$"
 
-Route109_Text_297140: @ 8297140
+Route109_Text_DavidIntro: @ 8297140
 	.string "Hiyah! Look at my chiseled abs!\n"
 	.string "This is what you call “cut”!$"
 
-Route109_Text_29717D: @ 829717D
+Route109_Text_DavidDefeated: @ 829717D
 	.string "Aiyah!\n"
 	.string "Flubbed out!$"
 
-Route109_Text_297191: @ 8297191
+Route109_Text_DavidPostBattle: @ 8297191
 	.string "Hiyah!\p"
 	.string "My sculpted abs have nothing to do\n"
 	.string "with POKéMON battles!$"
 
-Route109_Text_2971D1: @ 82971D1
+Route109_Text_AliceIntro: @ 82971D1
 	.string "Are you properly protected against\n"
 	.string "the sun?$"
 
-Route109_Text_2971FD: @ 82971FD
+Route109_Text_AliceDefeated: @ 82971FD
 	.string "Ouch, ouch, ouch!$"
 
-Route109_Text_29720F: @ 829720F
+Route109_Text_AlicePostBattle: @ 829720F
 	.string "Cheeks are the most prone to burning!$"
 
-Route109_Text_297235: @ 8297235
+Route109_Text_HueyIntro: @ 8297235
 	.string "I've laid anchor in ports around\n"
 	.string "the world, but SLATEPORT's the best.$"
 
-Route109_Text_29727B: @ 829727B
+Route109_Text_HueyDefeated: @ 829727B
 	.string "You're the best!$"
 
-Route109_Text_29728C: @ 829728C
+Route109_Text_HueyPostBattle: @ 829728C
 	.string "In the best port was the best\n"
 	.string "TRAINER…$"
 
-Route109_Text_2972B3: @ 82972B3
+Route109_Text_EdmondIntro: @ 82972B3
 	.string "Urrrrppp…\n"
 	.string "Battle? With me?$"
 
-Route109_Text_2972CE: @ 82972CE
+Route109_Text_EdmondDefeated: @ 82972CE
 	.string "Urp… Ooooooohhhhhh…\n"
 	.string "Urrrrpppp…$"
 
-Route109_Text_2972ED: @ 82972ED
+Route109_Text_EdmondPostBattle: @ 82972ED
 	.string "I'm usually stronger than this!\n"
 	.string "I'm just seasick as a dog!\p"
 	.string "I'm a SAILOR, but…$"
 
-Route109_Text_29733B: @ 829733B
+Route109_Text_RickyIntro: @ 829733B
 	.string "I'm thirsty… I could go for a SODA POP\n"
 	.string "at the SEASHORE HOUSE…$"
 
-Route109_Text_297379: @ 8297379
+Route109_Text_RickyDefeated: @ 8297379
 	.string "Groan…$"
 
-Route109_Text_297380: @ 8297380
+Route109_Text_RickyPostBattle: @ 8297380
 	.string "I'm getting famished… My inner tube\n"
 	.string "looks like a giant doughnut…$"
 
-Route109_Text_2973C1: @ 82973C1
+Route109_Text_RickyRegister: @ 82973C1
 	.string "Will you have another match with me\n"
 	.string "when I'm not all thirsty?$"
 
-Route109_Text_2973FF: @ 82973FF
+Route109_Text_RickyRematchIntro: @ 82973FF
 	.string "I'm hungry, but I've got enough pep in\n"
 	.string "me for a battle!$"
 
-Route109_Text_297437: @ 8297437
+Route109_Text_RickyRematchDefeated: @ 8297437
 	.string "I lost…\n"
 	.string "It's because I'm hungry…$"
 
-Route109_Text_297458: @ 8297458
+Route109_Text_RickyRematchPostBattle: @ 8297458
 	.string "When you eat on a beach, everything\n"
 	.string "seems to taste a little better.$"
 
-Route109_Text_29749C: @ 829749C
+Route109_Text_LolaIntro: @ 829749C
 	.string "Doesn't a beach umbrella look like\n"
 	.string "a giant flower?$"
 
-Route109_Text_2974CF: @ 82974CF
+Route109_Text_LolaDefeated: @ 82974CF
 	.string "Mommy!$"
 
-Route109_Text_2974D6: @ 82974D6
+Route109_Text_LolaPostBattle: @ 82974D6
 	.string "If you look at the beach from the sky,\n"
 	.string "it looks like a big flower garden!$"
 
-Route109_Text_297520: @ 8297520
+Route109_Text_LolaRegister: @ 8297520
 	.string "Me?\n"
 	.string "I'm here every day!$"
 
-Route109_Text_297538: @ 8297538
+Route109_Text_LolaRematchIntro: @ 8297538
 	.string "I'm not losing to you again!\n"
 	.string "That's why I have my inner tube!$"
 
-Route109_Text_297576: @ 8297576
+Route109_Text_LolaRematchDefeated: @ 8297576
 	.string "Mommy!$"
 
-Route109_Text_29757D: @ 829757D
+Route109_Text_LolaRematchPostBattle: @ 829757D
 	.string "If I have an inner tube, me and my\n"
 	.string "POKéMON's cuteness goes way up!$"
 
-Route109_Text_2975C0: @ 82975C0
+Route109_Text_AustinaIntro: @ 82975C0
 	.string "I can't swim without my inner tube,\n"
 	.string "but I won't lose at POKéMON!$"
 
-Route109_Text_297601: @ 8297601
+Route109_Text_AustinaDefeated: @ 8297601
 	.string "Did I lose because I have an inner\n"
 	.string "tube?$"
 
-Route109_Text_29762A: @ 829762A
+Route109_Text_AustinaPostBattle: @ 829762A
 	.string "My inner tube is a fashion item.\n"
 	.string "I can't be seen without it.$"
 
-Route109_Text_297667: @ 8297667
+Route109_Text_GwenIntro: @ 8297667
 	.string "Hi, big TRAINER.\n"
 	.string "Will you battle with me?$"
 
-Route109_Text_297691: @ 8297691
+Route109_Text_GwenDefeated: @ 8297691
 	.string "Oh, you're strong.$"
 
-Route109_Text_2976A4: @ 82976A4
+Route109_Text_GwenPostBattle: @ 82976A4
 	.string "How did you get to be so strong?$"
 
-Route109_Text_2976C5: @ 82976C5
+Route109_Text_CarterIntro: @ 82976C5
 	.string "Wahahah! This dude's going to catch\n"
 	.string "himself a big one!$"
 
-Route109_Text_2976FC: @ 82976FC
+Route109_Text_CarterDefeated: @ 82976FC
 	.string "This dude just lost one…$"
 
-Route109_Text_297715: @ 8297715
+Route109_Text_CarterPostBattle: @ 8297715
 	.string "This dude thinks you're a big one.\n"
 	.string "No, you're a big-one-to-be!$"
 
-Route109_Text_297754: @ 8297754
+Route109_Text_PaulIntro: @ 8297754
 	.string "PAUL: Well, this is a mood-breaker.\p"
 	.string "I wish you wouldn't disturb our\n"
 	.string "precious time together.$"
 
-Route109_Text_2977B0: @ 82977B0
+Route109_Text_PaulDefeated: @ 82977B0
 	.string "PAUL: Well, I give up.$"
 
-Route109_Text_2977C7: @ 82977C7
+Route109_Text_PaulPostBattle: @ 82977C7
 	.string "PAUL: Well, don't tell anyone that\n"
 	.string "we're here.\l"
 	.string "This is just our private world of two!$"
 
-Route109_Text_29781D: @ 829781D
+Route109_Text_PaulNotEnoughPokemon: @ 829781D
 	.string "PAUL: We're totally, deeply in love.\n"
 	.string "That's why we make our POKéMON battle\l"
 	.string "together.$"
 
-Route109_Text_297872: @ 8297872
+Route109_Text_MelIntro: @ 8297872
 	.string "MEL: We're, like, totally in love.\n"
 	.string "Our romance is heating up all of HOENN!$"
 
-Route109_Text_2978BD: @ 82978BD
+Route109_Text_MelDefeated: @ 82978BD
 	.string "MEL: We lost, and it's my fault!\n"
 	.string "PAUL will hate me!$"
 
-Route109_Text_2978F1: @ 82978F1
+Route109_Text_MelPostBattle: @ 82978F1
 	.string "MEL: Um, PAUL, are you angry with me?\n"
 	.string "Please don't be angry.$"
 
-Route109_Text_29792E: @ 829792E
+Route109_Text_MelNotEnoughPokemon: @ 829792E
 	.string "MEL: We're, like, deeply and truly in love.\n"
 	.string "That's why we make our POKéMON\l"
 	.string "battle together.$"
 
-Route109_Text_29798A: @ 829798A
+Route109_Text_ChandlerIntro: @ 829798A
 	.string "Tadaah! See?\n"
 	.string "My inner tube's round!$"
 
-Route109_Text_2979AE: @ 82979AE
+Route109_Text_ChandlerDefeated: @ 82979AE
 	.string "Oh, oh!\n"
 	.string "Too bad!$"
 
-Route109_Text_2979BF: @ 82979BF
+Route109_Text_ChandlerPostBattle: @ 82979BF
 	.string "After I showed you my round inner\n"
 	.string "tube, too…$"
 
-Route109_Text_2979EC: @ 82979EC
+Route109_Text_HaileyIntro: @ 82979EC
 	.string "I can't swim, so I'm pretending\n"
 	.string "to swim.$"
 
-Route109_Text_297A15: @ 8297A15
+Route109_Text_HaileyDefeated: @ 8297A15
 	.string "I thought so!\n"
 	.string "I didn't think we could win.$"
 
-Route109_Text_297A40: @ 8297A40
+Route109_Text_HaileyPostBattle: @ 8297A40
 	.string "When I learn how to swim, I think\n"
 	.string "my POKéMON will become tougher.$"
 
-Route109_Text_297A82: @ 8297A82
+Route109_Text_ElijahIntro: @ 8297A82
 	.string "For a guy as macho as me, this kind\n"
 	.string "of POKéMON is the perfect match!$"
 
-Route109_Text_297AC7: @ 8297AC7
+Route109_Text_ElijahDefeated: @ 8297AC7
 	.string "I'm cool even in defeat, hey?$"
 
-Route109_Text_297AE5: @ 8297AE5
+Route109_Text_ElijahPostBattle: @ 8297AE5
 	.string "For a guy as macho as me, a port\n"
 	.string "is the perfect setting!\p"
 	.string "I guess I'll head for SLATEPORT.$"
 
-Route110_Text_297B3F: @ 8297B3F
+Route110_Text_JacobIntro: @ 8297B3F
 	.string "Whoa! Watch it!\n"
 	.string "I guess you're not used to BIKE racing.$"
 
-Route110_Text_297B77: @ 8297B77
+Route110_Text_JacobDefeated: @ 8297B77
 	.string "Whoa!\n"
 	.string "My brakes failed!$"
 
-Route110_Text_297B8F: @ 8297B8F
+Route110_Text_JacobPostBattle: @ 8297B8F
 	.string "Flat tires and brake problems can\n"
 	.string "cause serious injury!\l"
 	.string "Inspect your BIKE for problems!$"
 
-Route110_Text_297BE7: @ 8297BE7
+Route110_Text_AnthonyIntro: @ 8297BE7
 	.string "Yo, you!\n"
 	.string "Can you keep up with my speed?$"
 
-Route110_Text_297C0F: @ 8297C0F
+Route110_Text_AnthonyDefeated: @ 8297C0F
 	.string "Crash and burn!$"
 
-Route110_Text_297C1F: @ 8297C1F
+Route110_Text_AnthonyPostBattle: @ 8297C1F
 	.string "Speed alone won't let me win at POKéMON.\n"
 	.string "I need to reconsider this…$"
 
-Route110_Text_297C63: @ 8297C63
+Route110_Text_BenjaminIntro: @ 8297C63
 	.string "Don't panic if your BIKE's going fast!$"
 
-Route110_Text_297C8A: @ 8297C8A
+Route110_Text_BenjaminDefeated: @ 8297C8A
 	.string "I shouldn't panic during POKéMON\n"
 	.string "battles…$"
 
-Route110_Text_297CB4: @ 8297CB4
+Route110_Text_BenjaminPostBattle: @ 8297CB4
 	.string "There's no need to panic or stress.\n"
 	.string "Take it easy. There's plenty of time.$"
 
-Route110_Text_297CFE: @ 8297CFE
+Route110_Text_BenjaminRegister: @ 8297CFE
 	.string "I'll keep chugging on without stressing.\n"
 	.string "Give me a shout if you're up to it.$"
 
-Route110_Text_297D4B: @ 8297D4B
+Route110_Text_BenjaminRematchIntro: @ 8297D4B
 	.string "Aren't you going a little too fast?\n"
 	.string "Take it easy and let's battle.$"
 
-Route110_Text_297D8E: @ 8297D8E
+Route110_Text_BenjaminRematchDefeated: @ 8297D8E
 	.string "I didn't panic, but I still lost…$"
 
-Route110_Text_297DB0: @ 8297DB0
+Route110_Text_BenjaminRematchPostBattle: @ 8297DB0
 	.string "There's no need to panic or stress.\n"
 	.string "Take it easy. There's plenty of time.$"
 
-Route110_Text_297DFA: @ 8297DFA
+Route110_Text_AbigailIntro: @ 8297DFA
 	.string "The triathlon is hard in the extreme.\p"
 	.string "You have to complete the three events\n"
 	.string "of swimming, cycling, and running.$"
 
-Route110_Text_297E69: @ 8297E69
+Route110_Text_AbigailDefeated: @ 8297E69
 	.string "POKéMON battles are hard, too!$"
 
-Route110_Text_297E88: @ 8297E88
+Route110_Text_AbigailPostBattle: @ 8297E88
 	.string "I'm exhausted, so I need a break.\n"
 	.string "It's important to get proper rest.$"
 
-Route110_Text_297ECD: @ 8297ECD
+Route110_Text_AbigailRegister: @ 8297ECD
 	.string "You know, I like you!\n"
 	.string "Let's have a rematch on CYCLING ROAD.$"
 
-Route110_Text_297F09: @ 8297F09
+Route110_Text_AbigailRematchIntro: @ 8297F09
 	.string "Isn't it neat to hold a battle while\n"
 	.string "cycling?$"
 
-Route110_Text_297F37: @ 8297F37
+Route110_Text_AbigailRematchDefeated: @ 8297F37
 	.string "Wow…\n"
 	.string "How could you be so strong?$"
 
-Route110_Text_297F58: @ 8297F58
+Route110_Text_AbigailRematchPostBattle: @ 8297F58
 	.string "Were you going after a record?\p"
 	.string "I'm sorry if I held you up!$"
 
-Route110_Text_297F93: @ 8297F93
+Route110_Text_JasmineIntro: @ 8297F93
 	.string "I've been riding without stopping.\n"
 	.string "My thighs are like rocks!$"
 
-Route110_Text_297FD0: @ 8297FD0
+Route110_Text_JasmineDefeated: @ 8297FD0
 	.string "I'm worried about muscle cramps…$"
 
-Route110_Text_297FF1: @ 8297FF1
+Route110_Text_JasminePostBattle: @ 8297FF1
 	.string "Oh, you have some GYM BADGES?\n"
 	.string "No wonder you're so strong!$"
 
-Route110_Text_29802B: @ 829802B
+Route110_Text_EdwardIntro: @ 829802B
 	.string "I have foreseen your intentions!\n"
 	.string "I cannot possibly lose!$"
 
-Route110_Text_298064: @ 8298064
+Route110_Text_EdwardDefeated: @ 8298064
 	.string "I failed to prophesize my own demise!$"
 
-Route110_Text_29808A: @ 829808A
+Route110_Text_EdwardPostBattle: @ 829808A
 	.string "I see your future…\p"
 	.string "Hmm…\n"
 	.string "I see a shining light…$"
 
-Route110_Text_2980B9: @ 82980B9
+Route110_Text_JaclynIntro: @ 82980B9
 	.string "Ahahahaha!\n"
 	.string "I'll dazzle you with my wonders!$"
 
-Route110_Text_2980E5: @ 82980E5
+Route110_Text_JaclynDefeated: @ 82980E5
 	.string "I wondrously lost!$"
 
-Route110_Text_2980F8: @ 82980F8
+Route110_Text_JaclynPostBattle: @ 82980F8
 	.string "You managed to win only because it was\n"
 	.string "a wonder! Yes, a wonder!\l"
 	.string "Don't think you can win all the time!$"
 
-Route110_Text_29815E: @ 829815E
+Route110_Text_EdwinIntro: @ 829815E
 	.string "Could I see your POKéMON?\n"
 	.string "Just one look, please?$"
 
-Route110_Text_29818F: @ 829818F
+Route110_Text_EdwinDefeated: @ 829818F
 	.string "I wanted to complete\n"
 	.string "my collection…$"
 
-Route110_Text_2981B3: @ 82981B3
+Route110_Text_EdwinPostBattle: @ 82981B3
 	.string "When I see a POKéMON that I don't know,\n"
 	.string "my passion as a collector is ignited!$"
 
-Route110_Text_298201: @ 8298201
+Route110_Text_EdwinRegister: @ 8298201
 	.string "I like collecting MATCH CALL\n"
 	.string "registrations, too…$"
 
-Route110_Text_298232: @ 8298232
+Route110_Text_EdwinRematchIntro: @ 8298232
 	.string "Hi, have you caught any new POKéMON?\p"
 	.string "Could I see your POKéMON?\n"
 	.string "Just one look, please?$"
 
-Route110_Text_298288: @ 8298288
+Route110_Text_EdwinRematchDefeated: @ 8298288
 	.string "Your POKéMON…\n"
 	.string "I envy you.$"
 
-Route110_Text_2982A2: @ 82982A2
+Route110_Text_EdwinRematchPostBattle: @ 82982A2
 	.string "Oh, I long to make all rare POKéMON\n"
 	.string "mine!$"
 
-Route110_Text_2982CC: @ 82982CC
+Route110_Text_DaleIntro: @ 82982CC
 	.string "Hey!\n"
 	.string "Don't sneak up behind me like that!$"
 
-Route110_Text_2982F5: @ 82982F5
+Route110_Text_DaleDefeated: @ 82982F5
 	.string "I lost!\n"
 	.string "Drat!$"
 
-Route110_Text_298303: @ 8298303
+Route110_Text_DalePostBattle: @ 8298303
 	.string "Fishing is all about concentration.\n"
 	.string "You have to focus on the floater.$"
 
-Route110_Text_298349: @ 8298349
+Route110_Text_IsabelIntro: @ 8298349
 	.string "Ahahaha! I would go anywhere to show\n"
 	.string "off my delightful POKéMON.$"
 
-Route110_Text_298389: @ 8298389
+Route110_Text_IsabelDefeated: @ 8298389
 	.string "Oh, dear, this won't do.$"
 
-Route110_Text_2983A2: @ 82983A2
+Route110_Text_IsabelPostBattle: @ 82983A2
 	.string "Rather than battling, perhaps I should\n"
 	.string "show off my POKéMON at the FAN CLUB.$"
 
-Route110_Text_2983EE: @ 82983EE
+Route110_Text_IsabelRegister: @ 82983EE
 	.string "That wasn't close to what I could\n"
 	.string "do to show off my POKéMON.\p"
 	.string "I'll have you as my captive audience\n"
 	.string "as often as possible!$"
 
-Route110_Text_298466: @ 8298466
+Route110_Text_IsabelRematchIntro: @ 8298466
 	.string "Ahahahaha! I would be happy to show\n"
 	.string "off my POKéMON as often as you like!$"
 
-Route110_Text_2984AF: @ 82984AF
+Route110_Text_IsabelRematchDefeated: @ 82984AF
 	.string "Oh, dear, this won't do.$"
 
-Route110_Text_2984C8: @ 82984C8
+Route110_Text_IsabelRematchPostBattle: @ 82984C8
 	.string "I don't think that I could ever stop\n"
 	.string "from showing off my POKéMON.\p"
 	.string "But I like to battle, too!$"
 
-Route110_Text_298525: @ 8298525
+Route110_Text_TimmyIntro: @ 8298525
 	.string "I found some cool POKéMON in the grass\n"
 	.string "around here!$"
 
-Route110_Text_298559: @ 8298559
+Route110_Text_TimmyDefeated: @ 8298559
 	.string "Being cool isn't enough to win…$"
 
-Route110_Text_298579: @ 8298579
+Route110_Text_TimmyPostBattle: @ 8298579
 	.string "It's hard to battle with POKéMON you\n"
 	.string "just caught.$"
 
-Route110_Text_2985AB: @ 82985AB
+Route110_Text_AlyssaIntro: @ 82985AB
 	.string "I fell off CYCLING ROAD…\p"
 	.string "I'll get over my embarrassment by\n"
 	.string "battling with you!$"
 
-Route110_Text_2985F9: @ 82985F9
+Route110_Text_AlyssaDefeated: @ 82985F9
 	.string "Oops!\n"
 	.string "I ended up losing!$"
 
-Route110_Text_298612: @ 8298612
+Route110_Text_AlyssaPostBattle: @ 8298612
 	.string "Falling… Losing…\n"
 	.string "This is so humiliating for me!$"
 
-Route110_Text_298642: @ 8298642
+Route110_Text_JosephIntro: @ 8298642
 	.string "Okay! Full-throttle time! If you can't\n"
 	.string "groove, you get left behind!$"
 
-Route110_Text_298686: @ 8298686
+Route110_Text_JosephDefeated: @ 8298686
 	.string "You got into the groove all right…$"
 
-Route110_Text_2986A9: @ 82986A9
+Route110_Text_JosephPostBattle: @ 82986A9
 	.string "This isn't going to bring me down!\n"
 	.string "Losing has made me a better man!$"
 
-Route110_Text_2986ED: @ 82986ED
+Route110_Text_KalebIntro: @ 82986ED
 	.string "When cute POKéMON help each other…\n"
 	.string "You won't see a more adorable sight!$"
 
-Route110_Text_298735: @ 8298735
+Route110_Text_KalebDefeated: @ 8298735
 	.string "Have you no compassion or pity?$"
 
-Route110_Text_298755: @ 8298755
+Route110_Text_KalebPostBattle: @ 8298755
 	.string "Okay, okay, you've done the best you\n"
 	.string "could, my pretties.$"
 
-Route111_Text_29878E: @ 829878E
+Route111_Text_DrewIntro: @ 829878E
 	.string "Oh, hey! Those GO-GOGGLES suit you.\n"
 	.string "But I think they look better on me.\p"
 	.string "Let's decide who they look better on\n"
 	.string "with a battle!$"
 
-Route111_Text_29880A: @ 829880A
+Route111_Text_DrewDefeat: @ 829880A
 	.string "I couldn't see what was happening at\n"
 	.string "my sides because of the GO-GOGGLES.$"
 
-Route111_Text_298853: @ 8298853
+Route111_Text_DrewPostBattle: @ 8298853
 	.string "The GO-GOGGLES make it possible to\n"
 	.string "get through sandstorms.\l"
 	.string "That makes me happy!$"
 
-Route111_Text_2988A3: @ 82988A3
+Route111_Text_HeidiIntro: @ 82988A3
 	.string "I'm having a picnic in the desert.\p"
 	.string "You can always find a TRAINER,\n"
 	.string "so I can enjoy a battle here, too!$"
 
-Route111_Text_298908: @ 8298908
+Route111_Text_HeidiDefeat: @ 8298908
 	.string "Ohhh! You're mean!$"
 
-Route111_Text_29891B: @ 829891B
+Route111_Text_HeidiPostBattle: @ 829891B
 	.string "When you're battling in a sandstorm,\n"
 	.string "watch out for your POKéMON's HP.\p"
 	.string "It can faint if you don't keep\n"
 	.string "an eye on it!$"
 
-Route111_Text_29898E: @ 829898E
+Route111_Text_BeauIntro: @ 829898E
 	.string "Wearing these GO-GOGGLES makes me\n"
 	.string "feel like a superhero.\l"
 	.string "Right now, nobody can beat me!$"
 
-Route111_Text_2989E6: @ 82989E6
+Route111_Text_BeauDefeat: @ 82989E6
 	.string "I can't win on spirit alone…$"
 
-Route111_Text_298A03: @ 8298A03
+Route111_Text_BeauPostBattle: @ 8298A03
 	.string "I'm going to be a real hero one day.\n"
 	.string "I'm going to work harder to make me\l"
 	.string "and my POKéMON stronger.$"
 
-Route111_Text_298A65: @ 8298A65
+Route111_Text_BeckyIntro: @ 8298A65
 	.string "I heard there are fossils to be found\n"
 	.string "in the desert. Where could they be?$"
 
-Route111_Text_298AAF: @ 8298AAF
+Route111_Text_BeckyDefeat: @ 8298AAF
 	.string "I came up short…$"
 
-Route111_Text_298AC0: @ 8298AC0
+Route111_Text_BeckyPostBattle: @ 8298AC0
 	.string "If they can find fossils in the desert,\n"
 	.string "it must have been a sea before.$"
 
-Route111_Text_298B08: @ 8298B08
+Route111_Text_DustyIntro: @ 8298B08
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\l"
 	.string "I am to be challenged?$"
 
-Route111_Text_298B53: @ 8298B53
+Route111_Text_DustyDefeat: @ 8298B53
 	.string "While I have searched for ruins,\n"
 	.string "I've not searched for strong POKéMON.$"
 
-Route111_Text_298B9A: @ 8298B9A
+Route111_Text_DustyPostBattle: @ 8298B9A
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years?\n"
 	.string "Which was it now?$"
 
-Route111_Text_298C00: @ 8298C00
+Route111_Text_DustyRegister: @ 8298C00
 	.string "I haven't been searching for any\n"
 	.string "tough POKéMON.\p"
 	.string "But, for some reason, I sure do like\n"
 	.string "POKéNAVS.$"
 
-Route111_Text_298C5F: @ 8298C5F
+Route111_Text_DustyRematchIntro: @ 8298C5F
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years?\n"
 	.string "Anyway, am I to be challenged?$"
 
-Route111_Text_298CD2: @ 8298CD2
+Route111_Text_DustyRematchDefeat: @ 8298CD2
 	.string "I've found no ruins, nor have I found\n"
 	.string "any strong POKéMON…$"
 
-Route111_Text_298D0C: @ 8298D0C
+Route111_Text_DustyPostRematch: @ 8298D0C
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years\n"
@@ -1324,215 +1324,215 @@ Route111_Text_298D0C: @ 8298D0C
 	.string "Hmm… It could even be fifty…\n"
 	.string "How long have I been at this?$"
 
-Route111_Text_298DA9: @ 8298DA9
+Route111_Text_TravisIntro: @ 8298DA9
 	.string "I'm full of pep!\n"
 	.string "And my POKéMON is peppy, too!$"
 
-Route111_Text_298DD8: @ 8298DD8
+Route111_Text_TravisDefeat: @ 8298DD8
 	.string "My POKéMON lost its pep…$"
 
-Route111_Text_298DF1: @ 8298DF1
+Route111_Text_TravisPostBattle: @ 8298DF1
 	.string "When I see a TRAINER with a lot of pep,\n"
 	.string "I can't help looking.$"
 
-Route111_Text_298E2F: @ 8298E2F
+Route111_Text_IreneIntro: @ 8298E2F
 	.string "I don't know where you're going,\n"
 	.string "but would you like to battle?$"
 
-Route111_Text_298E6E: @ 8298E6E
+Route111_Text_IreneDefeat: @ 8298E6E
 	.string "Oh, you're disgustingly good!$"
 
-Route111_Text_298E8C: @ 8298E8C
+Route111_Text_IrenePostBattle: @ 8298E8C
 	.string "I'm thinking that I should go to\n"
 	.string "MT. CHIMNEY, but the view around\l"
 	.string "here is very nice, too.$"
 
-Route111_Text_298EE6: @ 8298EE6
+Route111_Text_DaisukeIntro: @ 8298EE6
 	.string "To train myself, I challenge all\n"
 	.string "whom I meet!$"
 
-Route111_Text_298F14: @ 8298F14
+Route111_Text_DaisukeDefeat: @ 8298F14
 	.string "Uncle! I give up!$"
 
-Route111_Text_298F26: @ 8298F26
+Route111_Text_DaisukePostBattle: @ 8298F26
 	.string "All I can do is keep training until\n"
 	.string "I can defeat strong TRAINERS such\l"
 	.string "as yourself.$"
 
-Route111_Text_298F79: @ 8298F79
+Route111_Text_WiltonIntro: @ 8298F79
 	.string "Show me how much you've toughened\n"
 	.string "your POKéMON.$"
 
-Route111_Text_298FA9: @ 8298FA9
+Route111_Text_WiltonDefeat: @ 8298FA9
 	.string "I see, you've toughened them\n"
 	.string "considerably.$"
 
-Route111_Text_298FD4: @ 8298FD4
+Route111_Text_WiltonPostBattle: @ 8298FD4
 	.string "POKéMON and TRAINERS learn much\n"
 	.string "through battling.\p"
 	.string "What's important is to never give up\n"
 	.string "even if you lose.$"
 
-Route111_Text_29903D: @ 829903D
+Route111_Text_WiltonRegister: @ 829903D
 	.string "There is much to be learned from\n"
 	.string "your training style.\p"
 	.string "I request a rematch if it\n"
 	.string "behooves you.$"
 
-Route111_Text_29909B: @ 829909B
+Route111_Text_WiltonRematchIntro: @ 829909B
 	.string "We're training here to elevate our\n"
 	.string "game to the next level.\l"
 	.string "Stay and train with us!$"
 
-Route111_Text_2990EE: @ 82990EE
+Route111_Text_WiltonRematchDefeat: @ 82990EE
 	.string "Ooh, you're decent!$"
 
-Route111_Text_299102: @ 8299102
+Route111_Text_WiltonPostRematch: @ 8299102
 	.string "Since you're that strong, you should\n"
 	.string "aim for the POKéMON LEAGUE.$"
 
-Route111_Text_299143: @ 8299143
+Route111_Text_BrookeIntro: @ 8299143
 	.string "Oh, your POKéMON look like serious\n"
 	.string "actors.\l"
 	.string "I have to ask you for an engagement.$"
 
-Route111_Text_299193: @ 8299193
+Route111_Text_BrookeDefeat: @ 8299193
 	.string "They didn't just look strong,\n"
 	.string "they are strong!$"
 
-Route111_Text_2991C2: @ 82991C2
+Route111_Text_BrookePostBattle: @ 82991C2
 	.string "I thought I was raising my POKéMON\n"
 	.string "diligently, but, oh no, there is still\l"
 	.string "much to be done.$"
 
-Route111_Text_29921D: @ 829921D
+Route111_Text_BrookeRegister: @ 829921D
 	.string "I wish I could become friends with\n"
 	.string "more strong people like you!$"
 
-Route111_Text_29925D: @ 829925D
+Route111_Text_BrookeRematchIntro: @ 829925D
 	.string "You can make POKéMON stronger or\n"
 	.string "weaker depending on the moves you\l"
 	.string "teach them.\p"
 	.string "What kinds of moves do your POKéMON\n"
 	.string "know?$"
 
-Route111_Text_2992D6: @ 82992D6
+Route111_Text_BrookeRematchDefeat: @ 82992D6
 	.string "You've taught them good moves!$"
 
-Route111_Text_2992F5: @ 82992F5
+Route111_Text_BrookePostRematch: @ 82992F5
 	.string "Maybe I should have stopped my\n"
 	.string "POKéMON from evolving until they\l"
 	.string "learned better moves…$"
 
-Route111_Text_29934B: @ 829934B
+Route111_Text_CeliaIntro: @ 829934B
 	.string "I shouldn't have come to a place like\n"
 	.string "this for a picnic!$"
 
-Route111_Text_299384: @ 8299384
+Route111_Text_CeliaDefeat: @ 8299384
 	.string "Aww!\n"
 	.string "I really shouldn't have come!$"
 
-Route111_Text_2993A7: @ 82993A7
+Route111_Text_CeliaPostBattle: @ 82993A7
 	.string "In a sandstorm like this, I can't set\n"
 	.string "the places for a picnic even with my\l"
 	.string "GO-GOGGLES on…$"
 
-Route111_Text_299401: @ 8299401
+Route111_Text_BryanIntro: @ 8299401
 	.string "How tough are you?\n"
 	.string "We shall expose that secret!$"
 
-Route111_Text_299431: @ 8299431
+Route111_Text_BryanDefeat: @ 8299431
 	.string "Oh! Your strength!\n"
 	.string "It is shrouded in mystery!$"
 
-Route111_Text_29945F: @ 829945F
+Route111_Text_BryanPostBattle: @ 829945F
 	.string "This desert hoards mysteries in\n"
 	.string "its shifting sands!$"
 
-Route111_Text_299493: @ 8299493
+Route111_Text_BrandenIntro: @ 8299493
 	.string "I'll give you some of my sandwich\n"
 	.string "if you'll lose.$"
 
-Route111_Text_2994C5: @ 82994C5
+Route111_Text_BrandenDefeat: @ 82994C5
 	.string "Tch! I thought a sandwich would be\n"
 	.string "enough of a bribe…$"
 
-Route111_Text_2994FB: @ 82994FB
+Route111_Text_BrandenPostBattle: @ 82994FB
 	.string "My SANDSHREW loves eating\n"
 	.string "my sandwiches.$"
 
-Route111_Text_299524: @ 8299524
+Route111_Text_TyronIntro: @ 8299524
 	.string "This is my favorite kind of POKéMON!$"
 
-Route111_Text_299549: @ 8299549
+Route111_Text_TyronDefeat: @ 8299549
 	.string "Wait!\n"
 	.string "Did you get a good look at my POKéMON?$"
 
-Route111_Text_299576: @ 8299576
+Route111_Text_TyronPostBattle: @ 8299576
 	.string "When having a battle, I get a kick out\n"
 	.string "of showing off my POKéMON.\p"
 	.string "I bet everyone feels that way when\n"
 	.string "they enter a battle!$"
 
-Route111_Text_2995F0: @ 82995F0
+Route111_Text_CelinaIntro: @ 82995F0
 	.string "Show me how to put a little excitement\n"
 	.string "into my life.$"
 
-Route111_Text_299625: @ 8299625
+Route111_Text_CelinaDefeat: @ 8299625
 	.string "Oh… My…\n"
 	.string "That was too much excitement.$"
 
-Route111_Text_29964B: @ 829964B
+Route111_Text_CelinaPostBattle: @ 829964B
 	.string "My pulse is still racing.\n"
 	.string "You're one fabulous TRAINER.$"
 
-Route111_Text_299682: @ 8299682
+Route111_Text_HaydenIntro: @ 8299682
 	.string "When you're as famished as I am,\n"
 	.string "there is no room for pity!$"
 
-Route111_Text_2996BE: @ 82996BE
+Route111_Text_HaydenDefeat: @ 82996BE
 	.string "Groan…$"
 
-Route111_Text_2996C5: @ 82996C5
+Route111_Text_HaydenPostBattle: @ 82996C5
 	.string "My stomach is grumbling!\n"
 	.string "Maybe I can grill some BERRIES…$"
 
-Route111_Text_2996FE: @ 82996FE
+Route111_Text_BiancaIntro: @ 82996FE
 	.string "Did you come from MAUVILLE?\n"
 	.string "Then you should be full of energy!$"
 
-Route111_Text_29973D: @ 829973D
+Route111_Text_BiancaDefeat: @ 829973D
 	.string "Ooh lala!\n"
 	.string "That's a lot to take!$"
 
-Route111_Text_29975D: @ 829975D
+Route111_Text_BiancaPostBattle: @ 829975D
 	.string "This road here…\n"
 	.string "You have quite a ways to travel.$"
 
-Route112_Text_29978E: @ 829978E
+Route112_Text_BriceIntro: @ 829978E
 	.string "Hahahaha!\n"
 	.string "How about we have a battle?\l"
 	.string "You and me!\l"
 	.string "Hahahaha!$"
 
-Route112_Text_2997CA: @ 82997CA
+Route112_Text_BriceDefeat: @ 82997CA
 	.string "I lost!\n"
 	.string "Hahahaha!$"
 
-Route112_Text_2997DC: @ 82997DC
+Route112_Text_BricePostBattle: @ 82997DC
 	.string "Hahahahaha! Something flew up my nose!\n"
 	.string "Hahahaha-hatchoo!$"
 
-Route112_Text_299815: @ 8299815
+Route112_Text_TrentIntro: @ 8299815
 	.string "My legs are solid from pounding up\n"
 	.string "and down the mountains.\p"
 	.string "They're not going to buckle easily,\n"
 	.string "friend!$"
 
-Route112_Text_29987C: @ 829987C
+Route112_Text_TrentDefeat: @ 829987C
 	.string "Ouch! My legs cramped up!$"
 
-Route112_Text_299896: @ 8299896
+Route112_Text_TrentPostBattle: @ 8299896
 	.string "Try hiking, and I mean really\n"
 	.string "pounding, on these mountain trails\l"
 	.string "with a heavy pack weighing dozens of\l"
@@ -1540,2318 +1540,2318 @@ Route112_Text_299896: @ 8299896
 	.string "That, my friend, will get your body\n"
 	.string "into serious shape.$"
 
-Route112_Text_29993C: @ 829993C
+Route112_Text_TrentRegister: @ 829993C
 	.string "Ow, my legs have cramped up.\n"
 	.string "Can you grab me some bandages from\l"
 	.string "my backpack?\p"
 	.string "No, that's my POKéNAV!\n"
 	.string "Oh, fine, I'll register you.$"
 
-Route112_Text_2999BD: @ 82999BD
+Route112_Text_TrentRematchIntro: @ 82999BD
 	.string "I've been keeping fit by hiking.\n"
 	.string "Power, I have in spades!$"
 
-Route112_Text_2999F7: @ 82999F7
+Route112_Text_TrentRematchDefeat: @ 82999F7
 	.string "I got trumped in power?$"
 
-Route112_Text_299A0F: @ 8299A0F
+Route112_Text_TrentRematchPostBattle: @ 8299A0F
 	.string "I hear there are some seriously tough\n"
 	.string "TRAINERS on top of MT. CHIMNEY.\p"
 	.string "I intend to get up there and give them\n"
 	.string "a challenge!$"
 
-Route112_Text_299A89: @ 8299A89
+Route112_Text_LarryIntro: @ 8299A89
 	.string "I'm strong.\n"
 	.string "I won't cry if I lose.$"
 
-Route112_Text_299AAC: @ 8299AAC
+Route112_Text_LarryDefeat: @ 8299AAC
 	.string "Waaaah!$"
 
-Route112_Text_299AB4: @ 8299AB4
+Route112_Text_LarryPostBattle: @ 8299AB4
 	.string "I'm not crying because I miss my mommy!\n"
 	.string "Snivel…$"
 
-Route112_Text_299AE4: @ 8299AE4
+Route112_Text_CarolIntro: @ 8299AE4
 	.string "When you're out on a picnic, why,\n"
 	.string "you simply have to sing!\l"
 	.string "Come on, sing with me!$"
 
-Route112_Text_299B36: @ 8299B36
+Route112_Text_CarolDefeat: @ 8299B36
 	.string "Oh, you're so strong!$"
 
-Route112_Text_299B4C: @ 8299B4C
+Route112_Text_CarolPostBattle: @ 8299B4C
 	.string "It doesn't matter if you're good or bad\n"
 	.string "at singing or POKéMON.\p"
 	.string "If you have the most fun, you win!$"
 
-Route112_Text_299BAE: @ 8299BAE
+Route112_Text_BryantIntro: @ 8299BAE
 	.string "I caught hot POKéMON in FIERY PATH!\n"
 	.string "Take a look!$"
 
-Route112_Text_299BDF: @ 8299BDF
+Route112_Text_BryantDefeat: @ 8299BDF
 	.string "What a bumpy ride that was!$"
 
-Route112_Text_299BFB: @ 8299BFB
+Route112_Text_BryantPostBattle: @ 8299BFB
 	.string "I like the way you battle.\n"
 	.string "It has a certain flair to it.$"
 
-Route112_Text_299C34: @ 8299C34
+Route112_Text_ShaylaIntro: @ 8299C34
 	.string "Oh, aren't you an adorable TRAINER!\n"
 	.string "Please, I need a romantic battle!\l"
 	.string "I'm somewhat decent!$"
 
-Route112_Text_299C8F: @ 8299C8F
+Route112_Text_ShaylaDefeat: @ 8299C8F
 	.string "Oh, how strong you are!\n"
 	.string "You've given me quite a shock!$"
 
-Route112_Text_299CC6: @ 8299CC6
+Route112_Text_ShaylaPostBattle: @ 8299CC6
 	.string "Are you busy right now?\n"
 	.string "I was thinking that maybe we can have\l"
 	.string "a rematch right now…\l"
 	.string "But it's all right if you're busy.$"
 
-Route113_Text_299D3C: @ 8299D3C
+Route113_Text_JaylenIntro: @ 8299D3C
 	.string "Can you guess why it's so cool\n"
 	.string "around here?$"
 
-Route113_Text_299D68: @ 8299D68
+Route113_Text_JaylenDefeat: @ 8299D68
 	.string "Peeuuw!\n"
 	.string "That stinks!$"
 
-Route113_Text_299D7D: @ 8299D7D
+Route113_Text_JaylenPostBattle: @ 8299D7D
 	.string "The volcanic ash blocks the sun,\n"
 	.string "so it doesn't get very warm.\p"
 	.string "That's good for me--I can't stand heat!$"
 
-Route113_Text_299DE3: @ 8299DE3
+Route113_Text_DillonIntro: @ 8299DE3
 	.string "The volcano's eruption is proof that\n"
 	.string "the earth is alive.$"
 
-Route113_Text_299E1C: @ 8299E1C
+Route113_Text_DillonDefeat: @ 8299E1C
 	.string "You're some kind of strong!$"
 
-Route113_Text_299E38: @ 8299E38
+Route113_Text_DillonPostBattle: @ 8299E38
 	.string "Ouch! Owww! I can't see!\n"
 	.string "I got ashes in my eyelashes!\p"
 	.string "Get it? Ashes and eyelashes?\p"
 	.string "Okay, that was bad, sorry…$"
 
-Route113_Text_299EA6: @ 8299EA6
+Route113_Text_MadelineIntro: @ 8299EA6
 	.string "I use this parasol to ward off this\n"
 	.string "filthy, yucky volcanic ash from\l"
 	.string "my dear NUMEL.$"
 
-Route113_Text_299EF9: @ 8299EF9
+Route113_Text_MadelineDefeat: @ 8299EF9
 	.string "Huff, huff…\n"
 	.string "I am exhausted…$"
 
-Route113_Text_299F15: @ 8299F15
+Route113_Text_MadelinePostBattle: @ 8299F15
 	.string "You're very good at this.\n"
 	.string "I must say I'm impressed!$"
 
-Route113_Text_299F49: @ 8299F49
+Route113_Text_MadelineRegister: @ 8299F49
 	.string "Here, slide under my parasol.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-Route113_Text_299F8A: @ 8299F8A
+Route113_Text_MadelineRematchIntro: @ 8299F8A
 	.string "Oh, hello, hasn't it been a while?\n"
 	.string "May I invite you to battle?$"
 
-Route113_Text_299FC9: @ 8299FC9
+Route113_Text_MadelineRematchDefeat: @ 8299FC9
 	.string "Oh, how super!$"
 
-Route113_Text_299FD8: @ 8299FD8
+Route113_Text_MadelinePostRematch: @ 8299FD8
 	.string "You've remained very good at this.\n"
 	.string "I must say I'm impressed!$"
 
-Route113_Text_29A015: @ 829A015
+Route113_Text_LaoIntro: @ 829A015
 	.string "From out of the ashes I leap! Hiyah!\n"
 	.string "I challenge thee!$"
 
-Route113_Text_29A04C: @ 829A04C
+Route113_Text_LaoDefeat: @ 829A04C
 	.string "With honor I admit defeat!$"
 
-Route113_Text_29A067: @ 829A067
+Route113_Text_LaoPostBattle: @ 829A067
 	.string "I must refine the art of concealment.\n"
 	.string "I bid thee farewell.$"
 
-Route113_Text_29A0A2: @ 829A0A2
+Route113_Text_LaoRegister: @ 829A0A2
 	.string "Yiiyaah! Witness the ancient ninja\n"
 	.string "technique of POKéNAV registration!$"
 
-Route113_Text_29A0E8: @ 829A0E8
+Route113_Text_LaoRematchIntro: @ 829A0E8
 	.string "From out of the ashes I leap! Hiyah!\n"
 	.string "I challenge thee!$"
 
-Route113_Text_29A11F: @ 829A11F
+Route113_Text_LaoRematchDefeat: @ 829A11F
 	.string "With honor I admit defeat!$"
 
-Route113_Text_29A13A: @ 829A13A
+Route113_Text_LaoPostRematch: @ 829A13A
 	.string "My flawless concealment was let down\n"
 	.string "by my immature battle skills…\p"
 	.string "I bid thee farewell.$"
 
-Route113_Text_29A192: @ 829A192
+Route113_Text_LungIntro: @ 829A192
 	.string "Thanks for finding me!\n"
 	.string "But we still have to battle!$"
 
-Route113_Text_29A1C6: @ 829A1C6
+Route113_Text_LungDefeat: @ 829A1C6
 	.string "I'll use my ninjutsu on you…\n"
 	.string "“VOLCANIC ASH SWIRL CLOAK”!\p"
 	.string "…What?\n"
 	.string "It's already over?$"
 
-Route113_Text_29A219: @ 829A219
+Route113_Text_LungPostBattle: @ 829A219
 	.string "You know what's crummy about hiding?\n"
 	.string "It's lonely if no one comes along.$"
 
-Route113_Text_29A261: @ 829A261
+Route113_Text_ToriIntro: @ 829A261
 	.string "TORI: Both of us, we collect ashes.\n"
 	.string "We battle POKéMON, too.$"
 
-Route113_Text_29A29D: @ 829A29D
+Route113_Text_ToriDefeat: @ 829A29D
 	.string "TORI: We lost… It's boring, so I'm going\n"
 	.string "to get some more ashes.$"
 
-Route113_Text_29A2DE: @ 829A2DE
+Route113_Text_ToriPostBattle: @ 829A2DE
 	.string "TORI: How much ash do we have?\n"
 	.string "Enough for a WHITE FLUTE, I hope.$"
 
-Route113_Text_29A31F: @ 829A31F
+Route113_Text_ToriNotEnoughMons: @ 829A31F
 	.string "TORI: We want to battle 2-on-2.\n"
 	.string "If we didn't, we would lose!$"
 
-Route113_Text_29A35C: @ 829A35C
+Route113_Text_TiaIntro: @ 829A35C
 	.string "TIA: Both of us, we collect ashes.\n"
 	.string "We battle POKéMON, too.$"
 
-Route113_Text_29A397: @ 829A397
+Route113_Text_TiaDefeat: @ 829A397
 	.string "TIA: We couldn't win… It's boring,\n"
 	.string "so I'm getting some more ashes.$"
 
-Route113_Text_29A3DA: @ 829A3DA
+Route113_Text_TiaPostBattle: @ 829A3DA
 	.string "TIA: We have a lot of ashes!\n"
 	.string "I think enough for a WHITE FLUTE!$"
 
-Route113_Text_29A419: @ 829A419
+Route113_Text_TiaNotEnoughMons: @ 829A419
 	.string "TIA: We want to battle 2-on-2.\n"
 	.string "If we don't, we won't win!$"
 
-Route113_Text_29A453: @ 829A453
+Route113_Text_CobyIntro: @ 829A453
 	.string "Pfft, with these wings I can\n"
 	.string "flick you away!$"
 
-Route113_Text_29A480: @ 829A480
+Route113_Text_CobyDefeat: @ 829A480
 	.string "A… What?$"
 
-Route113_Text_29A489: @ 829A489
+Route113_Text_CobyPostBattle: @ 829A489
 	.string "I don't know what to say when I get\n"
 	.string "beaten so easily…$"
 
-Route113_Text_29A4BF: @ 829A4BF
+Route113_Text_SophieIntro: @ 829A4BF
 	.string "The warmth here is making me drowsy.\n"
 	.string "Battle with me so I can stay awake.$"
 
-Route113_Text_29A508: @ 829A508
+Route113_Text_SophieDefeat: @ 829A508
 	.string "This is a dream.\n"
 	.string "I'm sure of it…$"
 
-Route113_Text_29A529: @ 829A529
+Route113_Text_SophiePostBattle: @ 829A529
 	.string "Losing burns me up…\n"
 	.string "I'm just going to sleep right here!\l"
 	.string "Zzz!$"
 
-Route113_Text_29A566: @ 829A566
+Route113_Text_LawrenceIntro: @ 829A566
 	.string "Were you maybe in the middle\n"
 	.string "of gathering volcanic ashes?$"
 
-Route113_Text_29A5A0: @ 829A5A0
+Route113_Text_LawrenceDefeat: @ 829A5A0
 	.string "Ehehe.\n"
 	.string "We got beaten cleanly.$"
 
-Route113_Text_29A5BE: @ 829A5BE
+Route113_Text_LawrencePostBattle: @ 829A5BE
 	.string "I ought to hide under the ashes, too.$"
 
-Route113_Text_29A5E4: @ 829A5E4
+Route113_Text_WyattIntro: @ 829A5E4
 	.string "Y-you want to battle with me?\n"
 	.string "Even though I just caught my POKéMON?$"
 
-Route113_Text_29A628: @ 829A628
+Route113_Text_WyattDefeat: @ 829A628
 	.string "Y-you're all happy to win?\n"
 	.string "Even though it's only me?$"
 
-Route113_Text_29A65D: @ 829A65D
+Route113_Text_WyattPostBattle: @ 829A65D
 	.string "Oh, so now you want to say a word to\n"
 	.string "the loser?\p"
 	.string "Aren't you just the coolest?\n"
 	.string "Humph!$"
 
-Route114_Text_29A6B1: @ 829A6B1
+Route114_Text_LennyIntro: @ 829A6B1
 	.string "Yodelayhihoo!\p"
 	.string "… …\p"
 	.string "You're supposed to shout\n"
 	.string "“yodelayhihoo” since it doesn't\l"
 	.string "echo here!$"
 
-Route114_Text_29A707: @ 829A707
+Route114_Text_LennyDefeat: @ 829A707
 	.string "Yodelayhihoo!$"
 
-Route114_Text_29A715: @ 829A715
+Route114_Text_LennyPostBattle: @ 829A715
 	.string "When I was a wee tyke, I believed there\n"
 	.string "was someone copying me and shouting\l"
 	.string "back, “Yodelayhihoo.”$"
 
-Route114_Text_29A777: @ 829A777
+Route114_Text_LucasIntro: @ 829A777
 	.string "If you're not prepared, you shouldn't\n"
 	.string "be up in the mountains!$"
 
-Route114_Text_29A7B5: @ 829A7B5
+Route114_Text_LucasDefeat: @ 829A7B5
 	.string "The mountains are unforgiving…$"
 
-Route114_Text_29A7D4: @ 829A7D4
+Route114_Text_LucasPostBattle: @ 829A7D4
 	.string "In the winter, mountains turn deadly\n"
 	.string "with blizzards and avalanches.$"
 
-Route114_Text_29A818: @ 829A818
+Route114_Text_ShaneIntro: @ 829A818
 	.string "Camping's fun! You can fish, roast\n"
 	.string "marshmallows, and tell spooky stories!\p"
 	.string "But the best of all are the POKéMON\n"
 	.string "battles!$"
 
-Route114_Text_29A88F: @ 829A88F
+Route114_Text_ShaneDefeat: @ 829A88F
 	.string "Way too strong!$"
 
-Route114_Text_29A89F: @ 829A89F
+Route114_Text_ShanePostBattle: @ 829A89F
 	.string "I think it's great that I can go\n"
 	.string "camping with my POKéMON.$"
 
-Route114_Text_29A8D9: @ 829A8D9
+Route114_Text_NancyIntro: @ 829A8D9
 	.string "I need to exercise after a meal.\n"
 	.string "Let's have a match!$"
 
-Route114_Text_29A90E: @ 829A90E
+Route114_Text_NancyDefeat: @ 829A90E
 	.string "Oh, no!$"
 
-Route114_Text_29A916: @ 829A916
+Route114_Text_NancyPostBattle: @ 829A916
 	.string "I just had a tasty meal.\n"
 	.string "I'm getting drowsy…$"
 
-Route114_Text_29A943: @ 829A943
+Route114_Text_SteveIntro: @ 829A943
 	.string "Ufufufufufu…\n"
 	.string "Want to battle against my POKéMON?$"
 
-Route114_Text_29A973: @ 829A973
+Route114_Text_SteveDefeat: @ 829A973
 	.string "M-My POKéMON…$"
 
-Route114_Text_29A981: @ 829A981
+Route114_Text_StevePostBattle: @ 829A981
 	.string "A big body that's all lumpy and hard,\n"
 	.string "enormous horns, and vicious fangs…\p"
 	.string "Ufufufufu…\n"
 	.string "I wish I had a POKéMON like that…$"
 
-Route114_Text_29A9F7: @ 829A9F7
+Route114_Text_SteveRegister: @ 829A9F7
 	.string "Don't forget what you've done to me!\n"
 	.string "I'll make it so you can't forget!$"
 
-Route114_Text_29AA3E: @ 829AA3E
+Route114_Text_SteveRematchIntro: @ 829AA3E
 	.string "Ufufufufufu…\n"
 	.string "Come on, battle my POKéMON…$"
 
-Route114_Text_29AA67: @ 829AA67
+Route114_Text_SteveRematchDefeat: @ 829AA67
 	.string "I feel so lucky getting to see your\n"
 	.string "POKéMON…$"
 
-Route114_Text_29AA94: @ 829AA94
+Route114_Text_StevePostRematch: @ 829AA94
 	.string "Ufufufufufu…\p"
 	.string "When I see POKéMON battling, I get all\n"
 	.string "shivery and shaky…$"
 
-Route114_Text_29AADB: @ 829AADB
+Route114_Text_BernieIntro: @ 829AADB
 	.string "If you're lighting a campfire,\n"
 	.string "make sure you have water handy.$"
 
-Route114_Text_29AB1A: @ 829AB1A
+Route114_Text_BernieDefeat: @ 829AB1A
 	.string "Thanks for dousing my fire!$"
 
-Route114_Text_29AB36: @ 829AB36
+Route114_Text_BerniePostBattle: @ 829AB36
 	.string "You really do have to be careful with\n"
 	.string "any sort of fire in a forest.\p"
 	.string "Don't ever underestimate the power\n"
 	.string "of fire.$"
 
-Route114_Text_29ABA6: @ 829ABA6
+Route114_Text_BernieRegister: @ 829ABA6
 	.string "You set my spirit on fire.\n"
 	.string "Let's register each other!$"
 
-Route114_Text_29ABDC: @ 829ABDC
+Route114_Text_BernieRematchIntro: @ 829ABDC
 	.string "Have you learned to keep water handy\n"
 	.string "for campfires?$"
 
-Route114_Text_29AC10: @ 829AC10
+Route114_Text_BernieRematchDefeat: @ 829AC10
 	.string "I got hosed down before I could\n"
 	.string "flare up, I guess.$"
 
-Route114_Text_29AC43: @ 829AC43
+Route114_Text_BerniePostRematch: @ 829AC43
 	.string "You really do have to be careful with\n"
 	.string "any sort of fire in a forest.\p"
 	.string "Don't ever underestimate the power\n"
 	.string "of fire.$"
 
-Route114_Text_29ACB3: @ 829ACB3
+Route114_Text_ClaudeIntro: @ 829ACB3
 	.string "If we were fishing, you wouldn't stand\n"
 	.string "a chance against me.\l"
 	.string "So, bring on your POKéMON!$"
 
-Route114_Text_29AD0A: @ 829AD0A
+Route114_Text_ClaudeDefeat: @ 829AD0A
 	.string "If we were fishing, I would've won…$"
 
-Route114_Text_29AD2E: @ 829AD2E
+Route114_Text_ClaudePostBattle: @ 829AD2E
 	.string "I think I'll try my luck at landing\n"
 	.string "a big one at METEOR FALLS.\p"
 	.string "There has to be something in there.\n"
 	.string "I just know it.$"
 
-Route114_Text_29ADA1: @ 829ADA1
+Route114_Text_NolanIntro: @ 829ADA1
 	.string "I like to fish. But I also like to\n"
 	.string "battle!\p"
 	.string "If anyone challenges me, I'm there,\n"
 	.string "even if I'm fishing.$"
 
-Route114_Text_29AE05: @ 829AE05
+Route114_Text_NolanDefeat: @ 829AE05
 	.string "I like to battle, but that doesn't\n"
 	.string "mean I'm good at it…$"
 
-Route114_Text_29AE3D: @ 829AE3D
+Route114_Text_NolanPostBattle: @ 829AE3D
 	.string "This time I'll do it!\p"
 	.string "I always think that, so I can't walk\n"
 	.string "away from fishing or POKéMON.$"
 
-Route114_Text_29AE96: @ 829AE96
+Route114_Text_TyraIntro: @ 829AE96
 	.string "TYRA: Well, sure.\n"
 	.string "I'm in the mood for it.\l"
 	.string "I'll teach you a little about POKéMON.$"
 
-Route114_Text_29AEE7: @ 829AEE7
+Route114_Text_TyraDefeat: @ 829AEE7
 	.string "TYRA: What an amazing battle style!$"
 
-Route114_Text_29AF0B: @ 829AF0B
+Route114_Text_TyraPostBattle: @ 829AF0B
 	.string "TYRA: I was teaching my junior IVY\n"
 	.string "about POKéMON.$"
 
-Route114_Text_29AF3D: @ 829AF3D
+Route114_Text_TyraNotEnoughMons: @ 829AF3D
 	.string "TYRA: Giggle…\n"
 	.string "If you want to battle with us, just one\l"
 	.string "POKéMON isn't enough!$"
 
-Route114_Text_29AF89: @ 829AF89
+Route114_Text_IvyIntro: @ 829AF89
 	.string "IVY: Who taught you about POKéMON?$"
 
-Route114_Text_29AFAC: @ 829AFAC
+Route114_Text_IvyDefeat: @ 829AFAC
 	.string "IVY: What an amazing battle style!$"
 
-Route114_Text_29AFCF: @ 829AFCF
+Route114_Text_IvyPostBattle: @ 829AFCF
 	.string "IVY: I started training POKéMON\n"
 	.string "because TYRA, my student mentor,\l"
 	.string "taught me!$"
 
-Route114_Text_29B01B: @ 829B01B
+Route114_Text_IvyNotEnoughMons: @ 829B01B
 	.string "IVY: Do you only have one POKéMON?\n"
 	.string "I think it must feel lonesome.$"
 
-Route114_Text_29B05D: @ 829B05D
+Route114_Text_KaiIntro: @ 829B05D
 	.string "I landed a big one!\n"
 	.string "A huge one, I tell you!$"
 
-Route114_Text_29B089: @ 829B089
+Route114_Text_KaiDefeat: @ 829B089
 	.string "What was that about?\n"
 	.string "Did mine lose in size?$"
 
-Route114_Text_29B0B5: @ 829B0B5
+Route114_Text_KaiPostBattle: @ 829B0B5
 	.string "Okay!\n"
 	.string "I'll just fish me a bigger one!$"
 
-Route114_Text_29B0DB: @ 829B0DB
+Route114_Text_CharlotteIntro: @ 829B0DB
 	.string "Me!\n"
 	.string "I'm not just a pretty face!$"
 
-Route114_Text_29B0FB: @ 829B0FB
+Route114_Text_CharlotteDefeat: @ 829B0FB
 	.string "That wasn't cute in the least!$"
 
-Route114_Text_29B11A: @ 829B11A
+Route114_Text_CharlottePostBattle: @ 829B11A
 	.string "I don't want a POKéMON that's\n"
 	.string "just cute.\p"
 	.string "I adore cute ones that have a quirk\n"
 	.string "or two!$"
 
-Route114_Text_29B16F: @ 829B16F
+Route114_Text_AngelinaIntro: @ 829B16F
 	.string "Have you made your POKéMON evolve\n"
 	.string "very much?$"
 
-Route114_Text_29B19C: @ 829B19C
+Route114_Text_AngelinaDefeat: @ 829B19C
 	.string "Oh, I see.\n"
 	.string "That's good to know.$"
 
-Route114_Text_29B1BC: @ 829B1BC
+Route114_Text_AngelinaPostBattle: @ 829B1BC
 	.string "Some POKéMON change so much when\n"
 	.string "they evolve, it's startling!$"
 
-Route115_Text_29B1FA: @ 829B1FA
+Route115_Text_TimothyIntro: @ 829B1FA
 	.string "Hm…\n"
 	.string "You seem rather capable…\l"
 	.string "Let me keep you company!$"
 
-Route115_Text_29B230: @ 829B230
+Route115_Text_TimothyDefeat: @ 829B230
 	.string "You're much stronger than\n"
 	.string "I'd imagined!$"
 
-Route115_Text_29B258: @ 829B258
+Route115_Text_TimothyPostBattle: @ 829B258
 	.string "There is no such thing as a born genius.\n"
 	.string "It all depends on effort!\l"
 	.string "That is what I believe…$"
 
-Route115_Text_29B2B3: @ 829B2B3
+Route115_Text_TimothyRegister: @ 829B2B3
 	.string "Hmm… A loss this thorough has been\n"
 	.string "a distant memory.\p"
 	.string "If you would allow it, I wish for\n"
 	.string "another opportunity to do battle.$"
 
-Route115_Text_29B32C: @ 829B32C
+Route115_Text_TimothyRematchIntro: @ 829B32C
 	.string "Hm… As always, your agility speaks\n"
 	.string "for itself.\l"
 	.string "Come, keep me company!$"
 
-Route115_Text_29B372: @ 829B372
+Route115_Text_TimothyRematchDefeat: @ 829B372
 	.string "As strong as ever!$"
 
-Route115_Text_29B385: @ 829B385
+Route115_Text_TimothyPostRematch: @ 829B385
 	.string "All it takes is effort!\p"
 	.string "I lost because I haven't put in enough\n"
 	.string "effort!$"
 
-Route115_Text_29B3CC: @ 829B3CC
+Route115_Text_KoichiIntro: @ 829B3CC
 	.string "You!\p"
 	.string "My MACHOP!\p"
 	.string "Demand a battle!$"
 
-Route115_Text_29B3ED: @ 829B3ED
+Route115_Text_KoichiDefeat: @ 829B3ED
 	.string "Ouch, ouch, ouch!$"
 
-Route115_Text_29B3FF: @ 829B3FF
+Route115_Text_KoichiPostBattle: @ 829B3FF
 	.string "My MACHOP crew!\p"
 	.string "So long as they seek power, I will\n"
 	.string "grow strong with them!$"
 
-Route115_Text_29B449: @ 829B449
+Route115_Text_NobIntro: @ 829B449
 	.string "My strongest skill is busting bricks\n"
 	.string "with my forehead!$"
 
-Route115_Text_29B480: @ 829B480
+Route115_Text_NobDefeat: @ 829B480
 	.string "Ugwaaaah!\n"
 	.string "My head is busted!$"
 
-Route115_Text_29B49D: @ 829B49D
+Route115_Text_NobPostBattle: @ 829B49D
 	.string "I've been teaching my POKéMON karate.\p"
 	.string "It looks like they'll get a lot better\n"
 	.string "than me. I'm excited about that.$"
 
-Route115_Text_29B50B: @ 829B50B
+Route115_Text_NobRegister: @ 829B50B
 	.string "You impress me! Give me a rematch\n"
 	.string "after I redo my training!$"
 
-Route115_Text_29B547: @ 829B547
+Route115_Text_NobRematchIntro: @ 829B547
 	.string "After you beat me, we trained hard to\n"
 	.string "improve our skills.\l"
 	.string "Come on, give us a rematch!$"
 
-Route115_Text_29B59D: @ 829B59D
+Route115_Text_NobRematchDefeat: @ 829B59D
 	.string "Ugwaaah!\n"
 	.string "We lost again!$"
 
-Route115_Text_29B5B5: @ 829B5B5
+Route115_Text_NobPostRematch: @ 829B5B5
 	.string "My POKéMON will grow stronger!\n"
 	.string "I'll redouble my training!$"
 
-Route115_Text_29B5EF: @ 829B5EF
+Route115_Text_CyndyIntro: @ 829B5EF
 	.string "This beach is my secret training spot!\n"
 	.string "Don't come butting in!$"
 
-Route115_Text_29B62D: @ 829B62D
+Route115_Text_CyndyDefeat: @ 829B62D
 	.string "I haven't trained enough!$"
 
-Route115_Text_29B647: @ 829B647
+Route115_Text_CyndyPostBattle: @ 829B647
 	.string "The sand acts as a cushion to reduce\n"
 	.string "impact and prevent injury.\l"
 	.string "This is the perfect place to train.$"
 
-Route115_Text_29B6AB: @ 829B6AB
+Route115_Text_CyndyRegister: @ 829B6AB
 	.string "Okay, fine, you're free to come here.\n"
 	.string "In return, I'd like to battle you again.$"
 
-Route115_Text_29B6FA: @ 829B6FA
+Route115_Text_CyndyRematchIntro: @ 829B6FA
 	.string "Okay, let's get this battle on!$"
 
-Route115_Text_29B71A: @ 829B71A
+Route115_Text_CyndyRematchDefeat: @ 829B71A
 	.string "I can battle but my POKéMON…$"
 
-Route115_Text_29B737: @ 829B737
+Route115_Text_CyndyPostRematch: @ 829B737
 	.string "Even when I lose, I still get some\n"
 	.string "enjoyment out of it.\l"
 	.string "It must be that I love POKéMON.$"
 
-Route115_Text_29B78F: @ 829B78F
+Route115_Text_HectorIntro: @ 829B78F
 	.string "I have a rare POKéMON!\n"
 	.string "Would you like me to show you?$"
 
-Route115_Text_29B7C5: @ 829B7C5
+Route115_Text_HectorDefeat: @ 829B7C5
 	.string "You…\n"
 	.string "You want my POKéMON, don't you?$"
 
-Route115_Text_29B7EA: @ 829B7EA
+Route115_Text_HectorPostBattle: @ 829B7EA
 	.string "I have this rare POKéMON.\n"
 	.string "It's enough to keep me satisfied.$"
 
-Route115_Text_29B826: @ 829B826
+Route115_Text_KyraIntro: @ 829B826
 	.string "I'll battle while I'm running!\n"
 	.string "Try to keep up with me!$"
 
-Route115_Text_29B85D: @ 829B85D
+Route115_Text_KyraDefeat: @ 829B85D
 	.string "Gasp, gasp…$"
 
-Route115_Text_29B869: @ 829B869
+Route115_Text_KyraPostBattle: @ 829B869
 	.string "I made the mistake of trying to battle\n"
 	.string "while running!\p"
 	.string "I should take a run to calm down…$"
 
-Route115_Text_29B8C1: @ 829B8C1
+Route115_Text_JaidenIntro: @ 829B8C1
 	.string "Take that!\n"
 	.string "Ultra POKéMON ninja attack!$"
 
-Route115_Text_29B8E8: @ 829B8E8
+Route115_Text_JaidenDefeat: @ 829B8E8
 	.string "Waaah!\n"
 	.string "Our strategy failed!$"
 
-Route115_Text_29B904: @ 829B904
+Route115_Text_JaidenPostBattle: @ 829B904
 	.string "But my POKéMON were ultra,\n"
 	.string "weren't they?$"
 
-Route115_Text_29B92D: @ 829B92D
+Route115_Text_HeleneIntro: @ 829B92D
 	.string "My POKéMON have black belt-level\n"
 	.string "strength!$"
 
-Route115_Text_29B958: @ 829B958
+Route115_Text_HeleneDefeat: @ 829B958
 	.string "This is too humiliating!$"
 
-Route115_Text_29B971: @ 829B971
+Route115_Text_HelenePostBattle: @ 829B971
 	.string "I rarely meet anyone who's better\n"
 	.string "than me…\p"
 	.string "I get it now!\n"
 	.string "You're a GYM LEADER, aren't you?$"
 
-Route115_Text_29B9CB: @ 829B9CB
+Route115_Text_AlixIntro: @ 829B9CB
 	.string "Our eyes met!\n"
 	.string "There's no getting away now!$"
 
-Route115_Text_29B9F6: @ 829B9F6
+Route115_Text_AlixDefeat: @ 829B9F6
 	.string "Gah!\n"
 	.string "Not bad!$"
 
-Route115_Text_29BA04: @ 829BA04
+Route115_Text_AlixPostBattle: @ 829BA04
 	.string "Oh, well.\n"
 	.string "I think I will TELEPORT home.$"
 
-Route115_Text_29BA2C: @ 829BA2C
+Route115_Text_MarleneIntro: @ 829BA2C
 	.string "You've disturbed my meditation…\n"
 	.string "You'll be punished for it.$"
 
-Route115_Text_29BA67: @ 829BA67
+Route115_Text_MarleneDefeat: @ 829BA67
 	.string "You've broken my concentration!$"
 
-Route115_Text_29BA87: @ 829BA87
+Route115_Text_MarlenePostBattle: @ 829BA87
 	.string "I was meditating with my POKéMON.\n"
 	.string "But this place isn't very peaceful…$"
 
-Route116_Text_29BACD: @ 829BACD
+Route116_Text_ClarkIntro: @ 829BACD
 	.string "If the tunnel doesn't go through, then\n"
 	.string "I'll just go over the top.$"
 
-Route116_Text_29BB0F: @ 829BB0F
+Route116_Text_ClarkDefeat: @ 829BB0F
 	.string "Gasp… Gasp…\n"
 	.string "Losing made me tired…$"
 
-Route116_Text_29BB31: @ 829BB31
+Route116_Text_ClarkPostBattle: @ 829BB31
 	.string "It's no big deal if there's no tunnel.\n"
 	.string "To a HIKER, mountains are roads!$"
 
-Route116_Text_29BB79: @ 829BB79
+Route116_Text_JoeyIntro: @ 829BB79
 	.string "My POKéMON rule!\n"
 	.string "Check them out!$"
 
-Route116_Text_29BB9A: @ 829BB9A
+Route116_Text_JoeyDefeat: @ 829BB9A
 	.string "Ouch! A scrape!\n"
 	.string "I have to put on a bandage!$"
 
-Route116_Text_29BBC6: @ 829BBC6
+Route116_Text_JoeyPostBattle: @ 829BBC6
 	.string "Bandages are signs of toughness!\n"
 	.string "I've got another one!$"
 
-Route116_Text_29BBFD: @ 829BBFD
+Route116_Text_JoseIntro: @ 829BBFD
 	.string "My BUG POKéMON are tough!\n"
 	.string "Let's battle!$"
 
-Route116_Text_29BC25: @ 829BC25
+Route116_Text_JoseDefeat: @ 829BC25
 	.string "I lost!\n"
 	.string "I thought I had you!$"
 
-Route116_Text_29BC42: @ 829BC42
+Route116_Text_JosePostBattle: @ 829BC42
 	.string "BUG POKéMON evolve quickly.\n"
 	.string "So they get strong quickly, too.$"
 
-Route116_Text_29BC7F: @ 829BC7F
+Route116_Text_JaniceIntro: @ 829BC7F
 	.string "Let me teach you how strong my\n"
 	.string "adorable POKéMON is!$"
 
-Route116_Text_29BCB3: @ 829BCB3
+Route116_Text_JaniceDefeat: @ 829BCB3
 	.string "You're a notch above me…$"
 
-Route116_Text_29BCCC: @ 829BCCC
+Route116_Text_JanicePostBattle: @ 829BCCC
 	.string "POKéMON that possess cuteness and\n"
 	.string "power, that's ideal, I think.$"
 
-Route116_Text_29BD0C: @ 829BD0C
+Route116_Text_JerryIntro: @ 829BD0C
 	.string "We learn all sorts of things at the\n"
 	.string "TRAINER'S SCHOOL.\p"
 	.string "I want to test things out for real!$"
 
-Route116_Text_29BD66: @ 829BD66
+Route116_Text_JerryDefeat: @ 829BD66
 	.string "I slacked off in school…\n"
 	.string "That's why I lost.$"
 
-Route116_Text_29BD92: @ 829BD92
+Route116_Text_JerryPostBattle: @ 829BD92
 	.string "I'll have to redo some courses at\n"
 	.string "the TRAINER'S SCHOOL.\l"
 	.string "If I don't, ROXANNE will be steamed.$"
 
-Route116_Text_29BDEF: @ 829BDEF
+Route116_Text_JerryRegister1: @ 829BDEF
 	.string "I learned at the TRAINER'S SCHOOL\n"
 	.string "that a POKéNAV can register TRAINERS.\p"
 	.string "I don't really get what that means,\n"
 	.string "so can I just try it?$"
 
-Route116_Text_29BE71: @ 829BE71
+Route116_Text_JerryRegister2: @ 829BE71
 	.string "I learned at the TRAINER'S SCHOOL\n"
 	.string "that a POKéNAV can register TRAINERS.\p"
 	.string "I don't really get what that means,\n"
 	.string "so can I just try it?$"
 
-Route116_Text_29BEF3: @ 829BEF3
+Route116_Text_JerryRematchIntro: @ 829BEF3
 	.string "I've been studying seriously at the\n"
 	.string "TRAINER'S SCHOOL.\l"
 	.string "I won't lose like I did last time.$"
 
-Route116_Text_29BF4C: @ 829BF4C
+Route116_Text_JerryRematchDefeat: @ 829BF4C
 	.string "Hunh?\n"
 	.string "I studied diligently.$"
 
-Route116_Text_29BF68: @ 829BF68
+Route116_Text_JerryPostRematch: @ 829BF68
 	.string "I'll have to redo some courses at\n"
 	.string "the TRAINER'S SCHOOL.\l"
 	.string "If I don't, ROXANNE will be steamed.$"
 
-Route116_Text_29BFC5: @ 829BFC5
+Route116_Text_KarenIntro: @ 829BFC5
 	.string "I study at school, and I study on\n"
 	.string "the way home, too!$"
 
-Route116_Text_29BFFA: @ 829BFFA
+Route116_Text_KarenDefeat: @ 829BFFA
 	.string "I'm in shock--I lost?$"
 
-Route116_Text_29C010: @ 829C010
+Route116_Text_KarenPostBattle: @ 829C010
 	.string "Awww, I'll never become an elegant\n"
 	.string "TRAINER like ROXANNE this way!$"
 
-Route116_Text_29C052: @ 829C052
+Route116_Text_KarenRegister1: @ 829C052
 	.string "Oh, wow! Isn't that a POKéNAV?\n"
 	.string "I have one, too! Please register me!$"
 
-Route116_Text_29C096: @ 829C096
+Route116_Text_KarenRegister2: @ 829C096
 	.string "Oh, wow! Isn't that a POKéNAV?\n"
 	.string "I have one, too! Please register me!$"
 
-Route116_Text_29C0DA: @ 829C0DA
+Route116_Text_KarenRematchIntro: @ 829C0DA
 	.string "I studied a whole lot since I saw you.\n"
 	.string "You must see my achievements!$"
 
-Route116_Text_29C11F: @ 829C11F
+Route116_Text_KarenRematchDefeat: @ 829C11F
 	.string "I'm in shock.\n"
 	.string "I lost again?$"
 
-Route116_Text_29C13B: @ 829C13B
+Route116_Text_KarenPostRematch: @ 829C13B
 	.string "You've beaten ROXANNE?\n"
 	.string "I can't beat you, then. Not yet.$"
 
-Route116_Text_29C173: @ 829C173
+Route116_Text_SarahIntro: @ 829C173
 	.string "Just so you know, I've never once been\n"
 	.string "bested by anyone at anything.$"
 
-Route116_Text_29C1B8: @ 829C1B8
+Route116_Text_SarahDefeat: @ 829C1B8
 	.string "Oh, my goodness.\n"
 	.string "This is a new experience for me.$"
 
-Route116_Text_29C1EA: @ 829C1EA
+Route116_Text_SarahPostBattle: @ 829C1EA
 	.string "My life of luxury affords me all that\n"
 	.string "I could possibly desire.\p"
 	.string "However, when it comes to POKéMON,\n"
 	.string "my wealth has no meaning.$"
 
-Route116_Text_29C266: @ 829C266
+Route116_Text_DawsonIntro: @ 829C266
 	.string "When you lay your eyes on my POKéMON's\n"
 	.string "gorgeous fur, their beauty will render\l"
 	.string "you helpless!$"
 
-Route116_Text_29C2C2: @ 829C2C2
+Route116_Text_DawsonDefeat: @ 829C2C2
 	.string "Oh, baby, say it isn't so!$"
 
-Route116_Text_29C2DD: @ 829C2DD
+Route116_Text_DawsonPostBattle: @ 829C2DD
 	.string "Oh, no, no, no!\n"
 	.string "You've mussed up my POKéMON's fur!\l"
 	.string "You've ruined my hairdo, too!\l"
 	.string "I'll have to call my stylist now!$"
 
-Route116_Text_29C350: @ 829C350
+Route116_Text_DevanIntro: @ 829C350
 	.string "We'll rock you hard!$"
 
-Route116_Text_29C365: @ 829C365
+Route116_Text_DevanDefeat: @ 829C365
 	.string "Aiyiyi!\n"
 	.string "No contest at all!$"
 
-Route116_Text_29C380: @ 829C380
+Route116_Text_DevanPostBattle: @ 829C380
 	.string "I should try different POKéMON\n"
 	.string "types, that's what I ought to do.$"
 
-Route116_Text_29C3C1: @ 829C3C1
+Route116_Text_JohnsonIntro: @ 829C3C1
 	.string "It's a dead end up here.\n"
 	.string "I'm bored, so can we battle?$"
 
-Route116_Text_29C3F7: @ 829C3F7
+Route116_Text_JohnsonDefeat: @ 829C3F7
 	.string "That was fun even though I lost.$"
 
-Route116_Text_29C418: @ 829C418
+Route116_Text_JohnsonPostBattle: @ 829C418
 	.string "Want to stay here and keep\n"
 	.string "me company?$"
 
-Route117_Text_29C43F: @ 829C43F
+Route117_Text_IsaacIntro: @ 829C43F
 	.string "Listen, could I get you to battle\n"
 	.string "the POKéMON I'm raising?$"
 
-Route117_Text_29C47A: @ 829C47A
+Route117_Text_IsaacDefeat: @ 829C47A
 	.string "You've raised yours superbly…$"
 
-Route117_Text_29C498: @ 829C498
+Route117_Text_IsaacPostBattle: @ 829C498
 	.string "POKéMON isn't all about power.\p"
 	.string "Polishing a unique aspect of one's\n"
 	.string "character is another way of enjoying\l"
 	.string "POKéMON.$"
 
-Route117_Text_29C508: @ 829C508
+Route117_Text_IsaacRegister: @ 829C508
 	.string "I'm going to redouble my training.\n"
 	.string "Would you come look in on us?$"
 
-Route117_Text_29C549: @ 829C549
+Route117_Text_IsaacRematchIntro: @ 829C549
 	.string "The POKéMON I've been raising are\n"
 	.string "looking good, just like before.$"
 
-Route117_Text_29C58B: @ 829C58B
+Route117_Text_IsaacRematchDefeat: @ 829C58B
 	.string "You know how to raise them properly.\n"
 	.string "You might have DAY CARE skills…$"
 
-Route117_Text_29C5D0: @ 829C5D0
+Route117_Text_IsaacPostRematch: @ 829C5D0
 	.string "Your POKéMON are growing good!\n"
 	.string "You should enter them in CONTESTS.$"
 
-Route117_Text_29C612: @ 829C612
+Route117_Text_LydiaIntro: @ 829C612
 	.string "Please, allow me to evaluate if you\n"
 	.string "have raised your POKéMON properly.$"
 
-Route117_Text_29C659: @ 829C659
+Route117_Text_LydiaDefeat: @ 829C659
 	.string "Yes, they are growing properly.$"
 
-Route117_Text_29C679: @ 829C679
+Route117_Text_LydiaPostBattle: @ 829C679
 	.string "Try raising POKéMON with more\n"
 	.string "attention to their character traits.$"
 
-Route117_Text_29C6BC: @ 829C6BC
+Route117_Text_LydiaRegister: @ 829C6BC
 	.string "I'm glad I met a superb TRAINER in you.\n"
 	.string "I hope to see you again.$"
 
-Route117_Text_29C6FD: @ 829C6FD
+Route117_Text_LydiaRematchIntro: @ 829C6FD
 	.string "Allow me to reevaluate if you have\n"
 	.string "raised your POKéMON properly.$"
 
-Route117_Text_29C73E: @ 829C73E
+Route117_Text_LydiaRematchDefeat: @ 829C73E
 	.string "They are growing admirably.$"
 
-Route117_Text_29C75A: @ 829C75A
+Route117_Text_LydiaPostRematch: @ 829C75A
 	.string "POKéMON seem to like different kinds\n"
 	.string "of {POKEBLOCK}S, depending on their nature.$"
 
-Route117_Text_29C7A5: @ 829C7A5
+Route117_Text_DylanIntro: @ 829C7A5
 	.string "I'm in the middle of a triathlon, but,\n"
 	.string "whatever, let's have a battle!$"
 
-Route117_Text_29C7EB: @ 829C7EB
+Route117_Text_DylanDefeat: @ 829C7EB
 	.string "I ran out of energy!$"
 
-Route117_Text_29C800: @ 829C800
+Route117_Text_DylanPostBattle: @ 829C800
 	.string "I may have blown it…\p"
 	.string "I might have dropped to last during\n"
 	.string "that battle…$"
 
-Route117_Text_29C846: @ 829C846
+Route117_Text_DylanRegister: @ 829C846
 	.string "POKéMON have to be strong, too?\n"
 	.string "I'd like you to train me!$"
 
-Route117_Text_29C880: @ 829C880
+Route117_Text_DylanRematchIntro: @ 829C880
 	.string "I'm smack in the middle of a triathlon,\n"
 	.string "but I'm comfortably ahead.\l"
 	.string "Let's make this a quick battle!$"
 
-Route117_Text_29C8E3: @ 829C8E3
+Route117_Text_DylanRematchDefeat: @ 829C8E3
 	.string "I ran out of energy again!$"
 
-Route117_Text_29C8FE: @ 829C8FE
+Route117_Text_DylanPostRematch: @ 829C8FE
 	.string "I was tops in swimming and cycling,\n"
 	.string "but I'm not quite that confident with\l"
 	.string "POKéMON yet.$"
 
-Route117_Text_29C955: @ 829C955
+Route117_Text_MariaIntro: @ 829C955
 	.string "I do my triathlon training with POKéMON,\n"
 	.string "so I'm pretty confident about my speed.$"
 
-Route117_Text_29C9A6: @ 829C9A6
+Route117_Text_MariaDefeat: @ 829C9A6
 	.string "I need to get more practices in,\n"
 	.string "I guess.$"
 
-Route117_Text_29C9D0: @ 829C9D0
+Route117_Text_MariaPostBattle: @ 829C9D0
 	.string "Training is meaningful only if you\n"
 	.string "keep it up regularly.\p"
 	.string "Okay! I'll resume my training!\n"
 	.string "Tomorrow!$"
 
-Route117_Text_29CA32: @ 829CA32
+Route117_Text_MariaRegister: @ 829CA32
 	.string "You appear to be training properly…\n"
 	.string "If you'd like, I'll battle you later!$"
 
-Route117_Text_29CA7C: @ 829CA7C
+Route117_Text_MariaRematchIntro: @ 829CA7C
 	.string "Are you keeping up with your training?\n"
 	.string "I sure am!\l"
 	.string "Let me show you the evidence!$"
 
-Route117_Text_29CACC: @ 829CACC
+Route117_Text_MariaRematchDefeat: @ 829CACC
 	.string "I need to get more practices in,\n"
 	.string "I guess.$"
 
-Route117_Text_29CAF6: @ 829CAF6
+Route117_Text_MariaPostRematch: @ 829CAF6
 	.string "I'll resume training tomorrow.\n"
 	.string "Let's battle again sometime!$"
 
-Route117_Text_29CB32: @ 829CB32
+Route117_Text_DerekIntro: @ 829CB32
 	.string "Once a BUG CATCHER!\n"
 	.string "And now a BUG MANIAC!\p"
 	.string "But my love for POKéMON remains\n"
 	.string "unchanged!$"
 
-Route117_Text_29CB87: @ 829CB87
+Route117_Text_DerekDefeat: @ 829CB87
 	.string "My ineptitude also remains\n"
 	.string "unchanged…$"
 
-Route117_Text_29CBAD: @ 829CBAD
+Route117_Text_DerekPostBattle: @ 829CBAD
 	.string "All I did was follow my heart, and now\n"
 	.string "they call me a BUG MANIAC…\p"
 	.string "Still, I am an expert on BUG POKéMON,\n"
 	.string "so it's only natural that they call me\l"
 	.string "a BUG MANIAC.$"
 
-Route117_Text_29CC4A: @ 829CC4A
+Route117_Text_AnnaIntro: @ 829CC4A
 	.string "ANNA: I'm with my pretty junior student\n"
 	.string "partner. I have to do good!$"
 
-Route117_Text_29CC8E: @ 829CC8E
+Route117_Text_AnnaDefeat: @ 829CC8E
 	.string "ANNA: I'm with my pretty junior student\n"
 	.string "partner! Let me win!$"
 
-Route117_Text_29CCCB: @ 829CCCB
+Route117_Text_AnnaPostBattle: @ 829CCCB
 	.string "ANNA: Your POKéMON have some good\n"
 	.string "combinations.\p"
 	.string "I'd say you're second only to us!$"
 
-Route117_Text_29CD1D: @ 829CD1D
+Route117_Text_AnnaAndMegRegister: @ 829CD1D
 	.string "ANNA: We can't take this lying down!\n"
 	.string "You will come back, won't you?$"
 
-Route117_Text_29CD61: @ 829CD61
+Route117_Text_AnnaNotEnoughMons: @ 829CD61
 	.string "ANNA: If you want to battle us,\n"
 	.string "bring two POKéMON with you.$"
 
-Route117_Text_29CD9D: @ 829CD9D
+Route117_Text_MegIntro: @ 829CD9D
 	.string "MEG: I'm going to tag up with my super\n"
 	.string "senior student partner and beat you!$"
 
-Route117_Text_29CDE9: @ 829CDE9
+Route117_Text_MegDefeat: @ 829CDE9
 	.string "MEG: Oh, no!\n"
 	.string "I'm sorry, ANNA! I let you down…$"
 
-Route117_Text_29CE17: @ 829CE17
+Route117_Text_MegPostBattle: @ 829CE17
 	.string "MEG: I dragged ANNA down…\n"
 	.string "If I didn't, she would have won!$"
 
-Route117_Text_29CE52: @ 829CE52
+Route117_Text_MegNotEnoughMons: @ 829CE52
 	.string "MEG: Do you only have one POKéMON?\n"
 	.string "We can't battle with you, then.\p"
 	.string "We want to have a 2-on-2 battle.$"
 
-Route117_Text_29CEB6: @ 829CEB6
+Route117_Text_AnnaRematchIntro: @ 829CEB6
 	.string "ANNA: I can't keep losing in front of\n"
 	.string "my junior partner, right?$"
 
-Route117_Text_29CEF6: @ 829CEF6
+Route117_Text_AnnaRematchDefeat: @ 829CEF6
 	.string "ANNA: I couldn't get into the groove.$"
 
-Route117_Text_29CF1C: @ 829CF1C
+Route117_Text_AnnaPostRematch: @ 829CF1C
 	.string "ANNA: Your POKéMON have some good\n"
 	.string "combinations.\p"
 	.string "I'd say you're second only to us!$"
 
-Route117_Text_29CF6E: @ 829CF6E
+Route117_Text_AnnaRematchNotEnoughMons: @ 829CF6E
 	.string "ANNA: If you want to battle us,\n"
 	.string "bring two POKéMON with you.$"
 
-Route117_Text_29CFAA: @ 829CFAA
+Route117_Text_MegRematchIntro: @ 829CFAA
 	.string "MEG: I'm going to tag up with my\n"
 	.string "senior partner and win this time!$"
 
-Route117_Text_29CFED: @ 829CFED
+Route117_Text_MegRematchDefeat: @ 829CFED
 	.string "MEG: Too strong!$"
 
-Route117_Text_29CFFE: @ 829CFFE
+Route117_Text_MegPostRematch: @ 829CFFE
 	.string "MEG: I battled together with my\n"
 	.string "senior partner, but we lost…\p"
 	.string "That's so discouraging…$"
 
-Route117_Text_29D053: @ 829D053
+Route117_Text_MegRematchNotEnoughMons: @ 829D053
 	.string "MEG: Do you only have one POKéMON?\n"
 	.string "We can't battle with you, then.\p"
 	.string "We want to have a 2-on-2 battle.$"
 
-Route117_Text_29D0B7: @ 829D0B7
+Route117_Text_MelinaIntro: @ 829D0B7
 	.string "Isn't it nice? To battle while looking\n"
 	.string "at pretty flowers?$"
 
-Route117_Text_29D0F1: @ 829D0F1
+Route117_Text_MelinaDefeat: @ 829D0F1
 	.string "Oh, that's quite impressive!$"
 
-Route117_Text_29D10E: @ 829D10E
+Route117_Text_MelinaPostBattle: @ 829D10E
 	.string "It feels wonderful to go for a jog\n"
 	.string "while looking at flowers.$"
 
-Route117_Text_29D14B: @ 829D14B
+Route117_Text_BrandiIntro: @ 829D14B
 	.string "Let me demonstrate the power\n"
 	.string "hidden within a PSYCHIC POKéMON!$"
 
-Route117_Text_29D189: @ 829D189
+Route117_Text_BrandiDefeat: @ 829D189
 	.string "Astonishing!$"
 
-Route117_Text_29D196: @ 829D196
+Route117_Text_BrandiPostBattle: @ 829D196
 	.string "PSYCHIC POKéMON are complex.\n"
 	.string "You should try catching some.$"
 
-Route117_Text_29D1D1: @ 829D1D1
+Route117_Text_AishaIntro: @ 829D1D1
 	.string "Concentrate on getting the win.\n"
 	.string "That's how I battle!$"
 
-Route117_Text_29D206: @ 829D206
+Route117_Text_AishaDefeat: @ 829D206
 	.string "I don't waste any time being angry\n"
 	.string "over a loss--I would rather train.$"
 
-Route117_Text_29D24C: @ 829D24C
+Route117_Text_AishaPostBattle: @ 829D24C
 	.string "I think that if you worry about losing,\n"
 	.string "you're more likely to lose.$"
 
-Route118_Text_29D290: @ 829D290
+Route118_Text_RoseIntro: @ 829D290
 	.string "The aroma of flowers has a magical\n"
 	.string "power. It cleanses us body and soul.$"
 
-Route118_Text_29D2D8: @ 829D2D8
+Route118_Text_RoseDefeat: @ 829D2D8
 	.string "Oh, dear me.\n"
 	.string "I seem to have lost.$"
 
-Route118_Text_29D2FA: @ 829D2FA
+Route118_Text_RosePostBattle: @ 829D2FA
 	.string "Flowers, POKéMON…\n"
 	.string "I love whatever smells nice.\p"
 	.string "Stinky things…\n"
 	.string "I'll pass.$"
 
-Route118_Text_29D343: @ 829D343
+Route118_Text_RoseRegister: @ 829D343
 	.string "Sniff… That odor--it's a POKéNAV!\n"
 	.string "We must register each other!$"
 
-Route118_Text_29D382: @ 829D382
+Route118_Text_RoseRematchIntro: @ 829D382
 	.string "Were you drawn here by the sweet\n"
 	.string "aroma?$"
 
-Route118_Text_29D3AA: @ 829D3AA
+Route118_Text_RoseRematchDefeat: @ 829D3AA
 	.string "The power of aroma…\n"
 	.string "It didn't seem to do much.$"
 
-Route118_Text_29D3D9: @ 829D3D9
+Route118_Text_RosePostRematch: @ 829D3D9
 	.string "If you use a sweet aroma properly,\n"
 	.string "POKéMON will be attracted by it.$"
 
-Route118_Text_29D41D: @ 829D41D
+Route118_Text_PerryIntro: @ 829D41D
 	.string "BIRD POKéMON that FLY elegantly in\n"
 	.string "the sky… They're the best!$"
 
-Route118_Text_29D45B: @ 829D45B
+Route118_Text_PerryDefeat: @ 829D45B
 	.string "Urgh…\n"
 	.string "I crashed…$"
 
-Route118_Text_29D46C: @ 829D46C
+Route118_Text_PerryPostBattle: @ 829D46C
 	.string "You've got great POKéMON.\n"
 	.string "I'll have to train mine better.$"
 
-Route118_Text_29D4A6: @ 829D4A6
+Route118_Text_ChesterIntro: @ 829D4A6
 	.string "Take flight!\n"
 	.string "My BIRD POKéMON!$"
 
-Route118_Text_29D4C4: @ 829D4C4
+Route118_Text_ChesterDefeat: @ 829D4C4
 	.string "They did take flight…$"
 
-Route118_Text_29D4DA: @ 829D4DA
+Route118_Text_ChesterPostBattle: @ 829D4DA
 	.string "If they'd get stronger, they'd be able\n"
 	.string "to fly more freely…$"
 
-Route118_Text_29D515: @ 829D515
+Route118_Text_BarnyIntro: @ 829D515
 	.string "I'm a FISHERMAN, but also a TRAINER.\n"
 	.string "I'm raising the POKéMON I caught.$"
 
-Route118_Text_29D55C: @ 829D55C
+Route118_Text_BarnyDefeat: @ 829D55C
 	.string "I thought I was doing okay in my\n"
 	.string "training…$"
 
-Route118_Text_29D587: @ 829D587
+Route118_Text_BarnyPostBattle: @ 829D587
 	.string "I couldn't win by training POKéMON\n"
 	.string "while I fished…\p"
 	.string "Was I doing things in half measures?$"
 
-Route118_Text_29D5DF: @ 829D5DF
+Route118_Text_WadeIntro: @ 829D5DF
 	.string "For FISHERMEN, equipment is the key.\p"
 	.string "But for TRAINERS, the key ingredients\n"
 	.string "are POKéMON and heart, of course!$"
 
-Route118_Text_29D64C: @ 829D64C
+Route118_Text_WadeDefeat: @ 829D64C
 	.string "I was beaten in heart?$"
 
-Route118_Text_29D663: @ 829D663
+Route118_Text_WadePostBattle: @ 829D663
 	.string "Come to think of it, fishing is a battle\n"
 	.string "between a FISHERMAN and a POKéMON.$"
 
-Route118_Text_29D6AF: @ 829D6AF
+Route118_Text_DaltonIntro: @ 829D6AF
 	.string "Let my melody rock your soul!$"
 
-Route118_Text_29D6CD: @ 829D6CD
+Route118_Text_DaltonDefeat: @ 829D6CD
 	.string "La-lalala…$"
 
-Route118_Text_29D6D8: @ 829D6D8
+Route118_Text_DaltonPostBattle: @ 829D6D8
 	.string "An electric guitar doesn't always\n"
 	.string "have to be noisy…\p"
 	.string "It can be strummed to squeeze out\n"
 	.string "this heart-stirring melody…$"
 
-Route118_Text_29D74A: @ 829D74A
+Route118_Text_DaltonRegister: @ 829D74A
 	.string "When I compose better melodies,\n"
 	.string "you have to come listen, okay?$"
 
-Route118_Text_29D789: @ 829D789
+Route118_Text_DaltonRematchIntro: @ 829D789
 	.string "A melody from my POKéMON and me…\n"
 	.string "Let us deliver it to your soul.$"
 
-Route118_Text_29D7CA: @ 829D7CA
+Route118_Text_DaltonRematchDefeat: @ 829D7CA
 	.string "La-lalala…$"
 
-Route118_Text_29D7D5: @ 829D7D5
+Route118_Text_DaltonPostRematch: @ 829D7D5
 	.string "When I play, my emotions should reach\n"
 	.string "you through my electric guitar…$"
 
-Route118_Text_29D81B: @ 829D81B
+Route118_Text_DeandreIntro: @ 829D81B
 	.string "Go, go, go!\n"
 	.string "POKéMON 1, 2, and 3!$"
 
-Route118_Text_29D83C: @ 829D83C
+Route118_Text_DeandreDefeat: @ 829D83C
 	.string "Come in, POKéMON! Are you okay?\n"
 	.string "POKéMON 1, 2, and 3?!$"
 
-Route118_Text_29D872: @ 829D872
+Route118_Text_DeandrePostBattle: @ 829D872
 	.string "Isn't it cool that I have a POKéMON\n"
 	.string "battle team?\p"
 	.string "You can copy me--I don't mind!$"
 
-Route119_Text_29D8C2: @ 829D8C2
+Route119_Text_BrentIntro: @ 829D8C2
 	.string "We're the MIMIC CIRCLE!\n"
 	.string "We MIMIC what you do!$"
 
-Route119_Text_29D8F0: @ 829D8F0
+Route119_Text_BrentDefeat: @ 829D8F0
 	.string "Whoopsie!\n"
 	.string "I lost!$"
 
-Route119_Text_29D902: @ 829D902
+Route119_Text_BrentPostBattle: @ 829D902
 	.string "What's so good about mimicry?\p"
 	.string "Fufufu…\n"
 	.string "You'll never understand…$"
 
-Route119_Text_29D941: @ 829D941
+Route119_Text_DonaldIntro: @ 829D941
 	.string "So, we finally meet!\n"
 	.string "My BUG POKéMON will keep you company!$"
 
-Route119_Text_29D97C: @ 829D97C
+Route119_Text_DonaldDefeat: @ 829D97C
 	.string "I wish we'd never met…$"
 
-Route119_Text_29D993: @ 829D993
+Route119_Text_DonaldPostBattle: @ 829D993
 	.string "I want to MIMIC you some more.\n"
 	.string "Can you hurry up and move?$"
 
-Route119_Text_29D9CD: @ 829D9CD
+Route119_Text_TaylorIntro: @ 829D9CD
 	.string "If you step forward, we step forward.\p"
 	.string "If you turn right, we turn, too…$"
 
-Route119_Text_29DA14: @ 829DA14
+Route119_Text_TaylorDefeat: @ 829DA14
 	.string "But if you win, I lose…$"
 
-Route119_Text_29DA2C: @ 829DA2C
+Route119_Text_TaylorPostBattle: @ 829DA2C
 	.string "I can't MIMIC you winning the match.\n"
 	.string "That's just impossible…\l"
 	.string "It's burning me up…$"
 
-Route119_Text_29DA7D: @ 829DA7D
+Route119_Text_DougIntro: @ 829DA7D
 	.string "Yep, you've finally caught me!\n"
 	.string "Or were you trying to avoid me?$"
 
-Route119_Text_29DABC: @ 829DABC
+Route119_Text_DougDefeat: @ 829DABC
 	.string "Whoop, that was a great match!$"
 
-Route119_Text_29DADB: @ 829DADB
+Route119_Text_DougPostBattle: @ 829DADB
 	.string "We're the MIMIC CIRCLE!\n"
 	.string "I hope you enjoyed our performance.$"
 
-Route119_Text_29DB17: @ 829DB17
+Route119_Text_GregIntro: @ 829DB17
 	.string "You don't know who I am, do you?\p"
 	.string "But, I also don't know you.\n"
 	.string "So, we'll battle!$"
 
-Route119_Text_29DB66: @ 829DB66
+Route119_Text_GregDefeat: @ 829DB66
 	.string "You're pretty strong!$"
 
-Route119_Text_29DB7C: @ 829DB7C
+Route119_Text_GregPostBattle: @ 829DB7C
 	.string "Until you go away somewhere, we'll\n"
 	.string "keep on mimicking your every move.$"
 
-Route119_Text_29DBC2: @ 829DBC2
+Route119_Text_KentIntro: @ 829DBC2
 	.string "The MIMIC CIRCLE was formed by people\n"
 	.string "who like to MIMIC.\p"
 	.string "A battle starts the instant we meet!$"
 
-Route119_Text_29DC20: @ 829DC20
+Route119_Text_KentDefeat: @ 829DC20
 	.string "I give up!$"
 
-Route119_Text_29DC2B: @ 829DC2B
+Route119_Text_KentPostBattle: @ 829DC2B
 	.string "Won't you join our MIMIC CIRCLE?$"
 
-Route119_Text_29DC4C: @ 829DC4C
+Route119_Text_JacksonIntro: @ 829DC4C
 	.string "Who has the knowledge and\n"
 	.string "the technique for survival?\p"
 	.string "POKéMON RANGERS, that's who!$"
 
-Route119_Text_29DC9F: @ 829DC9F
+Route119_Text_JacksonDefeat: @ 829DC9F
 	.string "I didn't have enough POKéMON\n"
 	.string "know-how…$"
 
-Route119_Text_29DCC6: @ 829DCC6
+Route119_Text_JacksonPostBattle: @ 829DCC6
 	.string "To break away from civilization and\n"
 	.string "awaken the wild spirit within!\p"
 	.string "That's our vision.$"
 
-Route119_Text_29DD1C: @ 829DD1C
+Route119_Text_JacksonRegister: @ 829DD1C
 	.string "I hope you'll give me a rematch without\n"
 	.string "mocking my lack of knowledge.$"
 
-Route119_Text_29DD62: @ 829DD62
+Route119_Text_JacksonRematchIntro: @ 829DD62
 	.string "I'm going to regain my wild spirit by\n"
 	.string "being together with POKéMON.$"
 
-Route119_Text_29DDA5: @ 829DDA5
+Route119_Text_JacksonRematchDefeat: @ 829DDA5
 	.string "You've remained strong!$"
 
-Route119_Text_29DDBD: @ 829DDBD
+Route119_Text_JacksonPostRematch: @ 829DDBD
 	.string "Believe in your POKéMON.\n"
 	.string "Believe in yourself.\p"
 	.string "The road will reveal itself to you.$"
 
-Route119_Text_29DE0F: @ 829DE0F
+Route119_Text_CatherineIntro: @ 829DE0F
 	.string "Oh? Look at you.\p"
 	.string "For someone on an adventure,\n"
 	.string "you're traveling awfully light.$"
 
-Route119_Text_29DE5D: @ 829DE5D
+Route119_Text_CatherineDefeat: @ 829DE5D
 	.string "Accidents happen when you're not\n"
 	.string "prepared!$"
 
-Route119_Text_29DE88: @ 829DE88
+Route119_Text_CatherinePostBattle: @ 829DE88
 	.string "You're traveling light but you have\n"
 	.string "everything you need.\p"
 	.string "You're on top of things mentally and\n"
 	.string "physically, too.$"
 
-Route119_Text_29DEF7: @ 829DEF7
+Route119_Text_CatherineRegister: @ 829DEF7
 	.string "Do you have a POKéNAV?\n"
 	.string "It's a must-have tool for any TRAINER.\p"
 	.string "Oh, you do have one!\n"
 	.string "Let's register each other, then!$"
 
-Route119_Text_29DF6B: @ 829DF6B
+Route119_Text_CatherineRematchIntro: @ 829DF6B
 	.string "How's your journey with POKéMON\n"
 	.string "going?$"
 
-Route119_Text_29DF92: @ 829DF92
+Route119_Text_CatherineRematchDefeat: @ 829DF92
 	.string "I'm still missing something…$"
 
-Route119_Text_29DFAF: @ 829DFAF
+Route119_Text_CatherinePostRematch: @ 829DFAF
 	.string "In the same way that you, as a TRAINER,\n"
 	.string "rely on your POKéMON, your POKéMON\l"
 	.string "rely on you.$"
 
-Route119_Text_29E007: @ 829E007
+Route119_Text_HughIntro: @ 829E007
 	.string "The vast sky holds untold promise!\p"
 	.string "Nothing can compare to the sheer\n"
 	.string "exhilaration of flight!$"
 
-Route119_Text_29E063: @ 829E063
+Route119_Text_HughDefeat: @ 829E063
 	.string "Down and out!$"
 
-Route119_Text_29E071: @ 829E071
+Route119_Text_HughPostBattle: @ 829E071
 	.string "My BIRD POKéMON made my dreams of\n"
 	.string "flying come true!$"
 
-Route119_Text_29E0A5: @ 829E0A5
+Route119_Text_PhilIntro: @ 829E0A5
 	.string "I'll show you the true potential of me\n"
 	.string "and my BIRD POKéMON!$"
 
-Route119_Text_29E0E1: @ 829E0E1
+Route119_Text_PhilDefeat: @ 829E0E1
 	.string "We lacked potential…$"
 
-Route119_Text_29E0F6: @ 829E0F6
+Route119_Text_PhilPostBattle: @ 829E0F6
 	.string "Ever since I was a little kid, I always\n"
 	.string "admired BIRD POKéMON…$"
 
-Route119_Text_29E134: @ 829E134
+Route119_Text_YasuIntro: @ 829E134
 	.string "To lurk in shadows, and live in\n"
 	.string "darkness… That is my destiny.\p"
 	.string "I emerge to challenge you!$"
 
-Route119_Text_29E18D: @ 829E18D
+Route119_Text_YasuDefeat: @ 829E18D
 	.string "I admit defeat!$"
 
-Route119_Text_29E19D: @ 829E19D
+Route119_Text_YasuPostBattle: @ 829E19D
 	.string "Those defeated in battle withdraw\n"
 	.string "quietly back into the shadows.\l"
 	.string "That, too, is destiny…$"
 
-Route119_Text_29E1F5: @ 829E1F5
+Route119_Text_TakashiIntro: @ 829E1F5
 	.string "If you're not on your guard,\n"
 	.string "you're in for some pain!$"
 
-Route119_Text_29E22B: @ 829E22B
+Route119_Text_TakashiDefeat: @ 829E22B
 	.string "You're surprisingly good!$"
 
-Route119_Text_29E245: @ 829E245
+Route119_Text_TakashiPostBattle: @ 829E245
 	.string "My surprise attack ended in\n"
 	.string "failure…$"
 
-Route119_Text_29E26A: @ 829E26A
+Route119_Text_HideoIntro: @ 829E26A
 	.string "To hide a tree, use a forest!$"
 
-Route119_Text_29E288: @ 829E288
+Route119_Text_HideoDefeat: @ 829E288
 	.string "I bow to your superiority.$"
 
-Route119_Text_29E2A3: @ 829E2A3
+Route119_Text_HideoPostBattle: @ 829E2A3
 	.string "To hide a tree, use a forest!\n"
 	.string "To hide a POKéMON, use a POKéMON!\p"
 	.string "There is no deep, hidden meaning\n"
 	.string "to that.$"
 
-Route119_Text_29E30D: @ 829E30D
+Route119_Text_ChrisIntro: @ 829E30D
 	.string "You spoke to me…\n"
 	.string "So you want to challenge me!\p"
 	.string "Sure! I'll try out the POKéMON I caught\n"
 	.string "while SURFING!$"
 
-Route119_Text_29E372: @ 829E372
+Route119_Text_ChrisDefeat: @ 829E372
 	.string "I don't have a clue about what it\n"
 	.string "takes to win.$"
 
-Route119_Text_29E3A2: @ 829E3A2
+Route119_Text_ChrisPostBattle: @ 829E3A2
 	.string "Go for a SURF on my POKéMON…\p"
 	.string "Then fish off its back…\p"
 	.string "It's an indescribably luxuriant moment!$"
 
-Route119_Text_29E3FF: @ 829E3FF
+Route119_Text_FabianIntro: @ 829E3FF
 	.string "Hit me with a power chord!\n"
 	.string "Victory is mine!\l"
 	.string "It's our time to shine, whoa, yeah!$"
 
-Route119_Text_29E44F: @ 829E44F
+Route119_Text_FabianDefeat: @ 829E44F
 	.string "You showed me who's the boss!\n"
 	.string "We'll have to take the loss, oh, no!$"
 
-Route119_Text_29E492: @ 829E492
+Route119_Text_FabianPostBattle: @ 829E492
 	.string "Hit me with another power chord!\n"
 	.string "Leave me alone!\l"
 	.string "Your win you have to atone!$"
 
-Route119_Text_29E4DF: @ 829E4DF
+Route119_Text_DaytonIntro: @ 829E4DF
 	.string "Hohoho!\n"
 	.string "I like kid TRAINERS!\l"
 	.string "Let's have a good one!$"
 
-Route119_Text_29E513: @ 829E513
+Route119_Text_DaytonDefeat: @ 829E513
 	.string "You're pretty amazing!\n"
 	.string "Hohoho!$"
 
-Route119_Text_29E532: @ 829E532
+Route119_Text_DaytonPostBattle: @ 829E532
 	.string "Hohoho!\n"
 	.string "I'll try emulating the pep of kid\l"
 	.string "TRAINERS like you!$"
 
-Route119_Text_29E56F: @ 829E56F
+Route119_Text_RachelIntro: @ 829E56F
 	.string "Wherever and whenever I may be,\n"
 	.string "I always have my parasol in hand.$"
 
-Route119_Text_29E5B1: @ 829E5B1
+Route119_Text_RachelDefeat: @ 829E5B1
 	.string "Oh, but…\n"
 	.string "That's not fair.$"
 
-Route119_Text_29E5CB: @ 829E5CB
+Route119_Text_RachelPostBattle: @ 829E5CB
 	.string "You're asking if my parasol is heavy?\n"
 	.string "Your BAG is filled with more junk than\l"
 	.string "I ever carry around.$"
 
-Route120_Text_29E62D: @ 829E62D
+Route120_Text_ColinIntro: @ 829E62D
 	.string "Do you have any moves that can strike\n"
 	.string "a flying POKéMON?$"
 
-Route120_Text_29E665: @ 829E665
+Route120_Text_ColinDefeat: @ 829E665
 	.string "You soared above me!$"
 
-Route120_Text_29E67A: @ 829E67A
+Route120_Text_ColinPostBattle: @ 829E67A
 	.string "The move FLY is convenient,\n"
 	.string "don't you think?\p"
 	.string "While the POKéMON is flying,\n"
 	.string "almost no moves can strike it.$"
 
-Route120_Text_29E6E3: @ 829E6E3
+Route120_Text_RobertIntro: @ 829E6E3
 	.string "My POKéMON is strong!\n"
 	.string "How about yours?$"
 
-Route120_Text_29E70A: @ 829E70A
+Route120_Text_RobertDefeat: @ 829E70A
 	.string "Your POKéMON were stronger…$"
 
-Route120_Text_29E726: @ 829E726
+Route120_Text_RobertPostBattle: @ 829E726
 	.string "A POKéMON that grows steadily is one\n"
 	.string "you can count on.$"
 
-Route120_Text_29E75D: @ 829E75D
+Route120_Text_RobertRegister: @ 829E75D
 	.string "You can be counted on to get better.\n"
 	.string "I'd like to register you in my POKéNAV!$"
 
-Route120_Text_29E7AA: @ 829E7AA
+Route120_Text_RobertRematchIntro: @ 829E7AA
 	.string "A POKéMON that grows steadily is one\n"
 	.string "you can count on.$"
 
-Route120_Text_29E7E1: @ 829E7E1
+Route120_Text_RobertRematchDefeat: @ 829E7E1
 	.string "Your POKéMON are seriously strong.$"
 
-Route120_Text_29E804: @ 829E804
+Route120_Text_RobertPostRematch: @ 829E804
 	.string "My POKéMON are growing stronger.\n"
 	.string "I have to grow stronger, too.$"
 
-Route120_Text_29E843: @ 829E843
+Route120_Text_LorenzoIntro: @ 829E843
 	.string "I'll check your POKéMON and see if\n"
 	.string "they're fit for the outdoors.$"
 
-Route120_Text_29E884: @ 829E884
+Route120_Text_LorenzoDefeat: @ 829E884
 	.string "With POKéMON that strong, you're in\n"
 	.string "no danger of needing rescue!$"
 
-Route120_Text_29E8C5: @ 829E8C5
+Route120_Text_LorenzoPostBattle: @ 829E8C5
 	.string "To travel wherever your heart desires\n"
 	.string "with POKéMON…\l"
 	.string "That's the joy of being a TRAINER.$"
 
-Route120_Text_29E91C: @ 829E91C
+Route120_Text_JennaIntro: @ 829E91C
 	.string "How's your physical fitness?\n"
 	.string "If you're not fit, you could have a\l"
 	.string "rough time in critical situations.$"
 
-Route120_Text_29E980: @ 829E980
+Route120_Text_JennaDefeat: @ 829E980
 	.string "I'm totally fit, but…$"
 
-Route120_Text_29E996: @ 829E996
+Route120_Text_JennaPostBattle: @ 829E996
 	.string "Fitness training is in my routine.\n"
 	.string "I always run with my POKéMON.$"
 
-Route120_Text_29E9D7: @ 829E9D7
+Route120_Text_JeffreyIntro: @ 829E9D7
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Want to battle?$"
 
-Route120_Text_29E9FF: @ 829E9FF
+Route120_Text_JeffreyDefeat: @ 829E9FF
 	.string "Lost it…$"
 
-Route120_Text_29EA08: @ 829EA08
+Route120_Text_JeffreyPostBattle: @ 829EA08
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "I'll try harder…$"
 
-Route120_Text_29EA31: @ 829EA31
+Route120_Text_JeffreyRegister: @ 829EA31
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Do you have a POKéNAV…?$"
 
-Route120_Text_29EA61: @ 829EA61
+Route120_Text_JeffreyRematchIntro: @ 829EA61
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Want to battle again?$"
 
-Route120_Text_29EA8F: @ 829EA8F
+Route120_Text_JeffreyRematchDefeat: @ 829EA8F
 	.string "… … … … … …\n"
 	.string "I lost again…$"
 
-Route120_Text_29EAA9: @ 829EAA9
+Route120_Text_JeffreyPostRematch: @ 829EAA9
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "I'll try harder…\l"
 	.string "For my precious BUG POKéMON…$"
 
-Route120_Text_29EAEF: @ 829EAEF
+Route120_Text_JenniferIntro: @ 829EAEF
 	.string "POKéMON have many special abilities.\n"
 	.string "If you want to become a first-class\l"
 	.string "TRAINER, learn about them.$"
 
-Route120_Text_29EB53: @ 829EB53
+Route120_Text_JenniferDefeat: @ 829EB53
 	.string "You're obviously thinking.$"
 
-Route120_Text_29EB6E: @ 829EB6E
+Route120_Text_JenniferPostBattle: @ 829EB6E
 	.string "The special abilities of POKéMON\n"
 	.string "will make battle styles change.$"
 
-Route120_Text_29EBAF: @ 829EBAF
+Route120_Text_ChipIntro: @ 829EBAF
 	.string "Who might you be?\p"
 	.string "Are you perhaps searching for ancient\n"
 	.string "ruins that are rumored to possibly\l"
 	.string "exist according to legend?$"
 
-Route120_Text_29EC25: @ 829EC25
+Route120_Text_ChipDefeat: @ 829EC25
 	.string "What a disgraceful setback…$"
 
-Route120_Text_29EC41: @ 829EC41
+Route120_Text_ChipPostBattle: @ 829EC41
 	.string "That giant rock… I would like to\n"
 	.string "believe it may indeed contain ancient\l"
 	.string "ruins. But I see no entrance.$"
 
-Route120_Text_29ECA6: @ 829ECA6
+Route120_Text_ClarissaIntro: @ 829ECA6
 	.string "Why am I carrying this parasol?\p"
 	.string "I'll tell you if you can win against me.$"
 
-Route120_Text_29ECEF: @ 829ECEF
+Route120_Text_ClarissaDefeat: @ 829ECEF
 	.string "A parasol can't ward off POKéMON\n"
 	.string "attacks…$"
 
-Route120_Text_29ED19: @ 829ED19
+Route120_Text_ClarissaPostBattle: @ 829ED19
 	.string "I don't think strong sunlight is good\n"
 	.string "for my POKéMON.\l"
 	.string "So I shield them with my parasol.$"
 
-Route120_Text_29ED71: @ 829ED71
+Route120_Text_AngelicaIntro: @ 829ED71
 	.string "Me, POKéMON, and my parasol…\p"
 	.string "If any one of them is missing,\n"
 	.string "the picture of beauty will be ruined.$"
 
-Route120_Text_29EDD3: @ 829EDD3
+Route120_Text_AngelicaDefeat: @ 829EDD3
 	.string "You've completely ruined my beauty…$"
 
-Route120_Text_29EDF7: @ 829EDF7
+Route120_Text_AngelicaPostBattle: @ 829EDF7
 	.string "A parasol wouldn't suit you at all.\p"
 	.string "Why, something like this would only\n"
 	.string "get in your way.$"
 
-Route120_Text_29EE50: @ 829EE50
+Route120_Text_KeigoIntro: @ 829EE50
 	.string "I will adopt the movements of POKéMON\n"
 	.string "and create new ninja techniques.$"
 
-Route120_Text_29EE97: @ 829EE97
+Route120_Text_KeigoDefeat: @ 829EE97
 	.string "The creation of new ninja techniques\n"
 	.string "is but a distant dream…$"
 
-Route120_Text_29EED4: @ 829EED4
+Route120_Text_KeigoPostBattle: @ 829EED4
 	.string "Perhaps I ought to apprentice under\n"
 	.string "a ninja sensei.$"
 
-Route120_Text_29EF08: @ 829EF08
+Route120_Text_RileyIntro: @ 829EF08
 	.string "We ninja conceal ourselves under our\n"
 	.string "camouflage cloaks.\l"
 	.string "I bet you didn't know where I was!$"
 
-Route120_Text_29EF63: @ 829EF63
+Route120_Text_RileyDefeat: @ 829EF63
 	.string "I lost!\n"
 	.string "I should camouflage my shame!$"
 
-Route120_Text_29EF89: @ 829EF89
+Route120_Text_RileyPostBattle: @ 829EF89
 	.string "Our camouflage cloaks are all\n"
 	.string "handmade.$"
 
-Route120_Text_29EFB1: @ 829EFB1
+Route120_Text_CallieIntro: @ 829EFB1
 	.string "If you don't pay attention,\n"
 	.string "you could get hurt!$"
 
-Route120_Text_29EFE1: @ 829EFE1
+Route120_Text_CallieDefeat: @ 829EFE1
 	.string "Ouch!\n"
 	.string "I was the one to get hurt.$"
 
-Route120_Text_29F002: @ 829F002
+Route120_Text_CalliePostBattle: @ 829F002
 	.string "I wonder… Should I evolve my POKéMON?\n"
 	.string "They're cute the way they are, though.$"
 
-Route120_Text_29F04F: @ 829F04F
+Route120_Text_LeonelIntro: @ 829F04F
 	.string "Your party POKéMON…\n"
 	.string "Do you have different types?$"
 
-Route120_Text_29F080: @ 829F080
+Route120_Text_LeonelDefeat: @ 829F080
 	.string "I've seen your policy in action!$"
 
-Route120_Text_29F0A1: @ 829F0A1
+Route120_Text_LeonelPostBattle: @ 829F0A1
 	.string "I think it's awesome you're so strong\n"
 	.string "battling with your favorite POKéMON.$"
 
-Route121_Text_29F0EC: @ 829F0EC
+Route121_Text_VanessaIntro: @ 829F0EC
 	.string "Will you play with my delightfully\n"
 	.string "pretty POKéMON?$"
 
-Route121_Text_29F11F: @ 829F11F
+Route121_Text_VanessaDefeat: @ 829F11F
 	.string "This isn't what I meant!$"
 
-Route121_Text_29F138: @ 829F138
+Route121_Text_VanessaPostBattle: @ 829F138
 	.string "I'm going to a CONTEST in LILYCOVE.\p"
 	.string "My POKéMON should have no problem\n"
 	.string "sweeping the MASTER CLASS.$"
 
-Route121_Text_29F199: @ 829F199
+Route121_Text_WalterIntro: @ 829F199
 	.string "With my POKéMON, I have traveled\n"
 	.string "to the world's four corners.\p"
 	.string "You might say I have some confidence\n"
 	.string "in my abilities.$"
 
-Route121_Text_29F20D: @ 829F20D
+Route121_Text_WalterDefeat: @ 829F20D
 	.string "Ah, well played.$"
 
-Route121_Text_29F21E: @ 829F21E
+Route121_Text_WalterPostBattle: @ 829F21E
 	.string "I would like to circle the globe once\n"
 	.string "again with my POKéMON.$"
 
-Route121_Text_29F25B: @ 829F25B
+Route121_Text_WalterRegister: @ 829F25B
 	.string "Your POKéMON prowess is remarkable.\n"
 	.string "Allow me to register you as a memento.$"
 
-Route121_Text_29F2A6: @ 829F2A6
+Route121_Text_WalterRematchIntro: @ 829F2A6
 	.string "With my POKéMON, I have traveled\n"
 	.string "to the world's four corners.\p"
 	.string "You might say I have some confidence\n"
 	.string "in my abilities.$"
 
-Route121_Text_29F31A: @ 829F31A
+Route121_Text_WalterRematchDefeat: @ 829F31A
 	.string "Ah, well played.$"
 
-Route121_Text_29F32B: @ 829F32B
+Route121_Text_WalterPostRematch: @ 829F32B
 	.string "Your POKéMON and you…\p"
 	.string "Your prowess together will be\n"
 	.string "considered strong, even overseas.$"
 
-Route121_Text_29F381: @ 829F381
+Route121_Text_TammyIntro: @ 829F381
 	.string "There are powers beyond our\n"
 	.string "understanding in the world…$"
 
-Route121_Text_29F3B9: @ 829F3B9
+Route121_Text_TammyDefeat: @ 829F3B9
 	.string "I have lost…$"
 
-Route121_Text_29F3C6: @ 829F3C6
+Route121_Text_TammyPostBattle: @ 829F3C6
 	.string "MT. PYRE…\n"
 	.string "There is a mysterious power\l"
 	.string "at work there…$"
 
-Route121_Text_29F3FB: @ 829F3FB
+Route121_Text_KateIntro: @ 829F3FB
 	.string "KATE: Together, we're fearless!\n"
 	.string "We'll demonstrate how tough we are!$"
 
-Route121_Text_29F43F: @ 829F43F
+Route121_Text_KateDefeat: @ 829F43F
 	.string "KATE: I blew it in front of my junior\n"
 	.string "student partner…$"
 
-Route121_Text_29F476: @ 829F476
+Route121_Text_KatePostBattle: @ 829F476
 	.string "KATE: When someone's relying on me,\n"
 	.string "I get this urge to look cool in front\l"
 	.string "of them…$"
 
-Route121_Text_29F4C9: @ 829F4C9
+Route121_Text_KateNotEnoughMons: @ 829F4C9
 	.string "KATE: If you've only got one POKéMON,\n"
 	.string "we can't battle with you.\p"
 	.string "That would be bullying.$"
 
-Route121_Text_29F521: @ 829F521
+Route121_Text_JoyIntro: @ 829F521
 	.string "JOY: Together, we're fearless!\n"
 	.string "We'll demonstrate how tough we are!$"
 
-Route121_Text_29F564: @ 829F564
+Route121_Text_JoyDefeat: @ 829F564
 	.string "JOY: Please forgive me, KATE!$"
 
-Route121_Text_29F582: @ 829F582
+Route121_Text_JoyPostBattle: @ 829F582
 	.string "JOY: Ehehe, I'll have to train with KATE,\n"
 	.string "my senior student partner, again.$"
 
-Route121_Text_29F5CE: @ 829F5CE
+Route121_Text_JoyNotEnoughMons: @ 829F5CE
 	.string "JOY: You need at least two POKéMON\n"
 	.string "if you're going to challenge us!$"
 
-Route121_Text_29F612: @ 829F612
+Route121_Text_JessicaIntro: @ 829F612
 	.string "Stop! Have a good look at my precious\n"
 	.string "POKéMON!$"
 
-Route121_Text_29F641: @ 829F641
+Route121_Text_JessicaDefeat: @ 829F641
 	.string "Oh, how dare you!\n"
 	.string "Don't take it so seriously!$"
 
-Route121_Text_29F66F: @ 829F66F
+Route121_Text_JessicaPostBattle: @ 829F66F
 	.string "Maybe I'll go catch more POKéMON at\n"
 	.string "the SAFARI.$"
 
-Route121_Text_29F69F: @ 829F69F
+Route121_Text_JessicaRegister: @ 829F69F
 	.string "I took it easy on you this time!\n"
 	.string "It won't be that way the next time!$"
 
-Route121_Text_29F6E4: @ 829F6E4
+Route121_Text_JessicaRematchIntro: @ 829F6E4
 	.string "My precious POKéMON grew!\n"
 	.string "Have a good look!$"
 
-Route121_Text_29F710: @ 829F710
+Route121_Text_JessicaRematchDefeat: @ 829F710
 	.string "Oh, how dare you!\n"
 	.string "You still won't take it easy!$"
 
-Route121_Text_29F740: @ 829F740
+Route121_Text_JessicaPostRematch: @ 829F740
 	.string "Maybe I'll go catch more POKéMON at\n"
 	.string "the SAFARI.$"
 
-Route121_Text_29F770: @ 829F770
+Route121_Text_CristinIntro: @ 829F770
 	.string "I have this routine.\n"
 	.string "Defeat five TRAINERS a day.\l"
 	.string "Guess what? You're number five!$"
 
-Route121_Text_29F7C1: @ 829F7C1
+Route121_Text_CristinDefeat: @ 829F7C1
 	.string "No!\n"
 	.string "You're horrid!$"
 
-Route121_Text_29F7D4: @ 829F7D4
+Route121_Text_CristinPostBattle: @ 829F7D4
 	.string "I didn't expect to lose this easily…\n"
 	.string "I'll win next time!$"
 
-Route121_Text_29F80D: @ 829F80D
+Route121_Text_CristinRegister: @ 829F80D
 	.string "That was total humiliation!\n"
 	.string "I won't forget you…\l"
 	.string "Hand over your POKéNAV!$"
 
-Route121_Text_29F855: @ 829F855
+Route121_Text_CristinRematchIntro: @ 829F855
 	.string "I have this new routine.\n"
 	.string "Defeat ten TRAINERS a day.\l"
 	.string "Guess what? You're number ten!$"
 
-Route121_Text_29F8A8: @ 829F8A8
+Route121_Text_CristinRematchDefeat: @ 829F8A8
 	.string "Wait! That's nasty!\n"
 	.string "I demand a rematch!$"
 
-Route121_Text_29F8D0: @ 829F8D0
+Route121_Text_CristinPostRematch: @ 829F8D0
 	.string "An opponent I just can't beat…\n"
 	.string "Snivel…\l"
 	.string "I can't believe this is happening…$"
 
-Route121_Text_29F91A: @ 829F91A
+Route121_Text_CaleIntro: @ 829F91A
 	.string "Can't you see that I have all this\n"
 	.string "stuff with me?\p"
 	.string "Despite that, you still insist that\n"
 	.string "we battle?$"
 
-Route121_Text_29F97B: @ 829F97B
+Route121_Text_CaleDefeat: @ 829F97B
 	.string "Of course I lost!\n"
 	.string "I'm holding stuff in both hands!$"
 
-Route121_Text_29F9AE: @ 829F9AE
+Route121_Text_CalePostBattle: @ 829F9AE
 	.string "I bought too much stuff at\n"
 	.string "the LILYCOVE DEPT. STORE.\p"
 	.string "It's up the road from here.\n"
 	.string "I wish I had a BAG like yours.$"
 
-Route121_Text_29FA1E: @ 829FA1E
+Route121_Text_MylesIntro: @ 829FA1E
 	.string "There's nothing I love more than\n"
 	.string "checking out other people's POKéMON!$"
 
-Route121_Text_29FA64: @ 829FA64
+Route121_Text_MylesDefeat: @ 829FA64
 	.string "Super awesome!$"
 
-Route121_Text_29FA73: @ 829FA73
+Route121_Text_MylesPostBattle: @ 829FA73
 	.string "They're great, your POKéMON!\n"
 	.string "How do you raise them?$"
 
-Route121_Text_29FAA7: @ 829FAA7
+Route121_Text_PatIntro: @ 829FAA7
 	.string "I want everybody to see the POKéMON\n"
 	.string "I've raised!$"
 
-Route121_Text_29FAD8: @ 829FAD8
+Route121_Text_PatDefeat: @ 829FAD8
 	.string "Wow!\n"
 	.string "Spectacular!$"
 
-Route121_Text_29FAEA: @ 829FAEA
+Route121_Text_PatPostBattle: @ 829FAEA
 	.string "I raise every POKéMON with the same\n"
 	.string "love and care--I don't pick favorites.$"
 
-Route121_Text_29FB35: @ 829FB35
+Route121_Text_MarcelIntro: @ 829FB35
 	.string "My POKéMON have never tasted defeat!\n"
 	.string "On their next win, I'm entering them\l"
 	.string "in CONTESTS.$"
 
-Route121_Text_29FB8C: @ 829FB8C
+Route121_Text_MarcelDefeat: @ 829FB8C
 	.string "Oh, now what happened here?$"
 
-Route121_Text_29FBA8: @ 829FBA8
+Route121_Text_MarcelPostBattle: @ 829FBA8
 	.string "I may have to train my gang some more\n"
 	.string "before entering any CONTEST.$"
 
-Route123_Text_29FBEB: @ 829FBEB
+Route123_Text_WendyIntro: @ 829FBEB
 	.string "Want to determine how strong you are?\n"
 	.string "I'll be the test!$"
 
-Route123_Text_29FC23: @ 829FC23
+Route123_Text_WendyDefeat: @ 829FC23
 	.string "You passed with flying colors!$"
 
-Route123_Text_29FC42: @ 829FC42
+Route123_Text_WendyPostBattle: @ 829FC42
 	.string "To best even me…\n"
 	.string "Your strength is marvelous!$"
 
-Route123_Text_29FC6F: @ 829FC6F
+Route123_Text_BraxtonIntro: @ 829FC6F
 	.string "You seem to have a big collection\n"
 	.string "of GYM BADGES.\p"
 	.string "Let me see if you're actually worthy of\n"
 	.string "those BADGES!$"
 
-Route123_Text_29FCD6: @ 829FCD6
+Route123_Text_BraxtonDefeat: @ 829FCD6
 	.string "Oh, you're worthy, all right!$"
 
-Route123_Text_29FCF4: @ 829FCF4
+Route123_Text_BraxtonPostBattle: @ 829FCF4
 	.string "You did your BADGES proud in that\n"
 	.string "match!$"
 
-Route123_Text_29FD1D: @ 829FD1D
+Route123_Text_VioletIntro: @ 829FD1D
 	.string "They say that good times are filled\n"
 	.string "with good aromas.$"
 
-Route123_Text_29FD53: @ 829FD53
+Route123_Text_VioletDefeat: @ 829FD53
 	.string "Oh…\n"
 	.string "I smell the bitter scent of misery…$"
 
-Route123_Text_29FD7B: @ 829FD7B
+Route123_Text_VioletPostBattle: @ 829FD7B
 	.string "The BERRY MASTER's garden is filled\n"
 	.string "with uplifting fragrances.$"
 
-Route123_Text_29FDBA: @ 829FDBA
+Route123_Text_CameronIntro: @ 829FDBA
 	.string "Being a psychic is about willpower.\p"
 	.string "I've willed myself not to lose to\n"
 	.string "anyone. That makes me strong!$"
 
-Route123_Text_29FE1E: @ 829FE1E
+Route123_Text_CameronDefeat: @ 829FE1E
 	.string "I feel sad…$"
 
-Route123_Text_29FE2A: @ 829FE2A
+Route123_Text_CameronPostBattle: @ 829FE2A
 	.string "Being a psychic is about willpower.\n"
 	.string "I thought I wouldn't lose to you…$"
 
-Route123_Text_29FE70: @ 829FE70
+Route123_Text_CameronRegister: @ 829FE70
 	.string "I sense it!\n"
 	.string "You and I shall battle again!\l"
 	.string "I can't tell if I'll win, though…\p"
 	.string "Let's see your POKéNAV.$"
 
-Route123_Text_29FED4: @ 829FED4
+Route123_Text_CameronRematchIntro: @ 829FED4
 	.string "I've convinced myself that I won't\n"
 	.string "lose anymore. That makes me strong!$"
 
-Route123_Text_29FF1B: @ 829FF1B
+Route123_Text_CameronRematchDefeat: @ 829FF1B
 	.string "I feel sad…$"
 
-Route123_Text_29FF27: @ 829FF27
+Route123_Text_CameronPostRematch: @ 829FF27
 	.string "I should train at MT. PYRE…\n"
 	.string "I'll never beat you this way…$"
 
-Route123_Text_29FF61: @ 829FF61
+Route123_Text_JackiIntro: @ 829FF61
 	.string "Don't be too happy if your POKéMON\n"
 	.string "develop psychic powers.\p"
 	.string "You need to refine those powers to\n"
 	.string "make them really useful.$"
 
-Route123_Text_29FFD8: @ 829FFD8
+Route123_Text_JackiDefeat: @ 829FFD8
 	.string "Overwhelmed!$"
 
-Route123_Text_29FFE5: @ 829FFE5
+Route123_Text_JackiPostBattle: @ 829FFE5
 	.string "We all have psychic powers.\n"
 	.string "We've just forgotten how to use them.$"
 
-Route123_Text_2A0027: @ 82A0027
+Route123_Text_JackiRegister: @ 82A0027
 	.string "I would like to face you again.\n"
 	.string "Is that okay with you?$"
 
-Route123_Text_2A005E: @ 82A005E
+Route123_Text_JackiRematchIntro: @ 82A005E
 	.string "Have you awoken the psychic powers\n"
 	.string "within you?$"
 
-Route123_Text_2A008D: @ 82A008D
+Route123_Text_JackiRematchDefeat: @ 82A008D
 	.string "Astounding!$"
 
-Route123_Text_2A0099: @ 82A0099
+Route123_Text_JackiPostRematch: @ 82A0099
 	.string "Your power with POKéMON…\n"
 	.string "That could be a psychic power, too.$"
 
-Route123_Text_2A00D6: @ 82A00D6
+Route123_Text_MiuIntro: @ 82A00D6
 	.string "MIU: Hello, TRAINER. I hope your\n"
 	.string "POKéMON won't cry when they lose.$"
 
-Route123_Text_2A0119: @ 82A0119
+Route123_Text_MiuDefeat: @ 82A0119
 	.string "MIU: Uh-oh, we lost.$"
 
-Route123_Text_2A012E: @ 82A012E
+Route123_Text_MiuPostBattle: @ 82A012E
 	.string "MIU: TRAINER, your POKéMON are\n"
 	.string "strong because you are friends.$"
 
-Route123_Text_2A016D: @ 82A016D
+Route123_Text_MiuNotEnoughMons: @ 82A016D
 	.string "MIU: It's no fun to battle if you\n"
 	.string "don't have two POKéMON.$"
 
-Route123_Text_2A01A7: @ 82A01A7
+Route123_Text_YukiIntro: @ 82A01A7
 	.string "YUKI: Okay!\n"
 	.string "We're beating the TRAINER's POKéMON!$"
 
-Route123_Text_2A01D8: @ 82A01D8
+Route123_Text_YukiDefeat: @ 82A01D8
 	.string "YUKI: Uh-oh, we lost.$"
 
-Route123_Text_2A01EE: @ 82A01EE
+Route123_Text_YukiPostBattle: @ 82A01EE
 	.string "YUKI: Why are you so strong?\n"
 	.string "We've never lost before.$"
 
-Route123_Text_2A0224: @ 82A0224
+Route123_Text_YukiNotEnoughMons: @ 82A0224
 	.string "YUKI: It's no fun to battle if you\n"
 	.string "don't have two POKéMON.$"
 
-Route123_Text_2A025F: @ 82A025F
+Route123_Text_KindraIntro: @ 82A025F
 	.string "MT. PYRE…\n"
 	.string "Where the spirits of POKéMON sleep…\l"
 	.string "Will your POKéMON sleep?$"
 
-Route123_Text_2A02A6: @ 82A02A6
+Route123_Text_KindraDefeat: @ 82A02A6
 	.string "Overflowing with vitality…$"
 
-Route123_Text_2A02C1: @ 82A02C1
+Route123_Text_KindraPostBattle: @ 82A02C1
 	.string "MT. PYRE…\n"
 	.string "Where the spirits of POKéMON sleep…\p"
 	.string "It must overflow with a power that\n"
 	.string "soothes spirits…$"
 
-Route123_Text_2A0323: @ 82A0323
+Route123_Text_FernandoIntro: @ 82A0323
 	.string "I'll turn your lights out while\n"
 	.string "I rip through this tune!$"
 
-Route123_Text_2A035C: @ 82A035C
+Route123_Text_FernandoDefeat: @ 82A035C
 	.string "Hey, hold it!\n"
 	.string "I was still playing the intro!$"
 
-Route123_Text_2A0389: @ 82A0389
+Route123_Text_FernandoPostBattle: @ 82A0389
 	.string "You're rock steady.\n"
 	.string "I'd like to write a tune about you.$"
 
-Route123_Text_2A03C1: @ 82A03C1
+Route123_Text_FernandoRegister: @ 82A03C1
 	.string "The next time, lend your ears to\n"
 	.string "the full tune, will you?$"
 
-Route123_Text_2A03FB: @ 82A03FB
+Route123_Text_FernandoRematchIntro: @ 82A03FB
 	.string "Today's the day I'm going to do it!\n"
 	.string "I'll turn out your lights before\l"
 	.string "I finish singing my song!$"
 
-Route123_Text_2A045A: @ 82A045A
+Route123_Text_FernandoRematchDefeat: @ 82A045A
 	.string "Hey, hold it!\n"
 	.string "I haven't even hit the chorus!$"
 
-Route123_Text_2A0487: @ 82A0487
+Route123_Text_FernandoPostRematch: @ 82A0487
 	.string "I thought you'd be so enthralled\n"
 	.string "by my tune, you'd lose.$"
 
-Route123_Text_2A04C0: @ 82A04C0
+Route123_Text_DavisIntro: @ 82A04C0
 	.string "This is my awesome BUG POKéMON!\n"
 	.string "My big brother got it for me.$"
 
-Route123_Text_2A04FE: @ 82A04FE
+Route123_Text_DavisDefeat: @ 82A04FE
 	.string "Waaaah!\n"
 	.string "You meanie!$"
 
-Route123_Text_2A0512: @ 82A0512
+Route123_Text_DavisPostBattle: @ 82A0512
 	.string "Don't tell my brother I lost.\n"
 	.string "You have to keep it a secret!$"
 
-Route123_Text_2A054E: @ 82A054E
+Route123_Text_JazmynIntro: @ 82A054E
 	.string "My confidence will get a boost by\n"
 	.string "beating someone obviously strong!$"
 
-Route123_Text_2A0592: @ 82A0592
+Route123_Text_JazmynDefeat: @ 82A0592
 	.string "There goes my confidence…$"
 
-Route123_Text_2A05AC: @ 82A05AC
+Route123_Text_JazmynPostBattle: @ 82A05AC
 	.string "They say that you can't judge a person\n"
 	.string "by their appearance.\p"
 	.string "But often, their looks don't lie…$"
 
-Route123_Text_2A060A: @ 82A060A
+Route123_Text_FrederickIntro: @ 82A060A
 	.string "Hello, child!\n"
 	.string "Can you spare some time?$"
 
-Route123_Text_2A0631: @ 82A0631
+Route123_Text_FrederickDefeat: @ 82A0631
 	.string "Ah, a mighty capable child!\n"
 	.string "Let me contribute to your allowance.$"
 
-Route123_Text_2A0672: @ 82A0672
+Route123_Text_FrederickPostBattle: @ 82A0672
 	.string "Contribute to your allowance?\n"
 	.string "Wasn't the prize money enough?$"
 
-Route123_Text_2A06AF: @ 82A06AF
+Route123_Text_AlbertoIntro: @ 82A06AF
 	.string "I have to tell you, BIRD POKéMON\n"
 	.string "are my obsession!\p"
 	.string "Birds are cool!\n"
 	.string "They're the best!$"
 
-Route123_Text_2A0704: @ 82A0704
+Route123_Text_AlbertoDefeat: @ 82A0704
 	.string "Even in defeat, BIRD POKéMON are cool!$"
 
-Route123_Text_2A072B: @ 82A072B
+Route123_Text_AlbertoPostBattle: @ 82A072B
 	.string "I gather BIRD POKéMON feathers that\n"
 	.string "scatter during battles.\p"
 	.string "I'm going to make a hat with\n"
 	.string "BIRD POKéMON feathers.$"
 
-Route123_Text_2A079B: @ 82A079B
+Route123_Text_EdIntro: @ 82A079B
 	.string "When there are no TRAINERS around,\n"
 	.string "I let my POKéMON battle each other.\l"
 	.string "I watch them.$"
 
-Route123_Text_2A07F0: @ 82A07F0
+Route123_Text_EdDefeat: @ 82A07F0
 	.string "I kind of like your POKéMON.$"
 
-Route123_Text_2A080D: @ 82A080D
+Route123_Text_EdPostBattle: @ 82A080D
 	.string "Hehe, I'm swiping your battling ideas!\n"
 	.string "I think they'll make me better.$"
 
-Route123_Text_2A0854: @ 82A0854
+Route123_Text_JonasIntro: @ 82A0854
 	.string "I lay in ambush, and a TRAINER has\n"
 	.string "landed in my trap!$"
 
-Route123_Text_2A088A: @ 82A088A
+Route123_Text_JonasDefeat: @ 82A088A
 	.string "If you don't lose, how am I supposed\n"
 	.string "to have fun playing ninja?$"
 
-Route123_Text_2A08CA: @ 82A08CA
+Route123_Text_JonasPostBattle: @ 82A08CA
 	.string "I'm going to ambush a weaker-looking\n"
 	.string "TRAINER next time.$"
 
-Route123_Text_2A0902: @ 82A0902
+Route123_Text_KayleyIntro: @ 82A0902
 	.string "I just bought this parasol.\n"
 	.string "My cuteness should be up by a third!$"
 
-Route123_Text_2A0943: @ 82A0943
+Route123_Text_KayleyDefeat: @ 82A0943
 	.string "You're better than me by about\n"
 	.string "five times!$"
 
-Route123_Text_2A096E: @ 82A096E
+Route123_Text_KayleyPostBattle: @ 82A096E
 	.string "Using accessories effectively is\n"
 	.string "the secret behind fashion appeal.$"
 
-Route124_Text_2A09B1: @ 82A09B1
+Route124_Text_SpencerIntro: @ 82A09B1
 	.string "Hey, are you lost at sea?\p"
 	.string "If you can beat my POKéMON,\n"
 	.string "I can serve as your pilot.$"
 
-Route124_Text_2A0A02: @ 82A0A02
+Route124_Text_SpencerDefeat: @ 82A0A02
 	.string "I lost my bearings in battle!$"
 
-Route124_Text_2A0A20: @ 82A0A20
+Route124_Text_SpencerPostBattle: @ 82A0A20
 	.string "Many people lose their bearings at sea.\p"
 	.string "If you're that sort, you should refer\n"
 	.string "to the POKéNAV's MAP.$"
 
-Route124_Text_2A0A84: @ 82A0A84
+Route124_Text_RolandIntro: @ 82A0A84
 	.string "Hm! You're riding a POKéMON instead\n"
 	.string "of swimming yourself…\p"
 	.string "I am envious!$"
 
-Route124_Text_2A0ACC: @ 82A0ACC
+Route124_Text_RolandDefeat: @ 82A0ACC
 	.string "Oh!\n"
 	.string "I can't…$"
 
-Route124_Text_2A0AD9: @ 82A0AD9
+Route124_Text_RolandPostBattle: @ 82A0AD9
 	.string "I'm getting chilled…\n"
 	.string "I've been in the water too long…\p"
 	.string "I wish I could ride a POKéMON like you…$"
 
-Route124_Text_2A0B37: @ 82A0B37
+Route124_Text_JennyIntro: @ 82A0B37
 	.string "If you just float in the sea like\n"
 	.string "this, POKéMON come around to play.$"
 
-Route124_Text_2A0B7C: @ 82A0B7C
+Route124_Text_JennyDefeat: @ 82A0B7C
 	.string "Oh, darn.\n"
 	.string "I've gone and lost.$"
 
-Route124_Text_2A0B9A: @ 82A0B9A
+Route124_Text_JennyPostBattle: @ 82A0B9A
 	.string "While swimming, I noticed that some\n"
 	.string "POKéMON attack, and some just watch.\p"
 	.string "I guess POKéMON have personalities\n"
 	.string "of their own.$"
 
-Route124_Text_2A0C14: @ 82A0C14
+Route124_Text_JennyRegister: @ 82A0C14
 	.string "It's only on a whim, but maybe I'll get\n"
 	.string "you to register me in your POKéNAV.$"
 
-Route124_Text_2A0C60: @ 82A0C60
+Route124_Text_JennyRematchIntro: @ 82A0C60
 	.string "If you just float in the sea like this,\n"
 	.string "TRAINERS challenge you!$"
 
-Route124_Text_2A0CA0: @ 82A0CA0
+Route124_Text_JennyRematchDefeat: @ 82A0CA0
 	.string "That's strange…\n"
 	.string "I lost again…$"
 
-Route124_Text_2A0CBE: @ 82A0CBE
+Route124_Text_JennyPostRematch: @ 82A0CBE
 	.string "This has nothing to do with anything,\n"
 	.string "but maybe I'll visit the TRICK HOUSE.$"
 
-Route124_Text_2A0D0A: @ 82A0D0A
+Route124_Text_GraceIntro: @ 82A0D0A
 	.string "I'm growing bored of swimming…\n"
 	.string "How about a battle?$"
 
-Route124_Text_2A0D3D: @ 82A0D3D
+Route124_Text_GraceDefeat: @ 82A0D3D
 	.string "I had no idea that you were\n"
 	.string "this strong!$"
 
-Route124_Text_2A0D66: @ 82A0D66
+Route124_Text_GracePostBattle: @ 82A0D66
 	.string "All the effort you put in must have\n"
 	.string "made you this strong.$"
 
-Route124_Text_2A0DA0: @ 82A0DA0
+Route124_Text_ChadIntro: @ 82A0DA0
 	.string "Fufufufu… I dive deep underwater\n"
 	.string "to go deep under cover.\l"
 	.string "Plumbing the depths is where I excel!$"
 
-Route124_Text_2A0DFF: @ 82A0DFF
+Route124_Text_ChadDefeat: @ 82A0DFF
 	.string "Glub, glub, glub…\n"
 	.string "I'm sinking…$"
 
-Route124_Text_2A0E1E: @ 82A0E1E
+Route124_Text_ChadPostBattle: @ 82A0E1E
 	.string "I have it on good authority that\n"
 	.string "there's a DIVE spot around here.\p"
 	.string "It gives me the urge to go deep\n"
 	.string "again…$"
 
-Route124_Text_2A0E87: @ 82A0E87
+Route124_Text_LilaIntro: @ 82A0E87
 	.string "LILA: Sigh…\p"
 	.string "Here I am in the sea, but who's with me?\n"
 	.string "My little brother!\p"
 	.string "Let's battle so I won't have to dwell\n"
 	.string "on that!$"
 
-Route124_Text_2A0EFE: @ 82A0EFE
+Route124_Text_LilaDefeat: @ 82A0EFE
 	.string "LILA: ROY! It's your fault we lost!\n"
 	.string "You're in for it later!$"
 
-Route124_Text_2A0F3A: @ 82A0F3A
+Route124_Text_LilaPostBattle: @ 82A0F3A
 	.string "LILA: Sigh…\p"
 	.string "If only it wasn't my little brother\n"
 	.string "next to me, but a nice boyfriend…$"
 
-Route124_Text_2A0F8C: @ 82A0F8C
+Route124_Text_LilaNotEnoughMons: @ 82A0F8C
 	.string "LILA: You're planning to battle us?\n"
 	.string "Not unless you have two POKéMON.$"
 
-Route124_Text_2A0FD1: @ 82A0FD1
+Route124_Text_RoyIntro: @ 82A0FD1
 	.string "ROY: My big sister is tough at POKéMON!\p"
 	.string "Don't cry when you lose!$"
 
-Route124_Text_2A1012: @ 82A1012
+Route124_Text_RoyDefeat: @ 82A1012
 	.string "ROY: Uh-oh…\n"
 	.string "My big sister will chew me out…$"
 
-Route124_Text_2A103E: @ 82A103E
+Route124_Text_RoyPostBattle: @ 82A103E
 	.string "ROY: My big sister is really scary\n"
 	.string "when she gets angry.\p"
 	.string "That's why she doesn't have a\n"
 	.string "boyfriend.$"
 
-Route124_Text_2A109F: @ 82A109F
+Route124_Text_LilaRoyRegister: @ 82A109F
 	.string "ROY: Will you battle with us again?\n"
 	.string "But take it easy next time, okay?$"
 
-Route124_Text_2A10E5: @ 82A10E5
+Route124_Text_RoyNotEnoughMons: @ 82A10E5
 	.string "ROY: Did you want to battle us?\n"
 	.string "Bring two POKéMON, then.$"
 
-Route124_Text_2A111E: @ 82A111E
+Route124_Text_LilaRematchIntro: @ 82A111E
 	.string "LILA: Sigh…\p"
 	.string "Here I am in the sea, but who's with me?\n"
 	.string "My little brother!\p"
 	.string "Oh, hi, it's been a while. Let's battle\n"
 	.string "so I won't have to dwell on things!$"
 
-Route124_Text_2A11B2: @ 82A11B2
+Route124_Text_LilaRematchDefeat: @ 82A11B2
 	.string "LILA: ROY!\n"
 	.string "It's your fault we lost again!\p"
 	.string "We're having a training session later!$"
 
-Route124_Text_2A1203: @ 82A1203
+Route124_Text_LilaPostRematch: @ 82A1203
 	.string "LILA: Sigh…\p"
 	.string "If I had a nice boyfriend, we'd beat\n"
 	.string "anyone with lovely combinations…$"
 
-Route124_Text_2A1255: @ 82A1255
+Route124_Text_LilaRematchNotEnoughMons: @ 82A1255
 	.string "LILA: You're planning to battle us?\n"
 	.string "Not unless you have two POKéMON.$"
 
-Route124_Text_2A129A: @ 82A129A
+Route124_Text_RoyRematchIntro: @ 82A129A
 	.string "ROY: If we lose, I'll catch heck.\n"
 	.string "I'm going to go totally all out!$"
 
-Route124_Text_2A12DD: @ 82A12DD
+Route124_Text_RoyRematchDefeat: @ 82A12DD
 	.string "ROY: Uh-oh…\n"
 	.string "My big sister will chew me out again.$"
 
-Route124_Text_2A130F: @ 82A130F
+Route124_Text_RoyPostRematch: @ 82A130F
 	.string "ROY: My big sister is really scary\n"
 	.string "when she gets angry.\p"
 	.string "She's going to make me train really\n"
 	.string "hard with POKéMON later…$"
 
-Route124_Text_2A1384: @ 82A1384
+Route124_Text_RoyRematchNotEnoughMons: @ 82A1384
 	.string "ROY: Did you want to battle us?\n"
 	.string "Bring two POKéMON, then.$"
 
-Route124_Text_2A13BD: @ 82A13BD
+Route124_Text_DeclanIntro: @ 82A13BD
 	.string "Here I am swimming by my lonesome\n"
 	.string "on this wide, beautiful sea.\p"
 	.string "There's no other word for it.\n"
 	.string "This is pathetic!$"
 
-Route124_Text_2A142C: @ 82A142C
+Route124_Text_DeclanDefeat: @ 82A142C
 	.string "I'm feeling blue.\n"
 	.string "Blue as the sky…$"
 
-Route124_Text_2A144F: @ 82A144F
+Route124_Text_DeclanPostBattle: @ 82A144F
 	.string "I should chat up lady SWIMMERS\n"
 	.string "and invite them on a long swim.$"
 
-Route124_Text_2A148E: @ 82A148E
+Route124_Text_IsabellaIntro: @ 82A148E
 	.string "I'm not going to lose to some\n"
 	.string "surfer TRAINER.$"
 
-Route124_Text_2A14BC: @ 82A14BC
+Route124_Text_IsabellaDefeat: @ 82A14BC
 	.string "I've only got sweat in my eyes!\n"
 	.string "I am not crying!$"
 
-Route124_Text_2A14ED: @ 82A14ED
+Route124_Text_IsabellaPostBattle: @ 82A14ED
 	.string "You can find pretty colored shards\n"
 	.string "of things around here.$"
 
-Route125_Text_2A1527: @ 82A1527
+Route125_Text_NolenIntro: @ 82A1527
 	.string "I heard you approaching, so I hung\n"
 	.string "around for you!$"
 
-Route125_Text_2A155A: @ 82A155A
+Route125_Text_NolenDefeat: @ 82A155A
 	.string "I surrender!$"
 
-Route125_Text_2A1567: @ 82A1567
+Route125_Text_NolenPostBattle: @ 82A1567
 	.string "Sound travels faster in water than\n"
 	.string "it does through air.$"
 
-Route125_Text_2A159F: @ 82A159F
+Route125_Text_StanIntro: @ 82A159F
 	.string "Hey, there!\n"
 	.string "Check out my sweet POKéMON!$"
 
-Route125_Text_2A15C7: @ 82A15C7
+Route125_Text_StanDefeat: @ 82A15C7
 	.string "I floundered…$"
 
-Route125_Text_2A15D5: @ 82A15D5
+Route125_Text_StanPostBattle: @ 82A15D5
 	.string "I was blown away by HORSEA's charm,\n"
 	.string "so I started swimming, too.$"
 
-Route125_Text_2A1615: @ 82A1615
+Route125_Text_TanyaIntro: @ 82A1615
 	.string "I'm tired of swimming.\n"
 	.string "Are you up for a battle with me?$"
 
-Route125_Text_2A164D: @ 82A164D
+Route125_Text_TanyaDefeat: @ 82A164D
 	.string "You're too much!$"
 
-Route125_Text_2A165E: @ 82A165E
+Route125_Text_TanyaPostBattle: @ 82A165E
 	.string "Whew…\n"
 	.string "Which way is it to MOSSDEEP CITY?$"
 
-Route125_Text_2A1686: @ 82A1686
+Route125_Text_SharonIntro: @ 82A1686
 	.string "How would you like to take on the\n"
 	.string "WATER-type POKéMON I raised?$"
 
-Route125_Text_2A16C5: @ 82A16C5
+Route125_Text_SharonDefeat: @ 82A16C5
 	.string "Lost it…$"
 
-Route125_Text_2A16CE: @ 82A16CE
+Route125_Text_SharonPostBattle: @ 82A16CE
 	.string "Your power… You're the real deal.\n"
 	.string "I'm amazed!$"
 
-Route125_Text_2A16FC: @ 82A16FC
+Route125_Text_ErnestIntro: @ 82A16FC
 	.string "Ahoy! I'm a buff, tough SAILOR!\n"
 	.string "I've braved the world's seas!$"
 
-Route125_Text_2A173A: @ 82A173A
+Route125_Text_ErnestDefeat: @ 82A173A
 	.string "Gwrroooar!\n"
 	.string "I couldn't win!$"
 
-Route125_Text_2A1755: @ 82A1755
+Route125_Text_ErnestPostBattle: @ 82A1755
 	.string "The tide ebbs and flows inside the\n"
 	.string "SHOAL CAVE.\p"
 	.string "By the way, it's about six hours from\n"
 	.string "high tide to low tide. Did you know?$"
 
-Route125_Text_2A17CF: @ 82A17CF
+Route125_Text_ErnestRegister: @ 82A17CF
 	.string "Register me in your POKéNAV,\n"
 	.string "and I'll tell you something good.$"
 
-Route125_Text_2A180E: @ 82A180E
+Route125_Text_ErnestRematchIntro: @ 82A180E
 	.string "It's high time I get my payback\n"
 	.string "from you! Come on, we're battling!$"
 
-Route125_Text_2A1851: @ 82A1851
+Route125_Text_ErnestRematchDefeat: @ 82A1851
 	.string "I couldn't win!\n"
 	.string "I flat out couldn't win!$"
 
-Route125_Text_2A187A: @ 82A187A
+Route125_Text_ErnestRematchPostBattle: @ 82A187A
 	.string "The SHOAL CAVE…\p"
 	.string "There are places you can and can't\n"
 	.string "get to depending on the rise and fall\l"
@@ -3859,524 +3859,524 @@ Route125_Text_2A187A: @ 82A187A
 	.string "By the way, it's about six hours from\n"
 	.string "high tide to low tide. Don't forget!$"
 
-Route125_Text_2A192B: @ 82A192B
+Route125_Text_KimIntro: @ 82A192B
 	.string "KIM: A funny old man lives in the\n"
 	.string "SHOAL CAVE. Someone told me.\l"
 	.string "Are you going to see him, too?$"
 
-Route125_Text_2A1989: @ 82A1989
+Route125_Text_KimDefeat: @ 82A1989
 	.string "KIM: I thought we would win.$"
 
-Route125_Text_2A19A6: @ 82A19A6
+Route125_Text_KimPostBattle: @ 82A19A6
 	.string "KIM: A funny old man lives in the\n"
 	.string "SHOAL CAVE, doesn't he?\p"
 	.string "Let's go see him, IRIS!$"
 
-Route125_Text_2A19F8: @ 82A19F8
+Route125_Text_KimNotEnoughMons: @ 82A19F8
 	.string "KIM: No, no, no! You need two POKéMON,\n"
 	.string "or it's just no good!$"
 
-Route125_Text_2A1A35: @ 82A1A35
+Route125_Text_IrisIntro: @ 82A1A35
 	.string "IRIS: KIM, can you tell me what we're\n"
 	.string "looking for out here?$"
 
-Route125_Text_2A1A71: @ 82A1A71
+Route125_Text_IrisDefeat: @ 82A1A71
 	.string "IRIS: Oh, we came sort of close.$"
 
-Route125_Text_2A1A92: @ 82A1A92
+Route125_Text_IrisPostBattle: @ 82A1A92
 	.string "IRIS: KIM, are we really going into\n"
 	.string "the SHOAL CAVE?\l"
 	.string "We'll get all wet.$"
 
-Route125_Text_2A1AD9: @ 82A1AD9
+Route125_Text_IrisNotEnoughMons: @ 82A1AD9
 	.string "IRIS: Oh, we could never, ever do\n"
 	.string "anything like a 2-on-1 battle.$"
 
-Route125_Text_2A1B1A: @ 82A1B1A
+Route125_Text_PresleyIntro: @ 82A1B1A
 	.string "Why would a BIRDKEEPER like me\n"
 	.string "come out to the sea?$"
 
-Route125_Text_2A1B4E: @ 82A1B4E
+Route125_Text_PresleyDefeat: @ 82A1B4E
 	.string "Okay.\n"
 	.string "I'll tell you why I'm here.$"
 
-Route125_Text_2A1B70: @ 82A1B70
+Route125_Text_PresleyPostBattle: @ 82A1B70
 	.string "I put a message in a bottle and put\n"
 	.string "it out to sea.\p"
 	.string "I'm sure that a girl SWIMMER will\n"
 	.string "find it!$"
 
-Route125_Text_2A1BCE: @ 82A1BCE
+Route125_Text_AuronIntro: @ 82A1BCE
 	.string "Hey! Was it you throwing garbage\n"
 	.string "into the sea?$"
 
-Route125_Text_2A1BFD: @ 82A1BFD
+Route125_Text_AuronDefeat: @ 82A1BFD
 	.string "Oh, you weren't throwing trash into\n"
 	.string "the sea.$"
 
-Route125_Text_2A1C2A: @ 82A1C2A
+Route125_Text_AuronPostBattle: @ 82A1C2A
 	.string "I found an unsightly bottle bobbing\n"
 	.string "in the waves earlier.\p"
 	.string "It angers me that someone would\n"
 	.string "pollute the sea!$"
 
-Route126_Text_2A1C95: @ 82A1C95
+Route126_Text_BarryIntro: @ 82A1C95
 	.string "Swimming is a full-body workout!\n"
 	.string "You will get fit!$"
 
-Route126_Text_2A1CC8: @ 82A1CC8
+Route126_Text_BarryDefeat: @ 82A1CC8
 	.string "I admit it!\n"
 	.string "You win!$"
 
-Route126_Text_2A1CDD: @ 82A1CDD
+Route126_Text_BarryPostBattle: @ 82A1CDD
 	.string "Thanks to my daily swimming routine…\n"
 	.string "Look! Feast your eyes on this physique!$"
 
-Route126_Text_2A1D2A: @ 82A1D2A
+Route126_Text_DeanIntro: @ 82A1D2A
 	.string "This towering white mountain of rock\n"
 	.string "is SOOTOPOLIS CITY.$"
 
-Route126_Text_2A1D63: @ 82A1D63
+Route126_Text_DeanDefeat: @ 82A1D63
 	.string "I was done in?$"
 
-Route126_Text_2A1D72: @ 82A1D72
+Route126_Text_DeanPostBattle: @ 82A1D72
 	.string "I can't find the entrance to\n"
 	.string "SOOTOPOLIS. Where could it be?$"
 
-Route126_Text_2A1DAE: @ 82A1DAE
+Route126_Text_NikkiIntro: @ 82A1DAE
 	.string "Ufufufufu!\n"
 	.string "I'm a mermaid!$"
 
-Route126_Text_2A1DC8: @ 82A1DC8
+Route126_Text_NikkiDefeat: @ 82A1DC8
 	.string "My fantasy burst as if it were a bubble!\n"
 	.string "Blub, blub, blub…$"
 
-Route126_Text_2A1E03: @ 82A1E03
+Route126_Text_NikkiPostBattle: @ 82A1E03
 	.string "You thrashed me… I want to\n"
 	.string "disappear in a wave of despair…$"
 
-Route126_Text_2A1E3E: @ 82A1E3E
+Route126_Text_BrendaIntro: @ 82A1E3E
 	.string "Hello, kiddo!\n"
 	.string "Want a battle with me?$"
 
-Route126_Text_2A1E63: @ 82A1E63
+Route126_Text_BrendaDefeat: @ 82A1E63
 	.string "Oh, noooooh!$"
 
-Route126_Text_2A1E70: @ 82A1E70
+Route126_Text_BrendaPostBattle: @ 82A1E70
 	.string "I love frolicking with POKéMON in\n"
 	.string "the sea like this!$"
 
-Route126_Text_2A1EA5: @ 82A1EA5
+Route126_Text_PabloIntro: @ 82A1EA5
 	.string "Check out this sculpted body!\n"
 	.string "I'm more cut than a BLACK BELT!$"
 
-Route126_Text_2A1EE3: @ 82A1EE3
+Route126_Text_PabloDefeat: @ 82A1EE3
 	.string "Whoops! Too strong!\n"
 	.string "Not bad! Not bad at all!$"
 
-Route126_Text_2A1F10: @ 82A1F10
+Route126_Text_PabloPostBattle: @ 82A1F10
 	.string "Losing to you stimulated my senses!\n"
 	.string "I'll train myself and POKéMON harder!$"
 
-Route126_Text_2A1F5A: @ 82A1F5A
+Route126_Text_PabloRegister: @ 82A1F5A
 	.string "Yep, you're not bad at all!\n"
 	.string "I'd like to get to know you more!$"
 
-Route126_Text_2A1F98: @ 82A1F98
+Route126_Text_PabloRematchIntro: @ 82A1F98
 	.string "Check out this beautiful body!\n"
 	.string "I'm more shapely than a SWIMMER!$"
 
-Route126_Text_2A1FD8: @ 82A1FD8
+Route126_Text_PabloRematchDefeat: @ 82A1FD8
 	.string "Whoops! Really too strong!\n"
 	.string "Not bad! Not bad at all!$"
 
-Route126_Text_2A200C: @ 82A200C
+Route126_Text_PabloPostRematch: @ 82A200C
 	.string "I'm going to train even harder!\n"
 	.string "You're a great motivator!\l"
 	.string "You have to come back again!$"
 
-Route126_Text_2A2063: @ 82A2063
+Route126_Text_LeonardoIntro: @ 82A2063
 	.string "I couldn't even swim last year,\n"
 	.string "but now I'm a decent SWIMMER.\p"
 	.string "I think I'm capable of anything now.$"
 
-Route126_Text_2A20C6: @ 82A20C6
+Route126_Text_LeonardoDefeat: @ 82A20C6
 	.string "Sheesh, getting greedy didn't do\n"
 	.string "a thing for me.$"
 
-Route126_Text_2A20F7: @ 82A20F7
+Route126_Text_LeonardoPostBattle: @ 82A20F7
 	.string "If you practice at something,\n"
 	.string "you will get better at it.\p"
 	.string "You're young--don't be afraid to\n"
 	.string "try all sorts of things!$"
 
-Route126_Text_2A216A: @ 82A216A
+Route126_Text_IsobelIntro: @ 82A216A
 	.string "If seawater gets up your nose,\n"
 	.string "doesn't it feel terrible?$"
 
-Route126_Text_2A21A3: @ 82A21A3
+Route126_Text_IsobelDefeat: @ 82A21A3
 	.string "Ack! Why, you…\n"
 	.string "Glub!$"
 
-Route126_Text_2A21B8: @ 82A21B8
+Route126_Text_IsobelPostBattle: @ 82A21B8
 	.string "Ooh, I choked on some water!\n"
 	.string "It's bitter! It's salty!!$"
 
-Route126_Text_2A21EF: @ 82A21EF
+Route126_Text_SiennaIntro: @ 82A21EF
 	.string "I'm throwing my whole heart\n"
 	.string "into this!$"
 
-Route126_Text_2A2216: @ 82A2216
+Route126_Text_SiennaDefeat: @ 82A2216
 	.string "You had more heart!$"
 
-Route126_Text_2A222A: @ 82A222A
+Route126_Text_SiennaPostBattle: @ 82A222A
 	.string "I need to cool down now…\n"
 	.string "I think I'll go for a dive.$"
 
-Route127_Text_2A225F: @ 82A225F
+Route127_Text_CamdenIntro: @ 82A225F
 	.string "I can see it in your face.\n"
 	.string "You want to challenge me.$"
 
-Route127_Text_2A2294: @ 82A2294
+Route127_Text_CamdenDefeat: @ 82A2294
 	.string "Awawawawawa…$"
 
-Route127_Text_2A22A1: @ 82A22A1
+Route127_Text_CamdenPostBattle: @ 82A22A1
 	.string "A well-played match leaves me feeling\n"
 	.string "refreshed and serene.$"
 
-Route127_Text_2A22DD: @ 82A22DD
+Route127_Text_DonnyIntro: @ 82A22DD
 	.string "Do you have a rival whom you just\n"
 	.string "hate to lose against?$"
 
-Route127_Text_2A2315: @ 82A2315
+Route127_Text_DonnyDefeat: @ 82A2315
 	.string "Arrrgh!\n"
 	.string "I hate losing!$"
 
-Route127_Text_2A232C: @ 82A232C
+Route127_Text_DonnyPostBattle: @ 82A232C
 	.string "If you have a rival, don't you get the\n"
 	.string "feeling that you have to keep getting\l"
 	.string "better?$"
 
-Route127_Text_2A2381: @ 82A2381
+Route127_Text_JonahIntro: @ 82A2381
 	.string "Through fishing, I have attained a\n"
 	.string "state of becalmed serenity…\p"
 	.string "Please, allow me to demonstrate…$"
 
-Route127_Text_2A23E1: @ 82A23E1
+Route127_Text_JonahDefeat: @ 82A23E1
 	.string "Though I have lost, my heart remains\n"
 	.string "calm…$"
 
-Route127_Text_2A240C: @ 82A240C
+Route127_Text_JonahPostBattle: @ 82A240C
 	.string "It matters not that I catch nothing.\n"
 	.string "The line remains in the water…$"
 
-Route127_Text_2A2450: @ 82A2450
+Route127_Text_HenryIntro: @ 82A2450
 	.string "Whoops! Don't tell me I snagged\n"
 	.string "a SURFING POKéMON?$"
 
-Route127_Text_2A2483: @ 82A2483
+Route127_Text_HenryDefeat: @ 82A2483
 	.string "I can't keep up!$"
 
-Route127_Text_2A2494: @ 82A2494
+Route127_Text_HenryPostBattle: @ 82A2494
 	.string "It'd be a handful if I hooked\n"
 	.string "your tough POKéMON!$"
 
-Route127_Text_2A24C6: @ 82A24C6
+Route127_Text_RogerIntro: @ 82A24C6
 	.string "Well, hey! This is a match between\n"
 	.string "a POKéMON fan and a fishing buff!$"
 
-Route127_Text_2A250B: @ 82A250B
+Route127_Text_RogerDefeat: @ 82A250B
 	.string "No! My line's all tangled!\n"
 	.string "The party's over!$"
 
-Route127_Text_2A2538: @ 82A2538
+Route127_Text_RogerPostBattle: @ 82A2538
 	.string "My fishing line's doing a dance!\n"
 	.string "The tangle tango! Hahaha, snarl!$"
 
-Route127_Text_2A257A: @ 82A257A
+Route127_Text_AidanIntro: @ 82A257A
 	.string "BIRD POKéMON have excellent vision.\n"
 	.string "They spot prey from great heights.$"
 
-Route127_Text_2A25C1: @ 82A25C1
+Route127_Text_AidanDefeat: @ 82A25C1
 	.string "Whew… I give up.$"
 
-Route127_Text_2A25D2: @ 82A25D2
+Route127_Text_AidanPostBattle: @ 82A25D2
 	.string "There're lots of diving spots in\n"
 	.string "the sea around here.\p"
 	.string "You can spot them easily from the sky\n"
 	.string "because of their darker color.$"
 
-Route127_Text_2A264D: @ 82A264D
+Route127_Text_KojiIntro: @ 82A264D
 	.string "Run in your bare feet.\n"
 	.string "That will toughen up your soles!$"
 
-Route127_Text_2A2685: @ 82A2685
+Route127_Text_KojiDefeat: @ 82A2685
 	.string "Yowch!\n"
 	.string "I got a pebble under a toenail!$"
 
-Route127_Text_2A26AC: @ 82A26AC
+Route127_Text_KojiPostBattle: @ 82A26AC
 	.string "Going barefoot feels great.\n"
 	.string "But your RUNNING SHOES are cool, too.$"
 
-Route127_Text_2A26EE: @ 82A26EE
+Route127_Text_KojiRegister: @ 82A26EE
 	.string "This is what I do to people who beat me!\n"
 	.string "I hope we can do this again.$"
 
-Route127_Text_2A2734: @ 82A2734
+Route127_Text_KojiRematchIntro: @ 82A2734
 	.string "I still run in my bare feet daily.\n"
 	.string "My soles are tough!$"
 
-Route127_Text_2A276B: @ 82A276B
+Route127_Text_KojiRematchDefeat: @ 82A276B
 	.string "Yowch!\n"
 	.string "Pebbles dug into my arches!$"
 
-Route127_Text_2A278E: @ 82A278E
+Route127_Text_KojiPostRematch: @ 82A278E
 	.string "Want to go barefoot for a while?\n"
 	.string "So I can try your RUNNING SHOES?$"
 
-Route127_Text_2A27D0: @ 82A27D0
+Route127_Text_AthenaIntro: @ 82A27D0
 	.string "We should have a slow and methodical\n"
 	.string "match.$"
 
-Route127_Text_2A27FC: @ 82A27FC
+Route127_Text_AthenaDefeat: @ 82A27FC
 	.string "You didn't give me the chance to\n"
 	.string "do any strategizing.$"
 
-Route127_Text_2A2832: @ 82A2832
+Route127_Text_AthenaPostBattle: @ 82A2832
 	.string "When I'm surrounded by the blue sea\n"
 	.string "and sky, it feels as if time slows down.$"
 
-Route128_Text_2A287F: @ 82A287F
+Route128_Text_IsaiahIntro: @ 82A287F
 	.string "EVER GRANDE CITY is still a long ways\n"
 	.string "away…$"
 
-Route128_Text_2A28AB: @ 82A28AB
+Route128_Text_IsaiahDefeat: @ 82A28AB
 	.string "My first victory seems to be far\n"
 	.string "away, too…$"
 
-Route128_Text_2A28D7: @ 82A28D7
+Route128_Text_IsaiahPostBattle: @ 82A28D7
 	.string "My whole life has been about losing,\n"
 	.string "but I will never give up!$"
 
-Route128_Text_2A2916: @ 82A2916
+Route128_Text_IsaiahRegister: @ 82A2916
 	.string "I know I'm not good now, but I think\n"
 	.string "I can win eventually.\p"
 	.string "Please register me in your POKéNAV.$"
 
-Route128_Text_2A2975: @ 82A2975
+Route128_Text_IsaiahRematchIntro: @ 82A2975
 	.string "I'm still feeling good. I'll keep on\n"
 	.string "swimming to EVER GRANDE CITY.$"
 
-Route128_Text_2A29B8: @ 82A29B8
+Route128_Text_IsaiahRematchDefeat: @ 82A29B8
 	.string "I've yet to taste my first victory…$"
 
-Route128_Text_2A29DC: @ 82A29DC
+Route128_Text_IsaiahPostRematch: @ 82A29DC
 	.string "I'll eventually reach EVER GRANDE CITY\n"
 	.string "where I can eventually win…$"
 
-Route128_Text_2A2A1F: @ 82A2A1F
+Route128_Text_KatelynIntro: @ 82A2A1F
 	.string "You have to swim, cycle, and then run\n"
 	.string "a marathon in a triathlon.\p"
 	.string "It's a grueling race that consists\n"
 	.string "of three events.$"
 
-Route128_Text_2A2A94: @ 82A2A94
+Route128_Text_KatelynDefeat: @ 82A2A94
 	.string "A POKéMON battle is grueling, too…$"
 
-Route128_Text_2A2AB7: @ 82A2AB7
+Route128_Text_KatelynPostBattle: @ 82A2AB7
 	.string "I have to ride a BIKE next, but…\n"
 	.string "I'm about to throw in the towel…$"
 
-Route128_Text_2A2AF9: @ 82A2AF9
+Route128_Text_KatelynRegister: @ 82A2AF9
 	.string "Well, I may as well make the best\n"
 	.string "of this. I'd like a rematch sometime.$"
 
-Route128_Text_2A2B41: @ 82A2B41
+Route128_Text_KatelynRematchIntro: @ 82A2B41
 	.string "A triathlon is long. But I guess the\n"
 	.string "road to become the POKéMON CHAMPION\l"
 	.string "is also a long and grueling one.$"
 
-Route128_Text_2A2BAB: @ 82A2BAB
+Route128_Text_KatelynRematchDefeat: @ 82A2BAB
 	.string "A POKéMON battle really is harsh\n"
 	.string "and unforgiving…$"
 
-Route128_Text_2A2BDD: @ 82A2BDD
+Route128_Text_KatelynPostRematch: @ 82A2BDD
 	.string "You should give serious thought to\n"
 	.string "challenges on VICTORY ROAD.$"
 
-Route128_Text_2A2C1C: @ 82A2C1C
+Route128_Text_AlexaIntro: @ 82A2C1C
 	.string "We've been working so hard to mount\n"
 	.string "a POKéMON LEAGUE challenge…\p"
 	.string "We can't afford to lose now!$"
 
-Route128_Text_2A2C79: @ 82A2C79
+Route128_Text_AlexaDefeat: @ 82A2C79
 	.string "Oh!\n"
 	.string "How could this happen?!$"
 
-Route128_Text_2A2C95: @ 82A2C95
+Route128_Text_AlexaPostBattle: @ 82A2C95
 	.string "After all I've done to get here,\n"
 	.string "I won't give up after one setback.$"
 
-Route128_Text_2A2CD9: @ 82A2CD9
+Route128_Text_RubenIntro: @ 82A2CD9
 	.string "There is no stronger TRAINER than I!$"
 
-Route128_Text_2A2CFE: @ 82A2CFE
+Route128_Text_RubenDefeat: @ 82A2CFE
 	.string "This can't be!$"
 
-Route128_Text_2A2D0D: @ 82A2D0D
+Route128_Text_RubenPostBattle: @ 82A2D0D
 	.string "There probably is no stronger TRAINER\n"
 	.string "than you!$"
 
-Route128_Text_2A2D3D: @ 82A2D3D
+Route128_Text_WayneIntro: @ 82A2D3D
 	.string "I want to visit EVER GRANDE, so I\n"
 	.string "caught myself a POKéMON that knows\l"
 	.string "the move WATERFALL to crest the falls.$"
 
-Route128_Text_2A2DA9: @ 82A2DA9
+Route128_Text_WayneDefeat: @ 82A2DA9
 	.string "I'm crestfallen!$"
 
-Route128_Text_2A2DBA: @ 82A2DBA
+Route128_Text_WaynePostBattle: @ 82A2DBA
 	.string "Awww, phooey!\p"
 	.string "My POKéMON knows WATERFALL, but\n"
 	.string "I don't have the SOOTOPOLIS GYM BADGE!$"
 
-Route128_Text_2A2E0F: @ 82A2E0F
+Route128_Text_HarrisonIntro: @ 82A2E0F
 	.string "You're looking awfully tough.\n"
 	.string "I wonder if I can win?$"
 
-Route128_Text_2A2E44: @ 82A2E44
+Route128_Text_HarrisonDefeat: @ 82A2E44
 	.string "Ouch!\n"
 	.string "I guess it was impossible to win.$"
 
-Route128_Text_2A2E6C: @ 82A2E6C
+Route128_Text_HarrisonPostBattle: @ 82A2E6C
 	.string "There are tough TRAINERS galore\n"
 	.string "around EVER GRANDE.\p"
 	.string "Do you think I may be out\n"
 	.string "of my league?$"
 
-Route128_Text_2A2EC8: @ 82A2EC8
+Route128_Text_CarleeIntro: @ 82A2EC8
 	.string "The sunlight seems to be more harsh\n"
 	.string "in this area.$"
 
-Route128_Text_2A2EFA: @ 82A2EFA
+Route128_Text_CarleeDefeat: @ 82A2EFA
 	.string "I couldn't see very well because of\n"
 	.string "the sun's glare.$"
 
-Route128_Text_2A2F2F: @ 82A2F2F
+Route128_Text_CarleePostBattle: @ 82A2F2F
 	.string "I should go back soon.\n"
 	.string "I need to reapply my sunscreen.$"
 
-Route129_Text_2A2F66: @ 82A2F66
+Route129_Text_ChaseIntro: @ 82A2F66
 	.string "This is my first triathlon.\n"
 	.string "I'm all tense and nervous!$"
 
-Route129_Text_2A2F9D: @ 82A2F9D
+Route129_Text_ChaseDefeat: @ 82A2F9D
 	.string "Wroooaaar!\n"
 	.string "I failed to win!$"
 
-Route129_Text_2A2FB9: @ 82A2FB9
+Route129_Text_ChasePostBattle: @ 82A2FB9
 	.string "If I'm all tensed up, I won't be able to\n"
 	.string "give it my all.$"
 
-Route129_Text_2A2FF2: @ 82A2FF2
+Route129_Text_AllisonIntro: @ 82A2FF2
 	.string "I'm in the middle of a triathlon,\n"
 	.string "but, sure, why don't we battle?$"
 
-Route129_Text_2A3034: @ 82A3034
+Route129_Text_AllisonDefeat: @ 82A3034
 	.string "I was sure I'd win!$"
 
-Route129_Text_2A3048: @ 82A3048
+Route129_Text_AllisonPostBattle: @ 82A3048
 	.string "Do you know what's the greatest thing\n"
 	.string "about triathlons?\p"
 	.string "Testing the limits of your own\n"
 	.string "strength and endurance against\l"
 	.string "Mother Nature!$"
 
-Route129_Text_2A30CD: @ 82A30CD
+Route129_Text_ReedIntro: @ 82A30CD
 	.string "Say hey, hey!\n"
 	.string "Let's get on with it!$"
 
-Route129_Text_2A30F1: @ 82A30F1
+Route129_Text_ReedDefeat: @ 82A30F1
 	.string "Beat, I'm beaten.\n"
 	.string "That's it, done!$"
 
-Route129_Text_2A3114: @ 82A3114
+Route129_Text_ReedPostBattle: @ 82A3114
 	.string "There's nothing for a loser.\n"
 	.string "Time for me to beat it home.$"
 
-Route129_Text_2A314E: @ 82A314E
+Route129_Text_TishaIntro: @ 82A314E
 	.string "What's the hurry?\n"
 	.string "Let's take it slow and easy.$"
 
-Route129_Text_2A317D: @ 82A317D
+Route129_Text_TishaDefeat: @ 82A317D
 	.string "Oh, my.\n"
 	.string "I wanted to relax a little more…$"
 
-Route129_Text_2A31A6: @ 82A31A6
+Route129_Text_TishaPostBattle: @ 82A31A6
 	.string "Don't you hate making mistakes when\n"
 	.string "you're in a rush?\p"
 	.string "That's why I try to take things\n"
 	.string "slowly.$"
 
-Route129_Text_2A3204: @ 82A3204
+Route129_Text_ClarenceIntro: @ 82A3204
 	.string "Surfing isn't as easy as it seems,\n"
 	.string "isn't that right?$"
 
-Route129_Text_2A3239: @ 82A3239
+Route129_Text_ClarenceDefeat: @ 82A3239
 	.string "Winning sure isn't easy.$"
 
-Route129_Text_2A3252: @ 82A3252
+Route129_Text_ClarencePostBattle: @ 82A3252
 	.string "You have your sights on the POKéMON\n"
 	.string "LEAGUE? Keep at it!$"
 
-Route130_Text_2A328A: @ 82A328A
+Route130_Text_RodneyIntro: @ 82A328A
 	.string "What a surprise! I didn't expect to\n"
 	.string "see a TRAINER out in the sea.\p"
 	.string "I think we should battle!$"
 
-Route130_Text_2A32E6: @ 82A32E6
+Route130_Text_RodneyDefeat: @ 82A32E6
 	.string "This kid's awfully tough…$"
 
-Route130_Text_2A3300: @ 82A3300
+Route130_Text_RodneyPostBattle: @ 82A3300
 	.string "Your eyes have that look of someone\n"
 	.string "who's experienced harsh challenges\l"
 	.string "and won. It suits you well!$"
 
-Route130_Text_2A3363: @ 82A3363
+Route130_Text_KatieIntro: @ 82A3363
 	.string "In the deep blue sea,\n"
 	.string "my shattered blue heart finds\l"
 	.string "comfort among waves.$"
 
-Route130_Text_2A33AC: @ 82A33AC
+Route130_Text_KatieDefeat: @ 82A33AC
 	.string "Like the vast blue sea,\n"
 	.string "the world of POKéMON spans\l"
 	.string "depths beyond belief.$"
 
-Route130_Text_2A33F5: @ 82A33F5
+Route130_Text_KatiePostBattle: @ 82A33F5
 	.string "The world's children dream\n"
 	.string "of one day becoming\l"
 	.string "the POKéMON CHAMPION.$"
 
-Route130_Text_2A343A: @ 82A343A
+Route130_Text_SantiagoIntro: @ 82A343A
 	.string "Floating on the open sea like this…\n"
 	.string "It's peaceful.$"
 
-Route130_Text_2A346D: @ 82A346D
+Route130_Text_SantiagoDefeat: @ 82A346D
 	.string "I needed to be a little less peaceful!$"
 
-Route130_Text_2A3494: @ 82A3494
+Route130_Text_SantiagoPostBattle: @ 82A3494
 	.string "Swimming and battling like this…\n"
 	.string "I'm one happy guy…$"
 
-Route131_Text_2A34C8: @ 82A34C8
+Route131_Text_RichardIntro: @ 82A34C8
 	.string "The sea is teeming with POKéMON.\n"
 	.string "It's not easy swimming, I tell you.$"
 
-Route131_Text_2A350D: @ 82A350D
+Route131_Text_RichardDefeat: @ 82A350D
 	.string "POKéMON raised by TRAINERS are\n"
 	.string "seriously tough…$"
 
-Route131_Text_2A353D: @ 82A353D
+Route131_Text_RichardPostBattle: @ 82A353D
 	.string "Gasp… Gasp…\n"
 	.string "I'm wiped out…\p"
 	.string "The going's easy. It's the leaving\n"
@@ -4384,398 +4384,398 @@ Route131_Text_2A353D: @ 82A353D
 	.string "Will I have any energy left to make\n"
 	.string "the return trip?$"
 
-Route131_Text_2A35C6: @ 82A35C6
+Route131_Text_HermanIntro: @ 82A35C6
 	.string "The sea… The sea… The sea…\n"
 	.string "The sea as far as these eyes can see!\l"
 	.string "I'm sick and tired of the sea!$"
 
-Route131_Text_2A3626: @ 82A3626
+Route131_Text_HermanDefeat: @ 82A3626
 	.string "Bleah!$"
 
-Route131_Text_2A362D: @ 82A362D
+Route131_Text_HermanPostBattle: @ 82A362D
 	.string "Bored I am by the sea, but swim I must.\p"
 	.string "I'm a born swimmer!\n"
 	.string "That's what I am.$"
 
-Route131_Text_2A367B: @ 82A367B
+Route131_Text_SusieIntro: @ 82A367B
 	.string "Hi, sweetie, wait!\n"
 	.string "We should battle, you and I!$"
 
-Route131_Text_2A36AB: @ 82A36AB
+Route131_Text_SusieDefeat: @ 82A36AB
 	.string "You're tough in spite of the way\n"
 	.string "you look!$"
 
-Route131_Text_2A36D6: @ 82A36D6
+Route131_Text_SusiePostBattle: @ 82A36D6
 	.string "Did you see a guy over there who whines\n"
 	.string "that he's bored of the sea?\p"
 	.string "That's all talk.\n"
 	.string "He's hopelessly in love with the sea!$"
 
-Route131_Text_2A3751: @ 82A3751
+Route131_Text_KaraIntro: @ 82A3751
 	.string "Why do men love bathing suits so much?\p"
 	.string "They all ogle me!$"
 
-Route131_Text_2A378A: @ 82A378A
+Route131_Text_KaraDefeat: @ 82A378A
 	.string "I'm out of my depth!$"
 
-Route131_Text_2A379F: @ 82A379F
+Route131_Text_KaraPostBattle: @ 82A379F
 	.string "Maybe it's not my bathing suit that\n"
 	.string "makes men look. It must be my beauty!$"
 
-Route131_Text_2A37E9: @ 82A37E9
+Route131_Text_ReliIntro: @ 82A37E9
 	.string "RELI: We'll work together as siblings\n"
 	.string "to take you on!$"
 
-Route131_Text_2A381F: @ 82A381F
+Route131_Text_ReliDefeat: @ 82A381F
 	.string "RELI: We couldn't win even though we\n"
 	.string "worked together…$"
 
-Route131_Text_2A3855: @ 82A3855
+Route131_Text_ReliPostBattle: @ 82A3855
 	.string "RELI: The people of PACIFIDLOG are\n"
 	.string "together with the sea and POKéMON from\l"
 	.string "the time they are born.$"
 
-Route131_Text_2A38B7: @ 82A38B7
+Route131_Text_ReliNotEnoughMons: @ 82A38B7
 	.string "RELI: You don't have two POKéMON?\n"
 	.string "We can't enjoy a battle, then.$"
 
-Route131_Text_2A38F8: @ 82A38F8
+Route131_Text_IanIntro: @ 82A38F8
 	.string "IAN: I'm doing my best together with\n"
 	.string "my sis!$"
 
-Route131_Text_2A3925: @ 82A3925
+Route131_Text_IanDefeat: @ 82A3925
 	.string "IAN: I did my best with my sis,\n"
 	.string "but we still couldn't win…$"
 
-Route131_Text_2A3960: @ 82A3960
+Route131_Text_IanPostBattle: @ 82A3960
 	.string "IAN: You know how PACIFIDLOG is\n"
 	.string "a floating town?\p"
 	.string "So, wherever there is the sea,\n"
 	.string "that's a part of PACIFIDLOG!$"
 
-Route131_Text_2A39CD: @ 82A39CD
+Route131_Text_IanNotEnoughMons: @ 82A39CD
 	.string "IAN: If you have two POKéMON,\n"
 	.string "we'll take you on!$"
 
-Route131_Text_2A39FE: @ 82A39FE
+Route131_Text_TaliaIntro: @ 82A39FE
 	.string "If you can beat me, I'll give you some\n"
 	.string "great information!$"
 
-Route131_Text_2A3A38: @ 82A3A38
+Route131_Text_TaliaDefeat: @ 82A3A38
 	.string "Oh?\n"
 	.string "Did I lose?$"
 
-Route131_Text_2A3A48: @ 82A3A48
+Route131_Text_TaliaPostBattle: @ 82A3A48
 	.string "There is an odd place nearby.\n"
 	.string "There's a huge tower there.\l"
 	.string "Why don't you go take a look?$"
 
-Route131_Text_2A3AA0: @ 82A3AA0
+Route131_Text_KevinIntro: @ 82A3AA0
 	.string "The people of PACIFIDLOG are\n"
 	.string "a peaceful bunch.\p"
 	.string "They never get angry.\n"
 	.string "That goes for me, too.$"
 
-Route131_Text_2A3AFC: @ 82A3AFC
+Route131_Text_KevinDefeat: @ 82A3AFC
 	.string "Oops!$"
 
-Route131_Text_2A3B02: @ 82A3B02
+Route131_Text_KevinPostBattle: @ 82A3B02
 	.string "Tch! …Oh, wait.\n"
 	.string "I'm not angry. Honestly!\p"
 	.string "But, boy, you're strong!\n"
 	.string "Hahaha!$"
 
-Route132_Text_2A3B4C: @ 82A3B4C
+Route132_Text_GilbertIntro: @ 82A3B4C
 	.string "I used to catch colds all the time as\n"
 	.string "a kid, but I became totally fit after\l"
 	.string "I started swimming.$"
 
-Route132_Text_2A3BAC: @ 82A3BAC
+Route132_Text_GilbertDefeat: @ 82A3BAC
 	.string "I crave more power…$"
 
-Route132_Text_2A3BC0: @ 82A3BC0
+Route132_Text_GilbertPostBattle: @ 82A3BC0
 	.string "TRAINERS travel the fields and\n"
 	.string "mountains, so they must be fit, too.$"
 
-Route132_Text_2A3C04: @ 82A3C04
+Route132_Text_DanaIntro: @ 82A3C04
 	.string "I try not to swim where the currents\n"
 	.string "are too strong.$"
 
-Route132_Text_2A3C39: @ 82A3C39
+Route132_Text_DanaDefeat: @ 82A3C39
 	.string "Oh, please, no!$"
 
-Route132_Text_2A3C49: @ 82A3C49
+Route132_Text_DanaPostBattle: @ 82A3C49
 	.string "If I get swept away, I'll lose all my\n"
 	.string "sense of place…$"
 
-Route132_Text_2A3C7F: @ 82A3C7F
+Route132_Text_RonaldIntro: @ 82A3C7F
 	.string "Win or lose, you'll never know until\n"
 	.string "you try!$"
 
-Route132_Text_2A3CAD: @ 82A3CAD
+Route132_Text_RonaldDefeat: @ 82A3CAD
 	.string "Waah!\n"
 	.string "I sank in defeat!$"
 
-Route132_Text_2A3CC5: @ 82A3CC5
+Route132_Text_RonaldPostBattle: @ 82A3CC5
 	.string "I never battle when I know I'll win.\n"
 	.string "I like to battle at the razor's edge of\l"
 	.string "victory and defeat!$"
 
-Route132_Text_2A3D26: @ 82A3D26
+Route132_Text_KiyoIntro: @ 82A3D26
 	.string "I contemplate POKéMON 24 hours a day.\n"
 	.string "How could you possibly beat me?$"
 
-Route132_Text_2A3D6C: @ 82A3D6C
+Route132_Text_KiyoDefeat: @ 82A3D6C
 	.string "I lose.\n"
 	.string "I will concede defeat.$"
 
-Route132_Text_2A3D8B: @ 82A3D8B
+Route132_Text_KiyoPostBattle: @ 82A3D8B
 	.string "Urggh…\n"
 	.string "You're a POKéMON fanatic, aren't you?\p"
 	.string "You must contemplate POKéMON 24 hours\n"
 	.string "a day, don't you?$"
 
-Route132_Text_2A3DF0: @ 82A3DF0
+Route132_Text_MakaylaIntro: @ 82A3DF0
 	.string "I'm always with my husband,\n"
 	.string "but I can win even without him.$"
 
-Route132_Text_2A3E2C: @ 82A3E2C
+Route132_Text_MakaylaDefeat: @ 82A3E2C
 	.string "Oh, I guess I wasn't good enough.$"
 
-Route132_Text_2A3E4E: @ 82A3E4E
+Route132_Text_MakaylaPostBattle: @ 82A3E4E
 	.string "That young man over there looks just\n"
 	.string "like my husband when he was young.\p"
 	.string "He's making me blush!$"
 
-Route132_Text_2A3EAC: @ 82A3EAC
+Route132_Text_JonathanIntro: @ 82A3EAC
 	.string "Someone's been watching me intently.\n"
 	.string "Was it you?$"
 
-Route132_Text_2A3EDD: @ 82A3EDD
+Route132_Text_JonathanDefeat: @ 82A3EDD
 	.string "Wow!\n"
 	.string "That's pretty strong, all right!$"
 
-Route132_Text_2A3F03: @ 82A3F03
+Route132_Text_JonathanPostBattle: @ 82A3F03
 	.string "I can't shake this feeling that\n"
 	.string "someone's watching me.\p"
 	.string "I can't concentrate!$"
 
-Route132_Text_2A3F4F: @ 82A3F4F
+Route132_Text_PaxtonIntro: @ 82A3F4F
 	.string "Now where could my wife have gone?\n"
 	.string "I'm always with her.\l"
 	.string "I wonder if I can win on my own.$"
 
-Route132_Text_2A3FA8: @ 82A3FA8
+Route132_Text_PaxtonDefeat: @ 82A3FA8
 	.string "Ah, I see that I couldn't manage\n"
 	.string "to win on my own after all.$"
 
-Route132_Text_2A3FE5: @ 82A3FE5
+Route132_Text_PaxtonPostBattle: @ 82A3FE5
 	.string "My wife must be looking for me.\n"
 	.string "I'd best go find her right away.$"
 
-Route132_Text_2A4026: @ 82A4026
+Route132_Text_DarcyIntro: @ 82A4026
 	.string "I liked training here by myself.\n"
 	.string "It's awful that all these people came!$"
 
-Route132_Text_2A406E: @ 82A406E
+Route132_Text_DarcyDefeat: @ 82A406E
 	.string "Okay! I won't complain about other\n"
 	.string "people being here.$"
 
-Route132_Text_2A40A4: @ 82A40A4
+Route132_Text_DarcyPostBattle: @ 82A40A4
 	.string "I suppose I can partner up with that\n"
 	.string "old man and challenge that other team.$"
 
-Route133_Text_2A40F0: @ 82A40F0
+Route133_Text_FranklinIntro: @ 82A40F0
 	.string "Did the currents carry you here, too?\n"
 	.string "This must have been fated.\l"
 	.string "Let's battle!$"
 
-Route133_Text_2A413F: @ 82A413F
+Route133_Text_FranklinDefeat: @ 82A413F
 	.string "Strong!\n"
 	.string "Too much so!$"
 
-Route133_Text_2A4154: @ 82A4154
+Route133_Text_FranklinPostBattle: @ 82A4154
 	.string "It's just my luck that a tough TRAINER\n"
 	.string "like you would drift here…\l"
 	.string "I must be cursed…$"
 
-Route133_Text_2A41A8: @ 82A41A8
+Route133_Text_DebraIntro: @ 82A41A8
 	.string "I've led a life of woe and misery…\n"
 	.string "I've been cast away, and this is where\l"
 	.string "I've drifted…$"
 
-Route133_Text_2A4200: @ 82A4200
+Route133_Text_DebraDefeat: @ 82A4200
 	.string "Another loss…$"
 
-Route133_Text_2A420E: @ 82A420E
+Route133_Text_DebraPostBattle: @ 82A420E
 	.string "A life adrift…\n"
 	.string "I don't want it anymore!$"
 
-Route133_Text_2A4236: @ 82A4236
+Route133_Text_LindaIntro: @ 82A4236
 	.string "Welcome!\n"
 	.string "I've been expecting you!$"
 
-Route133_Text_2A4258: @ 82A4258
+Route133_Text_LindaDefeat: @ 82A4258
 	.string "No! Please!$"
 
-Route133_Text_2A4264: @ 82A4264
+Route133_Text_LindaPostBattle: @ 82A4264
 	.string "A strong child TRAINER…\n"
 	.string "That's so annoying!$"
 
-Route133_Text_2A4290: @ 82A4290
+Route133_Text_WarrenIntro: @ 82A4290
 	.string "I want to win like everyone else, but I\n"
 	.string "won't raise POKéMON like everyone else.$"
 
-Route133_Text_2A42E0: @ 82A42E0
+Route133_Text_WarrenDefeat: @ 82A42E0
 	.string "Darn it!\n"
 	.string "My way is still too slack!$"
 
-Route133_Text_2A4304: @ 82A4304
+Route133_Text_WarrenPostBattle: @ 82A4304
 	.string "It's way more fun to do things the way\n"
 	.string "I want than to be like everybody else.\l"
 	.string "I mean, that's obvious!$"
 
-Route133_Text_2A436A: @ 82A436A
+Route133_Text_BeckIntro: @ 82A436A
 	.string "I came all the way out here with my\n"
 	.string "BIRD POKéMON.$"
 
-Route133_Text_2A439C: @ 82A439C
+Route133_Text_BeckDefeat: @ 82A439C
 	.string "You…\n"
 	.string "You're stunningly cool!$"
 
-Route133_Text_2A43B9: @ 82A43B9
+Route133_Text_BeckPostBattle: @ 82A43B9
 	.string "I'd like to go back to FORTREE,\n"
 	.string "but I've grown to like this place, too.$"
 
-Route133_Text_2A4401: @ 82A4401
+Route133_Text_MollieIntro: @ 82A4401
 	.string "I must have battled thousands\n"
 	.string "of times. I've lost count.$"
 
-Route133_Text_2A443A: @ 82A443A
+Route133_Text_MollieDefeat: @ 82A443A
 	.string "I may have lost thousands of times,\n"
 	.string "but a loss still stings.$"
 
-Route133_Text_2A4477: @ 82A4477
+Route133_Text_MolliePostBattle: @ 82A4477
 	.string "Keep at this, youngster. So you can\n"
 	.string "become like my husband and me.$"
 
-Route133_Text_2A44BA: @ 82A44BA
+Route133_Text_ConorIntro: @ 82A44BA
 	.string "Young people are too happy to go with\n"
 	.string "the flow. They're without direction.$"
 
-Route133_Text_2A4505: @ 82A4505
+Route133_Text_ConorDefeat: @ 82A4505
 	.string "You have a firm sense of purpose.$"
 
-Route133_Text_2A4527: @ 82A4527
+Route133_Text_ConorPostBattle: @ 82A4527
 	.string "Don't let others lead you astray.\n"
 	.string "Don't lose direction as you grow older.$"
 
-Route134_Text_2A4571: @ 82A4571
+Route134_Text_JackIntro: @ 82A4571
 	.string "Even those POKéMON that can swim are\n"
 	.string "carried along by the rapid currents.$"
 
-Route134_Text_2A45BB: @ 82A45BB
+Route134_Text_JackDefeat: @ 82A45BB
 	.string "Aiyeeeeh!$"
 
-Route134_Text_2A45C5: @ 82A45C5
+Route134_Text_JackPostBattle: @ 82A45C5
 	.string "I think POKéMON enjoy the fast-running\n"
 	.string "currents around these parts.$"
 
-Route134_Text_2A4609: @ 82A4609
+Route134_Text_LaurelIntro: @ 82A4609
 	.string "My LUVDISC are looking for a fun\n"
 	.string "match. Will you join us?$"
 
-Route134_Text_2A4643: @ 82A4643
+Route134_Text_LaurelDefeat: @ 82A4643
 	.string "Oopsie!$"
 
-Route134_Text_2A464B: @ 82A464B
+Route134_Text_LaurelPostBattle: @ 82A464B
 	.string "There's a collector who's after\n"
 	.string "the SCALES of LUVDISC.$"
 
-Route134_Text_2A4682: @ 82A4682
+Route134_Text_AlexIntro: @ 82A4682
 	.string "Okeydokey! That's enough rest, gang!\n"
 	.string "It's time for a match!$"
 
-Route134_Text_2A46BE: @ 82A46BE
+Route134_Text_AlexDefeat: @ 82A46BE
 	.string "Tuckered out again…$"
 
-Route134_Text_2A46D2: @ 82A46D2
+Route134_Text_AlexPostBattle: @ 82A46D2
 	.string "My BIRD POKéMON get tired quickly after\n"
 	.string "a long flight…$"
 
-Route134_Text_2A4709: @ 82A4709
+Route134_Text_HitoshiIntro: @ 82A4709
 	.string "You're a POKéMON TRAINER.\n"
 	.string "No need for words. We battle now.$"
 
-Route134_Text_2A4745: @ 82A4745
+Route134_Text_HitoshiDefeat: @ 82A4745
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-Route134_Text_2A475D: @ 82A475D
+Route134_Text_HitoshiPostBattle: @ 82A475D
 	.string "It was I who challenged you, and yet\n"
 	.string "I lost. I am deeply shamed…$"
 
-Route134_Text_2A479E: @ 82A479E
+Route134_Text_AaronIntro: @ 82A479E
 	.string "The savage tide in this area serves to\n"
 	.string "make us stronger than ever.$"
 
-Route134_Text_2A47E1: @ 82A47E1
+Route134_Text_AaronDefeat: @ 82A47E1
 	.string "I willingly concede defeat.$"
 
-Route134_Text_2A47FD: @ 82A47FD
+Route134_Text_AaronPostBattle: @ 82A47FD
 	.string "We will return for more training at\n"
 	.string "METEOR FALLS.\p"
 	.string "If you'd like, you should go, too.\n"
 	.string "It will definitely toughen you up!$"
 
-Route134_Text_2A4875: @ 82A4875
+Route134_Text_KelvinIntro: @ 82A4875
 	.string "O-our boat!\n"
 	.string "The tide carried it away!$"
 
-Route134_Text_2A489B: @ 82A489B
+Route134_Text_KelvinDefeat: @ 82A489B
 	.string "Awawawawah!\n"
 	.string "Please, stop! Please!$"
 
-Route134_Text_2A48BD: @ 82A48BD
+Route134_Text_KelvinPostBattle: @ 82A48BD
 	.string "If we can't SURF, how are we supposed\n"
 	.string "to get home?\p"
 	.string "Actually, I know a fainted POKéMON\n"
 	.string "can still SURF, but it feels wrong.$"
 
-Route134_Text_2A4937: @ 82A4937
+Route134_Text_MarleyIntro: @ 82A4937
 	.string "Can your POKéMON dodge our\n"
 	.string "lightning-quick attacks?$"
 
-Route134_Text_2A496B: @ 82A496B
+Route134_Text_MarleyDefeat: @ 82A496B
 	.string "I never knew such a technique existed!\n"
 	.string "You've defeated us thoroughly.$"
 
-Route134_Text_2A49B1: @ 82A49B1
+Route134_Text_MarleyPostBattle: @ 82A49B1
 	.string "I haven't lost my passion for speed.\n"
 	.string "I will try harder.$"
 
-Route134_Text_2A49E9: @ 82A49E9
+Route134_Text_ReynaIntro: @ 82A49E9
 	.string "My POKéMON can't be taken down\n"
 	.string "easily!$"
 
-Route134_Text_2A4A10: @ 82A4A10
+Route134_Text_ReynaDefeat: @ 82A4A10
 	.string "You're kidding!\n"
 	.string "Explain how I lost!$"
 
-Route134_Text_2A4A34: @ 82A4A34
+Route134_Text_ReynaPostBattle: @ 82A4A34
 	.string "Haha!\n"
 	.string "You won, all right!\p"
 	.string "I'll work my way back up by taking on\n"
 	.string "TRAINERS I happen to meet!$"
 
-Route134_Text_2A4A8F: @ 82A4A8F
+Route134_Text_HudsonIntro: @ 82A4A8F
 	.string "Listen, have you seen another SAILOR\n"
 	.string "around here?$"
 
-Route134_Text_2A4AC1: @ 82A4AC1
+Route134_Text_HudsonDefeat: @ 82A4AC1
 	.string "Now, that's something!$"
 
-Route134_Text_2A4AD8: @ 82A4AD8
+Route134_Text_HudsonPostBattle: @ 82A4AD8
 	.string "Our boat drifted out to sea.\p"
 	.string "My buddy's a timid fellow, so I'm\n"
 	.string "worried about him.$"
diff --git a/data/text/tv.inc b/data/text/tv.inc
index f084ac055..c6453af0c 100644
--- a/data/text/tv.inc
+++ b/data/text/tv.inc
@@ -1,4 +1,4 @@
-LilycoveCity_ContestLobby_Text_27EF15: @ 827EF15
+LilycoveCity_ContestLobby_Text_InterviewRequest: @ 827EF15
 	.string "Oh, hello! You were in a POKéMON\n"
 	.string "CONTEST, weren't you?\l"
 	.string "It's easy to tell from your POKéMON.\p"
@@ -7,13 +7,13 @@ LilycoveCity_ContestLobby_Text_27EF15: @ 827EF15
 	.string "If I may, would you be willing to answer\n"
 	.string "a few questions?$"
 
-LilycoveCity_ContestLobby_Text_27EFE7: @ 827EFE7
+LilycoveCity_ContestLobby_Text_DescribeContest: @ 827EFE7
 	.string "Oh, you will?\n"
 	.string "Thank you.\p"
 	.string "Briefly, how would you describe the\n"
 	.string "CONTEST you just entered?$"
 
-LilycoveCity_ContestLobby_Text_27F03E: @ 827F03E
+LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX: @ 827F03E
 	.string "Ah, I see.\n"
 	.string "That's a very edifying comment.\p"
 	.string "You get a good feel for what\n"
@@ -22,7 +22,7 @@ LilycoveCity_ContestLobby_Text_27F03E: @ 827F03E
 	.string "When you hear the word “{STR_VAR_2},”\n"
 	.string "what image do you get?$"
 
-LilycoveCity_ContestLobby_Text_27F0EC: @ 827F0EC
+LilycoveCity_ContestLobby_Text_ThatsAllForInterview: @ 827F0EC
 	.string "I see!\p"
 	.string "So that's how you imagine the concept\n"
 	.string "of “{STR_VAR_2}” to be.\p"
@@ -34,12 +34,12 @@ LilycoveCity_ContestLobby_Text_27F0EC: @ 827F0EC
 	.string "make it to television.\l"
 	.string "I hope you'll look forward to it!$"
 
-LilycoveCity_ContestLobby_Text_27F1EF: @ 827F1EF
+LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe: @ 827F1EF
 	.string "Oh, too bad…\p"
 	.string "Well, if you come across a good story,\n"
 	.string "please do share it with me.$"
 
-LilycoveCity_ContestLobby_Text_27F23F: @ 827F23F
+LilycoveCity_ContestLobby_Text_LookingForwardToNextContest: @ 827F23F
 	.string "I'll be looking forward to your next\n"
 	.string "POKéMON CONTEST.$"
 
@@ -108,7 +108,7 @@ gTVBravoTrainerText07:: @ 0827F65C
 gTVBravoTrainerText08:: @ 0827F6E6
 	.string "Introducing the TRAINER's {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704
+BattleFrontier_BattleTowerLobby_Text_InterviewRequest:: @ 0827F704
 	.string "Hello! You're the TRAINER who just had\n"
 	.string "a battle, right?\p"
 	.string "I'm gathering interviews with TRAINERS\n"
@@ -116,7 +116,7 @@ BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704
 	.string "May I get a few words from you about\n"
 	.string "your impressions on battling?$"
 
-BattleFrontier_BattleTowerLobby_Text_27F7BA:: @ 0827F7BA
+BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut:: @ 0827F7BA
 	.string "You will? Really?\n"
 	.string "Thank you!\l"
 	.string "Then, uh…\p"
@@ -125,44 +125,44 @@ BattleFrontier_BattleTowerLobby_Text_27F7BA:: @ 0827F7BA
 	.string "Were you satisfied with the battle?\n"
 	.string "Or are you unhappy?$"
 
-BattleFrontier_BattleTowerLobby_Text_27F84C:: @ 0827F84C
+BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou:: @ 0827F84C
 	.string "Oh…\n"
 	.string "Sorry we disturbed you.\p"
 	.string "Please give us an interview the next\n"
 	.string "time you visit the BATTLE TOWER.$"
 
-BattleFrontier_BattleTowerLobby_Text_27F8AE:: @ 0827F8AE
+BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle:: @ 0827F8AE
 	.string "Well, of course!\p"
 	.string "That unmistakable look of satisfaction\n"
 	.string "on your face…\p"
 	.string "It's obvious that you've had a great\n"
 	.string "battle.$"
 
-BattleFrontier_BattleTowerLobby_Text_27F921:: @ 0827F921
+BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned:: @ 0827F921
 	.string "Oh, I see…\p"
 	.string "Well, it certainly is difficult to make a\n"
 	.string "battle turn out exactly as planned.$"
 
-BattleFrontier_BattleTowerLobby_Text_27F97A:: @ 0827F97A
+BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle:: @ 0827F97A
 	.string "Oh, oh, may I ask one more question?\p"
 	.string "If you were to describe your\n"
 	.string "impressions about this battle with\l"
 	.string "one saying, what would it be?$"
 
-BattleFrontier_BattleTowerLobby_Text_27F9FD:: @ 0827F9FD
+BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine:: @ 0827F9FD
 	.string "Oh, that is stunningly cool!\p"
 	.string "That's a great line!\n"
 	.string "I hope you'll do great next time, too.\p"
 	.string "I hope to see you again!$"
 
-BattleFrontier_BattleTowerLobby_Text_27FA6F:: @ 0827FA6F
+BattleFrontier_BattleTowerLobby_Text_SilentType:: @ 0827FA6F
 	.string "Oh, I see…\p"
 	.string "Still, being the silent type is also\n"
 	.string "cool, isn't it?\p"
 	.string "I hope you'll give me the opportunity\n"
 	.string "to share your thoughts again!$"
 
-BattleFrontier_BattleTowerLobby_Text_27FAF3:: @ 0827FAF3
+BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle:: @ 0827FAF3
 	.string "I'll be looking forward to your\n"
 	.string "next battle!$"
 
@@ -269,7 +269,7 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6
 	.string "That's all the time we have!\n"
 	.string "Until next time, see you!$"
 
-SlateportCity_PokemonFanClub_Text_280270: @ 08280270
+SlateportCity_PokemonFanClub_Text_InterviewRequestHasName: @ 08280270
 	.string "Wow!\p"
 	.string "It's plain to see that you lavish your\n"
 	.string "love on your {STR_VAR_1}.\p"
@@ -280,36 +280,36 @@ SlateportCity_PokemonFanClub_Text_280270: @ 08280270
 	.string "Would you be willing to answer a few\n"
 	.string "simple questions for me?$"
 
-SlateportCity_PokemonFanClub_Text_28034F: @ 0828034F
+SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers: @ 0828034F
 	.string "Great! Thank you!\p"
 	.string "Okay, here goes.\n"
 	.string "I just need quick answers, okay?$"
 
-SlateportCity_PokemonFanClub_Text_280393: @ 08280393
+SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon: @ 08280393
 	.string "When you first met {STR_VAR_1},\n"
 	.string "what did you feel?\p"
 	.string "How would you describe your feelings\n"
 	.string "at the time?$"
 
-SlateportCity_PokemonFanClub_Text_2803EF: @ 082803EF
+SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike: @ 082803EF
 	.string "Your {STR_VAR_1} is cared for lovingly.\p"
 	.string "If you were to liken it to something\n"
 	.string "that you like, what would it be?$"
 
-SlateportCity_PokemonFanClub_Text_280454: @ 08280454
+SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon: @ 08280454
 	.string "This question also relates to your\n"
 	.string "beloved {STR_VAR_1}.\p"
 	.string "What was it about {STR_VAR_1} that\n"
 	.string "attracted you?$"
 
-SlateportCity_PokemonFanClub_Text_2804AC: @ 082804AC
+SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou: @ 082804AC
 	.string "Okay, that makes sense.\p"
 	.string "The next question might be a little\n"
 	.string "on the tough side.\p"
 	.string "Here goes…\p"
 	.string "What do POKéMON mean to you?$"
 
-SlateportCity_PokemonFanClub_Text_280523: @ 08280523
+SlateportCity_PokemonFanClub_Text_ThatsAllForInterview: @ 08280523
 	.string "I see!\p"
 	.string "Hmhm…\p"
 	.string "Okay!\n"
@@ -321,16 +321,16 @@ SlateportCity_PokemonFanClub_Text_280523: @ 08280523
 	.string "Okay, that's all.\n"
 	.string "Bye-bye!$"
 
-SlateportCity_PokemonFanClub_Text_2805E2: @ 082805E2
+SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe: @ 082805E2
 	.string "Oh, okay…\p"
 	.string "Well, if you get the urge to tell me\n"
 	.string "about POKéMON, I'll be here!$"
 
-SlateportCity_PokemonFanClub_Text_28062E: @ 0828062E
+SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews: @ 0828062E
 	.string "I enjoy this job--you get to learn\n"
 	.string "about POKéMON by doing interviews.$"
 
-SlateportCity_PokemonFanClub_Text_280674: @ 08280674
+SlateportCity_PokemonFanClub_Text_InterviewRequest: @ 08280674
 	.string "Hi, you seem to be very close to your\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Do you know what?\n"
@@ -340,12 +340,12 @@ SlateportCity_PokemonFanClub_Text_280674: @ 08280674
 	.string "I'm wondering if you'd be willing to tell\n"
 	.string "me a little about your {STR_VAR_1}?$"
 
-SlateportCity_PokemonFanClub_Text_28073B: @ 0828073B
+SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon: @ 0828073B
 	.string "Wow, thank you!\p"
 	.string "Okay, then, please tell me anything\n"
 	.string "you'd like about your {STR_VAR_1}.$"
 
-SlateportCity_PokemonFanClub_Text_280789: @ 08280789
+SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2: @ 08280789
 	.string "Wow…\n"
 	.string "That's an interesting account.\p"
 	.string "You really are tight with {STR_VAR_1},\n"
@@ -479,7 +479,7 @@ gTVFanClubText07:: @ 082810E7
 	.string "A-whoops, will you look at the time?\n"
 	.string "Time to say good-bye until next time!$"
 
-SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0
+SlateportCity_OceanicMuseum_1F_Text_InterviewRequest: @ 082811A0
 	.string "Oh?\n"
 	.string "Do you perhaps like POKéMON?\p"
 	.string "I'm on assignment with the TV network.\p"
@@ -488,32 +488,32 @@ SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0
 	.string "If you don't mind, could you tell me\n"
 	.string "something about yourself?$"
 
-SlateportCity_OceanicMuseum_1F_Text_28126D: @ 0828126D
+SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort: @ 0828126D
 	.string "I'm gathering stories on POKéMON and\n"
 	.string "TRAINERS that occurred recently.\p"
 	.string "If you don't mind, could you tell me\n"
 	.string "something about yourself?$"
 
-SlateportCity_OceanicMuseum_1F_Text_2812F2: @ 082812F2
+SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon: @ 082812F2
 	.string "Oh, you will?\n"
 	.string "Thank you!\p"
 	.string "Then, please, tell me anything of\n"
 	.string "interest that you experienced recently\l"
 	.string "involving POKéMON.$"
 
-SlateportCity_OceanicMuseum_1F_Text_281367: @ 08281367
+SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory: @ 08281367
 	.string "Oh, I see…\p"
 	.string "Well, if you do have an interesting\n"
 	.string "story to tell, please let me know.$"
 
-SlateportCity_OceanicMuseum_1F_Text_2813B9: @ 082813B9
+SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview: @ 082813B9
 	.string "Oh, what an uplifting story!\p"
 	.string "I'll be sure to get your story told\n"
 	.string "on television.\p"
 	.string "It should be aired sometime, I think,\n"
 	.string "so please look forward to it.$"
 
-SlateportCity_OceanicMuseum_1F_Text_28144D: @ 0828144D
+SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory: @ 0828144D
 	.string "Hmmm…\n"
 	.string "I've got a good story for a TV program.\p"
 	.string "I'd better write it up in a hurry!$"
@@ -612,44 +612,44 @@ gTV3CheersForPokeblocksText05:: @ 08281B93
 	.string "Tune in next time!\n"
 	.string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281BCB:: @ 8281BCB
+LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer:: @ 8281BCB
 	.string "Hi, there!\p"
 	.string "I'm a big fan of {STR_VAR_1}.\n"
 	.string "What's your opinion of {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281C06:: @ 8281C06
+LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink:: @ 8281C06
 	.string "I see, I see. That's what you think\n"
 	.string "about the TRAINER.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281C3D:: @ 8281C3D
+LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer:: @ 8281C3D
 	.string "Have you completely forgotten\n"
 	.string "about {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281C65:: @ 8281C65
+LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2:: @ 8281C65
 	.string "I'm a big fan of {STR_VAR_1}.\n"
 	.string "What's your opinion of {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281C95:: @ 8281C95
+LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer:: @ 8281C95
 	.string "How strong would you rate {STR_VAR_1}\n"
 	.string "on a scale of one hundred?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281CCD:: @ 8281CCD
+LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2:: @ 8281CCD
 	.string "Have you completely forgotten\n"
 	.string "about {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281CF5:: @ 8281CF5
+LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer:: @ 8281CF5
 	.string "Oh, I see!\n"
 	.string "You should meet {STR_VAR_1} sometime.\l"
 	.string "I'm sure you'll become a fan, too!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281D40:: @ 8281D40
+LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo:: @ 8281D40
 	.string "I see, I see.\p"
 	.string "Thank you!\n"
 	.string "That's very useful to know.\p"
 	.string "I'll share this information with other\n"
 	.string "{STR_VAR_1} fans and discuss it.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_281DB4:: @ 8281DB4
+LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial:: @ 8281DB4
 	.string "There's going to be a TV special on\n"
 	.string "{STR_VAR_1} very soon.\p"
 	.string "I hope you catch it!$"
@@ -2694,25 +2694,23 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26
 	.string "This concludes this episode of\n"
 	.string "“POKéMON BATTLE UPDATE!”$"
 
-Route111_Text_28AF05: @ 0828AF05
+GabbyAndTy_Text_GabbyPreFirstBattle: @ 0828AF05
 	.string "GABBY: Oh! We've just spotted a tough-\n"
 	.string "looking TRAINER here of all places!\p"
 	.string "Okay, roll camera!\n"
 	.string "Let's get this interview.$"
 
-Route111_Text_28AF7D: @ 0828AF7D
-Route118_Text_28AF7D: @ 0828AF7D
-Route120_Text_28AF7D: @ 0828AF7D
+GabbyAndTy_Text_GabbyPreBattle: @ 0828AF7D
 	.string "GABBY: Oh! You're {PLAYER}! Hi!\n"
 	.string "Do you remember us from last time?\p"
 	.string "Can you show us how much stronger\n"
 	.string "you've become? Okay, cue interview!$"
 
-Route111_Text_28B000: @ 0828B000
+GabbyAndTy_Text_GabbyDefeatFirstTime: @ 0828B000
 	.string "GABBY: My eyes didn't lie!\n"
 	.string "I did discover an astonishing TRAINER!$"
 
-Route111_Text_28B042: @ 0828B042
+GabbyAndTy_Text_WhoAreYouInterview: @ 0828B042
 	.string "GABBY: Awesome! Awesome!\n"
 	.string "Who are you?!\p"
 	.string "I knew we were onto something wild\n"
@@ -2723,19 +2721,19 @@ Route111_Text_28B042: @ 0828B042
 	.string "So, would you give us a bit of your time\n"
 	.string "for an interview?$"
 
-Route111_Text_28B137: @ 0828B137
+GabbyAndTy_Text_QuoteFromLastInterview: @ 0828B137
 	.string "GABBY: “{STR_VAR_1}!”\p"
 	.string "Remember? That's the quote you gave\n"
 	.string "us as the battle clincher last time.\p"
 	.string "I never, ever forget stuff like that!$"
 
-Route111_Text_28B1B3: @ 0828B1B3
+GabbyAndTy_Text_YouStompedUsInterviewAgain: @ 0828B1B3
 	.string "The last time we battled, you stomped\n"
 	.string "us before we could brace ourselves…\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B23D: @ 0828B23D
+GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain: @ 0828B23D
 	.string "The last time we battled, didn't you\n"
 	.string "throw a POKé BALL at us?\p"
 	.string "We were shocked! So we told everyone,\n"
@@ -2743,30 +2741,30 @@ Route111_Text_28B23D: @ 0828B23D
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B2FA: @ 0828B2FA
+GabbyAndTy_Text_CleverItemSkillsInterviewAgain: @ 0828B2FA
 	.string "The last time we battled, your item\n"
 	.string "skills cleverly did us in.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B379: @ 0828B379
+GabbyAndTy_Text_WeLookedRespectableInterviewAgain: @ 0828B379
 	.string "The last time we battled, we managed\n"
 	.string "to look respectable.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B3F3: @ 0828B3F3
+GabbyAndTy_Text_InterviewAgain: @ 0828B3F3
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B433: @ 0828B433
+GabbyAndTy_Text_DescribeYourFeelings: @ 0828B433
 	.string "You will?\n"
 	.string "Thank you!\p"
 	.string "Okay, I need you to describe your\n"
 	.string "feelings about our battle, but it\l"
 	.string "has to be short and sweet. Go!$"
 
-Route111_Text_28B4AB: @ 0828B4AB
+GabbyAndTy_Text_PerfectWellBeSeeingYou: @ 0828B4AB
 	.string "GABBY: Mmm, yeah!\n"
 	.string "That's the perfect clincher!\p"
 	.string "I get the feeling that this will make\n"
@@ -2776,24 +2774,20 @@ Route111_Text_28B4AB: @ 0828B4AB
 	.string "Okay!\n"
 	.string "We'll be seeing you!$"
 
-Route111_Text_28B577: @ 0828B577
+GabbyAndTy_Text_DontGiveUpKeepingEyeOut: @ 0828B577
 	.string "GABBY: Oh…\p"
 	.string "Okay, but don't give up!\n"
 	.string "We'll be keeping an eye out for you!$"
 
-Route111_Text_28B5C0: @ 0828B5C0
-Route118_Text_28B5C0: @ 0828B5C0
-Route120_Text_28B5C0: @ 0828B5C0
+GabbyAndTy_Text_KeepingAnEyeOutForYou: @ 0828B5C0
 	.string "GABBY: We'll be keeping an eye out\n"
 	.string "for you!$"
 
-Route111_Text_28B5EC: @ 0828B5EC
-Route118_Text_28B5EC: @ 0828B5EC
-Route120_Text_28B5EC: @ 0828B5EC
+GabbyAndTy_Text_GabbyNotEnoughMons: @ 0828B5EC
 	.string "GABBY: Is there a strong TRAINER\n"
 	.string "anywhere with a lot of POKéMON?$"
 
-Route111_Text_28B62D: @ 0828B62D
+GabbyAndTy_Text_GiveUsAnInterviewThisTime: @ 0828B62D
 	.string "GABBY: Wow, you are something!\p"
 	.string "You've gotten a lot stronger--a lot--\n"
 	.string "since we last battled.\p"
@@ -2803,46 +2797,36 @@ Route111_Text_28B62D: @ 0828B62D
 	.string "Are you willing to give us an interview\l"
 	.string "this time?$"
 
-Route111_Text_28B719: @ 0828B719
-Route118_Text_28B719: @ 0828B719
-Route120_Text_28B719: @ 0828B719
+GabbyAndTy_Text_GabbyDefeat: @ 0828B719
 	.string "GABBY: That was an intense battle!\n"
 	.string "Did you get all that on camera?$"
 
-Route111_Text_28B75C: @ 0828B75C
+GabbyAndTy_Text_TyPreFirstBattle: @ 0828B75C
 	.string "TY: Hey, lookie here! A tough-looking\n"
 	.string "TRAINER here, of all places!\l"
 	.string "Camera's rolling!$"
 
-Route111_Text_28B7B1: @ 0828B7B1
-Route118_Text_28B7B1: @ 0828B7B1
-Route120_Text_28B7B1: @ 0828B7B1
+GabbyAndTy_Text_TyPreBattle: @ 0828B7B1
 	.string "TY: Hey, lookie here!\n"
 	.string "I remember you!\p"
 	.string "I'll get this battle all on this\n"
 	.string "here camera!$"
 
-Route111_Text_28B805: @ 0828B805
-Route118_Text_28B805: @ 0828B805
-Route120_Text_28B805: @ 0828B805
+GabbyAndTy_Text_TyPostBattle: @ 0828B805
 	.string "TY: You're a natural!\n"
 	.string "Got me some prime footage right here!$"
 
-Route111_Text_28B841: @ 0828B841
-Route118_Text_28B841: @ 0828B841
-Route120_Text_28B841: @ 0828B841
+GabbyAndTy_Text_TyNotEnoughMons: @ 0828B841
 	.string "TY: Do you only have the one POKéMON\n"
 	.string "and that's it?\p"
 	.string "If you had more POKéMON, it'd make for\n"
 	.string "better footage, but…$"
 
-Route111_Text_28B8B1: @ 0828B8B1
+GabbyAndTy_Text_TyDefeatFirstTime: @ 0828B8B1
 	.string "TY: Yep, we sure spotted a hot TRAINER.\n"
 	.string "This is a huge scoop for us!$"
 
-Route111_Text_28B8F6: @ 0828B8F6
-Route118_Text_28B8F6: @ 0828B8F6
-Route120_Text_28B8F6: @ 0828B8F6
+GabbyAndTy_Text_TyDefeat: @ 0828B8F6
 	.string "TY: Yep, I got it all.\n"
 	.string "That whole battle's on camera.$"
 
diff --git a/graphics/battle_frontier/text.pal b/graphics/battle_interface/text.pal
index 574999b72..574999b72 100644..100755
--- a/graphics/battle_frontier/text.pal
+++ b/graphics/battle_interface/text.pal
diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_bg.bin
index d6ff1114d..d6ff1114d 100644
--- a/graphics/interface/party_menu_misc.bin
+++ b/graphics/interface/party_menu_bg.bin
diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_bg.pal
index 0b4b30f81..0b4b30f81 100644
--- a/graphics/interface/party_menu_misc.pal
+++ b/graphics/interface/party_menu_bg.pal
diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_bg.png
index c58f3aae9..c58f3aae9 100644
--- a/graphics/interface/party_menu_misc.png
+++ b/graphics/interface/party_menu_bg.png
diff --git a/graphics/interface/unknown_6157E0.bin b/graphics/interface/party_menu_cancel_button.bin
index 7f11aaf4e..7f11aaf4e 100644
--- a/graphics/interface/unknown_6157E0.bin
+++ b/graphics/interface/party_menu_cancel_button.bin
diff --git a/graphics/interface/unknown_6157C4.bin b/graphics/interface/party_menu_confirm_button.bin
index 8c3c1be3d..8c3c1be3d 100644
--- a/graphics/interface/unknown_6157C4.bin
+++ b/graphics/interface/party_menu_confirm_button.bin
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index bc51b1e1f..fbdb6348c 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -409,7 +409,7 @@ $(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 16
 
-$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
+$(INTERFACEGFXDIR)/party_menu_bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 62
 
 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
diff --git a/include/apprentice.h b/include/apprentice.h
index 195106c53..27ce0371e 100644
--- a/include/apprentice.h
+++ b/include/apprentice.h
@@ -1,21 +1,21 @@
 #ifndef GUARD_APPRENTICE_H
 #define GUARD_APPRENTICE_H
 
-#define APPRENTICE_SPECIES_COUNT 10
+#include "constants/apprentice.h"
 
 struct ApprenticeTrainer
 {
-    u8 name[6][PLAYER_NAME_LENGTH + 1]; // For all six languages.
+    u8 name[NUM_LANGUAGES - 1][PLAYER_NAME_LENGTH + 1]; // For all languages except the unused one.
     u16 otId;
     u8 facilityClass;
     u16 species[APPRENTICE_SPECIES_COUNT];
     u8 id;
-    u16 easyChatWords[6];
+    u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
 };
 
 extern const struct ApprenticeTrainer gApprentices[];
 
-void CopyFriendsApprenticeChallengeText(u8 saveblockApprenticeId);
+void BufferApprenticeChallengeText(u8 saveApprenticeId);
 void Apprentice_EnableBothScriptContexts(void);
 void ResetApprenticeStruct(struct Apprentice *apprentice);
 void ResetAllApprenticeData(void);
diff --git a/include/battle.h b/include/battle.h
index 32eabc6de..f8c685fb0 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -478,7 +478,7 @@ struct BattleScripting
     u8 animArg1;
     u8 animArg2;
     u16 tripleKickPower;
-    u8 atk49_state;
+    u8 moveendState;
     u8 battlerWithAbility;
     u8 multihitMoveEffect;
     u8 battler;
@@ -486,9 +486,9 @@ struct BattleScripting
     u8 animTargetsHit;
     u8 statChanger;
     bool8 statAnimPlayed;
-    u8 atk23_state;
+    u8 getexpState;
     u8 battleStyle;
-    u8 atk6C_state;
+    u8 drawlvlupboxState;
     u8 learnMoveState;
     u8 field_20;
     u8 reshowMainState;
diff --git a/include/battle_bg.h b/include/battle_bg.h
index dac41c992..167ea5cf7 100644
--- a/include/battle_bg.h
+++ b/include/battle_bg.h
@@ -2,11 +2,11 @@
 #define GUARD_BATTLE_BG_H
 
 void BattleInitBgsAndWindows(void);
-void sub_80356D0(void);
+void InitBattleBgsVideo(void);
 void LoadBattleMenuWindowGfx(void);
 void DrawMainBattleBackground(void);
 void LoadBattleTextboxAndBackground(void);
-void sub_8035D74(u8 taskId);
+void InitLinkBattleVsScreen(u8 taskId);
 void DrawBattleEntryBackground(void);
 bool8 LoadChosenBattleElement(u8 caseId);
 
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 365229fda..32918fefb 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -248,8 +248,8 @@ void nullsub_21(void);
 void PlayerHandleGetRawMonData(void);
 void sub_80587B0(void);
 void sub_805CC00(struct Sprite *sprite);
-void SetCB2ToReshowScreenAfterMenu(void);
-void SetCB2ToReshowScreenAfterMenu2(void);
+void CB2_SetUpReshowBattleScreenAfterMenu(void);
+void CB2_SetUpReshowBattleScreenAfterMenu2(void);
 void c3_0802FDF4(u8 taskId);
 void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused);
 void ActionSelectionDestroyCursorAt(u8 cursorPos);
diff --git a/include/battle_main.h b/include/battle_main.h
index c134f819f..e04db17bb 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -77,20 +77,20 @@ void sub_803B3AC(void); // unused
 void sub_803B598(void); // unused
 void BattleTurnPassed(void);
 u8 IsRunningFromBattleImpossible(void);
-void sub_803BDA0(u8 battlerId);
+void SwitchPartyOrder(u8 battlerId);
 void SwapTurnOrder(u8 id1, u8 id2);
 u8 GetWhoStrikesFirst(u8 battlerId1, u8 battlerId2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 battlerId);
 
-extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3];
+extern struct UnknownPokemonStruct4 gMultiPartnerParty[MULTI_PARTY_SIZE];
 
 extern const struct SpriteTemplate gUnknown_0831AC88;
 extern const struct OamData gOamData_831ACA8;
 extern const struct OamData gOamData_831ACB0;
 extern const u8 gTypeEffectiveness[336];
-extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1];
+extern const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1];
 extern const struct TrainerMoney gTrainerMoneyTable[];
 extern const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1];
 extern const u8 *const gAbilityDescriptionPointers[];
diff --git a/include/battle_message.h b/include/battle_message.h
index 88ccbb90f..1157fbfae 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -213,7 +213,7 @@ struct BattleMsgData
 void BufferStringBattle(u16 stringID);
 u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
 u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
-void BattlePutTextOnWindow(const u8* text, u8 arg1);
+void BattlePutTextOnWindow(const u8* text, u8 windowId);
 void SetPpNumbersPaletteInMoveSelection(void);
 u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
 
diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h
index c3b799a4d..f0c6e7ee4 100644
--- a/include/battle_pyramid_bag.h
+++ b/include/battle_pyramid_bag.h
@@ -36,13 +36,13 @@ extern struct PyramidBagCursorData gPyramidBagCursorData;
 
 void InitBattlePyramidBagCursorPosition(void);
 void CB2_PyramidBagMenuFromStartMenu(void);
-void sub_81C4F84(void);
+void CB2_ReturnToPyramidBagMenu(void);
 void sub_81C5924(void);
 void sub_81C59BC(void);
 void sub_81C4EFC(void);
-void sub_81C4F98(u8 a0, void (*callback)(void));
+void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
 void sub_81C6714(u8 taskId);
-void sub_81C6A94(void);
+void TryStoreHeldItemsInPyramidBag(void);
 void sub_81C4F24(void);
 void sub_81C5B14(u8 taskId);
 void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 8bc6e6554..2366cac12 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -48,7 +48,7 @@ extern u16 gUnknown_03006298[];
 extern const struct BattleFrontierTrainer *gFacilityTrainers;
 extern const struct FacilityMon *gFacilityTrainerMons;
 
-void sub_8161F74(void);
+void CallBattleTowerFunc(void);
 u16 sub_8162548(u8 challengeNum, u8 battleNum);
 void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId);
 void SetEReaderTrainerGfxId(void);
diff --git a/include/battle_util.h b/include/battle_util.h
index 0756a387a..b77fa10ad 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -12,7 +12,7 @@
 #define ABILITYEFFECT_ENDTURN                    0x1
 #define ABILITYEFFECT_MOVES_BLOCK                0x2
 #define ABILITYEFFECT_ABSORBING                  0x3
-#define ABILITYEFFECT_MOVE_END                   0x4
+#define ABILITYEFFECT_ON_DAMAGE                  0x4
 #define ABILITYEFFECT_IMMUNITY                   0x5
 #define ABILITYEFFECT_FORECAST                   0x6
 #define ABILITYEFFECT_SYNCHRONIZE                0x7
diff --git a/include/battle_util2.h b/include/battle_util2.h
index 336698ea3..fe767ea4b 100644
--- a/include/battle_util2.h
+++ b/include/battle_util2.h
@@ -4,7 +4,7 @@
 void AllocateBattleResources(void);
 void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 battler);
-void sub_80571DC(u8 battler, u8 arg1);
+void SwitchPartyOrderInGameMulti(u8 battler, u8 arg1);
 u32 sub_805725C(u8 battler);
 
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h
index 9db58bb8e..63434a4fc 100644
--- a/include/constants/apprentice.h
+++ b/include/constants/apprentice.h
@@ -1,22 +1,88 @@
 #ifndef GUARD_CONSTANTS_APPRENTICE_H
 #define GUARD_CONSTANTS_APPRENTICE_H
 
-#define APPRENTICE_ASK_WHICH_LEVEL 0
-#define APPRENTICE_ASK_3SPECIES 1
-#define APPRENTICE_ASK_2SPECIES 2
-#define APPRENTICE_ASK_MOVES 3
-#define APPRENTICE_ASK_GIVE 4
-#define APPRENTICE_ASK_YES_NO 6
-
-#define APPRENTICE_BUFF_SPECIES1 0
-#define APPRENTICE_BUFF_SPECIES2 1
-#define APPRENTICE_BUFF_SPECIES3 2
-#define APPRENTICE_BUFF_MOVE1 3
-#define APPRENTICE_BUFF_MOVE2 4
-#define APPRENTICE_BUFF_ITEM 5
-#define APPRENTICE_BUFF_NAME 6
-#define APPRENTICE_BUFF_EASY_CHAT 7
-#define APPRENTICE_BUFF_LEVEL 8
-#define APPRENTICE_BUFF_SPECIES4 9
+#define NUM_APPRENTICES 16
+#define APPRENTICE_SPECIES_COUNT 10
+
+#define NUM_WHICH_MON_QUESTIONS  MULTI_PARTY_SIZE
+#define NUM_WHICH_MOVE_QUESTIONS 5
+
+#define APPRENTICE_LVL_MODE_50    (FRONTIER_LVL_50 + 1)
+#define APPRENTICE_LVL_MODE_OPEN  (FRONTIER_LVL_OPEN + 1)
+
+#define APPRENTICE_FUNC_GAVE_LVLMODE         0
+#define APPRENTICE_FUNC_SET_LVLMODE          1
+#define APPRENTICE_FUNC_SET_ID               2
+#define APPRENTICE_FUNC_SHUFFLE_SPECIES      3
+#define APPRENTICE_FUNC_RANDOMIZE_QUESTIONS  4
+#define APPRENTICE_FUNC_ANSWERED_QUESTION    5
+#define APPRENTICE_FUNC_IS_FINAL_QUESTION    6
+#define APPRENTICE_FUNC_MENU                 7
+#define APPRENTICE_FUNC_PRINT_MSG            8
+#define APPRENTICE_FUNC_RESET                9
+#define APPRENTICE_FUNC_CHECK_GONE           10
+#define APPRENTICE_FUNC_GET_QUESTION         11
+#define APPRENTICE_FUNC_GET_NUM_PARTY_MONS   12
+#define APPRENTICE_FUNC_SET_PARTY_MON        13
+#define APPRENTICE_FUNC_INIT_QUESTION_DATA   14
+#define APPRENTICE_FUNC_FREE_QUESTION_DATA   15
+#define APPRENTICE_FUNC_BUFFER_STRING        16
+#define APPRENTICE_FUNC_SET_MOVE             17
+#define APPRENTICE_FUNC_SET_LEAD_MON         18
+#define APPRENTICE_FUNC_OPEN_BAG             19
+#define APPRENTICE_FUNC_TRY_SET_HELD_ITEM    20
+#define APPRENTICE_FUNC_SAVE                 21
+#define APPRENTICE_FUNC_SET_GFX_SAVED        22
+#define APPRENTICE_FUNC_SET_GFX              23
+#define APPRENTICE_FUNC_SHOULD_LEAVE         24
+#define APPRENTICE_FUNC_SHIFT_SAVED          25
+
+#define APPRENTICE_MSG_PLEASE_TEACH             0
+#define APPRENTICE_MSG_REJECT                   1
+#define APPRENTICE_MSG_WHICH_LVL_MODE           2
+#define APPRENTICE_MSG_THANKS_LVL_MODE          3
+#define APPRENTICE_MSG_WHICH_MON_FIRST          4
+#define APPRENTICE_MSG_THANKS_MON_FIRST         5
+#define APPRENTICE_MSG_WHICH_MON                6
+#define APPRENTICE_MSG_THANKS_MON               7
+#define APPRENTICE_MSG_WHICH_MOVE               8
+#define APPRENTICE_MSG_THANKS_MOVE              9
+#define APPRENTICE_MSG_WHAT_HELD_ITEM           10
+#define APPRENTICE_MSG_PICK_WIN_SPEECH          11
+#define APPRENTICE_MSG_THANKS_HELD_ITEM         12
+#define APPRENTICE_MSG_HOLD_NOTHING             13
+#define APPRENTICE_MSG_THANKS_NO_HELD_ITEM      14
+#define APPRENTICE_MSG_THANKS_WIN_SPEECH        15
+#define APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED   16
+
+#define APPRENTICE_QUESTION_WHICH_FIRST    1
+#define APPRENTICE_QUESTION_WHICH_MON      2
+#define APPRENTICE_QUESTION_WHICH_MOVE     3
+#define APPRENTICE_QUESTION_WHAT_ITEM      4
+#define APPRENTICE_QUESTION_WIN_SPEECH     5
+
+// Would be redundant with the above set if they used the same values
+#define QUESTION_ID_WIN_SPEECH    0
+#define QUESTION_ID_WHAT_ITEM     1
+#define QUESTION_ID_WHICH_MOVE    2
+#define QUESTION_ID_WHICH_FIRST   3
+
+#define APPRENTICE_ASK_WHICH_LEVEL  0
+#define APPRENTICE_ASK_3SPECIES     1
+#define APPRENTICE_ASK_2SPECIES     2
+#define APPRENTICE_ASK_MOVES        3
+#define APPRENTICE_ASK_GIVE         4
+#define APPRENTICE_ASK_YES_NO       6
+
+#define APPRENTICE_BUFF_SPECIES1         0
+#define APPRENTICE_BUFF_SPECIES2         1
+#define APPRENTICE_BUFF_SPECIES3         2
+#define APPRENTICE_BUFF_MOVE1            3
+#define APPRENTICE_BUFF_MOVE2            4
+#define APPRENTICE_BUFF_ITEM             5
+#define APPRENTICE_BUFF_NAME             6
+#define APPRENTICE_BUFF_WIN_SPEECH       7
+#define APPRENTICE_BUFF_LEVEL            8
+#define APPRENTICE_BUFF_LEAD_MON_SPECIES 9
 
 #endif // GUARD_CONSTANTS_APPRENTICE_H
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
index d287dd2db..54d50c18a 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -4,16 +4,17 @@
 #define FRONTIER_CHALLENGE(facility, mode) ((facility << 8) + mode)
 
 // Battle Frontier facility ids.
-#define FRONTIER_FACILITY_TOWER 0
-#define FRONTIER_FACILITY_DOME 1
-#define FRONTIER_FACILITY_PALACE 2
-#define FRONTIER_FACILITY_ARENA 3
-#define FRONTIER_FACILITY_FACTORY 4
-#define FRONTIER_FACILITY_PIKE 5
-#define FRONTIER_FACILITY_PYRAMID 6
-#define NUM_FRONTIER_FACILITIES 7
+#define FRONTIER_FACILITY_TOWER    0
+#define FRONTIER_FACILITY_DOME     1
+#define FRONTIER_FACILITY_PALACE   2
+#define FRONTIER_FACILITY_ARENA    3
+#define FRONTIER_FACILITY_FACTORY  4
+#define FRONTIER_FACILITY_PIKE     5
+#define FRONTIER_FACILITY_PYRAMID  6
+#define NUM_FRONTIER_FACILITIES    7
 // The multiplayer battle colosseum rooms re-use VAR_FRONTIER_FACILITY.
-#define FRONTIER_FACILITY_DOUBLE_COLOSSEUM 9
+#define FACILITY_UNION_ROOM        8
+#define FACILITY_MULTI_OR_EREADER  9  // Direct Corner multi battles, multi battle with Steven, and e-Reader battles
 
 #define TENT_VERDANTURF 2
 #define TENT_FALLARBOR 3
@@ -45,18 +46,30 @@
 
 #define MAX_BATTLE_FRONTIER_POINTS 9999
 
-// Frontier Maniac
-#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES       0
-#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES       1
-#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS        2
-#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS   3
-#define FRONTIER_MANIAC_BATTLE_DOME                4
-#define FRONTIER_MANIAC_BATTLE_FACTORY             5
-#define FRONTIER_MANIAC_BATTLE_PALACE              6
-#define FRONTIER_MANIAC_BATTLE_ARENA               7
-#define FRONTIER_MANIAC_BATTLE_PIKE                8
-#define FRONTIER_MANIAC_BATTLE_PYRAMID             9
-#define FRONTIER_MANIAC_FACILITY_COUNT            10
+// These sets of facility ids would be redunant if the order was consistent
+// The order is important for this set so that all the non-link records can be continuous
+#define RANKING_HALL_BATTLE_TOWER_SINGLES   0
+#define RANKING_HALL_BATTLE_TOWER_DOUBLES   1
+#define RANKING_HALL_BATTLE_TOWER_MULTIS    2
+#define RANKING_HALL_BATTLE_DOME            3
+#define RANKING_HALL_BATTLE_PALACE          4
+#define RANKING_HALL_BATTLE_ARENA           5
+#define RANKING_HALL_BATTLE_FACTORY         6
+#define RANKING_HALL_BATTLE_PIKE            7
+#define RANKING_HALL_BATTLE_PYRAMID         8
+#define RANKING_HALL_BATTLE_TOWER_LINK      9
+
+#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES   0
+#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES   1
+#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS    2
+#define FRONTIER_MANIAC_BATTLE_TOWER_LINK      3
+#define FRONTIER_MANIAC_BATTLE_DOME            4
+#define FRONTIER_MANIAC_BATTLE_FACTORY         5
+#define FRONTIER_MANIAC_BATTLE_PALACE          6
+#define FRONTIER_MANIAC_BATTLE_ARENA           7
+#define FRONTIER_MANIAC_BATTLE_PIKE            8
+#define FRONTIER_MANIAC_BATTLE_PYRAMID         9
+#define FRONTIER_MANIAC_FACILITY_COUNT        10
 
 #define FRONTIER_MANIAC_MESSAGE_COUNT 3
 
@@ -76,6 +89,11 @@
 // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
 #define RESULTS_LINK_CONTEST 7
 
+#define EXCHANGE_CORNER_DECOR1_CLERK     0
+#define EXCHANGE_CORNER_DECOR2_CLERK     1
+#define EXCHANGE_CORNER_VITAMIN_CLERK    2
+#define EXCHANGE_CORNER_HOLD_ITEM_CLERK  3
+
 #define F_EV_SPREAD_HP         (1 << 0)
 #define F_EV_SPREAD_ATTACK     (1 << 1)
 #define F_EV_SPREAD_DEFENSE    (1 << 2)
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 894bd13b6..dfcf79128 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -39,16 +39,16 @@
 #define BS_EFFECT_BATTLER           2
 #define BS_FAINTED                  3
 #define BS_BATTLER_0                7
-#define BS_ATTACKER_WITH_PARTNER    4 // for atk98_status_icon_update
-#define BS_ATTACKER_SIDE            8 // for atk1E_jumpifability
-#define BS_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
+#define BS_ATTACKER_WITH_PARTNER    4 // for Cmd_updatestatusicon
+#define BS_ATTACKER_SIDE            8 // for Cmd_jumpifability
+#define BS_NOT_ATTACKER_SIDE        9 // for Cmd_jumpifability
 #define BS_SCRIPTING                10
 #define BS_PLAYER1                  11
 #define BS_OPPONENT1                12
 #define BS_PLAYER2                  13
 #define BS_OPPONENT2                14
 
-// atk 01, accuracy calc
+// Cmd_accuracycheck
 #define NO_ACC_CALC 0xFFFE
 #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
 #define ACC_CURR_MOVE 0
@@ -61,7 +61,7 @@
 #define CMP_COMMON_BITS         0x4
 #define CMP_NO_COMMON_BITS      0x5
 
-// atk76, various
+// Cmd_various
 #define VARIOUS_CANCEL_MULTI_TURN_MOVES         0
 #define VARIOUS_SET_MAGIC_COAT_TARGET           1
 #define VARIOUS_IS_RUNNING_IMPOSSIBLE           2
@@ -84,44 +84,25 @@
 #define VARIOUS_SET_TELEPORT_OUTCOME            25
 #define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC     26
 
-// atk80, dmg manipulation
-#define ATK80_DMG_CHANGE_SIGN                               0
-#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP     1
-#define ATK80_DMG_DOUBLED                                   2
+// Cmd_manipulatedmg
+#define DMG_CHANGE_SIGN            0
+#define DMG_RECOIL_FROM_MISS       1
+#define DMG_DOUBLED                2
 
-// atk4F, a flag used for the jumpifcantswitch command
-#define ATK4F_DONT_CHECK_STATUSES   0x80
+// Cmd_jumpifcantswitch
+#define SWITCH_IGNORE_ESCAPE_PREVENTION   0x80
 
-// statchange defines
-#define STAT_CHANGE_BS_PTR                  0x1
-#define STAT_CHANGE_NOT_PROTECT_AFFECTED    0x20
+// Cmd_statbuffchange
+#define STAT_BUFF_ALLOW_PTR                 0x1   // If set, allow use of jumpptr. Set in every use of statbuffchange
+#define STAT_BUFF_NOT_PROTECT_AFFECTED      0x20
 
-// atk48
-#define ATK48_STAT_NEGATIVE         0x1
-#define ATK48_STAT_BY_TWO           0x2
-#define ATK48_ONLY_MULTIPLE         0x4
-#define ATK48_DONT_CHECK_LOWER      0x8
-
-// atk49, moveend cases
-#define ATK49_RAGE                              0
-#define ATK49_DEFROST                           1
-#define ATK49_SYNCHRONIZE_TARGET                2
-#define ATK49_MOVE_END_ABILITIES                3
-#define ATK49_STATUS_IMMUNITY_ABILITIES         4
-#define ATK49_SYNCHRONIZE_ATTACKER              5
-#define ATK49_CHOICE_MOVE                       6
-#define ATK49_CHANGED_ITEMS                     7
-#define ATK49_ATTACKER_INVISIBLE                8
-#define ATK49_ATTACKER_VISIBLE                  9
-#define ATK49_TARGET_VISIBLE                    10
-#define ATK49_ITEM_EFFECTS_ALL                  11
-#define ATK49_KINGSROCK_SHELLBELL               12
-#define ATK49_SUBSTITUTE                        13
-#define ATK49_UPDATE_LAST_MOVES                 14
-#define ATK49_MIRROR_MOVE                       15
-#define ATK49_NEXT_TARGET                       16
-#define ATK49_COUNT                             17
+// stat change flags for Cmd_playstatchangeanimation
+#define STAT_CHANGE_NEGATIVE             0x1
+#define STAT_CHANGE_BY_TWO               0x2
+#define STAT_CHANGE_MULTIPLE_STATS       0x4
+#define STAT_CHANGE_CANT_PREVENT         0x8
 
+// stat flags for Cmd_playstatchangeanimation
 #define BIT_HP                      0x1
 #define BIT_ATK                     0x2
 #define BIT_DEF                     0x4
@@ -131,4 +112,24 @@
 #define BIT_ACC                     0x40
 #define BIT_EVASION                 0x80
 
+// cases for Cmd_moveend
+#define MOVEEND_RAGE                              0
+#define MOVEEND_DEFROST                           1
+#define MOVEEND_SYNCHRONIZE_TARGET                2
+#define MOVEEND_ON_DAMAGE_ABILITIES               3
+#define MOVEEND_IMMUNITY_ABILITIES                4
+#define MOVEEND_SYNCHRONIZE_ATTACKER              5
+#define MOVEEND_CHOICE_MOVE                       6
+#define MOVEEND_CHANGED_ITEMS                     7
+#define MOVEEND_ATTACKER_INVISIBLE                8
+#define MOVEEND_ATTACKER_VISIBLE                  9
+#define MOVEEND_TARGET_VISIBLE                    10
+#define MOVEEND_ITEM_EFFECTS_ALL                  11
+#define MOVEEND_KINGSROCK_SHELLBELL               12
+#define MOVEEND_SUBSTITUTE                        13
+#define MOVEEND_UPDATE_LAST_MOVES                 14
+#define MOVEEND_MIRROR_MOVE                       15
+#define MOVEEND_NEXT_TARGET                       16
+#define MOVEEND_COUNT                             17
+
 #endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h
index d98e1762f..d825c88bc 100644
--- a/include/constants/battle_setup.h
+++ b/include/constants/battle_setup.h
@@ -13,6 +13,6 @@
 #define TRAINER_BATTLE_PYRAMID                          9
 #define TRAINER_BATTLE_SET_TRAINER_A                    10
 #define TRAINER_BATTLE_SET_TRAINER_B                    11
-#define TRAINER_BATTLE_12                               12
+#define TRAINER_BATTLE_HILL                             12
 
 #endif // GUARD_CONSTANTS_BATTLE_SETUP_H
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
new file mode 100644
index 000000000..508656fab
--- /dev/null
+++ b/include/constants/battle_tower.h
@@ -0,0 +1,21 @@
+#ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
+#define GUARD_CONSTANTS_BATTLE_TOWER_H
+
+#define BATTLE_TOWER_FUNC_0               0
+#define BATTLE_TOWER_FUNC_1               1
+#define BATTLE_TOWER_FUNC_2               2
+#define BATTLE_TOWER_FUNC_CHOOSE_TRAINER  3
+#define BATTLE_TOWER_FUNC_4               4
+#define BATTLE_TOWER_FUNC_GIVE_RIBBONS    5
+#define BATTLE_TOWER_FUNC_SAVE            6
+#define BATTLE_TOWER_FUNC_7               7
+#define BATTLE_TOWER_FUNC_NOP             8
+#define BATTLE_TOWER_FUNC_NOP2            9
+#define BATTLE_TOWER_FUNC_10              10
+#define BATTLE_TOWER_FUNC_11              11
+#define BATTLE_TOWER_FUNC_12              12
+#define BATTLE_TOWER_FUNC_13              13
+#define BATTLE_TOWER_FUNC_14              14
+#define BATTLE_TOWER_FUNC_15              15
+
+#endif //GUARD_CONSTANTS_BATTLE_TOWER_H
diff --git a/include/constants/coins.h b/include/constants/coins.h
new file mode 100644
index 000000000..fd68f3f9e
--- /dev/null
+++ b/include/constants/coins.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CONSTANTS_COINS_H
+#define GUARD_CONSTANTS_COINS_H
+
+#define MAX_COINS 9999
+
+#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file
diff --git a/include/constants/contest.h b/include/constants/contest.h
index d3296222b..186c56e2b 100644
--- a/include/constants/contest.h
+++ b/include/constants/contest.h
@@ -9,6 +9,19 @@
 #define LINK_CONTEST_FLAG_IS_WIRELESS   (1 << 1)
 #define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
 
+#define CONTEST_RANK_NORMAL  0
+#define CONTEST_RANK_SUPER   1
+#define CONTEST_RANK_HYPER   2
+#define CONTEST_RANK_MASTER  3
+#define CONTEST_RANK_LINK    4
+
+// States for VAR_CONTEST_TYPE
+#define CONTEST_TYPE_NPC_NORMAL  (CONTEST_RANK_NORMAL + 1)
+#define CONTEST_TYPE_NPC_SUPER   (CONTEST_RANK_SUPER + 1)
+#define CONTEST_TYPE_NPC_HYPER   (CONTEST_RANK_HYPER + 1)
+#define CONTEST_TYPE_NPC_MASTER  (CONTEST_RANK_MASTER + 1)
+#define CONTEST_TYPE_LINK        (CONTEST_RANK_LINK + 1)
+
 #define CONTEST_CATEGORY_COOL     0
 #define CONTEST_CATEGORY_BEAUTY   1
 #define CONTEST_CATEGORY_CUTE     2
@@ -16,4 +29,10 @@
 #define CONTEST_CATEGORY_TOUGH    4
 #define CONTEST_CATEGORIES_COUNT  5
 
+#define CANT_ENTER_CONTEST             0
+#define CAN_ENTER_CONTEST_EQUAL_RANK   1
+#define CAN_ENTER_CONTEST_HIGH_RANK    2
+#define CANT_ENTER_CONTEST_EGG         3
+#define CANT_ENTER_CONTEST_FAINTED     4
+
 #endif  // GUARD_CONSTANTS_CONTEST_H
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index 50f5994f4..8e82cfef0 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -1095,6 +1095,15 @@
 #define EC_WORD_OLD            (EC_GROUP_TRENDY_SAYING << 9) | 0x1e
 #define EC_WORD_YOUNG          (EC_GROUP_TRENDY_SAYING << 9) | 0x1f
 #define EC_WORD_UGLY           (EC_GROUP_TRENDY_SAYING << 9) | 0x20
+#define NUM_ADDITIONAL_PHRASES  33
+
+// Special Berry Masters Wife phrases
+#define NOT_SPECIAL_PHRASE          0
+#define PHRASE_GREAT_BATTLE         1
+#define PHRASE_CHALLENGE_CONTEST    2
+#define PHRASE_OVERWHELMING_LATIAS  3
+#define PHRASE_COOL_LATIOS          4
+#define PHRASE_SUPER_HUSTLE         5
 
 #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
 #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h
index 5ec38d1d4..5dde18058 100644
--- a/include/constants/field_specials.h
+++ b/include/constants/field_specials.h
@@ -13,6 +13,19 @@
 #define SS_TIDAL_LOCATION_ROUTE124  3
 #define SS_TIDAL_LOCATION_ROUTE131  4
 
+#define SS_TIDAL_BOARD_SLATEPORT     1
+#define SS_TIDAL_DEPART_SLATEPORT    2
+#define SS_TIDAL_HALFWAY_LILYCOVE    3
+#define SS_TIDAL_LAND_LILYCOVE       4
+#define SS_TIDAL_BOARD_LILYCOVE      5
+#define SS_TIDAL_DEPART_LILYCOVE     6
+#define SS_TIDAL_HALFWAY_SLATEPORT   7
+#define SS_TIDAL_LAND_SLATEPORT      8
+#define SS_TIDAL_EXIT_CURRENTS_RIGHT 9
+#define SS_TIDAL_EXIT_CURRENTS_LEFT  10
+
+#define SS_TIDAL_MAX_STEPS 205
+
 // Scrollable Multichoice Menus
 #define SCROLL_MULTI_NONE                                  0
 #define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR                 1
@@ -49,4 +62,17 @@
 #define DEPT_STORE_FLOORNUM_11F      14
 #define DEPT_STORE_FLOORNUM_ROOFTOP  15
 
+// Lilycove Pokemon Trainer Fan Club
+#define NUM_TRAINER_FAN_CLUB_MEMBERS  8
+
+#define FANCLUB_GOT_FIRST_FANS 7
+#define FANCLUB_MEMBER1        8
+#define FANCLUB_MEMBER2        9
+#define FANCLUB_MEMBER3        10
+#define FANCLUB_MEMBER4        11
+#define FANCLUB_MEMBER5        12
+#define FANCLUB_MEMBER6        13
+#define FANCLUB_MEMBER7        14
+#define FANCLUB_MEMBER8        15
+
 #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index e9f9aa770..1eb8a0673 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -87,7 +87,7 @@
 #define FLAG_UNUSED_0x04F    0x4F // Unused Flag
 
 // Scripts
-#define FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT    0x50
+#define FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT  0x50
 #define FLAG_SET_WALL_CLOCK                  0x51
 #define FLAG_RESCUED_BIRCH                   0x52
 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS       0x53
@@ -95,7 +95,7 @@
 #define FLAG_UNUSED_0x054                    0x54  // Unused Flag
 #define FLAG_UNUSED_0x055                    0x55  // Unused Flag
 
-#define FLAG_LINK_CONTEST_POKE_BALL          0x56
+#define FLAG_HIDE_CONTEST_POKE_BALL          0x56  // Always set after new game, object it hides is added directly
 #define FLAG_MET_RIVAL_MOM                   0x57
 #define FLAG_BIRCH_AIDE_MET                  0x58
 #define FLAG_DECLINED_BIKE                   0x59
@@ -119,13 +119,13 @@
 #define FLAG_OCEANIC_MUSEUM_MET_REPORTER     0x69
 #define FLAG_RECEIVED_HM04                   0x6A
 #define FLAG_RECEIVED_HM06                   0x6B
-#define FLAG_FLANNERY_GIVES_BADGE_INFO       0x6C
+#define FLAG_WHITEOUT_TO_LAVARIDGE           0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles
 #define FLAG_RECEIVED_HM05                   0x6D
 #define FLAG_RECEIVED_HM02                   0x6E
 #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT  0x6F
 #define FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE  0x70
 #define FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE 0x71 // Unused Flag. Used in R/S to indicate whether player defeated or caught Groudon/Kyogre in Cave of Origin.
-#define FLAG_SCOTT_CALL_NATIONAL_DEX         0x72 // Used in order to activate a phone call from Scott, inviting the player to the SS Tidal.
+#define FLAG_SCOTT_CALL_BATTLE_FRONTIER      0x72 // Used in order to activate a phone call from Scott, inviting the player to the SS Tidal.
 #define FLAG_RECEIVED_METEORITE              0x73
 #define FLAG_ADVENTURE_STARTED               0x74 // RECEIVED Pokédex.
 #define FLAG_DEFEATED_MAGMA_SPACE_CENTER     0x75 // Set when Team Magma is defeated at Mossdeep's Space Center.
@@ -146,12 +146,12 @@
 #define FLAG_DEFEATED_RIVAL_ROUTE103         0x82
 #define FLAG_RECEIVED_DOLL_LANETTE           0x83
 #define FLAG_RECEIVED_POTION_OLDALE          0x84
-#define FLAG_MOM_SAYS_GOODBYE                0x85
+#define FLAG_RECEIVED_AMULET_COIN            0x85
 #define FLAG_PENDING_DAYCARE_EGG             0x86
 #define FLAG_THANKED_FOR_PLAYING_WITH_WALLY  0x87
 #define FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL 0x88 // Set after defeating Wally outside Mauville Gym. Will activate a call later to register Wally.
 #define FLAG_RECEIVED_HM01                   0x89
-#define FLAG_REGISTER_WINONA_POKENAV         0x8A // Set after obtaining registering Winona, and cleared after Scott's call.
+#define FLAG_SCOTT_CALL_FORTREE_GYM          0x8A // Triggers call from Scott after defeating Winona
 #define FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY   0x8B
 #define FLAG_RECEIVED_6_SODA_POP             0x8C
 #define FLAG_DEFEATED_SEASHORE_HOUSE         0x8D
@@ -163,9 +163,7 @@
 #define FLAG_MR_BRINEY_SAILING_INTRO         0x93
 #define FLAG_DOCK_REJECTED_DEVON_GOODS       0x94
 #define FLAG_DELIVERED_DEVON_GOODS           0x95
-
-#define FLAG_UNUSED_0x096                    0x96 // Unused Flag
-
+#define FLAG_RECEIVED_CONTEST_PASS           0x96 // Unused, leftover from R/S
 #define FLAG_RECEIVED_CASTFORM               0x97
 #define FLAG_RECEIVED_SUPER_ROD              0x98
 #define FLAG_RUSTBORO_NPC_TRADE_COMPLETED    0x99
@@ -209,11 +207,11 @@
 #define FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F  0xBF
 #define FLAG_RECEIVED_SUN_STONE_MOSSDEEP     0xC0
 #define FLAG_WALLY_SPEECH                    0xC1
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1   0xC2
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2   0xC3
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3   0xC4
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4   0xC5
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5   0xC6
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1   0xC2 // Leftover from the RS version of Puzzle Room 7, functionally unused
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2   0xC3 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3   0xC4 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4   0xC5 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5   0xC6 //
 #define FLAG_RUSTURF_TUNNEL_OPENED           0xC7
 #define FLAG_RECEIVED_RED_SCARF              0xC8
 #define FLAG_RECEIVED_BLUE_SCARF             0xC9
@@ -263,7 +261,7 @@
 #define FLAG_USED_ROOM_2_KEY                 0xF1
 #define FLAG_USED_ROOM_4_KEY                 0xF2
 #define FLAG_USED_ROOM_6_KEY                 0xF3
-#define FLAG_MET_PROF_COSMO                  0xF4
+#define FLAG_MET_PROF_COZMO                  0xF4
 #define FLAG_RECEIVED_WAILMER_DOLL           0xF5
 #define FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 0xF6
 #define FLAG_DEFEATED_SS_TIDAL_TRAINERS      0xF7
@@ -289,7 +287,7 @@
 #define FLAG_RECEIVED_REVIVED_FOSSIL_MON     0x10B
 #define FLAG_SECRET_BASE_REGISTRY_ENABLED    0x10C
 #define FLAG_RECEIVED_TM46                   0x10D
-#define FLAG_CONTEST_SKETCH_CREATED          0x10E
+#define FLAG_CONTEST_SKETCH_CREATED          0x10E  // Set but never read
 #define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE   0x10F
 #define FLAG_RECEIVED_EXP_SHARE              0x110
 #define FLAG_POKERUS_EXPLAINED               0x111
@@ -332,10 +330,10 @@
 #define FLAG_MET_SCOTT_RUSTBORO              0x136
 #define FLAG_WALLACE_GOES_TO_SKY_PILLAR      0x137 // Set after speaking to Wallace within the Cave of Origin.
 #define FLAG_RECEIVED_HM07                   0x138
-#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS    0x139 // Beat Magma Grunt blocking Magma Hideout entrance.
-#define FLAG_RECEIVED_AURORA_TICKET          0x13A // RECEIVED Aurora Ticket in Mystery Gift
-#define FLAG_RECEIVED_MYSTIC_TICKET          0x13B // RECEIVED Mystic Ticket in Mystery Gift
-#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C // RECEIVED Old Sea Map in Mystery Gift
+#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS    0x139
+#define FLAG_RECEIVED_AURORA_TICKET          0x13A
+#define FLAG_RECEIVED_MYSTIC_TICKET          0x13B
+#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C 
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13D       0x13D
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13E       0x13E
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13F       0x13F
@@ -355,17 +353,17 @@
 #define FLAG_UNUSED_MYSTERY_GIFT_0x14D       0x14D
 
 #define FLAG_MIRAGE_TOWER_VISIBLE            0x14E
-#define FLAG_CHOSE_CLAW_FOSSIL               0x14F // Player chose Claw Fossil
-#define FLAG_CHOSE_ROOT_FOSSIL               0x150 // Player chose Root Fossil
+#define FLAG_CHOSE_ROOT_FOSSIL               0x14F
+#define FLAG_CHOSE_CLAW_FOSSIL               0x150
 #define FLAG_RECEIVED_POWDER_JAR             0x151
 
 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152
 
 #define FLAG_MET_BATTLE_FRONTIER_BREEDER     0x153
 #define FLAG_MET_BATTLE_FRONTIER_MANIAC      0x154
-#define FLAG_ENTERED_LINK_CONTEST            0x155
+#define FLAG_ENTERED_CONTEST                 0x155
 #define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN  0x156
-#define FLAG_MET_BATTLE_FRONTIER_BETTOR      0x157
+#define FLAG_MET_BATTLE_FRONTIER_GAMBLER     0x157
 #define FLAG_ENABLE_MR_STONE_POKENAV         0x158
 #define FLAG_NURSE_MENTIONS_GOLD_CARD        0x159
 #define FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR  0x15A
@@ -493,7 +491,7 @@
 #define FLAG_MET_SCOTT_IN_EVERGRANDE         0x1CF
 #define FLAG_MET_SCOTT_ON_SS_TIDAL           0x1D0
 #define FLAG_SCOTT_GIVES_BATTLE_POINTS       0x1D1
-#define FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT 0x1D2
+#define FLAG_COLLECTED_ALL_GOLD_SYMBOLS      0x1D2
 #define FLAG_ENABLE_ROXANNE_MATCH_CALL       0x1D3
 #define FLAG_ENABLE_BRAWLY_MATCH_CALL        0x1D4
 #define FLAG_ENABLE_WATTSON_MATCH_CALL       0x1D5
@@ -650,6 +648,95 @@
 #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5D)
 #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5E)
 
+#define FLAG_UNUSED_0x264  0x264 // Unused Flag
+#define FLAG_UNUSED_0x265  0x265 // Unused Flag
+#define FLAG_UNUSED_0x266  0x266 // Unused Flag
+#define FLAG_UNUSED_0x267  0x267 // Unused Flag
+#define FLAG_UNUSED_0x268  0x268 // Unused Flag
+#define FLAG_UNUSED_0x269  0x269 // Unused Flag
+#define FLAG_UNUSED_0x26A  0x26A // Unused Flag
+#define FLAG_UNUSED_0x26B  0x26B // Unused Flag
+#define FLAG_UNUSED_0x26C  0x26C // Unused Flag
+#define FLAG_UNUSED_0x26D  0x26D // Unused Flag
+#define FLAG_UNUSED_0x26E  0x26E // Unused Flag
+#define FLAG_UNUSED_0x26F  0x26F // Unused Flag
+#define FLAG_UNUSED_0x270  0x270 // Unused Flag
+#define FLAG_UNUSED_0x271  0x271 // Unused Flag
+#define FLAG_UNUSED_0x272  0x272 // Unused Flag
+#define FLAG_UNUSED_0x273  0x273 // Unused Flag
+#define FLAG_UNUSED_0x274  0x274 // Unused Flag
+#define FLAG_UNUSED_0x275  0x275 // Unused Flag
+#define FLAG_UNUSED_0x276  0x276 // Unused Flag
+#define FLAG_UNUSED_0x277  0x277 // Unused Flag
+#define FLAG_UNUSED_0x278  0x278 // Unused Flag
+#define FLAG_UNUSED_0x279  0x279 // Unused Flag
+#define FLAG_UNUSED_0x27A  0x27A // Unused Flag
+#define FLAG_UNUSED_0x27B  0x27B // Unused Flag
+#define FLAG_UNUSED_0x27C  0x27C // Unused Flag
+#define FLAG_UNUSED_0x27D  0x27D // Unused Flag
+#define FLAG_UNUSED_0x27E  0x27E // Unused Flag
+#define FLAG_UNUSED_0x27F  0x27F // Unused Flag
+#define FLAG_UNUSED_0x280  0x280 // Unused Flag
+#define FLAG_UNUSED_0x281  0x281 // Unused Flag
+#define FLAG_UNUSED_0x282  0x282 // Unused Flag
+#define FLAG_UNUSED_0x283  0x283 // Unused Flag
+#define FLAG_UNUSED_0x284  0x284 // Unused Flag
+#define FLAG_UNUSED_0x285  0x285 // Unused Flag
+#define FLAG_UNUSED_0x286  0x286 // Unused Flag
+#define FLAG_UNUSED_0x287  0x287 // Unused Flag
+#define FLAG_UNUSED_0x288  0x288 // Unused Flag
+#define FLAG_UNUSED_0x289  0x289 // Unused Flag
+#define FLAG_UNUSED_0x28A  0x28A // Unused Flag
+#define FLAG_UNUSED_0x28B  0x28B // Unused Flag
+#define FLAG_UNUSED_0x28C  0x28C // Unused Flag
+#define FLAG_UNUSED_0x28D  0x28D // Unused Flag
+#define FLAG_UNUSED_0x28E  0x28E // Unused Flag
+#define FLAG_UNUSED_0x28F  0x28F // Unused Flag
+#define FLAG_UNUSED_0x290  0x290 // Unused Flag
+#define FLAG_UNUSED_0x291  0x291 // Unused Flag
+#define FLAG_UNUSED_0x292  0x292 // Unused Flag
+#define FLAG_UNUSED_0x293  0x293 // Unused Flag
+#define FLAG_UNUSED_0x294  0x294 // Unused Flag
+#define FLAG_UNUSED_0x295  0x295 // Unused Flag
+#define FLAG_UNUSED_0x296  0x296 // Unused Flag
+#define FLAG_UNUSED_0x297  0x297 // Unused Flag
+#define FLAG_UNUSED_0x298  0x298 // Unused Flag
+#define FLAG_UNUSED_0x299  0x299 // Unused Flag
+#define FLAG_UNUSED_0x29A  0x29A // Unused Flag
+#define FLAG_UNUSED_0x29B  0x29B // Unused Flag
+#define FLAG_UNUSED_0x29C  0x29C // Unused Flag
+#define FLAG_UNUSED_0x29D  0x29D // Unused Flag
+#define FLAG_UNUSED_0x29E  0x29E // Unused Flag
+#define FLAG_UNUSED_0x29F  0x29F // Unused Flag
+#define FLAG_UNUSED_0x2A0  0x2A0 // Unused Flag
+#define FLAG_UNUSED_0x2A1  0x2A1 // Unused Flag
+#define FLAG_UNUSED_0x2A2  0x2A2 // Unused Flag
+#define FLAG_UNUSED_0x2A3  0x2A3 // Unused Flag
+#define FLAG_UNUSED_0x2A4  0x2A4 // Unused Flag
+#define FLAG_UNUSED_0x2A5  0x2A5 // Unused Flag
+#define FLAG_UNUSED_0x2A6  0x2A6 // Unused Flag
+#define FLAG_UNUSED_0x2A7  0x2A7 // Unused Flag
+#define FLAG_UNUSED_0x2A8  0x2A8 // Unused Flag
+#define FLAG_UNUSED_0x2A9  0x2A9 // Unused Flag
+#define FLAG_UNUSED_0x2AA  0x2AA // Unused Flag
+#define FLAG_UNUSED_0x2AB  0x2AB // Unused Flag
+#define FLAG_UNUSED_0x2AC  0x2AC // Unused Flag
+#define FLAG_UNUSED_0x2AD  0x2AD // Unused Flag
+#define FLAG_UNUSED_0x2AE  0x2AE // Unused Flag
+#define FLAG_UNUSED_0x2AF  0x2AF // Unused Flag
+#define FLAG_UNUSED_0x2B0  0x2B0 // Unused Flag
+#define FLAG_UNUSED_0x2B1  0x2B1 // Unused Flag
+#define FLAG_UNUSED_0x2B2  0x2B2 // Unused Flag
+#define FLAG_UNUSED_0x2B3  0x2B3 // Unused Flag
+#define FLAG_UNUSED_0x2B4  0x2B4 // Unused Flag
+#define FLAG_UNUSED_0x2B5  0x2B5 // Unused Flag
+#define FLAG_UNUSED_0x2B6  0x2B6 // Unused Flag
+#define FLAG_UNUSED_0x2B7  0x2B7 // Unused Flag
+#define FLAG_UNUSED_0x2B8  0x2B8 // Unused Flag
+#define FLAG_UNUSED_0x2B9  0x2B9 // Unused Flag
+#define FLAG_UNUSED_0x2BA  0x2BA // Unused Flag
+#define FLAG_UNUSED_0x2BB  0x2BB // Unused Flag
+
 // Event Flags
 #define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG                      0x2BC
 #define FLAG_HIDE_APPRENTICE                                        0x2BD
@@ -690,16 +777,16 @@
 #define FLAG_HIDE_PLAYERS_HOUSE_DAD                                 0x2DE
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING      0x2DF
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING          0x2E0
-#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY    0x2E1
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE             0x2E1
 #define FLAG_HIDE_ROUTE_104_MR_BRINEY                               0x2E2
 #define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY                           0x2E3
 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN                            0x2E4
-#define FLAG_HIDE_ROUTE_108_MR_BRINEY                               0x2E5
+#define FLAG_HIDE_ROUTE_109_MR_BRINEY                               0x2E5
 #define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT                          0x2E6
 #define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN                       0x2E7
 #define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT                          0x2E8
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN            0x2E9
-#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN                0x2EA
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY                    0x2EA
 #define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION                  0x2EB
 #define FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER                0x2EC
 #define FLAG_HIDE_SLATEPORT_CITY_SCOTT                              0x2ED
@@ -720,7 +807,7 @@
 #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE                      0x2FC
 #define FLAG_HIDE_MAUVILLE_CITY_SCOTT                               0x2FD
 #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT                             0x2FE
-#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
+#define FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
 #define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE                        0x300
 #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE                      0x301
 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE                          0x302
@@ -760,14 +847,14 @@
 #define FLAG_HIDE_MAUVILLE_CITY_WALLY                               0x324
 #define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE                        0x325
 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY                0x326
-#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN                          0x327
-#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN            0x328
+#define FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND                   0x327
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND     0x328
 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE         0x329
 #define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT                           0x32A
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL     0x32B
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE      0x32C
 #define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN                     0x32D
-#define FLAG_HIDE_RUSBORO_CITY_RIVAL                                0x32E
+#define FLAG_HIDE_RUSTBORO_CITY_RIVAL                               0x32E
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL     0x32F
 #define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE                           0x330
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL       0x331
@@ -778,16 +865,14 @@
 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE         0x336
 #define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA                          0x337
 #define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE                        0x338
-
-#define FLAG_UNUSED_0x339                                           0x339 // Unused Flag
-
+#define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN                         0x339 // Unused, leftover from R/S
 #define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE                            0x33A
 #define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE                             0x33B
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE                     0x33C
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE                      0x33D
 #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE                       0x33E
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS               0x33F
-#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS      0x340
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER                0x340
 #define FLAG_HIDE_GRANITE_CAVE_STEVEN                               0x341
 #define FLAG_HIDE_ROUTE_128_STEVEN                                  0x342
 #define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY                       0x343
@@ -828,13 +913,13 @@
 #define FLAG_HIDE_LANETTES_HOUSE_LANETTE                            0x366
 #define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE                  0x367
 #define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN                          0x368
-#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT            0x369
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT    0x369
 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL                           0x36A
 #define FLAG_HIDE_ROUTE_111_PLAYER_DESCENT                          0x36B
 #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL                           0x36C
 #define FLAG_HIDE_MT_CHIMNEY_TRAINERS                               0x36D
 #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT                         0x36E
-#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN                            0x36F
+#define FLAG_HIDE_RUSTURF_TUNNEL_BRINEY                             0x36F
 #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO                              0x370
 #define FLAG_HIDE_BRINEYS_HOUSE_PEEKO                               0x371
 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA                          0x372
@@ -849,7 +934,7 @@
 #define FLAG_HIDE_ROUTE_116_MR_BRINEY                               0x37B
 #define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS                      0x37C
 #define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS                      0x37D
-#define FLAG_HIDE_ROUTE_116_TUNNELER                                0x37E
+#define FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND                        0x37E
 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2         0x37F
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380          0x380
 #define FLAG_HIDE_ROUTE_101_BIRCH                                   0x381
@@ -883,9 +968,9 @@
 #define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS                      0x39D
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA                              0x39E
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA                             0x39F
-#define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO                      0x3A0
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1                            0x3A1
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2                            0x3A2
+#define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO                        0x3A0
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL                              0x3A1
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE                      0x3A2
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1                             0x3A3
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2                             0x3A4
 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL                      0x3A5
@@ -938,8 +1023,8 @@
 #define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE      0x3D4
 #define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE                  0x3D5
 #define FLAG_HIDE_ROUTE_120_KECLEON_1                               0x3D6
-#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN                        0x3D7
-#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN          0x3D8
+#define FLAG_HIDE_RUSTURF_TUNNEL_WANDA                              0x3D7
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA                0x3D8
 #define FLAG_HIDE_ROUTE_120_KECLEON_2                               0x3D9
 #define FLAG_HIDE_ROUTE_120_KECLEON_3                               0x3DA
 #define FLAG_HIDE_ROUTE_120_KECLEON_4                               0x3DB
@@ -948,7 +1033,7 @@
 #define FLAG_HIDE_ROUTE_119_KECLEON_2                               0x3DE
 #define FLAG_HIDE_ROUTE_101_BOY                                     0x3DF
 #define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M                 0x3E0
-#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY                      0x3E1
+#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON          0x3E1
 #define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY                       0x3E2
 #define FLAG_HIDE_PETALBURG_CITY_SCOTT                              0x3E3
 #define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA                          0x3E4
@@ -1552,6 +1637,6 @@
 #define FLAG_DONT_TRANSITION_MUSIC                                 0x4001
 #define FLAG_SPECIAL_FLAG_0x4002                                   0x4002
 #define FLAG_SPECIAL_FLAG_0x4003                                   0x4003
-#define FLAG_SPECIAL_FLAG_0x4004                                   0x4004
+#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG                          0x4004
 
 #endif // GUARD_CONSTANTS_FLAGS_H
diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h
new file mode 100644
index 000000000..52bde509f
--- /dev/null
+++ b/include/constants/frontier_util.h
@@ -0,0 +1,32 @@
+#ifndef GUARD_CONSTANTS_FRONTIER_UTIL_H
+#define GUARD_CONSTANTS_FRONTIER_UTIL_H
+
+#define FRONTIER_BEFORE_TEXT      0
+#define FRONTIER_PLAYER_LOST_TEXT 1
+#define FRONTIER_PLAYER_WON_TEXT  2
+
+#define FRONTIER_UTIL_FUNC_0                      0
+#define FRONTIER_UTIL_FUNC_1                      1
+#define FRONTIER_UTIL_FUNC_2                      2
+#define FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY    3
+#define FRONTIER_UTIL_FUNC_SOFT_RESET             4
+#define FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS  5
+#define FRONTIER_UTIL_FUNC_6                      6
+#define FRONTIER_UTIL_FUNC_RESULTS_WINDOW         7
+#define FRONTIER_UTIL_FUNC_8                      8
+#define FRONTIER_UTIL_FUNC_9                      9
+#define FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN      10
+#define FRONTIER_UTIL_FUNC_11                     11
+#define FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS   12
+#define FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL   13
+#define FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE      14
+#define FRONTIER_UTIL_FUNC_15                     15
+#define FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER    16
+#define FRONTIER_UTIL_FUNC_17                     17
+#define FRONTIER_UTIL_FUNC_18                     18
+#define FRONTIER_UTIL_FUNC_19                     19
+#define FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME    20
+#define FRONTIER_UTIL_FUNC_21                     21
+#define FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT       22
+
+#endif // GUARD_CONSTANTS_FRONTIER_UTIL_H
diff --git a/include/constants/global.h b/include/constants/global.h
index 091f735f4..3ee7650a8 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -18,12 +18,13 @@
 #define VERSION_GAMECUBE 15
 
 #define LANGUAGE_JAPANESE 1
-#define LANGUAGE_ENGLISH 2
-#define LANGUAGE_FRENCH 3
-#define LANGUAGE_ITALIAN 4
-#define LANGUAGE_GERMAN 5
-#define LANGUAGE_KOREAN 6 // 6 goes unused but the theory is it was meant to be Korean
-#define LANGUAGE_SPANISH 7
+#define LANGUAGE_ENGLISH  2
+#define LANGUAGE_FRENCH   3
+#define LANGUAGE_ITALIAN  4
+#define LANGUAGE_GERMAN   5
+#define LANGUAGE_KOREAN   6 // 6 goes unused but the theory is it was meant to be Korean
+#define LANGUAGE_SPANISH  7
+#define NUM_LANGUAGES     7
 
 #define GAME_VERSION (VERSION_EMERALD)
 #define GAME_LANGUAGE (LANGUAGE_ENGLISH)
@@ -48,12 +49,16 @@
 #define EVENT_OBJECT_TEMPLATES_COUNT 64
 #define DECOR_MAX_SECRET_BASE 16
 #define DECOR_MAX_PLAYERS_HOUSE 12
+#define APPRENTICE_COUNT 4
+#define APPRENTICE_MAX_QUESTIONS 9
 
 #define PYRAMID_BAG_ITEMS_COUNT 10
 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
 
 #define TRAINER_ID_LENGTH 4
 #define PARTY_SIZE 6
+#define FRONTIER_PARTY_SIZE 3
+#define MULTI_PARTY_SIZE PARTY_SIZE / 2
 #define MAX_MON_MOVES 4
 
 // string lengths
@@ -61,12 +66,17 @@
 #define POKEMON_NAME_LENGTH 10
 #define PLAYER_NAME_LENGTH 7
 #define MAIL_WORDS_COUNT 9
+#define EASY_CHAT_BATTLE_WORDS_COUNT 6
 #define MOVE_NAME_LENGTH 12
 
 #define MALE 0
 #define FEMALE 1
 #define GENDER_COUNT 2
 
+#define BARD_SONG_LENGTH       6
+#define NUM_STORYTELLER_TALES  4
+#define NUM_TRADER_ITEMS       4
+
 #define OPTIONS_BUTTON_MODE_NORMAL 0
 #define OPTIONS_BUTTON_MODE_LR 1
 #define OPTIONS_BUTTON_MODE_L_EQUALS_A 2
diff --git a/include/constants/items.h b/include/constants/items.h
index 3a894f8ff..db3474a72 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -465,8 +465,27 @@
 #define ITEMS_COUNT 377
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
-#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
-#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
+#define FIRST_BERRY_INDEX             ITEM_CHERI_BERRY
+#define LAST_BERRY_INDEX              ITEM_ENIGMA_BERRY
+
+// Range of berries given out by various NPCS
+#define FIRST_BERRY_MASTER_BERRY      ITEM_POMEG_BERRY
+#define LAST_BERRY_MASTER_BERRY       ITEM_NOMEL_BERRY
+#define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY
+#define LAST_BERRY_MASTER_WIFE_BERRY  ITEM_SITRUS_BERRY
+#define FIRST_KIRI_BERRY              ITEM_POMEG_BERRY
+#define LAST_KIRI_BERRY               ITEM_NOMEL_BERRY
+#define FIRST_ROUTE_114_MAN_BERRY     ITEM_RAZZ_BERRY
+#define LAST_ROUTE_114_MAN_BERRY      ITEM_PINAP_BERRY
+
+#define NUM_BERRY_MASTER_BERRIES          LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
+#define NUM_BERRY_MASTER_BERRIES_SKIPPED  FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
+#define NUM_BERRY_MASTER_WIFE_BERRIES     LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
+#define NUM_KIRI_BERRIES                  LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1
+#define NUM_KIRI_BERRIES_SKIPPED          FIRST_KIRI_BERRY - FIRST_BERRY_INDEX
+#define NUM_ROUTE_114_MAN_BERRIES         LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1
+#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX
+
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
 
 #define NUM_TECHNICAL_MACHINES 50
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index d4819c46a..fe905a2c6 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -221,22 +221,22 @@
 #define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
 #define LAYOUT_SECRET_BASE_TREE4 219
 #define LAYOUT_SECRET_BASE_SHRUB4 220
-#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221
+#define LAYOUT_BATTLE_COLOSSEUM_2P 221
 #define LAYOUT_TRADE_CENTER 222
 #define LAYOUT_RECORD_CORNER 223
-#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
-#define LAYOUT_LINK_CONTEST_ROOM1 225
+#define LAYOUT_BATTLE_COLOSSEUM_4P 224
+#define LAYOUT_CONTEST_HALL 225
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
-#define LAYOUT_LINK_CONTEST_ROOM2 232
-#define LAYOUT_LINK_CONTEST_ROOM3 233
-#define LAYOUT_LINK_CONTEST_ROOM4 234
-#define LAYOUT_LINK_CONTEST_ROOM5 235
-#define LAYOUT_LINK_CONTEST_ROOM6 236
+#define LAYOUT_CONTEST_HALL_BEAUTY 232
+#define LAYOUT_CONTEST_HALL_TOUGH 233
+#define LAYOUT_CONTEST_HALL_COOL 234
+#define LAYOUT_CONTEST_HALL_SMART 235
+#define LAYOUT_CONTEST_HALL_CUTE 236
 #define LAYOUT_INSIDE_OF_TRUCK 237
 #define LAYOUT_SAFARI_ZONE_NORTHWEST 238
 #define LAYOUT_SAFARI_ZONE_NORTH 239
@@ -398,7 +398,7 @@
 #define LAYOUT_SAFARI_ZONE_SOUTHEAST 395
 #define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396
 #define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398
+#define LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER 398
 #define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399
 #define LAYOUT_ARTISAN_CAVE_B1F 400
 #define LAYOUT_ARTISAN_CAVE_1F 401
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 6a3276b44..bedaaca2a 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -98,8 +98,8 @@
 #define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8))
 #define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F       (4 | (5 << 8))
 #define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F       (5 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE1                  (6 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE2                  (7 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_COZMOS_HOUSE            (6 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE   (7 | (5 << 8))
 
 // Map Group 6
 #define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY       (0 | (6 << 8))
@@ -136,12 +136,12 @@
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE1                  (5 | (9 << 8))
+#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE       (5 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
 #define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE2                  (10 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE                   (10 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
 #define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
@@ -422,22 +422,22 @@
 #define MAP_SECRET_BASE_YELLOW_CAVE4        (21 | (25 << 8))
 #define MAP_SECRET_BASE_TREE4               (22 | (25 << 8))
 #define MAP_SECRET_BASE_SHRUB4              (23 | (25 << 8))
-#define MAP_SINGLE_BATTLE_COLOSSEUM         (24 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_2P             (24 | (25 << 8))
 #define MAP_TRADE_CENTER                    (25 | (25 << 8))
 #define MAP_RECORD_CORNER                   (26 | (25 << 8))
-#define MAP_DOUBLE_BATTLE_COLOSSEUM         (27 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM1              (28 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_4P             (27 | (25 << 8))
+#define MAP_CONTEST_HALL                    (28 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM2              (35 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM3              (36 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM4              (37 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM5              (38 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM6              (39 | (25 << 8))
+#define MAP_CONTEST_HALL_BEAUTY             (35 | (25 << 8))
+#define MAP_CONTEST_HALL_TOUGH              (36 | (25 << 8))
+#define MAP_CONTEST_HALL_COOL               (37 | (25 << 8))
+#define MAP_CONTEST_HALL_SMART              (38 | (25 << 8))
+#define MAP_CONTEST_HALL_CUTE               (39 | (25 << 8))
 #define MAP_INSIDE_OF_TRUCK                 (40 | (25 << 8))
 #define MAP_SS_TIDAL_CORRIDOR               (41 | (25 << 8))
 #define MAP_SS_TIDAL_LOWER_DECK             (42 | (25 << 8))
@@ -461,95 +461,95 @@
 #define MAP_UNION_ROOM                      (60 | (25 << 8))
 
 // Map Group 26
-#define MAP_SAFARI_ZONE_NORTHWEST                                (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTH                                    (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST                                (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTH                                    (3 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                         (4 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY                   (5 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR                (6 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR                (7 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM             (8 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_EXTERIOR                             (9 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_INTERIOR                             (10 | (26 << 8))
-#define MAP_SAFARI_ZONE_REST_HOUSE                               (11 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST                                (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST                                (13 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                         (14 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM       (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2               (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2            (17 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY                    (18 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR                 (19 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM          (20 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM              (21 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY                  (22 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR               (23 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM            (24 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY                 (25 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE          (26 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP                   (27 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY                   (28 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR                (29 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM             (30 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY                 (31 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM       (32 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM           (33 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY                    (34 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR                 (35 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM          (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1             (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2             (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3             (39 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RANKING_HALL                         (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE1                              (41 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE2                              (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE3                              (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE4                              (45 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                         (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE5                              (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE6                              (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE7                              (49 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                       (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE8                              (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE9                              (52 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F                    (53 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F                    (54 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_MART                                 (55 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_ENTRANCE                              (56 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_INTERIOR                              (57 | (26 << 8))
-#define MAP_BIRTH_ISLAND_EXTERIOR                                (58 | (26 << 8))
-#define MAP_BIRTH_ISLAND_HARBOR                                  (59 | (26 << 8))
-#define MAP_TRAINER_HILL_ENTRANCE                                (60 | (26 << 8))
-#define MAP_TRAINER_HILL_1F                                      (61 | (26 << 8))
-#define MAP_TRAINER_HILL_2F                                      (62 | (26 << 8))
-#define MAP_TRAINER_HILL_3F                                      (63 | (26 << 8))
-#define MAP_TRAINER_HILL_4F                                      (64 | (26 << 8))
-#define MAP_TRAINER_HILL_ROOF                                    (65 | (26 << 8))
-#define MAP_NAVEL_ROCK_EXTERIOR                                  (66 | (26 << 8))
-#define MAP_NAVEL_ROCK_HARBOR                                    (67 | (26 << 8))
-#define MAP_NAVEL_ROCK_ENTRANCE                                  (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F                                       (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK                                      (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP1                                       (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP2                                       (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP3                                       (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP4                                       (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP                                       (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN01                                    (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN02                                    (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN03                                    (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN04                                    (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN05                                    (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN06                                    (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN07                                    (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN08                                    (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN09                                    (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN10                                    (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN11                                    (86 | (26 << 8))
-#define MAP_NAVEL_ROCK_BOTTOM                                    (87 | (26 << 8))
-#define MAP_TRAINER_HILL_ELEVATOR                                (88 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHWEST                          (0 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTH                              (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHWEST                          (2 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTH                              (3 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                   (4 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY             (5 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR          (6 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR          (7 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM       (8 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_EXTERIOR                       (9 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_INTERIOR                       (10 | (26 << 8))
+#define MAP_SAFARI_ZONE_REST_HOUSE                         (11 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST                          (12 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST                          (13 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                   (14 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2         (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2      (17 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY              (18 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR           (19 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM    (20 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM        (21 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY            (22 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR         (23 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM      (24 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY           (25 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE    (26 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP             (27 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY             (28 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR          (29 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM       (30 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY           (31 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM     (33 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY              (34 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR           (35 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM    (36 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1       (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2       (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3       (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RANKING_HALL                   (40 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1                        (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER        (42 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE2                        (43 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE3                        (44 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE4                        (45 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                   (46 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE5                        (47 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE6                        (48 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE7                        (49 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                 (50 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE8                        (51 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE9                        (52 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F              (53 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F              (54 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_MART                           (55 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_ENTRANCE                        (56 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_INTERIOR                        (57 | (26 << 8))
+#define MAP_BIRTH_ISLAND_EXTERIOR                          (58 | (26 << 8))
+#define MAP_BIRTH_ISLAND_HARBOR                            (59 | (26 << 8))
+#define MAP_TRAINER_HILL_ENTRANCE                          (60 | (26 << 8))
+#define MAP_TRAINER_HILL_1F                                (61 | (26 << 8))
+#define MAP_TRAINER_HILL_2F                                (62 | (26 << 8))
+#define MAP_TRAINER_HILL_3F                                (63 | (26 << 8))
+#define MAP_TRAINER_HILL_4F                                (64 | (26 << 8))
+#define MAP_TRAINER_HILL_ROOF                              (65 | (26 << 8))
+#define MAP_NAVEL_ROCK_EXTERIOR                            (66 | (26 << 8))
+#define MAP_NAVEL_ROCK_HARBOR                              (67 | (26 << 8))
+#define MAP_NAVEL_ROCK_ENTRANCE                            (68 | (26 << 8))
+#define MAP_NAVEL_ROCK_B1F                                 (69 | (26 << 8))
+#define MAP_NAVEL_ROCK_FORK                                (70 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP1                                 (71 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP2                                 (72 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP3                                 (73 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP4                                 (74 | (26 << 8))
+#define MAP_NAVEL_ROCK_TOP                                 (75 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN01                              (76 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN02                              (77 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN03                              (78 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN04                              (79 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN05                              (80 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN06                              (81 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN07                              (82 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN08                              (83 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN09                              (84 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN10                              (85 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN11                              (86 | (26 << 8))
+#define MAP_NAVEL_ROCK_BOTTOM                              (87 | (26 << 8))
+#define MAP_TRAINER_HILL_ELEVATOR                          (88 | (26 << 8))
 
 // Map Group 27
 #define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))
diff --git a/include/constants/mauville_man.h b/include/constants/mauville_man.h
deleted file mode 100644
index b00e3a291..000000000
--- a/include/constants/mauville_man.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAUVILLE_MAN_H
-#define GUARD_CONSTANTS_MAUVILLE_MAN_H
-
-#define MAUVILLE_MAN_BARD 0
-#define MAUVILLE_MAN_HIPSTER 1
-#define MAUVILLE_MAN_TRADER 2
-#define MAUVILLE_MAN_STORYTELLER 3
-#define MAUVILLE_MAN_GIDDY 4
-
-#endif  // GUARD_CONSTANTS_MAUVILLE_MAN_H
diff --git a/include/constants/mauville_old_man.h b/include/constants/mauville_old_man.h
new file mode 100644
index 000000000..c1fb0bf24
--- /dev/null
+++ b/include/constants/mauville_old_man.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H
+#define GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H
+
+#define MAUVILLE_MAN_BARD           0
+#define MAUVILLE_MAN_HIPSTER        1
+#define MAUVILLE_MAN_TRADER         2
+#define MAUVILLE_MAN_STORYTELLER    3
+#define MAUVILLE_MAN_GIDDY          4
+#define MAUVILLE_MAN_UNUSED1        5
+#define MAUVILLE_MAN_UNUSED2        6
+
+#endif // GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index 44bbd9729..94cb0ffca 100755
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -235,7 +235,7 @@
 #define MB_CABLE_BOX_RESULTS_2 0xE7
 #define MB_WIRELESS_BOX_RESULTS 0xE8
 #define MB_TRAINER_HILL_TIMER 0xE9
-#define MB_UNKNOWN_CLOSED_DOOR 0xEA
+#define MB_SKY_PILLAR_CLOSED_DOOR 0xEA
 #define MB_UNUSED_EB 0xEB
 #define MB_UNUSED_EC 0xEC
 #define MB_UNUSED_ED 0xED
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 2f3ce5f71..58ac90eab 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -149,8 +149,8 @@
 #define METATILE_Fortree_SecretBase_LongGrass_BottomLeft  0x281
 #define METATILE_Fortree_SecretBase_LongGrass_BottomMid   0x282
 #define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283
-#define METATILE_Fortree_WoodBridge_Kecleon0              0x297
-#define METATILE_Fortree_WoodBridge_Kecleon1              0x29F
+#define METATILE_Fortree_WoodBridge1_Top                  0x297
+#define METATILE_Fortree_WoodBridge1_Bottom               0x29F
 
 // gTileset_Sootopolis
 #define METATILE_Sootopolis_Door_Closed    0x248
@@ -255,10 +255,10 @@
 #define METATILE_EliteFour_EntryDoor_ClosedBottom   0x20E
 
 // gTileset_InsideShip
-#define METATILE_InsideShip_InTactDoor0_Bottom 0x233
-#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B
-#define METATILE_InsideShip_DoorIndent1        0x21A
-#define METATILE_InsideShip_DoorIndent0        0x234
+#define METATILE_InsideShip_IntactDoor_Bottom_Unlocked 0x22B
+#define METATILE_InsideShip_IntactDoor_Bottom_Locked   0x233
+#define METATILE_InsideShip_DoorIndent_Unlocked        0x21A
+#define METATILE_InsideShip_DoorIndent_Locked          0x234
 
 // gTileset_BattlePike
 #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A
@@ -381,7 +381,7 @@
 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
 #define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right  0x298
 
-// gTileset_BikeShop
+// gTileset_BikeShop (also used by New Mauville)
 #define METATILE_BikeShop_Barrier_Hidden_Top      0x269
 #define METATILE_BikeShop_Barrier_Hidden_Bottom   0x271
 #define METATILE_BikeShop_Floor_Shadow_Top        0x26D
diff --git a/include/constants/mevent.h b/include/constants/mevent.h
new file mode 100644
index 000000000..25bbcdf36
--- /dev/null
+++ b/include/constants/mevent.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_CONSTANTS_MEVENT_H
+#define GUARD_CONSTANTS_MEVENT_H
+
+// mevent2.c
+#define GET_NUM_STAMPS   0
+#define GET_MAX_STAMPS   1
+#define GET_CARD_BATTLES_WON  2
+
+#define GET_NUM_STAMPS_INTERNAL   3
+#define GET_MAX_STAMPS_INTERNAL   4
+#define GET_CARD_BATTLES_WON_INTERNAL  0
+
+#define REQUIRED_CARD_BATTLES 3
+
+#endif //GUARD_MEVENT_H
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 9f74baf67..9917b84ba 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -1,862 +1,862 @@
 #ifndef GUARD_CONSTANTS_OPPONENTS_H
 #define GUARD_CONSTANTS_OPPONENTS_H
 
-#define TRAINER_NONE              0
-#define TRAINER_SAWYER_1          1
-#define TRAINER_GRUNT_1           2
-#define TRAINER_GRUNT_2           3
-#define TRAINER_GRUNT_3           4
-#define TRAINER_GRUNT_4           5
-#define TRAINER_GRUNT_5           6
-#define TRAINER_GRUNT_6           7
-#define TRAINER_GRUNT_7           8
-#define TRAINER_GABRIELLE_1       9
-#define TRAINER_GRUNT_8          10
-#define TRAINER_MARCEL           11
-#define TRAINER_ALBERTO          12
-#define TRAINER_ED               13
-#define TRAINER_GRUNT_9          14
-#define TRAINER_DECLAN           15
-#define TRAINER_GRUNT_10         16
-#define TRAINER_GRUNT_11         17
-#define TRAINER_GRUNT_12         18
-#define TRAINER_GRUNT_13         19
-#define TRAINER_GRUNT_14         20
-#define TRAINER_GRUNT_15         21
-#define TRAINER_GRUNT_16         22
-#define TRAINER_GRUNT_17         23
-#define TRAINER_GRUNT_18         24
-#define TRAINER_GRUNT_19         25
-#define TRAINER_GRUNT_20         26
-#define TRAINER_GRUNT_21         27
-#define TRAINER_GRUNT_22         28
-#define TRAINER_FREDRICK         29
-#define TRAINER_MATT             30
-#define TRAINER_ZANDER           31
-#define TRAINER_SHELLY_1         32
-#define TRAINER_SHELLY_2         33
-#define TRAINER_ARCHIE           34
-#define TRAINER_LEAH             35
-#define TRAINER_DAISY            36
-#define TRAINER_ROSE_1           37
-#define TRAINER_FELIX            38
-#define TRAINER_VIOLET           39
-#define TRAINER_ROSE_2           40
-#define TRAINER_ROSE_3           41
-#define TRAINER_ROSE_4           42
-#define TRAINER_ROSE_5           43
-#define TRAINER_DUSTY_1          44
-#define TRAINER_CHIP             45
-#define TRAINER_FOSTER           46
-#define TRAINER_DUSTY_2          47
-#define TRAINER_DUSTY_3          48
-#define TRAINER_DUSTY_4          49
-#define TRAINER_DUSTY_5          50
-#define TRAINER_GABBY_AND_TY_1   51
-#define TRAINER_GABBY_AND_TY_2   52
-#define TRAINER_GABBY_AND_TY_3   53
-#define TRAINER_GABBY_AND_TY_4   54
-#define TRAINER_GABBY_AND_TY_5   55
-#define TRAINER_GABBY_AND_TY_6   56
-#define TRAINER_LOLA_1           57
-#define TRAINER_AUSTINA          58
-#define TRAINER_GWEN             59
-#define TRAINER_LOLA_2           60
-#define TRAINER_LOLA_3           61
-#define TRAINER_LOLA_4           62
-#define TRAINER_LOLA_5           63
-#define TRAINER_RICKY_1          64
-#define TRAINER_SIMON            65
-#define TRAINER_CHARLIE          66
-#define TRAINER_RICKY_2          67
-#define TRAINER_RICKY_3          68
-#define TRAINER_RICKY_4          69
-#define TRAINER_RICKY_5          70
-#define TRAINER_RANDALL          71
-#define TRAINER_PARKER           72
-#define TRAINER_GEORGE           73
-#define TRAINER_BERKE            74
-#define TRAINER_BRAXTON          75
-#define TRAINER_VINCENT          76
-#define TRAINER_LEROY            77
-#define TRAINER_WILTON_1         78
-#define TRAINER_EDGAR            79
-#define TRAINER_ALBERT           80
-#define TRAINER_SAMUEL           81
-#define TRAINER_VITO             82
-#define TRAINER_OWEN             83
-#define TRAINER_WILTON_2         84
-#define TRAINER_WILTON_3         85
-#define TRAINER_WILTON_4         86
-#define TRAINER_WILTON_5         87
-#define TRAINER_WARREN           88
-#define TRAINER_MARY             89
-#define TRAINER_ALEXIA           90
-#define TRAINER_JODY             91
-#define TRAINER_WENDY            92
-#define TRAINER_KEIRA            93
-#define TRAINER_BROOKE_1         94
-#define TRAINER_JENNIFER         95
-#define TRAINER_HOPE             96
-#define TRAINER_SHANNON          97
-#define TRAINER_MICHELLE         98
-#define TRAINER_CAROLINE         99
-#define TRAINER_JULIE           100
-#define TRAINER_BROOKE_2        101
-#define TRAINER_BROOKE_3        102
-#define TRAINER_BROOKE_4        103
-#define TRAINER_BROOKE_5        104
-#define TRAINER_PATRICIA        105
-#define TRAINER_KINDRA          106
-#define TRAINER_TAMMY           107
-#define TRAINER_VALERIE_1       108
-#define TRAINER_TASHA           109
-#define TRAINER_VALERIE_2       110
-#define TRAINER_VALERIE_3       111
-#define TRAINER_VALERIE_4       112
-#define TRAINER_VALERIE_5       113
-#define TRAINER_CINDY_1         114
-#define TRAINER_DAPHNE          115
-#define TRAINER_GRUNT_23        116
-#define TRAINER_CINDY_2         117
-#define TRAINER_BRIANNA         118
-#define TRAINER_NAOMI           119
-#define TRAINER_CINDY_3         120
-#define TRAINER_CINDY_4         121
-#define TRAINER_CINDY_5         122
-#define TRAINER_CINDY_6         123
-#define TRAINER_MELISSA         124
-#define TRAINER_SHEILA          125
-#define TRAINER_SHIRLEY         126
-#define TRAINER_JESSICA_1       127
-#define TRAINER_CONNIE          128
-#define TRAINER_BRIDGET         129
-#define TRAINER_OLIVIA          130
-#define TRAINER_TIFFANY         131
-#define TRAINER_JESSICA_2       132
-#define TRAINER_JESSICA_3       133
-#define TRAINER_JESSICA_4       134
-#define TRAINER_JESSICA_5       135
-#define TRAINER_WINSTON_1       136
-#define TRAINER_MOLLIE          137
-#define TRAINER_GARRET          138
-#define TRAINER_WINSTON_2       139
-#define TRAINER_WINSTON_3       140
-#define TRAINER_WINSTON_4       141
-#define TRAINER_WINSTON_5       142
-#define TRAINER_STEVE_1         143
-#define TRAINER_THALIA_1        144
-#define TRAINER_MARK            145
-#define TRAINER_GRUNT_24        146
-#define TRAINER_STEVE_2         147
-#define TRAINER_STEVE_3         148
-#define TRAINER_STEVE_4         149
-#define TRAINER_STEVE_5         150
-#define TRAINER_LUIS            151
-#define TRAINER_DOMINIK         152
-#define TRAINER_DOUGLAS         153
-#define TRAINER_DARRIN          154
-#define TRAINER_TONY_1          155
-#define TRAINER_JEROME          156
-#define TRAINER_MATTHEW         157
-#define TRAINER_DAVID           158
-#define TRAINER_SPENCER         159
-#define TRAINER_ROLAND          160
-#define TRAINER_NOLEN           161
-#define TRAINER_STAN            162
-#define TRAINER_BARRY           163
-#define TRAINER_DEAN            164
-#define TRAINER_RODNEY          165
-#define TRAINER_RICHARD         166
-#define TRAINER_HERMAN          167
-#define TRAINER_SANTIAGO        168
-#define TRAINER_GILBERT         169
-#define TRAINER_FRANKLIN        170
-#define TRAINER_KEVIN           171
-#define TRAINER_JACK            172
-#define TRAINER_DUDLEY          173
-#define TRAINER_CHAD            174
-#define TRAINER_TONY_2          175
-#define TRAINER_TONY_3          176
-#define TRAINER_TONY_4          177
-#define TRAINER_TONY_5          178
-#define TRAINER_TAKAO           179
-#define TRAINER_HITOSHI         180
-#define TRAINER_KIYO            181
-#define TRAINER_KOICHI          182
-#define TRAINER_NOB_1           183
-#define TRAINER_NOB_2           184
-#define TRAINER_NOB_3           185
-#define TRAINER_NOB_4           186
-#define TRAINER_NOB_5           187
-#define TRAINER_YUJI            188
-#define TRAINER_DAISUKE         189
-#define TRAINER_ATSUSHI         190
-#define TRAINER_KIRK            191
-#define TRAINER_GRUNT_25        192
-#define TRAINER_GRUNT_26        193
-#define TRAINER_SHAWN           194
-#define TRAINER_FERNANDO_1      195
-#define TRAINER_DALTON_1        196
-#define TRAINER_DALTON_2        197
-#define TRAINER_DALTON_3        198
-#define TRAINER_DALTON_4        199
-#define TRAINER_DALTON_5        200
-#define TRAINER_COLE            201
-#define TRAINER_JEFF            202
-#define TRAINER_AXLE            203
-#define TRAINER_JACE            204
-#define TRAINER_KEEGAN          205
-#define TRAINER_BERNIE_1        206
-#define TRAINER_BERNIE_2        207
-#define TRAINER_BERNIE_3        208
-#define TRAINER_BERNIE_4        209
-#define TRAINER_BERNIE_5        210
-#define TRAINER_DREW            211
-#define TRAINER_BEAU            212
-#define TRAINER_LARRY           213
-#define TRAINER_SHANE           214
-#define TRAINER_JUSTIN          215
-#define TRAINER_ETHAN_1         216
-#define TRAINER_AUTUMN          217
-#define TRAINER_TRAVIS          218
-#define TRAINER_ETHAN_2         219
-#define TRAINER_ETHAN_3         220
-#define TRAINER_ETHAN_4         221
-#define TRAINER_ETHAN_5         222
-#define TRAINER_BRENT           223
-#define TRAINER_DONALD          224
-#define TRAINER_TAYLOR          225
-#define TRAINER_JEFFREY_1       226
-#define TRAINER_DEREK           227
-#define TRAINER_JEFFREY_2       228
-#define TRAINER_JEFFREY_3       229
-#define TRAINER_JEFFREY_4       230
-#define TRAINER_JEFFREY_5       231
-#define TRAINER_EDWARD          232
-#define TRAINER_PRESTON         233
-#define TRAINER_VIRGIL          234
-#define TRAINER_BLAKE           235
-#define TRAINER_WILLIAM         236
-#define TRAINER_JOSHUA          237
-#define TRAINER_CAMERON_1       238
-#define TRAINER_CAMERON_2       239
-#define TRAINER_CAMERON_3       240
-#define TRAINER_CAMERON_4       241
-#define TRAINER_CAMERON_5       242
-#define TRAINER_JACLYN          243
-#define TRAINER_HANNAH          244
-#define TRAINER_SAMANTHA        245
-#define TRAINER_MAURA           246
-#define TRAINER_KAYLA           247
-#define TRAINER_ALEXIS          248
-#define TRAINER_JACKI_1         249
-#define TRAINER_JACKI_2         250
-#define TRAINER_JACKI_3         251
-#define TRAINER_JACKI_4         252
-#define TRAINER_JACKI_5         253
-#define TRAINER_WALTER_1        254
-#define TRAINER_MICAH           255
-#define TRAINER_THOMAS          256
-#define TRAINER_WALTER_2        257
-#define TRAINER_WALTER_3        258
-#define TRAINER_WALTER_4        259
-#define TRAINER_WALTER_5        260
-#define TRAINER_SIDNEY          261
-#define TRAINER_PHOEBE          262
-#define TRAINER_GLACIA          263
-#define TRAINER_DRAKE           264
-#define TRAINER_ROXANNE_1       265
-#define TRAINER_BRAWLY_1        266
-#define TRAINER_WATTSON_1       267
-#define TRAINER_FLANNERY_1      268
-#define TRAINER_NORMAN_1        269
-#define TRAINER_WINONA_1        270
-#define TRAINER_TATE_AND_LIZA_1 271
-#define TRAINER_JUAN_1          272
-#define TRAINER_JERRY_1         273
-#define TRAINER_TED             274
-#define TRAINER_PAUL            275
-#define TRAINER_JERRY_2         276
-#define TRAINER_JERRY_3         277
-#define TRAINER_JERRY_4         278
-#define TRAINER_JERRY_5         279
-#define TRAINER_KAREN_1         280
-#define TRAINER_GEORGIA         281
-#define TRAINER_KAREN_2         282
-#define TRAINER_KAREN_3         283
-#define TRAINER_KAREN_4         284
-#define TRAINER_KAREN_5         285
-#define TRAINER_KATE_AND_JOY    286
-#define TRAINER_ANNA_AND_MEG_1  287
-#define TRAINER_ANNA_AND_MEG_2  288
-#define TRAINER_ANNA_AND_MEG_3  289
-#define TRAINER_ANNA_AND_MEG_4  290
-#define TRAINER_ANNA_AND_MEG_5  291
-#define TRAINER_VICTOR          292
-#define TRAINER_MIGUEL_1        293
-#define TRAINER_COLTON          294
-#define TRAINER_MIGUEL_2        295
-#define TRAINER_MIGUEL_3        296
-#define TRAINER_MIGUEL_4        297
-#define TRAINER_MIGUEL_5        298
-#define TRAINER_VICTORIA        299
-#define TRAINER_VANESSA         300
-#define TRAINER_BETHANY         301
-#define TRAINER_ISABEL_1        302
-#define TRAINER_ISABEL_2        303
-#define TRAINER_ISABEL_3        304
-#define TRAINER_ISABEL_4        305
-#define TRAINER_ISABEL_5        306
-#define TRAINER_TIMOTHY_1       307
-#define TRAINER_TIMOTHY_2       308
-#define TRAINER_TIMOTHY_3       309
-#define TRAINER_TIMOTHY_4       310
-#define TRAINER_TIMOTHY_5       311
-#define TRAINER_VICKY           312
-#define TRAINER_SHELBY_1        313
-#define TRAINER_SHELBY_2        314
-#define TRAINER_SHELBY_3        315
-#define TRAINER_SHELBY_4        316
-#define TRAINER_SHELBY_5        317
-#define TRAINER_CALVIN_1        318
-#define TRAINER_BILLY           319
-#define TRAINER_JOSH            320
-#define TRAINER_TOMMY           321
-#define TRAINER_JOEY            322
-#define TRAINER_BEN             323
-#define TRAINER_QUINCY          324
-#define TRAINER_KATELYNN        325
-#define TRAINER_JAYLEN          326
-#define TRAINER_DILLON          327
-#define TRAINER_CALVIN_2        328
-#define TRAINER_CALVIN_3        329
-#define TRAINER_CALVIN_4        330
-#define TRAINER_CALVIN_5        331
-#define TRAINER_EDDIE           332
-#define TRAINER_ALLEN           333
-#define TRAINER_TIMMY           334
-#define TRAINER_WALLACE         335
-#define TRAINER_ANDREW          336
-#define TRAINER_IVAN            337
-#define TRAINER_CLAUDE          338
-#define TRAINER_ELLIOT_1        339
-#define TRAINER_NED             340
-#define TRAINER_DALE            341
-#define TRAINER_NOLAN           342
-#define TRAINER_BARNY           343
-#define TRAINER_WADE            344
-#define TRAINER_CARTER          345
-#define TRAINER_ELLIOT_2        346
-#define TRAINER_ELLIOT_3        347
-#define TRAINER_ELLIOT_4        348
-#define TRAINER_ELLIOT_5        349
-#define TRAINER_RONALD          350
-#define TRAINER_JACOB           351
-#define TRAINER_ANTHONY         352
-#define TRAINER_BENJAMIN_1      353
-#define TRAINER_BENJAMIN_2      354
-#define TRAINER_BENJAMIN_3      355
-#define TRAINER_BENJAMIN_4      356
-#define TRAINER_BENJAMIN_5      357
-#define TRAINER_ABIGAIL_1       358
-#define TRAINER_JASMINE         359
-#define TRAINER_ABIGAIL_2       360
-#define TRAINER_ABIGAIL_3       361
-#define TRAINER_ABIGAIL_4       362
-#define TRAINER_ABIGAIL_5       363
-#define TRAINER_DYLAN_1         364
-#define TRAINER_DYLAN_2         365
-#define TRAINER_DYLAN_3         366
-#define TRAINER_DYLAN_4         367
-#define TRAINER_DYLAN_5         368
-#define TRAINER_MARIA_1         369
-#define TRAINER_MARIA_2         370
-#define TRAINER_MARIA_3         371
-#define TRAINER_MARIA_4         372
-#define TRAINER_MARIA_5         373
-#define TRAINER_CAMDEN          374
-#define TRAINER_DEMETRIUS       375
-#define TRAINER_ISAIAH_1        376
-#define TRAINER_PABLO_1         377
-#define TRAINER_CHASE           378
-#define TRAINER_ISAIAH_2        379
-#define TRAINER_ISAIAH_3        380
-#define TRAINER_ISAIAH_4        381
-#define TRAINER_ISAIAH_5        382
-#define TRAINER_ISOBEL          383
-#define TRAINER_DONNY           384
-#define TRAINER_TALIA           385
-#define TRAINER_KATELYN_1       386
-#define TRAINER_ALLISON         387
-#define TRAINER_KATELYN_2       388
-#define TRAINER_KATELYN_3       389
-#define TRAINER_KATELYN_4       390
-#define TRAINER_KATELYN_5       391
-#define TRAINER_NICOLAS_1       392
-#define TRAINER_NICOLAS_2       393
-#define TRAINER_NICOLAS_3       394
-#define TRAINER_NICOLAS_4       395
-#define TRAINER_NICOLAS_5       396
-#define TRAINER_AARON           397
-#define TRAINER_PERRY           398
-#define TRAINER_HUGH            399
-#define TRAINER_PHIL            400
-#define TRAINER_JARED           401
-#define TRAINER_HUMBERTO        402
-#define TRAINER_PRESLEY         403
-#define TRAINER_EDWARDO         404
-#define TRAINER_COLIN           405
-#define TRAINER_ROBERT_1        406
-#define TRAINER_BENNY           407
-#define TRAINER_CHESTER         408
-#define TRAINER_ROBERT_2        409
-#define TRAINER_ROBERT_3        410
-#define TRAINER_ROBERT_4        411
-#define TRAINER_ROBERT_5        412
-#define TRAINER_ALEX            413
-#define TRAINER_BECK            414
-#define TRAINER_YASU            415
-#define TRAINER_TAKASHI         416
-#define TRAINER_DIANNE          417
-#define TRAINER_JANI            418
-#define TRAINER_LAO_1           419
-#define TRAINER_LUNG            420
-#define TRAINER_LAO_2           421
-#define TRAINER_LAO_3           422
-#define TRAINER_LAO_4           423
-#define TRAINER_LAO_5           424
-#define TRAINER_JOCELYN         425
-#define TRAINER_LAURA           426
-#define TRAINER_CYNDY_1         427
-#define TRAINER_CORA            428
-#define TRAINER_PAULA           429
-#define TRAINER_CYNDY_2         430
-#define TRAINER_CYNDY_3         431
-#define TRAINER_CYNDY_4         432
-#define TRAINER_CYNDY_5         433
-#define TRAINER_MADELINE_1      434
-#define TRAINER_CLARISSA        435
-#define TRAINER_ANGELICA        436
-#define TRAINER_MADELINE_2      437
-#define TRAINER_MADELINE_3      438
-#define TRAINER_MADELINE_4      439
-#define TRAINER_MADELINE_5      440
-#define TRAINER_BEVERLY         441
-#define TRAINER_IMANI           442
-#define TRAINER_KYLA            443
-#define TRAINER_DENISE          444
-#define TRAINER_BETH            445
-#define TRAINER_TARA            446
-#define TRAINER_MISSY           447
-#define TRAINER_ALICE           448
-#define TRAINER_JENNY_1         449
-#define TRAINER_GRACE           450
-#define TRAINER_TANYA           451
-#define TRAINER_SHARON          452
-#define TRAINER_NIKKI           453
-#define TRAINER_BRENDA          454
-#define TRAINER_KATIE           455
-#define TRAINER_SUSIE           456
-#define TRAINER_KARA            457
-#define TRAINER_DANA            458
-#define TRAINER_SIENNA          459
-#define TRAINER_DEBRA           460
-#define TRAINER_LINDA           461
-#define TRAINER_KAYLEE          462
-#define TRAINER_LAUREL          463
-#define TRAINER_CARLEE          464
-#define TRAINER_JENNY_2         465
-#define TRAINER_JENNY_3         466
-#define TRAINER_JENNY_4         467
-#define TRAINER_JENNY_5         468
-#define TRAINER_HEIDI           469
-#define TRAINER_BECKY           470
-#define TRAINER_CAROL           471
-#define TRAINER_NANCY           472
-#define TRAINER_MARTHA          473
-#define TRAINER_DIANA_1         474
-#define TRAINER_CEDRIC          475
-#define TRAINER_IRENE           476
-#define TRAINER_DIANA_2         477
-#define TRAINER_DIANA_3         478
-#define TRAINER_DIANA_4         479
-#define TRAINER_DIANA_5         480
-#define TRAINER_AMY_AND_LIV_1   481
-#define TRAINER_AMY_AND_LIV_2   482
-#define TRAINER_GINA_AND_MIA_1  483
-#define TRAINER_MIU_AND_YUKI    484
-#define TRAINER_AMY_AND_LIV_3   485
-#define TRAINER_GINA_AND_MIA_2  486
-#define TRAINER_AMY_AND_LIV_4   487
-#define TRAINER_AMY_AND_LIV_5   488
-#define TRAINER_AMY_AND_LIV_6   489
-#define TRAINER_HUEY            490
-#define TRAINER_EDMOND          491
-#define TRAINER_ERNEST_1        492
-#define TRAINER_DWAYNE          493
-#define TRAINER_PHILLIP         494
-#define TRAINER_LEONARD         495
-#define TRAINER_DUNCAN          496
-#define TRAINER_ERNEST_2        497
-#define TRAINER_ERNEST_3        498
-#define TRAINER_ERNEST_4        499
-#define TRAINER_ERNEST_5        500
-#define TRAINER_ELI             501
-#define TRAINER_ANNIKA          502
-#define TRAINER_JAZMYN          503
-#define TRAINER_JONAS           504
-#define TRAINER_KAYLEY          505
-#define TRAINER_AURON           506
-#define TRAINER_KELVIN          507
-#define TRAINER_MARLEY          508
-#define TRAINER_REYNA           509
-#define TRAINER_HUDSON          510
-#define TRAINER_CONOR           511
-#define TRAINER_EDWIN_1         512
-#define TRAINER_HECTOR          513
-#define TRAINER_TABITHA_1       514
-#define TRAINER_EDWIN_2         515
-#define TRAINER_EDWIN_3         516
-#define TRAINER_EDWIN_4         517
-#define TRAINER_EDWIN_5         518
-#define TRAINER_WALLY_1         519
-#define TRAINER_BRENDAN_1       520
-#define TRAINER_BRENDAN_2       521
-#define TRAINER_BRENDAN_3       522
-#define TRAINER_BRENDAN_4       523
-#define TRAINER_BRENDAN_5       524
-#define TRAINER_BRENDAN_6       525
-#define TRAINER_BRENDAN_7       526
-#define TRAINER_BRENDAN_8       527
-#define TRAINER_BRENDAN_9       528
-#define TRAINER_MAY_1           529
-#define TRAINER_MAY_2           530
-#define TRAINER_MAY_3           531
-#define TRAINER_MAY_4           532
-#define TRAINER_MAY_5           533
-#define TRAINER_MAY_6           534
-#define TRAINER_MAY_7           535
-#define TRAINER_MAY_8           536
-#define TRAINER_MAY_9           537
-#define TRAINER_ISAAC_1         538
-#define TRAINER_DAVIS           539
-#define TRAINER_MITCHELL        540
-#define TRAINER_ISAAC_2         541
-#define TRAINER_ISAAC_3         542
-#define TRAINER_ISAAC_4         543
-#define TRAINER_ISAAC_5         544
-#define TRAINER_LYDIA_1         545
-#define TRAINER_HALLE           546
-#define TRAINER_GARRISON        547
-#define TRAINER_LYDIA_2         548
-#define TRAINER_LYDIA_3         549
-#define TRAINER_LYDIA_4         550
-#define TRAINER_LYDIA_5         551
-#define TRAINER_JACKSON_1       552
-#define TRAINER_LORENZO         553
-#define TRAINER_SEBASTIAN       554
-#define TRAINER_JACKSON_2       555
-#define TRAINER_JACKSON_3       556
-#define TRAINER_JACKSON_4       557
-#define TRAINER_JACKSON_5       558
-#define TRAINER_CATHERINE_1     559
-#define TRAINER_JENNA           560
-#define TRAINER_SOPHIA          561
-#define TRAINER_CATHERINE_2     562
-#define TRAINER_CATHERINE_3     563
-#define TRAINER_CATHERINE_4     564
-#define TRAINER_CATHERINE_5     565
-#define TRAINER_JULIO           566
-#define TRAINER_GRUNT_27        567
-#define TRAINER_GRUNT_28        568
-#define TRAINER_GRUNT_29        569
-#define TRAINER_GRUNT_30        570
-#define TRAINER_MARC            571
-#define TRAINER_BRENDEN         572
-#define TRAINER_LILITH          573
-#define TRAINER_CRISTIAN        574
-#define TRAINER_SYLVIA          575
-#define TRAINER_LEONARDO        576
-#define TRAINER_ATHENA          577
-#define TRAINER_HARRISON        578
-#define TRAINER_GRUNT_31        579
-#define TRAINER_CLARENCE        580
-#define TRAINER_TERRY           581
-#define TRAINER_NATE            582
-#define TRAINER_KATHLEEN        583
-#define TRAINER_CLIFFORD        584
-#define TRAINER_NICHOLAS        585
-#define TRAINER_GRUNT_32        586
-#define TRAINER_GRUNT_33        587
-#define TRAINER_GRUNT_34        588
-#define TRAINER_GRUNT_35        589
-#define TRAINER_GRUNT_36        590
-#define TRAINER_MACEY           591
-#define TRAINER_BRENDAN_10      592
-#define TRAINER_BRENDAN_11      593
-#define TRAINER_PAXTON          594
-#define TRAINER_ISABELLA        595
-#define TRAINER_GRUNT_37        596
-#define TRAINER_TABITHA_2       597
-#define TRAINER_JONATHAN        598
-#define TRAINER_BRENDAN_12      599
-#define TRAINER_MAY_10          600
-#define TRAINER_MAXIE_1         601
-#define TRAINER_MAXIE_2         602
-#define TRAINER_TIANA           603
-#define TRAINER_HALEY_1         604
-#define TRAINER_JANICE          605
-#define TRAINER_VIVI            606
-#define TRAINER_HALEY_2         607
-#define TRAINER_HALEY_3         608
-#define TRAINER_HALEY_4         609
-#define TRAINER_HALEY_5         610
-#define TRAINER_SALLY           611
-#define TRAINER_ROBIN           612
-#define TRAINER_ANDREA          613
-#define TRAINER_CRISSY          614
-#define TRAINER_RICK            615
-#define TRAINER_LYLE            616
-#define TRAINER_JOSE            617
-#define TRAINER_DOUG            618
-#define TRAINER_GREG            619
-#define TRAINER_KENT            620
-#define TRAINER_JAMES_1         621
-#define TRAINER_JAMES_2         622
-#define TRAINER_JAMES_3         623
-#define TRAINER_JAMES_4         624
-#define TRAINER_JAMES_5         625
-#define TRAINER_BRICE           626
-#define TRAINER_TRENT_1         627
-#define TRAINER_LENNY           628
-#define TRAINER_LUCAS_1         629
-#define TRAINER_ALAN            630
-#define TRAINER_CLARK           631
-#define TRAINER_ERIC            632
-#define TRAINER_LUCAS_2         633
-#define TRAINER_MIKE_1          634
-#define TRAINER_MIKE_2          635
-#define TRAINER_TRENT_2         636
-#define TRAINER_TRENT_3         637
-#define TRAINER_TRENT_4         638
-#define TRAINER_TRENT_5         639
-#define TRAINER_DEZ_AND_LUKE    640
-#define TRAINER_LEA_AND_JED     641
-#define TRAINER_KIRA_AND_DAN_1  642
-#define TRAINER_KIRA_AND_DAN_2  643
-#define TRAINER_KIRA_AND_DAN_3  644
-#define TRAINER_KIRA_AND_DAN_4  645
-#define TRAINER_KIRA_AND_DAN_5  646
-#define TRAINER_JOHANNA         647
-#define TRAINER_GERALD          648
-#define TRAINER_VIVIAN          649
-#define TRAINER_DANIELLE        650
-#define TRAINER_HIDEO           651
-#define TRAINER_KEIGO           652
-#define TRAINER_RILEY           653
-#define TRAINER_FLINT           654
-#define TRAINER_ASHLEY          655
-#define TRAINER_WALLY_2         656
-#define TRAINER_WALLY_3         657
-#define TRAINER_WALLY_4         658
-#define TRAINER_WALLY_5         659
-#define TRAINER_WALLY_6         660
-#define TRAINER_BRENDAN_13      661
-#define TRAINER_BRENDAN_14      662
-#define TRAINER_BRENDAN_15      663
-#define TRAINER_MAY_11          664
-#define TRAINER_MAY_12          665
-#define TRAINER_MAY_13          666
-#define TRAINER_JONAH           667
-#define TRAINER_HENRY           668
-#define TRAINER_ROGER           669
-#define TRAINER_ALEXA           670
-#define TRAINER_RUBEN           671
-#define TRAINER_KOJI_1          672
-#define TRAINER_WAYNE           673
-#define TRAINER_AIDAN           674
-#define TRAINER_REED            675
-#define TRAINER_TISHA           676
-#define TRAINER_TORI_AND_TIA    677
-#define TRAINER_KIM_AND_IRIS    678
-#define TRAINER_TYRA_AND_IVY    679
-#define TRAINER_MEL_AND_PAUL    680
-#define TRAINER_JOHN_AND_JAY_1  681
-#define TRAINER_JOHN_AND_JAY_2  682
-#define TRAINER_JOHN_AND_JAY_3  683
-#define TRAINER_JOHN_AND_JAY_4  684
-#define TRAINER_JOHN_AND_JAY_5  685
-#define TRAINER_RELI_AND_IAN    686
-#define TRAINER_LILA_AND_ROY_1  687
-#define TRAINER_LILA_AND_ROY_2  688
-#define TRAINER_LILA_AND_ROY_3  689
-#define TRAINER_LILA_AND_ROY_4  690
-#define TRAINER_LILA_AND_ROY_5  691
-#define TRAINER_LISA_AND_RAY    692
-#define TRAINER_CHRIS           693
-#define TRAINER_DAWSON          694
-#define TRAINER_SARAH           695
-#define TRAINER_DARIAN          696
-#define TRAINER_HAILEY          697
-#define TRAINER_CHANDLER        698
-#define TRAINER_KALEB           699
-#define TRAINER_JOSEPH          700
-#define TRAINER_ALYSSA          701
-#define TRAINER_MARCOS          702
-#define TRAINER_RHETT           703
-#define TRAINER_TYRON           704
-#define TRAINER_CELINA          705
-#define TRAINER_BIANCA          706
-#define TRAINER_HAYDEN          707
-#define TRAINER_SOPHIE          708
-#define TRAINER_COBY            709
-#define TRAINER_LAWRENCE        710
-#define TRAINER_WYATT           711
-#define TRAINER_ANGELINA        712
-#define TRAINER_KAI             713
-#define TRAINER_CHARLOTTE       714
-#define TRAINER_DEANDRE         715
-#define TRAINER_GRUNT_38        716
-#define TRAINER_GRUNT_39        717
-#define TRAINER_GRUNT_40        718
-#define TRAINER_GRUNT_41        719
-#define TRAINER_GRUNT_42        720
-#define TRAINER_GRUNT_43        721
-#define TRAINER_GRUNT_44        722
-#define TRAINER_GRUNT_45        723
-#define TRAINER_GRUNT_46        724
-#define TRAINER_GRUNT_47        725
-#define TRAINER_GRUNT_48        726
-#define TRAINER_GRUNT_49        727
-#define TRAINER_GRUNT_50        728
-#define TRAINER_GRUNT_51        729
-#define TRAINER_GRUNT_52        730
-#define TRAINER_GRUNT_53        731
-#define TRAINER_TABITHA_3       732
-#define TRAINER_DARCY           733
-#define TRAINER_MAXIE_3         734
-#define TRAINER_PETE            735
-#define TRAINER_ISABELLE        736
-#define TRAINER_ANDRES_1        737
-#define TRAINER_JOSUE           738
-#define TRAINER_CAMRON          739
-#define TRAINER_CORY_1          740
-#define TRAINER_CAROLINA        741
-#define TRAINER_ELIJAH          742
-#define TRAINER_CELIA           743
-#define TRAINER_BRYAN           744
-#define TRAINER_BRANDEN         745
-#define TRAINER_BRYANT          746
-#define TRAINER_SHAYLA          747
-#define TRAINER_KYRA            748
-#define TRAINER_JAIDEN          749
-#define TRAINER_ALIX            750
-#define TRAINER_HELENE          751
-#define TRAINER_MARLENE         752
-#define TRAINER_DEVAN           753
-#define TRAINER_JOHNSON         754
-#define TRAINER_MELINA          755
-#define TRAINER_BRANDI          756
-#define TRAINER_AISHA           757
-#define TRAINER_MAKAYLA         758
-#define TRAINER_FABIAN          759
-#define TRAINER_DAYTON          760
-#define TRAINER_RACHEL          761
-#define TRAINER_LEONEL          762
-#define TRAINER_CALLIE          763
-#define TRAINER_CALE            764
-#define TRAINER_MYLES           765
-#define TRAINER_PAT             766
-#define TRAINER_CRISTIN_1       767
-#define TRAINER_MAY_14          768
-#define TRAINER_MAY_15          769
-#define TRAINER_ROXANNE_2       770
-#define TRAINER_ROXANNE_3       771
-#define TRAINER_ROXANNE_4       772
-#define TRAINER_ROXANNE_5       773
-#define TRAINER_BRAWLY_2        774
-#define TRAINER_BRAWLY_3        775
-#define TRAINER_BRAWLY_4        776
-#define TRAINER_BRAWLY_5        777
-#define TRAINER_WATTSON_2       778
-#define TRAINER_WATTSON_3       779
-#define TRAINER_WATTSON_4       780
-#define TRAINER_WATTSON_5       781
-#define TRAINER_FLANNERY_2      782
-#define TRAINER_FLANNERY_3      783
-#define TRAINER_FLANNERY_4      784
-#define TRAINER_FLANNERY_5      785
-#define TRAINER_NORMAN_2        786
-#define TRAINER_NORMAN_3        787
-#define TRAINER_NORMAN_4        788
-#define TRAINER_NORMAN_5        789
-#define TRAINER_WINONA_2        790
-#define TRAINER_WINONA_3        791
-#define TRAINER_WINONA_4        792
-#define TRAINER_WINONA_5        793
-#define TRAINER_TATE_AND_LIZA_2 794
-#define TRAINER_TATE_AND_LIZA_3 795
-#define TRAINER_TATE_AND_LIZA_4 796
-#define TRAINER_TATE_AND_LIZA_5 797
-#define TRAINER_JUAN_2          798
-#define TRAINER_JUAN_3          799
-#define TRAINER_JUAN_4          800
-#define TRAINER_JUAN_5          801
-#define TRAINER_ANGELO          802
-#define TRAINER_DARIUS          803
-#define TRAINER_STEVEN          804
-#define TRAINER_ANABEL          805
-#define TRAINER_TUCKER          806
-#define TRAINER_SPENSER         807
-#define TRAINER_GRETA           808
-#define TRAINER_NOLAND          809
-#define TRAINER_LUCY            810
-#define TRAINER_BRANDON         811
-#define TRAINER_ANDRES_2        812
-#define TRAINER_ANDRES_3        813
-#define TRAINER_ANDRES_4        814
-#define TRAINER_ANDRES_5        815
-#define TRAINER_CORY_2          816
-#define TRAINER_CORY_3          817
-#define TRAINER_CORY_4          818
-#define TRAINER_CORY_5          819
-#define TRAINER_PABLO_2         820
-#define TRAINER_PABLO_3         821
-#define TRAINER_PABLO_4         822
-#define TRAINER_PABLO_5         823
-#define TRAINER_KOJI_2          824
-#define TRAINER_KOJI_3          825
-#define TRAINER_KOJI_4          826
-#define TRAINER_KOJI_5          827
-#define TRAINER_CRISTIN_2       828
-#define TRAINER_CRISTIN_3       829
-#define TRAINER_CRISTIN_4       830
-#define TRAINER_CRISTIN_5       831
-#define TRAINER_FERNANDO_2      832
-#define TRAINER_FERNANDO_3      833
-#define TRAINER_FERNANDO_4      834
-#define TRAINER_FERNANDO_5      835
-#define TRAINER_SAWYER_2        836
-#define TRAINER_SAWYER_3        837
-#define TRAINER_SAWYER_4        838
-#define TRAINER_SAWYER_5        839
-#define TRAINER_GABRIELLE_2     840
-#define TRAINER_GABRIELLE_3     841
-#define TRAINER_GABRIELLE_4     842
-#define TRAINER_GABRIELLE_5     843
-#define TRAINER_THALIA_2        844
-#define TRAINER_THALIA_3        845
-#define TRAINER_THALIA_4        846
-#define TRAINER_THALIA_5        847
-#define TRAINER_MARIELA         848
-#define TRAINER_ALVARO          849
-#define TRAINER_EVERETT         850
-#define TRAINER_RED             851
-#define TRAINER_LEAF            852
-#define TRAINER_BRENDAN_16      853
-#define TRAINER_MAY_16          854
+#define TRAINER_NONE                          0
+#define TRAINER_SAWYER_1                      1
+#define TRAINER_GRUNT_AQUA_HIDEOUT_1          2
+#define TRAINER_GRUNT_AQUA_HIDEOUT_2          3
+#define TRAINER_GRUNT_AQUA_HIDEOUT_3          4
+#define TRAINER_GRUNT_AQUA_HIDEOUT_4          5
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_1       6
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_2       7
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_3       8
+#define TRAINER_GABRIELLE_1                   9
+#define TRAINER_GRUNT_PETALBURG_WOODS        10
+#define TRAINER_MARCEL                       11
+#define TRAINER_ALBERTO                      12
+#define TRAINER_ED                           13
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_4      14
+#define TRAINER_DECLAN                       15
+#define TRAINER_GRUNT_RUSTURF_TUNNEL         16
+#define TRAINER_GRUNT_WEATHER_INST_1         17
+#define TRAINER_GRUNT_WEATHER_INST_2         18
+#define TRAINER_GRUNT_WEATHER_INST_3         19
+#define TRAINER_GRUNT_MUSEUM_1               20
+#define TRAINER_GRUNT_MUSEUM_2               21
+#define TRAINER_GRUNT_SPACE_CENTER_1         22
+#define TRAINER_GRUNT_MT_PYRE_1              23
+#define TRAINER_GRUNT_MT_PYRE_2              24
+#define TRAINER_GRUNT_MT_PYRE_3              25
+#define TRAINER_GRUNT_WEATHER_INST_4         26
+#define TRAINER_GRUNT_AQUA_HIDEOUT_5         27
+#define TRAINER_GRUNT_AQUA_HIDEOUT_6         28
+#define TRAINER_FREDRICK                     29
+#define TRAINER_MATT                         30
+#define TRAINER_ZANDER                       31
+#define TRAINER_SHELLY_1                     32
+#define TRAINER_SHELLY_2                     33
+#define TRAINER_ARCHIE                       34
+#define TRAINER_LEAH                         35
+#define TRAINER_DAISY                        36
+#define TRAINER_ROSE_1                       37
+#define TRAINER_FELIX                        38
+#define TRAINER_VIOLET                       39
+#define TRAINER_ROSE_2                       40
+#define TRAINER_ROSE_3                       41
+#define TRAINER_ROSE_4                       42
+#define TRAINER_ROSE_5                       43
+#define TRAINER_DUSTY_1                      44
+#define TRAINER_CHIP                         45
+#define TRAINER_FOSTER                       46
+#define TRAINER_DUSTY_2                      47
+#define TRAINER_DUSTY_3                      48
+#define TRAINER_DUSTY_4                      49
+#define TRAINER_DUSTY_5                      50
+#define TRAINER_GABBY_AND_TY_1               51
+#define TRAINER_GABBY_AND_TY_2               52
+#define TRAINER_GABBY_AND_TY_3               53
+#define TRAINER_GABBY_AND_TY_4               54
+#define TRAINER_GABBY_AND_TY_5               55
+#define TRAINER_GABBY_AND_TY_6               56
+#define TRAINER_LOLA_1                       57
+#define TRAINER_AUSTINA                      58
+#define TRAINER_GWEN                         59
+#define TRAINER_LOLA_2                       60
+#define TRAINER_LOLA_3                       61
+#define TRAINER_LOLA_4                       62
+#define TRAINER_LOLA_5                       63
+#define TRAINER_RICKY_1                      64
+#define TRAINER_SIMON                        65
+#define TRAINER_CHARLIE                      66
+#define TRAINER_RICKY_2                      67
+#define TRAINER_RICKY_3                      68
+#define TRAINER_RICKY_4                      69
+#define TRAINER_RICKY_5                      70
+#define TRAINER_RANDALL                      71
+#define TRAINER_PARKER                       72
+#define TRAINER_GEORGE                       73
+#define TRAINER_BERKE                        74
+#define TRAINER_BRAXTON                      75
+#define TRAINER_VINCENT                      76
+#define TRAINER_LEROY                        77
+#define TRAINER_WILTON_1                     78
+#define TRAINER_EDGAR                        79
+#define TRAINER_ALBERT                       80
+#define TRAINER_SAMUEL                       81
+#define TRAINER_VITO                         82
+#define TRAINER_OWEN                         83
+#define TRAINER_WILTON_2                     84
+#define TRAINER_WILTON_3                     85
+#define TRAINER_WILTON_4                     86
+#define TRAINER_WILTON_5                     87
+#define TRAINER_WARREN                       88
+#define TRAINER_MARY                         89
+#define TRAINER_ALEXIA                       90
+#define TRAINER_JODY                         91
+#define TRAINER_WENDY                        92
+#define TRAINER_KEIRA                        93
+#define TRAINER_BROOKE_1                     94
+#define TRAINER_JENNIFER                     95
+#define TRAINER_HOPE                         96
+#define TRAINER_SHANNON                      97
+#define TRAINER_MICHELLE                     98
+#define TRAINER_CAROLINE                     99
+#define TRAINER_JULIE                       100
+#define TRAINER_BROOKE_2                    101
+#define TRAINER_BROOKE_3                    102
+#define TRAINER_BROOKE_4                    103
+#define TRAINER_BROOKE_5                    104
+#define TRAINER_PATRICIA                    105
+#define TRAINER_KINDRA                      106
+#define TRAINER_TAMMY                       107
+#define TRAINER_VALERIE_1                   108
+#define TRAINER_TASHA                       109
+#define TRAINER_VALERIE_2                   110
+#define TRAINER_VALERIE_3                   111
+#define TRAINER_VALERIE_4                   112
+#define TRAINER_VALERIE_5                   113
+#define TRAINER_CINDY_1                     114
+#define TRAINER_DAPHNE                      115
+#define TRAINER_GRUNT_SPACE_CENTER_2        116
+#define TRAINER_CINDY_2                     117
+#define TRAINER_BRIANNA                     118
+#define TRAINER_NAOMI                       119
+#define TRAINER_CINDY_3                     120
+#define TRAINER_CINDY_4                     121
+#define TRAINER_CINDY_5                     122
+#define TRAINER_CINDY_6                     123
+#define TRAINER_MELISSA                     124
+#define TRAINER_SHEILA                      125
+#define TRAINER_SHIRLEY                     126
+#define TRAINER_JESSICA_1                   127
+#define TRAINER_CONNIE                      128
+#define TRAINER_BRIDGET                     129
+#define TRAINER_OLIVIA                      130
+#define TRAINER_TIFFANY                     131
+#define TRAINER_JESSICA_2                   132
+#define TRAINER_JESSICA_3                   133
+#define TRAINER_JESSICA_4                   134
+#define TRAINER_JESSICA_5                   135
+#define TRAINER_WINSTON_1                   136
+#define TRAINER_MOLLIE                      137
+#define TRAINER_GARRET                      138
+#define TRAINER_WINSTON_2                   139
+#define TRAINER_WINSTON_3                   140
+#define TRAINER_WINSTON_4                   141
+#define TRAINER_WINSTON_5                   142
+#define TRAINER_STEVE_1                     143
+#define TRAINER_THALIA_1                    144
+#define TRAINER_MARK                        145
+#define TRAINER_GRUNT_MT_CHIMNEY_1          146
+#define TRAINER_STEVE_2                     147
+#define TRAINER_STEVE_3                     148
+#define TRAINER_STEVE_4                     149
+#define TRAINER_STEVE_5                     150
+#define TRAINER_LUIS                        151
+#define TRAINER_DOMINIK                     152
+#define TRAINER_DOUGLAS                     153
+#define TRAINER_DARRIN                      154
+#define TRAINER_TONY_1                      155
+#define TRAINER_JEROME                      156
+#define TRAINER_MATTHEW                     157
+#define TRAINER_DAVID                       158
+#define TRAINER_SPENCER                     159
+#define TRAINER_ROLAND                      160
+#define TRAINER_NOLEN                       161
+#define TRAINER_STAN                        162
+#define TRAINER_BARRY                       163
+#define TRAINER_DEAN                        164
+#define TRAINER_RODNEY                      165
+#define TRAINER_RICHARD                     166
+#define TRAINER_HERMAN                      167
+#define TRAINER_SANTIAGO                    168
+#define TRAINER_GILBERT                     169
+#define TRAINER_FRANKLIN                    170
+#define TRAINER_KEVIN                       171
+#define TRAINER_JACK                        172
+#define TRAINER_DUDLEY                      173
+#define TRAINER_CHAD                        174
+#define TRAINER_TONY_2                      175
+#define TRAINER_TONY_3                      176
+#define TRAINER_TONY_4                      177
+#define TRAINER_TONY_5                      178
+#define TRAINER_TAKAO                       179
+#define TRAINER_HITOSHI                     180
+#define TRAINER_KIYO                        181
+#define TRAINER_KOICHI                      182
+#define TRAINER_NOB_1                       183
+#define TRAINER_NOB_2                       184
+#define TRAINER_NOB_3                       185
+#define TRAINER_NOB_4                       186
+#define TRAINER_NOB_5                       187
+#define TRAINER_YUJI                        188
+#define TRAINER_DAISUKE                     189
+#define TRAINER_ATSUSHI                     190
+#define TRAINER_KIRK                        191
+#define TRAINER_GRUNT_AQUA_HIDEOUT_7        192
+#define TRAINER_GRUNT_AQUA_HIDEOUT_8        193
+#define TRAINER_SHAWN                       194
+#define TRAINER_FERNANDO_1                  195
+#define TRAINER_DALTON_1                    196
+#define TRAINER_DALTON_2                    197
+#define TRAINER_DALTON_3                    198
+#define TRAINER_DALTON_4                    199
+#define TRAINER_DALTON_5                    200
+#define TRAINER_COLE                        201
+#define TRAINER_JEFF                        202
+#define TRAINER_AXLE                        203
+#define TRAINER_JACE                        204
+#define TRAINER_KEEGAN                      205
+#define TRAINER_BERNIE_1                    206
+#define TRAINER_BERNIE_2                    207
+#define TRAINER_BERNIE_3                    208
+#define TRAINER_BERNIE_4                    209
+#define TRAINER_BERNIE_5                    210
+#define TRAINER_DREW                        211
+#define TRAINER_BEAU                        212
+#define TRAINER_LARRY                       213
+#define TRAINER_SHANE                       214
+#define TRAINER_JUSTIN                      215
+#define TRAINER_ETHAN_1                     216
+#define TRAINER_AUTUMN                      217
+#define TRAINER_TRAVIS                      218
+#define TRAINER_ETHAN_2                     219
+#define TRAINER_ETHAN_3                     220
+#define TRAINER_ETHAN_4                     221
+#define TRAINER_ETHAN_5                     222
+#define TRAINER_BRENT                       223
+#define TRAINER_DONALD                      224
+#define TRAINER_TAYLOR                      225
+#define TRAINER_JEFFREY_1                   226
+#define TRAINER_DEREK                       227
+#define TRAINER_JEFFREY_2                   228
+#define TRAINER_JEFFREY_3                   229
+#define TRAINER_JEFFREY_4                   230
+#define TRAINER_JEFFREY_5                   231
+#define TRAINER_EDWARD                      232
+#define TRAINER_PRESTON                     233
+#define TRAINER_VIRGIL                      234
+#define TRAINER_BLAKE                       235
+#define TRAINER_WILLIAM                     236
+#define TRAINER_JOSHUA                      237
+#define TRAINER_CAMERON_1                   238
+#define TRAINER_CAMERON_2                   239
+#define TRAINER_CAMERON_3                   240
+#define TRAINER_CAMERON_4                   241
+#define TRAINER_CAMERON_5                   242
+#define TRAINER_JACLYN                      243
+#define TRAINER_HANNAH                      244
+#define TRAINER_SAMANTHA                    245
+#define TRAINER_MAURA                       246
+#define TRAINER_KAYLA                       247
+#define TRAINER_ALEXIS                      248
+#define TRAINER_JACKI_1                     249
+#define TRAINER_JACKI_2                     250
+#define TRAINER_JACKI_3                     251
+#define TRAINER_JACKI_4                     252
+#define TRAINER_JACKI_5                     253
+#define TRAINER_WALTER_1                    254
+#define TRAINER_MICAH                       255
+#define TRAINER_THOMAS                      256
+#define TRAINER_WALTER_2                    257
+#define TRAINER_WALTER_3                    258
+#define TRAINER_WALTER_4                    259
+#define TRAINER_WALTER_5                    260
+#define TRAINER_SIDNEY                      261
+#define TRAINER_PHOEBE                      262
+#define TRAINER_GLACIA                      263
+#define TRAINER_DRAKE                       264
+#define TRAINER_ROXANNE_1                   265
+#define TRAINER_BRAWLY_1                    266
+#define TRAINER_WATTSON_1                   267
+#define TRAINER_FLANNERY_1                  268
+#define TRAINER_NORMAN_1                    269
+#define TRAINER_WINONA_1                    270
+#define TRAINER_TATE_AND_LIZA_1             271
+#define TRAINER_JUAN_1                      272
+#define TRAINER_JERRY_1                     273
+#define TRAINER_TED                         274
+#define TRAINER_PAUL                        275
+#define TRAINER_JERRY_2                     276
+#define TRAINER_JERRY_3                     277
+#define TRAINER_JERRY_4                     278
+#define TRAINER_JERRY_5                     279
+#define TRAINER_KAREN_1                     280
+#define TRAINER_GEORGIA                     281
+#define TRAINER_KAREN_2                     282
+#define TRAINER_KAREN_3                     283
+#define TRAINER_KAREN_4                     284
+#define TRAINER_KAREN_5                     285
+#define TRAINER_KATE_AND_JOY                286
+#define TRAINER_ANNA_AND_MEG_1              287
+#define TRAINER_ANNA_AND_MEG_2              288
+#define TRAINER_ANNA_AND_MEG_3              289
+#define TRAINER_ANNA_AND_MEG_4              290
+#define TRAINER_ANNA_AND_MEG_5              291
+#define TRAINER_VICTOR                      292
+#define TRAINER_MIGUEL_1                    293
+#define TRAINER_COLTON                      294
+#define TRAINER_MIGUEL_2                    295
+#define TRAINER_MIGUEL_3                    296
+#define TRAINER_MIGUEL_4                    297
+#define TRAINER_MIGUEL_5                    298
+#define TRAINER_VICTORIA                    299
+#define TRAINER_VANESSA                     300
+#define TRAINER_BETHANY                     301
+#define TRAINER_ISABEL_1                    302
+#define TRAINER_ISABEL_2                    303
+#define TRAINER_ISABEL_3                    304
+#define TRAINER_ISABEL_4                    305
+#define TRAINER_ISABEL_5                    306
+#define TRAINER_TIMOTHY_1                   307
+#define TRAINER_TIMOTHY_2                   308
+#define TRAINER_TIMOTHY_3                   309
+#define TRAINER_TIMOTHY_4                   310
+#define TRAINER_TIMOTHY_5                   311
+#define TRAINER_VICKY                       312
+#define TRAINER_SHELBY_1                    313
+#define TRAINER_SHELBY_2                    314
+#define TRAINER_SHELBY_3                    315
+#define TRAINER_SHELBY_4                    316
+#define TRAINER_SHELBY_5                    317
+#define TRAINER_CALVIN_1                    318
+#define TRAINER_BILLY                       319
+#define TRAINER_JOSH                        320
+#define TRAINER_TOMMY                       321
+#define TRAINER_JOEY                        322
+#define TRAINER_BEN                         323
+#define TRAINER_QUINCY                      324
+#define TRAINER_KATELYNN                    325
+#define TRAINER_JAYLEN                      326
+#define TRAINER_DILLON                      327
+#define TRAINER_CALVIN_2                    328
+#define TRAINER_CALVIN_3                    329
+#define TRAINER_CALVIN_4                    330
+#define TRAINER_CALVIN_5                    331
+#define TRAINER_EDDIE                       332
+#define TRAINER_ALLEN                       333
+#define TRAINER_TIMMY                       334
+#define TRAINER_WALLACE                     335
+#define TRAINER_ANDREW                      336
+#define TRAINER_IVAN                        337
+#define TRAINER_CLAUDE                      338
+#define TRAINER_ELLIOT_1                    339
+#define TRAINER_NED                         340
+#define TRAINER_DALE                        341
+#define TRAINER_NOLAN                       342
+#define TRAINER_BARNY                       343
+#define TRAINER_WADE                        344
+#define TRAINER_CARTER                      345
+#define TRAINER_ELLIOT_2                    346
+#define TRAINER_ELLIOT_3                    347
+#define TRAINER_ELLIOT_4                    348
+#define TRAINER_ELLIOT_5                    349
+#define TRAINER_RONALD                      350
+#define TRAINER_JACOB                       351
+#define TRAINER_ANTHONY                     352
+#define TRAINER_BENJAMIN_1                  353
+#define TRAINER_BENJAMIN_2                  354
+#define TRAINER_BENJAMIN_3                  355
+#define TRAINER_BENJAMIN_4                  356
+#define TRAINER_BENJAMIN_5                  357
+#define TRAINER_ABIGAIL_1                   358
+#define TRAINER_JASMINE                     359
+#define TRAINER_ABIGAIL_2                   360
+#define TRAINER_ABIGAIL_3                   361
+#define TRAINER_ABIGAIL_4                   362
+#define TRAINER_ABIGAIL_5                   363
+#define TRAINER_DYLAN_1                     364
+#define TRAINER_DYLAN_2                     365
+#define TRAINER_DYLAN_3                     366
+#define TRAINER_DYLAN_4                     367
+#define TRAINER_DYLAN_5                     368
+#define TRAINER_MARIA_1                     369
+#define TRAINER_MARIA_2                     370
+#define TRAINER_MARIA_3                     371
+#define TRAINER_MARIA_4                     372
+#define TRAINER_MARIA_5                     373
+#define TRAINER_CAMDEN                      374
+#define TRAINER_DEMETRIUS                   375
+#define TRAINER_ISAIAH_1                    376
+#define TRAINER_PABLO_1                     377
+#define TRAINER_CHASE                       378
+#define TRAINER_ISAIAH_2                    379
+#define TRAINER_ISAIAH_3                    380
+#define TRAINER_ISAIAH_4                    381
+#define TRAINER_ISAIAH_5                    382
+#define TRAINER_ISOBEL                      383
+#define TRAINER_DONNY                       384
+#define TRAINER_TALIA                       385
+#define TRAINER_KATELYN_1                   386
+#define TRAINER_ALLISON                     387
+#define TRAINER_KATELYN_2                   388
+#define TRAINER_KATELYN_3                   389
+#define TRAINER_KATELYN_4                   390
+#define TRAINER_KATELYN_5                   391
+#define TRAINER_NICOLAS_1                   392
+#define TRAINER_NICOLAS_2                   393
+#define TRAINER_NICOLAS_3                   394
+#define TRAINER_NICOLAS_4                   395
+#define TRAINER_NICOLAS_5                   396
+#define TRAINER_AARON                       397
+#define TRAINER_PERRY                       398
+#define TRAINER_HUGH                        399
+#define TRAINER_PHIL                        400
+#define TRAINER_JARED                       401
+#define TRAINER_HUMBERTO                    402
+#define TRAINER_PRESLEY                     403
+#define TRAINER_EDWARDO                     404
+#define TRAINER_COLIN                       405
+#define TRAINER_ROBERT_1                    406
+#define TRAINER_BENNY                       407
+#define TRAINER_CHESTER                     408
+#define TRAINER_ROBERT_2                    409
+#define TRAINER_ROBERT_3                    410
+#define TRAINER_ROBERT_4                    411
+#define TRAINER_ROBERT_5                    412
+#define TRAINER_ALEX                        413
+#define TRAINER_BECK                        414
+#define TRAINER_YASU                        415
+#define TRAINER_TAKASHI                     416
+#define TRAINER_DIANNE                      417
+#define TRAINER_JANI                        418
+#define TRAINER_LAO_1                       419
+#define TRAINER_LUNG                        420
+#define TRAINER_LAO_2                       421
+#define TRAINER_LAO_3                       422
+#define TRAINER_LAO_4                       423
+#define TRAINER_LAO_5                       424
+#define TRAINER_JOCELYN                     425
+#define TRAINER_LAURA                       426
+#define TRAINER_CYNDY_1                     427
+#define TRAINER_CORA                        428
+#define TRAINER_PAULA                       429
+#define TRAINER_CYNDY_2                     430
+#define TRAINER_CYNDY_3                     431
+#define TRAINER_CYNDY_4                     432
+#define TRAINER_CYNDY_5                     433
+#define TRAINER_MADELINE_1                  434
+#define TRAINER_CLARISSA                    435
+#define TRAINER_ANGELICA                    436
+#define TRAINER_MADELINE_2                  437
+#define TRAINER_MADELINE_3                  438
+#define TRAINER_MADELINE_4                  439
+#define TRAINER_MADELINE_5                  440
+#define TRAINER_BEVERLY                     441
+#define TRAINER_IMANI                       442
+#define TRAINER_KYLA                        443
+#define TRAINER_DENISE                      444
+#define TRAINER_BETH                        445
+#define TRAINER_TARA                        446
+#define TRAINER_MISSY                       447
+#define TRAINER_ALICE                       448
+#define TRAINER_JENNY_1                     449
+#define TRAINER_GRACE                       450
+#define TRAINER_TANYA                       451
+#define TRAINER_SHARON                      452
+#define TRAINER_NIKKI                       453
+#define TRAINER_BRENDA                      454
+#define TRAINER_KATIE                       455
+#define TRAINER_SUSIE                       456
+#define TRAINER_KARA                        457
+#define TRAINER_DANA                        458
+#define TRAINER_SIENNA                      459
+#define TRAINER_DEBRA                       460
+#define TRAINER_LINDA                       461
+#define TRAINER_KAYLEE                      462
+#define TRAINER_LAUREL                      463
+#define TRAINER_CARLEE                      464
+#define TRAINER_JENNY_2                     465
+#define TRAINER_JENNY_3                     466
+#define TRAINER_JENNY_4                     467
+#define TRAINER_JENNY_5                     468
+#define TRAINER_HEIDI                       469
+#define TRAINER_BECKY                       470
+#define TRAINER_CAROL                       471
+#define TRAINER_NANCY                       472
+#define TRAINER_MARTHA                      473
+#define TRAINER_DIANA_1                     474
+#define TRAINER_CEDRIC                      475
+#define TRAINER_IRENE                       476
+#define TRAINER_DIANA_2                     477
+#define TRAINER_DIANA_3                     478
+#define TRAINER_DIANA_4                     479
+#define TRAINER_DIANA_5                     480
+#define TRAINER_AMY_AND_LIV_1               481
+#define TRAINER_AMY_AND_LIV_2               482
+#define TRAINER_GINA_AND_MIA_1              483
+#define TRAINER_MIU_AND_YUKI                484
+#define TRAINER_AMY_AND_LIV_3               485
+#define TRAINER_GINA_AND_MIA_2              486
+#define TRAINER_AMY_AND_LIV_4               487
+#define TRAINER_AMY_AND_LIV_5               488
+#define TRAINER_AMY_AND_LIV_6               489
+#define TRAINER_HUEY                        490
+#define TRAINER_EDMOND                      491
+#define TRAINER_ERNEST_1                    492
+#define TRAINER_DWAYNE                      493
+#define TRAINER_PHILLIP                     494
+#define TRAINER_LEONARD                     495
+#define TRAINER_DUNCAN                      496
+#define TRAINER_ERNEST_2                    497
+#define TRAINER_ERNEST_3                    498
+#define TRAINER_ERNEST_4                    499
+#define TRAINER_ERNEST_5                    500
+#define TRAINER_ELI                         501
+#define TRAINER_ANNIKA                      502
+#define TRAINER_JAZMYN                      503
+#define TRAINER_JONAS                       504
+#define TRAINER_KAYLEY                      505
+#define TRAINER_AURON                       506
+#define TRAINER_KELVIN                      507
+#define TRAINER_MARLEY                      508
+#define TRAINER_REYNA                       509
+#define TRAINER_HUDSON                      510
+#define TRAINER_CONOR                       511
+#define TRAINER_EDWIN_1                     512
+#define TRAINER_HECTOR                      513
+#define TRAINER_TABITHA_1                   514
+#define TRAINER_EDWIN_2                     515
+#define TRAINER_EDWIN_3                     516
+#define TRAINER_EDWIN_4                     517
+#define TRAINER_EDWIN_5                     518
+#define TRAINER_WALLY_1                     519
+#define TRAINER_BRENDAN_1                   520
+#define TRAINER_BRENDAN_2                   521
+#define TRAINER_BRENDAN_3                   522
+#define TRAINER_BRENDAN_4                   523
+#define TRAINER_BRENDAN_5                   524
+#define TRAINER_BRENDAN_6                   525
+#define TRAINER_BRENDAN_7                   526
+#define TRAINER_BRENDAN_8                   527
+#define TRAINER_BRENDAN_9                   528
+#define TRAINER_MAY_1                       529
+#define TRAINER_MAY_2                       530
+#define TRAINER_MAY_3                       531
+#define TRAINER_MAY_4                       532
+#define TRAINER_MAY_5                       533
+#define TRAINER_MAY_6                       534
+#define TRAINER_MAY_7                       535
+#define TRAINER_MAY_8                       536
+#define TRAINER_MAY_9                       537
+#define TRAINER_ISAAC_1                     538
+#define TRAINER_DAVIS                       539
+#define TRAINER_MITCHELL                    540
+#define TRAINER_ISAAC_2                     541
+#define TRAINER_ISAAC_3                     542
+#define TRAINER_ISAAC_4                     543
+#define TRAINER_ISAAC_5                     544
+#define TRAINER_LYDIA_1                     545
+#define TRAINER_HALLE                       546
+#define TRAINER_GARRISON                    547
+#define TRAINER_LYDIA_2                     548
+#define TRAINER_LYDIA_3                     549
+#define TRAINER_LYDIA_4                     550
+#define TRAINER_LYDIA_5                     551
+#define TRAINER_JACKSON_1                   552
+#define TRAINER_LORENZO                     553
+#define TRAINER_SEBASTIAN                   554
+#define TRAINER_JACKSON_2                   555
+#define TRAINER_JACKSON_3                   556
+#define TRAINER_JACKSON_4                   557
+#define TRAINER_JACKSON_5                   558
+#define TRAINER_CATHERINE_1                 559
+#define TRAINER_JENNA                       560
+#define TRAINER_SOPHIA                      561
+#define TRAINER_CATHERINE_2                 562
+#define TRAINER_CATHERINE_3                 563
+#define TRAINER_CATHERINE_4                 564
+#define TRAINER_CATHERINE_5                 565
+#define TRAINER_JULIO                       566
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_5     567
+#define TRAINER_GRUNT_UNUSED                568
+#define TRAINER_GRUNT_MT_PYRE_4             569
+#define TRAINER_GRUNT_JAGGED_PASS           570
+#define TRAINER_MARC                        571
+#define TRAINER_BRENDEN                     572
+#define TRAINER_LILITH                      573
+#define TRAINER_CRISTIAN                    574
+#define TRAINER_SYLVIA                      575
+#define TRAINER_LEONARDO                    576
+#define TRAINER_ATHENA                      577
+#define TRAINER_HARRISON                    578
+#define TRAINER_GRUNT_MT_CHIMNEY_2          579
+#define TRAINER_CLARENCE                    580
+#define TRAINER_TERRY                       581
+#define TRAINER_NATE                        582
+#define TRAINER_KATHLEEN                    583
+#define TRAINER_CLIFFORD                    584
+#define TRAINER_NICHOLAS                    585
+#define TRAINER_GRUNT_SPACE_CENTER_3        586
+#define TRAINER_GRUNT_SPACE_CENTER_4        587
+#define TRAINER_GRUNT_SPACE_CENTER_5        588
+#define TRAINER_GRUNT_SPACE_CENTER_6        589
+#define TRAINER_GRUNT_SPACE_CENTER_7        590
+#define TRAINER_MACEY                       591
+#define TRAINER_BRENDAN_10                  592
+#define TRAINER_BRENDAN_11                  593
+#define TRAINER_PAXTON                      594
+#define TRAINER_ISABELLA                    595
+#define TRAINER_GRUNT_WEATHER_INST_5        596
+#define TRAINER_TABITHA_2                   597
+#define TRAINER_JONATHAN                    598
+#define TRAINER_BRENDAN_12                  599
+#define TRAINER_MAY_10                      600
+#define TRAINER_MAXIE_1                     601
+#define TRAINER_MAXIE_2                     602
+#define TRAINER_TIANA                       603
+#define TRAINER_HALEY_1                     604
+#define TRAINER_JANICE                      605
+#define TRAINER_VIVI                        606
+#define TRAINER_HALEY_2                     607
+#define TRAINER_HALEY_3                     608
+#define TRAINER_HALEY_4                     609
+#define TRAINER_HALEY_5                     610
+#define TRAINER_SALLY                       611
+#define TRAINER_ROBIN                       612
+#define TRAINER_ANDREA                      613
+#define TRAINER_CRISSY                      614
+#define TRAINER_RICK                        615
+#define TRAINER_LYLE                        616
+#define TRAINER_JOSE                        617
+#define TRAINER_DOUG                        618
+#define TRAINER_GREG                        619
+#define TRAINER_KENT                        620
+#define TRAINER_JAMES_1                     621
+#define TRAINER_JAMES_2                     622
+#define TRAINER_JAMES_3                     623
+#define TRAINER_JAMES_4                     624
+#define TRAINER_JAMES_5                     625
+#define TRAINER_BRICE                       626
+#define TRAINER_TRENT_1                     627
+#define TRAINER_LENNY                       628
+#define TRAINER_LUCAS_1                     629
+#define TRAINER_ALAN                        630
+#define TRAINER_CLARK                       631
+#define TRAINER_ERIC                        632
+#define TRAINER_LUCAS_2                     633
+#define TRAINER_MIKE_1                      634
+#define TRAINER_MIKE_2                      635
+#define TRAINER_TRENT_2                     636
+#define TRAINER_TRENT_3                     637
+#define TRAINER_TRENT_4                     638
+#define TRAINER_TRENT_5                     639
+#define TRAINER_DEZ_AND_LUKE                640
+#define TRAINER_LEA_AND_JED                 641
+#define TRAINER_KIRA_AND_DAN_1              642
+#define TRAINER_KIRA_AND_DAN_2              643
+#define TRAINER_KIRA_AND_DAN_3              644
+#define TRAINER_KIRA_AND_DAN_4              645
+#define TRAINER_KIRA_AND_DAN_5              646
+#define TRAINER_JOHANNA                     647
+#define TRAINER_GERALD                      648
+#define TRAINER_VIVIAN                      649
+#define TRAINER_DANIELLE                    650
+#define TRAINER_HIDEO                       651
+#define TRAINER_KEIGO                       652
+#define TRAINER_RILEY                       653
+#define TRAINER_FLINT                       654
+#define TRAINER_ASHLEY                      655
+#define TRAINER_WALLY_2                     656
+#define TRAINER_WALLY_3                     657
+#define TRAINER_WALLY_4                     658
+#define TRAINER_WALLY_5                     659
+#define TRAINER_WALLY_6                     660
+#define TRAINER_BRENDAN_13                  661
+#define TRAINER_BRENDAN_14                  662
+#define TRAINER_BRENDAN_15                  663
+#define TRAINER_MAY_11                      664
+#define TRAINER_MAY_12                      665
+#define TRAINER_MAY_13                      666
+#define TRAINER_JONAH                       667
+#define TRAINER_HENRY                       668
+#define TRAINER_ROGER                       669
+#define TRAINER_ALEXA                       670
+#define TRAINER_RUBEN                       671
+#define TRAINER_KOJI_1                      672
+#define TRAINER_WAYNE                       673
+#define TRAINER_AIDAN                       674
+#define TRAINER_REED                        675
+#define TRAINER_TISHA                       676
+#define TRAINER_TORI_AND_TIA                677
+#define TRAINER_KIM_AND_IRIS                678
+#define TRAINER_TYRA_AND_IVY                679
+#define TRAINER_MEL_AND_PAUL                680
+#define TRAINER_JOHN_AND_JAY_1              681
+#define TRAINER_JOHN_AND_JAY_2              682
+#define TRAINER_JOHN_AND_JAY_3              683
+#define TRAINER_JOHN_AND_JAY_4              684
+#define TRAINER_JOHN_AND_JAY_5              685
+#define TRAINER_RELI_AND_IAN                686
+#define TRAINER_LILA_AND_ROY_1              687
+#define TRAINER_LILA_AND_ROY_2              688
+#define TRAINER_LILA_AND_ROY_3              689
+#define TRAINER_LILA_AND_ROY_4              690
+#define TRAINER_LILA_AND_ROY_5              691
+#define TRAINER_LISA_AND_RAY                692
+#define TRAINER_CHRIS                       693
+#define TRAINER_DAWSON                      694
+#define TRAINER_SARAH                       695
+#define TRAINER_DARIAN                      696
+#define TRAINER_HAILEY                      697
+#define TRAINER_CHANDLER                    698
+#define TRAINER_KALEB                       699
+#define TRAINER_JOSEPH                      700
+#define TRAINER_ALYSSA                      701
+#define TRAINER_MARCOS                      702
+#define TRAINER_RHETT                       703
+#define TRAINER_TYRON                       704
+#define TRAINER_CELINA                      705
+#define TRAINER_BIANCA                      706
+#define TRAINER_HAYDEN                      707
+#define TRAINER_SOPHIE                      708
+#define TRAINER_COBY                        709
+#define TRAINER_LAWRENCE                    710
+#define TRAINER_WYATT                       711
+#define TRAINER_ANGELINA                    712
+#define TRAINER_KAI                         713
+#define TRAINER_CHARLOTTE                   714
+#define TRAINER_DEANDRE                     715
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_1       716
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_2       717
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_3       718
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_4       719
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_5       720
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_6       721
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_7       722
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_8       723
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_9       724
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_10      725
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_11      726
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_12      727
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_13      728
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_14      729
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_15      730
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_16      731
+#define TRAINER_TABITHA_3                   732
+#define TRAINER_DARCY                       733
+#define TRAINER_MAXIE_3                     734
+#define TRAINER_PETE                        735
+#define TRAINER_ISABELLE                    736
+#define TRAINER_ANDRES_1                    737
+#define TRAINER_JOSUE                       738
+#define TRAINER_CAMRON                      739
+#define TRAINER_CORY_1                      740
+#define TRAINER_CAROLINA                    741
+#define TRAINER_ELIJAH                      742
+#define TRAINER_CELIA                       743
+#define TRAINER_BRYAN                       744
+#define TRAINER_BRANDEN                     745
+#define TRAINER_BRYANT                      746
+#define TRAINER_SHAYLA                      747
+#define TRAINER_KYRA                        748
+#define TRAINER_JAIDEN                      749
+#define TRAINER_ALIX                        750
+#define TRAINER_HELENE                      751
+#define TRAINER_MARLENE                     752
+#define TRAINER_DEVAN                       753
+#define TRAINER_JOHNSON                     754
+#define TRAINER_MELINA                      755
+#define TRAINER_BRANDI                      756
+#define TRAINER_AISHA                       757
+#define TRAINER_MAKAYLA                     758
+#define TRAINER_FABIAN                      759
+#define TRAINER_DAYTON                      760
+#define TRAINER_RACHEL                      761
+#define TRAINER_LEONEL                      762
+#define TRAINER_CALLIE                      763
+#define TRAINER_CALE                        764
+#define TRAINER_MYLES                       765
+#define TRAINER_PAT                         766
+#define TRAINER_CRISTIN_1                   767
+#define TRAINER_MAY_14                      768
+#define TRAINER_MAY_15                      769
+#define TRAINER_ROXANNE_2                   770
+#define TRAINER_ROXANNE_3                   771
+#define TRAINER_ROXANNE_4                   772
+#define TRAINER_ROXANNE_5                   773
+#define TRAINER_BRAWLY_2                    774
+#define TRAINER_BRAWLY_3                    775
+#define TRAINER_BRAWLY_4                    776
+#define TRAINER_BRAWLY_5                    777
+#define TRAINER_WATTSON_2                   778
+#define TRAINER_WATTSON_3                   779
+#define TRAINER_WATTSON_4                   780
+#define TRAINER_WATTSON_5                   781
+#define TRAINER_FLANNERY_2                  782
+#define TRAINER_FLANNERY_3                  783
+#define TRAINER_FLANNERY_4                  784
+#define TRAINER_FLANNERY_5                  785
+#define TRAINER_NORMAN_2                    786
+#define TRAINER_NORMAN_3                    787
+#define TRAINER_NORMAN_4                    788
+#define TRAINER_NORMAN_5                    789
+#define TRAINER_WINONA_2                    790
+#define TRAINER_WINONA_3                    791
+#define TRAINER_WINONA_4                    792
+#define TRAINER_WINONA_5                    793
+#define TRAINER_TATE_AND_LIZA_2             794
+#define TRAINER_TATE_AND_LIZA_3             795
+#define TRAINER_TATE_AND_LIZA_4             796
+#define TRAINER_TATE_AND_LIZA_5             797
+#define TRAINER_JUAN_2                      798
+#define TRAINER_JUAN_3                      799
+#define TRAINER_JUAN_4                      800
+#define TRAINER_JUAN_5                      801
+#define TRAINER_ANGELO                      802
+#define TRAINER_DARIUS                      803
+#define TRAINER_STEVEN                      804
+#define TRAINER_ANABEL                      805
+#define TRAINER_TUCKER                      806
+#define TRAINER_SPENSER                     807
+#define TRAINER_GRETA                       808
+#define TRAINER_NOLAND                      809
+#define TRAINER_LUCY                        810
+#define TRAINER_BRANDON                     811
+#define TRAINER_ANDRES_2                    812
+#define TRAINER_ANDRES_3                    813
+#define TRAINER_ANDRES_4                    814
+#define TRAINER_ANDRES_5                    815
+#define TRAINER_CORY_2                      816
+#define TRAINER_CORY_3                      817
+#define TRAINER_CORY_4                      818
+#define TRAINER_CORY_5                      819
+#define TRAINER_PABLO_2                     820
+#define TRAINER_PABLO_3                     821
+#define TRAINER_PABLO_4                     822
+#define TRAINER_PABLO_5                     823
+#define TRAINER_KOJI_2                      824
+#define TRAINER_KOJI_3                      825
+#define TRAINER_KOJI_4                      826
+#define TRAINER_KOJI_5                      827
+#define TRAINER_CRISTIN_2                   828
+#define TRAINER_CRISTIN_3                   829
+#define TRAINER_CRISTIN_4                   830
+#define TRAINER_CRISTIN_5                   831
+#define TRAINER_FERNANDO_2                  832
+#define TRAINER_FERNANDO_3                  833
+#define TRAINER_FERNANDO_4                  834
+#define TRAINER_FERNANDO_5                  835
+#define TRAINER_SAWYER_2                    836
+#define TRAINER_SAWYER_3                    837
+#define TRAINER_SAWYER_4                    838
+#define TRAINER_SAWYER_5                    839
+#define TRAINER_GABRIELLE_2                 840
+#define TRAINER_GABRIELLE_3                 841
+#define TRAINER_GABRIELLE_4                 842
+#define TRAINER_GABRIELLE_5                 843
+#define TRAINER_THALIA_2                    844
+#define TRAINER_THALIA_3                    845
+#define TRAINER_THALIA_4                    846
+#define TRAINER_THALIA_5                    847
+#define TRAINER_MARIELA                     848
+#define TRAINER_ALVARO                      849
+#define TRAINER_EVERETT                     850
+#define TRAINER_RED                         851
+#define TRAINER_LEAF                        852
+#define TRAINER_BRENDAN_16                  853
+#define TRAINER_MAY_16                      854
 
-#define TRAINERS_COUNT          855
+#define TRAINERS_COUNT                      855
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 213263b47..7953967ed 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -10,13 +10,6 @@
 #define AILMENT_PKRS  6
 #define AILMENT_FNT   7
 
-#define PARTY_CHOOSE_MON        0
-#define PARTY_MUST_CHOOSE_MON   1
-#define PARTY_CANT_SWITCH       2
-#define PARTY_USE_ITEM_ON       3
-#define PARTY_ABILITY_PREVENTS  4
-#define PARTY_GIVE_ITEM         5
-
 #define TUTOR_MOVE_MEGA_PUNCH      0
 #define TUTOR_MOVE_SWORDS_DANCE    1
 #define TUTOR_MOVE_MEGA_KICK       2
@@ -49,4 +42,91 @@
 #define TUTOR_MOVE_FURY_CUTTER     29
 #define TUTOR_MOVE_COUNT           30
 
+#define PARTY_LAYOUT_SINGLE          0
+#define PARTY_LAYOUT_DOUBLE          1
+#define PARTY_LAYOUT_MULTI           2
+#define PARTY_LAYOUT_MULTI_SHOWCASE  3  // The layout during the screen that appears just before a multi battle
+#define PARTY_LAYOUT_COUNT           4
+#define KEEP_PARTY_LAYOUT            0xFF
+
+#define PARTY_MENU_TYPE_FIELD                     0 
+#define PARTY_MENU_TYPE_IN_BATTLE                 1 
+#define PARTY_MENU_TYPE_CONTEST                   2 
+#define PARTY_MENU_TYPE_CHOOSE_MON                3 
+#define PARTY_MENU_TYPE_CHOOSE_HALF               4  // multi battles, eReader battles, and some battle facilities
+#define PARTY_MENU_TYPE_MULTI_SHOWCASE            5
+#define PARTY_MENU_TYPE_DAYCARE                   6 
+#define PARTY_MENU_TYPE_MOVE_RELEARNER            7 
+#define PARTY_MENU_TYPE_UNION_ROOM_REGISTER       8  // trading board
+#define PARTY_MENU_TYPE_UNION_ROOM_TRADE          9  // trading board
+#define PARTY_MENU_TYPE_SPIN_TRADE                10 // Unused beta for Gen IV's Spin Trade
+#define PARTY_MENU_TYPE_MINIGAME                  11
+#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS  12
+
+#define PARTY_ACTION_CHOOSE_MON         0
+#define PARTY_ACTION_SEND_OUT           1
+#define PARTY_ACTION_CANT_SWITCH        2
+#define PARTY_ACTION_USE_ITEM           3
+#define PARTY_ACTION_ABILITY_PREVENTS   4
+#define PARTY_ACTION_GIVE_ITEM          5  
+#define PARTY_ACTION_GIVE_PC_ITEM       6   // Unused. Not possible to give non-mail items directly from PC
+#define PARTY_ACTION_GIVE_MAILBOX_MAIL  7
+#define PARTY_ACTION_SWITCH             8
+#define PARTY_ACTION_SWITCHING          9
+#define PARTY_ACTION_SOFTBOILED         10
+#define PARTY_ACTION_CHOOSE_AND_CLOSE   11
+#define PARTY_ACTION_MOVE_TUTOR         12
+#define PARTY_ACTION_MINIGAME           13
+#define PARTY_ACTION_REUSABLE_ITEM      14  // Unused. The only reusable items are handled separately
+
+// IDs for DisplayPartyMenuStdMessage, to display the message at the bottom of the party menu
+#define PARTY_MSG_CHOOSE_MON                0
+#define PARTY_MSG_CHOOSE_MON_OR_CANCEL      1
+#define PARTY_MSG_CHOOSE_MON_AND_CONFIRM    2
+#define PARTY_MSG_MOVE_TO_WHERE             3 
+#define PARTY_MSG_TEACH_WHICH_MON           4
+#define PARTY_MSG_USE_ON_WHICH_MON          5
+#define PARTY_MSG_GIVE_TO_WHICH_MON         6
+#define PARTY_MSG_NOTHING_TO_CUT            7
+#define PARTY_MSG_CANT_SURF_HERE            8
+#define PARTY_MSG_ALREADY_SURFING           9
+#define PARTY_MSG_CURRENT_TOO_FAST          10
+#define PARTY_MSG_ENJOY_CYCLING             11
+#define PARTY_MSG_ALREADY_IN_USE            12
+#define PARTY_MSG_CANT_USE_HERE             13
+#define PARTY_MSG_NO_MON_FOR_BATTLE         14
+#define PARTY_MSG_CHOOSE_MON_2              15
+#define PARTY_MSG_NOT_ENOUGH_HP             16
+#define PARTY_MSG_X_MONS_ARE_NEEDED         17
+#define PARTY_MSG_MONS_CANT_BE_SAME         18
+#define PARTY_MSG_NO_SAME_HOLD_ITEMS        19
+#define PARTY_MSG_UNUSED                    20
+#define PARTY_MSG_DO_WHAT_WITH_MON          21
+#define PARTY_MSG_RESTORE_WHICH_MOVE        22
+#define PARTY_MSG_BOOST_PP_WHICH_MOVE       23
+#define PARTY_MSG_DO_WHAT_WITH_ITEM         24
+#define PARTY_MSG_DO_WHAT_WITH_MAIL         25
+#define PARTY_MSG_ALREADY_HOLDING_ONE       26
+#define PARTY_MSG_NONE                      127
+
+// IDs for DisplayPartyPokemonDescriptionText, to display a message in the party pokemon's box
+#define PARTYBOX_DESC_NO_USE      0
+#define PARTYBOX_DESC_ABLE_3      1
+#define PARTYBOX_DESC_FIRST       2
+#define PARTYBOX_DESC_SECOND      3
+#define PARTYBOX_DESC_THIRD       4
+#define PARTYBOX_DESC_FOURTH      5
+#define PARTYBOX_DESC_ABLE        6
+#define PARTYBOX_DESC_NOT_ABLE    7
+#define PARTYBOX_DESC_ABLE_2      8
+#define PARTYBOX_DESC_NOT_ABLE_2  9
+#define PARTYBOX_DESC_LEARNED     10
+#define PARTYBOX_DESC_HAVE        11
+#define PARTYBOX_DESC_DONT_HAVE   12
+
+#define SELECTWINDOW_ACTIONS  0
+#define SELECTWINDOW_ITEM     1
+#define SELECTWINDOW_MAIL     2
+#define SELECTWINDOW_MOVES    3
+
 #endif // GUARD_CONSTANTS_PARTY_MENU_H
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 5cd98d3f3..5610a470c 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -184,7 +184,6 @@
 #define OT_ID_PRESET          1
 #define OT_ID_RANDOM_NO_SHINY 2
 
-
 #define MON_GIVEN_TO_PARTY      0
 #define MON_GIVEN_TO_PC         1
 #define MON_CANT_GIVE           2
@@ -193,6 +192,13 @@
 #define PLAYER_HAS_ONE_MON             1
 #define PLAYER_HAS_ONE_USABLE_MON      2
 
+#define MON_ALREADY_KNOWS_MOVE  0xFFFE
+#define MON_HAS_MAX_MOVES       0xFFFF
+
+#define LEVEL_UP_MOVE_ID   0x01FF
+#define LEVEL_UP_MOVE_LV   0xFE00
+#define LEVEL_UP_END       0xFFFF
+
 #define MON_MALE       0x00
 #define MON_FEMALE     0xFE
 #define MON_GENDERLESS 0xFF
diff --git a/include/constants/trade.h b/include/constants/trade.h
index 4fb8966d0..fa42e6b43 100644
--- a/include/constants/trade.h
+++ b/include/constants/trade.h
@@ -20,13 +20,13 @@
 #define READY_FINISH_TRADE  1
 #define FINISH_TRADE        2
 
-// Return values for CanTradeSelectedMon and CanTradeSelectedPartyMenuMon
+// Return values for CanTradeSelectedMon and CanSpinTradeMon
 #define CAN_TRADE_MON           0
 #define CANT_TRADE_LAST_MON     1
 #define CANT_TRADE_NATIONAL     2
-#define CANT_TRADE_EGG          3
+#define CANT_TRADE_EGG_YET      3
 #define CANT_TRADE_INVALID_MON  4
-#define CANT_TRADE_EGG2         5
+#define CANT_TRADE_EGG_YET2     5
 
 // Return values for CheckValidityOfTradeMons
 #define PLAYER_MON_INVALID   0
diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h
index cab56a5ac..f7a270428 100644
--- a/include/constants/trainer_hill.h
+++ b/include/constants/trainer_hill.h
@@ -1,27 +1,46 @@
 #ifndef GUARD_CONSTANTS_TRAINER_HILL_H
 #define GUARD_CONSTANTS_TRAINER_HILL_H
 
+#define TRAINER_HILL_1F        1
+#define TRAINER_HILL_2F        2
+#define TRAINER_HILL_3F        3
+#define TRAINER_HILL_4F        4
+#define TRAINER_HILL_ROOF      5
+#define TRAINER_HILL_ENTRANCE  6
+
+#define NUM_TRAINER_HILL_FLOORS    4
+#define NUM_TRAINER_HILL_FLOORS_JP 2
+
+#define NUM_TRAINER_HILL_PRIZE_LISTS 10
+
 #define TRAINER_HILL_FUNC_START 0
-#define TRAINER_HILL_FUNC_1 1
-#define TRAINER_HILL_FUNC_2 2
-#define TRAINER_HILL_FUNC_3 3
+#define TRAINER_HILL_FUNC_GET_OWNER_STATE 1
+#define TRAINER_HILL_FUNC_GIVE_PRIZE 2
+#define TRAINER_HILL_FUNC_CHECK_FINAL_TIME 3
 #define TRAINER_HILL_FUNC_RESUME_TIMER 4
 #define TRAINER_HILL_FUNC_SET_LOST 5
 #define TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS 6
-#define TRAINER_HILL_FUNC_7 7
-#define TRAINER_HILL_FUNC_8 8
-#define TRAINER_HILL_FUNC_9 9
-#define TRAINER_HILL_FUNC_IS_IN 10
-#define TRAINER_HILL_FUNC_11 11
-#define TRAINER_HILL_FUNC_12 12
-#define TRAINER_HILL_FUNC_13 13
-#define TRAINER_HILL_FUNC_14 14
-#define TRAINER_HILL_FUNC_15 15
-#define TRAINER_HILL_FUNC_16 16
+#define TRAINER_HILL_FUNC_GET_CHALLENGE_TIME 7
+#define TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED 8
+#define TRAINER_HILL_FUNC_CLEAR_RESULT 9
+#define TRAINER_HILL_FUNC_IN_CHALLENGE 10
+#define TRAINER_HILL_FUNC_POST_BATTLE_TEXT 11
+#define TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS 12
+#define TRAINER_HILL_FUNC_GET_GAME_SAVED 13
+#define TRAINER_HILL_FUNC_SET_GAME_SAVED 14
+#define TRAINER_HILL_FUNC_CLEAR_GAME_SAVED 15
+#define TRAINER_HILL_FUNC_GET_WON 16
 #define TRAINER_HILL_FUNC_SET_TAG 17
 
-// Values returned by the TrainerHillGetChallengeStatus
-// function.
+#define TRAINER_HILL_TEXT_INTRO        2
+#define TRAINER_HILL_TEXT_PLAYER_LOST  3
+#define TRAINER_HILL_TEXT_PLAYER_WON   4
+#define TRAINER_HILL_TEXT_AFTER        5
+
+#define NUM_TRAINER_HILL_TRAINERS     (NUM_TRAINER_HILL_FLOORS * 2)
+#define NUM_TRAINER_HILL_TRAINERS_JP  (NUM_TRAINER_HILL_FLOORS_JP * 2)
+
+// Values returned by TrainerHillGetChallengeStatus
 #define TRAINER_HILL_PLAYER_STATUS_LOST 0
 #define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1
 #define TRAINER_HILL_PLAYER_STATUS_NORMAL 2
diff --git a/include/constants/tv.h b/include/constants/tv.h
index c22bec9a3..fddf650e4 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -43,4 +43,7 @@
 //                                                  //
 #define TVSHOW_MASS_OUTBREAK                        41 
 
+// Number of ribbons to put Spot the Cuties on air
+#define NUM_CUTIES_RIBBONS  4
+
 #endif //GUARD_CONSTANTS_TV_H
diff --git a/include/constants/union_room.h b/include/constants/union_room.h
new file mode 100644
index 000000000..2314f85a0
--- /dev/null
+++ b/include/constants/union_room.h
@@ -0,0 +1,28 @@
+#ifndef GUARD_CONSTANTS_UNION_ROOM_H
+#define GUARD_CONSTANTS_UNION_ROOM_H
+
+#define LINK_GROUP_SINGLE_BATTLE        0
+#define LINK_GROUP_DOUBLE_BATTLE        1
+#define LINK_GROUP_MULTI_BATTLE         2
+#define LINK_GROUP_TRADE                3
+#define LINK_GROUP_POKEMON_JUMP         4
+#define LINK_GROUP_BERRY_CRUSH          5
+#define LINK_GROUP_BERRY_PICKING        6
+#define LINK_GROUP_WONDER_CARD          7
+#define LINK_GROUP_WONDER_NEWS          8
+#define LINK_GROUP_UNK_9                9
+#define LINK_GROUP_UNK_10               10
+#define LINK_GROUP_UNK_11               11
+#define LINK_GROUP_RECORD_CORNER        12
+#define LINK_GROUP_BERRY_BLENDER        13
+#define LINK_GROUP_UNK_14               14
+#define LINK_GROUP_COOL_CONTEST         15
+#define LINK_GROUP_BEAUTY_CONTEST       16
+#define LINK_GROUP_CUTE_CONTEST         17
+#define LINK_GROUP_SMART_CONTEST        18
+#define LINK_GROUP_TOUGH_CONTEST        19
+#define LINK_GROUP_BATTLE_TOWER         20
+#define LINK_GROUP_BATTLE_TOWER_OPEN    21
+#define NUM_LINK_GROUP_TYPES            22
+
+#endif //GUARD_CONSTANTS_UNION_ROOM_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index cfafccd9b..d39323831 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -79,8 +79,8 @@
 #define VAR_ALTERING_CAVE_WILD_SET           0x403E
 #define VAR_DISTRIBUTE_EON_TICKET            0x403F // This var is read and written, but is always zero. The only way to obtain the Eon Ticket in Emerald is via Record Mixing
 #define VAR_DAYS                             0x4040
-#define VAR_FANCLUB_UNKNOWN_1                0x4041
-#define VAR_FANCLUB_UNKNOWN_2                0x4042
+#define VAR_FANCLUB_FAN_COUNTER              0x4041
+#define VAR_FANCLUB_LOSE_FAN_TIMER           0x4042
 #define VAR_DEPT_STORE_FLOOR                 0x4043
 #define VAR_TRICK_HOUSE_LEVEL                0x4044
 #define VAR_POKELOT_PRIZE_ITEM               0x4045
@@ -144,17 +144,17 @@
 #define VAR_ROUTE132_STATE                   0x407F // Unused Var
 #define VAR_ROUTE133_STATE                   0x4080 // Unused Var
 #define VAR_ROUTE134_STATE                   0x4081 // Unused Var
-#define VAR_LITTLEROOT_HOUSES_STATE          0x4082
+#define VAR_LITTLEROOT_HOUSES_STATE_MAY      0x4082
 #define VAR_UNUSED_0x4083                    0x4083 // Unused Var
 #define VAR_BIRCH_LAB_STATE                  0x4084
 #define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman 
-#define VAR_LINK_CONTEST_ROOM_STATE          0x4086
+#define VAR_CONTEST_HALL_STATE               0x4086
 #define VAR_CABLE_CLUB_STATE                 0x4087
-#define VAR_CONTEST_LOCATION                 0x4088
+#define VAR_CONTEST_TYPE                     0x4088
 #define VAR_SECRET_BASE_INITIALIZED          0x4089
 #define VAR_CONTEST_PRIZE_PICKUP             0x408A
 #define VAR_UNUSED_0x408B                    0x408B // Unused Var
-#define VAR_LITTLEROOT_HOUSES_STATE_2        0x408C
+#define VAR_LITTLEROOT_HOUSES_STATE_BRENDAN  0x408C
 #define VAR_LITTLEROOT_RIVAL_STATE           0x408D
 #define VAR_BOARD_BRINEY_BOAT_STATE          0x408E
 #define VAR_DEVON_CORP_3F_STATE              0x408F
@@ -172,16 +172,16 @@
 #define VAR_UNUSED_0x409B                    0x409B // Unused Var
 #define VAR_ELITE_4_STATE                    0x409C
 #define VAR_UNUSED_0x409D                    0x409D // Unused Var
-#define VAR_MOSSDEEP_SPACE_CENTER_STATE_1    0x409E
-#define VAR_MOSSDEEP_SPACE_CENTER_STATE_2    0x409F
+#define VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE    0x409E
+#define VAR_MOSSDEEP_SPACE_CENTER_STATE      0x409F
 #define VAR_SLATEPORT_HARBOR_STATE           0x40A0
 #define VAR_UNUSED_0x40A1                    0x40A1 // Unused var
 #define VAR_SEAFLOOR_CAVERN_STATE            0x40A2
 #define VAR_CABLE_CAR_STATION_STATE          0x40A3
 #define VAR_SAFARI_ZONE_STATE                0x40A4  // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1     0x40A5
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2     0x40A6
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3     0x40A7
+#define VAR_TRICK_HOUSE_BEING_WATCHED_STATE  0x40A5
+#define VAR_TRICK_HOUSE_FOUND_TRICK_MASTER   0x40A6
+#define VAR_TRICK_HOUSE_ENTRANCE_STATE       0x40A7
 #define VAR_UNUSED_0x40A8                    0x40A8 // Unused Var
 #define VAR_CYCLING_CHALLENGE_STATE          0x40A9
 #define VAR_SLATEPORT_MUSEUM_1F_STATE        0x40AA
@@ -194,9 +194,9 @@
 #define VAR_TRICK_HOUSE_PUZZLE_7_STATE       0x40B1
 #define VAR_TRICK_HOUSE_PUZZLE_8_STATE       0x40B2
 #define VAR_WEATHER_INSTITUTE_STATE          0x40B3
-#define VAR_PORTHOLE_STATE                   0x40B4
-#define VAR_TRICK_HOUSE_STATE                0x40B5 // TODO: needs some further investigation
-#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2     0x40B6
+#define VAR_SS_TIDAL_STATE                   0x40B4
+#define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR  0x40B5
+#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2     0x40B6 // Leftover from RS, never set
 #define VAR_SLATEPORT_FAN_CLUB_STATE         0x40B7
 #define VAR_UNUSED_0x40B8                    0x40B8 // Unused Var
 #define VAR_MT_PYRE_STATE                    0x40B9
@@ -257,9 +257,9 @@
 #define VAR_SECRET_BASE_IS_NOT_LOCAL         0x40F0 // Set to TRUE while in another player's secret base.
 #define VAR_DAILY_BP                         0x40F1
 #define VAR_WALLY_CALL_STEP_COUNTER          0x40F2
-#define VAR_WINONA_CALL_STEP_COUNTER         0x40F3
+#define VAR_SCOTT_FORTREE_CALL_STEP_COUNTER  0x40F3
 #define VAR_ROXANNE_CALL_STEP_COUNTER        0x40F4
-#define VAR_SCOTT_CALL_STEP_COUNTER          0x40F5
+#define VAR_SCOTT_BF_CALL_STEP_COUNTER       0x40F5
 #define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER 0x40F6
 #define VAR_UNUSED_0x40F7                    0x40F7 // Unused Var
 #define VAR_UNUSED_0x40F8                    0x40F8 // Unused Var
diff --git a/include/contest.h b/include/contest.h
index 2b1b95af5..00c3191eb 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -201,14 +201,6 @@ enum
 };
 
 enum {
-    CONTEST_RANK_NORMAL,
-    CONTEST_RANK_SUPER,
-    CONTEST_RANK_HYPER,
-    CONTEST_RANK_MASTER,
-    CONTEST_RANK_LINK
-};
-
-enum {
     CONTEST_FILTER_NONE,
     CONTEST_FILTER_NO_POSTGAME,
     CONTEST_FILTER_ONLY_POSTGAME
@@ -436,15 +428,15 @@ struct ContestResources
 #define eContestDebugMode (gHeap[0x1a000])
 #define eUnknownHeap1A004 (*(struct Shared1A004 *)(gHeap + 0x1a004))
 
-extern struct ContestPokemon gContestMons[4];
-extern s16 gContestMonConditions[4];
-extern s16 gUnknown_02039F08[4];
-extern s16 gUnknown_02039F10[4];
-extern s16 gUnknown_02039F18[4];
-extern u8 gContestFinalStandings[4];
+extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
+extern s16 gContestMonConditions[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F08[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F10[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F18[CONTESTANT_COUNT];
+extern u8 gContestFinalStandings[CONTESTANT_COUNT];
 extern u8 gContestMonPartyIndex;
 extern u8 gContestPlayerMonIndex;
-extern u8 gContestantTurnOrder[4];
+extern u8 gContestantTurnOrder[CONTESTANT_COUNT];
 extern u8 gLinkContestFlags;
 extern u8 gUnknown_02039F2B;
 extern u16 gSpecialVar_ContestCategory;
@@ -453,7 +445,7 @@ extern u8 gNumLinkContestPlayers;
 extern u8 gHighestRibbonRank;
 extern struct ContestResources *gContestResources;
 extern u8 sContestBgCopyFlags;
-extern struct ContestWinner gUnknown_02039F3C;
+extern struct ContestWinner gCurContestWinner;
 extern u8 gUnknown_02039F5C;
 extern u8 gUnknown_02039F5D;
 
@@ -466,7 +458,7 @@ void CB2_StartContest(void);
 void sub_80DA8C8(u8 partyIndex);
 void sub_80DAB8C(u8 contestType, u8 rank);
 void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
-u8 sub_80DAE0C(struct Pokemon *pkmn);
+u8 GetContestEntryEligibility(struct Pokemon *pkmn);
 void sub_80DB09C(u8 contestCategory);
 bool8 IsSpeciesNotUnown(u16 species);
 bool8 Contest_IsMonsTurnDisabled(u8 a);
diff --git a/include/contest_link_80F57C4.h b/include/contest_link_80F57C4.h
index b4ccf2803..add3ae62f 100644
--- a/include/contest_link_80F57C4.h
+++ b/include/contest_link_80F57C4.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_CONTEST_LINK_80F57C4_H
 #define GUARD_CONTEST_LINK_80F57C4_H
 
-void sub_80F8264(void);
-void sub_80F8290(void);
-void sub_80F840C(void);
-void sub_80F8438(void);
+void BufferContestantTrainerName(void);
+void BufferContestantMonNickname(void);
+void StartContest(void);
+void BufferContestantMonSpecies(void);
 void sub_80F8484(void);
 void sub_80F84C4(u8);
 void sub_80FC998(u8 taskId);
diff --git a/include/contest_painting.h b/include/contest_painting.h
index c633c50cc..f16a0d2f3 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -1,16 +1,7 @@
 #ifndef GUARD_CONTESTPAINTING_H
 #define GUARD_CONTESTPAINTING_H
 
-enum
-{
-    CONTESTRESULT_COOL = 9,
-    CONTESTRESULT_BEAUTY = 13,
-    CONTESTRESULT_CUTE = 2,
-    CONTESTRESULT_SMART = 36,
-    CONTESTRESULT_TOUGH = 6,
-};
-
-void sub_812FDA8(int);
+void SetContestWinnerForPainting(int);
 void CB2_ContestPainting(void);
 
 #endif
diff --git a/include/contest_painting_effects.h b/include/contest_painting_effects.h
deleted file mode 100755
index 3b6964666..000000000
--- a/include/contest_painting_effects.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef GUARD_CONTEST_PAINTING_EFFECTS_H
-#define GUARD_CONTEST_PAINTING_EFFECTS_H
-
-struct Unk030061A0
-{
-    u8 var_0;
-    u8 pad1[3];
-    u16 (*var_4)[][32];
-    u16 *var_8;
-    u8 pad0C[4];
-    u32 var_10;
-    u16 var_14;
-    u16 var_16;
-    u8 var_18;
-    u8 var_19;
-    u8 var_1A;
-    u8 var_1B;
-    u8 var_1C;
-    u8 var_1D;
-    u8 var_1E;
-    u8 var_1F;
-};
-
-void sub_8124F2C(struct Unk030061A0 *);
-void sub_81261A4(struct Unk030061A0 *);
-void sub_8126058(struct Unk030061A0 *);
-
-#endif
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 84ac15422..221cbd1da 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -129,11 +129,11 @@ void InitializeEasyChatWordArray(u16 *words, u16 length);
 u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 u16 sub_811EE38(u16 group);
-u16 sub_811F01C(void);
+u16 GetNewHipsterPhraseToTeach(void);
 u16 EasyChat_GetNumWordsInGroup(u8);
 u16 sub_811EE90(u16);
 void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
 void sub_811F8BC(void);
-void sub_811EFC0(u8 additionalPhraseId);
+void UnlockAdditionalPhrase(u8 additionalPhraseId);
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index a0190ea9e..3e4251cf6 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -376,16 +376,12 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
 //field effects
 extern const u8 EventScript_FldEffStrength[];
 extern const u8 EventScript_FailSweetScent[];
-extern const u8 EventScript_2926F8[];
+extern const u8 EventScript_FldEffFlash[];
 extern const u8 EventScript_FldEffRockSmash[];
 
 //player pc
-extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[];
-extern const u8 LittlerootTown_MaysHouse_2F_EventScript_1F958F[];
-
-//contest_strings
-extern const u8 gText_0827D507[];
-extern const u8 gText_0827D531[];
+extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC[];
+extern const u8 LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC[];
 
 //mauville_old_man
 extern const u8 gOtherText_Is[];
@@ -407,127 +403,127 @@ extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[];
 extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[];
 extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[];
 
+// mauville old man storyteller
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory[];
 
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E947[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E956[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9D7[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9EF[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9FE[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA7D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA98[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EAA8[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB19[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB31[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB3E[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBB5[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBCD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBDD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC60[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC79[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC81[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED04[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED21[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED30[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDA1[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDB5[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDCF[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE45[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE5D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE6A[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEDD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEF1[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF01[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF73[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF95[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EFAA[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F045[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F05A[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F071[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F0F3[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F10D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F125[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1BE[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1D5[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1DE[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F24F[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F269[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F277[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F2FC[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F314[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F32A[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3AD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3C6[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3D2[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F44B[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F461[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F47C[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F50C[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F51B[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F538[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5BE[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5D1[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5F2[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F678[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F694[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F6B4[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F751[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F76A[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F776[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F7F6[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F811[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F822[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F89C[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8AF[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8BC[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F92F[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F941[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F949[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9D1[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9EA[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9FD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA81[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA99[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FAA7[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB1D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB35[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB47[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBC4[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBD9[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBEA[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC6B[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC85[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC98[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD1D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD35[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD40[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDA2[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDBD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDCE[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE57[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE72[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE88[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF0C[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF27[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF44[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFDD[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFFA[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_29000D[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[];
-extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[];
-
-extern const u8 EventScript_PlayerPCMale[];
-extern const u8 EventScript_PlayerPCFemale[];
+extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_PC[];
+extern const u8 LittlerootTown_MaysHouse_2F_EventScript_PC[];
 extern const u8 EventScript_PC[];
 extern const u8 EventScript_TestSignpostMsg[];
 extern const u8 EventScript_HiddenItemScript[];
 extern const u8 EventScript_TV[];
 extern const u8 EventScript_ClosedSootopolisDoor[];
-extern const u8 SkyPillar_Outside_EventScript_2393F9[];
+extern const u8 SkyPillar_Outside_EventScript_ClosedDoor[];
 extern const u8 EventScript_CableBoxResults[];
 extern const u8 EventScript_PokeBlockFeeder[];
-extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
+extern const u8 Route110_TrickHousePuzzle_EventScript_Door[];
 extern const u8 EventScript_RegionMap[];
 extern const u8 EventScript_RunningShoesManual[];
 extern const u8 EventScript_PictureBookShelf[];
@@ -551,13 +547,13 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
 extern const u8 EventScript_FieldPoison[];
 extern const u8 EventScript_EggHatch[];
 extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
-extern const u8 IslandCave_EventScript_238EAF[];
-extern const u8 MauvilleCity_EventScript_1DF7BA[];
-extern const u8 Route119_EventScript_1F49EC[];
-extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
+extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
+extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
+extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[];
+extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[];
 extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
-extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
-extern const u8 SSTidalCorridor_EventScript_23C050[];
+extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[];
+extern const u8 SSTidalCorridor_EventScript_ReachedStepCount[];
 extern const u8 EventScript_FallDownHoleMtPyre[];
 
 // Secret Base
@@ -586,6 +582,6 @@ extern const u8 SecretBase_EventScript_TreeUseSecretPower[];
 extern const u8 SecretBase_EventScript_ShrubUseSecretPower[];
 
 // trainer hill
-extern const u8 EventScript_2C83F0[];
+extern const u8 TrainerHill_EventScript_TrainerBattle[];
 
 #endif // GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 0dbe600d3..0a99938d7 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -12,7 +12,7 @@ extern bool8 (*gFieldCallback2)(void);
 u32 FieldEffectStart(u8);
 bool8 FieldEffectActiveListContains(u8 id);
 void FieldEffectActiveListClear(void);
-void sub_80B69DC(void);
+void ReturnToFieldFromFlyMapSelect(void);
 u8 AddNewGameBirchObject(s16, s16, u8);
 void FieldEffectStop(struct Sprite *sprite, u8 id);
 u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index af594611e..02a927d4b 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -32,13 +32,13 @@ void DoMossdeepGymWarp(void);
 void sub_80AF8B8(void);
 void sub_80AF948(void);
 void sub_80AF9F8(void);
-void sub_80AFC60(void);
+void DoContestHallWarp(void);
 void AnimateFlash(u8 flashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
 void sub_80B0244(void);
 void sub_80B0268(void);
-void sub_80B0534(void);
-void sub_80B058C(void);
+void DoOrbEffect(void);
+void FadeOutOrbEffect(void);
 void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
 bool8 walkrun_is_standing_still(void);
diff --git a/include/field_specials.h b/include/field_specials.h
index 952081e93..a4d53a9a6 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -8,20 +8,20 @@ u8 GetLeadMonIndex(void);
 u8 IsDestinationBoxFull(void);
 u16 GetPCBoxToSendMon(void);
 bool8 InMultiBattleRoom(void);
-void sub_813BF10(void);
+void UpdateTrainerFansAfterLinkBattle(void);
 void IncrementBirthIslandRockStepCount(void);
 bool8 UnusualWeatherHasExpired(void);
 bool8 ShouldDoBrailleRegicePuzzle(void);
 bool32 ShouldDoWallyCall(void);
-bool32 ShouldDoWinonaCall(void);
-bool32 ShouldDoScottCall(void);
+bool32 ShouldDoScottFortreeCall(void);
+bool32 ShouldDoScottBattleFrontierCall(void);
 bool32 ShouldDoRoxanneCall(void);
 bool32 ShouldDoRivalRayquazaCall(void);
 bool32 CountSSTidalStep(u16 delta);
 u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
 void ShowScrollableMultichoice(void);
 void FrontierGamblerSetWonOrLost(bool8 won);
-u8 sub_813BADC(u8 a0);
+u8 TryGainNewFanFromCounter(u8 incrementId);
 bool8 InPokemonCenter(void);
 void SetShoalItemFlag(u16 unused);
 void UpdateFrontierManiac(u16 daysSince);
diff --git a/include/fldeff.h b/include/fldeff.h
index ff6c9823f..5da189c2a 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -28,8 +28,8 @@ bool8 sub_80E1584(void);
 
 // soft-boiled
 bool8 SetUpFieldMove_SoftBoiled(void);
-void sub_81615A8(u8 taskId);
-void sub_8161560(u8 taskId);
+void Task_TryUseSoftboiledOnPartyMon(u8 taskId);
+void ChooseMonForSoftboiled(u8 taskId);
 
 // flash
 bool8 SetUpFieldMove_Flash(void);
diff --git a/include/frontier_util.h b/include/frontier_util.h
index 9464ba91c..627b5bef5 100644
--- a/include/frontier_util.h
+++ b/include/frontier_util.h
@@ -1,10 +1,6 @@
 #ifndef GUARD_FRONTIER_UTIL_H
 #define GUARD_FRONTIER_UTIL_H
 
-#define FRONTIER_BEFORE_TEXT 0
-#define FRONTIER_PLAYER_LOST_TEXT 1
-#define FRONTIER_PLAYER_WON_TEXT 2
-
 void CallFrontierUtilFunc(void);
 u8 sub_81A3610(void);
 void CopyFrontierTrainerText(u8 whichText, u16 trainerId);
diff --git a/include/global.h b/include/global.h
index 82c53c009..d33be5d82 100644
--- a/include/global.h
+++ b/include/global.h
@@ -214,14 +214,16 @@ struct ApprenticeMon
     u16 item;
 };
 
+// This is for past players Apprentices or Apprentices received via Record Mix.
+// For the current Apprentice, see struct PlayersApprentice
 struct Apprentice
 {
     u8 id:5;
     u8 lvlMode:2; // + 1
-    u8 field_1;
+    u8 numQuestions;
     u8 number;
-    struct ApprenticeMon party[3];
-    u16 easyChatWords[6];
+    struct ApprenticeMon party[MULTI_PARTY_SIZE];
+    u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT];
     u8 playerId[TRAINER_ID_LENGTH];
     u8 playerName[PLAYER_NAME_LENGTH];
     u8 language;
@@ -264,9 +266,9 @@ struct EmeraldBattleTowerRecord
     /*0x02*/ u16 winStreak;
     /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
     /*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
-    /*0x10*/ u16 greeting[6];
-    /*0x1C*/ u16 speechWon[6];
-    /*0x28*/ u16 speechLost[6];
+    /*0x10*/ u16 greeting[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x1C*/ u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x28*/ u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
     /*0x34*/ struct BattleTowerPokemon party[4];
     /*0xE4*/ u8 language;
     /*0xE8*/ u32 checksum;
@@ -279,10 +281,10 @@ struct BattleTowerEReaderTrainer
     /*0x02*/ u16 winStreak;
     /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
     /*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
-    /*0x10*/ u16 greeting[6];
-    /*0x1C*/ u16 farewellPlayerLost[6];
-    /*0x28*/ u16 farewellPlayerWon[6];
-    /*0x34*/ struct BattleTowerPokemon party[3];
+    /*0x10*/ u16 greeting[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x1C*/ u16 farewellPlayerLost[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x28*/ u16 farewellPlayerWon[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x34*/ struct BattleTowerPokemon party[FRONTIER_PARTY_SIZE];
     /*0xB8*/ u32 checksum;
 };
 
@@ -329,7 +331,7 @@ struct BattleFrontier
     /*0xCA9*/ u8 field_CA9_d:1;   // 0x20
     /*0xCA9*/ u8 field_CA9_e:1;   // 0x40
     /*0xCA9*/ u8 field_CA9_f:1;   // 0x80
-    /*0xCAA*/ u16 selectedPartyMons[3];
+    /*0xCAA*/ u16 selectedPartyMons[FRONTIER_PARTY_SIZE];
     /*0xCB0*/ u16 field_CB0;
     /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor.
     /*0xCB4*/ u16 trainerIds[20];
@@ -356,7 +358,7 @@ struct BattleFrontier
     /*0xD14*/ u16 domeRecordWinStreaks[2][2];
     /*0xD1C*/ u16 domeTotalChampionships[2][2];
     /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
-    /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3];
+    /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][FRONTIER_PARTY_SIZE];
     /*0xDC4*/ u16 field_DC4;
     /*0xDC6*/ u16 field_DC6;
     /*0xDC8*/ u16 palaceWinStreaks[2][2];
@@ -375,7 +377,7 @@ struct BattleFrontier
     /*0xE10*/ u8 pikeHintedRoomIndex:3;
     /*0xE10*/ u8 pikeHintedRoomType:4;
     /*0xE10*/ u8 pikeHealingRoomsDisabled:1;
-    /*0xE12*/ u16 pikeHeldItemsBackup[3];
+    /*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE];
     /*0xE18*/ u16 pyramidRewardItem;
     /*0xE1A*/ u16 pyramidWinStreaks[2];
     /*0xE1E*/ u16 pyramidRecordStreaks[2];
@@ -391,36 +393,36 @@ struct BattleFrontier
     /*0xEBA*/ u16 field_EBA;
     /*0xEBC*/ u32 battlesCount;
     /*0xEC0*/ u16 field_EC0[16];
-    /*0xEE0*/ u8 field_EE0;
+    /*0xEE0*/ u8 trainerFlags;
     /*0xEE1*/ u8 opponentName[2][PLAYER_NAME_LENGTH + 1];
     /*0xEF1*/ u8 field_EF1[2][4];
-    /*0xEF9*/ u8 field_EF9_0:7;
-    /*0xEF9*/ u8 field_EF9_1:1;
+    /*0xEF9*/ u8 unk_EF9:7;
+    /*0xEF9*/ u8 savedGame:1;
     /*0xEFA*/ u8 field_EFA;
     /*0xEFB*/ u8 field_EFB;
     /*0xEFC*/ struct FrontierMonData field_EFC[3];
 };
 
-struct Sav2_B8
+struct ApprenticeQuestion
 {
-    u8 unk0_0:2;
-    u8 unk0_1:2;
-    u8 unk0_2:2;
-    u8 unk0_3:2;
-    u16 unk2;
+    u8 questionId:2;
+    u8 monId:2;
+    u8 moveSlot:2;
+    u8 suggestedChange:2; // TRUE if told to use held item or second move, FALSE if told to use no item or first move
+    u16 data; // used both as an itemId and a moveId
 };
 
 struct PlayersApprentice
 {
     /*0xB0*/ u8 id;
-    /*0xB1*/ u8 activeLvlMode:2; // +1, 0 means not active
-    /*0xB1*/ u8 field_B1_1:4;
-    /*0xB1*/ u8 field_B1_2:2;
-    /*0xB2*/ u8 field_B2_0:3;
-    /*0xB2*/ u8 field_B2_1:2;
-    /*0xB3*/ u8 field_B3;
-    /*0xB4*/ u8 monIds[3];
-    /*0xB8*/ struct Sav2_B8 field_B8[9];
+    /*0xB1*/ u8 lvlMode:2;  //0: Unassigned, 1: Lv 50, 2: Open Lv
+    /*0xB1*/ u8 questionsAnswered:4;
+    /*0xB1*/ u8 leadMonId:2;
+    /*0xB2*/ u8 party:3;
+    /*0xB2*/ u8 saveId:2; 
+    /*0xB3*/ u8 unused;
+    /*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE];
+    /*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS];
 };
 
 struct RankingHall1P
@@ -465,7 +467,7 @@ struct SaveBlock2
     /*0xA8*/ u32 field_A8; // Written to, but never read.
     /*0xAC*/ u32 encryptionKey;
     /*0xB0*/ struct PlayersApprentice playerApprentice;
-    /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing.
+    /*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT];
     /*0x1EC*/ struct BerryCrush berryCrush;
     /*0x1FC*/ struct PokemonJumpResults pokeJump;
     /*0x20C*/ struct BerryPickingResults berryPick;
@@ -594,9 +596,9 @@ struct MauvilleManCommon
 struct MauvilleManBard
 {
     /*0x00*/ u8 id;
-    /*0x02*/ u16 songLyrics[6];
-    /*0x0E*/ u16 temporaryLyrics[6];
-    /*0x1A*/ u8 playerName[8];
+    /*0x02*/ u16 songLyrics[BARD_SONG_LENGTH];
+    /*0x0E*/ u16 temporaryLyrics[BARD_SONG_LENGTH];
+    /*0x1A*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
     /*0x22*/ u8 filler_2DB6[0x3];
     /*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH];
     /*0x29*/ bool8 hasChangedSong;
@@ -608,10 +610,10 @@ struct MauvilleManStoryteller
     u8 id;
     bool8 alreadyRecorded;
     u8 filler2[2];
-    u8 gameStatIDs[4];
-    u8 trainerNames[4][7];
-    u8 statValues[4][4];
-    u8 language[4];
+    u8 gameStatIDs[NUM_STORYTELLER_TALES];
+    u8 trainerNames[NUM_STORYTELLER_TALES][PLAYER_NAME_LENGTH];
+    u8 statValues[NUM_STORYTELLER_TALES][4];
+    u8 language[NUM_STORYTELLER_TALES];
 };
 
 struct MauvilleManGiddy
@@ -634,10 +636,10 @@ struct MauvilleManHipster
 struct MauvilleOldManTrader
 {
     u8 id;
-    u8 decorIds[4];
-    u8 playerNames[4][11];
+    u8 decorIds[NUM_TRADER_ITEMS];
+    u8 playerNames[NUM_TRADER_ITEMS][11];
     u8 alreadyTraded;
-    u8 language[4];
+    u8 language[NUM_TRADER_ITEMS];
 };
 
 typedef union OldMan
@@ -806,15 +808,15 @@ struct SaveTrainerHill
 {
     /*0x3D64*/ u32 timer;
     /*0x3D68*/ u32 bestTime;
-    /*0x3D6C*/ u8 field_3D6C;
+    /*0x3D6C*/ u8 unk_3D6C;
     /*0x3D6D*/ u8 unused;
-    /*0x3D6E*/ u16 field_3D6E_0a:1; // 1
-    /*0x3D6E*/ u16 field_3D6E_0b:1; // 2
-    /*0x3D6E*/ u16 field_3D6E_0c:1; // 4
-    /*0x3D6E*/ u16 hasLost:1; // 8
-    /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1; // x10
-    /*0x3D6E*/ u16 field_3D6E_0f:1; // x20
-    /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0
+    /*0x3D6E*/ u16 receivedPrize:1;
+    /*0x3D6E*/ u16 checkedFinalTime:1;
+    /*0x3D6E*/ u16 spokeToOwner:1;
+    /*0x3D6E*/ u16 hasLost:1;
+    /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1;
+    /*0x3D6E*/ u16 field_3D6E_0f:1;
+    /*0x3D6E*/ u16 tag:2;
 };
 
 struct MysteryEventStruct
@@ -949,10 +951,10 @@ struct SaveBlock1
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;
     /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;
-    /*0x2BB0*/ u16 easyChatProfile[6];
-    /*0x2BBC*/ u16 easyChatBattleStart[6];
-    /*0x2BC8*/ u16 easyChatBattleWon[6];
-    /*0x2BD4*/ u16 easyChatBattleLost[6];
+    /*0x2BB0*/ u16 easyChatProfile[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x2BBC*/ u16 easyChatBattleStart[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x2BC8*/ u16 easyChatBattleWon[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x2BD4*/ u16 easyChatBattleLost[EASY_CHAT_BATTLE_WORDS_COUNT];
     /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT];
     /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E28*/ OldMan oldMan;
diff --git a/include/graphics.h b/include/graphics.h
index 7fba3ed80..146803cfa 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3208,7 +3208,7 @@ extern const u32 gBattleTextboxTiles[];
 extern const u32 gBattleTextboxTilemap[];
 extern const u32 gBattleTextboxPalette[];
 extern const u32 gUnknown_08D778F0[];
-extern const u32 gUnknown_08D77B0C[];
+extern const u32 gVsLettersGfx[];
 extern const u32 gUnknown_08D77AE4[];
 extern const u32 gUnknown_08D779D8[];
 extern const u32 gUnknown_08D857A8[];
@@ -3916,9 +3916,9 @@ extern const u16 gIntro2FlygonPal[];
 extern const u32 gIntro2FlygonGfx[];
 
 // party menu graphics
-extern const u32 gPartyMenuMisc_Gfx[];
-extern const u32 gPartyMenuMisc_Tilemap[];
-extern const u32 gPartyMenuMisc_Pal[];
+extern const u32 gPartyMenuBg_Gfx[];
+extern const u32 gPartyMenuBg_Tilemap[];
+extern const u32 gPartyMenuBg_Pal[];
 
 // berry pics
 extern const u32 gBerryPic_Cheri[];
@@ -4122,7 +4122,7 @@ extern const u32 gUnknown_08D84970[];
 extern const u32 gUnknown_08D84F00[];
 extern const u32 gUnknown_08D85444[];
 extern const u32 gUnknown_08D85358[];
-extern const u32 gUnknown_08D85600[];
+extern const u32 gBattleWindowTextPalette[];
 extern const u32 gUnknown_08D854C8[];
 extern const u32 gUnknown_08D82F10[];
 extern const u32 gUnknown_08D834FC[];
diff --git a/include/image_processing_effects.h b/include/image_processing_effects.h
new file mode 100755
index 000000000..7f726707c
--- /dev/null
+++ b/include/image_processing_effects.h
@@ -0,0 +1,53 @@
+#ifndef GUARD_IMAGE_PROCESSING_EFFECTS_H
+#define GUARD_IMAGE_PROCESSING_EFFECTS_H
+
+enum
+{
+    IMAGE_EFFECT_POINTILLISM = 2,
+    IMAGE_EFFECT_GRAYSCALE_LIGHT = 6,
+    IMAGE_EFFECT_BLUR = 8,
+    IMAGE_EFFECT_OUTLINE_COLORED = 9,
+    IMAGE_EFFECT_INVERT_BLACK_WHITE = 10,
+    IMAGE_EFFECT_THICK_BLACK_WHITE = 11,
+    IMAGE_EFFECT_SHIMMER = 13,
+    IMAGE_EFFECT_OUTLINE = 30,
+    IMAGE_EFFECT_INVERT = 31,
+    IMAGE_EFFECT_BLUR_RIGHT = 32,
+    IMAGE_EFFECT_BLUR_DOWN = 33,
+    IMAGE_EFFECT_CHARCOAL = 36,
+};
+
+enum
+{
+    QUANTIZE_EFFECT_STANDARD,
+    QUANTIZE_EFFECT_STANDARD_LIMITED_COLORS,
+    QUANTIZE_EFFECT_PRIMARY_COLORS,
+    QUANTIZE_EFFECT_GRAYSCALE,
+    QUANTIZE_EFFECT_GRAYSCALE_SMALL,
+    QUANTIZE_EFFECT_BLACK_WHITE,
+};
+
+struct ImageProcessingContext
+{
+    u8 effect;
+    void *canvasPixels;
+    u16 *canvasPalette;
+    u8 fillerC[0x4];
+    void *dest;
+    u16 quantizeEffect;
+    u16 var_16;
+    u8 paletteStart;
+    u8 columnStart;
+    u8 rowStart;
+    u8 columnEnd;
+    u8 rowEnd;
+    u8 canvasWidth;
+    u8 canvasHeight;
+    u8 personality;
+};
+
+void ApplyImageProcessingEffects(struct ImageProcessingContext *);
+void ApplyImageProcessingQuantization(struct ImageProcessingContext *);
+void ConvertImageProcessingToGBA(struct ImageProcessingContext *);
+
+#endif
diff --git a/include/item_menu.h b/include/item_menu.h
index b1275549d..508f94815 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -71,7 +71,7 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC14(void);
 void FavorLadyOpenBagMenu(void);
 void QuizLadyOpenBagMenu(void);
-void sub_81AAC28(void);
+void ApprenticeOpenBagMenu(void);
 void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
 void bag_menu_mail_related(void);
@@ -82,7 +82,7 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
-void sub_81AABF0(void (*callback)(void));
+void ChooseBerrySetCallback(void (*callback)(void));
 void CB2_ChooseBerry(void);
 void unknown_ItemMenu_Confirm(u8 taskId);
 void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
diff --git a/include/link.h b/include/link.h
index 499405fc1..4d6771a03 100644
--- a/include/link.h
+++ b/include/link.h
@@ -87,13 +87,13 @@
 #define LINKTYPE_0x2288              0x2288  // battle?
 #define LINKTYPE_0x3311              0x3311
 #define LINKTYPE_0x3322              0x3322
-#define LINKTYPE_0x4411              0x4411
+#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
 #define LINKTYPE_BERRY_BLENDER       0x4422
 #define LINKTYPE_0x5501              0x5501  // mystery event
 #define LINKTYPE_0x5502              0x5502  // unused?
 #define LINKTYPE_0x5503              0x5503  // eReader
-#define LINKTYPE_0x6601              0x6601
-#define LINKTYPE_0x6602              0x6602
+#define LINKTYPE_CONTEST_GMODE       0x6601
+#define LINKTYPE_CONTEST_EMODE       0x6602
 
 struct LinkStatus
 {
@@ -290,7 +290,7 @@ void sub_800AF18(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 un
 void sub_800B348(void);
 void sub_800B3A4(u32 who);
 bool32 sub_800A07C(void);
-void sub_800AB98(void);
+void ResetLinkPlayerCount(void);
 void sub_800AA04(u8 a0);
 void sub_800B4C0(void);
 bool32 sub_800B504(void);
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 9d71e81aa..3845ac290 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -1,16 +1,6 @@
-
 #ifndef GUARD_MAUVILLE_OLD_MAN_H
 #define GUARD_MAUVILLE_OLD_MAN_H
 
-enum MauvilleOldManType
-{
-    MAUVILLE_MAN_BARD,
-    MAUVILLE_MAN_HIPSTER,
-    MAUVILLE_MAN_TRADER,
-    MAUVILLE_MAN_STORYTELLER,
-    MAUVILLE_MAN_GIDDY
-};
-
 extern struct BardSong gBardSong;
 
 void SetMauvilleOldMan(void);
diff --git a/include/menu.h b/include/menu.h
index 62e2558dc..c5cef202c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,4 +1,3 @@
-
 #ifndef GUARD_MENU_H
 #define GUARD_MENU_H
 
@@ -87,7 +86,7 @@ void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);
 void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing);
-void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
+void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
 void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
 void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram);
 void sub_8197AE8(bool8 copyToVram);
@@ -95,7 +94,7 @@ void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const
 s8 Menu_ProcessInputGridLayout(void);
 u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted);
 s8 Menu_ProcessInputNoWrapAround_other(void);
-void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
+void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
 u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile);
 void sub_8198314(void);
 void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 3b6c13172..442f4a063 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -4,6 +4,9 @@
 #include "task.h"
 #include "window.h"
 
+#define MENU_L_PRESSED 1
+#define MENU_R_PRESSED 2
+
 // Exported type declarations
 
 struct YesNoFuncTable
@@ -23,8 +26,8 @@ bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
 void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data);
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
-u8 GetLRKeysState(void);
-u8 sub_812210C(void);
+u8 GetLRKeysPressed(void);
+u8 GetLRKeysPressedAndHeld(void);
 bool8 sub_8122148(u16 itemId);
 bool8 itemid_80BF6D8_mail_related(u16 itemId);
 bool8 sub_81221AC(void);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 7fd1d1301..b5dae6de0 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -107,7 +107,7 @@ bool8 MetatileBehavior_IsPacifidlogLog(u8);
 bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
 bool8 MetatileBehavior_IsRegionMap(u8);
 bool8 MetatileBehavior_IsClosedSootopolisDoor(u8);
-bool8 MetatileBehavior_IsUnknownClosedDoor(u8);
+bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8);
 bool8 MetatileBehavior_IsRoulette(u8);
 bool8 MetatileBehavior_IsPokeblockFeeder(u8);
 bool8 MetatileBehavior_IsSecretBaseJumpMat(u8);
diff --git a/include/party_menu.h b/include/party_menu.h
index a26cdb4cd..126931762 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -4,93 +4,90 @@
 #include "main.h"
 #include "task.h"
 
-#include "constants/party_menu.h"
-
-struct Struct203CEC8
+// seems like the last two fields may have been left as all-purpose vars
+// and the second of the two just happens to only be used in one case
+struct PartyMenu
 {
     MainCallback exitCallback;
-    TaskFunc unk4;
-    u8 unk8_0:4;
-    u8 mode:2;
-    u8 unk8_2:2;
+    TaskFunc task;
+    u8 menuType:4;
+    u8 layout:2;
     s8 slotId;
-    s8 unkA;
-    u8 unkB;
-    u16 unkC;
-    s16 unkE;
-    s16 unk10;
+    s8 slotId2;
+    u8 action;
+    u16 bagItem;
+    s16 data1;           // used variously as a moveId, counter, moveSlotId, or cursorPos
+    s16 learnMoveState;  // data2, used only as a learn move state
 };
 
-extern struct Struct203CEC8 gUnknown_0203CEC8;
-extern u8 gUnknown_0203CEE8;
-extern u8 gUnknown_0203CEE9;
+extern struct PartyMenu gPartyMenu;
+extern bool8 gPartyMenuUseExitCallback;
+extern u8 gSelectedMonPartyId;
 extern MainCallback gPostMenuFieldCallback;
 extern u8 gSelectedOrderFromParty[4];
-extern u8 gUnknown_0203CF00[3];
+extern u8 gBattlePartyCurrentOrder[3];
 
-extern void (*gUnknown_03006328)(u8, TaskFunc);
+extern void (*gItemUseCB)(u8, TaskFunc);
 
 extern const u16 gTutorMoves[];
 
-void sub_81B0FCC(u8 slot, u8 b);
+void AnimatePartySlot(u8 slot, u8 animNum);
 bool8 IsMultiBattle(void);
 u8 GetCursorSelectionMonId(void);
-u8 sub_81B1360(void);
-void sub_81B1370(u8 taskId);
+u8 GetPartyMenuType(void);
+void Task_HandleChooseMonInput(u8 taskId);
 u8* GetMonNickname(struct Pokemon *mon, u8 *dest);
-u8 DisplayPartyMenuMessage(const u8* str, u8 b);
-bool8 sub_81B1BD4(void);
-void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
-u8 pokemon_ailments_get_primary(u32 status);
+u8 DisplayPartyMenuMessage(const u8* str, bool8 keepOpen);
+bool8 IsPartyMenuTextPrinterActive(void);
+void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 HPDifference, TaskFunc task);
+u8 GetAilmentFromStatus(u32 status);
 u8 GetMonAilment(struct Pokemon *mon);
-void DisplayPartyMenuStdMessage(u32 stringID);
-void sub_81B47E0(u8 taskId);
+void DisplayPartyMenuStdMessage(u32 stringId);
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
-void sub_81B58A8(void);
+void CB2_ReturnToPartyMenuFromFlyMap(void);
 void LoadHeldItemIcons(void);
-void DrawHeldItemIconsForTrade(u8 *a, u8 *b, u8 c);
-void sub_81B617C(void);
+void DrawHeldItemIconsForTrade(u8 *partyCounts, u8 *partySpriteIds, u8 whichParty);
+void CB2_ShowPartyMenuForItemUse(void);
 void ItemUseCB_Medicine(u8 taskId, TaskFunc task);
-void sub_81B67C8(u8 taskId, TaskFunc task);
-void dp05_ether(u8 taskId, TaskFunc task);
-void dp05_pp_up(u8 taskId, TaskFunc task);
+void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task);
+void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task);
+void ItemUseCB_PPUp(u8 taskId, TaskFunc task);
 u16 ItemIdToBattleMoveId(u16 item);
 bool8 IsMoveHm(u16 move);
 bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
-void sub_81B6DC4(u8 taskId, TaskFunc task);
-void dp05_rare_candy(u8 taskId, TaskFunc task);
-void sub_81B79E8(u8 taskId, TaskFunc task);
-void sub_81B7C74(u8 taskId, TaskFunc task);
+void ItemUseCB_TMHM(u8 taskId, TaskFunc task);
+void ItemUseCB_RareCandy(u8 taskId, TaskFunc task);
+void ItemUseCB_SacredAsh(u8 taskId, TaskFunc task);
+void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task);
 u8 GetItemEffectType(u16 item);
 void CB2_PartyMenuFromStartMenu(void);
-void sub_81B7F60(void);
-void sub_81B8448(void);
+void CB2_ChooseMonToGiveItem(void);
+void ChooseMonToGiveMailFromMailbox(void);
 void InitChooseHalfPartyForBattle(u8 unused);
-void sub_81B8558(void);
-void sub_81B8904(u8 initArg, MainCallback callback);
-void OpenPartyMenuForMoveTutor(void);
-void ChooseMonForWirelessMinigame(void);
+void ClearSelectedPartyOrder(void);
+void ChooseMonForTradingBoard(u8 menuType, MainCallback callback);
+void ChooseMonForMoveTutor(void);
 void ChooseMonForWirelessMinigame(void);
-void OpenPartyMenuInBattle(u8 arg);
-void sub_81B89F0(void);
-void sub_81B8C68(void);
-void sub_81B8D64(u8 battlerId, u8 multiplayerFlag);
-void sub_81B8E80(u8 battlerId, u8 unk, u8 arrayIndex);
-void sub_81B8FB0(u8 slot, u8 slot2);
-u8 pokemon_order_func(u8 slot);
-void sub_81B9150(void);
-void sub_81B9328(void);
-bool8 hm_add_c3_without_phase_2(void);
-void sub_81B9404(void);
-void sub_81B94B0(void);
-void sub_81B951C(void);
-void sub_81B9620(void);
-void sub_81B95E0(void);
-void sub_81B98DC(void);
-void sub_81B9918(void);
-void sub_81B9770(void);
-void sub_81B9718(void);
-void sub_81B96D0(void);
-void sub_81B968C(void);
+void OpenPartyMenuInBattle(u8 partyAction);
+void ChooseMonForInBattleItem(void);
+void BufferBattlePartyCurrentOrder(void);
+void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 flankId);
+void SwitchPartyOrderLinkMulti(u8 battlerId, u8 slot, u8 arrayIndex);
+void SwitchPartyMonSlots(u8 slot, u8 slot2);
+u8 GetPartyIdFromBattlePartyId(u8 slot);
+void ShowPartyMenuToShowcaseMultiBattleParty(void);
+void ChooseMonForDaycare(void);
+bool8 CB2_FadeFromPartyMenu(void);
+void ChooseContestMon(void);
+void ChoosePartyMon(void);
+void ChooseMonForMoveRelearner(void);
+void BattlePyramidChooseMonHeldItems(void);
+void DoBattlePyramidMonsHaveHeldItem(void);
+void IsSelectedMonEgg(void);
+void IsLastMonThatKnowsSurf(void);
+void MoveDeleterForgetMove(void);
+void BufferMoveDeleterNicknameAndMove(void);
+void GetNumMovesSelectedMonHas(void);
+void MoveDeleterChooseMoveToForget(void);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 6a34e3cda..316fbc2b3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -287,7 +287,6 @@ void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest);
 u8 GetLevelFromMonExp(struct Pokemon *mon);
 u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon);
 u16 GiveMoveToMon(struct Pokemon *mon, u16 move);
-u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
 void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot);
 void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot);
@@ -357,8 +356,8 @@ u16 SpeciesToCryId(u16 species);
 void sub_806D544(u16 species, u32 personality, u8 *dest);
 void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4);
 void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
-bool8 sub_806D7EC(void);
-bool16 GetLinkTrainerFlankId(u8 id);
+u8 GetPlayerFlankId(void);
+u16 GetLinkTrainerFlankId(u8 id);
 s32 GetBattlerMultiplayerId(u16 a1);
 u8 GetTrainerEncounterMusicId(u16 trainerOpponentId);
 u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex);
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 5018de37c..9d56aebcb 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -21,7 +21,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
 u8 UpdateMonIconFrame(struct Sprite *sprite);
 void LoadMonIconPalette(u16 species);
 void sub_80D328C(struct Sprite *sprite);
-void UpdateTradeMonIconFrame(struct Sprite *sprite);
+void SpriteCB_MonIcon(struct Sprite *sprite);
 void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum);
 u8 GetMonIconPaletteIndexFromSpecies(u16 species);
 
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 20d881702..07d541cac 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -9,10 +9,9 @@ extern const u8 *const gMoveDescriptionPointers[];
 extern const u8 *const gNatureNamePointers[];
 
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
-void sub_81C4F98(u8, void(*)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
-u8 sub_81C1B94(void);
+u8 GetMoveSlotToReplace(void);
 void SummaryScreen_SetUnknownTaskId(u8 a0);
 void SummaryScreen_DestroyUnknownTask(void);
 
diff --git a/include/region_map.h b/include/region_map.h
index 798e6f56d..0d219643d 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -102,7 +102,7 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y);
 void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
 u8 *GetMapName(u8 *, u16, u16);
 bool32 sub_8124668(u8 mapSecId);
-u8 *sub_81245DC(u8 *dest, u16 mapSecId);
+u8 *GetMapNameGeneric(u8 *dest, u16 mapSecId);
 u8 *sub_8124610(u8 *dest, u16 mapSecId);
 u16 CorrectSpecialMapSecId(u16 mapSecId);
 void sub_8122D88(struct RegionMap *regionMap);
diff --git a/include/save_location.h b/include/save_location.h
index c330124ad..6c2ae0e6b 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -6,9 +6,14 @@
 #define POKECENTER_SAVEWARP          (1 << 1)
 #define LOBBY_SAVEWARP               (1 << 2)
 #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
+//
+//
+//
+//
+#define CHAMPION_SAVEWARP            (1 << 7)
 
 void TrySetMapSaveWarpStatus(void);
 void sub_81AFDA0(void);
-void sub_81AFDD0(void);
+void SetChampionSaveWarp(void);
 
 #endif // GUARD_SAVE_LOCATION_H
diff --git a/include/script.h b/include/script.h
index cfe493479..3f92964ac 100644
--- a/include/script.h
+++ b/include/script.h
@@ -62,6 +62,6 @@ u8 *GetSavedRamScriptIfValid(void);
 void InitRamScript_NoEventObject(u8 *script, u16 scriptSize);
 
 // srccmd.h
-void sub_809BE48(u16 npcId);
+void SetMovingNpcId(u16 npcId);
 
 #endif // GUARD_SCRIPT_H
diff --git a/include/script_pokemon_81B9.h b/include/script_pokemon_81B9.h
deleted file mode 100644
index 1b8563ee6..000000000
--- a/include/script_pokemon_81B9.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE81B9_H
-#define GUARD_SCRIPTPOKE81B9_H
-
-void sub_81B9404(void);
-
-#endif
diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h
index 7d8d99628..7c246b745 100644
--- a/include/script_pokemon_util_80F87D8.h
+++ b/include/script_pokemon_util_80F87D8.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
 #define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
 
-u16 sub_80F903C(void);
+u16 GetContestRand(void);
 void ReducePlayerPartyToSelectedMons(void);
 void HealPlayerParty(void);
 u8 CountPlayerContestPaintings(void);
diff --git a/include/strings.h b/include/strings.h
index 0b678f2f5..43b87e888 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -411,7 +411,7 @@ extern const u8 gText_CantBeUsedOnPkmn[];
 extern const u8 gText_CancelParticipation[];
 extern const u8 gText_PkmnWasGivenItem[];
 extern const u8 gText_ReceivedItemFromPkmn[];
-extern const u8 gText_SwitchPkmnItem[];
+extern const u8 gText_PkmnAlreadyHoldingItemSwitch[];
 extern const u8 gText_SwitchedPkmnItem[];
 extern const u8 gText_BagFullCouldNotRemoveItem[];
 extern const u8 gText_PkmnCantParticipate[];
@@ -427,7 +427,7 @@ extern const u8 gText_NoMoreThanVar1Pkmn[];
 extern const u8 gText_PkmnCantBeTradedNow[];
 extern const u8 gText_EggCantBeTradedNow[];
 extern const u8 gText_OnlyPkmnForBattle[];
-extern const u8 gJPText_PutVar1IntoSpinner[];
+extern const u8 gJPText_AreYouSureYouWantToSpinTradeMon[];
 extern const u8 gText_PauseUntilPress[];
 extern const u8 gText_CantUseUntilNewBadge[];
 extern const u8 gText_ReturnToHealingSpot[];
@@ -583,6 +583,8 @@ extern const u8 gText_BigGirl[];
 extern const u8 gText_Son[];
 extern const u8 gText_Daughter[];
 
+// Multichoice strings
+extern const u8 gText_Exit[];
 extern const u8 gText_1F[];
 extern const u8 gText_2F[];
 extern const u8 gText_3F[];
@@ -601,8 +603,6 @@ extern const u8 gText_B4F[];
 extern const u8 gText_Rooftop[];
 extern const u8 gText_ElevatorNowOn[];
 
-extern const u8 gText_Exit[];
-
 extern const u8 gText_BlueFlute[];
 extern const u8 gText_YellowFlute[];
 extern const u8 gText_RedFlute[];
@@ -610,7 +610,6 @@ extern const u8 gText_WhiteFlute[];
 extern const u8 gText_BlackFlute[];
 extern const u8 gText_PrettyChair[];
 extern const u8 gText_PrettyDesk[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_0Pts[];
 extern const u8 gText_10Pts[];
@@ -635,14 +634,12 @@ extern const u8 gText_DittoDoll48BP[];
 extern const u8 gText_CyndaquilDoll80BP[];
 extern const u8 gText_ChikoritaDoll80BP[];
 extern const u8 gText_TotodileDoll80BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_LaprasDoll128BP[];
 extern const u8 gText_SnorlaxDoll128BP[];
 extern const u8 gText_VenusaurDoll256BP[];
 extern const u8 gText_CharizardDoll256BP[];
 extern const u8 gText_BlastoiseDoll256BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_Protein1BP[];
 extern const u8 gText_Calcium1BP[];
@@ -650,7 +647,6 @@ extern const u8 gText_Iron1BP[];
 extern const u8 gText_Zinc1BP[];
 extern const u8 gText_Carbos1BP[];
 extern const u8 gText_HpUp1BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_Leftovers48BP[];
 extern const u8 gText_WhiteHerb48BP[];
@@ -661,7 +657,6 @@ extern const u8 gText_ChoiceBand64BP[];
 extern const u8 gText_KingsRock64BP[];
 extern const u8 gText_FocusBand64BP[];
 extern const u8 gText_ScopeLens64BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_EnergyPowder50[];
 extern const u8 gText_EnergyRoot80[];
@@ -674,7 +669,6 @@ extern const u8 gText_Calcium1000[];
 extern const u8 gText_Zinc1000[];
 extern const u8 gText_HPUp1000[];
 extern const u8 gText_PPUp3000[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_BattleTower2[];
 extern const u8 gText_BattleDome[];
@@ -685,8 +679,8 @@ extern const u8 gText_BattlePike[];
 extern const u8 gText_BattlePyramid[];
 extern const u8 gText_RankingHall[];
 extern const u8 gText_ExchangeService[];
-extern const u8 gText_Exit[];
 
+// Battle Frontier Move Tutors
 extern const u8 gText_Softboiled16BP[];
 extern const u8 gText_SeismicToss24BP[];
 extern const u8 gText_DreamEater24BP[];
@@ -697,8 +691,6 @@ extern const u8 gText_RockSlide48BP[];
 extern const u8 gText_Counter48BP[];
 extern const u8 gText_ThunderWave48BP[];
 extern const u8 gText_SwordsDance48BP[];
-extern const u8 gText_Exit[];
-
 extern const u8 gText_DefenseCurl16BP[];
 extern const u8 gText_Snore24BP[];
 extern const u8 gText_MudSlap24BP[];
@@ -709,7 +701,6 @@ extern const u8 gText_PsychUp48BP[];
 extern const u8 gText_IcePunch48BP[];
 extern const u8 gText_ThunderPunch48BP[];
 extern const u8 gText_FirePunch48BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_SlateportCity[];
 extern const u8 gText_BattleFrontier[];
@@ -717,7 +708,6 @@ extern const u8 gText_SouthernIsland[];
 extern const u8 gText_NavelRock[];
 extern const u8 gText_BirthIsland[];
 extern const u8 gText_FarawayIsland[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_BattleTrainers[];
 extern const u8 gText_BattleBasics[];
@@ -725,38 +715,34 @@ extern const u8 gText_PokemonNature[];
 extern const u8 gText_PokemonMoves[];
 extern const u8 gText_Underpowered[];
 extern const u8 gText_WhenInDanger[];
-extern const u8 gText_Exit[];
 
-extern const u8 BattleFrontier_Lounge2_Text_260971[];
-extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
-extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
-extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
-extern const u8 BattleFrontier_Lounge2_Text_261A91[];
-extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
-extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
-extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
-extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
-extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
-extern const u8 BattleFrontier_Lounge2_Text_260F74[];
-extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
-extern const u8 BattleFrontier_Lounge2_Text_261591[];
-extern const u8 BattleFrontier_Lounge2_Text_26166F[];
-extern const u8 BattleFrontier_Lounge2_Text_261282[];
-extern const u8 BattleFrontier_Lounge2_Text_261329[];
-extern const u8 BattleFrontier_Lounge2_Text_261403[];
-extern const u8 BattleFrontier_Lounge2_Text_261026[];
-extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
-extern const u8 BattleFrontier_Lounge2_Text_261194[];
-extern const u8 BattleFrontier_Lounge2_Text_26174D[];
-extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
-extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
+// Battle Frontier Maniac
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice1[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice2[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice3[];
+extern const u8 BattleFrontier_Lounge2_Text_MultiBattleAdvice[];
+extern const u8 BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingGoldMons[];
 
 // Battle Frontier Nature Girl
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHardy[];
@@ -782,85 +768,83 @@ extern const u8 BattleFrontier_Lounge5_Text_NatureGirlGentle[];
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSassy[];
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCareful[];
 
-extern const u8 BattleFrontier_Lounge3_Text_262261[];
-extern const u8 BattleFrontier_Lounge3_Text_26230D[];
-extern const u8 BattleFrontier_Lounge3_Text_2623B9[];
-extern const u8 BattleFrontier_Lounge3_Text_262464[];
-extern const u8 BattleFrontier_Lounge3_Text_26250E[];
-extern const u8 BattleFrontier_Lounge3_Text_2625B8[];
-extern const u8 BattleFrontier_Lounge3_Text_26266A[];
-extern const u8 BattleFrontier_Lounge3_Text_26271C[];
-extern const u8 BattleFrontier_Lounge3_Text_2627C9[];
-extern const u8 BattleFrontier_Lounge3_Text_262876[];
-extern const u8 BattleFrontier_Lounge3_Text_26291A[];
-extern const u8 BattleFrontier_Lounge3_Text_2629BC[];
-
-extern const u8 BattleFrontier_Lounge3_Text_262C04[];
-extern const u8 BattleFrontier_Lounge3_Text_262C90[];
-extern const u8 BattleFrontier_Lounge3_Text_262D1C[];
-extern const u8 BattleFrontier_Lounge3_Text_262DA7[];
-extern const u8 BattleFrontier_Lounge3_Text_262E34[];
-extern const u8 BattleFrontier_Lounge3_Text_262EC1[];
-extern const u8 BattleFrontier_Lounge3_Text_262F56[];
-extern const u8 BattleFrontier_Lounge3_Text_262FEB[];
-extern const u8 BattleFrontier_Lounge3_Text_263078[];
-extern const u8 BattleFrontier_Lounge3_Text_263105[];
-extern const u8 BattleFrontier_Lounge3_Text_26318C[];
-extern const u8 BattleFrontier_Lounge3_Text_263211[];
+// Battle Frontier Gambler
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleArena[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePike[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePyramid[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerMulti[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleDomeSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleDomeDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleFactorySingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleArena[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePike[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePyramid[];
 
 extern const u8 gText_BP[];
 
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260201[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260287[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E[];
-
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C[];
-
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260397[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260436[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C[];
-
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260542[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260575[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2[];
-extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260613[];
-
-extern const u8 BattleFrontier_Lounge7_Text_265E30[];
-extern const u8 BattleFrontier_Lounge7_Text_265E5B[];
-extern const u8 BattleFrontier_Lounge7_Text_265E8A[];
-extern const u8 BattleFrontier_Lounge7_Text_265EC0[];
-extern const u8 BattleFrontier_Lounge7_Text_265EED[];
-extern const u8 BattleFrontier_Lounge7_Text_265F1C[];
-extern const u8 BattleFrontier_Lounge7_Text_265F47[];
-extern const u8 BattleFrontier_Lounge7_Text_265F77[];
-extern const u8 BattleFrontier_Lounge7_Text_265FAA[];
-extern const u8 BattleFrontier_Lounge7_Text_265FDD[];
-
-extern const u8 BattleFrontier_Lounge7_Text_26600A[];
-extern const u8 BattleFrontier_Lounge7_Text_26603E[];
-extern const u8 BattleFrontier_Lounge7_Text_266070[];
-extern const u8 BattleFrontier_Lounge7_Text_2660A6[];
-extern const u8 BattleFrontier_Lounge7_Text_2660D0[];
-extern const u8 BattleFrontier_Lounge7_Text_2660FF[];
-extern const u8 BattleFrontier_Lounge7_Text_26612D[];
-extern const u8 BattleFrontier_Lounge7_Text_26615F[];
-extern const u8 BattleFrontier_Lounge7_Text_266185[];
-extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
+// Battle Frontier Exchange Corner
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_IronDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ZincDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc[];
+extern const u8 BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc[];
+
+// Battle Frontier Move Tutors
+extern const u8 BattleFrontier_Lounge7_Text_SoftboiledDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SeismicTossDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_DreamEaterDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MegaPunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MegaKickDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_BodySlamDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_RockSlideDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_CounterDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_ThunderWaveDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SwordsDanceDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_DefenseCurlDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SnoreDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MudSlapDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SwiftDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_IcyWindDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_EndureDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_PsychUpDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_IcePunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_ThunderPunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_FirePunchDesc[];
 
 extern const u8 gText_YourPartnerHasRetired[];
 
@@ -1328,11 +1312,11 @@ extern const u8 gText_Are2[];
 extern const u8 gText_123Dot[][3];
 
 // Frontier util.
-extern const u8 gUnknown_085ED164[];
-extern const u8 gUnknown_085ED170[];
-extern const u8 gUnknown_085ED17C[];
-extern const u8 gUnknown_085ED188[];
-extern const u8 gUnknown_085ED190[];
+extern const u8 gText_FacilitySingle[];
+extern const u8 gText_FacilityDouble[];
+extern const u8 gText_FacilityMulti[];
+extern const u8 gText_FacilityLink[];
+extern const u8 gText_Facility[];
 
 extern const u8 gText_RecordsLv50[];
 extern const u8 gText_RecordsOpenLevel[];
@@ -2035,8 +2019,8 @@ extern const u8 gText_Confusion[];
 extern const u8 gText_Love[];
 
 // battle message
-extern const u8 gText_PkmnBoxSomeonesPCFull[];
-extern const u8 gText_PkmnBoxLanettesPCFull[];
+extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[];
+extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
 extern const u8 gText_PkmnTransferredSomeonesPC[];
 extern const u8 gText_PkmnTransferredLanettesPC[];
 
@@ -2416,6 +2400,10 @@ extern const u8 gUnknown_085EDC45[];
 extern const u8 gUnknown_085EDB00[];
 extern const u8 gUnknown_085EDC84[];
 
+// Apprentice
+extern const u8 gText_Give[];
+extern const u8 gText_NoNeed[];
+
 // Easy Chat Entry
 extern const u8 gText_StopGivingPkmnMail[];
 extern const u8 gText_LikeToQuitQuiz[];
diff --git a/include/trade.h b/include/trade.h
index 42bfc1482..72a04ed21 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -18,7 +18,7 @@ void CB2_StartCreateTradeMenu(void);
 void CB2_LinkTrade(void);
 int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8);
 int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6);
-int CanTradeSelectedPartyMenuMon(struct Pokemon*, u16);
+int CanSpinTradeMon(struct Pokemon*, u16);
 void InitTradeSequenceBgGpuRegs(void);
 void LinkTradeDrawWindow(void);
 void InitTradeBg(void);
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index a592ef580..c07aeb6d7 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -32,15 +32,15 @@ struct TrHillDisplay
 
 struct TrHillFloor
 {
-    u8 unk0;
-    u8 unk1;
+    u8 trainerNum1;
+    u8 trainerNum2;
     struct TrainerHillTrainer trainers[2];
     struct TrHillDisplay display;
 };
 
 struct TrHillTag
 {
-    u8 unkField_0;
+    u8 numTrainers;
     u8 unused1;
     u8 numFloors;
     u32 checksum;
@@ -60,22 +60,21 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId);
 bool8 InTrainerHillChallenge(void);
 void nullsub_129(void);
 void PrintOnTrainerHillRecordsWindow(void);
-void sub_81D5DF8(void);
-bool32 sub_81D5F48(void);
-void sub_81D5FB4(u16 *mapArg);
+void LoadTrainerHillEventObjectTemplates(void);
+bool32 LoadTrainerHillFloorEventObjectScripts(void);
+void GenerateTrainerHillFloorLayout(u16 *mapArg);
 bool32 InTrainerHill(void);
 u8 GetCurrentTrainerHillMapId(void);
-const struct WarpEvent* sub_81D6120(void);
-const struct WarpEvent* sub_81D6134(u8 warpEventId);
+const struct WarpEvent* SetWarpDestinationTrainerHill4F(void);
+const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId);
 u16 LocalIdToHillTrainerId(u8 localId);
 bool8 GetHillTrainerFlag(u8 eventObjectId);
 void SetHillTrainerFlag(void);
 const u8 *GetTrainerHillTrainerScript(void);
 void FillHillTrainerParty(void);
 void FillHillTrainersParties(void);
-u32 sub_81D63C4(void);
 u8 GetTrainerEncounterMusicIdInTrainerHill(u16 trainerId);
-u8 sub_81D6490(void);
+u8 GetNumFloorsInTrainerHillChallenge(void);
 void sub_81D64C0(void);
 bool32 sub_81D6534(void);
 
diff --git a/include/trainer_see.h b/include/trainer_see.h
index a9b92d71b..daf9d0298 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -9,11 +9,11 @@ struct ApproachingTrainer
     u8 taskId;
 };
 
-extern u16 gUnknown_03006080;
-extern u8 gUnknown_03006084[4];
+extern u16 gWhichTrainerToFaceAfterBattle;
+extern u8 gPostBattleMovementScript[4];
 extern struct ApproachingTrainer gApproachingTrainers[2];
 extern u8 gNoOfApproachingTrainers;
-extern u8 gUnknown_030060AC;
+extern bool8 gTrainerApproachedPlayer;
 extern u8 gApproachingTrainerId;
 
 bool8 CheckForTrainersWantingBattle(void);
@@ -25,6 +25,6 @@ u8 FldEff_QuestionMarkIcon(void);
 u8 FldEff_HeartIcon(void);
 u8 GetCurrentApproachingTrainerEventObjectId(void);
 u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId);
-void sub_80B4808(void);
+void PlayerFaceTrainerAfterBattle(void);
 
 #endif // GUARD_TRAINER_SEE_H
diff --git a/include/tv.h b/include/tv.h
index 42640fb95..4027c3c0f 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -12,15 +12,15 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1
 void sub_80EE8C8(u16 winStreak, u8 facility);
 void DoTVShow(void);
 void DoTVShowInSearchOfTrainers(void);
-void sub_80EDCE8(void);
-void sub_80EE2CC(void);
-void sub_80EE72C(void);
+void TryPutTreasureInvestigatorsOnAir(void);
+void TryPutLotteryWinnerReportOnAir(void);
+void TryPutTrainerFanClubOnAir(void);
 void IncrementDailyPlantedBerries(void);
 void IncrementDailyPickedBerries(void);
 void IncrementDailyBattlePoints(u16 delta);
 void sub_80F01B8(void);
 void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
-void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
+void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
 u32 GetPlayerIDAsU32(void);
 bool8 GetPriceReduction(u8 newsKind);
 void sub_80F14F8(TVShow *shows);
diff --git a/ld_script.txt b/ld_script.txt
index 92aafebde..2f6137773 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -204,7 +204,7 @@ SECTIONS {
         src/dewford_trend.o(.text);
         src/heal_location.o(.text);
         src/region_map.o(.text);
-        src/contest_painting_effects.o(.text);
+        src/image_processing_effects.o(.text);
         src/decoration.o(.text);
         src/slot_machine.o(.text);
         src/contest_painting.o(.text);
@@ -575,8 +575,8 @@ SECTIONS {
         src/menu_helpers.o(.rodata);
         src/heal_location.o(.rodata);
         src/region_map.o(.rodata);
-        src/contest_painting_effects.o(.rodata);
-        data/contest_painting_effects.o(.rodata);
+        src/image_processing_effects.o(.rodata);
+        data/image_processing_effects.o(.rodata);
         src/decoration.o(.rodata);
         src/slot_machine.o(.rodata);
         data/slot_machine.o(.rodata);
@@ -687,7 +687,7 @@ SECTIONS {
         data/text_input_strings.o(.rodata);
         data/fonts.o(.rodata);
         src/mystery_event_msg.o(.rodata);
-        data/mystery_event_msg.o(.rodata);
+        data/mystery_event.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
diff --git a/src/apprentice.c b/src/apprentice.c
index 189647991..2c8959024 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -22,1052 +22,117 @@
 #include "strings.h"
 #include "task.h"
 #include "text.h"
-#include "constants/apprentice.h"
+#include "constants/battle_frontier.h"
+#include "constants/easy_chat.h"
 #include "constants/items.h"
+#include "constants/pokemon.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
 #include "constants/moves.h"
 
+/* Summary of Apprentice, because (as of writing at least) its not very well documented online
+ *
+ * ## Basic info
+ * In the Battle Tower lobby there is an NPC which asks to be taught by the player
+ * They can be any 1 of 16 NPC trainers, each with their own name, class, and set of possible party species
+ * They ask the player a series of questions once per day, and eventually depart the lobby to be replaced by a new Apprentice
+ *
+ * ## Initial Questions
+ * The first question they always ask is a request to be taught, which cannot be rejected
+ * The second question (which follows immediately after) is whether they should participate in Battle Tower Lv 50 or Open Lv
+ * After these opening questions they always ask the player to choose between 2 mons, which they repeat 3 times
+ *
+ * ## Random Questions
+ * After choosing 3 mons for them, the Apprentice will randomly ask between 1 and 8 questions of 4 different types, as follows
+ * - Asking which mon to lead with, which they will only ask at most once
+ * - Asking which move a mon should use, which they will ask at most 5 times
+ * - Asking what held item to give to a mon, which they will ask at most 3 times (once for each mon)
+ * - Asking what they should say when they win a battle, which will always be their final question before departing
+ * 
+ * ## After departing
+ * After telling them what they should say when they win a battle they will leave the lobby for a final time
+ * They will then be replaced by a new random Apprentice (they can repeat)
+ * Up to 4 old Apprentices are saved and can be encountered (or partnered with) during challenges of the mode they were told to battle in
+ * They can also be record mixed to and from other Emerald games
+ * Old/record mixed Apprentices are stored in struct Apprentice apprentices of SaveBlock2
+ *   and the current Apprentice is stored in struct PlayersApprentice playerApprentice of SaveBlock2
+ */
+
 #define PLAYER_APPRENTICE gSaveBlock2Ptr->playerApprentice
+#define CURRENT_QUESTION_NUM  PLAYER_APPRENTICE.questionsAnswered - NUM_WHICH_MON_QUESTIONS
 
-struct Unk030062ECStruct
+struct ApprenticePartyMovesData
 {
-    u8 unk0;
-    u16 unk2[3][5];
-    u8 unk20[3][5];
+    u8 moveCounter;
+    u16 moves[MULTI_PARTY_SIZE][NUM_WHICH_MOVE_QUESTIONS];
+    u8 moveSlots[MULTI_PARTY_SIZE][NUM_WHICH_MOVE_QUESTIONS];
 };
 
-struct Unk030062F0Struct
+struct ApprenticeQuestionData
 {
-    u16 unk0;
-    u16 unk2;
-    u16 unk4;
-    u16 unk6;
+    u16 speciesId;
+    u16 altSpeciesId;
+    u16 moveId1;
+    u16 moveId2;
 };
 
-// data/scripts/apprentice.inc
-extern const u8 gText_082B7229[];
-extern const u8 gText_082B731C[];
-extern const u8 gText_082B735B[];
-extern const u8 gText_082B7423[];
-extern const u8 gText_082B74C1[];
-extern const u8 gText_082B756F[];
-extern const u8 gText_082B75B2[];
-extern const u8 gText_082B763F[];
-extern const u8 gText_082B76AC[];
-extern const u8 gText_082B7772[];
-extern const u8 gText_082B77CE[];
-extern const u8 gText_082B7871[];
-extern const u8 gText_082B78D4[];
-extern const u8 gText_082B7B1A[];
-extern const u8 gText_082B7C13[];
-extern const u8 gText_082B7D18[];
-extern const u8 gText_082B7DD4[];
-extern const u8 gText_082B7EE5[];
-extern const u8 gText_082B7F35[];
-extern const u8 gText_082B7FE8[];
-extern const u8 gText_082B8087[];
-extern const u8 gText_082B822B[];
-extern const u8 gText_082B8286[];
-extern const u8 gText_082B8356[];
-extern const u8 gText_082B83CE[];
-extern const u8 gText_082B84FC[];
-extern const u8 gText_082B8559[];
-extern const u8 gText_082B8656[];
-extern const u8 gText_082B86EA[];
-extern const u8 gText_082B87DA[];
-extern const u8 gText_082B887C[];
-extern const u8 gText_082B8957[];
-extern const u8 gText_082B89C6[];
-extern const u8 gText_082B8ACF[];
-extern const u8 gText_082B8B66[];
-extern const u8 gText_082B8C20[];
-extern const u8 gText_082B8CAA[];
-extern const u8 gText_082B8DD3[];
-extern const u8 gText_082B8E24[];
-extern const u8 gText_082B8ED5[];
-extern const u8 gText_082B8F45[];
-extern const u8 gText_082B905F[];
-extern const u8 gText_082B910E[];
-extern const u8 gText_082B9204[];
-extern const u8 gText_082B929C[];
-extern const u8 gText_082B9438[];
-extern const u8 gText_082B9488[];
-extern const u8 gText_082B9564[];
-extern const u8 gText_082B95D8[];
-extern const u8 gText_082B9763[];
-extern const u8 gText_082B97E5[];
-extern const u8 gText_082B989A[];
-extern const u8 gText_082B992D[];
-extern const u8 gText_082B9A84[];
-extern const u8 gText_082B9AB9[];
-extern const u8 gText_082B9B76[];
-extern const u8 gText_082B9BF2[];
-extern const u8 gText_082B9D83[];
-extern const u8 gText_082B9DF9[];
-extern const u8 gText_082B9EAA[];
-extern const u8 gText_082B9F55[];
-extern const u8 gText_082BA084[];
-extern const u8 gText_082BA11D[];
-extern const u8 gText_082BA1F3[];
-
-extern const u8 gText_082BE50D[];
-extern const u8 gText_082BE5F5[];
-extern const u8 gText_082BE679[];
-extern const u8 gText_082BE71E[];
-extern const u8 gText_082BE762[];
-extern const u8 gText_082BE7F8[];
-extern const u8 gText_082BE850[];
-extern const u8 gText_082BE99C[];
-extern const u8 gText_082BEA1B[];
-extern const u8 gText_082BEAE9[];
-extern const u8 gText_082BEB72[];
-extern const u8 gText_082BEC8E[];
-extern const u8 gText_082BED16[];
-extern const u8 gText_082BEE29[];
-extern const u8 gText_082BEEB4[];
-extern const u8 gText_082BEFE2[];
-extern const u8 gText_082BF04E[];
-extern const u8 gText_082BF11D[];
-extern const u8 gText_082BF1A8[];
-extern const u8 gText_082BF268[];
-extern const u8 gText_082BF2D1[];
-extern const u8 gText_082BF3CF[];
-extern const u8 gText_082BF46A[];
-extern const u8 gText_082BF551[];
-extern const u8 gText_082BF5C3[];
-extern const u8 gText_082BF6E5[];
-extern const u8 gText_082BF773[];
-extern const u8 gText_082BF869[];
-extern const u8 gText_082BF8DD[];
-extern const u8 gText_082BF9BA[];
-extern const u8 gText_082BFA5A[];
-extern const u8 gText_082BFB4E[];
-
-extern const u8 gText_082BA2A3[];
-extern const u8 gText_082BA34E[];
-extern const u8 gText_082BA380[];
-extern const u8 gText_082BA3D2[];
-extern const u8 gText_082BA448[];
-extern const u8 gText_082BA4D3[];
-extern const u8 gText_082BA58C[];
-extern const u8 gText_082BA5BF[];
-extern const u8 gText_082BA5F3[];
-extern const u8 gText_082BA635[];
-extern const u8 gText_082BA6E6[];
-extern const u8 gText_082BA742[];
-extern const u8 gText_082BA770[];
-extern const u8 gText_082BA78F[];
-extern const u8 gText_082BA7D8[];
-extern const u8 gText_082BA867[];
-extern const u8 gText_082BA96B[];
-extern const u8 gText_082BA9B7[];
-extern const u8 gText_082BAA1B[];
-extern const u8 gText_082BAA81[];
-extern const u8 gText_082BAB22[];
-extern const u8 gText_082BAC43[];
-extern const u8 gText_082BAC78[];
-extern const u8 gText_082BAD17[];
-extern const u8 gText_082BADB6[];
-extern const u8 gText_082BAE36[];
-extern const u8 gText_082BAF4E[];
-extern const u8 gText_082BAF8F[];
-extern const u8 gText_082BAFDB[];
-extern const u8 gText_082BB05F[];
-extern const u8 gText_082BB0D4[];
-extern const u8 gText_082BB18C[];
-extern const u8 gText_082BB1CE[];
-extern const u8 gText_082BB242[];
-extern const u8 gText_082BB2D9[];
-extern const u8 gText_082BB370[];
-extern const u8 gText_082BB4C3[];
-extern const u8 gText_082BB4FB[];
-extern const u8 gText_082BB575[];
-extern const u8 gText_082BB5E1[];
-extern const u8 gText_082BB656[];
-extern const u8 gText_082BB6E5[];
-extern const u8 gText_082BB72C[];
-extern const u8 gText_082BB7A2[];
-extern const u8 gText_082BB84A[];
-extern const u8 gText_082BB8CD[];
-extern const u8 gText_082BB970[];
-extern const u8 gText_082BB9AE[];
-extern const u8 gText_082BBA05[];
-extern const u8 gText_082BBA6C[];
-extern const u8 gText_082BBB01[];
-extern const u8 gText_082BBC1C[];
-extern const u8 gText_082BBC4B[];
-extern const u8 gText_082BBCF6[];
-extern const u8 gText_082BBD90[];
-extern const u8 gText_082BBE0B[];
-extern const u8 gText_082BBEE5[];
-extern const u8 gText_082BBF25[];
-extern const u8 gText_082BBFA4[];
-extern const u8 gText_082BC024[];
-extern const u8 gText_082BC0C8[];
-extern const u8 gText_082BC213[];
-extern const u8 gText_082BC247[];
-extern const u8 gText_082BC2DD[];
-extern const u8 gText_082BC373[];
-extern const u8 gText_082BC40E[];
-extern const u8 gText_082BC514[];
-extern const u8 gText_082BC555[];
-extern const u8 gText_082BC5CE[];
-extern const u8 gText_082BC666[];
-extern const u8 gText_082BC714[];
-extern const u8 gText_082BC808[];
-extern const u8 gText_082BC84D[];
-extern const u8 gText_082BC8EA[];
-extern const u8 gText_082BC984[];
-extern const u8 gText_082BCA4D[];
-extern const u8 gText_082BCB75[];
-extern const u8 gText_082BCBA6[];
-extern const u8 gText_082BCBFC[];
-extern const u8 gText_082BCCA4[];
-
-extern const u8 gText_082BFBF2[];
-extern const u8 gText_082BFCAE[];
-extern const u8 gText_082BFD26[];
-extern const u8 gText_082BFDB1[];
-extern const u8 gText_082BFE24[];
-extern const u8 gText_082BFEAD[];
-extern const u8 gText_082BFF0A[];
-extern const u8 gText_082C0032[];
-extern const u8 gText_082C0090[];
-extern const u8 gText_082C016E[];
-extern const u8 gText_082C01F7[];
-extern const u8 gText_082C034C[];
-extern const u8 gText_082C03CA[];
-extern const u8 gText_082C046E[];
-extern const u8 gText_082C04F9[];
-extern const u8 gText_082C0598[];
-extern const u8 gText_082C0602[];
-extern const u8 gText_082C06D8[];
-extern const u8 gText_082C074A[];
-extern const u8 gText_082C0809[];
-extern const u8 gText_082C086E[];
-extern const u8 gText_082C0982[];
-extern const u8 gText_082C0A1D[];
-extern const u8 gText_082C0AFD[];
-extern const u8 gText_082C0B6F[];
-extern const u8 gText_082C0C7D[];
-extern const u8 gText_082C0D0B[];
-extern const u8 gText_082C0DFE[];
-extern const u8 gText_082C0E71[];
-extern const u8 gText_082C0F6D[];
-extern const u8 gText_082C1003[];
-extern const u8 gText_082C1122[];
-
-extern const u8 gText_082BCD68[];
-extern const u8 gText_082BCE64[];
-extern const u8 gText_082BCEF2[];
-extern const u8 gText_082BCF61[];
-extern const u8 gText_082BCFA1[];
-extern const u8 gText_082BD03C[];
-extern const u8 gText_082BD06D[];
-extern const u8 gText_082BD18A[];
-extern const u8 gText_082BD222[];
-extern const u8 gText_082BD325[];
-extern const u8 gText_082BD3B1[];
-extern const u8 gText_082BD493[];
-extern const u8 gText_082BD51C[];
-extern const u8 gText_082BD609[];
-extern const u8 gText_082BD697[];
-extern const u8 gText_082BD797[];
-extern const u8 gText_082BD806[];
-extern const u8 gText_082BD8F5[];
-extern const u8 gText_082BD9BE[];
-extern const u8 gText_082BDAE1[];
-extern const u8 gText_082BDB4E[];
-extern const u8 gText_082BDC6B[];
-extern const u8 gText_082BDD0D[];
-extern const u8 gText_082BDDEC[];
-extern const u8 gText_082BDE68[];
-extern const u8 gText_082BDF4D[];
-extern const u8 gText_082BDFD8[];
-extern const u8 gText_082BE0FD[];
-extern const u8 gText_082BE189[];
-extern const u8 gText_082BE2A5[];
-extern const u8 gText_082BE33E[];
-extern const u8 gText_082BE46C[];
-
-extern const u8 gText_082C11D1[];
-extern const u8 gText_082C12D5[];
-extern const u8 gText_082C13AB[];
-extern const u8 gText_082C1444[];
-extern const u8 gText_082C1501[];
-extern const u8 gText_082C15B6[];
-extern const u8 gText_082C165E[];
-extern const u8 gText_082C174F[];
-extern const u8 gText_082C1862[];
-extern const u8 gText_082C19A0[];
-extern const u8 gText_082C1A76[];
-extern const u8 gText_082C1C16[];
-extern const u8 gText_082C1CF5[];
-extern const u8 gText_082C1DC1[];
-extern const u8 gText_082C1EDC[];
-extern const u8 gText_082C1FEC[];
-extern const u8 gText_082C20D1[];
-extern const u8 gText_082C21FF[];
-extern const u8 gText_082C231C[];
-extern const u8 gText_082C2407[];
-extern const u8 gText_082C24B5[];
-extern const u8 gText_082C25B1[];
-extern const u8 gText_082C2707[];
-extern const u8 gText_082C27D4[];
-extern const u8 gText_082C28D6[];
-extern const u8 gText_082C2A0B[];
-extern const u8 gText_082C2B50[];
-extern const u8 gText_082C2C77[];
-extern const u8 gText_082C2D67[];
-extern const u8 gText_082C2E41[];
-extern const u8 gText_082C2EF5[];
-extern const u8 gText_082C3023[];
-
-extern const u8 gText_082B6EA5[];
-extern const u8 gText_082B6EEC[];
-extern const u8 gText_082B6F16[];
-extern const u8 gText_082B6F4C[];
-extern const u8 gText_082B6F92[];
-extern const u8 gText_082B6FC9[];
-extern const u8 gText_082B700C[];
-extern const u8 gText_082B703A[];
-extern const u8 gText_082B706A[];
-extern const u8 gText_082B709C[];
-extern const u8 gText_082B70CC[];
-extern const u8 gText_082B710A[];
-extern const u8 gText_082B714D[];
-extern const u8 gText_082B7185[];
-extern const u8 gText_082B71C1[];
-extern const u8 gText_082B71F9[];
-
 // IWRAM common
-struct Unk030062ECStruct *gUnknown_030062EC;
-struct Unk030062F0Struct *gUnknown_030062F0;
-void (*gUnknown_030062F4)(void);
+struct ApprenticePartyMovesData *gApprenticePartyMovesData;
+struct ApprenticeQuestionData *gApprenticeQuestionData;
+void (*gApprenticeFunc)(void);
 
 // This file's functions.
-static u16 sub_819FF98(u8 arg0);
-static bool8 sub_81A0194(u8 arg0, u16 moveId);
+static u16 GetRandomAlternateMove(u8 monId);
+static bool8 TrySetMove(u8 monId, u16 moveId);
 static void CreateChooseAnswerTask(bool8 noBButton, u8 itemsCount, u8 windowId);
 static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height);
 static void RemoveAndHideWindow(u8 windowId);
 static void ExecuteFuncAfterButtonPress(void (*func)(void));
 
-static void Script_IsPlayersApprenticeActive(void);
-static void Script_SetPlayersApprenticeLvlMode(void);
-static void sub_81A0978(void);
-static void sub_819FC60(void);
-static void sub_81A0984(void);
-static void sub_81A0990(void);
-static void sub_81A09D0(void);
+static void Script_GivenApprenticeLvlMode(void);
+static void Script_SetApprenticeLvlMode(void);
+static void Script_SetApprenticeId(void);
+static void ShuffleApprenticeSpecies(void);
+static void Script_SetRandomQuestionData(void);
+static void IncrementQuestionsAnswered(void);
+static void IsFinalQuestion(void);
 static void Script_CreateApprenticeMenu(void);
-static void Script_PrintMessage(void);
+static void Script_PrintApprenticeMessage(void);
 static void Script_ResetPlayerApprentice(void);
-static void sub_81A1638(void);
-static void sub_81A0CC0(void);
-static void sub_81A09B4(void);
-static void sub_81A0D40(void);
-static void sub_81A0DD4(void);
-static void sub_81A0FE4(void);
-static void sub_81A0FFC(void);
-static void sub_81A0D80(void);
-static void sub_81A11F8(void);
-static void sub_81A1218(void);
-static void sub_81A1224(void);
-static void sub_81A1438(void);
-static void sub_81A150C(void);
-static void Script_SetPlayerApprenticeTrainerGfxId(void);
-static void sub_81A1644(void);
-static void sub_81A1370(void);
-
-// rodata
-
-const struct ApprenticeTrainer gApprentices[] =
-{
-    {
-        .name = {_("サダヒロ"), _("ALANN"), _("ALAIN"), _("ADELFO"), _("CLAUS"), _("TEO")},
-        .otId = 0xBDC9,
-        .facilityClass = 0x43,
-        .species = {SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT},
-        .id = 0,
-        .easyChatWords = {0x81D, 0x143E, 0xC00, 0xA01, 0x630, 0x1444},
-    },
-    {
-        .name = {_("ヒロオ"), _("LIONEL"), _("LIONEL"), _("CAIO"), _("LUDWIG"), _("LEO")},
-        .otId = 0xCF09,
-        .facilityClass = 0x2B,
-        .species = {SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH},
-        .id = 1,
-        .easyChatWords = {0xC38, 0xA01, 0x630, 0xA06, 0x1020, 0x2213},
-    },
-    {
-        .name = {_("ケイジ"), _("SONNY"), _("HERVE"), _("FEDRO"), _("WENZEL"), _("SANTI")},
-        .otId = 0x2E34,
-        .facilityClass = 0x26,
-        .species = {SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP},
-        .id = 2,
-        .easyChatWords = {0xA01, 0x160A, 0xE15, 0x630, 0xC3B, 0xC04},
-    },
-    {
-        .name = {_("ユラ"), _("LAYLA"), _("LAYLA"), _("ASTRID"), _("SONJA"), _("LOLA")},
-        .otId = 0x84EF,
-        .facilityClass = 0x47,
-        .species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA},
-        .id = 3,
-        .easyChatWords = {0x100B, 0x1E0F, 0x1039, 0x1421, 0xC03, 0xFFFF},
-    },
-    {
-        .name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")},
-        .otId = 0x1E43,
-        .facilityClass = 0x27,
-        .species = {SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY},
-        .id = 4,
-        .easyChatWords = {0x1E0F, 0x1014, 0x1006, 0x280F, 0x1C1C, 0x1C13},
-    },
-    {
-        .name = {_("ヤスシ"), _("DONTE"), _("BRAHIM"), _("GLAUCO"), _("JOSEF"), _("ROQUE")},
-        .otId = 0x379F,
-        .facilityClass = 0x30,
-        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA},
-        .id = 5,
-        .easyChatWords = {0xA29, 0x1408, 0x102F, 0x1638, 0x820, 0xC00},
-    },
-    {
-        .name = {_("ミサオ"), _("AMIRA"), _("LAURE"), _("DAFNE"), _("AMELIE"), _("LARA")},
-        .otId = 0xF555,
-        .facilityClass = 0x31,
-        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO},
-        .id = 6,
-        .easyChatWords = {0xC0B, 0x123E, 0xC00, 0xA31, 0x1430, 0xC00},
-    },
-    {
-        .name = {_("カズサ"), _("KALI"), _("JODIE"), _("ILENIA"), _("KARO"), _("ELSA")},
-        .otId = 0x8D26,
-        .facilityClass = 0x14,
-        .species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC},
-        .id = 7,
-        .easyChatWords = {0xA06, 0x620, 0xA1F, 0xA02, 0xC03, 0xFFFF},
-    },
-    {
-        .name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")},
-        .otId = 0x800C,
-        .facilityClass = 0xD,
-        .species = {SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY},
-        .id = 8,
-        .easyChatWords = {0x1E22, 0x433, 0x20E, 0xA02, 0x101E, 0xC00},
-    },
-    {
-        .name = {_("アキノリ"), _("DILLEN"), _("RENE"), _("INDRO"), _("DETLEF"), _("PEDRO")},
-        .otId = 0x469f,
-        .facilityClass = 0,
-        .species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON},
-        .id = 9,
-        .easyChatWords = {0xA3D, 0x1011, 0xE1E, 0x201C, 0xC04, 0xFFFF},
-    },
-    {
-        .name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")},
-        .otId = 0x71FC,
-        .facilityClass = 0x2D,
-        .species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA},
-        .id = 10,
-        .easyChatWords = {0xA05, 0x606, 0x160E, 0xA14, 0xC00, 0xFFFF},
-    },
-    {
-        .name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")},
-        .otId = 0xA39E,
-        .facilityClass = 0x3A,
-        .species = {SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE},
-        .id = 11,
-        .easyChatWords = {0x280E, 0x103D, 0x240F, 0xA14, 0x1E23, 0x1024},
-    },
-    {
-        .name = {_("リュウジ"), _("LAMONT"), _("XAV"), _("ORFEO"), _("JÜRGEN"), _("JORGE")},
-        .otId = 0xE590,
-        .facilityClass = 0x19,
-        .species = {SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING},
-        .id = 12,
-        .easyChatWords = {0x1020, 0x62E, 0x100B, 0x1E22, 0x1E0F, 0x100B},
-    },
-    {
-        .name = {_("カツアキ"), _("TYRESE"), _("ANDY"), _("PARIDE"), _("DAVID"), _("CHICHO")},
-        .otId = 0xD018,
-        .facilityClass = 10,
-        .species = {SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING},
-        .id = 13,
-        .easyChatWords = {0xA29, 0x63A, 0xE15, 0x1435, 0x1034, 0x61E},
-    },
-    {
-        .name = {_("トシミツ"), _("DANTE"), _("DANTE"), _("RAOUL"), _("LOTHAR"), _("PABLO")},
-        .otId = 0xBC75,
-        .facilityClass = 14,
-        .species = {SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM},
-        .id = 14,
-        .easyChatWords = {0xA01, 0x1017, 0x1243, 0x1E22, 0x100B, 0x280F},
-    },
-    {
-        .name = {_("ローウェン"), _("ARTURO"), _("ARTURO"), _("ROMOLO"), _("BRIAN"), _("ARTURO")},
-        .otId = 0xFA02,
-        .facilityClass = 0x20,
-        .species = {SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS},
-        .id = 15,
-        .easyChatWords = {0x1E0F, 0x1404, 0x102F, 0x1006, 0x1020, 0xE03},
-    },
-};
-
-static const u8 *const gUnknown_08610EF0[][4] =
-{
-    {gText_082B7229, gText_082B731C, gText_082B735B, gText_082B7423},
-    {gText_082B74C1, gText_082B756F, gText_082B75B2, gText_082B763F},
-    {gText_082B76AC, gText_082B7772, gText_082B77CE, gText_082B7871},
-    {gText_082B78D4, gText_082B7B1A, gText_082B7C13, gText_082B7D18},
-    {gText_082B7DD4, gText_082B7EE5, gText_082B7F35, gText_082B7FE8},
-    {gText_082B8087, gText_082B822B, gText_082B8286, gText_082B8356},
-    {gText_082B83CE, gText_082B84FC, gText_082B8559, gText_082B8656},
-    {gText_082B86EA, gText_082B87DA, gText_082B887C, gText_082B8957},
-    {gText_082B89C6, gText_082B8ACF, gText_082B8B66, gText_082B8C20},
-    {gText_082B8CAA, gText_082B8DD3, gText_082B8E24, gText_082B8ED5},
-    {gText_082B8F45, gText_082B905F, gText_082B910E, gText_082B9204},
-    {gText_082B929C, gText_082B9438, gText_082B9488, gText_082B9564},
-    {gText_082B95D8, gText_082B9763, gText_082B97E5, gText_082B989A},
-    {gText_082B992D, gText_082B9A84, gText_082B9AB9, gText_082B9B76},
-    {gText_082B9BF2, gText_082B9D83, gText_082B9DF9, gText_082B9EAA},
-    {gText_082B9F55, gText_082BA084, gText_082BA11D, gText_082BA1F3},
-};
-
-static const u8 *const gUnknown_08610FF0[][2] =
-{
-    {gText_082BE50D, gText_082BE5F5},
-    {gText_082BE679, gText_082BE71E},
-    {gText_082BE762, gText_082BE7F8},
-    {gText_082BE850, gText_082BE99C},
-    {gText_082BEA1B, gText_082BEAE9},
-    {gText_082BEB72, gText_082BEC8E},
-    {gText_082BED16, gText_082BEE29},
-    {gText_082BEEB4, gText_082BEFE2},
-    {gText_082BF04E, gText_082BF11D},
-    {gText_082BF1A8, gText_082BF268},
-    {gText_082BF2D1, gText_082BF3CF},
-    {gText_082BF46A, gText_082BF551},
-    {gText_082BF5C3, gText_082BF6E5},
-    {gText_082BF773, gText_082BF869},
-    {gText_082BF8DD, gText_082BF9BA},
-    {gText_082BFA5A, gText_082BFB4E},
-};
-
-static const u8 *const gUnknown_08611070[][5] =
-{
-    {gText_082BA2A3, gText_082BA34E, gText_082BA380, gText_082BA3D2, gText_082BA448},
-    {gText_082BA4D3, gText_082BA58C, gText_082BA5BF, gText_082BA5F3, gText_082BA635},
-    {gText_082BA6E6, gText_082BA742, gText_082BA770, gText_082BA78F, gText_082BA7D8},
-    {gText_082BA867, gText_082BA96B, gText_082BA9B7, gText_082BAA1B, gText_082BAA81},
-    {gText_082BAB22, gText_082BAC43, gText_082BAC78, gText_082BAD17, gText_082BADB6},
-    {gText_082BAE36, gText_082BAF4E, gText_082BAF8F, gText_082BAFDB, gText_082BB05F},
-    {gText_082BB0D4, gText_082BB18C, gText_082BB1CE, gText_082BB242, gText_082BB2D9},
-    {gText_082BB370, gText_082BB4C3, gText_082BB4FB, gText_082BB575, gText_082BB5E1},
-    {gText_082BB656, gText_082BB6E5, gText_082BB72C, gText_082BB7A2, gText_082BB84A},
-    {gText_082BB8CD, gText_082BB970, gText_082BB9AE, gText_082BBA05, gText_082BBA6C},
-    {gText_082BBB01, gText_082BBC1C, gText_082BBC4B, gText_082BBCF6, gText_082BBD90},
-    {gText_082BBE0B, gText_082BBEE5, gText_082BBF25, gText_082BBFA4, gText_082BC024},
-    {gText_082BC0C8, gText_082BC213, gText_082BC247, gText_082BC2DD, gText_082BC373},
-    {gText_082BC40E, gText_082BC514, gText_082BC555, gText_082BC5CE, gText_082BC666},
-    {gText_082BC714, gText_082BC808, gText_082BC84D, gText_082BC8EA, gText_082BC984},
-    {gText_082BCA4D, gText_082BCB75, gText_082BCBA6, gText_082BCBFC, gText_082BCCA4},
-};
-
-static const u8 *const gUnknown_086111B0[][2] =
-{
-    {gText_082BFBF2, gText_082BFCAE},
-    {gText_082BFD26, gText_082BFDB1},
-    {gText_082BFE24, gText_082BFEAD},
-    {gText_082BFF0A, gText_082C0032},
-    {gText_082C0090, gText_082C016E},
-    {gText_082C01F7, gText_082C034C},
-    {gText_082C03CA, gText_082C046E},
-    {gText_082C04F9, gText_082C0598},
-    {gText_082C0602, gText_082C06D8},
-    {gText_082C074A, gText_082C0809},
-    {gText_082C086E, gText_082C0982},
-    {gText_082C0A1D, gText_082C0AFD},
-    {gText_082C0B6F, gText_082C0C7D},
-    {gText_082C0D0B, gText_082C0DFE},
-    {gText_082C0E71, gText_082C0F6D},
-    {gText_082C1003, gText_082C1122},
-};
-
-static const u8 *const gUnknown_08611230[][2] =
-{
-    {gText_082BCD68, gText_082BCE64},
-    {gText_082BCEF2, gText_082BCF61},
-    {gText_082BCFA1, gText_082BD03C},
-    {gText_082BD06D, gText_082BD18A},
-    {gText_082BD222, gText_082BD325},
-    {gText_082BD3B1, gText_082BD493},
-    {gText_082BD51C, gText_082BD609},
-    {gText_082BD697, gText_082BD797},
-    {gText_082BD806, gText_082BD8F5},
-    {gText_082BD9BE, gText_082BDAE1},
-    {gText_082BDB4E, gText_082BDC6B},
-    {gText_082BDD0D, gText_082BDDEC},
-    {gText_082BDE68, gText_082BDF4D},
-    {gText_082BDFD8, gText_082BE0FD},
-    {gText_082BE189, gText_082BE2A5},
-    {gText_082BE33E, gText_082BE46C},
-};
-
-static const u8 *const gUnknown_086112B0[][2] =
-{
-    {gText_082C11D1, gText_082C12D5},
-    {gText_082C13AB, gText_082C1444},
-    {gText_082C1501, gText_082C15B6},
-    {gText_082C165E, gText_082C174F},
-    {gText_082C1862, gText_082C19A0},
-    {gText_082C1A76, gText_082C1C16},
-    {gText_082C1CF5, gText_082C1DC1},
-    {gText_082C1EDC, gText_082C1FEC},
-    {gText_082C20D1, gText_082C21FF},
-    {gText_082C231C, gText_082C2407},
-    {gText_082C24B5, gText_082C25B1},
-    {gText_082C2707, gText_082C27D4},
-    {gText_082C28D6, gText_082C2A0B},
-    {gText_082C2B50, gText_082C2C77},
-    {gText_082C2D67, gText_082C2E41},
-    {gText_082C2EF5, gText_082C3023},
-};
-
-static const u8 *const gUnknown_08611330[] =
-{
-    gText_082B6EA5,
-    gText_082B6EEC,
-    gText_082B6F16,
-    gText_082B6F4C,
-    gText_082B6F92,
-    gText_082B6FC9,
-    gText_082B700C,
-    gText_082B703A,
-    gText_082B706A,
-    gText_082B709C,
-    gText_082B70CC,
-    gText_082B710A,
-    gText_082B714D,
-    gText_082B7185,
-    gText_082B71C1,
-    gText_082B71F9,
-};
-
-static const bool8 gUnknown_08611370[MOVES_COUNT] =
-{
-    [MOVE_NONE] = FALSE,
-    [MOVE_POUND] = FALSE,
-    [MOVE_KARATE_CHOP] = TRUE,
-    [MOVE_DOUBLE_SLAP] = TRUE,
-    [MOVE_COMET_PUNCH] = FALSE,
-    [MOVE_MEGA_PUNCH] = TRUE,
-    [MOVE_PAY_DAY] = FALSE,
-    [MOVE_FIRE_PUNCH] = TRUE,
-    [MOVE_ICE_PUNCH] = TRUE,
-    [MOVE_THUNDER_PUNCH] = TRUE,
-    [MOVE_SCRATCH] = FALSE,
-    [MOVE_VICE_GRIP] = FALSE,
-    [MOVE_GUILLOTINE] = TRUE,
-    [MOVE_RAZOR_WIND] = FALSE,
-    [MOVE_SWORDS_DANCE] = TRUE,
-    [MOVE_CUT] = FALSE,
-    [MOVE_GUST] = FALSE,
-    [MOVE_WING_ATTACK] = FALSE,
-    [MOVE_WHIRLWIND] = TRUE,
-    [MOVE_FLY] = TRUE,
-    [MOVE_BIND] = TRUE,
-    [MOVE_SLAM] = TRUE,
-    [MOVE_VINE_WHIP] = FALSE,
-    [MOVE_STOMP] = TRUE,
-    [MOVE_DOUBLE_KICK] = TRUE,
-    [MOVE_MEGA_KICK] = TRUE,
-    [MOVE_JUMP_KICK] = TRUE,
-    [MOVE_ROLLING_KICK] = TRUE,
-    [MOVE_SAND_ATTACK] = TRUE,
-    [MOVE_HEADBUTT] = TRUE,
-    [MOVE_HORN_ATTACK] = FALSE,
-    [MOVE_FURY_ATTACK] = FALSE,
-    [MOVE_HORN_DRILL] = TRUE,
-    [MOVE_TACKLE] = FALSE,
-    [MOVE_BODY_SLAM] = TRUE,
-    [MOVE_WRAP] = TRUE,
-    [MOVE_TAKE_DOWN] = TRUE,
-    [MOVE_THRASH] = TRUE,
-    [MOVE_DOUBLE_EDGE] = TRUE,
-    [MOVE_TAIL_WHIP] = FALSE,
-    [MOVE_POISON_STING] = FALSE,
-    [MOVE_TWINEEDLE] = TRUE,
-    [MOVE_PIN_MISSILE] = FALSE,
-    [MOVE_LEER] = FALSE,
-    [MOVE_BITE] = TRUE,
-    [MOVE_GROWL] = FALSE,
-    [MOVE_ROAR] = TRUE,
-    [MOVE_SING] = TRUE,
-    [MOVE_SUPERSONIC] = TRUE,
-    [MOVE_SONIC_BOOM] = TRUE,
-    [MOVE_DISABLE] = TRUE,
-    [MOVE_ACID] = FALSE,
-    [MOVE_EMBER] = FALSE,
-    [MOVE_FLAMETHROWER] = TRUE,
-    [MOVE_MIST] = TRUE,
-    [MOVE_WATER_GUN] = FALSE,
-    [MOVE_HYDRO_PUMP] = TRUE,
-    [MOVE_SURF] = TRUE,
-    [MOVE_ICE_BEAM] = TRUE,
-    [MOVE_BLIZZARD] = TRUE,
-    [MOVE_PSYBEAM] = TRUE,
-    [MOVE_BUBBLE_BEAM] = FALSE,
-    [MOVE_AURORA_BEAM] = FALSE,
-    [MOVE_HYPER_BEAM] = TRUE,
-    [MOVE_PECK] = FALSE,
-    [MOVE_DRILL_PECK] = TRUE,
-    [MOVE_SUBMISSION] = TRUE,
-    [MOVE_LOW_KICK] = TRUE,
-    [MOVE_COUNTER] = TRUE,
-    [MOVE_SEISMIC_TOSS] = TRUE,
-    [MOVE_STRENGTH] = TRUE,
-    [MOVE_ABSORB] = FALSE,
-    [MOVE_MEGA_DRAIN] = FALSE,
-    [MOVE_LEECH_SEED] = TRUE,
-    [MOVE_GROWTH] = TRUE,
-    [MOVE_RAZOR_LEAF] = TRUE,
-    [MOVE_SOLAR_BEAM] = TRUE,
-    [MOVE_POISON_POWDER] = TRUE,
-    [MOVE_STUN_SPORE] = TRUE,
-    [MOVE_SLEEP_POWDER] = TRUE,
-    [MOVE_PETAL_DANCE] = TRUE,
-    [MOVE_STRING_SHOT] = FALSE,
-    [MOVE_DRAGON_RAGE] = TRUE,
-    [MOVE_FIRE_SPIN] = TRUE,
-    [MOVE_THUNDER_SHOCK] = FALSE,
-    [MOVE_THUNDERBOLT] = TRUE,
-    [MOVE_THUNDER_WAVE] = TRUE,
-    [MOVE_THUNDER] = TRUE,
-    [MOVE_ROCK_THROW] = FALSE,
-    [MOVE_EARTHQUAKE] = TRUE,
-    [MOVE_FISSURE] = TRUE,
-    [MOVE_DIG] = TRUE,
-    [MOVE_TOXIC] = TRUE,
-    [MOVE_CONFUSION] = FALSE,
-    [MOVE_PSYCHIC] = TRUE,
-    [MOVE_HYPNOSIS] = TRUE,
-    [MOVE_MEDITATE] = TRUE,
-    [MOVE_AGILITY] = TRUE,
-    [MOVE_QUICK_ATTACK] = TRUE,
-    [MOVE_RAGE] = FALSE,
-    [MOVE_TELEPORT] = FALSE,
-    [MOVE_NIGHT_SHADE] = TRUE,
-    [MOVE_MIMIC] = TRUE,
-    [MOVE_SCREECH] = TRUE,
-    [MOVE_DOUBLE_TEAM] = TRUE,
-    [MOVE_RECOVER] = TRUE,
-    [MOVE_HARDEN] = TRUE,
-    [MOVE_MINIMIZE] = TRUE,
-    [MOVE_SMOKESCREEN] = TRUE,
-    [MOVE_CONFUSE_RAY] = TRUE,
-    [MOVE_WITHDRAW] = TRUE,
-    [MOVE_DEFENSE_CURL] = TRUE,
-    [MOVE_BARRIER] = TRUE,
-    [MOVE_LIGHT_SCREEN] = TRUE,
-    [MOVE_HAZE] = TRUE,
-    [MOVE_REFLECT] = TRUE,
-    [MOVE_FOCUS_ENERGY] = TRUE,
-    [MOVE_BIDE] = FALSE,
-    [MOVE_METRONOME] = TRUE,
-    [MOVE_MIRROR_MOVE] = TRUE,
-    [MOVE_SELF_DESTRUCT] = TRUE,
-    [MOVE_EGG_BOMB] = TRUE,
-    [MOVE_LICK] = TRUE,
-    [MOVE_SMOG] = FALSE,
-    [MOVE_SLUDGE] = FALSE,
-    [MOVE_BONE_CLUB] = FALSE,
-    [MOVE_FIRE_BLAST] = TRUE,
-    [MOVE_WATERFALL] = TRUE,
-    [MOVE_CLAMP] = TRUE,
-    [MOVE_SWIFT] = TRUE,
-    [MOVE_SKULL_BASH] = TRUE,
-    [MOVE_SPIKE_CANNON] = FALSE,
-    [MOVE_CONSTRICT] = FALSE,
-    [MOVE_AMNESIA] = TRUE,
-    [MOVE_KINESIS] = TRUE,
-    [MOVE_SOFT_BOILED] = TRUE,
-    [MOVE_HI_JUMP_KICK] = TRUE,
-    [MOVE_GLARE] = TRUE,
-    [MOVE_DREAM_EATER] = TRUE,
-    [MOVE_POISON_GAS] = FALSE,
-    [MOVE_BARRAGE] = FALSE,
-    [MOVE_LEECH_LIFE] = FALSE,
-    [MOVE_LOVELY_KISS] = TRUE,
-    [MOVE_SKY_ATTACK] = TRUE,
-    [MOVE_TRANSFORM] = TRUE,
-    [MOVE_BUBBLE] = FALSE,
-    [MOVE_DIZZY_PUNCH] = TRUE,
-    [MOVE_SPORE] = TRUE,
-    [MOVE_FLASH] = TRUE,
-    [MOVE_PSYWAVE] = TRUE,
-    [MOVE_SPLASH] = FALSE,
-    [MOVE_ACID_ARMOR] = TRUE,
-    [MOVE_CRABHAMMER] = TRUE,
-    [MOVE_EXPLOSION] = TRUE,
-    [MOVE_FURY_SWIPES] = FALSE,
-    [MOVE_BONEMERANG] = TRUE,
-    [MOVE_REST] = TRUE,
-    [MOVE_ROCK_SLIDE] = TRUE,
-    [MOVE_HYPER_FANG] = TRUE,
-    [MOVE_SHARPEN] = TRUE,
-    [MOVE_CONVERSION] = TRUE,
-    [MOVE_TRI_ATTACK] = TRUE,
-    [MOVE_SUPER_FANG] = TRUE,
-    [MOVE_SLASH] = TRUE,
-    [MOVE_SUBSTITUTE] = TRUE,
-    [MOVE_STRUGGLE] = TRUE,
-    [MOVE_SKETCH] = TRUE,
-    [MOVE_TRIPLE_KICK] = TRUE,
-    [MOVE_THIEF] = TRUE,
-    [MOVE_SPIDER_WEB] = TRUE,
-    [MOVE_MIND_READER] = TRUE,
-    [MOVE_NIGHTMARE] = TRUE,
-    [MOVE_FLAME_WHEEL] = FALSE,
-    [MOVE_SNORE] = TRUE,
-    [MOVE_CURSE] = TRUE,
-    [MOVE_FLAIL] = TRUE,
-    [MOVE_CONVERSION_2] = TRUE,
-    [MOVE_AEROBLAST] = TRUE,
-    [MOVE_COTTON_SPORE] = TRUE,
-    [MOVE_REVERSAL] = TRUE,
-    [MOVE_SPITE] = TRUE,
-    [MOVE_POWDER_SNOW] = FALSE,
-    [MOVE_PROTECT] = TRUE,
-    [MOVE_MACH_PUNCH] = TRUE,
-    [MOVE_SCARY_FACE] = TRUE,
-    [MOVE_FAINT_ATTACK] = TRUE,
-    [MOVE_SWEET_KISS] = TRUE,
-    [MOVE_BELLY_DRUM] = TRUE,
-    [MOVE_SLUDGE_BOMB] = TRUE,
-    [MOVE_MUD_SLAP] = TRUE,
-    [MOVE_OCTAZOOKA] = TRUE,
-    [MOVE_SPIKES] = TRUE,
-    [MOVE_ZAP_CANNON] = TRUE,
-    [MOVE_FORESIGHT] = TRUE,
-    [MOVE_DESTINY_BOND] = TRUE,
-    [MOVE_PERISH_SONG] = TRUE,
-    [MOVE_ICY_WIND] = TRUE,
-    [MOVE_DETECT] = TRUE,
-    [MOVE_BONE_RUSH] = FALSE,
-    [MOVE_LOCK_ON] = TRUE,
-    [MOVE_OUTRAGE] = TRUE,
-    [MOVE_SANDSTORM] = TRUE,
-    [MOVE_GIGA_DRAIN] = TRUE,
-    [MOVE_ENDURE] = TRUE,
-    [MOVE_CHARM] = TRUE,
-    [MOVE_ROLLOUT] = TRUE,
-    [MOVE_FALSE_SWIPE] = TRUE,
-    [MOVE_SWAGGER] = TRUE,
-    [MOVE_MILK_DRINK] = TRUE,
-    [MOVE_SPARK] = FALSE,
-    [MOVE_FURY_CUTTER] = TRUE,
-    [MOVE_STEEL_WING] = TRUE,
-    [MOVE_MEAN_LOOK] = TRUE,
-    [MOVE_ATTRACT] = TRUE,
-    [MOVE_SLEEP_TALK] = TRUE,
-    [MOVE_HEAL_BELL] = TRUE,
-    [MOVE_RETURN] = TRUE,
-    [MOVE_PRESENT] = TRUE,
-    [MOVE_FRUSTRATION] = TRUE,
-    [MOVE_SAFEGUARD] = TRUE,
-    [MOVE_PAIN_SPLIT] = TRUE,
-    [MOVE_SACRED_FIRE] = TRUE,
-    [MOVE_MAGNITUDE] = FALSE,
-    [MOVE_DYNAMIC_PUNCH] = TRUE,
-    [MOVE_MEGAHORN] = TRUE,
-    [MOVE_DRAGON_BREATH] = TRUE,
-    [MOVE_BATON_PASS] = TRUE,
-    [MOVE_ENCORE] = TRUE,
-    [MOVE_PURSUIT] = TRUE,
-    [MOVE_RAPID_SPIN] = TRUE,
-    [MOVE_SWEET_SCENT] = TRUE,
-    [MOVE_IRON_TAIL] = TRUE,
-    [MOVE_METAL_CLAW] = TRUE,
-    [MOVE_VITAL_THROW] = TRUE,
-    [MOVE_MORNING_SUN] = TRUE,
-    [MOVE_SYNTHESIS] = TRUE,
-    [MOVE_MOONLIGHT] = TRUE,
-    [MOVE_HIDDEN_POWER] = TRUE,
-    [MOVE_CROSS_CHOP] = TRUE,
-    [MOVE_TWISTER] = FALSE,
-    [MOVE_RAIN_DANCE] = TRUE,
-    [MOVE_SUNNY_DAY] = TRUE,
-    [MOVE_CRUNCH] = TRUE,
-    [MOVE_MIRROR_COAT] = TRUE,
-    [MOVE_PSYCH_UP] = TRUE,
-    [MOVE_EXTREME_SPEED] = TRUE,
-    [MOVE_ANCIENT_POWER] = TRUE,
-    [MOVE_SHADOW_BALL] = TRUE,
-    [MOVE_FUTURE_SIGHT] = TRUE,
-    [MOVE_ROCK_SMASH] = TRUE,
-    [MOVE_WHIRLPOOL] = TRUE,
-    [MOVE_BEAT_UP] = TRUE,
-    [MOVE_FAKE_OUT] = TRUE,
-    [MOVE_UPROAR] = TRUE,
-    [MOVE_STOCKPILE] = TRUE,
-    [MOVE_SPIT_UP] = TRUE,
-    [MOVE_SWALLOW] = TRUE,
-    [MOVE_HEAT_WAVE] = TRUE,
-    [MOVE_HAIL] = TRUE,
-    [MOVE_TORMENT] = TRUE,
-    [MOVE_FLATTER] = TRUE,
-    [MOVE_WILL_O_WISP] = TRUE,
-    [MOVE_MEMENTO] = TRUE,
-    [MOVE_FACADE] = TRUE,
-    [MOVE_FOCUS_PUNCH] = TRUE,
-    [MOVE_SMELLING_SALT] = TRUE,
-    [MOVE_FOLLOW_ME] = TRUE,
-    [MOVE_NATURE_POWER] = TRUE,
-    [MOVE_CHARGE] = TRUE,
-    [MOVE_TAUNT] = TRUE,
-    [MOVE_HELPING_HAND] = TRUE,
-    [MOVE_TRICK] = TRUE,
-    [MOVE_ROLE_PLAY] = TRUE,
-    [MOVE_WISH] = TRUE,
-    [MOVE_ASSIST] = TRUE,
-    [MOVE_INGRAIN] = TRUE,
-    [MOVE_SUPERPOWER] = TRUE,
-    [MOVE_MAGIC_COAT] = TRUE,
-    [MOVE_RECYCLE] = TRUE,
-    [MOVE_REVENGE] = TRUE,
-    [MOVE_BRICK_BREAK] = TRUE,
-    [MOVE_YAWN] = TRUE,
-    [MOVE_KNOCK_OFF] = TRUE,
-    [MOVE_ENDEAVOR] = TRUE,
-    [MOVE_ERUPTION] = TRUE,
-    [MOVE_SKILL_SWAP] = TRUE,
-    [MOVE_IMPRISON] = TRUE,
-    [MOVE_REFRESH] = TRUE,
-    [MOVE_GRUDGE] = TRUE,
-    [MOVE_SNATCH] = TRUE,
-    [MOVE_SECRET_POWER] = TRUE,
-    [MOVE_DIVE] = TRUE,
-    [MOVE_ARM_THRUST] = FALSE,
-    [MOVE_CAMOUFLAGE] = TRUE,
-    [MOVE_TAIL_GLOW] = TRUE,
-    [MOVE_LUSTER_PURGE] = TRUE,
-    [MOVE_MIST_BALL] = TRUE,
-    [MOVE_FEATHER_DANCE] = TRUE,
-    [MOVE_TEETER_DANCE] = TRUE,
-    [MOVE_BLAZE_KICK] = TRUE,
-    [MOVE_MUD_SPORT] = TRUE,
-    [MOVE_ICE_BALL] = FALSE,
-    [MOVE_NEEDLE_ARM] = TRUE,
-    [MOVE_SLACK_OFF] = TRUE,
-    [MOVE_HYPER_VOICE] = TRUE,
-    [MOVE_POISON_FANG] = FALSE,
-    [MOVE_CRUSH_CLAW] = TRUE,
-    [MOVE_BLAST_BURN] = TRUE,
-    [MOVE_HYDRO_CANNON] = TRUE,
-    [MOVE_METEOR_MASH] = TRUE,
-    [MOVE_ASTONISH] = TRUE,
-    [MOVE_WEATHER_BALL] = TRUE,
-    [MOVE_AROMATHERAPY] = TRUE,
-    [MOVE_FAKE_TEARS] = TRUE,
-    [MOVE_AIR_CUTTER] = TRUE,
-    [MOVE_OVERHEAT] = TRUE,
-    [MOVE_ODOR_SLEUTH] = TRUE,
-    [MOVE_ROCK_TOMB] = TRUE,
-    [MOVE_SILVER_WIND] = TRUE,
-    [MOVE_METAL_SOUND] = TRUE,
-    [MOVE_GRASS_WHISTLE] = TRUE,
-    [MOVE_TICKLE] = TRUE,
-    [MOVE_COSMIC_POWER] = TRUE,
-    [MOVE_WATER_SPOUT] = TRUE,
-    [MOVE_SIGNAL_BEAM] = TRUE,
-    [MOVE_SHADOW_PUNCH] = TRUE,
-    [MOVE_EXTRASENSORY] = TRUE,
-    [MOVE_SKY_UPPERCUT] = TRUE,
-    [MOVE_SAND_TOMB] = TRUE,
-    [MOVE_SHEER_COLD] = TRUE,
-    [MOVE_MUDDY_WATER] = TRUE,
-    [MOVE_BULLET_SEED] = FALSE,
-    [MOVE_AERIAL_ACE] = TRUE,
-    [MOVE_ICICLE_SPEAR] = FALSE,
-    [MOVE_IRON_DEFENSE] = TRUE,
-    [MOVE_BLOCK] = TRUE,
-    [MOVE_HOWL] = TRUE,
-    [MOVE_DRAGON_CLAW] = TRUE,
-    [MOVE_FRENZY_PLANT] = TRUE,
-    [MOVE_BULK_UP] = TRUE,
-    [MOVE_BOUNCE] = TRUE,
-    [MOVE_MUD_SHOT] = FALSE,
-    [MOVE_POISON_TAIL] = TRUE,
-    [MOVE_COVET] = TRUE,
-    [MOVE_VOLT_TACKLE] = TRUE,
-    [MOVE_MAGICAL_LEAF] = TRUE,
-    [MOVE_WATER_SPORT] = TRUE,
-    [MOVE_CALM_MIND] = TRUE,
-    [MOVE_LEAF_BLADE] = TRUE,
-    [MOVE_DRAGON_DANCE] = TRUE,
-    [MOVE_ROCK_BLAST] = FALSE,
-    [MOVE_SHOCK_WAVE] = TRUE,
-    [MOVE_WATER_PULSE] = TRUE,
-    [MOVE_DOOM_DESIRE] = TRUE,
-    [MOVE_PSYCHO_BOOST] = TRUE,
-};
-
-static const u8 gUnknown_086114D3[] = {0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00};
-
-static void (* const sApprenticeFunctions[])(void) =
-{
-    Script_IsPlayersApprenticeActive,
-    Script_SetPlayersApprenticeLvlMode,
-    sub_81A0978,
-    sub_819FC60,
-    sub_81A0984,
-    sub_81A0990,
-    sub_81A09D0,
-    Script_CreateApprenticeMenu,
-    Script_PrintMessage,
-    Script_ResetPlayerApprentice,
-    sub_81A1638,
-    sub_81A0CC0,
-    sub_81A09B4,
-    sub_81A0D40,
-    sub_81A0DD4,
-    sub_81A0FE4,
-    sub_81A0FFC,
-    sub_81A0D80,
-    sub_81A11F8,
-    sub_81A1218,
-    sub_81A1224,
-    sub_81A1438,
-    sub_81A150C,
-    Script_SetPlayerApprenticeTrainerGfxId,
-    sub_81A1644,
-    sub_81A1370,
-};
-
-static const u8 gUnknown_08611548[8] = {0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x08, 0x09};
-
-// text
-extern const u8 gText_Give[];
-extern const u8 gText_NoNeed[];
-extern const u8 gText_Yes[];
-extern const u8 gText_No[];
-
-void CopyFriendsApprenticeChallengeText(u8 saveblockApprenticeId)
-{
-    u8 i, var;
-    const u8 *str;
-
-    var = gSaveBlock2Ptr->apprentices[saveblockApprenticeId].number;
-    for (i = 0; var != 0 && i < 4; var /= 10, i++)
+static void GetShouldCheckApprenticeGone(void);
+static void ApprenticeGetQuestion(void);
+static void GetNumApprenticePartyMonsAssigned(void);
+static void SetApprenticePartyMon(void);
+static void InitQuestionData(void);
+static void FreeQuestionData(void);
+static void ApprenticeBufferString(void);
+static void SetApprenticeMonMove(void);
+static void SetLeadApprenticeMon(void);
+static void Script_ApprenticeOpenBagMenu(void);
+static void TrySetApprenticeHeldItem(void);
+static void SaveApprentice(void);
+static void SetSavedApprenticeTrainerGfxId(void);
+static void SetPlayerApprenticeTrainerGfxId(void);
+static void GetShouldApprenticeLeave(void);
+static void ShiftSavedApprentices(void);
+
+#include "data/battle_frontier/apprentice.h"
+
+void BufferApprenticeChallengeText(u8 saveApprenticeId)
+{
+    u8 i, num;
+    const u8 *challengeText;
+
+    num = gSaveBlock2Ptr->apprentices[saveApprenticeId].number;
+    for (i = 0; num != 0 && i < APPRENTICE_COUNT; num /= 10, i++)
         ;
 
-    StringCopy7(gStringVar1, gSaveBlock2Ptr->apprentices[saveblockApprenticeId].playerName);
-    ConvertInternationalString(gStringVar1, gSaveBlock2Ptr->apprentices[saveblockApprenticeId].language);
-    ConvertIntToDecimalStringN(gStringVar2, gSaveBlock2Ptr->apprentices[saveblockApprenticeId].number, STR_CONV_MODE_RIGHT_ALIGN, i);
-    str = gUnknown_08611330[gSaveBlock2Ptr->apprentices[saveblockApprenticeId].id];
-    StringExpandPlaceholders(gStringVar4, str);
+    StringCopy7(gStringVar1, gSaveBlock2Ptr->apprentices[saveApprenticeId].playerName);
+    ConvertInternationalString(gStringVar1, gSaveBlock2Ptr->apprentices[saveApprenticeId].language);
+    ConvertIntToDecimalStringN(gStringVar2, gSaveBlock2Ptr->apprentices[saveApprenticeId].number, STR_CONV_MODE_RIGHT_ALIGN, i);
+    challengeText = sApprenticeChallengeTexts[gSaveBlock2Ptr->apprentices[saveApprenticeId].id];
+    StringExpandPlaceholders(gStringVar4, challengeText);
 }
 
 void Apprentice_EnableBothScriptContexts(void)
@@ -1079,27 +144,27 @@ void ResetApprenticeStruct(struct Apprentice *apprentice)
 {
     u8 i;
 
-    for (i = 0; i < 6; i++)
-        apprentice->easyChatWords[i] = 0xFFFF;
+    for (i = 0; i < ARRAY_COUNT(apprentice->speechWon); i++)
+        apprentice->speechWon[i] = 0xFFFF;
 
     apprentice->playerName[0] = EOS;
-    apprentice->id = 16;
+    apprentice->id = NUM_APPRENTICES;
 }
 
 void ResetAllApprenticeData(void)
 {
     u8 i, j;
 
-    PLAYER_APPRENTICE.field_B2_1 = 0;
-    for (i = 0; i < 4; i++)
+    PLAYER_APPRENTICE.saveId = 0;
+    for (i = 0; i < APPRENTICE_COUNT; i++)
     {
-        for (j = 0; j < 6; j++)
-            gSaveBlock2Ptr->apprentices[i].easyChatWords[j] = 0xFFFF;
-        gSaveBlock2Ptr->apprentices[i].id = 16;
+        for (j = 0; j < ARRAY_COUNT(gSaveBlock2Ptr->apprentices[i].speechWon); j++)
+            gSaveBlock2Ptr->apprentices[i].speechWon[j] = 0xFFFF;
+        gSaveBlock2Ptr->apprentices[i].id = NUM_APPRENTICES;
         gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS;
         gSaveBlock2Ptr->apprentices[i].lvlMode = 0;
         gSaveBlock2Ptr->apprentices[i].number = 0;
-        gSaveBlock2Ptr->apprentices[i].field_1 = 0;
+        gSaveBlock2Ptr->apprentices[i].numQuestions = 0;
         for (j = 0; j < TRAINER_ID_LENGTH; j++)
             gSaveBlock2Ptr->apprentices[i].playerId[j] = 0;
         gSaveBlock2Ptr->apprentices[i].language = gGameLanguage;
@@ -1109,174 +174,184 @@ void ResetAllApprenticeData(void)
     Script_ResetPlayerApprentice();
 }
 
-static bool8 IsPlayersApprenticeActive(void)
+static bool8 GivenApprenticeLvlMode(void)
 {
-    return (PLAYER_APPRENTICE.activeLvlMode != 0);
+    return (PLAYER_APPRENTICE.lvlMode != 0);
 }
 
-static void sub_819FBC8(void)
+static void SetApprenticeId(void)
 {
     if (gSaveBlock2Ptr->apprentices[0].number == 0)
     {
         do
         {
-            PLAYER_APPRENTICE.id = gUnknown_08611548[Random() % ARRAY_COUNT(gUnknown_08611548)];
+            PLAYER_APPRENTICE.id = sInitialApprenticeIds[Random() % ARRAY_COUNT(sInitialApprenticeIds)];
         } while (PLAYER_APPRENTICE.id == gSaveBlock2Ptr->apprentices[0].id);
     }
     else
     {
         do
         {
-            PLAYER_APPRENTICE.id = Random() % 16;
+            PLAYER_APPRENTICE.id = Random() % (NUM_APPRENTICES);
         } while (PLAYER_APPRENTICE.id == gSaveBlock2Ptr->apprentices[0].id);
     }
 }
 
 static void SetPlayersApprenticeLvlMode(u8 mode)
 {
-    PLAYER_APPRENTICE.activeLvlMode = mode;
+    PLAYER_APPRENTICE.lvlMode = mode;
 }
 
-static void sub_819FC60(void)
+static void ShuffleApprenticeSpecies(void)
 {
-    u8 array[APPRENTICE_SPECIES_COUNT];
+    u8 species[APPRENTICE_SPECIES_COUNT];
     u8 i;
 
-    for (i = 0; i < ARRAY_COUNT(array); i++)
-        array[i] = i;
+    for (i = 0; i < ARRAY_COUNT(species); i++)
+        species[i] = i;
 
+    // Shuffle the possible species an arbitrary 50 times
     for (i = 0; i < 50; i++)
     {
         u8 temp;
-        u8 var1 = Random() % ARRAY_COUNT(array);
-        u8 var2 = Random() % ARRAY_COUNT(array);
-        SWAP(array[var1], array[var2], temp);
+        u8 rand1 = Random() % ARRAY_COUNT(species);
+        u8 rand2 = Random() % ARRAY_COUNT(species);
+        SWAP(species[rand1], species[rand2], temp);
     }
 
-    for (i = 0; i < 3; i++)
-        PLAYER_APPRENTICE.monIds[i] = ((array[i * 2] & 0xF) << 4) | ((array[i * 2 + 1]) & 0xF);
+    for (i = 0; i < MULTI_PARTY_SIZE; i++)
+        PLAYER_APPRENTICE.speciesIds[i] = ((species[i * 2] & 0xF) << 4) | ((species[i * 2 + 1]) & 0xF);
 }
 
-static u8 sub_819FCF8(u8 val, u8 *arg1, u8 *arg2)
+// Pick one of the Apprentice's mons to ask the question about
+// Picking a move chooses a random mon, picking a held item is sequential (so that none are repeated)
+static u8 GetMonIdForQuestion(u8 questionId, u8 *party, u8 *partySlot)
 {
     u8 i, count;
-    u8 ret = 0;
+    u8 monId = 0;
 
-    if (val == 2)
+    if (questionId == QUESTION_ID_WHICH_MOVE)
     {
         do
         {
-            ret = Random() % 3;
-            for (count = 0, i = 0; i < 5; i++)
+            monId = Random() % (MULTI_PARTY_SIZE);
+            for (count = 0, i = 0; i < NUM_WHICH_MOVE_QUESTIONS; i++)
             {
-                if (gUnknown_030062EC->unk2[ret][i] != 0)
+                if (gApprenticePartyMovesData->moves[monId][i] != MOVE_NONE)
                     count++;
             }
-        } while (count > 3);
+        } while (count > MULTI_PARTY_SIZE);
     }
-    else if (val == 1)
+    else if (questionId == QUESTION_ID_WHAT_ITEM)
     {
-        ret = arg1[*arg2];
-        (*arg2)++;
+        monId = party[*partySlot];
+        (*partySlot)++;
     }
 
-    return ret;
+    return monId;
 }
 
-static void sub_819FD64(void)
+// Sets the random order and data for the remaining questions after the initial "choose mon" questions
+static void SetRandomQuestionData(void)
 {
-    u8 sp_0[10];
-    u8 sp_C[3];
-    u8 sp_10;
+    u8 questionOrder[APPRENTICE_MAX_QUESTIONS + 1];
+    u8 partyOrder[MULTI_PARTY_SIZE];
+    u8 partySlot;
     u8 i, j;
     u8 rand1, rand2;
     u8 id;
 
-    for (i = 0; i < 3; i++)
-        sp_C[i] = i;
+    for (i = 0; i < ARRAY_COUNT(partyOrder); i++)
+        partyOrder[i] = i;
+
+    // Shuffle the party an arbitrary 10 times
     for (i = 0; i < 10; i++)
     {
         u8 temp;
-        rand1 = Random() % ARRAY_COUNT(sp_C);
-        rand2 = Random() % ARRAY_COUNT(sp_C);
-        SWAP(sp_C[rand1], sp_C[rand2], temp);
+        rand1 = Random() % ARRAY_COUNT(partyOrder);
+        rand2 = Random() % ARRAY_COUNT(partyOrder);
+        SWAP(partyOrder[rand1], partyOrder[rand2], temp);
     }
 
-    for (i = 0; i < 10; i++)
-        sp_0[i] = gUnknown_086114D3[i];
+    for (i = 0; i < ARRAY_COUNT(questionOrder); i++)
+        questionOrder[i] = sQuestionPossibilities[i];
+    
+    // Shuffle the questions an arbitrary 50 times
     for (i = 0; i < 50; i++)
     {
         u8 temp;
-        rand1 = Random() % ARRAY_COUNT(sp_0);
-        rand2 = Random() % ARRAY_COUNT(sp_0);
-        SWAP(sp_0[rand1], sp_0[rand2], temp);
+        rand1 = Random() % ARRAY_COUNT(questionOrder);
+        rand2 = Random() % ARRAY_COUNT(questionOrder);
+        SWAP(questionOrder[rand1], questionOrder[rand2], temp);
     }
 
-    gUnknown_030062EC = AllocZeroed(sizeof(*gUnknown_030062EC));
-    gUnknown_030062EC->unk0 = 0;
-    for (i = 0; i < 5; i++)
+    gApprenticePartyMovesData = AllocZeroed(sizeof(*gApprenticePartyMovesData));
+    gApprenticePartyMovesData->moveCounter = 0;
+    for (i = 0; i < NUM_WHICH_MOVE_QUESTIONS; i++)
     {
-        for (j = 0; j < 3; j++)
-            gUnknown_030062EC->unk20[j][i] = 4;
+        for (j = 0; j < MULTI_PARTY_SIZE; j++)
+            gApprenticePartyMovesData->moveSlots[j][i] = MAX_MON_MOVES;
     }
 
-    sp_10 = 0;
-    for (i = 0; i < 9; i++)
+    partySlot = 0;
+    for (i = 0; i < APPRENTICE_MAX_QUESTIONS; i++)
     {
-        PLAYER_APPRENTICE.field_B8[i].unk0_0 = sp_0[i];
-        if (sp_0[i] != 3)
+        PLAYER_APPRENTICE.questions[i].questionId = questionOrder[i];
+        if (questionOrder[i] != QUESTION_ID_WHICH_FIRST)
         {
-            PLAYER_APPRENTICE.field_B8[i].unk0_1 = sub_819FCF8(sp_0[i], sp_C, &sp_10);
-            id = PLAYER_APPRENTICE.field_B8[i].unk0_1;
-            if (sp_0[i] == 2)
+            PLAYER_APPRENTICE.questions[i].monId = GetMonIdForQuestion(questionOrder[i], partyOrder, &partySlot);
+            id = PLAYER_APPRENTICE.questions[i].monId;
+            if (questionOrder[i] == QUESTION_ID_WHICH_MOVE)
             {
                 do
                 {
-                    rand1 = Random() % 4;
-                    for (j = 0; j < gUnknown_030062EC->unk0 + 1; j++)
+                    rand1 = Random() % MAX_MON_MOVES;
+                    for (j = 0; j < gApprenticePartyMovesData->moveCounter + 1; j++)
                     {
-                        if (gUnknown_030062EC->unk20[id][j] == rand1)
+                        if (gApprenticePartyMovesData->moveSlots[id][j] == rand1)
                             break;
                     }
-                } while (j != gUnknown_030062EC->unk0 + 1);
+                } while (j != gApprenticePartyMovesData->moveCounter + 1);
 
-                gUnknown_030062EC->unk20[id][gUnknown_030062EC->unk0] = rand1;
-                PLAYER_APPRENTICE.field_B8[i].unk0_2 = rand1;
-                PLAYER_APPRENTICE.field_B8[i].unk2 = sub_819FF98(PLAYER_APPRENTICE.field_B8[i].unk0_1);
+                gApprenticePartyMovesData->moveSlots[id][gApprenticePartyMovesData->moveCounter] = rand1;
+                PLAYER_APPRENTICE.questions[i].moveSlot = rand1;
+                PLAYER_APPRENTICE.questions[i].data = GetRandomAlternateMove(PLAYER_APPRENTICE.questions[i].monId);
             }
         }
     }
 
-    FREE_AND_SET_NULL(gUnknown_030062EC);
+    FREE_AND_SET_NULL(gApprenticePartyMovesData);
 }
 
 // No idea why a do-while loop is needed, but it will not match without it.
 
-#define APPRENTICE_SPECIES_ID(speciesArrId, monId) speciesArrId = (PLAYER_APPRENTICE.monIds[monId] >> \
-                                                                  (((PLAYER_APPRENTICE.field_B2_0 >> monId) & 1) << 2)) & 0xF; \
+#define APPRENTICE_SPECIES_ID(speciesArrId, monId) speciesArrId = (PLAYER_APPRENTICE.speciesIds[monId] >> \
+                                                                  (((PLAYER_APPRENTICE.party >> monId) & 1) << 2)) & 0xF; \
                                                    do {} while (0)
 
 // Why the need to have two macros do the exact thing differently?
-#define APPRENTICE_SPECIES_ID_2(speciesArrId, monId) {  u8 a0 = ((PLAYER_APPRENTICE.field_B2_0 >> monId) & 1);\
-                                                        speciesArrId = PLAYER_APPRENTICE.monIds[monId];     \
+#define APPRENTICE_SPECIES_ID_2(speciesArrId, monId) {  u8 a0 = ((PLAYER_APPRENTICE.party >> monId) & 1);\
+                                                        speciesArrId = PLAYER_APPRENTICE.speciesIds[monId];     \
                                                         speciesArrId = ((speciesArrId) >> (a0 << 2)) & 0xF; \
                                                      }
 
-static u16 sub_819FF98(u8 arg0)
+// Get the second move choice for the "Which move" question
+// Unlike the first move choice, this can be either a level up move or a TM/HM move
+static u16 GetRandomAlternateMove(u8 monId)
 {
     u8 i, j;
     u8 id;
-    u8 knownMovesCount;
+    u8 numLearnsetMoves;
     u16 species;
     const u16 *learnset;
-    bool32 var_24 = FALSE;
-    u16 moveId = 0;
-    bool32 valid;
+    bool32 needTMs = FALSE;
+    u16 moveId = MOVE_NONE;
+    bool32 shouldUseMove;
     u8 level;
 
-    if (arg0 < 3)
+    if (monId < MULTI_PARTY_SIZE)
     {
-        APPRENTICE_SPECIES_ID(id, arg0);
+        APPRENTICE_SPECIES_ID(id, monId);
     }
     else
     {
@@ -1286,207 +361,224 @@ static u16 sub_819FF98(u8 arg0)
     species = gApprentices[PLAYER_APPRENTICE.id].species[id];
     learnset = gLevelUpLearnsets[species];
     j = 0;
-    if (PLAYER_APPRENTICE.activeLvlMode == 1)
+
+    // Despite being open level, level up moves are only read up to level 60
+    if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
         level = 50;
-    else
+    else // == APPRENTICE_LVL_MODE_OPEN
         level = 60;
 
-    for (j = 0; learnset[j] != 0xFFFF; j++)
+    for (j = 0; learnset[j] != LEVEL_UP_END; j++)
     {
-        if ((learnset[j] & 0xFE00) > (level << 9))
+        if ((learnset[j] & LEVEL_UP_MOVE_LV) > (level << 9))
             break;
     }
 
-    knownMovesCount = j;
+    numLearnsetMoves = j;
     i = 0;
-    while (i <= MAX_MON_MOVES)
+
+    // i < 5 here is arbitrary, i isnt used and is only incremented when the selected move isnt in sValidApprenticeMoves
+    // This while loop contains 3 potential infinite loops, though none of them would occur in the base game
+    while (i < 5)
     {
-        if (Random() % 2 == 0 || var_24 == TRUE)
+        if (Random() % 2 == 0 || needTMs == TRUE)
         {
+            // Get TM move
+            // NOTE: Below is an infinite loop if a species that only learns TMs for moves
+            //       that are also in its level up learnset is assigned to an Apprentice
             do
             {
+                // NOTE: Below is an infinite loop if a species which cannot learn TMs is assigned to an Apprentice
                 do
                 {
                     id = Random() % (NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES);
-                    valid = CanSpeciesLearnTMHM(species, id);
+                    shouldUseMove = CanSpeciesLearnTMHM(species, id);
                 }
-                while (!valid);
+                while (!shouldUseMove);
 
                 moveId = ItemIdToBattleMoveId(ITEM_TM01 + id);
-                valid = TRUE;
+                shouldUseMove = TRUE;
 
-                if (knownMovesCount < 5)
+                if (numLearnsetMoves <= MAX_MON_MOVES)
                     j = 0;
                 else
-                    j = knownMovesCount - MAX_MON_MOVES;
+                    j = numLearnsetMoves - MAX_MON_MOVES;
 
-                for (; j < knownMovesCount; j++)
+                for (; j < numLearnsetMoves; j++)
                 {
-                    if ((learnset[j] & 0x1FF) == moveId)
+                    // Keep looking for TMs until one not in the level up learnset is found
+                    if ((learnset[j] & LEVEL_UP_MOVE_ID) == moveId)
                     {
-                        valid = FALSE;
+                        shouldUseMove = FALSE;
                         break;
                     }
                 }
-            } while (valid != TRUE);
+            } while (shouldUseMove != TRUE);
         }
         else
         {
-            if (knownMovesCount <= MAX_MON_MOVES)
+            if (numLearnsetMoves <= MAX_MON_MOVES)
             {
-                var_24 = TRUE;
+                needTMs = TRUE;
                 continue;
             }
             else
             {
+                // Get level up move
+                // NOTE: Below is an infinite loop if a mon whose last 4 moves contain
+                //       all the moves in the rest of its learnset is assigned to an Apprentice
                 do
                 {
-                    u8 learnsetId = Random() % (knownMovesCount - MAX_MON_MOVES);
-                    moveId = learnset[learnsetId] & 0x1FF;
-                    valid = TRUE;
-                    for (j = knownMovesCount - MAX_MON_MOVES; j < knownMovesCount; j++)
+                    // Get a random move excluding the 4 it would know at max level
+                    u8 learnsetId = Random() % (numLearnsetMoves - MAX_MON_MOVES);
+                    moveId = learnset[learnsetId] & LEVEL_UP_MOVE_ID;
+                    shouldUseMove = TRUE;
+
+                    for (j = numLearnsetMoves - MAX_MON_MOVES; j < numLearnsetMoves; j++)
                     {
-                        if ((learnset[j] & 0x1FF) == moveId)
+                        // Keep looking for moves until one not in the last 4 is found
+                        if ((learnset[j] & LEVEL_UP_MOVE_ID) == moveId)
                         {
-                            valid = FALSE;
+                            shouldUseMove = FALSE;
                             break;
                         }
                     }
-                } while (valid != TRUE);
+                } while (shouldUseMove != TRUE);
             }
         }
 
-        if (sub_81A0194(arg0, moveId))
+        if (TrySetMove(monId, moveId))
         {
-            if (gUnknown_08611370[moveId])
+            if (sValidApprenticeMoves[moveId])
                 break;
             i++;
         }
     }
 
-    gUnknown_030062EC->unk0++;
+    gApprenticePartyMovesData->moveCounter++;
     return moveId;
 }
 
-static bool8 sub_81A0194(u8 arg0, u16 moveId)
+static bool8 TrySetMove(u8 monId, u16 moveId)
 {
     u8 i;
 
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < NUM_WHICH_MOVE_QUESTIONS; i++)
     {
-        if (gUnknown_030062EC->unk2[arg0][i] == moveId)
+        if (gApprenticePartyMovesData->moves[monId][i] == moveId)
             return FALSE;
     }
 
-    gUnknown_030062EC->unk2[arg0][gUnknown_030062EC->unk0] = moveId;
+    gApprenticePartyMovesData->moves[monId][gApprenticePartyMovesData->moveCounter] = moveId;
     return TRUE;
 }
 
 static void GetLatestLearnedMoves(u16 species, u16 *moves)
 {
     u8 i, j;
-    u8 level, knownMovesCount;
+    u8 level, numLearnsetMoves;
     const u16 *learnset;
 
-    if (PLAYER_APPRENTICE.activeLvlMode == 1)
+    if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
         level = 50;
-    else
+    else // == APPRENTICE_LVL_MODE_OPEN
         level = 60;
 
     learnset = gLevelUpLearnsets[species];
-    for (i = 0; learnset[i] != 0xFFFF; i++)
+    for (i = 0; learnset[i] != LEVEL_UP_END; i++)
     {
-        if ((learnset[i] & 0xFE00) > (level << 9))
+        if ((learnset[i] & LEVEL_UP_MOVE_LV) > (level << 9))
             break;
     }
 
-    knownMovesCount = i;
-    if (knownMovesCount > MAX_MON_MOVES)
-        knownMovesCount = MAX_MON_MOVES;
+    numLearnsetMoves = i;
+    if (numLearnsetMoves > MAX_MON_MOVES)
+        numLearnsetMoves = MAX_MON_MOVES;
 
-    for (j = 0; j < knownMovesCount; j++)
-        moves[j] = learnset[(i - 1) - j] & 0x1FF;
+    for (j = 0; j < numLearnsetMoves; j++)
+        moves[j] = learnset[(i - 1) - j] & LEVEL_UP_MOVE_ID;
 }
 
-static u16 sub_81A0284(u8 arg0, u8 speciesTableId, u8 arg2)
+// Get the level up move or previously suggested move to be the first move choice
+// Compare to GetRandomAlternateMove, which gets the move that will be the second choice
+static u16 GetDefaultMove(u8 monId, u8 speciesArrayId, u8 moveSlot)
 {
     u16 moves[MAX_MON_MOVES];
-    u8 i, count;
+    u8 i, numQuestions;
 
-    if (PLAYER_APPRENTICE.field_B1_1 < 3)
-        return 0;
+    if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
+        return MOVE_NONE;
 
-    count = 0;
-    for (i = 0; i < 9; i++)
-    {
-        if (PLAYER_APPRENTICE.field_B8[i].unk0_0 == 0)
-            break;
-        count++;
-    }
+    numQuestions = 0;
+    for (i = 0; i < APPRENTICE_MAX_QUESTIONS && PLAYER_APPRENTICE.questions[i].questionId != QUESTION_ID_WIN_SPEECH; i++)
+        numQuestions++;
 
-    GetLatestLearnedMoves(gApprentices[PLAYER_APPRENTICE.id].species[speciesTableId], moves);
-    for (i = 0; i < count && i < PLAYER_APPRENTICE.field_B1_1 - 3; i++)
+    GetLatestLearnedMoves(gApprentices[PLAYER_APPRENTICE.id].species[speciesArrayId], moves);
+    for (i = 0; i < numQuestions && i < CURRENT_QUESTION_NUM; i++)
     {
-        if (PLAYER_APPRENTICE.field_B8[i].unk0_0 == 2
-            && PLAYER_APPRENTICE.field_B8[i].unk0_1 == arg0
-            && PLAYER_APPRENTICE.field_B8[i].unk0_3 != 0)
+        if (PLAYER_APPRENTICE.questions[i].questionId == QUESTION_ID_WHICH_MOVE
+            && PLAYER_APPRENTICE.questions[i].monId == monId
+            && PLAYER_APPRENTICE.questions[i].suggestedChange)
         {
-            moves[PLAYER_APPRENTICE.field_B8[i].unk0_2] = PLAYER_APPRENTICE.field_B8[i].unk2;
+            moves[PLAYER_APPRENTICE.questions[i].moveSlot] = PLAYER_APPRENTICE.questions[i].data;
         }
     }
 
-    return moves[arg2];
+    return moves[moveSlot];
 }
 
-static void sub_81A0390(u8 arg0)
+static void SaveApprenticeParty(u8 numQuestions)
 {
-    struct ApprenticeMon *apprenticeMons[3];
+    struct ApprenticeMon *apprenticeMons[MULTI_PARTY_SIZE];
     u8 i, j;
     u32 speciesTableId;
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < MULTI_PARTY_SIZE; i++)
     {
-        gSaveBlock2Ptr->apprentices[0].party[i].species = 0;
-        gSaveBlock2Ptr->apprentices[0].party[i].item = 0;
+        gSaveBlock2Ptr->apprentices[0].party[i].species = SPECIES_NONE;
+        gSaveBlock2Ptr->apprentices[0].party[i].item = ITEM_NONE;
         for (j = 0; j < MAX_MON_MOVES; j++)
-            gSaveBlock2Ptr->apprentices[0].party[i].moves[j] = 0;
+            gSaveBlock2Ptr->apprentices[0].party[i].moves[j] = MOVE_NONE;
     }
 
-    j = PLAYER_APPRENTICE.field_B1_2;
-    for (i = 0; i < 3; i++)
+    // Save party order
+    j = PLAYER_APPRENTICE.leadMonId;
+    for (i = 0; i < MULTI_PARTY_SIZE; i++)
     {
         apprenticeMons[j] = &gSaveBlock2Ptr->apprentices[0].party[i];
-        j = (j + 1) % 3;
+        j = (j + 1) % (MULTI_PARTY_SIZE);
     }
 
-    for (i = 0; i < 3; i++)
+    // Save party species
+    for (i = 0; i < MULTI_PARTY_SIZE; i++)
     {
         APPRENTICE_SPECIES_ID(speciesTableId, i);
         apprenticeMons[i]->species = gApprentices[PLAYER_APPRENTICE.id].species[speciesTableId];
         GetLatestLearnedMoves(apprenticeMons[i]->species, apprenticeMons[i]->moves);
     }
 
-    for (i = 0; i < arg0; i++)
+    // Update party based on response to held item / move choice questions
+    for (i = 0; i < numQuestions; i++)
     {
-        u8 var1 = PLAYER_APPRENTICE.field_B8[i].unk0_0;
-        u8 monId = PLAYER_APPRENTICE.field_B8[i].unk0_1;
-        if (var1 == 1)
+        u8 questionId = PLAYER_APPRENTICE.questions[i].questionId;
+        u8 monId = PLAYER_APPRENTICE.questions[i].monId;
+        if (questionId == QUESTION_ID_WHAT_ITEM)
         {
-            if (PLAYER_APPRENTICE.field_B8[i].unk0_3 != 0)
-                apprenticeMons[monId]->item = PLAYER_APPRENTICE.field_B8[i].unk2;
+            if (PLAYER_APPRENTICE.questions[i].suggestedChange)
+                apprenticeMons[monId]->item = PLAYER_APPRENTICE.questions[i].data;
         }
-        else if (var1 == 2)
+        else if (questionId == QUESTION_ID_WHICH_MOVE)
         {
-            if (PLAYER_APPRENTICE.field_B8[i].unk0_3 != 0)
+            if (PLAYER_APPRENTICE.questions[i].suggestedChange)
             {
-                u32 moveSlot = PLAYER_APPRENTICE.field_B8[i].unk0_2;
-                apprenticeMons[monId]->moves[moveSlot] = PLAYER_APPRENTICE.field_B8[i].unk2;
+                u32 moveSlot = PLAYER_APPRENTICE.questions[i].moveSlot;
+                apprenticeMons[monId]->moves[moveSlot] = PLAYER_APPRENTICE.questions[i].data;
             }
         }
     }
 }
 
-static void CreateMenuWithAnswers(u8 arg0)
+static void CreateApprenticeMenu(u8 menu)
 {
     u8 i;
     u8 windowId;
@@ -1497,19 +589,19 @@ static void CreateMenuWithAnswers(u8 arg0)
     u8 top;
     s32 pixelWidth;
 
-    switch (arg0)
+    switch (menu)
     {
     case APPRENTICE_ASK_WHICH_LEVEL:
-        left = 0x12;
+        left = 18;
         top = 8;
         strings[0] = gText_Lv50;
         strings[1] = gText_OpenLevel;
         break;
     case APPRENTICE_ASK_3SPECIES:
-        count = 3;
-        left = 0x12;
+        count = MULTI_PARTY_SIZE;
+        left = 18;
         top = 6;
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < MULTI_PARTY_SIZE; i++)
         {
             u16 species;
             u32 speciesTableId;
@@ -1520,27 +612,27 @@ static void CreateMenuWithAnswers(u8 arg0)
         }
         break;
     case APPRENTICE_ASK_2SPECIES:
-        left = 0x12;
+        left = 18;
         top = 8;
-        if (PLAYER_APPRENTICE.field_B1_1 > 2)
+        if (PLAYER_APPRENTICE.questionsAnswered >= NUM_WHICH_MON_QUESTIONS)
             return;
-        strings[1] = gSpeciesNames[gUnknown_030062F0->unk2];
-        strings[0] = gSpeciesNames[gUnknown_030062F0->unk0];
+        strings[1] = gSpeciesNames[gApprenticeQuestionData->altSpeciesId];
+        strings[0] = gSpeciesNames[gApprenticeQuestionData->speciesId];
         break;
     case APPRENTICE_ASK_MOVES:
-        left = 0x11;
+        left = 17;
         top = 8;
-        strings[0] = gMoveNames[gUnknown_030062F0->unk4];
-        strings[1] = gMoveNames[gUnknown_030062F0->unk6];
+        strings[0] = gMoveNames[gApprenticeQuestionData->moveId1];
+        strings[1] = gMoveNames[gApprenticeQuestionData->moveId2];
         break;
     case APPRENTICE_ASK_GIVE:
-        left = 0x12;
+        left = 18;
         top = 8;
         strings[0] = gText_Give;
         strings[1] = gText_NoNeed;
         break;
     case APPRENTICE_ASK_YES_NO:
-        left = 0x14;
+        left = 20;
         top = 8;
         strings[0] = gText_Yes;
         strings[1] = gText_No;
@@ -1623,12 +715,12 @@ static void RemoveAndHideWindow(u8 windowId)
     RemoveWindow(windowId);
 }
 
-static void CreateChooseAnswerTask(bool8 noBButton, u8 itemsCount, u8 windowId)
+static void CreateChooseAnswerTask(bool8 noBButton, u8 answers, u8 windowId)
 {
     u8 taskId = CreateTask(Task_ChooseAnswer, 80);
     gTasks[taskId].tNoBButton = noBButton;
 
-    if (itemsCount > 3)
+    if (answers > 3)
         gTasks[taskId].tWrapAround = TRUE;
     else
         gTasks[taskId].tWrapAround = FALSE;
@@ -1649,71 +741,79 @@ static void Script_ResetPlayerApprentice(void)
 {
     u8 i;
 
-    sub_819FBC8();
-    PLAYER_APPRENTICE.activeLvlMode = 0;
-    PLAYER_APPRENTICE.field_B1_1 = 0;
-    PLAYER_APPRENTICE.field_B1_2 = 0;
-    PLAYER_APPRENTICE.field_B2_0 = 0;
+    SetApprenticeId();
+    PLAYER_APPRENTICE.lvlMode = 0;
+    PLAYER_APPRENTICE.questionsAnswered = 0;
+    PLAYER_APPRENTICE.leadMonId = 0;
+    PLAYER_APPRENTICE.party = 0;
 
-    for (i = 0; i < 3; i++)
-        PLAYER_APPRENTICE.monIds[i] = 0;
+    for (i = 0; i < MULTI_PARTY_SIZE; i++)
+        PLAYER_APPRENTICE.speciesIds[i] = 0;
 
-    for (i = 0; i < 9; i++)
+    for (i = 0; i < APPRENTICE_MAX_QUESTIONS; i++)
     {
-        PLAYER_APPRENTICE.field_B8[i].unk0_0 = 0;
-        PLAYER_APPRENTICE.field_B8[i].unk0_1 = 0;
-        PLAYER_APPRENTICE.field_B8[i].unk0_2 = 0;
-        PLAYER_APPRENTICE.field_B8[i].unk0_3 = 0;
-        PLAYER_APPRENTICE.field_B8[i].unk2 = 0;
+        PLAYER_APPRENTICE.questions[i].questionId = 0;
+        PLAYER_APPRENTICE.questions[i].monId = 0;
+        PLAYER_APPRENTICE.questions[i].moveSlot = 0;
+        PLAYER_APPRENTICE.questions[i].suggestedChange = 0;
+        PLAYER_APPRENTICE.questions[i].data = 0;
     }
 }
 
-static void Script_IsPlayersApprenticeActive(void)
+static void Script_GivenApprenticeLvlMode(void)
 {
-    if (!IsPlayersApprenticeActive())
+    if (!GivenApprenticeLvlMode())
         gSpecialVar_Result = FALSE;
     else
         gSpecialVar_Result = TRUE;
 }
 
-static void Script_SetPlayersApprenticeLvlMode(void)
+// VAR_0x8005 is 1 + the selection value from the multichoice APPRENTICE_ASK_WHICH_LEVEL
+// i.e. APPRENTICE_LVL_MODE_50 or APPRENTICE_LVL_MODE_OPEN
+static void Script_SetApprenticeLvlMode(void)
 {
     SetPlayersApprenticeLvlMode(gSpecialVar_0x8005);
 }
 
-static void sub_81A0978(void)
+// Never called, APPRENTICE_FUNC_SET_ID is unused
+static void Script_SetApprenticeId(void)
 {
-    sub_819FBC8();
+    SetApprenticeId();
 }
 
-static void sub_81A0984(void)
+static void Script_SetRandomQuestionData(void)
 {
-    sub_819FD64();
+    SetRandomQuestionData();
 }
 
-static void sub_81A0990(void)
+static void IncrementQuestionsAnswered(void)
 {
-    PLAYER_APPRENTICE.field_B1_1++;
+    PLAYER_APPRENTICE.questionsAnswered++;
 }
 
-static void sub_81A09B4(void)
+// The first 3 questions answered after meeting the Apprentice are always selecting party mons
+//  after which this is never called
+static void GetNumApprenticePartyMonsAssigned(void)
 {
-    gSpecialVar_Result = PLAYER_APPRENTICE.field_B1_1;
+    gSpecialVar_Result = PLAYER_APPRENTICE.questionsAnswered;
 }
 
-static void sub_81A09D0(void)
+// Never called, APPRENTICE_FUNC_IS_FINAL_QUESTION is unused
+static void IsFinalQuestion(void)
 {
-    s32 var = PLAYER_APPRENTICE.field_B1_1 - 3;
-    if (var < 0)
+    s32 questionNum = CURRENT_QUESTION_NUM;
+    
+    if (questionNum < 0)
     {
+        // Not finished asking initial questions
         gSpecialVar_Result = FALSE;
     }
     else
     {
-        if (var > 8)
+        if (questionNum > APPRENTICE_MAX_QUESTIONS - 1)
             gSpecialVar_Result = TRUE;
 
-        if (!PLAYER_APPRENTICE.field_B8[var].unk0_0)
+        if (PLAYER_APPRENTICE.questions[questionNum].questionId == QUESTION_ID_WIN_SPEECH)
             gSpecialVar_Result = TRUE;
         else
             gSpecialVar_Result = FALSE;
@@ -1722,7 +822,7 @@ static void sub_81A09D0(void)
 
 static void Script_CreateApprenticeMenu(void)
 {
-    CreateMenuWithAnswers(gSpecialVar_0x8005);
+    CreateApprenticeMenu(gSpecialVar_0x8005);
 }
 
 static void Task_WaitForPrintingMessage(u8 taskId)
@@ -1737,77 +837,77 @@ static void Task_WaitForPrintingMessage(u8 taskId)
     }
 }
 
-static void PrintMessage(void)
+static void PrintApprenticeMessage(void)
 {
     const u8 *string;
 
-    if (gSpecialVar_0x8006 == 6)
+    if (gSpecialVar_0x8006 == APPRENTICE_MSG_WHICH_MON)
     {
-        string = gUnknown_08610FF0[PLAYER_APPRENTICE.id][0];
+        string = sApprenticeWhichMonTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 7)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_MON)
     {
-        string = gUnknown_08610FF0[PLAYER_APPRENTICE.id][1];
+        string = sApprenticeWhichMonTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 8)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_WHICH_MOVE)
     {
-        string = gUnknown_086111B0[PLAYER_APPRENTICE.id][0];
+        string = sApprenticeWhichMoveTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 9)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_MOVE)
     {
-        string = gUnknown_086111B0[PLAYER_APPRENTICE.id][1];
+        string = sApprenticeWhichMoveTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 4)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_WHICH_MON_FIRST)
     {
-        string = gUnknown_08611230[PLAYER_APPRENTICE.id][0];
+        string = sApprenticeWhichMonFirstTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 5)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_MON_FIRST)
     {
-        string = gUnknown_08611230[PLAYER_APPRENTICE.id][1];
+        string = sApprenticeWhichMonFirstTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 10)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_WHAT_HELD_ITEM)
     {
-        string = gUnknown_08611070[PLAYER_APPRENTICE.id][0];
+        string = sApprenticeHeldItemTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 11)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_PICK_WIN_SPEECH)
     {
-        string = gUnknown_086112B0[PLAYER_APPRENTICE.id][0];
+        string = sApprenticePickWinSpeechTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 12)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_HELD_ITEM)
     {
-        string = gUnknown_08611070[PLAYER_APPRENTICE.id][3];
+        string = sApprenticeHeldItemTexts[PLAYER_APPRENTICE.id][3];
     }
-    else if (gSpecialVar_0x8006 == 13)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_HOLD_NOTHING)
     {
-        string = gUnknown_08611070[PLAYER_APPRENTICE.id][1];
+        string = sApprenticeHeldItemTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 16)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED)
     {
-        string = gUnknown_08611070[PLAYER_APPRENTICE.id][4];
+        string = sApprenticeHeldItemTexts[PLAYER_APPRENTICE.id][4];
     }
-    else if (gSpecialVar_0x8006 == 14)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_NO_HELD_ITEM)
     {
-        string = gUnknown_08611070[PLAYER_APPRENTICE.id][2];
+        string = sApprenticeHeldItemTexts[PLAYER_APPRENTICE.id][2];
     }
-    else if (gSpecialVar_0x8006 == 15)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_WIN_SPEECH)
     {
-        string = gUnknown_086112B0[PLAYER_APPRENTICE.id][1];
+        string = sApprenticePickWinSpeechTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 0)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_PLEASE_TEACH)
     {
-        string = gUnknown_08610EF0[PLAYER_APPRENTICE.id][0];
+        string = sApprenticeFirstMeetingTexts[PLAYER_APPRENTICE.id][0];
     }
-    else if (gSpecialVar_0x8006 == 1)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_REJECT)
     {
-        string = gUnknown_08610EF0[PLAYER_APPRENTICE.id][1];
+        string = sApprenticeFirstMeetingTexts[PLAYER_APPRENTICE.id][1];
     }
-    else if (gSpecialVar_0x8006 == 2)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_WHICH_LVL_MODE)
     {
-        string = gUnknown_08610EF0[PLAYER_APPRENTICE.id][2];
+        string = sApprenticeFirstMeetingTexts[PLAYER_APPRENTICE.id][2];
     }
-    else if (gSpecialVar_0x8006 == 3)
+    else if (gSpecialVar_0x8006 == APPRENTICE_MSG_THANKS_LVL_MODE)
     {
-        string = gUnknown_08610EF0[PLAYER_APPRENTICE.id][3];
+        string = sApprenticeFirstMeetingTexts[PLAYER_APPRENTICE.id][3];
     }
     else
     {
@@ -1820,121 +920,129 @@ static void PrintMessage(void)
     CreateTask(Task_WaitForPrintingMessage, 1);
 }
 
-static void Script_PrintMessage(void)
+static void Script_PrintApprenticeMessage(void)
 {
     ScriptContext2_Enable();
     FreezeEventObjects();
     sub_808B864();
     sub_808BCF4();
     DrawDialogueFrame(0, 1);
-    PrintMessage();
+    PrintApprenticeMessage();
 }
 
-static void sub_81A0CC0(void)
+static void ApprenticeGetQuestion(void)
 {
-    if (PLAYER_APPRENTICE.field_B1_1 < 3)
+    if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
     {
-        gSpecialVar_Result = 2;
+        gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_MON;
     }
-    else if (PLAYER_APPRENTICE.field_B1_1 > 11)
+    else if (PLAYER_APPRENTICE.questionsAnswered > (APPRENTICE_MAX_QUESTIONS + NUM_WHICH_MON_QUESTIONS - 1))
     {
-        gSpecialVar_Result = 5;
+        gSpecialVar_Result = APPRENTICE_QUESTION_WIN_SPEECH;
     }
     else
     {
-        s32 id = PLAYER_APPRENTICE.field_B1_1 - 3;
-        switch (PLAYER_APPRENTICE.field_B8[id].unk0_0)
+        s32 id = CURRENT_QUESTION_NUM;
+        switch (PLAYER_APPRENTICE.questions[id].questionId)
         {
-        case 1:
-            gSpecialVar_Result = 4;
+        case QUESTION_ID_WHAT_ITEM:
+            gSpecialVar_Result = APPRENTICE_QUESTION_WHAT_ITEM;
             break;
-        case 2:
-            gSpecialVar_Result = 3;
+        case QUESTION_ID_WHICH_MOVE:
+            gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_MOVE;
             break;
-        case 3:
-            gSpecialVar_Result = 1;
+        case QUESTION_ID_WHICH_FIRST:
+            gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_FIRST;
             break;
         default:
-            gSpecialVar_Result = 5;
+      //case QUESTION_ID_WIN_SPEECH:  
+            gSpecialVar_Result = APPRENTICE_QUESTION_WIN_SPEECH;
             break;
         }
     }
 }
 
-static void sub_81A0D40(void)
+// gSpecialVar_0x8005 is 0 or 1 for the mon selection (0 is already on the team)
+// gSpecialVar_0x8006 is 0-2 for the number of party mons selected so far
+static void SetApprenticePartyMon(void)
 {
     if (gSpecialVar_0x8005)
     {
-        u8 bitNo = gSpecialVar_0x8006;
-        PLAYER_APPRENTICE.field_B2_0 |= 1 << bitNo;
+        u8 partySlot = gSpecialVar_0x8006;
+        PLAYER_APPRENTICE.party |= 1 << partySlot;
     }
 }
 
-static void sub_81A0D80(void)
+// gSpecialVar_0x8005 is 0 or 1 for the move selection
+// Selection 0 is implicitly the default move assigned
+static void SetApprenticeMonMove(void)
 {
-    if (PLAYER_APPRENTICE.field_B1_1 >= 3)
+    if (PLAYER_APPRENTICE.questionsAnswered >= NUM_WHICH_MON_QUESTIONS)
     {
-        u8 id = PLAYER_APPRENTICE.field_B1_1 - 3;
+        u8 id = CURRENT_QUESTION_NUM;
         if (gSpecialVar_0x8005)
-            PLAYER_APPRENTICE.field_B8[id].unk0_3 = 1;
+            PLAYER_APPRENTICE.questions[id].suggestedChange = TRUE;
         else
-            PLAYER_APPRENTICE.field_B8[id].unk0_3 = 0;
+            PLAYER_APPRENTICE.questions[id].suggestedChange = FALSE;
     }
 }
 
-static void sub_81A0DD4(void)
+static void InitQuestionData(void)
 {
     u8 i;
     u8 count = 0;
     u8 id1, id2;
 
-    for (i = 0; i < 9 && PLAYER_APPRENTICE.field_B8[i].unk0_0; count++, i++)
+    for (i = 0; i < APPRENTICE_MAX_QUESTIONS && (PLAYER_APPRENTICE.questions[i].questionId != QUESTION_ID_WIN_SPEECH); count++, i++)
         ;
 
-    gUnknown_030062F0 = AllocZeroed(sizeof(*gUnknown_030062F0));
-    if (gSpecialVar_0x8005 == 2)
+    gApprenticeQuestionData = AllocZeroed(sizeof(*gApprenticeQuestionData));
+    if (gSpecialVar_0x8005 == APPRENTICE_QUESTION_WHICH_MON)
     {
-        if (PLAYER_APPRENTICE.field_B1_1 < 3)
+        if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
         {
-            id1 = PLAYER_APPRENTICE.monIds[PLAYER_APPRENTICE.field_B1_1] >> 4;
-            gUnknown_030062F0->unk2 = gApprentices[PLAYER_APPRENTICE.id].species[id1];
+            // For the first MULTI_PARTY_SIZE (3) questions, a mon is asked to be selected for the Apprentice's party
+            id1 = PLAYER_APPRENTICE.speciesIds[PLAYER_APPRENTICE.questionsAnswered] >> 4;
+            gApprenticeQuestionData->altSpeciesId = gApprentices[PLAYER_APPRENTICE.id].species[id1];
 
-            id2 = PLAYER_APPRENTICE.monIds[PLAYER_APPRENTICE.field_B1_1] & 0xF;
-            gUnknown_030062F0->unk0 = gApprentices[PLAYER_APPRENTICE.id].species[id2];
+            id2 = PLAYER_APPRENTICE.speciesIds[PLAYER_APPRENTICE.questionsAnswered] & 0xF;
+            gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id2];
         }
     }
-    else if (gSpecialVar_0x8005 == 3)
+    else if (gSpecialVar_0x8005 == APPRENTICE_QUESTION_WHICH_MOVE)
     {
-        if (PLAYER_APPRENTICE.field_B1_1 >= 3
-            && PLAYER_APPRENTICE.field_B1_1 < count + 3
-            && PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_0 == 2)
+        if (PLAYER_APPRENTICE.questionsAnswered >= NUM_WHICH_MON_QUESTIONS
+            && PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS
+            && PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHICH_MOVE)
         {
-            count = PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_1;
+            // count re-used as monId
+            count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId;
             APPRENTICE_SPECIES_ID_2(id1, count);
-            gUnknown_030062F0->unk0 = gApprentices[PLAYER_APPRENTICE.id].species[id1];
-            gUnknown_030062F0->unk4 = sub_81A0284(count, id1, PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_2);
-            gUnknown_030062F0->unk6 = PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2;
+            gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id1];
+            gApprenticeQuestionData->moveId1 = GetDefaultMove(count, id1, PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].moveSlot);
+            gApprenticeQuestionData->moveId2 = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data;
         }
     }
-    else if (gSpecialVar_0x8005 == 4)
+    else if (gSpecialVar_0x8005 == APPRENTICE_QUESTION_WHAT_ITEM)
     {
-        if (PLAYER_APPRENTICE.field_B1_1 >= 3
-            && PLAYER_APPRENTICE.field_B1_1 < count + 3
-            && PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_0 == 1)
+        if (PLAYER_APPRENTICE.questionsAnswered >= NUM_WHICH_MON_QUESTIONS
+            && PLAYER_APPRENTICE.questionsAnswered < count + NUM_WHICH_MON_QUESTIONS
+            && PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].questionId == QUESTION_ID_WHAT_ITEM)
         {
-            count = PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_1;
+            // count re-used as monId
+            count = PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].monId;
             APPRENTICE_SPECIES_ID_2(id2, count);
-            gUnknown_030062F0->unk0 = gApprentices[PLAYER_APPRENTICE.id].species[id2];
+            gApprenticeQuestionData->speciesId = gApprentices[PLAYER_APPRENTICE.id].species[id2];
         }
     }
 }
 
-static void sub_81A0FE4(void)
+static void FreeQuestionData(void)
 {
-    FREE_AND_SET_NULL(gUnknown_030062F0);
+    FREE_AND_SET_NULL(gApprenticeQuestionData);
 }
 
-static void sub_81A0FFC(void)
+static void ApprenticeBufferString(void)
 {
     u8 *stringDst;
     u8 text[16];
@@ -1958,41 +1066,41 @@ static void sub_81A0FFC(void)
     switch (gSpecialVar_0x8006)
     {
     case APPRENTICE_BUFF_SPECIES1:
-        StringCopy(stringDst, gSpeciesNames[gUnknown_030062F0->unk0]);
+        StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->speciesId]);
         break;
     case APPRENTICE_BUFF_SPECIES2:
-        StringCopy(stringDst, gSpeciesNames[gUnknown_030062F0->unk2]);
+        StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->altSpeciesId]);
         break;
     case APPRENTICE_BUFF_SPECIES3:
-        StringCopy(stringDst, gSpeciesNames[gUnknown_030062F0->unk0]);
+        StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->speciesId]);
         break;
     case APPRENTICE_BUFF_MOVE1:
-        StringCopy(stringDst, gMoveNames[gUnknown_030062F0->unk4]);
+        StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->moveId1]);
         break;
     case APPRENTICE_BUFF_MOVE2:
-        StringCopy(stringDst, gMoveNames[gUnknown_030062F0->unk6]);
+        StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->moveId2]);
         break;
     case APPRENTICE_BUFF_ITEM:
-        StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2));
+        StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data));
         break;
     case APPRENTICE_BUFF_NAME:
         TVShowConvertInternationalString(text, GetApprenticeNameInLanguage(PLAYER_APPRENTICE.id, LANGUAGE_ENGLISH), LANGUAGE_ENGLISH);
         StringCopy(stringDst, text);
         break;
     case APPRENTICE_BUFF_LEVEL:
-        if (PLAYER_APPRENTICE.activeLvlMode == 1)
+        if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
             StringCopy(stringDst, gText_Lv50);
-        else
+        else // == APPRENTICE_LVL_MODE_OPEN
             StringCopy(stringDst, gText_OpenLevel);
         break;
-    case APPRENTICE_BUFF_EASY_CHAT:
-        FrontierSpeechToString(gSaveBlock2Ptr->apprentices[0].easyChatWords);
+    case APPRENTICE_BUFF_WIN_SPEECH:
+        FrontierSpeechToString(gSaveBlock2Ptr->apprentices[0].speechWon);
         StringCopy(stringDst, gStringVar4);
         break;
-    case APPRENTICE_BUFF_SPECIES4:
-        if (PLAYER_APPRENTICE.field_B1_2 < 3)
+    case APPRENTICE_BUFF_LEAD_MON_SPECIES:
+        if (PLAYER_APPRENTICE.leadMonId < MULTI_PARTY_SIZE)
         {
-            APPRENTICE_SPECIES_ID(speciesArrayId, PLAYER_APPRENTICE.field_B1_2);
+            APPRENTICE_SPECIES_ID(speciesArrayId, PLAYER_APPRENTICE.leadMonId);
         }
         else
         {
@@ -2003,56 +1111,57 @@ static void sub_81A0FFC(void)
     }
 }
 
-static void sub_81A11F8(void)
+static void SetLeadApprenticeMon(void)
 {
-    PLAYER_APPRENTICE.field_B1_2 = gSpecialVar_0x8005;
+    PLAYER_APPRENTICE.leadMonId = gSpecialVar_0x8005;
 }
 
-static void sub_81A1218(void)
+static void Script_ApprenticeOpenBagMenu(void)
 {
-    sub_81AAC28();
+    ApprenticeOpenBagMenu();
 }
 
-static void sub_81A1224(void)
+static void TrySetApprenticeHeldItem(void)
 {
     u8 i, j;
     u8 count;
 
-    if (PLAYER_APPRENTICE.field_B1_1 < 3)
+    if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
         return;
 
-    for (count = 0, j = 0; j < 9 && PLAYER_APPRENTICE.field_B8[j].unk0_0; count++, j++)
+    for (count = 0, j = 0; j < APPRENTICE_MAX_QUESTIONS && PLAYER_APPRENTICE.questions[j].questionId != QUESTION_ID_WIN_SPEECH; count++, j++)
         ;
 
-    for (i = 0; i < count && i < PLAYER_APPRENTICE.field_B1_1 - 3; i++)
+    // Make sure the item hasnt already been suggested in previous questions
+    for (i = 0; i < count && i < CURRENT_QUESTION_NUM; i++)
     {
         do {} while(0);
-        if (PLAYER_APPRENTICE.field_B8[i].unk0_0 == 1
-            && PLAYER_APPRENTICE.field_B8[i].unk0_3
-            && PLAYER_APPRENTICE.field_B8[i].unk2 == gSpecialVar_0x8005)
+        if (PLAYER_APPRENTICE.questions[i].questionId == QUESTION_ID_WHAT_ITEM
+            && PLAYER_APPRENTICE.questions[i].suggestedChange
+            && PLAYER_APPRENTICE.questions[i].data == gSpecialVar_0x8005)
         {
-            PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_3 = 0;
-            PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2 = gSpecialVar_0x8005;
-            gSpecialVar_Result = 0;
+            PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].suggestedChange = FALSE;
+            PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data = gSpecialVar_0x8005;
+            gSpecialVar_Result = FALSE;
             return;
         }
     }
 
-    PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_3 = 1;
-    PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2 = gSpecialVar_0x8005;
-    gSpecialVar_Result = 1;
+    PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].suggestedChange = TRUE;
+    PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data = gSpecialVar_0x8005;
+    gSpecialVar_Result = TRUE;
 }
 
-static void sub_81A1370(void)
+static void ShiftSavedApprentices(void)
 {
     s32 i;
-    s32 r10;
-    s32 r9;
+    s32 apprenticeNum;
+    s32 apprenticeIdx;
 
     if (gSaveBlock2Ptr->apprentices[0].playerName[0] == EOS)
         return;
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < APPRENTICE_COUNT - 1; i++)
     {
         if (gSaveBlock2Ptr->apprentices[i + 1].playerName[0] == EOS)
         {
@@ -2061,37 +1170,39 @@ static void sub_81A1370(void)
         }
     }
 
-    r10 = 0xFFFF;
-    r9 = -1;
-    for (i = 1; i < TRAINER_ID_LENGTH; i++)
+    apprenticeNum = 0xFFFF;
+    apprenticeIdx = -1;
+    for (i = 1; i < APPRENTICE_COUNT; i++)
     {
         if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId)
-            && gSaveBlock2Ptr->apprentices[i].number < r10)
+            && gSaveBlock2Ptr->apprentices[i].number < apprenticeNum)
         {
-            r10 = gSaveBlock2Ptr->apprentices[i].number;
-            r9 = i;
+            apprenticeNum = gSaveBlock2Ptr->apprentices[i].number;
+            apprenticeIdx = i;
         }
     }
 
-    if (r9 > 0)
-        gSaveBlock2Ptr->apprentices[r9] = gSaveBlock2Ptr->apprentices[0];
+    if (apprenticeIdx > 0)
+        gSaveBlock2Ptr->apprentices[apprenticeIdx] = gSaveBlock2Ptr->apprentices[0];
 }
 
-static void sub_81A1438(void)
+// Apprentice is always saved in the first slot. Pre-existing Apprentices are moved by ShiftSavedApprentices
+static void SaveApprentice(void)
 {
     u8 i;
 
     gSaveBlock2Ptr->apprentices[0].id = PLAYER_APPRENTICE.id;
-    gSaveBlock2Ptr->apprentices[0].lvlMode = PLAYER_APPRENTICE.activeLvlMode;
+    gSaveBlock2Ptr->apprentices[0].lvlMode = PLAYER_APPRENTICE.lvlMode;
 
-    for (i = 0; i < 9 && PLAYER_APPRENTICE.field_B8[i].unk0_0; i++)
+    // Count questions asked until the final (win speech) question was reached
+    for (i = 0; i < APPRENTICE_MAX_QUESTIONS && (PLAYER_APPRENTICE.questions[i].questionId != QUESTION_ID_WIN_SPEECH); i++)
         ;
 
-    gSaveBlock2Ptr->apprentices[0].field_1 = i;
+    gSaveBlock2Ptr->apprentices[0].numQuestions = i;
     if (gSaveBlock2Ptr->apprentices[0].number < 255)
         gSaveBlock2Ptr->apprentices[0].number++;
 
-    sub_81A0390(gSaveBlock2Ptr->apprentices[0].field_1);
+    SaveApprenticeParty(gSaveBlock2Ptr->apprentices[0].numQuestions);
     for (i = 0; i < TRAINER_ID_LENGTH; i++)
         gSaveBlock2Ptr->apprentices[0].playerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
 
@@ -2100,13 +1211,13 @@ static void sub_81A1438(void)
     CalcApprenticeChecksum(&gSaveBlock2Ptr->apprentices[0]);
 }
 
-static void sub_81A150C(void)
+// Never called, APPRENTICE_FUNC_SET_GFX_SAVED is unused
+static void SetSavedApprenticeTrainerGfxId(void)
 {
     u8 i;
     u8 mapObjectGfxId;
     u8 class = gApprentices[gSaveBlock2Ptr->apprentices[0].id].facilityClass;
 
-    // Search male classes.
     for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++)
         ;
     if (i != ARRAY_COUNT(gTowerMaleFacilityClasses))
@@ -2125,7 +1236,7 @@ static void sub_81A150C(void)
     }
 }
 
-static void Script_SetPlayerApprenticeTrainerGfxId(void)
+static void SetPlayerApprenticeTrainerGfxId(void)
 {
     u8 i;
     u8 mapObjectGfxId;
@@ -2149,14 +1260,16 @@ static void Script_SetPlayerApprenticeTrainerGfxId(void)
     }
 }
 
-static void sub_81A1638(void)
+// Both of the below functions may have been dummied / used for debug
+// In all cases theres a conditional for VAR_0x8004 right after the call to these functions
+static void GetShouldCheckApprenticeGone(void)
 {
-    gSpecialVar_0x8004 = 1;
+    gSpecialVar_0x8004 = TRUE;
 }
 
-static void sub_81A1644(void)
+static void GetShouldApprenticeLeave(void)
 {
-    gSpecialVar_0x8004 = 1;
+    gSpecialVar_0x8004 = TRUE;
 }
 
 const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language)
@@ -2181,7 +1294,8 @@ const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language)
     }
 }
 
-static void sub_81A16B4(u8 taskId)
+// Functionally unused
+static void Task_SwitchToFollowupFuncAfterButtonPress(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
         SwitchTaskToFollowupFunc(taskId);
@@ -2191,8 +1305,8 @@ static void Task_ExecuteFuncAfterButtonPress(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
     {
-        gUnknown_030062F4 = (void*)(u32)(((u16)gTasks[taskId].data[0] | (gTasks[taskId].data[1] << 0x10)));
-        gUnknown_030062F4();
+        gApprenticeFunc = (void*)(u32)(((u16)gTasks[taskId].data[0] | (gTasks[taskId].data[1] << 16)));
+        gApprenticeFunc();
         DestroyTask(taskId);
     }
 }
@@ -2204,8 +1318,9 @@ static void ExecuteFuncAfterButtonPress(void (*func)(void))
     gTasks[taskId].data[1] = (u32)(func) >> 16;
 }
 
-static void sub_81A175C(TaskFunc taskFunc)
+// Unused
+static void ExecuteFollowupFuncAfterButtonPress(TaskFunc task)
 {
-    u8 taskId = CreateTask(sub_81A16B4, 1);
-    SetTaskFuncWithFollowupFunc(taskId, sub_81A16B4, taskFunc);
+    u8 taskId = CreateTask(Task_SwitchToFollowupFuncAfterButtonPress, 1);
+    SetTaskFuncWithFollowupFunc(taskId, Task_SwitchToFollowupFuncAfterButtonPress, task);
 }
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index b581a8bbc..c9a6a6606 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -54,105 +54,105 @@ static void BattleAI_DoAIProcessing(void);
 static void AIStackPushVar(const u8 *);
 static bool8 AIStackPop(void);
 
-static void BattleAICmd_if_random_less_than(void);
-static void BattleAICmd_if_random_greater_than(void);
-static void BattleAICmd_if_random_equal(void);
-static void BattleAICmd_if_random_not_equal(void);
-static void BattleAICmd_score(void);
-static void BattleAICmd_if_hp_less_than(void);
-static void BattleAICmd_if_hp_more_than(void);
-static void BattleAICmd_if_hp_equal(void);
-static void BattleAICmd_if_hp_not_equal(void);
-static void BattleAICmd_if_status(void);
-static void BattleAICmd_if_not_status(void);
-static void BattleAICmd_if_status2(void);
-static void BattleAICmd_if_not_status2(void);
-static void BattleAICmd_if_status3(void);
-static void BattleAICmd_if_not_status3(void);
-static void BattleAICmd_if_side_affecting(void);
-static void BattleAICmd_if_not_side_affecting(void);
-static void BattleAICmd_if_less_than(void);
-static void BattleAICmd_if_more_than(void);
-static void BattleAICmd_if_equal(void);
-static void BattleAICmd_if_not_equal(void);
-static void BattleAICmd_if_less_than_ptr(void);
-static void BattleAICmd_if_more_than_ptr(void);
-static void BattleAICmd_if_equal_ptr(void);
-static void BattleAICmd_if_not_equal_ptr(void);
-static void BattleAICmd_if_move(void);
-static void BattleAICmd_if_not_move(void);
-static void BattleAICmd_if_in_bytes(void);
-static void BattleAICmd_if_not_in_bytes(void);
-static void BattleAICmd_if_in_hwords(void);
-static void BattleAICmd_if_not_in_hwords(void);
-static void BattleAICmd_if_user_has_attacking_move(void);
-static void BattleAICmd_if_user_has_no_attacking_moves(void);
-static void BattleAICmd_get_turn_count(void);
-static void BattleAICmd_get_type(void);
-static void BattleAICmd_get_considered_move_power(void);
-static void BattleAICmd_get_how_powerful_move_is(void);
-static void BattleAICmd_get_last_used_battler_move(void);
-static void BattleAICmd_if_equal_(void);
-static void BattleAICmd_if_not_equal_(void);
-static void BattleAICmd_if_user_goes(void);
-static void BattleAICmd_if_user_doesnt_go(void);
-static void BattleAICmd_nullsub_2A(void);
-static void BattleAICmd_nullsub_2B(void);
-static void BattleAICmd_count_usable_party_mons(void);
-static void BattleAICmd_get_considered_move(void);
-static void BattleAICmd_get_considered_move_effect(void);
-static void BattleAICmd_get_ability(void);
-static void BattleAICmd_get_highest_type_effectiveness(void);
-static void BattleAICmd_if_type_effectiveness(void);
-static void BattleAICmd_nullsub_32(void);
-static void BattleAICmd_nullsub_33(void);
-static void BattleAICmd_if_status_in_party(void);
-static void BattleAICmd_if_status_not_in_party(void);
-static void BattleAICmd_get_weather(void);
-static void BattleAICmd_if_effect(void);
-static void BattleAICmd_if_not_effect(void);
-static void BattleAICmd_if_stat_level_less_than(void);
-static void BattleAICmd_if_stat_level_more_than(void);
-static void BattleAICmd_if_stat_level_equal(void);
-static void BattleAICmd_if_stat_level_not_equal(void);
-static void BattleAICmd_if_can_faint(void);
-static void BattleAICmd_if_cant_faint(void);
-static void BattleAICmd_if_has_move(void);
-static void BattleAICmd_if_doesnt_have_move(void);
-static void BattleAICmd_if_has_move_with_effect(void);
-static void BattleAICmd_if_doesnt_have_move_with_effect(void);
-static void BattleAICmd_if_any_move_disabled_or_encored(void);
-static void BattleAICmd_if_curr_move_disabled_or_encored(void);
-static void BattleAICmd_flee(void);
-static void BattleAICmd_if_random_safari_flee(void);
-static void BattleAICmd_watch(void);
-static void BattleAICmd_get_hold_effect(void);
-static void BattleAICmd_get_gender(void);
-static void BattleAICmd_is_first_turn_for(void);
-static void BattleAICmd_get_stockpile_count(void);
-static void BattleAICmd_is_double_battle(void);
-static void BattleAICmd_get_used_held_item(void);
-static void BattleAICmd_get_move_type_from_result(void);
-static void BattleAICmd_get_move_power_from_result(void);
-static void BattleAICmd_get_move_effect_from_result(void);
-static void BattleAICmd_get_protect_count(void);
-static void BattleAICmd_nullsub_52(void);
-static void BattleAICmd_nullsub_53(void);
-static void BattleAICmd_nullsub_54(void);
-static void BattleAICmd_nullsub_55(void);
-static void BattleAICmd_nullsub_56(void);
-static void BattleAICmd_nullsub_57(void);
-static void BattleAICmd_call(void);
-static void BattleAICmd_goto(void);
-static void BattleAICmd_end(void);
-static void BattleAICmd_if_level_cond(void);
-static void BattleAICmd_if_target_taunted(void);
-static void BattleAICmd_if_target_not_taunted(void);
-static void BattleAICmd_check_ability(void);
-static void BattleAICmd_is_of_type(void);
-static void BattleAICmd_if_target_is_ally(void);
-static void BattleAICmd_if_flash_fired(void);
-static void BattleAICmd_if_holds_item(void);
+static void Cmd_if_random_less_than(void);
+static void Cmd_if_random_greater_than(void);
+static void Cmd_if_random_equal(void);
+static void Cmd_if_random_not_equal(void);
+static void Cmd_score(void);
+static void Cmd_if_hp_less_than(void);
+static void Cmd_if_hp_more_than(void);
+static void Cmd_if_hp_equal(void);
+static void Cmd_if_hp_not_equal(void);
+static void Cmd_if_status(void);
+static void Cmd_if_not_status(void);
+static void Cmd_if_status2(void);
+static void Cmd_if_not_status2(void);
+static void Cmd_if_status3(void);
+static void Cmd_if_not_status3(void);
+static void Cmd_if_side_affecting(void);
+static void Cmd_if_not_side_affecting(void);
+static void Cmd_if_less_than(void);
+static void Cmd_if_more_than(void);
+static void Cmd_if_equal(void);
+static void Cmd_if_not_equal(void);
+static void Cmd_if_less_than_ptr(void);
+static void Cmd_if_more_than_ptr(void);
+static void Cmd_if_equal_ptr(void);
+static void Cmd_if_not_equal_ptr(void);
+static void Cmd_if_move(void);
+static void Cmd_if_not_move(void);
+static void Cmd_if_in_bytes(void);
+static void Cmd_if_not_in_bytes(void);
+static void Cmd_if_in_hwords(void);
+static void Cmd_if_not_in_hwords(void);
+static void Cmd_if_user_has_attacking_move(void);
+static void Cmd_if_user_has_no_attacking_moves(void);
+static void Cmd_get_turn_count(void);
+static void Cmd_get_type(void);
+static void Cmd_get_considered_move_power(void);
+static void Cmd_get_how_powerful_move_is(void);
+static void Cmd_get_last_used_battler_move(void);
+static void Cmd_if_equal_(void);
+static void Cmd_if_not_equal_(void);
+static void Cmd_if_user_goes(void);
+static void Cmd_if_user_doesnt_go(void);
+static void Cmd_nullsub_2A(void);
+static void Cmd_nullsub_2B(void);
+static void Cmd_count_usable_party_mons(void);
+static void Cmd_get_considered_move(void);
+static void Cmd_get_considered_move_effect(void);
+static void Cmd_get_ability(void);
+static void Cmd_get_highest_type_effectiveness(void);
+static void Cmd_if_type_effectiveness(void);
+static void Cmd_nullsub_32(void);
+static void Cmd_nullsub_33(void);
+static void Cmd_if_status_in_party(void);
+static void Cmd_if_status_not_in_party(void);
+static void Cmd_get_weather(void);
+static void Cmd_if_effect(void);
+static void Cmd_if_not_effect(void);
+static void Cmd_if_stat_level_less_than(void);
+static void Cmd_if_stat_level_more_than(void);
+static void Cmd_if_stat_level_equal(void);
+static void Cmd_if_stat_level_not_equal(void);
+static void Cmd_if_can_faint(void);
+static void Cmd_if_cant_faint(void);
+static void Cmd_if_has_move(void);
+static void Cmd_if_doesnt_have_move(void);
+static void Cmd_if_has_move_with_effect(void);
+static void Cmd_if_doesnt_have_move_with_effect(void);
+static void Cmd_if_any_move_disabled_or_encored(void);
+static void Cmd_if_curr_move_disabled_or_encored(void);
+static void Cmd_flee(void);
+static void Cmd_if_random_safari_flee(void);
+static void Cmd_watch(void);
+static void Cmd_get_hold_effect(void);
+static void Cmd_get_gender(void);
+static void Cmd_is_first_turn_for(void);
+static void Cmd_get_stockpile_count(void);
+static void Cmd_is_double_battle(void);
+static void Cmd_get_used_held_item(void);
+static void Cmd_get_move_type_from_result(void);
+static void Cmd_get_move_power_from_result(void);
+static void Cmd_get_move_effect_from_result(void);
+static void Cmd_get_protect_count(void);
+static void Cmd_nullsub_52(void);
+static void Cmd_nullsub_53(void);
+static void Cmd_nullsub_54(void);
+static void Cmd_nullsub_55(void);
+static void Cmd_nullsub_56(void);
+static void Cmd_nullsub_57(void);
+static void Cmd_call(void);
+static void Cmd_goto(void);
+static void Cmd_end(void);
+static void Cmd_if_level_cond(void);
+static void Cmd_if_target_taunted(void);
+static void Cmd_if_target_not_taunted(void);
+static void Cmd_check_ability(void);
+static void Cmd_is_of_type(void);
+static void Cmd_if_target_is_ally(void);
+static void Cmd_if_flash_fired(void);
+static void Cmd_if_holds_item(void);
 
 // ewram
 EWRAM_DATA const u8 *gAIScriptPtr = NULL;
@@ -163,105 +163,105 @@ typedef void (*BattleAICmdFunc)(void);
 
 static const BattleAICmdFunc sBattleAICmdTable[] =
 {
-    BattleAICmd_if_random_less_than,                        // 0x0
-    BattleAICmd_if_random_greater_than,                     // 0x1
-    BattleAICmd_if_random_equal,                            // 0x2
-    BattleAICmd_if_random_not_equal,                        // 0x3
-    BattleAICmd_score,                                      // 0x4
-    BattleAICmd_if_hp_less_than,                            // 0x5
-    BattleAICmd_if_hp_more_than,                            // 0x6
-    BattleAICmd_if_hp_equal,                                // 0x7
-    BattleAICmd_if_hp_not_equal,                            // 0x8
-    BattleAICmd_if_status,                                  // 0x9
-    BattleAICmd_if_not_status,                              // 0xA
-    BattleAICmd_if_status2,                                 // 0xB
-    BattleAICmd_if_not_status2,                             // 0xC
-    BattleAICmd_if_status3,                                 // 0xD
-    BattleAICmd_if_not_status3,                             // 0xE
-    BattleAICmd_if_side_affecting,                          // 0xF
-    BattleAICmd_if_not_side_affecting,                      // 0x10
-    BattleAICmd_if_less_than,                               // 0x11
-    BattleAICmd_if_more_than,                               // 0x12
-    BattleAICmd_if_equal,                                   // 0x13
-    BattleAICmd_if_not_equal,                               // 0x14
-    BattleAICmd_if_less_than_ptr,                           // 0x15
-    BattleAICmd_if_more_than_ptr,                           // 0x16
-    BattleAICmd_if_equal_ptr,                               // 0x17
-    BattleAICmd_if_not_equal_ptr,                           // 0x18
-    BattleAICmd_if_move,                                    // 0x19
-    BattleAICmd_if_not_move,                                // 0x1A
-    BattleAICmd_if_in_bytes,                                // 0x1B
-    BattleAICmd_if_not_in_bytes,                            // 0x1C
-    BattleAICmd_if_in_hwords,                               // 0x1D
-    BattleAICmd_if_not_in_hwords,                           // 0x1E
-    BattleAICmd_if_user_has_attacking_move,                 // 0x1F
-    BattleAICmd_if_user_has_no_attacking_moves,             // 0x20
-    BattleAICmd_get_turn_count,                             // 0x21
-    BattleAICmd_get_type,                                   // 0x22
-    BattleAICmd_get_considered_move_power,                  // 0x23
-    BattleAICmd_get_how_powerful_move_is,                   // 0x24
-    BattleAICmd_get_last_used_battler_move,                 // 0x25
-    BattleAICmd_if_equal_,                                  // 0x26
-    BattleAICmd_if_not_equal_,                              // 0x27
-    BattleAICmd_if_user_goes,                               // 0x28
-    BattleAICmd_if_user_doesnt_go,                          // 0x29
-    BattleAICmd_nullsub_2A,                                 // 0x2A
-    BattleAICmd_nullsub_2B,                                 // 0x2B
-    BattleAICmd_count_usable_party_mons,                    // 0x2C
-    BattleAICmd_get_considered_move,                        // 0x2D
-    BattleAICmd_get_considered_move_effect,                 // 0x2E
-    BattleAICmd_get_ability,                                // 0x2F
-    BattleAICmd_get_highest_type_effectiveness,             // 0x30
-    BattleAICmd_if_type_effectiveness,                      // 0x31
-    BattleAICmd_nullsub_32,                                 // 0x32
-    BattleAICmd_nullsub_33,                                 // 0x33
-    BattleAICmd_if_status_in_party,                         // 0x34
-    BattleAICmd_if_status_not_in_party,                     // 0x35
-    BattleAICmd_get_weather,                                // 0x36
-    BattleAICmd_if_effect,                                  // 0x37
-    BattleAICmd_if_not_effect,                              // 0x38
-    BattleAICmd_if_stat_level_less_than,                    // 0x39
-    BattleAICmd_if_stat_level_more_than,                    // 0x3A
-    BattleAICmd_if_stat_level_equal,                        // 0x3B
-    BattleAICmd_if_stat_level_not_equal,                    // 0x3C
-    BattleAICmd_if_can_faint,                               // 0x3D
-    BattleAICmd_if_cant_faint,                              // 0x3E
-    BattleAICmd_if_has_move,                                // 0x3F
-    BattleAICmd_if_doesnt_have_move,                        // 0x40
-    BattleAICmd_if_has_move_with_effect,                    // 0x41
-    BattleAICmd_if_doesnt_have_move_with_effect,            // 0x42
-    BattleAICmd_if_any_move_disabled_or_encored,            // 0x43
-    BattleAICmd_if_curr_move_disabled_or_encored,           // 0x44
-    BattleAICmd_flee,                                       // 0x45
-    BattleAICmd_if_random_safari_flee,                      // 0x46
-    BattleAICmd_watch,                                      // 0x47
-    BattleAICmd_get_hold_effect,                            // 0x48
-    BattleAICmd_get_gender,                                 // 0x49
-    BattleAICmd_is_first_turn_for,                          // 0x4A
-    BattleAICmd_get_stockpile_count,                        // 0x4B
-    BattleAICmd_is_double_battle,                           // 0x4C
-    BattleAICmd_get_used_held_item,                         // 0x4D
-    BattleAICmd_get_move_type_from_result,                  // 0x4E
-    BattleAICmd_get_move_power_from_result,                 // 0x4F
-    BattleAICmd_get_move_effect_from_result,                // 0x50
-    BattleAICmd_get_protect_count,                          // 0x51
-    BattleAICmd_nullsub_52,                                 // 0x52
-    BattleAICmd_nullsub_53,                                 // 0x53
-    BattleAICmd_nullsub_54,                                 // 0x54
-    BattleAICmd_nullsub_55,                                 // 0x55
-    BattleAICmd_nullsub_56,                                 // 0x56
-    BattleAICmd_nullsub_57,                                 // 0x57
-    BattleAICmd_call,                                       // 0x58
-    BattleAICmd_goto,                                       // 0x59
-    BattleAICmd_end,                                        // 0x5A
-    BattleAICmd_if_level_cond,                              // 0x5B
-    BattleAICmd_if_target_taunted,                          // 0x5C
-    BattleAICmd_if_target_not_taunted,                      // 0x5D
-    BattleAICmd_if_target_is_ally,                          // 0x5E
-    BattleAICmd_is_of_type,                                 // 0x5F
-    BattleAICmd_check_ability,                              // 0x60
-    BattleAICmd_if_flash_fired,                             // 0x61
-    BattleAICmd_if_holds_item,                              // 0x62
+    Cmd_if_random_less_than,                        // 0x0
+    Cmd_if_random_greater_than,                     // 0x1
+    Cmd_if_random_equal,                            // 0x2
+    Cmd_if_random_not_equal,                        // 0x3
+    Cmd_score,                                      // 0x4
+    Cmd_if_hp_less_than,                            // 0x5
+    Cmd_if_hp_more_than,                            // 0x6
+    Cmd_if_hp_equal,                                // 0x7
+    Cmd_if_hp_not_equal,                            // 0x8
+    Cmd_if_status,                                  // 0x9
+    Cmd_if_not_status,                              // 0xA
+    Cmd_if_status2,                                 // 0xB
+    Cmd_if_not_status2,                             // 0xC
+    Cmd_if_status3,                                 // 0xD
+    Cmd_if_not_status3,                             // 0xE
+    Cmd_if_side_affecting,                          // 0xF
+    Cmd_if_not_side_affecting,                      // 0x10
+    Cmd_if_less_than,                               // 0x11
+    Cmd_if_more_than,                               // 0x12
+    Cmd_if_equal,                                   // 0x13
+    Cmd_if_not_equal,                               // 0x14
+    Cmd_if_less_than_ptr,                           // 0x15
+    Cmd_if_more_than_ptr,                           // 0x16
+    Cmd_if_equal_ptr,                               // 0x17
+    Cmd_if_not_equal_ptr,                           // 0x18
+    Cmd_if_move,                                    // 0x19
+    Cmd_if_not_move,                                // 0x1A
+    Cmd_if_in_bytes,                                // 0x1B
+    Cmd_if_not_in_bytes,                            // 0x1C
+    Cmd_if_in_hwords,                               // 0x1D
+    Cmd_if_not_in_hwords,                           // 0x1E
+    Cmd_if_user_has_attacking_move,                 // 0x1F
+    Cmd_if_user_has_no_attacking_moves,             // 0x20
+    Cmd_get_turn_count,                             // 0x21
+    Cmd_get_type,                                   // 0x22
+    Cmd_get_considered_move_power,                  // 0x23
+    Cmd_get_how_powerful_move_is,                   // 0x24
+    Cmd_get_last_used_battler_move,                 // 0x25
+    Cmd_if_equal_,                                  // 0x26
+    Cmd_if_not_equal_,                              // 0x27
+    Cmd_if_user_goes,                               // 0x28
+    Cmd_if_user_doesnt_go,                          // 0x29
+    Cmd_nullsub_2A,                                 // 0x2A
+    Cmd_nullsub_2B,                                 // 0x2B
+    Cmd_count_usable_party_mons,                    // 0x2C
+    Cmd_get_considered_move,                        // 0x2D
+    Cmd_get_considered_move_effect,                 // 0x2E
+    Cmd_get_ability,                                // 0x2F
+    Cmd_get_highest_type_effectiveness,             // 0x30
+    Cmd_if_type_effectiveness,                      // 0x31
+    Cmd_nullsub_32,                                 // 0x32
+    Cmd_nullsub_33,                                 // 0x33
+    Cmd_if_status_in_party,                         // 0x34
+    Cmd_if_status_not_in_party,                     // 0x35
+    Cmd_get_weather,                                // 0x36
+    Cmd_if_effect,                                  // 0x37
+    Cmd_if_not_effect,                              // 0x38
+    Cmd_if_stat_level_less_than,                    // 0x39
+    Cmd_if_stat_level_more_than,                    // 0x3A
+    Cmd_if_stat_level_equal,                        // 0x3B
+    Cmd_if_stat_level_not_equal,                    // 0x3C
+    Cmd_if_can_faint,                               // 0x3D
+    Cmd_if_cant_faint,                              // 0x3E
+    Cmd_if_has_move,                                // 0x3F
+    Cmd_if_doesnt_have_move,                        // 0x40
+    Cmd_if_has_move_with_effect,                    // 0x41
+    Cmd_if_doesnt_have_move_with_effect,            // 0x42
+    Cmd_if_any_move_disabled_or_encored,            // 0x43
+    Cmd_if_curr_move_disabled_or_encored,           // 0x44
+    Cmd_flee,                                       // 0x45
+    Cmd_if_random_safari_flee,                      // 0x46
+    Cmd_watch,                                      // 0x47
+    Cmd_get_hold_effect,                            // 0x48
+    Cmd_get_gender,                                 // 0x49
+    Cmd_is_first_turn_for,                          // 0x4A
+    Cmd_get_stockpile_count,                        // 0x4B
+    Cmd_is_double_battle,                           // 0x4C
+    Cmd_get_used_held_item,                         // 0x4D
+    Cmd_get_move_type_from_result,                  // 0x4E
+    Cmd_get_move_power_from_result,                 // 0x4F
+    Cmd_get_move_effect_from_result,                // 0x50
+    Cmd_get_protect_count,                          // 0x51
+    Cmd_nullsub_52,                                 // 0x52
+    Cmd_nullsub_53,                                 // 0x53
+    Cmd_nullsub_54,                                 // 0x54
+    Cmd_nullsub_55,                                 // 0x55
+    Cmd_nullsub_56,                                 // 0x56
+    Cmd_nullsub_57,                                 // 0x57
+    Cmd_call,                                       // 0x58
+    Cmd_goto,                                       // 0x59
+    Cmd_end,                                        // 0x5A
+    Cmd_if_level_cond,                              // 0x5B
+    Cmd_if_target_taunted,                          // 0x5C
+    Cmd_if_target_not_taunted,                      // 0x5D
+    Cmd_if_target_is_ally,                          // 0x5E
+    Cmd_is_of_type,                                 // 0x5F
+    Cmd_check_ability,                              // 0x60
+    Cmd_if_flash_fired,                             // 0x61
+    Cmd_if_holds_item,                              // 0x62
 };
 
 static const u16 sDiscouragedPowerfulMoveEffects[] =
@@ -653,7 +653,7 @@ void ClearBattlerItemEffectHistory(u8 battlerId)
     BATTLE_HISTORY->itemEffects[battlerId] = 0;
 }
 
-static void BattleAICmd_if_random_less_than(void)
+static void Cmd_if_random_less_than(void)
 {
     u16 random = Random();
 
@@ -663,7 +663,7 @@ static void BattleAICmd_if_random_less_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_greater_than(void)
+static void Cmd_if_random_greater_than(void)
 {
     u16 random = Random();
 
@@ -673,7 +673,7 @@ static void BattleAICmd_if_random_greater_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_equal(void)
+static void Cmd_if_random_equal(void)
 {
     u16 random = Random();
 
@@ -683,7 +683,7 @@ static void BattleAICmd_if_random_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_not_equal(void)
+static void Cmd_if_random_not_equal(void)
 {
     u16 random = Random();
 
@@ -693,7 +693,7 @@ static void BattleAICmd_if_random_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_score(void)
+static void Cmd_score(void)
 {
     AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // Add the result to the array of the move consider's score.
 
@@ -703,7 +703,7 @@ static void BattleAICmd_score(void)
     gAIScriptPtr += 2; // AI return.
 }
 
-static void BattleAICmd_if_hp_less_than(void)
+static void Cmd_if_hp_less_than(void)
 {
     u16 battlerId;
 
@@ -718,7 +718,7 @@ static void BattleAICmd_if_hp_less_than(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_more_than(void)
+static void Cmd_if_hp_more_than(void)
 {
     u16 battlerId;
 
@@ -733,7 +733,7 @@ static void BattleAICmd_if_hp_more_than(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_equal(void)
+static void Cmd_if_hp_equal(void)
 {
     u16 battlerId;
 
@@ -748,7 +748,7 @@ static void BattleAICmd_if_hp_equal(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_not_equal(void)
+static void Cmd_if_hp_not_equal(void)
 {
     u16 battlerId;
 
@@ -763,7 +763,7 @@ static void BattleAICmd_if_hp_not_equal(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_status(void)
+static void Cmd_if_status(void)
 {
     u16 battlerId;
     u32 status;
@@ -781,7 +781,7 @@ static void BattleAICmd_if_status(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status(void)
+static void Cmd_if_not_status(void)
 {
     u16 battlerId;
     u32 status;
@@ -799,7 +799,7 @@ static void BattleAICmd_if_not_status(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status2(void)
+static void Cmd_if_status2(void)
 {
     u16 battlerId;
     u32 status;
@@ -817,7 +817,7 @@ static void BattleAICmd_if_status2(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status2(void)
+static void Cmd_if_not_status2(void)
 {
     u16 battlerId;
     u32 status;
@@ -835,7 +835,7 @@ static void BattleAICmd_if_not_status2(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status3(void)
+static void Cmd_if_status3(void)
 {
     u16 battlerId;
     u32 status;
@@ -853,7 +853,7 @@ static void BattleAICmd_if_status3(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status3(void)
+static void Cmd_if_not_status3(void)
 {
     u16 battlerId;
     u32 status;
@@ -871,7 +871,7 @@ static void BattleAICmd_if_not_status3(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_side_affecting(void)
+static void Cmd_if_side_affecting(void)
 {
     u16 battlerId;
     u32 side, status;
@@ -890,7 +890,7 @@ static void BattleAICmd_if_side_affecting(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_side_affecting(void)
+static void Cmd_if_not_side_affecting(void)
 {
     u16 battlerId;
     u32 side, status;
@@ -909,7 +909,7 @@ static void BattleAICmd_if_not_side_affecting(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_less_than(void)
+static void Cmd_if_less_than(void)
 {
     if (AI_THINKING_STRUCT->funcResult < gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -917,7 +917,7 @@ static void BattleAICmd_if_less_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_more_than(void)
+static void Cmd_if_more_than(void)
 {
     if (AI_THINKING_STRUCT->funcResult > gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -925,7 +925,7 @@ static void BattleAICmd_if_more_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_equal(void)
+static void Cmd_if_equal(void)
 {
     if (AI_THINKING_STRUCT->funcResult == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -933,7 +933,7 @@ static void BattleAICmd_if_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_not_equal(void)
+static void Cmd_if_not_equal(void)
 {
     if (AI_THINKING_STRUCT->funcResult != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -941,7 +941,7 @@ static void BattleAICmd_if_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_less_than_ptr(void)
+static void Cmd_if_less_than_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -951,7 +951,7 @@ static void BattleAICmd_if_less_than_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_more_than_ptr(void)
+static void Cmd_if_more_than_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -961,7 +961,7 @@ static void BattleAICmd_if_more_than_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_equal_ptr(void)
+static void Cmd_if_equal_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -971,7 +971,7 @@ static void BattleAICmd_if_equal_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_equal_ptr(void)
+static void Cmd_if_not_equal_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -981,7 +981,7 @@ static void BattleAICmd_if_not_equal_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_move(void)
+static void Cmd_if_move(void)
 {
     u16 move = T1_READ_16(gAIScriptPtr + 1);
 
@@ -991,7 +991,7 @@ static void BattleAICmd_if_move(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_not_move(void)
+static void Cmd_if_not_move(void)
 {
     u16 move = T1_READ_16(gAIScriptPtr + 1);
 
@@ -1001,7 +1001,7 @@ static void BattleAICmd_if_not_move(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_in_bytes(void)
+static void Cmd_if_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1017,7 +1017,7 @@ static void BattleAICmd_if_in_bytes(void)
     gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_in_bytes(void)
+static void Cmd_if_not_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1033,7 +1033,7 @@ static void BattleAICmd_if_not_in_bytes(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
 }
 
-static void BattleAICmd_if_in_hwords(void)
+static void Cmd_if_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1049,7 +1049,7 @@ static void BattleAICmd_if_in_hwords(void)
     gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_in_hwords(void)
+static void Cmd_if_not_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1065,7 +1065,7 @@ static void BattleAICmd_if_not_in_hwords(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
 }
 
-static void BattleAICmd_if_user_has_attacking_move(void)
+static void Cmd_if_user_has_attacking_move(void)
 {
     s32 i;
 
@@ -1082,7 +1082,7 @@ static void BattleAICmd_if_user_has_attacking_move(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_if_user_has_no_attacking_moves(void)
+static void Cmd_if_user_has_no_attacking_moves(void)
 {
     s32 i;
 
@@ -1099,13 +1099,13 @@ static void BattleAICmd_if_user_has_no_attacking_moves(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_get_turn_count(void)
+static void Cmd_get_turn_count(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleResults.battleTurnCounter;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_type(void)
+static void Cmd_get_type(void)
 {
     u8 typeVar = gAIScriptPtr[1];
 
@@ -1146,7 +1146,7 @@ static u8 BattleAI_GetWantedBattler(u8 wantedBattler)
     }
 }
 
-static void BattleAICmd_is_of_type(void)
+static void Cmd_is_of_type(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1158,13 +1158,13 @@ static void BattleAICmd_is_of_type(void)
     gAIScriptPtr += 3;
 }
 
-static void BattleAICmd_get_considered_move_power(void)
+static void Cmd_get_considered_move_power(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_how_powerful_move_is(void)
+static void Cmd_get_how_powerful_move_is(void)
 {
     s32 i, checkedMove;
     s32 moveDmgs[MAX_MON_MOVES];
@@ -1228,7 +1228,7 @@ static void BattleAICmd_get_how_powerful_move_is(void)
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_get_last_used_battler_move(void)
+static void Cmd_get_last_used_battler_move(void)
 {
     if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI];
@@ -1238,7 +1238,7 @@ static void BattleAICmd_get_last_used_battler_move(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_equal_(void) // Same as if_equal.
+static void Cmd_if_equal_(void) // Same as if_equal.
 {
     if (gAIScriptPtr[1] == AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1246,7 +1246,7 @@ static void BattleAICmd_if_equal_(void) // Same as if_equal.
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_not_equal_(void) // Same as if_not_equal.
+static void Cmd_if_not_equal_(void) // Same as if_not_equal.
 {
     if (gAIScriptPtr[1] != AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1254,7 +1254,7 @@ static void BattleAICmd_if_not_equal_(void) // Same as if_not_equal.
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_user_goes(void)
+static void Cmd_if_user_goes(void)
 {
     if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1262,7 +1262,7 @@ static void BattleAICmd_if_user_goes(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_user_doesnt_go(void)
+static void Cmd_if_user_doesnt_go(void)
 {
     if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1270,15 +1270,15 @@ static void BattleAICmd_if_user_doesnt_go(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_nullsub_2A(void)
+static void Cmd_nullsub_2A(void)
 {
 }
 
-static void BattleAICmd_nullsub_2B(void)
+static void Cmd_nullsub_2B(void)
 {
 }
 
-static void BattleAICmd_count_usable_party_mons(void)
+static void Cmd_count_usable_party_mons(void)
 {
     u8 battlerId;
     u8 battlerOnField1, battlerOnField2;
@@ -1324,19 +1324,19 @@ static void BattleAICmd_count_usable_party_mons(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_considered_move(void)
+static void Cmd_get_considered_move(void)
 {
     AI_THINKING_STRUCT->funcResult = AI_THINKING_STRUCT->moveConsidered;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_considered_move_effect(void)
+static void Cmd_get_considered_move_effect(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_ability(void)
+static void Cmd_get_ability(void)
 {
     u8 battlerId;
 
@@ -1393,7 +1393,7 @@ static void BattleAICmd_get_ability(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_check_ability(void)
+static void Cmd_check_ability(void)
 {
     u32 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 ability = gAIScriptPtr[2];
@@ -1453,7 +1453,7 @@ static void BattleAICmd_check_ability(void)
     gAIScriptPtr += 3;
 }
 
-static void BattleAICmd_get_highest_type_effectiveness(void)
+static void Cmd_get_highest_type_effectiveness(void)
 {
     s32 i;
     u8 *dynamicMoveType;
@@ -1495,7 +1495,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_if_type_effectiveness(void)
+static void Cmd_if_type_effectiveness(void)
 {
     u8 damageVar;
 
@@ -1531,15 +1531,15 @@ static void BattleAICmd_if_type_effectiveness(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_nullsub_32(void)
+static void Cmd_nullsub_32(void)
 {
 }
 
-static void BattleAICmd_nullsub_33(void)
+static void Cmd_nullsub_33(void)
 {
 }
 
-static void BattleAICmd_if_status_in_party(void)
+static void Cmd_if_status_in_party(void)
 {
     struct Pokemon *party;
     s32 i;
@@ -1576,7 +1576,7 @@ static void BattleAICmd_if_status_in_party(void)
     gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status_not_in_party(void)
+static void Cmd_if_status_not_in_party(void)
 {
     struct Pokemon *party;
     s32 i;
@@ -1613,7 +1613,7 @@ static void BattleAICmd_if_status_not_in_party(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
 }
 
-static void BattleAICmd_get_weather(void)
+static void Cmd_get_weather(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_RAIN;
@@ -1627,7 +1627,7 @@ static void BattleAICmd_get_weather(void)
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_if_effect(void)
+static void Cmd_if_effect(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1635,7 +1635,7 @@ static void BattleAICmd_if_effect(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_not_effect(void)
+static void Cmd_if_not_effect(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1643,7 +1643,7 @@ static void BattleAICmd_if_not_effect(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_stat_level_less_than(void)
+static void Cmd_if_stat_level_less_than(void)
 {
     u32 battlerId;
 
@@ -1658,7 +1658,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_more_than(void)
+static void Cmd_if_stat_level_more_than(void)
 {
     u32 battlerId;
 
@@ -1673,7 +1673,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_equal(void)
+static void Cmd_if_stat_level_equal(void)
 {
     u32 battlerId;
 
@@ -1688,7 +1688,7 @@ static void BattleAICmd_if_stat_level_equal(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_not_equal(void)
+static void Cmd_if_stat_level_not_equal(void)
 {
     u32 battlerId;
 
@@ -1703,7 +1703,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_can_faint(void)
+static void Cmd_if_can_faint(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power < 2)
     {
@@ -1732,7 +1732,7 @@ static void BattleAICmd_if_can_faint(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_cant_faint(void)
+static void Cmd_if_cant_faint(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power < 2)
     {
@@ -1759,7 +1759,7 @@ static void BattleAICmd_if_cant_faint(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_has_move(void)
+static void Cmd_if_has_move(void)
 {
     s32 i;
     const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
@@ -1811,7 +1811,7 @@ static void BattleAICmd_if_has_move(void)
     }
 }
 
-static void BattleAICmd_if_doesnt_have_move(void)
+static void Cmd_if_doesnt_have_move(void)
 {
     s32 i;
     const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
@@ -1845,7 +1845,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
     }
 }
 
-static void BattleAICmd_if_has_move_with_effect(void)
+static void Cmd_if_has_move_with_effect(void)
 {
     s32 i;
 
@@ -1879,7 +1879,7 @@ static void BattleAICmd_if_has_move_with_effect(void)
     }
 }
 
-static void BattleAICmd_if_doesnt_have_move_with_effect(void)
+static void Cmd_if_doesnt_have_move_with_effect(void)
 {
     s32 i;
 
@@ -1912,7 +1912,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     }
 }
 
-static void BattleAICmd_if_any_move_disabled_or_encored(void)
+static void Cmd_if_any_move_disabled_or_encored(void)
 {
     u8 battlerId;
 
@@ -1941,7 +1941,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     }
 }
 
-static void BattleAICmd_if_curr_move_disabled_or_encored(void)
+static void Cmd_if_curr_move_disabled_or_encored(void)
 {
     switch (gAIScriptPtr[1])
     {
@@ -1963,12 +1963,12 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void)
     }
 }
 
-static void BattleAICmd_flee(void)
+static void Cmd_flee(void)
 {
     AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_FLEE | AI_ACTION_DO_NOT_ATTACK);
 }
 
-static void BattleAICmd_if_random_safari_flee(void)
+static void Cmd_if_random_safari_flee(void)
 {
     u8 safariFleeRate = gBattleStruct->safariEscapeFactor * 5; // Safari flee rate, from 0-20.
 
@@ -1978,12 +1978,12 @@ static void BattleAICmd_if_random_safari_flee(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_watch(void)
+static void Cmd_watch(void)
 {
     AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK);
 }
 
-static void BattleAICmd_get_hold_effect(void)
+static void Cmd_get_hold_effect(void)
 {
     u8 battlerId;
 
@@ -2000,7 +2000,7 @@ static void BattleAICmd_get_hold_effect(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_holds_item(void)
+static void Cmd_if_holds_item(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u16 item;
@@ -2021,7 +2021,7 @@ static void BattleAICmd_if_holds_item(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_get_gender(void)
+static void Cmd_get_gender(void)
 {
     u8 battlerId;
 
@@ -2035,7 +2035,7 @@ static void BattleAICmd_get_gender(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_first_turn_for(void)
+static void Cmd_is_first_turn_for(void)
 {
     u8 battlerId;
 
@@ -2049,7 +2049,7 @@ static void BattleAICmd_is_first_turn_for(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_stockpile_count(void)
+static void Cmd_get_stockpile_count(void)
 {
     u8 battlerId;
 
@@ -2063,14 +2063,14 @@ static void BattleAICmd_get_stockpile_count(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_double_battle(void)
+static void Cmd_is_double_battle(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleTypeFlags & BATTLE_TYPE_DOUBLE;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_used_held_item(void)
+static void Cmd_get_used_held_item(void)
 {
     u8 battlerId;
 
@@ -2089,28 +2089,28 @@ static void BattleAICmd_get_used_held_item(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_move_type_from_result(void)
+static void Cmd_get_move_type_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].type;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_move_power_from_result(void)
+static void Cmd_get_move_power_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].power;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_move_effect_from_result(void)
+static void Cmd_get_move_effect_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].effect;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_protect_count(void)
+static void Cmd_get_protect_count(void)
 {
     u8 battlerId;
 
@@ -2124,48 +2124,48 @@ static void BattleAICmd_get_protect_count(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_nullsub_52(void)
+static void Cmd_nullsub_52(void)
 {
 }
 
-static void BattleAICmd_nullsub_53(void)
+static void Cmd_nullsub_53(void)
 {
 }
 
-static void BattleAICmd_nullsub_54(void)
+static void Cmd_nullsub_54(void)
 {
 }
 
-static void BattleAICmd_nullsub_55(void)
+static void Cmd_nullsub_55(void)
 {
 }
 
-static void BattleAICmd_nullsub_56(void)
+static void Cmd_nullsub_56(void)
 {
 }
 
-static void BattleAICmd_nullsub_57(void)
+static void Cmd_nullsub_57(void)
 {
 }
 
-static void BattleAICmd_call(void)
+static void Cmd_call(void)
 {
     AIStackPushVar(gAIScriptPtr + 5);
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_goto(void)
+static void Cmd_goto(void)
 {
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_end(void)
+static void Cmd_end(void)
 {
     if (AIStackPop() == 0)
         AI_THINKING_STRUCT->aiAction |= AI_ACTION_DONE;
 }
 
-static void BattleAICmd_if_level_cond(void)
+static void Cmd_if_level_cond(void)
 {
     switch (gAIScriptPtr[1])
     {
@@ -2190,7 +2190,7 @@ static void BattleAICmd_if_level_cond(void)
     }
 }
 
-static void BattleAICmd_if_target_taunted(void)
+static void Cmd_if_target_taunted(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer != 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2198,7 +2198,7 @@ static void BattleAICmd_if_target_taunted(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_target_not_taunted(void)
+static void Cmd_if_target_not_taunted(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2206,7 +2206,7 @@ static void BattleAICmd_if_target_not_taunted(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_target_is_ally(void)
+static void Cmd_if_target_is_ally(void)
 {
     if ((sBattler_AI & BIT_SIDE) == (gBattlerTarget & BIT_SIDE))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2214,7 +2214,7 @@ static void BattleAICmd_if_target_is_ally(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_flash_fired(void)
+static void Cmd_if_flash_fired(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
diff --git a/src/battle_bg.c b/src/battle_bg.c
index a08873857..567625a99 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -36,7 +36,7 @@ struct BattleBackground
 // .rodata
 static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
 
-static const struct OamData gUnknown_0831A988 =
+static const struct OamData sVsLetter_V_OamData =
 {
     .y = 0,
     .affineMode = 3,
@@ -53,7 +53,7 @@ static const struct OamData gUnknown_0831A988 =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_0831A990 =
+static const struct OamData sVsLetter_S_OamData =
 {
     .y = 0,
     .affineMode = 3,
@@ -70,13 +70,13 @@ static const struct OamData gUnknown_0831A990 =
     .affineParam = 0,
 };
 
-static const union AffineAnimCmd gUnknown_0831A998[] =
+static const union AffineAnimCmd sVsLetterAffineAnimCmds0[] =
 {
     AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gUnknown_0831A9A8[] =
+static const union AffineAnimCmd sVsLetterAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00),
     AFFINEANIMCMD_FRAME(0x0018, 0x0018, 0x00, 0x80),
@@ -84,37 +84,39 @@ static const union AffineAnimCmd gUnknown_0831A9A8[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd * const gUnknown_0831A9C8[] =
+static const union AffineAnimCmd *const sVsLetterAffineAnimTable[] =
 {
-    gUnknown_0831A998,
-    gUnknown_0831A9A8,
+    sVsLetterAffineAnimCmds0,
+    sVsLetterAffineAnimCmds1,
 };
 
-static const struct SpriteTemplate gUnknown_0831A9D0 =
+#define TAG_VS_LETTERS 10000
+
+static const struct SpriteTemplate sVsLetter_V_SpriteTemplate =
 {
-    .tileTag = 0x2710,
-    .paletteTag = 0x2710,
-    .oam = &gUnknown_0831A988,
+    .tileTag = TAG_VS_LETTERS,
+    .paletteTag = TAG_VS_LETTERS,
+    .oam = &sVsLetter_V_OamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gUnknown_0831A9C8,
+    .affineAnims = sVsLetterAffineAnimTable,
     .callback = nullsub_17
 };
 
-static const struct SpriteTemplate gUnknown_0831A9E8 =
+static const struct SpriteTemplate sVsLetter_S_SpriteTemplate =
 {
-    .tileTag = 0x2710,
-    .paletteTag = 0x2710,
-    .oam = &gUnknown_0831A990,
+    .tileTag = TAG_VS_LETTERS,
+    .paletteTag = TAG_VS_LETTERS,
+    .oam = &sVsLetter_S_OamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gUnknown_0831A9C8,
+    .affineAnims = sVsLetterAffineAnimTable,
     .callback = nullsub_17
 };
 
-static const struct CompressedSpriteSheet gUnknown_0831AA00 =
+static const struct CompressedSpriteSheet sVsLettersSpriteSheet =
 {
-    gUnknown_08D77B0C, 0x1000, 0x2710
+    gVsLettersGfx, 0x1000, TAG_VS_LETTERS
 };
 
 const struct BgTemplate gBattleBgTemplates[] =
@@ -689,7 +691,6 @@ static const struct BattleBackground gBattleTerrainTable[] =
     },
 };
 
-// .text
 void BattleInitBgsAndWindows(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
@@ -710,7 +711,7 @@ void BattleInitBgsAndWindows(void)
     DeactivateAllTextPrinters();
 }
 
-void sub_80356D0(void)
+void InitBattleBgsVideo(void)
 {
     DisableInterrupts(INTR_FLAG_HBLANK);
     EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
@@ -725,10 +726,11 @@ void LoadBattleMenuWindowGfx(void)
 {
     LoadUserWindowBorderGfx(2, 0x12, 0x10);
     LoadUserWindowBorderGfx(2, 0x22, 0x10);
-    LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20);
+    LoadCompressedPalette(gBattleWindowTextPalette, 0x50, 0x20);
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
     {
+        // Load graphics for the Battle Arena referee's mid-battle messages.
         Menu_LoadStdPalAt(0x70);
         LoadMessageBoxGfx(0, 0x30, 0x70);
         gPlttBufferUnfaded[0x76] = 0;
@@ -837,86 +839,81 @@ void DrawMainBattleBackground(void)
 
 void LoadBattleTextboxAndBackground(void)
 {
-    LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+    LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0)));
     CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
     CopyBgTilemapBufferToVram(0);
     LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
     LoadBattleMenuWindowGfx();
-
     DrawMainBattleBackground();
 }
 
-static void sub_8035AE4(u8 taskId, u8 battlerId, u8 bgId, u8 destX, u8 destY)
+static void DrawLinkBattleParticipantPokeballs(u8 taskId, u8 multiplayerId, u8 bgId, u8 destX, u8 destY)
 {
     s32 i;
-    u16 var = 0;
-    u16 src[6];
+    u16 pokeballStatuses = 0;
+    u16 tiles[6];
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
         if (gTasks[taskId].data[5] != 0)
         {
-            switch (battlerId)
+            switch (multiplayerId)
             {
             case 0:
-                var = 0x3F & gTasks[taskId].data[3];
+                pokeballStatuses = 0x3F & gTasks[taskId].data[3];
                 break;
             case 1:
-                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6;
                 break;
             case 2:
-                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6;
                 break;
             case 3:
-                var = 0x3F & gTasks[taskId].data[4];
+                pokeballStatuses = 0x3F & gTasks[taskId].data[4];
                 break;
             }
         }
         else
         {
-            switch (battlerId)
+            switch (multiplayerId)
             {
             case 0:
-                var = 0x3F & gTasks[taskId].data[3];
+                pokeballStatuses = 0x3F & gTasks[taskId].data[3];
                 break;
             case 1:
-                var = 0x3F & gTasks[taskId].data[4];
+                pokeballStatuses = 0x3F & gTasks[taskId].data[4];
                 break;
             case 2:
-                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6;
                 break;
             case 3:
-                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6;
                 break;
             }
         }
 
         for (i = 0; i < 3; i++)
-        {
-            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
-        }
+            tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001;
 
-        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11);
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 3, 1, 0x11);
         CopyBgTilemapBufferToVram(bgId);
     }
     else
     {
-        if (battlerId == gBattleScripting.multiplayerId)
-            var = gTasks[taskId].data[3];
+        if (multiplayerId == gBattleScripting.multiplayerId)
+            pokeballStatuses = gTasks[taskId].data[3];
         else
-            var = gTasks[taskId].data[4];
+            pokeballStatuses = gTasks[taskId].data[4];
 
         for (i = 0; i < 6; i++)
-        {
-            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
-        }
+            tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001;
 
-        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11);
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 6, 1, 0x11);
         CopyBgTilemapBufferToVram(bgId);
     }
 }
 
-static void sub_8035C4C(void)
+static void DrawLinkBattleVsScreenOutcomeText(void)
 {
     if (gBattleOutcome == B_OUTCOME_DREW)
     {
@@ -997,7 +994,7 @@ static void sub_8035C4C(void)
     }
 }
 
-void sub_8035D74(u8 taskId)
+void InitLinkBattleVsScreen(u8 taskId)
 {
     struct LinkPlayer *linkPlayer;
     u8 *name;
@@ -1017,19 +1014,19 @@ void sub_8035D74(u8 taskId)
                 {
                 case 0:
                     BattlePutTextOnWindow(name, 0x11);
-                    sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4);
+                    DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 4);
                     break;
                 case 1:
                     BattlePutTextOnWindow(name, 0x12);
-                    sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4);
+                    DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 4);
                     break;
                 case 2:
                     BattlePutTextOnWindow(name, 0x13);
-                    sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8);
+                    DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 8);
                     break;
                 case 3:
                     BattlePutTextOnWindow(name, 0x14);
-                    sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8);
+                    DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 8);
                     break;
                 }
             }
@@ -1049,16 +1046,16 @@ void sub_8035D74(u8 taskId)
             name = gLinkPlayers[opponentId].name;
             BattlePutTextOnWindow(name, 0x10);
 
-            sub_8035AE4(taskId, playerId, 1, 2, 7);
-            sub_8035AE4(taskId, opponentId, 2, 2, 7);
+            DrawLinkBattleParticipantPokeballs(taskId, playerId, 1, 2, 7);
+            DrawLinkBattleParticipantPokeballs(taskId, opponentId, 2, 2, 7);
         }
         gTasks[taskId].data[0]++;
         break;
     case 1:
-        palId = AllocSpritePalette(0x2710);
+        palId = AllocSpritePalette(TAG_VS_LETTERS);
         gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF;
-        gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
-        gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
+        gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&sVsLetter_V_SpriteTemplate, 111, 80, 0);
+        gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&sVsLetter_S_SpriteTemplate, 129, 80, 0);
         gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE;
         gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = TRUE;
         gTasks[taskId].data[0]++;
@@ -1087,7 +1084,7 @@ void sub_8035D74(u8 taskId)
         else
         {
             if (gTasks[taskId].data[5] != 0)
-                sub_8035C4C();
+                DrawLinkBattleVsScreenOutcomeText();
 
             PlaySE(SE_W231);
             DestroyTask(taskId);
@@ -1110,7 +1107,7 @@ void DrawBattleEntryBackground(void)
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1)));
-        LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000));
+        LZDecompressVram(gVsLettersGfx, (void*)(VRAM + 0x10000));
         LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20);
         SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1);
         SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04);
@@ -1122,7 +1119,7 @@ void DrawBattleEntryBackground(void)
         SetGpuReg(REG_OFFSET_WINOUT, 0x36);
         gBattle_BG1_Y = 0xFF5C;
         gBattle_BG2_Y = 0xFF5C;
-        LoadCompressedSpriteSheetUsingHeap(&gUnknown_0831AA00);
+        LoadCompressedSpriteSheetUsingHeap(&sVsLettersSpriteSheet);
     }
     else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
     {
@@ -1195,7 +1192,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
     switch (caseId)
     {
     case 0:
-        LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+        LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0)));
         break;
     case 1:
         CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 1be5def47..57239bca6 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -31,6 +31,7 @@
 #include "constants/battle_anim.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
 #include "constants/rgb.h"
@@ -1341,10 +1342,10 @@ static void WaitForMonSelection(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        if (gUnknown_0203CEE8 == 1)
-            BtlController_EmitChosenMonReturnValue(1, gUnknown_0203CEE9, gUnknown_0203CF00);
+        if (gPartyMenuUseExitCallback == TRUE)
+            BtlController_EmitChosenMonReturnValue(1, gSelectedMonPartyId, gBattlePartyCurrentOrder);
         else
-            BtlController_EmitChosenMonReturnValue(1, 6, NULL);
+            BtlController_EmitChosenMonReturnValue(1, PARTY_SIZE, NULL);
 
         if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
             PrintLinkStandbyMsg();
@@ -1531,12 +1532,12 @@ void ActionSelectionDestroyCursorAt(u8 cursorPosition)
     CopyBgTilemapBufferToVram(0);
 }
 
-void SetCB2ToReshowScreenAfterMenu(void)
+void CB2_SetUpReshowBattleScreenAfterMenu(void)
 {
     SetMainCallback2(ReshowBattleScreenAfterMenu);
 }
 
-void SetCB2ToReshowScreenAfterMenu2(void)
+void CB2_SetUpReshowBattleScreenAfterMenu2(void)
 {
     SetMainCallback2(ReshowBattleScreenAfterMenu);
 }
@@ -2632,20 +2633,20 @@ static void PlayerHandleChooseItem(void)
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBattlerInMenuId = gActiveBattler;
 
-    for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][1 + i];
+    for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][1 + i];
 }
 
 static void PlayerHandleChoosePokemon(void)
 {
     s32 i;
 
-    for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][4 + i];
+    for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
 
-    if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != PARTY_CANT_SWITCH)
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != PARTY_ACTION_CANT_SWITCH)
     {
-        BtlController_EmitChosenMonReturnValue(1, gBattlerPartyIndexes[gActiveBattler] + 1, gUnknown_0203CF00);
+        BtlController_EmitChosenMonReturnValue(1, gBattlerPartyIndexes[gActiveBattler] + 1, gBattlePartyCurrentOrder);
         PlayerBufferExecCompleted();
     }
     else
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 17db0b868..d0e76ab1b 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -95,7 +95,7 @@ void sub_8032768(void)
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
         for (i = 0; i < gBattlersCount; i++)
-            sub_81B8D64(i, 0);
+            BufferBattlePartyCurrentOrderBySide(i, 0);
     }
 
     for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
@@ -144,10 +144,10 @@ static void InitSinglePlayerBtlControllers(void)
 
         gBattlersCount = MAX_BATTLERS_COUNT;
 
-        sub_81B8D64(0, 0);
-        sub_81B8D64(1, 0);
-        sub_81B8D64(2, 1);
-        sub_81B8D64(3, 1);
+        BufferBattlePartyCurrentOrderBySide(0, 0);
+        BufferBattlePartyCurrentOrderBySide(1, 0);
+        BufferBattlePartyCurrentOrderBySide(2, 1);
+        BufferBattlePartyCurrentOrderBySide(3, 1);
 
         gBattlerPartyIndexes[0] = 0;
         gBattlerPartyIndexes[1] = 0;
@@ -247,10 +247,10 @@ static void InitSinglePlayerBtlControllers(void)
 
                 gBattlersCount = MAX_BATTLERS_COUNT;
 
-                sub_81B8D64(0, 0);
-                sub_81B8D64(1, 0);
-                sub_81B8D64(2, 1);
-                sub_81B8D64(3, 1);
+                BufferBattlePartyCurrentOrderBySide(0, 0);
+                BufferBattlePartyCurrentOrderBySide(1, 0);
+                BufferBattlePartyCurrentOrderBySide(2, 1);
+                BufferBattlePartyCurrentOrderBySide(3, 1);
 
                 gBattlerPartyIndexes[0] = 0;
                 gBattlerPartyIndexes[1] = 0;
@@ -267,11 +267,11 @@ static void InitSinglePlayerBtlControllers(void)
                     {
                     case 0:
                     case 3:
-                        sub_81B8D64(gLinkPlayers[i].id, 0);
+                        BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
                         break;
                     case 1:
                     case 2:
-                        sub_81B8D64(gLinkPlayers[i].id, 1);
+                        BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
                         break;
                     }
 
@@ -487,10 +487,10 @@ static void InitLinkBtlControllers(void)
             gBattlersCount = MAX_BATTLERS_COUNT;
         }
 
-        sub_81B8D64(0, 0);
-        sub_81B8D64(1, 0);
-        sub_81B8D64(2, 1);
-        sub_81B8D64(3, 1);
+        BufferBattlePartyCurrentOrderBySide(0, 0);
+        BufferBattlePartyCurrentOrderBySide(1, 0);
+        BufferBattlePartyCurrentOrderBySide(2, 1);
+        BufferBattlePartyCurrentOrderBySide(3, 1);
         gBattlerPartyIndexes[0] = 0;
         gBattlerPartyIndexes[1] = 0;
         gBattlerPartyIndexes[2] = 3;
@@ -509,11 +509,11 @@ static void InitLinkBtlControllers(void)
             {
             case 0:
             case 3:
-                sub_81B8D64(gLinkPlayers[i].id, 0);
+                BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
                 break;
             case 1:
             case 2:
-                sub_81B8D64(gLinkPlayers[i].id, 1);
+                BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
                 break;
             }
 
@@ -1175,13 +1175,13 @@ void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1)
     PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
 }
 
-void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8 *arg4)
+void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 slotId, u8 abilityId, u8 *arg4)
 {
     s32 i;
 
     sBattleBuffersTransferData[0] = CONTROLLER_CHOOSEPOKEMON;
     sBattleBuffersTransferData[1] = caseId;
-    sBattleBuffersTransferData[2] = arg2;
+    sBattleBuffersTransferData[2] = slotId;
     sBattleBuffersTransferData[3] = abilityId;
     for (i = 0; i < 3; i++)
         sBattleBuffersTransferData[4 + i] = arg4[i];
@@ -1311,14 +1311,14 @@ void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2)
     PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
 }
 
-void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c)
+void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 partyId, u8 *battlePartyOrder)
 {
     s32 i;
 
     sBattleBuffersTransferData[0] = CONTROLLER_CHOSENMONRETURNVALUE;
-    sBattleBuffersTransferData[1] = b;
-    for (i = 0; i < 3; i++)
-        sBattleBuffersTransferData[2 + i] = c[i];
+    sBattleBuffersTransferData[1] = partyId;
+    for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+        sBattleBuffersTransferData[2 + i] = battlePartyOrder[i];
     PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 5);
 }
 
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 22a1ecaf2..9c63bba42 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -2330,7 +2330,7 @@ static void GetDomeData(void)
         }
         break;
     case 8:
-        sub_81B8558();
+        ClearSelectedPartyOrder();
         gSelectedOrderFromParty[0] = gSaveBlock2Ptr->frontier.field_CB0;
         gSelectedOrderFromParty[1] = gSaveBlock2Ptr->frontier.field_CB0 >> 8;
         break;
@@ -3414,7 +3414,7 @@ static void Task_ShowOpponentInfo(u8 taskId)
         LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet);
         LoadCompressedPalette(gUnknown_08D85358, 0, 0x200);
         LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200);
-        LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20);
+        LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20);
         if (r9 == 2)
             LoadCompressedPalette(gUnknown_08D854C8, 0x50, 0x20);
         CpuFill32(0, gPlttBufferFaded, 0x400);
@@ -5574,7 +5574,7 @@ static void Task_ShowTourneyTree(u8 taskId)
         DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D83C3C, 0x2000, 0, 1);
         LoadCompressedPalette(gUnknown_08D85358, 0, 0x200);
         LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200);
-        LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20);
+        LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20);
         CpuFill32(0, gPlttBufferFaded, 0x400);
         ShowBg(0);
         ShowBg(1);
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 737e6b61e..341cd4a6a 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -811,7 +811,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId)
         break;
     case 6:
         LoadAndCreateEnemyShadowSprites();
-        sub_81B8C68();
+        BufferBattlePartyCurrentOrder();
         retVal = TRUE;
         break;
     }
@@ -1061,8 +1061,8 @@ void HandleBattleLowHpMusicChange(void)
     {
         u8 playerBattler1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         u8 playerBattler2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
-        u8 battler1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler1]);
-        u8 battler2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler2]);
+        u8 battler1PartyId = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[playerBattler1]);
+        u8 battler2PartyId = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[playerBattler2]);
 
         if (GetMonData(&gPlayerParty[battler1PartyId], MON_DATA_HP) != 0)
             HandleLowHpMusicChange(&gPlayerParty[battler1PartyId], playerBattler1);
diff --git a/src/battle_main.c b/src/battle_main.c
index a8f17dc3b..196053ad2 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -54,6 +54,7 @@
 #include "constants/hold_effects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -166,8 +167,8 @@ EWRAM_DATA static u32 sUnusedUnknownArray[25] = {0};
 EWRAM_DATA u32 gBattleTypeFlags = 0;
 EWRAM_DATA u8 gBattleTerrain = 0;
 EWRAM_DATA u32 gUnknown_02022FF4 = 0;
-EWRAM_DATA struct UnknownPokemonStruct4 gUnknown_02022FF8[3] = {0}; // what is it used for?
-EWRAM_DATA struct UnknownPokemonStruct4* gUnknown_02023058 = NULL; // what is it used for?
+EWRAM_DATA struct UnknownPokemonStruct4 gMultiPartnerParty[MULTI_PARTY_SIZE] = {0};
+EWRAM_DATA static struct UnknownPokemonStruct4* sMultiPartnerPartyBuffer = NULL;
 EWRAM_DATA u8 *gUnknown_0202305C = NULL;
 EWRAM_DATA u8 *gUnknown_02023060 = NULL;
 EWRAM_DATA u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200] = {0};
@@ -453,7 +454,7 @@ const u8 gTypeEffectiveness[336] =
     TYPE_ENDTABLE, TYPE_ENDTABLE, TYPE_MUL_NO_EFFECT
 };
 
-const u8 gTypeNames[][TYPE_NAME_LENGTH + 1] =
+const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1] =
 {
     _("NORMAL"),
     _("FIGHT"),
@@ -686,7 +687,7 @@ static void CB2_InitBattleInternal(void)
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         gBattleTerrain = BATTLE_TERRAIN_BUILDING;
 
-    sub_80356D0();
+    InitBattleBgsVideo();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ResetTasks();
@@ -1023,7 +1024,7 @@ static void CB2_HandleStartBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(sub_8035D74, 0);
+            taskId = CreateTask(InitLinkBattleVsScreen, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -1225,7 +1226,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(sub_8035D74, 0);
+            taskId = CreateTask(InitLinkBattleVsScreen, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -1248,12 +1249,12 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             if (gLinkPlayers[playerMultiplayerId].id != 0)
             {
                 memcpy(gPlayerParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-                memcpy(gPlayerParty + 3, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
+                memcpy(gPlayerParty + MULTI_PARTY_SIZE, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
             }
             else
             {
                 memcpy(gPlayerParty, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
-                memcpy(gPlayerParty + 3, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+                memcpy(gPlayerParty + MULTI_PARTY_SIZE, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
             }
             gBattleCommunication[MULTIUSE_STATE]++;
         }
@@ -1396,22 +1397,22 @@ static void sub_80379F8(u8 arrayIdPlus)
 {
     s32 i;
 
-    for (i = 0; i < 3; i++)
-    {
-        gUnknown_02022FF8[i].species     = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_SPECIES);
-        gUnknown_02022FF8[i].heldItem    = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HELD_ITEM);
-        GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_NICKNAME, gUnknown_02022FF8[i].nickname);
-        gUnknown_02022FF8[i].level       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LEVEL);
-        gUnknown_02022FF8[i].hp          = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HP);
-        gUnknown_02022FF8[i].maxhp       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_MAX_HP);
-        gUnknown_02022FF8[i].status      = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_STATUS);
-        gUnknown_02022FF8[i].personality = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_PERSONALITY);
-        gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
-        StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
+    for (i = 0; i < (int)ARRAY_COUNT(gMultiPartnerParty); i++)
+    {
+        gMultiPartnerParty[i].species     = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_SPECIES);
+        gMultiPartnerParty[i].heldItem    = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HELD_ITEM);
+        GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_NICKNAME, gMultiPartnerParty[i].nickname);
+        gMultiPartnerParty[i].level       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LEVEL);
+        gMultiPartnerParty[i].hp          = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HP);
+        gMultiPartnerParty[i].maxhp       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_MAX_HP);
+        gMultiPartnerParty[i].status      = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_STATUS);
+        gMultiPartnerParty[i].personality = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_PERSONALITY);
+        gMultiPartnerParty[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
+        StripExtCtrlCodes(gMultiPartnerParty[i].nickname);
         if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
-            PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE);
+            PadNameString(gMultiPartnerParty[i].nickname, CHAR_SPACE);
     }
-    memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
+    memcpy(sMultiPartnerPartyBuffer, gMultiPartnerParty, sizeof(gMultiPartnerParty));
 }
 
 static void CB2_PreInitMultiBattle(void)
@@ -1443,9 +1444,9 @@ static void CB2_PreInitMultiBattle(void)
     case 0:
         if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
         {
-            gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
+            sMultiPartnerPartyBuffer = Alloc(sizeof(struct UnknownPokemonStruct4) * ARRAY_COUNT(gMultiPartnerParty));
             sub_80379F8(0);
-            SendBlock(bitmask_all_link_players_but_self(), gUnknown_02023058, sizeof(struct UnknownPokemonStruct4) * 3);
+            SendBlock(bitmask_all_link_players_but_self(), sMultiPartnerPartyBuffer, sizeof(struct UnknownPokemonStruct4) * ARRAY_COUNT(gMultiPartnerParty));
             gBattleCommunication[MULTIUSE_STATE]++;
         }
         break;
@@ -1458,24 +1459,24 @@ static void CB2_PreInitMultiBattle(void)
                 if (i == playerMultiplierId)
                     continue;
 
-                if (numPlayers == 4)
+                if (numPlayers == MAX_LINK_PLAYERS)
                 {
                     if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1))
                         || (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1))
                     {
-                        memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3);
+                        memcpy(gMultiPartnerParty, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * ARRAY_COUNT(gMultiPartnerParty));
                     }
                 }
                 else
                 {
-                    memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3);
+                    memcpy(gMultiPartnerParty, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * ARRAY_COUNT(gMultiPartnerParty));
                 }
             }
             gBattleCommunication[MULTIUSE_STATE]++;
             *savedCallback = gMain.savedCallback;
             *savedBattleTypeFlags = gBattleTypeFlags;
             gMain.savedCallback = CB2_PreInitMultiBattle;
-            sub_81B9150();
+            ShowPartyMenuToShowcaseMultiBattleParty();
         }
         break;
     case 2:
@@ -1496,8 +1497,8 @@ static void CB2_PreInitMultiBattle(void)
                 gBattleTypeFlags = *savedBattleTypeFlags;
                 gMain.savedCallback = *savedCallback;
                 SetMainCallback2(CB2_InitBattleInternal);
-                Free(gUnknown_02023058);
-                gUnknown_02023058 = NULL;
+                Free(sMultiPartnerPartyBuffer);
+                sMultiPartnerPartyBuffer = NULL;
             }
         }
         else if (gReceivedRemoteLinkPlayers == 0)
@@ -1505,8 +1506,8 @@ static void CB2_PreInitMultiBattle(void)
             gBattleTypeFlags = *savedBattleTypeFlags;
             gMain.savedCallback = *savedCallback;
             SetMainCallback2(CB2_InitBattleInternal);
-            Free(gUnknown_02023058);
-            gUnknown_02023058 = NULL;
+            Free(sMultiPartnerPartyBuffer);
+            sMultiPartnerPartyBuffer = NULL;
         }
         break;
     }
@@ -1527,13 +1528,13 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void)
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
     case 0:
-        gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
+        sMultiPartnerPartyBuffer = Alloc(sizeof(struct UnknownPokemonStruct4) * ARRAY_COUNT(gMultiPartnerParty));
         sub_80379F8(3);
         gBattleCommunication[MULTIUSE_STATE]++;
         *savedCallback = gMain.savedCallback;
         *savedBattleTypeFlags = gBattleTypeFlags;
         gMain.savedCallback = CB2_PreInitIngamePlayerPartnerBattle;
-        sub_81B9150();
+        ShowPartyMenuToShowcaseMultiBattleParty();
         break;
     case 1:
         if (!gPaletteFade.active)
@@ -1542,8 +1543,8 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void)
             gBattleTypeFlags = *savedBattleTypeFlags;
             gMain.savedCallback = *savedCallback;
             SetMainCallback2(CB2_InitBattleInternal);
-            Free(gUnknown_02023058);
-            gUnknown_02023058 = NULL;
+            Free(sMultiPartnerPartyBuffer);
+            sMultiPartnerPartyBuffer = NULL;
         }
         break;
     }
@@ -1611,7 +1612,7 @@ static void CB2_HandleStartMultiBattle(void)
             sub_8036EB8(4, playerMultiplayerId);
             SetAllPlayersBerryData();
             SetDeoxysStats();
-            var = CreateTask(sub_8035D74, 0);
+            var = CreateTask(InitLinkBattleVsScreen, 0);
             gTasks[var].data[1] = 0x10E;
             gTasks[var].data[2] = 0x5A;
             gTasks[var].data[5] = 0;
@@ -1666,7 +1667,7 @@ static void CB2_HandleStartMultiBattle(void)
                         break;
                     case 1:
                     case 2:
-                        memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                        memcpy(gPlayerParty + MULTI_PARTY_SIZE, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
                         break;
                     }
                 }
@@ -1683,7 +1684,7 @@ static void CB2_HandleStartMultiBattle(void)
                             break;
                         case 1:
                         case 2:
-                            memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            memcpy(gPlayerParty + MULTI_PARTY_SIZE, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
                             break;
                         }
                     }
@@ -1697,7 +1698,7 @@ static void CB2_HandleStartMultiBattle(void)
                             break;
                         case 1:
                         case 2:
-                            memcpy(gEnemyParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            memcpy(gEnemyParty + MULTI_PARTY_SIZE, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
                             break;
                         }
                     }
@@ -2249,7 +2250,7 @@ void sub_8038D64(void)
         gBattle_BG3_X = 0;
         gBattle_BG3_Y = 0;
 
-        sub_80356D0();
+        InitBattleBgsVideo();
         LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
         LoadBattleMenuWindowGfx();
         ResetSpriteData();
@@ -2260,7 +2261,7 @@ void sub_8038D64(void)
         gReservedSpritePaletteCount = 4;
         SetVBlankCallback(VBlankCB_Battle);
 
-        taskId = CreateTask(sub_8035D74, 0);
+        taskId = CreateTask(InitLinkBattleVsScreen, 0);
         gTasks[taskId].data[1] = 0x10E;
         gTasks[taskId].data[2] = 0x5A;
         gTasks[taskId].data[5] = 1;
@@ -2445,7 +2446,7 @@ static void sub_80392A8(void)
     gBattle_BG2_Y = 0;
     gBattle_BG3_X = 0;
     gBattle_BG3_Y = 0;
-    sub_80356D0();
+    InitBattleBgsVideo();
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
     LoadBattleMenuWindowGfx();
 
@@ -3953,7 +3954,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     *(&gBattleStruct->turnEffectsBattlerId) = 0;
     *(&gBattleStruct->wishPerishSongState) = 0;
     *(&gBattleStruct->wishPerishSongBattlerId) = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
     gBattleStruct->faintedActionsState = 0;
     gBattleStruct->turnCountersTracker = 0;
     gMoveResultFlags = 0;
@@ -4016,7 +4017,7 @@ void BattleTurnPassed(void)
     gHitMarker &= ~(HITMARKER_x100000);
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
     gBattleMoveDamage = 0;
     gMoveResultFlags = 0;
 
@@ -4121,34 +4122,34 @@ u8 IsRunningFromBattleImpossible(void)
     return 0;
 }
 
-void sub_803BDA0(u8 battler)
+void SwitchPartyOrder(u8 battler)
 {
     s32 i;
-    u8 r4;
-    u8 r1;
+    u8 partyId1;
+    u8 partyId2;
 
     // gBattleStruct->field_60[battler][i]
 
-    for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = *(battler * 3 + i + (u8*)(gBattleStruct->field_60));
+    for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+        gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8*)(gBattleStruct->field_60));
 
-    r4 = pokemon_order_func(gBattlerPartyIndexes[battler]);
-    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler));
-    sub_81B8FB0(r4, r1);
+    partyId1 = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battler]);
+    partyId2 = GetPartyIdFromBattlePartyId(*(gBattleStruct->monToSwitchIntoId + battler));
+    SwitchPartyMonSlots(partyId1, partyId2);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
         {
-            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-            *(BATTLE_PARTNER(battler) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
+            *(BATTLE_PARTNER(battler) * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
         }
     }
     else
     {
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
         {
-            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
         }
     }
 }
@@ -4283,7 +4284,7 @@ static void HandleTurnActionSelectionState(void)
                         || gBattleTypeFlags & BATTLE_TYPE_ARENA
                         || gStatuses3[gActiveBattler] & STATUS3_ROOTED)
                     {
-                        BtlController_EmitChoosePokemon(0, PARTY_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                        BtlController_EmitChoosePokemon(0, PARTY_ACTION_CANT_SWITCH, PARTY_SIZE, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
                     else if ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG))
                              || ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP))
@@ -4292,16 +4293,16 @@ static void HandleTurnActionSelectionState(void)
                              || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0))
                                  && IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL)))
                     {
-                        BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
+                        BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, PARTY_SIZE, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
                     }
                     else
                     {
                         if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH)
-                            BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH)
-                            BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else
-                            BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, PARTY_SIZE, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
                     MarkBattlerForControllerExec(gActiveBattler);
                     break;
@@ -4589,7 +4590,7 @@ static void HandleTurnActionSelectionState(void)
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gChosenActionByBattler[i] == B_ACTION_SWITCH)
-                    sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
+                    SwitchPartyOrderInGameMulti(i, *(gBattleStruct->monToSwitchIntoId + i));
             }
         }
     }
@@ -5884,7 +5885,7 @@ static void HandleAction_ActionFinished(void)
     gLastHitByType[gBattlerAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
     gBattleCommunication[3] = 0;
     gBattleCommunication[4] = 0;
     gBattleScripting.multihitMoveEffect = 0;
diff --git a/src/battle_message.c b/src/battle_message.c
index 22cdee0b8..1701f26ec 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -20,9 +20,11 @@
 #include "trainer_hill.h"
 #include "window.h"
 #include "constants/battle_string_ids.h"
+#include "constants/frontier_util.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/trainers.h"
+#include "constants/trainer_hill.h"
 
 struct BattleWindowText
 {
@@ -874,8 +876,8 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] =
     [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch,
     [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC,
     [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC,
-    [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull,
-    [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull,
+    [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnTransferredSomeonesPCBoxFull,
+    [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnTransferredLanettesPCBoxFull,
     [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText,
     [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText,
 };
@@ -2573,7 +2575,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
                 {
-                    CopyTrainerHillTrainerText(4, gTrainerBattleOpponent_A);
+                    CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_WON, gTrainerBattleOpponent_A);
                     toCpy = gStringVar4;
                 }
                 else
@@ -2589,7 +2591,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
                 {
-                    CopyTrainerHillTrainerText(3, gTrainerBattleOpponent_A);
+                    CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_LOST, gTrainerBattleOpponent_A);
                     toCpy = gStringVar4;
                 }
                 break;
@@ -2670,7 +2672,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
                 {
-                    CopyTrainerHillTrainerText(4, gTrainerBattleOpponent_B);
+                    CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_WON, gTrainerBattleOpponent_B);
                     toCpy = gStringVar4;
                 }
                 else
@@ -2686,7 +2688,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
                 {
-                    CopyTrainerHillTrainerText(3, gTrainerBattleOpponent_B);
+                    CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_LOST, gTrainerBattleOpponent_B);
                     toCpy = gStringVar4;
                 }
                 break;
diff --git a/src/battle_pike.c b/src/battle_pike.c
index a81d88145..36bf8dcbf 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -22,6 +22,7 @@
 #include "constants/trainers.h"
 #include "constants/species.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/battle_pike.h"
 
 struct PikeRoomNPC
@@ -922,7 +923,7 @@ static bool8 TryInflictRandomStatus(void)
             for (i = 0; i < 3; i++)
             {
                 mon = &gPlayerParty[indices[i]];
-                if (pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS)) == 0
+                if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
                     && GetMonData(mon, MON_DATA_HP) != 0)
                 {
                     j++;
@@ -964,7 +965,7 @@ static bool8 TryInflictRandomStatus(void)
     for (i = 0; i < 3; i++)
     {
         mon = &gPlayerParty[indices[i]];
-        if (pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS)) == 0
+        if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
             && GetMonData(mon, MON_DATA_HP) != 0)
         {
             j++;
@@ -996,7 +997,7 @@ static bool8 AtLeastOneHealthyMon(void)
     for (i = 0; i < 3; i++)
     {
         struct Pokemon *mon = &gPlayerParty[i];
-        if (pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS)) == 0
+        if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
             && GetMonData(mon, MON_DATA_HP) != 0)
         {
             healthyMonsCount++;
@@ -1285,7 +1286,7 @@ static void TryHealMons(u8 healCount)
         {
             canBeHealed = TRUE;
         }
-        else if (pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS)) != 0)
+        else if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) != AILMENT_NONE)
         {
             canBeHealed = TRUE;
         }
@@ -1556,7 +1557,7 @@ static void CanAnyPartyMonsBeHealed(void)
         struct Pokemon *mon = &gPlayerParty[i];
         u16 curr = GetMonData(mon, MON_DATA_HP);
         u16 max = GetMonData(mon, MON_DATA_MAX_HP);
-        if (curr >= max && pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS)) == 0)
+        if (curr >= max && GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE)
         {
             u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
             for (j = 0; j < MAX_MON_MOVES; j++)
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index a17a93499..c904d4e98 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -346,12 +346,12 @@ void InitBattlePyramidBagCursorPosition(void)
 
 void CB2_PyramidBagMenuFromStartMenu(void)
 {
-    sub_81C4F98(0, CB2_ReturnToFieldWithOpenMenu);
+    GoToBattlePyramidBagMenu(0, CB2_ReturnToFieldWithOpenMenu);
 }
 
 static void sub_81C4F10(void)
 {
-    sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2);
+    GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2);
 }
 
 void sub_81C4F24(void)
@@ -366,18 +366,18 @@ static void sub_81C4F44(u8 taskId)
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        gFieldCallback2 = hm_add_c3_without_phase_2;
-        sub_81C4F98(3, CB2_ReturnToField);
+        gFieldCallback2 = CB2_FadeFromPartyMenu;
+        GoToBattlePyramidBagMenu(3, CB2_ReturnToField);
         DestroyTask(taskId);
     }
 }
 
-void sub_81C4F84(void)
+void CB2_ReturnToPyramidBagMenu(void)
 {
-    sub_81C4F98(4, gPyramidBagCursorData.callback);
+    GoToBattlePyramidBagMenu(4, gPyramidBagCursorData.callback);
 }
 
-void sub_81C4F98(u8 a0, void (*callback)(void))
+void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void))
 {
     gPyramidBagResources = AllocZeroed(sizeof(*gPyramidBagResources));
 
@@ -981,7 +981,7 @@ static void HandleMenuActionInput(u8 taskId)
                 sub_8199134(0, 1);
             }
         }
-        else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+        else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED)
         {
             if (id & 1 && IsValidMenuAction(id - 1))
             {
@@ -989,7 +989,7 @@ static void HandleMenuActionInput(u8 taskId)
                 sub_8199134(-1, 0);
             }
         }
-        else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+        else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED)
         {
             if (!(id & 1) && IsValidMenuAction(id + 1))
             {
@@ -1202,7 +1202,7 @@ static void BagAction_Give(u8 taskId)
     }
     else if (!ItemId_GetImportance(gSpecialVar_ItemId))
     {
-        gPyramidBagResources->callback2 = sub_81B7F60;
+        gPyramidBagResources->callback2 = CB2_ChooseMonToGiveItem;
         sub_81C5B14(taskId);
     }
     else
@@ -1350,7 +1350,7 @@ static void sub_81C6A14(u8 taskId)
     SetTaskToMainPyramidBagInputHandler(taskId);
 }
 
-void sub_81C6A94(void)
+void TryStoreHeldItemsInPyramidBag(void)
 {
     u8 i;
     struct Pokemon *party = gPlayerParty;
@@ -1363,8 +1363,9 @@ void sub_81C6A94(void)
     for (i = 0; i < 3; i++)
     {
         heldItem = GetMonData(&party[i], MON_DATA_HELD_ITEM);
-        if (heldItem != 0 && !AddBagItem(heldItem, 1))
+        if (heldItem != ITEM_NONE && !AddBagItem(heldItem, 1))
         {
+            // Cant store party held items in pyramid bag because bag is full
             memcpy(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode], newItems, PYRAMID_BAG_ITEMS_COUNT * sizeof(u16));
             memcpy(gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode], newQuantities, PYRAMID_BAG_ITEMS_COUNT * sizeof(u8));
             Free(newItems);
@@ -1374,7 +1375,7 @@ void sub_81C6A94(void)
         }
     }
 
-    heldItem = 0;
+    heldItem = ITEM_NONE;
     for (i = 0; i < 3; i++)
     {
         SetMonData(&party[i], MON_DATA_HELD_ITEM, &heldItem);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 3c3e2480f..eab7b7d04 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -52,6 +52,7 @@
 #include "menu_specialized.h"
 #include "constants/rgb.h"
 #include "data.h"
+#include "constants/party_menu.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
@@ -76,507 +77,507 @@ static void PutLevelAndGenderOnLvlUpBox(void);
 
 static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite);
 
-static void atk00_attackcanceler(void);
-static void atk01_accuracycheck(void);
-static void atk02_attackstring(void);
-static void atk03_ppreduce(void);
-static void atk04_critcalc(void);
-static void atk05_damagecalc(void);
-static void atk06_typecalc(void);
-static void atk07_adjustnormaldamage(void);
-static void atk08_adjustnormaldamage2(void);
-static void atk09_attackanimation(void);
-static void atk0A_waitanimation(void);
-static void atk0B_healthbarupdate(void);
-static void atk0C_datahpupdate(void);
-static void atk0D_critmessage(void);
-static void atk0E_effectivenesssound(void);
-static void atk0F_resultmessage(void);
-static void atk10_printstring(void);
-static void atk11_printselectionstring(void);
-static void atk12_waitmessage(void);
-static void atk13_printfromtable(void);
-static void atk14_printselectionstringfromtable(void);
-static void atk15_seteffectwithchance(void);
-static void atk16_seteffectprimary(void);
-static void atk17_seteffectsecondary(void);
-static void atk18_clearstatusfromeffect(void);
-static void atk19_tryfaintmon(void);
-static void atk1A_dofaintanimation(void);
-static void atk1B_cleareffectsonfaint(void);
-static void atk1C_jumpifstatus(void);
-static void atk1D_jumpifstatus2(void);
-static void atk1E_jumpifability(void);
-static void atk1F_jumpifsideaffecting(void);
-static void atk20_jumpifstat(void);
-static void atk21_jumpifstatus3condition(void);
-static void atk22_jumpiftype(void);
-static void atk23_getexp(void);
-static void atk24(void);
-static void atk25_movevaluescleanup(void);
-static void atk26_setmultihit(void);
-static void atk27_decrementmultihit(void);
-static void atk28_goto(void);
-static void atk29_jumpifbyte(void);
-static void atk2A_jumpifhalfword(void);
-static void atk2B_jumpifword(void);
-static void atk2C_jumpifarrayequal(void);
-static void atk2D_jumpifarraynotequal(void);
-static void atk2E_setbyte(void);
-static void atk2F_addbyte(void);
-static void atk30_subbyte(void);
-static void atk31_copyarray(void);
-static void atk32_copyarraywithindex(void);
-static void atk33_orbyte(void);
-static void atk34_orhalfword(void);
-static void atk35_orword(void);
-static void atk36_bicbyte(void);
-static void atk37_bichalfword(void);
-static void atk38_bicword(void);
-static void atk39_pause(void);
-static void atk3A_waitstate(void);
-static void atk3B_healthbar_update(void);
-static void atk3C_return(void);
-static void atk3D_end(void);
-static void atk3E_end2(void);
-static void atk3F_end3(void);
-static void atk40_jumpifaffectedbyprotect(void);
-static void atk41_call(void);
-static void atk42_jumpiftype2(void);
-static void atk43_jumpifabilitypresent(void);
-static void atk44_endselectionscript(void);
-static void atk45_playanimation(void);
-static void atk46_playanimation2(void);
-static void atk47_setgraphicalstatchangevalues(void);
-static void atk48_playstatchangeanimation(void);
-static void atk49_moveend(void);
-static void atk4A_typecalc2(void);
-static void atk4B_returnatktoball(void);
-static void atk4C_getswitchedmondata(void);
-static void atk4D_switchindataupdate(void);
-static void atk4E_switchinanim(void);
-static void atk4F_jumpifcantswitch(void);
-static void atk50_openpartyscreen(void);
-static void atk51_switchhandleorder(void);
-static void atk52_switchineffects(void);
-static void atk53_trainerslidein(void);
-static void atk54_playse(void);
-static void atk55_fanfare(void);
-static void atk56_playfaintcry(void);
-static void atk57(void);
-static void atk58_returntoball(void);
-static void atk59_handlelearnnewmove(void);
-static void atk5A_yesnoboxlearnmove(void);
-static void atk5B_yesnoboxstoplearningmove(void);
-static void atk5C_hitanimation(void);
-static void atk5D_getmoneyreward(void);
-static void atk5E(void);
-static void atk5F_swapattackerwithtarget(void);
-static void atk60_incrementgamestat(void);
-static void atk61_drawpartystatussummary(void);
-static void atk62_hidepartystatussummary(void);
-static void atk63_jumptocalledmove(void);
-static void atk64_statusanimation(void);
-static void atk65_status2animation(void);
-static void atk66_chosenstatusanimation(void);
-static void atk67_yesnobox(void);
-static void atk68_cancelallactions(void);
-static void atk69_adjustsetdamage(void);
-static void atk6A_removeitem(void);
-static void atk6B_atknameinbuff1(void);
-static void atk6C_drawlvlupbox(void);
-static void atk6D_resetsentmonsvalue(void);
-static void atk6E_setatktoplayer0(void);
-static void atk6F_makevisible(void);
-static void atk70_recordlastability(void);
-static void atk71_buffermovetolearn(void);
-static void atk72_jumpifplayerran(void);
-static void atk73_hpthresholds(void);
-static void atk74_hpthresholds2(void);
-static void atk75_useitemonopponent(void);
-static void atk76_various(void);
-static void atk77_setprotectlike(void);
-static void atk78_faintifabilitynotdamp(void);
-static void atk79_setatkhptozero(void);
-static void atk7A_jumpifnexttargetvalid(void);
-static void atk7B_tryhealhalfhealth(void);
-static void atk7C_trymirrormove(void);
-static void atk7D_setrain(void);
-static void atk7E_setreflect(void);
-static void atk7F_setseeded(void);
-static void atk80_manipulatedamage(void);
-static void atk81_trysetrest(void);
-static void atk82_jumpifnotfirstturn(void);
-static void atk83_nop(void);
-static void atk84_jumpifcantmakeasleep(void);
-static void atk85_stockpile(void);
-static void atk86_stockpiletobasedamage(void);
-static void atk87_stockpiletohpheal(void);
-static void atk88_negativedamage(void);
-static void atk89_statbuffchange(void);
-static void atk8A_normalisebuffs(void);
-static void atk8B_setbide(void);
-static void atk8C_confuseifrepeatingattackends(void);
-static void atk8D_setmultihitcounter(void);
-static void atk8E_initmultihitstring(void);
-static void atk8F_forcerandomswitch(void);
-static void atk90_tryconversiontypechange(void);
-static void atk91_givepaydaymoney(void);
-static void atk92_setlightscreen(void);
-static void atk93_tryKO(void);
-static void atk94_damagetohalftargethp(void);
-static void atk95_setsandstorm(void);
-static void atk96_weatherdamage(void);
-static void atk97_tryinfatuating(void);
-static void atk98_updatestatusicon(void);
-static void atk99_setmist(void);
-static void atk9A_setfocusenergy(void);
-static void atk9B_transformdataexecution(void);
-static void atk9C_setsubstitute(void);
-static void atk9D_mimicattackcopy(void);
-static void atk9E_metronome(void);
-static void atk9F_dmgtolevel(void);
-static void atkA0_psywavedamageeffect(void);
-static void atkA1_counterdamagecalculator(void);
-static void atkA2_mirrorcoatdamagecalculator(void);
-static void atkA3_disablelastusedattack(void);
-static void atkA4_trysetencore(void);
-static void atkA5_painsplitdmgcalc(void);
-static void atkA6_settypetorandomresistance(void);
-static void atkA7_setalwayshitflag(void);
-static void atkA8_copymovepermanently(void);
-static void atkA9_trychoosesleeptalkmove(void);
-static void atkAA_setdestinybond(void);
-static void atkAB_trysetdestinybondtohappen(void);
-static void atkAC_remaininghptopower(void);
-static void atkAD_tryspiteppreduce(void);
-static void atkAE_healpartystatus(void);
-static void atkAF_cursetarget(void);
-static void atkB0_trysetspikes(void);
-static void atkB1_setforesight(void);
-static void atkB2_trysetperishsong(void);
-static void atkB3_rolloutdamagecalculation(void);
-static void atkB4_jumpifconfusedandstatmaxed(void);
-static void atkB5_furycuttercalc(void);
-static void atkB6_happinesstodamagecalculation(void);
-static void atkB7_presentdamagecalculation(void);
-static void atkB8_setsafeguard(void);
-static void atkB9_magnitudedamagecalculation(void);
-static void atkBA_jumpifnopursuitswitchdmg(void);
-static void atkBB_setsunny(void);
-static void atkBC_maxattackhalvehp(void);
-static void atkBD_copyfoestats(void);
-static void atkBE_rapidspinfree(void);
-static void atkBF_setdefensecurlbit(void);
-static void atkC0_recoverbasedonsunlight(void);
-static void atkC1_hiddenpowercalc(void);
-static void atkC2_selectfirstvalidtarget(void);
-static void atkC3_trysetfutureattack(void);
-static void atkC4_trydobeatup(void);
-static void atkC5_setsemiinvulnerablebit(void);
-static void atkC6_clearsemiinvulnerablebit(void);
-static void atkC7_setminimize(void);
-static void atkC8_sethail(void);
-static void atkC9_jumpifattackandspecialattackcannotfall(void);
-static void atkCA_setforcedtarget(void);
-static void atkCB_setcharge(void);
-static void atkCC_callterrainattack(void);
-static void atkCD_cureifburnedparalysedorpoisoned(void);
-static void atkCE_settorment(void);
-static void atkCF_jumpifnodamage(void);
-static void atkD0_settaunt(void);
-static void atkD1_trysethelpinghand(void);
-static void atkD2_tryswapitems(void);
-static void atkD3_trycopyability(void);
-static void atkD4_trywish(void);
-static void atkD5_trysetroots(void);
-static void atkD6_doubledamagedealtifdamaged(void);
-static void atkD7_setyawn(void);
-static void atkD8_setdamagetohealthdifference(void);
-static void atkD9_scaledamagebyhealthratio(void);
-static void atkDA_tryswapabilities(void);
-static void atkDB_tryimprison(void);
-static void atkDC_trysetgrudge(void);
-static void atkDD_weightdamagecalculation(void);
-static void atkDE_assistattackselect(void);
-static void atkDF_trysetmagiccoat(void);
-static void atkE0_trysetsnatch(void);
-static void atkE1_trygetintimidatetarget(void);
-static void atkE2_switchoutabilities(void);
-static void atkE3_jumpifhasnohp(void);
-static void atkE4_getsecretpowereffect(void);
-static void atkE5_pickup(void);
-static void atkE6_docastformchangeanimation(void);
-static void atkE7_trycastformdatachange(void);
-static void atkE8_settypebasedhalvers(void);
-static void atkE9_setweatherballtype(void);
-static void atkEA_tryrecycleitem(void);
-static void atkEB_settypetoterrain(void);
-static void atkEC_pursuitrelated(void);
-static void atkEF_snatchsetbattlers(void);
-static void atkEE_removelightscreenreflect(void);
-static void atkEF_handleballthrow(void);
-static void atkF0_givecaughtmon(void);
-static void atkF1_trysetcaughtmondexflags(void);
-static void atkF2_displaydexinfo(void);
-static void atkF3_trygivecaughtmonnick(void);
-static void atkF4_subattackerhpbydmg(void);
-static void atkF5_removeattackerstatus1(void);
-static void atkF6_finishaction(void);
-static void atkF7_finishturn(void);
-static void atkF8_trainerslideout(void);
+static void Cmd_attackcanceler(void);
+static void Cmd_accuracycheck(void);
+static void Cmd_attackstring(void);
+static void Cmd_ppreduce(void);
+static void Cmd_critcalc(void);
+static void Cmd_damagecalc(void);
+static void Cmd_typecalc(void);
+static void Cmd_adjustnormaldamage(void);
+static void Cmd_adjustnormaldamage2(void);
+static void Cmd_attackanimation(void);
+static void Cmd_waitanimation(void);
+static void Cmd_healthbarupdate(void);
+static void Cmd_datahpupdate(void);
+static void Cmd_critmessage(void);
+static void Cmd_effectivenesssound(void);
+static void Cmd_resultmessage(void);
+static void Cmd_printstring(void);
+static void Cmd_printselectionstring(void);
+static void Cmd_waitmessage(void);
+static void Cmd_printfromtable(void);
+static void Cmd_printselectionstringfromtable(void);
+static void Cmd_seteffectwithchance(void);
+static void Cmd_seteffectprimary(void);
+static void Cmd_seteffectsecondary(void);
+static void Cmd_clearstatusfromeffect(void);
+static void Cmd_tryfaintmon(void);
+static void Cmd_dofaintanimation(void);
+static void Cmd_cleareffectsonfaint(void);
+static void Cmd_jumpifstatus(void);
+static void Cmd_jumpifstatus2(void);
+static void Cmd_jumpifability(void);
+static void Cmd_jumpifsideaffecting(void);
+static void Cmd_jumpifstat(void);
+static void Cmd_jumpifstatus3condition(void);
+static void Cmd_jumpiftype(void);
+static void Cmd_getexp(void);
+static void Cmd_unknown_24(void);
+static void Cmd_movevaluescleanup(void);
+static void Cmd_setmultihit(void);
+static void Cmd_decrementmultihit(void);
+static void Cmd_goto(void);
+static void Cmd_jumpifbyte(void);
+static void Cmd_jumpifhalfword(void);
+static void Cmd_jumpifword(void);
+static void Cmd_jumpifarrayequal(void);
+static void Cmd_jumpifarraynotequal(void);
+static void Cmd_setbyte(void);
+static void Cmd_addbyte(void);
+static void Cmd_subbyte(void);
+static void Cmd_copyarray(void);
+static void Cmd_copyarraywithindex(void);
+static void Cmd_orbyte(void);
+static void Cmd_orhalfword(void);
+static void Cmd_orword(void);
+static void Cmd_bicbyte(void);
+static void Cmd_bichalfword(void);
+static void Cmd_bicword(void);
+static void Cmd_pause(void);
+static void Cmd_waitstate(void);
+static void Cmd_healthbar_update(void);
+static void Cmd_return(void);
+static void Cmd_end(void);
+static void Cmd_end2(void);
+static void Cmd_end3(void);
+static void Cmd_jumpifaffectedbyprotect(void);
+static void Cmd_call(void);
+static void Cmd_jumpiftype2(void);
+static void Cmd_jumpifabilitypresent(void);
+static void Cmd_endselectionscript(void);
+static void Cmd_playanimation(void);
+static void Cmd_playanimation2(void);
+static void Cmd_setgraphicalstatchangevalues(void);
+static void Cmd_playstatchangeanimation(void);
+static void Cmd_moveend(void);
+static void Cmd_typecalc2(void);
+static void Cmd_returnatktoball(void);
+static void Cmd_getswitchedmondata(void);
+static void Cmd_switchindataupdate(void);
+static void Cmd_switchinanim(void);
+static void Cmd_jumpifcantswitch(void);
+static void Cmd_openpartyscreen(void);
+static void Cmd_switchhandleorder(void);
+static void Cmd_switchineffects(void);
+static void Cmd_trainerslidein(void);
+static void Cmd_playse(void);
+static void Cmd_fanfare(void);
+static void Cmd_playfaintcry(void);
+static void Cmd_unknown_57(void);
+static void Cmd_returntoball(void);
+static void Cmd_handlelearnnewmove(void);
+static void Cmd_yesnoboxlearnmove(void);
+static void Cmd_yesnoboxstoplearningmove(void);
+static void Cmd_hitanimation(void);
+static void Cmd_getmoneyreward(void);
+static void Cmd_unknown_5E(void);
+static void Cmd_swapattackerwithtarget(void);
+static void Cmd_incrementgamestat(void);
+static void Cmd_drawpartystatussummary(void);
+static void Cmd_hidepartystatussummary(void);
+static void Cmd_jumptocalledmove(void);
+static void Cmd_statusanimation(void);
+static void Cmd_status2animation(void);
+static void Cmd_chosenstatusanimation(void);
+static void Cmd_yesnobox(void);
+static void Cmd_cancelallactions(void);
+static void Cmd_adjustsetdamage(void);
+static void Cmd_removeitem(void);
+static void Cmd_atknameinbuff1(void);
+static void Cmd_drawlvlupbox(void);
+static void Cmd_resetsentmonsvalue(void);
+static void Cmd_setatktoplayer0(void);
+static void Cmd_makevisible(void);
+static void Cmd_recordlastability(void);
+static void Cmd_buffermovetolearn(void);
+static void Cmd_jumpifplayerran(void);
+static void Cmd_hpthresholds(void);
+static void Cmd_hpthresholds2(void);
+static void Cmd_useitemonopponent(void);
+static void Cmd_various(void);
+static void Cmd_setprotectlike(void);
+static void Cmd_faintifabilitynotdamp(void);
+static void Cmd_setatkhptozero(void);
+static void Cmd_jumpifnexttargetvalid(void);
+static void Cmd_tryhealhalfhealth(void);
+static void Cmd_trymirrormove(void);
+static void Cmd_setrain(void);
+static void Cmd_setreflect(void);
+static void Cmd_setseeded(void);
+static void Cmd_manipulatedamage(void);
+static void Cmd_trysetrest(void);
+static void Cmd_jumpifnotfirstturn(void);
+static void Cmd_nop(void);
+static void Cmd_jumpifcantmakeasleep(void);
+static void Cmd_stockpile(void);
+static void Cmd_stockpiletobasedamage(void);
+static void Cmd_stockpiletohpheal(void);
+static void Cmd_negativedamage(void);
+static void Cmd_statbuffchange(void);
+static void Cmd_normalisebuffs(void);
+static void Cmd_setbide(void);
+static void Cmd_confuseifrepeatingattackends(void);
+static void Cmd_setmultihitcounter(void);
+static void Cmd_initmultihitstring(void);
+static void Cmd_forcerandomswitch(void);
+static void Cmd_tryconversiontypechange(void);
+static void Cmd_givepaydaymoney(void);
+static void Cmd_setlightscreen(void);
+static void Cmd_tryKO(void);
+static void Cmd_damagetohalftargethp(void);
+static void Cmd_setsandstorm(void);
+static void Cmd_weatherdamage(void);
+static void Cmd_tryinfatuating(void);
+static void Cmd_updatestatusicon(void);
+static void Cmd_setmist(void);
+static void Cmd_setfocusenergy(void);
+static void Cmd_transformdataexecution(void);
+static void Cmd_setsubstitute(void);
+static void Cmd_mimicattackcopy(void);
+static void Cmd_metronome(void);
+static void Cmd_dmgtolevel(void);
+static void Cmd_psywavedamageeffect(void);
+static void Cmd_counterdamagecalculator(void);
+static void Cmd_mirrorcoatdamagecalculator(void);
+static void Cmd_disablelastusedattack(void);
+static void Cmd_trysetencore(void);
+static void Cmd_painsplitdmgcalc(void);
+static void Cmd_settypetorandomresistance(void);
+static void Cmd_setalwayshitflag(void);
+static void Cmd_copymovepermanently(void);
+static void Cmd_trychoosesleeptalkmove(void);
+static void Cmd_setdestinybond(void);
+static void Cmd_trysetdestinybondtohappen(void);
+static void Cmd_remaininghptopower(void);
+static void Cmd_tryspiteppreduce(void);
+static void Cmd_healpartystatus(void);
+static void Cmd_cursetarget(void);
+static void Cmd_trysetspikes(void);
+static void Cmd_setforesight(void);
+static void Cmd_trysetperishsong(void);
+static void Cmd_rolloutdamagecalculation(void);
+static void Cmd_jumpifconfusedandstatmaxed(void);
+static void Cmd_furycuttercalc(void);
+static void Cmd_happinesstodamagecalculation(void);
+static void Cmd_presentdamagecalculation(void);
+static void Cmd_setsafeguard(void);
+static void Cmd_magnitudedamagecalculation(void);
+static void Cmd_jumpifnopursuitswitchdmg(void);
+static void Cmd_setsunny(void);
+static void Cmd_maxattackhalvehp(void);
+static void Cmd_copyfoestats(void);
+static void Cmd_rapidspinfree(void);
+static void Cmd_setdefensecurlbit(void);
+static void Cmd_recoverbasedonsunlight(void);
+static void Cmd_hiddenpowercalc(void);
+static void Cmd_selectfirstvalidtarget(void);
+static void Cmd_trysetfutureattack(void);
+static void Cmd_trydobeatup(void);
+static void Cmd_setsemiinvulnerablebit(void);
+static void Cmd_clearsemiinvulnerablebit(void);
+static void Cmd_setminimize(void);
+static void Cmd_sethail(void);
+static void Cmd_jumpifattackandspecialattackcannotfall(void);
+static void Cmd_setforcedtarget(void);
+static void Cmd_setcharge(void);
+static void Cmd_callterrainattack(void);
+static void Cmd_cureifburnedparalysedorpoisoned(void);
+static void Cmd_settorment(void);
+static void Cmd_jumpifnodamage(void);
+static void Cmd_settaunt(void);
+static void Cmd_trysethelpinghand(void);
+static void Cmd_tryswapitems(void);
+static void Cmd_trycopyability(void);
+static void Cmd_trywish(void);
+static void Cmd_trysetroots(void);
+static void Cmd_doubledamagedealtifdamaged(void);
+static void Cmd_setyawn(void);
+static void Cmd_setdamagetohealthdifference(void);
+static void Cmd_scaledamagebyhealthratio(void);
+static void Cmd_tryswapabilities(void);
+static void Cmd_tryimprison(void);
+static void Cmd_trysetgrudge(void);
+static void Cmd_weightdamagecalculation(void);
+static void Cmd_assistattackselect(void);
+static void Cmd_trysetmagiccoat(void);
+static void Cmd_trysetsnatch(void);
+static void Cmd_trygetintimidatetarget(void);
+static void Cmd_switchoutabilities(void);
+static void Cmd_jumpifhasnohp(void);
+static void Cmd_getsecretpowereffect(void);
+static void Cmd_pickup(void);
+static void Cmd_docastformchangeanimation(void);
+static void Cmd_trycastformdatachange(void);
+static void Cmd_settypebasedhalvers(void);
+static void Cmd_setweatherballtype(void);
+static void Cmd_tryrecycleitem(void);
+static void Cmd_settypetoterrain(void);
+static void Cmd_pursuitrelated(void);
+static void Cmd_snatchsetbattlers(void);
+static void Cmd_removelightscreenreflect(void);
+static void Cmd_handleballthrow(void);
+static void Cmd_givecaughtmon(void);
+static void Cmd_trysetcaughtmondexflags(void);
+static void Cmd_displaydexinfo(void);
+static void Cmd_trygivecaughtmonnick(void);
+static void Cmd_subattackerhpbydmg(void);
+static void Cmd_removeattackerstatus1(void);
+static void Cmd_finishaction(void);
+static void Cmd_finishturn(void);
+static void Cmd_trainerslideout(void);
 
 void (* const gBattleScriptingCommandsTable[])(void) =
 {
-    atk00_attackcanceler,
-    atk01_accuracycheck,
-    atk02_attackstring,
-    atk03_ppreduce,
-    atk04_critcalc,
-    atk05_damagecalc,
-    atk06_typecalc,
-    atk07_adjustnormaldamage,
-    atk08_adjustnormaldamage2,
-    atk09_attackanimation,
-    atk0A_waitanimation,
-    atk0B_healthbarupdate,
-    atk0C_datahpupdate,
-    atk0D_critmessage,
-    atk0E_effectivenesssound,
-    atk0F_resultmessage,
-    atk10_printstring,
-    atk11_printselectionstring,
-    atk12_waitmessage,
-    atk13_printfromtable,
-    atk14_printselectionstringfromtable,
-    atk15_seteffectwithchance,
-    atk16_seteffectprimary,
-    atk17_seteffectsecondary,
-    atk18_clearstatusfromeffect,
-    atk19_tryfaintmon,
-    atk1A_dofaintanimation,
-    atk1B_cleareffectsonfaint,
-    atk1C_jumpifstatus,
-    atk1D_jumpifstatus2,
-    atk1E_jumpifability,
-    atk1F_jumpifsideaffecting,
-    atk20_jumpifstat,
-    atk21_jumpifstatus3condition,
-    atk22_jumpiftype,
-    atk23_getexp,
-    atk24,
-    atk25_movevaluescleanup,
-    atk26_setmultihit,
-    atk27_decrementmultihit,
-    atk28_goto,
-    atk29_jumpifbyte,
-    atk2A_jumpifhalfword,
-    atk2B_jumpifword,
-    atk2C_jumpifarrayequal,
-    atk2D_jumpifarraynotequal,
-    atk2E_setbyte,
-    atk2F_addbyte,
-    atk30_subbyte,
-    atk31_copyarray,
-    atk32_copyarraywithindex,
-    atk33_orbyte,
-    atk34_orhalfword,
-    atk35_orword,
-    atk36_bicbyte,
-    atk37_bichalfword,
-    atk38_bicword,
-    atk39_pause,
-    atk3A_waitstate,
-    atk3B_healthbar_update,
-    atk3C_return,
-    atk3D_end,
-    atk3E_end2,
-    atk3F_end3,
-    atk40_jumpifaffectedbyprotect,
-    atk41_call,
-    atk42_jumpiftype2,
-    atk43_jumpifabilitypresent,
-    atk44_endselectionscript,
-    atk45_playanimation,
-    atk46_playanimation2,
-    atk47_setgraphicalstatchangevalues,
-    atk48_playstatchangeanimation,
-    atk49_moveend,
-    atk4A_typecalc2,
-    atk4B_returnatktoball,
-    atk4C_getswitchedmondata,
-    atk4D_switchindataupdate,
-    atk4E_switchinanim,
-    atk4F_jumpifcantswitch,
-    atk50_openpartyscreen,
-    atk51_switchhandleorder,
-    atk52_switchineffects,
-    atk53_trainerslidein,
-    atk54_playse,
-    atk55_fanfare,
-    atk56_playfaintcry,
-    atk57,
-    atk58_returntoball,
-    atk59_handlelearnnewmove,
-    atk5A_yesnoboxlearnmove,
-    atk5B_yesnoboxstoplearningmove,
-    atk5C_hitanimation,
-    atk5D_getmoneyreward,
-    atk5E,
-    atk5F_swapattackerwithtarget,
-    atk60_incrementgamestat,
-    atk61_drawpartystatussummary,
-    atk62_hidepartystatussummary,
-    atk63_jumptocalledmove,
-    atk64_statusanimation,
-    atk65_status2animation,
-    atk66_chosenstatusanimation,
-    atk67_yesnobox,
-    atk68_cancelallactions,
-    atk69_adjustsetdamage,
-    atk6A_removeitem,
-    atk6B_atknameinbuff1,
-    atk6C_drawlvlupbox,
-    atk6D_resetsentmonsvalue,
-    atk6E_setatktoplayer0,
-    atk6F_makevisible,
-    atk70_recordlastability,
-    atk71_buffermovetolearn,
-    atk72_jumpifplayerran,
-    atk73_hpthresholds,
-    atk74_hpthresholds2,
-    atk75_useitemonopponent,
-    atk76_various,
-    atk77_setprotectlike,
-    atk78_faintifabilitynotdamp,
-    atk79_setatkhptozero,
-    atk7A_jumpifnexttargetvalid,
-    atk7B_tryhealhalfhealth,
-    atk7C_trymirrormove,
-    atk7D_setrain,
-    atk7E_setreflect,
-    atk7F_setseeded,
-    atk80_manipulatedamage,
-    atk81_trysetrest,
-    atk82_jumpifnotfirstturn,
-    atk83_nop,
-    atk84_jumpifcantmakeasleep,
-    atk85_stockpile,
-    atk86_stockpiletobasedamage,
-    atk87_stockpiletohpheal,
-    atk88_negativedamage,
-    atk89_statbuffchange,
-    atk8A_normalisebuffs,
-    atk8B_setbide,
-    atk8C_confuseifrepeatingattackends,
-    atk8D_setmultihitcounter,
-    atk8E_initmultihitstring,
-    atk8F_forcerandomswitch,
-    atk90_tryconversiontypechange,
-    atk91_givepaydaymoney,
-    atk92_setlightscreen,
-    atk93_tryKO,
-    atk94_damagetohalftargethp,
-    atk95_setsandstorm,
-    atk96_weatherdamage,
-    atk97_tryinfatuating,
-    atk98_updatestatusicon,
-    atk99_setmist,
-    atk9A_setfocusenergy,
-    atk9B_transformdataexecution,
-    atk9C_setsubstitute,
-    atk9D_mimicattackcopy,
-    atk9E_metronome,
-    atk9F_dmgtolevel,
-    atkA0_psywavedamageeffect,
-    atkA1_counterdamagecalculator,
-    atkA2_mirrorcoatdamagecalculator,
-    atkA3_disablelastusedattack,
-    atkA4_trysetencore,
-    atkA5_painsplitdmgcalc,
-    atkA6_settypetorandomresistance,
-    atkA7_setalwayshitflag,
-    atkA8_copymovepermanently,
-    atkA9_trychoosesleeptalkmove,
-    atkAA_setdestinybond,
-    atkAB_trysetdestinybondtohappen,
-    atkAC_remaininghptopower,
-    atkAD_tryspiteppreduce,
-    atkAE_healpartystatus,
-    atkAF_cursetarget,
-    atkB0_trysetspikes,
-    atkB1_setforesight,
-    atkB2_trysetperishsong,
-    atkB3_rolloutdamagecalculation,
-    atkB4_jumpifconfusedandstatmaxed,
-    atkB5_furycuttercalc,
-    atkB6_happinesstodamagecalculation,
-    atkB7_presentdamagecalculation,
-    atkB8_setsafeguard,
-    atkB9_magnitudedamagecalculation,
-    atkBA_jumpifnopursuitswitchdmg,
-    atkBB_setsunny,
-    atkBC_maxattackhalvehp,
-    atkBD_copyfoestats,
-    atkBE_rapidspinfree,
-    atkBF_setdefensecurlbit,
-    atkC0_recoverbasedonsunlight,
-    atkC1_hiddenpowercalc,
-    atkC2_selectfirstvalidtarget,
-    atkC3_trysetfutureattack,
-    atkC4_trydobeatup,
-    atkC5_setsemiinvulnerablebit,
-    atkC6_clearsemiinvulnerablebit,
-    atkC7_setminimize,
-    atkC8_sethail,
-    atkC9_jumpifattackandspecialattackcannotfall,
-    atkCA_setforcedtarget,
-    atkCB_setcharge,
-    atkCC_callterrainattack,
-    atkCD_cureifburnedparalysedorpoisoned,
-    atkCE_settorment,
-    atkCF_jumpifnodamage,
-    atkD0_settaunt,
-    atkD1_trysethelpinghand,
-    atkD2_tryswapitems,
-    atkD3_trycopyability,
-    atkD4_trywish,
-    atkD5_trysetroots,
-    atkD6_doubledamagedealtifdamaged,
-    atkD7_setyawn,
-    atkD8_setdamagetohealthdifference,
-    atkD9_scaledamagebyhealthratio,
-    atkDA_tryswapabilities,
-    atkDB_tryimprison,
-    atkDC_trysetgrudge,
-    atkDD_weightdamagecalculation,
-    atkDE_assistattackselect,
-    atkDF_trysetmagiccoat,
-    atkE0_trysetsnatch,
-    atkE1_trygetintimidatetarget,
-    atkE2_switchoutabilities,
-    atkE3_jumpifhasnohp,
-    atkE4_getsecretpowereffect,
-    atkE5_pickup,
-    atkE6_docastformchangeanimation,
-    atkE7_trycastformdatachange,
-    atkE8_settypebasedhalvers,
-    atkE9_setweatherballtype,
-    atkEA_tryrecycleitem,
-    atkEB_settypetoterrain,
-    atkEC_pursuitrelated,
-    atkEF_snatchsetbattlers,
-    atkEE_removelightscreenreflect,
-    atkEF_handleballthrow,
-    atkF0_givecaughtmon,
-    atkF1_trysetcaughtmondexflags,
-    atkF2_displaydexinfo,
-    atkF3_trygivecaughtmonnick,
-    atkF4_subattackerhpbydmg,
-    atkF5_removeattackerstatus1,
-    atkF6_finishaction,
-    atkF7_finishturn,
-    atkF8_trainerslideout
+    Cmd_attackcanceler,                          //0x0
+    Cmd_accuracycheck,                           //0x1
+    Cmd_attackstring,                            //0x2
+    Cmd_ppreduce,                                //0x3
+    Cmd_critcalc,                                //0x4
+    Cmd_damagecalc,                              //0x5
+    Cmd_typecalc,                                //0x6
+    Cmd_adjustnormaldamage,                      //0x7
+    Cmd_adjustnormaldamage2,                     //0x8
+    Cmd_attackanimation,                         //0x9
+    Cmd_waitanimation,                           //0xA
+    Cmd_healthbarupdate,                         //0xB
+    Cmd_datahpupdate,                            //0xC
+    Cmd_critmessage,                             //0xD
+    Cmd_effectivenesssound,                      //0xE
+    Cmd_resultmessage,                           //0xF
+    Cmd_printstring,                             //0x10
+    Cmd_printselectionstring,                    //0x11
+    Cmd_waitmessage,                             //0x12
+    Cmd_printfromtable,                          //0x13
+    Cmd_printselectionstringfromtable,           //0x14
+    Cmd_seteffectwithchance,                     //0x15
+    Cmd_seteffectprimary,                        //0x16
+    Cmd_seteffectsecondary,                      //0x17
+    Cmd_clearstatusfromeffect,                   //0x18
+    Cmd_tryfaintmon,                             //0x19
+    Cmd_dofaintanimation,                        //0x1A
+    Cmd_cleareffectsonfaint,                     //0x1B
+    Cmd_jumpifstatus,                            //0x1C
+    Cmd_jumpifstatus2,                           //0x1D
+    Cmd_jumpifability,                           //0x1E
+    Cmd_jumpifsideaffecting,                     //0x1F
+    Cmd_jumpifstat,                              //0x20
+    Cmd_jumpifstatus3condition,                  //0x21
+    Cmd_jumpiftype,                              //0x22
+    Cmd_getexp,                                  //0x23
+    Cmd_unknown_24,                              //0x24
+    Cmd_movevaluescleanup,                       //0x25
+    Cmd_setmultihit,                             //0x26
+    Cmd_decrementmultihit,                       //0x27
+    Cmd_goto,                                    //0x28
+    Cmd_jumpifbyte,                              //0x29
+    Cmd_jumpifhalfword,                          //0x2A
+    Cmd_jumpifword,                              //0x2B
+    Cmd_jumpifarrayequal,                        //0x2C
+    Cmd_jumpifarraynotequal,                     //0x2D
+    Cmd_setbyte,                                 //0x2E
+    Cmd_addbyte,                                 //0x2F
+    Cmd_subbyte,                                 //0x30
+    Cmd_copyarray,                               //0x31
+    Cmd_copyarraywithindex,                      //0x32
+    Cmd_orbyte,                                  //0x33
+    Cmd_orhalfword,                              //0x34
+    Cmd_orword,                                  //0x35
+    Cmd_bicbyte,                                 //0x36
+    Cmd_bichalfword,                             //0x37
+    Cmd_bicword,                                 //0x38
+    Cmd_pause,                                   //0x39
+    Cmd_waitstate,                               //0x3A
+    Cmd_healthbar_update,                        //0x3B
+    Cmd_return,                                  //0x3C
+    Cmd_end,                                     //0x3D
+    Cmd_end2,                                    //0x3E
+    Cmd_end3,                                    //0x3F
+    Cmd_jumpifaffectedbyprotect,                 //0x40
+    Cmd_call,                                    //0x41
+    Cmd_jumpiftype2,                             //0x42
+    Cmd_jumpifabilitypresent,                    //0x43
+    Cmd_endselectionscript,                      //0x44
+    Cmd_playanimation,                           //0x45
+    Cmd_playanimation2,                          //0x46
+    Cmd_setgraphicalstatchangevalues,            //0x47
+    Cmd_playstatchangeanimation,                 //0x48
+    Cmd_moveend,                                 //0x49
+    Cmd_typecalc2,                               //0x4A
+    Cmd_returnatktoball,                         //0x4B
+    Cmd_getswitchedmondata,                      //0x4C
+    Cmd_switchindataupdate,                      //0x4D
+    Cmd_switchinanim,                            //0x4E
+    Cmd_jumpifcantswitch,                        //0x4F
+    Cmd_openpartyscreen,                         //0x50
+    Cmd_switchhandleorder,                       //0x51
+    Cmd_switchineffects,                         //0x52
+    Cmd_trainerslidein,                          //0x53
+    Cmd_playse,                                  //0x54
+    Cmd_fanfare,                                 //0x55
+    Cmd_playfaintcry,                            //0x56
+    Cmd_unknown_57,                              //0x57
+    Cmd_returntoball,                            //0x58
+    Cmd_handlelearnnewmove,                      //0x59
+    Cmd_yesnoboxlearnmove,                       //0x5A
+    Cmd_yesnoboxstoplearningmove,                //0x5B
+    Cmd_hitanimation,                            //0x5C
+    Cmd_getmoneyreward,                          //0x5D
+    Cmd_unknown_5E,                              //0x5E
+    Cmd_swapattackerwithtarget,                  //0x5F
+    Cmd_incrementgamestat,                       //0x60
+    Cmd_drawpartystatussummary,                  //0x61
+    Cmd_hidepartystatussummary,                  //0x62
+    Cmd_jumptocalledmove,                        //0x63
+    Cmd_statusanimation,                         //0x64
+    Cmd_status2animation,                        //0x65
+    Cmd_chosenstatusanimation,                   //0x66
+    Cmd_yesnobox,                                //0x67
+    Cmd_cancelallactions,                        //0x68
+    Cmd_adjustsetdamage,                         //0x69
+    Cmd_removeitem,                              //0x6A
+    Cmd_atknameinbuff1,                          //0x6B
+    Cmd_drawlvlupbox,                            //0x6C
+    Cmd_resetsentmonsvalue,                      //0x6D
+    Cmd_setatktoplayer0,                         //0x6E
+    Cmd_makevisible,                             //0x6F
+    Cmd_recordlastability,                       //0x70
+    Cmd_buffermovetolearn,                       //0x71
+    Cmd_jumpifplayerran,                         //0x72
+    Cmd_hpthresholds,                            //0x73
+    Cmd_hpthresholds2,                           //0x74
+    Cmd_useitemonopponent,                       //0x75
+    Cmd_various,                                 //0x76
+    Cmd_setprotectlike,                          //0x77
+    Cmd_faintifabilitynotdamp,                   //0x78
+    Cmd_setatkhptozero,                          //0x79
+    Cmd_jumpifnexttargetvalid,                   //0x7A
+    Cmd_tryhealhalfhealth,                       //0x7B
+    Cmd_trymirrormove,                           //0x7C
+    Cmd_setrain,                                 //0x7D
+    Cmd_setreflect,                              //0x7E
+    Cmd_setseeded,                               //0x7F
+    Cmd_manipulatedamage,                        //0x80
+    Cmd_trysetrest,                              //0x81
+    Cmd_jumpifnotfirstturn,                      //0x82
+    Cmd_nop,                                     //0x83
+    Cmd_jumpifcantmakeasleep,                    //0x84
+    Cmd_stockpile,                               //0x85
+    Cmd_stockpiletobasedamage,                   //0x86
+    Cmd_stockpiletohpheal,                       //0x87
+    Cmd_negativedamage,                          //0x88
+    Cmd_statbuffchange,                          //0x89
+    Cmd_normalisebuffs,                          //0x8A
+    Cmd_setbide,                                 //0x8B
+    Cmd_confuseifrepeatingattackends,            //0x8C
+    Cmd_setmultihitcounter,                      //0x8D
+    Cmd_initmultihitstring,                      //0x8E
+    Cmd_forcerandomswitch,                       //0x8F
+    Cmd_tryconversiontypechange,                 //0x90
+    Cmd_givepaydaymoney,                         //0x91
+    Cmd_setlightscreen,                          //0x92
+    Cmd_tryKO,                                   //0x93
+    Cmd_damagetohalftargethp,                    //0x94
+    Cmd_setsandstorm,                            //0x95
+    Cmd_weatherdamage,                           //0x96
+    Cmd_tryinfatuating,                          //0x97
+    Cmd_updatestatusicon,                        //0x98
+    Cmd_setmist,                                 //0x99
+    Cmd_setfocusenergy,                          //0x9A
+    Cmd_transformdataexecution,                  //0x9B
+    Cmd_setsubstitute,                           //0x9C
+    Cmd_mimicattackcopy,                         //0x9D
+    Cmd_metronome,                               //0x9E
+    Cmd_dmgtolevel,                              //0x9F
+    Cmd_psywavedamageeffect,                     //0xA0
+    Cmd_counterdamagecalculator,                 //0xA1
+    Cmd_mirrorcoatdamagecalculator,              //0xA2
+    Cmd_disablelastusedattack,                   //0xA3
+    Cmd_trysetencore,                            //0xA4
+    Cmd_painsplitdmgcalc,                        //0xA5
+    Cmd_settypetorandomresistance,               //0xA6
+    Cmd_setalwayshitflag,                        //0xA7
+    Cmd_copymovepermanently,                     //0xA8
+    Cmd_trychoosesleeptalkmove,                  //0xA9
+    Cmd_setdestinybond,                          //0xAA
+    Cmd_trysetdestinybondtohappen,               //0xAB
+    Cmd_remaininghptopower,                      //0xAC
+    Cmd_tryspiteppreduce,                        //0xAD
+    Cmd_healpartystatus,                         //0xAE
+    Cmd_cursetarget,                             //0xAF
+    Cmd_trysetspikes,                            //0xB0
+    Cmd_setforesight,                            //0xB1
+    Cmd_trysetperishsong,                        //0xB2
+    Cmd_rolloutdamagecalculation,                //0xB3
+    Cmd_jumpifconfusedandstatmaxed,              //0xB4
+    Cmd_furycuttercalc,                          //0xB5
+    Cmd_happinesstodamagecalculation,            //0xB6
+    Cmd_presentdamagecalculation,                //0xB7
+    Cmd_setsafeguard,                            //0xB8
+    Cmd_magnitudedamagecalculation,              //0xB9
+    Cmd_jumpifnopursuitswitchdmg,                //0xBA
+    Cmd_setsunny,                                //0xBB
+    Cmd_maxattackhalvehp,                        //0xBC
+    Cmd_copyfoestats,                            //0xBD
+    Cmd_rapidspinfree,                           //0xBE
+    Cmd_setdefensecurlbit,                       //0xBF
+    Cmd_recoverbasedonsunlight,                  //0xC0
+    Cmd_hiddenpowercalc,                         //0xC1
+    Cmd_selectfirstvalidtarget,                  //0xC2
+    Cmd_trysetfutureattack,                      //0xC3
+    Cmd_trydobeatup,                             //0xC4
+    Cmd_setsemiinvulnerablebit,                  //0xC5
+    Cmd_clearsemiinvulnerablebit,                //0xC6
+    Cmd_setminimize,                             //0xC7
+    Cmd_sethail,                                 //0xC8
+    Cmd_jumpifattackandspecialattackcannotfall,  //0xC9
+    Cmd_setforcedtarget,                         //0xCA
+    Cmd_setcharge,                               //0xCB
+    Cmd_callterrainattack,                       //0xCC
+    Cmd_cureifburnedparalysedorpoisoned,         //0xCD
+    Cmd_settorment,                              //0xCE
+    Cmd_jumpifnodamage,                          //0xCF
+    Cmd_settaunt,                                //0xD0
+    Cmd_trysethelpinghand,                       //0xD1
+    Cmd_tryswapitems,                            //0xD2
+    Cmd_trycopyability,                          //0xD3
+    Cmd_trywish,                                 //0xD4
+    Cmd_trysetroots,                             //0xD5
+    Cmd_doubledamagedealtifdamaged,              //0xD6
+    Cmd_setyawn,                                 //0xD7
+    Cmd_setdamagetohealthdifference,             //0xD8
+    Cmd_scaledamagebyhealthratio,                //0xD9
+    Cmd_tryswapabilities,                        //0xDA
+    Cmd_tryimprison,                             //0xDB
+    Cmd_trysetgrudge,                            //0xDC
+    Cmd_weightdamagecalculation,                 //0xDD
+    Cmd_assistattackselect,                      //0xDE
+    Cmd_trysetmagiccoat,                         //0xDF
+    Cmd_trysetsnatch,                            //0xE0
+    Cmd_trygetintimidatetarget,                  //0xE1
+    Cmd_switchoutabilities,                      //0xE2
+    Cmd_jumpifhasnohp,                           //0xE3
+    Cmd_getsecretpowereffect,                    //0xE4
+    Cmd_pickup,                                  //0xE5
+    Cmd_docastformchangeanimation,               //0xE6
+    Cmd_trycastformdatachange,                   //0xE7
+    Cmd_settypebasedhalvers,                     //0xE8
+    Cmd_setweatherballtype,                      //0xE9
+    Cmd_tryrecycleitem,                          //0xEA
+    Cmd_settypetoterrain,                        //0xEB
+    Cmd_pursuitrelated,                          //0xEC
+    Cmd_snatchsetbattlers,                       //0xED
+    Cmd_removelightscreenreflect,                //0xEE
+    Cmd_handleballthrow,                         //0xEF
+    Cmd_givecaughtmon,                           //0xF0
+    Cmd_trysetcaughtmondexflags,                 //0xF1
+    Cmd_displaydexinfo,                          //0xF2
+    Cmd_trygivecaughtmonnick,                    //0xF3
+    Cmd_subattackerhpbydmg,                      //0xF4
+    Cmd_removeattackerstatus1,                   //0xF5
+    Cmd_finishaction,                            //0xF6
+    Cmd_finishturn,                              //0xF7
+    Cmd_trainerslideout                          //0xF8
 };
 
 struct StatFractions
@@ -917,7 +918,7 @@ static const u8 sUnknown_0831C4F8[] =
     0x03, 0x00, 0x00, 0x00
 };
 
-static void atk00_attackcanceler(void)
+static void Cmd_attackcanceler(void)
 {
     s32 i;
 
@@ -1029,7 +1030,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     gBattlescriptCurrInstr = BS_ptr;
 }
 
-static void atk40_jumpifaffectedbyprotect(void)
+static void Cmd_jumpifaffectedbyprotect(void)
 {
     if (DEFENDER_IS_PROTECTED)
     {
@@ -1101,7 +1102,7 @@ static bool8 AccuracyCalcHelper(u16 move)
     return FALSE;
 }
 
-static void atk01_accuracycheck(void)
+static void Cmd_accuracycheck(void)
 {
     u16 move = T2_READ_16(gBattlescriptCurrInstr + 5);
 
@@ -1193,7 +1194,7 @@ static void atk01_accuracycheck(void)
     }
 }
 
-static void atk02_attackstring(void)
+static void Cmd_attackstring(void)
 {
     if (gBattleControllerExecFlags)
          return;
@@ -1206,7 +1207,7 @@ static void atk02_attackstring(void)
     gBattleCommunication[MSG_DISPLAY] = 0;
 }
 
-static void atk03_ppreduce(void)
+static void Cmd_ppreduce(void)
 {
     s32 ppToDeduct = 1;
 
@@ -1253,7 +1254,7 @@ static void atk03_ppreduce(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk04_critcalc(void)
+static void Cmd_critcalc(void)
 {
     u8 holdEffect;
     u16 item, critChance;
@@ -1290,7 +1291,7 @@ static void atk04_critcalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk05_damagecalc(void)
+static void Cmd_damagecalc(void)
 {
     u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)];
     gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove,
@@ -1355,7 +1356,7 @@ static void ModulateDmgByType(u8 multiplier)
     }
 }
 
-static void atk06_typecalc(void)
+static void Cmd_typecalc(void)
 {
     s32 i = 0;
     u8 moveType;
@@ -1657,7 +1658,7 @@ static void Unused_ApplyRandomDmgMultiplier(void)
     ApplyRandomDmgMultiplier();
 }
 
-static void atk07_adjustnormaldamage(void)
+static void Cmd_adjustnormaldamage(void)
 {
     u8 holdEffect, param;
 
@@ -1699,7 +1700,7 @@ static void atk07_adjustnormaldamage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't check for false swipe move effect.
+static void Cmd_adjustnormaldamage2(void) // The same as adjustnormaldamage except it doesn't check for false swipe move effect.
 {
     u8 holdEffect, param;
 
@@ -1741,7 +1742,7 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
     gBattlescriptCurrInstr++;
 }
 
-static void atk09_attackanimation(void)
+static void Cmd_attackanimation(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1795,13 +1796,13 @@ static void atk09_attackanimation(void)
     }
 }
 
-static void atk0A_waitanimation(void)
+static void Cmd_waitanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
-static void atk0B_healthbarupdate(void)
+static void Cmd_healthbarupdate(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1837,7 +1838,7 @@ static void atk0B_healthbarupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk0C_datahpupdate(void)
+static void Cmd_datahpupdate(void)
 {
     u32 moveType;
 
@@ -1963,7 +1964,7 @@ static void atk0C_datahpupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk0D_critmessage(void)
+static void Cmd_critmessage(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -1976,7 +1977,7 @@ static void atk0D_critmessage(void)
     }
 }
 
-static void atk0E_effectivenesssound(void)
+static void Cmd_effectivenesssound(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -2023,7 +2024,7 @@ static void atk0E_effectivenesssound(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk0F_resultmessage(void)
+static void Cmd_resultmessage(void)
 {
     u32 stringId = 0;
 
@@ -2112,7 +2113,7 @@ static void atk0F_resultmessage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk10_printstring(void)
+static void Cmd_printstring(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2123,7 +2124,7 @@ static void atk10_printstring(void)
     }
 }
 
-static void atk11_printselectionstring(void)
+static void Cmd_printselectionstring(void)
 {
     gActiveBattler = gBattlerAttacker;
 
@@ -2134,7 +2135,7 @@ static void atk11_printselectionstring(void)
     gBattleCommunication[MSG_DISPLAY] = 1;
 }
 
-static void atk12_waitmessage(void)
+static void Cmd_waitmessage(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2155,7 +2156,7 @@ static void atk12_waitmessage(void)
     }
 }
 
-static void atk13_printfromtable(void)
+static void Cmd_printfromtable(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2169,7 +2170,7 @@ static void atk13_printfromtable(void)
     }
 }
 
-static void atk14_printselectionstringfromtable(void)
+static void Cmd_printselectionstringfromtable(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2881,7 +2882,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
 }
 
-static void atk15_seteffectwithchance(void)
+static void Cmd_seteffectwithchance(void)
 {
     u32 percentChance;
 
@@ -2914,17 +2915,17 @@ static void atk15_seteffectwithchance(void)
     gBattleScripting.multihitMoveEffect = 0;
 }
 
-static void atk16_seteffectprimary(void)
+static void Cmd_seteffectprimary(void)
 {
     SetMoveEffect(TRUE, 0);
 }
 
-static void atk17_seteffectsecondary(void)
+static void Cmd_seteffectsecondary(void)
 {
     SetMoveEffect(FALSE, 0);
 }
 
-static void atk18_clearstatusfromeffect(void)
+static void Cmd_clearstatusfromeffect(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -2938,7 +2939,7 @@ static void atk18_clearstatusfromeffect(void)
     gBattleScripting.multihitMoveEffect = 0;
 }
 
-static void atk19_tryfaintmon(void)
+static void Cmd_tryfaintmon(void)
 {
     const u8 *BS_ptr;
 
@@ -3025,7 +3026,7 @@ static void atk19_tryfaintmon(void)
     }
 }
 
-static void atk1A_dofaintanimation(void)
+static void Cmd_dofaintanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -3036,7 +3037,7 @@ static void atk1A_dofaintanimation(void)
     }
 }
 
-static void atk1B_cleareffectsonfaint(void)
+static void Cmd_cleareffectsonfaint(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -3054,7 +3055,7 @@ static void atk1B_cleareffectsonfaint(void)
     }
 }
 
-static void atk1C_jumpifstatus(void)
+static void Cmd_jumpifstatus(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
@@ -3066,7 +3067,7 @@ static void atk1C_jumpifstatus(void)
         gBattlescriptCurrInstr += 10;
 }
 
-static void atk1D_jumpifstatus2(void)
+static void Cmd_jumpifstatus2(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
@@ -3078,7 +3079,7 @@ static void atk1D_jumpifstatus2(void)
         gBattlescriptCurrInstr += 10;
 }
 
-static void atk1E_jumpifability(void)
+static void Cmd_jumpifability(void)
 {
     u8 battlerId;
     u8 ability = gBattlescriptCurrInstr[2];
@@ -3125,7 +3126,7 @@ static void atk1E_jumpifability(void)
     }
 }
 
-static void atk1F_jumpifsideaffecting(void)
+static void Cmd_jumpifsideaffecting(void)
 {
     u8 side;
     u16 flags;
@@ -3145,7 +3146,7 @@ static void atk1F_jumpifsideaffecting(void)
         gBattlescriptCurrInstr += 8;
 }
 
-static void atk20_jumpifstat(void)
+static void Cmd_jumpifstat(void)
 {
     u8 ret = 0;
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
@@ -3185,7 +3186,7 @@ static void atk20_jumpifstat(void)
         gBattlescriptCurrInstr += 9;
 }
 
-static void atk21_jumpifstatus3condition(void)
+static void Cmd_jumpifstatus3condition(void)
 {
     u32 flags;
     const u8 *jumpPtr;
@@ -3210,7 +3211,7 @@ static void atk21_jumpifstatus3condition(void)
     }
 }
 
-static void atk22_jumpiftype(void)
+static void Cmd_jumpiftype(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u8 type = gBattlescriptCurrInstr[2];
@@ -3222,7 +3223,7 @@ static void atk22_jumpiftype(void)
         gBattlescriptCurrInstr += 7;
 }
 
-static void atk23_getexp(void)
+static void Cmd_getexp(void)
 {
     u16 item;
     s32 i; // also used as stringId
@@ -3234,7 +3235,7 @@ static void atk23_getexp(void)
     gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
 
-    switch (gBattleScripting.atk23_state)
+    switch (gBattleScripting.getexpState)
     {
     case 0: // check if should receive exp at all
         if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags &
@@ -3246,11 +3247,11 @@ static void atk23_getexp(void)
               | BATTLE_TYPE_BATTLE_TOWER
               | BATTLE_TYPE_EREADER_TRAINER)))
         {
-            gBattleScripting.atk23_state = 6; // goto last case
+            gBattleScripting.getexpState = 6; // goto last case
         }
         else
         {
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
             gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
         }
         break;
@@ -3297,7 +3298,7 @@ static void atk23_getexp(void)
                 gExpShareExp = 0;
             }
 
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
             gBattleStruct->expGetterMonId = 0;
             gBattleStruct->sentInPokes = sentIn;
         }
@@ -3315,13 +3316,13 @@ static void atk23_getexp(void)
             if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1))
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
             else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL)
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
             else
@@ -3393,7 +3394,7 @@ static void atk23_getexp(void)
                     MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
                 }
                 gBattleStruct->sentInPokes >>= 1;
-                gBattleScripting.atk23_state++;
+                gBattleScripting.getexpState++;
             }
         }
         break;
@@ -3414,7 +3415,7 @@ static void atk23_getexp(void)
                 BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
         }
         break;
     case 4: // lvl up if necessary
@@ -3464,27 +3465,27 @@ static void atk23_getexp(void)
 
                     gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
                 }
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
             }
             else
             {
                 gBattleMoveDamage = 0;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
             }
         }
         break;
     case 5: // looper increment
         if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp
         {
-            gBattleScripting.atk23_state = 3;
+            gBattleScripting.getexpState = 3;
         }
         else
         {
             gBattleStruct->expGetterMonId++;
             if (gBattleStruct->expGetterMonId <= 5)
-                gBattleScripting.atk23_state = 2; // loop again
+                gBattleScripting.getexpState = 2; // loop again
             else
-                gBattleScripting.atk23_state = 6; // we're done
+                gBattleScripting.getexpState = 6; // we're done
         }
         break;
     case 6: // increment instruction
@@ -3500,7 +3501,7 @@ static void atk23_getexp(void)
 }
 
 #ifdef NONMATCHING
-static void atk24(void)
+static void Cmd_unknown_24(void)
 {
     u16 HP_count = 0;
     s32 i;
@@ -3583,7 +3584,7 @@ static void atk24(void)
 }
 #else
 NAKED
-static void atk24(void)
+static void Cmd_unknown_24(void)
 {
     asm("\n\
         .syntax unified\n\
@@ -3888,19 +3889,19 @@ static void MoveValuesCleanUp(void)
     gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
 }
 
-static void atk25_movevaluescleanup(void)
+static void Cmd_movevaluescleanup(void)
 {
     MoveValuesCleanUp();
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk26_setmultihit(void)
+static void Cmd_setmultihit(void)
 {
     gMultiHitCounter = gBattlescriptCurrInstr[1];
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk27_decrementmultihit(void)
+static void Cmd_decrementmultihit(void)
 {
     if (--gMultiHitCounter == 0)
         gBattlescriptCurrInstr += 5;
@@ -3908,12 +3909,12 @@ static void atk27_decrementmultihit(void)
         gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk28_goto(void)
+static void Cmd_goto(void)
 {
     gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk29_jumpifbyte(void)
+static void Cmd_jumpifbyte(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -3951,7 +3952,7 @@ static void atk29_jumpifbyte(void)
     }
 }
 
-static void atk2A_jumpifhalfword(void)
+static void Cmd_jumpifhalfword(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -3989,7 +3990,7 @@ static void atk2A_jumpifhalfword(void)
     }
 }
 
-static void atk2B_jumpifword(void)
+static void Cmd_jumpifword(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -4027,7 +4028,7 @@ static void atk2B_jumpifword(void)
     }
 }
 
-static void atk2C_jumpifarrayequal(void)
+static void Cmd_jumpifarrayequal(void)
 {
     const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -4049,7 +4050,7 @@ static void atk2C_jumpifarrayequal(void)
         gBattlescriptCurrInstr = jumpPtr;
 }
 
-static void atk2D_jumpifarraynotequal(void)
+static void Cmd_jumpifarraynotequal(void)
 {
     u8 equalBytes = 0;
     const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -4073,7 +4074,7 @@ static void atk2D_jumpifarraynotequal(void)
         gBattlescriptCurrInstr += 14;
 }
 
-static void atk2E_setbyte(void)
+static void Cmd_setbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte = gBattlescriptCurrInstr[5];
@@ -4081,21 +4082,21 @@ static void atk2E_setbyte(void)
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk2F_addbyte(void)
+static void Cmd_addbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte += gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk30_subbyte(void)
+static void Cmd_subbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte -= gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk31_copyarray(void)
+static void Cmd_copyarray(void)
 {
     u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -4110,7 +4111,7 @@ static void atk31_copyarray(void)
     gBattlescriptCurrInstr += 10;
 }
 
-static void atk32_copyarraywithindex(void)
+static void Cmd_copyarraywithindex(void)
 {
     u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -4126,14 +4127,14 @@ static void atk32_copyarraywithindex(void)
     gBattlescriptCurrInstr += 14;
 }
 
-static void atk33_orbyte(void)
+static void Cmd_orbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte |= gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk34_orhalfword(void)
+static void Cmd_orhalfword(void)
 {
     u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
@@ -4142,7 +4143,7 @@ static void atk34_orhalfword(void)
     gBattlescriptCurrInstr += 7;
 }
 
-static void atk35_orword(void)
+static void Cmd_orword(void)
 {
     u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
@@ -4151,14 +4152,14 @@ static void atk35_orword(void)
     gBattlescriptCurrInstr += 9;
 }
 
-static void atk36_bicbyte(void)
+static void Cmd_bicbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte &= ~(gBattlescriptCurrInstr[5]);
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk37_bichalfword(void)
+static void Cmd_bichalfword(void)
 {
     u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
@@ -4167,7 +4168,7 @@ static void atk37_bichalfword(void)
     gBattlescriptCurrInstr += 7;
 }
 
-static void atk38_bicword(void)
+static void Cmd_bicword(void)
 {
     u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
@@ -4176,7 +4177,7 @@ static void atk38_bicword(void)
     gBattlescriptCurrInstr += 9;
 }
 
-static void atk39_pause(void)
+static void Cmd_pause(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -4189,13 +4190,13 @@ static void atk39_pause(void)
     }
 }
 
-static void atk3A_waitstate(void)
+static void Cmd_waitstate(void)
 {
     if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
-static void atk3B_healthbar_update(void)
+static void Cmd_healthbar_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_TARGET)
         gActiveBattler = gBattlerTarget;
@@ -4207,12 +4208,12 @@ static void atk3B_healthbar_update(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk3C_return(void)
+static void Cmd_return(void)
 {
     BattleScriptPop();
 }
 
-static void atk3D_end(void)
+static void Cmd_end(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
         BattleArena_AddSkillPoints(gBattlerAttacker);
@@ -4222,13 +4223,13 @@ static void atk3D_end(void)
     gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
-static void atk3E_end2(void)
+static void Cmd_end2(void)
 {
     gActiveBattler = 0;
     gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
-static void atk3F_end3(void) // pops the main function stack
+static void Cmd_end3(void) // pops the main function stack
 {
     BattleScriptPop();
     if (gBattleResources->battleCallbackStack->size != 0)
@@ -4236,13 +4237,13 @@ static void atk3F_end3(void) // pops the main function stack
     gBattleMainFunc = gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size];
 }
 
-static void atk41_call(void)
+static void Cmd_call(void)
 {
     BattleScriptPush(gBattlescriptCurrInstr + 5);
     gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk42_jumpiftype2(void)
+static void Cmd_jumpiftype2(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -4252,7 +4253,7 @@ static void atk42_jumpiftype2(void)
         gBattlescriptCurrInstr += 7;
 }
 
-static void atk43_jumpifabilitypresent(void)
+static void Cmd_jumpifabilitypresent(void)
 {
     if (AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, gBattlescriptCurrInstr[1], 0, 0))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -4260,12 +4261,12 @@ static void atk43_jumpifabilitypresent(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk44_endselectionscript(void)
+static void Cmd_endselectionscript(void)
 {
     *(gBattlerAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
-static void atk45_playanimation(void)
+static void Cmd_playanimation(void)
 {
     const u16* argumentPtr;
 
@@ -4306,7 +4307,7 @@ static void atk45_playanimation(void)
     }
 }
 
-static void atk46_playanimation2(void) // animation Id is stored in the first pointer
+static void Cmd_playanimation2(void) // animation Id is stored in the first pointer
 {
     const u16* argumentPtr;
     const u8* animationIdPtr;
@@ -4348,7 +4349,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     }
 }
 
-static void atk47_setgraphicalstatchangevalues(void)
+static void Cmd_setgraphicalstatchangevalues(void)
 {
     u8 value = 0;
     switch (GET_STAT_BUFF_VALUE2(gBattleScripting.statChanger))
@@ -4371,7 +4372,7 @@ static void atk47_setgraphicalstatchangevalues(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk48_playstatchangeanimation(void)
+static void Cmd_playstatchangeanimation(void)
 {
     u32 currStat = 0;
     u16 statAnimId = 0;
@@ -4381,10 +4382,10 @@ static void atk48_playstatchangeanimation(void)
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     statsToCheck = gBattlescriptCurrInstr[2];
 
-    if (gBattlescriptCurrInstr[3] & ATK48_STAT_NEGATIVE) // goes down
+    if (gBattlescriptCurrInstr[3] & STAT_CHANGE_NEGATIVE) // goes down
     {
         s16 startingStatAnimId;
-        if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO)
+        if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO)
             startingStatAnimId = STAT_ANIM_MINUS2 - 1;
         else
             startingStatAnimId = STAT_ANIM_MINUS1 - 1;
@@ -4393,7 +4394,7 @@ static void atk48_playstatchangeanimation(void)
         {
             if (statsToCheck & 1)
             {
-                if (gBattlescriptCurrInstr[3] & ATK48_DONT_CHECK_LOWER)
+                if (gBattlescriptCurrInstr[3] & STAT_CHANGE_CANT_PREVENT)
                 {
                     if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
                     {
@@ -4419,7 +4420,7 @@ static void atk48_playstatchangeanimation(void)
 
         if (changeableStatsCount > 1) // more than one stat, so the color is gray
         {
-            if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO)
+            if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO)
                 statAnimId = STAT_ANIM_MULTIPLE_MINUS2;
             else
                 statAnimId = STAT_ANIM_MULTIPLE_MINUS1;
@@ -4428,7 +4429,7 @@ static void atk48_playstatchangeanimation(void)
     else // goes up
     {
         s16 startingStatAnimId;
-        if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO)
+        if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO)
             startingStatAnimId = STAT_ANIM_PLUS2 - 1;
         else
             startingStatAnimId = STAT_ANIM_PLUS1 - 1;
@@ -4445,14 +4446,14 @@ static void atk48_playstatchangeanimation(void)
 
         if (changeableStatsCount > 1) // more than one stat, so the color is gray
         {
-            if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO)
+            if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO)
                 statAnimId = STAT_ANIM_MULTIPLE_PLUS2;
             else
                 statAnimId = STAT_ANIM_MULTIPLE_PLUS1;
         }
     }
 
-    if (gBattlescriptCurrInstr[3] & ATK48_ONLY_MULTIPLE && changeableStatsCount < 2)
+    if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount < 2)
     {
         gBattlescriptCurrInstr += 4;
     }
@@ -4460,7 +4461,7 @@ static void atk48_playstatchangeanimation(void)
     {
         BtlController_EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
         MarkBattlerForControllerExec(gActiveBattler);
-        if (gBattlescriptCurrInstr[3] & ATK48_ONLY_MULTIPLE && changeableStatsCount > 1)
+        if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount > 1)
             gBattleScripting.statAnimPlayed = TRUE;
         gBattlescriptCurrInstr += 4;
     }
@@ -4470,7 +4471,7 @@ static void atk48_playstatchangeanimation(void)
     }
 }
 
-static void atk49_moveend(void)
+static void Cmd_moveend(void)
 {
     s32 i;
     bool32 effect = FALSE;
@@ -4498,9 +4499,9 @@ static void atk49_moveend(void)
 
     do
     {
-        switch (gBattleScripting.atk49_state)
+        switch (gBattleScripting.moveendState)
         {
-        case ATK49_RAGE: // rage check
+        case MOVEEND_RAGE: // rage check
             if (gBattleMons[gBattlerTarget].status2 & STATUS2_RAGE
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
@@ -4512,9 +4513,9 @@ static void atk49_moveend(void)
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_DEFROST: // defrosting check
+        case MOVEEND_DEFROST: // defrosting check
             if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && gSpecialStatuses[gBattlerTarget].specialDmg
@@ -4528,38 +4529,38 @@ static void atk49_moveend(void)
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = TRUE;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_SYNCHRONIZE_TARGET: // target synchronize
+        case MOVEEND_SYNCHRONIZE_TARGET: // target synchronize
             if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_MOVE_END_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.).
-            if (AbilityBattleEffects(ABILITYEFFECT_MOVE_END, gBattlerTarget, 0, 0, 0))
+        case MOVEEND_ON_DAMAGE_ABILITIES: // Contact abilities and Color Change
+            if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_STATUS_IMMUNITY_ABILITIES: // status immunities
+        case MOVEEND_IMMUNITY_ABILITIES: // status immunities
             if (AbilityBattleEffects(ABILITYEFFECT_IMMUNITY, 0, 0, 0, 0))
                 effect = TRUE; // it loops through all battlers, so we increment after its done with all battlers
             else
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
             break;
-        case ATK49_SYNCHRONIZE_ATTACKER: // attacker synchronize
+        case MOVEEND_SYNCHRONIZE_ATTACKER: // attacker synchronize
             if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattlerAttacker, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_CHOICE_MOVE: // update choice band move
+        case MOVEEND_CHOICE_MOVE: // update choice band move
             if (gHitMarker & HITMARKER_OBEYS
              && holdEffectAtk == HOLD_EFFECT_CHOICE_BAND
-             && gChosenMove != MOVE_STRUGGLE 
+             && gChosenMove != MOVE_STRUGGLE
              && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF))
             {
                 if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED))
                 {
-                    ++gBattleScripting.atk49_state;
+                    ++gBattleScripting.moveendState;
                     break;
                 }
                 *choicedMoveAtk = gChosenMove;
@@ -4571,9 +4572,9 @@ static void atk49_moveend(void)
             }
             if (i == MAX_MON_MOVES)
                 *choicedMoveAtk = 0;
-            ++gBattleScripting.atk49_state;
+            ++gBattleScripting.moveendState;
             break;
-        case ATK49_CHANGED_ITEMS: // changed held items
+        case MOVEEND_CHANGED_ITEMS: // changed held items
             for (i = 0; i < gBattlersCount; i++)
             {
                 u16* changedItem = &gBattleStruct->changedItems[i];
@@ -4583,32 +4584,32 @@ static void atk49_moveend(void)
                     *changedItem = 0;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ITEM_EFFECTS_ALL: // item effects for all battlers
+        case MOVEEND_ITEM_EFFECTS_ALL: // item effects for all battlers
             if (ItemBattleEffects(ITEMEFFECT_MOVE_END, 0, FALSE))
                 effect = TRUE;
             else
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
             break;
-        case ATK49_KINGSROCK_SHELLBELL: // king's rock and shell bell
+        case MOVEEND_KINGSROCK_SHELLBELL: // king's rock and shell bell
             if (ItemBattleEffects(ITEMEFFECT_KINGSROCK_SHELLBELL, 0, FALSE))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ATTACKER_INVISIBLE: // make attacker sprite invisible
+        case MOVEEND_ATTACKER_INVISIBLE: // make attacker sprite invisible
             if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)
                 && gHitMarker & HITMARKER_NO_ANIMATIONS)
             {
                 gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSpriteInvisibility(0, TRUE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ATTACKER_VISIBLE: // make attacker sprite visible
+        case MOVEEND_ATTACKER_VISIBLE: // make attacker sprite visible
             if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
                 || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE))
                 || WasUnableToUseMove(gBattlerAttacker))
@@ -4618,12 +4619,12 @@ static void atk49_moveend(void)
                 MarkBattlerForControllerExec(gActiveBattler);
                 gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1;
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_TARGET_VISIBLE: // make target sprite visible
+        case MOVEEND_TARGET_VISIBLE: // make target sprite visible
             if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount
                 && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE))
             {
@@ -4631,20 +4632,20 @@ static void atk49_moveend(void)
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
                 gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_SUBSTITUTE: // update substitute
+        case MOVEEND_SUBSTITUTE: // update substitute
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gDisableStructs[i].substituteHP == 0)
                     gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE);
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_UPDATE_LAST_MOVES:
+        case MOVEEND_UPDATE_LAST_MOVES:
             if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET)
             {
                 gActiveBattler = gBattlerAttacker;
@@ -4691,9 +4692,9 @@ static void atk49_moveend(void)
                     gLastLandedMoves[gBattlerTarget] = 0xFFFF;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_MIRROR_MOVE: // mirror move
+        case MOVEEND_MIRROR_MOVE: // mirror move
             if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattlerAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
                 && gBattlerAttacker != gBattlerTarget && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))
@@ -4712,9 +4713,9 @@ static void atk49_moveend(void)
                 attacker = gBattlerAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_NEXT_TARGET: // For moves hitting two opposing Pokemon.
+        case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokemon.
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
                 && !gProtectStructs[gBattlerAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
@@ -4724,7 +4725,7 @@ static void atk49_moveend(void)
                 {
                     gBattlerTarget = battlerId;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
-                    gBattleScripting.atk49_state = 0;
+                    gBattleScripting.moveendState = 0;
                     MoveValuesCleanUp();
                     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
                     gBattlescriptCurrInstr = BattleScript_FlushMessageBox;
@@ -4735,24 +4736,24 @@ static void atk49_moveend(void)
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_COUNT:
+        case MOVEEND_COUNT:
             break;
         }
 
         if (arg1 == 1 && effect == FALSE)
-            gBattleScripting.atk49_state = ATK49_COUNT;
-        if (arg1 == 2 && arg2 == gBattleScripting.atk49_state)
-            gBattleScripting.atk49_state = ATK49_COUNT;
+            gBattleScripting.moveendState = MOVEEND_COUNT;
+        if (arg1 == 2 && arg2 == gBattleScripting.moveendState)
+            gBattleScripting.moveendState = MOVEEND_COUNT;
 
-    } while (gBattleScripting.atk49_state != ATK49_COUNT && effect == FALSE);
+    } while (gBattleScripting.moveendState != MOVEEND_COUNT && effect == FALSE);
 
-    if (gBattleScripting.atk49_state == ATK49_COUNT && effect == FALSE)
+    if (gBattleScripting.moveendState == MOVEEND_COUNT && effect == FALSE)
         gBattlescriptCurrInstr += 3;
 }
 
-static void atk4A_typecalc2(void)
+static void Cmd_typecalc2(void)
 {
     u8 flags = 0;
     s32 i = 0;
@@ -4847,7 +4848,7 @@ static void atk4A_typecalc2(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4B_returnatktoball(void)
+static void Cmd_returnatktoball(void)
 {
     gActiveBattler = gBattlerAttacker;
     if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
@@ -4858,7 +4859,7 @@ static void atk4B_returnatktoball(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4C_getswitchedmondata(void)
+static void Cmd_getswitchedmondata(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -4873,7 +4874,7 @@ static void atk4C_getswitchedmondata(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4D_switchindataupdate(void)
+static void Cmd_switchindataupdate(void)
 {
     struct BattlePokemon oldData;
     s32 i;
@@ -4926,7 +4927,7 @@ static void atk4D_switchindataupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4E_switchinanim(void)
+static void Cmd_switchinanim(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -4952,15 +4953,15 @@ static void atk4E_switchinanim(void)
         BattleArena_InitPoints();
 }
 
-static void atk4F_jumpifcantswitch(void)
+static void Cmd_jumpifcantswitch(void)
 {
     s32 i;
     s32 lastMonId;
     struct Pokemon *party;
 
-    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION));
 
-    if (!(gBattlescriptCurrInstr[1] & ATK4F_DONT_CHECK_STATUSES)
+    if (!(gBattlescriptCurrInstr[1] & SWITCH_IGNORE_ESCAPE_PREVENTION)
         && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
             || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
     {
@@ -5107,17 +5108,17 @@ static void atk4F_jumpifcantswitch(void)
     }
 }
 
-static void sub_804CF10(u8 arg0)
+static void sub_804CF10(u8 slotId)
 {
     *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE;
     gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-    BtlController_EmitChoosePokemon(0, PARTY_MUST_CHOOSE_MON, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
+    BtlController_EmitChoosePokemon(0, PARTY_ACTION_SEND_OUT, slotId, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
     MarkBattlerForControllerExec(gActiveBattler);
 }
 
-static void atk50_openpartyscreen(void)
+static void Cmd_openpartyscreen(void)
 {
     u32 flags;
     u8 hitmarkerFaintBits;
@@ -5145,7 +5146,7 @@ static void atk50_openpartyscreen(void)
                     }
                     else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
-                        sub_804CF10(6);
+                        sub_804CF10(PARTY_SIZE);
                         gSpecialStatuses[gActiveBattler].flag40 = 1;
                     }
                 }
@@ -5352,9 +5353,9 @@ static void atk50_openpartyscreen(void)
     else
     {
         if (gBattlescriptCurrInstr[1] & 0x80)
-            hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function.
+            hitmarkerFaintBits = PARTY_ACTION_CHOOSE_MON; // Used here as the caseId for the EmitChoose function.
         else
-            hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON;
+            hitmarkerFaintBits = PARTY_ACTION_SEND_OUT;
 
         battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80));
         if (gSpecialStatuses[battlerId].flag40)
@@ -5375,7 +5376,7 @@ static void atk50_openpartyscreen(void)
             *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
             gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-            BtlController_EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->field_60[gActiveBattler]);
+            BtlController_EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
             MarkBattlerForControllerExec(gActiveBattler);
 
             gBattlescriptCurrInstr += 6;
@@ -5407,7 +5408,7 @@ static void atk50_openpartyscreen(void)
     }
 }
 
-static void atk51_switchhandleorder(void)
+static void Cmd_switchhandleorder(void)
 {
     s32 i;
     if (gBattleControllerExecFlags)
@@ -5433,7 +5434,7 @@ static void atk51_switchhandleorder(void)
         break;
     case 1:
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            sub_803BDA0(gActiveBattler);
+            SwitchPartyOrder(gActiveBattler);
         break;
     case 2:
         if (!(gBattleStruct->field_93 & gBitTable[gActiveBattler]))
@@ -5458,11 +5459,11 @@ static void atk51_switchhandleorder(void)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
-            sub_80571DC(gActiveBattler, *(gBattleStruct->monToSwitchIntoId + gActiveBattler));
+            SwitchPartyOrderInGameMulti(gActiveBattler, *(gBattleStruct->monToSwitchIntoId + gActiveBattler));
         }
         else
         {
-            sub_803BDA0(gActiveBattler);
+            SwitchPartyOrder(gActiveBattler);
         }
 
         PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].species)
@@ -5474,7 +5475,7 @@ static void atk51_switchhandleorder(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk52_switchineffects(void)
+static void Cmd_switchineffects(void)
 {
     s32 i;
 
@@ -5556,7 +5557,7 @@ static void atk52_switchineffects(void)
     }
 }
 
-static void atk53_trainerslidein(void)
+static void Cmd_trainerslidein(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     BtlController_EmitTrainerSlide(0);
@@ -5565,7 +5566,7 @@ static void atk53_trainerslidein(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk54_playse(void)
+static void Cmd_playse(void)
 {
     gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlaySE(0, T2_READ_16(gBattlescriptCurrInstr + 1));
@@ -5574,7 +5575,7 @@ static void atk54_playse(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk55_fanfare(void)
+static void Cmd_fanfare(void)
 {
     gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlayFanfareOrBGM(0, T2_READ_16(gBattlescriptCurrInstr + 1), FALSE);
@@ -5583,7 +5584,7 @@ static void atk55_fanfare(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk56_playfaintcry(void)
+static void Cmd_playfaintcry(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitFaintingCry(0);
@@ -5592,7 +5593,7 @@ static void atk56_playfaintcry(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk57(void)
+static void Cmd_unknown_57(void)
 {
     gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     BtlController_EmitCmd55(0, gBattleOutcome);
@@ -5601,7 +5602,7 @@ static void atk57(void)
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk58_returntoball(void)
+static void Cmd_returntoball(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitReturnMonToBall(0, 1);
@@ -5610,20 +5611,20 @@ static void atk58_returntoball(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk59_handlelearnnewmove(void)
+static void Cmd_handlelearnnewmove(void)
 {
     const u8 *jumpPtr1 = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8 *jumpPtr2 = T1_READ_PTR(gBattlescriptCurrInstr + 5);
 
-    u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]);
-    while (ret == 0xFFFE)
-        ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], 0);
+    u16 learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]);
+    while (learnMove == MON_ALREADY_KNOWS_MOVE)
+        learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], FALSE);
 
-    if (ret == 0)
+    if (learnMove == 0)
     {
         gBattlescriptCurrInstr = jumpPtr2;
     }
-    else if (ret == 0xFFFF)
+    else if (learnMove == MON_HAS_MAX_MOVES)
     {
         gBattlescriptCurrInstr += 10;
     }
@@ -5634,7 +5635,7 @@ static void atk59_handlelearnnewmove(void)
         if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId
             && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
         {
-            GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
+            GiveMoveToBattleMon(&gBattleMons[gActiveBattler], learnMove);
         }
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -5642,7 +5643,7 @@ static void atk59_handlelearnnewmove(void)
             if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
-                GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
+                GiveMoveToBattleMon(&gBattleMons[gActiveBattler], learnMove);
             }
         }
 
@@ -5650,7 +5651,7 @@ static void atk59_handlelearnnewmove(void)
     }
 }
 
-static void atk5A_yesnoboxlearnmove(void)
+static void Cmd_yesnoboxlearnmove(void)
 {
     gActiveBattler = 0;
 
@@ -5715,8 +5716,8 @@ static void atk5A_yesnoboxlearnmove(void)
     case 4:
         if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2)
         {
-            u8 movePosition = sub_81C1B94();
-            if (movePosition == 4)
+            u8 movePosition = GetMoveSlotToReplace();
+            if (movePosition == MAX_MON_MOVES)
             {
                 gBattleScripting.learnMoveState = 5;
             }
@@ -5769,7 +5770,7 @@ static void atk5A_yesnoboxlearnmove(void)
     }
 }
 
-static void atk5B_yesnoboxstoplearningmove(void)
+static void Cmd_yesnoboxstoplearningmove(void)
 {
     switch (gBattleScripting.learnMoveState)
     {
@@ -5816,7 +5817,7 @@ static void atk5B_yesnoboxstoplearningmove(void)
     }
 }
 
-static void atk5C_hitanimation(void)
+static void Cmd_hitanimation(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -5893,7 +5894,7 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
     return moneyReward;
 }
 
-static void atk5D_getmoneyreward(void)
+static void Cmd_getmoneyreward(void)
 {
     u32 moneyReward = GetTrainerMoneyToGive(gTrainerBattleOpponent_A);
     if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
@@ -5905,7 +5906,7 @@ static void atk5D_getmoneyreward(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk5E(void)
+static void Cmd_unknown_5E(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -5932,7 +5933,7 @@ static void atk5E(void)
     }
 }
 
-static void atk5F_swapattackerwithtarget(void)
+static void Cmd_swapattackerwithtarget(void)
 {
     gActiveBattler = gBattlerAttacker;
     gBattlerAttacker = gBattlerTarget;
@@ -5946,7 +5947,7 @@ static void atk5F_swapattackerwithtarget(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk60_incrementgamestat(void)
+static void Cmd_incrementgamestat(void)
 {
     if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
@@ -5954,7 +5955,7 @@ static void atk60_incrementgamestat(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk61_drawpartystatussummary(void)
+static void Cmd_drawpartystatussummary(void)
 {
     s32 i;
     struct Pokemon *party;
@@ -5991,7 +5992,7 @@ static void atk61_drawpartystatussummary(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk62_hidepartystatussummary(void)
+static void Cmd_hidepartystatussummary(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitHidePartyStatusSummary(0);
@@ -6000,7 +6001,7 @@ static void atk62_hidepartystatussummary(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk63_jumptocalledmove(void)
+static void Cmd_jumptocalledmove(void)
 {
     if (gBattlescriptCurrInstr[1])
         gCurrentMove = gCalledMove;
@@ -6010,7 +6011,7 @@ static void atk63_jumptocalledmove(void)
     gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
 }
 
-static void atk64_statusanimation(void)
+static void Cmd_statusanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -6026,7 +6027,7 @@ static void atk64_statusanimation(void)
     }
 }
 
-static void atk65_status2animation(void)
+static void Cmd_status2animation(void)
 {
     u32 wantedToAnimate;
 
@@ -6045,7 +6046,7 @@ static void atk65_status2animation(void)
     }
 }
 
-static void atk66_chosenstatusanimation(void)
+static void Cmd_chosenstatusanimation(void)
 {
     u32 wantedStatus;
 
@@ -6064,7 +6065,7 @@ static void atk66_chosenstatusanimation(void)
     }
 }
 
-static void atk67_yesnobox(void)
+static void Cmd_yesnobox(void)
 {
     switch (gBattleCommunication[0])
     {
@@ -6107,7 +6108,7 @@ static void atk67_yesnobox(void)
     }
 }
 
-static void atk68_cancelallactions(void)
+static void Cmd_cancelallactions(void)
 {
     s32 i;
 
@@ -6117,7 +6118,7 @@ static void atk68_cancelallactions(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no random damage multiplier.
+static void Cmd_adjustsetdamage(void) // The same as adjustnormaldamage, except there's no random damage multiplier.
 {
     u8 holdEffect, param;
 
@@ -6157,7 +6158,7 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
     gBattlescriptCurrInstr++;
 }
 
-static void atk6A_removeitem(void)
+static void Cmd_removeitem(void)
 {
     u16* usedHeldItem;
 
@@ -6173,35 +6174,35 @@ static void atk6A_removeitem(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk6B_atknameinbuff1(void)
+static void Cmd_atknameinbuff1(void)
 {
     PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker])
 
     gBattlescriptCurrInstr++;
 }
 
-static void atk6C_drawlvlupbox(void)
+static void Cmd_drawlvlupbox(void)
 {
-    if (gBattleScripting.atk6C_state == 0)
+    if (gBattleScripting.drawlvlupboxState == 0)
     {
         if (IsMonGettingExpSentOut())
-            gBattleScripting.atk6C_state = 3;
+            gBattleScripting.drawlvlupboxState = 3;
         else
-            gBattleScripting.atk6C_state = 1;
+            gBattleScripting.drawlvlupboxState = 1;
     }
 
-    switch (gBattleScripting.atk6C_state)
+    switch (gBattleScripting.drawlvlupboxState)
     {
     case 1:
         gBattle_BG2_Y = 0x60;
         SetBgAttribute(2, BG_ATTR_PRIORITY, 0);
         ShowBg(2);
         sub_804F17C();
-        gBattleScripting.atk6C_state = 2;
+        gBattleScripting.drawlvlupboxState = 2;
         break;
     case 2:
         if (!sub_804F1CC())
-            gBattleScripting.atk6C_state = 3;
+            gBattleScripting.drawlvlupboxState = 3;
         break;
     case 3:
         gBattle_BG1_X = 0;
@@ -6211,20 +6212,20 @@ static void atk6C_drawlvlupbox(void)
         ShowBg(0);
         ShowBg(1);
         HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80);
-        gBattleScripting.atk6C_state = 4;
+        gBattleScripting.drawlvlupboxState = 4;
         break;
     case 4:
         DrawLevelUpWindow1();
         PutWindowTilemap(13);
         CopyWindowToVram(13, 3);
-        gBattleScripting.atk6C_state++;
+        gBattleScripting.drawlvlupboxState++;
         break;
     case 5:
     case 7:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             gBattle_BG1_Y = 0;
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 6:
@@ -6233,7 +6234,7 @@ static void atk6C_drawlvlupbox(void)
             PlaySE(SE_SELECT);
             DrawLevelUpWindow2();
             CopyWindowToVram(13, 2);
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 8:
@@ -6241,7 +6242,7 @@ static void atk6C_drawlvlupbox(void)
         {
             PlaySE(SE_SELECT);
             HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80 | WINDOW_CLEAR);
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 9:
@@ -6256,7 +6257,7 @@ static void atk6C_drawlvlupbox(void)
             SetBgAttribute(2, BG_ATTR_PRIORITY, 2);
             ShowBg(2);
 
-            gBattleScripting.atk6C_state = 10;
+            gBattleScripting.drawlvlupboxState = 10;
         }
         break;
     case 10:
@@ -6454,19 +6455,19 @@ static bool32 IsMonGettingExpSentOut(void)
     return FALSE;
 }
 
-static void atk6D_resetsentmonsvalue(void)
+static void Cmd_resetsentmonsvalue(void)
 {
     ResetSentPokesToOpponentValue();
     gBattlescriptCurrInstr++;
 }
 
-static void atk6E_setatktoplayer0(void)
+static void Cmd_setatktoplayer0(void)
 {
     gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
-static void atk6F_makevisible(void)
+static void Cmd_makevisible(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitSpriteInvisibility(0, FALSE);
@@ -6475,7 +6476,7 @@ static void atk6F_makevisible(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk70_recordlastability(void)
+static void Cmd_recordlastability(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
@@ -6487,13 +6488,13 @@ void BufferMoveToLearnIntoBattleTextBuff2(void)
     PREPARE_MOVE_BUFFER(gBattleTextBuff2, gMoveToLearn);
 }
 
-static void atk71_buffermovetolearn(void)
+static void Cmd_buffermovetolearn(void)
 {
     BufferMoveToLearnIntoBattleTextBuff2();
     gBattlescriptCurrInstr++;
 }
 
-static void atk72_jumpifplayerran(void)
+static void Cmd_jumpifplayerran(void)
 {
     if (TryRunFromBattle(gBattlerFainted))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -6501,7 +6502,7 @@ static void atk72_jumpifplayerran(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atk73_hpthresholds(void)
+static void Cmd_hpthresholds(void)
 {
     u8 opposingBank;
     s32 result;
@@ -6528,7 +6529,7 @@ static void atk73_hpthresholds(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk74_hpthresholds2(void)
+static void Cmd_hpthresholds2(void)
 {
     u8 opposingBank;
     s32 result;
@@ -6554,14 +6555,14 @@ static void atk74_hpthresholds2(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk75_useitemonopponent(void)
+static void Cmd_useitemonopponent(void)
 {
     gBattlerInMenuId = gBattlerAttacker;
     PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk76_various(void)
+static void Cmd_various(void)
 {
     u8 side;
     s32 i;
@@ -6740,7 +6741,7 @@ static void atk76_various(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk77_setprotectlike(void) // protect and endure
+static void Cmd_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
     u16 lastMove = gLastResultingMoves[gBattlerAttacker];
@@ -6775,7 +6776,7 @@ static void atk77_setprotectlike(void) // protect and endure
     gBattlescriptCurrInstr++;
 }
 
-static void atk78_faintifabilitynotdamp(void)
+static void Cmd_faintifabilitynotdamp(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -6810,7 +6811,7 @@ static void atk78_faintifabilitynotdamp(void)
     }
 }
 
-static void atk79_setatkhptozero(void)
+static void Cmd_setatkhptozero(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -6823,7 +6824,7 @@ static void atk79_setatkhptozero(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7A_jumpifnexttargetvalid(void)
+static void Cmd_jumpifnexttargetvalid(void)
 {
     const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -6848,7 +6849,7 @@ static void atk7A_jumpifnexttargetvalid(void)
     }
 }
 
-static void atk7B_tryhealhalfhealth(void)
+static void Cmd_tryhealhalfhealth(void)
 {
     const u8* failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -6866,7 +6867,7 @@ static void atk7B_tryhealhalfhealth(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk7C_trymirrormove(void)
+static void Cmd_trymirrormove(void)
 {
     s32 validMovesCount;
     s32 i;
@@ -6916,7 +6917,7 @@ static void atk7C_trymirrormove(void)
     }
 }
 
-static void atk7D_setrain(void)
+static void Cmd_setrain(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
     {
@@ -6932,7 +6933,7 @@ static void atk7D_setrain(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7E_setreflect(void)
+static void Cmd_setreflect(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_REFLECT)
     {
@@ -6953,7 +6954,7 @@ static void atk7E_setreflect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7F_setseeded(void)
+static void Cmd_setseeded(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattlerTarget] & STATUS3_LEECHSEED)
     {
@@ -6975,21 +6976,21 @@ static void atk7F_setseeded(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk80_manipulatedamage(void)
+static void Cmd_manipulatedamage(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
-    case ATK80_DMG_CHANGE_SIGN:
+    case DMG_CHANGE_SIGN:
         gBattleMoveDamage *= -1;
         break;
-    case ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP:
+    case DMG_RECOIL_FROM_MISS:
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         if ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage)
             gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
         break;
-    case ATK80_DMG_DOUBLED:
+    case DMG_DOUBLED:
         gBattleMoveDamage *= 2;
         break;
     }
@@ -6997,7 +6998,7 @@ static void atk80_manipulatedamage(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk81_trysetrest(void)
+static void Cmd_trysetrest(void)
 {
     const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     gActiveBattler = gBattlerTarget = gBattlerAttacker;
@@ -7021,7 +7022,7 @@ static void atk81_trysetrest(void)
     }
 }
 
-static void atk82_jumpifnotfirstturn(void)
+static void Cmd_jumpifnotfirstturn(void)
 {
     const u8* failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7031,7 +7032,7 @@ static void atk82_jumpifnotfirstturn(void)
         gBattlescriptCurrInstr = failJump;
 }
 
-static void atk83_nop(void)
+static void Cmd_nop(void)
 {
     gBattlescriptCurrInstr++;
 }
@@ -7063,7 +7064,7 @@ bool8 UproarWakeUpCheck(u8 battlerId)
         return TRUE;
 }
 
-static void atk84_jumpifcantmakeasleep(void)
+static void Cmd_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7085,7 +7086,7 @@ static void atk84_jumpifcantmakeasleep(void)
     }
 }
 
-static void atk85_stockpile(void)
+static void Cmd_stockpile(void)
 {
     if (gDisableStructs[gBattlerAttacker].stockpileCounter == 3)
     {
@@ -7103,7 +7104,7 @@ static void atk85_stockpile(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk86_stockpiletobasedamage(void)
+static void Cmd_stockpiletobasedamage(void)
 {
     const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
@@ -7129,7 +7130,7 @@ static void atk86_stockpiletobasedamage(void)
     }
 }
 
-static void atk87_stockpiletohpheal(void)
+static void Cmd_stockpiletohpheal(void)
 {
     const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7160,7 +7161,7 @@ static void atk87_stockpiletohpheal(void)
     }
 }
 
-static void atk88_negativedamage(void)
+static void Cmd_negativedamage(void)
 {
     gBattleMoveDamage = -(gHpDealt / 2);
     if (gBattleMoveDamage == 0)
@@ -7169,8 +7170,8 @@ static void atk88_negativedamage(void)
     gBattlescriptCurrInstr++;
 }
 
-#define STAT_CHANGE_WORKED      0
-#define STAT_CHANGE_DIDNT_WORK  1
+#define STAT_BUFF_WORKED      0
+#define STAT_BUFF_DIDNT_WORK  1
 
 static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
 {
@@ -7189,9 +7190,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         certain++;
     flags &= ~(MOVE_EFFECT_CERTAIN);
 
-    if (flags & STAT_CHANGE_NOT_PROTECT_AFFECTED)
+    if (flags & STAT_BUFF_NOT_PROTECT_AFFECTED)
         notProtectAffected++;
-    flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED);
+    flags &= ~(STAT_BUFF_NOT_PROTECT_AFFECTED);
 
     PREPARE_STAT_BUFFER(gBattleTextBuff1, statId)
 
@@ -7200,7 +7201,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer
             && !certain && gCurrentMove != MOVE_CURSE)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
@@ -7214,19 +7215,19 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
                     gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else if (gCurrentMove != MOVE_CURSE
                  && notProtectAffected != TRUE && JumpIfMoveAffectedByProtect(0))
         {
             gBattlescriptCurrInstr = BattleScript_ButItFailed;
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else if ((gBattleMons[gActiveBattler].ability == ABILITY_CLEAR_BODY
                   || gBattleMons[gActiveBattler].ability == ABILITY_WHITE_SMOKE)
                  && !certain && gCurrentMove != MOVE_CURSE)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
@@ -7242,12 +7243,12 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
                     gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else if (gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE
                  && !certain && statId == STAT_ACC)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 BattleScriptPush(BS_ptr);
                 gBattleScripting.battler = gActiveBattler;
@@ -7255,12 +7256,12 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
                 gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                 RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else if (gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER
                  && !certain && statId == STAT_ATK)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 BattleScriptPush(BS_ptr);
                 gBattleScripting.battler = gActiveBattler;
@@ -7268,11 +7269,11 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
                 gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                 RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else if (gBattleMons[gActiveBattler].ability == ABILITY_SHIELD_DUST && flags == 0)
         {
-            return STAT_CHANGE_DIDNT_WORK;
+            return STAT_BUFF_DIDNT_WORK;
         }
         else // try to decrease
         {
@@ -7333,23 +7334,23 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     if (gBattleMons[gActiveBattler].statStages[statId] > 0xC)
         gBattleMons[gActiveBattler].statStages[statId] = 0xC;
 
-    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR)
+    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_BUFF_ALLOW_PTR)
         gMoveResultFlags |= MOVE_RESULT_MISSED;
 
-    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_BS_PTR))
-        return STAT_CHANGE_DIDNT_WORK;
+    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_BUFF_ALLOW_PTR))
+        return STAT_BUFF_DIDNT_WORK;
 
-    return STAT_CHANGE_WORKED;
+    return STAT_BUFF_WORKED;
 }
 
-static void atk89_statbuffchange(void)
+static void Cmd_statbuffchange(void)
 {
     const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
-    if (ChangeStatBuffs(gBattleScripting.statChanger & 0xF0, GET_STAT_BUFF_ID(gBattleScripting.statChanger), gBattlescriptCurrInstr[1], jumpPtr) == STAT_CHANGE_WORKED)
+    if (ChangeStatBuffs(gBattleScripting.statChanger & 0xF0, GET_STAT_BUFF_ID(gBattleScripting.statChanger), gBattlescriptCurrInstr[1], jumpPtr) == STAT_BUFF_WORKED)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk8A_normalisebuffs(void) // haze
+static void Cmd_normalisebuffs(void) // haze
 {
     s32 i, j;
 
@@ -7362,7 +7363,7 @@ static void atk8A_normalisebuffs(void) // haze
     gBattlescriptCurrInstr++;
 }
 
-static void atk8B_setbide(void)
+static void Cmd_setbide(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS;
     gLockedMoves[gBattlerAttacker] = gCurrentMove;
@@ -7372,7 +7373,7 @@ static void atk8B_setbide(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk8C_confuseifrepeatingattackends(void)
+static void Cmd_confuseifrepeatingattackends(void)
 {
     if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE))
         gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER);
@@ -7380,7 +7381,7 @@ static void atk8C_confuseifrepeatingattackends(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk8D_setmultihitcounter(void)
+static void Cmd_setmultihitcounter(void)
 {
     if (gBattlescriptCurrInstr[1])
     {
@@ -7398,7 +7399,7 @@ static void atk8D_setmultihitcounter(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk8E_initmultihitstring(void)
+static void Cmd_initmultihitstring(void)
 {
     PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
 
@@ -7426,7 +7427,7 @@ static bool8 TryDoForceSwitchOut(void)
     return TRUE;
 }
 
-static void atk8F_forcerandomswitch(void)
+static void Cmd_forcerandomswitch(void)
 {
     s32 i;
     s32 battler1PartyId = 0;
@@ -7566,19 +7567,19 @@ static void atk8F_forcerandomswitch(void)
             *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
 
             if (!IsMultiBattle())
-                sub_803BDA0(gBattlerTarget);
+                SwitchPartyOrder(gBattlerTarget);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                sub_81B8E80(gBattlerTarget, i, 0);
-                sub_81B8E80(gBattlerTarget ^ BIT_FLANK, i, 1);
+                SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0);
+                SwitchPartyOrderLinkMulti(gBattlerTarget ^ BIT_FLANK, i, 1);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-                sub_80571DC(gBattlerTarget, i);
+                SwitchPartyOrderInGameMulti(gBattlerTarget, i);
         }
     }
     else
@@ -7587,7 +7588,7 @@ static void atk8F_forcerandomswitch(void)
     }
 }
 
-static void atk90_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type
+static void Cmd_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type
 {
     u8 validMoves = 0;
     u8 moveChecked;
@@ -7649,7 +7650,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
     }
 }
 
-static void atk91_givepaydaymoney(void)
+static void Cmd_givepaydaymoney(void)
 {
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && gPaydayMoney != 0)
     {
@@ -7667,7 +7668,7 @@ static void atk91_givepaydaymoney(void)
     }
 }
 
-static void atk92_setlightscreen(void)
+static void Cmd_setlightscreen(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
@@ -7689,7 +7690,7 @@ static void atk92_setlightscreen(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk93_tryKO(void)
+static void Cmd_tryKO(void)
 {
     u8 holdEffect, param;
 
@@ -7775,7 +7776,7 @@ static void atk93_tryKO(void)
     }
 }
 
-static void atk94_damagetohalftargethp(void) // super fang
+static void Cmd_damagetohalftargethp(void) // super fang
 {
     gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2;
     if (gBattleMoveDamage == 0)
@@ -7784,7 +7785,7 @@ static void atk94_damagetohalftargethp(void) // super fang
     gBattlescriptCurrInstr++;
 }
 
-static void atk95_setsandstorm(void)
+static void Cmd_setsandstorm(void)
 {
     if (gBattleWeather & WEATHER_SANDSTORM_ANY)
     {
@@ -7800,7 +7801,7 @@ static void atk95_setsandstorm(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk96_weatherdamage(void)
+static void Cmd_weatherdamage(void)
 {
     if (WEATHER_HAS_EFFECT)
     {
@@ -7825,7 +7826,7 @@ static void atk96_weatherdamage(void)
                 gBattleMoveDamage = 0;
             }
         }
-        if (gBattleWeather & WEATHER_HAIL)
+        if (gBattleWeather & WEATHER_HAIL_ANY)
         {
             if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_ICE)
                 && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND)
@@ -7852,7 +7853,7 @@ static void atk96_weatherdamage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk97_tryinfatuating(void)
+static void Cmd_tryinfatuating(void)
 {
     struct Pokemon *monAttacker, *monTarget;
     u16 speciesAttacker, speciesTarget;
@@ -7897,7 +7898,7 @@ static void atk97_tryinfatuating(void)
     }
 }
 
-static void atk98_updatestatusicon(void)
+static void Cmd_updatestatusicon(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -7930,7 +7931,7 @@ static void atk98_updatestatusicon(void)
     }
 }
 
-static void atk99_setmist(void)
+static void Cmd_setmist(void)
 {
     if (gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer)
     {
@@ -7947,7 +7948,7 @@ static void atk99_setmist(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk9A_setfocusenergy(void)
+static void Cmd_setfocusenergy(void)
 {
     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
@@ -7962,7 +7963,7 @@ static void atk9A_setfocusenergy(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk9B_transformdataexecution(void)
+static void Cmd_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
@@ -8006,7 +8007,7 @@ static void atk9B_transformdataexecution(void)
     }
 }
 
-static void atk9C_setsubstitute(void)
+static void Cmd_setsubstitute(void)
 {
     u32 hp = gBattleMons[gBattlerAttacker].maxHP / 4;
     if (gBattleMons[gBattlerAttacker].maxHP / 4 == 0)
@@ -8042,7 +8043,7 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
     return (sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END);
 }
 
-static void atk9D_mimicattackcopy(void)
+static void Cmd_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
@@ -8084,7 +8085,7 @@ static void atk9D_mimicattackcopy(void)
     }
 }
 
-static void atk9E_metronome(void)
+static void Cmd_metronome(void)
 {
     while (1)
     {
@@ -8116,13 +8117,13 @@ static void atk9E_metronome(void)
     }
 }
 
-static void atk9F_dmgtolevel(void)
+static void Cmd_dmgtolevel(void)
 {
     gBattleMoveDamage = gBattleMons[gBattlerAttacker].level;
     gBattlescriptCurrInstr++;
 }
 
-static void atkA0_psywavedamageeffect(void)
+static void Cmd_psywavedamageeffect(void)
 {
     s32 randDamage;
 
@@ -8133,7 +8134,7 @@ static void atkA0_psywavedamageeffect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkA1_counterdamagecalculator(void)
+static void Cmd_counterdamagecalculator(void)
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
     u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBattlerId);
@@ -8158,7 +8159,7 @@ static void atkA1_counterdamagecalculator(void)
     }
 }
 
-static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
+static void Cmd_mirrorcoatdamagecalculator(void) // a copy of Cmd with the physical -> special field changes
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
     u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId);
@@ -8181,7 +8182,7 @@ static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the p
     }
 }
 
-static void atkA3_disablelastusedattack(void)
+static void Cmd_disablelastusedattack(void)
 {
     s32 i;
 
@@ -8206,7 +8207,7 @@ static void atkA3_disablelastusedattack(void)
     }
 }
 
-static void atkA4_trysetencore(void)
+static void Cmd_trysetencore(void)
 {
     s32 i;
 
@@ -8238,7 +8239,7 @@ static void atkA4_trysetencore(void)
     }
 }
 
-static void atkA5_painsplitdmgcalc(void)
+static void Cmd_painsplitdmgcalc(void)
 {
     if (!(gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE))
     {
@@ -8262,7 +8263,7 @@ static void atkA5_painsplitdmgcalc(void)
     }
 }
 
-static void atkA6_settypetorandomresistance(void) // conversion 2
+static void Cmd_settypetorandomresistance(void) // conversion 2
 {
     if (gLastLandedMoves[gBattlerAttacker] == 0
         || gLastLandedMoves[gBattlerAttacker] == 0xFFFF)
@@ -8322,7 +8323,7 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
     }
 }
 
-static void atkA7_setalwayshitflag(void)
+static void Cmd_setalwayshitflag(void)
 {
     gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS);
     gStatuses3[gBattlerTarget] |= 0x10;
@@ -8330,7 +8331,7 @@ static void atkA7_setalwayshitflag(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkA8_copymovepermanently(void) // sketch
+static void Cmd_copymovepermanently(void) // sketch
 {
     gChosenMove = 0xFFFF;
 
@@ -8425,7 +8426,7 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c
     return 2;
 }
 
-static void atkA9_trychoosesleeptalkmove(void)
+static void Cmd_trychoosesleeptalkmove(void)
 {
     s32 i;
     u8 unusableMovesBits = 0;
@@ -8464,7 +8465,7 @@ static void atkA9_trychoosesleeptalkmove(void)
     }
 }
 
-static void atkAA_setdestinybond(void)
+static void Cmd_setdestinybond(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
@@ -8482,13 +8483,13 @@ static void TrySetDestinyBondToHappen(void)
     }
 }
 
-static void atkAB_trysetdestinybondtohappen(void)
+static void Cmd_trysetdestinybondtohappen(void)
 {
     TrySetDestinyBondToHappen();
     gBattlescriptCurrInstr++;
 }
 
-static void atkAC_remaininghptopower(void)
+static void Cmd_remaininghptopower(void)
 {
     s32 i;
     s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattlerAttacker].hp, gBattleMons[gBattlerAttacker].maxHP, 48);
@@ -8503,7 +8504,7 @@ static void atkAC_remaininghptopower(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkAD_tryspiteppreduce(void)
+static void Cmd_tryspiteppreduce(void)
 {
     if (gLastMoves[gBattlerTarget] != 0
         && gLastMoves[gBattlerTarget] != 0xFFFF)
@@ -8554,7 +8555,7 @@ static void atkAD_tryspiteppreduce(void)
     }
 }
 
-static void atkAE_healpartystatus(void)
+static void Cmd_healpartystatus(void)
 {
     u32 zero = 0;
     u8 toHeal = 0;
@@ -8650,7 +8651,7 @@ static void atkAE_healpartystatus(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkAF_cursetarget(void)
+static void Cmd_cursetarget(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_CURSED)
     {
@@ -8667,7 +8668,7 @@ static void atkAF_cursetarget(void)
     }
 }
 
-static void atkB0_trysetspikes(void)
+static void Cmd_trysetspikes(void)
 {
     u8 targetSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
@@ -8684,13 +8685,13 @@ static void atkB0_trysetspikes(void)
     }
 }
 
-static void atkB1_setforesight(void)
+static void Cmd_setforesight(void)
 {
     gBattleMons[gBattlerTarget].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
-static void atkB2_trysetperishsong(void)
+static void Cmd_trysetperishsong(void)
 {
     s32 i;
     s32 notAffectedCount = 0;
@@ -8718,7 +8719,7 @@ static void atkB2_trysetperishsong(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkB3_rolloutdamagecalculation(void)
+static void Cmd_rolloutdamagecalculation(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
@@ -8753,7 +8754,7 @@ static void atkB3_rolloutdamagecalculation(void)
     }
 }
 
-static void atkB4_jumpifconfusedandstatmaxed(void)
+static void Cmd_jumpifconfusedandstatmaxed(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION
         && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
@@ -8762,7 +8763,7 @@ static void atkB4_jumpifconfusedandstatmaxed(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atkB5_furycuttercalc(void)
+static void Cmd_furycuttercalc(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
@@ -8785,7 +8786,7 @@ static void atkB5_furycuttercalc(void)
     }
 }
 
-static void atkB6_happinesstodamagecalculation(void)
+static void Cmd_happinesstodamagecalculation(void)
 {
     if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN)
         gDynamicBasePower = 10 * (gBattleMons[gBattlerAttacker].friendship) / 25;
@@ -8795,7 +8796,7 @@ static void atkB6_happinesstodamagecalculation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkB7_presentdamagecalculation(void)
+static void Cmd_presentdamagecalculation(void)
 {
     s32 rand = Random() & 0xFF;
 
@@ -8823,7 +8824,7 @@ static void atkB7_presentdamagecalculation(void)
     }
 }
 
-static void atkB8_setsafeguard(void)
+static void Cmd_setsafeguard(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
@@ -8841,7 +8842,7 @@ static void atkB8_setsafeguard(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkB9_magnitudedamagecalculation(void)
+static void Cmd_magnitudedamagecalculation(void)
 {
     s32 magnitude = Random() % 100;
 
@@ -8895,7 +8896,7 @@ static void atkB9_magnitudedamagecalculation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkBA_jumpifnopursuitswitchdmg(void)
+static void Cmd_jumpifnopursuitswitchdmg(void)
 {
     if (gMultiHitCounter == 1)
     {
@@ -8939,7 +8940,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
     }
 }
 
-static void atkBB_setsunny(void)
+static void Cmd_setsunny(void)
 {
     if (gBattleWeather & WEATHER_SUN_ANY)
     {
@@ -8956,7 +8957,7 @@ static void atkBB_setsunny(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkBC_maxattackhalvehp(void) // belly drum
+static void Cmd_maxattackhalvehp(void) // belly drum
 {
     u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2;
 
@@ -8979,7 +8980,7 @@ static void atkBC_maxattackhalvehp(void) // belly drum
     }
 }
 
-static void atkBD_copyfoestats(void) // psych up
+static void Cmd_copyfoestats(void) // psych up
 {
     s32 i;
 
@@ -8991,7 +8992,7 @@ static void atkBD_copyfoestats(void) // psych up
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
 }
 
-static void atkBE_rapidspinfree(void)
+static void Cmd_rapidspinfree(void)
 {
     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_WRAPPED)
     {
@@ -9028,13 +9029,13 @@ static void atkBE_rapidspinfree(void)
     }
 }
 
-static void atkBF_setdefensecurlbit(void)
+static void Cmd_setdefensecurlbit(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
 }
 
-static void atkC0_recoverbasedonsunlight(void)
+static void Cmd_recoverbasedonsunlight(void)
 {
     gBattlerTarget = gBattlerAttacker;
 
@@ -9059,7 +9060,7 @@ static void atkC0_recoverbasedonsunlight(void)
     }
 }
 
-static void atkC1_hiddenpowercalc(void)
+static void Cmd_hiddenpowercalc(void)
 {
     u8 powerBits;
     u8 typeBits;
@@ -9088,7 +9089,7 @@ static void atkC1_hiddenpowercalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC2_selectfirstvalidtarget(void)
+static void Cmd_selectfirstvalidtarget(void)
 {
     for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
@@ -9100,7 +9101,7 @@ static void atkC2_selectfirstvalidtarget(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC3_trysetfutureattack(void)
+static void Cmd_trysetfutureattack(void)
 {
     if (gWishFutureKnock.futureSightCounter[gBattlerTarget] != 0)
     {
@@ -9128,7 +9129,7 @@ static void atkC3_trysetfutureattack(void)
     }
 }
 
-static void atkC4_trydobeatup(void)
+static void Cmd_trydobeatup(void)
 {
     struct Pokemon *party;
 
@@ -9175,7 +9176,7 @@ static void atkC4_trydobeatup(void)
     }
 }
 
-static void atkC5_setsemiinvulnerablebit(void)
+static void Cmd_setsemiinvulnerablebit(void)
 {
     switch (gCurrentMove)
     {
@@ -9194,7 +9195,7 @@ static void atkC5_setsemiinvulnerablebit(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC6_clearsemiinvulnerablebit(void)
+static void Cmd_clearsemiinvulnerablebit(void)
 {
     switch (gCurrentMove)
     {
@@ -9213,7 +9214,7 @@ static void atkC6_clearsemiinvulnerablebit(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC7_setminimize(void)
+static void Cmd_setminimize(void)
 {
     if (gHitMarker & HITMARKER_OBEYS)
         gStatuses3[gBattlerAttacker] |= STATUS3_MINIMIZED;
@@ -9221,7 +9222,7 @@ static void atkC7_setminimize(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC8_sethail(void)
+static void Cmd_sethail(void)
 {
     if (gBattleWeather & WEATHER_HAIL_ANY)
     {
@@ -9238,7 +9239,7 @@ static void atkC8_sethail(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
+static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
 {
     if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0
         && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0
@@ -9256,14 +9257,14 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
     }
 }
 
-static void atkCA_setforcedtarget(void) // follow me
+static void Cmd_setforcedtarget(void) // follow me
 {
     gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1;
     gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTarget = gBattlerAttacker;
     gBattlescriptCurrInstr++;
 }
 
-static void atkCB_setcharge(void)
+static void Cmd_setcharge(void)
 {
     gStatuses3[gBattlerAttacker] |= STATUS3_CHARGED_UP;
     gDisableStructs[gBattlerAttacker].chargeTimer = 2;
@@ -9271,7 +9272,7 @@ static void atkCB_setcharge(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkCC_callterrainattack(void) // nature power
+static void Cmd_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
@@ -9280,7 +9281,7 @@ static void atkCC_callterrainattack(void) // nature power
     gBattlescriptCurrInstr++;
 }
 
-static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
+static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh
 {
     if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
@@ -9296,7 +9297,7 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
     }
 }
 
-static void atkCE_settorment(void)
+static void Cmd_settorment(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_TORMENT)
     {
@@ -9309,7 +9310,7 @@ static void atkCE_settorment(void)
     }
 }
 
-static void atkCF_jumpifnodamage(void)
+static void Cmd_jumpifnodamage(void)
 {
     if (gProtectStructs[gBattlerAttacker].physicalDmg || gProtectStructs[gBattlerAttacker].specialDmg)
         gBattlescriptCurrInstr += 5;
@@ -9317,7 +9318,7 @@ static void atkCF_jumpifnodamage(void)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atkD0_settaunt(void)
+static void Cmd_settaunt(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
     {
@@ -9331,7 +9332,7 @@ static void atkD0_settaunt(void)
     }
 }
 
-static void atkD1_trysethelpinghand(void)
+static void Cmd_trysethelpinghand(void)
 {
     gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
@@ -9349,7 +9350,7 @@ static void atkD1_trysethelpinghand(void)
     }
 }
 
-static void atkD2_tryswapitems(void) // trick
+static void Cmd_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL
@@ -9436,7 +9437,7 @@ static void atkD2_tryswapitems(void) // trick
     }
 }
 
-static void atkD3_trycopyability(void) // role play
+static void Cmd_trycopyability(void) // role play
 {
     if (gBattleMons[gBattlerTarget].ability != 0
         && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD)
@@ -9451,7 +9452,7 @@ static void atkD3_trycopyability(void) // role play
     }
 }
 
-static void atkD4_trywish(void)
+static void Cmd_trywish(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
@@ -9484,7 +9485,7 @@ static void atkD4_trywish(void)
     }
 }
 
-static void atkD5_trysetroots(void) // ingrain
+static void Cmd_trysetroots(void) // ingrain
 {
     if (gStatuses3[gBattlerAttacker] & STATUS3_ROOTED)
     {
@@ -9497,7 +9498,7 @@ static void atkD5_trysetroots(void) // ingrain
     }
 }
 
-static void atkD6_doubledamagedealtifdamaged(void)
+static void Cmd_doubledamagedealtifdamaged(void)
 {
     if ((gProtectStructs[gBattlerAttacker].physicalDmg
          && gProtectStructs[gBattlerAttacker].physicalBattlerId == gBattlerTarget)
@@ -9510,7 +9511,7 @@ static void atkD6_doubledamagedealtifdamaged(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkD7_setyawn(void)
+static void Cmd_setyawn(void)
 {
     if (gStatuses3[gBattlerTarget] & STATUS3_YAWN
         || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY)
@@ -9524,7 +9525,7 @@ static void atkD7_setyawn(void)
     }
 }
 
-static void atkD8_setdamagetohealthdifference(void)
+static void Cmd_setdamagetohealthdifference(void)
 {
     if (gBattleMons[gBattlerTarget].hp <= gBattleMons[gBattlerAttacker].hp)
     {
@@ -9537,7 +9538,7 @@ static void atkD8_setdamagetohealthdifference(void)
     }
 }
 
-static void atkD9_scaledamagebyhealthratio(void)
+static void Cmd_scaledamagebyhealthratio(void)
 {
     if (gDynamicBasePower == 0)
     {
@@ -9549,7 +9550,7 @@ static void atkD9_scaledamagebyhealthratio(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkDA_tryswapabilities(void) // skill swap
+static void Cmd_tryswapabilities(void) // skill swap
 {
     if ((gBattleMons[gBattlerAttacker].ability == 0
          && gBattleMons[gBattlerTarget].ability == 0)
@@ -9569,7 +9570,7 @@ static void atkDA_tryswapabilities(void) // skill swap
     }
 }
 
-static void atkDB_tryimprison(void)
+static void Cmd_tryimprison(void)
 {
     if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
@@ -9611,7 +9612,7 @@ static void atkDB_tryimprison(void)
     }
 }
 
-static void atkDC_trysetgrudge(void)
+static void Cmd_trysetgrudge(void)
 {
     if (gStatuses3[gBattlerAttacker] & STATUS3_GRUDGE)
     {
@@ -9624,7 +9625,7 @@ static void atkDC_trysetgrudge(void)
     }
 }
 
-static void atkDD_weightdamagecalculation(void)
+static void Cmd_weightdamagecalculation(void)
 {
     s32 i;
     for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
@@ -9641,7 +9642,7 @@ static void atkDD_weightdamagecalculation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkDE_assistattackselect(void)
+static void Cmd_assistattackselect(void)
 {
     s32 chooseableMovesNo = 0;
     struct Pokemon* party;
@@ -9694,7 +9695,7 @@ static void atkDE_assistattackselect(void)
     }
 }
 
-static void atkDF_trysetmagiccoat(void)
+static void Cmd_trysetmagiccoat(void)
 {
     gBattlerTarget = gBattlerAttacker;
     gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1;
@@ -9709,7 +9710,7 @@ static void atkDF_trysetmagiccoat(void)
     }
 }
 
-static void atkE0_trysetsnatch(void) // snatch
+static void Cmd_trysetsnatch(void) // snatch
 {
     gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
@@ -9723,7 +9724,7 @@ static void atkE0_trysetsnatch(void) // snatch
     }
 }
 
-static void atkE1_trygetintimidatetarget(void)
+static void Cmd_trygetintimidatetarget(void)
 {
     u8 side;
 
@@ -9746,7 +9747,7 @@ static void atkE1_trygetintimidatetarget(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkE2_switchoutabilities(void)
+static void Cmd_switchoutabilities(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -9762,7 +9763,7 @@ static void atkE2_switchoutabilities(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atkE3_jumpifhasnohp(void)
+static void Cmd_jumpifhasnohp(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -9772,7 +9773,7 @@ static void atkE3_jumpifhasnohp(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atkE4_getsecretpowereffect(void)
+static void Cmd_getsecretpowereffect(void)
 {
     switch (gBattleTerrain)
     {
@@ -9807,7 +9808,7 @@ static void atkE4_getsecretpowereffect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE5_pickup(void)
+static void Cmd_pickup(void)
 {
     s32 i;
     u16 species, heldItem;
@@ -9884,7 +9885,7 @@ static void atkE5_pickup(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE6_docastformchangeanimation(void)
+static void Cmd_docastformchangeanimation(void)
 {
     gActiveBattler = gBattleScripting.battler;
 
@@ -9897,7 +9898,7 @@ static void atkE6_docastformchangeanimation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE7_trycastformdatachange(void)
+static void Cmd_trycastformdatachange(void)
 {
     u8 form;
 
@@ -9910,7 +9911,7 @@ static void atkE7_trycastformdatachange(void)
     }
 }
 
-static void atkE8_settypebasedhalvers(void) // water and mud sport
+static void Cmd_settypebasedhalvers(void) // water and mud sport
 {
     bool8 worked = FALSE;
 
@@ -9939,7 +9940,7 @@ static void atkE8_settypebasedhalvers(void) // water and mud sport
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atkE9_setweatherballtype(void)
+static void Cmd_setweatherballtype(void)
 {
     if (WEATHER_HAS_EFFECT)
     {
@@ -9960,7 +9961,7 @@ static void atkE9_setweatherballtype(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkEA_tryrecycleitem(void)
+static void Cmd_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
@@ -9983,7 +9984,7 @@ static void atkEA_tryrecycleitem(void)
     }
 }
 
-static void atkEB_settypetoterrain(void)
+static void Cmd_settypetoterrain(void)
 {
     if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, sTerrainToType[gBattleTerrain]))
     {
@@ -9998,7 +9999,7 @@ static void atkEB_settypetoterrain(void)
     }
 }
 
-static void atkEC_pursuitrelated(void)
+static void Cmd_pursuitrelated(void)
 {
     gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
@@ -10020,7 +10021,7 @@ static void atkEC_pursuitrelated(void)
     }
 }
 
-static void atkEF_snatchsetbattlers(void)
+static void Cmd_snatchsetbattlers(void)
 {
     gEffectBattler = gBattlerAttacker;
 
@@ -10033,7 +10034,7 @@ static void atkEF_snatchsetbattlers(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkEE_removelightscreenreflect(void) // brick break
+static void Cmd_removelightscreenreflect(void) // brick break
 {
     u8 opposingSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
@@ -10055,7 +10056,7 @@ static void atkEE_removelightscreenreflect(void) // brick break
     gBattlescriptCurrInstr++;
 }
 
-static void atkEF_handleballthrow(void)
+static void Cmd_handleballthrow(void)
 {
     u8 ballMultiplier = 0;
 
@@ -10203,7 +10204,7 @@ static void atkEF_handleballthrow(void)
     }
 }
 
-static void atkF0_givecaughtmon(void)
+static void Cmd_givecaughtmon(void)
 {
     if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
     {
@@ -10232,7 +10233,7 @@ static void atkF0_givecaughtmon(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkF1_trysetcaughtmondexflags(void)
+static void Cmd_trysetcaughtmondexflags(void)
 {
     u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
     u32 personality = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL);
@@ -10248,7 +10249,7 @@ static void atkF1_trysetcaughtmondexflags(void)
     }
 }
 
-static void atkF2_displaydexinfo(void)
+static void Cmd_displaydexinfo(void)
 {
     u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
 
@@ -10278,7 +10279,7 @@ static void atkF2_displaydexinfo(void)
         }
         break;
     case 3:
-        sub_80356D0();
+        InitBattleBgsVideo();
         LoadBattleTextboxAndBackground();
         gBattle_BG3_X = 0x100;
         gBattleCommunication[0]++;
@@ -10367,7 +10368,7 @@ void BattleDestroyYesNoCursorAt(u8 cursorPosition)
     CopyBgTilemapBufferToVram(0);
 }
 
-static void atkF3_trygivecaughtmonnick(void)
+static void Cmd_trygivecaughtmonnick(void)
 {
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
@@ -10443,30 +10444,30 @@ static void atkF3_trygivecaughtmonnick(void)
     }
 }
 
-static void atkF4_subattackerhpbydmg(void)
+static void Cmd_subattackerhpbydmg(void)
 {
     gBattleMons[gBattlerAttacker].hp -= gBattleMoveDamage;
     gBattlescriptCurrInstr++;
 }
 
-static void atkF5_removeattackerstatus1(void)
+static void Cmd_removeattackerstatus1(void)
 {
     gBattleMons[gBattlerAttacker].status1 = 0;
     gBattlescriptCurrInstr++;
 }
 
-static void atkF6_finishaction(void)
+static void Cmd_finishaction(void)
 {
     gCurrentActionFuncId = B_ACTION_FINISHED;
 }
 
-static void atkF7_finishturn(void)
+static void Cmd_finishturn(void)
 {
     gCurrentActionFuncId = B_ACTION_FINISHED;
     gCurrentTurnActionNumber = gBattlersCount;
 }
 
-static void atkF8_trainerslideout(void)
+static void Cmd_trainerslideout(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     BtlController_EmitTrainerSlideBack(0);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index f166c7375..b98b5df06 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,25 +1,18 @@
 #include "global.h"
-#include "constants/trainers.h"
 #include "battle.h"
-#include "constants/battle_setup.h"
 #include "battle_setup.h"
 #include "battle_transition.h"
 #include "main.h"
 #include "task.h"
 #include "safari_zone.h"
 #include "script.h"
-#include "constants/game_stat.h"
 #include "event_data.h"
-#include "constants/species.h"
-#include "constants/songs.h"
 #include "metatile_behavior.h"
-#include "constants/maps.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "random.h"
 #include "starter_choose.h"
 #include "script_pokemon_80F8.h"
-#include "constants/items.h"
 #include "palette.h"
 #include "window.h"
 #include "event_object_movement.h"
@@ -42,10 +35,18 @@
 #include "fldeff_misc.h"
 #include "field_control_avatar.h"
 #include "mirage_tower.h"
-#include "constants/map_types.h"
-#include "constants/battle_frontier.h"
 #include "field_screen_effect.h"
 #include "data.h"
+#include "constants/battle_frontier.h"
+#include "constants/battle_setup.h"
+#include "constants/game_stat.h"
+#include "constants/items.h"
+#include "constants/songs.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/species.h"
+#include "constants/trainers.h"
+#include "constants/trainer_hill.h"
 
 enum
 {
@@ -897,7 +898,7 @@ static void CB2_GiveStarter(void)
 
     *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
     starterMon = GetStarterPokemon(gSpecialVar_Result);
-    ScriptGiveMon(starterMon, 5, 0, 0, 0, 0);
+    ScriptGiveMon(starterMon, 5, ITEM_NONE, 0, 0, 0);
     ResetTasks();
     PlayBattleBGM();
     SetMainCallback2(CB2_StartFirstBattle);
@@ -1140,7 +1141,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
     case TRAINER_BATTLE_SET_TRAINER_B:
         TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
         return NULL;
-    case TRAINER_BATTLE_12:
+    case TRAINER_BATTLE_HILL:
         if (gApproachingTrainerId == 0)
         {
             TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
@@ -1288,7 +1289,7 @@ void BattleSetup_StartTrainerBattle(void)
     sNoOfPossibleTrainerRetScripts = gNoOfApproachingTrainers;
     gNoOfApproachingTrainers = 0;
     sShouldCheckTrainerBScript = FALSE;
-    gUnknown_03006080 = 0;
+    gWhichTrainerToFaceAfterBattle = 0;
     gMain.savedCallback = CB2_EndTrainerBattle;
 
     if (InBattlePyramid() || InTrainerHillChallenge())
@@ -1364,9 +1365,9 @@ void ShowTrainerIntroSpeech(void)
     else if (InTrainerHillChallenge())
     {
         if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
-            CopyTrainerHillTrainerText(2, LocalIdToHillTrainerId(gSpecialVar_LastTalked));
+            CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked));
         else
-            CopyTrainerHillTrainerText(2, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId));
+            CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId));
 
         sub_80982B8();
     }
@@ -1391,7 +1392,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
         sShouldCheckTrainerBScript = FALSE;
         if (sTrainerBBattleScriptRetAddr != NULL)
         {
-            gUnknown_03006080 = 1;
+            gWhichTrainerToFaceAfterBattle = 1;
             return sTrainerBBattleScriptRetAddr;
         }
     }
@@ -1399,7 +1400,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
     {
         if (sTrainerABattleScriptRetAddr != NULL)
         {
-            gUnknown_03006080 = 0;
+            gWhichTrainerToFaceAfterBattle = 0;
             return sTrainerABattleScriptRetAddr;
         }
     }
diff --git a/src/battle_tower.c b/src/battle_tower.c
index c55180965..aa4ca84e6 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -24,15 +24,17 @@
 #include "tv.h"
 #include "battle_factory.h"
 #include "constants/battle_frontier.h"
+#include "constants/battle_tower.h"
 #include "constants/items.h"
 #include "constants/trainers.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"
 #include "constants/species.h"
 #include "constants/easy_chat.h"
+#include "constants/tv.h"
 
-extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[];
-extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[];
+extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[];
+extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[];
 
 // EWRAM vars.
 EWRAM_DATA const struct BattleFrontierTrainer *gFacilityTrainers = NULL;
@@ -51,7 +53,7 @@ static void AwardBattleTowerRibbons(void);
 static void SaveBattleTowerProgress(void);
 static void sub_8163914(void);
 static void nullsub_61(void);
-static void SpriteCB_Null6(void);
+static void nullsub_116(void);
 static void sub_81642A0(void);
 static void sub_8164828(void);
 static void sub_8164B74(void);
@@ -1050,24 +1052,24 @@ struct
 
 #include "data/battle_frontier/battle_tent.h"
 
-static void (* const gUnknown_085DF96C[])(void) =
-{
-    sub_8161F94,
-    sub_8162054,
-    sub_81620F4,
-    ChooseNextBattleTowerTrainer,
-    sub_81621C0,
-    AwardBattleTowerRibbons,
-    SaveBattleTowerProgress,
-    sub_8163914,
-    nullsub_61,
-    SpriteCB_Null6,
-    sub_81642A0,
-    sub_8164828,
-    sub_8164B74,
-    sub_8164DCC,
-    sub_8164DE4,
-    sub_8164E04,
+static void (* const sBattleTowerFuncs[])(void) =
+{
+    [BATTLE_TOWER_FUNC_0] = sub_8161F94,
+    [BATTLE_TOWER_FUNC_1] = sub_8162054,
+    [BATTLE_TOWER_FUNC_2] = sub_81620F4,
+    [BATTLE_TOWER_FUNC_CHOOSE_TRAINER] = ChooseNextBattleTowerTrainer,
+    [BATTLE_TOWER_FUNC_4] = sub_81621C0,
+    [BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons,
+    [BATTLE_TOWER_FUNC_SAVE] = SaveBattleTowerProgress,
+    [BATTLE_TOWER_FUNC_7] = sub_8163914,
+    [BATTLE_TOWER_FUNC_NOP] = nullsub_61,
+    [BATTLE_TOWER_FUNC_NOP2] = nullsub_116,
+    [BATTLE_TOWER_FUNC_10] = sub_81642A0,
+    [BATTLE_TOWER_FUNC_11] = sub_8164828,
+    [BATTLE_TOWER_FUNC_12] = sub_8164B74,
+    [BATTLE_TOWER_FUNC_13] = sub_8164DCC,
+    [BATTLE_TOWER_FUNC_14] = sub_8164DE4,
+    [BATTLE_TOWER_FUNC_15] = sub_8164E04,
 };
 
 static const u32 gUnknown_085DF9AC[][2] =
@@ -1144,9 +1146,9 @@ static const u16 gUnknown_085DFA52[] =
 };
 
 // code
-void sub_8161F74(void)
+void CallBattleTowerFunc(void)
 {
-    gUnknown_085DF96C[gSpecialVar_0x8004]();
+    sBattleTowerFuncs[gSpecialVar_0x8004]();
 }
 
 static void sub_8161F94(void)
@@ -1270,10 +1272,10 @@ static bool8 ChooseSpecialBattleTowerTrainer(void)
     if (battleMode == FRONTIER_MODE_SINGLES)
     {
         ValidateApprenticesChecksums();
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < APPRENTICE_COUNT; i++)
         {
             if (gSaveBlock2Ptr->apprentices[i].lvlMode != 0
-                && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].field_1] == winStreak
+                && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].numQuestions] == winStreak
                 && gSaveBlock2Ptr->apprentices[i].lvlMode - 1 == lvlMode)
             {
                 trainerIds[idsCount] = i + TRAINER_RECORD_MIXING_APPRENTICE;
@@ -1998,7 +2000,7 @@ static void Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId)
     u8 fixedIV = 0;
     struct Apprentice *apprentice = &gSaveBlock2Ptr->apprentices[0];
 
-    if (apprentice->field_1 < 5)
+    if (apprentice->numQuestions < 5)
         fixedIV = 6;
     else
         fixedIV = 9;
@@ -2176,7 +2178,7 @@ static void sub_8163914(void)
     else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
         FrontierSpeechToString(gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].greeting);
     else
-        CopyFriendsApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE);
+        BufferApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE);
 }
 
 static void HandleSpecialTrainerBattleEnd(void)
@@ -2349,9 +2351,9 @@ void DoSpecialTrainerBattle(void)
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER;
         FillPartnerParty(TRAINER_STEVEN_PARTNER);
         gApproachingTrainerId = 0;
-        BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1);
+        BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer + 1);
         gApproachingTrainerId = 1;
-        BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1);
+        BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer + 1);
         gPartnerTrainerId = TRAINER_STEVEN_PARTNER;
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
@@ -2437,7 +2439,7 @@ static void nullsub_61(void)
 
 }
 
-static void SpriteCB_Null6(void)
+static void nullsub_116(void)
 {
 
 }
@@ -2567,10 +2569,10 @@ static void sub_81642A0(void)
 
     r10 = 0;
     ValidateApprenticesChecksums();
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < APPRENTICE_COUNT; i++)
     {
         if (gSaveBlock2Ptr->apprentices[i].lvlMode != 0
-            && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].field_1] / 7 <= challengeNum
+            && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].numQuestions] / 7 <= challengeNum
             && gSaveBlock2Ptr->apprentices[i].lvlMode - 1 == lvlMode)
         {
             k = 0;
@@ -3026,9 +3028,9 @@ static void AwardBattleTowerRibbons(void)
                 ribbons[i] = prevBest;
             }
         }
-        if (ribbons[0].count > 4)
+        if (ribbons[0].count > NUM_CUTIES_RIBBONS)
         {
-            sub_80EE4DC(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
+            TryPutSpotTheCutiesOnAir(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
         }
     }
 }
@@ -3191,7 +3193,7 @@ static void FillPartnerParty(u16 trainerId)
                       sStevenMons[i].fixedIV,
                       TRUE, i, // BUG: personality was stored in the 'j' variable. As a result, Steven's pokemon do not have the intended natures.
                       OT_ID_PRESET, STEVEN_OTID);
-            for (j = 0; j < 6; j++)
+            for (j = 0; j < PARTY_SIZE; j++)
                 SetMonData(&gPlayerParty[3 + i], MON_DATA_HP_EV + j, &sStevenMons[i].evs[j]);
             for (j = 0; j < MAX_MON_MOVES; j++)
                 SetMonMoveSlot(&gPlayerParty[3 + i], sStevenMons[i].moves[j], j);
@@ -3391,7 +3393,7 @@ static void ValidateApprenticesChecksums(void)
 {
     s32 i, j;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < APPRENTICE_COUNT; i++)
     {
         u32 *data = (u32*) &gSaveBlock2Ptr->apprentices[i];
         u32 checksum = 0;
diff --git a/src/battle_util.c b/src/battle_util.c
index 4d3ad3c7c..8587bb88e 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2084,7 +2084,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 }
             }
             break;
-        case ABILITYEFFECT_MOVE_END: // Think contact abilities.
+        case ABILITYEFFECT_ON_DAMAGE: // Contact abilities and Color Change
             switch (gLastUsedAbility)
             {
             case ABILITY_COLOR_CHANGE:
diff --git a/src/battle_util2.c b/src/battle_util2.c
index ce2153b2d..fd0dda76b 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -102,7 +102,7 @@ void AdjustFriendshipOnBattleFaint(u8 battlerId)
     }
 }
 
-void sub_80571DC(u8 battlerId, u8 arg1)
+void SwitchPartyOrderInGameMulti(u8 battlerId, u8 arg1)
 {
     if (GetBattlerSide(battlerId) != B_SIDE_OPPONENT)
     {
@@ -110,13 +110,13 @@ void sub_80571DC(u8 battlerId, u8 arg1)
 
         // gBattleStruct->field_60[0][i]
 
-        for (i = 0; i < 3; i++)
-            gUnknown_0203CF00[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
+        for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+            gBattlePartyCurrentOrder[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
 
-        sub_81B8FB0(pokemon_order_func(gBattlerPartyIndexes[battlerId]), pokemon_order_func(arg1));
+        SwitchPartyMonSlots(GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battlerId]), GetPartyIdFromBattlePartyId(arg1));
 
-        for (i = 0; i < 3; i++)
-            *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+        for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+            *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
     }
 }
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index b4874c3b1..72f3056d3 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1030,7 +1030,7 @@ static void sub_807FAC8(void)
             UnsetBgTilemapBuffer(2);
             UnsetBgTilemapBuffer(1);
             SetVBlankCallback(NULL);
-            sub_81AABF0(sub_807FFA4);
+            ChooseBerrySetCallback(sub_807FFA4);
 
             sBerryBlenderData->mainState = 0;
         }
@@ -1109,7 +1109,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
         sBerryBlenderData->playersNo = 2;
         StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
 
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
         else
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1432,7 +1432,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum,
     {
         opponentBerryId = sOpponentBerrySets[opponentSetId][i];
         var = playerBerryItemId - 163;
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1)
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER) && gSpecialVar_0x8004 == 1)
         {
             opponentSetId %= 5;
             opponentBerryId = sSpecialOpponentBerrySets[opponentSetId];
@@ -1632,7 +1632,7 @@ static void sub_80808D4(void)
 
         if (gSpecialVar_0x8004 == 1)
         {
-            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
                 sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 8b4c7a545..74a71f089 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -249,7 +249,7 @@ static void sub_8020D8C(void)
 void sub_8020E1C(void)
 {
     DestroyTask(gUnknown_02022C90->unkA);
-    sub_81AABF0(sub_8020D8C);
+    ChooseBerrySetCallback(sub_8020D8C);
 }
 
 static void sub_8020E3C(void)
diff --git a/src/cable_club.c b/src/cable_club.c
index 1375789c3..b1675030b 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -203,7 +203,7 @@ static void sub_80B2634(u8 taskId)
     if (data[0] == 0)
     {
         OpenLinkTimed();
-        sub_800AB98();
+        ResetLinkPlayerCount();
         ResetLinkPlayers();
         data[5] = AddWindow(&gUnknown_08550594);
     }
@@ -678,23 +678,23 @@ static void sub_80B2EE4(u8 taskId)
     }
 }
 
-void sub_80B2FD8(void)
+void TryBerryBlenderLinkup(void)
 {
-    gLinkType = LINKTYPE_0x4411;
+    gLinkType = LINKTYPE_BERRY_BLENDER_SETUP;
     gBattleTypeFlags = 0;
     sub_80B236C(2, 4);
 }
 
-void sub_80B3000(void)
+void TryContestGModeLinkup(void)
 {
-    gLinkType = LINKTYPE_0x6601;
+    gLinkType = LINKTYPE_CONTEST_GMODE;
     gBattleTypeFlags = 0;
     sub_80B236C(4, 4);
 }
 
-void sub_80B3028(void)
+void TryContestEModeLinkup(void)
 {
-    gLinkType = LINKTYPE_0x6602;
+    gLinkType = LINKTYPE_CONTEST_EMODE;
     gBattleTypeFlags = 0;
     sub_80B236C(2, 4);
 }
@@ -970,7 +970,7 @@ void sub_80B360C(void)
     Overworld_ResetMapMusic();
     LoadPlayerParty();
     SavePlayerBag();
-    sub_813BF10();
+    UpdateTrainerFansAfterLinkBattle();
 
     if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE)
     {
diff --git a/src/coins.c b/src/coins.c
index b838c303e..1b9656abd 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -6,8 +6,7 @@
 #include "string_util.h"
 #include "menu.h"
 #include "international_string_util.h"
-
-#define MAX_COINS 9999
+#include "constants/coins.h"
 
 EWRAM_DATA u8 sCoinsWindowId = 0;
 
diff --git a/src/contest.c b/src/contest.c
index a3914cf30..4830e05d5 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -219,15 +219,15 @@ static void sub_80DF9E0(u8 *, s32);
 static void SwapMoveDescAndContestTilemaps(void);
 
 // EWRAM vars.
-EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
-EWRAM_DATA s16 gContestMonConditions[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F08[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F10[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F18[4] = {0};
-EWRAM_DATA u8 gContestFinalStandings[4] = {0};
+EWRAM_DATA struct ContestPokemon gContestMons[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gContestMonConditions[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F08[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F10[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F18[CONTESTANT_COUNT] = {0};
+EWRAM_DATA u8 gContestFinalStandings[CONTESTANT_COUNT] = {0};
 EWRAM_DATA u8 gContestMonPartyIndex = 0;
 EWRAM_DATA u8 gContestPlayerMonIndex = 0;
-EWRAM_DATA u8 gContestantTurnOrder[4] = {0};
+EWRAM_DATA u8 gContestantTurnOrder[CONTESTANT_COUNT] = {0};
 EWRAM_DATA u8 gLinkContestFlags = 0;
 // Bit 0: Is a link contest
 // Bit 1: Link contest uses wireless adapter
@@ -238,7 +238,7 @@ EWRAM_DATA u8 gNumLinkContestPlayers = 0;
 EWRAM_DATA u8 gHighestRibbonRank = 0;
 EWRAM_DATA struct ContestResources *gContestResources = NULL;
 EWRAM_DATA u8 sContestBgCopyFlags = 0;
-EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0};
+EWRAM_DATA struct ContestWinner gCurContestWinner = {0};
 EWRAM_DATA u8 gUnknown_02039F5C = 0;
 EWRAM_DATA u8 gUnknown_02039F5D = 0;
 
@@ -246,29 +246,8 @@ EWRAM_DATA u8 gUnknown_02039F5D = 0;
 u32 gContestRngValue;
 
 extern const u8 gText_LinkStandby4[];
-extern const u8 gText_0827D55A[];
-extern const u8 gText_0827E793[];
-extern const u8 gText_0827E32E[];
-extern const u8 gText_0827E35B[];
-extern const u8 gText_0827E38D[];
-extern const u8 gText_0827E2FE[];
-extern const u8 gText_RepeatedAppeal[];
-extern const u8 gText_0827E73C[];
-extern const u8 gText_0827E717[];
-extern const u8 gText_0827E76A[];
-extern const u8 gText_0827E7EA[];
-extern const u8 gText_0827E817[];
-extern const u8 gText_0827E58A[];
-extern const u8 gText_0827D56F[];
-extern const u8 gText_0827D597[];
-extern const u8 gText_Contest_Shyness[];
-extern const u8 gText_Contest_Anxiety[];
-extern const u8 gText_Contest_Laziness[];
-extern const u8 gText_Contest_Hesitancy[];
-extern const u8 gText_Contest_Fear[];
 extern const u8 gText_BDot[];
 extern const u8 gText_CDot[];
-extern const u8 *const gUnknown_08587E10[];
 extern void (*const gContestEffectFuncs[])(void);
 
 static const u8 gUnknown_08587A6C[] =
@@ -1345,9 +1324,9 @@ static void sub_80D833C(u8 taskId)
         DmaCopy32Defvars(3, gPlttBufferUnfaded, eUnknownHeap1A004.unk18204, PLTT_BUFFER_SIZE * 2);
         ConvertIntToDecimalStringN(gStringVar1, eContest.turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
         if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
-            StringCopy(gDisplayedStringBattle, gText_0827D507);
+            StringCopy(gDisplayedStringBattle, gText_AppealNumWhichMoveWillBePlayed);
         else
-            StringCopy(gDisplayedStringBattle, gText_0827D531);
+            StringCopy(gDisplayedStringBattle, gText_AppealNumButItCantParticipate);
         ContestClearGeneralTextWindow();
         StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
         Contest_StartTextPrinter(gStringVar4, TRUE);
@@ -1443,9 +1422,9 @@ static void sub_80D8610(u8 taskId)
             sub_80DC490(FALSE);
             ConvertIntToDecimalStringN(gStringVar1, eContest.turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
             if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
-                StringCopy(gDisplayedStringBattle, gText_0827D507);
+                StringCopy(gDisplayedStringBattle, gText_AppealNumWhichMoveWillBePlayed);
             else
-                StringCopy(gDisplayedStringBattle, gText_0827D531);
+                StringCopy(gDisplayedStringBattle, gText_AppealNumButItCantParticipate);
             ContestClearGeneralTextWindow();
             StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
             Contest_StartTextPrinter(gStringVar4, 0);
@@ -1574,7 +1553,7 @@ static void sub_80D8A88(u8 taskId)
         {
             s32 i;
 
-            for (i = 0; i + gNumLinkContestPlayers < 4; i++)
+            for (i = 0; i + gNumLinkContestPlayers < CONTESTANT_COUNT; i++)
             {
                 eContestantStatus[gNumLinkContestPlayers + i].currMove = GetChosenMove(gNumLinkContestPlayers + i);
             }
@@ -1673,8 +1652,8 @@ static void sub_80D8B38(u8 taskId)
             if (eContestantStatus[r6].currMove < MOVES_COUNT)
                 StringCopy(gStringVar2, gMoveNames[eContestantStatus[r6].currMove]);
             else
-                StringCopy(gStringVar2, gUnknown_08587F1C[eContestantStatus[r6].moveCategory]);
-            StringExpandPlaceholders(gStringVar4, gText_0827D55A);
+                StringCopy(gStringVar2, sInvalidContestMoveNames[eContestantStatus[r6].moveCategory]);
+            StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove);
             Contest_StartTextPrinter(gStringVar4, 1);
             gTasks[taskId].data[0] = 6;
         }
@@ -1735,7 +1714,7 @@ static void sub_80D8B38(u8 taskId)
         {
             if (eContestantStatus[r6].effectStringId2 != CONTEST_STRING_NONE)
             {
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < CONTESTANT_COUNT; i++)
                 {
                     if (i != r6 && eContestantStatus[i].effectStringId != CONTEST_STRING_NONE)
                         break;
@@ -1838,10 +1817,10 @@ static void sub_80D8B38(u8 taskId)
             s32 r2 = 0;
 
             r3 = 0;
-            for (i = gTasks[taskId].data[1]; i < 4; i++)
+            for (i = gTasks[taskId].data[1]; i < CONTESTANT_COUNT; i++)
             {
                 r3 = 0;
-                for (r2 = 0; r2 < 4; r2++)
+                for (r2 = 0; r2 < CONTESTANT_COUNT; r2++)
                 {
                     if (r2 != r6 && gContestantTurnOrder[r2] == i
                         && eContestantStatus[r2].effectStringId != CONTEST_STRING_NONE)
@@ -1906,7 +1885,7 @@ static void sub_80D8B38(u8 taskId)
         }
         return;
     case 30:
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
         {
             if (gContestantTurnOrder[i] == gTasks[taskId].data[1])
                 break;
@@ -1932,7 +1911,7 @@ static void sub_80D8B38(u8 taskId)
             {
                 ContestClearGeneralTextWindow();
                 StringCopy(gStringVar1, gContestMons[r6].nickname);
-                StringExpandPlaceholders(gStringVar4, gText_0827E793);
+                StringExpandPlaceholders(gStringVar4, gText_MonCantAppealNextTurn);
                 Contest_StartTextPrinter(gStringVar4, 1);
             }
             gTasks[taskId].data[0] = 52;
@@ -1953,11 +1932,11 @@ static void sub_80D8B38(u8 taskId)
         {
             ContestClearGeneralTextWindow();
             if (r3 == 1)
-                Contest_StartTextPrinter(gText_0827E32E, TRUE);
+                Contest_StartTextPrinter(gText_AppealComboWentOverWell, TRUE);
             else if (r3 == 2)
-                Contest_StartTextPrinter(gText_0827E35B, TRUE);
+                Contest_StartTextPrinter(gText_AppealComboWentOverVeryWell, TRUE);
             else
-                Contest_StartTextPrinter(gText_0827E38D, TRUE);
+                Contest_StartTextPrinter(gText_AppealComboWentOverExcellently, TRUE);
             sub_80DD720(3);
             gTasks[taskId].data[10] = 0;
             gTasks[taskId].data[0] = 45;
@@ -1966,7 +1945,7 @@ static void sub_80D8B38(u8 taskId)
         {
             ContestClearGeneralTextWindow();
             StringCopy(gStringVar1, gContestMons[r6].nickname);
-            StringExpandPlaceholders(gStringVar4, gText_0827E2FE);
+            StringExpandPlaceholders(gStringVar4, gText_JudgeLookedAtMonExpectantly);
             Contest_StartTextPrinter(gStringVar4, 1);
             sub_80DD720(2);
             gTasks[taskId].data[10] = 0;
@@ -2056,7 +2035,7 @@ static void sub_80D8B38(u8 taskId)
             }
             else
             {
-                StringCopy(gStringVar3, gUnknown_08587F08[gContestMoves[eContestantStatus[r6].currMove].contestCategory]);
+                StringCopy(gStringVar3, sContestConditions[gContestMoves[eContestantStatus[r6].currMove].contestCategory]);
             }
             if (r3 > 0)
             {
@@ -2075,11 +2054,11 @@ static void sub_80D8B38(u8 taskId)
             else
             {
                 if (r3 < 0)
-                    StringExpandPlaceholders(gStringVar4, gText_0827E73C);
+                    StringExpandPlaceholders(gStringVar4, gText_MonsXDidntGoOverWell);
                 else if (r3 > 0 && eContest.applauseLevel <= 4)
-                    StringExpandPlaceholders(gStringVar4, gText_0827E717);
+                    StringExpandPlaceholders(gStringVar4, gText_MonsXWentOverGreat);
                 else
-                    StringExpandPlaceholders(gStringVar4, gText_0827E76A);
+                    StringExpandPlaceholders(gStringVar4, gText_MonsXGotTheCrowdGoing);
                 Contest_StartTextPrinter(gStringVar4, 1);
                 gTasks[taskId].data[10] = 0;
                 gTasks[taskId].data[11] = 0;
@@ -2189,7 +2168,7 @@ static void sub_80D8B38(u8 taskId)
         StringCopy(gStringVar3, gContestMons[gContestResources->field_10->excitementFreezer].nickname);
         StringCopy(gStringVar1, gContestMons[r6].nickname);
         StringCopy(gStringVar2, gMoveNames[eContestantStatus[r6].currMove]);
-        StringExpandPlaceholders(gStringVar4, gText_0827E7EA);
+        StringExpandPlaceholders(gStringVar4, gText_CrowdContinuesToWatchMon);
         Contest_StartTextPrinter(gStringVar4, TRUE);
         gTasks[taskId].data[0] = 58;
         return;
@@ -2197,7 +2176,7 @@ static void sub_80D8B38(u8 taskId)
         if (!Contest_RunTextPrinters())
         {
             ContestClearGeneralTextWindow();
-            StringExpandPlaceholders(gStringVar4, gText_0827E817);
+            StringExpandPlaceholders(gStringVar4, gText_MonsMoveIsIgnored);
             Contest_StartTextPrinter(gStringVar4, TRUE);
             gTasks[taskId].data[0] = 59;
         }
@@ -2215,7 +2194,7 @@ static void sub_80D8B38(u8 taskId)
         sub_80DC9B4(r6);
         StringCopy(gStringVar1, gContestMons[r6].nickname);
         StringCopy(gStringVar2, gMoveNames[eContestantStatus[r6].currMove]);
-        StringExpandPlaceholders(gStringVar4, gText_0827E58A);
+        StringExpandPlaceholders(gStringVar4, gText_MonWasTooNervousToMove);
         Contest_StartTextPrinter(gStringVar4, TRUE);
         gTasks[taskId].data[0] = 34;
         return;
@@ -2259,7 +2238,7 @@ static void sub_80D8B38(u8 taskId)
     case 31:
         ContestClearGeneralTextWindow();
         StringCopy(gStringVar1, gContestMons[r6].nickname);
-        StringExpandPlaceholders(gStringVar4, gText_0827D56F);
+        StringExpandPlaceholders(gStringVar4, gText_MonWasWatchingOthers);
         Contest_StartTextPrinter(gStringVar4, TRUE);
         gTasks[taskId].data[0] = 32;
         return;
@@ -2427,11 +2406,11 @@ static void sub_80DA3CC(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
-        u8 r4 = eContestantStatus[gContestPlayerMonIndex].attentionLevel;
+        u8 attention = eContestantStatus[gContestPlayerMonIndex].attentionLevel;
 
         ContestClearGeneralTextWindow();
         StringCopy(gStringVar1, gContestMons[gContestPlayerMonIndex].nickname);
-        StringExpandPlaceholders(gStringVar4, gUnknown_08587D90[r4]);
+        StringExpandPlaceholders(gStringVar4, sRoundResultTexts[attention]);
         Contest_StartTextPrinter(gStringVar4, TRUE);
         gTasks[taskId].data[0]++;
     }
@@ -2509,7 +2488,7 @@ static void sub_80DA5E8(u8 taskId)
 
     gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         gUnknown_02039F10[i] = eContestantStatus[i].pointTotal;
     sub_80DBD18();
     ContestClearGeneralTextWindow();
@@ -2522,7 +2501,7 @@ static void sub_80DA5E8(u8 taskId)
         ContestDebugPrintBitStrings();
     }
     gContestRngValue = gRngValue;
-    StringExpandPlaceholders(gStringVar4, gText_0827D597);
+    StringExpandPlaceholders(gStringVar4, gText_AllOutOfAppealTime);
     Contest_StartTextPrinter(gStringVar4, TRUE);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_80DA6B4;
@@ -2786,9 +2765,9 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
             opponents[opponentsCount++] = i;
     }
     opponents[opponentsCount] = 0xFF;
-    for (i = 0; i < 4 - gNumLinkContestPlayers; i++)
+    for (i = 0; i < CONTESTANT_COUNT - gNumLinkContestPlayers; i++)
     {
-        u16 rnd = sub_80F903C() % opponentsCount;
+        u16 rnd = GetContestRand() % opponentsCount;
 
         gContestMons[gNumLinkContestPlayers + i] = gContestOpponents[opponents[rnd]];
         sub_80DF9D4(gContestMons[gNumLinkContestPlayers + i].trainerName);
@@ -2799,16 +2778,15 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
     }
 }
 
-// GetContestAvailability?
-u8 sub_80DAE0C(struct Pokemon *pkmn)
+u8 GetContestEntryEligibility(struct Pokemon *pkmn)
 {
     u8 ribbon;
-    u8 retVal;
+    u8 eligibility;
 
     if (GetMonData(pkmn, MON_DATA_IS_EGG))
-        return 3;
+        return CANT_ENTER_CONTEST_EGG;
     if (GetMonData(pkmn, MON_DATA_HP) == 0)
-        return 4;
+        return CANT_ENTER_CONTEST_FAINTED;
     switch (gSpecialVar_ContestCategory)
     {
     case CONTEST_CATEGORY_COOL:
@@ -2827,19 +2805,19 @@ u8 sub_80DAE0C(struct Pokemon *pkmn)
         ribbon = GetMonData(pkmn, MON_DATA_TOUGH_RIBBON);
         break;
     default:
-        return 0;
+        return CANT_ENTER_CONTEST;
     }
 
     // Couldn't get this to match any other way.
     // Returns 2, 1, or 0 respectively if ribbon's rank is above, equal, or below
     // the current contest rank.
     if (ribbon > gSpecialVar_ContestRank)
-        retVal = 2;
+        eligibility = CAN_ENTER_CONTEST_HIGH_RANK;
     else if (ribbon >= gSpecialVar_ContestRank)
-        retVal = 1;
+        eligibility = CAN_ENTER_CONTEST_EQUAL_RANK;
     else
-        retVal = 0;
-    return retVal;
+        eligibility = CANT_ENTER_CONTEST;
+    return eligibility;
 }
 
 static void DrawContestantWindowText(void)
@@ -2935,7 +2913,7 @@ void sub_80DB09C(u8 contestCategory)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         gContestMonConditions[i] = sub_80DAFE0(i, contestCategory);
 }
 
@@ -3102,7 +3080,7 @@ static void sub_80DB584(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DB4E0(eContestantStatus[i].currMove, i);
 }
 
@@ -3213,7 +3191,7 @@ static void sub_80DB884(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DB798(i);
 }
 
@@ -3863,7 +3841,7 @@ static void sub_80DC864(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DC87C(i);
 }
 
@@ -4260,7 +4238,7 @@ static void sub_80DD080(u8 contestant)
     eContestResources8.jam2 = eContestResources8.jam;
 
     eContestResources8.contestant = contestant;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         eContestantStatus[i].jam = 0;
         eContestResources8.unnervedPokes[i] = 0;
@@ -4382,7 +4360,7 @@ static void sub_80DD45C(u8 contestant, u8 stringId)
         StringCopy(gStringVar3, gText_Contest_Hesitancy);
     else
         StringCopy(gStringVar3, gText_Contest_Fear);
-    StringExpandPlaceholders(gStringVar4, gUnknown_08587E10[stringId]);
+    StringExpandPlaceholders(gStringVar4, sAppealResultTexts[stringId]);
     ContestClearGeneralTextWindow();
     Contest_StartTextPrinter(gStringVar4, 1);
 }
@@ -4797,7 +4775,7 @@ static void sub_80DE008(bool8 a)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (eContestantStatus[i].turnOrderMod != 0 && a)
         {
@@ -5303,7 +5281,7 @@ void ResetContestLinkResults(void)
             gSaveBlock2Ptr->contestLinkResults[i][j] = 0;
 }
 
-bool8 sub_80DEDA8(u8 a)
+bool8 sub_80DEDA8(u8 rank)
 {
     s32 i;
     u8 r7 = Random() % 3;
@@ -5313,7 +5291,7 @@ bool8 sub_80DEDA8(u8 a)
         if (gContestFinalStandings[i] == 0)
             break;
     }
-    if (a == 0xFF && i != gContestPlayerMonIndex)
+    if (rank == 0xFF && i != gContestPlayerMonIndex)
         return FALSE;
     switch (gSpecialVar_ContestCategory)
     {
@@ -5333,9 +5311,9 @@ bool8 sub_80DEDA8(u8 a)
         r7 += 12;
         break;
     }
-    if (a != 0xFE)
+    if (rank != 0xFE)
     {
-        u8 r4 = sub_80DEFA8(a, 1);
+        u8 r4 = sub_80DEFA8(rank, 1);
 
         gSaveBlock1Ptr->contestWinners[r4].personality = gContestMons[i].personality;
         gSaveBlock1Ptr->contestWinners[r4].species = gContestMons[i].species;
@@ -5343,44 +5321,44 @@ bool8 sub_80DEDA8(u8 a)
         StringCopy(gSaveBlock1Ptr->contestWinners[r4].monName, gContestMons[i].nickname);
         StringCopy(gSaveBlock1Ptr->contestWinners[r4].trainerName, gContestMons[i].trainerName);
         if(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
-            gSaveBlock1Ptr->contestWinners[r4].contestRank = 4;
+            gSaveBlock1Ptr->contestWinners[r4].contestRank = CONTEST_RANK_LINK;
         else
             gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank;
 
-        if (a != 0xFF)
+        if (rank != 0xFF)
             gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory;
         else
             gSaveBlock1Ptr->contestWinners[r4].contestCategory = r7;
     }
     else
     {
-        gUnknown_02039F3C.personality = gContestMons[i].personality;
-        gUnknown_02039F3C.trainerId = gContestMons[i].otId;
-        gUnknown_02039F3C.species = gContestMons[i].species;
-        StringCopy(gUnknown_02039F3C.monName, gContestMons[i].nickname);
-        StringCopy(gUnknown_02039F3C.trainerName, gContestMons[i].trainerName);
-        gUnknown_02039F3C.contestCategory = r7;
+        gCurContestWinner.personality = gContestMons[i].personality;
+        gCurContestWinner.trainerId = gContestMons[i].otId;
+        gCurContestWinner.species = gContestMons[i].species;
+        StringCopy(gCurContestWinner.monName, gContestMons[i].nickname);
+        StringCopy(gCurContestWinner.trainerName, gContestMons[i].trainerName);
+        gCurContestWinner.contestCategory = r7;
     }
     return TRUE;
 }
 
-u8 sub_80DEFA8(u8 a, u8 b)
+u8 sub_80DEFA8(u8 rank, u8 b)
 {
     s32 i;
 
-    switch (a)
+    switch (rank)
     {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
+    case CONTEST_RANK_NORMAL:
+    case CONTEST_RANK_SUPER:
+    case CONTEST_RANK_HYPER:
+    case CONTEST_RANK_MASTER:
         if (b != 0)
         {
             for (i = 5; i >= 1; i--)
                 memcpy(&gSaveBlock1Ptr->contestWinners[i], &gSaveBlock1Ptr->contestWinners[i - 1], sizeof(struct ContestWinner));
         }
         return 0;
-    default:
+    default: // CONTEST_RANK_LINK
         switch (gSpecialVar_ContestCategory)
         {
         case CONTEST_CATEGORY_COOL:
@@ -5435,7 +5413,7 @@ static void sub_80DF080(u8 contestant)
         gContestResources->field_1c[contestant].unkC |= 8;
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (i != contestant && eContestantStatus[i].jam != 0)
         {
@@ -5482,7 +5460,7 @@ static void sub_80DF250(void)
     r1 = 0;
     var_38 = 0;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (gContestFinalStandings[i] == 0)
             var_38 = i;
@@ -5509,7 +5487,7 @@ static void sub_80DF250(void)
 
         r12 = FALSE;
         r8 = FALSE;
-        for (j = 0; j < 4; j++)
+        for (j = 0; j < CONTESTANT_COUNT; j++)
         {
             if (gContestMonConditions[i] > gContestMonConditions[j])
                 r12 = TRUE;
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index 54b2326d0..872aed14e 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -39,6 +39,7 @@
 #include "constants/game_stat.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "contest.h"
 
@@ -265,7 +266,7 @@ void sub_80F5AE0(void)
 {
     int i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80F5A74(i);
 
     CopyBgTilemapBufferToVram(1);
@@ -355,17 +356,17 @@ static void sub_80F5CE4(u8 taskId)
                     InterviewAfter();
             }
 
-            sub_813BADC(2);
+            TryGainNewFanFromCounter(2);
             sub_80DEDA8(gSpecialVar_ContestRank);
             sub_80DEDA8(0xFE);
             gUnknown_02039F5C = 1;
             gUnknown_02039F5D = sub_80DEFA8(0xFE, 0);
-            var = VarGet(VAR_LINK_CONTEST_ROOM_STATE);
-            VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0);
+            var = VarGet(VAR_CONTEST_HALL_STATE);
+            VarSet(VAR_CONTEST_HALL_STATE, 0);
             SetContinueGameWarpStatusToDynamicWarp();
             TrySavingData(SAVE_LINK);
             ClearContinueGameWarpStatus2();
-            VarSet(VAR_LINK_CONTEST_ROOM_STATE, var);
+            VarSet(VAR_CONTEST_HALL_STATE, var);
             gTasks[taskId].data[0]++;
             break;
         case 1:
@@ -410,7 +411,7 @@ static void sub_80F5CE4(u8 taskId)
             sub_80DEDA8(0xFE);
             gUnknown_02039F5C = 1;
             gUnknown_02039F5D = sub_80DEFA8(0xFE, 0);
-            sub_813BADC(2);
+            TryGainNewFanFromCounter(2);
             gTasks[taskId].func = sub_80F5F74;
         }
     }
@@ -576,7 +577,7 @@ static void sub_80F6204(u8 taskId)
         }
         break;
     case 2:
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
         {
             newTaskId = CreateTask(sub_80F73DC, 10);
             gTasks[newTaskId].data[0] = gContestFinalStandings[i];
@@ -592,7 +593,7 @@ static void sub_80F6204(u8 taskId)
                 gTasks[taskId].data[1] = 0;
                 CreateTask(sub_80F74BC, 10);
                 gTasks[taskId].data[0]++;
-                for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+                for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
                     ;
 
                 sub_80F77E0(i, 14);
@@ -603,7 +604,7 @@ static void sub_80F6204(u8 taskId)
         if (++gTasks[taskId].data[1] == 21)
         {
             gTasks[taskId].data[1] = 0;
-            for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+            for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
                 ;
 
             StringCopy(gStringVar1, gContestMons[i].trainerName);
@@ -636,7 +637,7 @@ static void sub_80F6404(u8 taskId)
     case 0:
         gBattle_WIN0H = 0x00F0;
         gBattle_WIN0V = 0x5050;
-        for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+        for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
             ;
 
         species = gContestMons[i].species;
@@ -732,7 +733,7 @@ static void sub_80F66B4(u8 taskId)
     {
         if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
         {
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < CONTESTANT_COUNT; i++)
             {
                 nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
                 GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
@@ -874,7 +875,7 @@ static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow)
 {
     int i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80F69B8(gContestMons[i].species, i, srcOffset, useDmaNow, gContestMons[i].personality);
 }
 
@@ -882,7 +883,7 @@ static void sub_80F6A9C(void)
 {
     int i, species;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         species = gContestMons[i].species;
         LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
@@ -1423,48 +1424,48 @@ static void sub_80F71C8(void)
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6498, 5, 1, 5, 2);
         x = 10;
     }
-    else if (gSpecialVar_ContestRank == 0)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_NORMAL)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC63F8, 5, 1, 10, 2);
         x = 15;
     }
-    else if (gSpecialVar_ContestRank == 1)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_SUPER)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6420, 5, 1, 10, 2);
         x = 15;
     }
-    else if (gSpecialVar_ContestRank == 2)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_HYPER)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6448, 5, 1, 10, 2);
         x = 15;
     }
-    else
+    else // CONTEST_RANK_MASTER
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6470, 5, 1, 10, 2);
         x = 15;
     }
 
-    if (gSpecialVar_ContestCategory == 0)
+    if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_COOL)
     {
         palette = 0;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64AC, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 1)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_BEAUTY)
     {
         palette = 1;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64C0, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 2)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_CUTE)
     {
         palette = 2;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64D4, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 3)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_SMART)
     {
         palette = 3;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64E8, x, y, 5, 2);
     }
-    else
+    else // CONTEST_CATEGORY_TOUGH
     {
         palette = 4;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64FC, x, y, 5, 2);
@@ -1550,7 +1551,7 @@ static void sub_80F73DC(u8 taskId)
 static void sub_80F74BC(u8 taskId)
 {
     int i;
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     CopyToBgTilemapBufferRect_ChangePalette(2, i * 0xC0 + 0x100 + gUnknown_0203A034->unkC[2], 0, i * 3 + 4, 32, 3, 9);
@@ -1706,7 +1707,7 @@ static void sub_80F7880(void)
         }
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         r4 = (gContestMonConditions[i] * 1000) / abs(r2);
         if (r4 % 10 > 4)
@@ -1933,50 +1934,52 @@ static void sub_80F7ED0(int windowId, u8 *str, int arg2)
     PutWindowTilemap(windowId);
 }
 
-void sub_80F7F30(void)
+void TryEnterContestMon(void)
 {
-    u8 result = sub_80DAE0C(&gPlayerParty[gContestMonPartyIndex]);
-    if (result)
+    u8 eligibility = GetContestEntryEligibility(&gPlayerParty[gContestMonPartyIndex]);
+
+    // Nonzero eligibility can still be non-eligibile, if mon is fainted or egg
+    if (eligibility)
     {
         sub_80DAB8C(gSpecialVar_ContestCategory, gSpecialVar_ContestRank);
         sub_80DB09C(gSpecialVar_ContestCategory);
     }
 
-    gSpecialVar_Result = result;
+    gSpecialVar_Result = eligibility;
 }
 
-u16 sub_80F7F7C(void)
+u16 HasMonWonThisContestBefore(void)
 {
-    u16 result = 0;
+    u16 hasRankRibbon = FALSE;
     struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex];
     switch (gSpecialVar_ContestCategory)
     {
     case CONTEST_CATEGORY_COOL:
         if (GetMonData(mon, MON_DATA_COOL_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_BEAUTY:
         if (GetMonData(mon, MON_DATA_BEAUTY_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_CUTE:
         if (GetMonData(mon, MON_DATA_CUTE_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_SMART:
         if (GetMonData(mon, MON_DATA_SMART_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_TOUGH:
         if (GetMonData(mon, MON_DATA_TOUGH_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     }
 
-    return result;
+    return hasRankRibbon;
 }
 
-void sub_80F7FFC(void)
+void GiveMonContestRibbon(void)
 {
     u8 ribbonData;
 
@@ -1991,8 +1994,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_BEAUTY:
@@ -2001,8 +2004,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_CUTE:
@@ -2011,8 +2014,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_SMART:
@@ -2021,8 +2024,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_TOUGH:
@@ -2031,95 +2034,96 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
         }
         break;
     }
 }
 
-void sub_80F8264(void)
+void BufferContestantTrainerName(void)
 {
     StringCopy(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
     sub_81DB5AC(gStringVar1);
 }
 
-void sub_80F8290(void)
+void BufferContestantMonNickname(void)
 {
     StringCopy(gStringVar3, gContestMons[gSpecialVar_0x8006].nickname);
 }
 
-void sub_80F82B4(void)
+// Unused script special
+void GetContestMonConditionRanking(void)
 {
-    u8 i, count;
+    u8 i, rank;
 
-    for (i = 0, count = 0; i < 4; i++)
+    for (i = 0, rank = 0; i < CONTESTANT_COUNT; i++)
     {
         if (gContestMonConditions[gSpecialVar_0x8006] < gContestMonConditions[i])
-            count++;
+            rank++;
     }
 
-    gSpecialVar_0x8004 = count;
+    gSpecialVar_0x8004 = rank;
 }
 
-void sub_80F82FC(void)
+void GetContestMonCondition(void)
 {
     gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006];
 }
 
-void sub_80F831C(void)
+void GetContestWinnerId(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     gSpecialVar_0x8005 = i;
 }
 
-void sub_80F834C(void)
+void BufferContestWinnerTrainerName(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     StringCopy(gStringVar3, gContestMons[i].trainerName);
     sub_81DB5AC(gStringVar3);
 }
 
-void sub_80F8390(void)
+void BufferContestWinnerMonName(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     StringCopy(gStringVar1, gContestMons[i].nickname);
 }
 
-void sub_80F83D0(void)
+void CB2_SetStartContestCallback(void)
 {
     SetMainCallback2(CB2_StartContest);
 }
 
-static void sub_80F83E0(u8 taskId)
+static void Task_StartContest(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         DestroyTask(taskId);
-        SetMainCallback2(sub_80F83D0);
+        SetMainCallback2(CB2_SetStartContestCallback);
     }
 }
 
-void sub_80F840C(void)
+void StartContest(void)
 {
     ScriptContext2_Enable();
-    CreateTask(sub_80F83E0, 10);
+    CreateTask(Task_StartContest, 10);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
 }
 
-void sub_80F8438(void)
+void BufferContestantMonSpecies(void)
 {
     gSpecialVar_0x8004 = gContestMons[gSpecialVar_0x8006].species;
 }
@@ -2140,7 +2144,7 @@ void sub_80F8484(void)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
 }
 
-void sub_80F84B0(void)
+void GetContestPlayerId(void)
 {
     gSpecialVar_0x8004 = gContestPlayerMonIndex;
 }
@@ -2246,7 +2250,7 @@ void sub_80F8714(u8 taskId)
     }
     else
     {
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
             StringGetEnd10(gContestMons[i].nickname);
 
         DestroyTask(taskId);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 2b36d5e38..7f33cac09 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -5,10 +5,10 @@
 #include "bg.h"
 #include "contest.h"
 #include "contest_painting.h"
-#include "contest_painting_effects.h"
 #include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
+#include "image_processing_effects.h"
 #include "international_string_util.h"
 #include "main.h"
 #include "lilycove_lady.h"
@@ -22,9 +22,9 @@
 #include "constants/rgb.h"
 
 // IWRAM common
-u16 (*gUnknown_03006190)[][32];
-struct Unk030061A0 gUnknown_030061A0;
-struct ContestWinner *gUnknown_030061C0;
+u16 (*gContestMonPixels)[][32];
+struct ImageProcessingContext gImageProcessingContext;
+struct ContestWinner *gContestPaintingWinner;
 u16 *gContestPaintingMonPalette;
 
 // IWRAM bss
@@ -39,10 +39,10 @@ static void HoldContestPainting(void);
 static void InitContestPaintingWindow(void);
 static void InitContestPaintingBg(void);
 static void InitContestPaintingVars(bool8);
-static void sub_8130884(u8, u8);
+static void CreateContestPaintingPicture(u8, u8);
 static void PrintContestPaintingCaption(u8, u8);
 static void VBlankCB_ContestPainting(void);
-static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]);
+static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64]);
 
 extern const u8 gUnknown_0827EA0C[];
 extern const u8 gContestCoolness[];
@@ -85,7 +85,7 @@ const u8 gPictureFrameTilemap_3[] = INCBIN_U8("graphics/picture_frame/frame3_map
 const u8 gPictureFrameTilemap_4[] = INCBIN_U8("graphics/picture_frame/frame4_map.bin.rl");
 const u8 gPictureFrameTilemap_5[] = INCBIN_U8("graphics/picture_frame/frame5_map.bin.rl");
 
-const u8 *const gUnknown_085B07C0[] =
+static const u8 *const sContestCategoryNames_Unused[] =
 {
     gContestCoolness,
     gContestBeauty,
@@ -94,7 +94,7 @@ const u8 *const gUnknown_085B07C0[] =
     gContestToughness,
 };
 
-const u8 *const gContestRankTextPointers[] =
+static const u8 *const sContestRankNames[] =
 {
     gContestRankNormal,
     gContestRankSuper,
@@ -103,7 +103,7 @@ const u8 *const gContestRankTextPointers[] =
     gContestLink,
 };
 
-const struct BgTemplate gUnknown_085B07E8[] =
+static const struct BgTemplate sContestPaintingBgTemplates[] =
 {
     {
         .bg = 1,
@@ -116,7 +116,7 @@ const struct BgTemplate gUnknown_085B07E8[] =
     },
 };
 
-const struct WindowTemplate gUnknown_085B07EC =
+static const struct WindowTemplate sContestPaintingWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 2,
@@ -127,7 +127,7 @@ const struct WindowTemplate gUnknown_085B07EC =
     .baseBlock = 1,
 };
 
-const u8 *const gContestPaintingDescriptionPointers[] =
+static const u8 *const sContestPaintingDescriptionPointers[] =
 {
     gContestPaintingCool1,
     gContestPaintingCool2,
@@ -146,7 +146,7 @@ const u8 *const gContestPaintingDescriptionPointers[] =
     gContestPaintingTough3,
 };
 
-const struct OamData gUnknown_085B0830 =
+static const struct OamData sContestPaintingMonOamData =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -163,13 +163,13 @@ const struct OamData gUnknown_085B0830 =
 
 const u16 gUnknown_085B0838[] = {RGB(0, 0, 0), RGB(0, 0, 0)};
 
-void sub_812FDA8(int contestWinner)
+void SetContestWinnerForPainting(int contestWinnerId)
 {
     // probably fakematching
     u8 *ptr1 = &gUnknown_02039F5D;
     u8 *ptr2 = &gUnknown_02039F5C;
-	gUnknown_02039F3C = gSaveBlock1Ptr->contestWinners[contestWinner - 1];
-	*ptr1 = contestWinner - 1;
+	gCurContestWinner = gSaveBlock1Ptr->contestWinners[contestWinnerId - 1];
+	*ptr1 = contestWinnerId - 1;
 	*ptr2 = 0;
 }
 
@@ -189,7 +189,7 @@ static void CB2_QuitContestPainting(void)
 {
     SetMainCallback2(gMain.savedCallback);
     FREE_AND_SET_NULL(gContestPaintingMonPalette);
-    FREE_AND_SET_NULL(gUnknown_03006190);
+    FREE_AND_SET_NULL(gContestMonPixels);
     RemoveWindow(gContestPaintingWindowId);
     Free(GetBgTilemapBuffer(1));
     FreeMonSpritesGfx();
@@ -203,7 +203,7 @@ static void ShowContestPainting(void)
         ScanlineEffect_Stop();
         SetVBlankCallback(NULL);
         AllocateMonSpritesGfx();
-        gUnknown_030061C0 = &gUnknown_02039F3C;
+        gContestPaintingWinner = &gCurContestWinner;
         InitContestPaintingVars(1);
         InitContestPaintingBg();
         gMain.state++;
@@ -221,7 +221,7 @@ static void ShowContestPainting(void)
         gMain.state++;
         break;
     case 3:
-        sub_8130884(gUnknown_02039F5D, gUnknown_02039F5C);
+        CreateContestPaintingPicture(gUnknown_02039F5D, gUnknown_02039F5C);
         gMain.state++;
         break;
     case 4:
@@ -269,11 +269,11 @@ static void HoldContestPainting(void)
 static void InitContestPaintingWindow(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085B07E8, ARRAY_COUNT(gUnknown_085B07E8));
+    InitBgsFromTemplates(0, sContestPaintingBgTemplates, ARRAY_COUNT(sContestPaintingBgTemplates));
     ChangeBgX(1, 0, 0);
     ChangeBgY(1, 0, 0);
     SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
-    gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC);
+    gContestPaintingWindowId = AddWindow(&sContestPaintingWindowTemplate);
     DeactivateAllTextPrinters();
     FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_FILL(0));
     PutWindowTilemap(gContestPaintingWindowId);
@@ -289,21 +289,21 @@ static void PrintContestPaintingCaption(u8 contestType, u8 arg1)
     if (arg1 == TRUE)
         return;
 
-    category = gUnknown_030061C0->contestCategory;
+    category = gContestPaintingWinner->contestCategory;
     if (contestType < 8)
     {
         BufferContestName(gStringVar1, category);
         StringAppend(gStringVar1, gText_Space);
-        StringAppend(gStringVar1, gContestRankTextPointers[gUnknown_030061C0->contestRank]);
-        StringCopy(gStringVar2, gUnknown_030061C0->trainerName);
+        StringAppend(gStringVar1, sContestRankNames[gContestPaintingWinner->contestRank]);
+        StringCopy(gStringVar2, gContestPaintingWinner->trainerName);
         sub_81DB5AC(gStringVar2);
-        StringCopy(gStringVar3, gUnknown_030061C0->monName);
+        StringCopy(gStringVar3, gContestPaintingWinner->monName);
         StringExpandPlaceholders(gStringVar4, gUnknown_0827EA0C);
     }
     else
     {
-        StringCopy(gStringVar1, gUnknown_030061C0->monName);
-        StringExpandPlaceholders(gStringVar4, gContestPaintingDescriptionPointers[category]);
+        StringCopy(gStringVar1, gContestPaintingWinner->monName);
+        StringExpandPlaceholders(gStringVar4, sContestPaintingDescriptionPointers[category]);
     }
 
     x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
@@ -360,18 +360,18 @@ static void VBlankCB_ContestPainting(void)
     TransferPlttBuffer();
 }
 
-void sub_81302E8(u16 species, u8 arg1)
+static void InitContestMonPixels(u16 species, u8 whichSprite)
 {
-    const void *pal = GetMonSpritePalFromSpeciesAndPersonality(species, gUnknown_030061C0->trainerId, gUnknown_030061C0->personality);
+    const void *pal = GetMonSpritePalFromSpeciesAndPersonality(species, gContestPaintingWinner->trainerId, gContestPaintingWinner->personality);
     LZDecompressVram(pal, gContestPaintingMonPalette);
-    if (!arg1)
+    if (whichSprite == 0)
     {
         HandleLoadSpecialPokePic_DontHandleDeoxys(
             &gMonFrontPicTable[species],
             gMonSpritesGfxPtr->sprites[1],
             species,
-            gUnknown_030061C0->personality);
-        sub_8130380(gMonSpritesGfxPtr->sprites[1], gContestPaintingMonPalette, (void *)gUnknown_03006190);
+            gContestPaintingWinner->personality);
+        _InitContestMonPixels(gMonSpritesGfxPtr->sprites[1], gContestPaintingMonPalette, (void *)gContestMonPixels);
     }
     else
     {
@@ -379,14 +379,14 @@ void sub_81302E8(u16 species, u8 arg1)
             &gMonBackPicTable[species],
             gMonSpritesGfxPtr->sprites[0],
             species,
-            gUnknown_030061C0->personality);
-        sub_8130380(gMonSpritesGfxPtr->sprites[0], gContestPaintingMonPalette, (void *)gUnknown_03006190);
+            gContestPaintingWinner->personality);
+        _InitContestMonPixels(gMonSpritesGfxPtr->sprites[0], gContestPaintingMonPalette, (void *)gContestMonPixels);
     }
 }
 
 #ifdef NONMATCHING
 // functionally equivalent.
-static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64])
+static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64])
 {
     u16 tileY, tileX, pixelY, pixelX;
     u8 colorIndex;
@@ -400,16 +400,16 @@ static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[6
                 for (pixelX = 0; pixelX < 8; pixelX++)
                 {
                     int offset = 32 * (8 * tileY + tileX) + (pixelY * 4 + pixelX / 2);
-                    colorIndex = spritePixels[offset];
+                    colorIndex = spriteGfx[offset];
                     if (pixelX & 1)
                         colorIndex >>= 4;
                     else
                         colorIndex &= 0xF;
 
                     if (colorIndex == 0) // transparent pixel
-                        (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = 0x8000;
+                        (*destPixels)[8 * tileY + pixelY][tileX * 8 + pixelX] = 0x8000;
                     else
-                        (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = palette[colorIndex];
+                        (*destPixels)[8 * tileY + pixelY][tileX * 8 + pixelX] = palette[colorIndex];
                 }
             }
         }
@@ -417,7 +417,7 @@ static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[6
 }
 #else
 NAKED
-static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64])
+static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64])
 {
     asm_unified("\n\
     push {r4-r7,lr}\n\
@@ -519,34 +519,34 @@ _081303F8:\n\
 }
 #endif
 
-static void sub_8130430(u8 arg0, u8 arg1)
+static void LoadContestPaintingFrame(u8 contestWinnerId, u8 arg1)
 {
     u8 x, y;
 
     LoadPalette(gPictureFramePalettes, 0, 0x100);
     if (arg1 == 1)
     {
-        switch (gUnknown_030061C0->contestCategory / 3)
+        switch (gContestPaintingWinner->contestCategory / 3)
         {
         case CONTEST_CATEGORY_COOL:
             RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM);
-            RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03006190);
+            RLUnCompWram(gPictureFrameTilemap_0, gContestMonPixels);
             break;
         case CONTEST_CATEGORY_BEAUTY:
             RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM);
-            RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03006190);
+            RLUnCompWram(gPictureFrameTilemap_1, gContestMonPixels);
             break;
         case CONTEST_CATEGORY_CUTE:
             RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM);
-            RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03006190);
+            RLUnCompWram(gPictureFrameTilemap_2, gContestMonPixels);
             break;
         case CONTEST_CATEGORY_SMART:
             RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM);
-            RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03006190);
+            RLUnCompWram(gPictureFrameTilemap_3, gContestMonPixels);
             break;
         case CONTEST_CATEGORY_TOUGH:
             RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM);
-            RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03006190);
+            RLUnCompWram(gPictureFrameTilemap_4, gContestMonPixels);
             break;
         }
 
@@ -563,23 +563,23 @@ static void sub_8130430(u8 arg0, u8 arg1)
         for (y = 0; y < 10; y++)
         {
             for (x = 0; x < 18; x++)
-                VRAM_PICTURE_DATA(x + 6, y + 2) = (*gUnknown_03006190)[y + 2][x + 6];
+                VRAM_PICTURE_DATA(x + 6, y + 2) = (*gContestMonPixels)[y + 2][x + 6];
         }
 
         // Re-set the entire top row to the first top frame part
         for (x = 0; x < 16; x++)
-            VRAM_PICTURE_DATA(x + 7, 2) = (*gUnknown_03006190)[2][7];
+            VRAM_PICTURE_DATA(x + 7, 2) = (*gContestMonPixels)[2][7];
 
 #undef VRAM_PICTURE_DATA
     }
-    else if (arg0 < 8)
+    else if (contestWinnerId < 8)
     {
         RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM);
         RLUnCompVram(gPictureFrameTilemap_5, (void *)(BG_SCREEN_ADDR(12)));
     }
     else
     {
-        switch (gUnknown_030061C0->contestCategory / 3)
+        switch (gContestPaintingWinner->contestCategory / 3)
         {
         case CONTEST_CATEGORY_COOL:
             RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM);
@@ -605,100 +605,99 @@ static void sub_8130430(u8 arg0, u8 arg1)
     }
 }
 
-static void sub_8130688(u8 arg0)
+static void InitPaintingMonOamData(u8 contestWinnerId)
 {
     //Some hacks just to get the asm to match
 #ifndef NONMATCHING
-    asm(""::"r"(arg0));
+    asm(""::"r"(contestWinnerId));
 #endif
 
-    gMain.oamBuffer[0] = gUnknown_085B0830;
+    gMain.oamBuffer[0] = sContestPaintingMonOamData;
     gMain.oamBuffer[0].tileNum = 0;
 
 #ifndef NONMATCHING
-    if (arg0) arg0 = gMain.oamBuffer[0].tileNum;
+    if (contestWinnerId) contestWinnerId = gMain.oamBuffer[0].tileNum;
 #endif
 
     gMain.oamBuffer[0].x = 88;
     gMain.oamBuffer[0].y = 24;
 }
 
-static u8 sub_81306CC(u8 arg0)
+static u8 GetImageEffectForContestWinner(u8 contestWinnerId)
 {
     u8 contestCategory;
 
-    if (arg0 < 8)
-        contestCategory = gUnknown_030061C0->contestCategory;
+    if (contestWinnerId < 8)
+        contestCategory = gContestPaintingWinner->contestCategory;
     else
-        contestCategory = gUnknown_030061C0->contestCategory / 3;
+        contestCategory = gContestPaintingWinner->contestCategory / 3;
 
     switch (contestCategory)
     {
     case CONTEST_CATEGORY_COOL:
-        return CONTESTRESULT_COOL;
+        return IMAGE_EFFECT_OUTLINE_COLORED;
     case CONTEST_CATEGORY_BEAUTY:
-        return CONTESTRESULT_BEAUTY;
+        return IMAGE_EFFECT_SHIMMER;
     case CONTEST_CATEGORY_CUTE:
-        return CONTESTRESULT_CUTE;
+        return IMAGE_EFFECT_POINTILLISM;
     case CONTEST_CATEGORY_SMART:
-        return CONTESTRESULT_SMART;
+        return IMAGE_EFFECT_CHARCOAL;
     case CONTEST_CATEGORY_TOUGH:
-        return CONTESTRESULT_TOUGH;
+        return IMAGE_EFFECT_GRAYSCALE_LIGHT;
     }
 
     return contestCategory;
 }
 
-static void sub_8130738(void)
+static void AllocPaintingResources(void)
 {
-    gContestPaintingMonPalette = AllocZeroed(0x200);
-    gUnknown_03006190 = AllocZeroed(0x2000);
+    gContestPaintingMonPalette = AllocZeroed(OBJ_PLTT_SIZE);
+    gContestMonPixels = AllocZeroed(0x2000);
 }
 
-static void sub_8130760(u8 contestResult)
+static void DoContestPaintingImageProcessing(u8 imageEffect)
 {
-    gUnknown_030061A0.var_4 = gUnknown_03006190;
-    gUnknown_030061A0.var_8 = gContestPaintingMonPalette;
-    gUnknown_030061A0.var_18 = 0;
-    gUnknown_030061A0.var_1F = gUnknown_030061C0->personality % 256;
-    gUnknown_030061A0.var_19 = 0;
-    gUnknown_030061A0.var_1A = 0;
-    gUnknown_030061A0.var_1B = 64;
-    gUnknown_030061A0.var_1C = 64;
-    gUnknown_030061A0.var_1D = 64;
-    gUnknown_030061A0.var_1E = 64;
-
-    switch (contestResult)
+    gImageProcessingContext.canvasPixels = gContestMonPixels;
+    gImageProcessingContext.canvasPalette = gContestPaintingMonPalette;
+    gImageProcessingContext.paletteStart = 0;
+    gImageProcessingContext.personality = gContestPaintingWinner->personality % 256;
+    gImageProcessingContext.columnStart = 0;
+    gImageProcessingContext.rowStart = 0;
+    gImageProcessingContext.columnEnd = 64;
+    gImageProcessingContext.rowEnd = 64;
+    gImageProcessingContext.canvasWidth = 64;
+    gImageProcessingContext.canvasHeight = 64;
+
+    switch (imageEffect)
     {
-    case CONTESTRESULT_SMART:
-    case CONTESTRESULT_TOUGH:
-        gUnknown_030061A0.var_14 = 3;
+    case IMAGE_EFFECT_CHARCOAL:
+    case IMAGE_EFFECT_GRAYSCALE_LIGHT:
+        gImageProcessingContext.quantizeEffect = QUANTIZE_EFFECT_GRAYSCALE;
         break;
-    case CONTESTRESULT_COOL:
-    case CONTESTRESULT_BEAUTY:
-    case CONTESTRESULT_CUTE:
+    case IMAGE_EFFECT_OUTLINE_COLORED:
+    case IMAGE_EFFECT_SHIMMER:
+    case IMAGE_EFFECT_POINTILLISM:
     default:
-        gUnknown_030061A0.var_14 = 1;
+        gImageProcessingContext.quantizeEffect = QUANTIZE_EFFECT_STANDARD_LIMITED_COLORS;
         break;
     }
 
-    gUnknown_030061A0.var_16 = 2;
-    gUnknown_030061A0.var_0 = contestResult;
-    gUnknown_030061A0.var_10 = OBJ_VRAM0;
-
-    sub_8124F2C(&gUnknown_030061A0);
-    sub_81261A4(&gUnknown_030061A0);
-    sub_8126058(&gUnknown_030061A0);
+    gImageProcessingContext.var_16 = 2;
+    gImageProcessingContext.effect = imageEffect;
+    gImageProcessingContext.dest = (void *)OBJ_VRAM0;
 
+    ApplyImageProcessingEffects(&gImageProcessingContext);
+    ApplyImageProcessingQuantization(&gImageProcessingContext);
+    ConvertImageProcessingToGBA(&gImageProcessingContext);
     LoadPalette(gContestPaintingMonPalette, 0x100, 0x200);
 }
 
-static void sub_8130884(u8 arg0, u8 arg1)
+static void CreateContestPaintingPicture(u8 contestWinnerId, u8 arg1)
 {
-    sub_8130738();
-    sub_81302E8(gUnknown_030061C0->species, 0);
-    sub_8130760(sub_81306CC(arg0));
-    sub_8130688(arg0);
-    sub_8130430(arg0, arg1);
+    AllocPaintingResources();
+    InitContestMonPixels(gContestPaintingWinner->species, 0);
+    DoContestPaintingImageProcessing(GetImageEffectForContestWinner(contestWinnerId));
+    InitPaintingMonOamData(contestWinnerId);
+    LoadContestPaintingFrame(contestWinnerId, arg1);
 }
 
diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c
deleted file mode 100644
index a791df65c..000000000
--- a/src/contest_painting_effects.c
+++ /dev/null
@@ -1,1365 +0,0 @@
-#include "global.h"
-#include "contest_painting_effects.h"
-#include "contest_painting.h"
-#include "constants/rgb.h"
-
-struct Unk8125954
-{
-    u8 unk0;
-    u8 unk1;
-    u16 unk2;
-};
-
-// IWRAM common
-u8 gUnknown_03006164;
-u16 (*gUnknown_03006168)[][32];
-u8 gUnknown_0300616C;
-u8 gUnknown_03006170;
-u8 gUnknown_03006174;
-u8 gUnknown_03006178;
-u8 gUnknown_0300617C;
-u8 gUnknown_03006180;
-u16 *gUnknown_03006184;
-u16 gUnknown_03006188;
-
-static void sub_8125230(void);
-static void sub_81252E8(void);
-static void sub_81254E0(void);
-static void sub_8125630(void);
-static void sub_8125448(void);
-static void sub_81257F8(void);
-static void sub_81258A0(void);
-static void sub_81256C8(void);
-static void sub_8125250(void);
-static void sub_81253A4(u8);
-static void sub_81250B8(u8);
-static void sub_8125170(u8);
-static void sub_8125954(u16);
-static u16 ConvertColorToGrayscale(u16*);
-static u16 sub_8125E18(u16*, u16*, u16*);
-static u16 ConvertCoolColor(u16*, u8);
-static u16 ConvertToBlackOrWhite(u16*);
-static u16 sub_8125C98(u16*, u16*);
-static u16 InvertColor(u16*);
-static u16 sub_8125F38(u16*, u16*, u16*);
-static u16 sub_8125CF4(u16*, u16*);
-static u16 GetCoolColorFromPersonality(u8);
-static void sub_81263A4(bool8);
-static void sub_8126270(void);
-static void sub_8126714(void);
-static void sub_8126370(void);
-static void sub_8126664(void);
-static void sub_8126334(void);
-static void sub_81265B4(void);
-static void sub_8126318(void);
-static void sub_81264FC(void);
-static u16 sub_81267C4(u16*);
-static u16 sub_8126908(u16*);
-static u16 sub_812693C(u16*);
-static u16 sub_8126838(u16*);
-
-extern const u8 gUnknown_085A1F94[][3];
-
-void sub_8124F2C(struct Unk030061A0 *info)
-{
-    gUnknown_03006168 = info->var_4;
-    gUnknown_0300617C = info->var_1F;
-    gUnknown_03006164 = info->var_19;
-    gUnknown_03006178 = info->var_1A;
-    gUnknown_03006174 = info->var_1B;
-    gUnknown_0300616C = info->var_1C;
-    gUnknown_03006180 = info->var_1D;
-    gUnknown_03006170 = info->var_1E;
-    switch (info->var_0)
-    {
-    case 2:
-        sub_8125230();
-        break;
-    case 8:
-        sub_81252E8();
-        break;
-    case 9:
-        sub_81254E0();
-        sub_81253A4(gUnknown_0300617C);
-        break;
-    case 10:
-        sub_81254E0();
-        sub_8125630();
-        sub_8125448();
-    case 31:
-        sub_8125630();
-        break;
-    case 11:
-        sub_81254E0();
-        sub_81257F8();
-        sub_81257F8();
-        sub_81258A0();
-        sub_8125448();
-        break;
-    case 13:
-        sub_81256C8();
-        break;
-    case 30:
-        sub_81254E0();
-        break;
-    case 32:
-        sub_81257F8();
-        break;
-    case 33:
-        sub_81258A0();
-        break;
-    case 6:
-        sub_8125250();
-        sub_81250B8(3);
-        break;
-    case 36:
-        sub_81254E0();
-        sub_81257F8();
-        sub_81258A0();
-        sub_8125448();
-        sub_81252E8();
-        sub_81252E8();
-        sub_81250B8(2);
-        sub_8125170(4);
-        break;
-    }
-}
-
-static void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (!(0x8000 & *pal))
-            {
-                u8 val = (31 & *pal);
-                val += a0;
-                if (val > 31)
-                    val = 31;
-
-                *pal = RGB2(val, val, val);
-            }
-        }
-    }
-}
-
-static void sub_8125170(u8 a0)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (!(0x8000 & *pal))
-            {
-                u8 val = (31 & *pal);
-                if (val > 31 - a0)
-                    val = 31 - (a0 >> 1);
-
-                *pal = RGB2(val, val, val);
-            }
-        }
-    }
-}
-
-static void sub_8125230(void)
-{
-    u32 i;
-    for (i = 0; i < 3200; i++)
-        sub_8125954(i);
-}
-
-static void sub_8125250(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* color = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, color++)
-        {
-            if (!(0x8000 & *color))
-            {
-                *color = ConvertColorToGrayscale(color);
-            }
-        }
-    }
-}
-
-static void sub_81252E8(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_03006174; i++)
-    {
-        u16* var0 = &(*gUnknown_03006168)[0][gUnknown_03006178 * gUnknown_03006180];
-        u16* palette = &var0[gUnknown_03006164 + i];
-        u16 color = *palette;
-
-        j = 1;
-        palette += gUnknown_03006180;
-        while (j < gUnknown_0300616C - 1)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = sub_8125E18(&color, palette, palette + gUnknown_03006180);
-                color = *palette;
-            }
-
-            j++;
-            palette += gUnknown_03006180;
-        }
-    }
-}
-
-static void sub_81253A4(u8 arg0)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var0 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* color = &var0[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, color++)
-        {
-            if (!(0x8000 & *color))
-            {
-                *color = ConvertCoolColor(color, arg0);
-            }
-        }
-    }
-}
-
-static void sub_8125448(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var0 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* color = &var0[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, color++)
-        {
-            if (!(0x8000 & *color))
-            {
-                *color = ConvertToBlackOrWhite(color);
-            }
-        }
-    }
-}
-
-static void sub_81254E0(void)
-{
-    u8 i, j;
-    u16 *palette;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16 *var0 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        palette = &var0[gUnknown_03006164];
-        *palette = sub_8125C98(palette, palette + 1);
-        for (j = 1, palette = palette + 1; j < gUnknown_03006174 - 1; j++, palette++)
-        {
-            *palette = sub_8125C98(palette, palette + 1);
-            *palette = sub_8125C98(palette, palette - 1);
-        }
-
-        *palette = sub_8125C98(palette, palette - 1);
-    }
-
-    for (j = 0; j < gUnknown_03006174; j++)
-    {
-        u16 *var0 = &(*gUnknown_03006168)[0][gUnknown_03006178 * gUnknown_03006180];
-        palette = &var0[gUnknown_03006164 + j];
-        *palette = sub_8125C98(palette, palette + gUnknown_03006180);
-        for (i = 1, palette = palette + gUnknown_03006180; i < gUnknown_0300616C - 1; i++, palette += gUnknown_03006180)
-        {
-            *palette = sub_8125C98(palette, palette + gUnknown_03006180);
-            *palette = sub_8125C98(palette, palette - gUnknown_03006180);
-        }
-
-        *palette = sub_8125C98(palette, palette - gUnknown_03006180);
-    }
-}
-
-static void sub_8125630(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16 *var0 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16 *color = &var0[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, color++)
-        {
-            if (!(0x8000 & *color))
-            {
-                *color = InvertColor(color);
-            }
-        }
-    }
-}
-
-static void sub_81256C8(void)
-{
-    u8 i, j;
-    u16 *palette;
-    u16 color;
-
-    palette = (*gUnknown_03006168)[0];
-    for (i = 0; i < 64; i++)
-    {
-        for (j = 0; j < 64; j++, palette++)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = InvertColor(palette);
-            }
-        }
-    }
-
-    for (j = 0; j < 64; j++)
-    {
-        palette = &(*gUnknown_03006168)[0][j];
-        color = *palette;
-        *palette = 0x8000;
-        for (i = 1, palette += 64; i < 63; i++, palette += 64)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = sub_8125F38(&color, palette, palette + 64);
-                color = *palette;
-            }
-        }
-
-        *palette = 0x8000;
-        palette = &(*gUnknown_03006168)[0][j];
-        color = *palette;
-        *palette = 0x8000;
-        for (i = 1, palette += 64; i < 63; i++, palette += 64)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = sub_8125F38(&color, palette, palette + 64);
-                color = *palette;
-            }
-        }
-
-        *palette = 0x8000;
-    }
-
-    palette = (*gUnknown_03006168)[0];
-    for (i = 0; i < 64; i++)
-    {
-        for (j = 0; j < 64; j++, palette++)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = InvertColor(palette);
-            }
-        }
-    }
-}
-
-static void sub_81257F8(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16 *var0 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16 *palette = &var0[gUnknown_03006164];
-        u16 color = *palette;
-        for (j = 1, palette++; j < gUnknown_03006174 - 1; j++, palette++)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = sub_8125CF4(&color, palette);
-                color = *palette;
-            }
-        }
-    }
-}
-
-static void sub_81258A0(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_03006174; i++)
-    {
-        u16* var0 = &(*gUnknown_03006168)[0][gUnknown_03006178 * gUnknown_03006180];
-        u16* palette = &var0[gUnknown_03006164 + i];
-        u16 color = *palette;
-        for (j = 1, palette += gUnknown_03006180; j < gUnknown_0300616C - 1; j++, palette += gUnknown_03006180)
-        {
-            if (!(0x8000 & *palette))
-            {
-                *palette = sub_8125CF4(&color, palette);
-                color = *palette;
-            }
-        }
-    }
-}
-
-static void sub_8125954(u16 arg0)
-{
-    u8 i;
-    u8 r5, r9;
-    struct Unk8125954 unkStruct[6];
-
-    unkStruct[0].unk0 = gUnknown_085A1F94[arg0][0];
-    unkStruct[0].unk1 = gUnknown_085A1F94[arg0][1];
-    unkStruct[0].unk2 = (gUnknown_085A1F94[arg0][2] >> 3) & 7;
-
-    r9 = (gUnknown_085A1F94[arg0][2] >> 1) & 3;
-    r5 = gUnknown_085A1F94[arg0][2] & 1;
-    for (i = 1; i < unkStruct[0].unk2; i++)
-    {
-        if (!r5)
-        {
-            unkStruct[i].unk0 = unkStruct[0].unk0 - i;
-            unkStruct[i].unk1 = unkStruct[0].unk1 + i;
-        }
-        else
-        {
-            unkStruct[i].unk0 = unkStruct[0].unk0 + 1;
-            unkStruct[i].unk1 = unkStruct[0].unk1 - 1;
-        }
-
-        if (unkStruct[i].unk0 > 63 || unkStruct[i].unk1 > 63)
-        {
-            unkStruct[0].unk2 = i - 1;
-            break;
-        }
-
-        unkStruct[i].unk2 = unkStruct[0].unk2 - i;
-    }
-
-    for (i = 0; i < unkStruct[0].unk2; i++)
-    {
-        u16 *pal = &(*gUnknown_03006168)[unkStruct[i].unk1 * 2][unkStruct[i].unk0];
-
-        if (!(0x8000 & *pal))
-        {
-            u16 r = (*pal) & 0x1F;
-            u16 g = (*pal >> 5) & 0x1F;
-            u16 b = (*pal >> 10) & 0x1F;
-
-            switch (r9)
-            {
-            case 0:
-            case 1:
-                switch (((gUnknown_085A1F94[arg0][2] >> 3) & 7) % 3)
-                {
-                case 0:
-                    if (r >= unkStruct[i].unk2)
-                        r -= unkStruct[i].unk2;
-                    else
-                        r = 0;
-                    break;
-                case 1:
-                    if (g >= unkStruct[i].unk2)
-                        g -= unkStruct[i].unk2;
-                    else
-                        g = 0;
-                    break;
-                case 2:
-                    if (b >= unkStruct[i].unk2)
-                        b -= unkStruct[i].unk2;
-                    else
-                        b = 0;
-                    break;
-                }
-                break;
-            case 2:
-            case 3:
-                r += unkStruct[i].unk2;
-                g += unkStruct[i].unk2;
-                b += unkStruct[i].unk2;
-                if (r > 31)
-                    r = 31;
-                if (g > 31)
-                    g = 31;
-                if (b > 31)
-                    b = 31;
-                break;
-            }
-
-            *pal = RGB2(r, g, b);
-        }
-    }
-}
-
-static u16 ConvertColorToGrayscale(u16 *color)
-{
-    s32 clr = *color;
-    s32 r = clr & 0x1F;
-    s32 g = (clr >> 5) & 0x1F;
-    s32 b = (clr >> 10) & 0x1F;
-    s32 gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
-    return RGB2(gray, gray, gray);
-}
-
-// The dark colors are the colored edges of the Cool painting effect.
-// Everything else is white.
-static u16 ConvertCoolColor(u16 *color, u8 personality)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-
-    if (red < 17 && green < 17 && blue < 17)
-        return GetCoolColorFromPersonality(personality);
-    else
-        return RGB_WHITE;
-}
-
-// Based on the given value, which comes from the first 8 bits of
-// the mon's personality value, return a color.
-static u16 GetCoolColorFromPersonality(u8 personality)
-{
-    u16 red = 0;
-    u16 green = 0;
-    u16 blue = 0;
-    u8 strength = (personality / 6) % 3;
-    u8 colorType = personality % 6;
-
-    switch (colorType)
-    {
-    case 0:
-        // Teal color
-        green = 21 - strength;
-        blue = green;
-        red = 0;
-        break;
-    case 1:
-        // Yellow color
-        blue = 0;
-        red = 21 - strength;
-        green = red;
-        break;
-    case 2:
-        // Purple color
-        blue = 21 - strength;
-        green = 0;
-        red = blue;
-        break;
-    case 3:
-        // Red color
-        blue = 0;
-        green = 0;
-        red = 23 - strength;
-        break;
-    case 4:
-        // Blue color
-        blue = 23 - strength;
-        green = 0;
-        red = 0;
-        break;
-    case 5:
-        // Green color
-        blue = 0;
-        green = 23 - strength;
-        red = 0;
-        break;
-    }
-
-    return RGB2(red, green, blue);
-}
-
-static u16 ConvertToBlackOrWhite(u16 *color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-
-    if (red < 17 && green < 17 && blue < 17)
-        return RGB_BLACK;
-    else
-        return RGB_WHITE;
-}
-
-static u16 sub_8125C98(u16 *colorA, u16 *colorB)
-{
-    if (*colorA)
-    {
-        if (*colorA & 0x8000)
-            return 0x8000;
-        if (*colorB & 0x8000)
-            return RGB_BLACK;
-
-        return *colorA;
-    }
-
-    return RGB_BLACK;
-}
-
-static u16 InvertColor(u16 *color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-
-    red = 31 - red;
-    green = 31 - green;
-    blue = 31 - blue;
-
-    return RGB2(red, green, blue);
-}
-
-static u16 sub_8125CF4(u16 *a0, u16 *a1)
-{
-    u16 sp0[2][3];
-    u16 spC[3];
-    u8 r4;
-    u16 r2;
-    u16 r, g, b;
-
-    if (*a0 == *a1)
-        return *a1;
-
-    sp0[0][0] = (*a0 >> 0) & 0x1F;
-    sp0[0][1] = (*a0 >> 5) & 0x1F;
-    sp0[0][2] = (*a0 >> 10) & 0x1F;
-    sp0[1][0] = (*a1 >> 0) & 0x1F;
-    sp0[1][1] = (*a1 >> 5) & 0x1F;
-    sp0[1][2] = (*a1 >> 10) & 0x1F;
-
-    if (sp0[0][0] > 25 && sp0[0][1] > 25 && sp0[0][2] > 25)
-        return *a1;
-    if (sp0[1][0] > 25 && sp0[1][1] > 25 && sp0[1][2] > 25)
-        return *a1;
-
-    for (r4 = 0; r4 < 3; r4++)
-    {
-        if (sp0[0][r4] > sp0[1][r4])
-            spC[r4] = sp0[0][r4] - sp0[1][r4];
-        else
-            spC[r4] = sp0[1][r4] - sp0[0][r4];
-    }
-
-    if (spC[0] >= spC[1])
-    {
-        if (spC[0] >= spC[2])
-            r2 = spC[0];
-        else if (spC[1] >= spC[2])
-            r2 = spC[1];
-        else
-            r2 = spC[2];
-    }
-    else
-    {
-        if (spC[1] >= spC[2])
-            r2 = spC[1];
-        else if (spC[2] >= spC[0])
-            r2 = spC[2];
-        else
-            r2 = spC[0];
-    }
-
-    r = (sp0[1][0] * (31 - r2 / 2)) / 31;
-    g = (sp0[1][1] * (31 - r2 / 2)) / 31;
-    b = (sp0[1][2] * (31 - r2 / 2)) / 31;
-    return RGB2(r, g, b);
-}
-
-static u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
-{
-    u16 red, green, blue;
-    u16 avg0, avg1, avg2;
-    u16 diff1, diff2;
-    u32 minimum;
-    u16 factor;
-
-    if (*a0 == *a1 && *a2 == *a1)
-        return *a1;
-
-    red = (*a1 >> 0) & 0x1F;
-    green = (*a1 >> 5) & 0x1F;
-    blue = (*a1 >> 10) & 0x1F;
-
-    avg0 = (((*a0 >> 0) & 0x1F) + ((*a0 >> 5) & 0x1F) + ((*a0 >> 10) & 0x1F)) / 3;
-    avg1 = (((*a1 >> 0) & 0x1F) + ((*a1 >> 5) & 0x1F) + ((*a1 >> 10) & 0x1F)) / 3;
-    avg2 = (((*a2 >> 0) & 0x1F) + ((*a2 >> 5) & 0x1F) + ((*a2 >> 10) & 0x1F)) / 3;
-
-    if (avg0 == avg1 && avg2 == avg1)
-        return *a1;
-
-    if (avg0 > avg1)
-        diff1 = avg0 - avg1;
-    else
-        diff1 = avg1 - avg0;
-
-    if (avg2 > avg1)
-        diff2 = avg2 - avg1;
-    else
-        diff2 = avg1 - avg2;
-
-    if (diff1 >= diff2)
-        minimum = diff1;
-    else
-        minimum = diff2;
-
-    factor = 31 - minimum / 2;
-    red = red * factor / 31;
-    green = green * factor / 31;
-    blue = blue * factor / 31;
-    return RGB2(red, green, blue);
-}
-
-static u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
-{
-    u16 red, green, blue;
-    u16 avg0, avg1, avg2;
-    u16 diff1, diff2;
-    u32 minimum;
-    u16 factor;
-
-    if (*a0 == *a1 && *a2 == *a1)
-        return *a1;
-
-    red = (*a1 >> 0) & 0x1F;
-    green = (*a1 >> 5) & 0x1F;
-    blue = (*a1 >> 10) & 0x1F;
-
-    avg0 = (((*a0 >> 0) & 0x1F) + ((*a0 >> 5) & 0x1F) + ((*a0 >> 10) & 0x1F)) / 3;
-    avg1 = (((*a1 >> 0) & 0x1F) + ((*a1 >> 5) & 0x1F) + ((*a1 >> 10) & 0x1F)) / 3;
-    avg2 = (((*a2 >> 0) & 0x1F) + ((*a2 >> 5) & 0x1F) + ((*a2 >> 10) & 0x1F)) / 3;
-
-    if (avg0 == avg1 && avg2 == avg1)
-        return *a1;
-
-    if (avg0 > avg1)
-        diff1 = avg0 - avg1;
-    else
-        diff1 = avg1 - avg0;
-
-    if (avg2 > avg1)
-        diff2 = avg2 - avg1;
-    else
-        diff2 = avg1 - avg2;
-
-    if (diff1 >= diff2)
-        minimum = diff1;
-    else
-        minimum = diff2;
-
-    factor = 31 - minimum;
-    red = red * factor / 31;
-    green = green * factor / 31;
-    blue = blue * factor / 31;
-    return RGB2(red, green, blue);
-}
-
-/*
-void sub_8126058(struct Unk030061A0 *arg0)
-{
-    u16 i, j, k;
-    u8 r5 = arg0->var_1D >> 3;
-    u8 var_24 = arg0->var_1E >> 3;
-    u16 (*var_2C)[][32] = arg0->var_4;
-    u32 var_28 = arg0->var_10;
-
-    if (arg0->var_16 == 2)
-    {
-        for (i = 0; i < var_24; i++)
-        {
-            for (j = 0; j < r5; j++)
-            {
-                for (k = 0; k < 8; k++)
-                {
-                    (*var_2C)[][];
-                }
-            }
-        }
-    }
-}
-*/
-
-NAKED
-void sub_8126058(struct Unk030061A0 *arg0)
-{
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0xC\n\
-    ldrb r1, [r0, 0x1D]\n\
-    lsrs r5, r1, 3\n\
-    ldrb r1, [r0, 0x1E]\n\
-    lsrs r1, 3\n\
-    str r1, [sp, 0x8]\n\
-    ldr r1, [r0, 0x4]\n\
-    str r1, [sp]\n\
-    ldr r2, [r0, 0x10]\n\
-    str r2, [sp, 0x4]\n\
-    ldrh r0, [r0, 0x16]\n\
-    cmp r0, 0x2\n\
-    bne _08126108\n\
-    movs r1, 0\n\
-    ldr r0, [sp, 0x8]\n\
-    cmp r1, r0\n\
-    bcc _08126086\n\
-    b _08126194\n\
-_08126086:\n\
-    movs r0, 0\n\
-    adds r2, r1, 0x1\n\
-    mov r10, r2\n\
-    cmp r0, r5\n\
-    bcs _081260FA\n\
-    adds r2, r1, 0\n\
-    muls r2, r5\n\
-    mov r9, r2\n\
-    lsls r1, 3\n\
-    mov r8, r1\n\
-_0812609A:\n\
-    movs r4, 0\n\
-    lsls r6, r0, 4\n\
-    adds r7, r0, 0x1\n\
-    add r0, r9\n\
-    lsls r0, 6\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r1, r0\n\
-    mov r12, r1\n\
-_081260AA:\n\
-    lsls r0, r4, 3\n\
-    mov r2, r12\n\
-    adds r3, r2, r0\n\
-    mov r1, r8\n\
-    adds r0, r1, r4\n\
-    lsls r0, 3\n\
-    muls r0, r5\n\
-    lsls r0, 1\n\
-    ldr r2, [sp]\n\
-    adds r0, r2, r0\n\
-    adds r2, r0, r6\n\
-    ldrh r0, [r2, 0x2]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2]\n\
-    orrs r0, r1\n\
-    strh r0, [r3]\n\
-    ldrh r0, [r2, 0x6]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0x4]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x2]\n\
-    ldrh r0, [r2, 0xA]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0x8]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x4]\n\
-    ldrh r0, [r2, 0xE]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0xC]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x6]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, 0x7\n\
-    bls _081260AA\n\
-    lsls r0, r7, 16\n\
-    lsrs r0, 16\n\
-    cmp r0, r5\n\
-    bcc _0812609A\n\
-_081260FA:\n\
-    mov r1, r10\n\
-    lsls r0, r1, 16\n\
-    lsrs r1, r0, 16\n\
-    ldr r2, [sp, 0x8]\n\
-    cmp r1, r2\n\
-    bcc _08126086\n\
-    b _08126194\n\
-_08126108:\n\
-    movs r1, 0\n\
-    ldr r0, [sp, 0x8]\n\
-    cmp r1, r0\n\
-    bcs _08126194\n\
-_08126110:\n\
-    movs r0, 0\n\
-    adds r2, r1, 0x1\n\
-    mov r10, r2\n\
-    cmp r0, r5\n\
-    bcs _08126188\n\
-    adds r2, r1, 0\n\
-    muls r2, r5\n\
-    mov r9, r2\n\
-    lsls r1, 3\n\
-    mov r8, r1\n\
-_08126124:\n\
-    movs r4, 0\n\
-    lsls r6, r0, 4\n\
-    adds r7, r0, 0x1\n\
-    add r0, r9\n\
-    lsls r0, 5\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r1, r0\n\
-    mov r12, r1\n\
-_08126134:\n\
-    lsls r0, r4, 2\n\
-    mov r2, r12\n\
-    adds r3, r2, r0\n\
-    mov r1, r8\n\
-    adds r0, r1, r4\n\
-    lsls r0, 3\n\
-    muls r0, r5\n\
-    lsls r0, 1\n\
-    ldr r2, [sp]\n\
-    adds r0, r2, r0\n\
-    adds r2, r0, r6\n\
-    ldrh r1, [r2, 0x2]\n\
-    lsls r1, 4\n\
-    ldrh r0, [r2]\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0x4]\n\
-    lsls r0, 8\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0x6]\n\
-    lsls r0, 12\n\
-    orrs r1, r0\n\
-    strh r1, [r3]\n\
-    ldrh r1, [r2, 0xA]\n\
-    lsls r1, 4\n\
-    ldrh r0, [r2, 0x8]\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0xC]\n\
-    lsls r0, 8\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0xE]\n\
-    lsls r0, 12\n\
-    orrs r1, r0\n\
-    strh r1, [r3, 0x2]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, 0x7\n\
-    bls _08126134\n\
-    lsls r0, r7, 16\n\
-    lsrs r0, 16\n\
-    cmp r0, r5\n\
-    bcc _08126124\n\
-_08126188:\n\
-    mov r1, r10\n\
-    lsls r0, r1, 16\n\
-    lsrs r1, r0, 16\n\
-    ldr r2, [sp, 0x8]\n\
-    cmp r1, r2\n\
-    bcc _08126110\n\
-_08126194:\n\
-    add sp, 0xC\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0");
-}
-
-void sub_81261A4(struct Unk030061A0 *arg0)
-{
-    gUnknown_03006188 = arg0->var_18 * 16;
-    gUnknown_03006184 = &arg0->var_8[gUnknown_03006188];
-    gUnknown_03006168 = arg0->var_4;
-    gUnknown_03006164 = arg0->var_19;
-    gUnknown_03006178 = arg0->var_1A;
-    gUnknown_03006174 = arg0->var_1B;
-    gUnknown_0300616C = arg0->var_1C;
-    gUnknown_03006180 = arg0->var_1D;
-    gUnknown_03006170 = arg0->var_1E;
-
-    switch (arg0->var_14)
-    {
-    case 0:
-        sub_81263A4(FALSE);
-        break;
-    case 1:
-        sub_81263A4(TRUE);
-        break;
-    case 2:
-        sub_8126270();
-        sub_8126714();
-        break;
-    case 3:
-        sub_8126370();
-        sub_8126664();
-        break;
-    case 4:
-        sub_8126334();
-        sub_81265B4();
-        break;
-    case 5:
-        sub_8126318();
-        sub_81264FC();
-        break;
-    }
-}
-
-static void sub_8126270(void)
-{
-    gUnknown_03006184[0] = RGB2(0, 0, 0);
-    gUnknown_03006184[1] = RGB2(6, 6, 6);
-    gUnknown_03006184[2] = RGB2(29, 29, 29);
-    gUnknown_03006184[3] = RGB2(11, 11, 11);
-    gUnknown_03006184[4] = RGB2(29, 6, 6);
-    gUnknown_03006184[5] = RGB2(6, 29, 6);
-    gUnknown_03006184[6] = RGB2(6, 6, 29);
-    gUnknown_03006184[7] = RGB2(29, 29, 6);
-    gUnknown_03006184[8] = RGB2(29, 6, 29);
-    gUnknown_03006184[9] = RGB2(6, 29, 29);
-    gUnknown_03006184[10] = RGB2(29, 11, 6);
-    gUnknown_03006184[11] = RGB2(11, 29, 6);
-    gUnknown_03006184[12] = RGB2(6, 11, 29);
-    gUnknown_03006184[13] = RGB2(29, 6, 11);
-    gUnknown_03006184[14] = RGB2(6, 29, 11);
-    gUnknown_03006184[15] = RGB2(11, 6, 29);
-}
-
-static void sub_8126318(void)
-{
-    gUnknown_03006184[0] = RGB2(0, 0, 0);
-    gUnknown_03006184[1] = RGB2(0, 0, 0);
-    gUnknown_03006184[2] = RGB2(31, 31, 31);
-}
-
-static void sub_8126334(void)
-{
-    u8 i;
-
-    gUnknown_03006184[0] = RGB2(0, 0, 0);
-    gUnknown_03006184[1] = RGB2(0, 0, 0);
-    for (i = 0; i < 14; i++)
-        gUnknown_03006184[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2));
-}
-
-static void sub_8126370(void)
-{
-    u8 i;
-
-    gUnknown_03006184[0] = RGB2(0, 0, 0);
-    for (i = 0; i < 32; i++)
-        gUnknown_03006184[i + 1] = RGB2(i, i, i);
-}
-
-static void sub_81263A4(bool8 arg0)
-{
-    u8 i, j;
-    u16 maxIndex;
-
-    maxIndex = 0xDF;
-    if (!arg0)
-        maxIndex = 0xFF;
-
-    for (j = 0; j < maxIndex; j++)
-        gUnknown_03006184[j] = 0;
-
-    gUnknown_03006184[maxIndex] = RGB2(15, 15, 15);
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (*pal & 0x8000)
-            {
-                *pal = gUnknown_03006188;
-            }
-            else
-            {
-                u16 color = sub_81267C4(pal);
-                u8 curIndex = 1;
-                if (curIndex < maxIndex)
-                {
-                    if (gUnknown_03006184[curIndex] == RGB_BLACK)
-                    {
-                        gUnknown_03006184[curIndex] = color;
-                        *pal = gUnknown_03006188 + curIndex;
-                    }
-                    else
-                    {
-                        while (curIndex < maxIndex)
-                        {
-                            if (gUnknown_03006184[curIndex] == RGB_BLACK)
-                            {
-                                gUnknown_03006184[curIndex] = color;
-                                *pal = gUnknown_03006188 + curIndex;
-                                break;
-                            }
-
-                            if (gUnknown_03006184[curIndex] == color)
-                            {
-                                *pal = gUnknown_03006188 + curIndex;
-                                break;
-                            }
-
-                            curIndex++;
-                        }
-                    }
-                }
-
-                if (curIndex == maxIndex)
-                {
-                    curIndex = maxIndex;
-                    *pal = curIndex;
-                }
-            }
-        }
-    }
-}
-
-static void sub_81264FC(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (*pal & 0x8000)
-            {
-                *pal = gUnknown_03006188;
-            }
-            else
-            {
-                if (ConvertToBlackOrWhite(pal) == RGB_BLACK)
-                    *pal = gUnknown_03006188 + 1;
-                else
-                    *pal = gUnknown_03006188 + 2;
-            }
-        }
-    }
-}
-
-static void sub_81265B4(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (*pal & 0x8000)
-                *pal = gUnknown_03006188;
-            else
-                *pal = sub_8126908(pal) + gUnknown_03006188;
-        }
-    }
-}
-
-static void sub_8126664(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (*pal & 0x8000)
-                *pal = gUnknown_03006188;
-            else
-                *pal = sub_812693C(pal) + gUnknown_03006188;
-        }
-    }
-}
-
-static void sub_8126714(void)
-{
-    u8 i, j;
-
-    for (i = 0; i < gUnknown_0300616C; i++)
-    {
-        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
-        u16* pal = &var2[gUnknown_03006164];
-        for (j = 0; j < gUnknown_03006174; j++, pal++)
-        {
-            if (*pal & 0x8000)
-                *pal = gUnknown_03006188;
-            else
-                *pal = sub_8126838(pal) + gUnknown_03006188;
-        }
-    }
-}
-
-static u16 sub_81267C4(u16 *color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-
-    if (red & 3)
-        red = (red & 0x1C) + 4;
-    if (green & 3)
-        green = (green & 0x1C) + 4;
-    if (blue & 3)
-        blue = (blue & 0x1C) + 4;
-
-    if (red < 6)
-        red = 6;
-    if (red > 30)
-        red = 30;
-
-    if (green < 6)
-        green = 6;
-    if (green > 30)
-        green = 30;
-
-    if (blue < 6)
-        blue = 6;
-    if (blue > 30)
-        blue = 30;
-
-    return RGB2(red, green, blue);
-}
-
-static u16 sub_8126838(u16* color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-
-    if (red < 12 && green < 11 && blue < 11)
-        return 1;
-
-    if (red > 19 && green > 19 && blue > 19)
-        return 2;
-
-    if (red > 19)
-    {
-        if (green > 19)
-        {
-            if (blue > 14)
-                return 2;
-            else
-                return 7;
-        }
-        else if (blue > 19)
-        {
-            if (green > 14)
-                return 2;
-            else
-                return 8;
-        }
-    }
-
-    if (green > 19 && blue > 19)
-    {
-        if (red > 14)
-            return 2;
-        else
-            return 9;
-    }
-
-    if (red > 19)
-    {
-        if (green > 11)
-        {
-            if (blue > 11)
-            {
-                if (green < blue)
-                    return 8;
-                else
-                    return 7;
-            }
-            else
-            {
-                return 10;
-            }
-        }
-        else if (blue > 11)
-        {
-            return 13;
-        }
-        else
-        {
-            return 4;
-        }
-    }
-
-    if (green > 19)
-    {
-        if (red > 11)
-        {
-            if (blue > 11)
-            {
-                if (red < blue)
-                    return 9;
-                else
-                    return 7;
-            }
-            else
-            {
-                return 11;
-            }
-        }
-        else
-        {
-            if (blue > 11)
-                return 14;
-            else
-                return 5;
-        }
-    }
-
-    if (blue > 19)
-    {
-        if (red > 11)
-        {
-            if (green > 11)
-            {
-                if (red < green)
-                    return 9;
-                else
-                    return 8;
-            }
-        }
-        else if (green > 11)
-        {
-            return 12;
-        }
-
-        if (blue > 11)
-            return 15;
-        else
-            return 6;
-    }
-
-    return 3;
-}
-
-static u16 sub_8126908(u16 *color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-    u16 average = ((red + green + blue) / 3) & 0x1E;
-    if (average == 0)
-        return 1;
-    else
-        return average / 2;
-}
-
-static u16 sub_812693C(u16 *color)
-{
-    u16 red = *color & 0x1F;
-    u16 green = (*color >> 5) & 0x1F;
-    u16 blue = (*color >> 10) & 0x1F;
-    u16 average = (red + green + blue) / 3;
-    return average + 1;
-}
diff --git a/src/credits.c b/src/credits.c
index e2c125d3f..323146f1e 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -128,16 +128,17 @@ enum
     TDE_TASK_A_ID = 2,
 };
 
-struct Unk201C000
-{
-    u16 unk0[71];
-    u16 unk8E;
-    u16 unk90;
-    u16 unk92;
-    u16 unk94;
-    u16 unk96[NATIONAL_DEX_COUNT];
-    u16 unk39A;
-    u16 unk39C[7];
+#define NUM_MON_SLIDES 71
+struct CreditsData
+{
+    u16 monToShow[NUM_MON_SLIDES]; // List of Pokemon species ids that will show during the credits
+    u16 imgCounter; //how many mon images have been shown
+    u16 nextImgPos; //if the next image spawns left/center/right
+    u16 currShownMon; //index into monToShow
+    u16 numMonToShow; //number of pokemon to show, always NUM_MON_SLIDES after determine function
+    u16 caughtMonIds[NATIONAL_DEX_COUNT]; //temporary location to hold a condensed array of all caught pokemon
+    u16 numCaughtMon; //count of filled spaces in caughtMonIds
+    u16 unk39C[7]; // unused padding?
 };
 
 struct CreditsEntry
@@ -151,7 +152,7 @@ static EWRAM_DATA s16 gUnknown_0203BCE0 = 0;
 static EWRAM_DATA u16 gUnknown_0203BCE2 = 0; // TASK A
 EWRAM_DATA bool8 gHasHallOfFameRecords = 0;
 static EWRAM_DATA u8 gUnknown_0203BCE5 = 0;
-static EWRAM_DATA struct Unk201C000 *gUnknown_0203BCE8 = {0};
+static EWRAM_DATA struct CreditsData *sCreditsData = {0};
 
 static const u16 gUnknown_085E56F0[][16] =
 {
@@ -959,7 +960,7 @@ static const struct WindowTemplate sWindowTemplates[] =
     },
     DUMMY_WIN_TEMPLATE,
 };
-static const u8 gUnknown_085E6F7C[][2] =
+static const u8 sMonSpritePos[][2] =
 {
     {104, 36},
     {120, 36},
@@ -1127,8 +1128,8 @@ static void LoadTheEndScreen(u16, u16, u16);
 static void sub_8176E40(u16 arg0, u16 palette);
 static void sub_8176EE8(struct Sprite *sprite);
 static void sub_8176F90(struct Sprite *sprite);
-static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position);
-static void sub_8177388(void);
+static u8 MakeMonSprite(u16 species, s16 x, s16 y, u16 position);
+static void DeterminePokemonToShow(void);
 
 static void CreditsVBlankCallback(void)
 {
@@ -1241,13 +1242,13 @@ void CB2_StartCreditsSequence(void)
     m4aSongNumStart(MUS_THANKFOR);
     SetMainCallback2(CB2_RunCreditsSequence);
     gUnknown_0203BCE5 = 0;
-    gUnknown_0203BCE8 = AllocZeroed(sizeof(struct Unk201C000));
+    sCreditsData = AllocZeroed(sizeof(struct CreditsData));
 
-    sub_8177388();
+    DeterminePokemonToShow();
 
-    gUnknown_0203BCE8->unk8E = 0;
-    gUnknown_0203BCE8->unk90 = 0;
-    gUnknown_0203BCE8->unk92 = 0;
+    sCreditsData->imgCounter = 0;
+    sCreditsData->nextImgPos = 0;
+    sCreditsData->currShownMon = 0;
 
     gUnknown_0203BCE2 = taskIdA;
 }
@@ -1604,7 +1605,7 @@ static void sub_8175DA0(u8 taskIdB)
         gTasks[gTasks[taskIdB].data[TDB_TASK_A_ID]].data[TDA_4] = 1;
         DestroyTask(taskIdB);
         sub_81755A4();
-        FREE_AND_SET_NULL(gUnknown_0203BCE8);
+        FREE_AND_SET_NULL(sCreditsData);
         return;
     }
 }
@@ -1683,29 +1684,29 @@ static void sub_81760FC(u8 taskIdD)
     case 0:
         break;
     case 1:
-        if (gUnknown_0203BCE8->unk90 == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0)
+        if (sCreditsData->nextImgPos == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0)
             break;
         gTasks[taskIdD].data[TDD_STATE]++;
         break;
     case 2:
-        if (gUnknown_0203BCE8->unk8E == 71 || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks)
+        if (sCreditsData->imgCounter == NUM_MON_SLIDES || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks)
             break;
-        r2 = sub_8177224(gUnknown_0203BCE8->unk0[gUnknown_0203BCE8->unk92], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][0], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][1], gUnknown_0203BCE8->unk90);
-        if (gUnknown_0203BCE8->unk92 < gUnknown_0203BCE8->unk94 - 1)
+        r2 = MakeMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon], sMonSpritePos[sCreditsData->nextImgPos][0], sMonSpritePos[sCreditsData->nextImgPos][1], sCreditsData->nextImgPos);
+        if (sCreditsData->currShownMon < sCreditsData->numMonToShow - 1)
         {
-            gUnknown_0203BCE8->unk92++;
+            sCreditsData->currShownMon++;
             gSprites[r2].data[3] = 50;
         }
         else
         {
-            gUnknown_0203BCE8->unk92 = 0;
+            sCreditsData->currShownMon = 0;
             gSprites[r2].data[3] = 512;
         }
-        gUnknown_0203BCE8->unk8E++;
-        if (gUnknown_0203BCE8->unk90 == 2)
-            gUnknown_0203BCE8->unk90 = 0;
+        sCreditsData->imgCounter++;
+        if (sCreditsData->nextImgPos == 2)
+            sCreditsData->nextImgPos = 0;
         else
-            gUnknown_0203BCE8->unk90++;
+            sCreditsData->nextImgPos++;
         gTasks[taskIdD].data[TDD_3] = 50;
         gTasks[taskIdD].data[TDD_STATE]++;
         break;
@@ -2256,7 +2257,7 @@ static void sub_8177050(struct Sprite *sprite)
     }
 }
 
-static u8 sub_8177224(u16 nationalDexNum, s16 x, s16 y, u16 position)
+static u8 MakeMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
 {
     u8 spriteId;
     u8 spriteId2;
@@ -2292,73 +2293,86 @@ static void sub_81772B8(struct Sprite *sprite)
     sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
 }
 
-static void sub_8177388(void)
+static void DeterminePokemonToShow(void)
 {
     u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON)));
     u16 page;
     u16 dexNum;
     u16 j;
-
+    
+    // Go through the Pokedex, and anything that has gotten caught we put into our massive array.
+    // This basically packs all of the caught pokemon into the front of the array
     for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
     {
         if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
         {
-            gUnknown_0203BCE8->unk96[j] = dexNum;
+            sCreditsData->caughtMonIds[j] = dexNum;
             j++;
         }
     }
 
+    // Fill the rest of the array with zeroes
     for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++)
-        gUnknown_0203BCE8->unk96[dexNum] = 0;
+        sCreditsData->caughtMonIds[dexNum] = 0;
 
-    gUnknown_0203BCE8->unk39A = j;
-    if (gUnknown_0203BCE8->unk39A < 71)
-        gUnknown_0203BCE8->unk94 = j;
+    // Cap the number of pokemon we care about to NUM_MON_SLIDES, the max we show in the credits scene (-1 for the starter)
+    sCreditsData->numCaughtMon = j;
+    if (sCreditsData->numCaughtMon < NUM_MON_SLIDES)
+        sCreditsData->numMonToShow = j;
     else
-        gUnknown_0203BCE8->unk94 = 71;
+        sCreditsData->numMonToShow = NUM_MON_SLIDES;
 
+    // Loop through our list of caught pokemon and select randomly from it to fill the images to show
     j = 0;
     do
     {
-        page = Random() % gUnknown_0203BCE8->unk39A;
-        gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk96[page];
-
+        // Select a random mon, insert into array
+        page = Random() % sCreditsData->numCaughtMon;
+        sCreditsData->monToShow[j] = sCreditsData->caughtMonIds[page];
+        
+        // Remove the select mon from the array, and condense array entries
         j++;
-        gUnknown_0203BCE8->unk96[page] = 0;
-        gUnknown_0203BCE8->unk39A--;
-        if (page != gUnknown_0203BCE8->unk39A)
+        sCreditsData->caughtMonIds[page] = 0;
+        sCreditsData->numCaughtMon--;
+        if (page != sCreditsData->numCaughtMon)
         {
-            gUnknown_0203BCE8->unk96[page] = gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A];
-            gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A] = 0;
+            // Instead of looping through and moving everything down, just take from the end. Order doesn't matter after all.
+            sCreditsData->caughtMonIds[page] = sCreditsData->caughtMonIds[sCreditsData->numCaughtMon];
+            sCreditsData->caughtMonIds[sCreditsData->numCaughtMon] = 0;
         }
     }
-    while (gUnknown_0203BCE8->unk39A != 0 && j < 71);
+    while (sCreditsData->numCaughtMon != 0 && j < NUM_MON_SLIDES);
 
-    if (gUnknown_0203BCE8->unk94 < 71)
+    // If we don't have enough pokemon in the dex to fill everything, copy the selected mon into the end of the array, so it loops
+    if (sCreditsData->numMonToShow < NUM_MON_SLIDES)
     {
-        for (j = gUnknown_0203BCE8->unk94, page = 0; j < 71; j++)
+        for (j = sCreditsData->numMonToShow, page = 0; j < NUM_MON_SLIDES; j++)
         {
-            gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk0[page];
+            sCreditsData->monToShow[j] = sCreditsData->monToShow[page];
 
             page++;
-            if (page == gUnknown_0203BCE8->unk94)
+            if (page == sCreditsData->numMonToShow)
                 page = 0;
         }
-        gUnknown_0203BCE8->unk0[70] = starter;
+        // Ensure the last pokemon is our starter
+        sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
     }
     else
     {
-        for (dexNum = 0; gUnknown_0203BCE8->unk0[dexNum] != starter && dexNum < 71; dexNum++);
+        // Check to see if our starter has already appeared in this list, break if it has
+        for (dexNum = 0; sCreditsData->monToShow[dexNum] != starter && dexNum < NUM_MON_SLIDES; dexNum++);
 
-        if (dexNum < gUnknown_0203BCE8->unk94 - 1)
+        // If it has, swap it with the last pokemon, to ensure our starter is the last image
+        if (dexNum < sCreditsData->numMonToShow - 1)
         {
-            gUnknown_0203BCE8->unk0[dexNum] = gUnknown_0203BCE8->unk0[70];
-            gUnknown_0203BCE8->unk0[70] = starter;
+            sCreditsData->monToShow[dexNum] = sCreditsData->monToShow[NUM_MON_SLIDES-1];
+            sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
         }
         else
         {
-            gUnknown_0203BCE8->unk0[70] = starter;
+            // Ensure the last pokemon is our starter
+            sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
         }
     }
-    gUnknown_0203BCE8->unk94 = 71;
+    sCreditsData->numMonToShow = NUM_MON_SLIDES;
 }
diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
new file mode 100644
index 000000000..0fdb87f96
--- /dev/null
+++ b/src/data/battle_frontier/apprentice.h
@@ -0,0 +1,982 @@
+// data/text/apprentice.inc
+extern const u8 gText_ApprenticePleaseTeach0[];
+extern const u8 gText_ApprenticePleaseTeach1[];
+extern const u8 gText_ApprenticePleaseTeach2[];
+extern const u8 gText_ApprenticePleaseTeach3[];
+extern const u8 gText_ApprenticePleaseTeach4[];
+extern const u8 gText_ApprenticePleaseTeach5[];
+extern const u8 gText_ApprenticePleaseTeach6[];
+extern const u8 gText_ApprenticePleaseTeach7[];
+extern const u8 gText_ApprenticePleaseTeach8[];
+extern const u8 gText_ApprenticePleaseTeach9[];
+extern const u8 gText_ApprenticePleaseTeach10[];
+extern const u8 gText_ApprenticePleaseTeach11[];
+extern const u8 gText_ApprenticePleaseTeach12[];
+extern const u8 gText_ApprenticePleaseTeach13[];
+extern const u8 gText_ApprenticePleaseTeach14[];
+extern const u8 gText_ApprenticePleaseTeach15[];
+extern const u8 gText_ApprenticeRejectTeaching0[];
+extern const u8 gText_ApprenticeRejectTeaching1[];
+extern const u8 gText_ApprenticeRejectTeaching2[];
+extern const u8 gText_ApprenticeRejectTeaching3[];
+extern const u8 gText_ApprenticeRejectTeaching4[];
+extern const u8 gText_ApprenticeRejectTeaching5[];
+extern const u8 gText_ApprenticeRejectTeaching6[];
+extern const u8 gText_ApprenticeRejectTeaching7[];
+extern const u8 gText_ApprenticeRejectTeaching8[];
+extern const u8 gText_ApprenticeRejectTeaching9[];
+extern const u8 gText_ApprenticeRejectTeaching10[];
+extern const u8 gText_ApprenticeRejectTeaching11[];
+extern const u8 gText_ApprenticeRejectTeaching12[];
+extern const u8 gText_ApprenticeRejectTeaching13[];
+extern const u8 gText_ApprenticeRejectTeaching14[];
+extern const u8 gText_ApprenticeRejectTeaching15[];
+extern const u8 gText_ApprenticeWhichLevelMode0[];
+extern const u8 gText_ApprenticeWhichLevelMode1[];
+extern const u8 gText_ApprenticeWhichLevelMode2[];
+extern const u8 gText_ApprenticeWhichLevelMode3[];
+extern const u8 gText_ApprenticeWhichLevelMode4[];
+extern const u8 gText_ApprenticeWhichLevelMode5[];
+extern const u8 gText_ApprenticeWhichLevelMode6[];
+extern const u8 gText_ApprenticeWhichLevelMode7[];
+extern const u8 gText_ApprenticeWhichLevelMode8[];
+extern const u8 gText_ApprenticeWhichLevelMode9[];
+extern const u8 gText_ApprenticeWhichLevelMode10[];
+extern const u8 gText_ApprenticeWhichLevelMode11[];
+extern const u8 gText_ApprenticeWhichLevelMode12[];
+extern const u8 gText_ApprenticeWhichLevelMode13[];
+extern const u8 gText_ApprenticeWhichLevelMode14[];
+extern const u8 gText_ApprenticeWhichLevelMode15[];
+extern const u8 gText_ApprenticeLevelModeThanks0[];
+extern const u8 gText_ApprenticeLevelModeThanks1[];
+extern const u8 gText_ApprenticeLevelModeThanks2[];
+extern const u8 gText_ApprenticeLevelModeThanks3[];
+extern const u8 gText_ApprenticeLevelModeThanks4[];
+extern const u8 gText_ApprenticeLevelModeThanks5[];
+extern const u8 gText_ApprenticeLevelModeThanks6[];
+extern const u8 gText_ApprenticeLevelModeThanks7[];
+extern const u8 gText_ApprenticeLevelModeThanks8[];
+extern const u8 gText_ApprenticeLevelModeThanks9[];
+extern const u8 gText_ApprenticeLevelModeThanks10[];
+extern const u8 gText_ApprenticeLevelModeThanks11[];
+extern const u8 gText_ApprenticeLevelModeThanks12[];
+extern const u8 gText_ApprenticeLevelModeThanks13[];
+extern const u8 gText_ApprenticeLevelModeThanks14[];
+extern const u8 gText_ApprenticeLevelModeThanks15[];
+
+extern const u8 gText_ApprenticeWhichMon0[];
+extern const u8 gText_ApprenticeWhichMon1[];
+extern const u8 gText_ApprenticeWhichMon2[];
+extern const u8 gText_ApprenticeWhichMon3[];
+extern const u8 gText_ApprenticeWhichMon4[];
+extern const u8 gText_ApprenticeWhichMon5[];
+extern const u8 gText_ApprenticeWhichMon6[];
+extern const u8 gText_ApprenticeWhichMon7[];
+extern const u8 gText_ApprenticeWhichMon8[];
+extern const u8 gText_ApprenticeWhichMon9[];
+extern const u8 gText_ApprenticeWhichMon10[];
+extern const u8 gText_ApprenticeWhichMon11[];
+extern const u8 gText_ApprenticeWhichMon12[];
+extern const u8 gText_ApprenticeWhichMon13[];
+extern const u8 gText_ApprenticeWhichMon14[];
+extern const u8 gText_ApprenticeWhichMon15[];
+extern const u8 gText_ApprenticeMonThanks0[];
+extern const u8 gText_ApprenticeMonThanks1[];
+extern const u8 gText_ApprenticeMonThanks2[];
+extern const u8 gText_ApprenticeMonThanks3[];
+extern const u8 gText_ApprenticeMonThanks4[];
+extern const u8 gText_ApprenticeMonThanks5[];
+extern const u8 gText_ApprenticeMonThanks6[];
+extern const u8 gText_ApprenticeMonThanks7[];
+extern const u8 gText_ApprenticeMonThanks8[];
+extern const u8 gText_ApprenticeMonThanks9[];
+extern const u8 gText_ApprenticeMonThanks10[];
+extern const u8 gText_ApprenticeMonThanks11[];
+extern const u8 gText_ApprenticeMonThanks12[];
+extern const u8 gText_ApprenticeMonThanks13[];
+extern const u8 gText_ApprenticeMonThanks14[];
+extern const u8 gText_ApprenticeMonThanks15[];
+
+extern const u8 gText_ApprenticeWhatHeldItem0[];
+extern const u8 gText_ApprenticeWhatHeldItem1[];
+extern const u8 gText_ApprenticeWhatHeldItem2[];
+extern const u8 gText_ApprenticeWhatHeldItem3[];
+extern const u8 gText_ApprenticeWhatHeldItem4[];
+extern const u8 gText_ApprenticeWhatHeldItem5[];
+extern const u8 gText_ApprenticeWhatHeldItem6[];
+extern const u8 gText_ApprenticeWhatHeldItem7[];
+extern const u8 gText_ApprenticeWhatHeldItem8[];
+extern const u8 gText_ApprenticeWhatHeldItem9[];
+extern const u8 gText_ApprenticeWhatHeldItem10[];
+extern const u8 gText_ApprenticeWhatHeldItem11[];
+extern const u8 gText_ApprenticeWhatHeldItem12[];
+extern const u8 gText_ApprenticeWhatHeldItem13[];
+extern const u8 gText_ApprenticeWhatHeldItem14[];
+extern const u8 gText_ApprenticeWhatHeldItem15[];
+extern const u8 gText_ApprenticeHoldNothing0[];
+extern const u8 gText_ApprenticeHoldNothing1[];
+extern const u8 gText_ApprenticeHoldNothing2[];
+extern const u8 gText_ApprenticeHoldNothing3[];
+extern const u8 gText_ApprenticeHoldNothing4[];
+extern const u8 gText_ApprenticeHoldNothing5[];
+extern const u8 gText_ApprenticeHoldNothing6[];
+extern const u8 gText_ApprenticeHoldNothing7[];
+extern const u8 gText_ApprenticeHoldNothing8[];
+extern const u8 gText_ApprenticeHoldNothing9[];
+extern const u8 gText_ApprenticeHoldNothing10[];
+extern const u8 gText_ApprenticeHoldNothing11[];
+extern const u8 gText_ApprenticeHoldNothing12[];
+extern const u8 gText_ApprenticeHoldNothing13[];
+extern const u8 gText_ApprenticeHoldNothing14[];
+extern const u8 gText_ApprenticeHoldNothing15[];
+extern const u8 gText_ApprenticeThanksNoHeldItem0[];
+extern const u8 gText_ApprenticeThanksNoHeldItem1[];
+extern const u8 gText_ApprenticeThanksNoHeldItem2[];
+extern const u8 gText_ApprenticeThanksNoHeldItem3[];
+extern const u8 gText_ApprenticeThanksNoHeldItem4[];
+extern const u8 gText_ApprenticeThanksNoHeldItem5[];
+extern const u8 gText_ApprenticeThanksNoHeldItem6[];
+extern const u8 gText_ApprenticeThanksNoHeldItem7[];
+extern const u8 gText_ApprenticeThanksNoHeldItem8[];
+extern const u8 gText_ApprenticeThanksNoHeldItem9[];
+extern const u8 gText_ApprenticeThanksNoHeldItem10[];
+extern const u8 gText_ApprenticeThanksNoHeldItem11[];
+extern const u8 gText_ApprenticeThanksNoHeldItem12[];
+extern const u8 gText_ApprenticeThanksNoHeldItem13[];
+extern const u8 gText_ApprenticeThanksNoHeldItem14[];
+extern const u8 gText_ApprenticeThanksNoHeldItem15[];
+extern const u8 gText_ApprenticeThanksHeldItem0[];
+extern const u8 gText_ApprenticeThanksHeldItem1[];
+extern const u8 gText_ApprenticeThanksHeldItem2[];
+extern const u8 gText_ApprenticeThanksHeldItem3[];
+extern const u8 gText_ApprenticeThanksHeldItem4[];
+extern const u8 gText_ApprenticeThanksHeldItem5[];
+extern const u8 gText_ApprenticeThanksHeldItem6[];
+extern const u8 gText_ApprenticeThanksHeldItem7[];
+extern const u8 gText_ApprenticeThanksHeldItem8[];
+extern const u8 gText_ApprenticeThanksHeldItem9[];
+extern const u8 gText_ApprenticeThanksHeldItem10[];
+extern const u8 gText_ApprenticeThanksHeldItem11[];
+extern const u8 gText_ApprenticeThanksHeldItem12[];
+extern const u8 gText_ApprenticeThanksHeldItem13[];
+extern const u8 gText_ApprenticeThanksHeldItem14[];
+extern const u8 gText_ApprenticeThanksHeldItem15[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended0[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended1[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended2[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended3[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended4[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended5[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended6[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended7[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended8[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended9[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended10[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended11[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended12[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended13[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended14[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended15[];
+
+extern const u8 gText_ApprenticeWhichMove0[];
+extern const u8 gText_ApprenticeWhichMove1[];
+extern const u8 gText_ApprenticeWhichMove2[];
+extern const u8 gText_ApprenticeWhichMove3[];
+extern const u8 gText_ApprenticeWhichMove4[];
+extern const u8 gText_ApprenticeWhichMove5[];
+extern const u8 gText_ApprenticeWhichMove6[];
+extern const u8 gText_ApprenticeWhichMove7[];
+extern const u8 gText_ApprenticeWhichMove8[];
+extern const u8 gText_ApprenticeWhichMove9[];
+extern const u8 gText_ApprenticeWhichMove10[];
+extern const u8 gText_ApprenticeWhichMove11[];
+extern const u8 gText_ApprenticeWhichMove12[];
+extern const u8 gText_ApprenticeWhichMove13[];
+extern const u8 gText_ApprenticeWhichMove14[];
+extern const u8 gText_ApprenticeWhichMove15[];
+extern const u8 gText_ApprenticeMoveThanks0[];
+extern const u8 gText_ApprenticeMoveThanks1[];
+extern const u8 gText_ApprenticeMoveThanks2[];
+extern const u8 gText_ApprenticeMoveThanks3[];
+extern const u8 gText_ApprenticeMoveThanks4[];
+extern const u8 gText_ApprenticeMoveThanks5[];
+extern const u8 gText_ApprenticeMoveThanks6[];
+extern const u8 gText_ApprenticeMoveThanks7[];
+extern const u8 gText_ApprenticeMoveThanks8[];
+extern const u8 gText_ApprenticeMoveThanks9[];
+extern const u8 gText_ApprenticeMoveThanks10[];
+extern const u8 gText_ApprenticeMoveThanks11[];
+extern const u8 gText_ApprenticeMoveThanks12[];
+extern const u8 gText_ApprenticeMoveThanks13[];
+extern const u8 gText_ApprenticeMoveThanks14[];
+extern const u8 gText_ApprenticeMoveThanks15[];
+
+extern const u8 gText_ApprenticeWhichMonFirst0[];
+extern const u8 gText_ApprenticeWhichMonFirst1[];
+extern const u8 gText_ApprenticeWhichMonFirst2[];
+extern const u8 gText_ApprenticeWhichMonFirst3[];
+extern const u8 gText_ApprenticeWhichMonFirst4[];
+extern const u8 gText_ApprenticeWhichMonFirst5[];
+extern const u8 gText_ApprenticeWhichMonFirst6[];
+extern const u8 gText_ApprenticeWhichMonFirst7[];
+extern const u8 gText_ApprenticeWhichMonFirst8[];
+extern const u8 gText_ApprenticeWhichMonFirst9[];
+extern const u8 gText_ApprenticeWhichMonFirst10[];
+extern const u8 gText_ApprenticeWhichMonFirst11[];
+extern const u8 gText_ApprenticeWhichMonFirst12[];
+extern const u8 gText_ApprenticeWhichMonFirst13[];
+extern const u8 gText_ApprenticeWhichMonFirst14[];
+extern const u8 gText_ApprenticeWhichMonFirst15[];
+extern const u8 gText_ApprenticeMonFirstThanks0[];
+extern const u8 gText_ApprenticeMonFirstThanks1[];
+extern const u8 gText_ApprenticeMonFirstThanks2[];
+extern const u8 gText_ApprenticeMonFirstThanks3[];
+extern const u8 gText_ApprenticeMonFirstThanks4[];
+extern const u8 gText_ApprenticeMonFirstThanks5[];
+extern const u8 gText_ApprenticeMonFirstThanks6[];
+extern const u8 gText_ApprenticeMonFirstThanks7[];
+extern const u8 gText_ApprenticeMonFirstThanks8[];
+extern const u8 gText_ApprenticeMonFirstThanks9[];
+extern const u8 gText_ApprenticeMonFirstThanks10[];
+extern const u8 gText_ApprenticeMonFirstThanks11[];
+extern const u8 gText_ApprenticeMonFirstThanks12[];
+extern const u8 gText_ApprenticeMonFirstThanks13[];
+extern const u8 gText_ApprenticeMonFirstThanks14[];
+extern const u8 gText_ApprenticeMonFirstThanks15[];
+
+extern const u8 gText_ApprenticePickWinSpeech0[];
+extern const u8 gText_ApprenticePickWinSpeech1[];
+extern const u8 gText_ApprenticePickWinSpeech2[];
+extern const u8 gText_ApprenticePickWinSpeech3[];
+extern const u8 gText_ApprenticePickWinSpeech4[];
+extern const u8 gText_ApprenticePickWinSpeech5[];
+extern const u8 gText_ApprenticePickWinSpeech6[];
+extern const u8 gText_ApprenticePickWinSpeech7[];
+extern const u8 gText_ApprenticePickWinSpeech8[];
+extern const u8 gText_ApprenticePickWinSpeech9[];
+extern const u8 gText_ApprenticePickWinSpeech10[];
+extern const u8 gText_ApprenticePickWinSpeech11[];
+extern const u8 gText_ApprenticePickWinSpeech12[];
+extern const u8 gText_ApprenticePickWinSpeech13[];
+extern const u8 gText_ApprenticePickWinSpeech14[];
+extern const u8 gText_ApprenticePickWinSpeech15[];
+extern const u8 gText_ApprenticeWinSpeechThanks0[];
+extern const u8 gText_ApprenticeWinSpeechThanks1[];
+extern const u8 gText_ApprenticeWinSpeechThanks2[];
+extern const u8 gText_ApprenticeWinSpeechThanks3[];
+extern const u8 gText_ApprenticeWinSpeechThanks4[];
+extern const u8 gText_ApprenticeWinSpeechThanks5[];
+extern const u8 gText_ApprenticeWinSpeechThanks6[];
+extern const u8 gText_ApprenticeWinSpeechThanks7[];
+extern const u8 gText_ApprenticeWinSpeechThanks8[];
+extern const u8 gText_ApprenticeWinSpeechThanks9[];
+extern const u8 gText_ApprenticeWinSpeechThanks10[];
+extern const u8 gText_ApprenticeWinSpeechThanks11[];
+extern const u8 gText_ApprenticeWinSpeechThanks12[];
+extern const u8 gText_ApprenticeWinSpeechThanks13[];
+extern const u8 gText_ApprenticeWinSpeechThanks14[];
+extern const u8 gText_ApprenticeWinSpeechThanks15[];
+
+extern const u8 gText_ApprenticeChallenge0[];
+extern const u8 gText_ApprenticeChallenge1[];
+extern const u8 gText_ApprenticeChallenge2[];
+extern const u8 gText_ApprenticeChallenge3[];
+extern const u8 gText_ApprenticeChallenge4[];
+extern const u8 gText_ApprenticeChallenge5[];
+extern const u8 gText_ApprenticeChallenge6[];
+extern const u8 gText_ApprenticeChallenge7[];
+extern const u8 gText_ApprenticeChallenge8[];
+extern const u8 gText_ApprenticeChallenge9[];
+extern const u8 gText_ApprenticeChallenge10[];
+extern const u8 gText_ApprenticeChallenge11[];
+extern const u8 gText_ApprenticeChallenge12[];
+extern const u8 gText_ApprenticeChallenge13[];
+extern const u8 gText_ApprenticeChallenge14[];
+extern const u8 gText_ApprenticeChallenge15[];
+
+const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
+{
+    {
+        .name = {_("サダヒロ"), _("ALANN"), _("ALAIN"), _("ADELFO"), _("CLAUS"), _("TEO")},
+        .otId = 0xBDC9,
+        .facilityClass = FACILITY_CLASS_BUG_CATCHER,
+        .species = {SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT},
+        .id = 0,
+        .speechLost = {EC_WORD_NO, EC_WORD_MISTAKE, EC_WORD_EXCL, EC_WORD_I, EC_WORD_LOST, EC_WORD_BADLY},
+    },
+    {
+        .name = {_("ヒロオ"), _("LIONEL"), _("LIONEL"), _("CAIO"), _("LUDWIG"), _("LEO")},
+        .otId = 0xCF09,
+        .facilityClass = FACILITY_CLASS_YOUNGSTER,
+        .species = {SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH},
+        .id = 1,
+        .speechLost = {EC_WORD_OKAY, EC_WORD_I, EC_WORD_LOST, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MASTER},
+    },
+    {
+        .name = {_("ケイジ"), _("SONNY"), _("HERVE"), _("FEDRO"), _("WENZEL"), _("SANTI")},
+        .otId = 0x2E34,
+        .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
+        .species = {SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP},
+        .id = 2,
+        .speechLost = {EC_WORD_I, EC_WORD_WENT, EC_WORD_AND, EC_WORD_LOST, EC_WORD_AWW, EC_WORD_ELLIPSIS},
+    },
+    {
+        .name = {_("ユラ"), _("LAYLA"), _("LAYLA"), _("ASTRID"), _("SONJA"), _("LOLA")},
+        .otId = 0x84EF,
+        .facilityClass = FACILITY_CLASS_LASS,
+        .species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA},
+        .id = 3,
+        .speechLost = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES, 0xFFFF},
+    },
+    {
+        .name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")},
+        .otId = 0x1E43,
+        .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
+        .species = {SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY},
+        .id = 4,
+        .speechLost = {EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_NEXT, EC_WORD_TIME},
+    },
+    {
+        .name = {_("ヤスシ"), _("DONTE"), _("BRAHIM"), _("GLAUCO"), _("JOSEF"), _("ROQUE")},
+        .otId = 0x379F,
+        .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA},
+        .id = 5,
+        .speechLost = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN, EC_WORD_BYE_BYE, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("ミサオ"), _("AMIRA"), _("LAURE"), _("DAFNE"), _("AMELIE"), _("LARA")},
+        .otId = 0xF555,
+        .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO},
+        .id = 6,
+        .speechLost = {EC_WORD_AHAHA, EC_WORD_DEFEATED, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_NOTHING, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("カズサ"), _("KALI"), _("JODIE"), _("ILENIA"), _("KARO"), _("ELSA")},
+        .otId = 0x8D26,
+        .facilityClass = FACILITY_CLASS_BEAUTY,
+        .species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC},
+        .id = 7,
+        .speechLost = {EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
+    },
+    {
+        .name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")},
+        .otId = 0x800C,
+        .facilityClass = FACILITY_CLASS_AROMA_LADY,
+        .species = {SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY},
+        .id = 8,
+        .speechLost = {EC_WORD_WHAT, EC_WORD_TOUGH, EC_WORD_POKEMON, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("アキノリ"), _("DILLEN"), _("RENE"), _("INDRO"), _("DETLEF"), _("PEDRO")},
+        .otId = 0x469f,
+        .facilityClass = FACILITY_CLASS_HIKER,
+        .species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON},
+        .id = 9,
+        .speechLost = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_JUST, EC_WORD_SHREDDED, EC_WORD_ELLIPSIS, 0xFFFF},
+    },
+    {
+        .name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")},
+        .otId = 0x71FC,
+        .facilityClass = FACILITY_CLASS_FISHERMAN,
+        .species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA},
+        .id = 10,
+        .speechLost = {EC_WORD_YOUR, EC_WORD_WIN, EC_WORD_ANGERS, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
+    },
+    {
+        .name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")},
+        .otId = 0xA39E,
+        .facilityClass = FACILITY_CLASS_SAILOR,
+        .species = {SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE},
+        .id = 11,
+        .speechLost = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DEEP, EC_WORD_OK_QUES},
+    },
+    {
+        .name = {_("リュウジ"), _("LAMONT"), _("XAV"), _("ORFEO"), _("JÜRGEN"), _("JORGE")},
+        .otId = 0xE590,
+        .facilityClass = FACILITY_CLASS_GUITARIST,
+        .species = {SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING},
+        .id = 12,
+        .speechLost = {EC_WORD_A, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_THIS, EC_WORD_IS},
+    },
+    {
+        .name = {_("カツアキ"), _("TYRESE"), _("ANDY"), _("PARIDE"), _("DAVID"), _("CHICHO")},
+        .otId = 0xD018,
+        .facilityClass = FACILITY_CLASS_BLACK_BELT,
+        .species = {SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING},
+        .id = 13,
+        .speechLost = {EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_AND, EC_WORD_LOW, EC_WORD_OF, EC_WORD_POWER},
+    },
+    {
+        .name = {_("トシミツ"), _("DANTE"), _("DANTE"), _("RAOUL"), _("LOTHAR"), _("PABLO")},
+        .otId = 0xBC75,
+        .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
+        .species = {SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM},
+        .id = 14,
+        .speechLost = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_UNDERSTAND, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_HAPPENING},
+    },
+    {
+        .name = {_("ローウェン"), _("ARTURO"), _("ARTURO"), _("ROMOLO"), _("BRIAN"), _("ARTURO")},
+        .otId = 0xFA02,
+        .facilityClass = FACILITY_CLASS_GENTLEMAN,
+        .species = {SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS},
+        .id = 15,
+        .speechLost = {EC_WORD_THIS, EC_WORD_HAS, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_LIE},
+    },
+};
+
+// Sequence of 4 messages for the first meeting with the apprentice
+static const u8 *const sApprenticeFirstMeetingTexts[NUM_APPRENTICES][4] =
+{
+    {gText_ApprenticePleaseTeach0,  gText_ApprenticeRejectTeaching0,  gText_ApprenticeWhichLevelMode0,  gText_ApprenticeLevelModeThanks0},
+    {gText_ApprenticePleaseTeach1,  gText_ApprenticeRejectTeaching1,  gText_ApprenticeWhichLevelMode1,  gText_ApprenticeLevelModeThanks1},
+    {gText_ApprenticePleaseTeach2,  gText_ApprenticeRejectTeaching2,  gText_ApprenticeWhichLevelMode2,  gText_ApprenticeLevelModeThanks2},
+    {gText_ApprenticePleaseTeach3,  gText_ApprenticeRejectTeaching3,  gText_ApprenticeWhichLevelMode3,  gText_ApprenticeLevelModeThanks3},
+    {gText_ApprenticePleaseTeach4,  gText_ApprenticeRejectTeaching4,  gText_ApprenticeWhichLevelMode4,  gText_ApprenticeLevelModeThanks4},
+    {gText_ApprenticePleaseTeach5,  gText_ApprenticeRejectTeaching5,  gText_ApprenticeWhichLevelMode5,  gText_ApprenticeLevelModeThanks5},
+    {gText_ApprenticePleaseTeach6,  gText_ApprenticeRejectTeaching6,  gText_ApprenticeWhichLevelMode6,  gText_ApprenticeLevelModeThanks6},
+    {gText_ApprenticePleaseTeach7,  gText_ApprenticeRejectTeaching7,  gText_ApprenticeWhichLevelMode7,  gText_ApprenticeLevelModeThanks7},
+    {gText_ApprenticePleaseTeach8,  gText_ApprenticeRejectTeaching8,  gText_ApprenticeWhichLevelMode8,  gText_ApprenticeLevelModeThanks8},
+    {gText_ApprenticePleaseTeach9,  gText_ApprenticeRejectTeaching9,  gText_ApprenticeWhichLevelMode9,  gText_ApprenticeLevelModeThanks9},
+    {gText_ApprenticePleaseTeach10, gText_ApprenticeRejectTeaching10, gText_ApprenticeWhichLevelMode10, gText_ApprenticeLevelModeThanks10},
+    {gText_ApprenticePleaseTeach11, gText_ApprenticeRejectTeaching11, gText_ApprenticeWhichLevelMode11, gText_ApprenticeLevelModeThanks11},
+    {gText_ApprenticePleaseTeach12, gText_ApprenticeRejectTeaching12, gText_ApprenticeWhichLevelMode12, gText_ApprenticeLevelModeThanks12},
+    {gText_ApprenticePleaseTeach13, gText_ApprenticeRejectTeaching13, gText_ApprenticeWhichLevelMode13, gText_ApprenticeLevelModeThanks13},
+    {gText_ApprenticePleaseTeach14, gText_ApprenticeRejectTeaching14, gText_ApprenticeWhichLevelMode14, gText_ApprenticeLevelModeThanks14},
+    {gText_ApprenticePleaseTeach15, gText_ApprenticeRejectTeaching15, gText_ApprenticeWhichLevelMode15, gText_ApprenticeLevelModeThanks15},
+};
+
+static const u8 *const sApprenticeWhichMonTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMon0,  gText_ApprenticeMonThanks0},
+    {gText_ApprenticeWhichMon1,  gText_ApprenticeMonThanks1},
+    {gText_ApprenticeWhichMon2,  gText_ApprenticeMonThanks2},
+    {gText_ApprenticeWhichMon3,  gText_ApprenticeMonThanks3},
+    {gText_ApprenticeWhichMon4,  gText_ApprenticeMonThanks4},
+    {gText_ApprenticeWhichMon5,  gText_ApprenticeMonThanks5},
+    {gText_ApprenticeWhichMon6,  gText_ApprenticeMonThanks6},
+    {gText_ApprenticeWhichMon7,  gText_ApprenticeMonThanks7},
+    {gText_ApprenticeWhichMon8,  gText_ApprenticeMonThanks8},
+    {gText_ApprenticeWhichMon9,  gText_ApprenticeMonThanks9},
+    {gText_ApprenticeWhichMon10, gText_ApprenticeMonThanks10},
+    {gText_ApprenticeWhichMon11, gText_ApprenticeMonThanks11},
+    {gText_ApprenticeWhichMon12, gText_ApprenticeMonThanks12},
+    {gText_ApprenticeWhichMon13, gText_ApprenticeMonThanks13},
+    {gText_ApprenticeWhichMon14, gText_ApprenticeMonThanks14},
+    {gText_ApprenticeWhichMon15, gText_ApprenticeMonThanks15},
+};
+
+// Sequence of 5 messages for suggesting a held item to the apprentice
+static const u8 *const sApprenticeHeldItemTexts[NUM_APPRENTICES][5] =
+{
+    {gText_ApprenticeWhatHeldItem0,  gText_ApprenticeHoldNothing0,  gText_ApprenticeThanksNoHeldItem0,  gText_ApprenticeThanksHeldItem0,  gText_ApprenticeItemAlreadyRecommended0},
+    {gText_ApprenticeWhatHeldItem1,  gText_ApprenticeHoldNothing1,  gText_ApprenticeThanksNoHeldItem1,  gText_ApprenticeThanksHeldItem1,  gText_ApprenticeItemAlreadyRecommended1},
+    {gText_ApprenticeWhatHeldItem2,  gText_ApprenticeHoldNothing2,  gText_ApprenticeThanksNoHeldItem2,  gText_ApprenticeThanksHeldItem2,  gText_ApprenticeItemAlreadyRecommended2},
+    {gText_ApprenticeWhatHeldItem3,  gText_ApprenticeHoldNothing3,  gText_ApprenticeThanksNoHeldItem3,  gText_ApprenticeThanksHeldItem3,  gText_ApprenticeItemAlreadyRecommended3},
+    {gText_ApprenticeWhatHeldItem4,  gText_ApprenticeHoldNothing4,  gText_ApprenticeThanksNoHeldItem4,  gText_ApprenticeThanksHeldItem4,  gText_ApprenticeItemAlreadyRecommended4},
+    {gText_ApprenticeWhatHeldItem5,  gText_ApprenticeHoldNothing5,  gText_ApprenticeThanksNoHeldItem5,  gText_ApprenticeThanksHeldItem5,  gText_ApprenticeItemAlreadyRecommended5},
+    {gText_ApprenticeWhatHeldItem6,  gText_ApprenticeHoldNothing6,  gText_ApprenticeThanksNoHeldItem6,  gText_ApprenticeThanksHeldItem6,  gText_ApprenticeItemAlreadyRecommended6},
+    {gText_ApprenticeWhatHeldItem7,  gText_ApprenticeHoldNothing7,  gText_ApprenticeThanksNoHeldItem7,  gText_ApprenticeThanksHeldItem7,  gText_ApprenticeItemAlreadyRecommended7},
+    {gText_ApprenticeWhatHeldItem8,  gText_ApprenticeHoldNothing8,  gText_ApprenticeThanksNoHeldItem8,  gText_ApprenticeThanksHeldItem8,  gText_ApprenticeItemAlreadyRecommended8},
+    {gText_ApprenticeWhatHeldItem9,  gText_ApprenticeHoldNothing9,  gText_ApprenticeThanksNoHeldItem9,  gText_ApprenticeThanksHeldItem9,  gText_ApprenticeItemAlreadyRecommended9},
+    {gText_ApprenticeWhatHeldItem10, gText_ApprenticeHoldNothing10, gText_ApprenticeThanksNoHeldItem10, gText_ApprenticeThanksHeldItem10, gText_ApprenticeItemAlreadyRecommended10},
+    {gText_ApprenticeWhatHeldItem11, gText_ApprenticeHoldNothing11, gText_ApprenticeThanksNoHeldItem11, gText_ApprenticeThanksHeldItem11, gText_ApprenticeItemAlreadyRecommended11},
+    {gText_ApprenticeWhatHeldItem12, gText_ApprenticeHoldNothing12, gText_ApprenticeThanksNoHeldItem12, gText_ApprenticeThanksHeldItem12, gText_ApprenticeItemAlreadyRecommended12},
+    {gText_ApprenticeWhatHeldItem13, gText_ApprenticeHoldNothing13, gText_ApprenticeThanksNoHeldItem13, gText_ApprenticeThanksHeldItem13, gText_ApprenticeItemAlreadyRecommended13},
+    {gText_ApprenticeWhatHeldItem14, gText_ApprenticeHoldNothing14, gText_ApprenticeThanksNoHeldItem14, gText_ApprenticeThanksHeldItem14, gText_ApprenticeItemAlreadyRecommended14},
+    {gText_ApprenticeWhatHeldItem15, gText_ApprenticeHoldNothing15, gText_ApprenticeThanksNoHeldItem15, gText_ApprenticeThanksHeldItem15, gText_ApprenticeItemAlreadyRecommended15},
+};
+
+static const u8 *const sApprenticeWhichMoveTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMove0,  gText_ApprenticeMoveThanks0},
+    {gText_ApprenticeWhichMove1,  gText_ApprenticeMoveThanks1},
+    {gText_ApprenticeWhichMove2,  gText_ApprenticeMoveThanks2},
+    {gText_ApprenticeWhichMove3,  gText_ApprenticeMoveThanks3},
+    {gText_ApprenticeWhichMove4,  gText_ApprenticeMoveThanks4},
+    {gText_ApprenticeWhichMove5,  gText_ApprenticeMoveThanks5},
+    {gText_ApprenticeWhichMove6,  gText_ApprenticeMoveThanks6},
+    {gText_ApprenticeWhichMove7,  gText_ApprenticeMoveThanks7},
+    {gText_ApprenticeWhichMove8,  gText_ApprenticeMoveThanks8},
+    {gText_ApprenticeWhichMove9,  gText_ApprenticeMoveThanks9},
+    {gText_ApprenticeWhichMove10, gText_ApprenticeMoveThanks10},
+    {gText_ApprenticeWhichMove11, gText_ApprenticeMoveThanks11},
+    {gText_ApprenticeWhichMove12, gText_ApprenticeMoveThanks12},
+    {gText_ApprenticeWhichMove13, gText_ApprenticeMoveThanks13},
+    {gText_ApprenticeWhichMove14, gText_ApprenticeMoveThanks14},
+    {gText_ApprenticeWhichMove15, gText_ApprenticeMoveThanks15},
+};
+
+static const u8 *const sApprenticeWhichMonFirstTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMonFirst0,  gText_ApprenticeMonFirstThanks0},
+    {gText_ApprenticeWhichMonFirst1,  gText_ApprenticeMonFirstThanks1},
+    {gText_ApprenticeWhichMonFirst2,  gText_ApprenticeMonFirstThanks2},
+    {gText_ApprenticeWhichMonFirst3,  gText_ApprenticeMonFirstThanks3},
+    {gText_ApprenticeWhichMonFirst4,  gText_ApprenticeMonFirstThanks4},
+    {gText_ApprenticeWhichMonFirst5,  gText_ApprenticeMonFirstThanks5},
+    {gText_ApprenticeWhichMonFirst6,  gText_ApprenticeMonFirstThanks6},
+    {gText_ApprenticeWhichMonFirst7,  gText_ApprenticeMonFirstThanks7},
+    {gText_ApprenticeWhichMonFirst8,  gText_ApprenticeMonFirstThanks8},
+    {gText_ApprenticeWhichMonFirst9,  gText_ApprenticeMonFirstThanks9},
+    {gText_ApprenticeWhichMonFirst10, gText_ApprenticeMonFirstThanks10},
+    {gText_ApprenticeWhichMonFirst11, gText_ApprenticeMonFirstThanks11},
+    {gText_ApprenticeWhichMonFirst12, gText_ApprenticeMonFirstThanks12},
+    {gText_ApprenticeWhichMonFirst13, gText_ApprenticeMonFirstThanks13},
+    {gText_ApprenticeWhichMonFirst14, gText_ApprenticeMonFirstThanks14},
+    {gText_ApprenticeWhichMonFirst15, gText_ApprenticeMonFirstThanks15},
+};
+
+static const u8 *const sApprenticePickWinSpeechTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticePickWinSpeech0,  gText_ApprenticeWinSpeechThanks0},
+    {gText_ApprenticePickWinSpeech1,  gText_ApprenticeWinSpeechThanks1},
+    {gText_ApprenticePickWinSpeech2,  gText_ApprenticeWinSpeechThanks2},
+    {gText_ApprenticePickWinSpeech3,  gText_ApprenticeWinSpeechThanks3},
+    {gText_ApprenticePickWinSpeech4,  gText_ApprenticeWinSpeechThanks4},
+    {gText_ApprenticePickWinSpeech5,  gText_ApprenticeWinSpeechThanks5},
+    {gText_ApprenticePickWinSpeech6,  gText_ApprenticeWinSpeechThanks6},
+    {gText_ApprenticePickWinSpeech7,  gText_ApprenticeWinSpeechThanks7},
+    {gText_ApprenticePickWinSpeech8,  gText_ApprenticeWinSpeechThanks8},
+    {gText_ApprenticePickWinSpeech9,  gText_ApprenticeWinSpeechThanks9},
+    {gText_ApprenticePickWinSpeech10, gText_ApprenticeWinSpeechThanks10},
+    {gText_ApprenticePickWinSpeech11, gText_ApprenticeWinSpeechThanks11},
+    {gText_ApprenticePickWinSpeech12, gText_ApprenticeWinSpeechThanks12},
+    {gText_ApprenticePickWinSpeech13, gText_ApprenticeWinSpeechThanks13},
+    {gText_ApprenticePickWinSpeech14, gText_ApprenticeWinSpeechThanks14},
+    {gText_ApprenticePickWinSpeech15, gText_ApprenticeWinSpeechThanks15},
+};
+
+static const u8 *const sApprenticeChallengeTexts[NUM_APPRENTICES] =
+{
+    gText_ApprenticeChallenge0,
+    gText_ApprenticeChallenge1,
+    gText_ApprenticeChallenge2,
+    gText_ApprenticeChallenge3,
+    gText_ApprenticeChallenge4,
+    gText_ApprenticeChallenge5,
+    gText_ApprenticeChallenge6,
+    gText_ApprenticeChallenge7,
+    gText_ApprenticeChallenge8,
+    gText_ApprenticeChallenge9,
+    gText_ApprenticeChallenge10,
+    gText_ApprenticeChallenge11,
+    gText_ApprenticeChallenge12,
+    gText_ApprenticeChallenge13,
+    gText_ApprenticeChallenge14,
+    gText_ApprenticeChallenge15,
+};
+
+// Unclear what the criteria are for valid moves
+// Notably, a large percentage of multi-strike moves are not valid
+static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
+{
+    [MOVE_NONE] = FALSE,
+    [MOVE_POUND] = FALSE,
+    [MOVE_KARATE_CHOP] = TRUE,
+    [MOVE_DOUBLE_SLAP] = TRUE,
+    [MOVE_COMET_PUNCH] = FALSE,
+    [MOVE_MEGA_PUNCH] = TRUE,
+    [MOVE_PAY_DAY] = FALSE,
+    [MOVE_FIRE_PUNCH] = TRUE,
+    [MOVE_ICE_PUNCH] = TRUE,
+    [MOVE_THUNDER_PUNCH] = TRUE,
+    [MOVE_SCRATCH] = FALSE,
+    [MOVE_VICE_GRIP] = FALSE,
+    [MOVE_GUILLOTINE] = TRUE,
+    [MOVE_RAZOR_WIND] = FALSE,
+    [MOVE_SWORDS_DANCE] = TRUE,
+    [MOVE_CUT] = FALSE,
+    [MOVE_GUST] = FALSE,
+    [MOVE_WING_ATTACK] = FALSE,
+    [MOVE_WHIRLWIND] = TRUE,
+    [MOVE_FLY] = TRUE,
+    [MOVE_BIND] = TRUE,
+    [MOVE_SLAM] = TRUE,
+    [MOVE_VINE_WHIP] = FALSE,
+    [MOVE_STOMP] = TRUE,
+    [MOVE_DOUBLE_KICK] = TRUE,
+    [MOVE_MEGA_KICK] = TRUE,
+    [MOVE_JUMP_KICK] = TRUE,
+    [MOVE_ROLLING_KICK] = TRUE,
+    [MOVE_SAND_ATTACK] = TRUE,
+    [MOVE_HEADBUTT] = TRUE,
+    [MOVE_HORN_ATTACK] = FALSE,
+    [MOVE_FURY_ATTACK] = FALSE,
+    [MOVE_HORN_DRILL] = TRUE,
+    [MOVE_TACKLE] = FALSE,
+    [MOVE_BODY_SLAM] = TRUE,
+    [MOVE_WRAP] = TRUE,
+    [MOVE_TAKE_DOWN] = TRUE,
+    [MOVE_THRASH] = TRUE,
+    [MOVE_DOUBLE_EDGE] = TRUE,
+    [MOVE_TAIL_WHIP] = FALSE,
+    [MOVE_POISON_STING] = FALSE,
+    [MOVE_TWINEEDLE] = TRUE,
+    [MOVE_PIN_MISSILE] = FALSE,
+    [MOVE_LEER] = FALSE,
+    [MOVE_BITE] = TRUE,
+    [MOVE_GROWL] = FALSE,
+    [MOVE_ROAR] = TRUE,
+    [MOVE_SING] = TRUE,
+    [MOVE_SUPERSONIC] = TRUE,
+    [MOVE_SONIC_BOOM] = TRUE,
+    [MOVE_DISABLE] = TRUE,
+    [MOVE_ACID] = FALSE,
+    [MOVE_EMBER] = FALSE,
+    [MOVE_FLAMETHROWER] = TRUE,
+    [MOVE_MIST] = TRUE,
+    [MOVE_WATER_GUN] = FALSE,
+    [MOVE_HYDRO_PUMP] = TRUE,
+    [MOVE_SURF] = TRUE,
+    [MOVE_ICE_BEAM] = TRUE,
+    [MOVE_BLIZZARD] = TRUE,
+    [MOVE_PSYBEAM] = TRUE,
+    [MOVE_BUBBLE_BEAM] = FALSE,
+    [MOVE_AURORA_BEAM] = FALSE,
+    [MOVE_HYPER_BEAM] = TRUE,
+    [MOVE_PECK] = FALSE,
+    [MOVE_DRILL_PECK] = TRUE,
+    [MOVE_SUBMISSION] = TRUE,
+    [MOVE_LOW_KICK] = TRUE,
+    [MOVE_COUNTER] = TRUE,
+    [MOVE_SEISMIC_TOSS] = TRUE,
+    [MOVE_STRENGTH] = TRUE,
+    [MOVE_ABSORB] = FALSE,
+    [MOVE_MEGA_DRAIN] = FALSE,
+    [MOVE_LEECH_SEED] = TRUE,
+    [MOVE_GROWTH] = TRUE,
+    [MOVE_RAZOR_LEAF] = TRUE,
+    [MOVE_SOLAR_BEAM] = TRUE,
+    [MOVE_POISON_POWDER] = TRUE,
+    [MOVE_STUN_SPORE] = TRUE,
+    [MOVE_SLEEP_POWDER] = TRUE,
+    [MOVE_PETAL_DANCE] = TRUE,
+    [MOVE_STRING_SHOT] = FALSE,
+    [MOVE_DRAGON_RAGE] = TRUE,
+    [MOVE_FIRE_SPIN] = TRUE,
+    [MOVE_THUNDER_SHOCK] = FALSE,
+    [MOVE_THUNDERBOLT] = TRUE,
+    [MOVE_THUNDER_WAVE] = TRUE,
+    [MOVE_THUNDER] = TRUE,
+    [MOVE_ROCK_THROW] = FALSE,
+    [MOVE_EARTHQUAKE] = TRUE,
+    [MOVE_FISSURE] = TRUE,
+    [MOVE_DIG] = TRUE,
+    [MOVE_TOXIC] = TRUE,
+    [MOVE_CONFUSION] = FALSE,
+    [MOVE_PSYCHIC] = TRUE,
+    [MOVE_HYPNOSIS] = TRUE,
+    [MOVE_MEDITATE] = TRUE,
+    [MOVE_AGILITY] = TRUE,
+    [MOVE_QUICK_ATTACK] = TRUE,
+    [MOVE_RAGE] = FALSE,
+    [MOVE_TELEPORT] = FALSE,
+    [MOVE_NIGHT_SHADE] = TRUE,
+    [MOVE_MIMIC] = TRUE,
+    [MOVE_SCREECH] = TRUE,
+    [MOVE_DOUBLE_TEAM] = TRUE,
+    [MOVE_RECOVER] = TRUE,
+    [MOVE_HARDEN] = TRUE,
+    [MOVE_MINIMIZE] = TRUE,
+    [MOVE_SMOKESCREEN] = TRUE,
+    [MOVE_CONFUSE_RAY] = TRUE,
+    [MOVE_WITHDRAW] = TRUE,
+    [MOVE_DEFENSE_CURL] = TRUE,
+    [MOVE_BARRIER] = TRUE,
+    [MOVE_LIGHT_SCREEN] = TRUE,
+    [MOVE_HAZE] = TRUE,
+    [MOVE_REFLECT] = TRUE,
+    [MOVE_FOCUS_ENERGY] = TRUE,
+    [MOVE_BIDE] = FALSE,
+    [MOVE_METRONOME] = TRUE,
+    [MOVE_MIRROR_MOVE] = TRUE,
+    [MOVE_SELF_DESTRUCT] = TRUE,
+    [MOVE_EGG_BOMB] = TRUE,
+    [MOVE_LICK] = TRUE,
+    [MOVE_SMOG] = FALSE,
+    [MOVE_SLUDGE] = FALSE,
+    [MOVE_BONE_CLUB] = FALSE,
+    [MOVE_FIRE_BLAST] = TRUE,
+    [MOVE_WATERFALL] = TRUE,
+    [MOVE_CLAMP] = TRUE,
+    [MOVE_SWIFT] = TRUE,
+    [MOVE_SKULL_BASH] = TRUE,
+    [MOVE_SPIKE_CANNON] = FALSE,
+    [MOVE_CONSTRICT] = FALSE,
+    [MOVE_AMNESIA] = TRUE,
+    [MOVE_KINESIS] = TRUE,
+    [MOVE_SOFT_BOILED] = TRUE,
+    [MOVE_HI_JUMP_KICK] = TRUE,
+    [MOVE_GLARE] = TRUE,
+    [MOVE_DREAM_EATER] = TRUE,
+    [MOVE_POISON_GAS] = FALSE,
+    [MOVE_BARRAGE] = FALSE,
+    [MOVE_LEECH_LIFE] = FALSE,
+    [MOVE_LOVELY_KISS] = TRUE,
+    [MOVE_SKY_ATTACK] = TRUE,
+    [MOVE_TRANSFORM] = TRUE,
+    [MOVE_BUBBLE] = FALSE,
+    [MOVE_DIZZY_PUNCH] = TRUE,
+    [MOVE_SPORE] = TRUE,
+    [MOVE_FLASH] = TRUE,
+    [MOVE_PSYWAVE] = TRUE,
+    [MOVE_SPLASH] = FALSE,
+    [MOVE_ACID_ARMOR] = TRUE,
+    [MOVE_CRABHAMMER] = TRUE,
+    [MOVE_EXPLOSION] = TRUE,
+    [MOVE_FURY_SWIPES] = FALSE,
+    [MOVE_BONEMERANG] = TRUE,
+    [MOVE_REST] = TRUE,
+    [MOVE_ROCK_SLIDE] = TRUE,
+    [MOVE_HYPER_FANG] = TRUE,
+    [MOVE_SHARPEN] = TRUE,
+    [MOVE_CONVERSION] = TRUE,
+    [MOVE_TRI_ATTACK] = TRUE,
+    [MOVE_SUPER_FANG] = TRUE,
+    [MOVE_SLASH] = TRUE,
+    [MOVE_SUBSTITUTE] = TRUE,
+    [MOVE_STRUGGLE] = TRUE,
+    [MOVE_SKETCH] = TRUE,
+    [MOVE_TRIPLE_KICK] = TRUE,
+    [MOVE_THIEF] = TRUE,
+    [MOVE_SPIDER_WEB] = TRUE,
+    [MOVE_MIND_READER] = TRUE,
+    [MOVE_NIGHTMARE] = TRUE,
+    [MOVE_FLAME_WHEEL] = FALSE,
+    [MOVE_SNORE] = TRUE,
+    [MOVE_CURSE] = TRUE,
+    [MOVE_FLAIL] = TRUE,
+    [MOVE_CONVERSION_2] = TRUE,
+    [MOVE_AEROBLAST] = TRUE,
+    [MOVE_COTTON_SPORE] = TRUE,
+    [MOVE_REVERSAL] = TRUE,
+    [MOVE_SPITE] = TRUE,
+    [MOVE_POWDER_SNOW] = FALSE,
+    [MOVE_PROTECT] = TRUE,
+    [MOVE_MACH_PUNCH] = TRUE,
+    [MOVE_SCARY_FACE] = TRUE,
+    [MOVE_FAINT_ATTACK] = TRUE,
+    [MOVE_SWEET_KISS] = TRUE,
+    [MOVE_BELLY_DRUM] = TRUE,
+    [MOVE_SLUDGE_BOMB] = TRUE,
+    [MOVE_MUD_SLAP] = TRUE,
+    [MOVE_OCTAZOOKA] = TRUE,
+    [MOVE_SPIKES] = TRUE,
+    [MOVE_ZAP_CANNON] = TRUE,
+    [MOVE_FORESIGHT] = TRUE,
+    [MOVE_DESTINY_BOND] = TRUE,
+    [MOVE_PERISH_SONG] = TRUE,
+    [MOVE_ICY_WIND] = TRUE,
+    [MOVE_DETECT] = TRUE,
+    [MOVE_BONE_RUSH] = FALSE,
+    [MOVE_LOCK_ON] = TRUE,
+    [MOVE_OUTRAGE] = TRUE,
+    [MOVE_SANDSTORM] = TRUE,
+    [MOVE_GIGA_DRAIN] = TRUE,
+    [MOVE_ENDURE] = TRUE,
+    [MOVE_CHARM] = TRUE,
+    [MOVE_ROLLOUT] = TRUE,
+    [MOVE_FALSE_SWIPE] = TRUE,
+    [MOVE_SWAGGER] = TRUE,
+    [MOVE_MILK_DRINK] = TRUE,
+    [MOVE_SPARK] = FALSE,
+    [MOVE_FURY_CUTTER] = TRUE,
+    [MOVE_STEEL_WING] = TRUE,
+    [MOVE_MEAN_LOOK] = TRUE,
+    [MOVE_ATTRACT] = TRUE,
+    [MOVE_SLEEP_TALK] = TRUE,
+    [MOVE_HEAL_BELL] = TRUE,
+    [MOVE_RETURN] = TRUE,
+    [MOVE_PRESENT] = TRUE,
+    [MOVE_FRUSTRATION] = TRUE,
+    [MOVE_SAFEGUARD] = TRUE,
+    [MOVE_PAIN_SPLIT] = TRUE,
+    [MOVE_SACRED_FIRE] = TRUE,
+    [MOVE_MAGNITUDE] = FALSE,
+    [MOVE_DYNAMIC_PUNCH] = TRUE,
+    [MOVE_MEGAHORN] = TRUE,
+    [MOVE_DRAGON_BREATH] = TRUE,
+    [MOVE_BATON_PASS] = TRUE,
+    [MOVE_ENCORE] = TRUE,
+    [MOVE_PURSUIT] = TRUE,
+    [MOVE_RAPID_SPIN] = TRUE,
+    [MOVE_SWEET_SCENT] = TRUE,
+    [MOVE_IRON_TAIL] = TRUE,
+    [MOVE_METAL_CLAW] = TRUE,
+    [MOVE_VITAL_THROW] = TRUE,
+    [MOVE_MORNING_SUN] = TRUE,
+    [MOVE_SYNTHESIS] = TRUE,
+    [MOVE_MOONLIGHT] = TRUE,
+    [MOVE_HIDDEN_POWER] = TRUE,
+    [MOVE_CROSS_CHOP] = TRUE,
+    [MOVE_TWISTER] = FALSE,
+    [MOVE_RAIN_DANCE] = TRUE,
+    [MOVE_SUNNY_DAY] = TRUE,
+    [MOVE_CRUNCH] = TRUE,
+    [MOVE_MIRROR_COAT] = TRUE,
+    [MOVE_PSYCH_UP] = TRUE,
+    [MOVE_EXTREME_SPEED] = TRUE,
+    [MOVE_ANCIENT_POWER] = TRUE,
+    [MOVE_SHADOW_BALL] = TRUE,
+    [MOVE_FUTURE_SIGHT] = TRUE,
+    [MOVE_ROCK_SMASH] = TRUE,
+    [MOVE_WHIRLPOOL] = TRUE,
+    [MOVE_BEAT_UP] = TRUE,
+    [MOVE_FAKE_OUT] = TRUE,
+    [MOVE_UPROAR] = TRUE,
+    [MOVE_STOCKPILE] = TRUE,
+    [MOVE_SPIT_UP] = TRUE,
+    [MOVE_SWALLOW] = TRUE,
+    [MOVE_HEAT_WAVE] = TRUE,
+    [MOVE_HAIL] = TRUE,
+    [MOVE_TORMENT] = TRUE,
+    [MOVE_FLATTER] = TRUE,
+    [MOVE_WILL_O_WISP] = TRUE,
+    [MOVE_MEMENTO] = TRUE,
+    [MOVE_FACADE] = TRUE,
+    [MOVE_FOCUS_PUNCH] = TRUE,
+    [MOVE_SMELLING_SALT] = TRUE,
+    [MOVE_FOLLOW_ME] = TRUE,
+    [MOVE_NATURE_POWER] = TRUE,
+    [MOVE_CHARGE] = TRUE,
+    [MOVE_TAUNT] = TRUE,
+    [MOVE_HELPING_HAND] = TRUE,
+    [MOVE_TRICK] = TRUE,
+    [MOVE_ROLE_PLAY] = TRUE,
+    [MOVE_WISH] = TRUE,
+    [MOVE_ASSIST] = TRUE,
+    [MOVE_INGRAIN] = TRUE,
+    [MOVE_SUPERPOWER] = TRUE,
+    [MOVE_MAGIC_COAT] = TRUE,
+    [MOVE_RECYCLE] = TRUE,
+    [MOVE_REVENGE] = TRUE,
+    [MOVE_BRICK_BREAK] = TRUE,
+    [MOVE_YAWN] = TRUE,
+    [MOVE_KNOCK_OFF] = TRUE,
+    [MOVE_ENDEAVOR] = TRUE,
+    [MOVE_ERUPTION] = TRUE,
+    [MOVE_SKILL_SWAP] = TRUE,
+    [MOVE_IMPRISON] = TRUE,
+    [MOVE_REFRESH] = TRUE,
+    [MOVE_GRUDGE] = TRUE,
+    [MOVE_SNATCH] = TRUE,
+    [MOVE_SECRET_POWER] = TRUE,
+    [MOVE_DIVE] = TRUE,
+    [MOVE_ARM_THRUST] = FALSE,
+    [MOVE_CAMOUFLAGE] = TRUE,
+    [MOVE_TAIL_GLOW] = TRUE,
+    [MOVE_LUSTER_PURGE] = TRUE,
+    [MOVE_MIST_BALL] = TRUE,
+    [MOVE_FEATHER_DANCE] = TRUE,
+    [MOVE_TEETER_DANCE] = TRUE,
+    [MOVE_BLAZE_KICK] = TRUE,
+    [MOVE_MUD_SPORT] = TRUE,
+    [MOVE_ICE_BALL] = FALSE,
+    [MOVE_NEEDLE_ARM] = TRUE,
+    [MOVE_SLACK_OFF] = TRUE,
+    [MOVE_HYPER_VOICE] = TRUE,
+    [MOVE_POISON_FANG] = FALSE,
+    [MOVE_CRUSH_CLAW] = TRUE,
+    [MOVE_BLAST_BURN] = TRUE,
+    [MOVE_HYDRO_CANNON] = TRUE,
+    [MOVE_METEOR_MASH] = TRUE,
+    [MOVE_ASTONISH] = TRUE,
+    [MOVE_WEATHER_BALL] = TRUE,
+    [MOVE_AROMATHERAPY] = TRUE,
+    [MOVE_FAKE_TEARS] = TRUE,
+    [MOVE_AIR_CUTTER] = TRUE,
+    [MOVE_OVERHEAT] = TRUE,
+    [MOVE_ODOR_SLEUTH] = TRUE,
+    [MOVE_ROCK_TOMB] = TRUE,
+    [MOVE_SILVER_WIND] = TRUE,
+    [MOVE_METAL_SOUND] = TRUE,
+    [MOVE_GRASS_WHISTLE] = TRUE,
+    [MOVE_TICKLE] = TRUE,
+    [MOVE_COSMIC_POWER] = TRUE,
+    [MOVE_WATER_SPOUT] = TRUE,
+    [MOVE_SIGNAL_BEAM] = TRUE,
+    [MOVE_SHADOW_PUNCH] = TRUE,
+    [MOVE_EXTRASENSORY] = TRUE,
+    [MOVE_SKY_UPPERCUT] = TRUE,
+    [MOVE_SAND_TOMB] = TRUE,
+    [MOVE_SHEER_COLD] = TRUE,
+    [MOVE_MUDDY_WATER] = TRUE,
+    [MOVE_BULLET_SEED] = FALSE,
+    [MOVE_AERIAL_ACE] = TRUE,
+    [MOVE_ICICLE_SPEAR] = FALSE,
+    [MOVE_IRON_DEFENSE] = TRUE,
+    [MOVE_BLOCK] = TRUE,
+    [MOVE_HOWL] = TRUE,
+    [MOVE_DRAGON_CLAW] = TRUE,
+    [MOVE_FRENZY_PLANT] = TRUE,
+    [MOVE_BULK_UP] = TRUE,
+    [MOVE_BOUNCE] = TRUE,
+    [MOVE_MUD_SHOT] = FALSE,
+    [MOVE_POISON_TAIL] = TRUE,
+    [MOVE_COVET] = TRUE,
+    [MOVE_VOLT_TACKLE] = TRUE,
+    [MOVE_MAGICAL_LEAF] = TRUE,
+    [MOVE_WATER_SPORT] = TRUE,
+    [MOVE_CALM_MIND] = TRUE,
+    [MOVE_LEAF_BLADE] = TRUE,
+    [MOVE_DRAGON_DANCE] = TRUE,
+    [MOVE_ROCK_BLAST] = FALSE,
+    [MOVE_SHOCK_WAVE] = TRUE,
+    [MOVE_WATER_PULSE] = TRUE,
+    [MOVE_DOOM_DESIRE] = TRUE,
+    [MOVE_PSYCHO_BOOST] = TRUE,
+};
+
+// The possible questions to ask after the initial 3 WHICH MON questions. Retrieved from here and shuffled
+// WHAT_ITEM has max 3 occurrences, one for each party member
+// WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS
+// WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once
+// WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked
+static const u8 sQuestionPossibilities[] = 
+{
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_FIRST, 
+    QUESTION_ID_WIN_SPEECH 
+};
+
+static void (* const sApprenticeFunctions[])(void) =
+{
+    [APPRENTICE_FUNC_GAVE_LVLMODE]        = Script_GivenApprenticeLvlMode,
+    [APPRENTICE_FUNC_SET_LVLMODE]         = Script_SetApprenticeLvlMode,
+    [APPRENTICE_FUNC_SET_ID]              = Script_SetApprenticeId,
+    [APPRENTICE_FUNC_SHUFFLE_SPECIES]     = ShuffleApprenticeSpecies,
+    [APPRENTICE_FUNC_RANDOMIZE_QUESTIONS] = Script_SetRandomQuestionData,
+    [APPRENTICE_FUNC_ANSWERED_QUESTION]   = IncrementQuestionsAnswered,
+    [APPRENTICE_FUNC_IS_FINAL_QUESTION]   = IsFinalQuestion,
+    [APPRENTICE_FUNC_MENU]                = Script_CreateApprenticeMenu,
+    [APPRENTICE_FUNC_PRINT_MSG]           = Script_PrintApprenticeMessage,
+    [APPRENTICE_FUNC_RESET]               = Script_ResetPlayerApprentice,
+    [APPRENTICE_FUNC_CHECK_GONE]          = GetShouldCheckApprenticeGone,
+    [APPRENTICE_FUNC_GET_QUESTION]        = ApprenticeGetQuestion,
+    [APPRENTICE_FUNC_GET_NUM_PARTY_MONS]  = GetNumApprenticePartyMonsAssigned,
+    [APPRENTICE_FUNC_SET_PARTY_MON]       = SetApprenticePartyMon,
+    [APPRENTICE_FUNC_INIT_QUESTION_DATA]  = InitQuestionData,
+    [APPRENTICE_FUNC_FREE_QUESTION_DATA]  = FreeQuestionData,
+    [APPRENTICE_FUNC_BUFFER_STRING]       = ApprenticeBufferString,
+    [APPRENTICE_FUNC_SET_MOVE]            = SetApprenticeMonMove,
+    [APPRENTICE_FUNC_SET_LEAD_MON]        = SetLeadApprenticeMon,
+    [APPRENTICE_FUNC_OPEN_BAG]            = Script_ApprenticeOpenBagMenu,
+    [APPRENTICE_FUNC_TRY_SET_HELD_ITEM]   = TrySetApprenticeHeldItem,
+    [APPRENTICE_FUNC_SAVE]                = SaveApprentice,
+    [APPRENTICE_FUNC_SET_GFX_SAVED]       = SetSavedApprenticeTrainerGfxId,
+    [APPRENTICE_FUNC_SET_GFX]             = SetPlayerApprenticeTrainerGfxId,
+    [APPRENTICE_FUNC_SHOULD_LEAVE]        = GetShouldApprenticeLeave,
+    [APPRENTICE_FUNC_SHIFT_SAVED]         = ShiftSavedApprentices,
+};
+
+// The first Apprentice can only be one of these
+static const u8 sInitialApprenticeIds[8] = {0, 1, 2, 3, 6, 7, 8, 9};
diff --git a/src/data/battle_frontier/battle_frontier_exchange_corner.h b/src/data/battle_frontier/battle_frontier_exchange_corner.h
index bcb3cdd62..d29dbdc44 100644
--- a/src/data/battle_frontier/battle_frontier_exchange_corner.h
+++ b/src/data/battle_frontier/battle_frontier_exchange_corner.h
@@ -50,50 +50,50 @@ static const u16 sFrontierExchangeCorner_HoldItems[] =
 
 static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
 {
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260201,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260287,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E,
+    BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc,
     gText_Exit,
 };
 
 static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] = 
 {
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
     gText_Exit
 };
 
 static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] = 
 {
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260397,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260436,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C,
+    BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_IronDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ZincDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc,
     gText_Exit
 };
 
 static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] = 
 {
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260542,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260575,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2,
-    BattleFrontier_BattlePointExchangeServiceCorner_Text_260613,
+    BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc,
     gText_Exit
 };
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 54d49422a..f38cfcc38 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -1,16 +1,17 @@
 #define TRAINER_HILL_OTID 0x10000000
 
-static const struct TrHillTag gUnknown_0862609C = {
-    .unkField_0 = 4,
+static const struct TrHillTag sDataTagJPDefault = {
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS_JP,
     .unused1 = 1,
-    .numFloors = 2,
+    .numFloors = NUM_TRAINER_HILL_FLOORS_JP,
     .checksum = 0x0
 };
 
-static const struct TrHillFloor gUnknown_0862609C_floors[] = {
+
+static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
     [0] = {
-        .unk0 = 0,
-        .unk1 = 0,
+        .trainerNum1 = 0,
+        .trainerNum2 = 0,
         .trainers = {
             [0] = {
                 .name = __("シゲノブ$$$$   "),
@@ -33,7 +34,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 100,
                         .spAttackEV = 0,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -57,7 +58,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 150,
                         .spDefenseEV = 120,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -81,7 +82,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 0,
                         .spDefenseEV = 200,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -122,7 +123,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -146,7 +147,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -170,7 +171,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -194,8 +195,8 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
         }
     },
     [1] = {
-        .unk0 = 0,
-        .unk1 = 0,
+        .trainerNum1 = 0,
+        .trainerNum2 = 0,
         .trainers = {
             [0] = {
                 .name = __("シゲゾウ$$$$   "),
@@ -218,7 +219,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 120,
                         .spAttackEV = 150,
                         .spDefenseEV = 0,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -242,7 +243,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -266,7 +267,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -307,7 +308,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -331,7 +332,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 100,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -355,7 +356,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 80,
                         .spAttackEV = 80,
                         .spDefenseEV = 80,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -382,18 +383,18 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
 
 static const struct TrHillTag sDataTagNormal =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 2,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00051E05
 };
 
-static const struct TrHillFloor sDataTagNormal_floors[] =
+static const struct TrHillFloor sDataTagNormal_Floors[] =
 {
     [0] =
     {
-        .unk0 = 0x11,
-        .unk1 = 0x12,
+        .trainerNum1 = 17,
+        .trainerNum2 = 18,
         .trainers =
         {
             [0] =
@@ -694,8 +695,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [1] =
     {
-        .unk0 = 0x13,
-        .unk1 = 0x14,
+        .trainerNum1 = 19,
+        .trainerNum2 = 20,
         .trainers =
         {
             [0] =
@@ -999,8 +1000,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [2] =
     {
-        .unk0 = 0x15,
-        .unk1 = 0x16,
+        .trainerNum1 = 21,
+        .trainerNum2 = 22,
         .trainers =
         {
             [0] =
@@ -1303,8 +1304,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [3] =
     {
-        .unk0 = 0x17,
-        .unk1 = 0x18,
+        .trainerNum1 = 23,
+        .trainerNum2 = 24,
         .trainers =
         {
             [0] =
@@ -1602,17 +1603,17 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
 
 static const struct TrHillTag sDataTagVariety =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 1,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00054C15
 };
 
-static const struct TrHillFloor sDataTagVariety_floors[] = {
+static const struct TrHillFloor sDataTagVariety_Floors[] = {
     [0] =
         {
-            .unk0 = 0x29,
-            .unk1 = 0x2A,
+            .trainerNum1 = 41,
+            .trainerNum2 = 42,
             .trainers =
                 {
                     [0] =
@@ -1904,8 +1905,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x2B,
-            .unk1 = 0x2C,
+            .trainerNum1 = 43,
+            .trainerNum2 = 44,
             .trainers =
                 {
                     [0] =
@@ -2227,8 +2228,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x2D,
-            .unk1 = 0x2E,
+            .trainerNum1 = 45,
+            .trainerNum2 = 46,
             .trainers =
                 {
                     [0] =
@@ -2531,8 +2532,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x2F,
-            .unk1 = 0x30,
+            .trainerNum1 = 47,
+            .trainerNum2 = 48,
             .trainers =
                 {
                     [0] =
@@ -2828,17 +2829,17 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
 
 static const struct TrHillTag sDataTagUnique =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 3,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x000652F3
 };
 
-static const struct TrHillFloor sDataTagUnique_floors[] = {
+static const struct TrHillFloor sDataTagUnique_Floors[] = {
     [0] =
         {
-            .unk0 = 0x31,
-            .unk1 = 0x32,
+            .trainerNum1 = 49,
+            .trainerNum2 = 50,
             .trainers =
                 {
                     [0] =
@@ -3135,8 +3136,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x33,
-            .unk1 = 0x34,
+            .trainerNum1 = 51,
+            .trainerNum2 = 52,
             .trainers =
                 {
                     [0] =
@@ -3439,8 +3440,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x35,
-            .unk1 = 0x36,
+            .trainerNum1 = 53,
+            .trainerNum2 = 54,
             .trainers =
                 {
                     [0] =
@@ -3743,8 +3744,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x38,
-            .unk1 = 0x37,
+            .trainerNum1 = 56,
+            .trainerNum2 = 55,
             .trainers =
                 {
                     [0] =
@@ -4039,17 +4040,17 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
 
 static const struct TrHillTag sDataTagExpert =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 1,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00061F3F
 };
 
-static const struct TrHillFloor sDataTagExpert_floors[] = {
+static const struct TrHillFloor sDataTagExpert_Floors[] = {
     [0] =
         {
-            .unk0 = 0x39,
-            .unk1 = 0x3A,
+            .trainerNum1 = 57,
+            .trainerNum2 = 58,
             .trainers =
                 {
                     [0] =
@@ -4353,8 +4354,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x3B,
-            .unk1 = 0x3C,
+            .trainerNum1 = 59,
+            .trainerNum2 = 60,
             .trainers =
                 {
                     [0] =
@@ -4658,8 +4659,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x3D,
-            .unk1 = 0x3E,
+            .trainerNum1 = 61,
+            .trainerNum2 = 62,
             .trainers =
                 {
                     [0] =
@@ -4963,8 +4964,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x3F,
-            .unk1 = 0x40,
+            .trainerNum1 = 63,
+            .trainerNum2 = 64,
             .trainers =
                 {
                     [0] =
diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h
index 8375520d1..f893bc66a 100644
--- a/src/data/contest_text_tables.h
+++ b/src/data/contest_text_tables.h
@@ -1,414 +1,439 @@
 
 #include "global.h"
 
-extern const u8 gContestEffect00hDescription[];
-extern const u8 gContestEffect01hDescription[];
-extern const u8 gContestEffect02hDescription[];
-extern const u8 gContestEffect03hDescription[];
-extern const u8 gContestEffect04hDescription[];
-extern const u8 gContestEffect05hDescription[];
-extern const u8 gContestEffect06hDescription[];
-extern const u8 gContestEffect07hDescription[];
-extern const u8 gContestEffect08hDescription[];
-extern const u8 gContestEffect09hDescription[];
-extern const u8 gContestEffect0AhDescription[];
-extern const u8 gContestEffect0BhDescription[];
-extern const u8 gContestEffect0ChDescription[];
-extern const u8 gContestEffect0DhDescription[];
-extern const u8 gContestEffect0EhDescription[];
-extern const u8 gContestEffect0FhDescription[];
-extern const u8 gContestEffect10hDescription[];
-extern const u8 gContestEffect11hDescription[];
-extern const u8 gContestEffect12hDescription[];
-extern const u8 gContestEffect13hDescription[];
-extern const u8 gContestEffect14hDescription[];
-extern const u8 gContestEffect15hDescription[];
-extern const u8 gContestEffect16hDescription[];
-extern const u8 gContestEffect17hDescription[];
-extern const u8 gContestEffect18hDescription[];
-extern const u8 gContestEffect19hDescription[];
-extern const u8 gContestEffect1AhDescription[];
-extern const u8 gContestEffect1BhDescription[];
-extern const u8 gContestEffect1ChDescription[];
-extern const u8 gContestEffect1DhDescription[];
-extern const u8 gContestEffect1EhDescription[];
-extern const u8 gContestEffect1FhDescription[];
-extern const u8 gContestEffect20hDescription[];
-extern const u8 gContestEffect21hDescription[];
-extern const u8 gContestEffect22hDescription[];
-extern const u8 gContestEffect23hDescription[];
-extern const u8 gContestEffect24hDescription[];
-extern const u8 gContestEffect25hDescription[];
-extern const u8 gContestEffect26hDescription[];
-extern const u8 gContestEffect27hDescription[];
-extern const u8 gContestEffect28hDescription[];
-extern const u8 gContestEffect29hDescription[];
-extern const u8 gContestEffect2AhDescription[];
-extern const u8 gContestEffect2BhDescription[];
-extern const u8 gContestEffect2ChDescription[];
-extern const u8 gContestEffect2DhDescription[];
-extern const u8 gContestEffect2EhDescription[];
-extern const u8 gContestEffect2FhDescription[];
+// gContestEffectDescriptionPointers
+extern const u8 gText_HighlyAppealingMove[];
+extern const u8 gText_UserMoreEasilyStartled[];
+extern const u8 gText_GreatAppealButNoMoreToEnd[];
+extern const u8 gText_UsedRepeatedlyWithoutBoringJudge[];
+extern const u8 gText_AvoidStartledByOthersOnce[];
+extern const u8 gText_AvoidStartledByOthers[];
+extern const u8 gText_AvoidStartledByOthersLittle[];
+extern const u8 gText_UserLessLikelyStartled[];
+extern const u8 gText_SlightlyStartleFrontMon[];
+extern const u8 gText_SlightlyStartleAppealed[];
+extern const u8 gText_StartleAppealedBeforeUser[];
+extern const u8 gText_StartleAllAppealed[];
+extern const u8 gText_BadlyStartleFrontMon[];
+extern const u8 gText_BadlyStartleAppealed[];
+extern const u8 gText_StartleAppealedBeforeUser2[];
+extern const u8 gText_StartleAllAppealed2[];
+extern const u8 gText_ShiftJudgesAttentionFromOthers[];
+extern const u8 gText_StartleMonHasJudgesAttention[];
+extern const u8 gText_JamOthersMissesTurn[];
+extern const u8 gText_StartleMonsMadeSameTypeAppeal[];
+extern const u8 gText_BadlyStartleCoolAppeals[];
+extern const u8 gText_BadlyStartleBeautyAppeals[];
+extern const u8 gText_BadlyStartleCuteAppeals[];
+extern const u8 gText_BadlyStartleSmartAppeals[];
+extern const u8 gText_BadlyStartleToughAppeals[];
+extern const u8 gText_MakeMonAfterUserNervous[];
+extern const u8 gText_MakeAllMonsAfterUserNervous[];
+extern const u8 gText_WorsenConditionOfThoseMadeAppeals[];
+extern const u8 gText_BadlyStartleMonsGoodCondition[];
+extern const u8 gText_AppealGreatIfPerformedFirst[];
+extern const u8 gText_AppealGreatIfPerformedLast[];
+extern const u8 gText_AppealAsGoodAsThoseBeforeIt[];
+extern const u8 gText_AppealAsGoodAsOneBeforeIt[];
+extern const u8 gText_AppealBetterLaterItsPerformed[];
+extern const u8 gText_AppealVariesDependingOnTiming[];
+extern const u8 gText_WorksWellIfSameTypeAsBefore[];
+extern const u8 gText_WorksWellIfDifferentTypeAsBefore[];
+extern const u8 gText_AffectedByAppealInFront[];
+extern const u8 gText_UpsConditionHelpsPreventNervousness[];
+extern const u8 gText_AppealWorksWellIfConditionGood[];
+extern const u8 gText_NextAppealMadeEarlier[];
+extern const u8 gText_NextAppealMadeLater[];
+extern const u8 gText_TurnOrderMoreEasilyScrambled[];
+extern const u8 gText_ScrambleOrderOfNextAppeals[];
+extern const u8 gText_AppealExcitesAudienceInAnyContest[];
+extern const u8 gText_BadlyStartlesMonsGoodAppeals[];
+extern const u8 gText_AppealBestMoreCrowdExcited[];
+extern const u8 gText_TemporarilyStopCrowdExcited[];
 
-extern const u8 gUnusedContestMoveName0[];
-extern const u8 gUnusedContestMoveName1[];
-extern const u8 gUnusedContestMoveName2[];
-extern const u8 gUnusedContestMoveName3[];
-extern const u8 gUnusedContestMoveName4[];
-extern const u8 gUnusedContestMoveName5[];
-extern const u8 gUnusedContestMoveName6[];
-extern const u8 gUnusedContestMoveName7[];
-extern const u8 gUnusedContestMoveName8[];
-extern const u8 gUnusedContestMoveName9[];
-extern const u8 gUnusedContestMoveName10[];
-extern const u8 gUnusedContestMoveName11[];
-extern const u8 gUnusedContestMoveName12[];
+// sUnusedComboMoveNameTexts
+extern const u8 gText_RainDance[];
+extern const u8 gText_Rage[];
+extern const u8 gText_FocusEnergy[];
+extern const u8 gText_Hypnosis[];
+extern const u8 gText_Softboiled[];
+extern const u8 gText_HornAttack[];
+extern const u8 gText_SwordsDance[];
+extern const u8 gText_Conversion[];
+extern const u8 gText_SunnyDay[];
+extern const u8 gText_Rest2[];
+extern const u8 gText_Vicegrip[];
+extern const u8 gText_DefenseCurl[];
+extern const u8 gText_LockOn[];
 
+// gContestMoveTypeTextPointers
 extern const u8 gContestMoveTypeCoolText[];
 extern const u8 gContestMoveTypeBeautyText[];
 extern const u8 gContestMoveTypeCuteText[];
 extern const u8 gContestMoveTypeSmartText[];
 extern const u8 gContestMoveTypeToughText[];
 
-extern const u8 gText_0827D5C1[];
-extern const u8 gText_0827D5DC[];
-extern const u8 gText_0827D600[];
-extern const u8 gText_0827D612[];
-extern const u8 gText_0827D612[];
-extern const u8 gText_0827D62D[];
-extern const u8 gText_0827D654[];
-extern const u8 gText_0827D67E[];
-extern const u8 gText_0827D69C[];
-extern const u8 gText_0827D6BA[];
-extern const u8 gText_0827D6E5[];
-extern const u8 gText_0827D706[];
-extern const u8 gText_0827D71D[];
+// sUnusedAppealResultTexts
+extern const u8 gText_ButAppealWasJammed[];
+extern const u8 gText_FollowedAnotherMonsLead[];
+extern const u8 gText_ButItMessedUp[];
+extern const u8 gText_WentBetterThanUsual[];
+extern const u8 gText_JudgeLookedAwayForSomeReason[];
+extern const u8 gText_WorkedHardToBuildOnPastMistakes[];
+extern const u8 gText_CantMakeAnyMoreMoves[];
+extern const u8 gText_WorkedFrighteninglyWell[];
+extern const u8 gText_WorkedHardAsStandoutMon[];
+extern const u8 gText_JudgedLookedOnExpectantly[];
+extern const u8 gText_WorkedRatherWell[];
+extern const u8 gText_WorkedLittleBetterThanUsual[];
 
-extern const u8 gText_0827D743[];
-extern const u8 gText_0827D764[];
-extern const u8 gText_0827D785[];
-extern const u8 gText_0827D7A5[];
-extern const u8 gText_0827D7C8[];
-extern const u8 gText_0827D7E8[];
-extern const u8 gText_0827D831[];
-extern const u8 gText_0827D855[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D872[];
-extern const u8 gText_0827D88F[];
-extern const u8 gText_0827D8B5[];
-extern const u8 gText_0827D8E4[];
-extern const u8 gText_0827D8FE[];
-extern const u8 gText_0827D926[];
-extern const u8 gText_0827D947[];
-extern const u8 gText_0827D961[];
-extern const u8 gText_0827D986[];
-extern const u8 gText_0827D9B1[];
-extern const u8 gText_0827D9D9[];
-extern const u8 gText_0827DA03[];
-extern const u8 gText_0827DA31[];
-extern const u8 gText_0827DA5B[];
-extern const u8 gText_0827DA85[];
-extern const u8 gText_0827DAB2[];
-extern const u8 gText_0827DADA[];
-extern const u8 gText_0827DB03[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827DB1F[];
-extern const u8 gText_0827DB4E[];
+// sRoundResultTexts
+extern const u8 gText_MonFailedToStandOutAtAll[];
+extern const u8 gText_MonDidntStandOutVeryMuch[];
+extern const u8 gText_MonCaughtALittleAttention[];
+extern const u8 gText_MonAttractedALotOfAttention[];
+extern const u8 gText_MonCommandedTotalAttention[];
+extern const u8 gText_MonHasntMadeItsAppeal[];
+extern const u8 gText_JudgesViewsOnMonHeldFirm[];
+extern const u8 gText_MonsXChangedPerceptions[];
+extern const u8 gText_EmptyContestString[];
+extern const u8 gText_MonsAppealEffectWoreOff[];
+extern const u8 gText_SpecialAppealsEffectWoreOff[];
+extern const u8 gText_EveryonesAppealsMadeToLookSame[];
+extern const u8 gText_CheapenedMonsAppeal[];
+extern const u8 gText_CheapenedMonsAppeal2[];
+extern const u8 gText_CheapenedAppealOfThoseAhead[];
+extern const u8 gText_CheapenedAppealOfThoseAhead2[];
+extern const u8 gText_StoleAttentionAwayFromMon[];
+extern const u8 gText_SeverelyCheapenedOtherAppeals[];
+extern const u8 gText_AnticipationSwelledForMonsAppealNext[];
+extern const u8 gText_CheapenedJudgesFavoriteAppeal[];
+extern const u8 gText_AppealsOfOthersCheapenedByHalf[];
+extern const u8 gText_StoodOutToMakeUpForBeingJammed[];
+extern const u8 gText_CantParticipateInAppealsAnyMore[];
+extern const u8 gText_TouchedJudgeForFantasticAppeal[];
+extern const u8 gText_AnticipationRoseForUpcomingAppeals[];
+extern const u8 gText_StoodOutAsMuchAsSpecialAppeals[];
+extern const u8 gText_StoodOutAsMuchAsMon[];
+extern const u8 gText_JammedAppealsMadeEvenLessNoticeable[];
+extern const u8 gText_EveryonesAppealsMadeSame[];
 
-extern const u8 gText_827DB75[];
-extern const u8 gText_827DBB0[];
-extern const u8 gText_827DBE0[];
-extern const u8 gText_827DC0F[];
-extern const u8 gText_827DC45[];
-extern const u8 gText_827DC7C[];
-extern const u8 gText_827DCB4[];
-extern const u8 gText_827DCE7[];
-extern const u8 gText_827DD12[];
-extern const u8 gText_827DD3D[];
-extern const u8 gText_827DD6F[];
-extern const u8 gText_827DD8E[];
-extern const u8 gText_827DDC7[];
-extern const u8 gText_827DDF2[];
-extern const u8 gText_827DE14[];
-extern const u8 gText_827DE44[];
-extern const u8 gText_827DE73[];
-extern const u8 gText_827DEA5[];
-extern const u8 gText_827DED9[];
-extern const u8 gText_827DF02[];
-extern const u8 gText_827DF3A[];
-extern const u8 gText_827DF63[];
-extern const u8 gText_827DF8C[];
-extern const u8 gText_827DFB8[];
-extern const u8 gText_827DFE2[];
-extern const u8 gText_827E00C[];
-extern const u8 gText_827E02F[];
-extern const u8 gText_827E05F[];
-extern const u8 gText_827E08B[];
-extern const u8 gText_827E0B5[];
-extern const u8 gText_827E0DD[];
-extern const u8 gText_827E107[];
-extern const u8 gText_827E143[];
-extern const u8 gText_827E17F[];
-extern const u8 gText_827E1BB[];
-extern const u8 gText_827E1F3[];
-extern const u8 gText_827E220[];
-extern const u8 gText_827E254[];
-extern const u8 gText_827E289[];
-extern const u8 gText_827E2C5[];
-extern const u8 gText_0827E2FE[];
-extern const u8 gText_0827E32E[];
-extern const u8 gText_0827E35B[];
-extern const u8 gText_0827E38D[];
-extern const u8 gText_0827E3C1[];
-extern const u8 gText_0827E3EB[];
-extern const u8 gText_0827E416[];
-extern const u8 gText_0827E448[];
-extern const u8 gText_0827E473[];
-extern const u8 gText_0827E4A6[];
-extern const u8 gText_0827E4D5[];
-extern const u8 gText_0827E504[];
-extern const u8 gText_0827E531[];
-extern const u8 gText_0827E55A[];
-extern const u8 gText_0827E5B2[];
-extern const u8 gText_0827E5D0[];
-extern const u8 gText_0827E606[];
-extern const u8 gText_0827E638[];
-extern const u8 gText_0827E658[];
-extern const u8 gText_0827E68B[];
-extern const u8 gText_0827E6C4[];
-extern const u8 gText_0827E7BA[];
+// sAppealResultTexts
+extern const u8 gText_BecameMoreConsciousOfOtherMons[];
+extern const u8 gText_MonCantMakeAnAppealAfterThis[];
+extern const u8 gText_SettledDownJustLittleBit[];
+extern const u8 gText_BecameObliviousToOtherMons[];
+extern const u8 gText_BecameLessAwareOfOtherMons[];
+extern const u8 gText_StoppedCaringAboutOtherMons[];
+extern const u8 gText_TriedToStartleOtherMons[];
+extern const u8 gText_TriedToDazzleOthers[];
+extern const u8 gText_JudgeLookedAwayFromMon[];
+extern const u8 gText_TriedToUnnerveNextMon[];
+extern const u8 gText_MonBecameNervous[];
+extern const u8 gText_AppealTriedToUnnerveWaitingMons[];
+extern const u8 gText_TauntedMonsDoingWell[];
+extern const u8 gText_MonRegainedItsForm[];
+extern const u8 gText_TriedToJamMonDoingWell[];
+extern const u8 gText_StandoutMonHustledEvenMore[];
+extern const u8 gText_LargelyUnnoticedMonWorkedHard[];
+extern const u8 gText_WorkedAsMuchAsMonBefore[];
+extern const u8 gText_WorkedAsMuchAsPrecedingMon[];
+extern const u8 gText_MonsAppealWasDud[];
+extern const u8 gText_MonsAppealDidNotGoWell[];
+extern const u8 gText_MonsAppealDidNotGoWell2[];
+extern const u8 gText_MonsAppealDidNotGoWell3[];
+extern const u8 gText_MonsAppealDidNotWorkVeryWell[];
+extern const u8 gText_MonsAppealWentSlightlyWell[];
+extern const u8 gText_MonsAppealWentSlightlyWell2[];
+extern const u8 gText_MonsAppealWentPrettyWell[];
+extern const u8 gText_MonsAppealWentPrettyWell2[];
+extern const u8 gText_MonsAppealWentVeryWell[];
+extern const u8 gText_MonsAppealWentExcellently[];
+extern const u8 gText_MonsAppealWentExcellently2[];
+extern const u8 gText_SameTypeAsOneBeforeGood[];
+extern const u8 gText_NotSameTypeAsOneBeforeGood[];
+extern const u8 gText_StoodOutMuchMoreThanMonBefore[];
+extern const u8 gText_DidntDoAsWellAsMonBefore[];
+extern const u8 gText_MonsConditionRoseAboveUsual[];
+extern const u8 gText_MonsHotStatusMadeGreatAppeal[];
+extern const u8 gText_MovedUpInLineForNextAppeal[];
+extern const u8 gText_MovedBackInLineForNextAppeal[];
+extern const u8 gText_ScrambledUpOrderForNextTurn[];
+extern const u8 gText_JudgeLookedAtMonExpectantly[];
+extern const u8 gText_AppealComboWentOverWell[];
+extern const u8 gText_AppealComboWentOverVeryWell[];
+extern const u8 gText_AppealComboWentOverExcellently[];
+extern const u8 gText_MonManagedToAvertGaze[];
+extern const u8 gText_MonManagedToAvoidSeeingIt[];
+extern const u8 gText_MonIsntFazedByThatSortOfThing[];
+extern const u8 gText_MonBecameALittleDistracted[];
+extern const u8 gText_TriedToStartleOtherPokemon[];
+extern const u8 gText_MonLookedDownOutOfDistraction[];
+extern const u8 gText_MonTurnedBackOutOfDistraction[];
+extern const u8 gText_MonCouldntHelpUtteringCry[];
+extern const u8 gText_MonCouldntHelpLeapingUp[];
+extern const u8 gText_MonTrippedOutOfDistraction[];
+extern const u8 gText_ButItMessedUp2[];
+extern const u8 gText_ButItFailedToMakeTargetNervous[];
+extern const u8 gText_ButItFailedToMakeAnyoneNervous[];
+extern const u8 gText_ButItWasIgnored[];
+extern const u8 gText_CouldntImproveItsCondition[];
+extern const u8 gText_BadConditionResultedInWeakAppeal[];
+extern const u8 gText_MonWasUnaffected[];
+extern const u8 gText_AttractedCrowdsAttention[];
+ 
+// sContestConditions
+extern const u8 gText_Contest_Coolness[];
+extern const u8 gText_Contest_Beauty[];
+extern const u8 gText_Contest_Cuteness[];
+extern const u8 gText_Contest_Smartness[];
+extern const u8 gText_Contest_Toughness[];
 
-extern const u8 gText_0827E85F[];
-extern const u8 gText_0827E868[];
-extern const u8 gText_0827E86F[];
-extern const u8 gText_0827E878[];
-extern const u8 gText_0827E882[];
+// sInvalidContestMoveNames
+extern const u8 gText_CoolMove[];
+extern const u8 gText_BeautyMove[];
+extern const u8 gText_CuteMove[];
+extern const u8 gText_SmartMove[];
+extern const u8 gText_ToughMove[];
+extern const u8 gText_3QuestionMarks[];
 
-extern const u8 gText_0827E894[];
-extern const u8 gText_0827E89E[];
-extern const u8 gText_0827E8AA[];
-extern const u8 gText_0827E8B4[];
-extern const u8 gText_0827E8BF[];
-extern const u8 gText_0827E8CA[];
+// Misc, used directly
+extern const u8 gText_MonAppealedWithMove[];
+extern const u8 gText_MonCantAppealNextTurn[];
+extern const u8 gText_RepeatedAppeal[];
+extern const u8 gText_MonsXDidntGoOverWell[];
+extern const u8 gText_MonsXWentOverGreat[];
+extern const u8 gText_MonsXGotTheCrowdGoing[];
+extern const u8 gText_CrowdContinuesToWatchMon[];
+extern const u8 gText_MonsMoveIsIgnored[];
+extern const u8 gText_MonWasTooNervousToMove[];
+extern const u8 gText_MonWasWatchingOthers[];
+extern const u8 gText_AllOutOfAppealTime[];
+extern const u8 gText_Contest_Shyness[];
+extern const u8 gText_Contest_Anxiety[];
+extern const u8 gText_Contest_Laziness[];
+extern const u8 gText_Contest_Hesitancy[];
+extern const u8 gText_Contest_Fear[];
+extern const u8 gText_AppealNumWhichMoveWillBePlayed[];
+extern const u8 gText_AppealNumButItCantParticipate[];
 
 const u8 *const gContestEffectDescriptionPointers[] =
 {
-    gContestEffect00hDescription,
-    gContestEffect01hDescription,
-    gContestEffect02hDescription,
-    gContestEffect03hDescription,
-    gContestEffect04hDescription,
-    gContestEffect05hDescription,
-    gContestEffect06hDescription,
-    gContestEffect07hDescription,
-    gContestEffect08hDescription,
-    gContestEffect09hDescription,
-    gContestEffect0AhDescription,
-    gContestEffect0BhDescription,
-    gContestEffect0ChDescription,
-    gContestEffect0DhDescription,
-    gContestEffect0EhDescription,
-    gContestEffect0FhDescription,
-    gContestEffect10hDescription,
-    gContestEffect11hDescription,
-    gContestEffect12hDescription,
-    gContestEffect13hDescription,
-    gContestEffect14hDescription,
-    gContestEffect15hDescription,
-    gContestEffect16hDescription,
-    gContestEffect17hDescription,
-    gContestEffect18hDescription,
-    gContestEffect19hDescription,
-    gContestEffect1AhDescription,
-    gContestEffect1BhDescription,
-    gContestEffect1ChDescription,
-    gContestEffect1DhDescription,
-    gContestEffect1EhDescription,
-    gContestEffect1FhDescription,
-    gContestEffect20hDescription,
-    gContestEffect21hDescription,
-    gContestEffect22hDescription,
-    gContestEffect23hDescription,
-    gContestEffect24hDescription,
-    gContestEffect25hDescription,
-    gContestEffect26hDescription,
-    gContestEffect27hDescription,
-    gContestEffect28hDescription,
-    gContestEffect29hDescription,
-    gContestEffect2AhDescription,
-    gContestEffect2BhDescription,
-    gContestEffect2ChDescription,
-    gContestEffect2DhDescription,
-    gContestEffect2EhDescription,
-    gContestEffect2FhDescription
+    [CONTEST_EFFECT_HIGHLY_APPEALING]                      = gText_HighlyAppealingMove,
+    [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED]             = gText_UserMoreEasilyStartled,
+    [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES]        = gText_GreatAppealButNoMoreToEnd,
+    [CONTEST_EFFECT_REPETITION_NOT_BORING]                 = gText_UsedRepeatedlyWithoutBoringJudge,
+    [CONTEST_EFFECT_AVOID_STARTLE_ONCE]                    = gText_AvoidStartledByOthersOnce,
+    [CONTEST_EFFECT_AVOID_STARTLE]                         = gText_AvoidStartledByOthers,
+    [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY]                = gText_AvoidStartledByOthersLittle,
+    [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED]             = gText_UserLessLikelyStartled,
+    [CONTEST_EFFECT_STARTLE_FRONT_MON]                     = gText_SlightlyStartleFrontMon,
+    [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS]            = gText_SlightlyStartleAppealed,
+    [CONTEST_EFFECT_STARTLE_PREV_MON]                      = gText_StartleAppealedBeforeUser,
+    [CONTEST_EFFECT_STARTLE_PREV_MONS]                     = gText_StartleAllAppealed,
+    [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON]               = gText_BadlyStartleFrontMon,
+    [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS]               = gText_BadlyStartleAppealed,
+    [CONTEST_EFFECT_STARTLE_PREV_MON_2]                    = gText_StartleAppealedBeforeUser2,
+    [CONTEST_EFFECT_STARTLE_PREV_MONS_2]                   = gText_StartleAllAppealed2,
+    [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION]                 = gText_ShiftJudgesAttentionFromOthers,
+    [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION]     = gText_StartleMonHasJudgesAttention,
+    [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN]         = gText_JamOthersMissesTurn,
+    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL]         = gText_StartleMonsMadeSameTypeAppeal,
+    [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL]              = gText_BadlyStartleCoolAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL]            = gText_BadlyStartleBeautyAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL]              = gText_BadlyStartleCuteAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL]             = gText_BadlyStartleSmartAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL]             = gText_BadlyStartleToughAppeals,
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS]            = gText_MakeMonAfterUserNervous,
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS]           = gText_MakeAllMonsAfterUserNervous,
+    [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS]         = gText_WorsenConditionOfThoseMadeAppeals,
+    [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = gText_BadlyStartleMonsGoodCondition,
+    [CONTEST_EFFECT_BETTER_IF_FIRST]                       = gText_AppealGreatIfPerformedFirst,
+    [CONTEST_EFFECT_BETTER_IF_LAST]                        = gText_AppealGreatIfPerformedLast,
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES]           = gText_AppealAsGoodAsThoseBeforeIt,
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE]            = gText_AppealAsGoodAsOneBeforeIt,
+    [CONTEST_EFFECT_BETTER_WHEN_LATER]                     = gText_AppealBetterLaterItsPerformed,
+    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING]             = gText_AppealVariesDependingOnTiming,
+    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE]                   = gText_WorksWellIfSameTypeAsBefore,
+    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE]                   = gText_WorksWellIfDifferentTypeAsBefore,
+    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL]               = gText_AffectedByAppealInFront,
+    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = gText_UpsConditionHelpsPreventNervousness,
+    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION]            = gText_AppealWorksWellIfConditionGood,
+    [CONTEST_EFFECT_NEXT_APPEAL_EARLIER]                   = gText_NextAppealMadeEarlier,
+    [CONTEST_EFFECT_NEXT_APPEAL_LATER]                     = gText_NextAppealMadeLater,
+    [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER]     = gText_TurnOrderMoreEasilyScrambled,
+    [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER]              = gText_ScrambleOrderOfNextAppeals,
+    [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST]        = gText_AppealExcitesAudienceInAnyContest,
+    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS]  = gText_BadlyStartlesMonsGoodAppeals,
+    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED]          = gText_AppealBestMoreCrowdExcited,
+    [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE]                  = gText_TemporarilyStopCrowdExcited
 };
 
 // Unreferenced array of pointers to move names.
 // All of the moves except Conversion are combo starters, so this may have
 // been an early list of combo starters.
-const u8 *const gUnknown_8587D10[] =
+static const u8 *const sUnusedComboMoveNameTexts[] =
 {
-    gUnusedContestMoveName0,
-    gUnusedContestMoveName0,
-    gUnusedContestMoveName1,
-    gUnusedContestMoveName2,
-    gUnusedContestMoveName3,
-    gUnusedContestMoveName4,
-    gUnusedContestMoveName5,
-    gUnusedContestMoveName6,
-    gUnusedContestMoveName7,
-    gUnusedContestMoveName8,
-    gUnusedContestMoveName9,
-    gUnusedContestMoveName10,
-    gUnusedContestMoveName11,
-    gUnusedContestMoveName12
+    gText_RainDance,
+    gText_RainDance,
+    gText_Rage,
+    gText_FocusEnergy,
+    gText_Hypnosis,
+    gText_Softboiled,
+    gText_HornAttack,
+    gText_SwordsDance,
+    gText_Conversion,
+    gText_SunnyDay,
+    gText_Rest2,
+    gText_Vicegrip,
+    gText_DefenseCurl,
+    gText_LockOn
 };
 
 const u8 *const gContestMoveTypeTextPointers[] =
 {
-    gContestMoveTypeCoolText,
-    gContestMoveTypeBeautyText,
-    gContestMoveTypeCuteText,
-    gContestMoveTypeSmartText,
-    gContestMoveTypeToughText
+    [CONTEST_CATEGORY_COOL]   = gContestMoveTypeCoolText,
+    [CONTEST_CATEGORY_BEAUTY] = gContestMoveTypeBeautyText,
+    [CONTEST_CATEGORY_CUTE]   = gContestMoveTypeCuteText,
+    [CONTEST_CATEGORY_SMART]  = gContestMoveTypeSmartText,
+    [CONTEST_CATEGORY_TOUGH]  = gContestMoveTypeToughText
 };
 
-const u8 *const gUnknown_08587D5C[] =
+static const u8 *const sUnusedAppealResultTexts[] =
 {
-    gText_0827D5C1,
-    gText_0827D5DC,
-    gText_0827D600,
-    gText_0827D612,
-    gText_0827D612,
-    gText_0827D62D,
-    gText_0827D654,
-    gText_0827D67E,
-    gText_0827D69C,
-    gText_0827D6BA,
-    gText_0827D6E5,
-    gText_0827D706,
-    gText_0827D71D
+    gText_ButAppealWasJammed,
+    gText_FollowedAnotherMonsLead,
+    gText_ButItMessedUp,
+    gText_WentBetterThanUsual,
+    gText_WentBetterThanUsual,
+    gText_JudgeLookedAwayForSomeReason,
+    gText_WorkedHardToBuildOnPastMistakes,
+    gText_CantMakeAnyMoreMoves,
+    gText_WorkedFrighteninglyWell,
+    gText_WorkedHardAsStandoutMon,
+    gText_JudgedLookedOnExpectantly,
+    gText_WorkedRatherWell,
+    gText_WorkedLittleBetterThanUsual
 };
 
-const u8 *const gUnknown_08587D90[] =
+// Takes the .attentionLevel of a contestant as an index. Only 0-5 are used
+static const u8 *const sRoundResultTexts[] =
 {
-    gText_0827D743,
-    gText_0827D764,
-    gText_0827D785,
-    gText_0827D7A5,
-    gText_0827D7C8,
-    gText_0827D7E8,
-    gText_0827D831,
-    gText_0827D855,
-    gText_0827D830,
-    gText_0827D872,
-    gText_0827D88F,
-    gText_0827D8B5,
-    gText_0827D8E4,
-    gText_0827D8FE,
-    gText_0827D926,
-    gText_0827D947,
-    gText_0827D961,
-    gText_0827D986,
-    gText_0827D9B1,
-    gText_0827D9D9,
-    gText_0827DA03,
-    gText_0827DA31,
-    gText_0827DA5B,
-    gText_0827DA85,
-    gText_0827DAB2,
-    gText_0827DADA,
-    gText_0827DB03,
-    gText_0827D830,
-    gText_0827D830,
-    gText_0827D830,
-    gText_0827DB1F,
-    gText_0827DB4E
+    gText_MonFailedToStandOutAtAll,
+    gText_MonDidntStandOutVeryMuch,
+    gText_MonCaughtALittleAttention,
+    gText_MonAttractedALotOfAttention,
+    gText_MonCommandedTotalAttention,
+    gText_MonHasntMadeItsAppeal,
+    gText_JudgesViewsOnMonHeldFirm, // here below unused
+    gText_MonsXChangedPerceptions,
+    gText_EmptyContestString,
+    gText_MonsAppealEffectWoreOff,
+    gText_SpecialAppealsEffectWoreOff,
+    gText_EveryonesAppealsMadeToLookSame,
+    gText_CheapenedMonsAppeal,
+    gText_CheapenedAppealOfThoseAhead,
+    gText_StoleAttentionAwayFromMon,
+    gText_CheapenedMonsAppeal2,
+    gText_SeverelyCheapenedOtherAppeals,
+    gText_AnticipationSwelledForMonsAppealNext,
+    gText_CheapenedAppealOfThoseAhead2,
+    gText_CheapenedJudgesFavoriteAppeal,
+    gText_AppealsOfOthersCheapenedByHalf,
+    gText_StoodOutToMakeUpForBeingJammed,
+    gText_CantParticipateInAppealsAnyMore,
+    gText_TouchedJudgeForFantasticAppeal,
+    gText_AnticipationRoseForUpcomingAppeals,
+    gText_StoodOutAsMuchAsSpecialAppeals,
+    gText_StoodOutAsMuchAsMon,
+    gText_EmptyContestString,
+    gText_EmptyContestString,
+    gText_EmptyContestString,
+    gText_JammedAppealsMadeEvenLessNoticeable,
+    gText_EveryonesAppealsMadeSame
 };
 
-const u8 *const gUnknown_08587E10[] =
+static const u8 *const sAppealResultTexts[] =
 {
-    gText_827DB75,
-    gText_827DBB0,
-    gText_827DBE0,
-    gText_827DC0F,
-    gText_827DC45,
-    gText_827DC7C,
-    gText_827DCB4,
-    gText_827DCE7,
-    gText_827DD12,
-    gText_827DD3D,
-    gText_827DD6F,
-    gText_827DD8E,
-    gText_827DDC7,
-    gText_827DDF2,
-    gText_827DE14,
-    gText_827DE44,
-    gText_827DE73,
-    gText_827DEA5,
-    gText_827DED9,
-    gText_827DF02,
-    gText_827DF3A,
-    gText_827DF63,
-    gText_827DF8C,
-    gText_827DFB8,
-    gText_827DFE2,
-    gText_827E00C,
-    gText_827E02F,
-    gText_827E05F,
-    gText_827E08B,
-    gText_827E0B5,
-    gText_827E0DD,
-    gText_827E107,
-    gText_827E143,
-    gText_827E17F,
-    gText_827E1BB,
-    gText_827E1F3,
-    gText_827E220,
-    gText_827E254,
-    gText_827E289,
-    gText_827E2C5,
-    gText_0827E2FE,
-    gText_0827E32E,
-    gText_0827E35B,
-    gText_0827E38D,
-    gText_0827E3C1,
-    gText_0827E3EB,
-    gText_0827E416,
-    gText_0827E448,
-    gText_0827E473,
-    gText_0827E4A6,
-    gText_0827E4D5,
-    gText_0827E504,
-    gText_0827E531,
-    gText_0827E55A,
-    gText_0827E5B2,
-    gText_0827E5D0,
-    gText_0827E606,
-    gText_0827E638,
-    gText_0827E658,
-    gText_0827E68B,
-    gText_0827E6C4,
-    gText_0827E7BA
+    [CONTEST_STRING_MORE_CONSCIOUS]            = gText_BecameMoreConsciousOfOtherMons,
+    [CONTEST_STRING_NO_APPEAL]                 = gText_MonCantMakeAnAppealAfterThis,
+    [CONTEST_STRING_SETTLE_DOWN]               = gText_SettledDownJustLittleBit,
+    [CONTEST_STRING_OBLIVIOUS_TO_OTHERS]       = gText_BecameObliviousToOtherMons,
+    [CONTEST_STRING_LESS_AWARE]                = gText_BecameLessAwareOfOtherMons,
+    [CONTEST_STRING_STOPPED_CARING]            = gText_StoppedCaringAboutOtherMons,
+    [CONTEST_STRING_STARTLE_ATTEMPT]           = gText_TriedToStartleOtherMons,
+    [CONTEST_STRING_DAZZLE_ATTEMPT]            = gText_TriedToDazzleOthers,
+    [CONTEST_STRING_JUDGE_LOOK_AWAY2]          = gText_JudgeLookedAwayFromMon,
+    [CONTEST_STRING_UNNERVE_ATTEMPT]           = gText_TriedToUnnerveNextMon,
+    [CONTEST_STRING_NERVOUS]                   = gText_MonBecameNervous,
+    [CONTEST_STRING_UNNERVE_WAITING]           = gText_AppealTriedToUnnerveWaitingMons,
+    [CONTEST_STRING_TAUNT_WELL]                = gText_TauntedMonsDoingWell,
+    [CONTEST_STRING_REGAINED_FORM]             = gText_MonRegainedItsForm,
+    [CONTEST_STRING_JAM_WELL]                  = gText_TriedToJamMonDoingWell,
+    [CONTEST_STRING_HUSTLE_STANDOUT]           = gText_StandoutMonHustledEvenMore,
+    [CONTEST_STRING_WORK_HARD_UNNOTICED]       = gText_LargelyUnnoticedMonWorkedHard,
+    [CONTEST_STRING_WORK_BEFORE]               = gText_WorkedAsMuchAsMonBefore,
+    [CONTEST_STRING_APPEAL_NOT_WELL]           = gText_MonsAppealDidNotGoWell,
+    [CONTEST_STRING_WORK_PRECEDING]            = gText_WorkedAsMuchAsPrecedingMon,
+    [CONTEST_STRING_APPEAL_NOT_WELL2]          = gText_MonsAppealDidNotGoWell2,
+    [CONTEST_STRING_APPEAL_NOT_SHOWN_WELL]     = gText_MonsAppealDidNotGoWell3,
+    [CONTEST_STRING_APPEAL_SLIGHTLY_WELL]      = gText_MonsAppealWentSlightlyWell,
+    [CONTEST_STRING_APPEAL_PRETTY_WELL]        = gText_MonsAppealWentPrettyWell,
+    [CONTEST_STRING_APPEAL_EXCELLENTLY]        = gText_MonsAppealWentExcellently,
+    [CONTEST_STRING_APPEAL_DUD]                = gText_MonsAppealWasDud,
+    [CONTEST_STRING_APPEAL_NOT_VERY_WELL]      = gText_MonsAppealDidNotWorkVeryWell,
+    [CONTEST_STRING_APPEAL_SLIGHTLY_WELL2]     = gText_MonsAppealWentSlightlyWell2,
+    [CONTEST_STRING_APPEAL_PRETTY_WELL2]       = gText_MonsAppealWentPrettyWell2,
+    [CONTEST_STRING_APPEAL_VERY_WELL]          = gText_MonsAppealWentVeryWell,
+    [CONTEST_STRING_APPEAL_EXCELLENTLY2]       = gText_MonsAppealWentExcellently2,
+    [CONTEST_STRING_SAME_TYPE_GOOD]            = gText_SameTypeAsOneBeforeGood,
+    [CONTEST_STRING_DIFF_TYPE_GOOD]            = gText_NotSameTypeAsOneBeforeGood,
+    [CONTEST_STRING_STOOD_OUT_AS_MUCH]         = gText_StoodOutMuchMoreThanMonBefore,
+    [CONTEST_STRING_NOT_AS_WELL]               = gText_DidntDoAsWellAsMonBefore,
+    [CONTEST_STRING_CONDITION_ROSE]            = gText_MonsConditionRoseAboveUsual,
+    [CONTEST_STRING_HOT_STATUS]                = gText_MonsHotStatusMadeGreatAppeal,
+    [CONTEST_STRING_MOVE_UP_LINE]              = gText_MovedUpInLineForNextAppeal,
+    [CONTEST_STRING_MOVE_BACK_LINE]            = gText_MovedBackInLineForNextAppeal,
+    [CONTEST_STRING_SCRAMBLE_ORDER]            = gText_ScrambledUpOrderForNextTurn,
+    [CONTEST_STRING_JUDGE_EXPECTANTLY2]        = gText_JudgeLookedAtMonExpectantly,
+    [CONTEST_STRING_WENT_OVER_WELL]            = gText_AppealComboWentOverWell,
+    [CONTEST_STRING_WENT_OVER_VERY_WELL]       = gText_AppealComboWentOverVeryWell,
+    [CONTEST_STRING_APPEAL_COMBO_EXCELLENTLY]  = gText_AppealComboWentOverExcellently,
+    [CONTEST_STRING_AVERT_GAZE]                = gText_MonManagedToAvertGaze,
+    [CONTEST_STRING_AVOID_SEEING]              = gText_MonManagedToAvoidSeeingIt,
+    [CONTEST_STRING_NOT_FAZED]                 = gText_MonIsntFazedByThatSortOfThing,
+    [CONTEST_STRING_LITTLE_DISTRACTED]         = gText_MonBecameALittleDistracted,
+    [CONTEST_STRING_ATTEMPT_STARTLE]           = gText_TriedToStartleOtherPokemon,
+    [CONTEST_STRING_LOOKED_DOWN]               = gText_MonLookedDownOutOfDistraction,
+    [CONTEST_STRING_TURNED_BACK]               = gText_MonTurnedBackOutOfDistraction,
+    [CONTEST_STRING_UTTER_CRY]                 = gText_MonCouldntHelpUtteringCry,
+    [CONTEST_STRING_LEAPT_UP]                  = gText_MonCouldntHelpLeapingUp,
+    [CONTEST_STRING_TRIPPED_OVER]              = gText_MonTrippedOutOfDistraction,
+    [CONTEST_STRING_MESSED_UP2]                = gText_ButItMessedUp2,
+    [CONTEST_STRING_FAILED_TARGET_NERVOUS]     = gText_ButItFailedToMakeTargetNervous,
+    [CONTEST_STRING_FAILED_ANYONE_NERVOUS]     = gText_ButItFailedToMakeAnyoneNervous,
+    [CONTEST_STRING_IGNORED]                   = gText_ButItWasIgnored,
+    [CONTEST_STRING_NO_CONDITION_IMPROVE]      = gText_CouldntImproveItsCondition,
+    [CONTEST_STRING_BAD_CONDITION_WEAK_APPEAL] = gText_BadConditionResultedInWeakAppeal,
+    [CONTEST_STRING_UNAFFECTED]                = gText_MonWasUnaffected,
+    [CONTEST_STRING_ATTRACTED_ATTENTION]       = gText_AttractedCrowdsAttention
 };
 
-const u8 *const gUnknown_08587F08[] =
+static const u8 *const sContestConditions[] =
 {
-    gText_0827E85F,
-    gText_0827E868,
-    gText_0827E86F,
-    gText_0827E878,
-    gText_0827E882
+    [CONTEST_CATEGORY_COOL]   = gText_Contest_Coolness,
+    [CONTEST_CATEGORY_BEAUTY] = gText_Contest_Beauty,
+    [CONTEST_CATEGORY_CUTE]   = gText_Contest_Cuteness,
+    [CONTEST_CATEGORY_SMART]  = gText_Contest_Smartness,
+    [CONTEST_CATEGORY_TOUGH]  = gText_Contest_Toughness
 };
 
-const u8 *const gUnknown_08587F1C[] =
+static const u8 *const sInvalidContestMoveNames[] =
 {
-    gText_0827E894,
-    gText_0827E89E,
-    gText_0827E8AA,
-    gText_0827E8B4,
-    gText_0827E8BF,
-    gText_0827E8CA
+    [CONTEST_CATEGORY_COOL]    = gText_CoolMove,
+    [CONTEST_CATEGORY_BEAUTY]  = gText_BeautyMove,
+    [CONTEST_CATEGORY_CUTE]    = gText_CuteMove,
+    [CONTEST_CATEGORY_SMART]   = gText_SmartMove,
+    [CONTEST_CATEGORY_TOUGH]   = gText_ToughMove,
+    [CONTEST_CATEGORIES_COUNT] = gText_3QuestionMarks
 };
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
index 0b8aa79b2..661539d57 100755
--- a/src/data/field_event_obj/event_object_graphics_info_pointers.h
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -489,11 +489,11 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 };
 
 const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-    &gEventObjectGraphicsInfo_Bard,
-    &gEventObjectGraphicsInfo_Hipster,
-    &gEventObjectGraphicsInfo_Trader,
-    &gEventObjectGraphicsInfo_Storyteller,
-    &gEventObjectGraphicsInfo_Giddy,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    [MAUVILLE_MAN_BARD]        = &gEventObjectGraphicsInfo_Bard,
+    [MAUVILLE_MAN_HIPSTER]     = &gEventObjectGraphicsInfo_Hipster,
+    [MAUVILLE_MAN_TRADER]      = &gEventObjectGraphicsInfo_Trader,
+    [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller,
+    [MAUVILLE_MAN_GIDDY]       = &gEventObjectGraphicsInfo_Giddy,
+    [MAUVILLE_MAN_UNUSED1]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    [MAUVILLE_MAN_UNUSED2]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
 };
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
new file mode 100644
index 000000000..6af8ee2a6
--- /dev/null
+++ b/src/data/party_menu.h
@@ -0,0 +1,1255 @@
+static const struct BgTemplate sPartyMenuBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 28,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+};
+
+enum
+{
+    PARTY_BOX_LEFT_COLUMN,
+    PARTY_BOX_RIGHT_COLUMN
+};
+
+static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
+{
+    [PARTY_BOX_LEFT_COLUMN] = 
+    {
+        BlitBitmapToPartyWindow_LeftColumn, 
+        {
+            //The below are the x, y, width, and height for each of the following info
+            24, 11, 40, 13, // Nickname
+            32, 20, 32,  8, // Level
+            64, 20,  8,  8, // Gender
+            38, 37, 24,  8, // HP
+            53, 37, 24,  8, // Max HP
+            24, 35, 48,  3  // HP bar
+        }, 
+        12, 34, 64, 16      // Description text (e.g. NO USE)
+    },
+    [PARTY_BOX_RIGHT_COLUMN] = 
+    {
+        BlitBitmapToPartyWindow_RightColumn, 
+        {
+             // See above comment
+             22,  3, 40, 13, // Nickname
+             30, 12, 32,  8, // Level
+             62, 12,  8,  8, // Gender
+            102, 12, 24,  8, // HP
+            117, 12, 24,  8, // Max HP
+             88, 10, 48,  3  // HP bar
+        }, 
+        77, 4, 64, 16        // Description text
+    },
+};
+
+
+// Each layout array has an array for each of the 6 party slots
+// The array for each slot has the sprite coords of its various sprites in the following order
+// Pokemon icon (x, y), held item (x, y), status condition (x, y), menu pokeball (x, y)
+static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
+{
+    [PARTY_LAYOUT_SINGLE] = 
+    {
+        { 16,  40,  20,  50,  50,  52,  16,  34},
+        {104,  18, 108,  28, 136,  27, 102,  25},
+        {104,  42, 108,  52, 136,  51, 102,  49},
+        {104,  66, 108,  76, 136,  75, 102,  73},
+        {104,  90, 108, 100, 136,  99, 102,  97},
+        {104, 114, 108, 124, 136, 123, 102, 121},
+    },
+    [PARTY_LAYOUT_DOUBLE] = 
+    {
+        {16, 24, 20, 34, 50, 36, 16, 18},
+        {16, 80, 20, 90, 50, 92, 16, 74},
+        {104, 18, 108, 28, 136, 27, 102, 25},
+        {104, 50, 108, 60, 136, 59, 102, 57},
+        {104, 82, 108, 92, 136, 91, 102, 89},
+        {104, 114, 108, 124, 136, 123, 102, 121},
+    },
+    [PARTY_LAYOUT_MULTI] = 
+    {
+        {16, 24, 20, 34, 50, 36, 16, 18},
+        {16, 80, 20, 90, 50, 92, 16, 74},
+        {104, 26, 106, 36, 136, 35, 102, 33},
+        {104, 50, 106, 60, 136, 59, 102, 57},
+        {104, 82, 106, 92, 136, 91, 102, 89},
+        {104, 106, 106, 116, 136, 115, 102, 113},
+    },
+    [PARTY_LAYOUT_MULTI_SHOWCASE] = 
+    {
+        {16, 32, 20, 42, 50, 44, 16, 26},
+        {104, 34, 106, 44, 136, 43, 102, 41},
+        {104, 58, 106, 68, 136, 67, 102, 65},
+        {16, 104, 20, 114, 50, 116, 16, 98},
+        {104, 106, 106, 116, 136, 115, 102, 113},
+        {104, 130, 106, 140, 136, 139, 102, 137},
+    },
+};
+
+// Used only when both Cancel and Confirm are present
+static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_confirm_button.bin");
+static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_cancel_button.bin");
+
+// Text colors for BG, FG, and Shadow in that order
+static const u8 sFontColorTable[][3] =
+{
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY},  // Default
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_GREEN},      // Unused
+    {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2,  TEXT_DYNAMIC_COLOR_3},  // Gender symbol
+    {TEXT_COLOR_WHITE,       TEXT_COLOR_DARK_GREY,  TEXT_COLOR_LIGHT_GREY}, // Selection actions
+    {TEXT_COLOR_WHITE,       TEXT_COLOR_BLUE,       TEXT_COLOR_LIGHT_BLUE}, // Field moves
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_DARK_GREY},  // Unused
+};
+
+static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 3,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 1,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 4,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xDF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 7,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x115,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 10,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x14B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 13,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x181,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 1,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xEF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 5,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x125,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 9,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x15B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 13,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x191,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 2,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xEF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 5,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x125,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 9,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x15B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 12,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x191,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 2,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 3,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 6,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0xDF,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 11,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0x115,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 12,
+        .tilemapTop = 12,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x16B,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 12,
+        .tilemapTop = 15,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x1A1,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sCancelButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 17,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1C7,
+};
+
+static const struct WindowTemplate sMultiCancelButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 18,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1C7,
+};
+
+static const struct WindowTemplate sConfirmButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 16,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1D3,
+};
+
+static const struct WindowTemplate sDefaultPartyMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 21,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x24F,
+};
+
+static const struct WindowTemplate sDoWhatWithMonMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 16,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x279,
+};
+
+static const struct WindowTemplate sDoWhatWithItemMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 20,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sDoWhatWithMailMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 18,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sWhichMoveMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 16,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sAlreadyHoldingOneMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 15,
+    .width = 20,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sItemGiveTakeWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 23,
+    .tilemapTop = 13,
+    .width = 6,
+    .height = 6,
+    .paletteNum = 14,
+    .baseBlock = 0x39D,
+};
+
+static const struct WindowTemplate sMailReadTakeWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 21,
+    .tilemapTop = 13,
+    .width = 8,
+    .height = 6,
+    .paletteNum = 14,
+    .baseBlock = 0x39D,
+};
+
+static const struct WindowTemplate sMoveSelectWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 19,
+    .tilemapTop = 11,
+    .width = 10,
+    .height = 8,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sPartyMenuYesNoWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sLevelUpStatsWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 19,
+    .tilemapTop = 1,
+    .width = 10,
+    .height = 11,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sUnusedWindowTemplate_08615978 =
+{
+    .bg = 2,
+    .tilemapLeft = 2,
+    .tilemapTop = 15,
+    .width = 27,
+    .height = 4,
+    .paletteNum = 14,
+    .baseBlock = 0x1DF,
+};
+
+static const struct WindowTemplate sUnusedWindowTemplate_08615980 =
+{
+    .bg = 2,
+    .tilemapLeft = 0,
+    .tilemapTop = 13,
+    .width = 18,
+    .height = 3,
+    .paletteNum = 12,
+    .baseBlock = 0x39D,
+};
+
+// Tile nums
+static const u8 sMainSlotTileNums[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       40, 59, 60, 58, 58, 58, 58, 58, 58, 61,
+                                       15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+                                       46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
+
+static const u8 sMainSlotTileNums_Egg[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
+                                           15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+                                           46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
+
+static const u8 sOtherSlotsTileNums[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
+                                         49, 33, 33, 33, 33, 33, 33, 33, 33, 52, 53, 51, 51, 51, 51, 51, 51, 54,
+                                         55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
+
+static const u8 sOtherSlotsTileNums_Egg[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
+                                             49, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 50,
+                                             55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
+
+static const u8 sEmptySlotTileNums[] = {21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
+                                        30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+                                        37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39};
+
+// Palette offsets
+static const u8 sGenderPalOffsets[] = {11, 12};
+static const u8 sHPBarPalOffsets[] = {9, 10};
+static const u8 sPartyBoxPalOffsets1[] = {4, 5, 6};
+static const u8 sPartyBoxPalOffsets2[] = {1, 7, 8};
+static const u8 sPartyBoxNoMonPalOffsets[] = {1, 11, 12};
+
+// Palette ids
+static const u8 sGenderMalePalIds[] = {59, 60};
+static const u8 sGenderFemalePalIds[] = {75, 76};
+static const u8 sHPBarGreenPalIds[] = {57, 58};
+static const u8 sHPBarYellowPalIds[] = {73, 74};
+static const u8 sHPBarRedPalIds[] = {89, 90};
+static const u8 sPartyBoxEmptySlotPalIds1[] = {52, 53, 54};
+static const u8 sPartyBoxMultiPalIds1[] = {68, 69, 70};
+static const u8 sPartyBoxFaintedPalIds1[] = {84, 85, 86};
+static const u8 sPartyBoxCurrSelectionPalIds1[] = {116, 117, 118};
+static const u8 sPartyBoxCurrSelectionMultiPalIds[] = {132, 133, 134};
+static const u8 sPartyBoxCurrSelectionFaintedPalIds[] = {148, 149, 150};
+static const u8 sPartyBoxSelectedForActionPalIds1[] = {100, 101, 102};
+static const u8 sPartyBoxEmptySlotPalIds2[] = {49, 55, 56};
+static const u8 sPartyBoxMultiPalIds2[] = {65, 71, 72};
+static const u8 sPartyBoxFaintedPalIds2[] = {81, 87, 88};
+static const u8 sPartyBoxCurrSelectionPalIds2[] = {97, 103, 104};
+static const u8 sPartyBoxSelectedForActionPalIds2[] = {161, 167, 168};
+static const u8 sPartyBoxNoMonPalIds[] = {17, 27, 28};
+
+static const u8 *const sActionStringTable[] =
+{
+    [PARTY_MSG_CHOOSE_MON]             = gText_ChoosePokemon,
+    [PARTY_MSG_CHOOSE_MON_OR_CANCEL]   = gText_ChoosePokemonCancel,
+    [PARTY_MSG_CHOOSE_MON_AND_CONFIRM] = gText_ChoosePokemonConfirm,
+    [PARTY_MSG_MOVE_TO_WHERE]          = gText_MoveToWhere,
+    [PARTY_MSG_TEACH_WHICH_MON]        = gText_TeachWhichPokemon,
+    [PARTY_MSG_USE_ON_WHICH_MON]       = gText_UseOnWhichPokemon,
+    [PARTY_MSG_GIVE_TO_WHICH_MON]      = gText_GiveToWhichPokemon,
+    [PARTY_MSG_NOTHING_TO_CUT]         = gText_NothingToCut,
+    [PARTY_MSG_CANT_SURF_HERE]         = gText_CantSurfHere,
+    [PARTY_MSG_ALREADY_SURFING]        = gText_AlreadySurfing,
+    [PARTY_MSG_CURRENT_TOO_FAST]       = gText_CurrentIsTooFast,
+    [PARTY_MSG_ENJOY_CYCLING]          = gText_EnjoyCycling,
+    [PARTY_MSG_ALREADY_IN_USE]         = gText_InUseAlready_PM,
+    [PARTY_MSG_CANT_USE_HERE]          = gText_CantUseHere,
+    [PARTY_MSG_NO_MON_FOR_BATTLE]      = gText_NoPokemonForBattle,
+    [PARTY_MSG_CHOOSE_MON_2]           = gText_ChoosePokemon2,
+    [PARTY_MSG_NOT_ENOUGH_HP]          = gText_NotEnoughHp,
+    [PARTY_MSG_X_MONS_ARE_NEEDED]      = gText_PokemonAreNeeded,
+    [PARTY_MSG_MONS_CANT_BE_SAME]      = gText_PokemonCantBeSame,
+    [PARTY_MSG_NO_SAME_HOLD_ITEMS]     = gText_NoIdenticalHoldItems,
+    [PARTY_MSG_UNUSED]                 = gText_EmptyString2,
+    [PARTY_MSG_DO_WHAT_WITH_MON]       = gText_DoWhatWithPokemon,
+    [PARTY_MSG_RESTORE_WHICH_MOVE]     = gText_RestoreWhichMove,
+    [PARTY_MSG_BOOST_PP_WHICH_MOVE]    = gText_BoostPp,
+    [PARTY_MSG_DO_WHAT_WITH_ITEM]      = gText_DoWhatWithItem,
+    [PARTY_MSG_DO_WHAT_WITH_MAIL]      = gText_DoWhatWithMail,
+    [PARTY_MSG_ALREADY_HOLDING_ONE]    = gText_AlreadyHoldingOne,
+};
+
+static const u8 *const sDescriptionStringTable[] =
+{
+    [PARTYBOX_DESC_NO_USE]     = gText_NoUse,
+    [PARTYBOX_DESC_ABLE_3]     = gText_Able,
+    [PARTYBOX_DESC_FIRST]      = gText_First_PM,
+    [PARTYBOX_DESC_SECOND]     = gText_Second_PM,
+    [PARTYBOX_DESC_THIRD]      = gText_Third_PM,
+    [PARTYBOX_DESC_FOURTH]     = gText_Fourth,
+    [PARTYBOX_DESC_ABLE]       = gText_Able2,
+    [PARTYBOX_DESC_NOT_ABLE]   = gText_NotAble,
+    [PARTYBOX_DESC_ABLE_2]     = gText_Able3,
+    [PARTYBOX_DESC_NOT_ABLE_2] = gText_NotAble2,
+    [PARTYBOX_DESC_LEARNED]    = gText_Learned,
+    [PARTYBOX_DESC_HAVE]       = gText_Have,
+    [PARTYBOX_DESC_DONT_HAVE]  = gText_DontHave,
+};
+
+static const u16 sUnused_08615B94[] =
+{
+    0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071,
+    0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068,
+    0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d,
+    0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123,
+};
+
+enum
+{
+    MENU_SUMMARY,
+    MENU_SWITCH,
+    MENU_CANCEL1,
+    MENU_ITEM,
+    MENU_GIVE,
+    MENU_TAKE_ITEM,
+    MENU_MAIL,
+    MENU_TAKE_MAIL,
+    MENU_READ,
+    MENU_CANCEL2,
+    MENU_SHIFT,
+    MENU_SEND_OUT,
+    MENU_ENTER,
+    MENU_NO_ENTRY,
+    MENU_STORE,
+    MENU_REGISTER,
+    MENU_TRADE1,
+    MENU_TRADE2,
+    MENU_TOSS,
+    MENU_FIELD_MOVES,
+};
+
+enum
+{
+    FIELD_MOVE_CUT,
+    FIELD_MOVE_FLASH,
+    FIELD_MOVE_ROCK_SMASH,
+    FIELD_MOVE_STRENGTH,
+    FIELD_MOVE_SURF,
+    FIELD_MOVE_FLY,
+    FIELD_MOVE_DIVE,
+    FIELD_MOVE_WATERFALL,
+    FIELD_MOVE_TELEPORT,
+    FIELD_MOVE_DIG,
+    FIELD_MOVE_SECRET_POWER,
+    FIELD_MOVE_MILK_DRINK,
+    FIELD_MOVE_SOFT_BOILED,
+    FIELD_MOVE_SWEET_SCENT,
+};
+
+// What a weird choice of table termination;
+#define FIELD_MOVE_TERMINATOR MOVE_SWORDS_DANCE
+
+struct
+{
+    const u8 *text;
+    TaskFunc func;
+} static const sCursorOptions[] =
+{
+    [MENU_SUMMARY] = {gText_Summary5, CursorCb_Summary},
+    [MENU_SWITCH] = {gText_Switch2, CursorCb_Switch},
+    [MENU_CANCEL1] = {gText_Cancel2, CursorCb_Cancel1},
+    [MENU_ITEM] = {gText_Item, CursorCb_Item},
+    [MENU_GIVE] = {gMenuText_Give, CursorCb_Give},
+    [MENU_TAKE_ITEM] = {gText_Take, CursorCb_TakeItem},
+    [MENU_MAIL] = {gText_Mail, CursorCb_Mail},
+    [MENU_TAKE_MAIL] = {gText_Take2, CursorCb_TakeMail},
+    [MENU_READ] = {gText_Read2, CursorCb_Read},
+    [MENU_CANCEL2] = {gText_Cancel2, CursorCb_Cancel2},
+    [MENU_SHIFT] = {gText_Shift, CursorCb_SendMon},
+    [MENU_SEND_OUT] = {gText_SendOut, CursorCb_SendMon},
+    [MENU_ENTER] = {gText_Enter, CursorCb_Enter},
+    [MENU_NO_ENTRY] = {gText_NoEntry, CursorCb_NoEntry},
+    [MENU_STORE] = {gText_Store, CursorCb_Store},
+    [MENU_REGISTER] = {gText_Register, CursorCb_Register},
+    [MENU_TRADE1] = {gText_Trade4, CursorCb_Trade1},
+    [MENU_TRADE2] = {gText_Trade4, CursorCb_Trade2},
+    [MENU_TOSS] = {gMenuText_Toss, CursorCb_Toss},
+    [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMoveNames[MOVE_CUT], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMoveNames[MOVE_FLASH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMoveNames[MOVE_ROCK_SMASH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMoveNames[MOVE_STRENGTH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMoveNames[MOVE_SURF], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMoveNames[MOVE_FLY], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMoveNames[MOVE_DIVE], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMoveNames[MOVE_WATERFALL], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMoveNames[MOVE_TELEPORT], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMoveNames[MOVE_DIG], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMoveNames[MOVE_SECRET_POWER], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMoveNames[MOVE_MILK_DRINK], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMoveNames[MOVE_SOFT_BOILED], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMoveNames[MOVE_SWEET_SCENT], CursorCb_FieldMove},
+};
+
+static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1};
+static const u8 sPartyMenuAction_ShiftSummaryCancel[] = {MENU_SHIFT, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_SendOutSummaryCancel[] = {MENU_SEND_OUT, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_SummaryCancel[] = {MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_EnterSummaryCancel[] = {MENU_ENTER, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_NoEntrySummaryCancel[] = {MENU_NO_ENTRY, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_StoreSummaryCancel[] = {MENU_STORE, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_GiveTakeItemCancel[] = {MENU_GIVE, MENU_TAKE_ITEM, MENU_CANCEL2};
+static const u8 sPartyMenuAction_ReadTakeMailCancel[] = {MENU_READ, MENU_TAKE_MAIL, MENU_CANCEL2};
+static const u8 sPartyMenuAction_RegisterSummaryCancel[] = {MENU_REGISTER, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TradeSummaryCancel1[] = {MENU_TRADE1, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TradeSummaryCancel2[] = {MENU_TRADE2, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TakeItemTossCancel[] = {MENU_TAKE_ITEM, MENU_TOSS, MENU_CANCEL1};
+
+// IDs for the action lists that appear when a party mon is selected
+enum
+{
+    ACTIONS_NONE,
+    ACTIONS_SWITCH,
+    ACTIONS_SHIFT,
+    ACTIONS_SEND_OUT,
+    ACTIONS_ENTER,
+    ACTIONS_NO_ENTRY,
+    ACTIONS_STORE,
+    ACTIONS_SUMMARY_ONLY,
+    ACTIONS_ITEM,
+    ACTIONS_MAIL,
+    ACTIONS_REGISTER,
+    ACTIONS_TRADE,
+    ACTIONS_SPIN_TRADE,
+    ACTIONS_TAKEITEM_TOSS
+};
+
+static const u8 *const sPartyMenuActions[] =
+{
+    [ACTIONS_NONE]          = NULL,
+    [ACTIONS_SWITCH]        = sPartyMenuAction_SummarySwitchCancel,
+    [ACTIONS_SHIFT]         = sPartyMenuAction_ShiftSummaryCancel,
+    [ACTIONS_SEND_OUT]      = sPartyMenuAction_SendOutSummaryCancel,
+    [ACTIONS_ENTER]         = sPartyMenuAction_EnterSummaryCancel,
+    [ACTIONS_NO_ENTRY]      = sPartyMenuAction_NoEntrySummaryCancel,
+    [ACTIONS_STORE]         = sPartyMenuAction_StoreSummaryCancel,
+    [ACTIONS_SUMMARY_ONLY]  = sPartyMenuAction_SummaryCancel,
+    [ACTIONS_ITEM]          = sPartyMenuAction_GiveTakeItemCancel,
+    [ACTIONS_MAIL]          = sPartyMenuAction_ReadTakeMailCancel,
+    [ACTIONS_REGISTER]      = sPartyMenuAction_RegisterSummaryCancel,
+    [ACTIONS_TRADE]         = sPartyMenuAction_TradeSummaryCancel1,
+    [ACTIONS_SPIN_TRADE]    = sPartyMenuAction_TradeSummaryCancel2,
+    [ACTIONS_TAKEITEM_TOSS] = sPartyMenuAction_TakeItemTossCancel,
+};
+
+static const u8 sPartyMenuActionCounts[] =
+{
+    [ACTIONS_NONE]          = 0,
+    [ACTIONS_SWITCH]        = ARRAY_COUNT(sPartyMenuAction_SummarySwitchCancel),
+    [ACTIONS_SHIFT]         = ARRAY_COUNT(sPartyMenuAction_ShiftSummaryCancel),
+    [ACTIONS_SEND_OUT]      = ARRAY_COUNT(sPartyMenuAction_SendOutSummaryCancel),
+    [ACTIONS_ENTER]         = ARRAY_COUNT(sPartyMenuAction_EnterSummaryCancel),
+    [ACTIONS_NO_ENTRY]      = ARRAY_COUNT(sPartyMenuAction_NoEntrySummaryCancel),
+    [ACTIONS_STORE]         = ARRAY_COUNT(sPartyMenuAction_StoreSummaryCancel),
+    [ACTIONS_SUMMARY_ONLY]  = ARRAY_COUNT(sPartyMenuAction_SummaryCancel),
+    [ACTIONS_ITEM]          = ARRAY_COUNT(sPartyMenuAction_GiveTakeItemCancel),
+    [ACTIONS_MAIL]          = ARRAY_COUNT(sPartyMenuAction_ReadTakeMailCancel),
+    [ACTIONS_REGISTER]      = ARRAY_COUNT(sPartyMenuAction_RegisterSummaryCancel),
+    [ACTIONS_TRADE]         = ARRAY_COUNT(sPartyMenuAction_TradeSummaryCancel1),
+    [ACTIONS_SPIN_TRADE]    = ARRAY_COUNT(sPartyMenuAction_TradeSummaryCancel2),
+    [ACTIONS_TAKEITEM_TOSS] = ARRAY_COUNT(sPartyMenuAction_TakeItemTossCancel)
+};
+
+static const u16 sFieldMoves[] =
+{
+    MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH, MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_TELEPORT,
+    MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK, MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, FIELD_MOVE_TERMINATOR
+};
+
+struct
+{
+    bool8 (*fieldMoveFunc)(void);
+    u8 msgId;
+} static const sFieldMoveCursorCallbacks[] =
+{
+    [FIELD_MOVE_CUT]          = {SetUpFieldMove_Cut,         PARTY_MSG_NOTHING_TO_CUT},
+    [FIELD_MOVE_FLASH]        = {SetUpFieldMove_Flash,       PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_ROCK_SMASH]   = {SetUpFieldMove_RockSmash,   PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_STRENGTH]     = {SetUpFieldMove_Strength,    PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_SURF]         = {SetUpFieldMove_Surf,        PARTY_MSG_CANT_SURF_HERE},
+    [FIELD_MOVE_FLY]          = {SetUpFieldMove_Fly,         PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_DIVE]         = {SetUpFieldMove_Dive,        PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_WATERFALL]    = {SetUpFieldMove_Waterfall,   PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_TELEPORT]     = {SetUpFieldMove_Teleport,    PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_DIG]          = {SetUpFieldMove_Dig,         PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_SECRET_POWER] = {SetUpFieldMove_SecretPower, PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_MILK_DRINK]   = {SetUpFieldMove_SoftBoiled,  PARTY_MSG_NOT_ENOUGH_HP},
+    [FIELD_MOVE_SOFT_BOILED]  = {SetUpFieldMove_SoftBoiled,  PARTY_MSG_NOT_ENOUGH_HP},
+    [FIELD_MOVE_SWEET_SCENT]  = {SetUpFieldMove_SweetScent,  PARTY_MSG_CANT_USE_HERE},
+};
+
+static const u8 *const sUnionRoomTradeMessages[] =
+{
+    [UR_TRADE_MSG_NOT_MON_PARTNER_WANTS - 1]       = gText_NotPkmnOtherTrainerWants,
+    [UR_TRADE_MSG_NOT_EGG - 1]                     = gText_ThatIsntAnEgg,
+    [UR_TRADE_MSG_MON_CANT_BE_TRADED_1 - 1]        = gText_PkmnCantBeTradedNow,
+    [UR_TRADE_MSG_MON_CANT_BE_TRADED_2 - 1]        = gText_PkmnCantBeTradedNow,
+    [UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED - 1] = gText_OtherTrainersPkmnCantBeTraded,
+    [UR_TRADE_MSG_EGG_CANT_BE_TRADED -1]           = gText_EggCantBeTradedNow,
+    [UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON - 1]     = gText_OtherTrainerCantAcceptPkmn,
+    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 - 1]   = gText_CantTradeWithTrainer,
+    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 - 1]   = gText_CantTradeWithTrainer,
+};
+
+static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp");
+static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
+
+static const struct OamData sOamData_HeldItem =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_HeldItem[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_HeldMail[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_HeldItem[] =
+{
+    sSpriteAnim_HeldItem,
+    sSpriteAnim_HeldMail,
+};
+
+static const struct SpriteSheet sSpriteSheet_HeldItem =
+{
+    sHeldItemGfx, sizeof(sHeldItemGfx), 0xd750
+};
+
+static const struct SpritePalette sSpritePalette_HeldItem =
+{
+    sHeldItemPalette, 0xd750
+};
+
+static const struct SpriteTemplate sSpriteTemplate_HeldItem =
+{
+    0xd750,
+    0xd750,
+    &sOamData_HeldItem,
+    sSpriteAnimTable_HeldItem,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+static const struct OamData sOamData_MenuPokeball =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sPokeballAnim_Closed[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sPokeballAnim_Open[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_MenuPokeball[] =
+{
+    sPokeballAnim_Closed,
+    sPokeballAnim_Open
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeball =
+{
+    gPartyMenuPokeball_Gfx, 0x400, 0x04b0
+};
+
+static const struct CompressedSpritePalette sSpritePalette_MenuPokeball =
+{
+    gPartyMenuPokeball_Pal, 0x04b0
+};
+
+// Used for the pokeball sprite on each party slot / Cancel button
+static const struct SpriteTemplate sSpriteTemplate_MenuPokeball =
+{
+    .tileTag = 0x04b0,
+    .paletteTag = 0x04b0,
+    .oam = &sOamData_MenuPokeball,
+    .anims = sSpriteAnimTable_MenuPokeball,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct OamData sOamData_MenuPokeballSmall =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSmallPokeballAnim_Closed[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Open[] =
+{
+    ANIMCMD_FRAME(4, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank1[] =
+{
+    ANIMCMD_FRAME(8, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank2[] =
+{
+    ANIMCMD_FRAME(12, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank3[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank4[] =
+{
+    ANIMCMD_FRAME(20, 0),
+    ANIMCMD_END
+};
+
+// The blanks below are never used. See SpriteCB_BounceConfirmCancelButton, where they were intended to be used
+static const union AnimCmd *const sSpriteAnimTable_MenuPokeballSmall[] =
+{
+    sSmallPokeballAnim_Closed,
+    sSmallPokeballAnim_Open,
+    sSmallPokeballAnim_Blank1,
+    sSmallPokeballAnim_Blank2,
+    sSmallPokeballAnim_Blank3,
+    sSmallPokeballAnim_Blank4
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall =
+{
+    gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
+};
+
+// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used
+static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall =
+{
+    .tileTag = 1201,
+    .paletteTag = 1200,
+    .oam = &sOamData_MenuPokeballSmall,
+    .anims = sSpriteAnimTable_MenuPokeballSmall,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct OamData sOamData_StatusCondition =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSpriteAnim_StatusPoison[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusParalyzed[] =
+{
+    ANIMCMD_FRAME(4, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusSleep[] =
+{
+    ANIMCMD_FRAME(8, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusFrozen[] =
+{
+    ANIMCMD_FRAME(12, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusBurn[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusPokerus[] =
+{
+    ANIMCMD_FRAME(20, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusFaint[] =
+{
+    ANIMCMD_FRAME(24, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_Blank[] =
+{
+    ANIMCMD_FRAME(28, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteTemplate_StatusCondition[] =
+{
+    sSpriteAnim_StatusPoison,
+    sSpriteAnim_StatusParalyzed,
+    sSpriteAnim_StatusSleep,
+    sSpriteAnim_StatusFrozen,
+    sSpriteAnim_StatusBurn,
+    sSpriteAnim_StatusPokerus,
+    sSpriteAnim_StatusFaint,
+    sSpriteAnim_Blank
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_StatusIcons =
+{
+    gStatusGfx_Icons, 0x400, 1202
+};
+
+static const struct CompressedSpritePalette sSpritePalette_StatusIcons =
+{
+    gStatusPal_Icons, 1202
+};
+
+static const struct SpriteTemplate sSpriteTemplate_StatusIcons =
+{
+    .tileTag = 1202,
+    .paletteTag = 1202,
+    .oam = &sOamData_StatusCondition,
+    .anims = sSpriteTemplate_StatusCondition,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// Mask for the partners party in a multi battle. TRUE if in the partners party, FALSE otherwise
+// The 7th slot is Cancel, and the 8th slot is unreachable
+// Used only to determine whether or not to show the Deoxys form icon sprite
+static const bool8 sMultiBattlePartnersPartyMask[PARTY_SIZE + 2] = 
+{
+    FALSE, 
+    TRUE, 
+    FALSE, 
+    FALSE, 
+    TRUE, 
+    TRUE, 
+    FALSE
+};
+
+static const u8 *const sUnused_StatStrings[] =
+{
+    gText_HP4,
+    gText_Attack3,
+    gText_Defense3,
+    gText_SpAtk4,
+    gText_SpDef4,
+    gText_Speed2
+};
+
+static const u16 sTMHMMoves[] =
+{
+    MOVE_FOCUS_PUNCH,
+    MOVE_DRAGON_CLAW,
+    MOVE_WATER_PULSE,
+    MOVE_CALM_MIND,
+    MOVE_ROAR,
+    MOVE_TOXIC,
+    MOVE_HAIL,
+    MOVE_BULK_UP,
+    MOVE_BULLET_SEED,
+    MOVE_HIDDEN_POWER,
+    MOVE_SUNNY_DAY,
+    MOVE_TAUNT,
+    MOVE_ICE_BEAM,
+    MOVE_BLIZZARD,
+    MOVE_HYPER_BEAM,
+    MOVE_LIGHT_SCREEN,
+    MOVE_PROTECT,
+    MOVE_RAIN_DANCE,
+    MOVE_GIGA_DRAIN,
+    MOVE_SAFEGUARD,
+    MOVE_FRUSTRATION,
+    MOVE_SOLAR_BEAM,
+    MOVE_IRON_TAIL,
+    MOVE_THUNDERBOLT,
+    MOVE_THUNDER,
+    MOVE_EARTHQUAKE,
+    MOVE_RETURN,
+    MOVE_DIG,
+    MOVE_PSYCHIC,
+    MOVE_SHADOW_BALL,
+    MOVE_BRICK_BREAK,
+    MOVE_DOUBLE_TEAM,
+    MOVE_REFLECT,
+    MOVE_SHOCK_WAVE,
+    MOVE_FLAMETHROWER,
+    MOVE_SLUDGE_BOMB,
+    MOVE_SANDSTORM,
+    MOVE_FIRE_BLAST,
+    MOVE_ROCK_TOMB,
+    MOVE_AERIAL_ACE,
+    MOVE_TORMENT,
+    MOVE_FACADE,
+    MOVE_SECRET_POWER,
+    MOVE_REST,
+    MOVE_ATTRACT,
+    MOVE_THIEF,
+    MOVE_STEEL_WING,
+    MOVE_SKILL_SWAP,
+    MOVE_SNATCH,
+    MOVE_OVERHEAT,
+    MOVE_CUT,
+    MOVE_FLY,
+    MOVE_SURF,
+    MOVE_STRENGTH,
+    MOVE_FLASH,
+    MOVE_ROCK_SMASH,
+    MOVE_WATERFALL,
+    MOVE_DIVE,
+};
diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h
index 727cc0959..c78b9ef0a 100644
--- a/src/data/pokemon/level_up_learnsets.h
+++ b/src/data/pokemon/level_up_learnsets.h
@@ -1,5 +1,4 @@
 #define LEVEL_UP_MOVE(lvl, move) ((lvl << 9) | move)
-#define LEVEL_UP_END 0xffff
 
 static const u16 sBulbasaurLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 1, MOVE_TACKLE),
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 252eed760..477967b95 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -6,7 +6,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -14,7 +14,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -27,7 +27,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -35,7 +35,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -43,7 +43,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -51,7 +51,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -59,7 +59,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -100,7 +100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -147,7 +147,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -163,7 +163,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -171,7 +171,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -184,7 +184,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -197,7 +197,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -215,7 +215,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -223,7 +223,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -236,7 +236,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -244,7 +244,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -252,7 +252,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -260,7 +260,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -273,7 +273,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -281,7 +281,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -289,7 +289,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt22[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -1474,7 +1474,7 @@ static const struct TrainerMonItemCustomMoves sParty_Daphne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt23[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1803,7 +1803,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt24[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -2312,7 +2312,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2325,7 +2325,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt26[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7594,7 +7594,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -7607,7 +7607,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7620,7 +7620,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -7633,7 +7633,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt30[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = {
     {
     .iv = 50,
     .lvl = 22,
@@ -7724,7 +7724,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt31[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -7780,7 +7780,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7793,7 +7793,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7801,7 +7801,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7809,7 +7809,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7817,7 +7817,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt36[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7880,7 +7880,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt37[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -9645,7 +9645,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9653,7 +9653,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9661,7 +9661,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9669,7 +9669,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9682,7 +9682,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9695,7 +9695,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9703,7 +9703,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9711,7 +9711,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9719,7 +9719,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9727,7 +9727,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9735,7 +9735,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9743,7 +9743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9751,7 +9751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9759,7 +9759,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9767,7 +9767,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9775,7 +9775,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt53[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] = {
     {
     .iv = 0,
     .lvl = 29,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index c30d21afd..327107007 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Sawyer1},
     },
 
-    [TRAINER_GRUNT_1] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -37,11 +37,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt1),
-        .party = {.NoItemDefaultMoves = sParty_Grunt1},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout1},
     },
 
-    [TRAINER_GRUNT_2] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -51,11 +51,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt2),
-        .party = {.NoItemDefaultMoves = sParty_Grunt2},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout2},
     },
 
-    [TRAINER_GRUNT_3] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -65,11 +65,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt3),
-        .party = {.NoItemDefaultMoves = sParty_Grunt3},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout3},
     },
 
-    [TRAINER_GRUNT_4] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -79,11 +79,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt4),
-        .party = {.NoItemDefaultMoves = sParty_Grunt4},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout4},
     },
 
-    [TRAINER_GRUNT_5] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -93,11 +93,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt5),
-        .party = {.NoItemDefaultMoves = sParty_Grunt5},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern1},
     },
 
-    [TRAINER_GRUNT_6] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -107,11 +107,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt6),
-        .party = {.NoItemDefaultMoves = sParty_Grunt6},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern2},
     },
 
-    [TRAINER_GRUNT_7] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -121,8 +121,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt7),
-        .party = {.NoItemDefaultMoves = sParty_Grunt7},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern3},
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Gabrielle1},
     },
 
-    [TRAINER_GRUNT_8] =
+    [TRAINER_GRUNT_PETALBURG_WOODS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -149,8 +149,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt8),
-        .party = {.NoItemDefaultMoves = sParty_Grunt8},
+        .partySize = ARRAY_COUNT(sParty_GruntPetalburgWoods),
+        .party = {.NoItemDefaultMoves = sParty_GruntPetalburgWoods},
     },
 
     [TRAINER_MARCEL] =
@@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Ed},
     },
 
-    [TRAINER_GRUNT_9] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -205,8 +205,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt9),
-        .party = {.NoItemDefaultMoves = sParty_Grunt9},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern4},
     },
 
     [TRAINER_DECLAN] =
@@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Declan},
     },
 
-    [TRAINER_GRUNT_10] =
+    [TRAINER_GRUNT_RUSTURF_TUNNEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -233,11 +233,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt10),
-        .party = {.NoItemDefaultMoves = sParty_Grunt10},
+        .partySize = ARRAY_COUNT(sParty_GruntRusturfTunnel),
+        .party = {.NoItemDefaultMoves = sParty_GruntRusturfTunnel},
     },
 
-    [TRAINER_GRUNT_11] =
+    [TRAINER_GRUNT_WEATHER_INST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -247,11 +247,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt11),
-        .party = {.NoItemDefaultMoves = sParty_Grunt11},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst1),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst1},
     },
 
-    [TRAINER_GRUNT_12] =
+    [TRAINER_GRUNT_WEATHER_INST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -261,11 +261,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt12),
-        .party = {.NoItemDefaultMoves = sParty_Grunt12},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst2),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst2},
     },
 
-    [TRAINER_GRUNT_13] =
+    [TRAINER_GRUNT_WEATHER_INST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -275,11 +275,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt13),
-        .party = {.NoItemDefaultMoves = sParty_Grunt13},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst3),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst3},
     },
 
-    [TRAINER_GRUNT_14] =
+    [TRAINER_GRUNT_MUSEUM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -289,11 +289,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt14),
-        .party = {.NoItemDefaultMoves = sParty_Grunt14},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum1},
     },
 
-    [TRAINER_GRUNT_15] =
+    [TRAINER_GRUNT_MUSEUM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -303,11 +303,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt15),
-        .party = {.NoItemDefaultMoves = sParty_Grunt15},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum2},
     },
 
-    [TRAINER_GRUNT_16] =
+    [TRAINER_GRUNT_SPACE_CENTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -317,11 +317,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt16),
-        .party = {.NoItemDefaultMoves = sParty_Grunt16},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter1},
     },
 
-    [TRAINER_GRUNT_17] =
+    [TRAINER_GRUNT_MT_PYRE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -331,11 +331,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt17),
-        .party = {.NoItemDefaultMoves = sParty_Grunt17},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre1},
     },
 
-    [TRAINER_GRUNT_18] =
+    [TRAINER_GRUNT_MT_PYRE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -345,11 +345,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt18),
-        .party = {.NoItemDefaultMoves = sParty_Grunt18},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre2},
     },
 
-    [TRAINER_GRUNT_19] =
+    [TRAINER_GRUNT_MT_PYRE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -359,11 +359,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt19),
-        .party = {.NoItemDefaultMoves = sParty_Grunt19},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre3},
     },
 
-    [TRAINER_GRUNT_20] =
+    [TRAINER_GRUNT_WEATHER_INST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -373,11 +373,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt20),
-        .party = {.NoItemDefaultMoves = sParty_Grunt20},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst4),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst4},
     },
 
-    [TRAINER_GRUNT_21] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -387,11 +387,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt21),
-        .party = {.NoItemDefaultMoves = sParty_Grunt21},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout5},
     },
 
-    [TRAINER_GRUNT_22] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -401,8 +401,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt22),
-        .party = {.NoItemDefaultMoves = sParty_Grunt22},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout6},
     },
 
     [TRAINER_FREDRICK] =
@@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = {
         .party = {.ItemCustomMoves = sParty_Daphne},
     },
 
-    [TRAINER_GRUNT_23] =
+    [TRAINER_GRUNT_SPACE_CENTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -1633,8 +1633,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt23),
-        .party = {.NoItemDefaultMoves = sParty_Grunt23},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter2},
     },
 
     [TRAINER_CINDY_2] =
@@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Mark},
     },
 
-    [TRAINER_GRUNT_24] =
+    [TRAINER_GRUNT_MT_CHIMNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -2053,8 +2053,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt24),
-        .party = {.NoItemDefaultMoves = sParty_Grunt24},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney1},
     },
 
     [TRAINER_STEVE_2] =
@@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemCustomMoves = sParty_Kirk},
     },
 
-    [TRAINER_GRUNT_25] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2697,11 +2697,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt25),
-        .party = {.NoItemDefaultMoves = sParty_Grunt25},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout7},
     },
 
-    [TRAINER_GRUNT_26] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2711,8 +2711,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt26),
-        .party = {.NoItemDefaultMoves = sParty_Grunt26},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout8},
     },
 
     [TRAINER_SHAWN] =
@@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Julio},
     },
 
-    [TRAINER_GRUNT_27] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7947,11 +7947,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt27),
-        .party = {.NoItemDefaultMoves = sParty_Grunt27},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern5},
     },
 
-    [TRAINER_GRUNT_28] =
+    [TRAINER_GRUNT_UNUSED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7961,11 +7961,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt28),
-        .party = {.NoItemDefaultMoves = sParty_Grunt28},
+        .partySize = ARRAY_COUNT(sParty_GruntUnused),
+        .party = {.NoItemDefaultMoves = sParty_GruntUnused},
     },
 
-    [TRAINER_GRUNT_29] =
+    [TRAINER_GRUNT_MT_PYRE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7975,11 +7975,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt29),
-        .party = {.NoItemDefaultMoves = sParty_Grunt29},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre4},
     },
 
-    [TRAINER_GRUNT_30] =
+    [TRAINER_GRUNT_JAGGED_PASS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7989,8 +7989,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt30),
-        .party = {.NoItemDefaultMoves = sParty_Grunt30},
+        .partySize = ARRAY_COUNT(sParty_GruntJaggedPass),
+        .party = {.NoItemDefaultMoves = sParty_GruntJaggedPass},
     },
 
     [TRAINER_MARC] =
@@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Harrison},
     },
 
-    [TRAINER_GRUNT_31] =
+    [TRAINER_GRUNT_MT_CHIMNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8115,8 +8115,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt31),
-        .party = {.NoItemDefaultMoves = sParty_Grunt31},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney2},
     },
 
     [TRAINER_CLARENCE] =
@@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Nicholas},
     },
 
-    [TRAINER_GRUNT_32] =
+    [TRAINER_GRUNT_SPACE_CENTER_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8213,11 +8213,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt32),
-        .party = {.NoItemDefaultMoves = sParty_Grunt32},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter3},
     },
 
-    [TRAINER_GRUNT_33] =
+    [TRAINER_GRUNT_SPACE_CENTER_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8227,11 +8227,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt33),
-        .party = {.NoItemDefaultMoves = sParty_Grunt33},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter4},
     },
 
-    [TRAINER_GRUNT_34] =
+    [TRAINER_GRUNT_SPACE_CENTER_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8241,11 +8241,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt34),
-        .party = {.NoItemDefaultMoves = sParty_Grunt34},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter5},
     },
 
-    [TRAINER_GRUNT_35] =
+    [TRAINER_GRUNT_SPACE_CENTER_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8255,11 +8255,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt35),
-        .party = {.NoItemDefaultMoves = sParty_Grunt35},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter6),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter6},
     },
 
-    [TRAINER_GRUNT_36] =
+    [TRAINER_GRUNT_SPACE_CENTER_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8269,8 +8269,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt36),
-        .party = {.NoItemDefaultMoves = sParty_Grunt36},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter7),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter7},
     },
 
     [TRAINER_MACEY] =
@@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Isabella},
     },
 
-    [TRAINER_GRUNT_37] =
+    [TRAINER_GRUNT_WEATHER_INST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -8353,8 +8353,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt37),
-        .party = {.NoItemDefaultMoves = sParty_Grunt37},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst5),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
     },
 
     [TRAINER_TABITHA_2] =
@@ -10023,7 +10023,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Deandre},
     },
 
-    [TRAINER_GRUNT_38] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10033,11 +10033,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt38),
-        .party = {.NoItemDefaultMoves = sParty_Grunt38},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout1},
     },
 
-    [TRAINER_GRUNT_39] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10047,11 +10047,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt39),
-        .party = {.NoItemDefaultMoves = sParty_Grunt39},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout2},
     },
 
-    [TRAINER_GRUNT_40] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10061,11 +10061,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt40),
-        .party = {.NoItemDefaultMoves = sParty_Grunt40},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout3},
     },
 
-    [TRAINER_GRUNT_41] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10075,11 +10075,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt41),
-        .party = {.NoItemDefaultMoves = sParty_Grunt41},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout4},
     },
 
-    [TRAINER_GRUNT_42] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10089,11 +10089,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt42),
-        .party = {.NoItemDefaultMoves = sParty_Grunt42},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout5},
     },
 
-    [TRAINER_GRUNT_43] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10103,11 +10103,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt43),
-        .party = {.NoItemDefaultMoves = sParty_Grunt43},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout6},
     },
 
-    [TRAINER_GRUNT_44] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10117,11 +10117,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt44),
-        .party = {.NoItemDefaultMoves = sParty_Grunt44},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout7},
     },
 
-    [TRAINER_GRUNT_45] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10131,11 +10131,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt45),
-        .party = {.NoItemDefaultMoves = sParty_Grunt45},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout8},
     },
 
-    [TRAINER_GRUNT_46] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10145,11 +10145,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt46),
-        .party = {.NoItemDefaultMoves = sParty_Grunt46},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout9),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout9},
     },
 
-    [TRAINER_GRUNT_47] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10159,11 +10159,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt47),
-        .party = {.NoItemDefaultMoves = sParty_Grunt47},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout10),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout10},
     },
 
-    [TRAINER_GRUNT_48] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10173,11 +10173,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt48),
-        .party = {.NoItemDefaultMoves = sParty_Grunt48},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout11),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout11},
     },
 
-    [TRAINER_GRUNT_49] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10187,11 +10187,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt49),
-        .party = {.NoItemDefaultMoves = sParty_Grunt49},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout12),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout12},
     },
 
-    [TRAINER_GRUNT_50] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10201,11 +10201,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt50),
-        .party = {.NoItemDefaultMoves = sParty_Grunt50},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout13),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout13},
     },
 
-    [TRAINER_GRUNT_51] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10215,11 +10215,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt51),
-        .party = {.NoItemDefaultMoves = sParty_Grunt51},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout14),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout14},
     },
 
-    [TRAINER_GRUNT_52] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10229,11 +10229,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt52),
-        .party = {.NoItemDefaultMoves = sParty_Grunt52},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout15),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout15},
     },
 
-    [TRAINER_GRUNT_53] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10243,8 +10243,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt53),
-        .party = {.NoItemDefaultMoves = sParty_Grunt53},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout16),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
     },
 
     [TRAINER_TABITHA_3] =
diff --git a/src/data/union_room.h b/src/data/union_room.h
index abe91b010..de155aee8 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -440,7 +440,7 @@ ALIGNED(4) const u8 sText_CancelRegistrationOfMon[] = _("Cancel the registration
 ALIGNED(4) const u8 sText_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?");
 ALIGNED(4) const u8 sText_RegistrationCanceled2[] = _("The registration has been canceled.\p");
 ALIGNED(4) const u8 sText_TradeTrainersWillBeListed[] = _("TRAINERS wishing to make a trade\nwill be listed."); // unused
-ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith2[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
 ALIGNED(4) const u8 sText_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?");
 ALIGNED(4) const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…"); // unused
 ALIGNED(4) const u8 sText_NotRegisteredAMonForTrade[] = _("You have not registered a POKéMON\nfor trading.\p"); // unused
@@ -457,50 +457,51 @@ const u8 *const sUnionRoomTexts_CantTradeRightNow[] = {
 
 ALIGNED(4) const u8 sText_TradeOfferRejected[] = _("Your trade offer was rejected.\p");
 ALIGNED(4) const u8 sText_EggTrade[] = _("EGG TRADE");
-ALIGNED(4) const u8 gUnknown_082EF7DC[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
-ALIGNED(4) const u8 gUnknown_082EF7F8[] = _("Please choose a TRAINER.");
-ALIGNED(4) const u8 gUnknown_082EF814[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF844[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF874[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF8A4[] = _("Please choose the TRAINER to\ntrade with.");
-ALIGNED(4) const u8 gUnknown_082EF8D0[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
-ALIGNED(4) const u8 gUnknown_082EF908[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
-ALIGNED(4) const u8 gUnknown_082EF940[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF974[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF99C[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF9CC[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF9F8[] = _("RECORD CORNER!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA24[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA50[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA7C[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFAA8[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFAD8[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFB08[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFB3C[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
-
-const u8 *const gUnknown_082EFB70[] = {
-    gUnknown_082EF814,
-    gUnknown_082EF844,
-    gUnknown_082EF874,
-    gUnknown_082EF8A4,
-    gUnknown_082EF940,
-    gUnknown_082EF974,
-    gUnknown_082EF99C,
-    gUnknown_082EF8D0,
-    gUnknown_082EF908,
-    NULL,
-    NULL,
-    NULL,
-    gUnknown_082EF9F8,
-    gUnknown_082EF9CC,
-    NULL,
-    gUnknown_082EFA24,
-    gUnknown_082EFA50,
-    gUnknown_082EFA7C,
-    gUnknown_082EFAA8,
-    gUnknown_082EFAD8,
-    gUnknown_082EFB08,
-    gUnknown_082EFB3C
+ALIGNED(4) const u8 sText_ChooseJoinCancel[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
+ALIGNED(4) const u8 sText_ChooseTrainer[] = _("Please choose a TRAINER.");
+ALIGNED(4) const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER to\ntrade with.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderCards[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderNews[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
+ALIGNED(4) const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryBlender[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderRecordCorner[] = _("RECORD CORNER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCoolContest[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBeautyContest[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCuteContest[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderSmartContest[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
+
+static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] = 
+{
+    [LINK_GROUP_SINGLE_BATTLE]     = sText_ChooseTrainerSingleBattle,
+    [LINK_GROUP_DOUBLE_BATTLE]     = sText_ChooseTrainerDoubleBattle,
+    [LINK_GROUP_MULTI_BATTLE]      = sText_ChooseLeaderMultiBattle,
+    [LINK_GROUP_TRADE]             = sText_ChooseTrainerToTradeWith,
+    [LINK_GROUP_POKEMON_JUMP]      = sText_ChooseLeaderPokemonJump,
+    [LINK_GROUP_BERRY_CRUSH]       = sText_ChooseLeaderBerryCrush,
+    [LINK_GROUP_BERRY_PICKING]     = sText_ChooseLeaderBerryPicking,
+    [LINK_GROUP_WONDER_CARD]       = sText_ChooseTrainerToShareWonderCards,
+    [LINK_GROUP_WONDER_NEWS]       = sText_ChooseTrainerToShareWonderNews,
+    [LINK_GROUP_UNK_9]             = NULL,
+    [LINK_GROUP_UNK_10]            = NULL,
+    [LINK_GROUP_UNK_11]            = NULL,
+    [LINK_GROUP_RECORD_CORNER]     = sText_ChooseLeaderRecordCorner,
+    [LINK_GROUP_BERRY_BLENDER]     = sText_ChooseLeaderBerryBlender,
+    [LINK_GROUP_UNK_14]            = NULL,
+    [LINK_GROUP_COOL_CONTEST]      = sText_ChooseLeaderCoolContest,
+    [LINK_GROUP_BEAUTY_CONTEST]    = sText_ChooseLeaderBeautyContest,
+    [LINK_GROUP_CUTE_CONTEST]      = sText_ChooseLeaderCuteContest,
+    [LINK_GROUP_SMART_CONTEST]     = sText_ChooseLeaderSmartContest,
+    [LINK_GROUP_TOUGH_CONTEST]     = sText_ChooseLeaderToughContest,
+    [LINK_GROUP_BATTLE_TOWER]      = sText_ChooseLeaderBattleTowerLv50,
+    [LINK_GROUP_BATTLE_TOWER_OPEN] = sText_ChooseLeaderBattleTowerOpenLv
 };
 
 ALIGNED(4) const u8 gUnknown_082EFBC8[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait...");
@@ -524,39 +525,39 @@ ALIGNED(4) const u8 gUnknown_082EFD7C[] = _("EXIT");
 ALIGNED(4) const u8 gUnknown_082EFD84[] = _("EXIT");
 ALIGNED(4) const u8 gUnknown_082EFD8C[] = _("INFO");
 ALIGNED(4) const u8 gUnknown_082EFD94[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV.");
-ALIGNED(4) const u8 gUnknown_082EFDB0[] = _("SINGLE BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDC0[] = _("DOUBLE BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDD0[] = _("MULTI BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDE0[] = _("POKéMON TRADES");
-ALIGNED(4) const u8 gUnknown_082EFDF0[] = _("CHAT");
-ALIGNED(4) const u8 gUnknown_082EFDF8[] = _("CARDS");
-ALIGNED(4) const u8 gUnknown_082EFE00[] = _("WONDER CARDS");
-ALIGNED(4) const u8 gUnknown_082EFE10[] = _("WONDER NEWS");
-ALIGNED(4) const u8 gUnknown_082EFE1C[] = _("POKéMON JUMP");
-ALIGNED(4) const u8 gUnknown_082EFE2C[] = _("BERRY CRUSH");
-ALIGNED(4) const u8 gUnknown_082EFE38[] = _("BERRY-PICKING");
-ALIGNED(4) const u8 gUnknown_082EFE48[] = _("SEARCH");
-ALIGNED(4) const u8 gUnknown_082EFE50[] = _("BERRY BLENDER");
-ALIGNED(4) const u8 gUnknown_082EFE60[] = _("RECORD CORNER");
-ALIGNED(4) const u8 gUnknown_082EFE70[] = _("COOL CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFE80[] = _("BEAUTY CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFE90[] = _("CUTE CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEA0[] = _("SMART CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEB0[] = _("TOUGH CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEC0[] = _("BATTLE TOWER LV. 50");
-ALIGNED(4) const u8 gUnknown_082EFED4[] = _("BATTLE TOWER OPEN LEVEL");
-ALIGNED(4) const u8 gUnknown_082EFEEC[] = _("It's a NORMAL CARD.");
-ALIGNED(4) const u8 gUnknown_082EFF00[] = _("It's a BRONZE CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF14[] = _("It's a COPPER CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF28[] = _("It's a SILVER CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF3C[] = _("It's a GOLD CARD!");
-
-const u8 *const gUnknown_082EFF50[] = {
-    gUnknown_082EFEEC,
-    gUnknown_082EFF00,
-    gUnknown_082EFF14,
-    gUnknown_082EFF28,
-    gUnknown_082EFF3C
+ALIGNED(4) const u8 sText_SingleBattle[] = _("SINGLE BATTLE");
+ALIGNED(4) const u8 sText_DoubleBattle[] = _("DOUBLE BATTLE");
+ALIGNED(4) const u8 sText_MultiBattle[] = _("MULTI BATTLE");
+ALIGNED(4) const u8 sText_PokemonTrades[] = _("POKéMON TRADES");
+ALIGNED(4) const u8 sText_Chat[] = _("CHAT");
+ALIGNED(4) const u8 sText_Cards[] = _("CARDS");
+ALIGNED(4) const u8 sText_WonderCards[] = _("WONDER CARDS");
+ALIGNED(4) const u8 sText_WonderNews[] = _("WONDER NEWS");
+ALIGNED(4) const u8 sText_PokemonJump[] = _("POKéMON JUMP");
+ALIGNED(4) const u8 sText_BerryCrush[] = _("BERRY CRUSH");
+ALIGNED(4) const u8 sText_BerryPicking[] = _("BERRY-PICKING");
+ALIGNED(4) const u8 sText_Search[] = _("SEARCH");
+ALIGNED(4) const u8 sText_BerryBlender[] = _("BERRY BLENDER");
+ALIGNED(4) const u8 sText_RecordCorner[] = _("RECORD CORNER");
+ALIGNED(4) const u8 sText_CoolContest[] = _("COOL CONTEST");
+ALIGNED(4) const u8 sText_BeautyContest[] = _("BEAUTY CONTEST");
+ALIGNED(4) const u8 sText_CuteContest[] = _("CUTE CONTEST");
+ALIGNED(4) const u8 sText_SmartContest[] = _("SMART CONTEST");
+ALIGNED(4) const u8 sText_ToughContest[] = _("TOUGH CONTEST");
+ALIGNED(4) const u8 sText_BattleTowerLv50[] = _("BATTLE TOWER LV. 50");
+ALIGNED(4) const u8 sText_BattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL");
+ALIGNED(4) const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD.");
+ALIGNED(4) const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!");
+ALIGNED(4) const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!");
+ALIGNED(4) const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!");
+ALIGNED(4) const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!");
+
+static const u8 *const sCardColorTexts[] = {
+    sText_ItsNormalCard,
+    sText_ItsBronzeCard,
+    sText_ItsCopperCard,
+    sText_ItsSilverCard,
+    sText_ItsGoldCard
 };
 
 ALIGNED(4) const u8 gUnknown_082EFF64[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
@@ -573,34 +574,34 @@ ALIGNED(4) const u8 gUnknown_082F0020[] = _("Finished checking {SPECIAL_F7 0x01}
 
 const u8 *const gUnknown_082F0048[] = {
     gText_EmptyString,
-    gUnknown_082EFDB0,
-    gUnknown_082EFDC0,
-    gUnknown_082EFDD0,
-    gUnknown_082EFDE0,
-    gUnknown_082EFDF0,
-    gUnknown_082EFE00,
-    gUnknown_082EFE10,
-    gUnknown_082EFDF8,
-    gUnknown_082EFE1C,
-    gUnknown_082EFE2C,
-    gUnknown_082EFE38,
-    gUnknown_082EFE48,
+    sText_SingleBattle,
+    sText_DoubleBattle,
+    sText_MultiBattle,
+    sText_PokemonTrades,
+    sText_Chat,
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_Cards,
+    sText_PokemonJump,
+    sText_BerryCrush,
+    sText_BerryPicking,
+    sText_Search,
     gText_EmptyString,
-    gUnknown_082EFED4,
-    gUnknown_082EFE60,
-    gUnknown_082EFE50,
+    sText_BattleTowerOpenLv,
+    sText_RecordCorner,
+    sText_BerryBlender,
     gText_EmptyString,
     gText_EmptyString,
     gText_EmptyString,
     gText_EmptyString,
-    gUnknown_082EFE00,
-    gUnknown_082EFE10,
-    gUnknown_082EFE70,
-    gUnknown_082EFE80,
-    gUnknown_082EFE90,
-    gUnknown_082EFEA0,
-    gUnknown_082EFEB0,
-    gUnknown_082EFEC0
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_CoolContest,
+    sText_BeautyContest,
+    sText_CuteContest,
+    sText_SmartContest,
+    sText_ToughContest,
+    sText_BattleTowerLv50
 };
 
 const struct WindowTemplate gUnknown_082F00BC = {
@@ -613,7 +614,7 @@ const struct WindowTemplate gUnknown_082F00BC = {
     .baseBlock = 0x0008
 };
 
-const u32 gUnknown_082F00C4[] = {
+const u32 gUnknown_082F00C4[NUM_LINK_GROUP_TYPES] = {
     0x0201,
     0x0202,
     0x0403,
@@ -1012,7 +1013,7 @@ ALIGNED(4) const u8 gUnknown_082F04CC[] = {0x1b, 0xff};
 ALIGNED(4) const u8 gUnknown_082F04D0[] = {0x1c, 0xff};
 ALIGNED(4) const u8 gUnknown_082F04D4[] = {0x0e, 0xff};
 
-const u8 *const gUnknown_082F04D8[] = {
+const u8 *const gUnknown_082F04D8[NUM_LINK_GROUP_TYPES] = {
     gUnknown_082F0474,
     gUnknown_082F0478,
     gUnknown_082F047C,
@@ -1037,8 +1038,29 @@ const u8 *const gUnknown_082F04D8[] = {
     gUnknown_082F04D4
 };
 
-const u8 gUnknown_082F0530[] = {
-    0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x15,
-    0x16, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x0e, 0x00, 0x00
+// Link group type to ID for gUnknown_02022C2C
+const u8 gUnknown_082F0530[NUM_LINK_GROUP_TYPES + 2] = 
+{
+    0x01, 
+    0x02, 
+    0x03, 
+    0x04, 
+    0x09, 
+    0x0a, 
+    0x0b, 
+    0x15,
+    0x16, 
+    0x00, 
+    0x00, 
+    0x00, 
+    0x0f, 
+    0x10, 
+    0x00, 
+    0x17,
+    0x18, 
+    0x19, 
+    0x1a, 
+    0x1b, 
+    0x1c, 
+    0x0e
 };
diff --git a/src/daycare.c b/src/daycare.c
index e5445ee21..42c69465b 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -231,11 +231,8 @@ static void ApplyDaycareExperience(struct Pokemon *mon)
             while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0)
             {
                 firstMove = FALSE;
-                if (learnedMove == 0xFFFF)
-                {
-                    // Mon already knows 4 moves.
+                if (learnedMove == MON_HAS_MAX_MOVES)
                     DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
-                }
             }
         }
         else
@@ -666,7 +663,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == MON_HAS_MAX_MOVES)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                     break;
                 }
@@ -685,7 +682,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == MON_HAS_MAX_MOVES)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                 }
             }
@@ -710,7 +707,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
         {
             if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j])
             {
-                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF)
+                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == MON_HAS_MAX_MOVES)
                     DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
                 break;
             }
@@ -755,7 +752,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca
 
     if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL)
     {
-        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF)
+        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == MON_HAS_MAX_MOVES)
             DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE);
     }
 }
@@ -1295,6 +1292,6 @@ void ShowDaycareLevelMenu(void)
 
 void ChooseSendDaycareMon(void)
 {
-    sub_81B9328();
+    ChooseMonForDaycare();
     gMain.savedCallback = CB2_ReturnToField;
 }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 827b47085..32478ff1a 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -31,6 +31,7 @@
 #include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/lilycove_lady.h"
+#include "constants/mauville_old_man.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/rgb.h"
@@ -220,7 +221,7 @@ static void sub_811E0EC(s8, s8);
 static void sub_811E1A4(s8, s8);
 static void sub_811E2DC(struct Sprite *);
 static void sub_811E34C(u8, u8);
-static bool8 sub_811F0F8(void);
+static bool8 EasyChatIsNationalPokedexEnabled(void);
 static u16 sub_811F108(void);
 static void sub_811F2D4(void);
 static void sub_811F46C(void);
@@ -531,11 +532,11 @@ static const u16 sMysteryGiftPhrase[] = {
 };
 
 static const u16 sBerryMasterWifePhrases[][2] = {
-    {EC_WORD_GREAT, EC_WORD_BATTLE},
-    {EC_WORD_CHALLENGE, EC_WORD_CONTEST},
-    {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)},
-    {EC_WORD_COOL, EC_POKEMON(LATIOS)},
-    {EC_WORD_SUPER, EC_WORD_HUSTLE},
+    [PHRASE_GREAT_BATTLE - 1]        = {EC_WORD_GREAT, EC_WORD_BATTLE},
+    [PHRASE_CHALLENGE_CONTEST - 1]   = {EC_WORD_CHALLENGE, EC_WORD_CONTEST},
+    [PHRASE_OVERWHELMING_LATIAS - 1] = {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)},
+    [PHRASE_COOL_LATIOS - 1]         = {EC_WORD_COOL, EC_POKEMON(LATIOS)},
+    [PHRASE_SUPER_HUSTLE - 1]        = {EC_WORD_SUPER, EC_WORD_HUSTLE},
 };
 
 static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal");
@@ -1263,7 +1264,7 @@ void ShowEasyChatScreen(void)
         break;
     case EASY_CHAT_TYPE_BARD_SONG:
         bard = &gSaveBlock1Ptr->oldMan.bard;
-        for (i = 0; i < 6; i ++)
+        for (i = 0; i < BARD_SONG_LENGTH; i ++)
             bard->temporaryLyrics[i] = bard->songLyrics[i];
 
         words = bard->temporaryLyrics;
@@ -1319,7 +1320,7 @@ void ShowEasyChatScreen(void)
         words = &gSaveBlock1Ptr->lilycoveLady.quiz.correctAnswer;
         break;
     case EASY_CHAT_TYPE_APPRENTICE:
-        words = gSaveBlock2Ptr->apprentices[0].easyChatWords;
+        words = gSaveBlock2Ptr->apprentices[0].speechWon;
         break;
     case EASY_CHAT_TYPE_QUESTIONNAIRE:
         words = sub_801B058();
@@ -4809,7 +4810,7 @@ static void sub_811E948(void)
     PutWindowTilemap(windowId);
 }
 
-static bool8 sub_811EA28(u8 groupId)
+static bool8 IsEasyChatGroupUnlocked(u8 groupId)
 {
     switch (groupId)
     {
@@ -4820,7 +4821,7 @@ static bool8 sub_811EA28(u8 groupId)
     case EC_GROUP_MOVE_2:
         return FlagGet(FLAG_SYS_GAME_CLEAR);
     case EC_GROUP_POKEMON_2:
-        return sub_811F0F8();
+        return EasyChatIsNationalPokedexEnabled();
     default:
         return TRUE;
     }
@@ -4831,7 +4832,7 @@ u16 EasyChat_GetNumWordsInGroup(u8 groupId)
     if (groupId == EC_GROUP_POKEMON)
         return GetNationalPokedexCount(FLAG_GET_SEEN);
 
-    if (sub_811EA28(groupId))
+    if (IsEasyChatGroupUnlocked(groupId))
         return gEasyChatGroups[groupId].numEnabledWords;
 
     return 0;
@@ -5071,7 +5072,7 @@ u16 sub_811EE38(u16 groupId)
 
 u16 sub_811EE90(u16 groupId)
 {
-    if (!sub_811EA28(groupId))
+    if (!IsEasyChatGroupUnlocked(groupId))
         return 0xFFFF;
 
     if (groupId == EC_GROUP_POKEMON)
@@ -5129,16 +5130,16 @@ void sub_811EF6C(void)
     CopyEasyChatWord(gStringVar2, easyChatWord);
 }
 
-static bool8 sub_811EF98(u8 additionalPhraseId)
+static bool8 IsAdditionalPhraseUnlocked(u8 additionalPhraseId)
 {
     int byteOffset = additionalPhraseId / 8;
     int shift = additionalPhraseId % 8;
     return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1;
 }
 
-void sub_811EFC0(u8 additionalPhraseId)
+void UnlockAdditionalPhrase(u8 additionalPhraseId)
 {
-    if (additionalPhraseId < 33)
+    if (additionalPhraseId < NUM_ADDITIONAL_PHRASES)
     {
         int byteOffset = additionalPhraseId / 8;
         int shift = additionalPhraseId % 8;
@@ -5146,32 +5147,32 @@ void sub_811EFC0(u8 additionalPhraseId)
     }
 }
 
-u8 sub_811EFF0(void)
+static u8 GetNumAdditionalPhrasesUnlocked(void)
 {
     u8 i;
     u8 numAdditionalPhrasesUnlocked;
 
-    for (i = 0, numAdditionalPhrasesUnlocked = 0; i < 33; i++)
+    for (i = 0, numAdditionalPhrasesUnlocked = 0; i < NUM_ADDITIONAL_PHRASES; i++)
     {
-        if (sub_811EF98(i))
+        if (IsAdditionalPhraseUnlocked(i))
             numAdditionalPhrasesUnlocked++;
     }
 
     return numAdditionalPhrasesUnlocked;
 }
 
-u16 sub_811F01C(void)
+u16 GetNewHipsterPhraseToTeach(void)
 {
     u16 i;
     u16 additionalPhraseId;
-    u8 numAdditionalPhrasesUnlocked = sub_811EFF0();
-    if (numAdditionalPhrasesUnlocked == 33)
+    u8 numAdditionalPhrasesUnlocked = GetNumAdditionalPhrasesUnlocked();
+    if (numAdditionalPhrasesUnlocked == NUM_ADDITIONAL_PHRASES)
         return 0xFFFF;
 
-    additionalPhraseId = Random() % (33 - numAdditionalPhrasesUnlocked);
-    for (i = 0; i < 33; i++)
+    additionalPhraseId = Random() % (NUM_ADDITIONAL_PHRASES - numAdditionalPhrasesUnlocked);
+    for (i = 0; i < NUM_ADDITIONAL_PHRASES; i++)
     {
-        if (!sub_811EF98(i))
+        if (!IsAdditionalPhraseUnlocked(i))
         {
             if (additionalPhraseId)
             {
@@ -5179,7 +5180,7 @@ u16 sub_811F01C(void)
             }
             else
             {
-                sub_811EFC0(i);
+                UnlockAdditionalPhrase(i);
                 return EC_WORD(EC_GROUP_TRENDY_SAYING, i);
             }
         }
@@ -5188,17 +5189,18 @@ u16 sub_811F01C(void)
     return 0xFFFF;
 }
 
-u16 sub_811F090(void)
+// Unused
+u16 GetRandomTaughtHipsterPhrase(void)
 {
     u16 i;
-    u16 additionalPhraseId = sub_811EFF0();
+    u16 additionalPhraseId = GetNumAdditionalPhrasesUnlocked();
     if (additionalPhraseId == 0)
         return 0xFFFF;
 
     additionalPhraseId = Random() % additionalPhraseId;
-    for (i = 0; i < 33; i++)
+    for (i = 0; i < NUM_ADDITIONAL_PHRASES; i++)
     {
-        if (sub_811EF98(i))
+        if (IsAdditionalPhraseUnlocked(i))
         {
             if (additionalPhraseId)
                 additionalPhraseId--;
@@ -5210,7 +5212,7 @@ u16 sub_811F090(void)
     return 0xFFFF;
 }
 
-static bool8 sub_811F0F8(void)
+static bool8 EasyChatIsNationalPokedexEnabled(void)
 {
     return IsNationalPokedexEnabled();
 }
@@ -5497,7 +5499,7 @@ static bool8 sub_811F764(u16 wordIndex, u8 groupId)
     case EC_GROUP_MOVE_2:
         return TRUE;
     case EC_GROUP_TRENDY_SAYING:
-        return sub_811EF98(wordIndex);
+        return IsAdditionalPhraseUnlocked(wordIndex);
     default:
         return gEasyChatGroups[groupId].wordData.words[wordIndex].enabled;
     }
@@ -5545,7 +5547,7 @@ bool32 sub_811F8D8(int easyChatWord)
     int groupId = EC_GROUP(easyChatWord);
     int mask = 0x7F;
     int index = EC_INDEX(easyChatWord);
-    if (!sub_811EA28(groupId & mask))
+    if (!IsEasyChatGroupUnlocked(groupId & mask))
         return FALSE;
     else
         return sub_811F764(index, groupId & mask);
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 7f0887790..2419c2806 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -448,7 +448,7 @@ static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct
     AGB_ASSERT_EX(ttdata->id == 0, "cereader_tool.c", 452);
 
     memset(buffer2, 0, 0x1000);
-    buffer2->unkField_0 = ttdata->count;
+    buffer2->numTrainers = ttdata->count;
     buffer2->unused1 = sub_81D38D4();
     buffer2->numFloors = (ttdata->count + 1) / 2;
 
@@ -456,13 +456,13 @@ static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct
     {
         if (!(i & 1))
         {
-            buffer2->floors[i / 2].unk0 = ttdata->unk_8[i].unk0;
+            buffer2->floors[i / 2].trainerNum1 = ttdata->unk_8[i].unk0;
             buffer2->floors[i / 2].display = ttdata->unk_8[i].unk14C;
             buffer2->floors[i / 2].trainers[0] = ttdata->unk_8[i].unk4;
         }
         else
         {
-            buffer2->floors[i / 2].unk1 = ttdata->unk_8[i].unk0;
+            buffer2->floors[i / 2].trainerNum2 = ttdata->unk_8[i].unk0;
             buffer2->floors[i / 2].trainers[1] = ttdata->unk_8[i].unk4;
         }
     }
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index b3daaad67..c746f08b1 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -26,6 +26,7 @@
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
 #include "constants/items.h"
+#include "constants/mauville_old_man.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
 
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index af560bc40..019d48416 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -235,7 +235,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
 
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
-    sub_80356D0();
+    InitBattleBgsVideo();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ScanlineEffect_Stop();
@@ -341,7 +341,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
 
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
-    sub_80356D0();
+    InitBattleBgsVideo();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
     FreeAllSpritePalettes();
@@ -743,12 +743,12 @@ static void Task_EvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == 0xFFFF) // no place to learn it
+                if (var == MON_HAS_MAX_MOVES)
                     gTasks[taskID].tState = 22;
-                else if (var == 0xFFFE) // it already knows that move
+                else if (var == MON_ALREADY_KNOWS_MOVE)
                     break;
                 else
-                    gTasks[taskID].tState = 20; // has less than 4 moves, so it's been learned
+                    gTasks[taskID].tState = 20; // move has been learned
             }
             else // no move to learn
             {
@@ -909,8 +909,8 @@ static void Task_EvolutionScene(u8 taskID)
         case 6:
             if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate)
             {
-                var = sub_81C1B94(); // moveID
-                if (var == 4)
+                var = GetMoveSlotToReplace();
+                if (var == MAX_MON_MOVES)
                 {
                     gTasks[taskID].tLearnMoveState = 10;
                 }
@@ -1100,9 +1100,9 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == 0xFFFF)
+                if (var == MON_HAS_MAX_MOVES)
                     gTasks[taskID].tState = 20;
-                else if (var == 0xFFFE)
+                else if (var == MON_ALREADY_KNOWS_MOVE)
                     break;
                 else
                     gTasks[taskID].tState = 18;
@@ -1243,8 +1243,8 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 6:
             if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate)
             {
-                var = sub_81C1B94(); // moveID
-                if (var == 4)
+                var = GetMoveSlotToReplace();
+                if (var == MAX_MON_MOVES)
                 {
                     gTasks[taskID].tLearnMoveState = 9;
                 }
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 47246d75a..8b4c7380c 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -30,9 +30,11 @@
 #include "wild_encounter.h"
 #include "constants/bg_event_constants.h"
 #include "constants/event_objects.h"
+#include "constants/field_poison.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
+#include "constants/trainer_hill.h"
 
 static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
 static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
@@ -223,8 +225,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
         return FALSE;
 
     // Don't play interaction sound for certain scripts.
-    if (script != EventScript_PlayerPCMale
-     && script != EventScript_PlayerPCFemale
+    if (script != LittlerootTown_BrendansHouse_2F_EventScript_PC
+     && script != LittlerootTown_MaysHouse_2F_EventScript_PC
      && script != SecretBase_EventScript_PC
      && script != SecretBase_EventScript_RecordMixingPC
      && script != SecretBase_EventScript_DollInteract
@@ -373,14 +375,14 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
         return EventScript_PC;
     if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE)
         return EventScript_ClosedSootopolisDoor;
-    if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE)
-        return SkyPillar_Outside_EventScript_2393F9;
+    if (MetatileBehavior_IsSkyPillarClosedDoor(metatileBehavior) == TRUE)
+        return SkyPillar_Outside_EventScript_ClosedDoor;
     if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE)
         return EventScript_CableBoxResults;
     if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)
         return EventScript_PokeBlockFeeder;
     if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE)
-        return Route110_TrickHouseEntrance_EventScript_26A22A;
+        return Route110_TrickHousePuzzle_EventScript_Door;
     if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE)
         return EventScript_RegionMap;
     if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE)
@@ -563,22 +565,22 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
         }
         if (ShouldDoBrailleRegicePuzzle() == TRUE)
         {
-            ScriptContext1_SetupScript(IslandCave_EventScript_238EAF);
+            ScriptContext1_SetupScript(IslandCave_EventScript_OpenRegiEntrance);
             return TRUE;
         }
         if (ShouldDoWallyCall() == TRUE)
         {
-            ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
+            ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
             return TRUE;
         }
-        if (ShouldDoWinonaCall() == TRUE)
+        if (ShouldDoScottFortreeCall() == TRUE)
         {
-            ScriptContext1_SetupScript(Route119_EventScript_1F49EC);
+            ScriptContext1_SetupScript(Route119_EventScript_ScottWonAtFortreeGymCall);
             return TRUE;
         }
-        if (ShouldDoScottCall() == TRUE)
+        if (ShouldDoScottBattleFrontierCall() == TRUE)
         {
-            ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6);
+            ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall);
             return TRUE;
         }
         if (ShouldDoRoxanneCall() == TRUE)
@@ -588,7 +590,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
         }
         if (ShouldDoRivalRayquazaCall() == TRUE)
         {
-            ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175);
+            ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall);
             return TRUE;
         }
     }
@@ -597,7 +599,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
         return TRUE;
     if (CountSSTidalStep(1) == TRUE)
     {
-        ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050);
+        ScriptContext1_SetupScript(SSTidalCorridor_EventScript_ReachedStepCount);
         return TRUE;
     }
     if (TryStartMatchCall())
@@ -646,11 +648,11 @@ static bool8 UpdatePoisonStepCounter(void)
         {
             switch (DoPoisonFieldEffect())
             {
-            case 0:
+            case FLDPSN_NONE:
                 return FALSE;
-            case 1:
+            case FLDPSN_PSN:
                 return FALSE;
-            case 2:
+            case FLDPSN_FNT:
                 return TRUE;
             }
         }
@@ -792,20 +794,16 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
 
     if (trainerHillMapId)
     {
-        if (trainerHillMapId == sub_81D6490())
+        if (trainerHillMapId == GetNumFloorsInTrainerHillChallenge())
         {
             if (warpEventId == 0)
-            {
                 warpEvent = &gMapHeader.events->warps[0];
-            }
             else
-            {
-                warpEvent = sub_81D6120();
-            }
+                warpEvent = SetWarpDestinationTrainerHill4F();
         }
-        else if (trainerHillMapId == 5)
+        else if (trainerHillMapId == TRAINER_HILL_ROOF)
         {
-            warpEvent = sub_81D6134(warpEventId);
+            warpEvent = SetWarpDestinationTrainerHillFinalFloor(warpEventId);
         }
         else
         {
diff --git a/src/field_effect.c b/src/field_effect.c
index 7569bdc75..99abcdcb0 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -63,7 +63,7 @@ static void PokeballGlowEffect_7(struct Sprite *);
 static u8 PokecenterHealEffectHelper(s16, s16);
 static void HallOfFameRecordEffectHelper(s16, s16, s16, u8);
 
-static void mapldr_080842E8(void);
+static void FieldCallback_Fly(void);
 static void task00_8084310(u8);
 static void mapldr_08084390(void);
 static void c3_080843F8(u8);
@@ -1364,13 +1364,13 @@ void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
 }
 
 
-void sub_80B69DC(void)
+void ReturnToFieldFromFlyMapSelect(void)
 {
     SetMainCallback2(CB2_ReturnToField);
-    gFieldCallback = mapldr_080842E8;
+    gFieldCallback = FieldCallback_Fly;
 }
 
-static void mapldr_080842E8(void)
+static void FieldCallback_Fly(void)
 {
     pal_fill_black();
     CreateTask(task00_8084310, 0);
diff --git a/src/field_poison.c b/src/field_poison.c
index d10a28a76..8385966d4 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -15,6 +15,7 @@
 #include "task.h"
 #include "trainer_hill.h"
 #include "constants/field_poison.h"
+#include "constants/party_menu.h"
 #include "constants/species.h"
 
 static bool32 IsMonValidSpecies(struct Pokemon *pokemon)
@@ -56,7 +57,7 @@ static void FaintFromFieldPoison(u8 partyIdx)
 static bool32 MonFaintedFromPoison(u8 partyIdx)
 {
     struct Pokemon *pokemon = gPlayerParty + partyIdx;
-    if (IsMonValidSpecies(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
+    if (IsMonValidSpecies(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
     {
         return TRUE;
     }
@@ -124,7 +125,7 @@ s32 DoPoisonFieldEffect(void)
     u32 numFainted = 0;
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
+        if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
         {
             hp = GetMonData(pokemon, MON_DATA_HP);
             if (hp == 0 || --hp == 0)
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 505315539..076859c28 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -34,7 +34,7 @@
 #include "event_obj_lock.h"
 #include "fldeff.h"
 
-extern const u16 gUnknown_82EC7CC[];
+extern const u16 gOrbEffectBackgroundLayerFlags[];
 
 // This file's functions.
 static void sub_8080B9C(u8);
@@ -752,7 +752,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
     }
 }
 
-void sub_80AFC60(void)
+void DoContestHallWarp(void)
 {
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
@@ -800,7 +800,7 @@ static void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 c
     }
 }
 
-static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
+static void SetOrbFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
 {
     if (y <= 160)
     {
@@ -816,17 +816,17 @@ static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s3
     }
 }
 
-static void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
+static void SetOrbFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
 {
     s32 r = radius;
     s32 v2 = radius;
     s32 v3 = 0;
     while (r >= v3)
     {
-        SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r);
-        SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r);
-        SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3);
-        SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3);
+        SetOrbFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r);
+        SetOrbFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r);
+        SetOrbFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3);
+        SetOrbFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3);
         v2 -= (v3 * 2) - 1;
         v3++;
         if (v2 < 0)
@@ -878,18 +878,18 @@ static void UpdateFlashLevelEffect(u8 taskId)
     }
 }
 
-static void UpdateFlash2LevelEffect(u8 taskId)
+static void UpdateOrbFlashEffect(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
     switch (data[0])
     {
     case 0:
-        SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius);
+        SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius);
         data[0] = 1;
         break;
     case 1:
-        SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius);
+        SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius);
         data[0] = 0;
         tCurFlashRadius += tFlashRadiusDelta;
         if (tCurFlashRadius > tDestFlashRadius)
@@ -948,7 +948,7 @@ static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 dest
 
 static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta)
 {
-    u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80);
+    u8 taskId = CreateTask(UpdateOrbFlashEffect, 80);
     s16 *data = gTasks[taskId].data;
 
     tCurFlashRadius = initialFlashRadius;
@@ -1063,12 +1063,12 @@ void sub_80B0268(void)
     CreateTask(sub_80B01BC, 10);
 }
 
-static void sub_80B028C(u8 a1)
+static void LoadOrbEffectPalette(bool8 blueOrb)
 {
     int i;
     u16 color[1];
 
-    if (!a1)
+    if (!blueOrb)
         color[0] = RGB_RED;
     else
         color[0] = RGB_BLUE;
@@ -1079,12 +1079,12 @@ static void sub_80B028C(u8 a1)
     }
 }
 
-static bool8 sub_80B02C8(u16 a1)
+static bool8 sub_80B02C8(u16 shakeDir)
 {
     u8 lo = REG_BLDALPHA & 0xFF;
     u8 hi = REG_BLDALPHA >> 8;
 
-    if (a1)
+    if (shakeDir != 0)
     {
         if (lo)
         {
@@ -1107,58 +1107,69 @@ static bool8 sub_80B02C8(u16 a1)
         return FALSE;
 }
 
-static void sub_80B0318(u8 taskId)
+#define tState       data[0]
+#define tBlueOrb     data[1]
+#define tCenterX     data[2]
+#define tCenterY     data[3]
+#define tShakeDelay  data[4]
+#define tShakeDir    data[5]
+#define tDispCnt     data[6]
+#define tBldCnt      data[7]
+#define tBldAlpha    data[8]
+#define tWinIn       data[9]
+#define tWinOut      data[10]
+
+static void Task_OrbEffect(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (data[0])
+    switch (tState)
     {
     case 0:
-        data[6] = REG_DISPCNT;
-        data[7] = REG_BLDCNT;
-        data[8] = REG_BLDALPHA;
-        data[9] = REG_WININ;
-        data[10] = REG_WINOUT;
+        tDispCnt = REG_DISPCNT;
+        tBldCnt = REG_BLDCNT;
+        tBldAlpha = REG_BLDALPHA;
+        tWinIn = REG_WININ;
+        tWinOut = REG_WINOUT;
         ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
-        SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]);
+        SetGpuRegBits(REG_OFFSET_BLDCNT, gOrbEffectBackgroundLayerFlags[0]);
         SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7));
         SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
         SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ);
-        sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF);
+        SetBgTilemapPalette(0, 0, 0, 0x1E, 0x14, 0xF);
         schedule_bg_copy_tilemap_to_vram(0);
-        SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1);
+        SetOrbFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], tCenterX, tCenterY, 1);
         CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
         ScanlineEffect_SetParams(sFlashEffectParams);
-        data[0] = 1;
+        tState = 1;
         break;
     case 1:
         sub_8199DF0(0, PIXEL_FILL(1), 0, 1);
-        sub_80B028C(data[1]);
-        sub_80B003C(data[2], data[3], 1, 160, 1, 2);
-        data[0] = 2;
+        LoadOrbEffectPalette(tBlueOrb);
+        sub_80B003C(tCenterX, tCenterY, 1, 160, 1, 2);
+        tState = 2;
         break;
     case 2:
-        if (!FuncIsActiveTask(UpdateFlash2LevelEffect))
+        if (!FuncIsActiveTask(UpdateOrbFlashEffect))
         {
             EnableBothScriptContexts();
-            data[0] = 3;
+            tState = 3;
         }
         break;
     case 3:
         InstallCameraPanAheadCallback();
         SetCameraPanningCallback(NULL);
-        data[5] = 0;
-        data[4] = 4;
-        data[0] = 4;
+        tShakeDir = 0;
+        tShakeDelay = 4;
+        tState = 4;
         break;
     case 4:
-        data[4]--;
-        if (!data[4])
+        if (--tShakeDelay == 0)
         {
             s32 panning;
-            data[4] = 4;
-            data[5] ^= 1;
-            if (data[5])
+            tShakeDelay = 4;
+            tShakeDir ^= 1;
+            if (tShakeDir)
                 panning = 4;
             else
                 panning = -4;
@@ -1167,70 +1178,81 @@ static void sub_80B0318(u8 taskId)
         break;
     case 6:
         InstallCameraPanAheadCallback();
-        data[4] = 8;
-        data[0] = 7;
+        tShakeDelay = 8;
+        tState = 7;
         break;
     case 7:
-        data[4]--;
-        if (!data[4])
+        if (--tShakeDelay == 0)
         {
-            data[4] = 8;
-            data[5] ^= 1;
-            if (sub_80B02C8(data[5]) == TRUE)
+            tShakeDelay = 8;
+            tShakeDir ^= 1;
+            if (sub_80B02C8(tShakeDir) == TRUE)
             {
-                data[0] = 5;
+                tState = 5;
                 sub_8199DF0(0, PIXEL_FILL(0), 0, 1);
             }
         }
         break;
     case 5:
         SetGpuReg(REG_OFFSET_WIN0H, 255);
-        SetGpuReg(REG_OFFSET_DISPCNT, data[6]);
-        SetGpuReg(REG_OFFSET_BLDCNT, data[7]);
-        SetGpuReg(REG_OFFSET_BLDALPHA, data[8]);
-        SetGpuReg(REG_OFFSET_WININ, data[9]);
-        SetGpuReg(REG_OFFSET_WINOUT, data[10]);
+        SetGpuReg(REG_OFFSET_DISPCNT, tDispCnt);
+        SetGpuReg(REG_OFFSET_BLDCNT, tBldCnt);
+        SetGpuReg(REG_OFFSET_BLDALPHA, tBldAlpha);
+        SetGpuReg(REG_OFFSET_WININ, tWinIn);
+        SetGpuReg(REG_OFFSET_WINOUT, tWinOut);
         EnableBothScriptContexts();
         DestroyTask(taskId);
         break;
     }
 }
 
-void sub_80B0534(void)
+void DoOrbEffect(void)
 {
-    u8 taskId = CreateTask(sub_80B0318, 80);
+    u8 taskId = CreateTask(Task_OrbEffect, 80);
     s16 *data = gTasks[taskId].data;
 
     if (gSpecialVar_Result == 0)
     {
-        data[1] = 0;
-        data[2] = 104;
+        tBlueOrb = FALSE;
+        tCenterX = 104;
     }
     else if (gSpecialVar_Result == 1)
     {
-        data[1] = 1;
-        data[2] = 136;
+        tBlueOrb = TRUE;
+        tCenterX = 136;
     }
     else if (gSpecialVar_Result == 2)
     {
-        data[1] = 0;
-        data[2] = 120;
+        tBlueOrb = FALSE;
+        tCenterX = 120;
     }
     else
     {
-        data[1] = 1;
-        data[2] = 120;
+        tBlueOrb = TRUE;
+        tCenterX = 120;
     }
 
-    data[3] = 80;
+    tCenterY = 80;
 }
 
-void sub_80B058C(void)
+void FadeOutOrbEffect(void)
 {
-    u8 taskId = FindTaskIdByFunc(sub_80B0318);
-    gTasks[taskId].data[0] = 6;
+    u8 taskId = FindTaskIdByFunc(Task_OrbEffect);
+    gTasks[taskId].tState = 6;
 }
 
+#undef tState
+#undef tBlueOrb
+#undef tCenterX
+#undef tCenterY
+#undef tShakeDelay
+#undef tShakeDir
+#undef tDispCnt
+#undef tBldCnt
+#undef tBldAlpha
+#undef tWinIn
+#undef tWinOut
+
 void Script_FadeOutMapMusic(void)
 {
     Overworld_FadeOutMapMusic();
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 231f4dd42..439b1855a 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -14,6 +14,8 @@
 #include "sprite.h"
 #include "task.h"
 #include "constants/event_objects.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/field_specials.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
 #include "constants/metatile_labels.h"
@@ -31,8 +33,18 @@ enum
 
 //. rodata
 static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0};
-const u8 gUnknown_0858E8AB[] = {0x18, 0xFE};
-const u8 gUnknown_0858E8AD[] = {0x17, 0xFE};
+
+static const u8 sSSTidalSailEastMovementScript[] = 
+{
+    MOVEMENT_ACTION_WALK_FAST_RIGHT, 
+    MOVEMENT_ACTION_STEP_END
+};
+
+static const u8 sSSTidalSailWestMovementScript[] = 
+{
+    MOVEMENT_ACTION_WALK_FAST_LEFT, 
+    MOVEMENT_ACTION_STEP_END
+};
 
 // .text
 static void Task_Truck3(u8);
@@ -256,7 +268,7 @@ bool8 sub_80FB59C(void)
 void Task_HandlePorthole(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
-    u16 *var = GetVarPointer(VAR_PORTHOLE_STATE);
+    u16 *cruiseState = GetVarPointer(VAR_SS_TIDAL_STATE);
     struct WarpData *location = &gSaveBlock1Ptr->location;
 
     switch (data[0])
@@ -268,40 +280,41 @@ void Task_HandlePorthole(u8 taskId)
             data[0] = EXECUTE_MOVEMENT; // execute movement before checking if should be exited. strange?
         }
         break;
-    case IDLE_CHECK: // idle and move.
+    case IDLE_CHECK:
         if (gMain.newKeys & A_BUTTON)
             data[1] = 1;
-        if (!ScriptMovement_IsObjectMovementFinished(0xFF, location->mapNum, location->mapGroup))
+        if (!ScriptMovement_IsObjectMovementFinished(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup))
             return;
         if (CountSSTidalStep(1) == TRUE)
         {
-            if (*var == 2)
-                *var = 9;
+            if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT)
+                *cruiseState = SS_TIDAL_EXIT_CURRENTS_RIGHT;
             else
-                *var = 10;
-            data[0] = 3;
+                *cruiseState = SS_TIDAL_EXIT_CURRENTS_LEFT;
+            data[0] = EXIT_PORTHOLE;
             return;
         }
-        data[0] = 2;
-    case EXECUTE_MOVEMENT: // execute movement.
+        data[0] = EXECUTE_MOVEMENT;
+        //fallthrough
+    case EXECUTE_MOVEMENT:
         if (data[1])
         {
-            data[0] = EXIT_PORTHOLE; // exit porthole.
+            data[0] = EXIT_PORTHOLE;
             return;
         }
-        // run this once.
-        if (*var == 2) // which direction?
+
+        if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT)
         {
-            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_0858E8AB);
-            data[0] = IDLE_CHECK; // run case 1.
+            ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript);
+            data[0] = IDLE_CHECK;
         }
         else
         {
-            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_0858E8AD);
-            data[0] = IDLE_CHECK; // run case 1.
+            ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript);
+            data[0] = IDLE_CHECK;
         }
         break;
-    case EXIT_PORTHOLE: // exit porthole.
+    case EXIT_PORTHOLE:
         FlagClear(FLAG_DONT_TRANSITION_MUSIC);
         FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
         SetWarpDestinationToDynamicWarp(0);
@@ -311,32 +324,28 @@ void Task_HandlePorthole(u8 taskId)
     }
 }
 
-void sub_80FB6EC(void)
+static void ShowSSTidalWhileSailing(void)
 {
     u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0);
 
     gSprites[spriteId].coordOffsetEnabled = FALSE;
 
-    if (VarGet(VAR_PORTHOLE_STATE) == 2)
-    {
-        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4));
-    }
+    if (VarGet(VAR_SS_TIDAL_STATE) == SS_TIDAL_DEPART_SLATEPORT)
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(DIR_EAST));
     else
-    {
-        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3));
-    }
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(DIR_WEST));
 }
 
 void sub_80FB768(void)
 {
-    sub_80FB6EC();
+    ShowSSTidalWhileSailing();
     gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
     pal_fill_black();
     CreateTask(Task_HandlePorthole, 80);
     ScriptContext2_Enable();
 }
 
-void sub_80FB7A4(void)
+void LookThroughPorthole(void)
 {
     FlagSet(FLAG_SYS_CRUISE_MODE);
     FlagSet(FLAG_DONT_TRANSITION_MUSIC);
diff --git a/src/field_specials.c b/src/field_specials.c
index b92e956d4..830c2246d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -55,11 +55,13 @@
 #include "constants/heal_locations.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
+#include "constants/mevent.h"
 #include "constants/tv.h"
 #include "constants/script_menu.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/vars.h"
 #include "constants/battle_frontier.h"
 #include "constants/weather.h"
@@ -90,9 +92,9 @@ extern const u16 gEventObjectPalette17[];
 extern const u16 gEventObjectPalette33[];
 extern const u16 gEventObjectPalette34[];
 
-void UpdateMovedLilycoveFanClubMembers(void);
-void sub_813BF60(void);
-u16 GetNumMovedLilycoveFanClubMembers(void);
+void TryLoseFansFromPlayTime(void);
+void SetPlayerGotFirstFans(void);
+u16 GetNumFansOfPlayerInTrainerFanClub(void);
 
 static void RecordCyclingRoadResults(u32, u8);
 static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum);
@@ -129,10 +131,10 @@ static void WaitForDeoxysRockMovement(u8 taskId);
 static void sub_813B57C(u8 taskId);
 static void Task_LoopWingFlapSE(u8 taskId);
 static void Task_CloseBattlePikeCurtain(u8 taskId);
-static u8 sub_813BF44(void);
-static void sub_813BD84(void);
-static u16 sub_813BB74(void);
-static void sub_813BE30(struct LinkBattleRecords *linkRecords, u8 a, u8 b);
+static u8 DidPlayerGetFirstFans(void);
+static void SetInitialFansOfPlayer(void);
+static u16 PlayerGainRandomTrainerFan(void);
+static void BufferFanClubTrainerName_(struct LinkBattleRecords *linkRecords, u8 a, u8 b);
 
 void Special_ShowDiploma(void)
 {
@@ -301,9 +303,10 @@ void ResetSSTidalFlag(void)
     FlagClear(FLAG_SYS_CRUISE_MODE);
 }
 
+// Returns TRUE if the Cruise is over
 bool32 CountSSTidalStep(u16 delta)
 {
-    if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc)
+    if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) < SS_TIDAL_MAX_STEPS)
     {
         return FALSE;
     }
@@ -313,21 +316,21 @@ bool32 CountSSTidalStep(u16 delta)
 u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
 {
     u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT);
-    switch (*GetVarPointer(VAR_PORTHOLE_STATE))
+    switch (*GetVarPointer(VAR_SS_TIDAL_STATE))
     {
-        case 1:
-        case 8:
+        case SS_TIDAL_BOARD_SLATEPORT:
+        case SS_TIDAL_LAND_SLATEPORT:
             return SS_TIDAL_LOCATION_SLATEPORT;
-        case 3:
-        case 9:
+        case SS_TIDAL_HALFWAY_LILYCOVE:
+        case SS_TIDAL_EXIT_CURRENTS_RIGHT:
             return SS_TIDAL_LOCATION_ROUTE131;
-        case 4:
-        case 5:
+        case SS_TIDAL_LAND_LILYCOVE:
+        case SS_TIDAL_BOARD_LILYCOVE:
             return SS_TIDAL_LOCATION_LILYCOVE;
-        case 6:
-        case 10:
+        case SS_TIDAL_DEPART_LILYCOVE:
+        case SS_TIDAL_EXIT_CURRENTS_LEFT:
             return SS_TIDAL_LOCATION_ROUTE124;
-        case 2:
+        case SS_TIDAL_DEPART_SLATEPORT:
             if (*varCruiseStepCount < 60)
             {
                 *mapNum = MAP_NUM(ROUTE134);
@@ -344,7 +347,7 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
                 *x = *varCruiseStepCount - 140;
             }
             break;
-        case 7:
+        case SS_TIDAL_HALFWAY_SLATEPORT:
             if (*varCruiseStepCount < 66)
             {
                 *mapNum = MAP_NUM(ROUTE132);
@@ -393,9 +396,9 @@ bool32 ShouldDoWallyCall(void)
     return TRUE;
 }
 
-bool32 ShouldDoWinonaCall(void)
+bool32 ShouldDoScottFortreeCall(void)
 {
-    if (FlagGet(FLAG_REGISTER_WINONA_POKENAV))
+    if (FlagGet(FLAG_SCOTT_CALL_FORTREE_GYM))
     {
         switch (gMapHeader.mapType)
         {
@@ -403,7 +406,7 @@ bool32 ShouldDoWinonaCall(void)
             case MAP_TYPE_CITY:
             case MAP_TYPE_ROUTE:
             case MAP_TYPE_OCEAN_ROUTE:
-                if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10)
+                if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10)
                 {
                     return FALSE;
                 }
@@ -420,9 +423,9 @@ bool32 ShouldDoWinonaCall(void)
     return TRUE;
 }
 
-bool32 ShouldDoScottCall(void)
+bool32 ShouldDoScottBattleFrontierCall(void)
 {
-    if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX))
+    if (FlagGet(FLAG_SCOTT_CALL_BATTLE_FRONTIER))
     {
         switch (gMapHeader.mapType)
         {
@@ -430,7 +433,7 @@ bool32 ShouldDoScottCall(void)
             case MAP_TYPE_CITY:
             case MAP_TYPE_ROUTE:
             case MAP_TYPE_OCEAN_ROUTE:
-                if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10)
+                if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10)
                 {
                     return FALSE;
                 }
@@ -973,7 +976,7 @@ void CableCarWarp(void)
     }
 }
 
-void SetFlagInVar(void)
+void SetHiddenItemFlag(void)
 {
     FlagSet(gSpecialVar_0x8004);
 }
@@ -1408,9 +1411,9 @@ void GiveLeadMonEffortRibbon(void)
     ribbonSet = TRUE;
     leadMon = &gPlayerParty[GetLeadMonIndex()];
     SetMonData(leadMon, MON_DATA_EFFORT_RIBBON, &ribbonSet);
-    if (GetRibbonCount(leadMon) > 4)
+    if (GetRibbonCount(leadMon) > NUM_CUTIES_RIBBONS)
     {
-        sub_80EE4DC(leadMon, 0x47);
+        TryPutSpotTheCutiesOnAir(leadMon, 0x47);
     }
 }
 
@@ -1425,7 +1428,9 @@ bool8 Special_AreLeadMonEVsMaxedOut(void)
 
 u8 TryUpdateRusturfTunnelState(void)
 {
-    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
+    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) 
+        && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) 
+        && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
     {
         if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1))
         {
@@ -1605,18 +1610,16 @@ u16 SetPacifidlogTMReceivedDay(void)
     return gLocalTime.days;
 }
 
-bool8 MonOTNameMatchesPlayer(void)
+bool8 MonOTNameNotPlayer(void)
 {
     if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_LANGUAGE) != GAME_LANGUAGE)
-    {
-        return TRUE;    // huh?
-    }
+        return TRUE;
 
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
+
     if (!StringCompare(gSaveBlock2Ptr->playerName, gStringVar1))
-    {
         return FALSE;
-    }
+
     return TRUE;
 }
 
@@ -1654,19 +1657,19 @@ void BufferLottoTicketNumber(void)
     }
 }
 
-u16 sub_813986C(void)
+u16 GetMysteryEventCardVal(void)
 {
     switch (gSpecialVar_Result)
     {
-        case 0:
-            return mevent_081445C0(3);
-        case 1:
-            return mevent_081445C0(4);
-        case 2:
-            return mevent_081445C0(0);
-        case 3:
+        case GET_NUM_STAMPS:
+            return mevent_081445C0(GET_NUM_STAMPS_INTERNAL);
+        case GET_MAX_STAMPS:
+            return mevent_081445C0(GET_MAX_STAMPS_INTERNAL);
+        case GET_CARD_BATTLES_WON:
+            return mevent_081445C0(GET_CARD_BATTLES_WON_INTERNAL);
+        case 3: // Never occurs
             return mevent_081445C0(1);
-        case 4:
+        case 4: // Never occurs
             return mevent_081445C0(2);
         default:
             return 0;
@@ -2080,78 +2083,78 @@ void ShowFrontierManiacMessage(void)
     {
         [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] =
         { 
-            BattleFrontier_Lounge2_Text_260971, 
-            BattleFrontier_Lounge2_Text_260A1E, 
-            BattleFrontier_Lounge2_Text_260AE7 
+            BattleFrontier_Lounge2_Text_SalonMaidenIsThere, 
+            BattleFrontier_Lounge2_Text_SalonMaidenSilverMons, 
+            BattleFrontier_Lounge2_Text_SalonMaidenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] =
         { 
-            BattleFrontier_Lounge2_Text_2619AC, 
-            BattleFrontier_Lounge2_Text_261A91, 
-            BattleFrontier_Lounge2_Text_261B0C 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice1, 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice2, 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice3 
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS] = 
         { 
-            BattleFrontier_Lounge2_Text_261B95, 
-            BattleFrontier_Lounge2_Text_261B95, 
-            BattleFrontier_Lounge2_Text_261B95 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice 
         },
-        [FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS] =
+        [FRONTIER_MANIAC_BATTLE_TOWER_LINK] =
         { 
-            BattleFrontier_Lounge2_Text_261C1A, 
-            BattleFrontier_Lounge2_Text_261C1A, 
-            BattleFrontier_Lounge2_Text_261C1A 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice 
         },
         [FRONTIER_MANIAC_BATTLE_DOME] =
         { 
-            BattleFrontier_Lounge2_Text_260BC4, 
-            BattleFrontier_Lounge2_Text_260C6D, 
-            BattleFrontier_Lounge2_Text_260D3A 
+            BattleFrontier_Lounge2_Text_DomeAceIsThere, 
+            BattleFrontier_Lounge2_Text_DomeAceSilverMons, 
+            BattleFrontier_Lounge2_Text_DomeAceGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_FACTORY] =
         { 
-            BattleFrontier_Lounge2_Text_260E1E, 
-            BattleFrontier_Lounge2_Text_260EC7, 
-            BattleFrontier_Lounge2_Text_260F74 
+            BattleFrontier_Lounge2_Text_FactoryHeadIsThere, 
+            BattleFrontier_Lounge2_Text_FactoryHeadSilverMons, 
+            BattleFrontier_Lounge2_Text_FactoryHeadGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PALACE] =
         { 
-            BattleFrontier_Lounge2_Text_2614E6, 
-            BattleFrontier_Lounge2_Text_261591, 
-            BattleFrontier_Lounge2_Text_26166F 
+            BattleFrontier_Lounge2_Text_PalaceMavenIsThere, 
+            BattleFrontier_Lounge2_Text_PalaceMavenSilverMons, 
+            BattleFrontier_Lounge2_Text_PalaceMavenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_ARENA] =
         { 
-            BattleFrontier_Lounge2_Text_261282, 
-            BattleFrontier_Lounge2_Text_261329, 
-            BattleFrontier_Lounge2_Text_261403 
+            BattleFrontier_Lounge2_Text_ArenaTycoonIsThere, 
+            BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons, 
+            BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PIKE] = 
         { 
-            BattleFrontier_Lounge2_Text_261026, 
-            BattleFrontier_Lounge2_Text_2610CC, 
-            BattleFrontier_Lounge2_Text_261194 
+            BattleFrontier_Lounge2_Text_PikeQueenIsThere, 
+            BattleFrontier_Lounge2_Text_PikeQueenSilverMons, 
+            BattleFrontier_Lounge2_Text_PikeQueenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PYRAMID] =
         { 
-            BattleFrontier_Lounge2_Text_26174D, 
-            BattleFrontier_Lounge2_Text_2617F9, 
-            BattleFrontier_Lounge2_Text_2618C4 
+            BattleFrontier_Lounge2_Text_PyramidKingIsThere, 
+            BattleFrontier_Lounge2_Text_PyramidKingSilverMons, 
+            BattleFrontier_Lounge2_Text_PyramidKingGoldMons 
         },
     };
 
     static const u8 sFrontierManiacStreakThresholds[][FRONTIER_MANIAC_MESSAGE_COUNT - 1] = 
     {
-        [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES]     = { 21, 56 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES]     = { 21, 35 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS]      = { 255, 255 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS] = { 255, 255 },
-        [FRONTIER_MANIAC_BATTLE_DOME]              = { 2, 4 },
-        [FRONTIER_MANIAC_BATTLE_FACTORY]           = { 7, 21 },
-        [FRONTIER_MANIAC_BATTLE_PALACE]            = { 7, 21 },
-        [FRONTIER_MANIAC_BATTLE_ARENA]             = { 14, 28 },
-        [FRONTIER_MANIAC_BATTLE_PIKE]              = { 13, 112 }, //BUG: 112 (0x70) is probably a mistake; the Pike Queen is battled twice well before that
-        [FRONTIER_MANIAC_BATTLE_PYRAMID]           = { 7, 56 }
+        [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] = { 21, 56 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] = { 21, 35 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS]  = { 255, 255 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_LINK]    = { 255, 255 },
+        [FRONTIER_MANIAC_BATTLE_DOME]          = { 2, 4 },
+        [FRONTIER_MANIAC_BATTLE_FACTORY]       = { 7, 21 },
+        [FRONTIER_MANIAC_BATTLE_PALACE]        = { 7, 21 },
+        [FRONTIER_MANIAC_BATTLE_ARENA]         = { 14, 28 },
+        [FRONTIER_MANIAC_BATTLE_PIKE]          = { 13, 112 }, //BUG: 112 (0x70) is probably a mistake; the Pike Queen is battled twice well before that
+        [FRONTIER_MANIAC_BATTLE_PYRAMID]       = { 7, 56 }
     };
 
     u8 i;
@@ -2163,7 +2166,7 @@ void ShowFrontierManiacMessage(void)
         case FRONTIER_MANIAC_BATTLE_TOWER_SINGLES:
         case FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES:
         case FRONTIER_MANIAC_BATTLE_TOWER_MULTIS:
-        case FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS:
+        case FRONTIER_MANIAC_BATTLE_TOWER_LINK:
             if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50] 
                 >= gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN])
             {
@@ -2901,18 +2904,18 @@ void ShowFrontierGamblerLookingMessage(void)
 {
     static const u8 *const sFrontierGamblerLookingMessages[] = 
     {
-        BattleFrontier_Lounge3_Text_262261,
-        BattleFrontier_Lounge3_Text_26230D,
-        BattleFrontier_Lounge3_Text_2623B9,
-        BattleFrontier_Lounge3_Text_262464,
-        BattleFrontier_Lounge3_Text_26250E,
-        BattleFrontier_Lounge3_Text_2625B8,
-        BattleFrontier_Lounge3_Text_26266A,
-        BattleFrontier_Lounge3_Text_26271C,
-        BattleFrontier_Lounge3_Text_2627C9,
-        BattleFrontier_Lounge3_Text_262876,
-        BattleFrontier_Lounge3_Text_26291A,
-        BattleFrontier_Lounge3_Text_2629BC,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti,
+        BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleArena,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePike,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePyramid,
     };
 
     u16 challenge = VarGet(VAR_FRONTIER_GAMBLER_CHALLENGE);
@@ -2924,18 +2927,18 @@ void ShowFrontierGamblerGoMessage(void)
 {
     static const u8 *const sFrontierGamblerGoMessages[] = 
     {
-        BattleFrontier_Lounge3_Text_262C04,
-        BattleFrontier_Lounge3_Text_262C90,
-        BattleFrontier_Lounge3_Text_262D1C,
-        BattleFrontier_Lounge3_Text_262DA7,
-        BattleFrontier_Lounge3_Text_262E34,
-        BattleFrontier_Lounge3_Text_262EC1,
-        BattleFrontier_Lounge3_Text_262F56,
-        BattleFrontier_Lounge3_Text_262FEB,
-        BattleFrontier_Lounge3_Text_263078,
-        BattleFrontier_Lounge3_Text_263105,
-        BattleFrontier_Lounge3_Text_26318C,
-        BattleFrontier_Lounge3_Text_263211,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerSingle,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerMulti,
+        BattleFrontier_Lounge3_Text_GetToBattleDomeSingle,
+        BattleFrontier_Lounge3_Text_GetToBattleDomeDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleFactorySingle,
+        BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble,
+        BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle,
+        BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleArena,
+        BattleFrontier_Lounge3_Text_GetToBattlePike,
+        BattleFrontier_Lounge3_Text_GetToBattlePyramid,
     };
 
     ShowFieldMessage(sFrontierGamblerGoMessages[VarGet(VAR_FRONTIER_GAMBLER_SET_CHALLENGE)]);
@@ -3210,31 +3213,31 @@ static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
 {
     static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] = 
     {
-        BattleFrontier_Lounge7_Text_265E30,
-        BattleFrontier_Lounge7_Text_265E5B,
-        BattleFrontier_Lounge7_Text_265E8A,
-        BattleFrontier_Lounge7_Text_265EC0,
-        BattleFrontier_Lounge7_Text_265EED,
-        BattleFrontier_Lounge7_Text_265F1C,
-        BattleFrontier_Lounge7_Text_265F47,
-        BattleFrontier_Lounge7_Text_265F77,
-        BattleFrontier_Lounge7_Text_265FAA,
-        BattleFrontier_Lounge7_Text_265FDD,
+        BattleFrontier_Lounge7_Text_SoftboiledDesc,
+        BattleFrontier_Lounge7_Text_SeismicTossDesc,
+        BattleFrontier_Lounge7_Text_DreamEaterDesc,
+        BattleFrontier_Lounge7_Text_MegaPunchDesc,
+        BattleFrontier_Lounge7_Text_MegaKickDesc,
+        BattleFrontier_Lounge7_Text_BodySlamDesc,
+        BattleFrontier_Lounge7_Text_RockSlideDesc,
+        BattleFrontier_Lounge7_Text_CounterDesc,
+        BattleFrontier_Lounge7_Text_ThunderWaveDesc,
+        BattleFrontier_Lounge7_Text_SwordsDanceDesc,
         gText_Exit,
     };
 
     static const u8 *const sBattleFrontier_TutorMoveDescriptions2[] = 
     {
-        BattleFrontier_Lounge7_Text_26600A,
-        BattleFrontier_Lounge7_Text_26603E,
-        BattleFrontier_Lounge7_Text_266070,
-        BattleFrontier_Lounge7_Text_2660A6,
-        BattleFrontier_Lounge7_Text_2660D0,
-        BattleFrontier_Lounge7_Text_2660FF,
-        BattleFrontier_Lounge7_Text_26612D,
-        BattleFrontier_Lounge7_Text_26615F,
-        BattleFrontier_Lounge7_Text_266185,
-        BattleFrontier_Lounge7_Text_2661B5,
+        BattleFrontier_Lounge7_Text_DefenseCurlDesc,
+        BattleFrontier_Lounge7_Text_SnoreDesc,
+        BattleFrontier_Lounge7_Text_MudSlapDesc,
+        BattleFrontier_Lounge7_Text_SwiftDesc,
+        BattleFrontier_Lounge7_Text_IcyWindDesc,
+        BattleFrontier_Lounge7_Text_EndureDesc,
+        BattleFrontier_Lounge7_Text_PsychUpDesc,
+        BattleFrontier_Lounge7_Text_IcePunchDesc,
+        BattleFrontier_Lounge7_Text_ThunderPunchDesc,
+        BattleFrontier_Lounge7_Text_FirePunchDesc,
         gText_Exit,
     };
 
@@ -3481,7 +3484,7 @@ void IncrementBirthIslandRockStepCount(void)
     }
 }
 
-void sub_813B1D0(void)
+void SetDeoxysRockPalette(void)
 {
     LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], 0x1A0, 8);
     BlendPalettes(0x04000000, 16, 0);
@@ -3996,10 +3999,10 @@ bool8 InPokemonCenter(void)
         MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
         MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
         MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
-        MAP_SINGLE_BATTLE_COLOSSEUM,
+        MAP_BATTLE_COLOSSEUM_2P,
         MAP_TRADE_CENTER,
         MAP_RECORD_CORNER,
-        MAP_DOUBLE_BATTLE_COLOSSEUM,
+        MAP_BATTLE_COLOSSEUM_4P,
         0xFFFF
     };
 
@@ -4016,28 +4019,72 @@ bool8 InPokemonCenter(void)
     return FALSE;
 }
 
+/*  Summary of the Lilycove Trainer Fan Club, because it's a little messy
+    
+    ## The Fan Club room itself
+    There are initially 4 members of the Fan Club (+ an interviewer), none of whom are fans of the player
+    After becoming the champion there will be 8 members of the Fan Club, 3 of whom are automatically fans of the player
+    After this point, if a club member is a fan of the player they will sit at the front table and comment on the player
+    If they are not fans of the player, they will sit at the far table and can make comments about a different trainer (see BufferFanClubTrainerName)
+    
+    ## Gaining/losing fans
+    After every link battle the player will gain a fan if they won, or lose a fan if they lost
+    If the player has at least 3 fans, this is the only way to gain fans
+    If the player has fewer than 3 fans, they may also gain fans by completing certain tasks enough times (see TryGainNewFanFromCounter)
+    If the player has at least 5 fans, they can lose a fan every 12 real-time hours, or more often if the timer variable is reset (see TryLoseFansFromPlayTime)
+    If the player has only 1 fan left it cannot be lost
+
+    ## Variables
+    VAR_FANCLUB_FAN_COUNTER, a bitfield for tracking the fans
+      Bits  1-7: Counter for when to add new fans
+      Bit     8: Flag set after receiving the initial 3 fans
+      Bits 9-16: Flags for each of the 8 club members, set to 1 when theyre a fan of the player and 0 when theyre not
+
+    VAR_FANCLUB_LOSE_FAN_TIMER, a timer for when to lose fans
+      Compared against playTimeHours. When theyre equal, a fan is ready to be lost
+      For every fan thats lost this way 12 hours are added to the timer
+
+    VAR_LILYCOVE_FAN_CLUB_STATE
+      0: Player is not the champion yet
+      1: Player is the champion, ready to meet their initial fans
+      2: Player has met their initial fans
+*/
+
+#define FANCLUB_BITFIELD (gSaveBlock1Ptr->vars[VAR_FANCLUB_FAN_COUNTER - VARS_START])
+#define FANCLUB_COUNTER    0x007F
+#define FANCLUB_FAN_FLAGS  0xFF80
+
+#define GET_TRAINER_FAN_CLUB_FLAG(flag) (FANCLUB_BITFIELD >> (flag) & 1)
+#define SET_TRAINER_FAN_CLUB_FLAG(flag) (FANCLUB_BITFIELD |= 1 << (flag))
+#define FLIP_TRAINER_FAN_CLUB_FLAG(flag)(FANCLUB_BITFIELD ^= 1 << (flag))
+
+#define GET_TRAINER_FAN_CLUB_COUNTER        (FANCLUB_BITFIELD & FANCLUB_COUNTER)
+#define SET_TRAINER_FAN_CLUB_COUNTER(count) (FANCLUB_BITFIELD = (FANCLUB_BITFIELD & FANCLUB_FAN_FLAGS) | (count))
+#define INCR_TRAINER_FAN_CLUB_COUNTER(count)(FANCLUB_BITFIELD += (count))
+#define CLEAR_TRAINER_FAN_CLUB_COUNTER      (FANCLUB_BITFIELD &= ~(FANCLUB_COUNTER))
+
 void ResetFanClub(void)
 {
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] = 0;
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = 0;
+    gSaveBlock1Ptr->vars[VAR_FANCLUB_FAN_COUNTER - VARS_START] = 0;
+    gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] = 0;
 }
 
-void sub_813BA30(void)
+void TryLoseFansFromPlayTimeAfterLinkBattle(void)
 {
-    if (sub_813BF44() != 0)
+    if (DidPlayerGetFirstFans())
     {
-        UpdateMovedLilycoveFanClubMembers();
-        gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours;
+        TryLoseFansFromPlayTime();
+        gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] = gSaveBlock2Ptr->playTimeHours;
     }
 }
 
-void sub_813BA60(void)
+void UpdateTrainerFanClubGameClear(void)
 {
-    if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1))
+    if (!GET_TRAINER_FAN_CLUB_FLAG(FANCLUB_GOT_FIRST_FANS))
     {
-        sub_813BF60();
-        sub_813BD84();
-        gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours;
+        SetPlayerGotFirstFans();
+        SetInitialFansOfPlayer();
+        gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] = gSaveBlock2Ptr->playTimeHours;
         FlagClear(FLAG_HIDE_FANCLUB_OLD_LADY);
         FlagClear(FLAG_HIDE_FANCLUB_BOY);
         FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY);
@@ -4047,186 +4094,216 @@ void sub_813BA60(void)
     }
 }
 
-u8 sub_813BADC(u8 a0)
+// If the player has < 3 fans, gain a new fan whenever the counter reaches 20+
+// Defeating Drake or participating in a Link Contest increments the counter by 2
+// Participating at Battle Tower or in a Secret Base battle increments the counter by 1
+u8 TryGainNewFanFromCounter(u8 incrementId)
 {
-    static const u8 gUnknown_085B3470[] = { 0x02, 0x01, 0x02, 0x01 };
+    static const u8 sCounterIncrements[] = { 2, 1, 2, 1 };
 
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
-        if ((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0x7F) + gUnknown_085B3470[a0] > 19)
+        if (GET_TRAINER_FAN_CLUB_COUNTER + sCounterIncrements[incrementId] > 19)
         {
-            if (GetNumMovedLilycoveFanClubMembers() < 3)
+            if (GetNumFansOfPlayerInTrainerFanClub() < 3)
             {
-                sub_813BB74();
-                gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] &= 0xFF80;
+                PlayerGainRandomTrainerFan();
+                CLEAR_TRAINER_FAN_CLUB_COUNTER;
             }
             else
             {
-                gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] = (gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0xFF80) | 0x14;
+                SET_TRAINER_FAN_CLUB_COUNTER(20);
             }
         }
         else
         {
-            gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] += gUnknown_085B3470[a0];
+            INCR_TRAINER_FAN_CLUB_COUNTER(sCounterIncrements[incrementId]);
         }
     }
 
-    return gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0x7F;
+    return GET_TRAINER_FAN_CLUB_COUNTER;
 }
 
-static u16 sub_813BB74(void)
+
+// Loop through the fan club members, and if theyre not a fan of the player there is a 50% chance for them to become a fan
+// Stops when a fan is gained
+// If no new fan was gained while looping, the last non-fan in the list becomes a fan
+// If all the members are already fans of the player then this redundantly sets the first fan in the list to be a fan
+static u16 PlayerGainRandomTrainerFan(void)
 {
-    static const u8 gUnknown_085B3474[] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] = 
+    { 
+        FANCLUB_MEMBER1, 
+        FANCLUB_MEMBER2, 
+        FANCLUB_MEMBER3, 
+        FANCLUB_MEMBER4, 
+        FANCLUB_MEMBER5, 
+        FANCLUB_MEMBER6,
+        FANCLUB_MEMBER7, 
+        FANCLUB_MEMBER8 
+    };
 
     u8 i;
-    u8 retVal = 0;
+    u8 idx = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(sFanClubMemberIds); i++)
     {
-        if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B3474[i]) & 1))
+        if (!GET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[i]))
         {
-            retVal = i;
-            if ((Random() & 1) != 0)
+            idx = i;
+            if (Random() & 1)
             {
-                gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 1 << gUnknown_085B3474[retVal];
-                return retVal;
+                SET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
+                return idx;
             }
         }
     }
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 1 << gUnknown_085B3474[retVal];
-    return retVal;
+    SET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
+    return idx;
 }
 
-static u16 sub_813BC00(void)
+// Loops through the fan club members, and if theyre a fan of the player there is a 50% chance for them to stop being a fan
+// Stops if a fan is removed, or if the player has only one fan left
+// If no fan was lost while looping, the last current fan in the list will stop being a fan
+static u16 PlayerLoseRandomTrainerFan(void)
 {
-    static const u8 gUnknown_085B347C[] = { 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 };
+    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] = 
+    { 
+        FANCLUB_MEMBER1, 
+        FANCLUB_MEMBER6, 
+        FANCLUB_MEMBER7, 
+        FANCLUB_MEMBER4, 
+        FANCLUB_MEMBER3, 
+        FANCLUB_MEMBER5, 
+        FANCLUB_MEMBER8, 
+        FANCLUB_MEMBER2 
+    };
 
     u8 i;
-    u8 retVal = 0;
+    u8 idx = 0;
 
-    if (GetNumMovedLilycoveFanClubMembers() == 1)
+    if (GetNumFansOfPlayerInTrainerFanClub() == 1)
     {
         return 0;
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(sFanClubMemberIds); i++)
     {
-        if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B347C[i]) & 1) != 0)
+        if (GET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[i]))
         {
-            retVal = i;
-            if ((Random() & 1) != 0)
+            idx = i;
+            if (Random() & 1)
             {
-                gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] ^= 1 << gUnknown_085B347C[retVal];
-                return retVal;
+                FLIP_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
+                return idx;
             }
         }
     }
 
-    if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B347C[retVal]) & 1))
+    if (GET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]))
     {
-        gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] ^= 1 << gUnknown_085B347C[retVal];
+        FLIP_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
     }
 
-    return retVal;
+    return idx;
 }
 
-u16 GetNumMovedLilycoveFanClubMembers(void)
+u16 GetNumFansOfPlayerInTrainerFanClub(void)
 {
     u8 i;
-    u8 retVal = 0;
+    u8 numFans = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < NUM_TRAINER_FAN_CLUB_MEMBERS; i++)
     {
-        if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> (i + 8)) & 1) != 0)
-        {
-            retVal++;
-        }
+        if (GET_TRAINER_FAN_CLUB_FLAG(i + FANCLUB_MEMBER1))
+            numFans++;
     }
 
-    return retVal;
+    return numFans;
 }
 
-void UpdateMovedLilycoveFanClubMembers(void)
+// If the player has > 5 fans in the Trainer Fan Club, then lose 1 fan for every 12 hours since the last fan loss / timer reset
+void TryLoseFansFromPlayTime(void)
 {
     u8 i = 0;
     if (gSaveBlock2Ptr->playTimeHours < 999)
     {
         while (TRUE)
         {
-            if (GetNumMovedLilycoveFanClubMembers() < 5)
+            if (GetNumFansOfPlayerInTrainerFanClub() < 5)
             {
-                gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours;
+                gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] = gSaveBlock2Ptr->playTimeHours;
                 break;
             }
-            else if (i == 8)
+            else if (i == NUM_TRAINER_FAN_CLUB_MEMBERS)
             {
                 break;
             }
-            else if (gSaveBlock2Ptr->playTimeHours - gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] < 12)
+            else if (gSaveBlock2Ptr->playTimeHours - gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] < 12)
             {
                 return;
             }
-            sub_813BC00();
-            gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] += 12;
+            PlayerLoseRandomTrainerFan();
+            gSaveBlock1Ptr->vars[VAR_FANCLUB_LOSE_FAN_TIMER - VARS_START] += 12;
             i++;
         }
     }
 }
 
-bool8 ShouldMoveLilycoveFanClubMember(void)
+bool8 IsFanClubMemberFanOfPlayer(void)
 {
-    return (gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gSpecialVar_0x8004) & 1;
+    return GET_TRAINER_FAN_CLUB_FLAG(gSpecialVar_0x8004);
 }
 
-static void sub_813BD84(void)
+static void SetInitialFansOfPlayer(void)
 {
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x2000;
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x100;
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x400;
+    SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER6);
+    SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER1);
+    SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER3);
 }
 
-void BufferStreakTrainerText(void)
+void BufferFanClubTrainerName(void)
 {
-    u8 a = 0;
-    u8 b = 0;
+    u8 whichLinkTrainer = 0;
+    u8 whichNPCTrainer = 0;
     switch (gSpecialVar_0x8004)
     {
-        case 8:
+        case FANCLUB_MEMBER1:
             break;
-        case 9:
+        case FANCLUB_MEMBER2:
             break;
-        case 10:
-            a = 0;
-            b = 3;
+        case FANCLUB_MEMBER3:
+            whichLinkTrainer = 0;
+            whichNPCTrainer = 3;
             break;
-        case 11:
-            a = 0;
-            b = 1;
+        case FANCLUB_MEMBER4:
+            whichLinkTrainer = 0;
+            whichNPCTrainer = 1;
             break;
-        case 12:
-            a = 1;
-            b = 0;
+        case FANCLUB_MEMBER5:
+            whichLinkTrainer = 1;
+            whichNPCTrainer = 0;
             break;
-        case 13:
-            a = 0;
-            b = 4;
+        case FANCLUB_MEMBER6:
+            whichLinkTrainer = 0;
+            whichNPCTrainer = 4;
             break;
-        case 14:
-            a = 1;
-            b = 5;
+        case FANCLUB_MEMBER7:
+            whichLinkTrainer = 1;
+            whichNPCTrainer = 5;
             break;
-        case 15:
+        case FANCLUB_MEMBER8:
             break;
     }
-    sub_813BE30(&gSaveBlock1Ptr->linkBattleRecords, a, b);
+    BufferFanClubTrainerName_(&gSaveBlock1Ptr->linkBattleRecords, whichLinkTrainer, whichNPCTrainer);
 }
 
-static void sub_813BE30(struct LinkBattleRecords *linkRecords, u8 a, u8 b)
+static void BufferFanClubTrainerName_(struct LinkBattleRecords *linkRecords, u8 whichLinkTrainer, u8 whichNPCTrainer)
 {
-    struct LinkBattleRecord *record = &linkRecords->entries[a];
+    struct LinkBattleRecord *record = &linkRecords->entries[whichLinkTrainer];
     if (record->name[0] == EOS)
     {
-        switch (b)
+        switch (whichNPCTrainer)
         {
             case 0:
                 StringCopy(gStringVar1, gText_Wallace);
@@ -4253,39 +4330,36 @@ static void sub_813BE30(struct LinkBattleRecords *linkRecords, u8 a, u8 b)
     }
     else
     {
-        StringCopyN(gStringVar1, record->name, 7);
-        gStringVar1[7] = EOS;
-        ConvertInternationalString(gStringVar1, linkRecords->languages[a]);
+        StringCopyN(gStringVar1, record->name, PLAYER_NAME_LENGTH);
+        gStringVar1[PLAYER_NAME_LENGTH] = EOS;
+        ConvertInternationalString(gStringVar1, linkRecords->languages[whichLinkTrainer]);
     }
 }
 
-void sub_813BF10(void)
+void UpdateTrainerFansAfterLinkBattle(void)
 {
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
-        sub_813BA30();
-        if (gBattleOutcome == 1)
-        {
-            sub_813BB74();
-        }
+        TryLoseFansFromPlayTimeAfterLinkBattle();
+        if (gBattleOutcome == B_OUTCOME_WON)
+            PlayerGainRandomTrainerFan();
         else
-        {
-            sub_813BC00();
-        }
+            PlayerLoseRandomTrainerFan();
     }
 }
 
-static bool8 sub_813BF44(void)
+static bool8 DidPlayerGetFirstFans(void)
 {
-    return (gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1;
+    return GET_TRAINER_FAN_CLUB_FLAG(FANCLUB_GOT_FIRST_FANS);
 }
 
-void sub_813BF60(void)
+void SetPlayerGotFirstFans(void)
 {
-    gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x80;
+    SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_GOT_FIRST_FANS);
 }
 
-u8 sub_813BF7C(void)
+// return value is always ignored
+u8 Script_TryGainNewFanFromCounter(void)
 {
-    return sub_813BADC(gSpecialVar_0x8004);
+    return TryGainNewFanFromCounter(gSpecialVar_0x8004);
 }
diff --git a/src/fieldmap.c b/src/fieldmap.c
index b2b80a2df..f595803ff 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -75,7 +75,7 @@ void InitBattlePyramidMap(bool8 setPlayerPosition)
 void InitTrainerHillMap(void)
 {
     CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData));
-    sub_81D5FB4(gBackupMapData);
+    GenerateTrainerHillFloorLayout(gBackupMapData);
 }
 
 static void InitMapLayoutData(struct MapHeader *mapHeader)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 00eed7624..fe21ff060 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -25,7 +25,7 @@
 extern struct MapPosition gPlayerFacingPosition;
 
 extern const u8 EventScript_FldEffCut[];
-extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
+extern const u8 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
 extern const u16 gFieldEffectObjectPalette6[];
@@ -584,7 +584,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
     ScriptContext2_Disable();
 
     if (IsMewPlayingHideAndSeek() == TRUE)
-        ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_267EDB);
+        ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_HideMewWhenGrassCut);
 }
 
 void FixLongGrassMetatilesWindowTop(s16 x, s16 y)
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index a2457307b..fedf38cf5 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -26,8 +26,8 @@ struct FlashStruct
 };
 
 // static functions
-static void hm2_flash(void);
-static void sub_81371B4(void);
+static void FieldCallback_Flash(void);
+static void FldEff_UseFlash(void);
 static bool8 sub_8137304(void);
 static void sub_81373F0(void);
 static void sub_8137404(u8 taskId);
@@ -86,26 +86,26 @@ bool8 SetUpFieldMove_Flash(void)
     else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH))
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = hm2_flash;
+        gPostMenuFieldCallback = FieldCallback_Flash;
         return TRUE;
     }
 
     return FALSE;
 }
 
-static void hm2_flash(void)
+static void FieldCallback_Flash(void)
 {
     u8 taskId = oei_task_add();
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    gTasks[taskId].data[8] = (uintptr_t)sub_81371B4 >> 16;
-    gTasks[taskId].data[9] = (uintptr_t)sub_81371B4;
+    gTasks[taskId].data[8] = (uintptr_t)FldEff_UseFlash >> 16;
+    gTasks[taskId].data[9] = (uintptr_t)FldEff_UseFlash;
 }
 
-static void sub_81371B4(void)
+static void FldEff_UseFlash(void)
 {
     PlaySE(SE_W115);
     FlagSet(FLAG_SYS_USE_FLASH);
-    ScriptContext1_SetupScript(EventScript_2926F8);
+    ScriptContext1_SetupScript(EventScript_FldEffFlash);
 }
 
 static void sub_81371D4(void)
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 733263bbc..1a42b297d 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -7,12 +7,13 @@
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
+#include "constants/party_menu.h"
 #include "constants/songs.h"
 
-static void sub_816166C(u8 taskId);
-static void sub_81616C0(u8 taskId);
-static void sub_8161724(u8 taskId);
-static void sub_81617B8(u8 taskId);
+static void Task_SoftboiledRestoreHealth(u8 taskId);
+static void Task_DisplayHPRestoredMessage(u8 taskId);
+static void Task_FinishSoftboiled(u8 taskId);
+static void CantUseSoftboiledOnMon(u8 taskId);
 
 bool8 SetUpFieldMove_SoftBoiled(void)
 {
@@ -29,81 +30,82 @@ bool8 SetUpFieldMove_SoftBoiled(void)
     return FALSE;
 }
 
-void sub_8161560(u8 taskId)
+void ChooseMonForSoftboiled(u8 taskId)
 {
-    gUnknown_0203CEC8.unkB = 0xA;
-    gUnknown_0203CEC8.unkA =  gUnknown_0203CEC8.slotId;
-    sub_81B0FCC(GetCursorSelectionMonId(), 0x1);
-    DisplayPartyMenuStdMessage(5);
-    gTasks[taskId].func = sub_81B1370;
+    gPartyMenu.action = PARTY_ACTION_SOFTBOILED;
+    gPartyMenu.slotId2 =  gPartyMenu.slotId;
+    AnimatePartySlot(GetCursorSelectionMonId(), 1);
+    DisplayPartyMenuStdMessage(PARTY_MSG_USE_ON_WHICH_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
-void sub_81615A8(u8 taskId)
+void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
 {
     u16 hp;
 
-    u8 slotId = gUnknown_0203CEC8.slotId;
-    u8 pokemonIndex = gUnknown_0203CEC8.unkA;
-    if(pokemonIndex > 6)
+    u8 userPartyId = gPartyMenu.slotId;
+    u8 recipientPartyId = gPartyMenu.slotId2;
+    if(recipientPartyId > PARTY_SIZE)
     {
-        gUnknown_0203CEC8.unkB = 0;
-        DisplayPartyMenuStdMessage(0);
-        gTasks[taskId].func = sub_81B1370;
+        gPartyMenu.action = 0;
+        DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
         return;
     }
 
-    hp = GetMonData(&gPlayerParty[pokemonIndex], MON_DATA_HP);
-    if(hp == 0 || slotId == pokemonIndex || GetMonData(&gPlayerParty[pokemonIndex], MON_DATA_MAX_HP) == hp)
+    hp = GetMonData(&gPlayerParty[recipientPartyId], MON_DATA_HP);
+    if(hp == 0 || userPartyId == recipientPartyId || GetMonData(&gPlayerParty[recipientPartyId], MON_DATA_MAX_HP) == hp)
     {
-        sub_81617B8(taskId);
+        CantUseSoftboiledOnMon(taskId);
         return;
     }
 
+    // Take away Softboiled user's health first (-1)
     PlaySE(SE_KAIFUKU);
-    sub_81B1F18(taskId, slotId, -1, GetMonData(&gPlayerParty[slotId], MON_DATA_MAX_HP)/5, sub_816166C);
+    PartyMenuModifyHP(taskId, userPartyId, -1, GetMonData(&gPlayerParty[userPartyId], MON_DATA_MAX_HP)/5, Task_SoftboiledRestoreHealth);
 }
 
-static void sub_816166C(u8 taskId)
+static void Task_SoftboiledRestoreHealth(u8 taskId)
 {
     PlaySE(SE_KAIFUKU);
-    sub_81B1F18(taskId, gUnknown_0203CEC8.unkA, 1, GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_MAX_HP)/5, sub_81616C0);
+    PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP)/5, Task_DisplayHPRestoredMessage);
 }
 
-static void sub_81616C0(u8 taskId)
+static void Task_DisplayHPRestoredMessage(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.unkA], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId2], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
-    DisplayPartyMenuMessage(gStringVar4, 0);
+    DisplayPartyMenuMessage(gStringVar4, FALSE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_8161724;
+    gTasks[taskId].func = Task_FinishSoftboiled;
 }
 
-static void sub_8161724(u8 taskId)
+static void Task_FinishSoftboiled(u8 taskId)
 {
-    if(sub_81B1BD4() == 1)
+    if(IsPartyMenuTextPrinterActive() == TRUE)
         return;
-    gUnknown_0203CEC8.unkB = 0x0;
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 0);
-    gUnknown_0203CEC8.slotId = gUnknown_0203CEC8.unkA;
-    sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
-    ClearStdWindowAndFrameToTransparent(0x6, FALSE);
-    ClearWindowTilemap(0x6);
-    DisplayPartyMenuStdMessage(0);
-    gTasks[taskId].func = sub_81B1370;
+    gPartyMenu.action = 0;
+    AnimatePartySlot(gPartyMenu.slotId, 0);
+    gPartyMenu.slotId = gPartyMenu.slotId2;
+    AnimatePartySlot(gPartyMenu.slotId2, 1);
+    ClearStdWindowAndFrameToTransparent(6, FALSE);
+    ClearWindowTilemap(6);
+    DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
-static void sub_8161784(u8 taskId)
+static void Task_ChooseNewMonForSoftboiled(u8 taskId)
 {
-    if(sub_81B1BD4() == 1)
+    if(IsPartyMenuTextPrinterActive() == TRUE)
         return;
-    DisplayPartyMenuStdMessage(5);
-    gTasks[taskId].func = sub_81B1370;
+    DisplayPartyMenuStdMessage(PARTY_MSG_USE_ON_WHICH_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
-static void sub_81617B8(u8 taskId)
+static void CantUseSoftboiledOnMon(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    DisplayPartyMenuMessage(gText_CantBeUsedOnPkmn, 0);
+    DisplayPartyMenuMessage(gText_CantBeUsedOnPkmn, FALSE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_8161784;
+    gTasks[taskId].func = Task_ChooseNewMonForSoftboiled;
 }
diff --git a/src/frontier_util.c b/src/frontier_util.c
index d7d76066f..87aff022e 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -29,6 +29,7 @@
 #include "load_save.h"
 #include "battle_dome.h"
 #include "constants/battle_frontier.h"
+#include "constants/frontier_util.h"
 #include "constants/trainers.h"
 #include "constants/species.h"
 #include "constants/game_stat.h"
@@ -51,26 +52,26 @@ struct FrontierBrainMon
 static void sub_81A17A0(void);
 static void sub_81A1830(void);
 static void sub_81A1968(void);
-static void sub_81A1AD4(void);
+static void LoadSelectedParty(void);
 static void DoSoftReset_(void);
-static void sub_81A1B28(void);
+static void SetFrontierTrainers(void);
 static void sub_81A1B38(void);
 static void ShowFacilityResultsWindow(void);
 static void sub_81A31FC(void);
 static void sub_81A35EC(void);
-static void sub_81A3B00(void);
+static void IsTrainerFrontierBrain(void);
 static void sub_81A3B64(void);
-static void sub_81A3D30(void);
-static void sub_81A3D58(void);
-static void sub_81A3DA0(void);
+static void GetFacilitySymbolCount(void);
+static void GiveFacilitySymbol(void);
+static void CheckBattleTypeFlag(void);
 static void sub_81A3FD4(void);
-static void sub_81A4224(void);
+static void ValidateVisitingTrainer(void);
 static void sub_81A4230(void);
 static void sub_81A43A8(void);
 static void sub_81A4410(void);
-static void sub_81A443C(void);
+static void BufferFrontierTrainerName(void);
 static void sub_81A447C(void);
-static void sub_81A457C(void);
+static void SetFacilityBrainEventObject(void);
 static void ShowTowerResultsWindow(u8);
 static void ShowDomeResultsWindow(u8);
 static void ShowPalaceResultsWindow(u8);
@@ -603,29 +604,29 @@ static const u16 gUnknown_08611BFC[][2] =
 
 static void (* const sFrontierUtilFuncs[])(void) =
 {
-    sub_81A17A0,
-    sub_81A1830,
-    sub_81A1968,
-    sub_81A1AD4,
-    DoSoftReset_,
-    sub_81A1B28,
-    sub_81A1B38,
-    ShowFacilityResultsWindow,
-    sub_81A31FC,
-    sub_81A35EC,
-    sub_81A3B00,
-    sub_81A3B64,
-    sub_81A3D30,
-    sub_81A3D58,
-    sub_81A3DA0,
-    sub_81A3FD4,
-    sub_81A4224,
-    sub_81A4230,
-    sub_81A43A8,
-    sub_81A4410,
-    sub_81A443C,
-    sub_81A447C,
-    sub_81A457C,
+    [FRONTIER_UTIL_FUNC_0]                     = sub_81A17A0,
+    [FRONTIER_UTIL_FUNC_1]                     = sub_81A1830,
+    [FRONTIER_UTIL_FUNC_2]                     = sub_81A1968,
+    [FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY]   = LoadSelectedParty,
+    [FRONTIER_UTIL_FUNC_SOFT_RESET]            = DoSoftReset_,
+    [FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS] = SetFrontierTrainers,
+    [FRONTIER_UTIL_FUNC_6]                     = sub_81A1B38,
+    [FRONTIER_UTIL_FUNC_RESULTS_WINDOW]        = ShowFacilityResultsWindow,
+    [FRONTIER_UTIL_FUNC_8]                     = sub_81A31FC,
+    [FRONTIER_UTIL_FUNC_9]                     = sub_81A35EC,
+    [FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN]     = IsTrainerFrontierBrain,
+    [FRONTIER_UTIL_FUNC_11]                    = sub_81A3B64,
+    [FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS]  = GetFacilitySymbolCount,
+    [FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL]  = GiveFacilitySymbol,
+    [FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE]     = CheckBattleTypeFlag,
+    [FRONTIER_UTIL_FUNC_15]                    = sub_81A3FD4,
+    [FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER]   = ValidateVisitingTrainer,
+    [FRONTIER_UTIL_FUNC_17]                    = sub_81A4230,
+    [FRONTIER_UTIL_FUNC_18]                    = sub_81A43A8,
+    [FRONTIER_UTIL_FUNC_19]                    = sub_81A4410,
+    [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME]   = BufferFrontierTrainerName,
+    [FRONTIER_UTIL_FUNC_21]                    = sub_81A447C,
+    [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT]      = SetFacilityBrainEventObject,
 };
 
 static const struct WindowTemplate gUnknown_08611C74 =
@@ -679,38 +680,38 @@ const u16 gFrontierBannedSpecies[] =
     SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF
 };
 
-static const u8 *const gUnknown_08611CB0[][2] =
-{
-    {gText_BattleTower2,  gUnknown_085ED164},
-    {gText_BattleTower2,  gUnknown_085ED170},
-    {gText_BattleTower2,  gUnknown_085ED17C},
-    {gText_BattleDome,    gUnknown_085ED164},
-    {gText_BattlePalace,  gUnknown_085ED164},
-    {gText_BattleArena,   gUnknown_085ED190},
-    {gText_BattleFactory, gUnknown_085ED164},
-    {gText_BattlePike,    gUnknown_085ED190},
-    {gText_BattlePyramid, gUnknown_085ED190},
-    {gText_BattleTower2,  gUnknown_085ED188},
+static const u8 *const sRecordsWindowChallengeTexts[][2] =
+{
+    [RANKING_HALL_BATTLE_TOWER_SINGLES] = {gText_BattleTower2,  gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_TOWER_DOUBLES] = {gText_BattleTower2,  gText_FacilityDouble},
+    [RANKING_HALL_BATTLE_TOWER_MULTIS]  = {gText_BattleTower2,  gText_FacilityMulti},
+    [RANKING_HALL_BATTLE_DOME]          = {gText_BattleDome,    gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_PALACE]        = {gText_BattlePalace,  gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_ARENA]         = {gText_BattleArena,   gText_Facility},
+    [RANKING_HALL_BATTLE_FACTORY]       = {gText_BattleFactory, gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_PIKE]          = {gText_BattlePike,    gText_Facility},
+    [RANKING_HALL_BATTLE_PYRAMID]       = {gText_BattlePyramid, gText_Facility},
+    [RANKING_HALL_BATTLE_TOWER_LINK]    = {gText_BattleTower2,  gText_FacilityLink},
 };
 
-static const u8 *const gLevelModeText[] =
+static const u8 *const sLevelModeText[] =
 {
     gText_RecordsLv50,
     gText_RecordsOpenLevel,
 };
 
-static const u8 *const gHallFacilityToRecordsText[] =
-{
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityClearStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityKOsStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityRoomsCleared,
-    gText_FrontierFacilityFloorsCleared,
-    gText_FrontierFacilityWinStreak,
+static const u8 *const sHallFacilityToRecordsText[] =
+{
+    [RANKING_HALL_BATTLE_TOWER_SINGLES] = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_TOWER_DOUBLES] = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_TOWER_MULTIS]  = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_DOME]          = gText_FrontierFacilityClearStreak,
+    [RANKING_HALL_BATTLE_PALACE]        = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_ARENA]         = gText_FrontierFacilityKOsStreak,
+    [RANKING_HALL_BATTLE_FACTORY]       = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_PIKE]          = gText_FrontierFacilityRoomsCleared,
+    [RANKING_HALL_BATTLE_PYRAMID]       = gText_FrontierFacilityFloorsCleared,
+    [RANKING_HALL_BATTLE_TOWER_LINK]    = gText_FrontierFacilityWinStreak,
 };
 
 static const u16 gFacilityToBrainTrainerId[] =
@@ -880,11 +881,11 @@ static void sub_81A1968(void)
     }
 }
 
-static void sub_81A1AD4(void)
+static void LoadSelectedParty(void)
 {
     s32 i;
 
-    sub_81B8558();
+    ClearSelectedPartyOrder();
     for (i = 0; i < gSpecialVar_0x8005; i++)
         gSelectedOrderFromParty[i] = gSaveBlock2Ptr->frontier.selectedPartyMons[i];
     ReducePlayerPartyToSelectedMons();
@@ -895,7 +896,7 @@ static void DoSoftReset_(void)
     DoSoftReset();
 }
 
-static void sub_81A1B28(void)
+static void SetFrontierTrainers(void)
 {
     gFacilityTrainers = gBattleFrontierTrainers;
 }
@@ -1697,7 +1698,7 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId)
         else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
             FrontierSpeechToString(gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].greeting);
         else
-            CopyFriendsApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE);
+            BufferApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE);
         break;
     case FRONTIER_PLAYER_LOST_TEXT:
         if (trainerId == TRAINER_EREADER)
@@ -1724,7 +1725,7 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId)
             if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
                 FrontierSpeechToString(GetRecordedBattleEasyChatSpeech());
             else
-                FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords);
+                FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].speechWon);
         }
         break;
     case FRONTIER_PLAYER_WON_TEXT:
@@ -1752,12 +1753,12 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId)
             if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
             {
                 trainerId = GetRecordedBattleApprenticeId();
-                FrontierSpeechToString(gApprentices[trainerId].easyChatWords);
+                FrontierSpeechToString(gApprentices[trainerId].speechLost);
             }
             else
             {
                 trainerId = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id;
-                FrontierSpeechToString(gApprentices[trainerId].easyChatWords);
+                FrontierSpeechToString(gApprentices[trainerId].speechLost);
             }
         }
         break;
@@ -1827,7 +1828,7 @@ void sub_81A3ACC(void)
         gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF;
 }
 
-static void sub_81A3B00(void)
+static void IsTrainerFrontierBrain(void)
 {
     if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
         gSpecialVar_Result = TRUE;
@@ -1900,13 +1901,13 @@ static void sub_81A3B64(void)
     gSaveBlock2Ptr->frontier.field_EBA = points;
 }
 
-static void sub_81A3D30(void)
+static void GetFacilitySymbolCount(void)
 {
     s32 facility = VarGet(VAR_FRONTIER_FACILITY);
     gSpecialVar_Result = GetPlayerSymbolCountForFacility(facility);
 }
 
-static void sub_81A3D58(void)
+static void GiveFacilitySymbol(void)
 {
     s32 facility = VarGet(VAR_FRONTIER_FACILITY);
     if (GetPlayerSymbolCountForFacility(facility) == 0)
@@ -1915,7 +1916,7 @@ static void sub_81A3D58(void)
         FlagSet(FLAG_SYS_TOWER_GOLD + facility * 2);
 }
 
-static void sub_81A3DA0(void)
+static void CheckBattleTypeFlag(void)
 {
     if (gBattleTypeFlags & gSpecialVar_0x8005)
         gSpecialVar_Result = TRUE;
@@ -2087,7 +2088,7 @@ static void sub_81A3FD4(void)
     }
 }
 
-static void sub_81A4224(void)
+static void ValidateVisitingTrainer(void)
 {
     ValidateEReaderTrainer();
 }
@@ -2160,7 +2161,7 @@ static void sub_81A4410(void)
     gSaveBlock2Ptr->frontier.field_CA9_b = 1;
 }
 
-static void sub_81A443C(void)
+static void BufferFrontierTrainerName(void)
 {
     switch (gSpecialVar_0x8005)
     {
@@ -2198,7 +2199,7 @@ static void sub_81A447C(void)
     }
 }
 
-static void sub_81A457C(void)
+static void SetFacilityBrainEventObject(void)
 {
     SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY));
 }
@@ -2219,8 +2220,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall
         if (winStreak > 9999)
             winStreak = 9999;
         ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
-        StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[hallFacilityId]);
-        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+        StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[hallFacilityId]);
+        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, sHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
     }
 }
 
@@ -2246,8 +2247,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall
         if (winStreak > 9999)
             winStreak = 9999;
         ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
-        StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[9]);
-        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+        StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[RANKING_HALL_BATTLE_TOWER_LINK]);
+        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, sHallFacilityToRecordsText[RANKING_HALL_BATTLE_TOWER_LINK], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
     }
 }
 
@@ -2326,12 +2327,12 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode)
     struct RankingHall1P records1P[3];
     struct RankingHall2P records2P[3];
 
-    StringCopy(gStringVar1, gUnknown_08611CB0[hallFacilityId][0]);
-    StringExpandPlaceholders(gStringVar4, gUnknown_08611CB0[hallFacilityId][1]);
+    StringCopy(gStringVar1, sRecordsWindowChallengeTexts[hallFacilityId][0]);
+    StringExpandPlaceholders(gStringVar4, sRecordsWindowChallengeTexts[hallFacilityId][1]);
     AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
-    x = GetStringRightAlignXOffset(1, gLevelModeText[lvlMode], 0xD0);
-    AddTextPrinterParameterized(gRecordsWindowId, 1, gLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL);
-    if (hallFacilityId == HALL_FACILITIES_COUNT)
+    x = GetStringRightAlignXOffset(1, sLevelModeText[lvlMode], 0xD0);
+    AddTextPrinterParameterized(gRecordsWindowId, 1, sLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL);
+    if (hallFacilityId == RANKING_HALL_BATTLE_TOWER_LINK)
     {
         gSaveBlock2Ptr->frontier.opponentName[0][PLAYER_NAME_LENGTH] = EOS;
         gSaveBlock2Ptr->frontier.opponentName[1][PLAYER_NAME_LENGTH] = EOS;
diff --git a/src/graphics.c b/src/graphics.c
index 22478a7b6..82765e913 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -960,7 +960,7 @@ const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame
 const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz");
 const u32 gUnknown_08D77AE4[] = INCBIN_U32("graphics/battle_transitions/vs_frame.gbapal.lz");
 
-const u32 gUnknown_08D77B0C[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz");
+const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz");
 
 #include "data/graphics/battle_terrain.h"
 
@@ -987,7 +987,7 @@ const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal
 const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz");
 const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz");
 
-const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz");
+const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz");
 const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal");
 
 const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal");
@@ -1138,9 +1138,9 @@ const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("graphics/battle_anims/spri
 const u32 gBattleAnimSpriteGfx_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.4bpp.lz");
 const u32 gBattleAnimSpritePal_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.gbapal.lz");
 
-const u32 gPartyMenuMisc_Gfx[] = INCBIN_U32("graphics/interface/party_menu_misc.4bpp.lz");
-const u32 gPartyMenuMisc_Pal[] = INCBIN_U32("graphics/interface/party_menu_misc.gbapal.lz");
-const u32 gPartyMenuMisc_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_misc.bin.lz");
+const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/interface/party_menu_bg.4bpp.lz");
+const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/interface/party_menu_bg.gbapal.lz");
+const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_bg.bin.lz");
 
 const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball.4bpp.lz");
 const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball_small.4bpp.lz"); //unused
diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c
new file mode 100644
index 000000000..13794faf0
--- /dev/null
+++ b/src/image_processing_effects.c
@@ -0,0 +1,1226 @@
+#include "global.h"
+#include "image_processing_effects.h"
+#include "contest_painting.h"
+#include "constants/rgb.h"
+
+// IWRAM common
+u8 gCanvasColumnStart;
+u16 (*gCanvasPixels)[][32];
+u8 gCanvasRowEnd;
+u8 gCanvasHeight;
+u8 gCanvasColumnEnd;
+u8 gCanvasRowStart;
+u8 gCanvasMonPersonality;
+u8 gCanvasWidth;
+u16 *gCanvasPalette;
+u16 gCanvasPaletteStart;
+
+static void ApplyImageEffect_Pointillism(void);
+static void ApplyImageEffect_Blur(void);
+static void ApplyImageEffect_BlackOutline(void);
+static void ApplyImageEffect_Invert(void);
+static void ApplyImageEffect_BlackAndWhite(void);
+static void ApplyImageEffect_BlurRight(void);
+static void ApplyImageEffect_BlurDown(void);
+static void ApplyImageEffect_Shimmer(void);
+static void ApplyImageEffect_Grayscale(void);
+static void ApplyImageEffect_PersonalityColor(u8);
+static void ApplyImageEffect_RedChannelGrayscale(u8);
+static void ApplyImageEffect_RedChannelGrayscaleHighlight(u8);
+static void AddPointillismPoints(u16);
+static u16 ConvertColorToGrayscale(u16*);
+static u16 QuantizePixel_Blur(u16*, u16*, u16*);
+static u16 QuantizePixel_PersonalityColor(u16*, u8);
+static u16 QuantizePixel_BlackAndWhite(u16*);
+static u16 QuantizePixel_BlackOutline(u16*, u16*);
+static u16 QuantizePixel_Invert(u16*);
+static u16 QuantizePixel_BlurHard(u16*, u16*, u16*);
+static u16 QuantizePixel_MotionBlur(u16*, u16*);
+static u16 GetColorFromPersonality(u8);
+static void QuantizePalette_Standard(bool8);
+static void SetPresetPalette_PrimaryColors(void);
+static void QuantizePalette_PrimaryColors(void);
+static void SetPresetPalette_Grayscale(void);
+static void QuantizePalette_Grayscale(void);
+static void SetPresetPalette_GrayscaleSmall(void);
+static void QuantizePalette_GrayscaleSmall(void);
+static void SetPresetPalette_BlackAndWhite(void);
+static void QuantizePalette_BlackAndWhite(void);
+static u16 QuantizePixel_Standard(u16*);
+static u16 QuantizePixel_GrayscaleSmall(u16*);
+static u16 QuantizePixel_Grayscale(u16*);
+static u16 QuantizePixel_PrimaryColors(u16*);
+
+extern const u8 gPointillismPoints[][3];
+
+void ApplyImageProcessingEffects(struct ImageProcessingContext *context)
+{
+    gCanvasPixels = context->canvasPixels;
+    gCanvasMonPersonality = context->personality;
+    gCanvasColumnStart = context->columnStart;
+    gCanvasRowStart = context->rowStart;
+    gCanvasColumnEnd = context->columnEnd;
+    gCanvasRowEnd = context->rowEnd;
+    gCanvasWidth = context->canvasWidth;
+    gCanvasHeight = context->canvasHeight;
+
+    switch (context->effect)
+    {
+    case IMAGE_EFFECT_POINTILLISM:
+        ApplyImageEffect_Pointillism();
+        break;
+    case IMAGE_EFFECT_BLUR:
+        ApplyImageEffect_Blur();
+        break;
+    case IMAGE_EFFECT_OUTLINE_COLORED:
+        ApplyImageEffect_BlackOutline();
+        ApplyImageEffect_PersonalityColor(gCanvasMonPersonality);
+        break;
+    case IMAGE_EFFECT_INVERT_BLACK_WHITE:
+        ApplyImageEffect_BlackOutline();
+        ApplyImageEffect_Invert();
+        ApplyImageEffect_BlackAndWhite();
+    case IMAGE_EFFECT_INVERT:
+        ApplyImageEffect_Invert();
+        break;
+    case IMAGE_EFFECT_THICK_BLACK_WHITE:
+        ApplyImageEffect_BlackOutline();
+        ApplyImageEffect_BlurRight();
+        ApplyImageEffect_BlurRight();
+        ApplyImageEffect_BlurDown();
+        ApplyImageEffect_BlackAndWhite();
+        break;
+    case IMAGE_EFFECT_SHIMMER:
+        ApplyImageEffect_Shimmer();
+        break;
+    case IMAGE_EFFECT_OUTLINE:
+        ApplyImageEffect_BlackOutline();
+        break;
+    case IMAGE_EFFECT_BLUR_RIGHT:
+        ApplyImageEffect_BlurRight();
+        break;
+    case IMAGE_EFFECT_BLUR_DOWN:
+        ApplyImageEffect_BlurDown();
+        break;
+    case IMAGE_EFFECT_GRAYSCALE_LIGHT:
+        ApplyImageEffect_Grayscale();
+        ApplyImageEffect_RedChannelGrayscale(3);
+        break;
+    case IMAGE_EFFECT_CHARCOAL:
+        ApplyImageEffect_BlackOutline();
+        ApplyImageEffect_BlurRight();
+        ApplyImageEffect_BlurDown();
+        ApplyImageEffect_BlackAndWhite();
+        ApplyImageEffect_Blur();
+        ApplyImageEffect_Blur();
+        ApplyImageEffect_RedChannelGrayscale(2);
+        ApplyImageEffect_RedChannelGrayscaleHighlight(4);
+        break;
+    }
+}
+
+static void ApplyImageEffect_RedChannelGrayscale(u8 delta)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                // Gets the grayscale value, based on the pixel's red channel.
+                // Also adds a delta to skew lighter or darker.
+                u8 grayValue = (31 & *pixel);
+                grayValue += delta;
+                if (grayValue > 31)
+                    grayValue = 31;
+
+                *pixel = RGB2(grayValue, grayValue, grayValue);
+            }
+        }
+    }
+}
+
+static void ApplyImageEffect_RedChannelGrayscaleHighlight(u8 highlight)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                u8 grayValue = (31 & *pixel);
+                if (grayValue > 31 - highlight)
+                    grayValue = 31 - (highlight >> 1);
+
+                *pixel = RGB2(grayValue, grayValue, grayValue);
+            }
+        }
+    }
+}
+
+static void ApplyImageEffect_Pointillism(void)
+{
+    u32 i;
+    for (i = 0; i < 3200; i++)
+        AddPointillismPoints(i);
+}
+
+static void ApplyImageEffect_Grayscale(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = ConvertColorToGrayscale(pixel);
+        }
+    }
+}
+
+static void ApplyImageEffect_Blur(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gCanvasColumnEnd; i++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][gCanvasRowStart * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart + i];
+        u16 prevPixel = *pixel;
+
+        j = 1;
+        pixel += gCanvasWidth;
+        while (j < gCanvasRowEnd - 1)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                *pixel = QuantizePixel_Blur(&prevPixel, pixel, pixel + gCanvasWidth);
+                prevPixel = *pixel;
+            }
+
+            j++;
+            pixel += gCanvasWidth;
+        }
+    }
+}
+
+static void ApplyImageEffect_PersonalityColor(u8 personality)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = QuantizePixel_PersonalityColor(pixel, personality);
+        }
+    }
+}
+
+static void ApplyImageEffect_BlackAndWhite(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = QuantizePixel_BlackAndWhite(pixel);
+        }
+    }
+}
+
+static void ApplyImageEffect_BlackOutline(void)
+{
+    u8 i, j;
+    u16 *pixel;
+
+    // Handle top row of pixels first.
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        pixel = &pixelRow[gCanvasColumnStart];
+        *pixel = QuantizePixel_BlackOutline(pixel, pixel + 1);
+        for (i = 1, pixel++; i < gCanvasColumnEnd - 1; i++, pixel++)
+        {
+            *pixel = QuantizePixel_BlackOutline(pixel, pixel + 1);
+            *pixel = QuantizePixel_BlackOutline(pixel, pixel - 1);
+        }
+
+        *pixel = QuantizePixel_BlackOutline(pixel, pixel - 1);
+    }
+
+    // Handle each column from left to right.
+    for (i = 0; i < gCanvasColumnEnd; i++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][gCanvasRowStart * gCanvasWidth];
+        pixel = &pixelRow[gCanvasColumnStart + i];
+        *pixel = QuantizePixel_BlackOutline(pixel, pixel + gCanvasWidth);
+        for (j = 1, pixel += gCanvasWidth; j < gCanvasRowEnd - 1; j++, pixel += gCanvasWidth)
+        {
+            *pixel = QuantizePixel_BlackOutline(pixel, pixel + gCanvasWidth);
+            *pixel = QuantizePixel_BlackOutline(pixel, pixel - gCanvasWidth);
+        }
+
+        *pixel = QuantizePixel_BlackOutline(pixel, pixel - gCanvasWidth);
+    }
+}
+
+static void ApplyImageEffect_Invert(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = QuantizePixel_Invert(pixel);
+        }
+    }
+}
+
+static void ApplyImageEffect_Shimmer(void)
+{
+    u8 i, j;
+    u16 *pixel;
+    u16 prevPixel;
+
+    // First, invert all of the colors.
+    pixel = (*gCanvasPixels)[0];
+    for (i = 0; i < 64; i++)
+    {
+        for (j = 0; j < 64; j++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = QuantizePixel_Invert(pixel);
+        }
+    }
+
+    // Blur the pixels twice.
+    for (j = 0; j < 64; j++)
+    {
+        pixel = &(*gCanvasPixels)[0][j];
+        prevPixel = *pixel;
+        *pixel = 0x8000;
+        for (i = 1, pixel += 64; i < 63; i++, pixel += 64)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                *pixel = QuantizePixel_BlurHard(&prevPixel, pixel, pixel + 64);
+                prevPixel = *pixel;
+            }
+        }
+
+        *pixel = 0x8000;
+        pixel = &(*gCanvasPixels)[0][j];
+        prevPixel = *pixel;
+        *pixel = 0x8000;
+        for (i = 1, pixel += 64; i < 63; i++, pixel += 64)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                *pixel = QuantizePixel_BlurHard(&prevPixel, pixel, pixel + 64);
+                prevPixel = *pixel;
+            }
+        }
+
+        *pixel = 0x8000;
+    }
+
+    // Finally, invert colors back to the original color space.
+    // The above blur causes the outline areas to darken, which makes
+    // this inversion give the effect of light outlines.
+    pixel = (*gCanvasPixels)[0];
+    for (i = 0; i < 64; i++)
+    {
+        for (j = 0; j < 64; j++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+                *pixel = QuantizePixel_Invert(pixel);
+        }
+    }
+}
+
+static void ApplyImageEffect_BlurRight(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        u16 prevPixel = *pixel;
+        for (i = 1, pixel++; i < gCanvasColumnEnd - 1; i++, pixel++)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                *pixel = QuantizePixel_MotionBlur(&prevPixel, pixel);
+                prevPixel = *pixel;
+            }
+        }
+    }
+}
+
+static void ApplyImageEffect_BlurDown(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gCanvasColumnEnd; i++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][gCanvasRowStart * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart + i];
+        u16 prevPixel = *pixel;
+        for (j = 1, pixel += gCanvasWidth; j < gCanvasRowEnd - 1; j++, pixel += gCanvasWidth)
+        {
+            if (!(0x8000 & *pixel))
+            {
+                *pixel = QuantizePixel_MotionBlur(&prevPixel, pixel);
+                prevPixel = *pixel;
+            }
+        }
+    }
+}
+
+struct PointillismPoint
+{
+    u8 column;
+    u8 row;
+    u16 delta;
+};
+
+static void AddPointillismPoints(u16 arg0)
+{
+    u8 i;
+    bool8 offsetDownLeft;
+    u8 colorType;
+    struct PointillismPoint points[6];
+
+    points[0].column = gPointillismPoints[arg0][0];
+    points[0].row = gPointillismPoints[arg0][1];
+    points[0].delta = (gPointillismPoints[arg0][2] >> 3) & 7;
+
+    colorType = (gPointillismPoints[arg0][2] >> 1) & 3;
+    offsetDownLeft = gPointillismPoints[arg0][2] & 1;
+    for (i = 1; i < points[0].delta; i++)
+    {
+        if (!offsetDownLeft)
+        {
+            points[i].column = points[0].column - i;
+            points[i].row = points[0].row + i;
+        }
+        else
+        {
+            points[i].column = points[0].column + 1;
+            points[i].row = points[0].row - 1;
+        }
+
+        if (points[i].column > 63 || points[i].row > 63)
+        {
+            points[0].delta = i - 1;
+            break;
+        }
+
+        points[i].delta = points[0].delta - i;
+    }
+
+    for (i = 0; i < points[0].delta; i++)
+    {
+        u16 *pixel = &(*gCanvasPixels)[points[i].row * 2][points[i].column];
+
+        if (!(0x8000 & *pixel))
+        {
+            u16 red = (*pixel) & 0x1F;
+            u16 green = (*pixel >> 5) & 0x1F;
+            u16 blue = (*pixel >> 10) & 0x1F;
+
+            switch (colorType)
+            {
+            case 0:
+            case 1:
+                switch (((gPointillismPoints[arg0][2] >> 3) & 7) % 3)
+                {
+                case 0:
+                    if (red >= points[i].delta)
+                        red -= points[i].delta;
+                    else
+                        red = 0;
+                    break;
+                case 1:
+                    if (green >= points[i].delta)
+                        green -= points[i].delta;
+                    else
+                        green = 0;
+                    break;
+                case 2:
+                    if (blue >= points[i].delta)
+                        blue -= points[i].delta;
+                    else
+                        blue = 0;
+                    break;
+                }
+                break;
+            case 2:
+            case 3:
+                red += points[i].delta;
+                green += points[i].delta;
+                blue += points[i].delta;
+                if (red > 31)
+                    red = 31;
+                if (green > 31)
+                    green = 31;
+                if (blue > 31)
+                    blue = 31;
+                break;
+            }
+
+            *pixel = RGB2(red, green, blue);
+        }
+    }
+}
+
+static u16 ConvertColorToGrayscale(u16 *color)
+{
+    s32 clr = *color;
+    s32 r = clr & 0x1F;
+    s32 g = (clr >> 5) & 0x1F;
+    s32 b = (clr >> 10) & 0x1F;
+    s32 gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
+    return RGB2(gray, gray, gray);
+}
+
+// The dark colors are the colored edges of the Cool painting effect.
+// Everything else is white.
+static u16 QuantizePixel_PersonalityColor(u16 *color, u8 personality)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    if (red < 17 && green < 17 && blue < 17)
+        return GetColorFromPersonality(personality);
+    else
+        return RGB_WHITE;
+}
+
+// Based on the given value, which comes from the first 8 bits of
+// the mon's personality value, return a color.
+static u16 GetColorFromPersonality(u8 personality)
+{
+    u16 red = 0;
+    u16 green = 0;
+    u16 blue = 0;
+    u8 strength = (personality / 6) % 3;
+    u8 colorType = personality % 6;
+
+    switch (colorType)
+    {
+    case 0:
+        // Teal color
+        green = 21 - strength;
+        blue = green;
+        red = 0;
+        break;
+    case 1:
+        // Yellow color
+        blue = 0;
+        red = 21 - strength;
+        green = red;
+        break;
+    case 2:
+        // Purple color
+        blue = 21 - strength;
+        green = 0;
+        red = blue;
+        break;
+    case 3:
+        // Red color
+        blue = 0;
+        green = 0;
+        red = 23 - strength;
+        break;
+    case 4:
+        // Blue color
+        blue = 23 - strength;
+        green = 0;
+        red = 0;
+        break;
+    case 5:
+        // Green color
+        blue = 0;
+        green = 23 - strength;
+        red = 0;
+        break;
+    }
+
+    return RGB2(red, green, blue);
+}
+
+static u16 QuantizePixel_BlackAndWhite(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    if (red < 17 && green < 17 && blue < 17)
+        return RGB_BLACK;
+    else
+        return RGB_WHITE;
+}
+
+static u16 QuantizePixel_BlackOutline(u16 *pixelA, u16 *pixelB)
+{
+    if (*pixelA != RGB_BLACK)
+    {
+        if (*pixelA & 0x8000)
+            return 0x8000;
+        if (*pixelB & 0x8000)
+            return RGB_BLACK;
+
+        return *pixelA;
+    }
+
+    return RGB_BLACK;
+}
+
+static u16 QuantizePixel_Invert(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    red = 31 - red;
+    green = 31 - green;
+    blue = 31 - blue;
+
+    return RGB2(red, green, blue);
+}
+
+static u16 QuantizePixel_MotionBlur(u16 *prevPixel, u16 *curPixel)
+{
+    u16 pixelChannels[2][3];
+    u16 diffs[3];
+    u8 i;
+    u16 largestDiff;
+    u16 red, green, blue;
+
+    if (*prevPixel == *curPixel)
+        return *curPixel;
+
+    pixelChannels[0][0] = (*prevPixel >> 0)  & 0x1F;
+    pixelChannels[0][1] = (*prevPixel >> 5)  & 0x1F;
+    pixelChannels[0][2] = (*prevPixel >> 10) & 0x1F;
+    pixelChannels[1][0] = (*curPixel  >> 0)  & 0x1F;
+    pixelChannels[1][1] = (*curPixel  >> 5)  & 0x1F;
+    pixelChannels[1][2] = (*curPixel  >> 10) & 0x1F;
+
+    // Don't blur light colors.
+    if (pixelChannels[0][0] > 25 && pixelChannels[0][1] > 25 && pixelChannels[0][2] > 25)
+        return *curPixel;
+    if (pixelChannels[1][0] > 25 && pixelChannels[1][1] > 25 && pixelChannels[1][2] > 25)
+        return *curPixel;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (pixelChannels[0][i] > pixelChannels[1][i])
+            diffs[i] = pixelChannels[0][i] - pixelChannels[1][i];
+        else
+            diffs[i] = pixelChannels[1][i] - pixelChannels[0][i];
+    }
+
+    // Find the largest diff of any of the color channels.
+    if (diffs[0] >= diffs[1])
+    {
+        if (diffs[0] >= diffs[2])
+            largestDiff = diffs[0];
+        else if (diffs[1] >= diffs[2])
+            largestDiff = diffs[1];
+        else
+            largestDiff = diffs[2];
+    }
+    else
+    {
+        if (diffs[1] >= diffs[2])
+            largestDiff = diffs[1];
+        else if (diffs[2] >= diffs[0])
+            largestDiff = diffs[2];
+        else
+            largestDiff = diffs[0];
+    }
+
+    red =   (pixelChannels[1][0] * (31 - largestDiff / 2)) / 31;
+    green = (pixelChannels[1][1] * (31 - largestDiff / 2)) / 31;
+    blue =  (pixelChannels[1][2] * (31 - largestDiff / 2)) / 31;
+    return RGB2(red, green, blue);
+}
+
+static u16 QuantizePixel_Blur(u16 *prevPixel, u16 *curPixel, u16 *nextPixel)
+{
+    u16 red, green, blue;
+    u16 prevAvg, curAvg, nextAvg;
+    u16 prevDiff, nextDiff;
+    u32 diff;
+    u16 factor;
+
+    if (*prevPixel == *curPixel && *nextPixel == *curPixel)
+        return *curPixel;
+
+    red   = (*curPixel >> 0)  & 0x1F;
+    green = (*curPixel >> 5)  & 0x1F;
+    blue  = (*curPixel >> 10) & 0x1F;
+
+    prevAvg = (((*prevPixel >> 0) & 0x1F) + ((*prevPixel >> 5) & 0x1F) + ((*prevPixel >> 10) & 0x1F)) / 3;
+    curAvg  = (((*curPixel  >> 0) & 0x1F) + ((*curPixel  >> 5) & 0x1F) + ((*curPixel  >> 10) & 0x1F)) / 3;
+    nextAvg = (((*nextPixel >> 0) & 0x1F) + ((*nextPixel >> 5) & 0x1F) + ((*nextPixel >> 10) & 0x1F)) / 3;
+
+    if (prevAvg == curAvg && nextAvg == curAvg)
+        return *curPixel;
+
+    if (prevAvg > curAvg)
+        prevDiff = prevAvg - curAvg;
+    else
+        prevDiff = curAvg - prevAvg;
+
+    if (nextAvg > curAvg)
+        nextDiff = nextAvg - curAvg;
+    else
+        nextDiff = curAvg - nextAvg;
+
+    if (prevDiff >= nextDiff)
+        diff = prevDiff;
+    else
+        diff = nextDiff;
+
+    factor = 31 - diff / 2;
+    red   = (red   * factor) / 31;
+    green = (green * factor) / 31;
+    blue  = (blue  * factor) / 31;
+    return RGB2(red, green, blue);
+}
+
+static u16 QuantizePixel_BlurHard(u16 *prevPixel, u16 *curPixel, u16 *nextPixel)
+{
+    u16 red, green, blue;
+    u16 prevAvg, curAvg, nextAvg;
+    u16 prevDiff, nextDiff;
+    u32 diff;
+    u16 factor;
+
+    if (*prevPixel == *curPixel && *nextPixel == *curPixel)
+        return *curPixel;
+
+    red   = (*curPixel >> 0)  & 0x1F;
+    green = (*curPixel >> 5)  & 0x1F;
+    blue  = (*curPixel >> 10) & 0x1F;
+
+    prevAvg = (((*prevPixel >> 0) & 0x1F) + ((*prevPixel >> 5) & 0x1F) + ((*prevPixel >> 10) & 0x1F)) / 3;
+    curAvg  = (((*curPixel  >> 0) & 0x1F) + ((*curPixel  >> 5) & 0x1F) + ((*curPixel  >> 10) & 0x1F)) / 3;
+    nextAvg = (((*nextPixel >> 0) & 0x1F) + ((*nextPixel >> 5) & 0x1F) + ((*nextPixel >> 10) & 0x1F)) / 3;
+
+    if (prevAvg == curAvg && nextAvg == curAvg)
+        return *curPixel;
+
+    if (prevAvg > curAvg)
+        prevDiff = prevAvg - curAvg;
+    else
+        prevDiff = curAvg - prevAvg;
+
+    if (nextAvg > curAvg)
+        nextDiff = nextAvg - curAvg;
+    else
+        nextDiff = curAvg - nextAvg;
+
+    if (prevDiff >= nextDiff)
+        diff = prevDiff;
+    else
+        diff = nextDiff;
+
+    factor = 31 - diff;
+    red   = (red   * factor) / 31;
+    green = (green * factor) / 31;
+    blue  = (blue  * factor) / 31;
+    return RGB2(red, green, blue);
+}
+
+void ConvertImageProcessingToGBA(struct ImageProcessingContext *context)
+{
+    u16 i, j, k;
+    u16 *src, *dest, *src_, *dest_;
+    u16 width, height;
+
+    width = context->canvasWidth >> 3;
+    height = context->canvasHeight >> 3;
+    src_ = context->canvasPixels;
+    dest_ = context->dest;
+
+    if (context->var_16 == 2)
+    {
+        for (i = 0; i < height; i++)
+        {
+            for (j = 0; j < width; j++)
+            {
+                for (k = 0; k < 8; k++)
+                {
+                    dest = dest_ + ((i * width + j) << 5) + (k << 2);
+                    src = src_ + ((((i << 3) + k) << 3) * width) + (j << 3);
+
+                    dest[0] = src[0] | (src[1] << 8);
+                    dest[1] = src[2] | (src[3] << 8);
+                    dest[2] = src[4] | (src[5] << 8);
+                    dest[3] = src[6] | (src[7] << 8);
+                }
+            }
+        }
+    }
+    else
+    {
+        for (i = 0; i < height; i++)
+        {
+            for (j = 0; j < width; j++)
+            {
+                for (k = 0; k < 8; k++)
+                {
+                    dest = dest_ + ((i * width + j) << 4) + (k << 1);
+                    src = src_ + ((((i << 3) + k) << 3) * width) + (j << 3);
+
+                    dest[0] = src[0] | (src[1] << 4) | (src[2] << 8) | (src[3] << 0xC);
+                    dest[1] = src[4] | (src[5] << 4) | (src[6] << 8) | (src[7] << 0xC);
+                }
+            }
+        }
+    }
+}
+
+void ApplyImageProcessingQuantization(struct ImageProcessingContext *context)
+{
+    gCanvasPaletteStart = context->paletteStart * 16;
+    gCanvasPalette = &context->canvasPalette[gCanvasPaletteStart];
+    gCanvasPixels = context->canvasPixels;
+    gCanvasColumnStart = context->columnStart;
+    gCanvasRowStart = context->rowStart;
+    gCanvasColumnEnd = context->columnEnd;
+    gCanvasRowEnd = context->rowEnd;
+    gCanvasWidth = context->canvasWidth;
+    gCanvasHeight = context->canvasHeight;
+
+    switch (context->quantizeEffect)
+    {
+    case QUANTIZE_EFFECT_STANDARD:
+        QuantizePalette_Standard(FALSE);
+        break;
+    case QUANTIZE_EFFECT_STANDARD_LIMITED_COLORS:
+        QuantizePalette_Standard(TRUE);
+        break;
+    case QUANTIZE_EFFECT_PRIMARY_COLORS:
+        SetPresetPalette_PrimaryColors();
+        QuantizePalette_PrimaryColors();
+        break;
+    case QUANTIZE_EFFECT_GRAYSCALE:
+        SetPresetPalette_Grayscale();
+        QuantizePalette_Grayscale();
+        break;
+    case QUANTIZE_EFFECT_GRAYSCALE_SMALL:
+        SetPresetPalette_GrayscaleSmall();
+        QuantizePalette_GrayscaleSmall();
+        break;
+    case QUANTIZE_EFFECT_BLACK_WHITE:
+        SetPresetPalette_BlackAndWhite();
+        QuantizePalette_BlackAndWhite();
+        break;
+    }
+}
+
+static void SetPresetPalette_PrimaryColors(void)
+{
+    gCanvasPalette[0]  = RGB2(0, 0, 0);
+    gCanvasPalette[1]  = RGB2(6, 6, 6);
+    gCanvasPalette[2]  = RGB2(29, 29, 29);
+    gCanvasPalette[3]  = RGB2(11, 11, 11);
+    gCanvasPalette[4]  = RGB2(29, 6, 6);
+    gCanvasPalette[5]  = RGB2(6, 29, 6);
+    gCanvasPalette[6]  = RGB2(6, 6, 29);
+    gCanvasPalette[7]  = RGB2(29, 29, 6);
+    gCanvasPalette[8]  = RGB2(29, 6, 29);
+    gCanvasPalette[9]  = RGB2(6, 29, 29);
+    gCanvasPalette[10] = RGB2(29, 11, 6);
+    gCanvasPalette[11] = RGB2(11, 29, 6);
+    gCanvasPalette[12] = RGB2(6, 11, 29);
+    gCanvasPalette[13] = RGB2(29, 6, 11);
+    gCanvasPalette[14] = RGB2(6, 29, 11);
+    gCanvasPalette[15] = RGB2(11, 6, 29);
+}
+
+static void SetPresetPalette_BlackAndWhite(void)
+{
+    gCanvasPalette[0] = RGB2(0, 0, 0);
+    gCanvasPalette[1] = RGB2(0, 0, 0);
+    gCanvasPalette[2] = RGB2(31, 31, 31);
+}
+
+static void SetPresetPalette_GrayscaleSmall(void)
+{
+    u8 i;
+
+    gCanvasPalette[0] = RGB2(0, 0, 0);
+    gCanvasPalette[1] = RGB2(0, 0, 0);
+    for (i = 0; i < 14; i++)
+        gCanvasPalette[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2));
+}
+
+static void SetPresetPalette_Grayscale(void)
+{
+    u8 i;
+
+    gCanvasPalette[0] = RGB2(0, 0, 0);
+    for (i = 0; i < 32; i++)
+        gCanvasPalette[i + 1] = RGB2(i, i, i);
+}
+
+static void QuantizePalette_Standard(bool8 useLimitedPalette)
+{
+    u8 i, j;
+    u16 maxIndex;
+
+    maxIndex = 0xDF;
+    if (!useLimitedPalette)
+        maxIndex = 0xFF;
+
+    for (i = 0; i < maxIndex; i++)
+        gCanvasPalette[i] = RGB_BLACK;
+
+    gCanvasPalette[maxIndex] = RGB2(15, 15, 15);
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (*pixel & 0x8000)
+            {
+                *pixel = gCanvasPaletteStart;
+            }
+            else
+            {
+                u16 quantizedColor = QuantizePixel_Standard(pixel);
+                u8 curIndex = 1;
+                if (curIndex < maxIndex)
+                {
+                    if (gCanvasPalette[curIndex] == RGB_BLACK)
+                    {
+                        // The quantized color does not match any existing color in the
+                        // palette, so we add it to the palette.
+                        // This if block seems pointless because the below while loop handles
+                        // this same logic.
+                        gCanvasPalette[curIndex] = quantizedColor;
+                        *pixel = gCanvasPaletteStart + curIndex;
+                    }
+                    else
+                    {
+                        while (curIndex < maxIndex)
+                        {
+                            if (gCanvasPalette[curIndex] == RGB_BLACK)
+                            {
+                                // The quantized color does not match any existing color in the
+                                // palette, so we add it to the palette.
+                                gCanvasPalette[curIndex] = quantizedColor;
+                                *pixel = gCanvasPaletteStart + curIndex;
+                                break;
+                            }
+
+                            if (gCanvasPalette[curIndex] == quantizedColor)
+                            {
+                                // The quantized color matches this existing color in the
+                                // palette, so we use this existing color for the pixel.
+                                *pixel = gCanvasPaletteStart + curIndex;
+                                break;
+                            }
+
+                            curIndex++;
+                        }
+                    }
+                }
+
+                if (curIndex == maxIndex)
+                {
+                    // The entire palette's colors are already in use, which means
+                    // the base image has too many colors to handle. This error is handled
+                    // by marking such pixels as gray color.
+                    curIndex = maxIndex;
+                    *pixel = curIndex;
+                }
+            }
+        }
+    }
+}
+
+static void QuantizePalette_BlackAndWhite(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (*pixel & 0x8000)
+            {
+                *pixel = gCanvasPaletteStart;
+            }
+            else
+            {
+                if (QuantizePixel_BlackAndWhite(pixel) == RGB_BLACK)
+                {
+                    // Black is the first color in the quantized palette.
+                    *pixel = gCanvasPaletteStart + 1;
+                }
+                else
+                {
+                    // White is the second color in the quantized palette.
+                    *pixel = gCanvasPaletteStart + 2;
+                }
+            }
+        }
+    }
+}
+
+static void QuantizePalette_GrayscaleSmall(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (*pixel & 0x8000)
+                *pixel = gCanvasPaletteStart;
+            else
+                *pixel = QuantizePixel_GrayscaleSmall(pixel) + gCanvasPaletteStart;
+        }
+    }
+}
+
+static void QuantizePalette_Grayscale(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (*pixel & 0x8000)
+                *pixel = gCanvasPaletteStart;
+            else
+                *pixel = QuantizePixel_Grayscale(pixel) + gCanvasPaletteStart;
+        }
+    }
+}
+
+static void QuantizePalette_PrimaryColors(void)
+{
+    u8 i, j;
+
+    for (j = 0; j < gCanvasRowEnd; j++)
+    {
+        u16 *pixelRow = &(*gCanvasPixels)[0][(gCanvasRowStart + j) * gCanvasWidth];
+        u16 *pixel = &pixelRow[gCanvasColumnStart];
+        for (i = 0; i < gCanvasColumnEnd; i++, pixel++)
+        {
+            if (*pixel & 0x8000)
+                *pixel = gCanvasPaletteStart;
+            else
+                *pixel = QuantizePixel_PrimaryColors(pixel) + gCanvasPaletteStart;
+        }
+    }
+}
+
+// Quantizes the pixel's color channels to nearest multiple of 4, and clamps to [6, 30].
+static u16 QuantizePixel_Standard(u16 *pixel)
+{
+    u16 red = *pixel & 0x1F;
+    u16 green = (*pixel >> 5) & 0x1F;
+    u16 blue = (*pixel >> 10) & 0x1F;
+
+    // Quantize color channels to muliples of 4, rounding up.
+    if (red & 3)
+        red = (red & 0x1C) + 4;
+    if (green & 3)
+        green = (green & 0x1C) + 4;
+    if (blue & 3)
+        blue = (blue & 0x1C) + 4;
+
+    // Clamp channels to [6, 30].
+    if (red < 6)
+        red = 6;
+    if (red > 30)
+        red = 30;
+    if (green < 6)
+        green = 6;
+    if (green > 30)
+        green = 30;
+    if (blue < 6)
+        blue = 6;
+    if (blue > 30)
+        blue = 30;
+
+    return RGB2(red, green, blue);
+}
+
+static u16 QuantizePixel_PrimaryColors(u16* color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    if (red < 12 && green < 11 && blue < 11)
+        return 1;
+
+    if (red > 19 && green > 19 && blue > 19)
+        return 2;
+
+    if (red > 19)
+    {
+        if (green > 19)
+        {
+            if (blue > 14)
+                return 2;
+            else
+                return 7;
+        }
+        else if (blue > 19)
+        {
+            if (green > 14)
+                return 2;
+            else
+                return 8;
+        }
+    }
+
+    if (green > 19 && blue > 19)
+    {
+        if (red > 14)
+            return 2;
+        else
+            return 9;
+    }
+
+    if (red > 19)
+    {
+        if (green > 11)
+        {
+            if (blue > 11)
+            {
+                if (green < blue)
+                    return 8;
+                else
+                    return 7;
+            }
+            else
+            {
+                return 10;
+            }
+        }
+        else if (blue > 11)
+        {
+            return 13;
+        }
+        else
+        {
+            return 4;
+        }
+    }
+
+    if (green > 19)
+    {
+        if (red > 11)
+        {
+            if (blue > 11)
+            {
+                if (red < blue)
+                    return 9;
+                else
+                    return 7;
+            }
+            else
+            {
+                return 11;
+            }
+        }
+        else
+        {
+            if (blue > 11)
+                return 14;
+            else
+                return 5;
+        }
+    }
+
+    if (blue > 19)
+    {
+        if (red > 11)
+        {
+            if (green > 11)
+            {
+                if (red < green)
+                    return 9;
+                else
+                    return 8;
+            }
+        }
+        else if (green > 11)
+        {
+            return 12;
+        }
+
+        if (blue > 11)
+            return 15;
+        else
+            return 6;
+    }
+
+    return 3;
+}
+
+static u16 QuantizePixel_GrayscaleSmall(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    u16 average = ((red + green + blue) / 3) & 0x1E;
+    if (average == 0)
+        return 1;
+    else
+        return average / 2;
+}
+
+static u16 QuantizePixel_Grayscale(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    u16 average = (red + green + blue) / 3;
+    return average + 1;
+}
diff --git a/src/item.c b/src/item.c
index 6b8f51f12..7b8b37c06 100644
--- a/src/item.c
+++ b/src/item.c
@@ -142,7 +142,7 @@ bool8 CheckBagHasItem(u16 itemId, u16 count)
 
     if (ItemId_GetPocket(itemId) == 0)
         return FALSE;
-    if (InBattlePyramid() || FlagGet(FLAG_SPECIAL_FLAG_0x4004) == TRUE)
+    if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
         return CheckPyramidBagHasItem(itemId, count);
     pocket = ItemId_GetPocket(itemId) - 1;
     // Check for item slots that contain the item
@@ -189,7 +189,7 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count)
     if (ItemId_GetPocket(itemId) == POCKET_NONE)
         return FALSE;
 
-    if (InBattlePyramid() || FlagGet(FLAG_SPECIAL_FLAG_0x4004) == TRUE)
+    if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
     {
         return CheckPyramidBagHasSpace(itemId, count);
     }
@@ -404,7 +404,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
         return FALSE;
 
     // check Battle Pyramid Bag
-    if (InBattlePyramid() || FlagGet(FLAG_SPECIAL_FLAG_0x4004) == TRUE)
+    if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
     {
         return AddPyramidBagItem(itemId, count);
     }
@@ -517,7 +517,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
         return FALSE;
 
     // check Battle Pyramid Bag
-    if (InBattlePyramid() || FlagGet(FLAG_SPECIAL_FLAG_0x4004) == TRUE)
+    if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
     {
         return RemovePyramidBagItem(itemId, count);
     }
diff --git a/src/item_menu.c b/src/item_menu.c
index 16008b4bb..3c5095551 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -4,6 +4,7 @@
 #include "battle_controllers.h"
 #include "battle_pyramid.h"
 #include "frontier_util.h"
+#include "battle_pyramid_bag.h"
 #include "berry_tag_screen.h"
 #include "bg.h"
 #include "constants/items.h"
@@ -118,7 +119,7 @@ void sub_81AD9C0(u8);
 void sub_81ADB14(u8);
 void sub_81ADA7C(u8);
 void sub_81ADC0C(u8);
-void bag_menu_leave_maybe(void);
+void CB2_ApprenticeExitBagMenu(void);
 void CB2_FavorLadyExitBagMenu(void);
 void CB2_QuizLadyExitBagMenu(void);
 void sub_81ABA6C(void);
@@ -466,9 +467,9 @@ void CB2_BagMenuFromStartMenu(void)
 void sub_81AABB0(void)
 {
     if (!InBattlePyramid())
-        GoToBagMenu(RETURN_LOCATION_BATTLE, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2);
+        GoToBagMenu(RETURN_LOCATION_BATTLE, POCKETS_COUNT, CB2_SetUpReshowBattleScreenAfterMenu2);
     else
-        sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2);
+        GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2);
 }
 
 void CB2_ChooseBerry(void)
@@ -476,7 +477,7 @@ void CB2_ChooseBerry(void)
     GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
 }
 
-void sub_81AABF0(void (*callback)(void))
+void ChooseBerrySetCallback(void (*callback)(void))
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
 }
@@ -491,23 +492,23 @@ void sub_81AAC14(void)
     GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C);
 }
 
-void sub_81AAC28(void)
+void ApprenticeOpenBagMenu(void)
 {
-    GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, bag_menu_leave_maybe);
-    gSpecialVar_0x8005 = 0;
-    gSpecialVar_Result = 0;
+    GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, CB2_ApprenticeExitBagMenu);
+    gSpecialVar_0x8005 = ITEM_NONE;
+    gSpecialVar_Result = FALSE;
 }
 
 void FavorLadyOpenBagMenu(void)
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_4, POCKETS_COUNT, CB2_FavorLadyExitBagMenu);
-    gSpecialVar_Result = 0;
+    gSpecialVar_Result = FALSE;
 }
 
 void QuizLadyOpenBagMenu(void)
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_5, POCKETS_COUNT, CB2_QuizLadyExitBagMenu);
-    gSpecialVar_Result = 0;
+    gSpecialVar_Result = FALSE;
 }
 
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)())
@@ -1148,13 +1149,13 @@ u8 GetSwitchBagPocketDirection(void)
     u8 LRKeys;
     if (gBagMenu->unk81B != 0)
         return 0;
-    LRKeys = GetLRKeysState();
-    if ((gMain.newKeys & DPAD_LEFT) || LRKeys == 1)
+    LRKeys = GetLRKeysPressed();
+    if ((gMain.newKeys & DPAD_LEFT) || LRKeys == MENU_L_PRESSED)
     {
         PlaySE(SE_SELECT);
         return 1;
     }
-    if ((gMain.newKeys & DPAD_RIGHT) || LRKeys == 2)
+    if ((gMain.newKeys & DPAD_RIGHT) || LRKeys == MENU_R_PRESSED)
     {
         PlaySE(SE_SELECT);
         return 2;
@@ -1581,7 +1582,7 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
                 sub_8199134(0, 1);
             }
         }
-        else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1)
+        else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED)
         {
             if ((cursorPos & 1) && sub_81ACDFC(cursorPos - 1))
             {
@@ -1589,7 +1590,7 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
                 sub_8199134(-1, 0);
             }
         }
-        else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2)
+        else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED)
         {
             if (!(cursorPos & 1) && sub_81ACDFC(cursorPos + 1))
             {
@@ -1782,7 +1783,7 @@ void ItemMenu_Give(u8 taskId)
             BagMenu_PrintThereIsNoPokemon(taskId);
         else
         {
-            gBagMenu->mainCallback2 = sub_81B7F60;
+            gBagMenu->mainCallback2 = CB2_ChooseMonToGiveItem;
             unknown_ItemMenu_Confirm(taskId);
         }
     }
@@ -2157,7 +2158,7 @@ void DoWallyTutorialBagMenu(void)
     PrepareBagForWallyTutorial();
     AddBagItem(ITEM_POTION, 1);
     AddBagItem(ITEM_POKE_BALL, 1);
-    GoToBagMenu(RETURN_LOCATION_BATTLE_2, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2);
+    GoToBagMenu(RETURN_LOCATION_BATTLE_2, ITEMS_POCKET, CB2_SetUpReshowBattleScreenAfterMenu2);
 }
 
 void Task_WallyTutorialBagMenu(u8 taskId)
@@ -2202,7 +2203,7 @@ void unknown_ItemMenu_Show(u8 taskId)
     unknown_ItemMenu_Confirm(taskId);
 }
 
-void bag_menu_leave_maybe(void)
+void CB2_ApprenticeExitBagMenu(void)
 {
     gFieldCallback = Apprentice_EnableBothScriptContexts;
     SetMainCallback2(CB2_ReturnToField);
diff --git a/src/item_use.c b/src/item_use.c
index 456a39339..a777bb2ec 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -64,10 +64,10 @@ void sub_80FDC00(u8 taskId);
 void ItemUseOnFieldCB_Berry(u8 taskId);
 void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId);
 void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId);
-void sub_80FDF90(u8 taskId);
-void task08_0809AD8C(u8 taskId);
-void sub_80FE024(u8 taskId);
-void sub_80FE03C(u8 taskId);
+static void BootUpSoundTMHM(u8 taskId);
+static void Task_ShowTMHMContainedMessage(u8 taskId);
+static void UseTMHMYesNo(u8 taskId);
+static void UseTMHM(u8 taskId);
 void sub_80FE124(u8 taskId);
 void sub_80FE164(u8 taskId);
 
@@ -91,16 +91,16 @@ EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL;
 
 static const MainCallback gUnknown_085920D8[] =
 {
-    sub_81B617C,
+    CB2_ShowPartyMenuForItemUse,
     CB2_ReturnToField,
     NULL,
 };
 
 static const u8 gUnknown_085920E4[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
 
-static const struct YesNoFuncTable gUnknown_085920E8 =
+static const struct YesNoFuncTable sUseTMHMYesNoFuncTable =
 {
-    .yesFunc = sub_80FE03C,
+    .yesFunc = UseTMHM,
     .noFunc = BagMenu_InitListsMenu,
 };
 
@@ -350,7 +350,7 @@ bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId)
     gTasks[taskId].data[2] = FALSE;
     for (i = 0; i < events->bgEventCount; i++)
     {
-        if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
+        if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START))
         {
             distanceX = (u16)events->bgEvents[i].x + 7;
             newDistanceX = distanceX - x;
@@ -379,7 +379,7 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
     {
         if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
         {
-            if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
+            if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START))
                 return TRUE;
             else
                 return FALSE;
@@ -722,72 +722,72 @@ void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId)
 
 void ItemUseOutOfBattle_Medicine(u8 taskId)
 {
-    gUnknown_03006328 = ItemUseCB_Medicine;
+    gItemUseCB = ItemUseCB_Medicine;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_ReduceEV(u8 taskId)
 {
-    gUnknown_03006328 = sub_81B67C8;
+    gItemUseCB = ItemUseCB_ReduceEV;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_SacredAsh(u8 taskId)
 {
-    gUnknown_03006328 = sub_81B79E8;
+    gItemUseCB = ItemUseCB_SacredAsh;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_PPRecovery(u8 taskId)
 {
-    gUnknown_03006328 = dp05_ether;
+    gItemUseCB = ItemUseCB_PPRecovery;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_PPUp(u8 taskId)
 {
-    gUnknown_03006328 = dp05_pp_up;
+    gItemUseCB = ItemUseCB_PPUp;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_RareCandy(u8 taskId)
 {
-    gUnknown_03006328 = dp05_rare_candy;
+    gItemUseCB = ItemUseCB_RareCandy;
     SetUpItemUseCallback(taskId);
 }
 
 void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
     if (gSpecialVar_ItemId >= ITEM_HM01_CUT)
-        DisplayItemMessage(taskId, 1, gText_BootedUpHM, sub_80FDF90); // HM
+        DisplayItemMessage(taskId, 1, gText_BootedUpHM, BootUpSoundTMHM); // HM
     else
-        DisplayItemMessage(taskId, 1, gText_BootedUpTM, sub_80FDF90); // TM
+        DisplayItemMessage(taskId, 1, gText_BootedUpTM, BootUpSoundTMHM); // TM
 }
 
-void sub_80FDF90(u8 taskId)
+static void BootUpSoundTMHM(u8 taskId)
 {
     PlaySE(SE_PC_LOGIN);
-    gTasks[taskId].func = task08_0809AD8C;
+    gTasks[taskId].func = Task_ShowTMHMContainedMessage;
 }
 
-void task08_0809AD8C(u8 taskId)
+static void Task_ShowTMHMContainedMessage(u8 taskId)
 {
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
         StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]);
         StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1);
-        DisplayItemMessage(taskId, 1, gStringVar4, sub_80FE024);
+        DisplayItemMessage(taskId, 1, gStringVar4, UseTMHMYesNo);
     }
 }
 
-void sub_80FE024(u8 taskId)
+static void UseTMHMYesNo(u8 taskId)
 {
-    BagMenu_YesNo(taskId, 6, &gUnknown_085920E8);
+    BagMenu_YesNo(taskId, 6, &sUseTMHMYesNoFuncTable);
 }
 
-void sub_80FE03C(u8 taskId)
+static void UseTMHM(u8 taskId)
 {
-    gUnknown_03006328 = sub_81B6DC4;
+    gItemUseCB = ItemUseCB_TMHM;
     SetUpItemUseCallback(taskId);
 }
 
@@ -912,7 +912,7 @@ void ItemUseOutOfBattle_EscapeRope(u8 taskId)
 
 void ItemUseOutOfBattle_EvolutionStone(u8 taskId)
 {
-    gUnknown_03006328 = sub_81B7C74;
+    gItemUseCB = ItemUseCB_EvolutionStone;
     SetUpItemUseCallback(taskId);
 }
 
@@ -976,36 +976,37 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
     }
 }
 
-void sub_80FE54C(u8 taskId)
+static void ItemUseInBattle_ShowPartyMenu(u8 taskId)
 {
     if (!InBattlePyramid())
     {
-        gBagMenu->mainCallback2 = sub_81B89F0;
+        gBagMenu->mainCallback2 = ChooseMonForInBattleItem;
         unknown_ItemMenu_Confirm(taskId);
     }
     else
     {
-        gPyramidBagResources->callback2 = sub_81B89F0;
+        gPyramidBagResources->callback2 = ChooseMonForInBattleItem;
         sub_81C5B14(taskId);
     }
 }
 
 void ItemUseInBattle_Medicine(u8 taskId)
 {
-    gUnknown_03006328 = ItemUseCB_Medicine;
-    sub_80FE54C(taskId);
+    gItemUseCB = ItemUseCB_Medicine;
+    ItemUseInBattle_ShowPartyMenu(taskId);
 }
 
-void sub_80FE5AC(u8 taskId)
+// Unused. Sacred Ash cannot be used in battle
+void ItemUseInBattle_SacredAsh(u8 taskId)
 {
-    gUnknown_03006328 = sub_81B79E8;
-    sub_80FE54C(taskId);
+    gItemUseCB = ItemUseCB_SacredAsh;
+    ItemUseInBattle_ShowPartyMenu(taskId);
 }
 
 void ItemUseInBattle_PPRecovery(u8 taskId)
 {
-    gUnknown_03006328 = dp05_ether;
-    sub_80FE54C(taskId);
+    gItemUseCB = ItemUseCB_PPRecovery;
+    ItemUseInBattle_ShowPartyMenu(taskId);
 }
 
 void ItemUseInBattle_Escape(u8 taskId)
diff --git a/src/link.c b/src/link.c
index 3ca8236ed..b010558a5 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1399,7 +1399,7 @@ void sub_800AB18(void)
     }
 }
 
-void sub_800AB98(void)
+void ResetLinkPlayerCount(void)
 {
     gSavedLinkPlayerCount = 0;
     gSavedMultiplayerId = 0;
diff --git a/src/mail_data.c b/src/mail_data.c
index 809dcc2a8..b0b05e8fe 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -63,7 +63,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
             gSaveBlock1Ptr->mail[id].playerName[i] = EOS;
             PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE);
 
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < TRAINER_ID_LENGTH; i++)
                 gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
 
             species = GetBoxMonData(&mon->box, MON_DATA_SPECIES);
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index f55dd2b8b..add48efd8 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -22,6 +22,7 @@
 #include "field_message_box.h"
 #include "script_menu.h"
 #include "trader.h"
+#include "constants/mauville_old_man.h"
 
 #define CHAR_SONG_WORD_SEPARATOR 0x37
 
@@ -41,7 +42,7 @@ static EWRAM_DATA u16 sUnknownBardRelated = 0;
 static EWRAM_DATA struct MauvilleManStoryteller * sStorytellerPtr = NULL;
 static EWRAM_DATA u8 sStorytellerWindowId = 0;
 
-static const u16 sDefaultBardSongLyrics[6] = {
+static const u16 sDefaultBardSongLyrics[BARD_SONG_LENGTH] = {
     EC_WORD_SHAKE,
     EC_WORD_IT,
     EC_WORD_DO,
@@ -80,7 +81,7 @@ static void SetupBard(void)
     bard->id = MAUVILLE_MAN_BARD;
     bard->hasChangedSong = FALSE;
     bard->language = gGameLanguage;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < BARD_SONG_LENGTH; i++)
         bard->songLyrics[i] = sDefaultBardSongLyrics[i];
 }
 
@@ -166,10 +167,10 @@ void ScrSpecial_SaveBardSongLyrics(void)
 
     StringCopy(bard->playerName, gSaveBlock2Ptr->playerName);
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < TRAINER_ID_LENGTH; i++)
         bard->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < BARD_SONG_LENGTH; i++)
         bard->songLyrics[i] = bard->temporaryLyrics[i];
 
     bard->hasChangedSong = TRUE;
@@ -248,15 +249,15 @@ void ScrSpecial_SetHipsterSpokenFlag(void)
 
 void ScrSpecial_HipsterTeachWord(void)
 {
-    u16 var = sub_811F01C();
+    u16 phrase = GetNewHipsterPhraseToTeach();
 
-    if (var == 0xFFFF)
+    if (phrase == 0xFFFF)
     {
         gSpecialVar_Result = FALSE;
     }
     else
     {
-        CopyEasyChatWord(gStringVar1, var);
+        CopyEasyChatWord(gStringVar1, phrase);
         gSpecialVar_Result = TRUE;
     }
 }
@@ -458,7 +459,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
                 lyrics = bard->songLyrics;
             else
                 lyrics = bard->temporaryLyrics;
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < BARD_SONG_LENGTH; i++)
                 song->lyrics[i] = lyrics[i];
             song->currWord = 0;
         }
@@ -683,14 +684,14 @@ void ScrSpecial_SetMauvilleOldManEventObjGfx(void)
 void sub_8120B70(union OldMan * oldMan)
 {
     s32 i;
-    u8 sp00[8];
+    u8 playerName[PLAYER_NAME_LENGTH + 1];
 
     switch (oldMan->common.id)
     {
         case MAUVILLE_MAN_TRADER:
         {
             struct MauvilleOldManTrader * trader = &oldMan->trader;
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < NUM_TRADER_ITEMS; i++)
             {
                 if (trader->language[i] == LANGUAGE_JAPANESE)
                 {
@@ -702,17 +703,17 @@ void sub_8120B70(union OldMan * oldMan)
         case MAUVILLE_MAN_STORYTELLER:
         {
             struct MauvilleManStoryteller * storyteller = &oldMan->storyteller;
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < NUM_STORYTELLER_TALES; i++)
             {
                 if (storyteller->gameStatIDs[i] != 0)
                 {
-                    memcpy(sp00, storyteller->trainerNames[i], 7);
-                    sp00[7] = EOS;
-                    if (IsStringJapanese(sp00))
+                    memcpy(playerName, storyteller->trainerNames[i], PLAYER_NAME_LENGTH);
+                    playerName[PLAYER_NAME_LENGTH] = EOS;
+                    if (IsStringJapanese(playerName))
                     {
-                        memset(sp00, CHAR_SPACE, 8);
-                        StringCopy(sp00, gText_Friend);
-                        memcpy(storyteller->trainerNames[i], sp00, 7);
+                        memset(playerName, CHAR_SPACE, PLAYER_NAME_LENGTH + 1);
+                        StringCopy(playerName, gText_Friend);
+                        memcpy(storyteller->trainerNames[i], playerName, PLAYER_NAME_LENGTH);
                         storyteller->language[i] = GAME_LANGUAGE;
                     }
                 }
@@ -732,7 +733,7 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3)
         {
             struct MauvilleOldManTrader * trader = &oldMan->trader;
 
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < NUM_TRADER_ITEMS; i++)
             {
                 if (IsStringJapanese(trader->playerNames[i]))
                 {
@@ -749,7 +750,7 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3)
         {
             struct MauvilleManStoryteller * storyteller = &oldMan->storyteller;
 
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < NUM_STORYTELLER_TALES; i++)
             {
                 if (IsStringJapanese(storyteller->trainerNames[i]))
                 {
@@ -797,19 +798,19 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3)
 
 void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 version, u32 language)
 {
-    u8 sp00[8];
+    u8 playerName[PLAYER_NAME_LENGTH + 1];
     s32 i;
     if (oldMan->common.id == MAUVILLE_MAN_STORYTELLER && language == LANGUAGE_JAPANESE)
     {
         struct MauvilleManStoryteller * storyteller = &oldMan->storyteller;
 
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < NUM_STORYTELLER_TALES; i++)
         {
             if (storyteller->gameStatIDs[i] != 0)
             {
-                memcpy(sp00, storyteller->trainerNames[i], 7);
-                sp00[7] = EOS;
-                if (IsStringJapanese(sp00))
+                memcpy(playerName, storyteller->trainerNames[i], PLAYER_NAME_LENGTH);
+                playerName[PLAYER_NAME_LENGTH] = EOS;
+                if (IsStringJapanese(playerName))
                     storyteller->language[i] = LANGUAGE_JAPANESE;
                 else
                     storyteller->language[i] = GAME_LANGUAGE;
@@ -831,7 +832,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language
 
             if (isRuby)
             {
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < NUM_TRADER_ITEMS; i++)
                 {
                     u8 * str = trader->playerNames[i];
                     if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN)
@@ -845,7 +846,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language
             }
             else
             {
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < NUM_TRADER_ITEMS; i++)
                 {
                     if (trader->language[i] == LANGUAGE_JAPANESE)
                     {
@@ -863,7 +864,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language
 
             if (isRuby)
             {
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < NUM_STORYTELLER_TALES; i++)
                 {
                     if (storyteller->gameStatIDs[i] != 0)
                         storyteller->language[i] = language;
@@ -914,42 +915,223 @@ struct Story
 };
 
 static const struct Story sStorytellerStories[] = {
-    {GAME_STAT_NUM_UNION_ROOM_BATTLES, 1, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956},
-    {GAME_STAT_STARTED_TRENDS, 1, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE},
-    {GAME_STAT_PLANTED_BERRIES, 1, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8},
-    {GAME_STAT_TRADED_BIKES, 1, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E},
-    {GAME_STAT_GOT_INTERVIEWED, 1, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD},
-    {GAME_STAT_TRAINER_BATTLES, 1, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81},
-    {GAME_STAT_POKEMON_CAPTURES, 1, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30},
-    {GAME_STAT_FISHING_CAPTURES, 1, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF},
-    {GAME_STAT_HATCHED_EGGS, 1, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A},
-    {GAME_STAT_EVOLVED_POKEMON, 1, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01},
-    {GAME_STAT_USED_POKECENTER, 1, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA},
-    {GAME_STAT_RESTED_AT_HOME, 1, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071},
-    {GAME_STAT_ENTERED_SAFARI_ZONE, 1, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125},
-    {GAME_STAT_USED_CUT, 1, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE},
-    {GAME_STAT_USED_ROCK_SMASH, 1, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277},
-    {GAME_STAT_MOVED_SECRET_BASE, 1, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A},
-    {GAME_STAT_USED_SPLASH, 1, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2},
-    {GAME_STAT_USED_STRUGGLE, 1, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C},
-    {GAME_STAT_SLOT_JACKPOTS, 1, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538},
-    {GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2},
-    {GAME_STAT_ENTERED_BATTLE_TOWER, 1, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4},
-    {GAME_STAT_POKEBLOCKS, 1, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776},
-    {GAME_STAT_ENTERED_CONTEST, 1, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822},
-    {GAME_STAT_WON_CONTEST, 1, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC},
-    {GAME_STAT_SHOPPED, 1, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949},
-    {GAME_STAT_USED_ITEMFINDER, 1, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD},
-    {GAME_STAT_GOT_RAINED_ON, 1, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7},
-    {GAME_STAT_CHECKED_POKEDEX, 1, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47},
-    {GAME_STAT_RECEIVED_RIBBONS, 1, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA},
-    {GAME_STAT_JUMPED_DOWN_LEDGES, 1, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98},
-    {GAME_STAT_WATCHED_TV, 1, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40},
-    {GAME_STAT_CHECKED_CLOCK, 1, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE},
-    {GAME_STAT_WON_POKEMON_LOTTERY, 1, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88},
-    {GAME_STAT_USED_DAYCARE, 1, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44},
-    {GAME_STAT_RODE_CABLE_CAR, 1, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D},
-    {GAME_STAT_ENTERED_HOT_SPRINGS, 1, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB}
+    // The 50 below is replaced with GAME_STAT_SAVED_GAME
+    {
+        50, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_SavedGameAction, 
+        MauvilleCity_PokemonCenter_1F_Text_SavedGameStory
+    },
+    {
+        GAME_STAT_STARTED_TRENDS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory
+    },
+    {
+        GAME_STAT_PLANTED_BERRIES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory
+    },
+    {
+        GAME_STAT_TRADED_BIKES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction, 
+        MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory
+    },
+    {
+        GAME_STAT_GOT_INTERVIEWED, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_InterviewsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_InterviewsStory
+    },
+    {
+        GAME_STAT_TRAINER_BATTLES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction, 
+        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory
+    },
+    {
+        GAME_STAT_POKEMON_CAPTURES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory
+    },
+    {
+        GAME_STAT_FISHING_CAPTURES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction, 
+        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory
+    },
+    {
+        GAME_STAT_HATCHED_EGGS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory
+    },
+    {
+        GAME_STAT_EVOLVED_POKEMON, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory
+    },
+    {
+        GAME_STAT_USED_POKECENTER, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory
+    },
+    {
+        GAME_STAT_RESTED_AT_HOME, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction, 
+        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory
+    },
+    {
+        GAME_STAT_ENTERED_SAFARI_ZONE, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction, 
+        MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory
+    },
+    {
+        GAME_STAT_USED_CUT, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedCutAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedCutStory
+    },
+    {
+        GAME_STAT_USED_ROCK_SMASH, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory
+    },
+    {
+        GAME_STAT_MOVED_SECRET_BASE, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction, 
+        MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory
+    },
+    {
+        GAME_STAT_USED_SPLASH, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory
+    },
+    {
+        GAME_STAT_USED_STRUGGLE, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory
+    },
+    {
+        GAME_STAT_SLOT_JACKPOTS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory
+    },
+    {
+        GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2, 
+        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory
+    },
+    {
+        GAME_STAT_ENTERED_BATTLE_TOWER, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction, 
+        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory
+    },
+    {
+        GAME_STAT_POKEBLOCKS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction, 
+        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory
+    },
+    {
+        GAME_STAT_ENTERED_CONTEST, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory
+    },
+    {
+        GAME_STAT_WON_CONTEST, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_WonContestsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_WonContestsStory
+    },
+    {
+        GAME_STAT_SHOPPED, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory
+    },
+    {
+        GAME_STAT_USED_ITEMFINDER, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory
+    },
+    {
+        GAME_STAT_GOT_RAINED_ON, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory
+    },
+    {
+        GAME_STAT_CHECKED_POKEDEX, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory
+    },
+    {
+        GAME_STAT_RECEIVED_RIBBONS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory
+    },
+    {
+        GAME_STAT_JUMPED_DOWN_LEDGES, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory
+    },
+    {
+        GAME_STAT_WATCHED_TV, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction, 
+        MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory
+    },
+    {
+        GAME_STAT_CHECKED_CLOCK, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction, 
+        MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory
+    },
+    {
+        GAME_STAT_WON_POKEMON_LOTTERY, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction, 
+        MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory
+    },
+    {
+        GAME_STAT_USED_DAYCARE, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction, 
+        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory
+    },
+    {
+        GAME_STAT_RODE_CABLE_CAR, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction, 
+        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory
+    },
+    {
+        GAME_STAT_ENTERED_HOT_SPRINGS, 1, 
+        MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle, 
+        MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction, 
+        MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory
+    }
 };
 
 static void StorytellerSetup(void)
@@ -959,7 +1141,7 @@ static void StorytellerSetup(void)
 
     sStorytellerPtr->id = MAUVILLE_MAN_STORYTELLER;
     sStorytellerPtr->alreadyRecorded = FALSE;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_STORYTELLER_TALES; i++)
     {
         sStorytellerPtr->gameStatIDs[i] = 0;
         sStorytellerPtr->trainerNames[0][i] = EOS;  // Maybe they meant storyteller->trainerNames[i][0] instead?
@@ -977,7 +1159,7 @@ static void Storyteller_ResetFlag(void)
 static u32 StorytellerGetGameStat(u8 stat)
 {
     if (stat == 50)
-        stat = 0;
+        stat = GAME_STAT_SAVED_GAME;
     return GetGameStat(stat);
 }
 
@@ -985,12 +1167,12 @@ static const struct Story *GetStoryByStat(u32 stat)
 {
     s32 i;
 
-    for (i = 0; i < 36; i++)
+    for (i = 0; i < (int)ARRAY_COUNT(sStorytellerStories); i++)
     {
         if (sStorytellerStories[i].stat == stat)
             return &sStorytellerStories[i];
     }
-    return &sStorytellerStories[35];
+    return &sStorytellerStories[ARRAY_COUNT(sStorytellerStories) - 1];
 }
 
 static const u8 *GetStoryTitleByStat(u32 stat)
@@ -1012,7 +1194,7 @@ static u8 GetFreeStorySlot(void)
 {
     u8 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_STORYTELLER_TALES; i++)
     {
         if (sStorytellerPtr->gameStatIDs[i] == 0)
             break;
@@ -1049,15 +1231,15 @@ static void GetStoryByStattellerPlayerName(u32 player, void *dst)
 {
     u8 *name = sStorytellerPtr->trainerNames[player];
 
-    memset(dst, EOS, 8);
-    memcpy(dst, name, 7);
+    memset(dst, EOS, PLAYER_NAME_LENGTH + 1);
+    memcpy(dst, name, PLAYER_NAME_LENGTH);
 }
 
 static void StorytellerSetPlayerName(u32 player, const u8 * src)
 {
     u8 * name = sStorytellerPtr->trainerNames[player];
-    memset(name, EOS, 7);
-    memcpy(name, src, 7);
+    memset(name, EOS, PLAYER_NAME_LENGTH);
+    memcpy(name, src, PLAYER_NAME_LENGTH);
 }
 
 
@@ -1110,15 +1292,15 @@ static bool8 StorytellerInitializeRandomStat(void)
         u8 stat = sStorytellerStories[arr[i]].stat;
         u8 minVal = sStorytellerStories[arr[i]].minVal;
 
-        for (j = 0; j < 4; j++)
+        for (j = 0; j < NUM_STORYTELLER_TALES; j++)
         {
             if (sStorytellerPtr->gameStatIDs[j] == stat)
                 break;
         }
-        if (j == 4 && StorytellerGetGameStat(stat) >= minVal)
+        if (j == NUM_STORYTELLER_TALES && StorytellerGetGameStat(stat) >= minVal)
         {
             sStorytellerPtr->alreadyRecorded = TRUE;
-            if (GetFreeStorySlot() == 4)
+            if (GetFreeStorySlot() == NUM_STORYTELLER_TALES)
                 StorytellerRecordNewStat(sSelectedStory, stat);
             else
                 StorytellerRecordNewStat(GetFreeStorySlot(), stat);
@@ -1144,7 +1326,7 @@ static void PrintStoryList(void)
     s32 i;
     s32 width = GetStringWidth(1, gText_Exit, 0);
     u8 tileWidth;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_STORYTELLER_TALES; i++)
     {
         s32 curWidth;
         u16 gameStatID = sStorytellerPtr->gameStatIDs[i];
@@ -1157,7 +1339,7 @@ static void PrintStoryList(void)
     }
     sStorytellerWindowId = CreateWindowFromRect(0, 0, ConvertPixelWidthToTileWidth(width), GetFreeStorySlot() * 2 + 2);
     SetStandardWindowBorderStyle(sStorytellerWindowId, 0);
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_STORYTELLER_TALES; i++)
     {
         u16 gameStatID = sStorytellerPtr->gameStatIDs[i];
         if (gameStatID == 0)
@@ -1169,7 +1351,7 @@ static void PrintStoryList(void)
     CopyWindowToVram(sStorytellerWindowId, 3);
 }
 
-static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
+static void Task_StoryListMenu(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     s32 selection;
diff --git a/src/menu.c b/src/menu.c
index e349ff43a..056fc6a9d 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1433,13 +1433,13 @@ s8 sub_8199284(void)
         sub_8199134(0, 1);
         return MENU_NOTHING_CHOSEN;
     }
-    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED)
     {
         PlaySE(SE_SELECT);
         sub_8199134(-1, 0);
         return MENU_NOTHING_CHOSEN;
     }
-    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED)
     {
         PlaySE(SE_SELECT);
         sub_8199134(1, 0);
@@ -1474,13 +1474,13 @@ s8 Menu_ProcessInputGridLayout(void)
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
-    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED)
     {
         if (oldPos != sub_81991F8(-1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
-    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED)
     {
         if (oldPos != sub_81991F8(1, 0))
             PlaySE(SE_SELECT);
@@ -1513,13 +1513,13 @@ s8 sub_81993D8(void)
         sub_8199134(0, 1);
         return MENU_NOTHING_CHOSEN;
     }
-    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED)
     {
         PlaySE(SE_SELECT);
         sub_8199134(-1, 0);
         return MENU_NOTHING_CHOSEN;
     }
-    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED)
     {
         PlaySE(SE_SELECT);
         sub_8199134(1, 0);
@@ -1554,13 +1554,13 @@ s8 sub_8199484(void)
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
-    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED)
     {
         if (oldPos != sub_81991F8(-1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
-    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED)
     {
         if (oldPos != sub_81991F8(1, 0))
             PlaySE(SE_SELECT);
@@ -1868,7 +1868,7 @@ u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16
     }
 }
 
-void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
+void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
 {
     u8 i;
     u8 j;
@@ -1883,7 +1883,7 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
     }
 }
 
-void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
+void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
 {
     u8 i;
     u8 j;
@@ -2159,7 +2159,7 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
             ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
             break;
         case 3:
-            sub_81245DC(string, gMapHeader.regionMapSectionId);
+            GetMapNameGeneric(string, gMapHeader.regionMapSectionId);
             break;
         case 4:
             for (curFlag = FLAG_BADGE01_GET, flagCount = 0, endOfString = string + 1; curFlag <= FLAG_BADGE08_GET; curFlag++)
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index cb0d621c6..2b7a7f419 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -251,27 +251,27 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
     return FALSE;
 }
 
-u8 GetLRKeysState(void)
+u8 GetLRKeysPressed(void)
 {
     if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
     {
         if (gMain.newKeys & L_BUTTON)
-            return 1;
+            return MENU_L_PRESSED;
         if (gMain.newKeys & R_BUTTON)
-            return 2;
+            return MENU_R_PRESSED;
     }
 
     return 0;
 }
 
-u8 sub_812210C(void)
+u8 GetLRKeysPressedAndHeld(void)
 {
     if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
     {
         if (gMain.newAndRepeatedKeys & L_BUTTON)
-            return 1;
+            return MENU_L_PRESSED;
         if (gMain.newAndRepeatedKeys & R_BUTTON)
-            return 2;
+            return MENU_R_PRESSED;
     }
 
     return 0;
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 16298183b..435ad7233 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -244,7 +244,7 @@ static const u8 sTileBitAttributes[] =
     [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
-    [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SKY_PILLAR_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
@@ -1172,9 +1172,9 @@ bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsUnknownClosedDoor(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_UNKNOWN_CLOSED_DOOR)
+    if (metatileBehavior == MB_SKY_PILLAR_CLOSED_DOOR)
         return TRUE;
     else
         return FALSE;
diff --git a/src/mevent2.c b/src/mevent2.c
index f36e5d06b..aedc7b366 100755
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -9,6 +9,7 @@
 #include "string_util.h"
 #include "new_game.h"
 #include "mevent.h"
+#include "constants/mevent.h"
 #include "constants/species.h"
 
 static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE;
@@ -493,7 +494,7 @@ u16 mevent_081445C0(u32 command)
 {
     switch (command)
     {
-        case 0:
+        case GET_CARD_BATTLES_WON_INTERNAL:
         {
             struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
@@ -503,7 +504,7 @@ u16 mevent_081445C0(u32 command)
             }
             break;
         }
-        case 1:
+        case 1: // Never occurs
         {
             struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
@@ -513,7 +514,7 @@ u16 mevent_081445C0(u32 command)
             }
             break;
         }
-        case 2:
+        case 2: // Never occurs
         {
             struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
@@ -523,14 +524,14 @@ u16 mevent_081445C0(u32 command)
             }
             break;
         }
-        case 3:
+        case GET_NUM_STAMPS_INTERNAL:
         {
             struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 1)
                 return sub_801B4CC();
             break;
         }
-        case 4:
+        case GET_MAX_STAMPS_INTERNAL:
         {
             struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 1)
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 121ac66e8..b5202e006 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -513,7 +513,7 @@ static void DoMoveRelearnerMain(void)
 
             if (selection == 0)
             {
-                if (GiveMoveToMon(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF)
+                if (GiveMoveToMon(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove()) != MON_HAS_MAX_MOVES)
                 {
                     FormatAndPrintText(gText_MoveRelearnerPkmnLearnedMove);
                     gSpecialVar_0x8004 = TRUE;
@@ -778,7 +778,7 @@ static void HandleInput(bool8 showContest)
     switch (itemId)
     {
     case LIST_NOTHING_CHOSEN:
-        if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysState())
+        if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysPressed())
         {
             break;
         }
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index dba914b51..76f340c60 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -286,7 +286,7 @@ bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
 
 bool8 MEScrCmd_addrareword(struct ScriptContext *ctx)
 {
-    sub_811EFC0(ScriptReadByte(ctx));
+    UnlockAdditionalPhrase(ScriptReadByte(ctx));
     StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord);
     ctx->data[2] = 2;
     return FALSE;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index cc73031aa..73eda32c8 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -34,10 +34,6 @@ extern u16 gKeyRepeatStartDelay;
 
 // extern text
 extern const u8 gExpandedPlaceholder_Empty[];
-extern const u8 gText_PkmnTransferredSomeonesPC[];
-extern const u8 gText_PkmnTransferredLanettesPC[];
-extern const u8 gText_PkmnBoxSomeonesPCFull[];
-extern const u8 gText_PkmnBoxLanettesPCFull[];
 extern const u8 gText_MoveOkBack[];
 extern const u8 gText_YourName[];
 extern const u8 gText_BoxName[];
@@ -51,12 +47,12 @@ static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_ic
 static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
 static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
 
-static const u8 *const gUnknown_0858BDB8[] =
+static const u8 *const sTransferredToPCMessages[] =
 {
     gText_PkmnTransferredSomeonesPC,
     gText_PkmnTransferredLanettesPC,
-    gText_PkmnBoxSomeonesPCFull,
-    gText_PkmnBoxLanettesPCFull
+    gText_PkmnTransferredSomeonesPCBoxFull,
+    gText_PkmnTransferredLanettesPCBoxFull
 };
 
 static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!");
@@ -562,7 +558,7 @@ static void DisplaySentToPCMessage(void)
     if (FlagGet(FLAG_SYS_PC_LANETTE))
         stringToDisplay++;
 
-    StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
+    StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
     DrawDialogueFrame(0, 0);
     gTextFlags.canABSpeedUpPrint = TRUE;
     AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);
diff --git a/src/overworld.c b/src/overworld.c
index 55afe2fcf..c2e3d2789 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -64,6 +64,7 @@
 #include "constants/region_map_sections.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/trainer_hill.h"
 #include "constants/weather.h"
 
 #define PLAYER_TRADING_STATE_IDLE 0x80
@@ -88,16 +89,16 @@ extern const u8 EventScript_DoLinkRoomExit[];
 extern const u8 CableClub_EventScript_TooBusyToNotice[];
 extern const u8 CableClub_EventScript_ReadTrainerCard[];
 extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot3[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot0[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[];
 extern const u8 EventScript_RecordCenter_Spot0[];
 extern const u8 EventScript_RecordCenter_Spot1[];
 extern const u8 EventScript_RecordCenter_Spot2[];
 extern const u8 EventScript_RecordCenter_Spot3[];
-extern const u8 EventScript_SingleBattleColosseum_PlayerSpot0[];
-extern const u8 EventScript_SingleBattleColosseum_PlayerSpot1[];
+extern const u8 EventScript_BattleColosseum2P_PlayerSpot0[];
+extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[];
 extern const u8 EventScript_TradeCenter_Chair1[];
 extern const u8 EventScript_TradeCenter_Chair0[];
 extern const u8 EventScript_ConfirmLeaveTradeRoom[];
@@ -854,7 +855,7 @@ static void mli0_load_map(u32 a1)
         if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
             LoadBattlePyramidEventObjectTemplates();
         else if (InTrainerHill())
-            sub_81D5DF8();
+            LoadTrainerHillEventObjectTemplates();
         else
             LoadEventObjTemplatesFromHeader();
     }
@@ -1721,8 +1722,8 @@ void CB2_ContinueSavedGame(void)
     trainerHillMapId = GetCurrentTrainerHillMapId();
     if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
         LoadBattlePyramidFloorEventObjectScripts();
-    else if (trainerHillMapId != 0 && trainerHillMapId != 6)
-        sub_81D5F48();
+    else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE)
+        LoadTrainerHillFloorEventObjectScripts();
     else
         LoadSaveblockEventObjScripts();
 
@@ -2781,13 +2782,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
 // these event scripts runs.
 static u16 GetDirectionForEventScript(const u8 *script)
 {
-    if (script == EventScript_DoubleBattleColosseum_PlayerSpot0)
+    if (script == EventScript_BattleColosseum4P_PlayerSpot0)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot1)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot1)
         return FACING_FORCED_LEFT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot2)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot2)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot3)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot3)
         return FACING_FORCED_LEFT;
     else if (script == EventScript_RecordCenter_Spot0)
         return FACING_FORCED_RIGHT;
@@ -2797,9 +2798,9 @@ static u16 GetDirectionForEventScript(const u8 *script)
         return FACING_FORCED_RIGHT;
     else if (script == EventScript_RecordCenter_Spot3)
         return FACING_FORCED_LEFT;
-    else if (script == EventScript_SingleBattleColosseum_PlayerSpot0)
+    else if (script == EventScript_BattleColosseum2P_PlayerSpot0)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_SingleBattleColosseum_PlayerSpot1)
+    else if (script == EventScript_BattleColosseum2P_PlayerSpot1)
         return FACING_FORCED_LEFT;
     else if (script == EventScript_TradeCenter_Chair0)
         return FACING_FORCED_RIGHT;
diff --git a/src/party_menu.c b/src/party_menu.c
index 46d5a16c1..c711881b0 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -72,11 +72,26 @@
 #include "constants/items.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/vars.h"
 
+#define PARTY_PAL_SELECTED     (1 << 0)
+#define PARTY_PAL_FAINTED      (1 << 1)
+#define PARTY_PAL_TO_SWITCH    (1 << 2)
+#define PARTY_PAL_MULTI_ALT    (1 << 3)
+#define PARTY_PAL_SWITCHING    (1 << 4)
+#define PARTY_PAL_TO_SOFTBOIL  (1 << 5)
+#define PARTY_PAL_NO_MON       (1 << 6)
+#define PARTY_PAL_UNUSED       (1 << 7)
+
+#define MENU_DIR_DOWN     1
+#define MENU_DIR_UP      -1
+#define MENU_DIR_RIGHT    2
+#define MENU_DIR_LEFT    -2
+
 enum
 {
     CAN_LEARN_MOVE,
@@ -85,28 +100,28 @@ enum
     CANNOT_LEARN_MOVE_IS_EGG
 };
 
-struct Unk_Rodata1
+struct PartyMenuBoxInfoRects
 {
-    void (*unk0)(u8, u8, u8, u8, u8, u8);
-    u8 unk4[24];
-    u8 unk1C;
-    u8 unk1D;
-    u8 unk1E;
-    u8 unk1F;
+    void (*blitFunc)(u8, u8, u8, u8, u8, u8);
+    u8 dimensions[24];
+    u8 descTextLeft;
+    u8 descTextTop;
+    u8 descTextWidth;
+    u8 descTextHeight;
 };
 
-struct Struct203CEC4
+struct PartyMenuInternal
 {
     TaskFunc task;
     MainCallback exitCallback;
-    u32 unk8_0:1;
-    u32 unk8_1:3;
-    u32 unk8_2:7;
-    u32 unk9_0:7;
+    u32 chooseHalf:1;
+    u32 lastSelectedSlot:3;  // Used to return to same slot when going left/right bewtween columns
+    u32 spriteIdConfirmPokeball:7;
+    u32 spriteIdCancelPokeball:7;
     u32 messageId:14;
     u8 windowId[3];
     u8 actions[8];
-    u8 listSize;
+    u8 numActions;
     // In vanilla Emerald, only the first 0xB0 hwords (0x160 bytes) are actually used.
     // However, a full 0x100 hwords (0x200 bytes) are allocated.
     // It is likely that the 0x160 value used below is a constant defined by
@@ -115,10 +130,10 @@ struct Struct203CEC4
     s16 data[16];
 };
 
-struct Struct203CEDC
+struct PartyMenuBox
 {
-    const struct Unk_Rodata1 *unk0;
-    const u8 *unk4;
+    const struct PartyMenuBoxInfoRects *infoRects;
+    const u8 *spriteCoords;
     u8 windowId;
     u8 monSpriteId;
     u8 itemSpriteId;
@@ -127,268 +142,267 @@ struct Struct203CEDC
 };
 
 // EWRAM vars
-static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL;
-EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0};
-static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL;
-static EWRAM_DATA u8 *gUnknown_0203CEE0 = NULL;
-static EWRAM_DATA u8 *gUnknown_0203CEE4 = NULL;
-EWRAM_DATA u8 gUnknown_0203CEE8 = 0;
-EWRAM_DATA u8 gUnknown_0203CEE9 = 0;
+static EWRAM_DATA struct PartyMenuInternal *sPartyMenuInternal = NULL;
+EWRAM_DATA struct PartyMenu gPartyMenu = {0};
+static EWRAM_DATA struct PartyMenuBox *sPartyMenuBoxes = NULL;
+static EWRAM_DATA u8 *sPartyBgGfxTilemap = NULL;
+static EWRAM_DATA u8 *sPartyBgTilemapBuffer = NULL;
+EWRAM_DATA bool8 gPartyMenuUseExitCallback = 0;
+EWRAM_DATA u8 gSelectedMonPartyId = 0;
 EWRAM_DATA MainCallback gPostMenuFieldCallback = NULL;
-static EWRAM_DATA u16 *gUnknown_0203CEF0 = 0;
-static EWRAM_DATA u16 *gUnknown_0203CEF4 = 0;
+static EWRAM_DATA u16 *sSlot1TilemapBuffer = 0; // for switching party slots
+static EWRAM_DATA u16 *sSlot2TilemapBuffer = 0; //
 EWRAM_DATA u8 gSelectedOrderFromParty[4] = {0};
-static EWRAM_DATA u16 gUnknown_0203CEFC = 0;
-static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused
-EWRAM_DATA u8 gUnknown_0203CF00[3] = {0};
+static EWRAM_DATA u16 sPartyMenuItemId = 0;
+static EWRAM_DATA u16 sUnused_0203CEFE = 0;
+EWRAM_DATA u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2] = {0}; // bits 0-3 are the current pos of Slot 1, 4-7 are Slot 2, and so on
 
 // IWRAM common
-void (*gUnknown_03006328)(u8, TaskFunc);
+void (*gItemUseCB)(u8, TaskFunc);
 
-static void reset_brm(void);
-static void PartyMenuInitCallback(void);
-static bool8 PartyMenuSetup(void);
-static void sub_81B209C(void);
-static void PartyMenuExit(void);
+static void ResetPartyMenu(void);
+static void CB2_InitPartyMenu(void);
+static bool8 ShowPartyMenu(void);
+static void SetPartyMonsAllowedInMinigame(void);
+static void ExitPartyMenu(void);
 static bool8 AllocPartyMenuBg(void);
-static bool8 AllocPartyMiscGfx(void);
-static void sub_81B239C(u8);
-static void PartyMenuInitHelperStructs(u8);
+static bool8 AllocPartyMenuBgGfx(void);
+static void InitPartyMenuWindows(u8);
+static void InitPartyMenuBoxes(u8);
 static void LoadPartyMenuPokeballGfx(void);
 static void LoadPartyMenuAilmentGfx(void);
-static bool8 party_menu_add_per_mon_objects(void);
+static bool8 CreatePartyMonSpritesLoop(void);
 static bool8 RenderPartyMenuBoxes(void);
-static void sub_81B0F28(void);
-static void sub_81B2428(u8);
-static void PartyMenuExitTask(u8);
+static void CreateCancelConfirmPokeballSprites(void);
+static void CreateCancelConfirmWindows(u8);
+static void Task_ExitPartyMenu(u8);
 static void FreePartyPointers(void);
 static void PartyPaletteBufferCopy(u8);
-static void sub_81B0CEC(u8);
-static void UpdateSelectedPartyBox(struct Struct203CEDC *, u8);
+static void DisplayPartyPokemonDataForMultiBattle(u8);
+static void LoadPartyBoxPalette(struct PartyMenuBox *, u8);
 static void DrawEmptySlot(u8 windowId);
-static void DisplayPartyPokemonSelectForRelearner(u8);
-static void DisplayPartyPokemonSelectForContest(u8);
-static void DisplayPartyPokemonSelectForBattle(u8);
-static void sub_81B0B98(u8);
-static void DisplayPartyPokemonSelectHeldItemRelated(u8);
-static bool8 sub_81B0BFC(u8);
+static void DisplayPartyPokemonDataForRelearner(u8);
+static void DisplayPartyPokemonDataForContest(u8);
+static void DisplayPartyPokemonDataForChooseHalf(u8);
+static void DisplayPartyPokemonDataForWirelessMinigame(u8);
+static void DisplayPartyPokemonDataForBattlePyramidHeldItem(u8);
+static bool8 DisplayPartyPokemonDataForMoveTutorOrEvolutionItem(u8);
 static void DisplayPartyPokemonData(u8);
-static void DisplayPartyPokemonNickname(struct Pokemon *, struct Struct203CEDC *, u8);
-static void DisplayPartyPokemonLevelCheck(struct Pokemon *, struct Struct203CEDC *, u8);
-static void DisplayPartyPokemonGenderNidoranCheck(struct Pokemon *, struct Struct203CEDC *, u8);
-static void DisplayPartyPokemonHPCheck(struct Pokemon *, struct Struct203CEDC *, u8);
-static void DisplayPartyPokemonMaxHPCheck(struct Pokemon *, struct Struct203CEDC *, u8);
-static void DisplayPartyPokemonHPBarCheck(struct Pokemon *, struct Struct203CEDC *);
-static void DisplayPartyPokemonSelectionText(u8, struct Struct203CEDC *, u8);
-static u8 sub_81B8830(void);
-static bool8 GetBattleEntryEligibility(struct Pokemon *);
-static bool8 sub_81B218C(u8);
-static void DisplayPartyPokemonSelectToTeachMove(u8, u16, u8);
+static void DisplayPartyPokemonNickname(struct Pokemon *, struct PartyMenuBox *, u8);
+static void DisplayPartyPokemonLevelCheck(struct Pokemon *, struct PartyMenuBox *, u8);
+static void DisplayPartyPokemonGenderNidoranCheck(struct Pokemon *, struct PartyMenuBox *, u8);
+static void DisplayPartyPokemonHPCheck(struct Pokemon *, struct PartyMenuBox *, u8);
+static void DisplayPartyPokemonMaxHPCheck(struct Pokemon *, struct PartyMenuBox *, u8);
+static void DisplayPartyPokemonHPBarCheck(struct Pokemon *, struct PartyMenuBox *);
+static void DisplayPartyPokemonDescriptionText(u8, struct PartyMenuBox *, u8);
+static bool8 IsMonAllowedInMinigame(u8);
+static void DisplayPartyPokemonDataToTeachMove(u8, u16, u8);
 static u8 CanMonLearnTMTutor(struct Pokemon *, u16, u8);
 static void DisplayPartyPokemonBarDetail(u8, const u8*, u8, const u8*);
-static void DisplayPartyPokemonLevel(u8, struct Struct203CEDC *);
-static void DisplayPartyPokemonGender(u8, u16, u8*, struct Struct203CEDC *);
-static void DisplayPartyPokemonHP(u16, struct Struct203CEDC *);
-static void DisplayPartyPokemonMaxHP(u16, struct Struct203CEDC *);
-static void DisplayPartyPokemonHPBar(u16, u16, struct Struct203CEDC *);
-static void party_menu_link_mon_icon_anim(u16, u32, struct Struct203CEDC *, u8, u32);
-static void party_menu_link_mon_held_item_object(u16, u16, struct Struct203CEDC *);
-static void party_menu_link_mon_pokeball_object(u16, struct Struct203CEDC *);
-static void party_menu_link_mon_status_condition_object(u16, u8, struct Struct203CEDC *);
-static void party_menu_held_item_object(struct Pokemon *, struct Struct203CEDC *);
-static void party_menu_pokeball_object(struct Pokemon *, struct Struct203CEDC *);
-static void party_menu_icon_anim(struct Pokemon *, struct Struct203CEDC *, u32);
-static void party_menu_status_condition_object(struct Pokemon *, struct Struct203CEDC *);
-static u8 sub_81B5F74(u8, u8);
-static void sub_81B120C(void);
-static u8 sub_81B5F34(u8, u8);
+static void DisplayPartyPokemonLevel(u8, struct PartyMenuBox *);
+static void DisplayPartyPokemonGender(u8, u16, u8*, struct PartyMenuBox *);
+static void DisplayPartyPokemonHP(u16, struct PartyMenuBox *);
+static void DisplayPartyPokemonMaxHP(u16, struct PartyMenuBox *);
+static void DisplayPartyPokemonHPBar(u16, u16, struct PartyMenuBox *);
+static void CreatePartyMonIconSpriteParameterized(u16, u32, struct PartyMenuBox *, u8, u32);
+static void CreatePartyMonHeldItemSpriteParameterized(u16, u16, struct PartyMenuBox *);
+static void CreatePartyMonPokeballSpriteParameterized(u16, struct PartyMenuBox *);
+static void CreatePartyMonStatusSpriteParameterized(u16, u8, struct PartyMenuBox *);
+// These next 4 functions are essentially redundant with the above 4
+// The only difference is that rather than receive the data directly they retrieve it from the mon struct
+static void CreatePartyMonHeldItemSprite(struct Pokemon *, struct PartyMenuBox *);
+static void CreatePartyMonPokeballSprite(struct Pokemon *, struct PartyMenuBox *);
+static void CreatePartyMonIconSprite(struct Pokemon *, struct PartyMenuBox *, u32);
+static void CreatePartyMonStatusSprite(struct Pokemon *, struct PartyMenuBox *);
+static u8 CreateSmallPokeballButtonSprite(u8, u8);
+static void DrawCancelConfirmButtons(void);
+static u8 CreatePokeballButtonSprite(u8, u8);
 static void AnimateSelectedPartyIcon(u8, u8);
-static void sub_81B5F98(u8, u8);
-static u8 GetPartyBoxPalBitfield(u8, u8);
+static void PartyMenuStartSpriteAnim(u8, u8);
+static u8 GetPartyBoxPaletteFlags(u8, u8);
 static bool8 PartyBoxPal_ParnterOrDisqualifiedInArena(u8);
-static u8 sub_81B8F38(u8);
+static u8 GetPartyIdFromBattleSlot(u8);
 static void Task_ClosePartyMenuAndSetCB2(u8);
-static void sub_81B9080(void);
-static void sub_81B4F88(void);
-static void sub_81B15D0(u8, s8*);
-static void sub_81B140C(u8, s8*);
+static void UpdatePartyToFieldOrder(void);
+static void MoveCursorToConfirm(void);
+static void HandleChooseMonCancel(u8, s8*);
+static void HandleChooseMonSelection(u8, s8*);
 static u16 PartyMenuButtonHandler(s8*);
-static s8* sub_81B13EC(void);
-static bool8 sub_81B15A4(u8*);
+static s8* GetCurrentPartySlotPtr(void);
+static bool8 IsSelectedMonNotEgg(u8*);
 static void PartyMenuRemoveWindow(u8*);
-static void sub_81B9140(void);
-static void sub_81B6794(u8);
-static void sub_81B7E4C(u8);
-static void sub_81B8474(u8);
-static void sub_81B7FAC(u8);
-static void sub_81B3938(u8);
-static void sub_81B21AC(u8, u8);
-static void sub_81B36FC(u8);
-static void sub_81B407C(u8);
-static void sub_81B2210(u8);
-static bool8 sub_81B1660(u8);
-static const u8* sub_81B88BC(void);
-static void sub_81B16D4(u8);
-static void sub_81B334C(void);
-static void sub_81B1708(u8);
-static void sub_81B1C1C(u8);
+static void CB2_SetUpExitToBattleScreen(void);
+static void Task_ClosePartyMenuAfterText(u8);
+static void TryTutorSelectedMon(u8);
+static void TryGiveMailToSelectedMon(u8);
+static void TryGiveItemOrMailToSelectedMon(u8);
+static void SwitchSelectedMons(u8);
+static void TryEnterMonForMinigame(u8, u8);
+static void Task_TryCreateSelectionWindow(u8);
+static void FinishTwoMonAction(u8);
+static void CancelParticipationPrompt(u8);
+static bool8 DisplayCancelChooseMonYesNo(u8);
+static const u8* GetFacilityCancelString(void);
+static void Task_CancelChooseMonYesNo(u8);
+static void PartyMenuDisplayYesNoMenu(void);
+static void Task_HandleCancelChooseMonYesNoInput(u8);
+static void Task_ReturnToChooseMonAfterText(u8);
 static void UpdateCurrentPartySelection(s8*, s8);
-static void SetNewPartySelectTarget1(s8*, s8);
-static void SetNewPartySelectTarget2(s8*, s8);
-static s8 sub_81B1B00(s8, s8);
+static void UpdatePartySelectionSingleLayout(s8*, s8);
+static void UpdatePartySelectionDoubleLayout(s8*, s8);
+static s8 GetNewSlotDoubleLayout(s8, s8);
 static void PartyMenuPrintText(const u8*);
-static void sub_81B1B8C(u8);
-static void DisplayPartyPokemonHPCheck(struct Pokemon*, struct Struct203CEDC*, u8);
-static void DisplayPartyPokemonHPBarCheck(struct Pokemon*, struct Struct203CEDC*);
+static void Task_PrintAndWaitForText(u8);
 static bool16 IsMonAllowedInPokemonJump(struct Pokemon*);
-static bool16 sub_81B2164(struct Pokemon*);
-static void sub_81B2248(u8);
-static void sub_81B227C(u8);
+static bool16 IsMonAllowedInDodrioBerryPicking(struct Pokemon*);
+static void Task_CancelParticipationYesNo(u8);
+static void Task_HandleCancelParticipationYesNoInput(u8);
 static bool8 CanLearnTutorMove(u16, u8);
 static u16 GetTutorMove(u8);
-static bool8 sub_81B314C(void);
-static void CreateActionList(struct Pokemon*, u8);
-static u8 sub_81B8A2C(struct Pokemon*);
-static u8 sub_81B856C(s8);
-static void sub_81B469C(u8);
-static void HandleMenuInput(u8);
-static void sub_81B3828(void);
-static void pokemon_change_order(void);
-static void sub_81B3894(void);
-static void sub_81B3CC0(u8);
-static void sub_81B3D48(u8);
-static void swap_pokemon_and_oams(void);
-static void sub_81B3E60(u8);
-static void sub_81B41C4(void);
-static void c2_8123744(void);
-static void sub_81B452C(void);
-static void sub_81B4350(u8);
-static void sub_81B42D0(u8);
-static void sub_81B43A8(u8);
-static void sub_81B43DC(u8);
-static void sub_81B44FC(u8);
-static void sub_81B4578(void);
-static void sub_81B4624(u8);
-static void sub_81B5C94(struct Pokemon*, struct Struct203CEDC*);
-static void sub_81B48A8(u8);
-static void sub_81B48DC(u8);
-static void sub_81B4988(u8);
-static void sub_81B4A98(void);
-static void sub_81B4AE0(void);
-static void sub_81B4B6C(u8);
-static void sub_81B4BA0(u8);
-static void sub_81B4C60(u8);
-static void sub_81B4C94(u8);
-static bool8 sub_81B8A7C(void);
-static void sub_81B53FC(u8);
-static void sub_81B5430(u8);
-static void task_brm_cancel_1_on_keypad_a_or_b(u8);
-static void sub_81B5674(u8);
-static void sub_81B57DC(void);
-static void sub_81B5864(void);
-static void sub_81B56A4(u8);
-static void sub_81B56D8(u8);
-static void task_launch_hm_phase_2(u8);
-static u16 brm_get_selected_species(void);
-static void sub_81B5B38(u8, struct Pokemon*);
-static void UpdatePartyMonIconFrame(struct Sprite*);
-static void UpdatePartyMonIconFrameAndBounce(struct Sprite*);
-static void sub_81B5CB0(u16, struct Struct203CEDC*);
+static bool8 ShouldUseChooseMonText(void);
+static void SetPartyMonFieldSelectionActions(struct Pokemon*, u8);
+static u8 GetPartyMenuActionsTypeInBattle(struct Pokemon*);
+static u8 GetPartySlotEntryStatus(s8);
+static void Task_UpdateHeldItemSprite(u8);
+static void Task_HandleSelectionMenuInput(u8);
+static void CB2_ShowPokemonSummaryScreen(void);
+static void UpdatePartyToBattleOrder(void);
+static void CB2_ReturnToPartyMenuFromSummaryScreen(void);
+static void SlidePartyMenuBoxOneStep(u8);
+static void Task_SlideSelectedSlotsOffscreen(u8);
+static void SwitchPartyMon(void);
+static void Task_SlideSelectedSlotsOnscreen(u8);
+static void CB2_SelectBagItemToGive(void);
+static void CB2_GiveHoldItem(void);
+static void CB2_WriteMailToGiveMon(void);
+static void Task_SwitchHoldItemsPrompt(u8);
+static void Task_GiveHoldItem(u8);
+static void Task_SwitchItemsYesNo(u8);
+static void Task_HandleSwitchItemsYesNoInput(u8);
+static void Task_WriteMailToGiveMonAfterText(u8);
+static void CB2_ReturnToPartyMenuFromWritingMail(void);
+static void Task_DisplayGaveMailFromPartyMessage(u8);
+static void UpdatePartyMonHeldItemSprite(struct Pokemon*, struct PartyMenuBox*);
+static void Task_TossHeldItemYesNo(u8 taskId);
+static void Task_HandleTossHeldItemYesNoInput(u8);
+static void Task_TossHeldItem(u8);
+static void CB2_ReadHeldMail(void);
+static void CB2_ReturnToPartyMenuFromReadingMail(void);
+static void Task_SendMailToPCYesNo(u8);
+static void Task_HandleSendMailToPCYesNoInput(u8);
+static void Task_LoseMailMessageYesNo(u8);
+static void Task_HandleLoseMailMessageYesNoInput(u8);
+static bool8 TrySwitchInPokemon(void);
+static void Task_SpinTradeYesNo(u8);
+static void Task_HandleSpinTradeYesNoInput(u8);
+static void Task_CancelAfterAorBPress(u8);
+static void DisplayFieldMoveExitAreaMessage(u8);
+static void DisplayCantUseFlashMessage(void);
+static void DisplayCantUseSurfMessage(void);
+static void Task_FieldMoveExitAreaYesNo(u8);
+static void Task_HandleFieldMoveExitAreaYesNoInput(u8);
+static void Task_FieldMoveWaitForFade(u8);
+static u16 GetFieldMoveMonSpecies(void);
+static void UpdatePartyMonHPBar(u8, struct Pokemon*);
+static void SpriteCB_UpdatePartyMonIcon(struct Sprite*);
+static void SpriteCB_BouncePartyMonIcon(struct Sprite*);
+static void ShowOrHideHeldItemSprite(u16, struct PartyMenuBox*);
 static void CreateHeldItemSpriteForTrade(u8, bool8);
 static void SpriteCB_HeldItem(struct Sprite*);
-static void party_menu_get_status_condition_and_update_object(struct Pokemon*, struct Struct203CEDC*);
-static void party_menu_update_status_condition_object(u8, struct Struct203CEDC*);
-static u8 sub_81B8984(void);
-static void sub_81B6280(u8);
-static void c2_815ABFC(void);
-static void sub_81B672C(u8);
+static void SetPartyMonAilmentGfx(struct Pokemon*, struct PartyMenuBox*);
+static void UpdatePartyMonAilmentGfx(u8, struct PartyMenuBox*);
+static u8 GetPartyLayoutFromBattleType(void);
+static void Task_SetSacredAshCB(u8);
+static void CB2_ReturnToBagMenu(void);
+static void Task_DisplayHPRestoredMessage(u8);
 static u16 ItemEffectToMonEv(struct Pokemon*, u8);
 static void ItemEffectToStatString(u8, u8*);
-static void sub_81B6BB4(u8);
-static void ether_effect_related_2(u8);
-static void ether_effect_related(u8);
-static void sub_81B6EB4(u8);
-static void sub_81B6FF4(u8);
-static void sub_81B6F60(u8);
-static void sub_81B6F98(u8);
-static void sub_81B77AC(u8);
-static void sub_81B7028(u8);
-static void sub_81B7088(u8);
-static void sub_81B7230(u8);
-static void sub_81B70B8(void);
-static void sub_81B70F0(void);
-static void sub_81B711C(u8);
-static void sub_81B7154(u8);
-static void sub_81B71D4(u8);
-static void sub_81B7294(u8);
-static void sub_81B72C8(u8);
-static void sub_81B73E4(u8);
-static void sub_81B79A0(struct Pokemon*, s16*);
-static void sub_81B754C(u8, struct Pokemon*);
-static void sub_81B75D4(u8);
-static void sub_81B767C(u8);
-static void sub_81B7634(u8);
-static void sub_81B76C8(u8);
-static void sub_81B7704(u8);
-static void sub_81B7810(u8);
-static void sub_81B787C(u8);
-static void sub_81B7910(u8, u16);
-static void sub_81B7A28(u8);
-static void task_sacred_ash_party_loop(u8);
-static void sub_81B7C10(u8);
-static void sub_81B8044(u8);
-static void sub_81B83B8(u8);
-static void sub_81B82A0(u8);
-static void sub_81B83F0(u16);
-static void sub_81B814C(void);
-static void sub_81B8088(u8);
-static void sub_81B8104(u8);
-static void sub_81B81A8(void);
-static bool8 sub_81B841C(u16);
-static void sub_81B8230(u8);
-static void sub_81B82D4(u8);
-static void sub_81B879C(u8);
+static void ReturnToUseOnWhichMon(u8);
+static void SetSelectedMoveForPPItem(u8);
+static void TryUsePPItem(u8);
+static void Task_LearnedMove(u8);
+static void Task_ReplaceMoveYesNo(u8);
+static void Task_DoLearnedMoveFanfareAfterText(u8);
+static void Task_LearnNextMoveOrClosePartyMenu(u8);
+static void Task_TryLearningNextMove(u8);
+static void Task_HandleReplaceMoveYesNoInput(u8);
+static void Task_ShowSummaryScreenToForgetMove(u8);
+static void StopLearningMovePrompt(u8);
+static void CB2_ShowSummaryScreenToForgetMove(void);
+static void CB2_ReturnToPartyMenuWhileLearningMove(void);
+static void Task_ReturnToPartyMenuWhileLearningMove(u8);
+static void DisplayPartyMenuForgotMoveMessage(u8);
+static void Task_PartyMenuReplaceMove(u8);
+static void Task_StopLearningMoveYesNo(u8);
+static void Task_HandleStopLearningMoveYesNoInput(u8);
+static void Task_TryLearningNextMoveAfterText(u8);
+static void BufferMonStatsToTaskData(struct Pokemon*, s16*);
+static void UpdateMonDisplayInfoAfterRareCandy(u8, struct Pokemon*);
+static void Task_DisplayLevelUpStatsPg1(u8);
+static void DisplayLevelUpStatsPg1(u8);
+static void Task_DisplayLevelUpStatsPg2(u8);
+static void DisplayLevelUpStatsPg2(u8);
+static void Task_TryLearnNewMoves(u8);
+static void PartyMenuTryEvolution(u8);
+static void DisplayMonNeedsToReplaceMove(u8);
+static void DisplayMonLearnedMove(u8, u16);
+static void UseSacredAsh(u8);
+static void Task_SacredAshLoop(u8);
+static void Task_SacredAshDisplayHPRestored(u8);
+static void GiveItemOrMailToSelectedMon(u8);
+static void DisplayItemMustBeRemovedFirstMessage(u8);
+static void Task_SwitchItemsFromBagYesNo(u8);
+static void RemoveItemToGiveFromBag(u16);
+static void CB2_WriteMailToGiveMonFromBag(void);
+static void GiveItemToSelectedMon(u8);
+static void Task_UpdateHeldItemSpriteAndClosePartyMenu(u8);
+static void CB2_ReturnToPartyOrBagMenuFromWritingMail(void);
+static bool8 ReturnGiveItemToBagOrPC(u16);
+static void Task_DisplayGaveMailFromBagMessage(u8);
+static void Task_HandleSwitchItemsFromBagYesNoInput(u8);
+static void Task_ValidateChosenHalfParty(u8);
 static bool8 GetBattleEntryEligibility(struct Pokemon*);
-static bool8 sub_81B8770(u8);
-static u8 sub_81B8888(void);
-static u8 sub_81B885C(void);
-static void sub_81B87E8(u8);
-static void sub_81B8C88(u8*, bool8);
-static void sub_81B8D88(u8*, u8, u8);
-static void sub_81B917C(u8);
-static void sub_81B91B4(u8);
-static void sub_81B9294(u8);
-static void sub_81B9240(u8);
-static void sub_81B9390(void);
-static void task_hm_without_phase_2(u8);
-static void sub_81B9424(u8);
-static void sub_81B9470(void);
-static void sub_81B94D0(u8);
-static void sub_81B953C(u8);
-static void sub_81B9588(void);
-static void sub_81B9640(u8);
-static void sub_81B97DC(struct Pokemon*, u8, u8);
-static void BlitBitmapToPartyWindow_Default1(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 f);
-static void BlitBitmapToPartyWindow_Default2(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 f);
-static void CursorCb_Summary(u8 taskId);
-static void CursorCb_Switch(u8 taskId);
-static void CursorCb_Cancel1(u8 taskId);
-static void CursorCb_Item(u8 taskId);
-static void CursorCb_Give(u8 taskId);
-static void CursorCb_TakeItem(u8 taskId);
-static void CursorCb_Mail(u8 taskId);
-static void CursorCb_Read(u8 taskId);
-static void CursorCb_TakeMail(u8 taskId);
-static void CursorCb_Cancel2(u8 taskId);
-static void CursorCb_SendMon(u8 taskId);
-static void CursorCb_Enter(u8 taskId);
-static void CursorCb_NoEntry(u8 taskId);
-static void CursorCb_Store(u8 taskId);
-static void CursorCb_Register(u8 taskId);
-static void CursorCb_Trade1(u8 taskId);
-static void CursorCb_Trade2(u8 taskId);
-static void CursorCb_Toss(u8 taskId);
-static void CursorCb_FieldMove(u8 taskId);
+static bool8 HasPartySlotAlreadyBeenSelected(u8);
+static u8 GetBattleEntryLevelCap(void);
+static u8 GetMaxBattleEntries(void);
+static u8 GetMinBattleEntries(void);
+static void Task_ContinueChoosingHalfParty(u8);
+static void BufferBattlePartyOrder(u8*, bool8);
+static void BufferBattlePartyOrderBySide(u8*, u8, u8);
+static void Task_InitMultiPartnerPartySlideIn(u8);
+static void Task_MultiPartnerPartySlideIn(u8);
+static void SlideMultiPartyMenuBoxSpritesOneStep(u8);
+static void Task_WaitAfterMultiPartnerPartySlideIn(u8);
+static void BufferMonSelection(void);
+static void Task_PartyMenuWaitForFade(u8 taskId);
+static void Task_ChooseContestMon(u8 taskId);
+static void CB2_ChooseContestMon(void);
+static void Task_ChoosePartyMon(u8 taskId);
+static void Task_ChooseMonForMoveRelearner(u8);
+static void CB2_ChooseMonForMoveRelearner(void);
+static void Task_BattlePyramidChooseMonHeldItems(u8);
+static void ShiftMoveSlot(struct Pokemon*, u8, u8);
+static void BlitBitmapToPartyWindow_LeftColumn(u8, u8, u8, u8, u8, u8);
+static void BlitBitmapToPartyWindow_RightColumn(u8, u8, u8, u8, u8, u8);
+static void CursorCb_Summary(u8);
+static void CursorCb_Switch(u8);
+static void CursorCb_Cancel1(u8);
+static void CursorCb_Item(u8);
+static void CursorCb_Give(u8);
+static void CursorCb_TakeItem(u8);
+static void CursorCb_Mail(u8);
+static void CursorCb_Read(u8);
+static void CursorCb_TakeMail(u8);
+static void CursorCb_Cancel2(u8);
+static void CursorCb_SendMon(u8);
+static void CursorCb_Enter(u8);
+static void CursorCb_NoEntry(u8);
+static void CursorCb_Store(u8);
+static void CursorCb_Register(u8);
+static void CursorCb_Trade1(u8);
+static void CursorCb_Trade2(u8);
+static void CursorCb_Toss(u8);
+static void CursorCb_FieldMove(u8);
 static bool8 SetUpFieldMove_Surf(void);
 static bool8 SetUpFieldMove_Fly(void);
 static bool8 SetUpFieldMove_Waterfall(void);
@@ -396,1234 +410,56 @@ static bool8 SetUpFieldMove_Dive(void);
 
 // static const data
 #include "data/pokemon/tutor_learnsets.h"
-
-static const struct BgTemplate gUnknown_086156B8[] =
-{
-    {
-        .bg = 0,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 31,
-        .screenSize = 0,
-        .paletteMode = 0,
-        .priority = 1,
-        .baseTile = 0
-    },
-    {
-        .bg = 1,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 30,
-        .screenSize = 0,
-        .paletteMode = 0,
-        .priority = 2,
-        .baseTile = 0
-    },
-    {
-        .bg = 2,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 28,
-        .screenSize = 1,
-        .paletteMode = 0,
-        .priority = 0,
-        .baseTile = 0
-    },
-};
-
-static const struct Unk_Rodata1 gUnknown_086156C4[] =
-{
-    {BlitBitmapToPartyWindow_Default1, {0x18, 0xB, 0x28, 0xD, 0x20, 0x14, 0x20, 8, 0x40, 0x14, 8, 8, 0x26, 0x25, 0x18, 8, 0x35, 0x25, 0x18, 8, 0x18, 0x23, 0x30, 3}, 0xC, 0x22, 0x40, 0x10},
-    {BlitBitmapToPartyWindow_Default2, {0x16, 3, 0x28, 0xD, 0x1E, 0xC, 0x20, 8, 0x3E, 0xC, 8, 8, 0x66, 0xC, 0x18, 8, 0x75, 0xC, 0x18, 8, 0x58, 0xA, 0x30, 3}, 0x4D, 4, 0x40, 0x10},
-};
-
-static const u8 gUnknown_08615704[][6][8] =
-{
-	{
-		{16, 40, 20, 50, 50, 52, 16, 34},
-		{104, 18, 108, 28, 136, 27, 102, 25},
-		{104, 42, 108, 52, 136, 51, 102, 49},
-		{104, 66, 108, 76, 136, 75, 102, 73},
-		{104, 90, 108, 100, 136, 99, 102, 97},
-		{104, 114, 108, 124, 136, 123, 102, 121},
-	},
-	{
-		{16, 24, 20, 34, 50, 36, 16, 18},
-		{16, 80, 20, 90, 50, 92, 16, 74},
-		{104, 18, 108, 28, 136, 27, 102, 25},
-		{104, 50, 108, 60, 136, 59, 102, 57},
-		{104, 82, 108, 92, 136, 91, 102, 89},
-		{104, 114, 108, 124, 136, 123, 102, 121},
-	},
-	{
-		{16, 24, 20, 34, 50, 36, 16, 18},
-		{16, 80, 20, 90, 50, 92, 16, 74},
-		{104, 26, 106, 36, 136, 35, 102, 33},
-		{104, 50, 106, 60, 136, 59, 102, 57},
-		{104, 82, 106, 92, 136, 91, 102, 89},
-		{104, 106, 106, 116, 136, 115, 102, 113},
-	},
-	{
-		{16, 32, 20, 42, 50, 44, 16, 26},
-		{104, 34, 106, 44, 136, 43, 102, 41},
-		{104, 58, 106, 68, 136, 67, 102, 65},
-		{16, 104, 20, 114, 50, 116, 16, 98},
-		{104, 106, 106, 116, 136, 115, 102, 113},
-		{104, 130, 106, 140, 136, 139, 102, 137},
-	},
-};
-
-static const u32 gUnknown_086157C4[] = INCBIN_U32("graphics/interface/unknown_6157C4.bin");
-static const u32 gUnknown_086157E0[] = INCBIN_U32("graphics/interface/unknown_6157E0.bin");
-
-static const u8 sFontColorTable[][3] =
-{
-	{0, 3, 2},
-	{0, 1, 6},
-	{0, 11, 12},
-	{1, 2, 3},
-	{1, 8, 9},
-	{0, 1, 2},
-};
-
-static const struct WindowTemplate gUnknown_08615810[] =
-{
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 3,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 3,
-		.baseBlock = 0x63,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 1,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 4,
-		.baseBlock = 0xA9,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 4,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 5,
-		.baseBlock = 0xDF,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 7,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 6,
-		.baseBlock = 0x115,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 10,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 7,
-		.baseBlock = 0x14B,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 13,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 8,
-		.baseBlock = 0x181,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 1,
-		.tilemapTop = 15,
-		.width = 28,
-		.height = 4,
-		.paletteNum = 14,
-		.baseBlock = 0x1DF,
-	},
-	DUMMY_WIN_TEMPLATE
-};
-
-static const struct WindowTemplate gUnknown_08615850[] =
-{
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 1,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 3,
-		.baseBlock = 0x63,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 8,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 4,
-		.baseBlock = 0xA9,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 1,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 5,
-		.baseBlock = 0xEF,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 5,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 6,
-		.baseBlock = 0x125,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 9,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 7,
-		.baseBlock = 0x15B,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 13,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 8,
-		.baseBlock = 0x191,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 1,
-		.tilemapTop = 15,
-		.width = 28,
-		.height = 4,
-		.paletteNum = 14,
-		.baseBlock = 0x1DF,
-	},
-	DUMMY_WIN_TEMPLATE
-};
-
-static const struct WindowTemplate gUnknown_08615890[] =
-{
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 1,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 3,
-		.baseBlock = 0x63,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 8,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 4,
-		.baseBlock = 0xA9,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 2,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 5,
-		.baseBlock = 0xEF,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 5,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 6,
-		.baseBlock = 0x125,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 9,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 7,
-		.baseBlock = 0x15B,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 12,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 8,
-		.baseBlock = 0x191,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 1,
-		.tilemapTop = 15,
-		.width = 28,
-		.height = 4,
-		.paletteNum = 14,
-		.baseBlock = 0x1DF,
-	},
-	DUMMY_WIN_TEMPLATE
-};
-
-static const struct WindowTemplate gUnknown_086158D0[] =
-{
-	{
-		.bg = 0,
-		.tilemapLeft = 1,
-		.tilemapTop = 2,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 3,
-		.baseBlock = 0x63,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 3,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 5,
-		.baseBlock = 0xA9,
-	},
-	{
-		.bg = 0,
-		.tilemapLeft = 12,
-		.tilemapTop = 6,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 6,
-		.baseBlock = 0xDF,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 1,
-		.tilemapTop = 11,
-		.width = 10,
-		.height = 7,
-		.paletteNum = 4,
-		.baseBlock = 0x115,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 12,
-		.tilemapTop = 12,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 7,
-		.baseBlock = 0x16B,
-	},
-	{
-		.bg = 2,
-		.tilemapLeft = 12,
-		.tilemapTop = 15,
-		.width = 18,
-		.height = 3,
-		.paletteNum = 8,
-		.baseBlock = 0x1A1,
-	},
-	DUMMY_WIN_TEMPLATE
-};
-
-static const struct WindowTemplate gUnknown_08615908 =
-{
-	.bg = 0,
-	.tilemapLeft = 24,
-	.tilemapTop = 17,
-	.width = 6,
-	.height = 2,
-	.paletteNum = 3,
-	.baseBlock = 0x1C7,
-};
-
-static const struct WindowTemplate gUnknown_08615910 =
-{
-	.bg = 0,
-	.tilemapLeft = 24,
-	.tilemapTop = 18,
-	.width = 6,
-	.height = 2,
-	.paletteNum = 3,
-	.baseBlock = 0x1C7,
-};
-
-static const struct WindowTemplate gUnknown_08615918 =
-{
-	.bg = 0,
-	.tilemapLeft = 24,
-	.tilemapTop = 16,
-	.width = 6,
-	.height = 2,
-	.paletteNum = 3,
-	.baseBlock = 0x1D3,
-};
-
-static const struct WindowTemplate gUnknown_08615920 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 17,
-	.width = 21,
-	.height = 2,
-	.paletteNum = 15,
-	.baseBlock = 0x24F,
-};
-
-static const struct WindowTemplate gUnknown_08615928 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 17,
-	.width = 16,
-	.height = 2,
-	.paletteNum = 15,
-	.baseBlock = 0x279,
-};
-
-static const struct WindowTemplate gUnknown_08615930 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 17,
-	.width = 20,
-	.height = 2,
-	.paletteNum = 15,
-	.baseBlock = 0x299,
-};
-
-static const struct WindowTemplate gUnknown_08615938 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 17,
-	.width = 18,
-	.height = 2,
-	.paletteNum = 15,
-	.baseBlock = 0x299,
-};
-
-static const struct WindowTemplate gUnknown_08615940 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 17,
-	.width = 16,
-	.height = 2,
-	.paletteNum = 15,
-	.baseBlock = 0x299,
-};
-
-static const struct WindowTemplate gUnknown_08615948 =
-{
-	.bg = 2,
-	.tilemapLeft = 1,
-	.tilemapTop = 15,
-	.width = 20,
-	.height = 4,
-	.paletteNum = 15,
-	.baseBlock = 0x299,
-};
-
-static const struct WindowTemplate gUnknown_08615950 =
-{
-	.bg = 2,
-	.tilemapLeft = 23,
-	.tilemapTop = 13,
-	.width = 6,
-	.height = 6,
-	.paletteNum = 14,
-	.baseBlock = 0x39D,
-};
-
-static const struct WindowTemplate gUnknown_08615958 =
-{
-	.bg = 2,
-	.tilemapLeft = 21,
-	.tilemapTop = 13,
-	.width = 8,
-	.height = 6,
-	.paletteNum = 14,
-	.baseBlock = 0x39D,
-};
-
-static const struct WindowTemplate gUnknown_08615960 =
-{
-	.bg = 2,
-	.tilemapLeft = 19,
-	.tilemapTop = 11,
-	.width = 10,
-	.height = 8,
-	.paletteNum = 14,
-	.baseBlock = 0x2E9,
-};
-
-static const struct WindowTemplate gUnknown_08615968 =
-{
-	.bg = 2,
-	.tilemapLeft = 21,
-	.tilemapTop = 9,
-	.width = 5,
-	.height = 4,
-	.paletteNum = 14,
-	.baseBlock = 0x2E9,
-};
-
-static const struct WindowTemplate gUnknown_08615970 =
-{
-	.bg = 2,
-	.tilemapLeft = 19,
-	.tilemapTop = 1,
-	.width = 10,
-	.height = 11,
-	.paletteNum = 14,
-	.baseBlock = 0x2E9,
-};
-
-// Unused.
-static const struct WindowTemplate gUnknown_08615978 =
-{
-	.bg = 2,
-	.tilemapLeft = 2,
-	.tilemapTop = 15,
-	.width = 27,
-	.height = 4,
-	.paletteNum = 14,
-	.baseBlock = 0x1DF,
-};
-
-// Unused.
-static const struct WindowTemplate gUnknown_08615980 =
-{
-	.bg = 2,
-	.tilemapLeft = 0,
-	.tilemapTop = 13,
-	.width = 18,
-	.height = 3,
-	.paletteNum = 12,
-	.baseBlock = 0x39D,
-};
-
-static const u8 sMainSlotTileNums[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
-                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                       40, 59, 60, 58, 58, 58, 58, 58, 58, 61,
-                                       15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
-                                       46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
-
-static const u8 sMainSlotTileNums_Egg[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
-                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
-                                           40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
-                                           15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
-                                           46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
-
-static const u8 sOtherSlotsTileNums[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
-                                         49, 33, 33, 33, 33, 33, 33, 33, 33, 52, 53, 51, 51, 51, 51, 51, 51, 54,
-                                         55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
-
-static const u8 sOtherSlotsTileNums_Egg[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
-                                             49, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 50,
-                                             55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
-
-static const u8 sEmptySlotTileNums[] = {21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
-                                        30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31,
-                                        37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39};
-static const u8 gUnknown_08615AB6[] = {11, 12};
-static const u8 gUnknown_08615AB8[] = {9, 10};
-static const u8 gUnknown_08615ABA[] = {4, 5, 6};
-static const u8 gUnknown_08615ABD[] = {1, 7, 8};
-static const u8 gUnknown_08615AC0[] = {1, 11, 12};
-static const u8 gUnknown_08615AC3[] = {59, 60};
-static const u8 gUnknown_08615AC5[] = {75, 76};
-static const u8 gUnknown_08615AC7[] = {57, 58};
-static const u8 gUnknown_08615AC9[] = {73, 74};
-static const u8 gUnknown_08615ACB[] = {89, 90};
-static const u8 gUnknown_08615ACD[] = {52, 53, 54};
-static const u8 gUnknown_08615AD0[] = {68, 69, 70};
-static const u8 gUnknown_08615AD3[] = {84, 85, 86};
-static const u8 gUnknown_08615AD6[] = {116, 117, 118};
-static const u8 gUnknown_08615AD9[] = {132, 133, 134};
-static const u8 gUnknown_08615ADC[] = {148, 149, 150};
-static const u8 gUnknown_08615ADF[] = {100, 101, 102};
-static const u8 gUnknown_08615AE2[] = {49, 55, 56};
-static const u8 gUnknown_08615AE5[] = {65, 71, 72};
-static const u8 gUnknown_08615AE8[] = {81, 87, 88};
-static const u8 gUnknown_08615AEB[] = {97, 103, 104};
-static const u8 gUnknown_08615AEE[] = {161, 167, 168};
-static const u8 gUnknown_08615AF1[] = {17, 27, 28};
-
-static const u8 *const sActionStringTable[] =
-{
-    gText_ChoosePokemon,
-    gText_ChoosePokemonCancel,
-    gText_ChoosePokemonConfirm,
-    gText_MoveToWhere,
-    gText_TeachWhichPokemon,
-    gText_UseOnWhichPokemon,
-    gText_GiveToWhichPokemon,
-    gText_NothingToCut,
-    gText_CantSurfHere,
-    gText_AlreadySurfing,
-    gText_CurrentIsTooFast,
-    gText_EnjoyCycling,
-    gText_InUseAlready_PM,
-    gText_CantUseHere,
-    gText_NoPokemonForBattle,
-    gText_ChoosePokemon2,
-    gText_NotEnoughHp,
-    gText_PokemonAreNeeded,
-    gText_PokemonCantBeSame,
-    gText_NoIdenticalHoldItems,
-    gText_EmptyString2,
-    gText_DoWhatWithPokemon,
-    gText_RestoreWhichMove,
-    gText_BoostPp,
-    gText_DoWhatWithItem,
-    gText_DoWhatWithMail,
-    gText_AlreadyHoldingOne,
-};
-
-static const u8 *const sSelectionStringTable[] =
-{
-    gText_NoUse,
-    gText_Able,
-    gText_First_PM,
-    gText_Second_PM,
-    gText_Third_PM,
-    gText_Fourth,
-    gText_Able2,
-    gText_NotAble,
-    gText_Able3,
-    gText_NotAble2,
-    gText_Learned,
-    gText_Have,
-    gText_DontHave,
-};
-
-// Unknown unused data. Feel free to remove.
-static const u16 gUnknown_08615B94[] =
-{
-    0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071,
-    0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068,
-    0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d,
-    0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123,
-};
-
-enum
-{
-    MENU_SUMMARY,
-    MENU_SWITCH,
-    MENU_CANCEL1,
-    MENU_ITEM,
-    MENU_GIVE,
-    MENU_TAKE_ITEM,
-    MENU_MAIL,
-    MENU_TAKE_MAIL,
-    MENU_READ,
-    MENU_CANCEL2,
-    MENU_SHIFT,
-    MENU_SEND_OUT,
-    MENU_ENTER,
-    MENU_NO_ENTRY,
-    MENU_STORE,
-    MENU_REGISTER,
-    MENU_TRADE1,
-    MENU_TRADE2,
-    MENU_TOSS,
-    MENU_FIELD_MOVES,
-};
-
-enum
-{
-    FIELD_MOVE_CUT,
-    FIELD_MOVE_FLASH,
-    FIELD_MOVE_ROCK_SMASH,
-    FIELD_MOVE_STRENGTH,
-    FIELD_MOVE_SURF,
-    FIELD_MOVE_FLY,
-    FIELD_MOVE_DIVE,
-    FIELD_MOVE_WATERFALL,
-    FIELD_MOVE_TELEPORT,
-    FIELD_MOVE_DIG,
-    FIELD_MOVE_SECRET_POWER,
-    FIELD_MOVE_MILK_DRINK,
-    FIELD_MOVE_SOFT_BOILED,
-    FIELD_MOVE_SWEET_SCENT,
-};
-
-// What a weird choice of table termination;
-#define FIELD_MOVE_TERMINATOR MOVE_SWORDS_DANCE
-
-struct
-{
-    const u8 *text;
-    TaskFunc func;
-} static const sCursorOptions[] =
-{
-    [MENU_SUMMARY] = {gText_Summary5, CursorCb_Summary},
-    [MENU_SWITCH] = {gText_Switch2, CursorCb_Switch},
-    [MENU_CANCEL1] = {gText_Cancel2, CursorCb_Cancel1},
-    [MENU_ITEM] = {gText_Item, CursorCb_Item},
-    [MENU_GIVE] = {gMenuText_Give, CursorCb_Give},
-    [MENU_TAKE_ITEM] = {gText_Take, CursorCb_TakeItem},
-    [MENU_MAIL] = {gText_Mail, CursorCb_Mail},
-    [MENU_TAKE_MAIL] = {gText_Take2, CursorCb_TakeMail},
-    [MENU_READ] = {gText_Read2, CursorCb_Read},
-    [MENU_CANCEL2] = {gText_Cancel2, CursorCb_Cancel2},
-    [MENU_SHIFT] = {gText_Shift, CursorCb_SendMon},
-    [MENU_SEND_OUT] = {gText_SendOut, CursorCb_SendMon},
-    [MENU_ENTER] = {gText_Enter, CursorCb_Enter},
-    [MENU_NO_ENTRY] = {gText_NoEntry, CursorCb_NoEntry},
-    [MENU_STORE] = {gText_Store, CursorCb_Store},
-    [MENU_REGISTER] = {gText_Register, CursorCb_Register},
-    [MENU_TRADE1] = {gText_Trade4, CursorCb_Trade1},
-    [MENU_TRADE2] = {gText_Trade4, CursorCb_Trade2},
-    [MENU_TOSS] = {gMenuText_Toss, CursorCb_Toss},
-    [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMoveNames[MOVE_CUT], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMoveNames[MOVE_FLASH], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMoveNames[MOVE_ROCK_SMASH], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMoveNames[MOVE_STRENGTH], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMoveNames[MOVE_SURF], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMoveNames[MOVE_FLY], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMoveNames[MOVE_DIVE], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMoveNames[MOVE_WATERFALL], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMoveNames[MOVE_TELEPORT], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMoveNames[MOVE_DIG], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMoveNames[MOVE_SECRET_POWER], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMoveNames[MOVE_MILK_DRINK], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMoveNames[MOVE_SOFT_BOILED], CursorCb_FieldMove},
-    [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMoveNames[MOVE_SWEET_SCENT], CursorCb_FieldMove},
-};
-
-static const u8 gUnknown_08615D10[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1};
-static const u8 gUnknown_08615D13[] = {MENU_SHIFT, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D16[] = {MENU_SEND_OUT, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D19[] = {MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D1B[] = {MENU_ENTER, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D1E[] = {MENU_NO_ENTRY, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D21[] = {MENU_STORE, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D24[] = {MENU_GIVE, MENU_TAKE_ITEM, MENU_CANCEL2};
-static const u8 gUnknown_08615D27[] = {MENU_READ, MENU_TAKE_MAIL, MENU_CANCEL2};
-static const u8 gUnknown_08615D2A[] = {MENU_REGISTER, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D2D[] = {MENU_TRADE1, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D30[] = {MENU_TRADE2, MENU_SUMMARY, MENU_CANCEL1};
-static const u8 gUnknown_08615D33[] = {MENU_TAKE_ITEM, MENU_TOSS, MENU_CANCEL1};
-
-static const u8 *const sActionTable[] =
-{
-    NULL,
-    gUnknown_08615D10,
-    gUnknown_08615D13,
-    gUnknown_08615D16,
-    gUnknown_08615D1B,
-    gUnknown_08615D1E,
-    gUnknown_08615D21,
-    gUnknown_08615D19,
-    gUnknown_08615D24,
-    gUnknown_08615D27,
-    gUnknown_08615D2A,
-    gUnknown_08615D2D,
-    gUnknown_08615D30,
-    gUnknown_08615D33,
-};
-
-static const u8 sListSizeTable[] =
-{
-    0x00,
-    ARRAY_COUNT(gUnknown_08615D10),
-    ARRAY_COUNT(gUnknown_08615D13),
-    ARRAY_COUNT(gUnknown_08615D16),
-    ARRAY_COUNT(gUnknown_08615D1B),
-    ARRAY_COUNT(gUnknown_08615D1E),
-    ARRAY_COUNT(gUnknown_08615D21),
-    ARRAY_COUNT(gUnknown_08615D19),
-    ARRAY_COUNT(gUnknown_08615D24),
-    ARRAY_COUNT(gUnknown_08615D27),
-    ARRAY_COUNT(gUnknown_08615D2A),
-    ARRAY_COUNT(gUnknown_08615D2D),
-    ARRAY_COUNT(gUnknown_08615D30),
-    ARRAY_COUNT(gUnknown_08615D33)
-};
-
-static const u16 sFieldMoves[] =
-{
-    MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH, MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_TELEPORT,
-    MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK, MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, FIELD_MOVE_TERMINATOR
-};
-
-struct
-{
-    bool8 (*fieldMoveFunc)(void);
-    u8 msgId;
-} static const sFieldMoveCursorCallbacks[] =
-{
-    [FIELD_MOVE_CUT] = {SetUpFieldMove_Cut, 0x07},
-    [FIELD_MOVE_FLASH] = {SetUpFieldMove_Flash, 0x0d},
-    [FIELD_MOVE_ROCK_SMASH] = {SetUpFieldMove_RockSmash, 0x0d},
-    [FIELD_MOVE_STRENGTH] = {SetUpFieldMove_Strength, 0x0d},
-    [FIELD_MOVE_SURF] = {SetUpFieldMove_Surf, 0x08},
-    [FIELD_MOVE_FLY] = {SetUpFieldMove_Fly, 0x0d},
-    [FIELD_MOVE_DIVE] = {SetUpFieldMove_Dive, 0x0d},
-    [FIELD_MOVE_WATERFALL] = {SetUpFieldMove_Waterfall, 0x0d},
-    [FIELD_MOVE_TELEPORT] = {SetUpFieldMove_Teleport, 0x0d},
-    [FIELD_MOVE_DIG] = {SetUpFieldMove_Dig, 0x0d},
-    [FIELD_MOVE_SECRET_POWER] = {SetUpFieldMove_SecretPower, 0x0d},
-    [FIELD_MOVE_MILK_DRINK] = {SetUpFieldMove_SoftBoiled, 0x10},
-    [FIELD_MOVE_SOFT_BOILED] = {SetUpFieldMove_SoftBoiled, 0x10},
-    [FIELD_MOVE_SWEET_SCENT] = {SetUpFieldMove_SweetScent, 0x0d},
-};
-
-static const u8 *const sUnionRoomTradeMessages[] =
-{
-    [UR_TRADE_MSG_NOT_MON_PARTNER_WANTS - 1]       = gText_NotPkmnOtherTrainerWants,
-    [UR_TRADE_MSG_NOT_EGG - 1]                     = gText_ThatIsntAnEgg,
-    [UR_TRADE_MSG_MON_CANT_BE_TRADED_1 - 1]        = gText_PkmnCantBeTradedNow,
-    [UR_TRADE_MSG_MON_CANT_BE_TRADED_2 - 1]        = gText_PkmnCantBeTradedNow,
-    [UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED - 1] = gText_OtherTrainersPkmnCantBeTraded,
-    [UR_TRADE_MSG_EGG_CANT_BE_TRADED -1]           = gText_EggCantBeTradedNow,
-    [UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON - 1]     = gText_OtherTrainerCantAcceptPkmn,
-    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 - 1]   = gText_CantTradeWithTrainer,
-    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 - 1]   = gText_CantTradeWithTrainer,
-};
-
-static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp");
-static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
-
-static const struct OamData sOamData_HeldItem =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(8x8),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(8x8),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 0,
-    .affineParam = 0,
-};
-
-static const union AnimCmd sSpriteAnim_HeldItem[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_HeldMail[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_HeldItem[] =
-{
-    sSpriteAnim_HeldItem,
-    sSpriteAnim_HeldMail,
-};
-
-static const struct SpriteSheet sSpriteSheet_HeldItem =
-{
-    sHeldItemGfx, sizeof(sHeldItemGfx), 0xd750
-};
-
-static const struct SpritePalette sSpritePalette_HeldItem =
-{
-    sHeldItemPalette, 0xd750
-};
-
-static const struct SpriteTemplate sSpriteTemplate_HeldItem =
-{
-    0xd750,
-    0xd750,
-    &sOamData_HeldItem,
-    sSpriteAnimTable_HeldItem,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    SpriteCallbackDummy
-};
-
-static const struct OamData sOamData_MenuPokeball =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(32x32),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(32x32),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const union AnimCmd sPokeballAnim_Closed[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sPokeballAnim_Open[] =
-{
-    ANIMCMD_FRAME(16, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_Pokeball[] =
-{
-    sPokeballAnim_Closed,
-    sPokeballAnim_Open
-};
-
-static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeball =
-{
-    gPartyMenuPokeball_Gfx, 0x400, 0x04b0
-};
-
-static const struct CompressedSpritePalette sSpritePalette_MenuPokeball =
-{
-    gPartyMenuPokeball_Pal, 0x04b0
-};
-
-static const struct SpriteTemplate sSpriteTemplate_MenuPokeball =
-{
-    .tileTag = 0x04b0,
-    .paletteTag = 0x04b0,
-    .oam = &sOamData_MenuPokeball,
-    .anims = sSpriteAnimTable_Pokeball,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy,
-};
-
-static const struct OamData sOamData_8615F20 =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(16x16),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(16x16),
-    .tileNum = 0,
-    .priority = 2,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const union AnimCmd sSpriteAnim_8615F28[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_8615F30[] =
-{
-    ANIMCMD_FRAME(4, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_8615F38[] =
-{
-    ANIMCMD_FRAME(8, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_8615F40[] =
-{
-    ANIMCMD_FRAME(12, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_8615F48[] =
-{
-    ANIMCMD_FRAME(16, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_8615F50[] =
-{
-    ANIMCMD_FRAME(20, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_8615F58[] =
-{
-    sSpriteAnim_8615F28,
-    sSpriteAnim_8615F30,
-    sSpriteAnim_8615F38,
-    sSpriteAnim_8615F40,
-    sSpriteAnim_8615F48,
-    sSpriteAnim_8615F50
-};
-
-static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall =
-{
-    gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
-};
-
-static const struct SpriteTemplate gSpriteTemplate_8615F78 =
-{
-    .tileTag = 1201,
-    .paletteTag = 1200,
-    .oam = &sOamData_8615F20,
-    .anims = sSpriteAnimTable_8615F58,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy,
-};
-
-static const struct OamData sOamData_StatusCondition =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(32x8),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(32x8),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const union AnimCmd sSpriteAnim_StatusPoison[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusParalyzed[] =
-{
-    ANIMCMD_FRAME(4, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusSleep[] =
-{
-    ANIMCMD_FRAME(8, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusFrozen[] =
-{
-    ANIMCMD_FRAME(12, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusBurn[] =
-{
-    ANIMCMD_FRAME(16, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusPokerus[] =
-{
-    ANIMCMD_FRAME(20, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_StatusFaint[] =
-{
-    ANIMCMD_FRAME(24, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_Blank[] =
-{
-    ANIMCMD_FRAME(28, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteTemplate_StatusCondition[] =
-{
-    sSpriteAnim_StatusPoison,
-    sSpriteAnim_StatusParalyzed,
-    sSpriteAnim_StatusSleep,
-    sSpriteAnim_StatusFrozen,
-    sSpriteAnim_StatusBurn,
-    sSpriteAnim_StatusPokerus,
-    sSpriteAnim_StatusFaint,
-    sSpriteAnim_Blank
-};
-
-static const struct CompressedSpriteSheet sSpriteSheet_StatusIcons =
-{
-    gStatusGfx_Icons, 0x400, 1202
-};
-
-static const struct CompressedSpritePalette sSpritePalette_StatusIcons =
-{
-    gStatusPal_Icons, 1202
-};
-
-static const struct SpriteTemplate sSpriteTemplate_StatusIcons =
-{
-    .tileTag = 1202,
-    .paletteTag = 1202,
-    .oam = &sOamData_StatusCondition,
-    .anims = sSpriteTemplate_StatusCondition,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy,
-};
-
-static const u8 gUnknown_08616020[] = {0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00};
-
-// Unused table of pointers to strings of statistics.
-static const u8 *const gUnknown_08616028[] =
-{
-    gText_HP4,
-    gText_Attack3,
-    gText_Defense3,
-    gText_SpAtk4,
-    gText_SpDef4,
-    gText_Speed2
-};
-
-static const u16 gTMHMMoves[] =
-{
-    MOVE_FOCUS_PUNCH,
-    MOVE_DRAGON_CLAW,
-    MOVE_WATER_PULSE,
-    MOVE_CALM_MIND,
-    MOVE_ROAR,
-    MOVE_TOXIC,
-    MOVE_HAIL,
-    MOVE_BULK_UP,
-    MOVE_BULLET_SEED,
-    MOVE_HIDDEN_POWER,
-    MOVE_SUNNY_DAY,
-    MOVE_TAUNT,
-    MOVE_ICE_BEAM,
-    MOVE_BLIZZARD,
-    MOVE_HYPER_BEAM,
-    MOVE_LIGHT_SCREEN,
-    MOVE_PROTECT,
-    MOVE_RAIN_DANCE,
-    MOVE_GIGA_DRAIN,
-    MOVE_SAFEGUARD,
-    MOVE_FRUSTRATION,
-    MOVE_SOLAR_BEAM,
-    MOVE_IRON_TAIL,
-    MOVE_THUNDERBOLT,
-    MOVE_THUNDER,
-    MOVE_EARTHQUAKE,
-    MOVE_RETURN,
-    MOVE_DIG,
-    MOVE_PSYCHIC,
-    MOVE_SHADOW_BALL,
-    MOVE_BRICK_BREAK,
-    MOVE_DOUBLE_TEAM,
-    MOVE_REFLECT,
-    MOVE_SHOCK_WAVE,
-    MOVE_FLAMETHROWER,
-    MOVE_SLUDGE_BOMB,
-    MOVE_SANDSTORM,
-    MOVE_FIRE_BLAST,
-    MOVE_ROCK_TOMB,
-    MOVE_AERIAL_ACE,
-    MOVE_TORMENT,
-    MOVE_FACADE,
-    MOVE_SECRET_POWER,
-    MOVE_REST,
-    MOVE_ATTRACT,
-    MOVE_THIEF,
-    MOVE_STEEL_WING,
-    MOVE_SKILL_SWAP,
-    MOVE_SNATCH,
-    MOVE_OVERHEAT,
-    MOVE_CUT,
-    MOVE_FLY,
-    MOVE_SURF,
-    MOVE_STRENGTH,
-    MOVE_FLASH,
-    MOVE_ROCK_SMASH,
-    MOVE_WATERFALL,
-    MOVE_DIVE,
-};
+#include "data/party_menu.h"
 
 // code
-static void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback)
+static void InitPartyMenu(u8 menuType, u8 layout, u8 partyAction, bool8 keepCursorPos, u8 messageId, TaskFunc task, MainCallback callback)
 {
     u16 i;
 
-    reset_brm();
-    gUnknown_0203CEC4 = Alloc(sizeof(struct Struct203CEC4));
-    if (gUnknown_0203CEC4 == NULL)
+    ResetPartyMenu();
+    sPartyMenuInternal = Alloc(sizeof(struct PartyMenuInternal));
+    if (sPartyMenuInternal == NULL)
     {
         SetMainCallback2(callback);
     }
     else
     {
-        gUnknown_0203CEC8.unk8_0 = a;
-        gUnknown_0203CEC8.exitCallback = callback;
-        gUnknown_0203CEC8.unkB = c;
-        gUnknown_0203CEC4->messageId = messageId;
-        gUnknown_0203CEC4->task = task;
-        gUnknown_0203CEC4->exitCallback = NULL;
-        gUnknown_0203CEC4->unk8_1 = 0;
-        gUnknown_0203CEC4->unk8_2 = 0x7F;
-        gUnknown_0203CEC4->unk9_0 = 0x7F;
-
-        if (a == 4)
-            gUnknown_0203CEC4->unk8_0 = TRUE;
+        gPartyMenu.menuType = menuType;
+        gPartyMenu.exitCallback = callback;
+        gPartyMenu.action = partyAction;
+        sPartyMenuInternal->messageId = messageId;
+        sPartyMenuInternal->task = task;
+        sPartyMenuInternal->exitCallback = NULL;
+        sPartyMenuInternal->lastSelectedSlot = 0;
+        sPartyMenuInternal->spriteIdConfirmPokeball = 0x7F;
+        sPartyMenuInternal->spriteIdCancelPokeball = 0x7F;
+
+        if (menuType == PARTY_MENU_TYPE_CHOOSE_HALF)
+            sPartyMenuInternal->chooseHalf = TRUE;
         else
-            gUnknown_0203CEC4->unk8_0 = FALSE;
+            sPartyMenuInternal->chooseHalf = FALSE;
 
-        if (b != 0xFF)
-            gUnknown_0203CEC8.mode = b;
+        if (layout != KEEP_PARTY_LAYOUT)
+            gPartyMenu.layout = layout;
 
-        for (i = 0; i <= 15; i++)
-            gUnknown_0203CEC4->data[i] = 0;
-        for (i = 0; i < ARRAY_COUNT(gUnknown_0203CEC4->windowId); i++)
-            gUnknown_0203CEC4->windowId[i] = 0xFF;
+        for (i = 0; i < ARRAY_COUNT(sPartyMenuInternal->data); i++)
+            sPartyMenuInternal->data[i] = 0;
+        for (i = 0; i < ARRAY_COUNT(sPartyMenuInternal->windowId); i++)
+            sPartyMenuInternal->windowId[i] = 0xFF;
 
-        if (d == 0)
-            gUnknown_0203CEC8.slotId = 0;
-        else if (gUnknown_0203CEC8.slotId > 5 || GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES) == SPECIES_NONE)
-            gUnknown_0203CEC8.slotId = 0; // wut why is this else if?
+        if (!keepCursorPos)
+            gPartyMenu.slotId = 0;
+        else if (gPartyMenu.slotId > PARTY_SIZE - 1 || GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES) == SPECIES_NONE)
+            gPartyMenu.slotId = 0;
 
         gTextFlags.autoScroll = 0;
         CalculatePlayerPartyCount();
-        SetMainCallback2(PartyMenuInitCallback);
+        SetMainCallback2(CB2_InitPartyMenu);
     }
 }
 
-static void PartyMenuCallback(void)
+static void CB2_UpdatePartyMenu(void)
 {
     RunTasks();
     AnimateSprites();
@@ -1632,23 +468,23 @@ static void PartyMenuCallback(void)
     UpdatePaletteFade();
 }
 
-static void PartyMenuVBlankCallback(void)
+static void VBlankCB_PartyMenu(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-static void PartyMenuInitCallback(void)
+static void CB2_InitPartyMenu(void)
 {
     while (TRUE)
     {
-        if (sub_81221EC() == TRUE || PartyMenuSetup() == TRUE || sub_81221AC() == TRUE)
+        if (sub_81221EC() == TRUE || ShowPartyMenu() == TRUE || sub_81221AC() == TRUE)
             break;
     }
 }
 
-static bool8 PartyMenuSetup(void)
+static bool8 ShowPartyMenu(void)
 {
     switch (gMain.state)
     {
@@ -1681,32 +517,32 @@ static bool8 PartyMenuSetup(void)
         gMain.state++;
         break;
     case 6:
-        sub_81B209C();
+        SetPartyMonsAllowedInMinigame();
         gMain.state++;
         break;
     case 7:
         if (!AllocPartyMenuBg())
         {
-            PartyMenuExit();
+            ExitPartyMenu();
             return TRUE;
         }
         else
         {
-            gUnknown_0203CEC4->data[0] = 0;
+            sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
     case 8:
-        if (AllocPartyMiscGfx())
+        if (AllocPartyMenuBgGfx())
             gMain.state++;
         break;
     case 9:
-        sub_81B239C(gUnknown_0203CEC8.mode);
+        InitPartyMenuWindows(gPartyMenu.layout);
         gMain.state++;
         break;
     case 10:
-        PartyMenuInitHelperStructs(gUnknown_0203CEC8.mode);
-        gUnknown_0203CEC4->data[0] = 0;
+        InitPartyMenuBoxes(gPartyMenu.layout);
+        sPartyMenuInternal->data[0] = 0;
         gMain.state++;
         break;
     case 11:
@@ -1726,33 +562,33 @@ static bool8 PartyMenuSetup(void)
         gMain.state++;
         break;
     case 15:
-        if (party_menu_add_per_mon_objects())
+        if (CreatePartyMonSpritesLoop())
         {
-            gUnknown_0203CEC4->data[0] = 0;
+            sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
     case 16:
         if (RenderPartyMenuBoxes())
         {
-            gUnknown_0203CEC4->data[0] = 0;
+            sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
     case 17:
-        sub_81B0F28();
+        CreateCancelConfirmPokeballSprites();
         gMain.state++;
         break;
     case 18:
-        sub_81B2428(gUnknown_0203CEC4->unk8_0);
+        CreateCancelConfirmWindows(sPartyMenuInternal->chooseHalf);
         gMain.state++;
         break;
     case 19:
         gMain.state++;
         break;
     case 20:
-        CreateTask(gUnknown_0203CEC4->task, 0);
-        DisplayPartyMenuStdMessage(gUnknown_0203CEC4->messageId);
+        CreateTask(sPartyMenuInternal->task, 0);
+        DisplayPartyMenuStdMessage(sPartyMenuInternal->messageId);
         gMain.state++;
         break;
     case 21:
@@ -1765,49 +601,49 @@ static bool8 PartyMenuSetup(void)
         gMain.state++;
         break;
     default:
-        SetVBlankCallback(PartyMenuVBlankCallback);
-        SetMainCallback2(PartyMenuCallback);
+        SetVBlankCallback(VBlankCB_PartyMenu);
+        SetMainCallback2(CB2_UpdatePartyMenu);
         return TRUE;
     }
     return FALSE;
 }
 
-static void PartyMenuExit(void)
+static void ExitPartyMenu(void)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
-    CreateTask(PartyMenuExitTask, 0);
-    SetVBlankCallback(PartyMenuVBlankCallback);
-    SetMainCallback2(PartyMenuCallback);
+    CreateTask(Task_ExitPartyMenu, 0);
+    SetVBlankCallback(VBlankCB_PartyMenu);
+    SetMainCallback2(CB2_UpdatePartyMenu);
 }
 
-static void PartyMenuExitTask(u8 taskId)
+static void Task_ExitPartyMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        SetMainCallback2(gUnknown_0203CEC8.exitCallback);
+        SetMainCallback2(gPartyMenu.exitCallback);
         FreePartyPointers();
         DestroyTask(taskId);
     }
 }
 
-static void reset_brm(void)
+static void ResetPartyMenu(void)
 {
-    gUnknown_0203CEC4 = NULL;
-    gUnknown_0203CEE4 = NULL;
-    gUnknown_0203CEDC = NULL;
-    gUnknown_0203CEE0 = NULL;
+    sPartyMenuInternal = NULL;
+    sPartyBgTilemapBuffer = NULL;
+    sPartyMenuBoxes = NULL;
+    sPartyBgGfxTilemap = NULL;
 }
 
 static bool8 AllocPartyMenuBg(void)
 {
-    gUnknown_0203CEE4 = Alloc(0x800);
-    if (gUnknown_0203CEE4 == NULL)
+    sPartyBgTilemapBuffer = Alloc(0x800);
+    if (sPartyBgTilemapBuffer == NULL)
         return FALSE;
 
-    memset(gUnknown_0203CEE4, 0, 0x800);
+    memset(sPartyBgTilemapBuffer, 0, 0x800);
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_086156B8, ARRAY_COUNT(gUnknown_086156B8));
-    SetBgTilemapBuffer(1, gUnknown_0203CEE4);
+    InitBgsFromTemplates(0, sPartyMenuBgTemplates, ARRAY_COUNT(sPartyMenuBgTemplates));
+    SetBgTilemapBuffer(1, sPartyBgTilemapBuffer);
     ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
@@ -1818,48 +654,48 @@ static bool8 AllocPartyMenuBg(void)
     return TRUE;
 }
 
-static bool8 AllocPartyMiscGfx(void)
+static bool8 AllocPartyMenuBgGfx(void)
 {
     u32 sizeout;
 
-    switch (gUnknown_0203CEC4->data[0])
+    switch (sPartyMenuInternal->data[0])
     {
     case 0:
-        gUnknown_0203CEE0 = malloc_and_decompress(gPartyMenuMisc_Gfx, &sizeout);
-        LoadBgTiles(1, gUnknown_0203CEE0, sizeout, 0);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyBgGfxTilemap = malloc_and_decompress(gPartyMenuBg_Gfx, &sizeout);
+        LoadBgTiles(1, sPartyBgGfxTilemap, sizeout, 0);
+        sPartyMenuInternal->data[0]++;
         break;
     case 1:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
-            LZDecompressWram(gPartyMenuMisc_Tilemap, gUnknown_0203CEE4);
-            gUnknown_0203CEC4->data[0]++;
+            LZDecompressWram(gPartyMenuBg_Tilemap, sPartyBgTilemapBuffer);
+            sPartyMenuInternal->data[0]++;
         }
         break;
     case 2:
-        LoadCompressedPalette(gPartyMenuMisc_Pal, 0, 0x160);
-        CpuCopy16(gPlttBufferUnfaded, gUnknown_0203CEC4->palBuffer, 0x160);
-        gUnknown_0203CEC4->data[0]++;
+        LoadCompressedPalette(gPartyMenuBg_Pal, 0, 0x160);
+        CpuCopy16(gPlttBufferUnfaded, sPartyMenuInternal->palBuffer, 0x160);
+        sPartyMenuInternal->data[0]++;
         break;
     case 3:
         PartyPaletteBufferCopy(4);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyMenuInternal->data[0]++;
         break;
     case 4:
         PartyPaletteBufferCopy(5);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyMenuInternal->data[0]++;
         break;
     case 5:
         PartyPaletteBufferCopy(6);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyMenuInternal->data[0]++;
         break;
     case 6:
         PartyPaletteBufferCopy(7);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyMenuInternal->data[0]++;
         break;
     case 7:
         PartyPaletteBufferCopy(8);
-        gUnknown_0203CEC4->data[0]++;
+        sPartyMenuInternal->data[0]++;
         break;
     default:
         return TRUE;
@@ -1876,84 +712,86 @@ static void PartyPaletteBufferCopy(u8 offset)
 
 static void FreePartyPointers(void)
 {
-    if (gUnknown_0203CEC4)
-        Free(gUnknown_0203CEC4);
-    if (gUnknown_0203CEE4)
-        Free(gUnknown_0203CEE4);
-    if (gUnknown_0203CEE0)
-        Free(gUnknown_0203CEE0);
-    if (gUnknown_0203CEDC)
-        Free(gUnknown_0203CEDC);
+    if (sPartyMenuInternal)
+        Free(sPartyMenuInternal);
+    if (sPartyBgTilemapBuffer)
+        Free(sPartyBgTilemapBuffer);
+    if (sPartyBgGfxTilemap)
+        Free(sPartyBgGfxTilemap);
+    if (sPartyMenuBoxes)
+        Free(sPartyMenuBoxes);
     FreeAllWindowBuffers();
 }
 
-static void PartyMenuInitHelperStructs(u8 a)
+static void InitPartyMenuBoxes(u8 layout)
 {
     u8 i;
 
-    gUnknown_0203CEDC = Alloc(sizeof(struct Struct203CEDC[PARTY_SIZE]));
+    sPartyMenuBoxes = Alloc(sizeof(struct PartyMenuBox[PARTY_SIZE]));
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        gUnknown_0203CEDC[i].unk0 = &gUnknown_086156C4[1];
-        gUnknown_0203CEDC[i].unk4 = gUnknown_08615704[a][i];
-        gUnknown_0203CEDC[i].windowId = i;
-        gUnknown_0203CEDC[i].monSpriteId = 0xFF;
-        gUnknown_0203CEDC[i].itemSpriteId = 0xFF;
-        gUnknown_0203CEDC[i].pokeballSpriteId = 0xFF;
-        gUnknown_0203CEDC[i].statusSpriteId = 0xFF;
+        sPartyMenuBoxes[i].infoRects = &sPartyBoxInfoRects[PARTY_BOX_RIGHT_COLUMN];
+        sPartyMenuBoxes[i].spriteCoords = sPartyMenuSpriteCoords[layout][i];
+        sPartyMenuBoxes[i].windowId = i;
+        sPartyMenuBoxes[i].monSpriteId = 0xFF;
+        sPartyMenuBoxes[i].itemSpriteId = 0xFF;
+        sPartyMenuBoxes[i].pokeballSpriteId = 0xFF;
+        sPartyMenuBoxes[i].statusSpriteId = 0xFF;
     }
-    gUnknown_0203CEDC[0].unk0 = &gUnknown_086156C4[0];
-    if (a == 3)
-        gUnknown_0203CEDC[3].unk0 = &gUnknown_086156C4[0];
-    else if (a != 0)
-        gUnknown_0203CEDC[1].unk0 = &gUnknown_086156C4[0];
+    // The first party mon goes in the left column
+    sPartyMenuBoxes[0].infoRects = &sPartyBoxInfoRects[PARTY_BOX_LEFT_COLUMN];
+
+    if (layout == PARTY_LAYOUT_MULTI_SHOWCASE)
+        sPartyMenuBoxes[3].infoRects = &sPartyBoxInfoRects[PARTY_BOX_LEFT_COLUMN];
+    else if (layout != PARTY_LAYOUT_SINGLE)
+        sPartyMenuBoxes[1].infoRects = &sPartyBoxInfoRects[PARTY_BOX_LEFT_COLUMN];
 }
 
 static void RenderPartyMenuBox(u8 slot)
 {
-    if (gUnknown_0203CEC8.unk8_0 == 5 && slot > 2)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE && slot >= MULTI_PARTY_SIZE)
     {
-        sub_81B0CEC(slot);
-        if (gUnknown_02022FF8[slot - 3].species == SPECIES_NONE)
-            UpdateSelectedPartyBox(&gUnknown_0203CEDC[slot], 0x40);
+        DisplayPartyPokemonDataForMultiBattle(slot);
+        if (gMultiPartnerParty[slot - MULTI_PARTY_SIZE].species == SPECIES_NONE)
+            LoadPartyBoxPalette(&sPartyMenuBoxes[slot], PARTY_PAL_NO_MON);
         else
-            UpdateSelectedPartyBox(&gUnknown_0203CEDC[slot], 8);
-        CopyWindowToVram(gUnknown_0203CEDC[slot].windowId, 2);
-        PutWindowTilemap(gUnknown_0203CEDC[slot].windowId);
+            LoadPartyBoxPalette(&sPartyMenuBoxes[slot], PARTY_PAL_MULTI_ALT);
+        CopyWindowToVram(sPartyMenuBoxes[slot].windowId, 2);
+        PutWindowTilemap(sPartyMenuBoxes[slot].windowId);
         schedule_bg_copy_tilemap_to_vram(2);
     }
     else
     {
         if (GetMonData(&gPlayerParty[slot], MON_DATA_SPECIES) == SPECIES_NONE)
         {
-            DrawEmptySlot(gUnknown_0203CEDC[slot].windowId);
-            UpdateSelectedPartyBox(&gUnknown_0203CEDC[slot], 0x40);
-            CopyWindowToVram(gUnknown_0203CEDC[slot].windowId, 2);
+            DrawEmptySlot(sPartyMenuBoxes[slot].windowId);
+            LoadPartyBoxPalette(&sPartyMenuBoxes[slot], PARTY_PAL_NO_MON);
+            CopyWindowToVram(sPartyMenuBoxes[slot].windowId, 2);
         }
         else
         {
-            if (gUnknown_0203CEC8.unk8_0 == 7)
-                DisplayPartyPokemonSelectForRelearner(slot);
-            else if (gUnknown_0203CEC8.unk8_0 == 2)
-                DisplayPartyPokemonSelectForContest(slot);
-            else if (gUnknown_0203CEC8.unk8_0 == 4)
-                DisplayPartyPokemonSelectForBattle(slot);
-            else if (gUnknown_0203CEC8.unk8_0 == 11)
-                sub_81B0B98(slot);
-            else if (gUnknown_0203CEC8.unk8_0 == 12)
-                DisplayPartyPokemonSelectHeldItemRelated(slot);
-            else if (!sub_81B0BFC(slot))
+            if (gPartyMenu.menuType == PARTY_MENU_TYPE_MOVE_RELEARNER)
+                DisplayPartyPokemonDataForRelearner(slot);
+            else if (gPartyMenu.menuType == PARTY_MENU_TYPE_CONTEST)
+                DisplayPartyPokemonDataForContest(slot);
+            else if (gPartyMenu.menuType == PARTY_MENU_TYPE_CHOOSE_HALF)
+                DisplayPartyPokemonDataForChooseHalf(slot);
+            else if (gPartyMenu.menuType == PARTY_MENU_TYPE_MINIGAME)
+                DisplayPartyPokemonDataForWirelessMinigame(slot);
+            else if (gPartyMenu.menuType == PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS)
+                DisplayPartyPokemonDataForBattlePyramidHeldItem(slot);
+            else if (!DisplayPartyPokemonDataForMoveTutorOrEvolutionItem(slot))
                 DisplayPartyPokemonData(slot);
 
-            if (gUnknown_0203CEC8.unk8_0 == 5)
-                sub_81B0FCC(slot, 0);
-            else if (gUnknown_0203CEC8.slotId == slot)
-                sub_81B0FCC(slot, 1);
+            if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE)
+                AnimatePartySlot(slot, 0);
+            else if (gPartyMenu.slotId == slot)
+                AnimatePartySlot(slot, 1);
             else
-                sub_81B0FCC(slot, 0);
+                AnimatePartySlot(slot, 0);
         }
-        PutWindowTilemap(gUnknown_0203CEDC[slot].windowId);
+        PutWindowTilemap(sPartyMenuBoxes[slot].windowId);
         schedule_bg_copy_tilemap_to_vram(0);
     }
 }
@@ -1962,249 +800,251 @@ static void DisplayPartyPokemonData(u8 slot)
 {
     if (GetMonData(&gPlayerParty[slot], MON_DATA_IS_EGG))
     {
-        gUnknown_0203CEDC[slot].unk0->unk0(gUnknown_0203CEDC[slot].windowId, 0, 0, 0, 0, 1);
-        DisplayPartyPokemonNickname(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
+        sPartyMenuBoxes[slot].infoRects->blitFunc(sPartyMenuBoxes[slot].windowId, 0, 0, 0, 0, TRUE);
+        DisplayPartyPokemonNickname(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
     }
     else
     {
-        gUnknown_0203CEDC[slot].unk0->unk0(gUnknown_0203CEDC[slot].windowId, 0, 0, 0, 0, 0);
-        DisplayPartyPokemonNickname(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonLevelCheck(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonGenderNidoranCheck(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonHPCheck(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonMaxHPCheck(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonHPBarCheck(&gPlayerParty[slot], &gUnknown_0203CEDC[slot]);
+        sPartyMenuBoxes[slot].infoRects->blitFunc(sPartyMenuBoxes[slot].windowId, 0, 0, 0, 0, FALSE);
+        DisplayPartyPokemonNickname(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonLevelCheck(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonGenderNidoranCheck(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonHPCheck(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonMaxHPCheck(&gPlayerParty[slot], &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonHPBarCheck(&gPlayerParty[slot], &sPartyMenuBoxes[slot]);
     }
 }
 
-static void DisplayPartyPokemonSelectData(u8 slot, u8 stringID)
+static void DisplayPartyPokemonDescriptionData(u8 slot, u8 stringID)
 {
     struct Pokemon *mon = &gPlayerParty[slot];
 
-    gUnknown_0203CEDC[slot].unk0->unk0(gUnknown_0203CEDC[slot].windowId, 0, 0, 0, 0, 1);
-    DisplayPartyPokemonNickname(mon, &gUnknown_0203CEDC[slot], 0);
+    sPartyMenuBoxes[slot].infoRects->blitFunc(sPartyMenuBoxes[slot].windowId, 0, 0, 0, 0, TRUE);
+    DisplayPartyPokemonNickname(mon, &sPartyMenuBoxes[slot], 0);
     if (!GetMonData(mon, MON_DATA_IS_EGG))
     {
-        DisplayPartyPokemonLevelCheck(mon, &gUnknown_0203CEDC[slot], 0);
-        DisplayPartyPokemonGenderNidoranCheck(mon, &gUnknown_0203CEDC[slot], 0);
+        DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[slot], 0);
+        DisplayPartyPokemonGenderNidoranCheck(mon, &sPartyMenuBoxes[slot], 0);
     }
-    DisplayPartyPokemonSelectionText(stringID, &gUnknown_0203CEDC[slot], 0);
+    DisplayPartyPokemonDescriptionText(stringID, &sPartyMenuBoxes[slot], 0);
 }
 
-static void DisplayPartyPokemonSelectForBattle(u8 slot)
+static void DisplayPartyPokemonDataForChooseHalf(u8 slot)
 {
     u8 i;
     struct Pokemon *mon = &gPlayerParty[slot];
-    u8 *ptr = gSelectedOrderFromParty;
+    u8 *order = gSelectedOrderFromParty;
 
     if (!GetBattleEntryEligibility(mon))
     {
-        DisplayPartyPokemonSelectData(slot, 7);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NOT_ABLE);
         return;
     }
     else
     {
-        for (i = 0; i < sub_81B8830(); i++)
+        for (i = 0; i < GetMaxBattleEntries(); i++)
         {
-            if (ptr[i] != 0 && (ptr[i] - 1) == slot)
+            if (order[i] != 0 && (order[i] - 1) == slot)
             {
-                DisplayPartyPokemonSelectData(slot, i + 2);
+                DisplayPartyPokemonDescriptionData(slot, i + PARTYBOX_DESC_FIRST);
                 return;
             }
         }
-        DisplayPartyPokemonSelectData(slot, 1);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_ABLE_3);
     }
 }
 
-static void DisplayPartyPokemonSelectForContest(u8 slot)
+static void DisplayPartyPokemonDataForContest(u8 slot)
 {
-    switch (sub_80DAE0C(&gPlayerParty[slot]))
+    switch (GetContestEntryEligibility(&gPlayerParty[slot]))
     {
-    case 0:
-    case 3:
-    case 4:
-        DisplayPartyPokemonSelectData(slot, 7);
+    case CANT_ENTER_CONTEST:
+    case CANT_ENTER_CONTEST_EGG:
+    case CANT_ENTER_CONTEST_FAINTED:
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NOT_ABLE);
         break;
-    case 1:
-    case 2:
-        DisplayPartyPokemonSelectData(slot, 6);
+    case CAN_ENTER_CONTEST_EQUAL_RANK:
+    case CAN_ENTER_CONTEST_HIGH_RANK:
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_ABLE);
         break;
     }
 }
 
-static void DisplayPartyPokemonSelectForRelearner(u8 slot)
+static void DisplayPartyPokemonDataForRelearner(u8 slot)
 {
     if (GetNumberOfRelearnableMoves(&gPlayerParty[slot]) == 0)
-        DisplayPartyPokemonSelectData(slot, 9);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NOT_ABLE_2);
     else
-        DisplayPartyPokemonSelectData(slot, 8);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_ABLE_2);
 }
 
-static void sub_81B0B98(u8 slot)
+static void DisplayPartyPokemonDataForWirelessMinigame(u8 slot)
 {
-    if (sub_81B218C(slot) == TRUE)
-        DisplayPartyPokemonSelectData(slot, 6);
+    if (IsMonAllowedInMinigame(slot) == TRUE)
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_ABLE);
     else
-        DisplayPartyPokemonSelectData(slot, 7);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NOT_ABLE);
 }
 
-static void DisplayPartyPokemonSelectHeldItemRelated(u8 slot)
+static void DisplayPartyPokemonDataForBattlePyramidHeldItem(u8 slot)
 {
     if (GetMonData(&gPlayerParty[slot], MON_DATA_HELD_ITEM))
-        DisplayPartyPokemonSelectData(slot, 11);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_HAVE);
     else
-        DisplayPartyPokemonSelectData(slot, 12);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_DONT_HAVE);
 }
 
-static bool8 sub_81B0BFC(u8 slot)
+// Returns TRUE if teaching move or cant evolve with item (i.e. description data is shown), FALSE otherwise
+static bool8 DisplayPartyPokemonDataForMoveTutorOrEvolutionItem(u8 slot)
 {
     struct Pokemon *currentPokemon = &gPlayerParty[slot];
     u16 item = gSpecialVar_ItemId;
 
-    if (gUnknown_0203CEC8.unkB == 12)
+    if (gPartyMenu.action == PARTY_ACTION_MOVE_TUTOR)
     {
         gSpecialVar_Result = FALSE;
-        DisplayPartyPokemonSelectToTeachMove(slot, 0, gSpecialVar_0x8005);
+        DisplayPartyPokemonDataToTeachMove(slot, 0, gSpecialVar_0x8005);
     }
     else
     {
-        if (gUnknown_0203CEC8.unkB != 3)
+        if (gPartyMenu.action != PARTY_ACTION_USE_ITEM)
             return FALSE;
 
         switch (CheckIfItemIsTMHMOrEvolutionStone(item))
         {
         default:
             return FALSE;
-        case 1:
-            DisplayPartyPokemonSelectToTeachMove(slot, item, 0);
+        case 1: // TM/HM
+            DisplayPartyPokemonDataToTeachMove(slot, item, 0);
             break;
-        case 2:
+        case 2: // Evolution stone
             if (!GetMonData(currentPokemon, MON_DATA_IS_EGG) && GetEvolutionTargetSpecies(currentPokemon, 3, item) != SPECIES_NONE)
                 return FALSE;
-            DisplayPartyPokemonSelectData(slot, 0);
+            DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NO_USE);
             break;
         }
     }
     return TRUE;
 }
 
-static void DisplayPartyPokemonSelectToTeachMove(u8 slot, u16 item, u8 tutor)
+static void DisplayPartyPokemonDataToTeachMove(u8 slot, u16 item, u8 tutor)
 {
     switch (CanMonLearnTMTutor(&gPlayerParty[slot], item, tutor))
     {
     case CANNOT_LEARN_MOVE:
     case CANNOT_LEARN_MOVE_IS_EGG:
-        DisplayPartyPokemonSelectData(slot, 9);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NOT_ABLE_2);
         break;
     case ALREADY_KNOWS_MOVE:
-        DisplayPartyPokemonSelectData(slot, 10);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_LEARNED);
         break;
     default:
-        DisplayPartyPokemonSelectData(slot, 8);
+        DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_ABLE_2);
         break;
     }
 }
 
-static void sub_81B0CEC(u8 slot)
+static void DisplayPartyPokemonDataForMultiBattle(u8 slot)
 {
-    struct Struct203CEDC *structPtr = &gUnknown_0203CEDC[slot];
-    u8 actualSlot = slot - 3;
+    struct PartyMenuBox *menuBox = &sPartyMenuBoxes[slot];
+    u8 actualSlot = slot - (3);
 
-    if (gUnknown_02022FF8[actualSlot].species == SPECIES_NONE)
+    if (gMultiPartnerParty[actualSlot].species == SPECIES_NONE)
     {
-        DrawEmptySlot(structPtr->windowId);
+        DrawEmptySlot(menuBox->windowId);
     }
     else
     {
-        structPtr->unk0->unk0(structPtr->windowId, 0, 0, 0, 0, 0);
-        StringCopy(gStringVar1, gUnknown_02022FF8[actualSlot].nickname);
+        menuBox->infoRects->blitFunc(menuBox->windowId, 0, 0, 0, 0, FALSE);
+        StringCopy(gStringVar1, gMultiPartnerParty[actualSlot].nickname);
         StringGetEnd10(gStringVar1);
         sub_81DB52C(gStringVar1);
-        DisplayPartyPokemonBarDetail(structPtr->windowId, gStringVar1, 0, structPtr->unk0->unk4);
-        DisplayPartyPokemonLevel(gUnknown_02022FF8[actualSlot].level, structPtr);
-        DisplayPartyPokemonGender(gUnknown_02022FF8[actualSlot].gender, gUnknown_02022FF8[actualSlot].species, gUnknown_02022FF8[actualSlot].nickname, structPtr);
-        DisplayPartyPokemonHP(gUnknown_02022FF8[actualSlot].hp, structPtr);
-        DisplayPartyPokemonMaxHP(gUnknown_02022FF8[actualSlot].maxhp, structPtr);
-        DisplayPartyPokemonHPBar(gUnknown_02022FF8[actualSlot].hp, gUnknown_02022FF8[actualSlot].maxhp, structPtr);
+        DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, menuBox->infoRects->dimensions);
+        DisplayPartyPokemonLevel(gMultiPartnerParty[actualSlot].level, menuBox);
+        DisplayPartyPokemonGender(gMultiPartnerParty[actualSlot].gender, gMultiPartnerParty[actualSlot].species, gMultiPartnerParty[actualSlot].nickname, menuBox);
+        DisplayPartyPokemonHP(gMultiPartnerParty[actualSlot].hp, menuBox);
+        DisplayPartyPokemonMaxHP(gMultiPartnerParty[actualSlot].maxhp, menuBox);
+        DisplayPartyPokemonHPBar(gMultiPartnerParty[actualSlot].hp, gMultiPartnerParty[actualSlot].maxhp, menuBox);
     }
 }
 
 static bool8 RenderPartyMenuBoxes(void)
 {
-    RenderPartyMenuBox(gUnknown_0203CEC4->data[0]);
-    if (++gUnknown_0203CEC4->data[0] == 6)
+    RenderPartyMenuBox(sPartyMenuInternal->data[0]);
+    if (++sPartyMenuInternal->data[0] == PARTY_SIZE)
         return TRUE;
     else
         return FALSE;
 }
 
-static u8* GetPartyMiscGraphicsTile(u16 tileId)
+static u8* GetPartyMenuBgTile(u16 tileId)
 {
-    return &gUnknown_0203CEE0[tileId << 5];
+    return &sPartyBgGfxTilemap[tileId << 5];
 }
 
-static void party_menu_add_per_mon_objects_internal(u8 slot)
+static void CreatePartyMonSprites(u8 slot)
 {
     u8 actualSlot;
 
-    if (gUnknown_0203CEC8.unk8_0 == 5 && slot > 2)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE && slot >= MULTI_PARTY_SIZE)
     {
         u8 status;
-        actualSlot = slot - 3;
+        actualSlot = slot - MULTI_PARTY_SIZE;
 
-        if (gUnknown_02022FF8[actualSlot].species != SPECIES_NONE)
+        if (gMultiPartnerParty[actualSlot].species != SPECIES_NONE)
         {
-            party_menu_link_mon_icon_anim(gUnknown_02022FF8[actualSlot].species, gUnknown_02022FF8[actualSlot].personality, &gUnknown_0203CEDC[slot], 0, 0);
-            party_menu_link_mon_held_item_object(gUnknown_02022FF8[actualSlot].species, gUnknown_02022FF8[actualSlot].heldItem, &gUnknown_0203CEDC[slot]);
-            party_menu_link_mon_pokeball_object(gUnknown_02022FF8[actualSlot].species, &gUnknown_0203CEDC[slot]);
-            if (gUnknown_02022FF8[actualSlot].hp == 0)
+            CreatePartyMonIconSpriteParameterized(gMultiPartnerParty[actualSlot].species, gMultiPartnerParty[actualSlot].personality, &sPartyMenuBoxes[slot], 0, FALSE);
+            CreatePartyMonHeldItemSpriteParameterized(gMultiPartnerParty[actualSlot].species, gMultiPartnerParty[actualSlot].heldItem, &sPartyMenuBoxes[slot]);
+            CreatePartyMonPokeballSpriteParameterized(gMultiPartnerParty[actualSlot].species, &sPartyMenuBoxes[slot]);
+            if (gMultiPartnerParty[actualSlot].hp == 0)
                 status = AILMENT_FNT;
             else
-                status = pokemon_ailments_get_primary(gUnknown_02022FF8[actualSlot].status);
-            party_menu_link_mon_status_condition_object(gUnknown_02022FF8[actualSlot].species, status, &gUnknown_0203CEDC[slot]);
+                status = GetAilmentFromStatus(gMultiPartnerParty[actualSlot].status);
+            CreatePartyMonStatusSpriteParameterized(gMultiPartnerParty[actualSlot].species, status, &sPartyMenuBoxes[slot]);
         }
     }
     else if (GetMonData(&gPlayerParty[slot], MON_DATA_SPECIES) != SPECIES_NONE)
     {
-        party_menu_icon_anim(&gPlayerParty[slot], &gUnknown_0203CEDC[slot], slot);
-        party_menu_held_item_object(&gPlayerParty[slot], &gUnknown_0203CEDC[slot]);
-        party_menu_pokeball_object(&gPlayerParty[slot], &gUnknown_0203CEDC[slot]);
-        party_menu_status_condition_object(&gPlayerParty[slot], &gUnknown_0203CEDC[slot]);
+        CreatePartyMonIconSprite(&gPlayerParty[slot], &sPartyMenuBoxes[slot], slot);
+        CreatePartyMonHeldItemSprite(&gPlayerParty[slot], &sPartyMenuBoxes[slot]);
+        CreatePartyMonPokeballSprite(&gPlayerParty[slot], &sPartyMenuBoxes[slot]);
+        CreatePartyMonStatusSprite(&gPlayerParty[slot], &sPartyMenuBoxes[slot]);
     }
 }
 
-static bool8 party_menu_add_per_mon_objects(void)
+static bool8 CreatePartyMonSpritesLoop(void)
 {
-    party_menu_add_per_mon_objects_internal(gUnknown_0203CEC4->data[0]);
-    if (++gUnknown_0203CEC4->data[0] == 6)
+    CreatePartyMonSprites(sPartyMenuInternal->data[0]);
+    if (++sPartyMenuInternal->data[0] == PARTY_SIZE)
         return TRUE;
     else
         return FALSE;
 }
 
-static void sub_81B0F28(void)
+static void CreateCancelConfirmPokeballSprites(void)
 {
-    if (gUnknown_0203CEC8.unk8_0 == 5)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE)
     {
+        // The showcase has no Cancel/Confirm buttons
         FillBgTilemapBufferRect(1, 14, 23, 17, 7, 2, 1);
     }
     else
     {
-        if (gUnknown_0203CEC4->unk8_0)
+        if (sPartyMenuInternal->chooseHalf)
         {
-            gUnknown_0203CEC4->unk8_2 = sub_81B5F74(0xBF, 0x88);
-            sub_81B120C();
-            gUnknown_0203CEC4->unk9_0 = sub_81B5F74(0xBF, 0x98);
+            sPartyMenuInternal->spriteIdConfirmPokeball = CreateSmallPokeballButtonSprite(0xBF, 0x88);
+            DrawCancelConfirmButtons();
+            sPartyMenuInternal->spriteIdCancelPokeball = CreateSmallPokeballButtonSprite(0xBF, 0x98);
         }
         else
         {
-            gUnknown_0203CEC4->unk9_0 = sub_81B5F34(0xC6, 0x94);
+            sPartyMenuInternal->spriteIdCancelPokeball = CreatePokeballButtonSprite(198, 148);
         }
-        sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
+        AnimatePartySlot(gPartyMenu.slotId, 1);
     }
 }
 
-void sub_81B0FCC(u8 slot, u8 b)
+void AnimatePartySlot(u8 slot, u8 animNum)
 {
     u8 spriteId;
 
@@ -2213,79 +1053,80 @@ void sub_81B0FCC(u8 slot, u8 b)
     default:
         if (GetMonData(&gPlayerParty[slot], MON_DATA_SPECIES) != SPECIES_NONE)
         {
-            UpdateSelectedPartyBox(&gUnknown_0203CEDC[slot], GetPartyBoxPalBitfield(slot, b));
-            AnimateSelectedPartyIcon(gUnknown_0203CEDC[slot].monSpriteId, b);
-            sub_81B5F98(gUnknown_0203CEDC[slot].pokeballSpriteId, b);
+            LoadPartyBoxPalette(&sPartyMenuBoxes[slot], GetPartyBoxPaletteFlags(slot, animNum));
+            AnimateSelectedPartyIcon(sPartyMenuBoxes[slot].monSpriteId, animNum);
+            PartyMenuStartSpriteAnim(sPartyMenuBoxes[slot].pokeballSpriteId, animNum);
         }
         return;
-    case 6:
-        if (b == 0)
-            sub_8199C30(1, 23, 16, 7, 2, 1);
+    case PARTY_SIZE: // Confirm
+        if (animNum == 0)
+            SetBgTilemapPalette(1, 23, 16, 7, 2, 1);
         else
-            sub_8199C30(1, 23, 16, 7, 2, 2);
-        spriteId = gUnknown_0203CEC4->unk8_2;
+            SetBgTilemapPalette(1, 23, 16, 7, 2, 2);
+        spriteId = sPartyMenuInternal->spriteIdConfirmPokeball;
         break;
-    case 7:
-        if (!gUnknown_0203CEC4->unk8_0)
+    case PARTY_SIZE + 1: // Cancel
+        // The position of the Cancel button changes if Confirm is present
+        if (!sPartyMenuInternal->chooseHalf)
         {
-            if (b == 0)
-                sub_8199C30(1, 23, 17, 7, 2, 1);
+            if (animNum == 0)
+                SetBgTilemapPalette(1, 23, 17, 7, 2, 1);
             else
-                sub_8199C30(1, 23, 17, 7, 2, 2);
+                SetBgTilemapPalette(1, 23, 17, 7, 2, 2);
         }
-        else if (b == 0)
+        else if (animNum == 0)
         {
-            sub_8199C30(1, 23, 18, 7, 2, 1);
+            SetBgTilemapPalette(1, 23, 18, 7, 2, 1);
         }
         else
         {
-            sub_8199C30(1, 23, 18, 7, 2, 2);
+            SetBgTilemapPalette(1, 23, 18, 7, 2, 2);
         }
-        spriteId = gUnknown_0203CEC4->unk9_0;
+        spriteId = sPartyMenuInternal->spriteIdCancelPokeball;
         break;
     }
-    sub_81B5F98(spriteId, b);
+    PartyMenuStartSpriteAnim(spriteId, animNum);
     schedule_bg_copy_tilemap_to_vram(1);
 }
 
-static u8 GetPartyBoxPalBitfield(u8 slot, u8 b)
+static u8 GetPartyBoxPaletteFlags(u8 slot, u8 animNum)
 {
-    u8 returnVar = 0;
+    u8 palFlags = 0;
 
-    if (b == 1)
-        returnVar |= 1;
+    if (animNum == 1)
+        palFlags |= PARTY_PAL_SELECTED;
     if (GetMonData(&gPlayerParty[slot], MON_DATA_HP) == 0)
-        returnVar |= 2;
+        palFlags |= PARTY_PAL_FAINTED;
     if (PartyBoxPal_ParnterOrDisqualifiedInArena(slot) == TRUE)
-        returnVar |= 8;
-    if (gUnknown_0203CEC8.unkB == 9)
-        returnVar |= 16;
-    if (gUnknown_0203CEC8.unkB == 8)
+        palFlags |= PARTY_PAL_MULTI_ALT;
+    if (gPartyMenu.action == PARTY_ACTION_SWITCHING)
+        palFlags |= PARTY_PAL_SWITCHING;
+    if (gPartyMenu.action == PARTY_ACTION_SWITCH)
     {
-        if (slot == gUnknown_0203CEC8.slotId || slot == gUnknown_0203CEC8.unkA)
-            returnVar |= 4;
+        if (slot == gPartyMenu.slotId || slot == gPartyMenu.slotId2)
+            palFlags |= PARTY_PAL_TO_SWITCH;
     }
-    if (gUnknown_0203CEC8.unkB == 10 && slot == gUnknown_0203CEC8.slotId )
-        returnVar |= 32;
+    if (gPartyMenu.action == PARTY_ACTION_SOFTBOILED && slot == gPartyMenu.slotId )
+        palFlags |= PARTY_PAL_TO_SOFTBOIL;
 
-    return returnVar;
+    return palFlags;
 }
 
 static bool8 PartyBoxPal_ParnterOrDisqualifiedInArena(u8 slot)
 {
-    if (gUnknown_0203CEC8.mode == 2 && (slot == 1 || slot == 4 || slot == 5))
+    if (gPartyMenu.layout == PARTY_LAYOUT_MULTI && (slot == 1 || slot == 4 || slot == 5))
         return TRUE;
 
-    if (slot < 3 && (gBattleTypeFlags & BATTLE_TYPE_ARENA) && gMain.inBattle && (gBattleStruct->arenaLostPlayerMons >> sub_81B8F38(slot) & 1))
+    if (slot < MULTI_PARTY_SIZE && (gBattleTypeFlags & BATTLE_TYPE_ARENA) && gMain.inBattle && (gBattleStruct->arenaLostPlayerMons >> GetPartyIdFromBattleSlot(slot) & 1))
         return TRUE;
 
     return FALSE;
 }
 
-static void sub_81B120C(void)
+static void DrawCancelConfirmButtons(void)
 {
-    CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_086157C4, 23, 16, 7, 2, 17);
-    CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_086157E0, 23, 18, 7, 2, 17);
+    CopyToBgTilemapBufferRect_ChangePalette(1, sConfirmButton_Tilemap, 23, 16, 7, 2, 17);
+    CopyToBgTilemapBufferRect_ChangePalette(1, sCancelButton_Tilemap, 23, 18, 7, 2, 17);
     schedule_bg_copy_tilemap_to_vram(1);
 }
 
@@ -2297,13 +1138,13 @@ bool8 IsMultiBattle(void)
         return FALSE;
 }
 
-static void sub_81B1288(struct Pokemon *partySlot, struct Pokemon *pokemon)
+static void SwapPartyPokemon(struct Pokemon *mon1, struct Pokemon *mon2)
 {
     struct Pokemon *temp = Alloc(sizeof(struct Pokemon));
 
-    *temp = *partySlot;
-    *partySlot = *pokemon;
-    *pokemon = *temp;
+    *temp = *mon1;
+    *mon1 = *mon2;
+    *mon2 = *temp;
 
     Free(temp);
 }
@@ -2318,13 +1159,13 @@ static void Task_ClosePartyMenuAndSetCB2(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_0203CEC8.unk8_0 == 1)
-            sub_81B9080();
+        if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
+            UpdatePartyToFieldOrder();
 
-        if  (gUnknown_0203CEC4->exitCallback != NULL)
-            SetMainCallback2(gUnknown_0203CEC4->exitCallback);
+        if (sPartyMenuInternal->exitCallback != NULL)
+            SetMainCallback2(sPartyMenuInternal->exitCallback);
         else
-            SetMainCallback2(gUnknown_0203CEC8.exitCallback);
+            SetMainCallback2(gPartyMenu.exitCallback);
 
         ResetSpriteData();
         FreePartyPointers();
@@ -2334,124 +1175,124 @@ static void Task_ClosePartyMenuAndSetCB2(u8 taskId)
 
 u8 GetCursorSelectionMonId(void)
 {
-    return gUnknown_0203CEC8.slotId;
+    return gPartyMenu.slotId;
 }
 
-u8 sub_81B1360(void)
+u8 GetPartyMenuType(void)
 {
-    return gUnknown_0203CEC8.unk8_0;
+    return gPartyMenu.menuType;
 }
 
-void sub_81B1370(u8 taskId)
+void Task_HandleChooseMonInput(u8 taskId)
 {
     if (!gPaletteFade.active && sub_81221EC() != TRUE)
     {
-        s8 *ptr = sub_81B13EC();
+        s8 *slotPtr = GetCurrentPartySlotPtr();
 
-        switch (PartyMenuButtonHandler(ptr))
+        switch (PartyMenuButtonHandler(slotPtr))
         {
-        case 1:
-            sub_81B140C(taskId, ptr);
+        case 1: // Selected mon
+            HandleChooseMonSelection(taskId, slotPtr);
             break;
-        case 2:
-            sub_81B15D0(taskId, ptr);
+        case 2: // Selected Cancel
+            HandleChooseMonCancel(taskId, slotPtr);
             break;
-        case 8:
-            if (gUnknown_0203CEC4->unk8_0)
+        case 8: // Start button
+            if (sPartyMenuInternal->chooseHalf)
             {
                 PlaySE(SE_SELECT);
-                sub_81B4F88();
+                MoveCursorToConfirm();
             }
             break;
         }
     }
 }
 
-static s8* sub_81B13EC(void)
+static s8* GetCurrentPartySlotPtr(void)
 {
-    if (gUnknown_0203CEC8.unkB == 8 || gUnknown_0203CEC8.unkB == 10)
-        return &gUnknown_0203CEC8.unkA;
+    if (gPartyMenu.action == PARTY_ACTION_SWITCH || gPartyMenu.action == PARTY_ACTION_SOFTBOILED)
+        return &gPartyMenu.slotId2;
     else
-        return &gUnknown_0203CEC8.slotId;
+        return &gPartyMenu.slotId;
 }
 
-static void sub_81B140C(u8 taskId, s8 *ptr)
+static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
 {
-    if (*ptr == 6)
+    if (*slotPtr == PARTY_SIZE)
     {
-        gUnknown_0203CEC8.unk4(taskId);
+        gPartyMenu.task(taskId);
     }
     else
     {
-        switch (gUnknown_0203CEC8.unkB - 3)
+        switch (gPartyMenu.action - 3)
         {
-        case 7:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_SOFTBOILED - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
-                PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-                sub_81615A8(taskId);
+                PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+                Task_TryUseSoftboiledOnPartyMon(taskId);
             }
             break;
-        case 0:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_USE_ITEM - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
-                if (gUnknown_0203CEC8.unk8_0 == 1)
-                    gUnknown_0203CEC4->exitCallback = sub_81B9140;
+                if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
+                    sPartyMenuInternal->exitCallback = CB2_SetUpExitToBattleScreen;
 
-                PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-                gUnknown_03006328(taskId, sub_81B6794);
+                PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+                gItemUseCB(taskId, Task_ClosePartyMenuAfterText);
             }
             break;
-        case 9:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_MOVE_TUTOR - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
                 PlaySE(SE_SELECT);
-                PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-                sub_81B7E4C(taskId);
+                PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+                TryTutorSelectedMon(taskId);
             }
             break;
-        case 4:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_GIVE_MAILBOX_MAIL - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
                 PlaySE(SE_SELECT);
-                PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-                sub_81B8474(taskId);
+                PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+                TryGiveMailToSelectedMon(taskId);
             }
             break;
-        case 2:
-        case 3:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_GIVE_ITEM - 3:
+        case PARTY_ACTION_GIVE_PC_ITEM - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
                 PlaySE(SE_SELECT);
-                PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-                sub_81B7FAC(taskId);
+                PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+                TryGiveItemOrMailToSelectedMon(taskId);
             }
             break;
-        case 5:
+        case PARTY_ACTION_SWITCH - 3:
             PlaySE(SE_SELECT);
-            sub_81B3938(taskId);
+            SwitchSelectedMons(taskId);
             break;
-        case 8:
+        case PARTY_ACTION_CHOOSE_AND_CLOSE - 3:
             PlaySE(SE_SELECT);
             Task_ClosePartyMenu(taskId);
             break;
-        case 10:
-            if (sub_81B15A4((u8*)ptr))
+        case PARTY_ACTION_MINIGAME - 3:
+            if (IsSelectedMonNotEgg((u8*)slotPtr))
             {
-                sub_81B21AC(taskId, (u8)*ptr);
+                TryEnterMonForMinigame(taskId, (u8)*slotPtr);
             }
             break;
         default:
-        case 1:
-        case 6:
+        case PARTY_ACTION_ABILITY_PREVENTS - 3:
+        case PARTY_ACTION_SWITCHING - 3:
             PlaySE(SE_SELECT);
-            sub_81B36FC(taskId);
+            Task_TryCreateSelectionWindow(taskId);
             break;
         }
     }
 }
 
-static bool8 sub_81B15A4(u8 *slotPtr)
+static bool8 IsSelectedMonNotEgg(u8 *slotPtr)
 {
     if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE)
     {
@@ -2461,108 +1302,109 @@ static bool8 sub_81B15A4(u8 *slotPtr)
     return TRUE;
 }
 
-static void sub_81B15D0(u8 taskId, s8 *ptr)
+static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
 {
-    switch (gUnknown_0203CEC8.unkB)
+    switch (gPartyMenu.action)
     {
-    case 1:
+    case PARTY_ACTION_SEND_OUT:
         PlaySE(SE_HAZURE);
         break;
-    case 8:
-    case 10:
+    case PARTY_ACTION_SWITCH:
+    case PARTY_ACTION_SOFTBOILED:
         PlaySE(SE_SELECT);
-        sub_81B407C(taskId);
+        FinishTwoMonAction(taskId);
         break;
-    case 13:
+    case PARTY_ACTION_MINIGAME:
         PlaySE(SE_SELECT);
-        sub_81B2210(taskId);
+        CancelParticipationPrompt(taskId);
         break;
     default:
         PlaySE(SE_SELECT);
-        if (sub_81B1660(taskId) != TRUE)
+        if (DisplayCancelChooseMonYesNo(taskId) != TRUE)
         {
             if (!sub_81221AC())
-                gSpecialVar_0x8004 = 7;
-            gUnknown_0203CEE8 = 0;
-            *ptr = 7;
+                gSpecialVar_0x8004 = PARTY_SIZE + 1;
+            gPartyMenuUseExitCallback = FALSE;
+            *slotPtr = PARTY_SIZE + 1;
             Task_ClosePartyMenu(taskId);
         }
         break;
     }
 }
 
-static bool8 sub_81B1660(u8 taskId)
+static bool8 DisplayCancelChooseMonYesNo(u8 taskId)
 {
     const u8* stringPtr = NULL;
 
-    if (gUnknown_0203CEC8.unk8_0 == 2)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_CONTEST)
         stringPtr = gText_CancelParticipation;
-    else if (gUnknown_0203CEC8.unk8_0 == 4)
-        stringPtr = sub_81B88BC();
+    else if (gPartyMenu.menuType == PARTY_MENU_TYPE_CHOOSE_HALF)
+        stringPtr = GetFacilityCancelString();
 
     if (stringPtr == NULL)
         return FALSE;
 
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     StringExpandPlaceholders(gStringVar4, stringPtr);
-    DisplayPartyMenuMessage(gStringVar4, 1);
-    gTasks[taskId].func = sub_81B16D4;
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
+    gTasks[taskId].func = Task_CancelChooseMonYesNo;
     return TRUE;
 }
 
-static void sub_81B16D4(u8 taskId)
+static void Task_CancelChooseMonYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B1708;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleCancelChooseMonYesNoInput;
     }
 }
 
-static void sub_81B1708(u8 taskId)
+static void Task_HandleCancelChooseMonYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
-        gUnknown_0203CEE8 = 0;
-        gUnknown_0203CEC8.slotId = 7;
-        sub_81B8558();
+        gPartyMenuUseExitCallback = FALSE;
+        gPartyMenu.slotId = PARTY_SIZE + 1;
+        ClearSelectedPartyOrder();
         Task_ClosePartyMenu(taskId);
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        sub_81B1C1C(taskId);
+        Task_ReturnToChooseMonAfterText(taskId);
         break;
     }
 }
 
-static u16 PartyMenuButtonHandler(s8 *ptr)
+static u16 PartyMenuButtonHandler(s8 *slotPtr)
 {
     s8 movementDir;
 
     switch (gMain.newAndRepeatedKeys)
     {
     case DPAD_UP:
-        movementDir = -1;
+        movementDir = MENU_DIR_UP;
         break;
     case DPAD_DOWN:
-        movementDir = 1;
+        movementDir = MENU_DIR_DOWN;
         break;
     case DPAD_LEFT:
-        movementDir = -2;
+        movementDir = MENU_DIR_LEFT;
         break;
     case DPAD_RIGHT:
-        movementDir = 2;
+        movementDir = MENU_DIR_RIGHT;
         break;
     default:
-        switch (sub_812210C())
+        switch (GetLRKeysPressedAndHeld())
         {
-        case 1:
-            movementDir = -1;
+        case MENU_L_PRESSED:
+            movementDir = MENU_DIR_UP;
             break;
-        case 2:
-            movementDir = 1;
+        case MENU_R_PRESSED:
+            movementDir = MENU_DIR_DOWN;
             break;
         default:
             movementDir = 0;
@@ -2576,203 +1418,207 @@ static u16 PartyMenuButtonHandler(s8 *ptr)
 
     if (movementDir)
     {
-        UpdateCurrentPartySelection(ptr, movementDir);
+        UpdateCurrentPartySelection(slotPtr, movementDir);
         return 0;
     }
 
-    if ((gMain.newKeys & A_BUTTON) && *ptr == 7)
+    // Pressed Cancel
+    if ((gMain.newKeys & A_BUTTON) && *slotPtr == PARTY_SIZE + 1)
         return 2;
 
     return gMain.newKeys & (A_BUTTON | B_BUTTON);
 }
 
-static void UpdateCurrentPartySelection(s8 *ptr, s8 movementDir)
+static void UpdateCurrentPartySelection(s8 *slotPtr, s8 movementDir)
 {
-    s8 slot = *ptr;
-    u8 mode = gUnknown_0203CEC8.mode;
+    s8 newSlotId = *slotPtr;
+    u8 layout = gPartyMenu.layout;
 
-    if (mode == 0)
-        SetNewPartySelectTarget1(ptr, movementDir);
+    if (layout == PARTY_LAYOUT_SINGLE)
+        UpdatePartySelectionSingleLayout(slotPtr, movementDir);
     else
-        SetNewPartySelectTarget2(ptr, movementDir);
+        UpdatePartySelectionDoubleLayout(slotPtr, movementDir);
 
-    if (*ptr != slot)
+    if (*slotPtr != newSlotId)
     {
         PlaySE(SE_SELECT);
-        sub_81B0FCC(slot, 0);
-        sub_81B0FCC(*ptr, 1);
+        AnimatePartySlot(newSlotId, 0);
+        AnimatePartySlot(*slotPtr, 1);
     }
 }
 
-static void SetNewPartySelectTarget1(s8 *ptr, s8 b)
+static void UpdatePartySelectionSingleLayout(s8 *slotPtr, s8 movementDir)
 {
-    switch (b)
+    // PARTY_SIZE + 1 is Cancel, PARTY_SIZE is Confirm
+    switch (movementDir)
     {
-    case -1:
-        if (*ptr == 0)
+    case MENU_DIR_UP:
+        if (*slotPtr == 0)
         {
-            *ptr = 7;
+            *slotPtr = PARTY_SIZE + 1;
         }
-        else if (*ptr == 6)
+        else if (*slotPtr == PARTY_SIZE)
         {
-            *ptr = gPlayerPartyCount - 1;
+            *slotPtr = gPlayerPartyCount - 1;
         }
-        else if (*ptr == 7)
+        else if (*slotPtr == PARTY_SIZE + 1)
         {
-            if (gUnknown_0203CEC4->unk8_0)
-                *ptr = 6;
+            if (sPartyMenuInternal->chooseHalf)
+                *slotPtr = PARTY_SIZE;
             else
-                *ptr = gPlayerPartyCount - 1;
+                *slotPtr = gPlayerPartyCount - 1;
         }
         else
         {
-            (*ptr)--;
+            (*slotPtr)--;
         }
         break;
-    case 1:
-        if (*ptr == 7)
+    case MENU_DIR_DOWN:
+        if (*slotPtr == PARTY_SIZE + 1)
         {
-            *ptr = 0;
+            *slotPtr = 0;
         }
         else
         {
-            if (*ptr == gPlayerPartyCount - 1)
+            if (*slotPtr == gPlayerPartyCount - 1)
             {
-                if (gUnknown_0203CEC4->unk8_0)
-                    *ptr = 6;
+                if (sPartyMenuInternal->chooseHalf)
+                    *slotPtr = PARTY_SIZE;
                 else
-                    *ptr = 7;
+                    *slotPtr = PARTY_SIZE + 1;
             }
             else
             {
-                (*ptr)++;
+                (*slotPtr)++;
             }
         }
         break;
-    case 2:
-        if (gPlayerPartyCount != 1 && *ptr == 0)
+    case MENU_DIR_RIGHT:
+        if (gPlayerPartyCount != 1 && *slotPtr == 0)
         {
-            if (gUnknown_0203CEC4->unk8_1 == 0)
-                *ptr = 1;
+            if (sPartyMenuInternal->lastSelectedSlot == 0)
+                *slotPtr = 1;
             else
-                *ptr = gUnknown_0203CEC4->unk8_1;
+                *slotPtr = sPartyMenuInternal->lastSelectedSlot;
         }
         break;
-    case -2:
-        if (*ptr != 0 && *ptr != 6 && *ptr != 7)
+    case MENU_DIR_LEFT:
+        if (*slotPtr != 0 && *slotPtr != PARTY_SIZE && *slotPtr != PARTY_SIZE + 1)
         {
-            gUnknown_0203CEC4->unk8_1 = *ptr;
-            *ptr = 0;
+            sPartyMenuInternal->lastSelectedSlot = *slotPtr;
+            *slotPtr = 0;
         }
         break;
     }
 }
 
-static void SetNewPartySelectTarget2(s8 *ptr, s8 b)
+static void UpdatePartySelectionDoubleLayout(s8 *slotPtr, s8 movementDir)
 {
-    s8 unk2 = b;
+    // PARTY_SIZE + 1 is Cancel, PARTY_SIZE is Confirm
+    // newSlot is used temporarily as a movement direction during its later assignment
+    s8 newSlot = movementDir;
 
-    switch (b)
+    switch (movementDir)
     {
-    case -1:
-        if (*ptr == 0)
+    case MENU_DIR_UP:
+        if (*slotPtr == 0)
         {
-            *ptr = 7;
+            *slotPtr = PARTY_SIZE + 1;
             break;
         }
-        else if (*ptr == 6)
+        else if (*slotPtr == PARTY_SIZE)
         {
-            *ptr = gPlayerPartyCount - 1;
+            *slotPtr = gPlayerPartyCount - 1;
             break;
         }
-        else if (*ptr == 7)
+        else if (*slotPtr == PARTY_SIZE + 1)
         {
-            if (gUnknown_0203CEC4->unk8_0)
+            if (sPartyMenuInternal->chooseHalf)
             {
-                *ptr = 6;
+                *slotPtr = PARTY_SIZE;
                 break;
             }
-            (*ptr)--;
+            (*slotPtr)--;
         }
-        unk2 = sub_81B1B00(*ptr, unk2);
-        if (unk2 != -1)
-            *ptr = unk2;
+        newSlot = GetNewSlotDoubleLayout(*slotPtr, newSlot);
+        if (newSlot != -1)
+            *slotPtr = newSlot;
         break;
-    case 1:
-        if (*ptr == 6)
+    case MENU_DIR_DOWN:
+        if (*slotPtr == PARTY_SIZE)
         {
-            *ptr = 7;
+            *slotPtr = PARTY_SIZE + 1;
         }
-        else if (*ptr == 7)
+        else if (*slotPtr == PARTY_SIZE + 1)
         {
-            *ptr = 0;
+            *slotPtr = 0;
         }
         else
         {
-            unk2 = sub_81B1B00(*ptr, 1);
-            if (unk2 == -1)
+            newSlot = GetNewSlotDoubleLayout(*slotPtr, MENU_DIR_DOWN);
+            if (newSlot == -1)
             {
-                if (gUnknown_0203CEC4->unk8_0)
-                    *ptr = 6;
+                if (sPartyMenuInternal->chooseHalf)
+                    *slotPtr = PARTY_SIZE;
                 else
-                    *ptr = 7;
+                    *slotPtr = PARTY_SIZE + 1;
             }
             else
             {
-                *ptr = unk2;
+                *slotPtr = newSlot;
             }
         }
         break;
-    case 2:
-        if (*ptr == 0)
+    case MENU_DIR_RIGHT:
+        if (*slotPtr == 0)
         {
-            if (gUnknown_0203CEC4->unk8_1 == 3)
+            if (sPartyMenuInternal->lastSelectedSlot == 3)
             {
                 if (GetMonData(&gPlayerParty[3], MON_DATA_SPECIES) != SPECIES_NONE)
-                    *ptr = 3;
+                    *slotPtr = 3;
             }
             else if (GetMonData(&gPlayerParty[2], MON_DATA_SPECIES) != SPECIES_NONE)
             {
-                *ptr = 2;
+                *slotPtr = 2;
             }
         }
-        else if (*ptr == 1)
+        else if (*slotPtr == 1)
         {
-            if (gUnknown_0203CEC4->unk8_1 == 5)
+            if (sPartyMenuInternal->lastSelectedSlot == 5)
             {
                 if (GetMonData(&gPlayerParty[5], MON_DATA_SPECIES) != SPECIES_NONE)
-                    *ptr = 5;
+                    *slotPtr = 5;
             }
             else if (GetMonData(&gPlayerParty[4], MON_DATA_SPECIES) != SPECIES_NONE)
             {
-                *ptr = 4;
+                *slotPtr = 4;
             }
         }
         break;
-    case -2:
-        if (*ptr == 2 || *ptr == 3)
+    case MENU_DIR_LEFT:
+        if (*slotPtr == 2 || *slotPtr == 3)
         {
-            gUnknown_0203CEC4->unk8_1 = *ptr;
-            *ptr = 0;
+            sPartyMenuInternal->lastSelectedSlot = *slotPtr;
+            *slotPtr = 0;
         }
-        else if (*ptr == 4 || *ptr == 5)
+        else if (*slotPtr == 4 || *slotPtr == 5)
         {
-            gUnknown_0203CEC4->unk8_1 = *ptr;
-            *ptr = 1;
+            sPartyMenuInternal->lastSelectedSlot = *slotPtr;
+            *slotPtr = 1;
         }
         break;
     }
 }
 
-static s8 sub_81B1B00(s8 a, s8 b)
+static s8 GetNewSlotDoubleLayout(s8 slotId, s8 movementDir)
 {
     while (TRUE)
     {
-        a += b;
-        if ((u8)a >= 6)
+        slotId += movementDir;
+        if ((u8)slotId >= PARTY_SIZE)
             return -1;
-        if (GetMonData(&gPlayerParty[a], MON_DATA_SPECIES) != SPECIES_NONE)
-            return a;
+        if (GetMonData(&gPlayerParty[slotId], MON_DATA_SPECIES) != SPECIES_NONE)
+            return slotId;
     }
 }
 
@@ -2782,21 +1628,23 @@ u8* GetMonNickname(struct Pokemon *mon, u8 *dest)
     return StringGetEnd10(dest);
 }
 
-u8 DisplayPartyMenuMessage(const u8* str, u8 b)
+#define tKeepOpen  data[0]
+
+u8 DisplayPartyMenuMessage(const u8* str, bool8 keepOpen)
 {
     u8 taskId;
 
     PartyMenuPrintText(str);
-    taskId = CreateTask(sub_81B1B8C, 1);
-    gTasks[taskId].data[0] = b;
+    taskId = CreateTask(Task_PrintAndWaitForText, 1);
+    gTasks[taskId].tKeepOpen = keepOpen;
     return taskId;
 }
 
-static void sub_81B1B8C(u8 taskId)
+static void Task_PrintAndWaitForText(u8 taskId)
 {
     if (RunTextPrintersRetIsActive(6) != TRUE)
     {
-        if (gTasks[taskId].data[0] == 0)
+        if (gTasks[taskId].tKeepOpen == FALSE)
         {
             ClearStdWindowAndFrameToTransparent(6, 0);
             ClearWindowTilemap(6);
@@ -2805,75 +1653,77 @@ static void sub_81B1B8C(u8 taskId)
     }
 }
 
-bool8 sub_81B1BD4(void)
+#undef tKeepOpen
+
+bool8 IsPartyMenuTextPrinterActive(void)
 {
-    return FuncIsActiveTask(sub_81B1B8C);
+    return FuncIsActiveTask(Task_PrintAndWaitForText);
 }
 
-static void sub_81B1BE8(u8 taskId)
+static void Task_WaitForLinkAndReturnToChooseMon(u8 taskId)
 {
     if (sub_81221EC() != TRUE)
     {
-        DisplayPartyMenuStdMessage(0);
-        gTasks[taskId].func = sub_81B1370;
+        DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
-static void sub_81B1C1C(u8 taskId)
+static void Task_ReturnToChooseMonAfterText(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
         ClearStdWindowAndFrameToTransparent(6, 0);
         ClearWindowTilemap(6);
         if (sub_81221AC() == TRUE)
         {
-            gTasks[taskId].func = sub_81B1BE8;
+            gTasks[taskId].func = Task_WaitForLinkAndReturnToChooseMon;
         }
         else
         {
-            DisplayPartyMenuStdMessage(0);
-            gTasks[taskId].func = sub_81B1370;
+            DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+            gTasks[taskId].func = Task_HandleChooseMonInput;
         }
     }
 }
 
-static void sub_81B1C84(struct Pokemon *mon, u16 item, u8 c, u8 unused)
+static void DisplayGaveHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keepOpen, u8 unused)
 {
     GetMonNickname(mon, gStringVar1);
     CopyItemName(item, gStringVar2);
     StringExpandPlaceholders(gStringVar4, gText_PkmnWasGivenItem);
-    DisplayPartyMenuMessage(gStringVar4, c);
+    DisplayPartyMenuMessage(gStringVar4, keepOpen);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B1CD0(struct Pokemon *mon, u16 item, u8 c)
+static void DisplayTookHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keepOpen)
 {
     GetMonNickname(mon, gStringVar1);
     CopyItemName(item, gStringVar2);
     StringExpandPlaceholders(gStringVar4, gText_ReceivedItemFromPkmn);
-    DisplayPartyMenuMessage(gStringVar4, c);
+    DisplayPartyMenuMessage(gStringVar4, keepOpen);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B1D1C(struct Pokemon *mon, u16 item, u8 c)
+static void DisplayAlreadyHoldingItemSwitchMessage(struct Pokemon *mon, u16 item, bool8 keepOpen)
 {
     GetMonNickname(mon, gStringVar1);
     CopyItemName(item, gStringVar2);
-    StringExpandPlaceholders(gStringVar4, gText_SwitchPkmnItem);
-    DisplayPartyMenuMessage(gStringVar4, c);
+    StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyHoldingItemSwitch);
+    DisplayPartyMenuMessage(gStringVar4, keepOpen);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B1D68(u16 item, u16 item2, u8 c)
+static void DisplaySwitchedHeldItemMessage(u16 item, u16 item2, bool8 keepOpen)
 {
     CopyItemName(item, gStringVar1);
     CopyItemName(item2, gStringVar2);
     StringExpandPlaceholders(gStringVar4, gText_SwitchedPkmnItem);
-    DisplayPartyMenuMessage(gStringVar4, c);
+    DisplayPartyMenuMessage(gStringVar4, keepOpen);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B1DB8(struct Pokemon *mon, u16 item)
+static void GiveItemToMon(struct Pokemon *mon, u16 item)
 {
     u8 itemBytes[2];
 
@@ -2901,71 +1751,89 @@ static u8 TryTakeMonItem(struct Pokemon* mon)
     return 2;
 }
 
-static void pokemon_item_not_removed(u16 itemUnused)
+static void BufferBagFullCantTakeItemMessage(u16 itemUnused)
 {
     StringExpandPlaceholders(gStringVar4, gText_BagFullCouldNotRemoveItem);
 }
 
-static void sub_81B1E60(u8 taskId)
+#define tHP           data[0]
+#define tMaxHP        data[1]
+#define tHPIncrement  data[2]
+#define tHPToAdd      data[3]
+#define tPartyId      data[4]
+#define tStartHP      data[5]
+
+static void Task_PartyMenuModifyHP(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    data[0] += data[2];
-    data[3]--;
-    SetMonData(&gPlayerParty[data[4]], MON_DATA_HP, &data[0]);
-    DisplayPartyPokemonHPCheck(&gPlayerParty[data[4]], &gUnknown_0203CEDC[data[4]], 1);
-    DisplayPartyPokemonHPBarCheck(&gPlayerParty[data[4]], &gUnknown_0203CEDC[data[4]]);
-    if (data[3] == 0 || data[0] == 0 || data[0] == data[1])
+    tHP += tHPIncrement;
+    tHPToAdd--;
+    SetMonData(&gPlayerParty[tPartyId], MON_DATA_HP, &tHP);
+    DisplayPartyPokemonHPCheck(&gPlayerParty[tPartyId], &sPartyMenuBoxes[tPartyId], 1);
+    DisplayPartyPokemonHPBarCheck(&gPlayerParty[tPartyId], &sPartyMenuBoxes[tPartyId]);
+    if (tHPToAdd == 0 || tHP == 0 || tHP == tMaxHP)
     {
-        if (data[0] > data[5])
-            ConvertIntToDecimalStringN(gStringVar2, data[0] - data[5], STR_CONV_MODE_LEFT_ALIGN, 3);
+        // If HP was recovered, buffer the amount recovered
+        if (tHP > tStartHP)
+            ConvertIntToDecimalStringN(gStringVar2, tHP - tStartHP, STR_CONV_MODE_LEFT_ALIGN, 3);
+
         SwitchTaskToFollowupFunc(taskId);
     }
 }
 
-void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func)
+void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 hpDifference, TaskFunc task)
 {
     struct Pokemon *mon = &gPlayerParty[slot];
     s16 *data = gTasks[taskId].data;
 
-    data[0] = GetMonData(mon, MON_DATA_HP);
-    data[1] = GetMonData(mon, MON_DATA_MAX_HP);
-    data[2] = c;
-    data[3] = HPDifference;
-    data[4] = slot;
-    data[5] = data[0];
-    SetTaskFuncWithFollowupFunc(taskId, sub_81B1E60, func);
+    tHP = GetMonData(mon, MON_DATA_HP);
+    tMaxHP = GetMonData(mon, MON_DATA_MAX_HP);
+    tHPIncrement = hpIncrement;
+    tHPToAdd = hpDifference;
+    tPartyId = slot;
+    tStartHP = tHP;
+    SetTaskFuncWithFollowupFunc(taskId, Task_PartyMenuModifyHP, task);
 }
 
-static void sub_81B1FA8(u8 taskId, u8 b, u32 hp)
+// The usage of hp in this function is mostly nonsense
+// Because caseId is always passed 0, none of the other cases ever occur
+static void ResetHPTaskData(u8 taskId, u8 caseId, u32 hp)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (b) // only case 0 is used
+    switch (caseId) // always zero
     {
         case 0:
-            data[0] = hp;
-            data[5] = hp;
+            tHP = hp;
+            tStartHP = hp;
             break;
         case 1:
-            data[1] = hp;
+            tMaxHP = hp;
             break;
         case 2:
-            data[2] = hp;
+            tHPIncrement = hp;
             break;
         case 3:
-            data[3] = hp;
+            tHPToAdd = hp;
             break;
         case 4:
-            data[4] = hp;
+            tPartyId = hp;
             break;
         case 5:
-            SetTaskFuncWithFollowupFunc(taskId, sub_81B1E60, (TaskFunc)hp); // >casting hp as a taskfunc
+            SetTaskFuncWithFollowupFunc(taskId, Task_PartyMenuModifyHP, (TaskFunc)hp); // >casting hp as a taskfunc
             break;
     }
 }
 
-u8 pokemon_ailments_get_primary(u32 status)
+#undef tHP
+#undef tMaxHP
+#undef tHPIncrement
+#undef tHPToAdd
+#undef tPartyId
+#undef tStartHP
+
+u8 GetAilmentFromStatus(u32 status)
 {
     if (status & STATUS1_PSN_ANY)
         return AILMENT_PSN;
@@ -2986,7 +1854,7 @@ u8 GetMonAilment(struct Pokemon *mon)
 
     if (GetMonData(mon, MON_DATA_HP) == 0)
         return AILMENT_FNT;
-    ailment = pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS));
+    ailment = GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS));
     if (ailment != AILMENT_NONE)
         return ailment;
     if (CheckPartyPokerus(mon, 0))
@@ -2994,16 +1862,16 @@ u8 GetMonAilment(struct Pokemon *mon)
     return AILMENT_NONE;
 }
 
-static void sub_81B209C(void)
+static void SetPartyMonsAllowedInMinigame(void)
 {
     u16 *ptr;
 
-    if (gUnknown_0203CEC8.unk8_0 == 11)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_MINIGAME)
     {
         u8 i;
 
-        ptr = &gUnknown_0203CEC8.unkE;
-        gUnknown_0203CEC8.unkE = 0;
+        ptr = &gPartyMenu.data1;
+        gPartyMenu.data1 = 0;
         if (gSpecialVar_0x8005 == 0)
         {
             for (i = 0; i < gPlayerPartyCount; i++)
@@ -3012,7 +1880,7 @@ static void sub_81B209C(void)
         else
         {
             for (i = 0; i < gPlayerPartyCount; i++)
-                *ptr += sub_81B2164(&gPlayerParty[i]) << i;
+                *ptr += IsMonAllowedInDodrioBerryPicking(&gPlayerParty[i]) << i;
         }
     }
 }
@@ -3024,25 +1892,24 @@ static bool16 IsMonAllowedInPokemonJump(struct Pokemon *mon)
     return FALSE;
 }
 
-// Dodrio Berry Picking select?
 
-static bool16 sub_81B2164(struct Pokemon *mon)
+static bool16 IsMonAllowedInDodrioBerryPicking(struct Pokemon *mon)
 {
     if (GetMonData(mon, MON_DATA_IS_EGG) != TRUE && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_DODRIO)
         return TRUE;
     return FALSE;
 }
 
-static bool8 sub_81B218C(u8 slot)
+static bool8 IsMonAllowedInMinigame(u8 slot)
 {
-    if (!((gUnknown_0203CEC8.unkE >> slot) & 1))
+    if (!((gPartyMenu.data1 >> slot) & 1))
         return FALSE;
     return TRUE;
 }
 
-static void sub_81B21AC(u8 taskId, u8 slot)
+static void TryEnterMonForMinigame(u8 taskId, u8 slot)
 {
-    if (sub_81B218C(slot) == TRUE)
+    if (IsMonAllowedInMinigame(slot) == TRUE)
     {
         PlaySE(SE_SELECT);
         gSpecialVar_0x8004 = slot;
@@ -3051,40 +1918,41 @@ static void sub_81B21AC(u8 taskId, u8 slot)
     else
     {
         PlaySE(SE_HAZURE);
-        DisplayPartyMenuMessage(gText_PkmnCantParticipate, 0);
+        DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE);
         schedule_bg_copy_tilemap_to_vram(2);
-        gTasks[taskId].func = sub_81B1C1C;
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
     }
 }
 
-static void sub_81B2210(u8 taskId)
+static void CancelParticipationPrompt(u8 taskId)
 {
-    DisplayPartyMenuMessage(gText_CancelParticipation, 1);
+    DisplayPartyMenuMessage(gText_CancelParticipation, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B2248;
+    gTasks[taskId].func = Task_CancelParticipationYesNo;
 }
 
-static void sub_81B2248(u8 taskId)
+static void Task_CancelParticipationYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B227C;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleCancelParticipationYesNoInput;
     }
 }
 
-static void sub_81B227C(u8 taskId)
+static void Task_HandleCancelParticipationYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
-        gSpecialVar_0x8004 = 7;
+        gSpecialVar_0x8004 = PARTY_SIZE + 1;
         Task_ClosePartyMenu(taskId);
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        gTasks[taskId].func = sub_81B1C1C;
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         break;
     }
 }
@@ -3132,23 +2000,23 @@ static bool8 CanLearnTutorMove(u16 species, u8 tutor)
         return FALSE;
 }
 
-static void sub_81B239C(u8 a)
+static void InitPartyMenuWindows(u8 layout)
 {
     u8 i;
 
-    switch (a)
+    switch (layout)
     {
-    case 0:
-        InitWindows(gUnknown_08615810);
+    case PARTY_LAYOUT_SINGLE:
+        InitWindows(sSinglePartyMenuWindowTemplate);
         break;
-    case 1:
-        InitWindows(gUnknown_08615850);
+    case PARTY_LAYOUT_DOUBLE:
+        InitWindows(sDoublePartyMenuWindowTemplate);
         break;
-    case 2:
-        InitWindows(gUnknown_08615890);
+    case PARTY_LAYOUT_MULTI:
+        InitWindows(sMultiPartyMenuWindowTemplate);
         break;
-    default:
-        InitWindows(gUnknown_086158D0);
+    default: // PARTY_LAYOUT_MULTI_SHOWCASE
+        InitWindows(sShowcaseMultiPartyMenuWindowTemplate);
         break;
     }
     DeactivateAllTextPrinters();
@@ -3159,51 +2027,53 @@ static void sub_81B239C(u8 a)
     LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
 }
 
-static void sub_81B2428(bool8 a)
+static void CreateCancelConfirmWindows(bool8 chooseHalf)
 {
-    u8 firstWindowId;
-    u8 windowId;
+    u8 confirmWindowId;
+    u8 cancelWindowId;
     u8 offset;
     u8 mainOffset;
 
-    if (gUnknown_0203CEC8.unk8_0 != 5)
+    if (gPartyMenu.menuType != PARTY_MENU_TYPE_MULTI_SHOWCASE)
     {
-        if (a == TRUE)
+        if (chooseHalf == TRUE)
         {
-            firstWindowId = AddWindow(&gUnknown_08615918);
-            FillWindowPixelBuffer(firstWindowId, PIXEL_FILL(0));
+            confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate);
+            FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0));
             mainOffset = GetStringCenterAlignXOffset(0, gMenuText_Confirm, 48);
-            AddTextPrinterParameterized4(firstWindowId, 0, mainOffset, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm);
-            PutWindowTilemap(firstWindowId);
-            CopyWindowToVram(firstWindowId, 2);
-            windowId = AddWindow(&gUnknown_08615910);
+            AddTextPrinterParameterized4(confirmWindowId, 0, mainOffset, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm);
+            PutWindowTilemap(confirmWindowId);
+            CopyWindowToVram(confirmWindowId, 2);
+            cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate);
             offset = 0;
         }
         else
         {
-            windowId = AddWindow(&gUnknown_08615908);
+            cancelWindowId = AddWindow(&sCancelButtonWindowTemplate);
             offset = 3;
         }
-        FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
-        if (gUnknown_0203CEC8.unk8_0 != 10)
+        FillWindowPixelBuffer(cancelWindowId, PIXEL_FILL(0));
+
+        // Branches are functionally identical. Second branch is never reached, Spin Trade wasnt fully implemented
+        if (gPartyMenu.menuType != PARTY_MENU_TYPE_SPIN_TRADE)
         {
             mainOffset = GetStringCenterAlignXOffset(0, gText_Cancel, 48);
-            AddTextPrinterParameterized3(windowId, 0, mainOffset + offset, 1, sFontColorTable[0], -1, gText_Cancel);
+            AddTextPrinterParameterized3(cancelWindowId, 0, mainOffset + offset, 1, sFontColorTable[0], -1, gText_Cancel);
         }
         else
         {
             mainOffset = GetStringCenterAlignXOffset(0, gText_Cancel2, 48);
-            AddTextPrinterParameterized3(windowId, 0, mainOffset + offset, 1, sFontColorTable[0], -1, gText_Cancel2);
+            AddTextPrinterParameterized3(cancelWindowId, 0, mainOffset + offset, 1, sFontColorTable[0], -1, gText_Cancel2);
         }
-        PutWindowTilemap(windowId);
-        CopyWindowToVram(windowId, 2);
+        PutWindowTilemap(cancelWindowId);
+        CopyWindowToVram(cancelWindowId, 2);
         schedule_bg_copy_tilemap_to_vram(0);
     }
 }
 
-static u16* GetPartyMenuPaletteFromBuffer(u8 paletteId)
+static u16* GetPartyMenuPalBufferPtr(u8 paletteId)
 {
-    return &gUnknown_0203CEC4->palBuffer[paletteId];
+    return &sPartyMenuInternal->palBuffer[paletteId];
 }
 
 static void BlitBitmapToPartyWindow(u8 windowId, const u8 *b, u8 c, u8 x, u8 y, u8 width, u8 height)
@@ -3216,14 +2086,14 @@ static void BlitBitmapToPartyWindow(u8 windowId, const u8 *b, u8 c, u8 x, u8 y,
         for (i = 0; i < height; i++)
         {
             for (j = 0; j < width; j++)
-                CpuCopy16(GetPartyMiscGraphicsTile(b[x + j + ((y + i) * c)]), &pixels[(i * width + j) * 32], 32);
+                CpuCopy16(GetPartyMenuBgTile(b[x + j + ((y + i) * c)]), &pixels[(i * width + j) * 32], 32);
         }
         BlitBitmapToWindow(windowId, pixels, x * 8, y * 8, width * 8, height * 8);
         Free(pixels);
     }
 }
 
-static void BlitBitmapToPartyWindow_Default1(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg)
+static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg)
 {
     if (width == 0 && height == 0)
     {
@@ -3236,7 +2106,7 @@ static void BlitBitmapToPartyWindow_Default1(u8 windowId, u8 x, u8 y, u8 width,
         BlitBitmapToPartyWindow(windowId, sMainSlotTileNums_Egg, 10, x, y, width, height);
 }
 
-static void BlitBitmapToPartyWindow_Default2(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg)
+static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg)
 {
     if (width == 0 && height == 0)
     {
@@ -3254,126 +2124,87 @@ static void DrawEmptySlot(u8 windowId)
     BlitBitmapToPartyWindow(windowId, sEmptySlotTileNums, 18, 0, 0, 18, 3);
 }
 
-static void UpdateSelectedPartyBox(struct Struct203CEDC *ptr, u8 bitfield)
+#define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets)                                    \
+{                                                                                         \
+    LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palNum, 2);  \
+    LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palNum, 2);  \
+    LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palNum, 2);  \
+}                                                                                         
+
+static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags)
 {
-    u8 palNum = GetWindowAttribute(ptr->windowId, WINDOW_PALETTE_NUM) * 16;
+    u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16;
 
-    if (bitfield & 0x40)
+    if (palFlags & PARTY_PAL_NO_MON)
     {
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AF1[0]), gUnknown_08615AC0[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AF1[1]), gUnknown_08615AC0[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AF1[2]), gUnknown_08615AC0[2] + palNum, 2);
+        LOAD_PARTY_BOX_PAL(sPartyBoxNoMonPalIds, sPartyBoxNoMonPalOffsets);
     }
-    else if (bitfield & 0x20)
+    else if (palFlags & PARTY_PAL_TO_SOFTBOIL)
     {
-        if (bitfield & 1)
+        if (palFlags & PARTY_PAL_SELECTED)
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds2, sPartyBoxPalOffsets2);
         }
         else
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds2, sPartyBoxPalOffsets2);
         }
     }
-    else if (bitfield & 0x10)
+    else if (palFlags & PARTY_PAL_SWITCHING)
     {
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[0]), gUnknown_08615ABA[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[1]), gUnknown_08615ABA[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[2]), gUnknown_08615ABA[2] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[0]), gUnknown_08615ABD[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[1]), gUnknown_08615ABD[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[2]), gUnknown_08615ABD[2] + palNum, 2);
+        LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds1, sPartyBoxPalOffsets1);
+        LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds2, sPartyBoxPalOffsets2);
     }
-    else if (bitfield & 4)
+    else if (palFlags & PARTY_PAL_TO_SWITCH)
     {
-        if (bitfield & 1)
+        if (palFlags & PARTY_PAL_SELECTED)
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds2, sPartyBoxPalOffsets2);
         }
         else
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADF[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEE[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxSelectedForActionPalIds2, sPartyBoxPalOffsets2);
         }
     }
-    else if (bitfield & 2)
+    else if (palFlags & PARTY_PAL_FAINTED)
     {
-        if (bitfield & 1)
+        if (palFlags & PARTY_PAL_SELECTED)
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADC[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADC[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ADC[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionFaintedPalIds, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds2, sPartyBoxPalOffsets2);
         }
         else
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD3[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD3[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD3[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE8[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE8[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE8[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxFaintedPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxFaintedPalIds2, sPartyBoxPalOffsets2);
         }
     }
-    else if (bitfield & 8)
+    else if (palFlags & PARTY_PAL_MULTI_ALT)
     {
-        if (bitfield & 1)
+        if (palFlags & PARTY_PAL_SELECTED)
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD9[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD9[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD9[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionMultiPalIds, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds2, sPartyBoxPalOffsets2);
         }
         else
         {
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD0[0]), gUnknown_08615ABA[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD0[1]), gUnknown_08615ABA[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD0[2]), gUnknown_08615ABA[2] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE5[0]), gUnknown_08615ABD[0] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE5[1]), gUnknown_08615ABD[1] + palNum, 2);
-            LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE5[2]), gUnknown_08615ABD[2] + palNum, 2);
+            LOAD_PARTY_BOX_PAL(sPartyBoxMultiPalIds1, sPartyBoxPalOffsets1);
+            LOAD_PARTY_BOX_PAL(sPartyBoxMultiPalIds2, sPartyBoxPalOffsets2);
         }
     }
-    else if (bitfield & 1)
+    else if (palFlags & PARTY_PAL_SELECTED)
     {
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD6[0]), gUnknown_08615ABA[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD6[1]), gUnknown_08615ABA[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AD6[2]), gUnknown_08615ABA[2] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[0]), gUnknown_08615ABD[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[1]), gUnknown_08615ABD[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AEB[2]), gUnknown_08615ABD[2] + palNum, 2);
+        LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds1, sPartyBoxPalOffsets1);
+        LOAD_PARTY_BOX_PAL(sPartyBoxCurrSelectionPalIds2, sPartyBoxPalOffsets2);
     }
     else
     {
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ACD[0]), gUnknown_08615ABA[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ACD[1]), gUnknown_08615ABA[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ACD[2]), gUnknown_08615ABA[2] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE2[0]), gUnknown_08615ABD[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE2[1]), gUnknown_08615ABD[1] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AE2[2]), gUnknown_08615ABD[2] + palNum, 2);
+        LOAD_PARTY_BOX_PAL(sPartyBoxEmptySlotPalIds1, sPartyBoxPalOffsets1);
+        LOAD_PARTY_BOX_PAL(sPartyBoxEmptySlotPalIds2, sPartyBoxPalOffsets2);
     }
 }
 
@@ -3382,20 +2213,20 @@ static void DisplayPartyPokemonBarDetail(u8 windowId, const u8 *str, u8 color, c
     AddTextPrinterParameterized3(windowId, 0, align[0], align[1], sFontColorTable[color], 0, str);
 }
 
-static void DisplayPartyPokemonNickname(struct Pokemon *mon, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonNickname(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c)
 {
     u8 nickname[POKEMON_NAME_LENGTH + 1];
 
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
         if (c == 1)
-            ptr->unk0->unk0(ptr->windowId, ptr->unk0->unk4[0] >> 3, ptr->unk0->unk4[1] >> 3, ptr->unk0->unk4[2] >> 3, ptr->unk0->unk4[3] >> 3, 0);
+            menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->dimensions[0] >> 3, menuBox->infoRects->dimensions[1] >> 3, menuBox->infoRects->dimensions[2] >> 3, menuBox->infoRects->dimensions[3] >> 3, FALSE);
         GetMonNickname(mon, nickname);
-        DisplayPartyPokemonBarDetail(ptr->windowId, nickname, 0, ptr->unk0->unk4);
+        DisplayPartyPokemonBarDetail(menuBox->windowId, nickname, 0, menuBox->infoRects->dimensions);
     }
 }
 
-static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
@@ -3403,34 +2234,34 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
         if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS)
         {
             if (c != 0)
-                ptr->unk0->unk0(ptr->windowId, ptr->unk0->unk4[4] >> 3, (ptr->unk0->unk4[5] >> 3) + 1, ptr->unk0->unk4[6] >> 3, ptr->unk0->unk4[7] >> 3, 0);
+                menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->dimensions[4] >> 3, (menuBox->infoRects->dimensions[5] >> 3) + 1, menuBox->infoRects->dimensions[6] >> 3, menuBox->infoRects->dimensions[7] >> 3, FALSE);
             if (c != 2)
-                DisplayPartyPokemonLevel(GetMonData(mon, MON_DATA_LEVEL), ptr);
+                DisplayPartyPokemonLevel(GetMonData(mon, MON_DATA_LEVEL), menuBox);
         }
     }
 }
 
-static void DisplayPartyPokemonLevel(u8 level, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonLevel(u8 level, struct PartyMenuBox *menuBox)
 {
     ConvertIntToDecimalStringN(gStringVar2, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringCopy(gStringVar1, gText_LevelSymbol);
     StringAppend(gStringVar1, gStringVar2);
-    DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[4]);
+    DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, &menuBox->infoRects->dimensions[4]);
 }
 
-static void DisplayPartyPokemonGenderNidoranCheck(struct Pokemon *mon, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonGenderNidoranCheck(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c)
 {
     u8 nickname[POKEMON_NAME_LENGTH + 1];
 
     if (c == 1)
-        ptr->unk0->unk0(ptr->windowId, ptr->unk0->unk4[8] >> 3, (ptr->unk0->unk4[9] >> 3) + 1, ptr->unk0->unk4[10] >> 3, ptr->unk0->unk4[11] >> 3, 0);
+        menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->dimensions[8] >> 3, (menuBox->infoRects->dimensions[9] >> 3) + 1, menuBox->infoRects->dimensions[10] >> 3, menuBox->infoRects->dimensions[11] >> 3, FALSE);
     GetMonNickname(mon, nickname);
-    DisplayPartyPokemonGender(GetMonGender(mon), GetMonData(mon, MON_DATA_SPECIES), nickname, ptr);
+    DisplayPartyPokemonGender(GetMonGender(mon), GetMonData(mon, MON_DATA_SPECIES), nickname, menuBox);
 }
 
-static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, struct PartyMenuBox *menuBox)
 {
-    u8 palNum = GetWindowAttribute(ptr->windowId, WINDOW_PALETTE_NUM) * 16;
+    u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16;
 
     if (species == SPECIES_NONE)
         return;
@@ -3439,108 +2270,108 @@ static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, stru
     switch (gender)
     {
     case MON_MALE:
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC3[0]), gUnknown_08615AB6[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC3[1]), gUnknown_08615AB6[1] + palNum, 2);
-        DisplayPartyPokemonBarDetail(ptr->windowId, gText_MaleSymbol, 2, &ptr->unk0->unk4[8]);
+        LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[0]), sGenderPalOffsets[0] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[1]), sGenderPalOffsets[1] + palNum, 2);
+        DisplayPartyPokemonBarDetail(menuBox->windowId, gText_MaleSymbol, 2, &menuBox->infoRects->dimensions[8]);
         break;
     case MON_FEMALE:
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC5[0]), gUnknown_08615AB6[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC5[1]), gUnknown_08615AB6[1] + palNum, 2);
-        DisplayPartyPokemonBarDetail(ptr->windowId, gText_FemaleSymbol, 2, &ptr->unk0->unk4[8]);
+        LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[0]), sGenderPalOffsets[0] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[1]), sGenderPalOffsets[1] + palNum, 2);
+        DisplayPartyPokemonBarDetail(menuBox->windowId, gText_FemaleSymbol, 2, &menuBox->infoRects->dimensions[8]);
         break;
     }
 }
 
-static void DisplayPartyPokemonHPCheck(struct Pokemon *mon, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonHPCheck(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
         if (c != 0)
-            ptr->unk0->unk0(ptr->windowId, ptr->unk0->unk4[12] >> 3, (ptr->unk0->unk4[13] >> 3) + 1, ptr->unk0->unk4[14] >> 3, ptr->unk0->unk4[15] >> 3, 0);
+            menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->dimensions[12] >> 3, (menuBox->infoRects->dimensions[13] >> 3) + 1, menuBox->infoRects->dimensions[14] >> 3, menuBox->infoRects->dimensions[15] >> 3, FALSE);
         if (c != 2)
-            DisplayPartyPokemonHP(GetMonData(mon, MON_DATA_HP), ptr);
+            DisplayPartyPokemonHP(GetMonData(mon, MON_DATA_HP), menuBox);
     }
 }
 
-static void DisplayPartyPokemonHP(u16 hp, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonHP(u16 hp, struct PartyMenuBox *menuBox)
 {
     u8 *strOut = ConvertIntToDecimalStringN(gStringVar1, hp, STR_CONV_MODE_RIGHT_ALIGN, 3);
 
     strOut[0] = CHAR_SLASH;
     strOut[1] = EOS;
 
-    DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[12]);
+    DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, &menuBox->infoRects->dimensions[12]);
 }
 
-static void DisplayPartyPokemonMaxHPCheck(struct Pokemon *mon, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonMaxHPCheck(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
         if (c != 0)
-            ptr->unk0->unk0(ptr->windowId, (ptr->unk0->unk4[16] >> 3) + 1, (ptr->unk0->unk4[17] >> 3) + 1, ptr->unk0->unk4[18] >> 3, ptr->unk0->unk4[19] >> 3, 0);
+            menuBox->infoRects->blitFunc(menuBox->windowId, (menuBox->infoRects->dimensions[16] >> 3) + 1, (menuBox->infoRects->dimensions[17] >> 3) + 1, menuBox->infoRects->dimensions[18] >> 3, menuBox->infoRects->dimensions[19] >> 3, FALSE);
         if (c != 2)
-            DisplayPartyPokemonMaxHP(GetMonData(mon, MON_DATA_MAX_HP), ptr);
+            DisplayPartyPokemonMaxHP(GetMonData(mon, MON_DATA_MAX_HP), menuBox);
     }
 }
 
-static void DisplayPartyPokemonMaxHP(u16 maxhp, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonMaxHP(u16 maxhp, struct PartyMenuBox *menuBox)
 {
     ConvertIntToDecimalStringN(gStringVar2, maxhp, STR_CONV_MODE_RIGHT_ALIGN, 3);
     StringCopy(gStringVar1, gText_Slash);
     StringAppend(gStringVar1, gStringVar2);
-    DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[16]);
+    DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, &menuBox->infoRects->dimensions[16]);
 }
 
-static void DisplayPartyPokemonHPBarCheck(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonHPBarCheck(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
-        DisplayPartyPokemonHPBar(GetMonData(mon, MON_DATA_HP), GetMonData(mon, MON_DATA_MAX_HP), ptr);
+        DisplayPartyPokemonHPBar(GetMonData(mon, MON_DATA_HP), GetMonData(mon, MON_DATA_MAX_HP), menuBox);
 }
 
-static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct Struct203CEDC *ptr)
+static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct PartyMenuBox *menuBox)
 {
-    u8 palNum = GetWindowAttribute(ptr->windowId, WINDOW_PALETTE_NUM) * 16;
+    u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16;
     u8 hpFraction;
 
     switch (GetHPBarLevel(hp, maxhp))
     {
     case HP_BAR_GREEN:
     case HP_BAR_FULL:
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC7[0]), gUnknown_08615AB8[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC7[1]), gUnknown_08615AB8[1] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[0]), sHPBarPalOffsets[0] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[1]), sHPBarPalOffsets[1] + palNum, 2);
         break;
     case HP_BAR_YELLOW:
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC9[0]), gUnknown_08615AB8[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615AC9[1]), gUnknown_08615AB8[1] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[0]), sHPBarPalOffsets[0] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[1]), sHPBarPalOffsets[1] + palNum, 2);
         break;
     default:
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ACB[0]), gUnknown_08615AB8[0] + palNum, 2);
-        LoadPalette(GetPartyMenuPaletteFromBuffer(gUnknown_08615ACB[1]), gUnknown_08615AB8[1] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[0]), sHPBarPalOffsets[0] + palNum, 2);
+        LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[1]), sHPBarPalOffsets[1] + palNum, 2);
         break;
     }
 
-    hpFraction = GetScaledHPFraction(hp, maxhp, ptr->unk0->unk4[22]);
-    FillWindowPixelRect(ptr->windowId, gUnknown_08615AB8[1], ptr->unk0->unk4[20], ptr->unk0->unk4[21], hpFraction, 1);
-    FillWindowPixelRect(ptr->windowId, gUnknown_08615AB8[0], ptr->unk0->unk4[20], ptr->unk0->unk4[21] + 1, hpFraction, 2);
-    if (hpFraction != ptr->unk0->unk4[22])
+    hpFraction = GetScaledHPFraction(hp, maxhp, menuBox->infoRects->dimensions[22]);
+    FillWindowPixelRect(menuBox->windowId, sHPBarPalOffsets[1], menuBox->infoRects->dimensions[20], menuBox->infoRects->dimensions[21], hpFraction, 1);
+    FillWindowPixelRect(menuBox->windowId, sHPBarPalOffsets[0], menuBox->infoRects->dimensions[20], menuBox->infoRects->dimensions[21] + 1, hpFraction, 2);
+    if (hpFraction != menuBox->infoRects->dimensions[22])
     {
         // This appears to be an alternating fill
-        FillWindowPixelRect(ptr->windowId, 0x0D, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21], ptr->unk0->unk4[22] - hpFraction, 1);
-        FillWindowPixelRect(ptr->windowId, 0x02, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21] + 1, ptr->unk0->unk4[22] - hpFraction, 2);
+        FillWindowPixelRect(menuBox->windowId, 0x0D, menuBox->infoRects->dimensions[20] + hpFraction, menuBox->infoRects->dimensions[21], menuBox->infoRects->dimensions[22] - hpFraction, 1);
+        FillWindowPixelRect(menuBox->windowId, 0x02, menuBox->infoRects->dimensions[20] + hpFraction, menuBox->infoRects->dimensions[21] + 1, menuBox->infoRects->dimensions[22] - hpFraction, 2);
     }
-    CopyWindowToVram(ptr->windowId, 2);
+    CopyWindowToVram(menuBox->windowId, 2);
 }
 
-static void DisplayPartyPokemonSelectionText(u8 stringID, struct Struct203CEDC *ptr, u8 c)
+static void DisplayPartyPokemonDescriptionText(u8 stringID, struct PartyMenuBox *menuBox, u8 c)
 {
-    if (c != 0)
+    if (c)
     {
-        int unk = ((ptr->unk0->unk1C % 8) + ptr->unk0->unk1E + 7) / 8;
-        int unk2 = ((ptr->unk0->unk1D % 8) + ptr->unk0->unk1F + 7) / 8;
-        ptr->unk0->unk0(ptr->windowId, ptr->unk0->unk1C >> 3, ptr->unk0->unk1D >> 3, unk, unk2, 1);
+        int width = ((menuBox->infoRects->descTextLeft % 8) + menuBox->infoRects->descTextWidth + 7) / 8;
+        int height = ((menuBox->infoRects->descTextTop % 8) + menuBox->infoRects->descTextHeight + 7) / 8;
+        menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->descTextLeft >> 3, menuBox->infoRects->descTextTop >> 3, width, height, TRUE);
     }
     if (c != 2)
-        AddTextPrinterParameterized3(ptr->windowId, 1, ptr->unk0->unk1C, ptr->unk0->unk1D, sFontColorTable[0], 0, sSelectionStringTable[stringID]);
+        AddTextPrinterParameterized3(menuBox->windowId, 1, menuBox->infoRects->descTextLeft, menuBox->infoRects->descTextTop, sFontColorTable[0], 0, sDescriptionStringTable[stringID]);
 }
 
 static void PartyMenuRemoveWindow(u8 *ptr)
@@ -3554,110 +2385,111 @@ static void PartyMenuRemoveWindow(u8 *ptr)
     }
 }
 
-void DisplayPartyMenuStdMessage(u32 stringID)
+void DisplayPartyMenuStdMessage(u32 stringId)
 {
-    u8 *windowPtr = &gUnknown_0203CEC4->windowId[1];
+    u8 *windowPtr = &sPartyMenuInternal->windowId[1];
 
     if (*windowPtr != 0xFF)
         PartyMenuRemoveWindow(windowPtr);
 
-    if (stringID != 0x7F)
+    if (stringId != PARTY_MSG_NONE)
     {
-        switch (stringID)
+        switch (stringId)
         {
-        case 21:
-            *windowPtr = AddWindow(&gUnknown_08615928);
+        case PARTY_MSG_DO_WHAT_WITH_MON:
+            *windowPtr = AddWindow(&sDoWhatWithMonMsgWindowTemplate);
             break;
-        case 24:
-            *windowPtr = AddWindow(&gUnknown_08615930);
+        case PARTY_MSG_DO_WHAT_WITH_ITEM:
+            *windowPtr = AddWindow(&sDoWhatWithItemMsgWindowTemplate);
             break;
-        case 25:
-            *windowPtr = AddWindow(&gUnknown_08615938);
+        case PARTY_MSG_DO_WHAT_WITH_MAIL:
+            *windowPtr = AddWindow(&sDoWhatWithMailMsgWindowTemplate);
             break;
-        case 22:
-        case 23:
-            *windowPtr = AddWindow(&gUnknown_08615940);
+        case PARTY_MSG_RESTORE_WHICH_MOVE:
+        case PARTY_MSG_BOOST_PP_WHICH_MOVE:
+            *windowPtr = AddWindow(&sWhichMoveMsgWindowTemplate);
             break;
-        case 26:
-            *windowPtr = AddWindow(&gUnknown_08615948);
+        case PARTY_MSG_ALREADY_HOLDING_ONE:
+            *windowPtr = AddWindow(&sAlreadyHoldingOneMsgWindowTemplate);
             break;
         default:
-            *windowPtr = AddWindow(&gUnknown_08615920);
+            *windowPtr = AddWindow(&sDefaultPartyMsgWindowTemplate);
             break;
         }
-        if (stringID == 0)
+
+        if (stringId == PARTY_MSG_CHOOSE_MON)
         {
-            if (gUnknown_0203CEC4->unk8_0)
-                stringID = 2;
-            else if (sub_81B314C() == FALSE)
-                stringID = 1;
+            if (sPartyMenuInternal->chooseHalf)
+                stringId = PARTY_MSG_CHOOSE_MON_AND_CONFIRM;
+            else if (!ShouldUseChooseMonText())
+                stringId = PARTY_MSG_CHOOSE_MON_OR_CANCEL;
         }
         DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 0xD);
-        StringExpandPlaceholders(gStringVar4, sActionStringTable[stringID]);
+        StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]);
         AddTextPrinterParameterized(*windowPtr, 1, gStringVar4, 0, 1, 0, 0);
         schedule_bg_copy_tilemap_to_vram(2);
     }
 }
 
-static bool8 sub_81B314C(void)
+static bool8 ShouldUseChooseMonText(void)
 {
     struct Pokemon *party = gPlayerParty;
     u8 i;
-    u8 j = 0;
+    u8 numAliveMons = 0;
 
-    if (gUnknown_0203CEC8.unkB == 1)
+    if (gPartyMenu.action == PARTY_ACTION_SEND_OUT)
         return TRUE;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && (GetMonData(&party[i], MON_DATA_HP) != 0 || GetMonData(&party[i], MON_DATA_IS_EGG)))
-            j++;
-        if (j > 1)
+            numAliveMons++;
+        if (numAliveMons > 1)
             return TRUE;
     }
     return FALSE;
 }
 
-static u8 sub_81B31B0(u8 a)
+static u8 DisplaySelectionWindow(u8 windowType)
 {
     struct WindowTemplate window;
     u8 cursorDimension;
     u8 fontAttribute;
     u8 i;
 
-    switch (a)
+    switch (windowType)
     {
-    case 0:
-        SetWindowTemplateFields(&window, 2, 19, 19 - (gUnknown_0203CEC4->listSize * 2), 10, gUnknown_0203CEC4->listSize * 2, 14, 0x2E9);
+    case SELECTWINDOW_ACTIONS:
+        SetWindowTemplateFields(&window, 2, 19, 19 - (sPartyMenuInternal->numActions * 2), 10, sPartyMenuInternal->numActions * 2, 14, 0x2E9);
         break;
-    case 1:
-        window = gUnknown_08615950;
+    case SELECTWINDOW_ITEM:
+        window = sItemGiveTakeWindowTemplate;
         break;
-    case 2:
-        window = gUnknown_08615958;
+    case SELECTWINDOW_MAIL:
+        window = sMailReadTakeWindowTemplate;
         break;
-    default:
-        window = gUnknown_08615960;
+    default: // SELECTWINDOW_MOVES
+        window = sMoveSelectWindowTemplate;
         break;
     }
 
-    gUnknown_0203CEC4->windowId[0] = AddWindow(&window);
-    DrawStdFrameWithCustomTileAndPalette(gUnknown_0203CEC4->windowId[0], FALSE, 0x4F, 13);
-    if (a == 3)
-        return gUnknown_0203CEC4->windowId[0];
+    sPartyMenuInternal->windowId[0] = AddWindow(&window);
+    DrawStdFrameWithCustomTileAndPalette(sPartyMenuInternal->windowId[0], FALSE, 0x4F, 13);
+    if (windowType == SELECTWINDOW_MOVES)
+        return sPartyMenuInternal->windowId[0];
     cursorDimension = GetMenuCursorDimensionByFont(1, 0);
     fontAttribute = GetFontAttribute(1, 2);
 
-    for (i = 0; i < gUnknown_0203CEC4->listSize; i++)
+    for (i = 0; i < sPartyMenuInternal->numActions; i++)
     {
-        u8 unk = (gUnknown_0203CEC4->actions[i] >= MENU_FIELD_MOVES) ? 4 : 3;
-        AddTextPrinterParameterized4(gUnknown_0203CEC4->windowId[0], 1, cursorDimension, (i * 16) + 1, fontAttribute, 0, sFontColorTable[unk], 0, sCursorOptions[gUnknown_0203CEC4->actions[i]].text);
+        u8 fontColorsId = (sPartyMenuInternal->actions[i] >= MENU_FIELD_MOVES) ? 4 : 3;
+        AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], 1, cursorDimension, (i * 16) + 1, fontAttribute, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text);
     }
 
-    InitMenuInUpperLeftCorner(gUnknown_0203CEC4->windowId[0], gUnknown_0203CEC4->listSize, 0, 1);
+    InitMenuInUpperLeftCorner(sPartyMenuInternal->windowId[0], sPartyMenuInternal->numActions, 0, 1);
     schedule_bg_copy_tilemap_to_vram(2);
 
-    return gUnknown_0203CEC4->windowId[0];
+    return sPartyMenuInternal->windowId[0];
 }
 
 static void PartyMenuPrintText(const u8 *text)
@@ -3667,53 +2499,55 @@ static void PartyMenuPrintText(const u8 *text)
     AddTextPrinterParameterized2(6, 1, text, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);
 }
 
-static void sub_81B334C(void)
+static void PartyMenuDisplayYesNoMenu(void)
 {
-    CreateYesNoMenu(&gUnknown_08615968, 0x4F, 13, 0);
+    CreateYesNoMenu(&sPartyMenuYesNoWindowTemplate, 0x4F, 13, 0);
 }
 
-static u8 sub_81B3364(void)
+static u8 CreateLevelUpStatsWindow(void)
 {
-    gUnknown_0203CEC4->windowId[0] = AddWindow(&gUnknown_08615970);
-    DrawStdFrameWithCustomTileAndPalette(gUnknown_0203CEC4->windowId[0], FALSE, 0x4F, 13);
-    return gUnknown_0203CEC4->windowId[0];
+    sPartyMenuInternal->windowId[0] = AddWindow(&sLevelUpStatsWindowTemplate);
+    DrawStdFrameWithCustomTileAndPalette(sPartyMenuInternal->windowId[0], FALSE, 0x4F, 13);
+    return sPartyMenuInternal->windowId[0];
 }
 
-static void sub_81B3394(void)
+static void RemoveLevelUpStatsWindow(void)
 {
-    ClearWindowTilemap(gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
+    ClearWindowTilemap(sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
 }
 
-static void sub_81B33B4(struct Pokemon *mons, u8 slotId, u8 b)
+static void SetPartyMonSelectionActions(struct Pokemon *mons, u8 slotId, u8 action)
 {
     u8 i;
 
-    if (b == 0)
+    if (action == ACTIONS_NONE)
     {
-        CreateActionList(mons, slotId);
+        SetPartyMonFieldSelectionActions(mons, slotId);
     }
     else
     {
-        gUnknown_0203CEC4->listSize = sListSizeTable[b];
-        for (i = 0; i < gUnknown_0203CEC4->listSize; i++)
-            gUnknown_0203CEC4->actions[i] = sActionTable[b][i];
+        sPartyMenuInternal->numActions = sPartyMenuActionCounts[action];
+        for (i = 0; i < sPartyMenuInternal->numActions; i++)
+            sPartyMenuInternal->actions[i] = sPartyMenuActions[action][i];
     }
 }
 
-static void CreateActionList(struct Pokemon *mons, u8 slotId)
+static void SetPartyMonFieldSelectionActions(struct Pokemon *mons, u8 slotId)
 {
     u8 i, j;
 
-    gUnknown_0203CEC4->listSize = 0;
-    AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, MENU_SUMMARY);
+    sPartyMenuInternal->numActions = 0;
+    AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, MENU_SUMMARY);
+
+    // Add field moves to action list
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
         for (j = 0; sFieldMoves[j] != FIELD_MOVE_TERMINATOR; j++)
         {
             if (GetMonData(&mons[slotId], i + MON_DATA_MOVE1) == sFieldMoves[j])
             {
-                AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, j + MENU_FIELD_MOVES);
+                AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, j + MENU_FIELD_MOVES);
                 break;
             }
         }
@@ -3722,118 +2556,124 @@ static void CreateActionList(struct Pokemon *mons, u8 slotId)
     if (!InBattlePike())
     {
         if (GetMonData(&mons[1], MON_DATA_SPECIES) != SPECIES_NONE)
-            AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, MENU_SWITCH);
+            AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, MENU_SWITCH);
         if (ItemIsMail(GetMonData(&mons[slotId], MON_DATA_HELD_ITEM)))
-            AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, MENU_MAIL);
+            AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, MENU_MAIL);
         else
-            AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, MENU_ITEM);
+            AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, MENU_ITEM);
     }
-    AppendToList(gUnknown_0203CEC4->actions, &gUnknown_0203CEC4->listSize, MENU_CANCEL1);
+    AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, MENU_CANCEL1);
 }
 
-static u8 sub_81B353C(struct Pokemon *mon)
+static u8 GetPartyMenuActionsType(struct Pokemon *mon)
 {
-    u32 returnVar;
+    u32 actionType;
 
-    switch (gUnknown_0203CEC8.unk8_0)
+    switch (gPartyMenu.menuType)
     {
-    case 0:
+    case PARTY_MENU_TYPE_FIELD:
         if (InMultiBattleRoom() == TRUE || GetMonData(mon, MON_DATA_IS_EGG))
-            returnVar = 1;
+            actionType = ACTIONS_SWITCH;
         else
-            returnVar = 0;
+            actionType = ACTIONS_NONE; // actions populated by SetPartyMonFieldSelectionActions
         break;
-    case 1:
-        returnVar = sub_81B8A2C(mon);
+    case PARTY_MENU_TYPE_IN_BATTLE:
+        actionType = GetPartyMenuActionsTypeInBattle(mon);
         break;
-    case 4:
-        switch (sub_81B856C(gUnknown_0203CEC8.slotId))
+    case PARTY_MENU_TYPE_CHOOSE_HALF:
+        switch (GetPartySlotEntryStatus(gPartyMenu.slotId))
         {
-        default:
-            returnVar = 7;
+        default: // Not eligible
+            actionType = ACTIONS_SUMMARY_ONLY;
             break;
-        case 0:
-            returnVar = 4;
+        case 0: // Eligible
+            actionType = ACTIONS_ENTER;
             break;
-        case 1:
-            returnVar = 5;
+        case 1: // Already selected
+            actionType = ACTIONS_NO_ENTRY;
             break;
         }
         break;
-    case 6:
-        returnVar = (GetMonData(mon, MON_DATA_IS_EGG)) ? 7 : 6;
+    case PARTY_MENU_TYPE_DAYCARE:
+        actionType = (GetMonData(mon, MON_DATA_IS_EGG)) ? ACTIONS_SUMMARY_ONLY : ACTIONS_STORE;
         break;
-    case 8:
-        returnVar = 10;
+    case PARTY_MENU_TYPE_UNION_ROOM_REGISTER:
+        actionType = ACTIONS_REGISTER;
         break;
-    case 9:
-        returnVar = 11;
+    case PARTY_MENU_TYPE_UNION_ROOM_TRADE:
+        actionType = ACTIONS_TRADE;
         break;
-    case 10:
-        returnVar = 12;
+    case PARTY_MENU_TYPE_SPIN_TRADE:
+        actionType = ACTIONS_SPIN_TRADE;
         break;
-    case 12:
-        returnVar = 13;
+    case PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS:
+        actionType = ACTIONS_TAKEITEM_TOSS;
         break;
+    // The following have no selection actions (i.e. they exit immediately upon selection)
+    // PARTY_MENU_TYPE_CONTEST
+    // PARTY_MENU_TYPE_CHOOSE_MON
+    // PARTY_MENU_TYPE_MULTI_SHOWCASE
+    // PARTY_MENU_TYPE_MOVE_RELEARNER
+    // PARTY_MENU_TYPE_MINIGAME
     default:
-        returnVar = 0;
+        actionType = ACTIONS_NONE;
         break;
     }
-    return returnVar;
+    return actionType;
 }
 
-static bool8 sub_81B3608(u8 taskId)
+static bool8 CreateSelectionWindow(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item;
 
     GetMonNickname(mon, gStringVar1);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    if (gUnknown_0203CEC8.unk8_0 != 12)
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    if (gPartyMenu.menuType != PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS)
     {
-        sub_81B33B4(gPlayerParty, gUnknown_0203CEC8.slotId, sub_81B353C(mon));
-        sub_81B31B0(0);
-        DisplayPartyMenuStdMessage(21);
+        SetPartyMonSelectionActions(gPlayerParty, gPartyMenu.slotId, GetPartyMenuActionsType(mon));
+        DisplaySelectionWindow(SELECTWINDOW_ACTIONS);
+        DisplayPartyMenuStdMessage(PARTY_MSG_DO_WHAT_WITH_MON);
     }
     else
     {
         item = GetMonData(mon, MON_DATA_HELD_ITEM);
         if (item != ITEM_NONE)
         {
-            sub_81B33B4(gPlayerParty, gUnknown_0203CEC8.slotId, sub_81B353C(mon));
-            sub_81B31B0(1);
+            SetPartyMonSelectionActions(gPlayerParty, gPartyMenu.slotId, GetPartyMenuActionsType(mon));
+            DisplaySelectionWindow(SELECTWINDOW_ITEM);
             CopyItemName(item, gStringVar2);
-            DisplayPartyMenuStdMessage(26);
+            DisplayPartyMenuStdMessage(PARTY_MSG_ALREADY_HOLDING_ONE);
         }
         else
         {
             StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding);
-            DisplayPartyMenuMessage(gStringVar4, 1);
+            DisplayPartyMenuMessage(gStringVar4, TRUE);
             schedule_bg_copy_tilemap_to_vram(2);
-            gTasks[taskId].func = sub_81B469C;
+            gTasks[taskId].func = Task_UpdateHeldItemSprite;
             return FALSE;
         }
     }
     return TRUE;
 }
 
-static void sub_81B36FC(u8 taskId)
+static void Task_TryCreateSelectionWindow(u8 taskId)
 {
-    if (sub_81B3608(taskId))
+    if (CreateSelectionWindow(taskId))
     {
         gTasks[taskId].data[0] = 0xFF;
-        gTasks[taskId].func = HandleMenuInput;
+        gTasks[taskId].func = Task_HandleSelectionMenuInput;
     }
 }
 
-static void HandleMenuInput(u8 taskId)
+static void Task_HandleSelectionMenuInput(u8 taskId)
 {
     if (!gPaletteFade.active && sub_81221EC() != TRUE)
     {
         s8 input;
         s16 *data = gTasks[taskId].data;
 
-        if (gUnknown_0203CEC4->listSize <= 3)
+        if (sPartyMenuInternal->numActions <= 3)
             input = Menu_ProcessInputNoWrapAround_other();
         else
             input = ProcessMenuInput_other();
@@ -3845,12 +2685,12 @@ static void HandleMenuInput(u8 taskId)
             break;
         case MENU_B_PRESSED:
             PlaySE(SE_SELECT);
-            PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[2]);
-            sCursorOptions[gUnknown_0203CEC4->actions[gUnknown_0203CEC4->listSize - 1]].func(taskId);
+            PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[2]);
+            sCursorOptions[sPartyMenuInternal->actions[sPartyMenuInternal->numActions - 1]].func(taskId);
             break;
         default:
-            PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[2]);
-            sCursorOptions[gUnknown_0203CEC4->actions[input]].func(taskId);
+            PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[2]);
+            sCursorOptions[sPartyMenuInternal->actions[input]].func(taskId);
             break;
         }
     }
@@ -3859,209 +2699,230 @@ static void HandleMenuInput(u8 taskId)
 static void CursorCb_Summary(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    gUnknown_0203CEC4->exitCallback = sub_81B3828;
+    sPartyMenuInternal->exitCallback = CB2_ShowPokemonSummaryScreen;
     Task_ClosePartyMenu(taskId);
 }
 
-static void sub_81B3828(void)
+static void CB2_ShowPokemonSummaryScreen(void)
 {
-    if (gUnknown_0203CEC8.unk8_0 == 1)
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
     {
-        pokemon_change_order();
-        ShowPokemonSummaryScreen(PSS_MODE_UNK1, gPlayerParty, gUnknown_0203CEC8.slotId, gPlayerPartyCount - 1, sub_81B3894);
+        UpdatePartyToBattleOrder();
+        ShowPokemonSummaryScreen(PSS_MODE_UNK1, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen);
     }
     else
     {
-        ShowPokemonSummaryScreen(PSS_MODE_NORMAL, gPlayerParty, gUnknown_0203CEC8.slotId, gPlayerPartyCount - 1, sub_81B3894);
+        ShowPokemonSummaryScreen(PSS_MODE_NORMAL, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen);
     }
 }
 
-static void sub_81B3894(void)
+static void CB2_ReturnToPartyMenuFromSummaryScreen(void)
 {
     gPaletteFade.bufferTransferDisabled = TRUE;
-    gUnknown_0203CEC8.slotId = gLastViewedMonIndex;
-    InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 21, sub_81B36FC, gUnknown_0203CEC8.exitCallback);
+    gPartyMenu.slotId = gLastViewedMonIndex;
+    InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_DO_WHAT_WITH_MON, Task_TryCreateSelectionWindow, gPartyMenu.exitCallback);
 }
 
 static void CursorCb_Switch(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    gUnknown_0203CEC8.unkB = 8;
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    DisplayPartyMenuStdMessage(3);
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
-    gUnknown_0203CEC8.unkA = gUnknown_0203CEC8.slotId;
-    gTasks[taskId].func = sub_81B1370;
-}
-
-static void sub_81B3938(u8 taskId)
+    gPartyMenu.action = PARTY_ACTION_SWITCH;
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    DisplayPartyMenuStdMessage(PARTY_MSG_MOVE_TO_WHERE);
+    AnimatePartySlot(gPartyMenu.slotId, 1);
+    gPartyMenu.slotId2 = gPartyMenu.slotId;
+    gTasks[taskId].func = Task_HandleChooseMonInput;
+}
+
+#define tSlot1Left     data[0]
+#define tSlot1Top      data[1]
+#define tSlot1Width    data[2]
+#define tSlot1Height   data[3]
+#define tSlot2Left     data[4]
+#define tSlot2Top      data[5]
+#define tSlot2Width    data[6]
+#define tSlot2Height   data[7]
+#define tSlot1Offset   data[8]
+#define tSlot2Offset   data[9]
+#define tSlot1SlideDir data[10]
+#define tSlot2SlideDir data[11]
+
+static void SwitchSelectedMons(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     u8 windowIds[2];
 
-    if (gUnknown_0203CEC8.unkA == gUnknown_0203CEC8.slotId)
+    if (gPartyMenu.slotId2 == gPartyMenu.slotId)
     {
-        sub_81B407C(taskId);
+        FinishTwoMonAction(taskId);
     }
     else
     {
-        windowIds[0] = gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].windowId;
-        data[0] = GetWindowAttribute(windowIds[0], WINDOW_TILEMAP_LEFT);
-        data[1] = GetWindowAttribute(windowIds[0], WINDOW_TILEMAP_TOP);
-        data[2] = GetWindowAttribute(windowIds[0], WINDOW_WIDTH);
-        data[3] = GetWindowAttribute(windowIds[0], WINDOW_HEIGHT);
-        data[8] = 0;
-        if (data[2] == 10)
-            data[10] = -1;
+        // Initialize switching party mons slide animation
+        windowIds[0] = sPartyMenuBoxes[gPartyMenu.slotId].windowId;
+        tSlot1Left = GetWindowAttribute(windowIds[0], WINDOW_TILEMAP_LEFT);
+        tSlot1Top = GetWindowAttribute(windowIds[0], WINDOW_TILEMAP_TOP);
+        tSlot1Width = GetWindowAttribute(windowIds[0], WINDOW_WIDTH);
+        tSlot1Height = GetWindowAttribute(windowIds[0], WINDOW_HEIGHT);
+        tSlot1Offset = 0;
+        if (tSlot1Width == 10)
+            tSlot1SlideDir = -1;
         else
-            data[10] = 1;
-        windowIds[1] = gUnknown_0203CEDC[gUnknown_0203CEC8.unkA].windowId;
-        data[4] = GetWindowAttribute(windowIds[1], WINDOW_TILEMAP_LEFT);
-        data[5] = GetWindowAttribute(windowIds[1], WINDOW_TILEMAP_TOP);
-        data[6] = GetWindowAttribute(windowIds[1], WINDOW_WIDTH);
-        data[7] = GetWindowAttribute(windowIds[1], WINDOW_HEIGHT);
-        data[9] = 0;
-        if (data[6] == 10)
-            data[11] = -1;
+            tSlot1SlideDir = 1;
+        windowIds[1] = sPartyMenuBoxes[gPartyMenu.slotId2].windowId;
+        tSlot2Left = GetWindowAttribute(windowIds[1], WINDOW_TILEMAP_LEFT);
+        tSlot2Top = GetWindowAttribute(windowIds[1], WINDOW_TILEMAP_TOP);
+        tSlot2Width = GetWindowAttribute(windowIds[1], WINDOW_WIDTH);
+        tSlot2Height = GetWindowAttribute(windowIds[1], WINDOW_HEIGHT);
+        tSlot2Offset = 0;
+        if (tSlot2Width == 10)
+            tSlot2SlideDir = -1;
         else
-            data[11] = 1;
-        gUnknown_0203CEF0 = Alloc(data[2] * (data[3] << 1));
-        gUnknown_0203CEF4 = Alloc(data[6] * (data[7] << 1));
-        sub_8199CBC(0, gUnknown_0203CEF0, data[0], data[1], data[2], data[3]);
-        sub_8199CBC(0, gUnknown_0203CEF4, data[4], data[5], data[6], data[7]);
+            tSlot2SlideDir = 1;
+        sSlot1TilemapBuffer = Alloc(tSlot1Width * (tSlot1Height << 1));
+        sSlot2TilemapBuffer = Alloc(tSlot2Width * (tSlot2Height << 1));
+        CopyToBufferFromBgTilemap(0, sSlot1TilemapBuffer, tSlot1Left, tSlot1Top, tSlot1Width, tSlot1Height);
+        CopyToBufferFromBgTilemap(0, sSlot2TilemapBuffer, tSlot2Left, tSlot2Top, tSlot2Width, tSlot2Height);
         ClearWindowTilemap(windowIds[0]);
         ClearWindowTilemap(windowIds[1]);
-        gUnknown_0203CEC8.unkB = 9;
-        sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
-        sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
-        sub_81B3CC0(taskId);
-        gTasks[taskId].func = sub_81B3D48;
+        gPartyMenu.action = PARTY_ACTION_SWITCHING;
+        AnimatePartySlot(gPartyMenu.slotId, 1);
+        AnimatePartySlot(gPartyMenu.slotId2, 1);
+        SlidePartyMenuBoxOneStep(taskId);
+        gTasks[taskId].func = Task_SlideSelectedSlotsOffscreen;
     }
 }
 
-static bool8 sub_81B3AD8(s16 a, s16 b, u8 *c, u8 *d, u8 *e)
+// returns FALSE if the slot has slid fully offscreen / back onscreen
+static bool8 TryMovePartySlot(s16 x, s16 width, u8 *leftMove, u8 *newX, u8 *newWidth)
 {
-    if ((a + b) < 0)
+    if ((x + width) < 0)
         return FALSE;
-    if (a > 31)
+    if (x > 31)
         return FALSE;
 
-    if (a < 0)
+    if (x < 0)
     {
-        *c = a * -1;
-        *d = 0;
-        *e = b + a;
+        *leftMove = x * -1;
+        *newX = 0;
+        *newWidth = width + x;
     }
     else
     {
-        *c = 0;
-        *d = a;
-        if ((a + b) > 31)
-            *e = 32 - a;
+        *leftMove = 0;
+        *newX = x;
+        if ((x + width) > 31)
+            *newWidth = 32 - x;
         else
-            *e = b;
+            *newWidth = width;
 
     }
     return TRUE;
 }
 
-static void sub_81B3B40(const void *rectSrc, s16 a, s16 b, s16 c, s16 d, s16 e)
+static void MoveAndBufferPartySlot(const void *rectSrc, s16 x, s16 y, s16 width, s16 height, s16 dir)
 {
-    u8 f, g, h;
+    // The use of the dimension parameters here is a mess
+    u8 leftMove, newX, newWidth; // leftMove is used as a srcX, newX is used as both x and srcHeight, newWidth is used as both width and destY
 
-    if (sub_81B3AD8(a, c, &f, &g, &h))
+    if (TryMovePartySlot(x, width, &leftMove, &newX, &newWidth))
     {
-        FillBgTilemapBufferRect_Palette0(0, 0, g, b, h, d);
-        if (sub_81B3AD8(a + e, c, &f, &g, &h))
-            CopyRectToBgTilemapBufferRect(0, rectSrc, f, 0, c, d, g, b, h, d, 17, 0, 0);
+        FillBgTilemapBufferRect_Palette0(0, 0, newX, y, newWidth, height);
+        if (TryMovePartySlot(x + dir, width, &leftMove, &newX, &newWidth))
+            CopyRectToBgTilemapBufferRect(0, rectSrc, leftMove, 0, width, height, newX, y, newWidth, height, 17, 0, 0);
     }
 }
 
-static void sub_81B3C0C(struct Struct203CEDC *ptr, s16 a)
+static void MovePartyMenuBoxSprites(struct PartyMenuBox *menuBox, s16 offset)
 {
-    gSprites[ptr->pokeballSpriteId].pos2.x += a * 8;
-    gSprites[ptr->itemSpriteId].pos2.x += a * 8;
-    gSprites[ptr->monSpriteId].pos2.x += a * 8;
-    gSprites[ptr->statusSpriteId].pos2.x += a * 8;
+    gSprites[menuBox->pokeballSpriteId].pos2.x += offset * 8;
+    gSprites[menuBox->itemSpriteId].pos2.x += offset * 8;
+    gSprites[menuBox->monSpriteId].pos2.x += offset * 8;
+    gSprites[menuBox->statusSpriteId].pos2.x += offset * 8;
 }
 
-static void sub_81B3C60(u8 taskId)
+static void SlidePartyMenuBoxSpritesOneStep(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (data[10] != 0)
-        sub_81B3C0C(&gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], data[10]);
-    if (data[11] != 0)
-        sub_81B3C0C(&gUnknown_0203CEDC[gUnknown_0203CEC8.unkA], data[11]);
+    if (tSlot1SlideDir != 0)
+        MovePartyMenuBoxSprites(&sPartyMenuBoxes[gPartyMenu.slotId], tSlot1SlideDir);
+    if (tSlot2SlideDir != 0)
+        MovePartyMenuBoxSprites(&sPartyMenuBoxes[gPartyMenu.slotId2], tSlot2SlideDir);
 }
 
-static void sub_81B3CC0(u8 taskId)
+static void SlidePartyMenuBoxOneStep(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (data[10] != 0)
-        sub_81B3B40(gUnknown_0203CEF0, data[0] + data[8], data[1], data[2], data[3], data[10]);
-    if (data[11] != 0)
-        sub_81B3B40(gUnknown_0203CEF4, data[4] + data[9], data[5], data[6], data[7], data[11]);
+    if (tSlot1SlideDir != 0)
+        MoveAndBufferPartySlot(sSlot1TilemapBuffer, tSlot1Left + tSlot1Offset, tSlot1Top, tSlot1Width, tSlot1Height, tSlot1SlideDir);
+    if (tSlot2SlideDir != 0)
+        MoveAndBufferPartySlot(sSlot2TilemapBuffer, tSlot2Left + tSlot2Offset, tSlot2Top, tSlot2Width, tSlot2Height, tSlot2SlideDir);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-static void sub_81B3D48(u8 taskId)
+static void Task_SlideSelectedSlotsOffscreen(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
-    u16 tilemapRelatedMaybe[2];
+    u16 slidingSlotPositions[2];
 
-    sub_81B3CC0(taskId);
-    sub_81B3C60(taskId);
-    data[8] += data[10];
-    data[9] += data[11];
-    tilemapRelatedMaybe[0] = data[0] + data[8];
-    tilemapRelatedMaybe[1] = data[4] + data[9];
-    if (tilemapRelatedMaybe[0] > 33 && tilemapRelatedMaybe[1] > 33)
+    SlidePartyMenuBoxOneStep(taskId);
+    SlidePartyMenuBoxSpritesOneStep(taskId);
+    tSlot1Offset += tSlot1SlideDir;
+    tSlot2Offset += tSlot2SlideDir;
+    slidingSlotPositions[0] = tSlot1Left + tSlot1Offset;
+    slidingSlotPositions[1] = tSlot2Left + tSlot2Offset;
+
+    // Both slots have slid offscreen
+    if (slidingSlotPositions[0] > 33 && slidingSlotPositions[1] > 33)
     {
-        data[10] *= -1;
-        data[11] *= -1;
-        swap_pokemon_and_oams();
-        DisplayPartyPokemonData(gUnknown_0203CEC8.slotId);
-        DisplayPartyPokemonData(gUnknown_0203CEC8.unkA);
-        PutWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].windowId);
-        PutWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.unkA].windowId);
-        sub_8199CBC(0, gUnknown_0203CEF0, data[0], data[1], data[2], data[3]);
-        sub_8199CBC(0, gUnknown_0203CEF4, data[4], data[5], data[6], data[7]);
-        ClearWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].windowId);
-        ClearWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.unkA].windowId);
-        gTasks[taskId].func = sub_81B3E60;
+        tSlot1SlideDir *= -1;
+        tSlot2SlideDir *= -1;
+        SwitchPartyMon();
+        DisplayPartyPokemonData(gPartyMenu.slotId);
+        DisplayPartyPokemonData(gPartyMenu.slotId2);
+        PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId].windowId);
+        PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId2].windowId);
+        CopyToBufferFromBgTilemap(0, sSlot1TilemapBuffer, tSlot1Left, tSlot1Top, tSlot1Width, tSlot1Height);
+        CopyToBufferFromBgTilemap(0, sSlot2TilemapBuffer, tSlot2Left, tSlot2Top, tSlot2Width, tSlot2Height);
+        ClearWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId].windowId);
+        ClearWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId2].windowId);
+        gTasks[taskId].func = Task_SlideSelectedSlotsOnscreen;
     }
 }
 
-static void sub_81B3E60(u8 taskId)
+static void Task_SlideSelectedSlotsOnscreen(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    sub_81B3CC0(taskId);
-    sub_81B3C60(taskId);
-    if (data[10] == 0 && data[11] == 0)
+    SlidePartyMenuBoxOneStep(taskId);
+    SlidePartyMenuBoxSpritesOneStep(taskId);
+    
+    // Both slots have slid back onscreen
+    if (tSlot1SlideDir == 0 && tSlot2SlideDir == 0)
     {
-        PutWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].windowId);
-        PutWindowTilemap(gUnknown_0203CEDC[gUnknown_0203CEC8.unkA].windowId);
+        PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId].windowId);
+        PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId2].windowId);
         schedule_bg_copy_tilemap_to_vram(0);
-        Free(gUnknown_0203CEF0);
-        Free(gUnknown_0203CEF4);
-        sub_81B407C(taskId);
+        Free(sSlot1TilemapBuffer);
+        Free(sSlot2TilemapBuffer);
+        FinishTwoMonAction(taskId);
     }
+    // Continue sliding
     else
     {
-        data[8] += data[10];
-        data[9] += data[11];
-        if (data[8] == 0)
-            data[10] = 0;
-        if (data[9] == 0)
-            data[11] = 0;
+        tSlot1Offset += tSlot1SlideDir;
+        tSlot2Offset += tSlot2SlideDir;
+        if (tSlot1Offset == 0)
+            tSlot1SlideDir = 0;
+        if (tSlot2Offset == 0)
+            tSlot2SlideDir = 0;
     }
 }
 
-static void oamt_swap_pos(u8 *spriteIdPtr1, u8 *spriteIdPtr2)
+static void SwitchMenuBoxSprites(u8 *spriteIdPtr1, u8 *spriteIdPtr2)
 {
     u8 spriteIdBuffer = *spriteIdPtr1;
     u16 xBuffer1, yBuffer1, xBuffer2, yBuffer2;
@@ -4082,545 +2943,575 @@ static void oamt_swap_pos(u8 *spriteIdPtr1, u8 *spriteIdPtr2)
     gSprites[*spriteIdPtr2].pos2.y = yBuffer2;
 }
 
-static void swap_pokemon_and_oams(void)
+static void SwitchPartyMon(void)
 {
-    struct Struct203CEDC *structPtrs[2];
+    struct PartyMenuBox *menuBoxes[2];
     struct Pokemon *mon1, *mon2;
     struct Pokemon *monBuffer;
 
-    structPtrs[0] = &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId];
-    structPtrs[1] = &gUnknown_0203CEDC[gUnknown_0203CEC8.unkA];
-    mon1 = &gPlayerParty[gUnknown_0203CEC8.slotId];
-    mon2 = &gPlayerParty[gUnknown_0203CEC8.unkA];
+    menuBoxes[0] = &sPartyMenuBoxes[gPartyMenu.slotId];
+    menuBoxes[1] = &sPartyMenuBoxes[gPartyMenu.slotId2];
+    mon1 = &gPlayerParty[gPartyMenu.slotId];
+    mon2 = &gPlayerParty[gPartyMenu.slotId2];
     monBuffer = Alloc(sizeof(struct Pokemon));
     *monBuffer = *mon1;
     *mon1 = *mon2;
     *mon2 = *monBuffer;
     Free(monBuffer);
-    oamt_swap_pos(&structPtrs[0]->pokeballSpriteId, &structPtrs[1]->pokeballSpriteId);
-    oamt_swap_pos(&structPtrs[0]->itemSpriteId, &structPtrs[1]->itemSpriteId);
-    oamt_swap_pos(&structPtrs[0]->monSpriteId, &structPtrs[1]->monSpriteId);
-    oamt_swap_pos(&structPtrs[0]->statusSpriteId, &structPtrs[1]->statusSpriteId);
-}
-
-static void sub_81B407C(u8 taskId)
-{
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    gUnknown_0203CEC8.unkB = 0;
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 0);
-    gUnknown_0203CEC8.slotId = gUnknown_0203CEC8.unkA;
-    sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
-    DisplayPartyMenuStdMessage(0);
-    gTasks[taskId].func = sub_81B1370;
-}
+    SwitchMenuBoxSprites(&menuBoxes[0]->pokeballSpriteId, &menuBoxes[1]->pokeballSpriteId);
+    SwitchMenuBoxSprites(&menuBoxes[0]->itemSpriteId, &menuBoxes[1]->itemSpriteId);
+    SwitchMenuBoxSprites(&menuBoxes[0]->monSpriteId, &menuBoxes[1]->monSpriteId);
+    SwitchMenuBoxSprites(&menuBoxes[0]->statusSpriteId, &menuBoxes[1]->statusSpriteId);
+}
+
+// Finish switching mons or using Softboiled
+static void FinishTwoMonAction(u8 taskId)
+{
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    gPartyMenu.action = PARTY_ACTION_CHOOSE_MON;
+    AnimatePartySlot(gPartyMenu.slotId, 0);
+    gPartyMenu.slotId = gPartyMenu.slotId2;
+    AnimatePartySlot(gPartyMenu.slotId2, 1);
+    DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
+}
+
+#undef tSlot1Left
+#undef tSlot1Top
+#undef tSlot1Width
+#undef tSlot1Height
+#undef tSlot2Left
+#undef tSlot2Top
+#undef tSlot2Width
+#undef tSlot2Height
+#undef tSlot1Offset
+#undef tSlot2Offset
+#undef tSlot1SlideDir
+#undef tSlot2SlideDir
 
 static void CursorCb_Cancel1(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    if (gUnknown_0203CEC8.unk8_0 == 6)
-        DisplayPartyMenuStdMessage(15);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    if (gPartyMenu.menuType == PARTY_MENU_TYPE_DAYCARE)
+        DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON_2);
     else
-        DisplayPartyMenuStdMessage(0);
-    gTasks[taskId].func = sub_81B1370;
+        DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
 static void CursorCb_Item(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    sub_81B33B4(gPlayerParty, gUnknown_0203CEC8.slotId, 8);
-    sub_81B31B0(1);
-    DisplayPartyMenuStdMessage(24);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    SetPartyMonSelectionActions(gPlayerParty, gPartyMenu.slotId, ACTIONS_ITEM);
+    DisplaySelectionWindow(SELECTWINDOW_ITEM);
+    DisplayPartyMenuStdMessage(PARTY_MSG_DO_WHAT_WITH_ITEM);
     gTasks[taskId].data[0] = 0xFF;
-    gTasks[taskId].func = HandleMenuInput;
+    gTasks[taskId].func = Task_HandleSelectionMenuInput;
 }
 
 static void CursorCb_Give(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    gUnknown_0203CEC4->exitCallback = sub_81B41C4;
+    sPartyMenuInternal->exitCallback = CB2_SelectBagItemToGive;
     Task_ClosePartyMenu(taskId);
 }
 
-static void sub_81B41C4(void)
+static void CB2_SelectBagItemToGive(void)
 {
     if (InBattlePyramid() == FALSE)
-        GoToBagMenu(RETURN_LOCATION_POKEMON_LIST, POCKETS_COUNT, c2_8123744);
+        GoToBagMenu(RETURN_LOCATION_POKEMON_LIST, POCKETS_COUNT, CB2_GiveHoldItem);
     else
-        sub_81C4F98(2, c2_8123744);
+        GoToBattlePyramidBagMenu(2, CB2_GiveHoldItem);
 }
 
-static void c2_8123744(void)
+static void CB2_GiveHoldItem(void)
 {
     if (gSpecialVar_ItemId == ITEM_NONE)
     {
-        InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0x7F, sub_81B36FC, gUnknown_0203CEC8.exitCallback);
+        InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_NONE, Task_TryCreateSelectionWindow, gPartyMenu.exitCallback);
     }
     else
     {
-        gUnknown_0203CEFC = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_HELD_ITEM);
-        if (gUnknown_0203CEFC != ITEM_NONE)
+        sPartyMenuItemId = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_HELD_ITEM);
+
+        // Already holding item
+        if (sPartyMenuItemId != ITEM_NONE)
         {
-            InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0x7F, sub_81B4350, gUnknown_0203CEC8.exitCallback);
+            InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_NONE, Task_SwitchHoldItemsPrompt, gPartyMenu.exitCallback);
         }
+        // Give mail
         else if (ItemIsMail(gSpecialVar_ItemId))
         {
             RemoveBagItem(gSpecialVar_ItemId, 1);
-            sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], gSpecialVar_ItemId);
-            sub_81B452C();
+            GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], gSpecialVar_ItemId);
+            CB2_WriteMailToGiveMon();
         }
+        // Give item
         else
         {
-            InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0x7F, sub_81B42D0, gUnknown_0203CEC8.exitCallback);
+            InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_NONE, Task_GiveHoldItem, gPartyMenu.exitCallback);
         }
     }
 }
 
-static void sub_81B42D0(u8 taskId)
+static void Task_GiveHoldItem(u8 taskId)
 {
     u16 item;
 
     if (!gPaletteFade.active)
     {
         item = gSpecialVar_ItemId;
-        sub_81B1C84(&gPlayerParty[gUnknown_0203CEC8.slotId], item, 0, 0);
-        sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], item);
+        DisplayGaveHeldItemMessage(&gPlayerParty[gPartyMenu.slotId], item, FALSE, 0);
+        GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], item);
         RemoveBagItem(item, 1);
-        gTasks[taskId].func = sub_81B469C;
+        gTasks[taskId].func = Task_UpdateHeldItemSprite;
     }
 }
 
-static void sub_81B4350(u8 taskId)
+static void Task_SwitchHoldItemsPrompt(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        sub_81B1D1C(&gPlayerParty[gUnknown_0203CEC8.slotId], gUnknown_0203CEFC, 1);
-        gTasks[taskId].func = sub_81B43A8;
+        DisplayAlreadyHoldingItemSwitchMessage(&gPlayerParty[gPartyMenu.slotId], sPartyMenuItemId, TRUE);
+        gTasks[taskId].func = Task_SwitchItemsYesNo;
     }
 }
 
-static void sub_81B43A8(u8 taskId)
+static void Task_SwitchItemsYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B43DC;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleSwitchItemsYesNoInput;
     }
 }
 
-static void sub_81B43DC(u8 taskId)
+static void Task_HandleSwitchItemsYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-    case 0:
+    case 0: // Yes, switch items
         RemoveBagItem(gSpecialVar_ItemId, 1);
-        if (AddBagItem(gUnknown_0203CEFC, 1) == FALSE)
+        
+        // No room to return held item to bag
+        if (AddBagItem(sPartyMenuItemId, 1) == FALSE)
         {
             AddBagItem(gSpecialVar_ItemId, 1);
-            pokemon_item_not_removed(gUnknown_0203CEFC);
-            DisplayPartyMenuMessage(gStringVar4, 0);
-            gTasks[taskId].func = sub_81B1C1C;
+            BufferBagFullCantTakeItemMessage(sPartyMenuItemId);
+            DisplayPartyMenuMessage(gStringVar4, FALSE);
+            gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         }
+        // Giving mail
         else if (ItemIsMail(gSpecialVar_ItemId))
         {
-            sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], gSpecialVar_ItemId);
-            gTasks[taskId].func = sub_81B44FC;
+            GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], gSpecialVar_ItemId);
+            gTasks[taskId].func = Task_WriteMailToGiveMonAfterText;
         }
+        // Giving item
         else
         {
-            sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], gSpecialVar_ItemId);
-            sub_81B1D68(gSpecialVar_ItemId, gUnknown_0203CEFC, 1);
-            gTasks[taskId].func = sub_81B469C;
+            GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], gSpecialVar_ItemId);
+            DisplaySwitchedHeldItemMessage(gSpecialVar_ItemId, sPartyMenuItemId, TRUE);
+            gTasks[taskId].func = Task_UpdateHeldItemSprite;
         }
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
-    case 1:
-        gTasks[taskId].func = sub_81B1C1C;
+        // fallthrough
+    case 1: // No
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         break;
     }
 }
 
-static void sub_81B44FC(u8 taskId)
+static void Task_WriteMailToGiveMonAfterText(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        gUnknown_0203CEC4->exitCallback = sub_81B452C;
+        sPartyMenuInternal->exitCallback = CB2_WriteMailToGiveMon;
         Task_ClosePartyMenu(taskId);
     }
 }
 
-static void sub_81B452C(void)
+static void CB2_WriteMailToGiveMon(void)
 {
-    u8 mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_MAIL);
+    u8 mail = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAIL);
 
     DoEasyChatScreen(
-    	EASY_CHAT_TYPE_MAIL,
-    	gSaveBlock1Ptr->mail[mail].words,
-    	sub_81B4578,
-    	EASY_CHAT_PERSON_DISPLAY_NONE);
+        EASY_CHAT_TYPE_MAIL,
+        gSaveBlock1Ptr->mail[mail].words,
+        CB2_ReturnToPartyMenuFromWritingMail,
+        EASY_CHAT_PERSON_DISPLAY_NONE);
 }
 
-static void sub_81B4578(void)
+static void CB2_ReturnToPartyMenuFromWritingMail(void)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
 
+    // Canceled writing mail
     if (gSpecialVar_Result == FALSE)
     {
         TakeMailFromMon(mon);
-        SetMonData(mon, MON_DATA_HELD_ITEM, &gUnknown_0203CEFC);
-        RemoveBagItem(gUnknown_0203CEFC, 1);
+        SetMonData(mon, MON_DATA_HELD_ITEM, &sPartyMenuItemId);
+        RemoveBagItem(sPartyMenuItemId, 1);
         AddBagItem(item, 1);
-        InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0, sub_81B36FC, gUnknown_0203CEC8.exitCallback);
+        InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_CHOOSE_MON, Task_TryCreateSelectionWindow, gPartyMenu.exitCallback);
     }
+    // Wrote mail
     else
     {
-        InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0x7F, sub_81B4624, gUnknown_0203CEC8.exitCallback);
+        InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_NONE, Task_DisplayGaveMailFromPartyMessage, gPartyMenu.exitCallback);
     }
 }
 
-static void sub_81B4624(u8 taskId)
+// Nearly redundant with Task_DisplayGaveMailFromBagMessgae
+static void Task_DisplayGaveMailFromPartyMessage(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_0203CEFC == ITEM_NONE)
-            sub_81B1C84(&gPlayerParty[gUnknown_0203CEC8.slotId], gSpecialVar_ItemId, 0, 0);
+        if (sPartyMenuItemId == ITEM_NONE)
+            DisplayGaveHeldItemMessage(&gPlayerParty[gPartyMenu.slotId], gSpecialVar_ItemId, FALSE, 0);
         else
-            sub_81B1D68(gSpecialVar_ItemId, gUnknown_0203CEFC, 0);
-        gTasks[taskId].func = sub_81B469C;
+            DisplaySwitchedHeldItemMessage(gSpecialVar_ItemId, sPartyMenuItemId, FALSE);
+        gTasks[taskId].func = Task_UpdateHeldItemSprite;
     }
 }
 
-static void sub_81B469C(u8 taskId)
+static void Task_UpdateHeldItemSprite(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
 
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B5C94(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId]);
-        if (gUnknown_0203CEC8.unk8_0 == 12)
+        UpdatePartyMonHeldItemSprite(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
+        if (gPartyMenu.menuType == PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS)
         {
             if (GetMonData(mon, MON_DATA_HELD_ITEM) != ITEM_NONE)
-                DisplayPartyPokemonSelectionText(11, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
+                DisplayPartyPokemonDescriptionText(PARTYBOX_DESC_HAVE, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
             else
-                DisplayPartyPokemonSelectionText(12, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
+                DisplayPartyPokemonDescriptionText(PARTYBOX_DESC_DONT_HAVE, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
         }
-        sub_81B1C1C(taskId);
+        Task_ReturnToChooseMonAfterText(taskId);
     }
 }
 
 static void CursorCb_TakeItem(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
 
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     switch (TryTakeMonItem(mon))
     {
-    case 0:
+    case 0: // Not holding item
         GetMonNickname(mon, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding);
-        DisplayPartyMenuMessage(gStringVar4, 1);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         break;
-    case 1:
-        pokemon_item_not_removed(item);
-        DisplayPartyMenuMessage(gStringVar4, 1);
+    case 1: // No room to take item
+        BufferBagFullCantTakeItemMessage(item);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         break;
-    default:
-        sub_81B1CD0(mon, item, 1);
+    default: // Took item
+        DisplayTookHeldItemMessage(mon, item, TRUE);
         break;
     }
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B469C;
+    gTasks[taskId].func = Task_UpdateHeldItemSprite;
 }
 
 static void CursorCb_Toss(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
 
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     if (item == ITEM_NONE)
     {
         GetMonNickname(mon, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        gTasks[taskId].func = sub_81B469C;
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        gTasks[taskId].func = Task_UpdateHeldItemSprite;
     }
     else
     {
         CopyItemName(item, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_ThrowAwayItem);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        gTasks[taskId].func = sub_81B48A8;
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        gTasks[taskId].func = Task_TossHeldItemYesNo;
     }
 }
 
-static void sub_81B48A8(u8 taskId)
+static void Task_TossHeldItemYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B48DC;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleTossHeldItemYesNoInput;
     }
 }
 
-static void sub_81B48DC(u8 taskId)
+static void Task_HandleTossHeldItemYesNoInput(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
 
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
         CopyItemName(GetMonData(mon, MON_DATA_HELD_ITEM), gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_ItemThrownAway);
-        DisplayPartyMenuMessage(gStringVar4, 0);
-        gTasks[taskId].func = sub_81B4988;
+        DisplayPartyMenuMessage(gStringVar4, FALSE);
+        gTasks[taskId].func = Task_TossHeldItem;
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        gTasks[taskId].func = sub_81B1C1C;
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         break;
     }
 }
 
-static void sub_81B4988(u8 taskId)
+static void Task_TossHeldItem(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
 
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
         u16 item = ITEM_NONE;
 
         SetMonData(mon, MON_DATA_HELD_ITEM, &item);
-        sub_81B5C94(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId]);
-        DisplayPartyPokemonSelectionText(12, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
-        gTasks[taskId].func = sub_81B1C1C;
+        UpdatePartyMonHeldItemSprite(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
+        DisplayPartyPokemonDescriptionText(PARTYBOX_DESC_DONT_HAVE, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
     }
 }
 
 static void CursorCb_Mail(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    sub_81B33B4(gPlayerParty, gUnknown_0203CEC8.slotId, 9);
-    sub_81B31B0(2);
-    DisplayPartyMenuStdMessage(25);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    SetPartyMonSelectionActions(gPlayerParty, gPartyMenu.slotId, ACTIONS_MAIL);
+    DisplaySelectionWindow(SELECTWINDOW_MAIL);
+    DisplayPartyMenuStdMessage(PARTY_MSG_DO_WHAT_WITH_MAIL);
     gTasks[taskId].data[0] = 0xFF;
-    gTasks[taskId].func = HandleMenuInput;
+    gTasks[taskId].func = Task_HandleSelectionMenuInput;
 }
 
 static void CursorCb_Read(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    gUnknown_0203CEC4->exitCallback = sub_81B4A98;
+    sPartyMenuInternal->exitCallback = CB2_ReadHeldMail;
     Task_ClosePartyMenu(taskId);
 }
 
-static void sub_81B4A98(void)
+static void CB2_ReadHeldMail(void)
 {
-    ReadMail(&gSaveBlock1Ptr->mail[GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_MAIL)], sub_81B4AE0, 1);
+    ReadMail(&gSaveBlock1Ptr->mail[GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAIL)], CB2_ReturnToPartyMenuFromReadingMail, 1);
 }
 
-static void sub_81B4AE0(void)
+static void CB2_ReturnToPartyMenuFromReadingMail(void)
 {
     gPaletteFade.bufferTransferDisabled = TRUE;
-    InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 21, sub_81B36FC, gUnknown_0203CEC8.exitCallback);
+    InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_DO_WHAT_WITH_MON, Task_TryCreateSelectionWindow, gPartyMenu.exitCallback);
 }
 
 static void CursorCb_TakeMail(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    DisplayPartyMenuMessage(gText_SendMailToPC, 1);
-    gTasks[taskId].func = sub_81B4B6C;
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    DisplayPartyMenuMessage(gText_SendMailToPC, TRUE);
+    gTasks[taskId].func = Task_SendMailToPCYesNo;
 }
 
-static void sub_81B4B6C(u8 taskId)
+static void Task_SendMailToPCYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B4BA0;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleSendMailToPCYesNoInput;
     }
 }
 
-static void sub_81B4BA0(u8 taskId)
+static void Task_HandleSendMailToPCYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-    case 0:
-        if (TakeMailFromMon2(&gPlayerParty[gUnknown_0203CEC8.slotId]) != 0xFF)
+    case 0: // Yes, send to PC
+        if (TakeMailFromMon2(&gPlayerParty[gPartyMenu.slotId]) != 0xFF)
         {
-            DisplayPartyMenuMessage(gText_MailSentToPC, 0);
-            gTasks[taskId].func = sub_81B469C;
+            DisplayPartyMenuMessage(gText_MailSentToPC, FALSE);
+            gTasks[taskId].func = Task_UpdateHeldItemSprite;
         }
         else
         {
-            DisplayPartyMenuMessage(gText_PCMailboxFull, 0);
-            gTasks[taskId].func = sub_81B1C1C;
+            DisplayPartyMenuMessage(gText_PCMailboxFull, FALSE);
+            gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         }
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        DisplayPartyMenuMessage(gText_MailMessageWillBeLost, 1);
-        gTasks[taskId].func = sub_81B4C60;
+        DisplayPartyMenuMessage(gText_MailMessageWillBeLost, TRUE);
+        gTasks[taskId].func = Task_LoseMailMessageYesNo;
         break;
     }
 }
 
-static void sub_81B4C60(u8 taskId)
+static void Task_LoseMailMessageYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B4C94;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleLoseMailMessageYesNoInput;
     }
 }
 
-static void sub_81B4C94(u8 taskId)
+static void Task_HandleLoseMailMessageYesNoInput(u8 taskId)
 {
     u16 item;
 
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-    case 0:
-        item = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_HELD_ITEM);
+    case 0: // Yes, lose mail message
+        item = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_HELD_ITEM);
         if (AddBagItem(item, 1) == TRUE)
         {
-            TakeMailFromMon(&gPlayerParty[gUnknown_0203CEC8.slotId]);
-            DisplayPartyMenuMessage(gText_MailTakenFromPkmn, 0);
-            gTasks[taskId].func = sub_81B469C;
+            TakeMailFromMon(&gPlayerParty[gPartyMenu.slotId]);
+            DisplayPartyMenuMessage(gText_MailTakenFromPkmn, FALSE);
+            gTasks[taskId].func = Task_UpdateHeldItemSprite;
         }
         else
         {
-            pokemon_item_not_removed(item);
-            DisplayPartyMenuMessage(gStringVar4, 0);
-            gTasks[taskId].func = sub_81B1C1C;
+            BufferBagFullCantTakeItemMessage(item);
+            DisplayPartyMenuMessage(gStringVar4, FALSE);
+            gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         }
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        gTasks[taskId].func = sub_81B1C1C;
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         break;
     }
 }
 
 static void CursorCb_Cancel2(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
 
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    sub_81B33B4(gPlayerParty, gUnknown_0203CEC8.slotId, sub_81B353C(mon));
-    if (gUnknown_0203CEC8.unk8_0 != 12)
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    SetPartyMonSelectionActions(gPlayerParty, gPartyMenu.slotId, GetPartyMenuActionsType(mon));
+    if (gPartyMenu.menuType != PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS)
     {
-        sub_81B31B0(0);
-        DisplayPartyMenuStdMessage(21);
+        DisplaySelectionWindow(SELECTWINDOW_ACTIONS);
+        DisplayPartyMenuStdMessage(PARTY_MSG_DO_WHAT_WITH_MON);
     }
     else
     {
-        sub_81B31B0(1);
+        DisplaySelectionWindow(SELECTWINDOW_ITEM);
         CopyItemName(GetMonData(mon, MON_DATA_HELD_ITEM), gStringVar2);
-        DisplayPartyMenuStdMessage(26);
+        DisplayPartyMenuStdMessage(PARTY_MSG_ALREADY_HOLDING_ONE);
     }
     gTasks[taskId].data[0] = 0xFF;
-    gTasks[taskId].func = HandleMenuInput;
+    gTasks[taskId].func = Task_HandleSelectionMenuInput;
 }
 
 static void CursorCb_SendMon(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    if (sub_81B8A7C() == TRUE)
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    if (TrySwitchInPokemon() == TRUE)
     {
         Task_ClosePartyMenu(taskId);
     }
     else
     {
-        PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        gTasks[taskId].func = sub_81B1C1C;
+        // gStringVar4 below is the error message buffered by TrySwitchInPokemon
+        PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
     }
 }
 
 static void CursorCb_Enter(u8 taskId)
 {
-    u8 unk;
+    u8 maxBattlers;
     u8 i;
 
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    unk = sub_81B8830();
-    for (i = 0; i < unk; i++)
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    maxBattlers = GetMaxBattleEntries();
+    for (i = 0; i < maxBattlers; i++)
     {
         if (gSelectedOrderFromParty[i] == 0)
         {
             PlaySE(SE_SELECT);
-            gSelectedOrderFromParty[i] = gUnknown_0203CEC8.slotId + 1;
-            DisplayPartyPokemonSelectionText(i + 2, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
-            if (i == (unk - 1))
-                sub_81B4F88();
-            DisplayPartyMenuStdMessage(0);
-            gTasks[taskId].func = sub_81B1370;
+            gSelectedOrderFromParty[i] = gPartyMenu.slotId + 1;
+            DisplayPartyPokemonDescriptionText(i + PARTYBOX_DESC_FIRST, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
+            if (i == (maxBattlers - 1))
+                MoveCursorToConfirm();
+            DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+            gTasks[taskId].func = Task_HandleChooseMonInput;
             return;
         }
     }
-    ConvertIntToDecimalStringN(gStringVar1, unk, STR_CONV_MODE_LEFT_ALIGN, 1);
+    ConvertIntToDecimalStringN(gStringVar1, maxBattlers, STR_CONV_MODE_LEFT_ALIGN, 1);
     StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn);
     PlaySE(SE_HAZURE);
-    DisplayPartyMenuMessage(gStringVar4, 1);
-    gTasks[taskId].func = sub_81B1C1C;
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
+    gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
 }
 
-static void sub_81B4F88(void)
+static void MoveCursorToConfirm(void)
 {
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 0);
-    gUnknown_0203CEC8.slotId = 6;
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
+    AnimatePartySlot(gPartyMenu.slotId, 0);
+    gPartyMenu.slotId = PARTY_SIZE;
+    AnimatePartySlot(gPartyMenu.slotId, 1);
 }
 
 static void CursorCb_NoEntry(u8 taskId)
 {
-    u8 unk;
+    u8 maxBattlers;
     u8 i, j;
 
     PlaySE(SE_SELECT);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    unk = sub_81B8830();
-    for (i = 0; i < unk; i++)
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    maxBattlers = GetMaxBattleEntries();
+    for (i = 0; i < maxBattlers; i++)
     {
-        if (gSelectedOrderFromParty[i] == (gUnknown_0203CEC8.slotId + 1))
+        if (gSelectedOrderFromParty[i] == (gPartyMenu.slotId + 1))
         {
-            for (j = i; j < (unk - 1); j++)
+            for (j = i; j < (maxBattlers - 1); j++)
                 gSelectedOrderFromParty[j] = gSelectedOrderFromParty[j + 1];
             gSelectedOrderFromParty[j] = 0;
             break;
         }
     }
-    DisplayPartyPokemonSelectionText(1, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
-    for (i = 0; i < (unk - 1); i++)
+    DisplayPartyPokemonDescriptionText(PARTYBOX_DESC_ABLE_3, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
+    for (i = 0; i < (maxBattlers - 1); i++)
     {
         if (gSelectedOrderFromParty[i] != 0)
-            DisplayPartyPokemonSelectionText(i + 2, &gUnknown_0203CEDC[gSelectedOrderFromParty[i] - 1], 1);
+            DisplayPartyPokemonDescriptionText(i + PARTYBOX_DESC_FIRST, &sPartyMenuBoxes[gSelectedOrderFromParty[i] - 1], 1);
     }
-    DisplayPartyMenuStdMessage(0);
-    gTasks[taskId].func = sub_81B1370;
+    DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
 static void CursorCb_Store(u8 taskId)
@@ -4632,9 +3523,9 @@ static void CursorCb_Store(u8 taskId)
 // Register mon for the Trading Board in Union Room
 static void CursorCb_Register(u8 taskId)
 {
-    u16 species2 = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES2);
-    u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES);
-    u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_OBEDIENCE);
+    u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
+    u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
+    u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
 
     switch (CanRegisterMonForTradingBoard(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_800F7DC(), species2, species, obedience))
     {
@@ -4650,29 +3541,29 @@ static void CursorCb_Register(u8 taskId)
         return;
     }
     PlaySE(SE_HAZURE);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     StringAppend(gStringVar4, gText_PauseUntilPress);
-    DisplayPartyMenuMessage(gStringVar4, 1);
-    gTasks[taskId].func = sub_81B1C1C;
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
+    gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
 }
 
 static void CursorCb_Trade1(u8 taskId)
 {
-    u16 species2 = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES2);
-    u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES);
-    u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_OBEDIENCE);
+    u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
+    u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
+    u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
     u32 stringId = GetUnionRoomTradeMessageId(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_800F7DC(), gUnknown_02022C38, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience);
 
     if (stringId != UR_TRADE_MSG_NONE)
     {
         StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]);
         PlaySE(SE_HAZURE);
-        PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-        PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+        PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+        PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
         StringAppend(gStringVar4, gText_PauseUntilPress);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        gTasks[taskId].func = sub_81B1C1C;
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
     }
     else
     {
@@ -4681,11 +3572,13 @@ static void CursorCb_Trade1(u8 taskId)
     }
 }
 
+// Spin Trade (based on the translation of the Japanese trade prompt)
+// Not fully implemented, and normally unreachable because PARTY_MENU_TYPE_SPIN_TRADE is never used
 static void CursorCb_Trade2(u8 taskId)
 {
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-    switch (CanTradeSelectedPartyMenuMon(gPlayerParty, gUnknown_0203CEC8.slotId))
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+    switch (CanSpinTradeMon(gPlayerParty, gPartyMenu.slotId))
     {
     case CANT_TRADE_LAST_MON:
         StringExpandPlaceholders(gStringVar4, gText_OnlyPkmnForBattle);
@@ -4693,33 +3586,34 @@ static void CursorCb_Trade2(u8 taskId)
     case CANT_TRADE_NATIONAL:
         StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow);
         break;
-    case CANT_TRADE_EGG:
+    case CANT_TRADE_EGG_YET:
         StringExpandPlaceholders(gStringVar4, gText_EggCantBeTradedNow);
         break;
-    default:
+    default: // CAN_TRADE_MON
         PlaySE(SE_SELECT);
-        GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1);
-        StringExpandPlaceholders(gStringVar4, gJPText_PutVar1IntoSpinner);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        gTasks[taskId].func = sub_81B53FC;
+        GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
+        StringExpandPlaceholders(gStringVar4, gJPText_AreYouSureYouWantToSpinTradeMon);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        gTasks[taskId].func = Task_SpinTradeYesNo;
         return;
     }
     PlaySE(SE_HAZURE);
     StringAppend(gStringVar4, gText_PauseUntilPress);
-    DisplayPartyMenuMessage(gStringVar4, 1);
-    gTasks[taskId].func = sub_81B1C1C;
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
+    gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
 }
 
-static void sub_81B53FC(u8 taskId)
+static void Task_SpinTradeYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B5430;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleSpinTradeYesNoInput;
     }
 }
 
-static void sub_81B5430(u8 taskId)
+// See comment on CursorCb_Trade2. Because no callback is set, selecting YES (0) to spin trade just closes the party menu
+static void Task_HandleSpinTradeYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
@@ -4728,39 +3622,40 @@ static void sub_81B5430(u8 taskId)
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        sub_81B1C1C(taskId);
+        Task_ReturnToChooseMonAfterText(taskId);
         break;
     }
 }
 
 static void CursorCb_FieldMove(u8 taskId)
 {
-    u8 fieldMove = gUnknown_0203CEC4->actions[Menu_GetCursorPos()] - MENU_FIELD_MOVES;
+    u8 fieldMove = sPartyMenuInternal->actions[Menu_GetCursorPos()] - MENU_FIELD_MOVES;
     const struct MapHeader *mapHeader;
 
     PlaySE(SE_SELECT);
     if (sFieldMoveCursorCallbacks[fieldMove].fieldMoveFunc == NULL)
         return;
 
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     if (sub_81221AC() == TRUE || InUnionRoom() == TRUE)
     {
         if (fieldMove == FIELD_MOVE_MILK_DRINK || fieldMove == FIELD_MOVE_SOFT_BOILED)
-            DisplayPartyMenuStdMessage(13);
+            DisplayPartyMenuStdMessage(PARTY_MSG_CANT_USE_HERE);
         else
             DisplayPartyMenuStdMessage(sFieldMoveCursorCallbacks[fieldMove].msgId);
 
-        gTasks[taskId].func = task_brm_cancel_1_on_keypad_a_or_b;
+        gTasks[taskId].func = Task_CancelAfterAorBPress;
     }
     else
     {
         // All field moves before WATERFALL are HMs.
         if (fieldMove <= FIELD_MOVE_WATERFALL && FlagGet(FLAG_BADGE01_GET + fieldMove) != TRUE)
         {
-            DisplayPartyMenuMessage(gText_CantUseUntilNewBadge, 1);
-            gTasks[taskId].func = sub_81B1C1C;
+            DisplayPartyMenuMessage(gText_CantUseUntilNewBadge, TRUE);
+            gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
         }
         else if (sFieldMoveCursorCallbacks[fieldMove].fieldMoveFunc() == TRUE)
         {
@@ -4768,80 +3663,82 @@ static void CursorCb_FieldMove(u8 taskId)
             {
             case FIELD_MOVE_MILK_DRINK:
             case FIELD_MOVE_SOFT_BOILED:
-                sub_8161560(taskId);
+                ChooseMonForSoftboiled(taskId);
                 break;
             case FIELD_MOVE_TELEPORT:
                 mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->lastHealLocation.mapGroup, gSaveBlock1Ptr->lastHealLocation.mapNum);
-                sub_81245DC(gStringVar1, mapHeader->regionMapSectionId);
+                GetMapNameGeneric(gStringVar1, mapHeader->regionMapSectionId);
                 StringExpandPlaceholders(gStringVar4, gText_ReturnToHealingSpot);
-                sub_81B5674(taskId);
-                gUnknown_0203CEC4->data[0] = fieldMove;
+                DisplayFieldMoveExitAreaMessage(taskId);
+                sPartyMenuInternal->data[0] = fieldMove;
                 break;
             case FIELD_MOVE_DIG:
                 mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum);
-                sub_81245DC(gStringVar1, mapHeader->regionMapSectionId);
+                GetMapNameGeneric(gStringVar1, mapHeader->regionMapSectionId);
                 StringExpandPlaceholders(gStringVar4, gText_EscapeFromHere);
-                sub_81B5674(taskId);
-                gUnknown_0203CEC4->data[0] = fieldMove;
+                DisplayFieldMoveExitAreaMessage(taskId);
+                sPartyMenuInternal->data[0] = fieldMove;
                 break;
             case FIELD_MOVE_FLY:
-                gUnknown_0203CEC8.exitCallback = MCB2_FlyMap;
+                gPartyMenu.exitCallback = MCB2_FlyMap;
                 Task_ClosePartyMenu(taskId);
                 break;
             default:
-                gUnknown_0203CEC8.exitCallback = CB2_ReturnToField;
+                gPartyMenu.exitCallback = CB2_ReturnToField;
                 Task_ClosePartyMenu(taskId);
                 break;
             }
         }
+        // Cant use Field Move
         else
         {
             switch (fieldMove)
             {
             case FIELD_MOVE_SURF:
-                sub_81B5864();
+                DisplayCantUseSurfMessage();
                 break;
             case FIELD_MOVE_FLASH:
-                sub_81B57DC();
+                DisplayCantUseFlashMessage();
                 break;
             default:
                 DisplayPartyMenuStdMessage(sFieldMoveCursorCallbacks[fieldMove].msgId);
                 break;
             }
-            gTasks[taskId].func = task_brm_cancel_1_on_keypad_a_or_b;
+            gTasks[taskId].func = Task_CancelAfterAorBPress;
         }
     }
 }
 
-static void sub_81B5674(u8 taskId)
+static void DisplayFieldMoveExitAreaMessage(u8 taskId)
 {
-    DisplayPartyMenuMessage(gStringVar4, 1);
-    gTasks[taskId].func = sub_81B56A4;
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
+    gTasks[taskId].func = Task_FieldMoveExitAreaYesNo;
 }
 
-static void sub_81B56A4(u8 taskId)
+static void Task_FieldMoveExitAreaYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B56D8;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleFieldMoveExitAreaYesNoInput;
     }
 }
 
-static void sub_81B56D8(u8 taskId)
+static void Task_HandleFieldMoveExitAreaYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
-        gUnknown_0203CEC8.exitCallback = CB2_ReturnToField;
+        gPartyMenu.exitCallback = CB2_ReturnToField;
         Task_ClosePartyMenu(taskId);
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
         gFieldCallback2 = NULL;
         gPostMenuFieldCallback = NULL;
-        sub_81B1C1C(taskId);
+        Task_ReturnToChooseMonAfterText(taskId);
         break;
     }
 }
@@ -4849,40 +3746,40 @@ static void sub_81B56D8(u8 taskId)
 bool8 FieldCallback_PrepareFadeInFromMenu(void)
 {
     pal_fill_black();
-    CreateTask(task_launch_hm_phase_2, 8);
+    CreateTask(Task_FieldMoveWaitForFade, 8);
     return TRUE;
 }
 
-static void task_launch_hm_phase_2(u8 taskId)
+static void Task_FieldMoveWaitForFade(u8 taskId)
 {
     if (IsWeatherNotFadingIn() == TRUE)
     {
-        gFieldEffectArguments[0] = brm_get_selected_species();
+        gFieldEffectArguments[0] = GetFieldMoveMonSpecies();
         gPostMenuFieldCallback();
         DestroyTask(taskId);
     }
 }
 
-static u16 brm_get_selected_species(void)
+static u16 GetFieldMoveMonSpecies(void)
 {
-    return GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_SPECIES);
+    return GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
 }
 
-static void task_brm_cancel_1_on_keypad_a_or_b(u8 taskId)
+static void Task_CancelAfterAorBPress(u8 taskId)
 {
     if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
         CursorCb_Cancel1(taskId);
 }
 
-static void sub_81B57DC(void)
+static void DisplayCantUseFlashMessage(void)
 {
     if (FlagGet(FLAG_SYS_USE_FLASH) == TRUE)
-        DisplayPartyMenuStdMessage(12);
+        DisplayPartyMenuStdMessage(PARTY_MSG_ALREADY_IN_USE);
     else
-        DisplayPartyMenuStdMessage(13);
+        DisplayPartyMenuStdMessage(PARTY_MSG_CANT_USE_HERE);
 }
 
-static void hm_surf_run_dp02scr(void)
+static void FieldCallback_Surf(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     FieldEffectStart(FLDEFF_USE_SURF);
@@ -4893,18 +3790,18 @@ static bool8 SetUpFieldMove_Surf(void)
     if (PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = hm_surf_run_dp02scr;
+        gPostMenuFieldCallback = FieldCallback_Surf;
         return TRUE;
     }
     return FALSE;
 }
 
-static void sub_81B5864(void)
+static void DisplayCantUseSurfMessage(void)
 {
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-        DisplayPartyMenuStdMessage(9);
+        DisplayPartyMenuStdMessage(PARTY_MSG_ALREADY_SURFING);
     else
-        DisplayPartyMenuStdMessage(8);
+        DisplayPartyMenuStdMessage(PARTY_MSG_CANT_SURF_HERE);
 }
 
 static bool8 SetUpFieldMove_Fly(void)
@@ -4915,12 +3812,12 @@ static bool8 SetUpFieldMove_Fly(void)
         return FALSE;
 }
 
-void sub_81B58A8(void)
+void CB2_ReturnToPartyMenuFromFlyMap(void)
 {
-    InitPartyMenu(0, 0, 0, 1, 0, sub_81B1370, CB2_ReturnToFieldWithOpenMenu);
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, TRUE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_ReturnToFieldWithOpenMenu);
 }
 
-static void hm2_waterfall(void)
+static void FieldCallback_Waterfall(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     FieldEffectStart(FLDEFF_USE_WATERFALL);
@@ -4934,13 +3831,13 @@ static bool8 SetUpFieldMove_Waterfall(void)
     if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE && IsPlayerSurfingNorth() == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = hm2_waterfall;
+        gPostMenuFieldCallback = FieldCallback_Waterfall;
         return TRUE;
     }
     return FALSE;
 }
 
-static void sub_81B5958(void)
+static void FieldCallback_Dive(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     FieldEffectStart(FLDEFF_USE_DIVE);
@@ -4952,34 +3849,36 @@ static bool8 SetUpFieldMove_Dive(void)
     if (gFieldEffectArguments[1] != 0)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = sub_81B5958;
+        gPostMenuFieldCallback = FieldCallback_Dive;
         return TRUE;
     }
     return FALSE;
 }
 
-static void party_menu_icon_anim(struct Pokemon *mon, struct Struct203CEDC *ptr, u32 a)
+static void CreatePartyMonIconSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox, u32 slot)
 {
-    u32 bit = 1;
+    bool32 handleDeoxys = TRUE;
     u16 species2;
 
+    // If in a multi battle, show partners Deoxys icon as Normal forme
     if (IsMultiBattle() == TRUE && gMain.inBattle)
-        bit = (gUnknown_08616020[a] ^ bit) ? 1 : 0;
+        handleDeoxys = (sMultiBattlePartnersPartyMask[slot] ^ handleDeoxys) ? TRUE : FALSE;
+
     species2 = GetMonData(mon, MON_DATA_SPECIES2);
-    party_menu_link_mon_icon_anim(species2, GetMonData(mon, MON_DATA_PERSONALITY), ptr, 1, bit);
-    sub_81B5B38(ptr->monSpriteId, mon);
+    CreatePartyMonIconSpriteParameterized(species2, GetMonData(mon, MON_DATA_PERSONALITY), menuBox, 1, handleDeoxys);
+    UpdatePartyMonHPBar(menuBox->monSpriteId, mon);
 }
 
-static void party_menu_link_mon_icon_anim(u16 species, u32 pid, struct Struct203CEDC *ptr, u8 priority, u32 bit)
+static void CreatePartyMonIconSpriteParameterized(u16 species, u32 pid, struct PartyMenuBox *menuBox, u8 priority, bool32 handleDeoxys)
 {
     if (species != SPECIES_NONE)
     {
-        ptr->monSpriteId = CreateMonIcon(species, UpdateTradeMonIconFrame, ptr->unk4[0], ptr->unk4[1], 4, pid, bit);
-        gSprites[ptr->monSpriteId].oam.priority = priority;
+        menuBox->monSpriteId = CreateMonIcon(species, SpriteCB_MonIcon, menuBox->spriteCoords[0], menuBox->spriteCoords[1], 4, pid, handleDeoxys);
+        gSprites[menuBox->monSpriteId].oam.priority = priority;
     }
 }
 
-static void sub_81B5A8C(u8 spriteId, u16 hp, u16 maxhp)
+static void UpdateHPBar(u8 spriteId, u16 hp, u16 maxhp)
 {
     switch (GetHPBarLevel(hp, maxhp))
     {
@@ -5001,15 +3900,15 @@ static void sub_81B5A8C(u8 spriteId, u16 hp, u16 maxhp)
     }
 }
 
-static void sub_81B5B38(u8 spriteId, struct Pokemon *mon)
+static void UpdatePartyMonHPBar(u8 spriteId, struct Pokemon *mon)
 {
-    sub_81B5A8C(spriteId, GetMonData(mon, MON_DATA_HP), GetMonData(mon, MON_DATA_MAX_HP));
+    UpdateHPBar(spriteId, GetMonData(mon, MON_DATA_HP), GetMonData(mon, MON_DATA_MAX_HP));
 }
 
-static void AnimateSelectedPartyIcon(u8 spriteId, u8 a)
+static void AnimateSelectedPartyIcon(u8 spriteId, u8 animNum)
 {
     gSprites[spriteId].data[0] = 0;
-    if (a == 0)
+    if (animNum == 0)
     {
         if (gSprites[spriteId].pos1.x == 16)
         {
@@ -5021,71 +3920,71 @@ static void AnimateSelectedPartyIcon(u8 spriteId, u8 a)
             gSprites[spriteId].pos2.x = -4;
             gSprites[spriteId].pos2.y = 0;
         }
-        gSprites[spriteId].callback = UpdatePartyMonIconFrame;
+        gSprites[spriteId].callback = SpriteCB_UpdatePartyMonIcon;
     }
     else
     {
         gSprites[spriteId].pos2.x = 0;
         gSprites[spriteId].pos2.y = 0;
-        gSprites[spriteId].callback = UpdatePartyMonIconFrameAndBounce;
+        gSprites[spriteId].callback = SpriteCB_BouncePartyMonIcon;
     }
 }
 
-static void UpdatePartyMonIconFrameAndBounce(struct Sprite *sprite)
+static void SpriteCB_BouncePartyMonIcon(struct Sprite *sprite)
 {
-    u8 unk = UpdateMonIconFrame(sprite);
+    u8 animCmd = UpdateMonIconFrame(sprite);
 
-    if (unk != 0)
+    if (animCmd != 0)
     {
-        if (unk & 1)
+        if (animCmd & 1) // % 2 also matches
             sprite->pos2.y = -3;
         else
             sprite->pos2.y = 1;
     }
 }
 
-static void UpdatePartyMonIconFrame(struct Sprite *sprite)
+static void SpriteCB_UpdatePartyMonIcon(struct Sprite *sprite)
 {
     UpdateMonIconFrame(sprite);
 }
 
-static void party_menu_held_item_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void CreatePartyMonHeldItemSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
-        ptr->itemSpriteId = CreateSprite(&sSpriteTemplate_HeldItem, ptr->unk4[2], ptr->unk4[3], 0);
-        sub_81B5C94(mon, ptr);
+        menuBox->itemSpriteId = CreateSprite(&sSpriteTemplate_HeldItem, menuBox->spriteCoords[2], menuBox->spriteCoords[3], 0);
+        UpdatePartyMonHeldItemSprite(mon, menuBox);
     }
 }
 
-static void party_menu_link_mon_held_item_object(u16 species, u16 item, struct Struct203CEDC *ptr)
+static void CreatePartyMonHeldItemSpriteParameterized(u16 species, u16 item, struct PartyMenuBox *menuBox)
 {
     if (species != SPECIES_NONE)
     {
-        ptr->itemSpriteId = CreateSprite(&sSpriteTemplate_HeldItem, ptr->unk4[2], ptr->unk4[3], 0);
-        gSprites[ptr->itemSpriteId].oam.priority = 0;
-        sub_81B5CB0(item, ptr);
+        menuBox->itemSpriteId = CreateSprite(&sSpriteTemplate_HeldItem, menuBox->spriteCoords[2], menuBox->spriteCoords[3], 0);
+        gSprites[menuBox->itemSpriteId].oam.priority = 0;
+        ShowOrHideHeldItemSprite(item, menuBox);
     }
 }
 
-static void sub_81B5C94(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void UpdatePartyMonHeldItemSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
-    sub_81B5CB0(GetMonData(mon, MON_DATA_HELD_ITEM), ptr);
+    ShowOrHideHeldItemSprite(GetMonData(mon, MON_DATA_HELD_ITEM), menuBox);
 }
 
-static void sub_81B5CB0(u16 item, struct Struct203CEDC *ptr)
+static void ShowOrHideHeldItemSprite(u16 item, struct PartyMenuBox *menuBox)
 {
     if (item == ITEM_NONE)
     {
-        gSprites[ptr->itemSpriteId].invisible = TRUE;
+        gSprites[menuBox->itemSpriteId].invisible = TRUE;
     }
     else
     {
         if (ItemIsMail(item))
-            StartSpriteAnim(&gSprites[ptr->itemSpriteId], 1);
+            StartSpriteAnim(&gSprites[menuBox->itemSpriteId], 1);
         else
-            StartSpriteAnim(&gSprites[ptr->itemSpriteId], 0);
-        gSprites[ptr->itemSpriteId].invisible = FALSE;
+            StartSpriteAnim(&gSprites[menuBox->itemSpriteId], 0);
+        gSprites[menuBox->itemSpriteId].invisible = FALSE;
     }
 }
 
@@ -5150,22 +4049,23 @@ static void SpriteCB_HeldItem(struct Sprite *sprite)
     }
 }
 
-static void party_menu_pokeball_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void CreatePartyMonPokeballSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
-        ptr->pokeballSpriteId = CreateSprite(&sSpriteTemplate_MenuPokeball, ptr->unk4[6], ptr->unk4[7], 8);
+        menuBox->pokeballSpriteId = CreateSprite(&sSpriteTemplate_MenuPokeball, menuBox->spriteCoords[6], menuBox->spriteCoords[7], 8);
 }
 
-static void party_menu_link_mon_pokeball_object(u16 species, struct Struct203CEDC *ptr)
+static void CreatePartyMonPokeballSpriteParameterized(u16 species, struct PartyMenuBox *menuBox)
 {
     if (species != SPECIES_NONE)
     {
-        ptr->pokeballSpriteId = CreateSprite(&sSpriteTemplate_MenuPokeball, ptr->unk4[6], ptr->unk4[7], 8);
-        gSprites[ptr->pokeballSpriteId].oam.priority = 0;
+        menuBox->pokeballSpriteId = CreateSprite(&sSpriteTemplate_MenuPokeball, menuBox->spriteCoords[6], menuBox->spriteCoords[7], 8);
+        gSprites[menuBox->pokeballSpriteId].oam.priority = 0;
     }
 }
 
-static u8 sub_81B5F34(u8 x, u8 y)
+// For Cancel when Confirm isnt present
+static u8 CreatePokeballButtonSprite(u8 x, u8 y)
 {
     u8 spriteId = CreateSprite(&sSpriteTemplate_MenuPokeball, x, y, 8);
 
@@ -5173,19 +4073,22 @@ static u8 sub_81B5F34(u8 x, u8 y)
     return spriteId;
 }
 
-static u8 sub_81B5F74(u8 x, u8 y)
+// For Confirm and Cancel when both are present
+static u8 CreateSmallPokeballButtonSprite(u8 x, u8 y)
 {
-    return CreateSprite(&gSpriteTemplate_8615F78, x, y, 8);
+    return CreateSprite(&sSpriteTemplate_MenuPokeballSmall, x, y, 8);
 }
 
-static void sub_81B5F98(u8 spriteId, u8 a)
+static void PartyMenuStartSpriteAnim(u8 spriteId, u8 animNum)
 {
-    StartSpriteAnim(&gSprites[spriteId], a);
+    StartSpriteAnim(&gSprites[spriteId], animNum);
 }
 
-static void sub_81B5FBC(u8 spriteId, u8 spriteId2, u8 a)
+// Unused. Might explain the large blank section in gPartyMenuPokeballSmall_Gfx
+// At the very least this is how the unused anim cmds for sSpriteAnimTable_MenuPokeballSmall were meant to be accessed
+static void SpriteCB_BounceConfirmCancelButton(u8 spriteId, u8 spriteId2, u8 animNum)
 {
-    if (a == 0)
+    if (animNum == 0)
     {
         StartSpriteAnim(&gSprites[spriteId], 2);
         StartSpriteAnim(&gSprites[spriteId2], 4);
@@ -5208,41 +4111,41 @@ static void LoadPartyMenuPokeballGfx(void)
     LoadCompressedSpritePalette(&sSpritePalette_MenuPokeball);
 }
 
-static void party_menu_status_condition_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void CreatePartyMonStatusSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
-        ptr->statusSpriteId = CreateSprite(&sSpriteTemplate_StatusIcons, ptr->unk4[4], ptr->unk4[5], 0);
-        party_menu_get_status_condition_and_update_object(mon, ptr);
+        menuBox->statusSpriteId = CreateSprite(&sSpriteTemplate_StatusIcons, menuBox->spriteCoords[4], menuBox->spriteCoords[5], 0);
+        SetPartyMonAilmentGfx(mon, menuBox);
     }
 }
 
-static void party_menu_link_mon_status_condition_object(u16 species, u8 status, struct Struct203CEDC *ptr)
+static void CreatePartyMonStatusSpriteParameterized(u16 species, u8 status, struct PartyMenuBox *menuBox)
 {
     if (species != SPECIES_NONE)
     {
-        ptr->statusSpriteId = CreateSprite(&sSpriteTemplate_StatusIcons, ptr->unk4[4], ptr->unk4[5], 0);
-        party_menu_update_status_condition_object(status, ptr);
-        gSprites[ptr->statusSpriteId].oam.priority = 0;
+        menuBox->statusSpriteId = CreateSprite(&sSpriteTemplate_StatusIcons, menuBox->spriteCoords[4], menuBox->spriteCoords[5], 0);
+        UpdatePartyMonAilmentGfx(status, menuBox);
+        gSprites[menuBox->statusSpriteId].oam.priority = 0;
     }
 }
 
-static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
+static void SetPartyMonAilmentGfx(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
-    party_menu_update_status_condition_object(GetMonAilment(mon), ptr);
+    UpdatePartyMonAilmentGfx(GetMonAilment(mon), menuBox);
 }
 
-static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr)
+static void UpdatePartyMonAilmentGfx(u8 status, struct PartyMenuBox *menuBox)
 {
     switch (status)
     {
     case AILMENT_NONE:
     case AILMENT_PKRS:
-        gSprites[ptr->statusSpriteId].invisible = TRUE;
+        gSprites[menuBox->statusSpriteId].invisible = TRUE;
         break;
     default:
-        StartSpriteAnim(&gSprites[ptr->statusSpriteId], status - 1);
-        gSprites[ptr->statusSpriteId].invisible = FALSE;
+        StartSpriteAnim(&gSprites[menuBox->statusSpriteId], status - 1);
+        gSprites[menuBox->statusSpriteId].invisible = FALSE;
         break;
     }
 }
@@ -5253,68 +4156,68 @@ static void LoadPartyMenuAilmentGfx(void)
     LoadCompressedSpritePalette(&sSpritePalette_StatusIcons);
 }
 
-void sub_81B617C(void)
+void CB2_ShowPartyMenuForItemUse(void)
 {
-    MainCallback callback = c2_815ABFC;
-    u8 doubleBattleStatus;
-    bool8 inBattle;
+    MainCallback callback = CB2_ReturnToBagMenu;
+    u8 partyLayout;
+    u8 menuType;
     u8 i;
-    u8 msgIdMaybe;
+    u8 msgId;
     TaskFunc task;
 
     if (gMain.inBattle)
     {
-        inBattle = TRUE;
-        doubleBattleStatus = sub_81B8984();
+        menuType = PARTY_MENU_TYPE_IN_BATTLE;
+        partyLayout = GetPartyLayoutFromBattleType();
     }
     else
     {
-        inBattle = FALSE;
-        doubleBattleStatus = 0;
+        menuType = PARTY_MENU_TYPE_FIELD;
+        partyLayout = PARTY_LAYOUT_SINGLE;
     }
 
     if (GetItemEffectType(gSpecialVar_ItemId) == ITEM_EFFECT_SACRED_ASH)
     {
-        gUnknown_0203CEC8.slotId = 0;
+        gPartyMenu.slotId = 0;
         for (i = 0; i < PARTY_SIZE; i++)
         {
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
             {
-                gUnknown_0203CEC8.slotId = i;
+                gPartyMenu.slotId = i;
                 break;
             }
         }
-        task = sub_81B6280;
-        msgIdMaybe = 0x7F;
+        task = Task_SetSacredAshCB;
+        msgId = PARTY_MSG_NONE;
     }
     else
     {
         if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_TM_HM)
-            msgIdMaybe = 4;
+            msgId = PARTY_MSG_TEACH_WHICH_MON;
         else
-            msgIdMaybe = 5;
+            msgId = PARTY_MSG_USE_ON_WHICH_MON;
 
-        task = sub_81B1370;
+        task = Task_HandleChooseMonInput;
     }
 
-    InitPartyMenu(inBattle, doubleBattleStatus, 3, 1, msgIdMaybe, task, callback);
+    InitPartyMenu(menuType, partyLayout, PARTY_ACTION_USE_ITEM, TRUE, msgId, task, callback);
 }
 
-static void c2_815ABFC(void)
+static void CB2_ReturnToBagMenu(void)
 {
     if (InBattlePyramid() == FALSE)
         GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL);
     else
-        sub_81C4F98(4, gPyramidBagCursorData.callback);
+        GoToBattlePyramidBagMenu(4, gPyramidBagCursorData.callback);
 }
 
-static void sub_81B6280(u8 taskId)
+static void Task_SetSacredAshCB(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_0203CEC8.unk8_0 == 1)
-            gUnknown_0203CEC4->exitCallback = sub_81B9140;
-        gUnknown_03006328(taskId, sub_81B6794);
+        if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
+            sPartyMenuInternal->exitCallback = CB2_SetUpExitToBattleScreen;
+        gItemUseCB(taskId, Task_ClosePartyMenuAfterText); // ItemUseCB_SacredAsh in this case
     }
 }
 
@@ -5398,7 +4301,7 @@ static void GetMedicineItemEffectMessage(u16 item)
     }
 }
 
-static bool8 UsingHPEVItemOnShedinja(struct Pokemon *mon, u16 item)
+static bool8 NotUsingHPEVItemOnShedinja(struct Pokemon *mon, u16 item)
 {
     if (GetItemEffectType(item) == ITEM_EFFECT_HP_EV && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_SHEDINJA)
         return FALSE;
@@ -5412,10 +4315,10 @@ static bool8 IsItemFlute(u16 item)
     return FALSE;
 }
 
-static bool8 ExecuteTableBasedItemEffect__(u8 partyMonIndex, u16 item, u8 monMoveIndex)
+static bool8 ExecuteTableBasedItemEffect_(u8 partyMonIndex, u16 item, u8 monMoveIndex)
 {
     if (gMain.inBattle)
-        return ExecuteTableBasedItemEffect(&gPlayerParty[partyMonIndex], item, sub_81B8F38(partyMonIndex), monMoveIndex);
+        return ExecuteTableBasedItemEffect(&gPlayerParty[partyMonIndex], item, GetPartyIdFromBattleSlot(partyMonIndex), monMoveIndex);
     else
         return ExecuteTableBasedItemEffect(&gPlayerParty[partyMonIndex], item, partyMonIndex, monMoveIndex);
 }
@@ -5423,11 +4326,11 @@ static bool8 ExecuteTableBasedItemEffect__(u8 partyMonIndex, u16 item, u8 monMov
 void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
 {
     u16 hp = 0;
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = gSpecialVar_ItemId;
     bool8 canHeal;
 
-    if (UsingHPEVItemOnShedinja(mon, item))
+    if (NotUsingHPEVItemOnShedinja(mon, item))
     {
         canHeal = IsHPRecoveryItem(item);
         if (canHeal == TRUE)
@@ -5436,12 +4339,12 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
             if (hp == GetMonData(mon, MON_DATA_MAX_HP))
                 canHeal = FALSE;
         }
-        if (ExecuteTableBasedItemEffect__(gUnknown_0203CEC8.slotId, item, 0))
+        if (ExecuteTableBasedItemEffect_(gPartyMenu.slotId, item, 0))
         {
             iTriedHonestlyIDid:
-            gUnknown_0203CEE8 = 0;
+            gPartyMenuUseExitCallback = FALSE;
             PlaySE(SE_SELECT);
-            DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+            DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
             schedule_bg_copy_tilemap_to_vram(2);
             gTasks[taskId].func = task;
             return;
@@ -5449,89 +4352,89 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
     }
     else
     {
-        goto iTriedHonestlyIDid;
+        goto iTriedHonestlyIDid; //TODO: resolve this goto
     }
-    gUnknown_0203CEE8 = 1;
-    if (IsItemFlute(item) == FALSE)
+    gPartyMenuUseExitCallback = TRUE;
+    if (!IsItemFlute(item))
     {
         PlaySE(SE_KAIFUKU);
-        if (gUnknown_0203CEC8.unkB != 14)
+        if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM)
             RemoveBagItem(item, 1);
     }
     else
     {
         PlaySE(SE_BIDORO);
     }
-    party_menu_get_status_condition_and_update_object(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId]);
-    if (gSprites[gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].statusSpriteId].invisible)
-        DisplayPartyPokemonLevelCheck(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
+    SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
+    if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
+        DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
     if (canHeal == TRUE)
     {
         if (hp == 0)
-            sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
-        sub_81B1F18(taskId, gUnknown_0203CEC8.slotId, 1, GetMonData(mon, MON_DATA_HP) - hp, sub_81B672C);
-        sub_81B1FA8(taskId, 0, hp);
+            AnimatePartySlot(gPartyMenu.slotId, 1);
+        PartyMenuModifyHP(taskId, gPartyMenu.slotId, 1, GetMonData(mon, MON_DATA_HP) - hp, Task_DisplayHPRestoredMessage);
+        ResetHPTaskData(taskId, 0, hp);
         return;
     }
     else
     {
         GetMonNickname(mon, gStringVar1);
         GetMedicineItemEffectMessage(item);
-        DisplayPartyMenuMessage(gStringVar4, 1);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
         gTasks[taskId].func = task;
     }
 }
 
-static void sub_81B672C(u8 taskId)
+static void Task_DisplayHPRestoredMessage(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
-    DisplayPartyMenuMessage(gStringVar4, 0);
+    DisplayPartyMenuMessage(gStringVar4, FALSE);
     schedule_bg_copy_tilemap_to_vram(2);
     HandleBattleLowHpMusicChange();
-    gTasks[taskId].func = sub_81B6794;
+    gTasks[taskId].func = Task_ClosePartyMenuAfterText;
 }
 
-static void sub_81B6794(u8 taskId)
+static void Task_ClosePartyMenuAfterText(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        if (gUnknown_0203CEE8 == 0)
-            gUnknown_0203CEC4->exitCallback = NULL;
+        if (gPartyMenuUseExitCallback == FALSE)
+            sPartyMenuInternal->exitCallback = NULL;
         Task_ClosePartyMenu(taskId);
     }
 }
 
-void sub_81B67C8(u8 taskId, TaskFunc task)
+void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = gSpecialVar_ItemId;
     u8 effectType = GetItemEffectType(item);
     u16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
-    u16 relevantEV = ItemEffectToMonEv(mon, effectType);
-    bool8 cannotUseEffect = ExecuteTableBasedItemEffect__(gUnknown_0203CEC8.slotId, item, 0);
+    u16 ev = ItemEffectToMonEv(mon, effectType);
+    bool8 cannotUseEffect = ExecuteTableBasedItemEffect_(gPartyMenu.slotId, item, 0);
     u16 newFriendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
-    u16 newRelevantEV = ItemEffectToMonEv(mon, effectType);
+    u16 newEv = ItemEffectToMonEv(mon, effectType);
 
-    if (cannotUseEffect || (friendship == newFriendship && relevantEV == newRelevantEV))
+    if (cannotUseEffect || (friendship == newFriendship && ev == newEv))
     {
-        gUnknown_0203CEE8 = 0;
+        gPartyMenuUseExitCallback = FALSE;
         PlaySE(SE_SELECT);
-        DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+        DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
         gTasks[taskId].func = task;
     }
     else
     {
-        gUnknown_0203CEE8 = 1;
+        gPartyMenuUseExitCallback = TRUE;
         PlaySE(SE_KAIFUKU);
         RemoveBagItem(item, 1);
         GetMonNickname(mon, gStringVar1);
         ItemEffectToStatString(effectType, gStringVar2);
         if (friendship != newFriendship)
         {
-            if (relevantEV != newRelevantEV)
+            if (ev != newEv)
                 StringExpandPlaceholders(gStringVar4, gText_PkmnFriendlyBaseVar2Fell);
             else
                 StringExpandPlaceholders(gStringVar4, gText_PkmnFriendlyBaseVar2CantFall);
@@ -5540,7 +4443,7 @@ void sub_81B67C8(u8 taskId, TaskFunc task)
         {
             StringExpandPlaceholders(gStringVar4, gText_PkmnAdoresBaseVar2Fell);
         }
-        DisplayPartyMenuMessage(gStringVar4, 1);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
         gTasks[taskId].func = task;
     }
@@ -5593,18 +4496,18 @@ static void ItemEffectToStatString(u8 effectType, u8 *dest)
     }
 }
 
-static void sub_81B6A10(u8 slot)
+static void ShowMoveSelectWindow(u8 slot)
 {
     u8 i;
     u8 moveCount = 0;
     u8 fontId = 1;
-    u8 windowId = sub_81B31B0(3);
+    u8 windowId = DisplaySelectionWindow(SELECTWINDOW_MOVES);
     u16 move;
 
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
         move = GetMonData(&gPlayerParty[slot], MON_DATA_MOVE1 + i);
-        AddTextPrinterParameterized(windowId, fontId, gMoveNames[move], 8, (i * 16) + 1, 0xFF, NULL);
+        AddTextPrinterParameterized(windowId, fontId, gMoveNames[move], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
         if (move != MOVE_NONE)
             moveCount++;
     }
@@ -5612,7 +4515,7 @@ static void sub_81B6A10(u8 slot)
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void ether_effect_related_3(u8 taskId)
+static void Task_HandleWhichMoveInput(u8 taskId)
 {
     s8 input = Menu_ProcessInput();
 
@@ -5621,17 +4524,17 @@ static void ether_effect_related_3(u8 taskId)
         if (input == MENU_B_PRESSED)
         {
             PlaySE(SE_SELECT);
-            sub_81B6BB4(taskId);
+            ReturnToUseOnWhichMon(taskId);
         }
         else
         {
-            PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[1]);
-            ether_effect_related_2(taskId);
+            PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
+            SetSelectedMoveForPPItem(taskId);
         }
     }
 }
 
-void dp05_ether(u8 taskId, TaskFunc task)
+void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task)
 {
     const u8 *effect;
     u16 item = gSpecialVar_ItemId;
@@ -5643,76 +4546,76 @@ void dp05_ether(u8 taskId, TaskFunc task)
 
     if (!(effect[4] & ITEM4_HEAL_PP_ONE))
     {
-        gUnknown_0203CEC8.unkE = 0;
-        ether_effect_related(taskId);
+        gPartyMenu.data1 = 0;
+        TryUsePPItem(taskId);
     }
     else
     {
         PlaySE(SE_SELECT);
-        DisplayPartyMenuStdMessage(22);
-        sub_81B6A10(gUnknown_0203CEC8.slotId);
-        gTasks[taskId].func = ether_effect_related_3;
+        DisplayPartyMenuStdMessage(PARTY_MSG_RESTORE_WHICH_MOVE);
+        ShowMoveSelectWindow(gPartyMenu.slotId);
+        gTasks[taskId].func = Task_HandleWhichMoveInput;
     }
 }
 
-static void ether_effect_related_2(u8 taskId)
+static void SetSelectedMoveForPPItem(u8 taskId)
 {
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    gUnknown_0203CEC8.unkE = Menu_GetCursorPos();
-    ether_effect_related(taskId);
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    gPartyMenu.data1 = Menu_GetCursorPos();
+    TryUsePPItem(taskId);
 }
 
-static void sub_81B6BB4(u8 taskId)
+static void ReturnToUseOnWhichMon(u8 taskId)
 {
-    gTasks[taskId].func = sub_81B1370;
-    gUnknown_0203CEC4->exitCallback = NULL;
-    PartyMenuRemoveWindow(&gUnknown_0203CEC4->windowId[0]);
-    DisplayPartyMenuStdMessage(5);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
+    sPartyMenuInternal->exitCallback = NULL;
+    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+    DisplayPartyMenuStdMessage(PARTY_MSG_USE_ON_WHICH_MON);
 }
 
-static void ether_effect_related(u8 taskId)
+static void TryUsePPItem(u8 taskId)
 {
     u16 move = MOVE_NONE;
-    s16 *moveslot = &gUnknown_0203CEC8.unkE;
+    s16 *moveSlot = &gPartyMenu.data1;
     u16 item = gSpecialVar_ItemId;
-    struct Struct203CEC8 *ptr = &gUnknown_0203CEC8;
+    struct PartyMenu *ptr = &gPartyMenu;
     struct Pokemon *mon;
 
-    if (ExecuteTableBasedItemEffect__(ptr->slotId, item, *moveslot))
+    if (ExecuteTableBasedItemEffect_(ptr->slotId, item, *moveSlot))
     {
-        gUnknown_0203CEE8 = 0;
+        gPartyMenuUseExitCallback = FALSE;
         PlaySE(SE_SELECT);
-        DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+        DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
-        gTasks[taskId].func = sub_81B6794;
+        gTasks[taskId].func = Task_ClosePartyMenuAfterText;
     }
     else
     {
-        gUnknown_0203CEE8 = 1;
+        gPartyMenuUseExitCallback = TRUE;
         mon = &gPlayerParty[ptr->slotId];
         PlaySE(SE_KAIFUKU);
         RemoveBagItem(item, 1);
-        move = GetMonData(mon, MON_DATA_MOVE1 + *moveslot);
+        move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot);
         StringCopy(gStringVar1, gMoveNames[move]);
         GetMedicineItemEffectMessage(item);
-        DisplayPartyMenuMessage(gStringVar4, 1);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
-        gTasks[taskId].func = sub_81B6794;
+        gTasks[taskId].func = Task_ClosePartyMenuAfterText;
     }
 }
 
-void dp05_pp_up(u8 taskId, TaskFunc task)
+void ItemUseCB_PPUp(u8 taskId, TaskFunc task)
 {
     PlaySE(SE_SELECT);
-    DisplayPartyMenuStdMessage(23);
-    sub_81B6A10(gUnknown_0203CEC8.slotId);
-    gTasks[taskId].func = ether_effect_related_3;
+    DisplayPartyMenuStdMessage(PARTY_MSG_BOOST_PP_WHICH_MOVE);
+    ShowMoveSelectWindow(gPartyMenu.slotId);
+    gTasks[taskId].func = Task_HandleWhichMoveInput;
 }
 
 u16 ItemIdToBattleMoveId(u16 item)
 {
     u16 tmNumber = item - ITEM_TM01_FOCUS_PUNCH;
-    return gTMHMMoves[tmNumber];
+    return sTMHMMoves[tmNumber];
 }
 
 bool8 IsMoveHm(u16 move)
@@ -5721,7 +4624,7 @@ bool8 IsMoveHm(u16 move)
 
     for (i = 0; i < NUM_HIDDEN_MACHINES; i++)
     {
-        if (gTMHMMoves[i + NUM_TECHNICAL_MACHINES] == move)
+        if (sTMHMMoves[i + NUM_TECHNICAL_MACHINES] == move)
             return TRUE;
     }
     return FALSE;
@@ -5739,30 +4642,30 @@ bool8 MonKnowsMove(struct Pokemon *mon, u16 move)
     return FALSE;
 }
 
-static void sub_81B6D74(const u8 *str)
+static void DisplayLearnMoveMessage(const u8 *str)
 {
     StringExpandPlaceholders(gStringVar4, str);
-    DisplayPartyMenuMessage(gStringVar4, 1);
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B6D98(u8 taskId, const u8 *str)
+static void DisplayLearnMoveMessageAndClose(u8 taskId, const u8 *str)
 {
-    sub_81B6D74(str);
-    gTasks[taskId].func = sub_81B6794;
+    DisplayLearnMoveMessage(str);
+    gTasks[taskId].func = Task_ClosePartyMenuAfterText;
 }
 
 // move[1] doesn't use constants cause I don't know if it's actually a move ID storage
 
-void sub_81B6DC4(u8 taskId, TaskFunc task)
+void ItemUseCB_TMHM(u8 taskId, TaskFunc task)
 {
     struct Pokemon *mon;
     s16 *move;
     u16 item;
 
     PlaySE(SE_SELECT);
-    mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-    move = &gUnknown_0203CEC8.unkE;
+    mon = &gPlayerParty[gPartyMenu.slotId];
+    move = &gPartyMenu.data1;
     item = gSpecialVar_ItemId;
     GetMonNickname(mon, gStringVar1);
     move[0] = ItemIdToBattleMoveId(item);
@@ -5772,28 +4675,28 @@ void sub_81B6DC4(u8 taskId, TaskFunc task)
     switch (CanMonLearnTMTutor(mon, item, 0))
     {
     case CANNOT_LEARN_MOVE:
-        sub_81B6D98(taskId, gText_PkmnCantLearnMove);
+        DisplayLearnMoveMessageAndClose(taskId, gText_PkmnCantLearnMove);
         return;
     case ALREADY_KNOWS_MOVE:
-        sub_81B6D98(taskId, gText_PkmnAlreadyKnows);
+        DisplayLearnMoveMessageAndClose(taskId, gText_PkmnAlreadyKnows);
         return;
     }
 
-    if (GiveMoveToMon(mon, move[0]) != 0xFFFF)
+    if (GiveMoveToMon(mon, move[0]) != MON_HAS_MAX_MOVES)
     {
-        gTasks[taskId].func = sub_81B6EB4;
+        gTasks[taskId].func = Task_LearnedMove;
     }
     else
     {
-        sub_81B6D74(gText_PkmnNeedsToReplaceMove);
-        gTasks[taskId].func = sub_81B6FF4;
+        DisplayLearnMoveMessage(gText_PkmnNeedsToReplaceMove);
+        gTasks[taskId].func = Task_ReplaceMoveYesNo;
     }
 }
 
-static void sub_81B6EB4(u8 taskId)
+static void Task_LearnedMove(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-    s16 *move = &gUnknown_0203CEC8.unkE;
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
+    s16 *move = &gPartyMenu.data1;
     u16 item = gSpecialVar_ItemId;
 
     if (move[1] == 0)
@@ -5805,186 +4708,188 @@ static void sub_81B6EB4(u8 taskId)
     GetMonNickname(mon, gStringVar1);
     StringCopy(gStringVar2, gMoveNames[move[0]]);
     StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3);
-    DisplayPartyMenuMessage(gStringVar4, 1);
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B6F60;
+    gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText;
 }
 
-static void sub_81B6F60(u8 taskId)
+static void Task_DoLearnedMoveFanfareAfterText(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
         PlayFanfare(MUS_FANFA1);
-        gTasks[taskId].func = sub_81B6F98;
+        gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu;
     }
 }
 
-static void sub_81B6F98(u8 taskId)
+static void Task_LearnNextMoveOrClosePartyMenu(u8 taskId)
 {
     if (IsFanfareTaskInactive() && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)))
     {
-        if (gUnknown_0203CEC8.unk10 == 1)
-            sub_81B77AC(taskId);
+        if (gPartyMenu.learnMoveState == 1)
+            Task_TryLearningNextMove(taskId);
         else
         {
-            if (gUnknown_0203CEC8.unk10 == 2)
+            if (gPartyMenu.learnMoveState == 2) // never occurs
                 gSpecialVar_Result = TRUE;
             Task_ClosePartyMenu(taskId);
         }
     }
 }
 
-static void sub_81B6FF4(u8 taskId)
+static void Task_ReplaceMoveYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B7028;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleReplaceMoveYesNoInput;
     }
 }
 
-static void sub_81B7028(u8 taskId)
+static void Task_HandleReplaceMoveYesNoInput(u8 taskId)
 {
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
-        DisplayPartyMenuMessage(gText_WhichMoveToForget, 1);
-        gTasks[taskId].func = sub_81B7088;
+        DisplayPartyMenuMessage(gText_WhichMoveToForget, TRUE);
+        gTasks[taskId].func = Task_ShowSummaryScreenToForgetMove;
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
-        sub_81B7230(taskId);
+        StopLearningMovePrompt(taskId);
         break;
     }
 }
 
-static void sub_81B7088(u8 taskId)
+static void Task_ShowSummaryScreenToForgetMove(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        gUnknown_0203CEC4->exitCallback = sub_81B70B8;
+        sPartyMenuInternal->exitCallback = CB2_ShowSummaryScreenToForgetMove;
         Task_ClosePartyMenu(taskId);
     }
 }
 
-static void sub_81B70B8(void)
+static void CB2_ShowSummaryScreenToForgetMove(void)
 {
-    ShowSelectMovePokemonSummaryScreen(gPlayerParty, gUnknown_0203CEC8.slotId, gPlayerPartyCount - 1, sub_81B70F0, gUnknown_0203CEC8.unkE);
+    ShowSelectMovePokemonSummaryScreen(gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuWhileLearningMove, gPartyMenu.data1);
 }
 
-static void sub_81B70F0(void)
+static void CB2_ReturnToPartyMenuWhileLearningMove(void)
 {
-    InitPartyMenu(0, 0, 0, 1, 0x7F, sub_81B711C, gUnknown_0203CEC8.exitCallback);
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, TRUE, PARTY_MSG_NONE, Task_ReturnToPartyMenuWhileLearningMove, gPartyMenu.exitCallback);
 }
 
-static void sub_81B711C(u8 taskId)
+static void Task_ReturnToPartyMenuWhileLearningMove(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (sub_81C1B94() != 4)
-            sub_81B7154(taskId);
+        if (GetMoveSlotToReplace() != MAX_MON_MOVES)
+            DisplayPartyMenuForgotMoveMessage(taskId);
         else
-            sub_81B7230(taskId);
+            StopLearningMovePrompt(taskId);
     }
 }
 
-static void sub_81B7154(u8 taskId)
+static void DisplayPartyMenuForgotMoveMessage(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-    u16 move = GetMonData(mon, MON_DATA_MOVE1 + sub_81C1B94());
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
+    u16 move = GetMonData(mon, MON_DATA_MOVE1 + GetMoveSlotToReplace());
 
     GetMonNickname(mon, gStringVar1);
     StringCopy(gStringVar2, gMoveNames[move]);
-    sub_81B6D74(gText_12PoofForgotMove);
-    gTasks[taskId].func = sub_81B71D4;
+    DisplayLearnMoveMessage(gText_12PoofForgotMove);
+    gTasks[taskId].func = Task_PartyMenuReplaceMove;
 }
 
-static void sub_81B71D4(u8 taskId)
+static void Task_PartyMenuReplaceMove(u8 taskId)
 {
     struct Pokemon *mon;
     u16 move;
 
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-        RemoveMonPPBonus(mon, sub_81C1B94());
-        move = gUnknown_0203CEC8.unkE;
-        SetMonMoveSlot(mon, move, sub_81C1B94());
-        sub_81B6EB4(taskId);
+        mon = &gPlayerParty[gPartyMenu.slotId];
+        RemoveMonPPBonus(mon, GetMoveSlotToReplace());
+        move = gPartyMenu.data1;
+        SetMonMoveSlot(mon, move, GetMoveSlotToReplace());
+        Task_LearnedMove(taskId);
     }
 }
 
-static void sub_81B7230(u8 taskId)
+static void StopLearningMovePrompt(u8 taskId)
 {
-    StringCopy(gStringVar2, gMoveNames[gUnknown_0203CEC8.unkE]);
+    StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]);
     StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2);
-    DisplayPartyMenuMessage(gStringVar4, 1);
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B7294;
+    gTasks[taskId].func = Task_StopLearningMoveYesNo;
 }
 
-static void sub_81B7294(u8 taskId)
+static void Task_StopLearningMoveYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B72C8;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleStopLearningMoveYesNoInput;
     }
 }
 
-static void sub_81B72C8(u8 taskId)
+static void Task_HandleStopLearningMoveYesNoInput(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
 
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
         GetMonNickname(mon, gStringVar1);
-        StringCopy(gStringVar2, gMoveNames[gUnknown_0203CEC8.unkE]);
+        StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]);
         StringExpandPlaceholders(gStringVar4, gText_MoveNotLearned);
-        DisplayPartyMenuMessage(gStringVar4, 1);
-        if (gUnknown_0203CEC8.unk10 == 1)
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
+        if (gPartyMenu.learnMoveState == 1)
         {
-            gTasks[taskId].func = sub_81B73E4;
+            gTasks[taskId].func = Task_TryLearningNextMoveAfterText;
         }
         else
         {
-            if (gUnknown_0203CEC8.unk10 == 2)
+            if (gPartyMenu.learnMoveState == 2) // never occurs
                 gSpecialVar_Result = FALSE;
-            gTasks[taskId].func = sub_81B6794;
+            gTasks[taskId].func = Task_ClosePartyMenuAfterText;
         }
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
+        // fallthrough
     case 1:
         GetMonNickname(mon, gStringVar1);
-        StringCopy(gStringVar2, gMoveNames[gUnknown_0203CEC8.unkE]);
-        sub_81B6D74(gText_PkmnNeedsToReplaceMove);
-        gTasks[taskId].func = sub_81B6FF4;
+        StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]);
+        DisplayLearnMoveMessage(gText_PkmnNeedsToReplaceMove);
+        gTasks[taskId].func = Task_ReplaceMoveYesNo;
         break;
     }
 }
 
-static void sub_81B73E4(u8 taskId)
+static void Task_TryLearningNextMoveAfterText(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
-        sub_81B77AC(taskId);
+    if (IsPartyMenuTextPrinterActive() != TRUE)
+        Task_TryLearningNextMove(taskId);
 }
 
-void dp05_rare_candy(u8 taskId, TaskFunc task)
+void ItemUseCB_RareCandy(u8 taskId, TaskFunc task)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-    struct Struct203CEC4 *ptr = gUnknown_0203CEC4;
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
+    struct PartyMenuInternal *ptr = sPartyMenuInternal;
     s16 *arrayPtr = ptr->data;
     u16 *itemPtr = &gSpecialVar_ItemId;
     bool8 cannotUseEffect;
 
     if (GetMonData(mon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        sub_81B79A0(mon, arrayPtr);
-        cannotUseEffect = ExecuteTableBasedItemEffect__(gUnknown_0203CEC8.slotId, *itemPtr, 0);
-        sub_81B79A0(mon, &ptr->data[6]);
+        BufferMonStatsToTaskData(mon, arrayPtr);
+        cannotUseEffect = ExecuteTableBasedItemEffect_(gPartyMenu.slotId, *itemPtr, 0);
+        BufferMonStatsToTaskData(mon, &ptr->data[NUM_STATS]);
     }
     else
     {
@@ -5993,166 +4898,166 @@ void dp05_rare_candy(u8 taskId, TaskFunc task)
     PlaySE(SE_SELECT);
     if (cannotUseEffect)
     {
-        gUnknown_0203CEE8 = 0;
-        DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+        gPartyMenuUseExitCallback = FALSE;
+        DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
         gTasks[taskId].func = task;
     }
     else
     {
-        gUnknown_0203CEE8 = 1;
+        gPartyMenuUseExitCallback = TRUE;
         PlayFanfareByFanfareNum(0);
-        sub_81B754C(gUnknown_0203CEC8.slotId, mon);
+        UpdateMonDisplayInfoAfterRareCandy(gPartyMenu.slotId, mon);
         RemoveBagItem(gSpecialVar_ItemId, 1);
         GetMonNickname(mon, gStringVar1);
         ConvertIntToDecimalStringN(gStringVar2, GetMonData(mon, MON_DATA_LEVEL), STR_CONV_MODE_LEFT_ALIGN, 3);
         StringExpandPlaceholders(gStringVar4, gText_PkmnElevatedToLvVar2);
-        DisplayPartyMenuMessage(gStringVar4, 1);
+        DisplayPartyMenuMessage(gStringVar4, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
-        gTasks[taskId].func = sub_81B75D4;
+        gTasks[taskId].func = Task_DisplayLevelUpStatsPg1;
     }
 }
 
-static void sub_81B754C(u8 slot, struct Pokemon *mon)
+static void UpdateMonDisplayInfoAfterRareCandy(u8 slot, struct Pokemon *mon)
 {
-    party_menu_get_status_condition_and_update_object(mon, &gUnknown_0203CEDC[slot]);
-    if (gSprites[gUnknown_0203CEDC[slot].statusSpriteId].invisible)
-        DisplayPartyPokemonLevelCheck(mon, &gUnknown_0203CEDC[slot], 1);
-    DisplayPartyPokemonHPCheck(mon, &gUnknown_0203CEDC[slot], 1);
-    DisplayPartyPokemonMaxHPCheck(mon, &gUnknown_0203CEDC[slot], 1);
-    DisplayPartyPokemonHPBarCheck(mon, &gUnknown_0203CEDC[slot]);
-    sub_81B5B38(gUnknown_0203CEDC[slot].monSpriteId, mon);
-    sub_81B0FCC(slot, 1);
+    SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[slot]);
+    if (gSprites[sPartyMenuBoxes[slot].statusSpriteId].invisible)
+        DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[slot], 1);
+    DisplayPartyPokemonHPCheck(mon, &sPartyMenuBoxes[slot], 1);
+    DisplayPartyPokemonMaxHPCheck(mon, &sPartyMenuBoxes[slot], 1);
+    DisplayPartyPokemonHPBarCheck(mon, &sPartyMenuBoxes[slot]);
+    UpdatePartyMonHPBar(sPartyMenuBoxes[slot].monSpriteId, mon);
+    AnimatePartySlot(slot, 1);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-static void sub_81B75D4(u8 taskId)
+static void Task_DisplayLevelUpStatsPg1(u8 taskId)
 {
-    if (WaitFanfare(FALSE) && sub_81B1BD4() != TRUE && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)))
+    if (WaitFanfare(FALSE) && IsPartyMenuTextPrinterActive() != TRUE && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)))
     {
         PlaySE(SE_SELECT);
-        sub_81B767C(taskId);
-        gTasks[taskId].func = sub_81B7634;
+        DisplayLevelUpStatsPg1(taskId);
+        gTasks[taskId].func = Task_DisplayLevelUpStatsPg2;
     }
 }
 
-static void sub_81B7634(u8 taskId)
+static void Task_DisplayLevelUpStatsPg2(u8 taskId)
 {
     if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        sub_81B76C8(taskId);
-        gTasks[taskId].func = sub_81B7704;
+        DisplayLevelUpStatsPg2(taskId);
+        gTasks[taskId].func = Task_TryLearnNewMoves;
     }
 }
 
-static void sub_81B767C(u8 taskId)
+static void DisplayLevelUpStatsPg1(u8 taskId)
 {
-    s16 *arrayPtr = gUnknown_0203CEC4->data;
+    s16 *arrayPtr = sPartyMenuInternal->data;
 
-    arrayPtr[12] = sub_81B3364();
+    arrayPtr[12] = CreateLevelUpStatsWindow();
     DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], 1, 2, 3);
     CopyWindowToVram(arrayPtr[12], 2);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B76C8(u8 taskId)
+static void DisplayLevelUpStatsPg2(u8 taskId)
 {
-    s16 *arrayPtr = gUnknown_0203CEC4->data;
+    s16 *arrayPtr = sPartyMenuInternal->data;
 
     DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], 1, 2, 3);
     CopyWindowToVram(arrayPtr[12], 2);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_81B7704(u8 taskId)
+static void Task_TryLearnNewMoves(u8 taskId)
 {
-    u16 result;
+    u16 learnMove;
 
     if (WaitFanfare(0) && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)))
     {
-        sub_81B3394();
-        result = MonTryLearningNewMove(&gPlayerParty[gUnknown_0203CEC8.slotId], 1);
-        gUnknown_0203CEC8.unk10 = 1;
-        switch (result)
+        RemoveLevelUpStatsWindow();
+        learnMove = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], TRUE);
+        gPartyMenu.learnMoveState = 1;
+        switch (learnMove)
         {
-        case 0:
-            sub_81B7810(taskId);
+        case 0: // No moves to learn
+            PartyMenuTryEvolution(taskId);
             break;
-        case 0xFFFF:
-            sub_81B787C(taskId);
+        case MON_HAS_MAX_MOVES:
+            DisplayMonNeedsToReplaceMove(taskId);
             break;
-        case 0xFFFE:
-            gTasks[taskId].func = sub_81B77AC;
+        case MON_ALREADY_KNOWS_MOVE:
+            gTasks[taskId].func = Task_TryLearningNextMove;
             break;
         default:
-            sub_81B7910(taskId, result);
+            DisplayMonLearnedMove(taskId, learnMove);
             break;
         }
     }
 }
 
-static void sub_81B77AC(u8 taskId)
+static void Task_TryLearningNextMove(u8 taskId)
 {
-    u16 result = MonTryLearningNewMove(&gPlayerParty[gUnknown_0203CEC8.slotId], 0);
+    u16 result = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], FALSE);
 
     switch (result)
     {
-    case 0:
-        sub_81B7810(taskId);
+    case 0: // No moves to learn
+        PartyMenuTryEvolution(taskId);
         break;
-    case 0xFFFF:
-        sub_81B787C(taskId);
+    case MON_HAS_MAX_MOVES:
+        DisplayMonNeedsToReplaceMove(taskId);
         break;
-    case 0xFFFE:
+    case MON_ALREADY_KNOWS_MOVE:
         return;
     default:
-        sub_81B7910(taskId, result);
+        DisplayMonLearnedMove(taskId, result);
         break;
     }
 }
 
-static void sub_81B7810(u8 taskId)
+static void PartyMenuTryEvolution(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 targetSpecies = GetEvolutionTargetSpecies(mon, 0, 0);
 
     if (targetSpecies != SPECIES_NONE)
     {
         FreePartyPointers();
-        gCB2_AfterEvolution = gUnknown_0203CEC8.exitCallback;
-        BeginEvolutionScene(mon, targetSpecies, 1, gUnknown_0203CEC8.slotId);
+        gCB2_AfterEvolution = gPartyMenu.exitCallback;
+        BeginEvolutionScene(mon, targetSpecies, 1, gPartyMenu.slotId);
         DestroyTask(taskId);
     }
     else
     {
-        gTasks[taskId].func = sub_81B6794;
+        gTasks[taskId].func = Task_ClosePartyMenuAfterText;
     }
 }
 
-static void sub_81B787C(u8 taskId)
+static void DisplayMonNeedsToReplaceMove(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
     StringCopy(gStringVar2, gMoveNames[gMoveToLearn]);
     StringExpandPlaceholders(gStringVar4, gText_PkmnNeedsToReplaceMove);
-    DisplayPartyMenuMessage(gStringVar4, 1);
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gUnknown_0203CEC8.unkE = gMoveToLearn;
-    gTasks[taskId].func = sub_81B6FF4;
+    gPartyMenu.data1 = gMoveToLearn;
+    gTasks[taskId].func = Task_ReplaceMoveYesNo;
 }
 
-static void sub_81B7910(u8 taskId, u16 move)
+static void DisplayMonLearnedMove(u8 taskId, u16 move)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
     StringCopy(gStringVar2, gMoveNames[move]);
     StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3);
-    DisplayPartyMenuMessage(gStringVar4, 1);
+    DisplayPartyMenuMessage(gStringVar4, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gUnknown_0203CEC8.unkE = move;
-    gTasks[taskId].func = sub_81B6F60;
+    gPartyMenu.data1 = move;
+    gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText;
 }
 
-static void sub_81B79A0(struct Pokemon *mon, s16 *data)
+static void BufferMonStatsToTaskData(struct Pokemon *mon, s16 *data)
 {
     data[0] = GetMonData(mon, MON_DATA_MAX_HP);
     data[1] = GetMonData(mon, MON_DATA_ATK);
@@ -6162,93 +5067,101 @@ static void sub_81B79A0(struct Pokemon *mon, s16 *data)
     data[3] = GetMonData(mon, MON_DATA_SPEED);
 }
 
-void sub_81B79E8(u8 taskId, TaskFunc task)
+#define tUsedOnSlot   data[0]
+#define tHadEffect    data[1]
+#define tLastSlotUsed data[2]
+
+void ItemUseCB_SacredAsh(u8 taskId, TaskFunc task)
 {
-    gUnknown_0203CEC4->data[0] = 0;
-    gUnknown_0203CEC4->data[1] = 0;
-    gUnknown_0203CEC4->data[2] = gUnknown_0203CEC8.slotId;
-    sub_81B7A28(taskId);
+    sPartyMenuInternal->tUsedOnSlot = FALSE;
+    sPartyMenuInternal->tHadEffect = FALSE;
+    sPartyMenuInternal->tLastSlotUsed = gPartyMenu.slotId;
+    UseSacredAsh(taskId);
 }
 
-static void sub_81B7A28(u8 taskId)
+static void UseSacredAsh(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 hp;
 
     if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NONE)
     {
-        gTasks[taskId].func = task_sacred_ash_party_loop;
+        gTasks[taskId].func = Task_SacredAshLoop;
         return;
     }
 
     hp = GetMonData(mon, MON_DATA_HP);
-    if (ExecuteTableBasedItemEffect__(gUnknown_0203CEC8.slotId, gSpecialVar_ItemId, 0))
+    if (ExecuteTableBasedItemEffect_(gPartyMenu.slotId, gSpecialVar_ItemId, 0))
     {
-        gTasks[taskId].func = task_sacred_ash_party_loop;
+        gTasks[taskId].func = Task_SacredAshLoop;
         return;
     }
 
     PlaySE(SE_KAIFUKU);
-    party_menu_get_status_condition_and_update_object(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId]);
-    if (gSprites[gUnknown_0203CEDC[gUnknown_0203CEC8.slotId].statusSpriteId].invisible)
-        DisplayPartyPokemonLevelCheck(mon, &gUnknown_0203CEDC[gUnknown_0203CEC8.slotId], 1);
-    sub_81B0FCC(gUnknown_0203CEC4->data[2], 0);
-    sub_81B0FCC(gUnknown_0203CEC8.slotId, 1);
-    sub_81B1F18(taskId, gUnknown_0203CEC8.slotId, 1, GetMonData(mon, MON_DATA_HP) - hp, sub_81B7C10);
-    sub_81B1FA8(taskId, 0, hp);
-    gUnknown_0203CEC4->data[0] = 1;
-    gUnknown_0203CEC4->data[1] = 1;
+    SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
+    if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
+        DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
+    AnimatePartySlot(sPartyMenuInternal->tLastSlotUsed, 0);
+    AnimatePartySlot(gPartyMenu.slotId, 1);
+    PartyMenuModifyHP(taskId, gPartyMenu.slotId, 1, GetMonData(mon, MON_DATA_HP) - hp, Task_SacredAshDisplayHPRestored);
+    ResetHPTaskData(taskId, 0, hp);
+    sPartyMenuInternal->tUsedOnSlot = TRUE;
+    sPartyMenuInternal->tHadEffect = TRUE;
 }
 
-static void task_sacred_ash_party_loop(u8 taskId)
+static void Task_SacredAshLoop(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        if (gUnknown_0203CEC4->data[0] == 1)
+        if (sPartyMenuInternal->tUsedOnSlot == TRUE)
         {
-            gUnknown_0203CEC4->data[0] = 0;
-            gUnknown_0203CEC4->data[2] = gUnknown_0203CEC8.slotId;
+            sPartyMenuInternal->tUsedOnSlot = FALSE;
+            sPartyMenuInternal->tLastSlotUsed = gPartyMenu.slotId;
         }
-        if (++(gUnknown_0203CEC8.slotId) == PARTY_SIZE)
+        if (++(gPartyMenu.slotId) == PARTY_SIZE)
         {
-            if (gUnknown_0203CEC4->data[1] == 0)
+            if (sPartyMenuInternal->tHadEffect == FALSE)
             {
-                gUnknown_0203CEE8 = 0;
-                DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+                gPartyMenuUseExitCallback = FALSE;
+                DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
                 schedule_bg_copy_tilemap_to_vram(2);
             }
             else
             {
-                gUnknown_0203CEE8 = 1;
+                gPartyMenuUseExitCallback = TRUE;
                 RemoveBagItem(gSpecialVar_ItemId, 1);
             }
-            gTasks[taskId].func = sub_81B6794;
-            gUnknown_0203CEC8.slotId = 0;
+            gTasks[taskId].func = Task_ClosePartyMenuAfterText;
+            gPartyMenu.slotId = 0;
         }
         else
         {
-            sub_81B7A28(taskId);
+            UseSacredAsh(taskId);
         }
     }
 }
 
-static void sub_81B7C10(u8 taskId)
+static void Task_SacredAshDisplayHPRestored(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
-    DisplayPartyMenuMessage(gStringVar4, 0);
+    DisplayPartyMenuMessage(gStringVar4, FALSE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = task_sacred_ash_party_loop;
+    gTasks[taskId].func = Task_SacredAshLoop;
 }
 
-void sub_81B7C74(u8 taskId, TaskFunc task)
+#undef tUsedOnSlot
+#undef tHadEffect
+#undef tLastSlotUsed
+
+void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task)
 {
     PlaySE(SE_SELECT);
-    gCB2_AfterEvolution = gUnknown_0203CEC8.exitCallback;
-    if (ExecuteTableBasedItemEffect__(gUnknown_0203CEC8.slotId, gSpecialVar_ItemId, 0))
+    gCB2_AfterEvolution = gPartyMenu.exitCallback;
+    if (ExecuteTableBasedItemEffect_(gPartyMenu.slotId, gSpecialVar_ItemId, 0))
     {
-        gUnknown_0203CEE8 = 0;
-        DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+        gPartyMenuUseExitCallback = FALSE;
+        DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
         schedule_bg_copy_tilemap_to_vram(2);
         gTasks[taskId].func = task;
     }
@@ -6327,264 +5240,271 @@ u8 GetItemEffectType(u16 item)
         return ITEM_EFFECT_NONE;
 }
 
-static void sub_81B7E4C(u8 taskId)
+static void TryTutorSelectedMon(u8 taskId)
 {
     struct Pokemon *mon;
     s16 *move;
 
     if (!gPaletteFade.active)
     {
-        mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
-        move = &gUnknown_0203CEC8.unkE;
+        mon = &gPlayerParty[gPartyMenu.slotId];
+        move = &gPartyMenu.data1;
         GetMonNickname(mon, gStringVar1);
-        gUnknown_0203CEC8.unkE = GetTutorMove(gSpecialVar_0x8005);
-        StringCopy(gStringVar2, gMoveNames[gUnknown_0203CEC8.unkE]);
+        gPartyMenu.data1 = GetTutorMove(gSpecialVar_0x8005);
+        StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]);
         move[1] = 2;
         switch (CanMonLearnTMTutor(mon, 0, gSpecialVar_0x8005))
         {
         case CANNOT_LEARN_MOVE:
-            sub_81B6D98(taskId, gText_PkmnCantLearnMove);
+            DisplayLearnMoveMessageAndClose(taskId, gText_PkmnCantLearnMove);
             return;
         case ALREADY_KNOWS_MOVE:
-            sub_81B6D98(taskId, gText_PkmnAlreadyKnows);
+            DisplayLearnMoveMessageAndClose(taskId, gText_PkmnAlreadyKnows);
             return;
         default:
-            if (GiveMoveToMon(mon, gUnknown_0203CEC8.unkE) != 0xFFFF)
+            if (GiveMoveToMon(mon, gPartyMenu.data1) != MON_HAS_MAX_MOVES)
             {
-                sub_81B6EB4(taskId);
+                Task_LearnedMove(taskId);
                 return;
             }
             break;
         }
-        sub_81B6D74(gText_PkmnNeedsToReplaceMove);
-        gTasks[taskId].func = sub_81B6FF4;
+        DisplayLearnMoveMessage(gText_PkmnNeedsToReplaceMove);
+        gTasks[taskId].func = Task_ReplaceMoveYesNo;
     }
 }
 
 void CB2_PartyMenuFromStartMenu(void)
 {
-    InitPartyMenu(0, 0, 0, 0, 0, sub_81B1370, CB2_ReturnToFieldWithOpenMenu);
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_ReturnToFieldWithOpenMenu);
 }
 
-void sub_81B7F60(void)
+// Giving an item by selecting Give from the bag menu
+// As opposted to by selecting Give in the party menu, which is handled by CursorCb_Give
+void CB2_ChooseMonToGiveItem(void)
 {
-    MainCallback callback = (InBattlePyramid() == FALSE) ? c2_815ABFC : sub_81C4F84;
-    InitPartyMenu(0, 0, 5, 0, 6, sub_81B1370, callback);
-    gUnknown_0203CEC8.unkC = gSpecialVar_ItemId;
+    MainCallback callback = (InBattlePyramid() == FALSE) ? CB2_ReturnToBagMenu : CB2_ReturnToPyramidBagMenu;
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_GIVE_ITEM, FALSE, PARTY_MSG_GIVE_TO_WHICH_MON, Task_HandleChooseMonInput, callback);
+    gPartyMenu.bagItem = gSpecialVar_ItemId;
 }
 
-static void sub_81B7FAC(u8 taskId)
+static void TryGiveItemOrMailToSelectedMon(u8 taskId)
 {
-    gUnknown_0203CEFC = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_HELD_ITEM);
-    if (gUnknown_0203CEFC == ITEM_NONE)
+    sPartyMenuItemId = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_HELD_ITEM);
+    if (sPartyMenuItemId == ITEM_NONE)
     {
-        sub_81B8044(taskId);
+        GiveItemOrMailToSelectedMon(taskId);
     }
-    else if (ItemIsMail(gUnknown_0203CEFC))
+    else if (ItemIsMail(sPartyMenuItemId))
     {
-        sub_81B83B8(taskId);
+        DisplayItemMustBeRemovedFirstMessage(taskId);
     }
     else
     {
-        sub_81B1D1C(&gPlayerParty[gUnknown_0203CEC8.slotId], gUnknown_0203CEFC, 1);
-        gTasks[taskId].func = sub_81B82A0;
+        DisplayAlreadyHoldingItemSwitchMessage(&gPlayerParty[gPartyMenu.slotId], sPartyMenuItemId, TRUE);
+        gTasks[taskId].func = Task_SwitchItemsFromBagYesNo;
     }
 }
 
-static void sub_81B8044(u8 taskId)
+static void GiveItemOrMailToSelectedMon(u8 taskId)
 {
-    if (ItemIsMail(gUnknown_0203CEC8.unkC))
+    if (ItemIsMail(gPartyMenu.bagItem))
     {
-        sub_81B83F0(gUnknown_0203CEC8.unkC);
-        gUnknown_0203CEC4->exitCallback = sub_81B814C;
+        RemoveItemToGiveFromBag(gPartyMenu.bagItem);
+        sPartyMenuInternal->exitCallback = CB2_WriteMailToGiveMonFromBag;
         Task_ClosePartyMenu(taskId);
     }
     else
     {
-        sub_81B8088(taskId);
+        GiveItemToSelectedMon(taskId);
     }
 }
 
-static void sub_81B8088(u8 taskId)
+static void GiveItemToSelectedMon(u8 taskId)
 {
     u16 item;
 
     if (!gPaletteFade.active)
     {
-        item = gUnknown_0203CEC8.unkC;
-        sub_81B1C84(&gPlayerParty[gUnknown_0203CEC8.slotId], item, 0, 1);
-        sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], item);
-        sub_81B83F0(item);
-        gTasks[taskId].func = sub_81B8104;
+        item = gPartyMenu.bagItem;
+        DisplayGaveHeldItemMessage(&gPlayerParty[gPartyMenu.slotId], item, FALSE, 1);
+        GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], item);
+        RemoveItemToGiveFromBag(item);
+        gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
     }
 }
 
-static void sub_81B8104(u8 taskId)
+static void Task_UpdateHeldItemSpriteAndClosePartyMenu(u8 taskId)
 {
-    s8 slot = gUnknown_0203CEC8.slotId;
+    s8 slot = gPartyMenu.slotId;
 
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B5C94(&gPlayerParty[slot], &gUnknown_0203CEDC[slot]);
+        UpdatePartyMonHeldItemSprite(&gPlayerParty[slot], &sPartyMenuBoxes[slot]);
         Task_ClosePartyMenu(taskId);
     }
 }
 
-static void sub_81B814C(void)
+static void CB2_WriteMailToGiveMonFromBag(void)
 {
     u8 mail;
 
-    sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], gUnknown_0203CEC8.unkC);
-    mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.slotId], MON_DATA_MAIL);
+    GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], gPartyMenu.bagItem);
+    mail = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAIL);
     DoEasyChatScreen(
-    	EASY_CHAT_TYPE_MAIL,
-    	gSaveBlock1Ptr->mail[mail].words,
-    	sub_81B81A8,
-    	EASY_CHAT_PERSON_DISPLAY_NONE);
+        EASY_CHAT_TYPE_MAIL,
+        gSaveBlock1Ptr->mail[mail].words,
+        CB2_ReturnToPartyOrBagMenuFromWritingMail,
+        EASY_CHAT_PERSON_DISPLAY_NONE);
 }
 
-static void sub_81B81A8(void)
+static void CB2_ReturnToPartyOrBagMenuFromWritingMail(void)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
 
+    // Canceled writing mail
     if (gSpecialVar_Result == FALSE)
     {
         TakeMailFromMon(mon);
-        SetMonData(mon, MON_DATA_HELD_ITEM, &gUnknown_0203CEFC);
-        RemoveBagItem(gUnknown_0203CEFC, 1);
-        sub_81B841C(item);
-        SetMainCallback2(gUnknown_0203CEC8.exitCallback);
+        SetMonData(mon, MON_DATA_HELD_ITEM, &sPartyMenuItemId);
+        RemoveBagItem(sPartyMenuItemId, 1);
+        ReturnGiveItemToBagOrPC(item);
+        SetMainCallback2(gPartyMenu.exitCallback);
     }
+    // Wrote mail
     else
     {
-        InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 0x7F, sub_81B8230, gUnknown_0203CEC8.exitCallback);
+        InitPartyMenu(gPartyMenu.menuType, KEEP_PARTY_LAYOUT, gPartyMenu.action, TRUE, PARTY_MSG_NONE, Task_DisplayGaveMailFromBagMessage, gPartyMenu.exitCallback);
     }
 }
 
-static void sub_81B8230(u8 taskId)
+static void Task_DisplayGaveMailFromBagMessage(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_0203CEFC != ITEM_NONE)
-            sub_81B1D68(gUnknown_0203CEC8.unkC, gUnknown_0203CEFC, 0);
+        if (sPartyMenuItemId != ITEM_NONE)
+            DisplaySwitchedHeldItemMessage(gPartyMenu.bagItem, sPartyMenuItemId, FALSE);
         else
-            sub_81B1C84(&gPlayerParty[gUnknown_0203CEC8.slotId], gUnknown_0203CEC8.unkC, 0, 1);
-        gTasks[taskId].func = sub_81B8104;
+            DisplayGaveHeldItemMessage(&gPlayerParty[gPartyMenu.slotId], gPartyMenu.bagItem, FALSE, 1);
+        gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
     }
 }
 
-static void sub_81B82A0(u8 taskId)
+static void Task_SwitchItemsFromBagYesNo(u8 taskId)
 {
-    if (sub_81B1BD4() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_81B334C();
-        gTasks[taskId].func = sub_81B82D4;
+        PartyMenuDisplayYesNoMenu();
+        gTasks[taskId].func = Task_HandleSwitchItemsFromBagYesNoInput;
     }
 }
 
-static void sub_81B82D4(u8 taskId)
+static void Task_HandleSwitchItemsFromBagYesNoInput(u8 taskId)
 {
     u16 item;
 
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-    case 0:
-        item = gUnknown_0203CEC8.unkC;
-        sub_81B83F0(item);
-        if (AddBagItem(gUnknown_0203CEFC, 1) == FALSE)
+    case 0: // Yes, switch items
+        item = gPartyMenu.bagItem;
+        RemoveItemToGiveFromBag(item);
+        if (AddBagItem(sPartyMenuItemId, 1) == FALSE)
         {
-            sub_81B841C(item);
-            pokemon_item_not_removed(gUnknown_0203CEFC);
-            DisplayPartyMenuMessage(gStringVar4, 0);
-            gTasks[taskId].func = sub_81B8104;
+            ReturnGiveItemToBagOrPC(item);
+            BufferBagFullCantTakeItemMessage(sPartyMenuItemId);
+            DisplayPartyMenuMessage(gStringVar4, FALSE);
+            gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
         }
         else if (ItemIsMail(item))
         {
-            gUnknown_0203CEC4->exitCallback = sub_81B814C;
+            sPartyMenuInternal->exitCallback = CB2_WriteMailToGiveMonFromBag;
             Task_ClosePartyMenu(taskId);
         }
         else
         {
-            sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.slotId], item);
-            sub_81B1D68(item, gUnknown_0203CEFC, 1);
-            gTasks[taskId].func = sub_81B8104;
+            GiveItemToMon(&gPlayerParty[gPartyMenu.slotId], item);
+            DisplaySwitchedHeldItemMessage(item, sPartyMenuItemId, TRUE);
+            gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
         }
         break;
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
-    case 1:
-        gTasks[taskId].func = sub_81B8104;
+        // fallthrough
+    case 1: // No, dont switch items
+        gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
         break;
     }
 }
 
-static void sub_81B83B8(u8 taskId)
+static void DisplayItemMustBeRemovedFirstMessage(u8 taskId)
 {
-    DisplayPartyMenuMessage(gText_RemoveMailBeforeItem, 1);
+    DisplayPartyMenuMessage(gText_RemoveMailBeforeItem, TRUE);
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B8104;
+    gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
 }
 
-static void sub_81B83F0(u16 item)
+static void RemoveItemToGiveFromBag(u16 item)
 {
-    if (gUnknown_0203CEC8.unkB == 6)
+    if (gPartyMenu.action == PARTY_ACTION_GIVE_PC_ITEM) // Unused, never occurs
         RemovePCItem(item, 1);
     else
         RemoveBagItem(item, 1);
 }
 
-static bool8 sub_81B841C(u16 item)
+// Returns FALSE if there was no space to return the item
+// but there always should be, and the return is ignored in all uses
+static bool8 ReturnGiveItemToBagOrPC(u16 item)
 {
-    if (gUnknown_0203CEC8.unkB == 5)
+    if (gPartyMenu.action == PARTY_ACTION_GIVE_ITEM) 
         return AddBagItem(item, 1);
     else
         return AddPCItem(item, 1);
 }
 
-void sub_81B8448(void)
+void ChooseMonToGiveMailFromMailbox(void)
 {
-    InitPartyMenu(0, 0, 7, 0, 6, sub_81B1370, Mailbox_ReturnToMailListAfterDeposit);
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_GIVE_MAILBOX_MAIL, FALSE, PARTY_MSG_GIVE_TO_WHICH_MON, Task_HandleChooseMonInput, Mailbox_ReturnToMailListAfterDeposit);
 }
 
-static void sub_81B8474(u8 taskId)
+static void TryGiveMailToSelectedMon(u8 taskId)
 {
-    struct Pokemon *mon = &gPlayerParty[gUnknown_0203CEC8.slotId];
+    struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
     struct MailStruct *mail;
 
-    gUnknown_0203CEE8 = 0;
+    gPartyMenuUseExitCallback = FALSE;
     mail = &gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos];
     if (GetMonData(mon, MON_DATA_HELD_ITEM) != ITEM_NONE)
     {
-        DisplayPartyMenuMessage(gText_PkmnHoldingItemCantHoldMail, 1);
+        DisplayPartyMenuMessage(gText_PkmnHoldingItemCantHoldMail, TRUE);
     }
     else
     {
         GiveMailToMon2(mon, mail);
         ClearMailStruct(mail);
-        DisplayPartyMenuMessage(gText_MailTransferredFromMailbox, 1);
+        DisplayPartyMenuMessage(gText_MailTransferredFromMailbox, TRUE);
     }
     schedule_bg_copy_tilemap_to_vram(2);
-    gTasks[taskId].func = sub_81B8104;
+    gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
 }
 
 void InitChooseHalfPartyForBattle(u8 unused)
 {
-    sub_81B8558();
-    InitPartyMenu(4, 0, 0, 0, 0, sub_81B1370, gMain.savedCallback);
-    gUnknown_0203CEC8.unk4 = sub_81B879C;
+    ClearSelectedPartyOrder();
+    InitPartyMenu(PARTY_MENU_TYPE_CHOOSE_HALF, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, gMain.savedCallback);
+    gPartyMenu.task = Task_ValidateChosenHalfParty;
 }
 
-void sub_81B8558(void)
+void ClearSelectedPartyOrder(void)
 {
     memset(gSelectedOrderFromParty, 0, sizeof(gSelectedOrderFromParty));
 }
 
-static u8 sub_81B856C(s8 slot)
+static u8 GetPartySlotEntryStatus(s8 slot)
 {
     if (GetBattleEntryEligibility(&gPlayerParty[slot]) == FALSE)
         return 2;
-    if (sub_81B8770(slot + 1) == TRUE)
+    if (HasPartySlotAlreadyBeenSelected(slot + 1) == TRUE)
         return 1;
     return 0;
 }
@@ -6595,7 +5515,7 @@ static bool8 GetBattleEntryEligibility(struct Pokemon *mon)
     u16 species;
 
     if (GetMonData(mon, MON_DATA_IS_EGG)
-        || GetMonData(mon, MON_DATA_LEVEL) > sub_81B8888()
+        || GetMonData(mon, MON_DATA_LEVEL) > GetBattleEntryLevelCap()
         || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY)
             && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY)
             && GetMonData(mon, MON_DATA_HELD_ITEM) != ITEM_NONE))
@@ -6603,15 +5523,15 @@ static bool8 GetBattleEntryEligibility(struct Pokemon *mon)
         return FALSE;
     }
 
-    switch (VarGet(VAR_FRONTIER_FACILITY)) // oddly the specific cases are beyond 6, turns out case 9 is apparently related to link battles
+    switch (VarGet(VAR_FRONTIER_FACILITY))
     {
-    case 9:
+    case FACILITY_MULTI_OR_EREADER:
         if (GetMonData(mon, MON_DATA_HP) != 0)
             return TRUE;
         return FALSE;
-    case 8:
+    case FACILITY_UNION_ROOM:
         return TRUE;
-    default:
+    default: // Battle Frontier
         species = GetMonData(mon, MON_DATA_SPECIES);
         for (; gFrontierBannedSpecies[i] != 0xFFFF; i++)
         {
@@ -6622,49 +5542,49 @@ static bool8 GetBattleEntryEligibility(struct Pokemon *mon)
     }
 }
 
-static u8 sub_81B865C(void)
+static u8 CheckBattleEntriesAndGetMessage(void)
 {
-    u8 unk2;
+    u8 maxBattlers;
     u8 i, j;
     u8 facility;
     struct Pokemon *party = gPlayerParty;
-    u8 unk = sub_81B885C();
+    u8 minBattlers = GetMinBattleEntries();
     u8 *order = gSelectedOrderFromParty;
 
-    if (order[unk - 1] == 0)
+    if (order[minBattlers - 1] == 0)
     {
-        if (unk == 1)
-            return 14;
-        ConvertIntToDecimalStringN(gStringVar1, unk, STR_CONV_MODE_LEFT_ALIGN, 1);
-        return 17;
+        if (minBattlers == 1)
+            return PARTY_MSG_NO_MON_FOR_BATTLE;
+        ConvertIntToDecimalStringN(gStringVar1, minBattlers, STR_CONV_MODE_LEFT_ALIGN, 1);
+        return PARTY_MSG_X_MONS_ARE_NEEDED;
     }
 
     facility = VarGet(VAR_FRONTIER_FACILITY);
-    if (facility == 8 || facility == 9)
+    if (facility == FACILITY_UNION_ROOM || facility == FACILITY_MULTI_OR_EREADER)
         return 0xFF;
 
-    unk2 = sub_81B8830();
-    for (i = 0; i < unk2 - 1; i++)
+    maxBattlers = GetMaxBattleEntries();
+    for (i = 0; i < maxBattlers - 1; i++)
     {
         u16 species = GetMonData(&party[order[i] - 1], MON_DATA_SPECIES);
         u16 item = GetMonData(&party[order[i] - 1], MON_DATA_HELD_ITEM);
-        for (j = i + 1; j < unk2; j++)
+        for (j = i + 1; j < maxBattlers; j++)
         {
             if (species == GetMonData(&party[order[j] - 1], MON_DATA_SPECIES))
-                return 18;
+                return PARTY_MSG_MONS_CANT_BE_SAME;
             if (item != ITEM_NONE && item == GetMonData(&party[order[j] - 1], MON_DATA_HELD_ITEM))
-                return 19;
+                return PARTY_MSG_NO_SAME_HOLD_ITEMS;
         }
     }
 
     return 0xFF;
 }
 
-static bool8 sub_81B8770(u8 slot)
+static bool8 HasPartySlotAlreadyBeenSelected(u8 slot)
 {
     u8 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(gSelectedOrderFromParty); i++)
     {
         if (gSelectedOrderFromParty[i] == slot)
             return TRUE;
@@ -6672,15 +5592,15 @@ static bool8 sub_81B8770(u8 slot)
     return FALSE;
 }
 
-static void sub_81B879C(u8 taskId)
+static void Task_ValidateChosenHalfParty(u8 taskId)
 {
-    u8 msgId = sub_81B865C();
+    u8 msgId = CheckBattleEntriesAndGetMessage();
 
     if (msgId != 0xFF)
     {
         PlaySE(SE_HAZURE);
         DisplayPartyMenuStdMessage(msgId);
-        gTasks[taskId].func = sub_81B87E8;
+        gTasks[taskId].func = Task_ContinueChoosingHalfParty;
     }
     else
     {
@@ -6689,62 +5609,62 @@ static void sub_81B879C(u8 taskId)
     }
 }
 
-static void sub_81B87E8(u8 taskId)
+static void Task_ContinueChoosingHalfParty(u8 taskId)
 {
     if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        DisplayPartyMenuStdMessage(0);
-        gTasks[taskId].func = sub_81B1370;
+        DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
-static u8 sub_81B8830(void)
+static u8 GetMaxBattleEntries(void)
 {
     switch (VarGet(VAR_FRONTIER_FACILITY))
     {
-    case 9:
+    case FACILITY_MULTI_OR_EREADER:
         return 3;
-    case 8:
+    case FACILITY_UNION_ROOM:
         return 2;
-    default:
+    default: // Battle Frontier
         return gSpecialVar_0x8005;
     }
 }
 
-static u8 sub_81B885C(void)
+static u8 GetMinBattleEntries(void)
 {
     switch (VarGet(VAR_FRONTIER_FACILITY))
     {
-    case 9:
+    case FACILITY_MULTI_OR_EREADER:
         return 1;
-    case 8:
+    case FACILITY_UNION_ROOM:
         return 2;
-    default:
+    default: // Battle Frontier
         return gSpecialVar_0x8005;
     }
 }
 
-static u8 sub_81B8888(void)
+static u8 GetBattleEntryLevelCap(void)
 {
     switch (VarGet(VAR_FRONTIER_FACILITY))
     {
-    case 9:
-        return 100;
-    case 8:
+    case FACILITY_MULTI_OR_EREADER:
+        return MAX_LEVEL;
+    case FACILITY_UNION_ROOM:
         return 30;
-    default:
-        if (gSpecialVar_0x8004 == 0)
+    default: // Battle Frontier
+        if (gSpecialVar_0x8004 == FRONTIER_LVL_50)
             return 50;
-        return 100;
+        return MAX_LEVEL;
     }
 }
 
-static const u8* sub_81B88BC(void)
+static const u8* GetFacilityCancelString(void)
 {
     u8 facilityNum = VarGet(VAR_FRONTIER_FACILITY);
 
-    if (!(facilityNum != 8 && facilityNum != 9))
+    if (!(facilityNum != FACILITY_UNION_ROOM && facilityNum != FACILITY_MULTI_OR_EREADER))
         return gText_CancelBattle;
     else if (facilityNum == FRONTIER_FACILITY_DOME && gSpecialVar_0x8005 == 2)
         return gText_ReturnToWaitingRoom;
@@ -6752,62 +5672,63 @@ static const u8* sub_81B88BC(void)
         return gText_CancelChallenge;
 }
 
-void sub_81B8904(u8 initArg, MainCallback callback)
+void ChooseMonForTradingBoard(u8 menuType, MainCallback callback)
 {
-    InitPartyMenu(initArg, 0, 0, 0, 0, sub_81B1370, callback);
+    InitPartyMenu(menuType, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, callback);
 }
 
-void OpenPartyMenuForMoveTutor(void)
+void ChooseMonForMoveTutor(void)
 {
-    InitPartyMenu(0, 0, 12, 0, 4, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic);
+    InitPartyMenu(PARTY_MENU_TYPE_FIELD, PARTY_LAYOUT_SINGLE, PARTY_ACTION_MOVE_TUTOR, FALSE, PARTY_MSG_TEACH_WHICH_MON, Task_HandleChooseMonInput, CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
 void ChooseMonForWirelessMinigame(void)
 {
-    InitPartyMenu(11, 0, 13, 0, 1, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic);
+    InitPartyMenu(PARTY_MENU_TYPE_MINIGAME, PARTY_LAYOUT_SINGLE, PARTY_ACTION_MINIGAME, FALSE, PARTY_MSG_CHOOSE_MON_OR_CANCEL, Task_HandleChooseMonInput, CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
-static u8 sub_81B8984(void)
+static u8 GetPartyLayoutFromBattleType(void)
 {
     if (IsDoubleBattle() == FALSE)
-        return 0;
+        return PARTY_LAYOUT_SINGLE;
     if (IsMultiBattle() == TRUE)
-        return 2;
-    return 1;
+        return PARTY_LAYOUT_MULTI;
+    return PARTY_LAYOUT_DOUBLE;
 }
 
-void OpenPartyMenuInBattle(u8 arg)
+void OpenPartyMenuInBattle(u8 partyAction)
 {
-    InitPartyMenu(1, sub_81B8984(), arg, 0, 0, sub_81B1370, SetCB2ToReshowScreenAfterMenu);
+    InitPartyMenu(PARTY_MENU_TYPE_IN_BATTLE, GetPartyLayoutFromBattleType(), partyAction, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_SetUpReshowBattleScreenAfterMenu);
     nullsub_35();
-    pokemon_change_order();
+    UpdatePartyToBattleOrder();
 }
 
-void sub_81B89F0(void)
+void ChooseMonForInBattleItem(void)
 {
-    InitPartyMenu(1, sub_81B8984(), 3, 0, 5, sub_81B1370, c2_815ABFC);
+    InitPartyMenu(PARTY_MENU_TYPE_IN_BATTLE, GetPartyLayoutFromBattleType(), PARTY_ACTION_USE_ITEM, FALSE, PARTY_MSG_USE_ON_WHICH_MON, Task_HandleChooseMonInput, CB2_ReturnToBagMenu);
     nullsub_35();
-    pokemon_change_order();
+    UpdatePartyToBattleOrder();
 }
 
-static u8 sub_81B8A2C(struct Pokemon *mon)
+static u8 GetPartyMenuActionsTypeInBattle(struct Pokemon *mon)
 {
     if (GetMonData(&gPlayerParty[1], MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(mon, MON_DATA_IS_EGG) == FALSE)
     {
-        if (gUnknown_0203CEC8.unkB == 1)
-            return 3;
+        if (gPartyMenu.action == PARTY_ACTION_SEND_OUT)
+            return ACTIONS_SEND_OUT;
         if (!(gBattleTypeFlags & BATTLE_TYPE_ARENA))
-            return 2;
+            return ACTIONS_SHIFT;
     }
-    return 7;
+    return ACTIONS_SUMMARY_ONLY;
 }
 
-static bool8 sub_81B8A7C(void)
+static bool8 TrySwitchInPokemon(void)
 {
     u8 slot = GetCursorSelectionMonId();
     u8 newSlot;
     u8 i;
 
+    // In a multi battle, slots 1, 4, and 5 are the partner's pokemon
     if (IsMultiBattle() == TRUE && (slot == 1 || slot == 4 || slot == 5))
     {
         StringCopy(gStringVar1, GetTrainerPartnerName());
@@ -6822,7 +5743,7 @@ static bool8 sub_81B8A7C(void)
     }
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (GetBattlerSide(i) == B_SIDE_PLAYER && sub_81B8F38(slot) == gBattlerPartyIndexes[i])
+        if (GetBattlerSide(i) == B_SIDE_PLAYER && GetPartyIdFromBattleSlot(slot) == gBattlerPartyIndexes[i])
         {
             GetMonNickname(&gPlayerParty[slot], gStringVar1);
             StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyInBattle);
@@ -6834,67 +5755,69 @@ static bool8 sub_81B8A7C(void)
         StringExpandPlaceholders(gStringVar4, gText_EggCantBattle);
         return FALSE;
     }
-    if (sub_81B8F38(slot) == gBattleStruct->field_8B)
+    if (GetPartyIdFromBattleSlot(slot) == gBattleStruct->field_8B)
     {
         GetMonNickname(&gPlayerParty[slot], gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadySelected);
         return FALSE;
     }
-    if (gUnknown_0203CEC8.unkB == 4)
+    if (gPartyMenu.action == PARTY_ACTION_ABILITY_PREVENTS)
     {
         SetMonPreventsSwitchingString();
         return FALSE;
     }
-    if (gUnknown_0203CEC8.unkB == 2)
+    if (gPartyMenu.action == PARTY_ACTION_CANT_SWITCH)
     {
         u8 currBattler = gBattlerInMenuId;
-        GetMonNickname(&gPlayerParty[pokemon_order_func(gBattlerPartyIndexes[currBattler])], gStringVar1);
+        GetMonNickname(&gPlayerParty[GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[currBattler])], gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_PkmnCantSwitchOut);
         return FALSE;
     }
-    gUnknown_0203CEE9 = sub_81B8F38(slot);
-    gUnknown_0203CEE8 = 1;
-    newSlot = pokemon_order_func(gBattlerPartyIndexes[gBattlerInMenuId]);
-    sub_81B8FB0(newSlot, slot);
-    sub_81B1288(&gPlayerParty[newSlot], &gPlayerParty[slot]);
+    gSelectedMonPartyId = GetPartyIdFromBattleSlot(slot);
+    gPartyMenuUseExitCallback = TRUE;
+    newSlot = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattlerInMenuId]);
+    SwitchPartyMonSlots(newSlot, slot);
+    SwapPartyPokemon(&gPlayerParty[newSlot], &gPlayerParty[slot]);
     return TRUE;
 }
 
-void sub_81B8C68(void)
+void BufferBattlePartyCurrentOrder(void)
 {
-    sub_81B8C88(gUnknown_0203CF00, sub_806D7EC());
+    BufferBattlePartyOrder(gBattlePartyCurrentOrder, GetPlayerFlankId());
 }
 
-static void sub_81B8C88(u8 *ptr, bool8 multiplayerFlag)
+static void BufferBattlePartyOrder(u8 *partyBattleOrder, u8 flankId)
 {
-    u8 partyIndexes[6];
+    u8 partyIds[PARTY_SIZE];
     int i, j;
 
     if (IsMultiBattle() == TRUE)
     {
-        if (multiplayerFlag)
+        // Party ids are packed in 4 bits at a time
+        // i.e. the party id order below would be 0, 3, 5, 4, 2, 1, and the two parties would be 0,5,4 and 3,2,1
+        if (flankId != 0)
         {
-            ptr[0] = 0 | (3 << 4);
-            ptr[1] = 5 | (4 << 4);
-            ptr[2] = 2 | (1 << 4);
+            partyBattleOrder[0] = 0 | (3 << 4);
+            partyBattleOrder[1] = 5 | (4 << 4);
+            partyBattleOrder[2] = 2 | (1 << 4);
         }
         else
         {
-            ptr[0] = 3 | (0 << 4);
-            ptr[1] = 2 | (1 << 4);
-            ptr[2] = 5 | (4 << 4);
+            partyBattleOrder[0] = 3 | (0 << 4);
+            partyBattleOrder[1] = 2 | (1 << 4);
+            partyBattleOrder[2] = 5 | (4 << 4);
         }
         return;
     }
     else if (IsDoubleBattle() == FALSE)
     {
         j = 1;
-        partyIndexes[0] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)];
+        partyIds[0] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)];
         for (i = 0; i < PARTY_SIZE; i++)
         {
-            if (i != partyIndexes[0])
+            if (i != partyIds[0])
             {
-                partyIndexes[j] = i;
+                partyIds[j] = i;
                 j++;
             }
         }
@@ -6902,29 +5825,30 @@ static void sub_81B8C88(u8 *ptr, bool8 multiplayerFlag)
     else
     {
         j = 2;
-        partyIndexes[0] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)];
-        partyIndexes[1] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)];
+        partyIds[0] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)];
+        partyIds[1] = gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)];
         for (i = 0; i < PARTY_SIZE; i++)
         {
-            if (i != partyIndexes[0] && i != partyIndexes[1])
+            if (i != partyIds[0] && i != partyIds[1])
             {
-                partyIndexes[j] = i;
+                partyIds[j] = i;
                 j++;
             }
         }
     }
-    for (i = 0; i < 3; i++)
-        ptr[i] = (partyIndexes[0 + (i * 2)] << 4) | partyIndexes[1 + (i * 2)];
+    for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+        partyBattleOrder[i] = (partyIds[0 + (i * 2)] << 4) | partyIds[1 + (i * 2)];
 }
 
-void sub_81B8D64(u8 battlerId, u8 multiplayerFlag)
+void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 flankId)
 {
-    sub_81B8D88(gBattleStruct->field_60[battlerId], multiplayerFlag, battlerId);
+    BufferBattlePartyOrderBySide(gBattleStruct->field_60[battlerId], flankId, battlerId);
 }
 
-static void sub_81B8D88(u8 *ptr, bool8 multiplayerFlag, u8 battlerId)
+// when GetBattlerSide(battlerId) == B_SIDE_PLAYER, this function is identical the one above
+static void BufferBattlePartyOrderBySide(u8 *partyBattleOrder, u8 flankId, u8 battlerId)
 {
-    u8 partyIndexes[6];
+    u8 partyIndexes[PARTY_SIZE];
     int i, j;
     u8 leftBattler;
     u8 rightBattler;
@@ -6942,17 +5866,17 @@ static void sub_81B8D88(u8 *ptr, bool8 multiplayerFlag, u8 battlerId)
 
     if (IsMultiBattle() == TRUE)
     {
-        if (multiplayerFlag)
+        if (flankId != 0)
         {
-            ptr[0] = 0 | (3 << 4);
-            ptr[1] = 5 | (4 << 4);
-            ptr[2] = 2 | (1 << 4);
+            partyBattleOrder[0] = 0 | (3 << 4);
+            partyBattleOrder[1] = 5 | (4 << 4);
+            partyBattleOrder[2] = 2 | (1 << 4);
         }
         else
         {
-            ptr[0] = 3 | (0 << 4);
-            ptr[1] = 2 | (1 << 4);
-            ptr[2] = 5 | (4 << 4);
+            partyBattleOrder[0] = 3 | (0 << 4);
+            partyBattleOrder[1] = 2 | (1 << 4);
+            partyBattleOrder[2] = 5 | (4 << 4);
         }
         return;
     }
@@ -6985,87 +5909,87 @@ static void sub_81B8D88(u8 *ptr, bool8 multiplayerFlag, u8 battlerId)
     }
 
     for (i = 0; i < 3; i++)
-        ptr[i] = (partyIndexes[0 + (i * 2)] << 4) | partyIndexes[1 + (i * 2)];
+        partyBattleOrder[i] = (partyIndexes[0 + (i * 2)] << 4) | partyIndexes[1 + (i * 2)];
 }
 
-void sub_81B8E80(u8 battlerId, u8 unk, u8 arrayIndex)
+void SwitchPartyOrderLinkMulti(u8 battlerId, u8 slot, u8 slot2)
 {
-    u8 possiblePartyIndexes[6];
-    u8 unk2 = 0;
+    u8 partyIds[PARTY_SIZE];
+    u8 tempSlot = 0;
     int i, j;
-    u8 *battleStructRelated;
-    u8 possiblePartyIndexBuffer;
+    u8 *partyBattleOrder;
+    u8 partyIdBuffer;
 
     if (IsMultiBattle())
     {
-        battleStructRelated = gBattleStruct->field_60[battlerId];
+        partyBattleOrder = gBattleStruct->field_60[battlerId];
         for (i = j = 0; i < 3; j++, i++)
         {
-            possiblePartyIndexes[j] = battleStructRelated[i] >> 4;
+            partyIds[j] = partyBattleOrder[i] >> 4;
             j++;
-            possiblePartyIndexes[j] = battleStructRelated[i] & 0xF;
+            partyIds[j] = partyBattleOrder[i] & 0xF;
         }
-        possiblePartyIndexBuffer = possiblePartyIndexes[arrayIndex];
+        partyIdBuffer = partyIds[slot2];
         for (i = 0; i < PARTY_SIZE; i++)
         {
-            if (possiblePartyIndexes[i] == unk)
+            if (partyIds[i] == slot)
             {
-                unk2 = possiblePartyIndexes[i];
-                possiblePartyIndexes[i] = possiblePartyIndexBuffer;
+                tempSlot = partyIds[i];
+                partyIds[i] = partyIdBuffer;
                 break;
             }
         }
         if (i != PARTY_SIZE)
         {
-            possiblePartyIndexes[arrayIndex] = unk2;
-            battleStructRelated[0] = (possiblePartyIndexes[0] << 4) | possiblePartyIndexes[1];
-            battleStructRelated[1] = (possiblePartyIndexes[2] << 4) | possiblePartyIndexes[3];
-            battleStructRelated[2] = (possiblePartyIndexes[4] << 4) | possiblePartyIndexes[5];
+            partyIds[slot2] = tempSlot;
+            partyBattleOrder[0] = (partyIds[0] << 4) | partyIds[1];
+            partyBattleOrder[1] = (partyIds[2] << 4) | partyIds[3];
+            partyBattleOrder[2] = (partyIds[4] << 4) | partyIds[5];
         }
     }
 }
 
-static u8 sub_81B8F38(u8 slot)
+static u8 GetPartyIdFromBattleSlot(u8 slot)
 {
     u8 modResult = slot & 1;
     u8 retVal;
 
     slot /= 2;
     if (modResult != 0)
-        retVal = gUnknown_0203CF00[slot] & 0xF;
+        retVal = gBattlePartyCurrentOrder[slot] & 0xF;
     else
-        retVal = gUnknown_0203CF00[slot] >> 4;
+        retVal = gBattlePartyCurrentOrder[slot] >> 4;
     return retVal;
 }
 
-static void sub_81B8F6C(u8 slot, u8 setVal)
+static void SetPartyIdAtBattleSlot(u8 slot, u8 setVal)
 {
     bool32 modResult = slot & 1;
 
     slot /= 2;
     if (modResult != 0)
-        gUnknown_0203CF00[slot] = (gUnknown_0203CF00[slot] & 0xF0) | setVal;
+        gBattlePartyCurrentOrder[slot] = (gBattlePartyCurrentOrder[slot] & 0xF0) | setVal;
     else
-        gUnknown_0203CF00[slot] = (gUnknown_0203CF00[slot] & 0xF) | (setVal << 4);
+        gBattlePartyCurrentOrder[slot] = (gBattlePartyCurrentOrder[slot] & 0xF) | (setVal << 4);
 }
 
-void sub_81B8FB0(u8 slot, u8 slot2)
+void SwitchPartyMonSlots(u8 slot, u8 slot2)
 {
-    u8 valBuffer = sub_81B8F38(slot);
-    sub_81B8F6C(slot, sub_81B8F38(slot2));
-    sub_81B8F6C(slot2, valBuffer);
+    u8 partyId = GetPartyIdFromBattleSlot(slot);
+    SetPartyIdAtBattleSlot(slot, GetPartyIdFromBattleSlot(slot2));
+    SetPartyIdAtBattleSlot(slot2, partyId);
 }
 
-u8 pokemon_order_func(u8 slot)
+u8 GetPartyIdFromBattlePartyId(u8 battlePartyId)
 {
     u8 i, j;
 
-    for (j = i = 0; i < 3; j++, i++)
+    for (j = i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); j++, i++)
     {
-        if ((gUnknown_0203CF00[i] >> 4) != slot)
+        if ((gBattlePartyCurrentOrder[i] >> 4) != battlePartyId)
         {
             j++;
-            if ((gUnknown_0203CF00[i] & 0xF) == slot)
+            if ((gBattlePartyCurrentOrder[i] & 0xF) == battlePartyId)
                 return j;
         }
         else
@@ -7076,147 +6000,155 @@ u8 pokemon_order_func(u8 slot)
     return 0;
 }
 
-static void pokemon_change_order(void)
+static void UpdatePartyToBattleOrder(void)
 {
     struct Pokemon *partyBuffer = Alloc(sizeof(gPlayerParty));
     u8 i;
 
     memcpy(partyBuffer, gPlayerParty, sizeof(gPlayerParty));
     for (i = 0; i < PARTY_SIZE; i++)
-        memcpy(&gPlayerParty[pokemon_order_func(i)], &partyBuffer[i], sizeof(struct Pokemon));
+        memcpy(&gPlayerParty[GetPartyIdFromBattlePartyId(i)], &partyBuffer[i], sizeof(struct Pokemon));
     Free(partyBuffer);
 }
 
-static void sub_81B9080(void)
+static void UpdatePartyToFieldOrder(void)
 {
     struct Pokemon *partyBuffer = Alloc(sizeof(gPlayerParty));
     u8 i;
 
     memcpy(partyBuffer, gPlayerParty, sizeof(gPlayerParty));
     for (i = 0; i < PARTY_SIZE; i++)
-        memcpy(&gPlayerParty[sub_81B8F38(i)], &partyBuffer[i], sizeof(struct Pokemon));
+        memcpy(&gPlayerParty[GetPartyIdFromBattleSlot(i)], &partyBuffer[i], sizeof(struct Pokemon));
     Free(partyBuffer);
 }
 
-static void sub_81B90D0(void)
+// Unused
+static void SwitchAliveMonIntoLeadSlot(void)
 {
     u8 i;
     struct Pokemon *mon;
-    u8 leadVal;
+    u8 partyId;
 
     for (i = 1; i < PARTY_SIZE; i++)
     {
-        mon = &gPlayerParty[sub_81B8F38(i)];
+        mon = &gPlayerParty[GetPartyIdFromBattleSlot(i)];
         if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(mon, MON_DATA_HP) != 0)
         {
-            leadVal = sub_81B8F38(0);
-            sub_81B8FB0(0, i);
-            sub_81B1288(&gPlayerParty[leadVal], mon);
+            partyId = GetPartyIdFromBattleSlot(0);
+            SwitchPartyMonSlots(0, i);
+            SwapPartyPokemon(&gPlayerParty[partyId], mon);
             break;
         }
     }
 }
 
-static void sub_81B9140(void)
+static void CB2_SetUpExitToBattleScreen(void)
 {
-    SetMainCallback2(SetCB2ToReshowScreenAfterMenu);
+    SetMainCallback2(CB2_SetUpReshowBattleScreenAfterMenu);
 }
 
-void sub_81B9150(void)
+void ShowPartyMenuToShowcaseMultiBattleParty(void)
 {
-    InitPartyMenu(5, 3, 0, 0, 0x7F, sub_81B917C, gMain.savedCallback);
+    InitPartyMenu(PARTY_MENU_TYPE_MULTI_SHOWCASE, PARTY_LAYOUT_MULTI_SHOWCASE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_NONE, Task_InitMultiPartnerPartySlideIn, gMain.savedCallback);
 }
 
-static void sub_81B917C(u8 taskId)
+#define tXPos  data[0]
+
+static void Task_InitMultiPartnerPartySlideIn(u8 taskId)
 {
-    gTasks[taskId].data[0] = 256;
-    sub_81B9294(taskId);
+    // The first slide step also sets the sprites offscreen
+    gTasks[taskId].tXPos = 256;
+    SlideMultiPartyMenuBoxSpritesOneStep(taskId);
     ChangeBgX(2, 0x10000, 0);
-    gTasks[taskId].func = sub_81B91B4;
+    gTasks[taskId].func = Task_MultiPartnerPartySlideIn;
 }
 
-static void sub_81B91B4(u8 taskId)
+static void Task_MultiPartnerPartySlideIn(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     u8 i;
 
     if (!gPaletteFade.active)
     {
-        data[0] -= 8;
-        sub_81B9294(taskId);
-        if (data[0] == 0)
+        tXPos -= 8;
+        SlideMultiPartyMenuBoxSpritesOneStep(taskId);
+        if (tXPos == 0)
         {
             for (i = 3; i < PARTY_SIZE; i++)
             {
-                if (gUnknown_02022FF8[i - 3].species != SPECIES_NONE)
-                    AnimateSelectedPartyIcon(gUnknown_0203CEDC[i].monSpriteId, 0);
+                if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
+                    AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0);
             }
-            PlaySE(SE_W231); // Harden SE?
-            gTasks[taskId].func = sub_81B9240;
+            PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen
+            gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn;
         }
     }
 }
 
-static void sub_81B9240(u8 taskId)
+static void Task_WaitAfterMultiPartnerPartySlideIn(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (++data[0] == 0x100)
+    // data[0] used as a timer afterwards rather than the x pos
+    if (++data[0] == 256)
         Task_ClosePartyMenu(taskId);
 }
 
-static void sub_81B9270(u8 spriteId, s16 x)
+static void MoveMultiPartyMenuBoxSprite(u8 spriteId, s16 x)
 {
     if (x >= 0)
         gSprites[spriteId].pos2.x = x;
 }
 
-static void sub_81B9294(u8 taskId)
+static void SlideMultiPartyMenuBoxSpritesOneStep(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     u8 i;
 
     for (i = 3; i < PARTY_SIZE; i++)
     {
-        if (gUnknown_02022FF8[i - 3].species != SPECIES_NONE)
+        if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
         {
-            sub_81B9270(gUnknown_0203CEDC[i].monSpriteId, data[0] - 8);
-            sub_81B9270(gUnknown_0203CEDC[i].itemSpriteId, data[0] - 8);
-            sub_81B9270(gUnknown_0203CEDC[i].pokeballSpriteId, data[0] - 8);
-            sub_81B9270(gUnknown_0203CEDC[i].statusSpriteId, data[0] - 8);
+            MoveMultiPartyMenuBoxSprite(sPartyMenuBoxes[i].monSpriteId, tXPos - 8);
+            MoveMultiPartyMenuBoxSprite(sPartyMenuBoxes[i].itemSpriteId, tXPos - 8);
+            MoveMultiPartyMenuBoxSprite(sPartyMenuBoxes[i].pokeballSpriteId, tXPos - 8);
+            MoveMultiPartyMenuBoxSprite(sPartyMenuBoxes[i].statusSpriteId, tXPos - 8);
         }
     }
     ChangeBgX(2, 0x800, 1);
 }
 
-void sub_81B9328(void)
+#undef tXpos
+
+void ChooseMonForDaycare(void)
 {
-    InitPartyMenu(6, 0, 0, 0, 15, sub_81B1370, sub_81B9390);
+    InitPartyMenu(PARTY_MENU_TYPE_DAYCARE, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_CHOOSE_MON_2, Task_HandleChooseMonInput, BufferMonSelection);
 }
 
-static void sub_81B9354(u8 arg1)
+// Unused
+static void ChoosePartyMonByMenuType(u8 menuType)
 {
-    gFieldCallback2 = hm_add_c3_without_phase_2;
-    InitPartyMenu(arg1, 0, 11, 0, 0, sub_81B1370, CB2_ReturnToField);
+    gFieldCallback2 = CB2_FadeFromPartyMenu;
+    InitPartyMenu(menuType, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_AND_CLOSE, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_ReturnToField);
 }
 
-static void sub_81B9390(void)
+static void BufferMonSelection(void)
 {
     gSpecialVar_0x8004 = GetCursorSelectionMonId();
     if (gSpecialVar_0x8004 >= PARTY_SIZE)
         gSpecialVar_0x8004 = 0xFF;
-    gFieldCallback2 = hm_add_c3_without_phase_2;
+    gFieldCallback2 = CB2_FadeFromPartyMenu;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-bool8 hm_add_c3_without_phase_2(void) // might not be bool
+bool8 CB2_FadeFromPartyMenu(void)
 {
     pal_fill_black();
-    CreateTask(task_hm_without_phase_2, 10);
+    CreateTask(Task_PartyMenuWaitForFade, 10);
     return TRUE;
 }
 
-static void task_hm_without_phase_2(u8 taskId)
+static void Task_PartyMenuWaitForFade(u8 taskId)
 {
     if (IsWeatherNotFadingIn())
     {
@@ -7226,84 +6158,85 @@ static void task_hm_without_phase_2(u8 taskId)
     }
 }
 
-void sub_81B9404(void)
+void ChooseContestMon(void)
 {
     ScriptContext2_Enable();
     FadeScreen(FADE_TO_BLACK, 0);
-    CreateTask(sub_81B9424, 10);
+    CreateTask(Task_ChooseContestMon, 10);
 }
 
-static void sub_81B9424(u8 taskId)
+static void Task_ChooseContestMon(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        InitPartyMenu(2, 0, 11, 0, 0, sub_81B1370, sub_81B9470);
+        InitPartyMenu(PARTY_MENU_TYPE_CONTEST, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_AND_CLOSE, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_ChooseContestMon);
         DestroyTask(taskId);
     }
 }
 
-static void sub_81B9470(void)
+static void CB2_ChooseContestMon(void)
 {
     gContestMonPartyIndex = GetCursorSelectionMonId();
     if (gContestMonPartyIndex >= PARTY_SIZE)
         gContestMonPartyIndex = 0xFF;
     gSpecialVar_0x8004 = gContestMonPartyIndex;
-    gFieldCallback2 = hm_add_c3_without_phase_2;
+    gFieldCallback2 = CB2_FadeFromPartyMenu;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void sub_81B94B0(void)
+// Used as a script special for showing a party mon to various npcs (e.g. in-game trades, move deleter)
+void ChoosePartyMon(void)
 {
     ScriptContext2_Enable();
     FadeScreen(FADE_TO_BLACK, 0);
-    CreateTask(sub_81B94D0, 10);
+    CreateTask(Task_ChoosePartyMon, 10);
 }
 
-static void sub_81B94D0(u8 taskId)
+static void Task_ChoosePartyMon(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        InitPartyMenu(3, 0, 11, 0, 0, sub_81B1370, sub_81B9390);
+        InitPartyMenu(PARTY_MENU_TYPE_CHOOSE_MON, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_AND_CLOSE, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, BufferMonSelection);
         DestroyTask(taskId);
     }
 }
 
-void sub_81B951C(void)
+void ChooseMonForMoveRelearner(void)
 {
     ScriptContext2_Enable();
     FadeScreen(FADE_TO_BLACK, 0);
-    CreateTask(sub_81B953C, 10);
+    CreateTask(Task_ChooseMonForMoveRelearner, 10);
 }
 
-static void sub_81B953C(u8 taskId)
+static void Task_ChooseMonForMoveRelearner(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        InitPartyMenu(7, 0, 11, 0, 0, sub_81B1370, sub_81B9588);
+        InitPartyMenu(PARTY_MENU_TYPE_MOVE_RELEARNER, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_AND_CLOSE, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, CB2_ChooseMonForMoveRelearner);
         DestroyTask(taskId);
     }
 }
 
-static void sub_81B9588(void)
+static void CB2_ChooseMonForMoveRelearner(void)
 {
     gSpecialVar_0x8004 = GetCursorSelectionMonId();
     if (gSpecialVar_0x8004 >= PARTY_SIZE)
         gSpecialVar_0x8004 = 0xFF;
     else
         gSpecialVar_0x8005 = GetNumberOfRelearnableMoves(&gPlayerParty[gSpecialVar_0x8004]);
-    gFieldCallback2 = hm_add_c3_without_phase_2;
+    gFieldCallback2 = CB2_FadeFromPartyMenu;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void sub_81B95E0(void)
+void DoBattlePyramidMonsHaveHeldItem(void)
 {
     u8 i;
 
     gSpecialVar_Result = FALSE;
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) != ITEM_NONE)
         {
@@ -7313,42 +6246,44 @@ void sub_81B95E0(void)
     }
 }
 
-void sub_81B9620(void)
+// Can be called if the Battle Pyramid Bag is full on exiting and at least one party mon still has held items
+// The player can then select to toss items from the bag or take/toss held items from the party
+void BattlePyramidChooseMonHeldItems(void)
 {
     ScriptContext2_Enable();
     FadeScreen(FADE_TO_BLACK, 0);
-    CreateTask(sub_81B9640, 10);
+    CreateTask(Task_BattlePyramidChooseMonHeldItems, 10);
 }
 
-static void sub_81B9640(u8 taskId)
+static void Task_BattlePyramidChooseMonHeldItems(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        InitPartyMenu(12, 0, 0, 0, 0, sub_81B1370, sub_81B9390);
+        InitPartyMenu(PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS, PARTY_LAYOUT_SINGLE, PARTY_ACTION_CHOOSE_MON, FALSE, PARTY_MSG_CHOOSE_MON, Task_HandleChooseMonInput, BufferMonSelection);
         DestroyTask(taskId);
     }
 }
 
-void sub_81B968C(void)
+void MoveDeleterChooseMoveToForget(void)
 {
     ShowPokemonSummaryScreen(PSS_MODE_SELECT_MOVE, gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField);
     gFieldCallback = FieldCallback_ReturnToEventScript2;
 }
 
-void sub_81B96D0(void)
+void GetNumMovesSelectedMonHas(void)
 {
     u8 i;
 
     gSpecialVar_Result = 0;
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
-        if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i) != ITEM_NONE)
+        if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i) != MOVE_NONE)
             gSpecialVar_Result++;
     }
 }
 
-void sub_81B9718(void)
+void BufferMoveDeleterNicknameAndMove(void)
 {
     struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
     u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
@@ -7357,17 +6292,17 @@ void sub_81B9718(void)
     StringCopy(gStringVar2, gMoveNames[move]);
 }
 
-void sub_81B9770(void)
+void MoveDeleterForgetMove(void)
 {
     u16 i;
 
     SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], MOVE_NONE, gSpecialVar_0x8005);
     RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005);
     for (i = gSpecialVar_0x8005; i < MAX_MON_MOVES - 1; i++)
-        sub_81B97DC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
+        ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
 }
 
-static void sub_81B97DC(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
+static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
 {
     u16 move1 = GetMonData(mon, MON_DATA_MOVE1 + slotTo);
     u16 move0 = GetMonData(mon, MON_DATA_MOVE1 + slotFrom);
@@ -7388,7 +6323,7 @@ static void sub_81B97DC(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
     SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
 }
 
-void sub_81B98DC(void)
+void IsSelectedMonEgg(void)
 {
     if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
         gSpecialVar_Result = TRUE;
@@ -7396,7 +6331,7 @@ void sub_81B98DC(void)
         gSpecialVar_Result = FALSE;
 }
 
-void sub_81B9918(void)
+void IsLastMonThatKnowsSurf(void)
 {
     u16 move;
     u32 i, j;
diff --git a/src/player_pc.c b/src/player_pc.c
index dd90bbd8a..94484ab72 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -419,12 +419,12 @@ static void PlayerPC_Decoration(u8 taskId)
 
 static void PlayerPC_TurnOff(u8 taskId)
 {
-    if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC and not player PC, so do gender specific handling.
+    if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC, so do gender specific handling.
     {
         if (gSaveBlock2Ptr->playerGender == MALE)
-            ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_1F863F);
+            ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC);
         else
-            ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_1F958F);
+            ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC);
     }
     else
     {
@@ -824,7 +824,7 @@ static void Mailbox_DoGiveMailPokeMenu(u8 taskId)
     {
         sub_81D1EC0();
         CleanupOverworldWindowsAndTilemaps();
-        sub_81B8448();
+        ChooseMonToGiveMailFromMailbox();
         DestroyTask(taskId);
     }
 }
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 14e5b6a1f..4c744b537 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -462,7 +462,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
 
 void OpenPokeblockCaseInBattle(void)
 {
-    OpenPokeblockCase(PBLOCK_CASE_BATTLE, SetCB2ToReshowScreenAfterMenu2);
+    OpenPokeblockCase(PBLOCK_CASE_BATTLE, CB2_SetUpReshowBattleScreenAfterMenu2);
 }
 
 void OpenPokeblockCaseOnFeeder(void)
diff --git a/src/pokedex.c b/src/pokedex.c
index 0b04ae3b9..2aa5e30ea 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -140,7 +140,7 @@ void sub_80BB78C(u8);
 void sub_80BB7D4(u8);
 void sub_80BBA28(u8);
 void sub_80BBA78(u8);
-void sub_80BBBF4(u8);
+void LoadPageOnceMonFinishedMoving(u8);
 void sub_80BBC74(u8);
 void sub_80BBD1C(u8);
 void sub_80BBDE8(u8);
@@ -169,7 +169,7 @@ u8 sub_80BDA40(void);
 u16 GetPokemonSpriteToDisplay(u16);
 u32 sub_80BDACC(u16, s16, s16);
 static void CreateInterfaceSprites(u8);
-void sub_80BE470(struct Sprite *sprite);
+void MoveMonIntoPosition(struct Sprite *sprite);
 static void SpriteCB_Scrollbar(struct Sprite *sprite);
 void sub_80BE658(struct Sprite *sprite);
 void sub_80BE758(struct Sprite *sprite);
@@ -177,29 +177,29 @@ void sub_80BE780(struct Sprite *sprite);
 void sub_80BE44C(struct Sprite *sprite);
 void sub_80BE834(struct Sprite *sprite);
 void sub_80BE4E0(struct Sprite *sprite);
-u8 sub_80BE91C(struct PokedexListItem*, u8);
+u8 SetupInfoScreen(struct PokedexListItem*, u8 monSpriteId);
 bool8 sub_80BE9C4(u8);
 u8 sub_80BE9F8(struct PokedexListItem*, u8);
-void sub_80BEA24(u8);
-void sub_80BEDF4(u8);
-void sub_80BEFD0(u8);
-void sub_80BF038(u8);
-void sub_80BF070(u8);
-void sub_80BF0AC(u8);
+void LoadInfoScreen(u8);
+void ChangePokedexScreen(u8);
+void LoadSelectedScreen(u8);
+void BeginChangeInfoScreen(u8);
+void BeginReturnToPokedex(u8);
+void LoadAreaScreen(u8);
 void sub_80BF1B4(u8);
 void sub_80BF1EC(u8);
-void sub_80BF250(u8);
+void LoadCryScreen(u8);
 void sub_80BF5CC(u8);
 void sub_80BF790(u8);
 void sub_80BF7FC(u8);
-void sub_80BF82C(u8);
+void LoadSizeScreen(u8);
 void sub_80BFBB0(u8);
 void sub_80BFC78(u8);
 void sub_80BFCDC(u16);
 void sub_80BFCF4(u16);
 void sub_80BFD0C(u8, u16);
 void sub_80BFD7C(u8, u16);
-void sub_80BFE38(u8);
+static void Task_DisplayNewMonData(u8);
 void sub_80C0088(u8);
 void blockset_load_palette_to_gpu(u8);
 void sub_80C01CC(struct Sprite *sprite);
@@ -211,8 +211,8 @@ u8 sub_80C0B44(u8, u16, u8, u8);
 void sub_80C0D30(u8, u16);
 u16 sub_80C0EF8(u16, s16, s16, s8);
 u16 sub_80C0E0C(u8, u16, u16, u16);
-u8 sub_80C1258();
-void sub_80C12E0(u8);
+u8 LoadSearchMenu(void);
+void Task_LoadSearchMenu(u8);
 void sub_80C1570(u8);
 void sub_80C15B0(u8);
 void sub_80C16CC(u8);
@@ -717,7 +717,7 @@ static const struct SpritePalette sInterfaceSpritePalette[] =
 static const u8 gUnknown_0855D28C[] = {0x4, 0x8, 0x10, 0x20, 0x20};
 static const u8 gUnknown_0855D291[] = {0x8, 0x4, 0x2, 0x1, 0x1};
 
-static const struct BgTemplate gBgTemplates_0855D298[] =
+static const struct BgTemplate sPokedex_BgTemplate[] =
 {
     {
         .bg = 0,
@@ -782,7 +782,7 @@ ALIGNED(4) static const u8 gExpandedPlaceholder_PokedexDescription[] = _("");
 
 static const u16 gUnknown_0856E610[] = INCBIN_U16("graphics/pokedex/black.gbapal");
 
-static const struct BgTemplate gUnknown_0856E630[] =
+static const struct BgTemplate sInfoScreen_BgTemplate[] =
 {
     {
         .bg = 0,
@@ -822,9 +822,14 @@ static const struct BgTemplate gUnknown_0856E630[] =
     }
 };
 
-static const struct WindowTemplate gUnknown_0856E640[] =
+#define WIN_INFO 0
+#define WIN_FOOTPRINT 1
+#define WIN_CRY_WAVE 2
+#define WIN_VU_METER 3
+
+static const struct WindowTemplate sInfoScreen_WindowTemplates[] =
 {
-    {
+    { // WIN_INFO
         .bg = 2,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -833,7 +838,7 @@ static const struct WindowTemplate gUnknown_0856E640[] =
         .paletteNum = 0,
         .baseBlock = 0x0001,
     },
-    {
+    { // WIN_FOOTPRINT
         .bg = 2,
         .tilemapLeft = 25,
         .tilemapTop = 8,
@@ -842,7 +847,7 @@ static const struct WindowTemplate gUnknown_0856E640[] =
         .paletteNum = 15,
         .baseBlock = 0x0281,
     },
-    {
+    { // WIN_CRY_WAVE
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 12,
@@ -851,7 +856,7 @@ static const struct WindowTemplate gUnknown_0856E640[] =
         .paletteNum = 8,
         .baseBlock = 0x0285,
     },
-    {
+    { // WIN_VU_METER
         .bg = 2,
         .tilemapLeft = 18,
         .tilemapTop = 3,
@@ -863,7 +868,7 @@ static const struct WindowTemplate gUnknown_0856E640[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const struct BgTemplate gUnknown_0856E668[] =
+static const struct BgTemplate sNewEntryInfoScreen_BgTemplate[] =
 {
     {
         .bg = 2,
@@ -885,9 +890,9 @@ static const struct BgTemplate gUnknown_0856E668[] =
     },
 };
 
-static const struct WindowTemplate gUnknown_0856E670[] =
+static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] =
 {
-    {
+    { // WIN_INFO
         .bg = 2,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -896,7 +901,7 @@ static const struct WindowTemplate gUnknown_0856E670[] =
         .paletteNum = 0,
         .baseBlock = 0x0001,
     },
-    {
+    { // WIN_FOOTPRINT
         .bg = 2,
         .tilemapLeft = 25,
         .tilemapTop = 8,
@@ -1164,7 +1169,7 @@ static const struct UnknownStruct1 gUnknown_0856EFC8[] =
     {gDexModeOptions, 2, 3, 2},
 };
 
-static const struct BgTemplate gUnknown_0856EFF8[] =
+static const struct BgTemplate sSearchMenu_BgTemplate[] =
 {
     {
         .bg = 0,
@@ -1204,7 +1209,7 @@ static const struct BgTemplate gUnknown_0856EFF8[] =
     }
 };
 
-static const struct WindowTemplate gUnknown_0856F008[] =
+static const struct WindowTemplate sSearchMenu_WindowTemplate[] =
 {
     {
         .bg = 2,
@@ -1397,8 +1402,8 @@ void sub_80BB7D4(u8 taskId)
         {
             sub_80BD8D0();
             BeginNormalPaletteFade(~(1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK);
-            gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470;
-            gTasks[taskId].func = sub_80BBBF4;
+            gSprites[sPokedexView->selectedMonSpriteId].callback = MoveMonIntoPosition;
+            gTasks[taskId].func = LoadPageOnceMonFinishedMoving;
             PlaySE(SE_PIN);
             sub_80BC890();
         }
@@ -1415,7 +1420,7 @@ void sub_80BB7D4(u8 taskId)
         {
             PlaySE(SE_SELECT);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
-            gTasks[taskId].data[0] = sub_80C1258();
+            gTasks[taskId].data[0] = LoadSearchMenu();
             sPokedexView->unk64E = 0;
             sPokedexView->unk62A = sPokedexView->unk62C;
             sPokedexView->unk610 = sPokedexView->selectedPokemon;
@@ -1508,12 +1513,12 @@ void sub_80BBA78(u8 taskId)
     }
 }
 
-void sub_80BBBF4(u8 taskId)
+void LoadPageOnceMonFinishedMoving(u8 taskId)
 {
     if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
     {
         sPokedexView->unk64B = sPokedexView->unk64A;
-        gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
+        gTasks[taskId].data[0] = SetupInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
         gTasks[taskId].func = sub_80BBC74;
     }
 }
@@ -1597,7 +1602,7 @@ void sub_80BBEB8(u8 taskId)
 
             sub_80BD8D0();
             a = (1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16));
-            gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470;
+            gSprites[sPokedexView->selectedMonSpriteId].callback = MoveMonIntoPosition;
             BeginNormalPaletteFade(~a, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].func = sub_80BC2D4;
             PlaySE(SE_PIN);
@@ -1614,7 +1619,7 @@ void sub_80BBEB8(u8 taskId)
         else if (gMain.newKeys & SELECT_BUTTON)
         {
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
-            gTasks[taskId].data[0] = sub_80C1258();
+            gTasks[taskId].data[0] = LoadSearchMenu();
             sPokedexView->unk64E = 0;
             gTasks[taskId].func = sub_80BBD1C;
             PlaySE(SE_PC_LOGIN);
@@ -1712,7 +1717,7 @@ void sub_80BC2D4(u8 taskId)
     if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
     {
         sPokedexView->unk64B = sPokedexView->unk64A;
-        gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
+        gTasks[taskId].data[0] = SetupInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
         sPokedexView->selectedMonSpriteId = -1;
         gTasks[taskId].func = sub_80BC360;
     }
@@ -1774,7 +1779,7 @@ bool8 sub_80BC514(u8 a)
             sub_80C09B0(0);
             SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset);
             ResetBgsAndClearDma3BusyFlags(0);
-            InitBgsFromTemplates(0, gBgTemplates_0855D298, 4);
+            InitBgsFromTemplates(0, sPokedex_BgTemplate, 4);
             SetBgTilemapBuffer(3, AllocZeroed(0x800));
             SetBgTilemapBuffer(2, AllocZeroed(0x800));
             SetBgTilemapBuffer(1, AllocZeroed(0x800));
@@ -2690,7 +2695,7 @@ void sub_80BE44C(struct Sprite *sprite)
 }
 
 //Move Pokemon into position for description page
-void sub_80BE470(struct Sprite *sprite)
+void MoveMonIntoPosition(struct Sprite *sprite)
 {
     sprite->oam.priority = 0;
     sprite->oam.affineMode = 0;
@@ -2860,25 +2865,27 @@ void sub_80BE8DC(const u8* str, u8 left, u8 top)
     AddTextPrinterParameterized4(0, 1, left, top, 0, 0, color, -1, str);
 }
 
-u8 sub_80BE91C(struct PokedexListItem* item, u8 b)
+#define tMonSpriteId data[4]
+
+u8 SetupInfoScreen(struct PokedexListItem* item, u8 monSpriteId)
 {
     u8 taskId;
 
     sPokedexListItem = item;
-    taskId = CreateTask(sub_80BEA24, 0);
+    taskId = CreateTask(LoadInfoScreen, 0);
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].data[1] = 1;
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].data[3] = 0;
-    gTasks[taskId].data[4] = b;
+    gTasks[taskId].tMonSpriteId = monSpriteId;
     gTasks[taskId].data[5] = 255;
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0856E630, 4);
+    InitBgsFromTemplates(0, sInfoScreen_BgTemplate, 4);
     SetBgTilemapBuffer(3, AllocZeroed(0x800));
     SetBgTilemapBuffer(2, AllocZeroed(0x800));
     SetBgTilemapBuffer(1, AllocZeroed(0x800));
     SetBgTilemapBuffer(0, AllocZeroed(0x800));
-    InitWindows(gUnknown_0856E640);
+    InitWindows(sInfoScreen_WindowTemplates);
     DeactivateAllTextPrinters();
 
     return taskId;
@@ -2886,7 +2893,7 @@ u8 sub_80BE91C(struct PokedexListItem* item, u8 b)
 
 bool8 sub_80BE9C4(u8 taskId)
 {
-    if (gTasks[taskId].data[0] == 0 && gTasks[taskId].func == sub_80BEDF4)
+    if (gTasks[taskId].data[0] == 0 && gTasks[taskId].func == ChangePokedexScreen)
         return FALSE;
     else
         return TRUE;
@@ -2902,7 +2909,7 @@ u8 sub_80BE9F8(struct PokedexListItem *item, u8 b)
     return b;
 }
 
-void sub_80BEA24(u8 taskId)
+void LoadInfoScreen(u8 taskId)
 {
     switch (gMain.state)
     {
@@ -2956,8 +2963,8 @@ void sub_80BEA24(u8 taskId)
         case 5:
             if (gTasks[taskId].data[1] == 0)
             {
-                gTasks[taskId].data[4] = (u16)CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0);
-                gSprites[gTasks[taskId].data[4]].oam.priority = 0;
+                gTasks[taskId].tMonSpriteId = (u16)CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0);
+                gSprites[gTasks[taskId].tMonSpriteId].oam.priority = 0;
             }
             gMain.state++;
             break;
@@ -2968,7 +2975,7 @@ void sub_80BEA24(u8 taskId)
                 if (gTasks[taskId].data[2] != 0)
                     r3 = 0x14;
                 if (gTasks[taskId].data[1] != 0)
-                    r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16));
+                    r3 |= (1 << (gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum + 16));
                 BeginNormalPaletteFade(~r3, 0, 16, 0, RGB_BLACK);
                 SetVBlankCallback(gUnknown_030060B4);
                 gMain.state++;
@@ -3009,7 +3016,7 @@ void sub_80BEA24(u8 taskId)
             gTasks[taskId].data[1] = 0;
             gTasks[taskId].data[2] = 1;
             gTasks[taskId].data[3] = 1;
-            gTasks[taskId].func = sub_80BEDF4;
+            gTasks[taskId].func = ChangePokedexScreen;
             gMain.state = 0;
             break;
     }
@@ -3033,19 +3040,19 @@ void sub_80BEDB0(void)
         Free(r0);
 }
 
-void sub_80BEDF4(u8 taskId)
+void ChangePokedexScreen(u8 taskId)
 {
     if (gTasks[taskId].data[0] != 0)
     {
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
-        gTasks[taskId].func = sub_80BF038;
+        gTasks[taskId].func = BeginChangeInfoScreen;
         PlaySE(SE_Z_SCROLL);
         return;
     }
     if (gMain.newKeys & B_BUTTON)
     {
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
-        gTasks[taskId].func = sub_80BF070;
+        gTasks[taskId].func = BeginReturnToPokedex;
         PlaySE(SE_PC_OFF);
         return;
     }
@@ -3056,13 +3063,13 @@ void sub_80BEDF4(u8 taskId)
             case AREA_SCREEN:
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB_BLACK);
                 sPokedexView->unk64E = 1;
-                gTasks[taskId].func = sub_80BEFD0;
+                gTasks[taskId].func = LoadSelectedScreen;
                 PlaySE(SE_PIN);
                 break;
             case CRY_SCREEN:
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
                 sPokedexView->unk64E = 2;
-                gTasks[taskId].func = sub_80BEFD0;
+                gTasks[taskId].func = LoadSelectedScreen;
                 PlaySE(SE_PIN);
                 break;
             case SIZE_SCREEN:
@@ -3074,13 +3081,13 @@ void sub_80BEDF4(u8 taskId)
                 {
                     BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
                     sPokedexView->unk64E = 3;
-                    gTasks[taskId].func = sub_80BEFD0;
+                    gTasks[taskId].func = LoadSelectedScreen;
                     PlaySE(SE_PIN);
                 }
                 break;
             case CANCEL_SCREEN:
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
-                gTasks[taskId].func = sub_80BF070;
+                gTasks[taskId].func = BeginReturnToPokedex;
                 PlaySE(SE_PC_OFF);
                 break;
         }
@@ -3106,47 +3113,47 @@ void sub_80BEDF4(u8 taskId)
     }
 }
 
-void sub_80BEFD0(u8 taskId)
+void LoadSelectedScreen(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
+        FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
         switch (sPokedexView->unk64E)
         {
             case 1:
             default:
-                gTasks[taskId].func = sub_80BF0AC;
+                gTasks[taskId].func = LoadAreaScreen;
                 break;
             case 2:
-                gTasks[taskId].func = sub_80BF250;
+                gTasks[taskId].func = LoadCryScreen;
                 break;
             case 3:
-                gTasks[taskId].func = sub_80BF82C;
+                gTasks[taskId].func = LoadSizeScreen;
                 break;
         }
     }
 }
 
-void sub_80BF038(u8 taskId)
+void BeginChangeInfoScreen(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
-        gTasks[taskId].func = sub_80BEA24;
+        FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
+        gTasks[taskId].func = LoadInfoScreen;
     }
 }
 
-void sub_80BF070(u8 taskId)
+void BeginReturnToPokedex(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
+        FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
         sub_80BEDB0();
         DestroyTask(taskId);
     }
 }
 
-void sub_80BF0AC(u8 taskId)
+void LoadAreaScreen(u8 taskId)
 {
     switch (gMain.state)
     {
@@ -3193,16 +3200,16 @@ void sub_80BF1EC(u8 taskId)
         {
             case 1:
             default:
-                gTasks[taskId].func = sub_80BEA24;
+                gTasks[taskId].func = LoadInfoScreen;
                 break;
             case 2:
-                gTasks[taskId].func = sub_80BF250;
+                gTasks[taskId].func = LoadCryScreen;
                 break;
         }
     }
 }
 
-void sub_80BF250(u8 taskId)
+void LoadCryScreen(u8 taskId)
 {
     switch (gMain.state)
     {
@@ -3222,10 +3229,10 @@ void sub_80BF250(u8 taskId)
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0);
             CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0);
-            FillWindowPixelBuffer(0, PIXEL_FILL(0));
-            PutWindowTilemap(0);
-            PutWindowTilemap(3);
-            PutWindowTilemap(2);
+            FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
+            PutWindowTilemap(WIN_INFO);
+            PutWindowTilemap(WIN_VU_METER);
+            PutWindowTilemap(WIN_CRY_WAVE);
             gMain.state++;
             break;
         case 2:
@@ -3244,8 +3251,8 @@ void sub_80BF250(u8 taskId)
             gMain.state++;
             break;
         case 5:
-            gTasks[taskId].data[4] = CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0);
-            gSprites[gTasks[taskId].data[4]].oam.priority = 0;
+            gTasks[taskId].tMonSpriteId = CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0);
+            gSprites[gTasks[taskId].tMonSpriteId].oam.priority = 0;
             gDexCryScreenState = 0;
             gMain.state++;
             break;
@@ -3274,8 +3281,8 @@ void sub_80BF250(u8 taskId)
                 spC.yPos = 3;
                 if (sub_8145850(&spC, 3) != 0)
                     gMain.state++;
-                CopyWindowToVram(3, 2);
-                CopyWindowToVram(0, 3);
+                CopyWindowToVram(WIN_VU_METER, 2);
+                CopyWindowToVram(WIN_INFO, 3);
                 CopyBgTilemapBufferToVram(0);
                 CopyBgTilemapBufferToVram(1);
                 CopyBgTilemapBufferToVram(2);
@@ -3367,18 +3374,18 @@ void sub_80BF790(u8 taskId)
     if (!gPaletteFade.active)
     {
         sub_8145914();
-        FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
+        FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
         switch (sPokedexView->unk64E)
         {
             default:
             case 1:
-                gTasks[taskId].func = sub_80BEA24;
+                gTasks[taskId].func = LoadInfoScreen;
                 break;
             case 2:
-                gTasks[taskId].func = sub_80BF0AC;
+                gTasks[taskId].func = LoadAreaScreen;
                 break;
             case 3:
-                gTasks[taskId].func = sub_80BF82C;
+                gTasks[taskId].func = LoadSizeScreen;
                 break;
         }
     }
@@ -3395,7 +3402,7 @@ void sub_80BF7FC(u8 a)
     LoadPalette(&unk, 0x5D, 2);
 }
 
-void sub_80BF82C(u8 taskId)
+void LoadSizeScreen(u8 taskId)
 {
     u8 spriteId;
 
@@ -3416,8 +3423,8 @@ void sub_80BF82C(u8 taskId)
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
             CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0);
-            FillWindowPixelBuffer(0, PIXEL_FILL(0));
-            PutWindowTilemap(0);
+            FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
+            PutWindowTilemap(WIN_INFO);
             gMain.state++;
             break;
         case 2:
@@ -3459,8 +3466,8 @@ void sub_80BF82C(u8 taskId)
             gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
             SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale);
             LoadPalette(gUnknown_0856E610, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
-            gTasks[taskId].data[4] = spriteId;
-            CopyWindowToVram(0, 3);
+            gTasks[taskId].tMonSpriteId = spriteId;
+            CopyWindowToVram(WIN_INFO, 3);
             CopyBgTilemapBufferToVram(1);
             CopyBgTilemapBufferToVram(2);
             CopyBgTilemapBufferToVram(3);
@@ -3516,16 +3523,16 @@ void sub_80BFC78(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]);
+        FreeAndDestroyMonPicSprite(gTasks[taskId].tMonSpriteId);
         FreeAndDestroyTrainerPicSprite(gTasks[taskId].data[5]);
         switch (sPokedexView->unk64E)
         {
             default:
             case 1:
-                gTasks[taskId].func = sub_80BEA24;
+                gTasks[taskId].func = LoadInfoScreen;
                 break;
             case 2:
-                gTasks[taskId].func = sub_80BF250;
+                gTasks[taskId].func = LoadCryScreen;
                 break;
         }
     }
@@ -3729,7 +3736,7 @@ _080BFDB4:\n\
 
 u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 b, u32 c)
 {
-    u8 taskId = CreateTask(sub_80BFE38, 0);
+    u8 taskId = CreateTask(Task_DisplayNewMonData, 0);
 
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].data[1] = dexNum;
@@ -3740,7 +3747,7 @@ u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 b, u32 c)
     return taskId;
 }
 
-void sub_80BFE38(u8 taskId)
+static void Task_DisplayNewMonData(u8 taskId)
 {
     u8 spriteId;
     u16 dexNum = gTasks[taskId].data[1];
@@ -3755,10 +3762,10 @@ void sub_80BFE38(u8 taskId)
                 SetVBlankCallback(NULL);
                 sub_80C09B0(0x100);
                 ResetBgsAndClearDma3BusyFlags(0);
-                InitBgsFromTemplates(0, gUnknown_0856E668, 2);
+                InitBgsFromTemplates(0, sNewEntryInfoScreen_BgTemplate, 2);
                 SetBgTilemapBuffer(3, AllocZeroed(0x800));
                 SetBgTilemapBuffer(2, AllocZeroed(0x800));
-                InitWindows(gUnknown_0856E670);
+                InitWindows(sNewEntryInfoScreen_WindowTemplates);
                 DeactivateAllTextPrinters();
                 gTasks[taskId].data[0] = 1;
             }
@@ -3766,11 +3773,11 @@ void sub_80BFE38(u8 taskId)
         case 1:
             DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
             CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0);
-            FillWindowPixelBuffer(0, PIXEL_FILL(0));
-            PutWindowTilemap(0);
-            PutWindowTilemap(1);
+            FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
+            PutWindowTilemap(WIN_INFO);
+            PutWindowTilemap(WIN_FOOTPRINT);
             sub_80C0D30(1, gTasks[taskId].data[1]);
-            CopyWindowToVram(1, 2);
+            CopyWindowToVram(WIN_FOOTPRINT, 2);
             ResetPaletteFade();
             LoadPokedexBgPalette(0);
             gTasks[taskId].data[0]++;
@@ -3780,7 +3787,7 @@ void sub_80BFE38(u8 taskId)
             break;
         case 3:
             sub_80C020C(dexNum, IsNationalPokedexEnabled(), 1, 1);
-            CopyWindowToVram(0, 3);
+            CopyWindowToVram(WIN_INFO, 3);
             CopyBgTilemapBufferToVram(2);
             CopyBgTilemapBufferToVram(3);
             gTasks[taskId].data[0]++;
@@ -4764,9 +4771,9 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     return resultsCount;
 }
 
-u8 sub_80C1258(void)
+u8 LoadSearchMenu(void)
 {
-    return CreateTask(sub_80C12E0, 0);
+    return CreateTask(Task_LoadSearchMenu, 0);
 }
 
 void sub_80C1270(const u8 *str, u32 left, u32 top)
@@ -4784,7 +4791,7 @@ void sub_80C12B0(u32 x, u32 y, u32 width, u32 height)
     FillWindowPixelRect(0, PIXEL_FILL(0), x, y, width, height);
 }
 
-void sub_80C12E0(u8 taskId)
+void Task_LoadSearchMenu(u8 taskId)
 {
     u16 i;
 
@@ -4797,12 +4804,12 @@ void sub_80C12E0(u8 taskId)
                 sPokedexView->unk64A = 2;
                 sub_80C09B0(0);
                 ResetBgsAndClearDma3BusyFlags(0);
-                InitBgsFromTemplates(0, gUnknown_0856EFF8, 4);
+                InitBgsFromTemplates(0, sSearchMenu_BgTemplate, 4);
                 SetBgTilemapBuffer(3, AllocZeroed(0x800));
                 SetBgTilemapBuffer(2, AllocZeroed(0x800));
                 SetBgTilemapBuffer(1, AllocZeroed(0x800));
                 SetBgTilemapBuffer(0, AllocZeroed(0x800));
-                InitWindows(gUnknown_0856F008);
+                InitWindows(sSearchMenu_WindowTemplate);
                 DeactivateAllTextPrinters();
                 PutWindowTilemap(0);
                 DecompressAndLoadBgGfxUsingHeap(3, gPokedexSearchMenu_Gfx, 0x2000, 0, 0);
diff --git a/src/pokemon.c b/src/pokemon.c
index c555ca3d7..376f400e6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -60,6 +60,7 @@ static void EncryptBoxMon(struct BoxPokemon *boxMon);
 static void DecryptBoxMon(struct BoxPokemon *boxMon);
 static void sub_806E6CC(u8 taskId);
 static bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 battlerId);
+static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
 
 // EWRAM vars
 EWRAM_DATA static u8 sLearningMoveTableID = 0;
@@ -2879,22 +2880,22 @@ u16 GiveMoveToMon(struct Pokemon *mon, u16 move)
     return GiveMoveToBoxMon(&mon->box, move);
 }
 
-u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
+static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
 {
     s32 i;
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
         u16 existingMove = GetBoxMonData(boxMon, MON_DATA_MOVE1 + i, NULL);
-        if (!existingMove)
+        if (existingMove == MOVE_NONE)
         {
             SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, &move);
             SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gBattleMoves[move].pp);
             return move;
         }
         if (existingMove == move)
-            return -2;
+            return MON_ALREADY_KNOWS_MOVE;
     }
-    return 0xFFFF;
+    return MON_HAS_MAX_MOVES;
 }
 
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
@@ -2942,14 +2943,14 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
         u16 moveLevel;
         u16 move;
 
-        moveLevel = (gLevelUpLearnsets[species][i] & 0xFE00);
+        moveLevel = (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_LV);
 
         if (moveLevel > (level << 9))
             break;
 
-        move = (gLevelUpLearnsets[species][i] & 0x1FF);
+        move = (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID);
 
-        if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF)
+        if (GiveMoveToBoxMon(boxMon, move) == MON_HAS_MAX_MOVES)
             DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move);
     }
 }
@@ -2968,7 +2969,7 @@ u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
     {
         sLearningMoveTableID = 0;
 
-        while ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) != (level << 9))
+        while ((gLevelUpLearnsets[species][sLearningMoveTableID] & LEVEL_UP_MOVE_LV) != (level << 9))
         {
             sLearningMoveTableID++;
             if (gLevelUpLearnsets[species][sLearningMoveTableID] == LEVEL_UP_END)
@@ -2976,9 +2977,9 @@ u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
         }
     }
 
-    if ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) == (level << 9))
+    if ((gLevelUpLearnsets[species][sLearningMoveTableID] & LEVEL_UP_MOVE_LV) == (level << 9))
     {
-        gMoveToLearn = (gLevelUpLearnsets[species][sLearningMoveTableID] & 0x1FF);
+        gMoveToLearn = (gLevelUpLearnsets[species][sLearningMoveTableID] & LEVEL_UP_MOVE_ID);
         sLearningMoveTableID++;
         retVal = GiveMoveToMon(mon, gMoveToLearn);
     }
@@ -3270,7 +3271,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
             }
 
             // any weather except sun weakens solar beam
-            if ((gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_HAIL)) && gCurrentMove == MOVE_SOLAR_BEAM)
+            if ((gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_HAIL_ANY)) && gCurrentMove == MOVE_SOLAR_BEAM)
                 damage /= 2;
 
             // sunny
@@ -4860,7 +4861,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                 if (battlerId != 4)
                                 {
                                     gAbsentBattlerFlags &= ~gBitTable[battlerId];
-                                    CopyPlayerPartyMonToBattleData(battlerId, pokemon_order_func(gBattlerPartyIndexes[battlerId]));
+                                    CopyPlayerPartyMonToBattleData(battlerId, GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battlerId]));
                                     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255)
                                         gBattleResults.numRevivesUsed++;
                                 }
@@ -5657,21 +5658,23 @@ void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies)
         SetMonData(mon, MON_DATA_NICKNAME, gSpeciesNames[newSpecies]);
 }
 
-bool8 sub_806D7EC(void)
+// The below two functions determine which side of a multi battle the trainer battles on
+// 0 is the left (top in  party menu), 1 is right (bottom in party menu)
+u8 GetPlayerFlankId(void)
 {
-    bool8 retVal = FALSE;
+    u8 flankId = 0;
     switch (gLinkPlayers[GetMultiplayerId()].id)
     {
     case 0:
     case 3:
-        retVal = FALSE;
+        flankId = 0;
         break;
     case 1:
     case 2:
-        retVal = TRUE;
+        flankId = 1;
         break;
     }
-    return retVal;
+    return flankId;
 }
 
 u16 GetLinkTrainerFlankId(u8 linkPlayerId)
@@ -6109,23 +6112,23 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == 0xFFFF)
+        if (gLevelUpLearnsets[species][i] == LEVEL_UP_END)
             break;
 
-        moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
+        moveLevel = gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_LV;
 
         if (moveLevel <= (level << 9))
         {
-            for (j = 0; j < MAX_MON_MOVES && learnedMoves[j] != (gLevelUpLearnsets[species][i] & 0x1FF); j++)
+            for (j = 0; j < MAX_MON_MOVES && learnedMoves[j] != (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID); j++)
                 ;
 
             if (j == MAX_MON_MOVES)
             {
-                for (k = 0; k < numMoves && moves[k] != (gLevelUpLearnsets[species][i] & 0x1FF); k++)
+                for (k = 0; k < numMoves && moves[k] != (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID); k++)
                     ;
 
                 if (k == numMoves)
-                    moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF;
+                    moves[numMoves++] = gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID;
             }
         }
     }
@@ -6138,8 +6141,8 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves)
     u8 numMoves = 0;
     int i;
 
-    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++)
-         moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF;
+    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != LEVEL_UP_END; i++)
+         moves[numMoves++] = gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID;
 
      return numMoves;
 }
@@ -6163,23 +6166,23 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == 0xFFFF)
+        if (gLevelUpLearnsets[species][i] == LEVEL_UP_END)
             break;
 
-        moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
+        moveLevel = gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_LV;
 
         if (moveLevel <= (level << 9))
         {
-            for (j = 0; j < MAX_MON_MOVES && learnedMoves[j] != (gLevelUpLearnsets[species][i] & 0x1FF); j++)
+            for (j = 0; j < MAX_MON_MOVES && learnedMoves[j] != (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID); j++)
                 ;
 
             if (j == MAX_MON_MOVES)
             {
-                for (k = 0; k < numMoves && moves[k] != (gLevelUpLearnsets[species][i] & 0x1FF); k++)
+                for (k = 0; k < numMoves && moves[k] != (gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID); k++)
                     ;
 
                 if (k == numMoves)
-                    moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF;
+                    moves[numMoves++] = gLevelUpLearnsets[species][i] & LEVEL_UP_MOVE_ID;
             }
         }
     }
@@ -6439,11 +6442,11 @@ void SetMonPreventsSwitchingString(void)
     gBattleTextBuff1[4] = B_BUFF_EOS;
 
     if (GetBattlerSide(gBattleStruct->battlerPreventingSwitchout) == B_SIDE_PLAYER)
-        gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]);
+        gBattleTextBuff1[3] = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]);
     else
         gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout];
 
-    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, pokemon_order_func(gBattlerPartyIndexes[gBattlerInMenuId]))
+    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattlerInMenuId]))
 
     BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVar4);
 }
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 7d7dadccb..70af9f956 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1029,13 +1029,13 @@ const u16 sSpriteImageSizes[3][4] =
     },
 };
 
-u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra)
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 handleDeoxys)
 {
     u8 spriteId;
     struct MonIconSpriteTemplate iconTemplate =
     {
         .oam = &sMonIconOamData,
-        .image = GetMonIconPtr(species, personality, extra),
+        .image = GetMonIconPtr(species, personality, handleDeoxys),
         .anims = sMonIconAnims,
         .affineAnims = sMonIconAffineAnims,
         .callback = callback,
@@ -1125,9 +1125,9 @@ u16 sub_80D2E84(u16 species)
     }
 }
 
-const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 extra)
+const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 handleDeoxys)
 {
-    return GetMonIconTiles(GetIconSpecies(species, personality), extra);
+    return GetMonIconTiles(GetIconSpecies(species, personality), handleDeoxys);
 }
 
 void sub_80D2EF8(struct Sprite *sprite)
@@ -1184,17 +1184,17 @@ void FreeMonIconPalette(u16 species)
     FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
 }
 
-void UpdateTradeMonIconFrame(struct Sprite *sprite)
+void SpriteCB_MonIcon(struct Sprite *sprite)
 {
     UpdateMonIconFrame(sprite);
 }
 
-const u8* GetMonIconTiles(u16 species, bool32 extra)
+const u8* GetMonIconTiles(u16 species, bool32 handleDeoxys)
 {
     const u8* iconSprite = gMonIconTable[species];
-    if (species == SPECIES_DEOXYS && extra == TRUE)
+    if (species == SPECIES_DEOXYS && handleDeoxys == TRUE)
     {
-        iconSprite = (const u8*)(0x400 + (u32)iconSprite); //WTF?
+        iconSprite = (const u8*)(0x400 + (u32)iconSprite); // use the specific Deoxys form icon (Speed in this case)
     }
     return iconSprite;
 }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 1190b73d5..41c48d008 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -42,6 +42,7 @@
 #include "window.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/party_menu.h"
 #include "constants/region_map_sections.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
@@ -162,7 +163,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData
     u8 unk_filler4[6];
 } *sMonSummaryScreen = NULL;
 EWRAM_DATA u8 gLastViewedMonIndex = 0;
-static EWRAM_DATA u8 sUnknown_0203CF21 = 0;
+static EWRAM_DATA u8 sMoveSlotToReplace = 0;
 ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0;
 
 struct UnkStruct_61CC04
@@ -1491,11 +1492,11 @@ static void HandleInput(u8 taskId)
         {
             ChangeSummaryPokemon(taskId, 1);
         }
-        else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1)
+        else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED)
         {
             ChangePage(taskId, -1);
         }
-        else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2)
+        else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED)
         {
             ChangePage(taskId, 1);
         }
@@ -2159,11 +2160,11 @@ static void HandleReplaceMoveInput(u8 taskId)
                 data[0] = 4;
                 sub_81C1070(data, 1, &sMonSummaryScreen->firstMoveIndex);
             }
-            else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+            else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED)
             {
                 ChangePage(taskId, -1);
             }
-            else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+            else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED)
             {
                 ChangePage(taskId, 1);
             }
@@ -2173,8 +2174,8 @@ static void HandleReplaceMoveInput(u8 taskId)
                 {
                     StopPokemonAnimations();
                     PlaySE(SE_SELECT);
-                    sUnknown_0203CF21 = sMonSummaryScreen->firstMoveIndex;
-                    gSpecialVar_0x8005 = sUnknown_0203CF21;
+                    sMoveSlotToReplace = sMonSummaryScreen->firstMoveIndex;
+                    gSpecialVar_0x8005 = sMoveSlotToReplace;
                     BeginCloseSummaryScreen(taskId);
                 }
                 else
@@ -2188,8 +2189,8 @@ static void HandleReplaceMoveInput(u8 taskId)
                 u32 var1;
                 StopPokemonAnimations();
                 PlaySE(SE_SELECT);
-                sUnknown_0203CF21 = 4;
-                gSpecialVar_0x8005 = 4;
+                sMoveSlotToReplace = MAX_MON_MOVES;
+                gSpecialVar_0x8005 = MAX_MON_MOVES;
                 BeginCloseSummaryScreen(taskId);
             }
         }
@@ -2238,7 +2239,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
             data[1] = 0;
             gTasks[taskId].func = HandleReplaceMoveInput;
         }
-        else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+        else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED)
         {
             if (sMonSummaryScreen->currPageIndex != 2)
             {
@@ -2252,7 +2253,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
                 sub_81C1EFC(9, -2, move);
             }
         }
-        else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+        else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED)
         {
             if (sMonSummaryScreen->currPageIndex != 3)
             {
@@ -2281,9 +2282,9 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
     }
 }
 
-u8 sub_81C1B94(void)
+u8 GetMoveSlotToReplace(void)
 {
-    return sUnknown_0203CF21;
+    return sMoveSlotToReplace;
 }
 
 static void DrawPagination(void) // Updates the pagination dots at the top of the summary screen
@@ -2574,9 +2575,9 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo
 static void SetDexNumberColor(bool8 isMonShiny)
 {
     if (!isMonShiny)
-        sub_8199C30(3, 1, 4, 8, 8, 0);
+        SetBgTilemapPalette(3, 1, 4, 8, 8, 0);
     else
-        sub_8199C30(3, 1, 4, 8, 8, 5);
+        SetBgTilemapPalette(3, 1, 4, 8, 8, 5);
     schedule_bg_copy_tilemap_to_vram(3);
 }
 
diff --git a/src/pokenav.c b/src/pokenav.c
index 2a1647a6f..9f12380df 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -48,8 +48,8 @@ static void VBlankCB_Pokenav(void);
 static void CB2_Pokenav(void);
 static void Task_RunLoopedTask_LinkMode(u8 a0);
 static void Task_RunLoopedTask(u8 taskId);
-static void sub_81C742C(u8 taskId);
-static void sub_81C72BC(void);
+static void Task_Pokenav(u8 taskId);
+static void CB2_InitPokenavForTutorial(void);
 
 const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] =
 {
@@ -311,19 +311,19 @@ void CB2_InitPokeNav(void)
         InitPokenavResources(gPokenavResources);
         ResetTasks();
         SetVBlankCallback(NULL);
-        CreateTask(sub_81C742C, 0);
+        CreateTask(Task_Pokenav, 0);
         SetMainCallback2(CB2_Pokenav);
         SetVBlankCallback(VBlankCB_Pokenav);
     }
 }
 
-void sub_81C72A4(void)
+void OpenPokenavForTutorial(void)
 {
-    SetMainCallback2(sub_81C72BC);
+    SetMainCallback2(CB2_InitPokenavForTutorial);
     FadeScreen(1, 0);
 }
 
-static void sub_81C72BC(void)
+static void CB2_InitPokenavForTutorial(void)
 {
     UpdatePaletteFade();
     if (gPaletteFade.active)
@@ -342,7 +342,7 @@ static void sub_81C72BC(void)
         ResetSpriteData();
         FreeAllSpritePalettes();
         SetVBlankCallback(NULL);
-        CreateTask(sub_81C742C, 0);
+        CreateTask(Task_Pokenav, 0);
         SetMainCallback2(CB2_Pokenav);
         SetVBlankCallback(VBlankCB_Pokenav);
     }
@@ -416,7 +416,7 @@ static void VBlankCB_Pokenav(void)
     ProcessSpriteCopyRequests();
 }
 
-static void sub_81C742C(u8 taskId)
+static void Task_Pokenav(u8 taskId)
 {
     u32 v1;
     s16 *data = gTasks[taskId].data;
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 41ad37fbf..4fa5d1b21 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -9,6 +9,7 @@
 #include "tv.h"
 #include "constants/heal_locations.h"
 #include "constants/flags.h"
+#include "constants/tv.h"
 
 int GameClear(void)
 {
@@ -76,9 +77,9 @@ int GameClear(void)
             }
         }
 
-        if (ribbonCounts[0].count > 4)
+        if (ribbonCounts[0].count > NUM_CUTIES_RIBBONS)
         {
-            sub_80EE4DC(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
+            TryPutSpotTheCutiesOnAir(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
         }
     }
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 8df0a8a8b..4ad47cc21 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -69,7 +69,7 @@ struct PlayerRecordsEmerald
     /* 0x1124 */ struct EmeraldBattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 giftItem;
     /* 0x1214 */ LilycoveLady lilycoveLady;
-    /* 0x1254 */ struct Apprentice apprentice[2];
+    /* 0x1254 */ struct Apprentice apprentices[2];
     /* 0x12dc */ struct PlayerHallRecords hallRecords;
     /* 0x1434 */ u8 field_1434[0x10];
 }; // 0x1444
@@ -120,8 +120,8 @@ static void sub_80E7B2C(const u8 *);
 static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
 static void ReceiveGiftItem(u16 *item, u8 which);
 static void Task_DoRecordMixing(u8 taskId);
-static void sub_80E8110(struct Apprentice *arg0, struct Apprentice *arg1);
-static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2);
+static void GetSavedApprentices(struct Apprentice *dst, struct Apprentice *src);
+static void ReceiveApprenticeData(struct Apprentice *mixApprentice, size_t recordSize, u32 multiplayerId);
 static void ReceiveRankingHallRecords(struct PlayerHallRecords *hallRecords, size_t arg1, u32 arg2);
 static void sub_80E89F8(struct RecordMixingDayCareMail *dst);
 static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src);
@@ -252,7 +252,7 @@ static void PrepareExchangePacket(void)
         if (GetMultiplayerId() == 0)
             sSentRecord->emerald.giftItem = GetRecordMixingGift();
 
-        sub_80E8110(sSentRecord->emerald.apprentice, sApprenticesSave);
+        GetSavedApprentices(sSentRecord->emerald.apprentices, sApprenticesSave);
         GetPlayerHallRecords(&sSentRecord->emerald.hallRecords);
     }
 }
@@ -285,7 +285,7 @@ static void ReceiveExchangePacket(u32 which)
         ReceiveBattleTowerData(&sReceivedRecords->emerald.battleTowerRecord, sizeof(struct PlayerRecordsEmerald), which);
         ReceiveGiftItem(&sReceivedRecords->emerald.giftItem, which);
         ReceiveLilycoveLadyData(&sReceivedRecords->emerald.lilycoveLady, sizeof(struct PlayerRecordsEmerald), which);
-        ReceiveApprenticeData(sReceivedRecords->emerald.apprentice, sizeof(struct PlayerRecordsEmerald), (u8) which);
+        ReceiveApprenticeData(sReceivedRecords->emerald.apprentices, sizeof(struct PlayerRecordsEmerald), (u8) which);
         ReceiveRankingHallRecords(&sReceivedRecords->emerald.hallRecords, sizeof(struct PlayerRecordsEmerald), (u8) which);
     }
 }
@@ -631,7 +631,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which)
     u8 version;
     u16 language;
     OldMan *dest;
-    u32 mixIndices[4];
+    u32 mixIndices[MAX_LINK_PLAYERS];
 
     ShufflePlayerIndices(mixIndices);
     dest = (void *)oldMan + recordSize * mixIndices[which];
@@ -651,7 +651,7 @@ static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u
 {
     struct EmeraldBattleTowerRecord *dest;
     struct BattleTowerPokemon *btPokemon;
-    u32 mixIndices[4];
+    u32 mixIndices[MAX_LINK_PLAYERS];
     s32 i;
 
     ShufflePlayerIndices(mixIndices);
@@ -682,7 +682,7 @@ static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u
 static void ReceiveLilycoveLadyData(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
 {
     LilycoveLady *dest;
-    u32 mixIndices[4];
+    u32 mixIndices[MAX_LINK_PLAYERS];
 
     ShufflePlayerIndices(mixIndices);
     memcpy((void *)lilycoveLady + recordSize * which, sLilycoveLadySave, sizeof(LilycoveLady));
@@ -1018,57 +1018,59 @@ static void Task_DoRecordMixing(u8 taskId)
 
 // New Emerald functions
 
-static void sub_80E8110(struct Apprentice *dst, struct Apprentice *src)
+static void GetSavedApprentices(struct Apprentice *dst, struct Apprentice *src)
 {
     s32 i, id;
-    s32 var_2C, var_28, var_24, r8;
+    s32 apprenticeSaveId, oldPlayerApprenticeSaveId;
+    s32 numOldPlayerApprentices, numMixApprentices;
 
     dst[0].playerName[0] = EOS;
     dst[1].playerName[0] = EOS;
 
     dst[0] = src[0];
 
-    var_28 = 0;
-    var_24 = 0;
-    var_2C = 0;
-    r8 = 0;
+    oldPlayerApprenticeSaveId = 0;
+    numOldPlayerApprentices = 0;
+    apprenticeSaveId = 0;
+    numMixApprentices = 0;
     for (i = 0; i < 2; i++)
     {
-        id = ((i + gSaveBlock2Ptr->playerApprentice.field_B2_1) % 3) + 1;
+        id = ((i + gSaveBlock2Ptr->playerApprentice.saveId) % (APPRENTICE_COUNT - 1)) + 1;
         if (src[id].playerName[0] != EOS)
         {
             if (GetTrainerId(src[id].playerId) != GetTrainerId(gSaveBlock2Ptr->playerTrainerId))
             {
-                r8++;
-                var_2C = id;
+                numMixApprentices++;
+                apprenticeSaveId = id;
             }
             if (GetTrainerId(src[id].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId))
             {
-                var_24++;
-                var_28 = id;
+                numOldPlayerApprentices++;
+                oldPlayerApprenticeSaveId = id;
             }
         }
     }
 
-    if (r8 == 0 && var_24 != 0)
+    // Prefer passing on other mixed Apprentices rather than old player's Apprentices
+    if (numMixApprentices == 0 && numOldPlayerApprentices != 0)
     {
-        r8 = var_24;
-        var_2C = var_28;
+        numMixApprentices = numOldPlayerApprentices;
+        apprenticeSaveId = oldPlayerApprenticeSaveId;
     }
 
-    switch (r8)
+    switch (numMixApprentices)
     {
     case 1:
-        dst[1] = src[var_2C];
+        dst[1] = src[apprenticeSaveId];
         break;
     case 2:
         if (Random2() > 0x3333)
         {
-            dst[1] = src[gSaveBlock2Ptr->playerApprentice.field_B2_1 + 1];
+            dst[1] = src[gSaveBlock2Ptr->playerApprentice.saveId + 1];
         }
         else
         {
-            dst[1] = src[((gSaveBlock2Ptr->playerApprentice.field_B2_1 + 1) % 3 + 1)];
+            dst[1] = src[((gSaveBlock2Ptr->playerApprentice.saveId + 1) % (APPRENTICE_COUNT - 1) + 1)];
         }
         break;
     }
@@ -1113,14 +1115,14 @@ void GetPlayerHallRecords(struct PlayerHallRecords *dst)
     }
 }
 
-static bool32 sub_80E841C(struct Apprentice *arg0, struct Apprentice *arg1)
+static bool32 IsApprenticeAlreadySaved(struct Apprentice *mixApprentice, struct Apprentice *apprentices)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < APPRENTICE_COUNT; i++)
     {
-        if (GetTrainerId(arg0->playerId) == GetTrainerId(arg1[i].playerId)
-            && arg0->number == arg1[i].number)
+        if (GetTrainerId(mixApprentice->playerId) == GetTrainerId(apprentices[i].playerId)
+            && mixApprentice->number == apprentices[i].number)
         {
             return TRUE;
         }
@@ -1129,40 +1131,40 @@ static bool32 sub_80E841C(struct Apprentice *arg0, struct Apprentice *arg1)
     return FALSE;
 }
 
-static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2)
+static void ReceiveApprenticeData(struct Apprentice *mixApprentice, size_t recordSize, u32 multiplayerId)
 {
-    s32 i, r7, r8;
-    struct Apprentice *structPtr;
-    u32 mixIndices[4];
-    u32 structId;
+    s32 i, numApprentices, apprenticeId;
+    struct Apprentice *mixApprenticePtr;
+    u32 mixIndices[MAX_LINK_PLAYERS];
+    u32 apprenticeSaveId;
 
     ShufflePlayerIndices(mixIndices);
-    structPtr = (void*)(arg0) + (arg1 * mixIndices[arg2]);
-    r7 = 0;
-    r8 = 0;
+    mixApprenticePtr = (void*)(mixApprentice) + (recordSize * mixIndices[multiplayerId]);
+    numApprentices = 0;
+    apprenticeId = 0;
     for (i = 0; i < 2; i++)
     {
-        if (structPtr[i].playerName[0] != EOS && !sub_80E841C(&structPtr[i], &gSaveBlock2Ptr->apprentices[0]))
+        if (mixApprenticePtr[i].playerName[0] != EOS && !IsApprenticeAlreadySaved(&mixApprenticePtr[i], &gSaveBlock2Ptr->apprentices[0]))
         {
-            r7++;
-            r8 = i;
+            numApprentices++;
+            apprenticeId = i;
         }
     }
 
-    switch (r7)
+    switch (numApprentices)
     {
     case 1:
-        structId = gSaveBlock2Ptr->playerApprentice.field_B2_1 + 1;
-        gSaveBlock2Ptr->apprentices[structId] = structPtr[r8];
-        gSaveBlock2Ptr->playerApprentice.field_B2_1 = (gSaveBlock2Ptr->playerApprentice.field_B2_1 + 1) % 3;
+        apprenticeSaveId = gSaveBlock2Ptr->playerApprentice.saveId + 1;
+        gSaveBlock2Ptr->apprentices[apprenticeSaveId] = mixApprenticePtr[apprenticeId];
+        gSaveBlock2Ptr->playerApprentice.saveId = (gSaveBlock2Ptr->playerApprentice.saveId + 1) % (APPRENTICE_COUNT - 1);
         break;
     case 2:
         for (i = 0; i < 2; i++)
         {
-            structId = ((i ^ 1) + gSaveBlock2Ptr->playerApprentice.field_B2_1) % 3 + 1;
-            gSaveBlock2Ptr->apprentices[structId] = structPtr[i];
+            apprenticeSaveId = ((i ^ 1) + gSaveBlock2Ptr->playerApprentice.saveId) % (APPRENTICE_COUNT - 1) + 1;
+            gSaveBlock2Ptr->apprentices[apprenticeSaveId] = mixApprenticePtr[i];
         }
-        gSaveBlock2Ptr->playerApprentice.field_B2_1 = (gSaveBlock2Ptr->playerApprentice.field_B2_1 + 2) % 3;
+        gSaveBlock2Ptr->playerApprentice.saveId = (gSaveBlock2Ptr->playerApprentice.saveId + 2) % (APPRENTICE_COUNT - 1);
         break;
     }
 }
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index bd1974d48..bde2b7bb6 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -409,12 +409,12 @@ bool32 MoveRecordedBattleToSaveData(void)
 
         if (sBattleOutcome == B_OUTCOME_WON)
         {
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
                 battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechLost[i];
         }
         else
         {
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
                 battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechWon[i];
         }
         battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].language;
@@ -427,12 +427,12 @@ bool32 MoveRecordedBattleToSaveData(void)
 
         if (sBattleOutcome == B_OUTCOME_WON)
         {
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
                 battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechLost[i];
         }
         else
         {
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
                 battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechWon[i];
         }
         battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].language;
@@ -449,15 +449,15 @@ bool32 MoveRecordedBattleToSaveData(void)
     if (gTrainerBattleOpponent_A >= TRAINER_RECORD_MIXING_APPRENTICE)
     {
         battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].id;
-        for (i = 0; i < 6; i++)
-            battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords[i];
+        for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
+            battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].speechWon[i];
         battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].language;
     }
     else if (gTrainerBattleOpponent_B >= TRAINER_RECORD_MIXING_APPRENTICE)
     {
         battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].id;
-        for (i = 0; i < 6; i++)
-            battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords[i];
+        for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
+            battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].speechWon[i];
         battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].language;
     }
     else if (gPartnerTrainerId >= TRAINER_RECORD_MIXING_APPRENTICE)
diff --git a/src/region_map.c b/src/region_map.c
index 3bb532a19..b6133ee0d 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -55,7 +55,7 @@ static EWRAM_DATA struct {
     /*0x008*/ struct RegionMap regionMap;
     /*0x88c*/ u8 unk_88c[0x1c0];
     /*0xa4c*/ u8 unk_a4c[0x26];
-    /*0xa72*/ bool8 unk_a72;
+    /*0xa72*/ bool8 choseFlyLocation;
 } *sFlyMap = NULL; // a74
 
 static bool32 gUnknown_03001180;
@@ -1605,7 +1605,8 @@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
     return str;
 }
 
-u8 *sub_81245DC(u8 *dest, u16 mapSecId)
+// TODO: probably needs a better name
+u8 *GetMapNameGeneric(u8 *dest, u16 mapSecId)
 {
     switch (mapSecId)
     {
@@ -1626,7 +1627,7 @@ u8 *sub_8124610(u8 *dest, u16 mapSecId)
     }
     else
     {
-        return sub_81245DC(dest, mapSecId);
+        return GetMapNameGeneric(dest, mapSecId);
     }
 }
 
@@ -1972,13 +1973,13 @@ static void sub_8124D64(void)
                 if (sFlyMap->regionMap.iconDrawType == MAPSECTYPE_CITY_CANFLY || sFlyMap->regionMap.iconDrawType == MAPSECTYPE_BATTLE_FRONTIER)
                 {
                     m4aSongNumStart(SE_SELECT);
-                    sFlyMap->unk_a72 = TRUE;
+                    sFlyMap->choseFlyLocation = TRUE;
                     sub_81248F4(sub_8124E0C);
                 }
                 break;
             case INPUT_EVENT_B_BUTTON:
                 m4aSongNumStart(SE_SELECT);
-                sFlyMap->unk_a72 = FALSE;
+                sFlyMap->choseFlyLocation = FALSE;
                 sub_81248F4(sub_8124E0C);
                 break;
         }
@@ -1997,7 +1998,7 @@ static void sub_8124E0C(void)
             if (!UpdatePaletteFade())
             {
                 FreeRegionMapIconResources();
-                if (sFlyMap->unk_a72)
+                if (sFlyMap->choseFlyLocation)
                 {
                     switch (sFlyMap->regionMap.mapSecId)
                     {
@@ -2024,11 +2025,11 @@ static void sub_8124E0C(void)
                             }
                             break;
                     }
-                    sub_80B69DC();
+                    ReturnToFieldFromFlyMapSelect();
                 }
                 else
                 {
-                    SetMainCallback2(sub_81B58A8);
+                    SetMainCallback2(CB2_ReturnToPartyMenuFromFlyMap);
                 }
                 if (sFlyMap != NULL)
                 {
diff --git a/src/save_location.c b/src/save_location.c
index 2443b3161..6bf5eceb0 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -52,10 +52,10 @@ static const u16 sSaveLocationPokeCenterList[] =
     MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
     MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
     MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F,
-    MAP_SINGLE_BATTLE_COLOSSEUM,
+    MAP_BATTLE_COLOSSEUM_2P,
     MAP_TRADE_CENTER,
     MAP_RECORD_CORNER,
-    MAP_DOUBLE_BATTLE_COLOSSEUM,
+    MAP_BATTLE_COLOSSEUM_4P,
     0xFFFF,
 };
 
@@ -118,6 +118,8 @@ void TrySetMapSaveWarpStatus(void)
     sub_81AFD5C();
 }
 
+// Called when receiving the Pokedex
+// Only place field_A8 is written (aside from clearing on new game), never read
 void sub_81AFDA0(void)
 {
     gSaveBlock2Ptr->field_A8 |= 0x8000;
@@ -129,7 +131,7 @@ void sub_81AFDA0(void)
     gSaveBlock2Ptr->field_A8 |= 0x8;
 }
 
-void sub_81AFDD0(void)
+void SetChampionSaveWarp(void)
 {
-    gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80;
+    gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP;
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index d97e3de47..a9be5c3ef 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -39,7 +39,6 @@
 #include "script_menu.h"
 #include "script_movement.h"
 #include "script_pokemon_80F8.h"
-#include "script_pokemon_81B9.h"
 #include "shop.h"
 #include "slot_machine.h"
 #include "sound.h"
@@ -68,7 +67,7 @@ extern const SpecialFunc gSpecials[];
 extern const u8 *gStdScripts[];
 extern const u8 *gStdScripts_End[];
 
-void sub_809BDB4(void);
+static void CloseBrailleWindow(void);
 
 // This is defined in here so the optimizer can't see its value when compiling
 // script.c.
@@ -462,13 +461,13 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
     return FALSE;
 }
 
+// Note: addvar doesn't support adding from a variable in vanilla. If you were to 
+// add a VarGet() to the above, make sure you change the `addvar VAR_*, -1`
+// in the contest scripts to `subvar VAR_*, 1`, else contests will break.
 bool8 ScrCmd_addvar(struct ScriptContext *ctx)
 {
     u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
     *ptr += ScriptReadHalfword(ctx);
-    // Note: addvar doesn't support adding from a variable in vanilla. If you were to 
-    // add a VarGet() to the above, make sure you change the `addvar VAR_0x8006, 65535`
-    // in the contest scripts to `subvar VAR_0x8006, 1`, else contests will break.
     return FALSE;
 }
 
@@ -1468,10 +1467,10 @@ bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
+    u8 contestWinnerId = ScriptReadByte(ctx);
+    if (contestWinnerId)
+        SetContestWinnerForPainting(contestWinnerId);
 
-    if (v1)
-        sub_812FDA8(v1);
     ShowContestWinner();
     ScriptContext1_Stop();
     return TRUE;
@@ -1528,9 +1527,9 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_cmdDA(struct ScriptContext *ctx)
+bool8 ScrCmd_closebraillemessage(struct ScriptContext *ctx)
 {
-    sub_809BDB4();
+    CloseBrailleWindow();
     return FALSE;
 }
 
@@ -1938,7 +1937,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 
 bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 {
-    sub_81B9404();
+    ChooseContestMon();
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -1946,7 +1945,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 
 bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
 {
-    sub_80F840C();
+    StartContest();
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -2257,7 +2256,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx)
     return FALSE;
 }
 
-void sub_809BDB4(void)
+static void CloseBrailleWindow(void)
 {
     ClearStdWindowAndFrame(gBrailleWindowId, 1);
     RemoveWindow(gBrailleWindowId);
@@ -2281,7 +2280,7 @@ bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx)
     return FALSE;
 }
 
-void sub_809BE48(u16 npcId)
+void SetMovingNpcId(u16 npcId)
 {
     sMovingNpcId = npcId;
 }
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c
index f8206797b..8c66be30f 100755
--- a/src/script_pokemon_util_80F87D8.c
+++ b/src/script_pokemon_util_80F87D8.c
@@ -29,6 +29,7 @@
 #include "constants/event_objects.h"
 #include "constants/items.h"
 #include "constants/species.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "constants/battle_frontier.h"
 
@@ -39,8 +40,8 @@ extern const u16 gEventObjectPalette34[];
 
 static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
 
-static void sub_80F8EE8(u8 taskId);
-static void sub_80F9088(u8 taskId);
+static void Task_ShowContestEntryMonPic(u8 taskId);
+static void Task_LinkContestWaitForConnection(u8 taskId);
 static void CB2_ReturnFromChooseHalfParty(void);
 static void sub_80F94B8(void);
 
@@ -74,11 +75,11 @@ void sub_80F8814(void)
     gSpecialVar_0x8004 = var1;
 }
 
-void sub_80F8850(void)
+void BufferContestTrainerAndMonNames(void)
 {
-    sub_80F8264();
-    sub_80F8290();
-    sub_80F8438();
+    BufferContestantTrainerName();
+    BufferContestantMonNickname();
+    BufferContestantMonSpecies();
 }
 
 void sub_80F8864(void)
@@ -110,22 +111,22 @@ void sub_80F8864(void)
         gSpecialVar_0x8004 = 1;
 }
 
-void sub_80F88DC(void)
+void SaveMuseumContestPainting(void)
 {
     sub_80DEDA8(0xFF);
 }
 
-void sub_80F88E8(void)
+void ShouldReadyContestArtist(void)
 {
     if (gContestFinalStandings[gContestPlayerMonIndex] == 0
-     && gSpecialVar_ContestRank == 3
+     && gSpecialVar_ContestRank == CONTEST_RANK_MASTER
      && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
     {
-        gSpecialVar_0x8004 = 1;
+        gSpecialVar_0x8004 = TRUE;
     }
     else
     {
-        gSpecialVar_0x8004 = 0;
+        gSpecialVar_0x8004 = FALSE;
     }
 }
 
@@ -219,11 +220,22 @@ static void ShowContestWinnerCleanup(void)
 
 void ShowContestWinner(void)
 {
+    /*
+    if(gUnknown_0203856C)
+    {
+        sub_80AAF30();
+        gBattleStruct->unk15DDF = 1;
+        gBattleStruct->unk15DDE = sub_80B2C4C(254, 0);
+        Contest_SaveWinner(3);
+        gUnknown_0203856C = 0;
+    }
+    */
+
     SetMainCallback2(CB2_ContestPainting);
     gMain.savedCallback = ShowContestWinnerCleanup;
 }
 
-void sub_80F8AFC(void)
+void SetLinkContestPlayerGfx(void)
 {
     int i;
 
@@ -248,7 +260,7 @@ void sub_80F8AFC(void)
     }
 }
 
-void sub_80F8B94(void)
+void LoadLinkContestPlayerPalettes(void)
 {
     int i;
     u8 eventObjectId;
@@ -287,13 +299,15 @@ u8 GiveMonArtistRibbon(void)
     u8 hasArtistRibbon;
 
     hasArtistRibbon = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
-    if (!hasArtistRibbon && gContestFinalStandings[gContestPlayerMonIndex] == 0 && gSpecialVar_ContestRank == 3
-     && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
+    if (!hasArtistRibbon 
+        && gContestFinalStandings[gContestPlayerMonIndex] == 0 
+        && gSpecialVar_ContestRank == CONTEST_RANK_MASTER
+        && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
     {
         hasArtistRibbon = 1;
         SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON, &hasArtistRibbon);
-        if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-            sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
+        if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+            TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
 
         return 1;
     }
@@ -303,9 +317,9 @@ u8 GiveMonArtistRibbon(void)
     }
 }
 
-u8 sub_80F8D24(void)
+bool8 IsContestDebugActive(void)
 {
-    return 0;
+    return FALSE; // gUnknown_0203856C in pokeruby
 }
 
 void ShowContestEntryMonPic(void)
@@ -317,7 +331,7 @@ void ShowContestEntryMonPic(void)
     u8 taskId;
     u8 left, top;
 
-    if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF)
+    if (FindTaskIdByFunc(Task_ShowContestEntryMonPic) == 0xFF)
     {
         AllocateMonSpritesGfx();
         left = 10;
@@ -325,7 +339,7 @@ void ShowContestEntryMonPic(void)
         species = gContestMons[gSpecialVar_0x8006].species;
         personality = gContestMons[gSpecialVar_0x8006].personality;
         otId = gContestMons[gSpecialVar_0x8006].otId;
-        taskId = CreateTask(sub_80F8EE8, 0x50);
+        taskId = CreateTask(Task_ShowContestEntryMonPic, 0x50);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = species;
         if (gSpecialVar_0x8006 == gContestPlayerMonIndex)
@@ -357,9 +371,9 @@ void ShowContestEntryMonPic(void)
     }
 }
 
-void sub_80F8EB8(void)
+void HideContestEntryMonPic(void)
 {
-    u8 taskId = FindTaskIdByFunc(sub_80F8EE8);
+    u8 taskId = FindTaskIdByFunc(Task_ShowContestEntryMonPic);
     if (taskId != 0xFF)
     {
         gTasks[taskId].data[0]++;
@@ -367,7 +381,7 @@ void sub_80F8EB8(void)
     }
 }
 
-static void sub_80F8EE8(u8 taskId)
+static void Task_ShowContestEntryMonPic(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     struct Sprite *sprite;
@@ -403,10 +417,12 @@ static void sub_80F8EE8(u8 taskId)
 
 void ScriptGetMultiplayerId(void)
 {
-    if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) && gNumLinkContestPlayers == 4 && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
+    if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) 
+        && gNumLinkContestPlayers == CONTESTANT_COUNT 
+        && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
         gSpecialVar_Result = GetMultiplayerId();
     else
-        gSpecialVar_Result = 4;
+        gSpecialVar_Result = MAX_LINK_PLAYERS;
 }
 
 void ScriptRandom(void)
@@ -428,26 +444,26 @@ void ScriptRandom(void)
     *scriptPtr = random % *scriptPtr;
 }
 
-u16 sub_80F903C(void)
+u16 GetContestRand(void)
 {
     gContestRngValue = 1103515245 * gContestRngValue + 24691;
     return gContestRngValue >> 16;
 }
 
-u8 sub_80F905C(void)
+bool8 LinkContestWaitForConnection(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
-        CreateTask(sub_80F9088, 5);
-        return 1;
+        CreateTask(Task_LinkContestWaitForConnection, 5);
+        return TRUE;
     }
     else
     {
-        return 0;
+        return FALSE;
     }
 }
 
-static void sub_80F9088(u8 taskId)
+static void Task_LinkContestWaitForConnection(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -471,7 +487,7 @@ static void sub_80F9088(u8 taskId)
     }
 }
 
-void sub_80F90DC(void)
+void LinkContestTryShowWirelessIndicator(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
@@ -483,7 +499,7 @@ void sub_80F90DC(void)
     }
 }
 
-void sub_80F910C(void)
+void LinkContestTryHideWirelessIndicator(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
@@ -492,25 +508,25 @@ void sub_80F910C(void)
     }
 }
 
-u8 sub_80F9134(void)
+bool8 IsContestWithRSPlayer(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
-        return 1;
+        return TRUE;
     else
-        return 0;
+        return FALSE;
 }
 
-void sub_80F9154(void)
+void ClearLinkContestFlags(void)
 {
     gLinkContestFlags = 0;
 }
 
-u8 sub_80F9160(void)
+bool8 IsWirelessContest(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
-        return 1;
+        return TRUE;
     else
-        return 0;
+        return FALSE;
 }
 
 void HealPlayerParty(void)
@@ -646,7 +662,7 @@ void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot)
 void ChooseHalfPartyForBattle(void)
 {
     gMain.savedCallback = CB2_ReturnFromChooseHalfParty;
-    VarSet(VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOUBLE_COLOSSEUM);
+    VarSet(VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER);
     InitChooseHalfPartyForBattle(0);
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index 76dbe7668..b9826a257 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1117,7 +1117,7 @@ const u8 *GetSecretBaseTrainerLoseText(void)
 
 void PrepSecretBaseBattleFlags(void)
 {
-    sub_813BADC(1);
+    TryGainNewFanFromCounter(1);
     gTrainerBattleOpponent_A = TRAINER_SECRET_BASE;
     gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_SECRET_BASE;
 }
diff --git a/src/strings.c b/src/strings.c
index ed702958e..afa567b9f 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -388,7 +388,7 @@ const u8 gText_PCMailboxFull[] = _("Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS
 const u8 gText_MailMessageWillBeLost[] = _("If the MAIL is removed, the\nmessage will be lost. Okay?");
 const u8 gText_RemoveMailBeforeItem[] = _("MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnWasGivenItem[] = _("{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}");
-const u8 gText_SwitchPkmnItem[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?");
+const u8 gText_PkmnAlreadyHoldingItemSwitch[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?");
 const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn't holding\nanything.{PAUSE_UNTIL_PRESS}");
 const u8 gText_ReceivedItemFromPkmn[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_MailTakenFromPkmn[] = _("MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}");
@@ -471,7 +471,7 @@ const u8 gText_CancelChallenge[] = _("Cancel the challenge?");
 const u8 gText_EscapeFromHere[] = _("Want to escape from here and return\nto {STR_VAR_1}?");
 const u8 gText_ReturnToHealingSpot[] = _("Want to return to the healing spot\nused last in {STR_VAR_1}?");
 const u8 gText_PauseUntilPress[] = _("{PAUSE_UNTIL_PRESS}");
-const u8 gJPText_PutVar1IntoSpinner[] = _("{STR_VAR_1}を ぐるぐるこうかんに\nだして よろしいですか？");
+const u8 gJPText_AreYouSureYouWantToSpinTradeMon[] = _("{STR_VAR_1}を ぐるぐるこうかんに\nだして よろしいですか？");
 ALIGNED(4) const u8 gText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle.");
 ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can't be traded\nnow.");
 ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can't be traded now.");
@@ -1220,11 +1220,11 @@ const u8 gText_BattleArena[] = _("BATTLE ARENA");
 const u8 gText_BattlePike[] = _("BATTLE PIKE");
 const u8 gText_BattlePyramid[] = _("BATTLE PYRAMID");
 
-ALIGNED(4) const u8 gUnknown_085ED164[] = _("{STR_VAR_1} SINGLE");
-ALIGNED(4) const u8 gUnknown_085ED170[] = _("{STR_VAR_1} DOUBLE");
-ALIGNED(4) const u8 gUnknown_085ED17C[] = _("{STR_VAR_1} MULTI");
-ALIGNED(4) const u8 gUnknown_085ED188[] = _("{STR_VAR_1} LINK");
-ALIGNED(4) const u8 gUnknown_085ED190[] = _("{STR_VAR_1}");
+ALIGNED(4) const u8 gText_FacilitySingle[] = _("{STR_VAR_1} SINGLE");
+ALIGNED(4) const u8 gText_FacilityDouble[] = _("{STR_VAR_1} DOUBLE");
+ALIGNED(4) const u8 gText_FacilityMulti[] = _("{STR_VAR_1} MULTI");
+ALIGNED(4) const u8 gText_FacilityLink[] = _("{STR_VAR_1} LINK");
+ALIGNED(4) const u8 gText_Facility[] = _("{STR_VAR_1}");
 
 const u8 gText_Give[] = _("Give");
 const u8 gText_NoNeed[] = _("No need");
diff --git a/src/trade.c b/src/trade.c
index bfbc24194..909abe540 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -481,7 +481,7 @@ static void CB2_CreateTradeMenu(void)
         {
             struct Pokemon *mon = &gPlayerParty[i];
             sTradeMenuData->partySpriteIds[TRADE_PLAYER][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2),
-                                                         UpdateTradeMonIconFrame,
+                                                         SpriteCB_MonIcon,
                                                          (sTradeMonSpriteCoords[i][0] * 8) + 14,
                                                          (sTradeMonSpriteCoords[i][1] * 8) - 12,
                                                          1,
@@ -493,7 +493,7 @@ static void CB2_CreateTradeMenu(void)
         {
             struct Pokemon *mon = &gEnemyParty[i];
             sTradeMenuData->partySpriteIds[TRADE_PARTNER][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2, NULL),
-                                                         UpdateTradeMonIconFrame,
+                                                         SpriteCB_MonIcon,
                                                          (sTradeMonSpriteCoords[i + PARTY_SIZE][0] * 8) + 14,
                                                          (sTradeMonSpriteCoords[i + PARTY_SIZE][1] * 8) - 12,
                                                          1,
@@ -668,7 +668,7 @@ static void CB2_ReturnToTradeMenu(void)
         {
             struct Pokemon *mon = &gPlayerParty[i];
             sTradeMenuData->partySpriteIds[TRADE_PLAYER][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2, NULL),
-                                                         UpdateTradeMonIconFrame,
+                                                         SpriteCB_MonIcon,
                                                          (sTradeMonSpriteCoords[i][0] * 8) + 14,
                                                          (sTradeMonSpriteCoords[i][1] * 8) - 12,
                                                          1,
@@ -680,7 +680,7 @@ static void CB2_ReturnToTradeMenu(void)
         {
             struct Pokemon *mon = &gEnemyParty[i];
             sTradeMenuData->partySpriteIds[TRADE_PARTNER][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2, NULL),
-                                                         UpdateTradeMonIconFrame,
+                                                         SpriteCB_MonIcon,
                                                          (sTradeMonSpriteCoords[i + PARTY_SIZE][0] * 8) + 14,
                                                          (sTradeMonSpriteCoords[i + PARTY_SIZE][1] * 8) - 12,
                                                          1,
@@ -1439,8 +1439,8 @@ static void TradeMenuProcessInput_SelectedMon(void)
             QueueAction(QUEUE_DELAY_MSG, QUEUE_MON_CANT_BE_TRADED);
             sTradeMenuData->tradeMenuFunc = TRADEMENUFUNC_REDRAW_MAIN_MENU;
             break;
-        case CANT_TRADE_EGG:
-        case CANT_TRADE_EGG2:
+        case CANT_TRADE_EGG_YET:
+        case CANT_TRADE_EGG_YET2:
             QueueAction(QUEUE_DELAY_MSG, QUEUE_EGG_CANT_BE_TRADED);
             sTradeMenuData->tradeMenuFunc = TRADEMENUFUNC_REDRAW_MAIN_MENU;
             break;
@@ -1809,7 +1809,7 @@ static void DrawTradeMenuParty(u8 whichParty)
         gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].data[0] = 20;
         gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].data[2] = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][0] + sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14;
         gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].data[4] = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][1] * 8) - 12;
-        StoreSpriteCallbackInData6(&gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]], UpdateTradeMonIconFrame);
+        StoreSpriteCallbackInData6(&gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]], SpriteCB_MonIcon);
         sTradeMenuData->drawPartyState[whichParty]++;
         TradeMenuBouncePartySprites(&gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]]);
         CopyToBgTilemapBufferRect_ChangePalette(1, sTradePartyBoxTilemap, whichParty * 15, 0, 15, 17, 0);
@@ -1820,7 +1820,7 @@ static void DrawTradeMenuParty(u8 whichParty)
             PrintNicknamesForTradeMenu();
         break;
     case 2:
-        if (gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].callback == UpdateTradeMonIconFrame)
+        if (gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].callback == SpriteCB_MonIcon)
             sTradeMenuData->drawPartyState[whichParty] = 3;
         break;
     case 3:
@@ -2352,7 +2352,7 @@ static u32 CanTradeSelectedMon(struct Pokemon *playerParty, int partyCount, int
     if (!IsNationalPokedexEnabled())
     {
         if (species2[monIdx] == SPECIES_EGG)
-            return CANT_TRADE_EGG;
+            return CANT_TRADE_EGG_YET;
 
         if (!IsSpeciesInHoennDex(species2[monIdx]))
             return CANT_TRADE_NATIONAL;
@@ -2366,7 +2366,7 @@ static u32 CanTradeSelectedMon(struct Pokemon *playerParty, int partyCount, int
         if (!(player->progressFlagsCopy & 0xF))
         {
             if (species2[monIdx] == SPECIES_EGG)
-                return CANT_TRADE_EGG2;
+                return CANT_TRADE_EGG_YET2;
 
             if (!IsSpeciesInHoennDex(species2[monIdx]))
                 return CANT_TRADE_INVALID_MON;
@@ -2542,8 +2542,10 @@ int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuP
 }
 
 // r6/r7 flip. Ugh.
+// Spin Trade wasnt fully implemented, but this checks if a mon would be valid to Spin Trade
+// Unlike later generations, this version of Spin Trade isnt only for Eggs
 #ifdef NONMATCHING
-int CanTradeSelectedPartyMenuMon(struct Pokemon *mon, u16 monIdx)
+int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx)
 {
     int i, version, versions, canTradeAnyMon, numMonsLeft;
     int speciesArray[PARTY_SIZE];
@@ -2592,7 +2594,7 @@ int CanTradeSelectedPartyMenuMon(struct Pokemon *mon, u16 monIdx)
             return CANT_TRADE_NATIONAL;
 
         if (speciesArray[monIdx] == SPECIES_NONE)
-            return CANT_TRADE_EGG;
+            return CANT_TRADE_EGG_YET;
     }
 
     numMonsLeft = 0;
@@ -2611,7 +2613,7 @@ int CanTradeSelectedPartyMenuMon(struct Pokemon *mon, u16 monIdx)
 }
 #else
 NAKED
-int CanTradeSelectedPartyMenuMon(struct Pokemon *mon, u16 a1)
+int CanSpinTradeMon(struct Pokemon *mon, u16 a1)
 {
     asm_unified("push {r4-r7,lr}\n\
 	mov r7, r8\n\
diff --git a/src/trader.c b/src/trader.c
index a3794a539..e0b780d25 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "constants/decorations.h"
-#include "constants/mauville_man.h"
+#include "constants/mauville_old_man.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
 #include "event_data.h"
@@ -86,7 +86,7 @@ void CreateAvailableDecorationsMenu(u8 taskId)
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void sub_8133BE4(u8 taskId, u8 decorationId)
+void Task_BufferDecorSelectionAndCloseWindow(u8 taskId, u8 decorationId)
 {
     s16 * data = gTasks[taskId].data;
     if (decorationId > NUM_DECORATIONS)
@@ -118,14 +118,14 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
         case MENU_B_PRESSED:
         case 4:
             PlaySE(SE_SELECT);
-            sub_8133BE4(taskId, 0);
+            Task_BufferDecorSelectionAndCloseWindow(taskId, 0);
             break;
         default:
             PlaySE(SE_SELECT);
             gSpecialVar_0x8005 = input;
             StringCopy(gStringVar1, trader->playerNames[input]);
             ConvertInternationalString(gStringVar1, trader->language[input]);
-            sub_8133BE4(taskId, trader->decorIds[input]);
+            Task_BufferDecorSelectionAndCloseWindow(taskId, trader->decorIds[input]);
             break;
     }
 }
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index af6b0621d..b84920a62 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -22,6 +22,7 @@
 #include "trainer_hill.h"
 #include "window.h"
 #include "util.h"
+#include "constants/battle_ai.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
@@ -45,7 +46,7 @@ struct TrHillStruct2
 {
     u8 floorId;
     struct TrHillTag tag;
-    struct TrHillFloor floors[4];
+    struct TrHillFloor floors[NUM_TRAINER_HILL_FLOORS];
 };
 
 static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL;
@@ -54,30 +55,30 @@ EWRAM_DATA u32 *gTrainerHillVBlankCounter = NULL;
 
 // This file's functions.
 static void TrainerHillStartChallenge(void);
-static void sub_81D58D8(void);
-static void sub_81D5924(void);
-static void sub_81D59D0(void);
+static void GetOwnerState(void);
+static void GiveChallengePrize(void);
+static void CheckFinalTime(void);
 static void TrainerHillResumeTimer(void);
 static void TrainerHillSetPlayerLost(void);
 static void TrainerHillGetChallengeStatus(void);
-static void sub_81D5B2C(void);
-static void sub_81D5BBC(void);
-static void sub_81D5C00(void);
-static void GetInTrainerHill(void);
-static void sub_81D62B4(void);
-static void sub_81D64AC(void);
-static void sub_81D64DC(void);
-static void sub_81D64FC(void);
-static void sub_81D6518(void);
-static void sub_81D6568(void);
+static void BufferChallengeTime(void);
+static void GetAllFloorsUsed(void);
+static void ClearVarResult(void);
+static void IsTrainerHillChallengeActive(void);
+static void ShowTrainerHillPostBattleText(void);
+static void SetAllTrainerFlags(void);
+static void GetGameSaved(void);
+static void SetGameSaved(void);
+static void ClearGameSaved(void);
+static void GetChallengeWon(void);
 static void TrainerHillSetTag(void);
 static void SetUpDataStruct(void);
 static void FreeDataStruct(void);
 static void nullsub_2(void);
 static void SetTimerValue(u32 *dst, u32 val);
 static u32 GetTimerValue(u32 *src);
-static void sub_81D642C(struct Pokemon *mon, u8 level);
-static u16 sub_81D6640(void);
+static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level);
+static u16 GetPrizeItemId(void);
 
 // const data
 #include "data/battle_frontier/trainer_hill.h"
@@ -86,7 +87,7 @@ struct
 {
     u8 trainerClass;
     u8 musicId;
-} static const gUnknown_0862A3B4[] =
+} static const sTrainerClassesAndMusic[] =
 {
     {TRAINER_CLASS_TEAM_AQUA, TRAINER_ENCOUNTER_MUSIC_AQUA},
     {TRAINER_CLASS_AQUA_ADMIN, TRAINER_ENCOUNTER_MUSIC_AQUA},
@@ -144,63 +145,64 @@ struct
     {TRAINER_CLASS_SCHOOL_KID, TRAINER_ENCOUNTER_MUSIC_MALE},
 };
 
-static const u16 gUnknown_0862A48C[] = {ITEM_RARE_CANDY, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A498[] = {ITEM_LUXURY_BALL, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4A4[] = {ITEM_MAX_REVIVE, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4B0[] = {ITEM_MAX_ETHER, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4BC[] = {ITEM_ELIXIR, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4C8[] = {ITEM_TM05_ROAR, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4D4[] = {ITEM_TM36_SLUDGE_BOMB, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4E0[] = {ITEM_TM06_TOXIC, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4EC[] = {ITEM_TM11_SUNNY_DAY, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A4F8[] = {ITEM_TM26_EARTHQUAKE, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A504[] = {ITEM_RARE_CANDY, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A510[] = {ITEM_LUXURY_BALL, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A51C[] = {ITEM_MAX_REVIVE, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A528[] = {ITEM_MAX_ETHER, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A534[] = {ITEM_ELIXIR, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A540[] = {ITEM_TM31_BRICK_BREAK, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A54C[] = {ITEM_TM41_TORMENT, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A558[] = {ITEM_TM48_SKILL_SWAP, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A564[] = {ITEM_TM19_GIGA_DRAIN, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-static const u16 gUnknown_0862A570[] = {ITEM_TM45_ATTRACT, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
-
-static const u16 *const gUnknown_0862A57C[] =
-{
-	gUnknown_0862A48C,
-	gUnknown_0862A498,
-	gUnknown_0862A4A4,
-	gUnknown_0862A4B0,
-	gUnknown_0862A4BC,
-	gUnknown_0862A4C8,
-	gUnknown_0862A4D4,
-	gUnknown_0862A4E0,
-	gUnknown_0862A4EC,
-	gUnknown_0862A4F8
+static const u16 sPrizeListRareCandy1[]  = {ITEM_RARE_CANDY,       ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListLuxuryBall1[] = {ITEM_LUXURY_BALL,      ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListMaxRevive1[]  = {ITEM_MAX_REVIVE,       ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListMaxEther1[]   = {ITEM_MAX_ETHER,        ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListElixir1[]     = {ITEM_ELIXIR,           ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListRoar[]        = {ITEM_TM05_ROAR,        ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListSludgeBomb[]  = {ITEM_TM36_SLUDGE_BOMB, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListToxic[]       = {ITEM_TM06_TOXIC,       ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListSunnyDay[]    = {ITEM_TM11_SUNNY_DAY,   ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListEarthQuake[]  = {ITEM_TM26_EARTHQUAKE,  ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+
+static const u16 sPrizeListRareCandy2[]  = {ITEM_RARE_CANDY,       ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListLuxuryBall2[] = {ITEM_LUXURY_BALL,      ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListMaxRevive2[]  = {ITEM_MAX_REVIVE,       ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListMaxEther2[]   = {ITEM_MAX_ETHER,        ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListElixir2[]     = {ITEM_ELIXIR,           ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListBrickBreak[]  = {ITEM_TM31_BRICK_BREAK, ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListTorment[]     = {ITEM_TM41_TORMENT,     ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListSkillSwap[]   = {ITEM_TM48_SKILL_SWAP,  ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListGigaSwap[]    = {ITEM_TM19_GIGA_DRAIN,  ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+static const u16 sPrizeListAttract[]     = {ITEM_TM45_ATTRACT,     ITEM_ETHER, ITEM_MAX_POTION, ITEM_REVIVE, ITEM_FLUFFY_TAIL, ITEM_GREAT_BALL};
+
+static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] =
+{
+	sPrizeListRareCandy1,
+	sPrizeListLuxuryBall1,
+	sPrizeListMaxRevive1,
+	sPrizeListMaxEther1,
+	sPrizeListElixir1,
+	sPrizeListRoar,
+	sPrizeListSludgeBomb,
+	sPrizeListToxic,
+	sPrizeListSunnyDay,
+	sPrizeListEarthQuake
 };
 
-static const u16 *const gUnknown_0862A5A4[] =
-{
-	gUnknown_0862A504,
-	gUnknown_0862A510,
-	gUnknown_0862A51C,
-	gUnknown_0862A528,
-	gUnknown_0862A534,
-	gUnknown_0862A540,
-	gUnknown_0862A54C,
-	gUnknown_0862A558,
-	gUnknown_0862A564,
-	gUnknown_0862A570
+static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] =
+{
+	sPrizeListRareCandy2,
+	sPrizeListLuxuryBall2,
+	sPrizeListMaxRevive2,
+	sPrizeListMaxEther2,
+	sPrizeListElixir2,
+	sPrizeListBrickBreak,
+	sPrizeListTorment,
+	sPrizeListSkillSwap,
+	sPrizeListGigaSwap,
+	sPrizeListAttract
 };
 
-static const u16 *const *const gUnknown_0862A5CC[] =
+static const u16 *const *const sPrizeListSets[] =
 {
-    gUnknown_0862A57C,
-    gUnknown_0862A5A4
+    sPrizeLists1,
+    sPrizeLists2
 };
 
-static const u16 gUnknown_0862A5D4[] = INCBIN_U16("graphics/pokenav/862A5D4.gbapal");
-static const u8 sRecordWinColors[] = {0, 2, 3};
+static const u16 sUnknown_0862A5D4[] = INCBIN_U16("graphics/pokenav/862A5D4.gbapal");
+static const u8 sRecordWinColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
 
 static const struct TrHillTag *const sDataPerTag[] =
 {
@@ -221,24 +223,24 @@ static const u8 *const sFloorStrings[] =
 
 static void (* const sHillFunctions[])(void) =
 {
-    TrainerHillStartChallenge,
-    sub_81D58D8,
-    sub_81D5924,
-    sub_81D59D0,
-    TrainerHillResumeTimer,
-    TrainerHillSetPlayerLost,
-    TrainerHillGetChallengeStatus,
-    sub_81D5B2C,
-    sub_81D5BBC,
-    sub_81D5C00,
-    GetInTrainerHill,
-    sub_81D62B4,
-    sub_81D64AC,
-    sub_81D64DC,
-    sub_81D64FC,
-    sub_81D6518,
-    sub_81D6568,
-    TrainerHillSetTag,
+    [TRAINER_HILL_FUNC_START] = TrainerHillStartChallenge,
+    [TRAINER_HILL_FUNC_GET_OWNER_STATE] = GetOwnerState,
+    [TRAINER_HILL_FUNC_GIVE_PRIZE] = GiveChallengePrize,
+    [TRAINER_HILL_FUNC_CHECK_FINAL_TIME] = CheckFinalTime,
+    [TRAINER_HILL_FUNC_RESUME_TIMER] = TrainerHillResumeTimer,
+    [TRAINER_HILL_FUNC_SET_LOST] = TrainerHillSetPlayerLost,
+    [TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS] = TrainerHillGetChallengeStatus,
+    [TRAINER_HILL_FUNC_GET_CHALLENGE_TIME] = BufferChallengeTime,
+    [TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED] = GetAllFloorsUsed,
+    [TRAINER_HILL_FUNC_CLEAR_RESULT] = ClearVarResult,
+    [TRAINER_HILL_FUNC_IN_CHALLENGE] = IsTrainerHillChallengeActive,
+    [TRAINER_HILL_FUNC_POST_BATTLE_TEXT] = ShowTrainerHillPostBattleText,
+    [TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS] = SetAllTrainerFlags,
+    [TRAINER_HILL_FUNC_GET_GAME_SAVED] = GetGameSaved,
+    [TRAINER_HILL_FUNC_SET_GAME_SAVED] = SetGameSaved,
+    [TRAINER_HILL_FUNC_CLEAR_GAME_SAVED] = ClearGameSaved,
+    [TRAINER_HILL_FUNC_GET_WON] = GetChallengeWon,
+    [TRAINER_HILL_FUNC_SET_TAG] = TrainerHillSetTag,
 };
 
 static const u8 *const sTagMatchStrings[] =
@@ -249,7 +251,7 @@ static const u8 *const sTagMatchStrings[] =
     gText_ExpertTagMatch,
 };
 
-static const struct EventObjectTemplate gUnknown_0862A670 =
+static const struct EventObjectTemplate sTrainerEventObjectTemplate =
 {
     .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
     .elevation = 3,
@@ -259,8 +261,18 @@ static const struct EventObjectTemplate gUnknown_0862A670 =
     .trainerType = 1,
 };
 
-static const u32 gUnknown_0862A688[] = {MAP_NUM(TRAINER_HILL_2F), MAP_NUM(TRAINER_HILL_3F), MAP_NUM(TRAINER_HILL_4F), MAP_NUM(TRAINER_HILL_ROOF)};
-static const u8 gUnknown_0862A698[][3] = {{0, 1, 2}, {3, 4, 5}};
+static const u32 sNextFloorMapNum[NUM_TRAINER_HILL_FLOORS] = 
+{
+    MAP_NUM(TRAINER_HILL_2F), 
+    MAP_NUM(TRAINER_HILL_3F), 
+    MAP_NUM(TRAINER_HILL_4F), 
+    MAP_NUM(TRAINER_HILL_ROOF)
+};
+static const u8 sTrainerPartySlots[][PARTY_SIZE / 2] = 
+{
+    {0, 1, 2}, 
+    {3, 4, 5}
+};
 
 // code
 void CallTrainerHillFunction(void)
@@ -274,8 +286,8 @@ void ResetTrainerHillResults(void)
 {
     s32 i;
 
-    gSaveBlock2Ptr->frontier.field_EF9_1 = 0;
-    gSaveBlock2Ptr->frontier.field_EF9_0 = 0;
+    gSaveBlock2Ptr->frontier.savedGame = 0;
+    gSaveBlock2Ptr->frontier.unk_EF9 = 0;
     gSaveBlock1Ptr->trainerHill.bestTime = 0;
     for (i = 0; i < 4; i++)
         SetTimerValue(&gSaveBlock1Ptr->trainerHillTimes[i], HILL_MAX_TIME);
@@ -366,16 +378,16 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId)
 
     switch (which)
     {
-    case 2:
+    case TRAINER_HILL_TEXT_INTRO:
         FrontierSpeechToString(sHillData->floors[floorId].trainers[id].speechBefore);
         break;
-    case 3:
+    case TRAINER_HILL_TEXT_PLAYER_LOST:
         FrontierSpeechToString(sHillData->floors[floorId].trainers[id].speechWin);
         break;
-    case 4:
+    case TRAINER_HILL_TEXT_PLAYER_WON:
         FrontierSpeechToString(sHillData->floors[floorId].trainers[id].speechLose);
         break;
-    case 5:
+    case TRAINER_HILL_TEXT_AFTER:
         FrontierSpeechToString(sHillData->floors[floorId].trainers[id].speechAfter);
         break;
     }
@@ -391,42 +403,42 @@ static void TrainerHillStartChallenge(void)
     else
         gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0;
 
-    gSaveBlock1Ptr->trainerHill.field_3D6C = 0;
+    gSaveBlock1Ptr->trainerHill.unk_3D6C = 0;
     SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer);
     gSaveBlock1Ptr->trainerHill.timer = 0;
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0;
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0;
+    gSaveBlock1Ptr->trainerHill.spokeToOwner = 0;
+    gSaveBlock1Ptr->trainerHill.checkedFinalTime = 0;
     gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge = 0;
-    gSaveBlock2Ptr->frontier.field_EE0 = 0;
+    gSaveBlock2Ptr->frontier.trainerFlags = 0;
     gBattleOutcome = 0;
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0a = 0;
+    gSaveBlock1Ptr->trainerHill.receivedPrize = 0;
 }
 
-static void sub_81D58D8(void)
+static void GetOwnerState(void)
 {
     ClearTrainerHillVBlankCounter();
     gSpecialVar_Result = 0;
-    if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
+    if (gSaveBlock1Ptr->trainerHill.spokeToOwner)
         gSpecialVar_Result++;
-    if (gSaveBlock1Ptr->trainerHill.field_3D6E_0a && gSaveBlock1Ptr->trainerHill.field_3D6E_0b)
+    if (gSaveBlock1Ptr->trainerHill.receivedPrize && gSaveBlock1Ptr->trainerHill.checkedFinalTime)
         gSpecialVar_Result++;
 
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 1;
+    gSaveBlock1Ptr->trainerHill.spokeToOwner = TRUE;
 }
 
-static void sub_81D5924(void)
+static void GiveChallengePrize(void)
 {
-    u16 itemId = sub_81D6640();
+    u16 itemId = GetPrizeItemId();
 
-    if (sHillData->tag.numFloors != 4 || gSaveBlock1Ptr->trainerHill.field_3D6E_0a)
+    if (sHillData->tag.numFloors != NUM_TRAINER_HILL_FLOORS || gSaveBlock1Ptr->trainerHill.receivedPrize)
     {
         gSpecialVar_Result = 2;
     }
     else if (AddBagItem(itemId, 1) == TRUE)
     {
         CopyItemName(itemId, gStringVar2);
-        gSaveBlock1Ptr->trainerHill.field_3D6E_0a = 1;
-        gSaveBlock2Ptr->frontier.field_EF9_0 = 0;
+        gSaveBlock1Ptr->trainerHill.receivedPrize = TRUE;
+        gSaveBlock2Ptr->frontier.unk_EF9 = 0;
         gSpecialVar_Result = 0;
     }
     else
@@ -435,9 +447,11 @@ static void sub_81D5924(void)
     }
 }
 
-static void sub_81D59D0(void)
+// If bestTime > timer, the challenge was completed faster and its a new record
+// Otherwise the owner says it was a slow time and to complete it faster next time
+static void CheckFinalTime(void)
 {
-    if (gSaveBlock1Ptr->trainerHill.field_3D6E_0b)
+    if (gSaveBlock1Ptr->trainerHill.checkedFinalTime)
     {
         gSpecialVar_Result = 2;
     }
@@ -452,12 +466,12 @@ static void sub_81D59D0(void)
         gSpecialVar_Result = 1;
     }
 
-    gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 1;
+    gSaveBlock1Ptr->trainerHill.checkedFinalTime = TRUE;
 }
 
 static void TrainerHillResumeTimer(void)
 {
-    if (!gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
+    if (!gSaveBlock1Ptr->trainerHill.spokeToOwner)
     {
         if (gSaveBlock1Ptr->trainerHill.timer >= HILL_MAX_TIME)
             gSaveBlock1Ptr->trainerHill.timer = HILL_MAX_TIME;
@@ -468,7 +482,7 @@ static void TrainerHillResumeTimer(void)
 
 static void TrainerHillSetPlayerLost(void)
 {
-    gSaveBlock1Ptr->trainerHill.hasLost = 1;
+    gSaveBlock1Ptr->trainerHill.hasLost = TRUE;
 }
 
 static void TrainerHillGetChallengeStatus(void)
@@ -476,7 +490,7 @@ static void TrainerHillGetChallengeStatus(void)
     if (gSaveBlock1Ptr->trainerHill.hasLost)
     {
         // The player lost their last match.
-        gSaveBlock1Ptr->trainerHill.hasLost = 0;
+        gSaveBlock1Ptr->trainerHill.hasLost = FALSE;
         gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_LOST;
     }
     else if (gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge)
@@ -492,7 +506,7 @@ static void TrainerHillGetChallengeStatus(void)
     }
 }
 
-static void sub_81D5B2C(void)
+static void BufferChallengeTime(void)
 {
     s32 total, minutes, secondsWhole, secondsFraction;
 
@@ -511,23 +525,27 @@ static void sub_81D5B2C(void)
     ConvertIntToDecimalStringN(gStringVar3, secondsFraction, STR_CONV_MODE_LEADING_ZEROS, 2);
 }
 
-static void sub_81D5BBC(void)
+// Returns TRUE if all 4 floors are used
+// Returns FALSE otherwise, and buffers the number of floors used
+// The only time fewer than all 4 floors are used is for the JP-exclusive E-Reader and Default modes
+static void GetAllFloorsUsed(void)
 {
     SetUpDataStruct();
-    if (sHillData->tag.numFloors != 4)
+    if (sHillData->tag.numFloors != NUM_TRAINER_HILL_FLOORS)
     {
         ConvertIntToDecimalStringN(gStringVar1, sHillData->tag.numFloors, STR_CONV_MODE_LEFT_ALIGN, 1);
-        gSpecialVar_Result = 0;
+        gSpecialVar_Result = FALSE;
     }
     else
     {
-        gSpecialVar_Result = 1;
+        gSpecialVar_Result = TRUE;
     }
 
     FreeDataStruct();
 }
 
-static void sub_81D5C00(void)
+// May have been dummied. Every time this is called a conditional for var result occurs afterwards
+static void ClearVarResult(void)
 {
     SetUpDataStruct();
     gSpecialVar_Result = 0;
@@ -538,7 +556,7 @@ bool8 InTrainerHillChallenge(void)
 {
     if (VarGet(VAR_TRAINER_HILL_IS_ACTIVE) == 0)
         return FALSE;
-    else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c)
+    else if (gSaveBlock1Ptr->trainerHill.spokeToOwner)
         return FALSE;
     else if (GetCurrentTrainerHillMapId() != 0)
         return TRUE;
@@ -546,12 +564,12 @@ bool8 InTrainerHillChallenge(void)
         return FALSE;
 }
 
-static void GetInTrainerHill(void)
+static void IsTrainerHillChallengeActive(void)
 {
     if (!InTrainerHillChallenge())
-        gSpecialVar_Result = 0;
+        gSpecialVar_Result = FALSE;
     else
-        gSpecialVar_Result = 1;
+        gSpecialVar_Result = TRUE;
 }
 
 void nullsub_129(void)
@@ -611,12 +629,12 @@ static void SetTimerValue(u32 *dst, u32 val)
     *dst = val;
 }
 
-void sub_81D5DF8(void)
+void LoadTrainerHillEventObjectTemplates(void)
 {
     u8 i, floorId;
     struct EventObjectTemplate *eventTemplates = gSaveBlock1Ptr->eventObjectTemplates;
 
-    if (!sub_81D5F48())
+    if (!LoadTrainerHillFloorEventObjectScripts())
         return;
 
     SetUpDataStruct();
@@ -629,7 +647,7 @@ void sub_81D5DF8(void)
     {
         u8 bits;
 
-        eventTemplates[i] = gUnknown_0862A670;
+        eventTemplates[i] = sTrainerEventObjectTemplate;
         eventTemplates[i].localId = i + 1;
         eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass);
         eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF;
@@ -637,16 +655,17 @@ void sub_81D5DF8(void)
         bits = i << 2;
         eventTemplates[i].movementType = ((sHillData->floors[floorId].display.direction >> bits) & 0xF) + MOVEMENT_TYPE_FACE_UP;
         eventTemplates[i].trainerRange_berryTreeId = (sHillData->floors[floorId].display.range >> bits) & 0xF;
-        eventTemplates[i].script = EventScript_2C83F0;
+        eventTemplates[i].script = TrainerHill_EventScript_TrainerBattle;
         gSaveBlock2Ptr->frontier.trainerIds[i] = i + 1;
     }
 
     FreeDataStruct();
 }
 
-bool32 sub_81D5F48(void)
+bool32 LoadTrainerHillFloorEventObjectScripts(void)
 {
     SetUpDataStruct();
+    // Something may have been dummied here
     FreeDataStruct();
     return TRUE;
 }
@@ -657,8 +676,8 @@ static u32 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3)
 {
     u32 var0, var1, var2, var3;
 
-    var0 = (sHillData->floors[floorId].unk3A0[arg2] >> (15 - bit)) & 1;
-    var1 = sHillData->floors[floorId].data[arg2 * arg3 + bit];
+    var0 = (sHillData->floors[floorId].display.unk3A0[arg2] >> (15 - bit)) & 1;
+    var1 = sHillData->floors[floorId].display.data[arg2 * arg3 + bit];
     var3 = 0x200;
     var2 = 0x3000;
 
@@ -716,20 +735,20 @@ static u32 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3)
 }
 #endif // NONMATCHING
 
-void sub_81D5FB4(u16 *mapArg)
+void GenerateTrainerHillFloorLayout(u16 *mapArg)
 {
     s32 i, j;
     u16 *src, *dst;
     u8 mapId = GetCurrentTrainerHillMapId();
 
-    if (mapId == 6)
+    if (mapId == TRAINER_HILL_ENTRANCE)
     {
         InitMapFromSavedGame();
         return;
     }
 
     SetUpDataStruct();
-    if (mapId == 5)
+    if (mapId == TRAINER_HILL_ROOF)
     {
         InitMapFromSavedGame();
         FreeDataStruct();
@@ -766,9 +785,9 @@ bool32 InTrainerHill(void)
     bool32 ret;
 
     if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F
-            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F
-            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F
-            || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F)
+        || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F
+        || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F
+        || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F)
         ret = TRUE;
     else
         ret = FALSE;
@@ -778,58 +797,61 @@ bool32 InTrainerHill(void)
 
 u8 GetCurrentTrainerHillMapId(void)
 {
-    u8 ret;
+    u8 mapId;
 
     if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F)
-        ret = 1;
+        mapId = TRAINER_HILL_1F;
     else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F)
-        ret = 2;
+        mapId = TRAINER_HILL_2F;
     else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F)
-        ret = 3;
+        mapId = TRAINER_HILL_3F;
     else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F)
-        ret = 4;
+        mapId = TRAINER_HILL_4F;
     else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF)
-        ret = 5;
+        mapId = TRAINER_HILL_ROOF;
     else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ENTRANCE)
-        ret = 6;
+        mapId = TRAINER_HILL_ENTRANCE;
     else
-        ret = 0;
+        mapId = 0;
 
-    return ret;
+    return mapId;
 }
 
-static bool32 sub_81D6100(void)
+// Unused
+static bool32 OnTrainerHillRoof(void)
 {
-    bool32 ret;
+    bool32 onRoof;
 
     if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF)
-        ret = TRUE;
+        onRoof = TRUE;
     else
-        ret = FALSE;
+        onRoof = FALSE;
 
-    return ret;
+    return onRoof;
 }
 
-const struct WarpEvent* sub_81D6120(void)
+const struct WarpEvent* SetWarpDestinationTrainerHill4F(void)
 {
     const struct MapHeader *header = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(TRAINER_HILL_4F), MAP_NUM(TRAINER_HILL_4F));
 
     return &header->events->warps[1];
 }
 
-const struct WarpEvent* sub_81D6134(u8 warpEventId)
+// For warping from the roof in challenges where the 4F is not the final challenge floor
+// This would only occur in the JP-exclusive Default and E-Reader challenges
+const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId)
 {
-    u8 id;
+    u8 numFloors;
     const struct MapHeader *header;
 
     if (warpEventId == 1)
         return &gMapHeader.events->warps[1];
 
-    id = sub_81D6490();
-    if (id == 0 || id >= 5)
-        id = 4;
+    numFloors = GetNumFloorsInTrainerHillChallenge();
+    if (numFloors == 0 || numFloors > NUM_TRAINER_HILL_FLOORS)
+        numFloors = NUM_TRAINER_HILL_FLOORS;
 
-    header = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(TRAINER_HILL_4F), gUnknown_0862A688[id - 1]);
+    header = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(TRAINER_HILL_4F), sNextFloorMapNum[numFloors - 1]);
     return &header->events->warps[0];
 }
 
@@ -843,7 +865,7 @@ bool8 GetHillTrainerFlag(u8 eventObjectId)
     u32 floorId = GetFloorId() * 2;
     u8 bitId = gEventObjects[eventObjectId].localId - 1 + floorId;
 
-    return gSaveBlock2Ptr->frontier.field_EE0 & gBitTable[bitId];
+    return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId];
 }
 
 void SetHillTrainerFlag(void)
@@ -855,7 +877,7 @@ void SetHillTrainerFlag(void)
     {
         if (gSaveBlock2Ptr->frontier.trainerIds[i] == gTrainerBattleOpponent_A)
         {
-            gSaveBlock2Ptr->frontier.field_EE0 |= gBitTable[floorId + i];
+            gSaveBlock2Ptr->frontier.trainerFlags |= gBitTable[floorId + i];
             break;
         }
     }
@@ -866,7 +888,7 @@ void SetHillTrainerFlag(void)
         {
             if (gSaveBlock2Ptr->frontier.trainerIds[i] == gTrainerBattleOpponent_B)
             {
-                gSaveBlock2Ptr->frontier.field_EE0 |= gBitTable[floorId + i];
+                gSaveBlock2Ptr->frontier.trainerFlags |= gBitTable[floorId + i];
                 break;
             }
         }
@@ -875,19 +897,19 @@ void SetHillTrainerFlag(void)
 
 const u8 *GetTrainerHillTrainerScript(void)
 {
-    return EventScript_2C83F0;
+    return TrainerHill_EventScript_TrainerBattle;
 }
 
-static void sub_81D62B4(void)
+static void ShowTrainerHillPostBattleText(void)
 {
-    CopyTrainerHillTrainerText(5, gSpecialVar_LastTalked);
+    CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_AFTER, gSpecialVar_LastTalked);
     sub_80982B8();
 }
 
-static void sub_81D62CC(u16 trainerId, u8 firstMonId)
+static void CreateNPCTrainerHillParty(u16 trainerId, u8 firstMonId)
 {
     u8 trId, level;
-    s32 i, floorId, arrId;
+    s32 i, floorId, partySlot;
 
     if (trainerId == 0 || trainerId > 2)
         return;
@@ -896,13 +918,13 @@ static void sub_81D62CC(u16 trainerId, u8 firstMonId)
     SetUpDataStruct();
     level = GetHighestLevelInPlayerParty();
     floorId = GetFloorId();
-    for (i = firstMonId, arrId = 0; i < firstMonId + 3; i++, arrId++)
+    for (i = firstMonId, partySlot = 0; i < firstMonId + 3; i++, partySlot++)
     {
-        u8 id = gUnknown_0862A698[trId][arrId];
+        u8 id = sTrainerPartySlots[trId][partySlot];
         struct Pokemon *mon = &gEnemyParty[i];
 
         CreateBattleTowerMon(mon, &sHillData->floors[floorId].trainers[trId].mons[id]);
-        sub_81D642C(mon, level);
+        SetTrainerHillMonLevel(mon, level);
     }
 
     FreeDataStruct();
@@ -911,22 +933,22 @@ static void sub_81D62CC(u16 trainerId, u8 firstMonId)
 void FillHillTrainerParty(void)
 {
     ZeroEnemyPartyMons();
-    sub_81D62CC(gTrainerBattleOpponent_A, 0);
+    CreateNPCTrainerHillParty(gTrainerBattleOpponent_A, 0);
 }
 
 void FillHillTrainersParties(void)
 {
     ZeroEnemyPartyMons();
-    sub_81D62CC(gTrainerBattleOpponent_A, 0);
-    sub_81D62CC(gTrainerBattleOpponent_B, 3);
+    CreateNPCTrainerHillParty(gTrainerBattleOpponent_A, 0);
+    CreateNPCTrainerHillParty(gTrainerBattleOpponent_B, 3);
 }
 
 // This function is unused, but my best guess is
 // it was supposed to return AI scripts for trainer
 // hill trainers.
-u32 sub_81D63C4(void)
+u32 GetTrainerHillAIFlags(void)
 {
-    return 7;
+    return (AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY);
 }
 
 u8 GetTrainerEncounterMusicIdInTrainerHill(u16 trainerId)
@@ -939,16 +961,16 @@ u8 GetTrainerEncounterMusicIdInTrainerHill(u16 trainerId)
     facilityClass = sHillData->floors[sHillData->floorId].trainers[trId].facilityClass;
     FreeDataStruct();
 
-    for (i = 0; i < ARRAY_COUNT(gUnknown_0862A3B4); i++)
+    for (i = 0; i < ARRAY_COUNT(sTrainerClassesAndMusic); i++)
     {
-        if (gUnknown_0862A3B4[i].trainerClass == gFacilityClassToTrainerClass[facilityClass])
-            return gUnknown_0862A3B4[i].musicId;
+        if (sTrainerClassesAndMusic[i].trainerClass == gFacilityClassToTrainerClass[facilityClass])
+            return sTrainerClassesAndMusic[i].musicId;
     }
 
     return 0;
 }
 
-static void sub_81D642C(struct Pokemon *mon, u8 level)
+static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
     u32 exp = gExperienceTables[gBaseStats[species].growthRate][level];
@@ -958,61 +980,63 @@ static void sub_81D642C(struct Pokemon *mon, u8 level)
     CalculateMonStats(mon);
 }
 
-u8 sub_81D6490(void)
+u8 GetNumFloorsInTrainerHillChallenge(void)
 {
-    u8 ret;
+    u8 floors;
 
     SetUpDataStruct();
-    ret = sHillData->tag.numFloors;
+    floors = sHillData->tag.numFloors;
     FreeDataStruct();
 
-    return ret;
+    return floors;
 }
 
-static void sub_81D64AC(void)
+static void SetAllTrainerFlags(void)
 {
-    gSaveBlock2Ptr->frontier.field_EE0 = 0xFF;
+    gSaveBlock2Ptr->frontier.trainerFlags = 0xFF;
 }
 
+// Palette never loaded, sub_81D6534 always FALSE
 void sub_81D64C0(void)
 {
     if (sub_81D6534() == TRUE)
-        LoadPalette(gUnknown_0862A5D4, 0x70, 0x20);
+        LoadPalette(sUnknown_0862A5D4, 0x70, 0x20);
 }
 
-static void sub_81D64DC(void)
+static void GetGameSaved(void)
 {
-    gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_EF9_1;
+    gSpecialVar_Result = gSaveBlock2Ptr->frontier.savedGame;
 }
 
-static void sub_81D64FC(void)
+static void SetGameSaved(void)
 {
-    gSaveBlock2Ptr->frontier.field_EF9_1 = 1;
+    gSaveBlock2Ptr->frontier.savedGame = TRUE;
 }
 
-static void sub_81D6518(void)
+static void ClearGameSaved(void)
 {
-    gSaveBlock2Ptr->frontier.field_EF9_1 = 0;
+    gSaveBlock2Ptr->frontier.savedGame = FALSE;
 }
 
+// Always FALSE
 bool32 sub_81D6534(void)
 {
-    if (!InTrainerHillChallenge() || GetCurrentTrainerHillMapId() == 6)
+    if (!InTrainerHillChallenge() || GetCurrentTrainerHillMapId() == TRAINER_HILL_ENTRANCE)
         return FALSE;
 
-    sub_81D5C00();
+    ClearVarResult();
     if (gSpecialVar_Result == 0)
         return FALSE;
     else
         return TRUE;
 }
 
-static void sub_81D6568(void)
+static void GetChallengeWon(void)
 {
     if (gSaveBlock1Ptr->trainerHill.hasLost)
-        gSpecialVar_Result = 0;
+        gSpecialVar_Result = FALSE;
     else
-        gSpecialVar_Result = 1;
+        gSpecialVar_Result = TRUE;
 }
 
 static void TrainerHillSetTag(void)
@@ -1021,49 +1045,50 @@ static void TrainerHillSetTag(void)
     gSaveBlock1Ptr->trainerHill.bestTime = gSaveBlock1Ptr->trainerHillTimes[gSpecialVar_0x8005];
 }
 
-static u8 sub_81D65E8(u8 arg0)
+static u8 GetPrizeListId(bool8 maxTrainers)
 {
-    u8 var, i, modBy;
+    u8 prizeListId, i, modBy;
 
-    var = 0;
-    for (i = 0; i < 4; i++)
+    prizeListId = 0;
+    for (i = 0; i < NUM_TRAINER_HILL_FLOORS; i++)
     {
-        var ^= sHillData->floors[i].unk0 & 0x1F;
-        var ^= sHillData->floors[i].unk1 & 0x1F;
+        prizeListId ^= sHillData->floors[i].trainerNum1 & 0x1F;
+        prizeListId ^= sHillData->floors[i].trainerNum2 & 0x1F;
     }
 
-    if (arg0)
-        modBy = 10;
+    // Not possible to win TMs with fewer than 8 trainers
+    if (maxTrainers)
+        modBy = NUM_TRAINER_HILL_PRIZE_LISTS;
     else
-        modBy = 5;
+        modBy = NUM_TRAINER_HILL_PRIZE_LISTS / 2;
 
-    var %= modBy;
-    return var;
+    prizeListId %= modBy;
+    return prizeListId;
 }
 
-static u16 sub_81D6640(void)
+static u16 GetPrizeItemId(void)
 {
     u8 i;
-    const u16 *ptr;
-    s32 var = 0, var2, minutes, id;
+    const u16 *prizeList;
+    s32 var = 0, prizeListSetId, minutes, id;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_TRAINER_HILL_FLOORS; i++)
     {
-        var += sHillData->floors[i].unk0;
-        var += sHillData->floors[i].unk1;
+        var += sHillData->floors[i].trainerNum1;
+        var += sHillData->floors[i].trainerNum2;
     }
 
-    var2 = var / 256;
-    var2 %= 2;
-    if (FlagGet(FLAG_SYS_GAME_CLEAR) && sHillData->tag.unkField_0 == 8)
-        i = sub_81D65E8(1);
+    prizeListSetId = var / 256;
+    prizeListSetId %= 2;
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) && sHillData->tag.numTrainers == NUM_TRAINER_HILL_TRAINERS)
+        i = GetPrizeListId(TRUE);
     else
-        i = sub_81D65E8(0);
+        i = GetPrizeListId(FALSE);
 
     if (gSaveBlock1Ptr->trainerHill.tag == HILL_TAG_EXPERT)
-        i = (i + 1) % 10;
+        i = (i + 1) % NUM_TRAINER_HILL_PRIZE_LISTS;
 
-    ptr = gUnknown_0862A5CC[var2][i];
+    prizeList = sPrizeListSets[prizeListSetId][i];
     minutes = (signed)(gSaveBlock1Ptr->trainerHill.timer) / (60 * 60);
     if (minutes < 12)
         id = 0;
@@ -1078,5 +1103,5 @@ static u16 sub_81D6640(void)
     else
         id = 5;
 
-    return ptr[id];
+    return prizeList[id];
 }
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 22b256a99..72e903728 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -14,6 +14,7 @@
 #include "util.h"
 #include "battle_pyramid.h"
 #include "constants/battle_setup.h"
+#include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
@@ -47,11 +48,11 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO
 static void SpriteCB_TrainerIcons(struct Sprite *sprite);
 
 // IWRAM common
-u16 gUnknown_03006080;
-u8 gUnknown_03006084[4];
+u16 gWhichTrainerToFaceAfterBattle;
+u8 gPostBattleMovementScript[4];
 struct ApproachingTrainer gApproachingTrainers[2];
 u8 gNoOfApproachingTrainers;
-u8 gUnknown_030060AC;
+bool8 gTrainerApproachedPlayer;
 
 // EWRAM
 EWRAM_DATA u8 gApproachingTrainerId = 0;
@@ -205,7 +206,7 @@ bool8 CheckForTrainersWantingBattle(void)
         ResetTrainerOpponentIds();
         ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId,
                                           gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr);
-        gUnknown_030060AC = 1;
+        gTrainerApproachedPlayer = TRUE;
         return TRUE;
     }
     else if (gNoOfApproachingTrainers == 2)
@@ -218,12 +219,12 @@ bool8 CheckForTrainersWantingBattle(void)
         }
         SetUpTwoTrainersBattle();
         gApproachingTrainerId = 0;
-        gUnknown_030060AC = 1;
+        gTrainerApproachedPlayer = TRUE;
         return TRUE;
     }
     else
     {
-        gUnknown_030060AC = 0;
+        gTrainerApproachedPlayer = FALSE;
         return FALSE;
     }
 }
@@ -764,24 +765,24 @@ u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId)
         return gApproachingTrainers[1].eventObjectId;
 }
 
-void sub_80B4808(void)
+void PlayerFaceTrainerAfterBattle(void)
 {
-    struct EventObject *trainerObj;
+    struct EventObject *eventObj;
 
-    if (gUnknown_030060AC == 1)
+    if (gTrainerApproachedPlayer == TRUE)
     {
-        trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId];
-        gUnknown_03006084[0] = GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection));
-        gUnknown_03006084[1] = 0xFE;
-        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+        eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId];
+        gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection));
+        gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
+        ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
     }
     else
     {
-        trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
-        gUnknown_03006084[0] = GetFaceDirectionMovementAction(trainerObj->facingDirection);
-        gUnknown_03006084[1] = 0xFE;
-        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+        eventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+        gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection);
+        gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
+        ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
     }
 
-    sub_809BE48(0xFF);
+    SetMovingNpcId(EVENT_OBJ_ID_PLAYER);
 }
diff --git a/src/tv.c b/src/tv.c
index a228daac0..c81085551 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -762,7 +762,7 @@ void ClearTVShowData(void)
     ClearPokemonNews();
 }
 
-u8 special_0x44(void)
+u8 GetRandomActiveShowIdx(void)
 {
     u8 i;
     u8 j;
@@ -771,10 +771,8 @@ u8 special_0x44(void)
 
     for (i = 5; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++)
     {
-        if (gSaveBlock1Ptr->tvShows[i].common.kind == 0)
-        {
+        if (gSaveBlock1Ptr->tvShows[i].common.kind == TVSHOW_OFF_AIR)
             break;
-        }
     }
     j = Random() % i;
     selIdx = j;
@@ -783,44 +781,38 @@ u8 special_0x44(void)
         if (GetTVChannelByShowType(gSaveBlock1Ptr->tvShows[j].common.kind) != 4)
         {
             if (gSaveBlock1Ptr->tvShows[j].common.active == TRUE)
-            {
                 return j;
-            }
         }
         else
         {
             show = &gSaveBlock1Ptr->tvShows[j];
             if (show->massOutbreak.daysLeft == 0 && show->massOutbreak.active == TRUE)
-            {
                 return j;
-            }
         }
+
         if (j == 0)
-        {
             j = ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 2;
-        }
         else
-        {
             j --;
-        }
+
     } while (j != selIdx);
     return 0xFF;
 }
 
 u8 FindAnyTVShowOnTheAir(void)
 {
-    u8 response;
+    u8 show;
 
-    response = special_0x44();
-    if (response == 0xFF)
+    show = GetRandomActiveShowIdx();
+    if (show == 0xFF)
     {
         return 0xFF;
     }
-    if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK)
+    if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[show].common.kind == TVSHOW_MASS_OUTBREAK)
     {
         return FindFirstActiveTVShowThatIsNotAMassOutbreak();
     }
-    return response;
+    return show;
 }
 
 void UpdateTVScreensOnMap(int width, int height)
@@ -876,7 +868,7 @@ void TurnOnTVScreen(void)
     DrawWholeMapView();
 }
 
-u8 special_0x45(void)
+u8 GetSelectedTVShow(void)
 {
     return gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004].common.kind;
 }
@@ -887,7 +879,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
 
     for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++)
     {
-        if (gSaveBlock1Ptr->tvShows[i].common.kind != 0 && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
+        if (gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_OFF_AIR && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
         {
             return i;
         }
@@ -895,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
     return 0xFF;
 }
 
-u8 special_0x4a(void)
+u8 GetNextActiveShowIfMassOutbreak(void)
 {
     TVShow *tvShow;
 
@@ -2003,7 +1995,7 @@ void sub_80EDC60(const u16 *words)
     }
 }
 
-void sub_80EDCE8(void)
+void TryPutTreasureInvestigatorsOnAir(void)
 {
     TVShow *show;
 
@@ -2298,7 +2290,7 @@ void sub_80EE184(void)
     }
 }
 
-void sub_80EE2CC(void)
+void TryPutLotteryWinnerReportOnAir(void)
 {
     TVShow *show;
 
@@ -2365,7 +2357,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed)
     }
 }
 
-void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
+void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
 {
     TVShow *show;
 
@@ -2440,7 +2432,7 @@ u8 TV_MonDataIdxToRibbon(u8 monDataIdx)
     return 0;
 }
 
-void sub_80EE72C(void)
+void TrySetUpTrainerFanClubSpecial(void)
 {
     TVShow *show;
 
@@ -2458,22 +2450,19 @@ void sub_80EE72C(void)
     }
 }
 
-bool8 sub_80EE7C0(void)
+bool8 ShouldHideFanClubInterviewer(void)
 {
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot == -1)
-    {
         return TRUE;
-    }
+
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
     if (gSpecialVar_Result == TRUE)
-    {
         return TRUE;
-    }
+
     if (gSaveBlock1Ptr->linkBattleRecords.entries[0].name[0] == EOS)
-    {
         return TRUE;
-    }
+    
     return FALSE;
 }
 
@@ -3149,7 +3138,7 @@ static void InterviewBefore_FanClubSpecial(void)
     }
 }
 
-bool8 sub_80EF88C(u8 monIdx)
+static bool8 IsPartyMonNicknamedOrNotEnglish(u8 monIdx)
 {
     struct Pokemon *pokemon;
     u8 language;
@@ -3164,9 +3153,9 @@ bool8 sub_80EF88C(u8 monIdx)
     return TRUE;
 }
 
-bool8 sub_80EF8F8(void)
+bool8 IsLeadMonNicknamedOrNotEnglish(void)
 {
-    return sub_80EF88C(GetLeadMonIndex());
+    return IsPartyMonNicknamedOrNotEnglish(GetLeadMonIndex());
 }
 
 void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx)
@@ -3436,13 +3425,14 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void)
     return FALSE;
 }
 
-bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void)
+bool8 TryPutNameRaterShowOnTheAir(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
+
+    // Nickname wasnt changed
     if (!StringCompare(gStringVar3, gStringVar1))
-    {
         return FALSE;
-    }
+
     PutNameRaterShowOnTheAir();
     return TRUE;
 }
@@ -3478,22 +3468,18 @@ void ChangeBoxPokemonNickname_CB(void)
     CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }
 
-void TV_CopyNicknameToStringVar1AndEnsureTerminated(void)
+void BufferMonNickname(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
     StringGetEnd10(gStringVar1);
 }
 
-void TV_CheckMonOTIDEqualsPlayerID(void)
+void IsMonOTIDNotPlayers(void)
 {
     if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
-    {
         gSpecialVar_Result = FALSE;
-    }
     else
-    {
         gSpecialVar_Result = TRUE;
-    }
 }
 
 u8 GetTVChannelByShowType(u8 kind)
diff --git a/src/union_room.c b/src/union_room.c
index f259a38f0..d6b712558 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -30,6 +30,7 @@
 #include "party_menu.h"
 #include "pokemon_jump.h"
 #include "random.h"
+#include "save_location.h"
 #include "script.h"
 #include "script_pokemon_util_80F87D8.h"
 #include "sound.h"
@@ -47,9 +48,11 @@
 #include "constants/cable_club.h"
 #include "constants/game_stat.h"
 #include "constants/maps.h"
+#include "constants/party_menu.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/union_room.h"
 
 EWRAM_DATA u8 sUnionRoomPlayerName[12] = {};
 EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -234,7 +237,7 @@ void sub_8012780(u8 taskId)
     switch (data->state)
     {
     case 0:
-        if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
+        if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
             gSpecialVar_0x8004++;
         gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004];
         gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8;
@@ -816,7 +819,7 @@ void sub_80134E8(u8 taskId)
     switch (data->state)
     {
     case 0:
-        if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
+        if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
             gSpecialVar_0x8004++;
         gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004];
         sub_8010F84(gUnknown_02022C2C, 0, 0);
@@ -828,7 +831,7 @@ void sub_80134E8(u8 taskId)
         data->state = 1;
         break;
     case 1:
-        if (PrintOnTextbox(&data->textState, gUnknown_082EFB70[gSpecialVar_0x8004]))
+        if (PrintOnTextbox(&data->textState, sChooseTrainerTexts[gSpecialVar_0x8004]))
             data->state = 2;
         break;
     case 2:
@@ -840,7 +843,7 @@ void sub_80134E8(u8 taskId)
         data->field_D = AddWindow(&gUnknown_082F017C);
 
         FillWindowPixelBuffer(data->field_C, PIXEL_FILL(2));
-        sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4);
+        sub_80173E0(data->field_C, 0, sText_ChooseJoinCancel, 8, 1, 4);
         PutWindowTilemap(data->field_C);
         CopyWindowToVram(data->field_C, 2);
 
@@ -1077,7 +1080,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id)
 
     if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3)
     {
-        if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80))
+        if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP))
             return 1;
         else if (structPtr->unk.field_0.unk_00.isChampion)
             return 0;
@@ -1469,7 +1472,7 @@ void sub_801440C(u8 taskId)
         HealPlayerParty();
         SavePlayerParty();
         LoadPlayerBag();
-        sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 2:
@@ -1478,7 +1481,7 @@ void sub_801440C(u8 taskId)
         SavePlayerParty();
         LoadPlayerBag();
         sub_80143E4(gBlockSendBuffer, TRUE);
-        sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 3:
@@ -1487,7 +1490,7 @@ void sub_801440C(u8 taskId)
         SavePlayerParty();
         LoadPlayerBag();
         sub_80143E4(gBlockSendBuffer, TRUE);
-        sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 4:
@@ -1896,7 +1899,7 @@ void sub_8014F48(u8 taskId)
         data->state = 1;
         break;
     case 1:
-        AddTextPrinterToWindow1(gUnknown_082EF7F8);
+        AddTextPrinterToWindow1(sText_ChooseTrainer);
         data->state = 2;
         break;
     case 2:
@@ -2308,7 +2311,9 @@ void sub_80156E0(u8 taskId)
         data->state = 3;
         break;
     case 3:
-        if ((sub_81B1360() == 8 || sub_81B1360() == 9) && sUnionRoomTrade.field_0 != 0)
+        if ((GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_REGISTER 
+           || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE) 
+           && sUnionRoomTrade.field_0 != 0)
         {
             id = GetCursorSelectionMonId();
             switch (sUnionRoomTrade.field_0)
@@ -2876,7 +2881,7 @@ void sub_80156E0(u8 taskId)
         {
             sUnionRoomTrade.field_0 = 1;
             gFieldCallback = sub_80AF128;
-            sub_81B8904(8, CB2_ReturnToField);
+            ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_REGISTER, CB2_ReturnToField);
         }
         break;
     case 52:
@@ -2988,7 +2993,7 @@ void sub_80156E0(u8 taskId)
             gUnionRoomRequestedMonType = data->field_0->arr[taskData[1]].unk.field_0.type;
             gUnionRoomOfferedSpecies = data->field_0->arr[taskData[1]].unk.field_0.species;
             gFieldCallback = sub_80AF128;
-            sub_81B8904(9, CB2_ReturnToField);
+            ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_TRADE, CB2_ReturnToField);
             sub_80156B0(data);
             sUnionRoomTrade.field_8 = taskData[1];
         }
@@ -4278,7 +4283,7 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2)
 
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->playerName);
 
-    StringCopy(arg1->field_174, gUnknown_082EFF50[trainerCard->stars]);
+    StringCopy(arg1->field_174, sCardColorTexts[trainerCard->stars]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, arg1->field_174);
 
     ConvertIntToDecimalStringN(arg1->field_C0[2], trainerCard->caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3);
diff --git a/sym_common.txt b/sym_common.txt
index 7c306c61b..8f0895207 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -51,7 +51,7 @@ gReservedSpritePaletteCount:
 	.include "contest.o"
 	.include "tv.o"
 	.include "mauville_old_man.o"
-	.include "contest_painting_effects.o"
+	.include "image_processing_effects.o"
 	
 	.space 0x4