Merge branch 'master' into pokenav-decomp-again

6 files changed, 388 insertions, 420 deletions

diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 685949006..2dc016a52 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,261 +1,261 @@
 BerryTreeScript:: @ 82742F9
 	special EventObjectInteractionGetBerryTreeData
 	switch VAR_0x8004
-	case 255, Route102_EventScript_27434F
-	case 0, Route102_EventScript_274359
-	case 1, Route102_EventScript_2743B1
-	case 2, Route102_EventScript_2743C1
-	case 3, Route102_EventScript_2743D1
-	case 4, Route102_EventScript_2743E1
-	case 5, Route102_EventScript_274421
+	case 255, BerryTree_EventScript_27434F
+	case 0, BerryTree_EventScript_CheckSoil
+	case 1, BerryTree_EventScript_CheckBerryStage1
+	case 2, BerryTree_EventScript_CheckBerryStage2
+	case 3, BerryTree_EventScript_CheckBerryStage3
+	case 4, BerryTree_EventScript_CheckBerryStage4
+	case 5, BerryTree_EventScript_CheckBerryFullyGrown
 	end
 
-Route102_EventScript_27434F:: @ 827434F
+BerryTree_EventScript_27434F:: @ 827434F
 	lockall
-	message Route102_Text_274744
+	message BerryTree_Text_ExclamationPoint
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-Route102_EventScript_274359:: @ 8274359
+BerryTree_EventScript_CheckSoil:: @ 8274359
 	lock
 	faceplayer
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, 1
-	goto_if_eq Route102_EventScript_274374
-	message Route102_Text_2744F0
+	goto_if_eq BerryTree_EventScript_WantToPlant
+	message BerryTree_Text_ItsSoftLoamySoil
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_274374:: @ 8274374
-	msgbox Route102_Text_274507, MSGBOX_YESNO
+BerryTree_EventScript_WantToPlant:: @ 8274374
+	msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq Route102_EventScript_274393
+	goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
 	compare VAR_RESULT, 0
-	goto_if_eq Route102_EventScript_2743AF
+	goto_if_eq BerryTree_EventScript_CancelPlanting
 	end
 
-Route102_EventScript_274393:: @ 8274393
+BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
 	fadescreen 1
 	closemessage
 	special Bag_ChooseBerry
 	waitstate
 	compare VAR_ITEM_ID, 0
-	goto_if_eq Route102_EventScript_2743AF
+	goto_if_eq BerryTree_EventScript_CancelPlanting
 	takeitem VAR_ITEM_ID, 1
-	call Route102_EventScript_2744DD
+	call BerryTree_EventScript_PlantBerry
 
-Route102_EventScript_2743AF:: @ 82743AF
+BerryTree_EventScript_CancelPlanting:: @ 82743AF
 	release
 	end
 
-Route102_EventScript_2743B1:: @ 82743B1
+BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
 	lockall
 	special EventObjectInteractionGetBerryCountString
-	message Route102_Text_274560
+	message BerryTree_Text_BerryGrowthStage1
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_27448D
+	goto BerryTree_EventScript_WantToWater
 
-Route102_EventScript_2743C1:: @ 82743C1
+BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
 	lockall
 	special EventObjectInteractionGetBerryName
-	message Route102_Text_274579
+	message BerryTree_Text_BerryGrowthStage2
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_27448D
+	goto BerryTree_EventScript_WantToWater
 
-Route102_EventScript_2743D1:: @ 82743D1
+BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
 	lockall
 	special EventObjectInteractionGetBerryName
-	message Route102_Text_27458A
+	message BerryTree_Text_BerryGrowthStage3
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_27448D
+	goto BerryTree_EventScript_WantToWater
 
-Route102_EventScript_2743E1:: @ 82743E1
-	call Route102_EventScript_2743F6
+BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
+	call BerryTree_EventScript_GetCareAdverb
 	lockall
 	special EventObjectInteractionGetBerryName
-	message Route102_Text_2745AB
+	message BerryTree_Text_BerryGrowthStage4
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_27448D
+	goto BerryTree_EventScript_WantToWater
 
-Route102_EventScript_2743F6:: @ 82743F6
+BerryTree_EventScript_GetCareAdverb:: @ 82743F6
 	compare VAR_0x8005, 0
-	goto_if_eq Route102_EventScript_27441A
+	goto_if_eq BerryTree_EventScript_SetAdverbPoor
 	compare VAR_0x8005, 4
-	goto_if_eq Route102_EventScript_274413
-	bufferstring 1, Route102_Text_2745E5
+	goto_if_eq BerryTree_EventScript_SetAdverbGreat
+	bufferstring 1, BerryTree_Text_CareAdverbGood
 	return
 
-Route102_EventScript_274413:: @ 8274413
-	bufferstring 1, Route102_Text_2745CD
+BerryTree_EventScript_SetAdverbGreat:: @ 8274413
+	bufferstring 1, BerryTree_Text_CareAdverbGreat
 	return
 
-Route102_EventScript_27441A:: @ 827441A
-	bufferstring 1, Route102_Text_2745DE
+BerryTree_EventScript_SetAdverbPoor:: @ 827441A
+	bufferstring 1, BerryTree_Text_CareAdverbPoor
 	return
 
-Route102_EventScript_274421:: @ 8274421
+BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
 	buffernumberstring 1, VAR_0x8006
 	lock
 	faceplayer
 	special EventObjectInteractionGetBerryCountString
-	msgbox Route102_Text_2745EE, MSGBOX_YESNO
+	msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq Route102_EventScript_274448
+	goto_if_eq BerryTree_EventScript_PickBerry
 	compare VAR_RESULT, 0
-	goto_if_eq Route102_EventScript_274479
+	goto_if_eq BerryTree_EventScript_CancelPickingBerry
 
-Route102_EventScript_274448:: @ 8274448
+BerryTree_EventScript_PickBerry:: @ 8274448
 	special EventObjectInteractionPickBerryTree
 	compare VAR_0x8004, 0
-	goto_if_eq Route102_EventScript_274470
+	goto_if_eq BerryTree_EventScript_BerryPocketFull
 	special sub_80EED34
 	special EventObjectInteractionRemoveBerryTree
-	message Route102_Text_27461B
+	message BerryTree_Text_PickedTheBerry
 	playfanfare MUS_ME_KINOMI
 	waitmessage
 	waitfanfare
 	waitbuttonpress
