Some script clean up, document secret base secrets show

16 files changed, 123 insertions, 656 deletions

diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
deleted file mode 100644
index 6d7bb156f..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ /dev/null
@@ -1,507 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
-	.byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
-	special CallBattleTowerFunc
-	checkplayergender
-	compare VAR_RESULT, FEMALE
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
-	special SetBattleTowerLinkPlayerGfx
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
-	setvar VAR_TEMP_0, 1
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
-	waitmovement 0
-	frontier_get FRONTIER_DATA_BATTLE_NUM
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	frontier_set FRONTIER_DATA_6, 1
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	tower_setopponent
-	addobject 1
-	addobject 4
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
-	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	tower_getopponentintro 0
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	tower_getopponentintro 1
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	tower_getopponentintro 0
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll gStringVar4
-	waitmessage
-	delay 48
-	tower_getopponentintro 1
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll gStringVar4
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
-	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	tower_set TOWER_DATA_LVL_MODE
-	setvar VAR_0x8004, 3
-	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
-	call BattleFrontier_EventScript_IncrementWinStreak
-	tower_setbattlewon
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
-	waitmovement 0
-	removeobject 1
-	removeobject 4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
-	messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
-	special LoadPlayerParty
-	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
-	frontier_get FRONTIER_DATA_BATTLE_NUM
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
-	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
-	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
-	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
-	switch VAR_RESULT
-	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
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
-	closemessage
-	clearflag FLAG_TEMP_2
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	waitmovement 0
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
-	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	tower_set TOWER_DATA_LVL_MODE
-	setvar VAR_0x8004, 3
-	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
-	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
-	waitmessage
-	tower_save CHALLENGE_STATUS_PAUSED
-	playse SE_SAVE
-	waitse
-	fadescreen FADE_TO_BLACK
-	frontier_reset
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
-	waitmessage
-	delay 48
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
-	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
-	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
-	multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	call BattleFrontier_EventScript_SaveBattle
-	setflag FLAG_TEMP_2
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
-	special sub_813B534
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
-	walk_left
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
-	walk_in_place_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
-	.string "The 2nd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
-	.string "The 3rd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
-	.string "The 4th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
-	.string "The 5th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
-	.string "The 6th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
-	.string "The 7th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
-	.string "The 2nd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
-	.string "The 3rd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
-	.string "The 4th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
-	.string "The 5th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
-	.string "The 6th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
-	.string "The 7th set of opponents is next.\n"
-	.string "Do your best!$"
-
-gText_LinkStandby3:: @ 824978D
-	.string "Link standby…$"
-
-gText_YourPartnerHasRetired:: @ 824979B
-	.string "Your partner has retired.\p"
-	.string "Your BATTLE ROOM challenge\n"
-	.string "will be canceled.$"
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index b3fd57a0a..297f05fb0 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
 	.byte 0
 
 BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
-	special sub_81653CC
+	special TryHideBattleTowerReporter
 	end
 
 BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
@@ -857,7 +857,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
 	waitstate
 	playse SE_SAVE
 	waitse
-	special sub_80B3BC4
+	special TrySetBattleTowerLinkType
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index cf273bcb8..1c2bf07ea 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -457,8 +457,7 @@ LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
 	walk_up
 	step_end
 
-@ Unused
-LilycoveCity_Harbor_Movement_21E635: @ 821E635
+LilycoveCity_Harbor_Movement_UnusedBoardFerry: @ 821E635
 	walk_up
 	step_end
 
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 76559a856..158e13678 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -184,8 +184,7 @@ MtChimney_Movement_ArchieExitNorth: @ 822EF9C
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFA6: @ 822EFA6
+MtChimney_Movement_Unused1: @ 822EFA6
 	walk_down
 	walk_down
 	walk_down
@@ -205,8 +204,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFB8: @ 822EFB8
+MtChimney_Movement_Unused2: @ 822EFB8
 	walk_down
 	walk_down
 	walk_down
@@ -217,8 +215,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFC1: @ 822EFC1
+MtChimney_Movement_Unused3: @ 822EFC1
 	walk_right
 	walk_down
 	walk_down
@@ -235,8 +232,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFD0: @ 822EFD0
+MtChimney_Movement_Unused4: @ 822EFD0
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
@@ -263,8 +259,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFE9: @ 822EFE9
+MtChimney_Movement_Unused5: @ 822EFE9
 	delay_16
 	delay_16
 	delay_16
