Sync some specials/drop unnecessary prefixes

2020-03-03 16:18:45 -05:00
parent 1aa1f18972
commit 7af1b35d17
101 changed files with 440 additions and 440 deletions
@@ -526,8 +526,8 @@ sub_807B6BC: @ 807B6BC
 	bx lr
 	thumb_func_end sub_807B6BC
-	thumb_func_start sub_807B6C0
+	thumb_func_start StartDroughtWeatherBlend
-sub_807B6C0: @ 807B6C0
+StartDroughtWeatherBlend: @ 807B6C0
 	push {lr}
 	ldr r0, _0807B6D0 @ =task50_0807B6D4
 	movs r1, 0x50
@@ -536,7 +536,7 @@ sub_807B6C0: @ 807B6C0
 	bx r0
 	.align 2, 0
 _0807B6D0: .4byte task50_0807B6D4
-	thumb_func_end sub_807B6C0
+	thumb_func_end StartDroughtWeatherBlend
 	thumb_func_start task50_0807B6D4
 task50_0807B6D4: @ 807B6D4
@@ -1629,7 +1629,7 @@
 	@ Jumps to dest if the Quest Log is currently showing playback scenes (dest is usually a release/end)
 	.macro goto_if_questlog dest:req
-	special Special_GetQuestLogState
+	special GetQuestLogState
 	compare VAR_RESULT, 2
 	goto_if_eq \dest
 	.endm
@@ -90,7 +90,7 @@
 	special CallTrainerTowerFunc
 	.endm
-	@ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead
+	@ Unused. Displays Trainer Tower results. Handled by ShowBattleRecords instead
 	.macro ttower_showresults
 	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
 	special CallTrainerTowerFunc
@@ -66,8 +66,8 @@ _08054C40: .4byte sWhiteOutMoneyLossMultipliers
 _08054C44: .4byte gSaveBlock1Ptr
 	thumb_func_end ComputeWhiteOutMoneyLoss
-	thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
+	thumb_func_start OverworldWhiteOutGetMoneyLoss
-Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
+OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	push {r4,r5,lr}
 	bl ComputeWhiteOutMoneyLoss
 	adds r4, r0, 0
@@ -85,7 +85,7 @@ Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	bx r0
 	.align 2, 0
 _08054C6C: .4byte gStringVar1
-	thumb_func_end Special_OverworldWhiteOutGetMoneyLoss
+	thumb_func_end OverworldWhiteOutGetMoneyLoss
 	thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
 CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
@@ -1093,7 +1093,7 @@ EventScript_WallTownMap:: @ 81A6C32
 	msgbox Text_ATownMap
 	goto_if_questlog EventScript_ReleaseEnd
 	fadescreen FADE_TO_BLACK
-	special Special_TownMap
+	special ShowTownMap
 	waitstate
 	releaseall
 	end
@@ -1154,7 +1154,7 @@ EventScript_SetEnteringCyclingRoad:: @ 81A77C1
 	.include "data/scripts/route23.inc"
 EventScript_GetElevatorFloor:: @ 81A7AB9
-	special Special_GetElevatorFloor
+	special GetElevatorFloor
 	return
 	.include "data/scripts/aide.inc"
@@ -1198,7 +1198,7 @@ EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD
 	return
 EventScript_ChooseMonForInGameTrade:: @ 81A8CBD
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
@@ -1307,11 +1307,11 @@ EventScript_TryDarkenRuins:: @ 81A925E
 	return
 EventScript_BrailleCursorWaitButton:: @ 81A926C
-	special Special_BrailleCursorToggle
+	special BrailleCursorToggle
 	waitbuttonpress
 	playse SE_SELECT
 	setvar VAR_0x8006, 1
-	special Special_BrailleCursorToggle
+	special BrailleCursorToggle
 	return
 EventScript_NoMoreRoomForPokemon:: @ 81A927C
@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
 	.byte 0
 BirthIsland_Exterior_OnReturnToField:: @ 8165213
-	special Special_SetDeoxysTriangleObjectPal
+	special SetDeoxysTrianglePalette
 	end
 BirthIsland_Exterior_OnTransition:: @ 8165217
@@ -33,7 +33,7 @@ BirthIsland_Exterior_OnResume:: @ 8165253
 	end
 BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 2
@@ -44,7 +44,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
 	faceplayer
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	special DoDeoxysRockInteraction
+	special DoDeoxysTriangleInteraction
 	waitstate
 	switch VAR_RESULT
 	case 0, BirthIsland_Exterior_EventScript_NotSolved1
@@ -86,10 +86,10 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -32,7 +32,7 @@ CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418
 	waitmessage
 	delay 60
 	goto_if_questlog EventScript_ReleaseEnd
-	special Special_ShowDiploma
+	special ShowDiploma
 	waitstate
 	release
 	end
@@ -6,11 +6,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153
 	setvar VAR_0x8004, 3
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F
 	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F
@@ -106,15 +106,15 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6
 	end
 CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return
@@ -259,7 +259,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
 	setfieldeffectarg 2, 14
 	dofieldeffect FLDEFF_SMILEY_FACE_ICON
 	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
-	specialvar VAR_RESULT, Special_GetRandomSlotMachine
+	specialvar VAR_RESULT, GetRandomSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -8,7 +8,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9
 	end
 CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
 	waitbuttonpress
 	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -53,7 +53,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E
 	msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, PARTY_SIZE
@@ -33,7 +33,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B
 FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19
 	copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
-	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
+	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
 	compare VAR_RESULT, TRUE
 	goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
 	goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
@@ -132,7 +132,7 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
 	special GetDaycareMonNicknames
 	msgbox DayCare_Text_YourMonsAreDoingFine
 	special SetDaycareCompatibilityString
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	release
@@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
 	end
 FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
-	special Special_SetIcefallCaveCrackedIceMetatiles
+	special SetIcefallCaveCrackedIceMetatiles
 	end
 FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
@@ -3,7 +3,7 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
 	.byte 0
 FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
-	special Special_ComputeLoreleiDollCollection
+	special UpdateLoreleiDollCollection
 	end
 FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58
@@ -71,7 +71,7 @@ FuchsiaCity_EventScript_GymSign:: @ 8166E07
 FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
 	lockall
 	setvar VAR_0x8004, SPECIES_CHANSEY
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_CHANSEY, 10, 3
 	msgbox FuchsiaCity_Text_ChanseySign
 	erasemonpic
@@ -81,7 +81,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
 FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
 	lockall
 	setvar VAR_0x8004, SPECIES_VOLTORB
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_VOLTORB, 10, 3
 	msgbox FuchsiaCity_Text_VoltorbSign
 	erasemonpic
@@ -91,7 +91,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
 FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
 	lockall
 	setvar VAR_0x8004, SPECIES_KANGASKHAN
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_KANGASKHAN, 10, 3
 	msgbox FuchsiaCity_Text_KangaskhanSign
 	erasemonpic
@@ -101,7 +101,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
 FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
 	lockall
 	setvar VAR_0x8004, SPECIES_SLOWPOKE
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_SLOWPOKE, 10, 3
 	msgbox FuchsiaCity_Text_SlowpokeSign
 	erasemonpic
@@ -111,7 +111,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
 FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
 	lockall
 	setvar VAR_0x8004, SPECIES_LAPRAS
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_LAPRAS, 10, 3
 	msgbox FuchsiaCity_Text_LaprasSign
 	erasemonpic
@@ -122,7 +122,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
 	lockall
 	goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
 	setvar VAR_0x8004, SPECIES_KABUTO
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_KABUTO, 10, 3
 	msgbox FuchsiaCity_Text_KabutoSign
 	erasemonpic
@@ -131,7 +131,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
 FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE
 	setvar VAR_0x8004, SPECIES_OMANYTE
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_OMANYTE, 10, 3
 	msgbox FuchsiaCity_Text_OmanyteSign
 	erasemonpic
@@ -12,23 +12,23 @@ FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895
 FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
 	msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove
-	special Special_IsSelectedMonEgg
+	special IsSelectedMonEgg
 	compare VAR_RESULT, TRUE
 	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg
-	special Special_GetNumMovesSelectedMonHas
+	special GetNumMovesSelectedMonHas
 	compare VAR_RESULT, 1
 	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove
 	msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten
 	fadescreen FADE_TO_BLACK
-	special Special_SelectMove
+	special SelectMoveDeleterMove
 	fadescreen FADE_FROM_BLACK
 	compare VAR_0x8005, MAX_MON_MOVES
 	goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
-	special Special_BufferMoveDeleterNicknameAndMove
+	special BufferMoveDeleterNicknameAndMove
 	msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove
@@ -36,7 +36,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
 	end
 FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
-	special Special_MoveDeleterForgetMove
+	special MoveDeleterForgetMove
 	playfanfare MUS_ME_WASURE
 	waitfanfare
 	msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely
@@ -44,7 +44,7 @@ FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
 	end
 FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A
-	special Special_BufferMoveDeleterNicknameAndMove
+	special BufferMoveDeleterNicknameAndMove
 	msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove
 	release
 	end
@@ -158,7 +158,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462
 	getpartysize
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_ne EventScript_Return
-	specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
+	specialvar VAR_RESULT, IsThereRoomInAnyBoxForMorePokemon
 	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_Return
 	msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull
@@ -81,7 +81,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
 	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
 	removeobject LOCALID_RIVAL
 	removeobject LOCALID_PROF_OAK
-	special Special_Credits @ noreturn
+	special DoCredits
 	waitstate
 	releaseall
 	end
@@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_NameRater:: @ 816B266
 LavenderTown_House2_EventScript_ChooseMon:: @ 816B287
 	msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon
@@ -27,15 +27,15 @@ LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA
 	end
 LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4
-	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
+	specialvar VAR_RESULT, GetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg
-	special Special_GetMonNickname
+	special BufferMonNickname
-	special Special_IsMonOTIDNotPlayers
+	special IsMonOTIDNotPlayers
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
-	specialvar VAR_RESULT, Special_IsMonOTNameNotPlayers
+	specialvar VAR_RESULT, IsMonOTNameNotPlayers
-	special Special_GetMonNickname
+	special BufferMonNickname
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
 	msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO
@@ -59,7 +59,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B
 	msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe
 	call EventScript_ChangePokemonNickname
 	specialvar VAR_RESULT, NameRaterWasNicknameChanged
-	special Special_GetMonNickname
+	special BufferMonNickname
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname
 	msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName
@@ -8,7 +8,7 @@ MtEmber_Summit_OnResume:: @ 8163B07
 	end
 MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -22,7 +22,7 @@ NavelRock_Base_OnResume:: @ 8165116
 	end
 NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 1