-	message Route102_Text_274630
+	message BerryTree_Text_PutAwayBerry
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_274470:: @ 8274470
-	message Route102_Text_27468F
+BerryTree_EventScript_BerryPocketFull:: @ 8274470
+	message BerryTree_Text_BerryPocketFull
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_274479:: @ 8274479
-	message Route102_Text_2746CB
+BerryTree_EventScript_CancelPickingBerry:: @ 8274479
+	message BerryTree_Text_BerryLeftUnpicked
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_274482:: @ 8274482
+BerryTree_EventScript_274482:: @ 8274482
 	lockall
 	special EventObjectInteractionGetBerryTreeData
-	call Route102_EventScript_2744DD
+	call BerryTree_EventScript_PlantBerry
 	releaseall
 	end
 
-Route102_EventScript_27448D:: @ 827448D
+BerryTree_EventScript_WantToWater:: @ 827448D
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare VAR_RESULT, 0
-	goto_if_eq Route102_EventScript_2744BE
+	goto_if_eq BerryTree_EventScript_DontWater
 	special EventObjectInteractionGetBerryName
-	msgbox Route102_Text_2746E4, MSGBOX_YESNO
+	msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq Route102_EventScript_2744C4
+	goto_if_eq BerryTree_EventScript_WaterBerry
 	compare VAR_RESULT, 0
-	goto_if_eq Route102_EventScript_2744BE
+	goto_if_eq BerryTree_EventScript_DontWater
 
-Route102_EventScript_2744BE:: @ 82744BE
+BerryTree_EventScript_DontWater:: @ 82744BE
 	releaseall
 	end
 
-Route102_EventScript_2744C0:: @ 82744C0
+BerryTree_EventScript_2744C0:: @ 82744C0
 	special EventObjectInteractionGetBerryTreeData
 	lockall
 
-Route102_EventScript_2744C4:: @ 82744C4
+BerryTree_EventScript_WaterBerry:: @ 82744C4
 	special EventObjectInteractionGetBerryName
-	message Route102_Text_274710
+	message BerryTree_Text_WateredTheBerry
 	waitmessage
 	special EventObjectInteractionWaterBerryTree
 	special DoWateringBerryTreeAnim
 	waitstate
-	message Route102_Text_274723
+	message BerryTree_Text_PlantIsDelighted
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-Route102_EventScript_2744DD:: @ 82744DD
+BerryTree_EventScript_PlantBerry:: @ 82744DD
 	special EventObjectInteractionPlantBerryTree
 	incrementgamestat 3
 	special sub_80EED10
 	special EventObjectInteractionGetBerryCountString
-	message Route102_Text_274535
+	message BerryTree_Text_PlantedOneBerry
 	waitmessage
 	waitbuttonpress
 	return
 
-Route102_Text_2744F0: @ 82744F0
+BerryTree_Text_ItsSoftLoamySoil: @ 82744F0
 	.string "It's soft, loamy soil.$"
 
-Route102_Text_274507: @ 8274507
+BerryTree_Text_WantToPlant: @ 8274507
 	.string "It's soft, loamy soil.\n"
 	.string "Want to plant a BERRY?$"
 
-Route102_Text_274535: @ 8274535
+BerryTree_Text_PlantedOneBerry: @ 8274535
 	.string "{PLAYER} planted one {STR_VAR_1} in\n"
 	.string "the soft, loamy soil.$"
 
-Route102_Text_274560: @ 8274560
+BerryTree_Text_BerryGrowthStage1: @ 8274560
 	.string "One {STR_VAR_1} was planted here.$"
 
-Route102_Text_274579: @ 8274579
+BerryTree_Text_BerryGrowthStage2: @ 8274579
 	.string "{STR_VAR_1} has sprouted.$"
 
-Route102_Text_27458A: @ 827458A
+BerryTree_Text_BerryGrowthStage3: @ 827458A
 	.string "This {STR_VAR_1} plant is growing taller.$"
 
-Route102_Text_2745AB: @ 82745AB
+BerryTree_Text_BerryGrowthStage4: @ 82745AB
 	.string "These {STR_VAR_1} flowers are blooming\n"
 	.string "{STR_VAR_2}.$"
 
-Route102_Text_2745CD: @ 82745CD
+BerryTree_Text_CareAdverbGreat: @ 82745CD
 	.string "very beautifully$"
 
-Route102_Text_2745DE: @ 82745DE
+BerryTree_Text_CareAdverbPoor: @ 82745DE
 	.string "cutely$"
 
-Route102_Text_2745E5: @ 82745E5
+BerryTree_Text_CareAdverbGood: @ 82745E5
 	.string "prettily$"
 
-Route102_Text_2745EE: @ 82745EE
+BerryTree_Text_WantToPick: @ 82745EE
 	.string "You found {STR_VAR_2} {STR_VAR_1}!\p"
 	.string "Do you want to pick the\n"
 	.string "{STR_VAR_1}?$"
 
-Route102_Text_27461B: @ 827461B
+BerryTree_Text_PickedTheBerry: @ 827461B
 	.string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1}.$"
 
-Route102_Text_274630: @ 8274630
+BerryTree_Text_PutAwayBerry: @ 8274630
 	.string "{PLAYER} put away the {STR_VAR_1}\n"
 	.string "in the BAG's BERRIES POCKET.\p"
 	.string "The soil returned to its soft and\n"
 	.string "loamy state.$"
 
-Route102_Text_27468F: @ 827468F
+BerryTree_Text_BerryPocketFull: @ 827468F
 	.string "The BAG's BERRIES POCKET is full.\p"
 	.string "The {STR_VAR_1} couldn't be taken.$"
 
-Route102_Text_2746CB: @ 82746CB
+BerryTree_Text_BerryLeftUnpicked: @ 82746CB
 	.string "{PLAYER} left the {STR_VAR_1}\n"
 	.string "unpicked.$"
 
-Route102_Text_2746E4: @ 82746E4
+BerryTree_Text_WantToWater: @ 82746E4
 	.string "Want to water the {STR_VAR_1} with the\n"
 	.string "WAILMER PAIL?$"
 
-Route102_Text_274710: @ 8274710
+BerryTree_Text_WateredTheBerry: @ 8274710
 	.string "{PLAYER} watered the {STR_VAR_1}.$"
 
-Route102_Text_274723: @ 8274723
+BerryTree_Text_PlantIsDelighted: @ 8274723
 	.string "The plant seems to be delighted.$"
 
-Route102_Text_274744: @ 8274744
+BerryTree_Text_ExclamationPoint: @ 8274744
 	.string "!$"
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 1914fee4f..c755493dc 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -22,7 +22,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
 	specialvar VAR_RESULT, sub_813B514
 	compare VAR_RESULT, 1
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB
-	specialvar VAR_RESULT, sub_801B27C
+	specialvar VAR_RESULT, ValidateReceivedWonderCard
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF
 	goto OldaleTown_PokemonCenter_2F_EventScript_276AFB