@@ -277,8 +272,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22EFF4: @ 822EFF4
+MtChimney_Movement_Unused6: @ 822EFF4
 	delay_16
 	walk_left
 	walk_down
@@ -296,8 +290,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F004: @ 822F004
+MtChimney_Movement_Unused7: @ 822F004
 	delay_16
 	walk_left
 	walk_left
@@ -316,8 +309,7 @@ MtChimney_Movement_22F004: @ 822F004
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F015: @ 822F015
+MtChimney_Movement_Unused8: @ 822F015
 	delay_16
 	walk_down
 	walk_left
@@ -327,8 +319,7 @@ MtChimney_Movement_22F015: @ 822F015
 	walk_in_place_fastest_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F01D: @ 822F01D
+MtChimney_Movement_Unused9: @ 822F01D
 	walk_down
 	walk_down
 	walk_down
@@ -344,13 +335,11 @@ MtChimney_Movement_22F01D: @ 822F01D
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F02B: @ 822F02B
+MtChimney_Movement_Unused10: @ 822F02B
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F02D: @ 822F02D
+MtChimney_Movement_Unused11: @ 822F02D
 	walk_down
 	walk_down
 	walk_down
@@ -360,8 +349,7 @@ MtChimney_Movement_22F02D: @ 822F02D
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F035: @ 822F035
+MtChimney_Movement_Unused12: @ 822F035
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
@@ -373,8 +361,7 @@ MtChimney_Movement_22F035: @ 822F035
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F03F: @ 822F03F
+MtChimney_Movement_Unused13: @ 822F03F
 	delay_16
 	delay_16
 	delay_16
@@ -387,16 +374,14 @@ MtChimney_Movement_22F03F: @ 822F03F
 	walk_down
 	step_end
 
-@ Unused
-MtChimney_Movement_22F04A: @ 822F04A
+MtChimney_Movement_Unused14: @ 822F04A
 	lock_facing_direction
 	walk_fast_left
 	unlock_facing_direction
 	face_right
 	step_end
 
-@ Unused
-MtChimney_Movement_22F04F: @ 822F04F
+MtChimney_Movement_Unused15: @ 822F04F
 	walk_left
 	walk_in_place_fastest_right
 	delay_16
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 5d3bbf1ef..80badcfd2 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -351,7 +351,8 @@ PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
 	waitmovement 0
 	return
 
-PetalburgCity_Movement_1DC611:: @ 81DC611
+@ Unused
+PetalburgCity_Movement_Delay48:: @ 81DC611
 	delay_16
 	delay_16
 	delay_16
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index d9f299db2..02685ef47 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -673,8 +673,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
 	walk_up
 	step_end
 
-@ Unused
-PetalburgCity_Gym_Movement_2050D8: @ 82050D8
+PetalburgCity_Gym_Movement_Unused: @ 82050D8
 	walk_in_place_fastest_up
 	delay_16
 	delay_16
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 2ea7a5d06..90abbddd5 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -78,13 +78,11 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
 	releaseall
 	end
 
-@ Unused
-Route128_Movement_1F6C76: @ 81F6C76
+Route128_Movement_Unused1: @ 81F6C76
 	walk_fast_left
 	step_end
 
-@ Unused
-Route128_Movement_1F6C78: @ 81F6C78
+Route128_Movement_Unused2: @ 81F6C78
 	walk_left
 	walk_left
 	walk_left
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 143ff4543..034f6fbd4 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -72,8 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	releaseall
 	end
 
-@ Unused
-RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
+RustboroCity_DevonCorp_3F_Movement_Unused: @ 821252F
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 9219ba3e4..aa99d8740 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -184,22 +184,19 @@ RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
 	walk_in_place_fastest_right
 	step_end
 
-@ Unused
-RusturfTunnel_Movement_22D035: @ 822D035
+RusturfTunnel_Movement_Unused1: @ 822D035
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-@ Unused
-RusturfTunnel_Movement_22D038: @ 822D038
+RusturfTunnel_Movement_Unused2: @ 822D038
 	walk_down
 	walk_in_place_fastest_up
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-@ Unused
-RusturfTunnel_Movement_22D03D: @ 822D03D
+RusturfTunnel_Movement_Unused3: @ 822D03D
 	walk_up
 	walk_in_place_fastest_down
 	delay_8
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 43c503682..46d1a1f36 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -153,8 +153,7 @@ SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
 	walk_right
 	step_end
 