@@ -40,14 +40,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
 	setvar VAR_0x8005, 3  @ Horizontal pan
 	setvar VAR_0x8006, 4  @ Num shakes
 	setvar VAR_0x8007, 2  @ Shake delay
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 30
 	playse SE_T_AME_E
 	setvar VAR_0x8004, 0  @ Vertical pan
 	setvar VAR_0x8005, 3  @ Horizontal pan
 	setvar VAR_0x8006, 4  @ Num shakes
 	setvar VAR_0x8007, 2  @ Shake delay
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 30
 	delay 50
 	waitse
@@ -59,10 +59,10 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq NavelRock_Base_EventScript_DefeatedLugia
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -25,7 +25,7 @@ NavelRock_Summit_OnResume:: @ 8164FDD
 	end
 NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 1
@@ -39,7 +39,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	special SpawnCameraObject
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
-	special Special_LoopWingFlapSound
+	special LoopWingFlapSound
 	applymovement 1, Movement_HoOhAppear
 	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
 	waitmovement 0
@@ -53,7 +53,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	delay 60
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
-	special Special_LoopWingFlapSound
+	special LoopWingFlapSound
 	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
 	applymovement 1, Movement_HoOhApproach
 	waitmovement 0
@@ -63,11 +63,11 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	setvar VAR_LAST_TALKED, 1
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -56,7 +56,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8
 	goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
 	msgbox PalletTown_Text_OakLetMeSeePokedex
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	getnumberstring 0, VAR_0x8008
@@ -57,13 +57,13 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
 	compare VAR_RESULT, NO
 	goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming
 	msgbox PalletTown_GarysHouse_Text_GroomWhichOne
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming
-	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
+	specialvar VAR_RESULT, GetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg
 	msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime
@@ -71,9 +71,9 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
 	fadescreen FADE_TO_BLACK
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	special Special_DaisyMassageServices
+	special DaisyMassageServices
 	fadescreen FADE_FROM_BLACK
-	special Special_GetMonNickname
+	special BufferMonNickname
 	msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone
 	release
 	end
@@ -35,7 +35,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
 	setvar VAR_0x8004, 32
 	special Special_SetSomeVariable
 	setvar VAR_0x8004, 1
-	special Special_AnimatePcTurnOn
+	special AnimatePcTurnOn
 	playse SE_PC_ON
 	msgbox Text_PlayerBootedUpPC
 	special BedroomPC
@@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
-	special Special_AnimatePcTurnOff
+	special AnimatePcTurnOff
 	special sub_812B35C
 	releaseall
 	end
@@ -849,7 +849,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0
 PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	getnumberstring 0, VAR_0x8008
@@ -182,9 +182,9 @@ PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512
 	setvar VAR_0x8004, SPECIES_AERODACTYL
 	setvar VAR_0x8005, 10
 	setvar VAR_0x8006, 3
-	special Special_OpenMuseumFossilPic
+	special OpenMuseumFossilPic
 	msgbox PewterCity_Museum_1F_Text_AerodactylFossil
-	special Special_CloseMuseumFossilPic
+	special CloseMuseumFossilPic
 	releaseall
 	end
@@ -193,8 +193,8 @@ PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532
 	setvar VAR_0x8004, SPECIES_KABUTOPS
 	setvar VAR_0x8005, 10
 	setvar VAR_0x8006, 3
-	special Special_OpenMuseumFossilPic
+	special OpenMuseumFossilPic
 	msgbox PewterCity_Museum_1F_Text_KabutopsFossil
-	special Special_CloseMuseumFossilPic
+	special CloseMuseumFossilPic
 	releaseall
 	end
@@ -78,7 +78,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76
 	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
 	waitmovement 0
 	delay 25
-	specialvar VAR_RESULT, ScrSpecial_GetStarter
+	specialvar VAR_RESULT, GetStarterSpecies
 	getspeciesname 0, VAR_RESULT
 	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
 	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
@@ -37,7 +37,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70
 	call EventScript_SetDefeatedEliteFourFlagsVars
 	setrespawn SPAWN_PALLET_TOWN
 	fadescreenspeed FADE_TO_BLACK, 24
-	special Special_HallOfFame
+	special EnterHallOfFame
 	waitstate
 	releaseall
 	end
@@ -7,7 +7,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
 	msgbox PokemonTower_6F_Text_BeGoneIntruders
 	goto_if_questlog EventScript_ReleaseEnd
 	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
-	special ScrSpecial_StartMarowakBattle
+	special StartMarowakBattle
 	waitstate
 	special sub_8112364
 	compare VAR_RESULT, FALSE  @ Set by CB2_EndMarowakBattle
@@ -8,7 +8,7 @@ PowerPlant_OnResume:: @ 816376F
 	end
 PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -48,10 +48,10 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_DefeatedZapdos
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -85,7 +85,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_8112364
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_FoughtElectrode1
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -114,7 +114,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_8112364
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_FoughtElectrode2
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -7,11 +7,11 @@ RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
 	setvar VAR_0x8004, 2
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
 	case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
@@ -73,15 +73,15 @@ RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
 	end
 RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return
@@ -38,7 +38,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_OWNED_MONS
@@ -65,7 +65,7 @@ Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
@@ -30,7 +30,7 @@ Route12_EventScript_Snorlax:: @ 8168014
 	setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq Route12_EventScript_FoughtSnorlax
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -33,12 +33,12 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_MAGIKARP
-	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
+	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty
 	special GetMagikarpSizeRecordInfo
 	msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, PARTY_SIZE
@@ -11,7 +11,7 @@ Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_ARTICUNO
-	special Special_SetSeenMon
+	special SetSeenMon
 	releaseall
 	end
@@ -28,7 +28,7 @@ Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
@@ -26,7 +26,7 @@ Route16_OnWarp:: @ 8168113
 	.2byte 0
 Route16_OnWarpCyclingRoad:: @ 816811D
-	special Special_ForcePlayerOntoBike
+	special ForcePlayerOntoBike
 	end
 Route16_EventScript_Snorlax:: @ 8168121
@@ -48,7 +48,7 @@ Route16_EventScript_Snorlax:: @ 8168121
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq Route16_EventScript_FoughtSnorlax
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -28,7 +28,7 @@ Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
@@ -17,7 +17,7 @@ Route18_OnWarp:: @ 8168211
 	.2byte 0
 Route18_OnWarpCyclingRoad:: @ 816821B
-	special Special_ForcePlayerOntoBike
+	special ForcePlayerOntoBike
 	end
 Route18_EventScript_RouteSign:: @ 816821F
@@ -262,7 +262,7 @@ Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
@@ -271,7 +271,7 @@ Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
@@ -280,7 +280,7 @@ Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
@@ -289,7 +289,7 @@ Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
@@ -12,7 +12,7 @@ Route2_EastBuilding_EventScript_Aide:: @ 816F67F
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route2_EastBuilding_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_SEEN_MONS
@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
 	message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_SNORLAX, 10, 3
 	waitbuttonpress
 	erasemonpic
@@ -20,7 +20,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859
 	call_if_ge SSAnne_Exterior_WalkInPlaceDown
 	fadenewbgm MUS_NAMINORI
 	delay 50
-	special Special_SSAnneDepartureCutscene
+	special DoSSAnneDepartureCutscene
 	waitstate
 	removeobject 1
 	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit
@@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048
 	end
 SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -64,7 +64,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7
 SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
-	special Special_ForcePlayerToStartSurfing
+	special ForcePlayerToStartSurfing
 	end
 SeafoamIslands_B4F_OnFrame:: @ 81630F9
@@ -172,10 +172,10 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -46,14 +46,14 @@ SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
 SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
@@ -111,7 +111,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 8
 	setvar VAR_0x8007, 3
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 60
 	return
@@ -120,13 +120,13 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
 	setvar VAR_0x8007, 3
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 60
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 12
 	setvar VAR_0x8007, 2
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 60
 	playse SE_FU_ZUZUZU
 	waitse
@@ -6,11 +6,11 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F
 	setvar VAR_0x8004, 1
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
@@ -140,15 +140,15 @@ SilphCo_Elevator_EventScript_To11F:: @ 81621BF
 	end
 SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return
@@ -31,7 +31,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 12
 	setvar VAR_0x8007, 3
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 60
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth
@@ -7,12 +7,12 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_HERACROSS
-	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
+	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
 	compare VAR_RESULT, FALSE
 	goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty
 	special GetHeracrossSizeRecordInfo
 	msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, PARTY_SIZE
@@ -30,7 +30,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
 	giveitem ITEM_IAPAPA_BERRY
 	compare VAR_RESULT, FALSE
 	call_if_eq ThreeIsland_BerryForest_EventScript_NoRoomForBerry
-	special Special_BufferBigGuyOrBigGirlString
+	special BufferBigGuyOrBigGirlString
 	msgbox ThreeIsland_BerryForest_Text_LetsGoHome
 	closemessage
 	setflag FLAG_RESCUED_LOSTELLE
@@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819
 ThreeIsland_House1_EventScript_Lostelle:: @ 817181A
 	lock
 	faceplayer
-	special Special_BufferBigGuyOrBigGirlString
+	special BufferBigGuyOrBigGirlString
 	msgbox ThreeIsland_House1_Text_YoureAlwaysSoCool
 	release
 	end
@@ -8,11 +8,11 @@ TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03
 	setvar VAR_0x8004, 6
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof
 	case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby
@@ -43,7 +43,7 @@ TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90
 	goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
 	call TrainerTower_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 3
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	delay 25
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
 	waitmovement 0
@@ -57,15 +57,15 @@ TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD
 	end
 TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return
@@ -212,7 +212,7 @@ TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
 	lockall
 	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8004, 1
-	special Special_BattleRecords
+	special ShowBattleRecords
 	waitstate
 	releaseall
 	end
@@ -51,11 +51,11 @@ TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5
 TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE
 	msgbox TwoIsland_House_Text_TutorWhichMon
-	special Special_SelectMoveTutorMon
+	special SelectMoveTutorMon
 	waitstate
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge TwoIsland_House_EventScript_EndTutorMove
-	special Special_IsSelectedMonEgg
+	special IsSelectedMonEgg
 	compare VAR_RESULT, TRUE
 	goto_if_eq TwoIsland_House_EventScript_CantTutorEgg
 	compare VAR_0x8005, 0
@@ -40,7 +40,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
 	textcolor 0
 	msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
 	textcolor 1
-	special Special_BufferBigGuyOrBigGirlString
+	special BufferBigGuyOrBigGirlString
 	msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
 	closemessage
 	applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown
@@ -45,7 +45,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772
 VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778
 	goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return
-	special Special_SetVermilionTrashCans
+	special SetVermilionTrashCans
 	copyvar VAR_TEMP_0, SWITCH1_ID
 	copyvar VAR_TEMP_1, SWITCH2_ID
 	return