@@ -60,7 +60,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19
-	execram
+	gotoram
 
 OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A
 	msgbox gUnknown_08273178, MSGBOX_NPC
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 024ffbf85..6eae55294 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,221 +1,189 @@
-PetalburgWoods_EventScript_2906BB:: @ 82906BB
-Route103_EventScript_2906BB:: @ 82906BB
-Route104_EventScript_2906BB:: @ 82906BB
-Route110_TrickHousePuzzle1_EventScript_2906BB:: @ 82906BB
-Route111_EventScript_2906BB:: @ 82906BB
-Route116_EventScript_2906BB:: @ 82906BB
-Route117_EventScript_2906BB:: @ 82906BB
-Route118_EventScript_2906BB:: @ 82906BB
-Route120_EventScript_2906BB:: @ 82906BB
-Route121_EventScript_2906BB:: @ 82906BB
-Route123_EventScript_2906BB:: @ 82906BB
+
+EventScript_CutTree:: @ 82906BB
 	lockall
-	goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_290721
+	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
 	compare VAR_RESULT, 6
-	goto_if_eq Route103_EventScript_290721
+	goto_if_eq EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_CUT
-	msgbox Route103_Text_29072E, MSGBOX_YESNO
+	msgbox Text_WantToCut, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route103_EventScript_29072B
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	goto_if_eq EventScript_CancelCut
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
-	goto Route103_EventScript_290710
+	goto EventScript_CutTreeDown
 	end
 
-Route103_EventScript_290705:: @ 8290705
+EventScript_FldEffCut:: @ 8290705
 	lockall
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
-	goto Route103_EventScript_290710
+	goto EventScript_CutTreeDown
 	end
 
-Route103_EventScript_290710:: @ 8290710
-	applymovement VAR_LAST_TALKED, Route103_Movement_29071F
+EventScript_CutTreeDown:: @ 8290710
+	applymovement VAR_LAST_TALKED, Movement_CutTreeDown
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	releaseall
 	end
 
-Route103_Movement_29071F: @ 829071F
+Movement_CutTreeDown: @ 829071F
 	cut_tree
 	step_end
 
-Route103_EventScript_290721:: @ 8290721
-	msgbox Route103_Text_29077D, MSGBOX_DEFAULT
+EventScript_CheckTreeCantCut:: @ 8290721
+	msgbox Text_CantCut, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route103_EventScript_29072B:: @ 829072B
+EventScript_CancelCut:: @ 829072B
 	closemessage
 	releaseall
 	end
 
-Route103_Text_29072E: @ 829072E
+Text_WantToCut: @ 829072E
 	.string "This tree looks like it can be\n"
 	.string "CUT down!\p"
 	.string "Would you like to CUT it?$"
 
-Route103_Text_290771: @ 8290771
-Route111_Text_290771: @ 8290771
+Text_MonUsedHM: @ 8290771
 	.string "{STR_VAR_1} used {STR_VAR_2}!$"
 
-Route103_Text_29077D: @ 829077D
+Text_CantCut: @ 829077D
 	.string "This tree looks like it can be\n"
 	.string "CUT down!$"
 
-GraniteCave_B2F_EventScript_2907A6:: @ 82907A6
-MirageTower_3F_EventScript_2907A6:: @ 82907A6
-MirageTower_4F_EventScript_2907A6:: @ 82907A6
-Route110_TrickHousePuzzle3_EventScript_2907A6:: @ 82907A6
-Route111_EventScript_2907A6:: @ 82907A6
-Route114_EventScript_2907A6:: @ 82907A6
-Route115_EventScript_2907A6:: @ 82907A6
-RusturfTunnel_EventScript_2907A6:: @ 82907A6
-SafariZone_North_EventScript_2907A6:: @ 82907A6
-SafariZone_Northeast_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room1_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6
-VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6
+EventScript_RockSmash:: @ 82907A6
 	lockall
-	goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D
+	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
 	compare VAR_RESULT, 6
-	goto_if_eq Route111_EventScript_29082D
+	goto_if_eq EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_ROCK_SMASH
-	msgbox Route111_Text_29083A, MSGBOX_YESNO
+	msgbox Text_WantToSmash, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_290837
-	msgbox Route111_Text_290771, MSGBOX_DEFAULT
+	goto_if_eq EventScript_CancelSmash
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
-	goto Route111_EventScript_2907FB
+	goto EventScript_SmashRock
 	end
 
-Route111_EventScript_2907F0:: @ 82907F0
+EventScript_FldEffRockSmash:: @ 82907F0
 	lockall
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
-	goto Route111_EventScript_2907FB
+	goto EventScript_SmashRock
 	end
 
-Route111_EventScript_2907FB:: @ 82907FB
-	applymovement VAR_LAST_TALKED, Route111_Movement_29082B
+EventScript_SmashRock:: @ 82907FB
+	applymovement VAR_LAST_TALKED, Movement_SmashRock
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	specialvar VAR_RESULT, TryUpdateRusturfTunnelState
 	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_290829
+	goto_if_eq EventScript_EndSmash
 	special RockSmashWildEncounter
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_290829
+	goto_if_eq EventScript_EndSmash
 	waitstate
 	releaseall
 	end
 
-Route111_EventScript_290829:: @ 8290829
+EventScript_EndSmash:: @ 8290829
 	releaseall
 	end
 
-Route111_Movement_29082B: @ 829082B
+Movement_SmashRock: @ 829082B
 	rock_smash_break
 	step_end
 
-Route111_EventScript_29082D:: @ 829082D
-	msgbox Route111_Text_29087F, MSGBOX_DEFAULT
+EventScript_CantSmashRock:: @ 829082D
+	msgbox Text_CantSmash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_EventScript_290837:: @ 8290837
+EventScript_CancelSmash:: @ 8290837
 	closemessage
 	releaseall
 	end
 
-Route111_Text_29083A: @ 829083A
+Text_WantToSmash: @ 829083A
 	.string "This rock appears to be breakable.\n"
 	.string "Would you like to use ROCK SMASH?$"
 
-Route111_Text_29087F: @ 829087F
+Text_CantSmash: @ 829087F
 	.string "It's a rugged rock, but a POKéMON\n"
 	.string "may be able to smash it.$"
 
-FieryPath_EventScript_2908BA:: @ 82908BA
-MagmaHideout_1F_EventScript_2908BA:: @ 82908BA
-Route110_TrickHousePuzzle4_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room1_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room2_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room3_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room5_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA
-ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA
-VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA
+EventScript_StrengthBoulder:: @ 82908BA
 	lockall
-	goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915
-	goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F
+	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
+	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
 	compare VAR_RESULT, 6