-@ Unused
-SeafloorCavern_Room9_Movement_235032: @ 8235032
+SeafloorCavern_Room9_Movement_Unused1: @ 8235032
 	walk_left
 	walk_left
 	step_end
@@ -164,8 +163,7 @@ SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035
 	delay_16
 	step_end
 
-@ Unused
-SeafloorCavern_Room9_Movement_235038: @ 8235038
+SeafloorCavern_Room9_Movement_Unused2: @ 8235038
 	walk_right
 	step_end
 
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 9f951e83d..025618b61 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -668,8 +668,7 @@ SlateportCity_Movement_TyExit: @ 81DD326
 	walk_left
 	step_end
 
-@ Unused
-SlateportCity_Movement_1DD334: @ 81DD334
+SlateportCity_Movement_Unused: @ 81DD334
 	walk_down
 	walk_in_place_fastest_up
 	step_end
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 38fb70e7d..7593b7824 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -129,8 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
 	walk_in_place_fastest_left
 	step_end
 
-@ Unused
-SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
+SlateportCity_OceanicMuseum_2F_Movement_Unused: @ 820BCC8
 	walk_up
 	walk_left
 	walk_left
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 0f2ad02b1..aa5f63b9e 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -364,7 +364,7 @@ SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25
 	end
 
 SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT
@@ -401,7 +401,7 @@ SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D
 	end
 
 SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT
@@ -438,7 +438,7 @@ SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15
 	end
 
 SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT
@@ -475,7 +475,7 @@ SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D
 	end
 
 SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT
@@ -512,7 +512,7 @@ SecretBase_EventScript_Trainer4PreChampion:: @ 8276005
 	end
 
 SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT
@@ -549,7 +549,7 @@ SecretBase_EventScript_Trainer5PreChampion:: @ 827607D
 	end
 
 SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT
@@ -586,7 +586,7 @@ SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5
 	end
 
 SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT
@@ -623,7 +623,7 @@ SecretBase_EventScript_Trainer7PreChampion:: @ 827616D
 	end
 
 SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT
@@ -660,7 +660,7 @@ SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5
 	end
 
 SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT
@@ -697,7 +697,7 @@ SecretBase_EventScript_Trainer9PreChampion:: @ 827625D
 	end
 
 SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267
-	special sub_80EB300
+	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
 	msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT
@@ -716,35 +716,35 @@ SecretBase_EventScript_BattleTrainer:: @ 8276286
 	special DoSpecialTrainerBattle
 	waitstate
 	compare VAR_RESULT, B_OUTCOME_DREW
-	call_if_eq SecretBase_EventScript_2762BD
+	call_if_eq SecretBase_EventScript_DrewSecretBaseBattle
 	compare VAR_RESULT, B_OUTCOME_WON
-	call_if_eq SecretBase_EventScript_2762C1
+	call_if_eq SecretBase_EventScript_WonSecretBaseBattle
 	compare VAR_RESULT, B_OUTCOME_LOST
-	call_if_eq SecretBase_EventScript_2762C5
+	call_if_eq SecretBase_EventScript_LostSecretBaseBattle
 	special HealPlayerParty
 	release
 	end
 
-SecretBase_EventScript_2762BD:: @ 82762BD
-	special sub_80EB438
+SecretBase_EventScript_DrewSecretBaseBattle:: @ 82762BD
+	special DrewSecretBaseBattle
 	return
 
-SecretBase_EventScript_2762C1:: @ 82762C1
-	special sub_80EB368
+SecretBase_EventScript_WonSecretBaseBattle:: @ 82762C1
+	special WonSecretBaseBattle
 	return
 
-SecretBase_EventScript_2762C5:: @ 82762C5
-	special sub_80EB3D0
+SecretBase_EventScript_LostSecretBaseBattle:: @ 82762C5
+	special LostSecretBaseBattle
 	return
 
 	.include "data/scripts/secret_power_tm.inc"
 
 SecretBase_EventScript_DollInteract:: @ 82766A2
-	special sub_80EB290
+	special CheckInteractedWithFriendsDollDecor
 	end
 
 SecretBase_EventScript_CushionInteract:: @ 82766A6