@@ -168,7 +168,7 @@ VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E
 	goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo
 	msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset
 	clearflag FOUND_FIRST_SWITCH
-	special Special_SetVermilionTrashCans
+	special SetVermilionTrashCans
 	copyvar VAR_TEMP_0, SWITCH1_ID
 	copyvar VAR_TEMP_1, SWITCH2_ID
 	call VermilionCity_Gym_EventScript_SetBeamsOn
@@ -147,7 +147,7 @@ ViridianCity_EventScript_TutorialUnused:: @ 8165A65
 	msgbox ViridianCity_Text_ThatWasEducationalTakeThis
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	special ScrSpecial_StartOldManTutorialBattle
+	special StartOldManTutorialBattle
 	waitstate
 	release
 	end
@@ -240,7 +240,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
 	closemessage
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	special ScrSpecial_StartOldManTutorialBattle
+	special StartOldManTutorialBattle
 	waitstate
 	lock
 	faceplayer
@@ -446,7 +446,7 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare VAR_RESULT, 2
 	goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade
-	specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
+	specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry
 	setvar VAR_RESULT, TRUE
@@ -601,7 +601,7 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
 	lockall
 	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8004, 0
-	special Special_BattleRecords
+	special ShowBattleRecords
 	waitstate
 	releaseall
 	end
@@ -760,7 +760,7 @@ TradeCenter_TerminateLink:: @ 81BB9F0
 	textcolor 3
 	messageautoscroll Text_TerminateLinkConfirmation
 	waitmessage
-	special sub_8081770
+	special ExitLinkRoom
 	end
 CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
@@ -775,7 +775,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
-	specialvar VAR_RESULT, Special_BadEggInParty
+	specialvar VAR_RESULT, IsBadEggInParty
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
 	copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -842,7 +842,7 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E
 	specialvar VAR_RESULT, CountPartyNonEggMons
 	compare VAR_RESULT, 2
 	goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom
-	specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
+	specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom
 	setvar VAR_RESULT, TRUE
@@ -885,7 +885,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
-	specialvar VAR_RESULT, Special_BadEggInParty
+	specialvar VAR_RESULT, IsBadEggInParty
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8
 	goto_if_eq CableClub_EventScript_AdapterNotConnected
 	special HelpSystem_Disable
 	fadescreen FADE_TO_BLACK
-	special Special_WirelessCommunicationScreen
+	special ShowWirelessCommunicationScreen
 	waitstate
 	msgbox CableClub_Text_ParticipantsStepUpToCounter
 	special HelpSystem_Enable
@@ -22,7 +22,7 @@ CaveOfOrigin_EventScript_Shake:: @ 81A74B7
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 8
 	setvar VAR_0x8007, 5
-	special Special_ShakeScreen
+	special ShakeScreen
 	waitstate
 	releaseall
 	end
@@ -89,7 +89,7 @@ EventScript_UseRockSmash:: @ 81BE06F
 	applymovement VAR_LAST_TALKED, Movement_BreakRock
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
-	special ScrSpecial_RockSmashWildEncounter
+	special RockSmashWildEncounter
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_RockSmashNoEncounter
 	waitstate
@@ -15,7 +15,7 @@ EventScript_DigUpItemPutInPocket::
 	waitmessage
 	delay 60
 	msgbox Text_PutItemAway
-	special Special_SetHiddenItemFlag
+	special SetHiddenItemFlag
 	releaseall
 	end
@@ -455,7 +455,7 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
 	goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught
 	getfirstpartymonname 0
 	msgbox Text_UltimateMoveThatMon
-	specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
+	specialvar VAR_RESULT, CapeBrinkGetMoveToTeachLeadPokemon
 	compare VAR_RESULT, FALSE
 	goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter
 	copyvar VAR_0x8009, VAR_0x8005
@@ -496,7 +496,7 @@ CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1
 CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB
 	copyvar VAR_0x8005, VAR_0x8009
-	specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
+	specialvar VAR_RESULT, HasLearnedAllMovesFromCapeBrinkTutor
 	compare VAR_RESULT, TRUE
 	goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves
 	msgbox Text_TaughtMove
@@ -45,7 +45,7 @@ EventScript_CancelGiveProfile: @ 81BEE9E
 EventScript_GaveProfile: @ 81BEEA8
 	setvar GAVE_PROFILE, TRUE
 	setvar VAR_0x8004, 0
-	special Special_BufferEasyChatMessage
+	special ShowEasyChatMessage
 	waitmessage
 	delay 80
 	msgbox Text_ProfileSaysSomethingAboutYou
@@ -92,7 +92,7 @@ EventScript_DeclineGiveNewProfile: @ 81BEF35
 EventScript_GaveSpecialProfile: @ 81BEF3F
 	setvar GAVE_PROFILE, TRUE
 	setvar VAR_0x8004, 0
-	special Special_BufferEasyChatMessage
+	special ShowEasyChatMessage
 	waitmessage
 	delay 80
 	msgbox Text_HeardThatBefore
@@ -133,7 +133,7 @@ Std_FindItem:: @ 81A67B3
 EventScript_PickUpItem:: @ 81A67EE
 	removeobject VAR_LAST_TALKED
 	additem VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName
+	specialvar VAR_RESULT, BufferTMHMMoveName
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, TRUE
 	call_if_eq EventScript_FoundTMHM
@@ -187,7 +187,7 @@ EventScript_PickedUpHiddenItem::
 	waitfanfare
 	waitmessage
 	msgbox Text_PutItemAway
-	special Special_SetHiddenItemFlag
+	special SetHiddenItemFlag
 	releaseall
 	end
@@ -215,7 +215,7 @@ EventScript_NoRoomForHiddenItem::
 EventScript_TryPickUpHiddenCoins::
 	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_NoCaseForHiddenCoins
 	checkcoins VAR_RESULT
-	specialvar VAR_RESULT, Special_CheckAddCoins
+	specialvar VAR_RESULT, CheckAddCoins
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_HiddenCoinsButCaseIsFull
 	addcoins VAR_0x8006
@@ -225,7 +225,7 @@ EventScript_TryPickUpHiddenCoins::
 	waitfanfare
 	waitmessage
 	msgbox Text_PutCoinsAwayInCoinCase
-	special Special_SetHiddenItemFlag
+	special SetHiddenItemFlag
 	releaseall
 	end
@@ -5,7 +5,7 @@ EventScript_PC:: @ 81A6955
 	setvar VAR_0x8004, 27
 	special Special_SetSomeVariable
 	setvar VAR_0x8004, 0
-	special Special_AnimatePcTurnOn
+	special AnimatePcTurnOn
 	playse SE_PC_ON
 	msgbox Text_BootedUpPC
 	goto EventScript_PCMainMenu
@@ -66,7 +66,7 @@ EventScript_AccessBillsPC:: @ 81A6A3D
 EventScript_TurnOffPC:: @ 81A6A46
 	setvar VAR_0x8004, 0
 	playse SE_PC_OFF
-	special Special_AnimatePcTurnOff
+	special AnimatePcTurnOff
 	special sub_812B35C
 	releaseall
 	end
@@ -29,7 +29,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
 	return
 EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
-	specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby
+	specialvar VAR_RESULT, IsPlayerNotInTrainerTowerLobby
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
 	specialvar VAR_RESULT, BufferUnionRoomPlayerName
@@ -16,7 +16,7 @@ PokedexRating_EventScript_NormalIntro:: @ 81A73AD
 PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6
 	copyvar VAR_0x8004, VAR_0x8009
-	special Special_GetProfOaksRatingMessage
+	special GetProfOaksRatingMessage
 	waitmessage
 	compare VAR_RESULT, FALSE
 	call_if_eq PokedexRating_EventScript_NormalFanfare
@@ -39,7 +39,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0
 	special HelpSystem_BackupSomeVariable
 	special Special_SetSomeVariable
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	copyvar VAR_0x800A, VAR_RESULT
@@ -51,7 +51,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0
 	compare VAR_0x800A, FALSE
 	goto_if_eq PokedexRating_EventScript_EndRating  @ National Dex not enabled
 	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	getnumberstring 0, VAR_0x8008 @ Num National Seen
@@ -60,5 +60,5 @@ PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3
 	step_end
 PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5
-	special Special_PokemonLeagueLightingEffect
+	special DoPokemonLeagueLightingEffect
 	return
@@ -8,7 +8,7 @@ EventScript_Questionnaire:: @ 81A7702
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
-	specialvar VAR_0x8008, Special_GetMartClerkObjectId
+	specialvar VAR_0x8008, GetMartClerkObjectId
 	textcolor 0
 	compare VAR_0x8004, 0
 	goto_if_eq EventScript_EnableMysteryGift
@@ -138,9 +138,9 @@ VermilionCity_Movement_WalkUp:: @ 81A911C
 EventScript_SeviiDestinationsPage1:: @ 81A911E
    setvar VAR_0x8005, 0
-    special Special_DrawSeagallopDestinationMenu
+    special DrawSeagallopDestinationMenu
    waitstate
-    specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
+    specialvar VAR_0x8006, GetSelectedSeagallopDestination
    switch VAR_0x8006
    case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
    case SEAGALLOP_ONE_ISLAND,     EventScript_SailToOneIsland
@@ -153,9 +153,9 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E
 EventScript_SeviiDestinationsPage2:: @ 81A917F
    setvar VAR_0x8005, 1
-    special Special_DrawSeagallopDestinationMenu
+    special DrawSeagallopDestinationMenu
    waitstate
-    specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
+    specialvar VAR_0x8006, GetSelectedSeagallopDestination
    switch VAR_0x8006
    case SEAGALLOP_FOUR_ISLAND,  EventScript_SailToFourIsland
    case SEAGALLOP_FIVE_ISLAND,  EventScript_SailToFiveIsland
@@ -559,6 +559,6 @@ EventScript_OpenDoor:: @ 81A8B32
    playse SE_KI_GASYAN
    special DrawWholeMapView
    waitse
-    special Special_SetHiddenItemFlag
+    special SetHiddenItemFlag
    releaseall
    end
@@ -63,7 +63,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
 	waitmessage
 	waitbuttonpress
 	goto_if_questlog EventScript_EndQuestLogRematch
-	special BattleSetup_StartRematchBattle
+	special StartRematchBattle
 	waitstate
 	releaseall
 	end
@@ -84,7 +84,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
 	waitmessage
 	waitbuttonpress
 	goto_if_questlog EventScript_EndQuestLogRematch
-	special BattleSetup_StartRematchBattle
+	special StartRematchBattle
 	waitstate
 	releaseall
 	end