-	goto_if_eq FieryPath_EventScript_290915
+	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
-	msgbox FieryPath_Text_29092C, MSGBOX_YESNO
+	msgbox Text_WantToStrength, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq FieryPath_EventScript_290929
+	goto_if_eq EventScript_CancelStrength
 	closemessage
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
-	goto FieryPath_EventScript_290908
+	goto EventScript_ActivateStrength
 	end
 
-FieryPath_EventScript_2908FD:: @ 82908FD
+EventScript_FldEffStrength:: @ 82908FD
 	lockall
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
-	goto FieryPath_EventScript_290908
+	goto EventScript_ActivateStrength
 	end
 
-FieryPath_EventScript_290908:: @ 8290908
+EventScript_ActivateStrength:: @ 8290908
 	setflag FLAG_SYS_USE_STRENGTH
-	msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT
+	msgbox Text_MonUsedStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_290915:: @ 8290915
-	msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT
+EventScript_CantStrength:: @ 8290915
+	msgbox Text_CantStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_29091F:: @ 829091F
-	msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT
+EventScript_CheckActivatedBoulder:: @ 829091F
+	msgbox Text_StrengthActivated, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_290929:: @ 8290929
+EventScript_CancelStrength:: @ 8290929
 	closemessage
 	releaseall
 	end
 
-FieryPath_Text_29092C: @ 829092C
+Text_WantToStrength: @ 829092C
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.\p"
 	.string "Would you like to use STRENGTH?$"
 
-FieryPath_Text_29098C: @ 829098C
+Text_MonUsedStrength: @ 829098C
 	.string "{STR_VAR_1} used STRENGTH!\p"
 	.string "{STR_VAR_1}'s STRENGTH made it\n"
 	.string "possible to move boulders around!$"
 
-FieryPath_Text_2909D6: @ 82909D6
+Text_CantStrength: @ 82909D6
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.$"
 
-FieryPath_Text_290A16: @ 8290A16
+Text_StrengthActivated: @ 8290A16
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
@@ -223,59 +191,59 @@ EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290A84
+	goto_if_eq EventScript_CantWaterfall
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
-	msgbox Text_290AC3, MSGBOX_YESNO
+	msgbox Text_WantToWaterfall, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290A8C
-	msgbox Text_290AFC, MSGBOX_DEFAULT
-	dofieldeffect 43
-	goto EventScript_290A8C
+	goto_if_eq EventScript_EndWaterfall
+	msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_WATERFALL
+	goto EventScript_EndWaterfall
 
 EventScript_CannotUseWaterfall:: @ 8290A83
 	lockall
 
-EventScript_290A84:: @ 8290A84
-	msgbox Text_290A8E, MSGBOX_DEFAULT
+EventScript_CantWaterfall:: @ 8290A84
+	msgbox Text_CantWaterfall, MSGBOX_DEFAULT
 
-EventScript_290A8C:: @ 8290A8C
+EventScript_EndWaterfall:: @ 8290A8C
 	releaseall
 	end
 
-Text_290A8E: @ 8290A8E
+Text_CantWaterfall: @ 8290A8E
 	.string "A wall of water is crashing down with\n"
 	.string "a mighty roar.$"
 
-Text_290AC3: @ 8290AC3
+Text_WantToWaterfall: @ 8290AC3
 	.string "It's a large waterfall.\n"
 	.string "Would you like to use WATERFALL?$"
 
-Text_290AFC: @ 8290AFC
+Text_MonUsedWaterfall: @ 8290AFC
 	.string "{STR_VAR_1} used WATERFALL.$"
 
 EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290B4E
+	goto_if_eq EventScript_CantDive
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
-	msgbox Text_290BE8, MSGBOX_YESNO
+	msgbox Text_WantToDive, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290B58
-	msgbox Text_290C1A, MSGBOX_DEFAULT
-	dofieldeffect 44
-	goto EventScript_290B58
+	goto_if_eq EventScript_EndDive
+	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_DIVE
+	goto EventScript_EndDive
 	end
 
-EventScript_290B4E:: @ 8290B4E
-	msgbox Text_290BAA, MSGBOX_DEFAULT
+EventScript_CantDive:: @ 8290B4E
+	msgbox Text_CantDive, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_290B58:: @ 8290B58
+EventScript_EndDive:: @ 8290B58
 	releaseall
 	end
 
@@ -283,50 +251,50 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290B99
+	goto_if_eq EventScript_CantSurface
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
-	msgbox Text_290C6E, MSGBOX_YESNO
+	msgbox Text_WantToSurface, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290BA8
-	msgbox Text_290C1A, MSGBOX_DEFAULT
-	dofieldeffect 44
-	goto EventScript_290BA8
+	goto_if_eq EventScript_EndSurface
+	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_DIVE
+	goto EventScript_EndSurface
 	end
 
-EventScript_290B99:: @ 8290B99
+EventScript_CantSurface:: @ 8290B99
 	lockall
-	msgbox Text_290C28, MSGBOX_DEFAULT
-	goto EventScript_290BA8
+	msgbox Text_CantSurface, MSGBOX_DEFAULT
+	goto EventScript_EndSurface
 	end
 
-EventScript_290BA8:: @ 8290BA8
+EventScript_EndSurface:: @ 8290BA8
 	releaseall
 	end
 
-Text_290BAA: @ 8290BAA
+Text_CantDive: @ 8290BAA
 	.string "The sea is deep here. A POKéMON\n"
 	.string "may be able to go underwater.$"
 
-Text_290BE8: @ 8290BE8
+Text_WantToDive: @ 8290BE8
 	.string "The sea is deep here.\n"
 	.string "Would you like to use DIVE?$"
 
-Text_290C1A: @ 8290C1A
+Text_MonUsedDive: @ 8290C1A
 	.string "{STR_VAR_1} used DIVE.$"
 
-Text_290C28: @ 8290C28
+Text_CantSurface: @ 8290C28
 	.string "Light is filtering down from above.\n"
 	.string "A POKéMON may be able to surface.$"
 
-Text_290C6E: @ 8290C6E
+Text_WantToSurface: @ 8290C6E
 	.string "Light is filtering down from above.\n"
 	.string "Would you like to use DIVE?$"
 
-EventScript_290CAE:: @ 8290CAE
-	msgbox Text_290CB7, MSGBOX_SIGN
+EventScript_FailSweetScent:: @ 8290CAE
+	msgbox Text_FailSweetScent, MSGBOX_SIGN
 	end
 