-	special sub_80EB2C8
+	special CheckInteractedWithFriendsCushionDecor
 	end
 
 SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index de5dcc703..0fa61a214 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -157,33 +157,33 @@ SecretBase_EventScript_PCTurnOff:: @ 823B66E
     end
 
 @ Unused
-SecretBase_EventScript_23B674:: @ 823B674
-    special SetSecretBaseSecretsTvFlags_Poster
+SecretBase_EventScript_Poster:: @ 823B674
+    special CheckInteractedWithFriendsPosterDecor
     end
 
 @ Unused
-SecretBase_EventScript_23B678:: @ 823B678
-    special SetSecretBaseSecretsTvFlags_MiscFurnature
+SecretBase_EventScript_FurnitureBottom:: @ 823B678
+    special CheckInteractedWithFriendsFurnitureBottom
     end
 
 @ Unused
-SecretBase_EventScript_23B67C:: @ 823B67C
-    special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
+SecretBase_EventScript_FurnitureMiddle:: @ 823B67C
+    special CheckInteractedWithFriendsFurnitureMiddle
     end
 
 @ Unused
-SecretBase_EventScript_23B680:: @ 823B680
-    special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
+SecretBase_EventScript_FurnitureTop:: @ 823B680
+    special CheckInteractedWithFriendsFurnitureTop
     end
 
 SecretBase_EventScript_SandOrnament:: @ 823B684
-    special SetSecretBaseSecretsTvFlags_SandOrnament
+    special CheckInteractedWithFriendsSandOrnament
     dofieldeffect FLDEFF_SAND_PILLAR
     waitstate
     end
 
 SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C
-    special GetShieldToyTVDecorationInfo
+    special InteractWithShieldOrTVDecoration
     compare VAR_RESULT, 0
     goto_if_eq SecretBase_EventScript_BattleTowerShield
     compare VAR_RESULT, 1
diff --git a/data/specials.inc b/data/specials.inc
index 17f459a1f..95a0ac5d3 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -28,7 +28,7 @@ gSpecials:: @ 81DBA64
 	def_special GetSecretBaseOwnerAndState
 	def_special InitSecretBaseDecorationSprites
 	def_special SetDecoration
-	def_special sub_81297AC
+	def_special GetEventObjectLocalIdByFlag
 	def_special GetSecretBaseTypeInFrontOfPlayer
 	def_special SetSecretBaseOwnerGfxId
 	def_special sub_8129708
@@ -44,7 +44,7 @@ gSpecials:: @ 81DBA64
 	def_special ColosseumPlayerSpotTriggered
 	def_special PlayerEnteredTradeSeat
 	def_special nullsub_37
-	def_special sub_80B3254
+	def_special CableClubSaveGame
 	def_special TryBerryBlenderLinkup
 	def_special GetLinkPartnerNames
 	def_special SpawnLinkPartnerEventObject
@@ -147,7 +147,7 @@ gSpecials:: @ 81DBA64
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	def_special ShouldReadyContestArtist
 	def_special SaveMuseumContestPainting
-	def_special sub_80F8864
+	def_special DoesContestCategoryHaveWinner
 	def_special CountPlayerContestPaintings
 	def_special ShowContestWinner
 	def_special MauvilleGymSetDefaultBarriers
@@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64
 	def_special ScriptCheckFreePokemonStorageSpace
 	def_special DoSealedChamberShakingEffect1
 	def_special ShowDeptStoreElevatorFloorSelect
-	def_special GetShieldToyTVDecorationInfo
+	def_special InteractWithShieldOrTVDecoration
 	def_special IsPokerusInParty
 	def_special SetSootopolisGymCrackedIceMetatiles
 	def_special ShakeCamera
@@ -348,7 +348,7 @@ gSpecials:: @ 81DBA64
 	def_special HasAllHoennMons
 	def_special MonOTNameNotPlayer
 	def_special BufferLottoTicketNumber
-	def_special sub_81653CC
+	def_special TryHideBattleTowerReporter
 	def_special DoesPartyHaveEnigmaBerry
 	def_special ScriptRandom
 	def_special SetChampionSaveWarp
@@ -361,17 +361,17 @@ gSpecials:: @ 81DBA64
 	def_special IncrementDailyPlantedBerries
 	def_special IncrementDailyPickedBerries
 	def_special InitSecretBaseVars