@@ -47,7 +47,7 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
 	playse MUS_ME_PHOTO
 	dofieldeffect FLDEFF_UNK_45
 	delay 60
-	special Special_UpdateTrainerCardPhotoIcons
+	special UpdateTrainerCardPhotoIcons
 	msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
 	hidemoneybox 0, 0
 	releaseall
@@ -55,7 +55,7 @@ EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E
 	end
 EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C
-	special Special_OverworldWhiteOutGetMoneyLoss
+	special OverworldWhiteOutGetMoneyLoss
 	msgbox Text_WhitedOutLostMoney
 	goto EventScript_FieldWhiteOutFade
 	end
@@ -64,6 +64,6 @@ EventScript_FieldWhiteOutFade:: @ 81A8E4D
 	special Script_FadeOutMapMusic
 	waitstate
 	fadescreen FADE_TO_BLACK
-	special SetCB2Whiteout
+	special SetCB2WhiteOut
 	waitstate
 	end
@@ -13,8 +13,8 @@ gSpecials:: @ 815FD60
 	def_special DoCableClubWarp
 	def_special ReturnFromLinkRoom
 	def_special CleanupLinkRoomState
-	def_special sub_8081770
+	def_special ExitLinkRoom
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Secret Base specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -42,8 +42,8 @@ gSpecials:: @ 815FD60
 	def_special CloseLink
 	def_special EnterColosseumPlayerSpot
 	def_special EnterTradeSeat
-	def_special Special_WiredCableClubTrade
+	def_special StartWiredCableClubTrade
-	def_special Special_CableClub_AskSaveTheGame
+	def_special CableClub_AskSaveTheGame
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -51,7 +51,7 @@ gSpecials:: @ 815FD60
 	def_special LoadPlayerParty
 	def_special ChooseHalfPartyForBattle
 	def_special Script_ShowLinkTrainerCard
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Berry Tree specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -67,18 +67,18 @@ gSpecials:: @ 815FD60
 	def_special PlayTrainerEncounterMusic
 	def_special ShouldTryRematchBattle
 	def_special IsTrainerReadyForRematch
-	def_special BattleSetup_StartRematchBattle
+	def_special StartRematchBattle
 	def_special ShowPokemonStorageSystem
 	def_special HasEnoughMonsForDoubleBattle
 	def_special NullFieldSpecial  @ Hoenn TV specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special HasLeadMonBeenRenamed
-	def_special Special_HasLeadMonBeenRenamed
+	def_special NullFieldSpecial  @ Contest specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -102,10 +102,10 @@ gSpecials:: @ 815FD60
 	def_special NullFieldSpecial
 	def_special sub_8081128
 	def_special Field_AskSaveTheGame
-	def_special nullsub_56
+	def_special DoWateringBerryTreeAnim
 	def_special ShowEasyChatScreen
-	def_special Special_BufferEasyChatMessage
+	def_special ShowEasyChatMessage
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Mauville Man specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -132,8 +132,8 @@ gSpecials:: @ 815FD60
 	def_special GetMagikarpSizeRecordInfo
 	def_special CompareMagikarpSize
 	def_special NameRaterWasNicknameChanged
-	def_special Special_GetMonNickname
+	def_special BufferMonNickname
-	def_special Special_IsMonOTIDNotPlayers
+	def_special IsMonOTIDNotPlayers
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special BufferRandomHobbyOrLifestyleString
@@ -142,33 +142,33 @@ gSpecials:: @ 815FD60
 	def_special CalculatePlayerPartyCount
 	def_special CountPartyNonEggMons
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	def_special NullFieldSpecial  @ Contest specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial  @ Mauville Gym specials
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special ShowFieldMessageStringVar4
 	def_special NullFieldSpecial
 	def_special Special_ShowStringVar4AsFieldMessage
 	def_special DrawWholeMapView
-	def_special Special_GetPlayerXY
+	def_special GetPlayerXY
 	def_special NullFieldSpecial  @ Mauville/Petalburg Gym specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special GetPlayerTrainerIdOnesDigit
-	def_special Special_GetPlayerTrainerIdOnesDigit
+	def_special BufferBigGuyOrBigGirlString
-	def_special Special_BufferBigGuyOrBigGirlString
+	def_special BufferSonOrDaughterString
-	def_special Special_BufferSonOrDaughterString
+	def_special SetHiddenItemFlag
-	def_special Special_SetHiddenItemFlag
+	def_special NullFieldSpecial  @ Cable Car specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special Overworld_PlaySpecialMapMusic
 	def_special NullFieldSpecial  @ Wall Clock specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special StartOldManTutorialBattle
 	def_special ScrSpecial_StartOldManTutorialBattle
 	def_special ChangePokemonNickname
-	def_special Special_ChooseMonFromParty
+	def_special ChoosePartyMon
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Berry Blender/Roulette specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special Special_IsFanClubMemberFanOfPlayer
@@ -179,7 +179,8 @@ gSpecials:: @ 815FD60
 	def_special Special_SetPlayerGotFirstFans
 	def_special Special_UpdateTrainerFanClubGameClear
 	def_special Special_TryGainNewFanFromCounter
-	def_special ScrSpecial_RockSmashWildEncounter
+	def_special RockSmashWildEncounter
 	def_special NullFieldSpecial  @ Gabby and Ty specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -187,8 +188,7 @@ gSpecials:: @ 815FD60
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special GetBattleOutcome
 	def_special Special_GetBattleOutcome
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
 	def_special RejectEggFromDayCare
@@ -204,38 +204,38 @@ gSpecials:: @ 815FD60
 	def_special ScriptHatchMon
 	def_special EggHatch
 	def_special DaycareMonReceivedMail
-	def_special Special_BattleRecords
+	def_special ShowBattleRecords
 	def_special IsEnoughForCostInVar0x8005
 	def_special SubtractMoneyFromVar0x8005
 	def_special TryFieldPoisonWhiteOut
-	def_special SetCB2Whiteout
+	def_special SetCB2WhiteOut
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Rotating gate puzzle specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial  @ SS Tidal specials
 	def_special NullFieldSpecial
 	def_special EnterSafariMode
 	def_special ExitSafariMode
 	def_special NullFieldSpecial  @ Misc Hoenn specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special GetPokedexCount
 	def_special GetProfOaksRatingMessage
 	def_special AnimatePcTurnOn
 	def_special AnimatePcTurnOff
 	def_special GetElevatorFloor
 	def_special NullFieldSpecial  @ Lottery Corner specials
 	def_special NullFieldSpecial
-	def_special Special_GetPokedexCount
+	def_special SelectMoveTutorMon
-	def_special Special_GetProfOaksRatingMessage
+	def_special SelectMoveDeleterMove
-	def_special Special_AnimatePcTurnOn
+	def_special MoveDeleterForgetMove
-	def_special Special_AnimatePcTurnOff
+	def_special BufferMoveDeleterNicknameAndMove
-	def_special Special_GetElevatorFloor
+	def_special GetNumMovesSelectedMonHas
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special Special_SelectMoveTutorMon
 	def_special Special_SelectMove
 	def_special Special_MoveDeleterForgetMove
 	def_special Special_BufferMoveDeleterNicknameAndMove
 	def_special Special_GetNumMovesSelectedMonHas
 	def_special DisplayMoveTutorMenu
 	def_special NullFieldSpecial  @ Hoenn Cycling Road specials
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special GetPlayerAvatarBike
 	def_special Special_GetPlayerAvatarBike
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special GetLeadMonFriendship
@@ -259,12 +259,12 @@ gSpecials:: @ 815FD60
 	def_special ReducePlayerPartyToThree
 	def_special BedroomPC
 	def_special PlayerPC
-	def_special Special_TownMap
+	def_special ShowTownMap
 	def_special GetInGameTradeSpeciesInfo
 	def_special CreateInGameTradePokemon
 	def_special DoInGameTradeScene
 	def_special GetTradeSpecies
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Misc Hoenn specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -272,20 +272,20 @@ gSpecials:: @ 815FD60
 	def_special NullFieldSpecial
 	def_special ScrSpecial_CreatePCMenu
 	def_special HallOfFamePCBeginFade
-	def_special Special_ShowDiploma
+	def_special ShowDiploma
 	def_special NullFieldSpecial  @ Check lead mon Contest strength specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special NullFieldSpecial
+	def_special LookThroughPorthole
 	def_special nullsub_61
 	def_special DoSoftReset
-	def_special Special_HallOfFame
+	def_special EnterHallOfFame
-	def_special Special_AnimateElevator
+	def_special AnimateElevator
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ ShowGlassWorkshopMenu
 	def_special SpawnCameraObject
 	def_special RemoveCameraObject
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Misc Hoenn specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
@@ -294,49 +294,49 @@ gSpecials:: @ 815FD60
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special BufferEReaderTrainerName
-	def_special Special_GetRandomSlotMachine
+	def_special GetRandomSlotMachineId
 	def_special GetPlayerFacingDirection
-	def_special NullFieldSpecial
+	def_special NullFieldSpecial  @ Abandoned Ship room key specials
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special LeadMonHasEffortRibbon
 	def_special GiveLeadMonEffortRibbon
-	def_special ScrSpecial_AreLeadMonEVsMaxedOut
+	def_special AreLeadMonEVsMaxedOut
 	def_special Script_FacePlayer
 	def_special Script_ClearHeldMovement
 	def_special InitRoamer
 	def_special NullFieldSpecial
-	def_special Special_PlayerHasGrassPokemonInParty
+	def_special PlayerHasGrassPokemonInParty
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special Special_IsStarterFirstStageInParty
+	def_special IsStarterFirstStageInParty
 	def_special NullFieldSpecial
-	def_special Special_IsThereRoomInAnyBoxForMorePokemon
+	def_special IsThereRoomInAnyBoxForMorePokemon
 	def_special NullFieldSpecial
-	def_special Special_DrawElevatorCurrentFloorWindow
+	def_special DrawElevatorCurrentFloorWindow
 	def_special NullFieldSpecial
-	def_special Special_CheckPartyPokerus
+	def_special IsPokerusInParty
-	def_special Special_SetIcefallCaveCrackedIceMetatiles
+	def_special SetIcefallCaveCrackedIceMetatiles
-	def_special Special_ShakeScreen
+	def_special ShakeScreen
-	def_special Special_StartGroudonKyogreBattle
+	def_special StartGroudonKyogreBattle
-	def_special Special_StartLegendaryBattle
+	def_special StartLegendaryBattle
-	def_special Special_StartRegiBattle
+	def_special StartRegiBattle
 	def_special SetUpTrainerMovement
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special sub_807B6C0
+	def_special StartDroughtWeatherBlend
 	def_special DoDiveWarp
 	def_special DoFallWarp
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special SetEReaderTrainerGfxId
-	def_special ScrSpecial_StartSouthernIslandBattle
+	def_special StartSouthernIslandBattle
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
-	def_special Special_GetSpeciesOfPartySlot_x8004
+	def_special GetPartyMonSpecies
-	def_special Special_IsSelectedMonEgg
+	def_special IsSelectedMonEgg
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special LoadPlayerBag
@@ -344,51 +344,51 @@ gSpecials:: @ 815FD60
 	def_special NullFieldSpecial
 	def_special NullFieldSpecial
 	def_special HasAllKantoMons