-Text_290CB7: @ 8290CB7
+Text_FailSweetScent: @ 8290CB7
 	.string "Looks like there's nothing here…$"
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 2b0083175..045fbb5a7 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
-Route102_EventScript_290CD8:: @ 8290CD8
+Route102_EventScript_ItemPotion:: @ 8290CD8
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route103_EventScript_290CE5:: @ 8290CE5
+Route103_EventScript_ItemGuardSpec:: @ 8290CE5
 	giveitem_std ITEM_GUARD_SPEC, 1, 1
 	end
 
-Route103_EventScript_290CF2:: @ 8290CF2
+Route103_EventScript_ItemPPUp:: @ 8290CF2
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route104_EventScript_290CFF:: @ 8290CFF
+Route104_EventScript_ItemPPUp:: @ 8290CFF
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route104_EventScript_290D0C:: @ 8290D0C
+Route104_EventScript_ItemPokeBall:: @ 8290D0C
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-Route104_EventScript_290D19:: @ 8290D19
+Route104_EventScript_ItemXAccuracy:: @ 8290D19
 	giveitem_std ITEM_X_ACCURACY, 1, 1
 	end
 
-Route104_EventScript_290D26:: @ 8290D26
+Route104_EventScript_ItemPotion:: @ 8290D26
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route105_EventScript_290D33:: @ 8290D33
+Route105_EventScript_ItemIron:: @ 8290D33
 	giveitem_std ITEM_IRON, 1, 1
 	end
 
-Route106_EventScript_290D40:: @ 8290D40
+Route106_EventScript_ItemProtein:: @ 8290D40
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route108_EventScript_290D4D:: @ 8290D4D
+Route108_EventScript_ItemStarPiece:: @ 8290D4D
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-Route109_EventScript_290D5A:: @ 8290D5A
+Route109_EventScript_ItemPPUp:: @ 8290D5A
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route109_EventScript_290D67:: @ 8290D67
+Route109_EventScript_ItemPotion:: @ 8290D67
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route110_EventScript_290D74:: @ 8290D74
+Route110_EventScript_ItemRareCandy:: @ 8290D74
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route110_EventScript_290D81:: @ 8290D81
+Route110_EventScript_ItemDireHit:: @ 8290D81
 	giveitem_std ITEM_DIRE_HIT, 1, 1
 	end
 
-Route110_EventScript_290D8E:: @ 8290D8E
+Route110_EventScript_ItemElixir:: @ 8290D8E
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route111_EventScript_290D9B:: @ 8290D9B
+Route111_EventScript_ItemTM37:: @ 8290D9B
 	giveitem_std ITEM_TM37, 1, 1
 	end
 
-Route111_EventScript_290DA8:: @ 8290DA8
+Route111_EventScript_ItemStardust:: @ 8290DA8
 	giveitem_std ITEM_STARDUST, 1, 1
 	end
 
-Route111_EventScript_290DB5:: @ 8290DB5
+Route111_EventScript_ItemHPUp:: @ 8290DB5
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-Route111_EventScript_290DC2:: @ 8290DC2
+Route111_EventScript_ItemElixir:: @ 8290DC2
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route112_EventScript_290DCF:: @ 8290DCF
+Route112_EventScript_ItemNugget:: @ 8290DCF
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route113_EventScript_290DDC:: @ 8290DDC
+Route113_EventScript_ItemMaxEther:: @ 8290DDC
 	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
-Route113_EventScript_290DE9:: @ 8290DE9
+Route113_EventScript_ItemSuperRepel:: @ 8290DE9
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-Route113_EventScript_290DF6:: @ 8290DF6
+Route113_EventScript_ItemHyperPotion:: @ 8290DF6
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route114_EventScript_290E03:: @ 8290E03
+Route114_EventScript_ItemRareCandy:: @ 8290E03
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route114_EventScript_290E10:: @ 8290E10
+Route114_EventScript_ItemProtein:: @ 8290E10
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route114_EventScript_290E1D:: @ 8290E1D
+Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
 	giveitem_std ITEM_ENERGY_POWDER, 1, 1
 	end
 
-Route115_EventScript_290E2A:: @ 8290E2A
+Route115_EventScript_ItemSuperPotion:: @ 8290E2A
 	giveitem_std ITEM_SUPER_POTION, 1, 1
 	end
 
-Route115_EventScript_290E37:: @ 8290E37
+Route115_EventScript_ItemTM01:: @ 8290E37
 	giveitem_std ITEM_TM01, 1, 1
 	end
 
-Route115_EventScript_290E44:: @ 8290E44
+Route115_EventScript_ItemIron:: @ 8290E44
 	giveitem_std ITEM_IRON, 1, 1
 	end
 
-Route115_EventScript_290E51:: @ 8290E51
+Route115_EventScript_ItemGreatBall:: @ 8290E51
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-Route115_EventScript_290E5E:: @ 8290E5E
+Route115_EventScript_ItemHealPowder:: @ 8290E5E
 	giveitem_std ITEM_HEAL_POWDER, 1, 1
 	end
 
-Route115_EventScript_290E6B:: @ 8290E6B
+Route115_EventScript_ItemPPUp:: @ 8290E6B
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route116_EventScript_290E78:: @ 8290E78
+Route116_EventScript_ItemXSpecial:: @ 8290E78
 	giveitem_std ITEM_X_SPECIAL, 1, 1
 	end
 
-Route116_EventScript_290E85:: @ 8290E85
+Route116_EventScript_ItemEther:: @ 8290E85
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-Route116_EventScript_290E92:: @ 8290E92
+Route116_EventScript_ItemRepel:: @ 8290E92
 	giveitem_std ITEM_REPEL, 1, 1
 	end
 
-Route116_EventScript_290E9F:: @ 8290E9F
+Route116_EventScript_ItemHPUp:: @ 8290E9F
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-Route116_EventScript_290EAC:: @ 8290EAC
+Route116_EventScript_ItemPotion:: @ 8290EAC
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route117_EventScript_290EB9:: @ 8290EB9
+Route117_EventScript_ItemGreatBall:: @ 8290EB9
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-Route117_EventScript_290EC6:: @ 8290EC6
+Route117_EventScript_ItemRevive:: @ 8290EC6
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route118_EventScript_290ED3:: @ 8290ED3
+Route118_EventScript_ItemHyperPotion:: @ 8290ED3
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290EE0:: @ 8290EE0
+Route119_EventScript_ItemSuperRepel:: @ 8290EE0
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-Route119_EventScript_290EED:: @ 8290EED
+Route119_EventScript_ItemZinc:: @ 8290EED
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route119_EventScript_290EFA:: @ 8290EFA
+Route119_EventScript_ItemElixir:: @ 8290EFA
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route119_EventScript_290F07:: @ 8290F07
+Route119_EventScript_ItemLeafStone:: @ 8290F07
 	giveitem_std ITEM_LEAF_STONE, 1, 1
 	end
 