-	def_special SetSecretBaseSecretsTvFlags_SandOrnament
-	def_special sub_80EB300
-	def_special sub_80EB438
-	def_special sub_80EB368
-	def_special sub_80EB3D0
-	def_special sub_80EB290
-	def_special sub_80EB2C8
-	def_special SetSecretBaseSecretsTvFlags_MiscFurnature
-	def_special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
-	def_special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
-	def_special SetSecretBaseSecretsTvFlags_Poster
+	def_special CheckInteractedWithFriendsSandOrnament
+	def_special DeclinedSecretBaseBattle
+	def_special DrewSecretBaseBattle
+	def_special WonSecretBaseBattle
+	def_special LostSecretBaseBattle
+	def_special CheckInteractedWithFriendsDollDecor
+	def_special CheckInteractedWithFriendsCushionDecor
+	def_special CheckInteractedWithFriendsFurnitureBottom
+	def_special CheckInteractedWithFriendsFurnitureMiddle
+	def_special CheckInteractedWithFriendsFurnitureTop
+	def_special CheckInteractedWithFriendsPosterDecor
 	def_special SetLilycoveLadyGfx
 	def_special Script_GetLilycoveLadyId
 	def_special GetFavorLadyState
@@ -444,7 +444,7 @@ gSpecials:: @ 81DBA64
 	def_special GetDeptStoreDefaultFloorChoice
 	def_special BufferVarsForIVRater
 	def_special LinkContestWaitForConnection
-	def_special sub_800B518
+	def_special GetWirelessCommType
 	def_special LinkContestTryShowWirelessIndicator
 	def_special LinkContestTryHideWirelessIndicator
 	def_special IsWirelessContest
@@ -534,4 +534,4 @@ gSpecials:: @ 81DBA64
 	def_special TryPrepareSecondApproachingTrainer
 	def_special RemoveRecordsWindow
 	def_special CloseDeptStoreElevatorWindow
-	def_special sub_80B3BC4
+	def_special TrySetBattleTowerLinkType
diff --git a/data/text/tv.inc b/data/text/tv.inc
index c6453af0c..c0d262cbf 100644
--- a/data/text/tv.inc
+++ b/data/text/tv.inc
@@ -2079,7 +2079,7 @@ gTVWhatsNo1InHoennTodayText08:: @ 0828858B
 	.string "Viewers, take heart from {STR_VAR_1}!\n"
 	.string "You, too, can be no. 1 every day!$"
 
-gTVSecretBaseSecretsText00:: @ 08288608
+TVSecretBaseSecrets_Text_Intro:: @ 08288608
 	.string "SECRET BASE SECRETS!\p"
 	.string "What do TRAINERS do in the secrecy\n"
 	.string "of SECRET BASES?\p"
@@ -2090,88 +2090,88 @@ gTVSecretBaseSecretsText00:: @ 08288608
 	.string "Let's have a peek!\p"
 	.string "What will {STR_VAR_2} do?$"
 
-gTVSecretBaseSecretsText01:: @ 082886C8
+TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1:: @ 082886C8
 	.string "What will {STR_VAR_2} do next?$"
 
-gTVSecretBaseSecretsText02:: @ 082886DE
+TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2:: @ 082886DE
 	.string "And now, what will {STR_VAR_2} do?$"
 
-gTVSecretBaseSecretsText03:: @ 082886F8
+TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving:: @ 082886F8
 	.string "In the end, {STR_VAR_2} took {STR_VAR_3} steps\n"
 	.string "in {STR_VAR_1}'s SECRET BASE before\l"
 	.string "leaving.$"
 
-gTVSecretBaseSecretsText04:: @ 08288739
+TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer:: @ 08288739
 	.string "Hmm…\p"
 	.string "It appears as if {STR_VAR_1}'s SECRET\n"
 	.string "BASE failed to interest {STR_VAR_2}…$"
 
-gTVSecretBaseSecretsText05:: @ 08288777
+TVSecretBaseSecrets_Text_PlayerEnjoyedBase:: @ 08288777
 	.string "{STR_VAR_2} appears to have enjoyed\n"
 	.string "{STR_VAR_1}'s SECRET BASE thoroughly.$"
 
-gTVSecretBaseSecretsText06:: @ 082887AF
+TVSecretBaseSecrets_Text_PlayerHugeFanOfBase:: @ 082887AF
 	.string "{STR_VAR_2} appears to have become\n"
 	.string "a huge fan of {STR_VAR_1}'s\l"
 	.string "SECRET BASE.$"
 