-	def_special Special_IsMonOTNameNotPlayers
+	def_special IsMonOTNameNotPlayers
 	def_special NullFieldSpecial
 	def_special Dummy_TryEnableBravoTrainerBattleTower
-	def_special GetNameOfEnigmaBerryInPlayerParty
+	def_special DoesPartyHaveEnigmaBerry
 	def_special NullFieldSpecial
 	def_special sub_810B82C
-	def_special ScrSpecial_StartMarowakBattle
+	def_special StartMarowakBattle
-	def_special Special_ForcePlayerOntoBike
+	def_special ForcePlayerOntoBike
 	def_special Special_ListMenu
 	def_special Special_ReturnToListMenu
 	def_special sub_80CADC4
-	def_special Special_SetVermilionTrashCans
+	def_special SetVermilionTrashCans
 	def_special sub_805D1A8
 	def_special SampleResortGorgeousMonAndReward
-	def_special Special_CheckAddCoins
+	def_special CheckAddCoins
 	def_special GetDaycarePokemonCount
-	def_special Special_CloseElevatorCurrentFloorWindow
+	def_special CloseElevatorCurrentFloorWindow
-	def_special Special_ForcePlayerToStartSurfing
+	def_special ForcePlayerToStartSurfing
-	def_special ScrSpecial_GetStarter
+	def_special GetStarterSpecies
-	def_special Special_SetSeenMon
+	def_special SetSeenMon
 	def_special sub_810C444
 	def_special ShouldShowBoxWasFullMessage
 	def_special ChangeBoxPokemonNickname
-	def_special Special_UpdateTrainerCardPhotoIcons
+	def_special UpdateTrainerCardPhotoIcons
 	def_special StickerManGetBragFlags
 	def_special SetUsedPkmnCenterQuestLogEvent
 	def_special IsWirelessAdapterConnected
 	def_special TryBecomeLinkLeader
 	def_special TryJoinLinkGroup
 	def_special UnionRoomSpecial
-	def_special Special_WirelessCommunicationScreen
+	def_special ShowWirelessCommunicationScreen
 	def_special EnableNationalPokedex
 	def_special sub_80699E0
 	def_special sub_80699BC
 	def_special sub_810C3A4
 	def_special SetFlavorTextFlagFromSpecialVars
 	def_special UpdatePickStateFromSpecialVar8005
-	def_special Special_OverworldWhiteOutGetMoneyLoss
+	def_special OverworldWhiteOutGetMoneyLoss
 	def_special PutMonInRoute5Daycare
 	def_special GetCostToWithdrawRoute5DaycareMon
 	def_special IsThereMonInRoute5Daycare
 	def_special GetNumLevelsGainedForRoute5DaycareMon
 	def_special TakePokemonFromRoute5Daycare
 	def_special DoSeagallopFerryScene
-	def_special Special_PlayerPartyContainsSpecies
+	def_special DoesPlayerPartyContainSpecies
 	def_special Special_SetSomeVariable
 	def_special HelpSystem_BackupSomeVariable
 	def_special HelpSystem_RestoreSomeVariable
@@ -397,25 +397,25 @@ gSpecials:: @ 815FD60
 	def_special InitUnionRoom
 	def_special BufferUnionRoomPlayerName
 	def_special sub_811390C
-	def_special Special_GetMartClerkObjectId
+	def_special GetMartClerkObjectId
 	def_special Special_BattleCardAction
-	def_special Special_GetQuestLogState
+	def_special GetQuestLogState
 	def_special sub_8112364
 	def_special Special_GetMENewsJisanItemAndState
 	def_special GetPCBoxToSendMon
-	def_special Special_OpenMuseumFossilPic
+	def_special OpenMuseumFossilPic
-	def_special Special_CloseMuseumFossilPic
+	def_special CloseMuseumFossilPic
 	def_special ChooseMonForMoveTutor
 	def_special ChooseMonForWirelessMinigame
 	def_special SetBattledTrainerFlag
 	def_special sub_812B35C
-	def_special Special_SSAnneDepartureCutscene
+	def_special DoSSAnneDepartureCutscene
 	def_special IsPokemonJumpSpeciesInParty
 	def_special IsNationalPokedexEnabled
 	def_special CallTrainerTowerFunc
 	def_special ShowPokemonJumpRecords
-	def_special Special_ItemIsTM_GetMoveName
+	def_special BufferTMHMMoveName
-	def_special Special_DaisyMassageServices
+	def_special DaisyMassageServices
 	def_special HelpSystem_Disable
 	def_special HelpSystem_Enable
 	def_special sub_810B82C
@@ -425,31 +425,31 @@ gSpecials:: @ 815FD60
 	def_special Special_HasEnoughBerryPowder
 	def_special Special_TakeBerryPowder
 	def_special PrintPlayerBerryPowderAmount
-	def_special Special_PokemonLeagueLightingEffect
+	def_special DoPokemonLeagueLightingEffect
 	def_special ShowBerryCrushRankings
-	def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
+	def_special CapeBrinkGetMoveToTeachLeadPokemon
-	def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
+	def_special HasLearnedAllMovesFromCapeBrinkTutor
-	def_special Special_Credits
+	def_special DoCredits
 	def_special ShowDodrioBerryPickingRecords
-	def_special Special_DrawSeagallopDestinationMenu
+	def_special DrawSeagallopDestinationMenu
-	def_special Special_GetSelectedSeagallopDestination
+	def_special GetSelectedSeagallopDestination
 	def_special GetSeagallopNumber
 	def_special GetPlayerFacingDirection
-	def_special DoDeoxysRockInteraction
+	def_special DoDeoxysTriangleInteraction
-	def_special Special_SetDeoxysTriangleObjectPal
+	def_special SetDeoxysTrianglePalette
 	def_special IsPlayerLeftOfVermilionSailor
-	def_special Special_BadEggInParty
+	def_special IsBadEggInParty
 	def_special ReadTrainerTowerAndValidate
 	def_special HasAllMons
-	def_special Special_PlayerIsNotInTrainerTowerLobby
+	def_special IsPlayerNotInTrainerTowerLobby
-	def_special Special_BrailleCursorToggle
+	def_special BrailleCursorToggle
 	def_special Script_ResetUnionRoomTrade
 	def_special PlayerPartyContainsSpeciesWithPlayerID
 	def_special AnimateTeleporterHousing
 	def_special IsDodrioInParty
 	def_special AnimateTeleporterCable
-	def_special Special_InitElevatorFloorSelectMenuPos
+	def_special InitElevatorFloorSelectMenuPos
-	def_special Special_ComputeLoreleiDollCollection
+	def_special UpdateLoreleiDollCollection
-	def_special Special_LoopWingFlapSound
+	def_special LoopWingFlapSound
 	def_special CreateObedientEnemyMon
 gSpecialsEnd::
@@ -3,15 +3,15 @@
 #include "global.h"
-void BattleSetup_StartWildBattle(void);
+void StartWildBattle(void);
-void BattleSetup_StartRoamerBattle(void);
+void StartRoamerBattle(void);
-void ScrSpecial_StartOldManTutorialBattle(void);
+void StartOldManTutorialBattle(void);
-void BattleSetup_StartScriptedWildBattle(void);
+void StartScriptedWildBattle(void);
-void ScrSpecial_StartMarowakBattle(void);
+void StartMarowakBattle(void);
-void ScrSpecial_StartSouthernIslandBattle(void);
+void StartSouthernIslandBattle(void);
-void Special_StartLegendaryBattle(void);
+void StartLegendaryBattle(void);
-void Special_StartGroudonKyogreBattle(void);
+void StartGroudonKyogreBattle(void);
-void Special_StartRegiBattle(void);
+void StartRegiBattle(void);
 u8 BattleSetup_GetTerrainId(void);
 u8 BattleSetup_GetBattleTowerBattleTransition(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
@@ -24,8 +24,8 @@ void SetBattledTrainerFlag(void);
 bool8 HasTrainerBeenFought(u16 trainerId);
 void SetTrainerFlag(u16 trainerId);
 void ClearTrainerFlag(u16 trainerId);
-void BattleSetup_StartTrainerBattle(void);
+void StartTrainerBattle(void);
-void BattleSetup_StartRematchBattle(void);
+void StartRematchBattle(void);
 void ShowTrainerIntroSpeech(void);
 const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 const u8 *BattleSetup_GetTrainerPostBattleScript(void);
@@ -14,7 +14,7 @@ enum HiddenItemAttr
 u8 GetLeadMonIndex(void);
 s32 CountDigits(s32 number);
 void TV_PrintIntToStringVar(u8, int);
-u16 ScrSpecial_GetStarter(void);
+u16 GetStarterSpecies(void);
 void StopPokemonLeagueLightingEffectTask(void);
 void nullsub_60(void);
 void nullsub_61(void);
@@ -35,7 +35,6 @@ extern const struct WildPokemonHeader gWildMonHeaders[];
 void DisableWildEncounters(bool8 disabled);
 bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior);
 void ScrSpecial_RockSmashWildEncounter(void);
 bool8 SweetScentWildEncounter(void);
 bool8 DoesCurrentMapHaveFishingMons(void);
 void FishingWildEncounter(u8 rod);
@@ -88,7 +88,7 @@ static u8 *const sStringVars[3] = {
    gStringVar3
 };
-void Special_BattleRecords(void)
+void ShowBattleRecords(void)
 {
    SetVBlankCallback(NULL);
    SetMainCallback2(MainCB2_SetUp);
@@ -221,7 +221,7 @@ static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum)
        return FALSE;
 }
-void BattleSetup_StartWildBattle(void)
+void StartWildBattle(void)
 {
    if (GetSafariZoneFlag())
        DoSafariBattle();
@@ -243,7 +243,7 @@ static void DoStandardWildBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void BattleSetup_StartRoamerBattle(void)
+void StartRoamerBattle(void)
 {
    ScriptContext2_Enable();
    FreezeObjectEvents();
@@ -285,7 +285,7 @@ static void DoTrainerBattle(void)
    IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
 }
-void ScrSpecial_StartOldManTutorialBattle(void)
+void StartOldManTutorialBattle(void)
 {
    CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5);
    ScriptContext2_Enable();
@@ -294,7 +294,7 @@ void ScrSpecial_StartOldManTutorialBattle(void)
    CreateBattleStartTask(B_TRANSITION_SLICED_SCREEN, 0);
 }