-Route119_EventScript_290F14:: @ 8290F14
+Route119_EventScript_ItemRareCandy:: @ 8290F14
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route119_EventScript_290F21:: @ 8290F21
+Route119_EventScript_ItemHyperPotion:: @ 8290F21
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290F2E:: @ 8290F2E
+Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290F3B:: @ 8290F3B
+Route119_EventScript_ItemElixir2:: @ 8290F3B
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route120_EventScript_290F48:: @ 8290F48
+Route120_EventScript_ItemNugget:: @ 8290F48
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route120_EventScript_290F55:: @ 8290F55
+Route120_EventScript_ItemFullHeal:: @ 8290F55
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-Route120_EventScript_290F62:: @ 8290F62
+Route120_EventScript_ItemHyperPotion:: @ 8290F62
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route120_EventScript_290F6F:: @ 8290F6F
+Route120_EventScript_ItemNestBall:: @ 8290F6F
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-Route120_EventScript_290F7C:: @ 8290F7C
+Route120_EventScript_ItemRevive:: @ 8290F7C
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route121_EventScript_290F89:: @ 8290F89
+Route121_EventScript_ItemCarbos:: @ 8290F89
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route121_EventScript_290F96:: @ 8290F96
+Route121_EventScript_ItemRevive:: @ 8290F96
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route121_EventScript_290FA3:: @ 8290FA3
+Route121_EventScript_ItemZinc:: @ 8290FA3
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route123_EventScript_290FB0:: @ 8290FB0
+Route123_EventScript_ItemCalcium:: @ 8290FB0
 	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
-Route123_EventScript_290FBD:: @ 8290FBD
+Route123_EventScript_ItemUltraBall:: @ 8290FBD
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-Route123_EventScript_290FCA:: @ 8290FCA
+Route123_EventScript_ItemElixir:: @ 8290FCA
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route123_EventScript_290FD7:: @ 8290FD7
+Route123_EventScript_ItemPPUp:: @ 8290FD7
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route123_EventScript_290FE4:: @ 8290FE4
+Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
 	giveitem_std ITEM_REVIVAL_HERB, 1, 1
 	end
 
-Route124_EventScript_290FF1:: @ 8290FF1
+Route124_EventScript_ItemRedShard:: @ 8290FF1
 	giveitem_std ITEM_RED_SHARD, 1, 1
 	end
 
-Route124_EventScript_290FFE:: @ 8290FFE
+Route124_EventScript_ItemBlueShard:: @ 8290FFE
 	giveitem_std ITEM_BLUE_SHARD, 1, 1
 	end
 
-Route124_EventScript_29100B:: @ 829100B
+Route124_EventScript_ItemYellowShard:: @ 829100B
 	giveitem_std ITEM_YELLOW_SHARD, 1, 1
 	end
 
-Route125_EventScript_291018:: @ 8291018
+Route125_EventScript_ItemBigPearl:: @ 8291018
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-Route126_EventScript_291025:: @ 8291025
+Route126_EventScript_ItemGreenShard:: @ 8291025
 	giveitem_std ITEM_GREEN_SHARD, 1, 1
 	end
 
-Route127_EventScript_291032:: @ 8291032
+Route127_EventScript_ItemZinc:: @ 8291032
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route127_EventScript_29103F:: @ 829103F
+Route127_EventScript_ItemCarbos:: @ 829103F
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route127_EventScript_29104C:: @ 829104C
+Route127_EventScript_ItemRareCandy:: @ 829104C
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route132_EventScript_291059:: @ 8291059
+Route132_EventScript_ItemRareCandy:: @ 8291059
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route132_EventScript_291066:: @ 8291066
+Route132_EventScript_ItemProtein:: @ 8291066
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route133_EventScript_291073:: @ 8291073
+Route133_EventScript_ItemBigPearl:: @ 8291073
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-Route133_EventScript_291080:: @ 8291080
+Route133_EventScript_ItemStarPiece:: @ 8291080
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-Route133_EventScript_29108D:: @ 829108D
+Route133_EventScript_ItemMaxRevive:: @ 829108D
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-Route134_EventScript_29109A:: @ 829109A
+Route134_EventScript_ItemCarbos:: @ 829109A
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route134_EventScript_2910A7:: @ 82910A7
+Route134_EventScript_ItemStarPiece:: @ 82910A7
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-PetalburgCity_EventScript_2910B4:: @ 82910B4
+PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-PetalburgCity_EventScript_2910C1:: @ 82910C1
+PetalburgCity_EventScript_ItemEther:: @ 82910C1
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-MauvilleCity_EventScript_2910CE:: @ 82910CE
+MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
 	giveitem_std ITEM_X_SPEED, 1, 1
 	end
 
-RustboroCity_EventScript_2910DB:: @ 82910DB
+RustboroCity_EventScript_ItemXDefend:: @ 82910DB
 	giveitem_std ITEM_X_DEFEND, 1, 1
 	end
 
-LilycoveCity_EventScript_2910E8:: @ 82910E8
+LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
 	giveitem_std ITEM_MAX_REPEL, 1, 1
 	end
 
-MossdeepCity_EventScript_2910F5:: @ 82910F5
+MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
 	giveitem_std ITEM_NET_BALL, 1, 1
 	end
 
-PetalburgWoods_EventScript_291102:: @ 8291102
+PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
 	giveitem_std ITEM_X_ATTACK, 1, 1
 	end
 
-PetalburgWoods_EventScript_29110F:: @ 829110F
+PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-PetalburgWoods_EventScript_29111C:: @ 829111C
+PetalburgWoods_EventScript_ItemEther:: @ 829111C
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-PetalburgWoods_EventScript_291129:: @ 8291129
+PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
 	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
-RusturfTunnel_EventScript_291136:: @ 8291136
+RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-RusturfTunnel_EventScript_291143:: @ 8291143
+RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
 	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
-GraniteCave_1F_EventScript_291150:: @ 8291150
+GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-GraniteCave_B1F_EventScript_29115D:: @ 829115D
+GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-GraniteCave_B2F_EventScript_29116A:: @ 829116A
+GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
 	giveitem_std ITEM_REPEL, 1, 1
 	end
 
-GraniteCave_B2F_EventScript_291177:: @ 8291177
+GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-JaggedPass_EventScript_291184:: @ 8291184
+JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
 	giveitem_std ITEM_BURN_HEAL, 1, 1
 	end
 
-FieryPath_EventScript_291191:: @ 8291191
+FieryPath_EventScript_ItemFireStone:: @ 8291191
 	giveitem_std ITEM_FIRE_STONE, 1, 1
 	end
 