-gTVSecretBaseSecretsText07:: @ 082887E9
+TVSecretBaseSecrets_Text_Outro:: @ 082887E9
 	.string "Viewers may want to check out\n"
 	.string "{STR_VAR_1}'s SECRET BASE, too.\p"
 	.string "Tune in next time as we visit another\n"
 	.string "SECRET BASE! Thanks for joining us!$"
 
-gTVSecretBaseSecretsText08:: @ 08288868
+TVSecretBaseSecrets_Text_StoppedMoving1:: @ 08288868
 	.string "The visitor has stopped!\p"
 	.string "The visitor isn't moving at all!\p"
 	.string "Was {STR_VAR_1}'s SECRET BASE\n"
 	.string "that unimpressive?$"
 
-gTVSecretBaseSecretsText09:: @ 082888CA
+TVSecretBaseSecrets_Text_StoppedMoving2:: @ 082888CA
 	.string "The visitor has stopped!\p"
 	.string "The visitor isn't moving at all!\p"
 	.string "Is it fatigue?\n"
 	.string "Has the visitor grown weary?$"
 
-gTVSecretBaseSecretsText10:: @ 08288930
+TVSecretBaseSecrets_Text_UsedChair:: @ 08288930
 	.string "The visitor sat down on a chair!\n"
 	.string "The visitor is seated!\p"
 	.string "Look at that look of delight!\p"
 	.string "That chair must be very comfortable\n"
 	.string "to get that response!$"
 
-gTVSecretBaseSecretsText11:: @ 082889C0
+TVSecretBaseSecrets_Text_UsedBalloon:: @ 082889C0
 	.string "The visitor charged at a balloon!\p"
 	.string "It burst!\n"
 	.string "Oh, my goodness, it popped!\p"
 	.string "The visitor appears startled by\n"
 	.string "the sudden noise!$"
 
-gTVSecretBaseSecretsText12:: @ 08288A3A
+TVSecretBaseSecrets_Text_UsedTent:: @ 08288A3A
 	.string "The visitor entered a TENT!\p"
 	.string "The visitor is running around!\p"
 	.string "Oh, my, the visitor is frolicking!\p"
 	.string "The visitor appears surprised by\n"
 	.string "the TENT's size!$"
 
-gTVSecretBaseSecretsText13:: @ 08288ACA
+TVSecretBaseSecrets_Text_UsedPlant:: @ 08288ACA
 	.string "The visitor is examining\n"
 	.string "a potted plant!\p"
 	.string "The visitor has surprisingly\n"
 	.string "mature taste!$"
 
-gTVSecretBaseSecretsText14:: @ 08288B1E
+TVSecretBaseSecrets_Text_UsedGoldShield:: @ 08288B1E
 	.string "The visitor is examining\n"
 	.string "a GOLD SHIELD!\p"
 	.string "The visitor's eyes appear to be\n"
 	.string "lit up with wonder!$"
 
-gTVSecretBaseSecretsText15:: @ 08288B7A
+TVSecretBaseSecrets_Text_UsedSilverShield:: @ 08288B7A
 	.string "The visitor is examining\n"
 	.string "a SILVER SHIELD!\p"
 	.string "The visitor appears to be wide-eyed!$"
 
-gTVSecretBaseSecretsText16:: @ 08288BC9
+TVSecretBaseSecrets_Text_UsedGlassOrnament:: @ 08288BC9
 	.string "The visitor is examining\n"
 	.string "a GLASS ORNAMENT!\p"
 	.string "Oh, no!\p"
@@ -2179,15 +2179,15 @@ gTVSecretBaseSecretsText16:: @ 08288BC9
 	.string "It's getting covered with\n"
 	.string "fingerprints…$"
 
-gTVSecretBaseSecretsText17:: @ 08288C40
+TVSecretBaseSecrets_Text_UsedTV:: @ 08288C40
 	.string "The visitor is watching television!\p"
 	.string "Looks like we have a big fan of TV!$"
 
-gTVSecretBaseSecretsText18:: @ 08288C88
+TVSecretBaseSecrets_Text_UsedMudBall:: @ 08288C88
 	.string "The visitor stomped on a MUD BALL!\p"
 	.string "The visitor looks delighted!$"
 