-void BattleSetup_StartScriptedWildBattle(void)
+void StartScriptedWildBattle(void)
 {
    ScriptContext2_Enable();
    gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -304,7 +304,7 @@ void BattleSetup_StartScriptedWildBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void ScrSpecial_StartMarowakBattle(void)
+void StartMarowakBattle(void)
 {
    ScriptContext2_Enable();
    gMain.savedCallback = CB2_EndMarowakBattle;
@@ -323,7 +323,7 @@ void ScrSpecial_StartMarowakBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void ScrSpecial_StartSouthernIslandBattle(void)
+void StartSouthernIslandBattle(void)
 {
    ScriptContext2_Enable();
    gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -333,7 +333,7 @@ void ScrSpecial_StartSouthernIslandBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void Special_StartLegendaryBattle(void)
+void StartLegendaryBattle(void)
 {
    u16 species;
@@ -364,7 +364,7 @@ void Special_StartLegendaryBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void Special_StartGroudonKyogreBattle(void)
+void StartGroudonKyogreBattle(void)
 {
    ScriptContext2_Enable();
    gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -377,7 +377,7 @@ void Special_StartGroudonKyogreBattle(void)
    IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
-void Special_StartRegiBattle(void)
+void StartRegiBattle(void)
 {
    ScriptContext2_Enable();
    gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -879,7 +879,7 @@ void ClearTrainerFlag(u16 trainerId)
    FlagClear(FLAG_TRAINER_FLAG_START + trainerId);
 }
-void BattleSetup_StartTrainerBattle(void)
+void StartTrainerBattle(void)
 {
    gBattleTypeFlags = BATTLE_TYPE_TRAINER;
    if (GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL && GetRivalBattleFlags() & RIVAL_BATTLE_TUTORIAL)
@@ -956,7 +956,7 @@ static void CB2_EndRematchBattle(void)
    }
 }
-void BattleSetup_StartRematchBattle(void)
+void StartRematchBattle(void)
 {
    gBattleTypeFlags = BATTLE_TYPE_TRAINER;
    gMain.savedCallback = CB2_EndRematchBattle;
@@ -573,7 +573,7 @@ static void Task_ReestablishLinkInCableClubRoom_2(u8 taskId)
    }
 }
-void Special_CableClub_AskSaveTheGame(void)
+void CableClub_AskSaveTheGame(void)
 {
    Field_AskSaveTheGame();
 }
@@ -765,7 +765,7 @@ void CleanupLinkRoomState(void)
    copy_saved_warp2_bank_and_enter_x_to_warp1(127);
 }
-void sub_8081770(void)
+void ExitLinkRoom(void)
 {
    sub_8057F5C();
 }
@@ -896,7 +896,7 @@ static void CreateTask_StartWiredCableClubTrade(void)
    CreateTask(Task_StartWiredCableClubTrade, 80);
 }
-void Special_WiredCableClubTrade(void)
+void StartWiredCableClubTrade(void)
 {
    CreateTask_StartWiredCableClubTrade();
    ScriptContext1_Stop();
@@ -714,7 +714,7 @@ static const struct CreditsTextHeader sCreditsTexts[] = {
    { gString_Dummy, gString_Dummy, FALSE }
 };
-void Special_Credits(void)
+void DoCredits(void)
 {
    sCreditsMgr = AllocZeroed(sizeof(*sCreditsMgr));
    ResetTasks();
@@ -276,7 +276,7 @@ static u16 GetRandomWordFromAnyGroup(u16 groupId)
    return GetRandomWordFromGroup(groupId);
 }
-void Special_BufferEasyChatMessage(void)
+void ShowEasyChatMessage(void)
 {
    u16 *easyChatWords;
    int columns, rows;
@@ -21,6 +21,7 @@ void nullsub_60(void)
 {
 }
-void nullsub_61(void)
+// From Hoenn's SS Tidal
 void LookThroughPorthole(void)
 {
 }
@@ -76,12 +76,12 @@ static void Task_SuspendListMenu(u8 taskId);
 static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId);
 static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId);
 static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId);
-static u16 GetStarterPokemon(u16 starterIdx);
+static u16 GetStarterSpeciesById(u16 starterIdx);
 static void ChangeBoxPokemonNickname_CB(void);
 static void ChangePokemonNickname_CB(void);
 static void Task_RunPokemonLeagueLightingEffect(u8 taskId);
 static void Task_CancelPokemonLeagueLightingEffect(u8 taskId);
-static void Task_DoDeoxysRockInteraction(u8 taskId);
+static void Task_DoDeoxysTriangleInteraction(u8 taskId);
 static void MoveDeoxysObject(u8 num);
 static void Task_WaitDeoxysFieldEffect(u8 taskId);
 static void Task_WingFlapSound(u8 taskId);
@@ -92,14 +92,14 @@ static u8 *const sStringVarPtrs[] = {
    gStringVar3
 };
-void Special_ShowDiploma(void)
+void ShowDiploma(void)
 {
    sub_8112364();
    SetMainCallback2(CB2_ShowDiploma);
    ScriptContext2_Enable();
 }
-void Special_ForcePlayerOntoBike(void)
+void ForcePlayerOntoBike(void)
 {
    if (gPlayerAvatar.flags & 1)
        SetPlayerAvatarTransitionFlags(2);
@@ -112,7 +112,7 @@ void nullsub_74(void)
 }
-u8 Special_GetPlayerAvatarBike(void)
+u8 GetPlayerAvatarBike(void)
 {
    if (TestPlayerAvatarFlags(4))
        return 1;
@@ -122,24 +122,24 @@ u8 Special_GetPlayerAvatarBike(void)
        return 0;
 }
-void Special_ShowStringVar4AsFieldMessage(void)
+void ShowFieldMessageStringVar4(void)
 {
    ShowFieldMessage(gStringVar4);
 }
-void Special_GetPlayerXY(void)
+void GetPlayerXY(void)
 {
    gSpecialVar_0x8004 = gSaveBlock1Ptr->pos.x;
    gSpecialVar_0x8005 = gSaveBlock1Ptr->pos.y;
 }
-u8 Special_GetPlayerTrainerIdOnesDigit(void)
+u8 GetPlayerTrainerIdOnesDigit(void)
 {
    u16 playerId = (gSaveBlock2Ptr->playerTrainerId[1] << 8) | gSaveBlock2Ptr->playerTrainerId[0];
    return playerId % 10;
 }
-void Special_BufferBigGuyOrBigGirlString(void)
+void BufferBigGuyOrBigGirlString(void)
 {
    if (gSaveBlock2Ptr->playerGender == MALE)
        StringCopy(gStringVar1, gText_BigGuy);
@@ -147,7 +147,7 @@ void Special_BufferBigGuyOrBigGirlString(void)
        StringCopy(gStringVar1, gText_BigGirl);
 }
-void Special_BufferSonOrDaughterString(void)
+void BufferSonOrDaughterString(void)
 {
    if (gSaveBlock2Ptr->playerGender == MALE)
        StringCopy(gStringVar1, gText_Son);
@@ -155,12 +155,12 @@ void Special_BufferSonOrDaughterString(void)
        StringCopy(gStringVar1, gText_Daughter);
 }
-u8 Special_GetBattleOutcome(void)
+u8 GetBattleOutcome(void)
 {
    return gBattleOutcome;
 }
-void Special_SetHiddenItemFlag(void)
+void SetHiddenItemFlag(void)
 {
    FlagSet(gSpecialVar_0x8004);
 }
@@ -184,13 +184,13 @@ u8 GetLeadMonFriendship(void)
        return 0;
 }
