summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/day_care.inc7
-rw-r--r--data/scripts/field_poison.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/interview.inc274
-rw-r--r--data/scripts/lilycove_lady.inc2
-rw-r--r--data/scripts/pc_transfer.inc2
-rw-r--r--data/scripts/pkmn_center_nurse.inc4
-rw-r--r--data/scripts/players_house.inc2
-rw-r--r--data/scripts/roulette.inc8
-rw-r--r--data/scripts/secret_base.inc4
-rw-r--r--data/scripts/shared_secret_base.inc16
-rw-r--r--data/scripts/trainer_hill.inc53
-rw-r--r--data/scripts/tv.inc58
13 files changed, 214 insertions, 222 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index b4c23a694..61763ba17 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -90,7 +90,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
- msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_FineThenComeAgain, MSGBOX_DEFAULT
release
end
@@ -375,7 +375,7 @@ Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF
Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6
.string "My husband was looking for you.$"
-Route117_PokemonDayCare_Text_292416: @ 8292416
+Route117_PokemonDayCare_Text_FineThenComeAgain: @ 8292416
.string "Oh, fine, then.\n"
.string "Come again.$"
@@ -402,7 +402,8 @@ Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF
.string "Your POKéMON team is full.\n"
.string "Make room, then come see me.$"
-Route117_PokemonDayCare_Text_292527: @ 8292527
+@ Unused
+Route117_PokemonDayCare_Text_TakeBackWhichMon: @ 8292527
.string "Which POKéMON will you take back?$"
Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 40b4cf658..d45b480d1 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -39,7 +39,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
- setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_Lost
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index f61b9d6db..456f56f45 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -184,13 +184,13 @@ GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
release
end
-Route118_EventScript_GabbyBattle5:: @ 828CED6
+GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
-Route118_EventScript_TyBattle5:: @ 828CEF6
+GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 2ae93ce70..f968577f3 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -1,27 +1,25 @@
-BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9
-LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9
-SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9
-SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9
+Interview_EventScript_EndInterview:: @ 828C7E9
special InterviewAfter
incrementgamestat GAME_STAT_GOT_INTERVIEWED
release
end
-SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
- setvar VAR_0x8005, 1
+@ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS
+SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
+ setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879
+ compare VAR_RESULT, TRUE
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2
copyvar VAR_0x8009, VAR_0x8006
- msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO
+ msgbox SlateportCity_PokemonFanClub_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview2
compare VAR_RESULT, NO
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
end
-SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
- msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
+ msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
@@ -29,54 +27,54 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_SubmitResponse2
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
end
-SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C
- msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C
+ msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
release
end
-SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866
- msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT
- setvar VAR_0x8005, 1
- goto SlateportCity_PokemonFanClub_EventScript_28C7E9
+SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866
+ msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
+ goto Interview_EventScript_EndInterview
end
-SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879
- msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879
+ msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
release
end
SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
lock
faceplayer
- setvar VAR_0x8005, 2
+ setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939
+ compare VAR_RESULT, TRUE
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006
- goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8
+ goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort
setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
- msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO
+ msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
compare VAR_RESULT, NO
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end
-SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
- msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO
+SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
+ msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
compare VAR_RESULT, NO
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end
-SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
- msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
+ msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
@@ -84,71 +82,71 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end
-SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C
- msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C
+ msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT
release
end
-SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926
- msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT
- setvar VAR_0x8005, 2
- goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9
+SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926
+ msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
+ goto Interview_EventScript_EndInterview
end
-SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939
- msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT
+SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939
+ msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
lock
faceplayer
- specialvar VAR_RESULT, sub_80EF8F8
- compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0
- setvar VAR_0x8005, 3
+ specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish
+ compare VAR_RESULT, FALSE
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname
+ setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F
+ compare VAR_RESULT, TRUE
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006
- msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO
+ msgbox SlateportCity_PokemonFanClub_Text_InterviewRequestHasName, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview
compare VAR_RESULT, NO
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
end
-SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C
- msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
+ msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT
random 3
copyvar VAR_0x800A, VAR_RESULT
switch VAR_RESULT
- case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3
- case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1
- case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF
+ case 0, SlateportCity_PokemonFanClub_EventScript_RandomQuestion1
+ case 1, SlateportCity_PokemonFanClub_EventScript_RandomQuestion2
+ case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3
end
-SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3
- msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT
- goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3
+ msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT
+ goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end
-SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1
- msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT
- goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1
+ msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT
+ goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end
-SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
- msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT
- goto SlateportCity_PokemonFanClub_EventScript_28C9ED
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF
+ msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT
+ goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end
-SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
+SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
@@ -156,48 +154,48 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
lock
faceplayer
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
- msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
+ msgbox SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou, MSGBOX_DEFAULT
setvar VAR_0x8006, 1
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
- msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
+ msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview, MSGBOX_DEFAULT
copyvar VAR_0x8007, VAR_0x800A
- setvar VAR_0x8005, 3
- goto SlateportCity_PokemonFanClub_EventScript_28C7E9
+ setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
+ goto Interview_EventScript_EndInterview
end
-SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45
- msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45
+ msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
release
end
-SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F
- msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F
+ msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
lock
faceplayer
- goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21
- setvar VAR_0x8005, 6
+ goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21
+ compare VAR_RESULT, TRUE
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006
- msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO
+ msgbox LilycoveCity_ContestLobby_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_AcceptInterview
compare VAR_RESULT, NO
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
end
-LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
- msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
+ msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
@@ -205,20 +203,20 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_SubmitResponse
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
end
-LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0
- msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0
+ msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT
release
end
-LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
+LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
setvar VAR_0x8004, 24
special SetContestCategoryStringVarForInterview
- msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1
@@ -226,22 +224,22 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
lock
faceplayer
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0
- msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT
+ goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
+ msgbox LilycoveCity_ContestLobby_Text_ThatsAllForInterview, MSGBOX_DEFAULT
setflag FLAG_TEMP_2
- setvar VAR_0x8005, 6
- goto LilycoveCity_ContestLobby_EventScript_28C7E9
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
+ goto Interview_EventScript_EndInterview
end
-LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
- msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21
+ msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
compare VAR_CONTEST_HALL_STATE, 2
goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
- setvar VAR_0x8005, 6
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
special InterviewBefore
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
@@ -261,86 +259,86 @@ LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
return
-BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
+BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
lock
faceplayer
- goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A
- setvar VAR_0x8005, 7
+ goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
+ compare VAR_RESULT, TRUE
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006
- msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO
+ msgbox BattleFrontier_BattleTowerLobby_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview
compare VAR_RESULT, NO
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview
end
-BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
- message BattleFrontier_BattleTowerLobby_Text_27F7BA
+BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
+ message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
waitmessage
multichoice 20, 8, MULTI_SATISFACTION, 1
copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0
- call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38
+ call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied
compare VAR_RESULT, 1
- call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
- msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
+ call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied
+ msgbox BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse
compare VAR_RESULT, 0
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
end
-BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E
- msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E
+ msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT
release
end
-BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38
- msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38
+ msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT
return
-BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41
- msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41
+ msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT
return
-BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
+BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
compare VAR_RESULT, 0
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
- msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
+ msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT
setflag FLAG_TEMP_2
copyvar VAR_0x8004, VAR_0x8008
- setvar VAR_0x8005, 7
- goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
+ goto Interview_EventScript_EndInterview
end
-BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70
- msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70
+ msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT
release
end
-BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
- msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT
+BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A
+ msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT
release
end
-BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
+BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
- setvar VAR_0x8005, 7
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
+ setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
+ compare VAR_RESULT, TRUE
+ goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return
-BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6
+BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index b7b9d514a..f553ea0ad 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -298,7 +298,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
special BufferQuizPrizeItem
special SetQuizLadyState_Complete
giveitem_std VAR_0x8005
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize
goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
end
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc
index 594956a31..cc583022d 100644
--- a/data/scripts/pc_transfer.inc
+++ b/data/scripts/pc_transfer.inc
@@ -35,7 +35,7 @@ EventScript_SomeonesPCBoxFull:: @ 82737D4
EventScript_TransferredLanettesPC:: @ 82737E6
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_LanettesPCBoxFull
msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
return
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 18b203d61..a26e9e22a 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -91,9 +91,9 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43
specialvar VAR_RESULT, IsPokerusInParty
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 3a0675e5e..1b706e603 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -346,7 +346,7 @@ PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_AMULET_COIN
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index 791069088..9aea65054 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,10 +1,10 @@
Roulette_EventScript_Table1:: @ 82A5AB1
checkitem ITEM_COIN_CASE, 1
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
getpricereduction POKENEWS_GAME_CORNER
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
goto Roulette_EventScript_Play
@@ -12,11 +12,11 @@ Roulette_EventScript_Table1:: @ 82A5AB1
Roulette_EventScript_Table2:: @ 82A5ADF
checkitem ITEM_COIN_CASE, 1
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
getpricereduction POKENEWS_GAME_CORNER
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
goto Roulette_EventScript_Play
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 04fab5598..617b19b42 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -27,7 +27,7 @@ SecretBase_Text_DiscoveredSmallEntrance: @ 8274883
SecretBase_EventScript_CheckEntrance:: @ 82759F1
special GetSecretBaseTypeInFrontOfPlayer
special CheckPlayerHasSecretBase
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase
checkpartymove MOVE_SECRET_POWER
setfieldeffectargument 0, VAR_RESULT
@@ -185,7 +185,7 @@ SecretBase_EventScript_Enter:: @ 8275BB7
setvar VAR_INIT_SECRET_BASE, 1
playse SE_KAIDAN
special IsCurSecretBaseOwnedByAnotherPlayer
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq SecretBase_EventScript_EnterPlayersBase
clearflag FLAG_DECORATION_0
special EnterSecretBase
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index 3a4c044a3..de5dcc703 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -1,25 +1,25 @@
SecretBase_MapScripts::
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp
- map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition
- map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame
- map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp
+ map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame
+ map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume
.byte 0
-SecretBase_MapScript2_OnWarp: @ 823B498
+SecretBase_OnWarp: @ 823B498
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations
.2byte 0
-SecretBase_MapScript1_OnTransition: @ 823B4A2
+SecretBase_OnTransition: @ 823B4A2
call SecretBase_EventScript_SetDecorationFlags
special SetSecretBaseOwnerGfxId
special InitSecretBaseVars
end
-SecretBase_MapScript2_OnFrame: @ 823B4AE
+SecretBase_OnFrame: @ 823B4AE
map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance
.2byte 0
-SecretBase_MapScript1_OnResume: @ 823B4B8
+SecretBase_OnResume: @ 823B4B8
setstepcallback STEP_CB_SECRET_BASE
end
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index db6105249..805c63264 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -1,8 +1,4 @@
-TrainerHill_1F_MapScript1_2C8336: @ 82C8336
-TrainerHill_2F_MapScript1_2C8336: @ 82C8336
-TrainerHill_3F_MapScript1_2C8336: @ 82C8336
-TrainerHill_4F_MapScript1_2C8336: @ 82C8336
-TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
+TrainerHill_OnResume: @ 82C8336
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
special CallTrainerHillFunction
@@ -17,67 +13,64 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
goto_if_eq TrainerHill_1F_EventScript_Lost
end
-TrainerHill_1F_MapScript2_2C8372: @ 82C8372
-TrainerHill_2F_MapScript2_2C8372: @ 82C8372
- map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C
+TrainerHill_OnWarp: @ 82C8372
+ map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_DummyOnWarp
.2byte 0
-TrainerHill_1F_EventScript_2C837C:: @ 82C837C
+TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
setvar VAR_TEMP_3, 1
@ forced stop
-TrainerHill_1F_MapScript2_2C8381: @ 82C8381
-TrainerHill_2F_MapScript2_2C8381: @ 82C8381
-TrainerHill_3F_MapScript2_2C8381: @ 82C8381
-TrainerHill_4F_MapScript2_2C8381: @ 82C8381
-TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
- map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6
- map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
+TrainerHill_OnFrame: @ 82C8381
+ map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
+ map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
.2byte 0
EventScript_TrainerHillTimer:: @ 82C8393
lockall
- setvar VAR_0x8004, TRAINER_HILL_FUNC_7
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME
special CallTrainerHillFunction
- msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
+ msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT
releaseall
end
-TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
+TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
setvar VAR_TEMP_2, 1
- setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
special CallTrainerHillFunction
- compare VAR_RESULT, 1
- goto_if_eq TrainerHill_1F_EventScript_2C83BF
+ compare VAR_RESULT, 1 @ VAR_RESULT always 0 here
+ goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
end
-TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
+@ Never reached
+TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF
warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
waitstate
end
TrainerHill_1F_EventScript_Lost:: @ 82C83C9
- setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
special CallTrainerHillFunction
setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
special CallTrainerHillFunction
setvar VAR_TEMP_1, 1
end
-TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF
-TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
+TrainerHill_EventScript_WarpToEntranceCounter:: @ 82C83DF
setvar VAR_TEMP_1, 0
warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
waitstate
end
-TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
+@ Unused
+TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE
set_invisible
step_end
-EventScript_2C83F0:: @ 82C83F0
- trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
- setvar VAR_0x8004, TRAINER_HILL_FUNC_11
+@ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here
+TrainerHill_EventScript_TrainerBattle:: @ 82C83F0
+ trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT
special CallTrainerHillFunction
waitmessage
waitbuttonpress
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 427775a76..a2d5473b1 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -7,28 +7,28 @@ EventScript_TV:: @ 827EE0B
goto_if_eq EventScript_PlayersHouseMovie
compare VAR_RESULT, 1
goto_if_eq EventScript_PlayersHouseLatiNewsFlash
- goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A
- goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A
+ goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
+ goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
- compare VAR_RESULT, 1
- goto_if_eq EventScript_27EEFF
- goto EventScript_27EEE9
+ compare VAR_RESULT, TRUE
+ goto_if_eq EventScript_DoInSearchOfTrainers
+ goto EventScript_TryDoPokeNews
end
-EventScript_27EE54:: @ 827EE54
- specialvar VAR_0x8004, special_0x44
+EventScript_TryDoTVShow:: @ 827EE54
+ specialvar VAR_0x8004, GetRandomActiveShowIdx
compare VAR_0x8004, 255
- goto_if_eq EventScript_27EED8
- specialvar VAR_RESULT, special_0x4a
+ goto_if_eq EventScript_MomDadMightLikeThis2
+ specialvar VAR_RESULT, GetNextActiveShowIfMassOutbreak
compare VAR_RESULT, 255
- goto_if_eq EventScript_27EED8
+ goto_if_eq EventScript_MomDadMightLikeThis2
copyvar VAR_0x8004, VAR_RESULT
- specialvar VAR_RESULT, special_0x45
+ specialvar VAR_RESULT, GetSelectedTVShow
compare VAR_RESULT, 0
- goto_if_ne EventScript_27EEBA
+ goto_if_ne EventScript_DoTVShow
end
-EventScript_27EE8A:: @ 827EE8A
+EventScript_MomDadMightLikeThis1:: @ 827EE8A
special GetMomOrDadStringForTVMessage
msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
special TurnOffTVScreen
@@ -40,11 +40,11 @@ EventScript_PlayersHouseMovie:: @ 827EE9A
releaseall
end
+@ special InitRoamer is a junk call. Its input var (VAR_0x8004) hasn't been set, and
+@ It's called again when Mom actually asks for the color, overwriting
+@ whatever it does here.
EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
- @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
- @ It's called again when Mom actually asks for the color, overwriting
- @ whatever it does here.
special InitRoamer
clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING
@@ -52,41 +52,41 @@ EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
releaseall
end
-EventScript_27EEBA:: @ 827EEBA
+EventScript_DoTVShow:: @ 827EEBA
special DoTVShow
waitmessage
waitbuttonpress
compare VAR_RESULT, 1
- goto_if_ne EventScript_27EEBA
- goto EventScript_27EED0
+ goto_if_ne EventScript_DoTVShow
+ goto EventScript_TurnOffTV
end
-EventScript_27EED0:: @ 827EED0
+EventScript_TurnOffTV:: @ 827EED0
special TurnOffTVScreen
setflag FLAG_SYS_TV_WATCH
releaseall
end
-EventScript_27EED8:: @ 827EED8
+EventScript_MomDadMightLikeThis2:: @ 827EED8
special GetMomOrDadStringForTVMessage
msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
- goto EventScript_27EED0
+ goto EventScript_TurnOffTV
end
-EventScript_27EEE9:: @ 827EEE9
+EventScript_TryDoPokeNews:: @ 827EEE9
special DoPokeNews
- compare VAR_RESULT, 0
- goto_if_eq EventScript_27EE54
+ compare VAR_RESULT, FALSE
+ goto_if_eq EventScript_TryDoTVShow
waitmessage
waitbuttonpress
- goto EventScript_27EED0
+ goto EventScript_TurnOffTV
end
-EventScript_27EEFF:: @ 827EEFF
+EventScript_DoInSearchOfTrainers:: @ 827EEFF
special DoTVShowInSearchOfTrainers
waitmessage
waitbuttonpress
compare VAR_RESULT, 0
- goto_if_eq EventScript_27EEFF
- goto EventScript_27EED0
+ goto_if_eq EventScript_DoInSearchOfTrainers
+ goto EventScript_TurnOffTV
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 11:30:17 +0000