-gTVSecretBaseSecretsText19:: @ 08288CC8
+TVSecretBaseSecrets_Text_UsedBag:: @ 08288CC8
 	.string "…Oh?\p"
 	.string "The visitor is reaching for their own\n"
 	.string "BAG and rummaging about in it!\p"
@@ -2197,19 +2197,19 @@ gTVSecretBaseSecretsText19:: @ 08288CC8
 	.string "holding up the {STR_VAR_2}!\p"
 	.string "It's like a TV commercial!$"
 
-gTVSecretBaseSecretsText20:: @ 08288D7F
+TVSecretBaseSecrets_Text_UsedCushion:: @ 08288D7F
 	.string "The visitor grabs a cushion and…$"
 
-gTVSecretBaseSecretsText21:: @ 08288DA0
+TVSecretBaseSecrets_Text_HitCushion:: @ 08288DA0
 	.string "…begins hitting it!\p"
 	.string "Is the visitor under a lot of stress?$"
 
-gTVSecretBaseSecretsText22:: @ 08288DDA
+TVSecretBaseSecrets_Text_HuggedCushion:: @ 08288DDA
 	.string "…hugs it tight!\p"
 	.string "Could the visitor be feeling happy\n"
 	.string "about something?$"
 
-gTVSecretBaseSecretsText23:: @ 08288E1E
+TVSecretBaseSecrets_Text_BattledWon:: @ 08288E1E
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2220,7 +2220,7 @@ gTVSecretBaseSecretsText23:: @ 08288E1E
 	.string "The visitor is doing\n"
 	.string "a victory dance!$"
 
-gTVSecretBaseSecretsText24:: @ 08288EC9
+TVSecretBaseSecrets_Text_BattledLost:: @ 08288EC9
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2230,7 +2230,7 @@ gTVSecretBaseSecretsText24:: @ 08288EC9
 	.string "The visitor has lost!\p"
 	.string "The visitor looks dejected!$"
 
-gTVSecretBaseSecretsText25:: @ 08288F58
+TVSecretBaseSecrets_Text_DeclinedBattle:: @ 08288F58
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2241,7 +2241,7 @@ gTVSecretBaseSecretsText25:: @ 08288F58
 	.string "Did the visitor find {STR_VAR_1}\n"
 	.string "unappealing?$"
 
-gTVSecretBaseSecretsText26:: @ 08289011
+TVSecretBaseSecrets_Text_UsedPoster:: @ 08289011
 	.string "The visitor is staring intently\n"
 	.string "at a poster!\p"
 	.string "Is the poster to the visitor's\n"
@@ -2249,12 +2249,12 @@ gTVSecretBaseSecretsText26:: @ 08289011
 	.string "…But… There's something disturbing\n"
 	.string "about the visitor's stares.$"
 
-gTVSecretBaseSecretsText27:: @ 082890A4
+TVSecretBaseSecrets_Text_UsedNoteMat:: @ 082890A4
 	.string "The visitor stepped on a NOTE MAT!\p"
 	.string "…Hmm…\n"
 	.string "The visitor composed a funny tune!$"
 
-gTVSecretBaseSecretsText28:: @ 082890F0
+TVSecretBaseSecrets_Text_BattledDraw:: @ 082890F0
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2265,14 +2265,14 @@ gTVSecretBaseSecretsText28:: @ 082890F0
 	.string "Both TRAINERS appear to be very\n"
 	.string "disappointed!$"
 
-gTVSecretBaseSecretsText29:: @ 08289193
+TVSecretBaseSecrets_Text_UsedSpinMat:: @ 08289193
 	.string "The visitor stepped on\n"
 	.string "a SPIN MAT!\p"
 	.string "It looks like the visitor is dizzy!\p"
 	.string "The visitor is tottering about!\n"
 	.string "Look out!$"
 
-gTVSecretBaseSecretsText30:: @ 08289204
+TVSecretBaseSecrets_Text_UsedSandOrnament:: @ 08289204
 	.string "The visitor is reaching for\n"
 	.string "a SAND ORNAMENT!\p"
 	.string "Oh!\p"
@@ -2281,7 +2281,7 @@ gTVSecretBaseSecretsText30:: @ 08289204
 	.string "The visitor looks sheepish\n"
 	.string "and guilty!$"
 
-gTVSecretBaseSecretsText31:: @ 0828927C
+TVSecretBaseSecrets_Text_UsedDesk:: @ 0828927C
 	.string "The visitor is rubbing a desktop\n"
 	.string "with their finger!\p"
 	.string "Apparently, the visitor disapproves\n"