-void Special_TownMap(void)
+void ShowTownMap(void)
 {
    sub_8112364();
    sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
-bool8 Special_PlayerHasGrassPokemonInParty(void)
+bool8 PlayerHasGrassPokemonInParty(void)
 {
    u8 i;
    struct Pokemon * pokemon;
@@ -211,7 +211,7 @@ bool8 Special_PlayerHasGrassPokemonInParty(void)
    return FALSE;
 }
-void Special_AnimatePcTurnOn(void)
+void AnimatePcTurnOn(void)
 {
    u8 taskId;
@@ -281,7 +281,7 @@ static void PcTurnOnUpdateMetatileId(bool16 a0)
    MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
 }
-void Special_AnimatePcTurnOff()
+void AnimatePcTurnOff()
 {
    u16 metatileId = 0;
    s8 deltaX = 0;
@@ -381,7 +381,7 @@ static const u8 sSlotMachineIndices[] = {
    5
 };
-u8 Special_GetRandomSlotMachine(void)
+u8 GetRandomSlotMachineId(void)
 {
    u16 rval = Random() % NELEMS(sSlotMachineIndices);
    return sSlotMachineIndices[rval];
@@ -404,7 +404,7 @@ void GiveLeadMonEffortRibbon(void)
    SetMonData(&gPlayerParty[leadMonIdx], MON_DATA_EFFORT_RIBBON, &param);
 }
-bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
+bool8 AreLeadMonEVsMaxedOut(void)
 {
    u8 leadMonIndex = GetLeadMonIndex();
    if (GetMonEVCount(&gPlayerParty[leadMonIndex]) >= 510)
@@ -413,9 +413,9 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
        return FALSE;
 }
-bool8 Special_IsStarterFirstStageInParty(void)
+bool8 IsStarterFirstStageInParty(void)
 {
-    u16 species = GetStarterPokemon(VarGet(VAR_STARTER_MON));
+    u16 species = GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
    u8 partyCount = CalculatePlayerPartyCount();
    u8 i;
    for (i = 0; i < partyCount; i++)
@@ -426,7 +426,7 @@ bool8 Special_IsStarterFirstStageInParty(void)
    return FALSE;
 }
-bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
+bool8 IsThereRoomInAnyBoxForMorePokemon(void)
 {
    u16 i;
    u16 j;
@@ -441,7 +441,7 @@ bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
    return FALSE;
 }
-bool8 Special_CheckPartyPokerus(void)
+bool8 IsPokerusInParty(void)
 {
    if (!CheckPartyPokerus(gPlayerParty, 0x3F))
        return FALSE;
@@ -455,7 +455,7 @@ bool8 Special_CheckPartyPokerus(void)
 #define tDuration data[3]
 #define tYtrans   data[4]
-void Special_ShakeScreen(void)
+void ShakeScreen(void)
 {
    /*
     * 0x8004 = x translation
@@ -518,12 +518,12 @@ u8 GetLeadMonIndex(void)
    return 0;
 }
-u16 Special_GetSpeciesOfPartySlot_x8004(void)
+u16 GetPartyMonSpecies(void)
 {
    return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL);
 }
-bool8 Special_IsMonOTNameNotPlayers(void)
+bool8 IsMonOTNameNotPlayers(void)
 {
    GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
@@ -546,7 +546,7 @@ void sub_80CADC4(void)
    sub_809D424();
 }
-void Special_SetVermilionTrashCans(void)
+void SetVermilionTrashCans(void)
 {
    u16 idx = (Random() % 15) + 1;
    gSpecialVar_0x8004 = idx;
@@ -713,7 +713,7 @@ static u16 SampleResortGorgeousReward(void)
        return sResortGorgeousDeluxeRewards[Random() % NELEMS(sResortGorgeousDeluxeRewards)];
 }
-bool8 Special_CheckAddCoins(void)
+bool8 CheckAddCoins(void)
 {
    if (gSpecialVar_Result + gSpecialVar_0x8006 > 9999)
        return FALSE;
@@ -805,7 +805,7 @@ static const u8 sElevatorWindowAnimDuration[] = {
    27
 };
-void Special_GetElevatorFloor(void)
+void GetElevatorFloor(void)
 {
    u16 floor = 4;
    if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F))
@@ -900,7 +900,7 @@ void Special_GetElevatorFloor(void)
    VarSet(VAR_ELEVATOR_FLOOR, floor);
 }
-u16 Special_InitElevatorFloorSelectMenuPos(void)
+u16 InitElevatorFloorSelectMenuPos(void)
 {
    sElevatorScroll = 0;
    sElevatorCursorPos = 0;
@@ -1018,7 +1018,7 @@ u16 Special_InitElevatorFloorSelectMenuPos(void)
    return sElevatorCursorPos;
 }
-void Special_AnimateElevator(void)
+void AnimateElevator(void)
 {
    u16 nfloors;
    s16 *data = gTasks[CreateTask(Task_ElevatorShake, 9)].data;
@@ -1063,7 +1063,7 @@ static void Task_ElevatorShake(u8 taskId)
    }
 }
-void Special_DrawElevatorCurrentFloorWindow(void)
+void DrawElevatorCurrentFloorWindow(void)
 {
    const u8 *floorname;
    u32 strwidth;
@@ -1081,7 +1081,7 @@ void Special_DrawElevatorCurrentFloorWindow(void)
    }
 }
-void Special_CloseElevatorCurrentFloorWindow(void)
+void CloseElevatorCurrentFloorWindow(void)
 {
    ClearStdWindowAndFrameToTransparent(sElevatorCurrentFloorWindowId, TRUE);
    RemoveWindow(sElevatorCurrentFloorWindowId);
@@ -1484,31 +1484,31 @@ static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId)
        RemoveScrollIndicatorArrowPair(task->data[12]);
 }
-void Special_ForcePlayerToStartSurfing(void)
+void ForcePlayerToStartSurfing(void)
 {
    HelpSystem_SetSomeVariable2(22);
    SetPlayerAvatarTransitionFlags(8);
 }
-static const u16 sStarterMon[] = {
+static const u16 sStarterSpecies[] = {
    SPECIES_BULBASAUR,
    SPECIES_SQUIRTLE,
    SPECIES_CHARMANDER
 };
-static u16 GetStarterPokemon(u16 idx)
+static u16 GetStarterSpeciesById(u16 idx)
 {
-    if (idx >= NELEMS(sStarterMon))
+    if (idx >= NELEMS(sStarterSpecies))
        idx = 0;
-    return sStarterMon[idx];
+    return sStarterSpecies[idx];
 }
-u16 ScrSpecial_GetStarter(void)
+u16 GetStarterSpecies(void)
 {
-    return GetStarterPokemon(VarGet(VAR_STARTER_MON));
+    return GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
 }
-void Special_SetSeenMon(void)
+void SetSeenMon(void)
 {
    GetSetPokedexFlag(SpeciesToNationalPokedexNum(gSpecialVar_0x8004), 2);
 }
@@ -1549,7 +1549,7 @@ static bool8 HasMonBeenRenamed(u8 idx)
        return FALSE;
 }
-bool8 Special_HasLeadMonBeenRenamed(void)
+bool8 HasLeadMonBeenRenamed(void)
 {
    return HasMonBeenRenamed(GetLeadMonIndex());
 }
@@ -1634,13 +1634,13 @@ static void ChangePokemonNickname_CB(void)
    CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }
-void Special_GetMonNickname(void)
+void BufferMonNickname(void)
 {
    GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
    StringGetEnd10(gStringVar1);
 }
-void Special_IsMonOTIDNotPlayers(void)
+void IsMonOTIDNotPlayers(void)
 {
    if (GetPlayerTrainerId() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
        gSpecialVar_Result = FALSE;
@@ -1673,7 +1673,7 @@ u8 GetUnlockedSeviiAreas(void)
    return result;
 }
-void Special_UpdateTrainerCardPhotoIcons(void)
+void UpdateTrainerCardPhotoIcons(void)
 {
    u16 species[PARTY_SIZE];
    u32 personality[PARTY_SIZE];
@@ -1730,7 +1730,7 @@ u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr)
        return 1;
 }
-bool8 Special_PlayerPartyContainsSpecies(void)
+bool8 DoesPlayerPartyContainSpecies(void)
 {
    u8 partyCount = CalculatePlayerPartyCount();
    u8 i;
@@ -1757,7 +1757,7 @@ static const u8 sMartMaps[][3] = {
    {MAP_GROUP(SIX_ISLAND_MART),      MAP_NUM(SIX_ISLAND_MART),      1}
 };
-u8 Special_GetMartClerkObjectId(void)
+u8 GetMartClerkObjectId(void)
 {
    u8 i;
    for (i = 0; i < NELEMS(sMartMaps); i++)
@@ -2017,7 +2017,7 @@ bool8 sub_80CC87C(void)
    return FALSE;
 }
-bool8 Special_ItemIsTM_GetMoveName(void)
+bool8 BufferTMHMMoveName(void)
 {
    // 8004 = item ID
    if (gSpecialVar_0x8004 >= ITEM_TM01 && gSpecialVar_0x8004 <= ITEM_HM08)
@@ -2036,7 +2036,7 @@ void RunMassageCooldownStepCounter(void)
        VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, count + 1);
 }
-void Special_DaisyMassageServices(void)
+void DaisyMassageServices(void)
 {
    AdjustFriendship(&gPlayerParty[gSpecialVar_0x8004], 6);
    VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 0);
@@ -2094,7 +2094,7 @@ static const u8 sChampionRoomLightingTimers[] = {
     8
 };
-void Special_PokemonLeagueLightingEffect(void)
+void DoPokemonLeagueLightingEffect(void)
 {
    u8 taskId = CreateTask(Task_RunPokemonLeagueLightingEffect, 8);
    s16 *data = gTasks[taskId].data;
@@ -2184,36 +2184,36 @@ static const u8 sCapeBrinkCompatibleSpecies[] = {
    SPECIES_BLASTOISE
 };
-bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
+bool8 CapeBrinkGetMoveToTeachLeadPokemon(void)
 {
    // Returns:
    //   8005 = Move tutor index
    //   8006 = Num moves known by lead mon
    //   8007 = Index of lead mon
    //   to specialvar = whether a move can be taught in the first place
-    u8 r7 = 0;
+    u8 tutorMonId = 0;
-    u8 r6 = 0;
+    u8 numMovesKnown = 0;
-    u8 r8 = GetLeadMonIndex();
+    u8 leadMonSlot = GetLeadMonIndex();
-    u8 r4;
+    u8 i;
-    gSpecialVar_0x8007 = r8;
+    gSpecialVar_0x8007 = leadMonSlot;
-    for (r4 = 0; r4 < NELEMS(sCapeBrinkCompatibleSpecies); r4++)
+    for (i = 0; i < NELEMS(sCapeBrinkCompatibleSpecies); i++)
    {
-        if (GetMonData(&gPlayerParty[r8], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[r4])
+        if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[i])
        {
-            r7 = r4;
+            tutorMonId = i;
            break;
        }
    }
-    if (r4 == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[r8], MON_DATA_FRIENDSHIP) != 255)
+    if (i == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_FRIENDSHIP) != 255)
        return FALSE;
-    if (r7 == 0)
+    if (tutorMonId == 0)
    {
        StringCopy(gStringVar2, gMoveNames[MOVE_FRENZY_PLANT]);
        gSpecialVar_0x8005 = MOVETUTOR_FRENZY_PLANT;
        if (FlagGet(FLAG_TUTOR_FRENZY_PLANT) == TRUE)
            return FALSE;
    }
-    else if (r7 == 1)
+    else if (tutorMonId == 1)
    {
        StringCopy(gStringVar2, gMoveNames[MOVE_BLAST_BURN]);
        gSpecialVar_0x8005 = MOVETUTOR_BLAST_BURN;
@@ -2227,21 +2227,21 @@ bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
        if (FlagGet(FLAG_TUTOR_HYDRO_CANNON) == TRUE)
            return FALSE;
    }
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE1) != MOVE_NONE)
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE1) != MOVE_NONE)
-        r6++;
+        numMovesKnown++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE2) != MOVE_NONE)
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE2) != MOVE_NONE)
-        r6++;
+        numMovesKnown++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE3) != MOVE_NONE)
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE3) != MOVE_NONE)
-        r6++;
+        numMovesKnown++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE4) != MOVE_NONE)
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE4) != MOVE_NONE)
-        r6++;
+        numMovesKnown++;
-    gSpecialVar_0x8006 = r6;
+    gSpecialVar_0x8006 = numMovesKnown;
    return TRUE;
 }
-bool8 Special_HasLearnedAllMovesFromCapeBrinkTutor(void)
+bool8 HasLearnedAllMovesFromCapeBrinkTutor(void)
 {
-    // 8005 is set by Special_CapeBrinkGetMoveToTeachLeadPokemon
+    // 8005 is set by CapeBrinkGetMoveToTeachLeadPokemon
    u8 r4 = 0;
    if (gSpecialVar_0x8005 == MOVETUTOR_FRENZY_PLANT)
        FlagSet(FLAG_TUTOR_FRENZY_PLANT);
@@ -2325,12 +2325,12 @@ static const u8 sDeoxysStepCaps[] = {
    3
 };
-void DoDeoxysRockInteraction(void)
+void DoDeoxysTriangleInteraction(void)
 {
-    CreateTask(Task_DoDeoxysRockInteraction, 8);
+    CreateTask(Task_DoDeoxysTriangleInteraction, 8);
 }
-static void Task_DoDeoxysRockInteraction(u8 taskId)
+static void Task_DoDeoxysTriangleInteraction(u8 taskId)
 {
    u16 r5;
    u16 r6;
@@ -2416,14 +2416,14 @@ void BirthIslandDeoxysStepCounter(void)
    }
 }
-void Special_SetDeoxysTriangleObjectPal(void)
+void SetDeoxysTrianglePalette(void)
 {
    u8 num = VarGet(VAR_DEOXYS_INTERACTION_NUM);
    LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08);
    sub_8083598(10);
 }
-bool8 Special_BadEggInParty(void)
+bool8 IsBadEggInParty(void)
 {
    u8 partyCount = CalculatePlayerPartyCount();
    u8 i;
@@ -2435,7 +2435,7 @@ bool8 Special_BadEggInParty(void)
    return FALSE;
 }
-bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
+bool8 IsPlayerNotInTrainerTowerLobby(void)
 {
    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY))
        return FALSE;
@@ -2443,7 +2443,7 @@ bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
        return TRUE;
 }
-void Special_BrailleCursorToggle(void)
+void BrailleCursorToggle(void)
 {
    // 8004 = x - 27
    // 8005 = y
@@ -2477,7 +2477,7 @@ bool8 PlayerPartyContainsSpeciesWithPlayerID(void)
 * Determines which of Lorelei's doll collection to show
 * based on how many times you've entered the Hall of Fame.
 */
-void Special_ComputeLoreleiDollCollection(void)
+void UpdateLoreleiDollCollection(void)
 {
    u32 numHofClears = GetGameStat(GAME_STAT_ENTERED_HOF);
    if (numHofClears >= 25)
@@ -2500,7 +2500,7 @@ void Special_ComputeLoreleiDollCollection(void)
    }
 }
-void Special_LoopWingFlapSound(void)
+void LoopWingFlapSound(void)
 {
    // 8004 = Num flaps
    // 8005 = Frame delay between flaps
@@ -137,7 +137,7 @@ static void MarkIcefallCaveCoordVisited(s16 x, s16 y)
    }
 }
-void Special_SetIcefallCaveCrackedIceMetatiles(void)
+void SetIcefallCaveCrackedIceMetatiles(void)
 {
    u8 i = 0;
    for (; i < NELEMS(sIcefallCaveIceTileCoords); ++i)
@@ -1,4 +1,4 @@
-void nullsub_56(void)
+// From R/S, removed
 void DoWateringBerryTreeAnim(void)
 {
 }
@@ -13,7 +13,7 @@
 static void sub_80BF97C(u8 taskId);
-void Special_ChooseMonFromParty(void)
+void ChoosePartyMon(void)
 {
    u8 taskId;
@@ -23,7 +23,7 @@ void Special_ChooseMonFromParty(void)
    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
 }
-void Special_SelectMoveTutorMon(void)
+void SelectMoveTutorMon(void)
 {
    u8 taskId;
@@ -43,14 +43,14 @@ static void sub_80BF97C(u8 taskId)
    }
 }
-void Special_SelectMove(void)
+void SelectMoveDeleterMove(void)
 {
    ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
    sub_8138B38(3);
    gFieldCallback = FieldCallback_ReturnToEventScript2;
 }
-void Special_GetNumMovesSelectedMonHas(void)
+void GetNumMovesSelectedMonHas(void)
 {
    u8 i;
@@ -60,7 +60,7 @@ void Special_GetNumMovesSelectedMonHas(void)
            ++gSpecialVar_Result;
 }
-void Special_BufferMoveDeleterNicknameAndMove(void)
+void BufferMoveDeleterNicknameAndMove(void)
 {
    struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
    u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
@@ -91,7 +91,7 @@ static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
    SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
 }
-void Special_MoveDeleterForgetMove(void)
+void MoveDeleterForgetMove(void)
 {
    u16 i;
@@ -101,7 +101,7 @@ void Special_MoveDeleterForgetMove(void)
        ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
 }
-void Special_IsSelectedMonEgg(void)
+void IsSelectedMonEgg(void)
 {
    if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
        gSpecialVar_Result = TRUE;
@@ -8,7 +8,7 @@
 #include "constants/flags.h"
 #include "constants/spawn_points.h"
-bool8 Special_HallOfFame(void)
+bool8 EnterHallOfFame(void)
 {
    bool8 ribbonState;
    bool8 *r7;
@@ -52,7 +52,7 @@ bool8 Special_HallOfFame(void)
    return FALSE;
 }
-bool8 SetCB2Whiteout(void)
+bool8 SetCB2WhiteOut(void)
 {
    SetMainCallback2(CB2_WhiteOut);
    return FALSE;
@@ -21,7 +21,7 @@ extern const u8 PokedexRating_Text_LessThan140[];
 extern const u8 PokedexRating_Text_LessThan150[];
 extern const u8 PokedexRating_Text_Complete[];
-u16 Special_GetPokedexCount(void)
+u16 GetPokedexCount(void)
 {
    if (gSpecialVar_0x8004 == 0)
    {
@@ -104,7 +104,7 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
    return PokedexRating_Text_LessThan10;
 }
-void Special_GetProfOaksRatingMessage(void)
+void GetProfOaksRatingMessage(void)
 {
    ShowFieldMessage(GetProfOaksRatingMessageByCount(gSpecialVar_0x8004));
 }
@@ -526,7 +526,7 @@ static void sub_8110A3C(void)
    }
 }
-void Special_GetQuestLogState(void)
+void GetQuestLogState(void)
 {
    gSpecialVar_Result = gQuestLogState;
 }
@@ -61,7 +61,7 @@ void ClearRoamerData(void)
 #define GetRoamerSpecies() ({\
    u16 a;\
-    switch (ScrSpecial_GetStarter())\
+    switch (GetStarterSpecies())\
    {\
    default:\
        a = SPECIES_RAIKOU;\
@@ -1892,7 +1892,7 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartTrainerBattle();
+    StartTrainerBattle();
    return TRUE;
 }
@@ -1944,7 +1944,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartScriptedWildBattle();
+    StartScriptedWildBattle();
    ScriptContext1_Stop();
    return TRUE;
 }
@@ -1116,7 +1116,7 @@ void Task_WaitMuseumFossilPic(u8 taskId)
    }
 }