-FieryPath_EventScript_29119E:: @ 829119E
+FieryPath_EventScript_ItemTM06:: @ 829119E
 	giveitem_std ITEM_TM06, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911AB:: @ 82911AB
+MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
 	giveitem_std ITEM_TM23, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911B8:: @ 82911B8
+MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911C5:: @ 82911C5
+MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
 	giveitem_std ITEM_MOON_STONE, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911D2:: @ 82911D2
+MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-MeteorFalls_B1F_2R_EventScript_2911DF:: @ 82911DF
+MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
 	giveitem_std ITEM_TM02, 1, 1
 	end
 
-NewMauville_Inside_EventScript_2911EC:: @ 82911EC
+NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-NewMauville_Inside_EventScript_2911F9:: @ 82911F9
+NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291206:: @ 8291206
+NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
 	giveitem_std ITEM_THUNDER_STONE, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291213:: @ 8291213
+NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291220:: @ 8291220
+NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
 	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
-AbandonedShip_Rooms_1F_EventScript_29122D:: @ 829122D
+AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
 	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_29123A:: @ 829123A
+AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-AbandonedShip_Rooms2_B1F_EventScript_291247:: @ 8291247
+AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
 	giveitem_std ITEM_DIVE_BALL, 1, 1
 	end
 
-AbandonedShip_Room_B1F_EventScript_291254:: @ 8291254
+AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
 	giveitem_std ITEM_TM13, 1, 1
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_291261:: @ 8291261
+AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_29126E:: @ 829126E
+AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
 	giveitem_std ITEM_STORAGE_KEY, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_29127B:: @ 829127B
+AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
 	giveitem_std ITEM_LUXURY_BALL, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_291288:: @ 8291288
+AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
 	giveitem_std ITEM_SCANNER, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_291295:: @ 8291295
+AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
 	giveitem_std ITEM_WATER_STONE, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_2912A2:: @ 82912A2
+AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
 	giveitem_std ITEM_TM18, 1, 1
 	end
 
-ScorchedSlab_EventScript_2912AF:: @ 82912AF
+ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
 	giveitem_std ITEM_TM11, 1, 1
 	end
 
-SafariZone_Northwest_EventScript_2912BC:: @ 82912BC
+SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
 	giveitem_std ITEM_TM22, 1, 1
 	end
 
-SafariZone_North_EventScript_2912C9:: @ 82912C9
+SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
 	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
-SafariZone_Southwest_EventScript_2912D6:: @ 82912D6
+SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-SafariZone_Northeast_EventScript_2912E3:: @ 82912E3
+SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-SafariZone_Southeast_EventScript_2912F0:: @ 82912F0
+SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-MtPyre_2F_EventScript_2912FD:: @ 82912FD
+MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-MtPyre_3F_EventScript_29130A:: @ 829130A
+MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-MtPyre_4F_EventScript_291317:: @ 8291317
+MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
 	giveitem_std ITEM_SEA_INCENSE, 1, 1
 	end
 
-MtPyre_5F_EventScript_291324:: @ 8291324
+MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
 	giveitem_std ITEM_LAX_INCENSE, 1, 1
 	end
 
-MtPyre_6F_EventScript_291331:: @ 8291331
+MtPyre_6F_EventScript_ItemTM30:: @ 8291331
 	giveitem_std ITEM_TM30, 1, 1
 	end
 
-MtPyre_Exterior_EventScript_29133E:: @ 829133E
+MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
 	giveitem_std ITEM_MAX_POTION, 1, 1
 	end
 
-MtPyre_Exterior_EventScript_29134B:: @ 829134B
+MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
 	giveitem_std ITEM_TM48, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291358:: @ 8291358
+AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
 	giveitem_std ITEM_MASTER_BALL, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291365:: @ 8291365
+AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291372:: @ 8291372
+AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-AquaHideout_B2F_EventScript_29137F:: @ 829137F
+AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-AquaHideout_B2F_EventScript_29138C:: @ 829138C
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
+	giveitem_std ITEM_MASTER_BALL, 1, 1      // Unused
 	end
 
-Route119_EventScript_291399:: @ 8291399
+Route119_EventScript_ItemNugget:: @ 8291399
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route119_EventScript_2913A6:: @ 82913A6
+Route119_EventScript_ItemMaxElixir:: @ 82913A6
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-Route119_EventScript_2913B3:: @ 82913B3
+Route119_EventScript_ItemNestBall:: @ 82913B3
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_2913C0:: @ 82913C0
+ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2913CD:: @ 82913CD
+ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_2913DA:: @ 82913DA
+ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
 	giveitem_std ITEM_ICE_HEAL, 1, 1
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_2913E7:: @ 82913E7
+ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
 	giveitem_std ITEM_TM07, 1, 1
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_2913F4:: @ 82913F4
+ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
 	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
 	end
 
-SeafloorCavern_Room9_EventScript_291401:: @ 8291401
+SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
 	giveitem_std ITEM_TM26, 1, 1
 	end
 
-Route110_TrickHousePuzzle1_EventScript_29140E:: @ 829140E
+Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
 	giveitem_std ITEM_ORANGE_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle2_EventScript_29141B:: @ 829141B
+Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
 	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle2_EventScript_291428:: @ 8291428
+Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
 	giveitem_std ITEM_WAVE_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle3_EventScript_291435:: @ 8291435
+Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
 	giveitem_std ITEM_SHADOW_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle3_EventScript_291442:: @ 8291442
+Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
 	giveitem_std ITEM_WOOD_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle4_EventScript_29144F:: @ 829144F
+Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
 	giveitem_std ITEM_MECH_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle6_EventScript_29145C:: @ 829145C
+Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
 	giveitem_std ITEM_GLITTER_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle7_EventScript_291469:: @ 8291469
+Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
 	giveitem_std ITEM_TROPIC_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle8_EventScript_291476:: @ 8291476
+Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
 	giveitem_std ITEM_BEAD_MAIL, 1, 1
 	end
 
-VictoryRoad_1F_EventScript_291483:: @ 8291483
+VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-VictoryRoad_1F_EventScript_291490:: @ 8291490
+VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-VictoryRoad_B1F_EventScript_29149D:: @ 829149D
+VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
 	giveitem_std ITEM_TM29, 1, 1
 	end
 
-VictoryRoad_B1F_EventScript_2914AA:: @ 82914AA
+VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
 	giveitem_std ITEM_FULL_RESTORE, 1, 1
 	end
 