@@ -2289,25 +2289,25 @@ gTVSecretBaseSecretsText31:: @ 0828927C
 	.string "The visitor is surprisingly concerned\n"
 	.string "about neatness!$"
 
-gTVSecretBaseSecretsText32:: @ 08289313
+TVSecretBaseSecrets_Text_UsedBrick:: @ 08289313
 	.string "The visitor is staring at a BRICK!\p"
 	.string "Perhaps the visitor is thinking about\n"
 	.string "the object on the BRICK.$"
 
-gTVSecretBaseSecretsText33:: @ 08289375
+TVSecretBaseSecrets_Text_UsedSolidBoard:: @ 08289375
 	.string "The visitor is walking across\n"
 	.string "the SOLID BOARD.\p"
 	.string "The visitor keeps looking down.\p"
 	.string "The visitor appears to be surprisingly\n"
 	.string "timid and cautious!$"
 
-gTVSecretBaseSecretsText34:: @ 082893FF
+TVSecretBaseSecrets_Text_UsedFence:: @ 082893FF
 	.string "The visitor is looking intently\n"
 	.string "at a FENCE!\p"
 	.string "Has a new idea for a trap popped\n"
 	.string "into the visitor's head?$"
 
-gTVSecretBaseSecretsText35:: @ 08289465
+TVSecretBaseSecrets_Text_UsedGlitterMat:: @ 08289465
 	.string "The visitor stepped on\n"
 	.string "a GLITTER MAT!\p"
 	.string "The visitor is striking a variety\n"
@@ -2315,13 +2315,13 @@ gTVSecretBaseSecretsText35:: @ 08289465
 	.string "The visitor appears to be fantasizing\n"
 	.string "about being an idol!$"
 
-gTVSecretBaseSecretsText36:: @ 082894F2
+TVSecretBaseSecrets_Text_UsedTire:: @ 082894F2
 	.string "The visitor is staring intently\n"
 	.string "at a TIRE!\p"
 	.string "Could the visitor be thinking about\n"
 	.string "the kind of car that would use it?$"
 
-gTVSecretBaseSecretsText37:: @ 08289564
+TVSecretBaseSecrets_Text_UsedStand:: @ 08289564
 	.string "The visitor climbed a STAND!\p"
 	.string "The visitor is looking out across\n"
 	.string "{STR_VAR_1}'s BASE from high up!\p"
@@ -2329,16 +2329,16 @@ gTVSecretBaseSecretsText37:: @ 08289564
 	.string "Lets loose a roar!\n"
 	.string "The visitor is roaring!$"
 
-gTVSecretBaseSecretsText38:: @ 082895EB
+TVSecretBaseSecrets_Text_BrokeDoor:: @ 082895EB
 	.string "The visitor charged headlong into\n"
 	.string "a BREAKABLE DOOR!\p"
 	.string "The visitor is laughing uproariously!$"
 
-gTVSecretBaseSecretsText39:: @ 08289645
+TVSecretBaseSecrets_Text_UsedDoll:: @ 08289645
 	.string "The visitor is talking to a DOLL!\p"
 	.string "…It's a little creepy…$"
 
-gTVSecretBaseSecretsText40:: @ 0828967E
+TVSecretBaseSecrets_Text_UsedSlide:: @ 0828967E
 	.string "The visitor is climbing the ladder\n"
 	.string "on a SLIDE!\p"
 	.string "And…\p"
@@ -2346,7 +2346,7 @@ gTVSecretBaseSecretsText40:: @ 0828967E
 	.string "Looks like the visitor is having\n"
 	.string "a grand old time!$"
 
-gTVSecretBaseSecretsText41:: @ 082896FC
+TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown:: @ 082896FC
 	.string "The visitor is climbing the ladder\n"
 	.string "on a SLIDE!\p"
 	.string "And…\p"
@@ -2354,7 +2354,7 @@ gTVSecretBaseSecretsText41:: @ 082896FC
 	.string "the ladder!\p"
 	.string "Did the visitor suddenly chicken out?$"
 
-gTVSecretBaseSecretsText42:: @ 0828977D
+TVSecretBaseSecrets_Text_UsedJumpMat:: @ 0828977D
 	.string "The visitor stepped on\n"
 	.string "a JUMP MAT!\p"
 	.string "The visitor jumped once!\p"