-bool8 Special_OpenMuseumFossilPic(void)
+bool8 OpenMuseumFossilPic(void)
 {
    u8 spriteId;
    u8 taskId;
@@ -1149,7 +1149,7 @@ bool8 Special_OpenMuseumFossilPic(void)
    return TRUE;
 }
-bool8 Special_CloseMuseumFossilPic(void)
+bool8 CloseMuseumFossilPic(void)
 {
    u8 taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic);
    if (taskId == 0xFF)
@@ -1197,7 +1197,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void)
    }
 }
-void Special_DrawSeagallopDestinationMenu(void)
+void DrawSeagallopDestinationMenu(void)
 {
    // 8004 = Starting location
    // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
@@ -1249,7 +1249,7 @@ void Special_DrawSeagallopDestinationMenu(void)
    }
 }
-u16 Special_GetSelectedSeagallopDestination(void)
+u16 GetSelectedSeagallopDestination(void)
 {
    // 8004 = Starting location
    // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
@@ -117,7 +117,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item)
    return FALSE;
 }
-bool8 GetNameOfEnigmaBerryInPlayerParty(void)
+bool8 DoesPartyHaveEnigmaBerry(void)
 {
    bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY);
    if (hasItem == TRUE)
@@ -79,7 +79,7 @@ static const struct SpriteTemplate sSmokeSpriteTemplate = {
    SmokeSpriteCallback
 };
-void Special_SSAnneDepartureCutscene(void)
+void DoSSAnneDepartureCutscene(void)
 {
    u8 taskId;
@@ -387,7 +387,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                    return FALSE;
                }
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                return TRUE;
            }
            else
@@ -396,7 +396,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                // try a regular wild land encounter
                if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_REPEL) == TRUE)
                {
-                    BattleSetup_StartWildBattle();
+                    StartWildBattle();
                    return TRUE;
                }
                else
@@ -426,14 +426,14 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                    return FALSE;
                }
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                return TRUE;
            }
            else // try a regular surfing encounter
            {
                if (TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, WILD_CHECK_REPEL) == TRUE)
                {
-                    BattleSetup_StartWildBattle();
+                    StartWildBattle();
                    return TRUE;
                }
                else
@@ -447,7 +447,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
    return FALSE;
 }
-void ScrSpecial_RockSmashWildEncounter(void)
+void RockSmashWildEncounter(void)
 {
    u16 headerIdx = GetCurrentMapWildMonHeaderId();
    if (headerIdx == 0xFFFF)
@@ -458,7 +458,7 @@ void ScrSpecial_RockSmashWildEncounter(void)
        gSpecialVar_Result = FALSE;
    else if (TryGenerateWildMon(gWildMonHeaders[headerIdx].rockSmashMonsInfo, WILD_AREA_ROCKS, WILD_CHECK_REPEL) == TRUE)
    {
-        BattleSetup_StartWildBattle();
+        StartWildBattle();
        gSpecialVar_Result = TRUE;
    }
    else
@@ -478,7 +478,7 @@ bool8 SweetScentWildEncounter(void)
        {
            if (TryStartRoamerEncounter() == TRUE)
            {
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                return TRUE;
            }
@@ -487,14 +487,14 @@ bool8 SweetScentWildEncounter(void)
            TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0);
-            BattleSetup_StartWildBattle();
+            StartWildBattle();
            return TRUE;
        }
        else if (MapGridGetMetatileAttributeAt(x, y, 4) == 2)
        {
            if (TryStartRoamerEncounter() == TRUE)
            {
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                return TRUE;
            }
@@ -502,7 +502,7 @@ bool8 SweetScentWildEncounter(void)
                return FALSE;
            TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, 0);
-            BattleSetup_StartWildBattle();
+            StartWildBattle();
            return TRUE;
        }
    }
@@ -524,7 +524,7 @@ void FishingWildEncounter(u8 rod)
 {
    GenerateFishingEncounter(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
    IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
-    BattleSetup_StartWildBattle();
+    StartWildBattle();
 }
 u16 GetLocalWildMon(bool8 *isWaterMon)
@@ -244,7 +244,7 @@ static s32 CountRoamerNests(u16 species, struct Subsprite * subsprites)
    roamerIdx = GetRoamerIndex(species);
    if (roamerIdx < 0)
        return 0;
-    if (sRoamerPairs[roamerIdx].starter != ScrSpecial_GetStarter())
+    if (sRoamerPairs[roamerIdx].starter != GetStarterSpecies())
        return 0;
    roamerLocation = GetRoamerLocationMapSectionId();
    dexAreaEntryLUTidx = 0;
--- a/Show More
+++ b/Show More