Merge branch 'master' into doc-union

1 files changed, 40 insertions, 40 deletions

diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 2d1c08196..90fceb9d1 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -1,11 +1,11 @@
-Interview_EventScript_EndInterview:: @ 828C7E9
+Interview_EventScript_EndInterview::
 	special InterviewAfter
 	incrementgamestat GAME_STAT_GOT_INTERVIEWED
 	release
 	end
 
 @ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS
-SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
+SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname::
 	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
 	special InterviewBefore
 	compare VAR_RESULT, TRUE
@@ -18,7 +18,7 @@ SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview2::
 	msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -32,23 +32,23 @@ SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview2::
 	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866
+SlateportCity_PokemonFanClub_EventScript_SubmitResponse2::
 	msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2::
 	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
+SlateportCity_OceanicMuseum_1F_EventScript_Reporter::
 	lock
 	faceplayer
 	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
@@ -65,7 +65,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
+SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
@@ -73,7 +73,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
+SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -87,23 +87,23 @@ SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C
+SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926
+SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939
+SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
+SlateportCity_PokemonFanClub_EventScript_Reporter::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish
@@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview::
 	msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT
 	random 3
 	copyvar VAR_0x800A, VAR_RESULT
@@ -131,22 +131,22 @@ SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
 	case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion1::
 	msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion2::
 	msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion3::
 	msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
+SlateportCity_PokemonFanClub_EventScript_ContinueInterview::
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
@@ -168,17 +168,17 @@ SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview::
 	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed::
 	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
+LilycoveCity_ContestLobby_EventScript_Reporter::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
@@ -194,7 +194,7 @@ LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
+LilycoveCity_ContestLobby_EventScript_AcceptInterview::
 	msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -208,12 +208,12 @@ LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0
+LilycoveCity_ContestLobby_EventScript_DeclineInterview::
 	msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
+LilycoveCity_ContestLobby_EventScript_SubmitResponse::
 	setvar VAR_0x8004, 24
 	special SetContestCategoryStringVarForInterview
 	msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT
@@ -231,12 +231,12 @@ LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
 	goto Interview_EventScript_EndInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21
+LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed::
 	msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
+LilycoveCity_ContestLobby_EventScript_TryShowContestReporter::
 	compare VAR_CONTEST_HALL_STATE, 2
 	goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
 	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
@@ -252,14 +252,14 @@ LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
 	case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
 	end
 
-LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
+LilycoveCity_ContestLobby_EventScript_ShowContestReporter::
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
+LilycoveCity_ContestLobby_EventScript_DontShowContestReporter::
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
+BattleFrontier_BattleTowerLobby_EventScript_Reporter::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
@@ -275,7 +275,7 @@ BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
+BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview::
 	message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
 	waitmessage
 	multichoice 20, 8, MULTI_SATISFACTION, TRUE
@@ -296,20 +296,20 @@ BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E
+BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview::
 	msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38
+BattleFrontier_BattleTowerLobby_EventScript_Satisfied::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41
+BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied::
 	msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
+BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
 	msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT
@@ -319,17 +319,17 @@ BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
 	goto Interview_EventScript_EndInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70
+BattleFrontier_BattleTowerLobby_EventScript_CancelInterview::
 	msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A
+BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed::
 	msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
+BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter::
 	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
 	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
@@ -339,12 +339,12 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
 	clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
+BattleFrontier_BattleTowerLobby_EventScript_HideReporter::
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
 @ Unused
-EventScript_ContestLiveInterview:: @ 828CCAA
+EventScript_ContestLiveInterview::
 	setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
 	special InterviewBefore
 	compare VAR_RESULT, TRUE
@@ -353,5 +353,5 @@ EventScript_ContestLiveInterview:: @ 828CCAA
 	special InterviewAfter
 	return
 
-EventScript_ContestLiveInterviewEnd:: @ 828CCC6
+EventScript_ContestLiveInterviewEnd::
 	return