-VictoryRoad_B2F_EventScript_2914B7:: @ 82914B7
+VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-ArtisanCave_B1F_EventScript_2914C4:: @ 82914C4
+ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-ArtisanCave_1F_EventScript_2914D1:: @ 82914D1
+ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-MagmaHideout_1F_EventScript_2914DE:: @ 82914DE
+MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-MagmaHideout_2F_2R_EventScript_2914EB:: @ 82914EB
+MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-MagmaHideout_2F_2R_EventScript_2914F8:: @ 82914F8
+MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
 	giveitem_std ITEM_FULL_RESTORE, 1, 1
 	end
 
-MagmaHideout_3F_1R_EventScript_291505:: @ 8291505
+MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-MagmaHideout_3F_2R_EventScript_291512:: @ 8291512
+MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
 	giveitem_std ITEM_PP_MAX, 1, 1
 	end
 
-MagmaHideout_4F_EventScript_29151F:: @ 829151F
+MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-MagmaHideout_3F_3R_EventScript_29152C:: @ 829152C
+MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 6302a33a8..81bd388f8 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -310,8 +310,8 @@ SecretBase_RedCave1_Text_275944: @ 8275944
 	.string "Are you speechless?$"
 
 EventScript_2759F1:: @ 82759F1
-	special sub_80E8C98
-	special sub_80E8BC8
+	special GetSecretBaseTypeInFrontOfPlayer
+	special CheckPlayerHasSecretBase
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_275BE8
 	checkpartymove MOVE_SECRET_POWER
@@ -339,7 +339,7 @@ EventScript_275A50:: @ 8275A50
 	msgbox gText_23B704, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
 	waitstate
@@ -371,7 +371,7 @@ EventScript_275AA9:: @ 8275AA9
 	msgbox Text_274779, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
 	waitstate
@@ -403,7 +403,7 @@ EventScript_275B02:: @ 8275B02
 	msgbox Text_274825, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
 	waitstate
@@ -432,11 +432,11 @@ EventScript_275B5B:: @ 8275B5B
 	playse SE_KAIDAN
 	setvar VAR_INIT_SECRET_BASE, 0
 	setflag FLAG_DECORATION_0
-	special sub_80E8E18
-	special sub_80E9068
+	special SetPlayerSecretBase
+	special EnterSecretBase
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
-	special sub_80E933C
+	special InitSecretBaseDecorationSprites
 	setvar VAR_SECRET_BASE_INITIALIZED, 1
 	waitstate
 	end
@@ -450,13 +450,13 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
 	goto_if_eq SecretBase_RedCave1_EventScript_275BAB
 	closemessage
 	playse SE_KAIDAN
-	special sub_80E9A90
+	special ClearAndLeaveSecretBase
 	end
 
 SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
 	closemessage
 	setflag FLAG_RECEIVED_SECRET_POWER
-	special sub_80E91F8
+	special EnterNewlyCreatedSecretBase
 	waitstate
 	end
 
@@ -469,18 +469,18 @@ EventScript_275BB7:: @ 8275BB7
 	lockall
 	setvar VAR_INIT_SECRET_BASE, 1
 	playse SE_KAIDAN
-	special sub_80E9744
+	special IsCurSecretBaseOwnedByAnotherPlayer
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275BDB
 	clearflag FLAG_DECORATION_0
-	special sub_80E9068
+	special EnterSecretBase
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	waitstate
 	end
 
 EventScript_275BDB:: @ 8275BDB
 	setflag FLAG_DECORATION_0
-	special sub_80E9068
+	special EnterSecretBase
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	waitstate
 	end
@@ -500,7 +500,7 @@ EventScript_275BE8:: @ 8275BE8
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
 	fadescreenswapbuffers 1
-	special sub_80E9B70
+	special MoveOutOfSecretBaseFromOutside
 	closemessage
 	fadescreenswapbuffers 0
 	msgbox Text_276A95, MSGBOX_YESNO
@@ -508,7 +508,7 @@ EventScript_275BE8:: @ 8275BE8
 	goto_if_eq EventScript_275CDE
 	bufferpartymonnick 0, VAR_0x8004
 	buffermovename 1, MOVE_SECRET_POWER
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	closemessage
 	compare VAR_0x8007, 1
@@ -569,7 +569,7 @@ SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1
 EventScript_275D0C:: @ 8275D0C
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
-	special sub_80E933C
+	special InitSecretBaseDecorationSprites
 	setvar VAR_SECRET_BASE_INITIALIZED, 1
 	end
 
@@ -626,7 +626,7 @@ SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64
 SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64
 SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64
 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64
-	special sub_80EA354
+	special GetSecretBaseOwnerInteractionState
 	compare VAR_0x8004, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_275DD6
 	compare VAR_0x8004, 1
@@ -1010,7 +1010,7 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C
 	end
 
 SecretBase_RedCave1_EventScript_276286:: @ 8276286
-	special sub_80EA2E4
+	special PrepSecretBaseBattleFlags
 	setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
@@ -1039,12 +1039,20 @@ SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5
 
 	.include "data/scripts/secret_power_tm.inc"
 
+SecretBase_EventScript_DollInteract:: @ 82766A2
+	special sub_80EB290
+	end
+
+SecretBase_EventScript_CushionInteract:: @ 82766A6
+	special sub_80EB2C8
+	end
+
 Text_2766AA: @ 82766AA
 	.string "All decorations and furniture in your\n"
 	.string "SECRET BASE will be returned to your PC.\p"
 	.string "Is that okay?$"
 
-Text_276707: @ 8276707
+Text_WantToRegisterSecretBase: @ 8276707
 	.string "Do you want to register\n"
 	.string "{STR_VAR_1}'s SECRET BASE?$"
 
@@ -1052,7 +1060,7 @@ Text_276731: @ 8276731
 	.string "This data is already registered.\n"
 	.string "Would you like to delete it?$"
 
-Text_27676F: @ 827676F
+Text_TooManyBasesDeleteSome: @ 827676F
 	.string "Up to 10 locations can be registered.\p"
 	.string "Delete a location if you want to\n"
 	.string "register another location.$"
@@ -1063,10 +1071,10 @@ Text_2767D1: @ 82767D1
 Text_2767E9: @ 82767E9
 	.string "Data has been unregistered.$"
 
-Text_276805: @ 8276805
+Text_SecretBaseBootUpPC: @ 8276805
 	.string "{PLAYER} booted up the PC.$"
 
-Text_27681A: @ 827681A
+Text_SecretBasePCStartMenu: @ 827681A
 	.string "What would you like to do?$"
 
 Text_276835: @ 8276835
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index ed7216357..647064829 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -103,11 +103,3 @@ Route111_Movement_276696: @ 8276696
 	walk_down
 	walk_down
 	step_end
-
-EventScript_SecretPower1:: @ 82766A2
-	special sub_80EB290
-	end
-
-EventScript_SecretPower2:: @ 82766A6
-	special sub_80EB2C8
-	end