dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #899 from GriffinRichards/doc-scriptclean

Browse Source 
Document interview and TV scripts, and misc script clean up
This commit is contained in:
huderlem
2019-11-16 11:34:47 -06:00
committed by GitHub
parent eb38922e42 ff7e11c0b0
commit 0a43f2ce53
22 changed files with 314 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_BattleTowerLobby/map.json
+1 -1
View File
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", "script": "BattleFrontier_BattleTowerLobby_EventScript_Reporter",
"flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
}, },
{ {
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
end end
BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
call BattleFrontier_BattleTowerLobby_EventScript_28CC84 call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special CallApprenticeFunction special CallApprenticeFunction
compare VAR_0x8004, 0 compare VAR_0x8004, 0
data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
+1 -1
View File
@@ -128,7 +128,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer",
"flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER"
} }
], ],
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+38 -37
View File
@@ -496,116 +496,117 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
lock lock
faceplayer faceplayer
goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed
goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_Interview
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
setvar VAR_0x8005, 11 setvar VAR_0x8005, TVSHOW_FAN_CLUB_SPECIAL
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2
copyvar VAR_0x800A, VAR_0x8006 copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion:: @ 821CDE0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink, MSGBOX_DEFAULT
goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D goto LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95 message LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer
waitmessage waitmessage
setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
special ShowScrollableMultichoice special ShowScrollableMultichoice
waitstate waitstate
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
switch VAR_RESULT switch VAR_RESULT
case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
copyvar VAR_0x8006, VAR_0x800A copyvar VAR_0x8006, VAR_0x800A
copyvar VAR_0x8005, VAR_RESULT copyvar VAR_0x8005, VAR_RESULT
special PutFanClubSpecialOnTheAir special PutFanClubSpecialOnTheAir
goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8 goto LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer:: @ 821CEC6
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer, MSGBOX_DEFAULT
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo, MSGBOX_DEFAULT
setflag FLAG_FAN_CLUB_STRENGTH_SHARED setflag FLAG_FAN_CLUB_STRENGTH_SHARED
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial, MSGBOX_DEFAULT
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF @ Shouldnt be reached
LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
end end
LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00 LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
data/maps/MagmaHideout_4F/scripts.inc
+1 -4
View File
@@ -9,10 +9,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
delay 20 delay 20
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
playse SE_W197 playse SE_W197
setfieldeffectargument 0, 18 dofieldeffectsparkle 18, 42, 0
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
playfanfare MUS_ME_TAMA playfanfare MUS_ME_TAMA
data/maps/Route110_TrickHouseEntrance/scripts.inc
+1 -4
View File
@@ -749,10 +749,7 @@ Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459 Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
setfieldeffectargument 0, VAR_0x8004 dofieldeffectsparkle VAR_0x8004, VAR_0x8005, VAR_0x8006
setfieldeffectargument 1, VAR_0x8005
setfieldeffectargument 2, VAR_0x8006
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
return return
data/maps/SeafloorCavern_Room9/scripts.inc
+1 -4
View File
@@ -37,10 +37,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
waitstate waitstate
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
playse SE_W197 playse SE_W197
setfieldeffectargument 0, 16 dofieldeffectsparkle 16, 42, 0
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
closemessage closemessage
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
data/maps/UnionRoom/map.json
+9 -9
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D236", "script": "UnionRoom_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D204", "script": "UnionRoom_EventScript_Player4",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D22C", "script": "UnionRoom_EventScript_Player8",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D222", "script": "UnionRoom_EventScript_Player7",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D218", "script": "UnionRoom_EventScript_Player6",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D20E", "script": "UnionRoom_EventScript_Player5",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D1FA", "script": "UnionRoom_EventScript_Player3",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D1F0", "script": "UnionRoom_EventScript_Player2",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
}, },
{ {
@@ -128,7 +128,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "UnionRoom_EventScript_23D1E6", "script": "UnionRoom_EventScript_Player1",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
} }
], ],
data/maps/UnionRoom/scripts.inc
+12 -12
View File
@@ -1,9 +1,9 @@
UnionRoom_MapScripts:: @ 823D1A6 UnionRoom_MapScripts:: @ 823D1A6
map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
.byte 0 .byte 0
UnionRoom_MapScript1_23D1B1: @ 823D1B1 UnionRoom_OnResume: @ 823D1B1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_1 setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_2 setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
setflag FLAG_HIDE_UNION_ROOM_PLAYER_3 setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
@@ -26,7 +26,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1
UnionRoom_OnTransition: @ 823D1E5 UnionRoom_OnTransition: @ 823D1E5
end end
UnionRoom_EventScript_23D1E6:: @ 823D1E6 UnionRoom_EventScript_Player1:: @ 823D1E6
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_23D1E6:: @ 823D1E6
release release
end end
UnionRoom_EventScript_23D1F0:: @ 823D1F0 UnionRoom_EventScript_Player2:: @ 823D1F0
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 2 setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_23D1F0:: @ 823D1F0
release release
end end
UnionRoom_EventScript_23D1FA:: @ 823D1FA UnionRoom_EventScript_Player3:: @ 823D1FA
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 3 setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_23D1FA:: @ 823D1FA
release release
end end
UnionRoom_EventScript_23D204:: @ 823D204 UnionRoom_EventScript_Player4:: @ 823D204
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 4 setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_23D204:: @ 823D204
release release
end end
UnionRoom_EventScript_23D20E:: @ 823D20E UnionRoom_EventScript_Player5:: @ 823D20E
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 5 setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_23D20E:: @ 823D20E
release release
end end
UnionRoom_EventScript_23D218:: @ 823D218 UnionRoom_EventScript_Player6:: @ 823D218
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 6 setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_23D218:: @ 823D218
release release
end end
UnionRoom_EventScript_23D222:: @ 823D222 UnionRoom_EventScript_Player7:: @ 823D222
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 7 setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_23D222:: @ 823D222
release release
end end
UnionRoom_EventScript_23D22C:: @ 823D22C UnionRoom_EventScript_Player8:: @ 823D22C
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 8 setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_23D22C:: @ 823D22C
release release
end end
UnionRoom_EventScript_23D236:: @ 823D236 UnionRoom_EventScript_Attendant:: @ 823D236
lock lock
faceplayer faceplayer
setvar VAR_RESULT, 9 setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_23D236:: @ 823D236
release release
end end
UnionRoom_EventScript_23D240:: @ 823D240 UnionRoom_EventScript_Unused:: @ 823D240
lockall lockall
setvar VAR_RESULT, 10 setvar VAR_RESULT, 10
waitstate waitstate
data/scripts/day_care.inc
+4 -3
View File
@@ -90,7 +90,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT msgbox Route117_PokemonDayCare_Text_FineThenComeAgain, MSGBOX_DEFAULT
release release
end end
@@ -375,7 +375,7 @@ Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF
Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6 Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6
.string "My husband was looking for you.$" .string "My husband was looking for you.$"
Route117_PokemonDayCare_Text_292416: @ 8292416 Route117_PokemonDayCare_Text_FineThenComeAgain: @ 8292416
.string "Oh, fine, then.\n" .string "Oh, fine, then.\n"
.string "Come again.$" .string "Come again.$"
@@ -402,7 +402,8 @@ Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF
.string "Your POKéMON team is full.\n" .string "Your POKéMON team is full.\n"
.string "Make room, then come see me.$" .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?$" .string "Which POKéMON will you take back?$"
Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549 Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549
data/scripts/interview.inc
+136 -138
View File
@@ -1,27 +1,25 @@
BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 Interview_EventScript_EndInterview:: @ 828C7E9
LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9
SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9
SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9
special InterviewAfter special InterviewAfter
incrementgamestat GAME_STAT_GOT_INTERVIEWED incrementgamestat GAME_STAT_GOT_INTERVIEWED
release release
end end
SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 @ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS
setvar VAR_0x8005, 1 SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO msgbox SlateportCity_PokemonFanClub_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview2
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
end end
SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
@@ -29,54 +27,54 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 goto_if_eq SlateportCity_PokemonFanClub_EventScript_SubmitResponse2
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
end end
SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C
msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
release release
end end
SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866
msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT
setvar VAR_0x8005, 1 setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
goto SlateportCity_PokemonFanClub_EventScript_28C7E9 goto Interview_EventScript_EndInterview
end end
SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879
msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
release release
end end
SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
lock lock
faceplayer faceplayer
setvar VAR_0x8005, 2 setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006 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 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 compare VAR_RESULT, YES
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end end
SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end end
SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
@@ -84,71 +82,71 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
end end
SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C
msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT
release release
end end
SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926
msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT
setvar VAR_0x8005, 2 setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 goto Interview_EventScript_EndInterview
end end
SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939
msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT
release release
end end
SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943 SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
lock lock
faceplayer faceplayer
specialvar VAR_RESULT, sub_80EF8F8 specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname
setvar VAR_0x8005, 3 setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO msgbox SlateportCity_PokemonFanClub_Text_InterviewRequestHasName, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
end end
SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT
random 3 random 3
copyvar VAR_0x800A, VAR_RESULT copyvar VAR_0x800A, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 case 0, SlateportCity_PokemonFanClub_EventScript_RandomQuestion1
case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 case 1, SlateportCity_PokemonFanClub_EventScript_RandomQuestion2
case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3
end end
SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3
msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT
goto SlateportCity_PokemonFanClub_EventScript_28C9ED goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end end
SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1
msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT
goto SlateportCity_PokemonFanClub_EventScript_28C9ED goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end end
SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF
msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT
goto SlateportCity_PokemonFanClub_EventScript_28C9ED goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
end end
SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
@@ -156,48 +154,48 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou, MSGBOX_DEFAULT
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview, MSGBOX_DEFAULT
copyvar VAR_0x8007, VAR_0x800A copyvar VAR_0x8007, VAR_0x800A
setvar VAR_0x8005, 3 setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS
goto SlateportCity_PokemonFanClub_EventScript_28C7E9 goto Interview_EventScript_EndInterview
end end
SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45
msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
release release
end end
SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F
msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
release release
end end
LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59 LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
lock lock
faceplayer faceplayer
goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
setvar VAR_0x8005, 6 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 goto_if_eq LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO msgbox LilycoveCity_ContestLobby_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B goto_if_eq LilycoveCity_ContestLobby_EventScript_AcceptInterview
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
end end
LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
@@ -205,20 +203,20 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA goto_if_eq LilycoveCity_ContestLobby_EventScript_SubmitResponse
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
end end
LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0
msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT
release release
end end
LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
setvar VAR_0x8004, 24 setvar VAR_0x8004, 24
special SetContestCategoryStringVarForInterview special SetContestCategoryStringVarForInterview
msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -226,22 +224,22 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_ThatsAllForInterview, MSGBOX_DEFAULT
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
setvar VAR_0x8005, 6 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
goto LilycoveCity_ContestLobby_EventScript_28C7E9 goto Interview_EventScript_EndInterview
end end
LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21
msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT
release release
end end
LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
compare VAR_CONTEST_HALL_STATE, 2 compare VAR_CONTEST_HALL_STATE, 2
goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
setvar VAR_0x8005, 6 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
special InterviewBefore special InterviewBefore
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
@@ -261,86 +259,86 @@ LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95 LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
return return
BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
lock lock
faceplayer faceplayer
goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
setvar VAR_0x8005, 7 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerLobby_Text_InterviewRequest, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview
end end
BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
message BattleFrontier_BattleTowerLobby_Text_27F7BA message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
waitmessage waitmessage
multichoice 20, 8, MULTI_SATISFACTION, 1 multichoice 20, 8, MULTI_SATISFACTION, 1
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied
msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E
msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT
release release
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38
msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT
return return
BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41
msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT
return return
BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
setvar VAR_0x8005, 7 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 goto Interview_EventScript_EndInterview
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70
msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT
release release
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A
msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT
release release
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
setvar VAR_0x8005, 7 setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return return
BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return return
data/scripts/lilycove_lady.inc
+1 -1
View File
@@ -298,7 +298,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
special BufferQuizPrizeItem special BufferQuizPrizeItem
special SetQuizLadyState_Complete special SetQuizLadyState_Complete
giveitem_std VAR_0x8005 giveitem_std VAR_0x8005
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize
goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
end end
data/scripts/pc_transfer.inc
+1 -1
View File
@@ -35,7 +35,7 @@ EventScript_SomeonesPCBoxFull:: @ 82737D4
EventScript_TransferredLanettesPC:: @ 82737E6 EventScript_TransferredLanettesPC:: @ 82737E6
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq EventScript_LanettesPCBoxFull goto_if_eq EventScript_LanettesPCBoxFull
msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
return return
data/scripts/pkmn_center_nurse.inc
+2 -2
View File
@@ -91,9 +91,9 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43 EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43
specialvar VAR_RESULT, IsPokerusInParty specialvar VAR_RESULT, IsPokerusInParty
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
end end
data/scripts/players_house.inc
+1 -1
View File
@@ -346,7 +346,7 @@ PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN giveitem_std ITEM_AMULET_COIN
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_AMULET_COIN setflag FLAG_RECEIVED_AMULET_COIN
data/scripts/roulette.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Roulette_EventScript_Table1:: @ 82A5AB1 Roulette_EventScript_Table1:: @ 82A5AB1
checkitem ITEM_COIN_CASE, 1 checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
getpricereduction POKENEWS_GAME_CORNER getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128 addvar VAR_0x8004, 128
goto Roulette_EventScript_Play goto Roulette_EventScript_Play
@@ -12,11 +12,11 @@ Roulette_EventScript_Table1:: @ 82A5AB1
Roulette_EventScript_Table2:: @ 82A5ADF Roulette_EventScript_Table2:: @ 82A5ADF
checkitem ITEM_COIN_CASE, 1 checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
getpricereduction POKENEWS_GAME_CORNER getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128 addvar VAR_0x8004, 128
goto Roulette_EventScript_Play goto Roulette_EventScript_Play
data/scripts/secret_base.inc
+2 -2
View File
@@ -27,7 +27,7 @@ SecretBase_Text_DiscoveredSmallEntrance: @ 8274883
SecretBase_EventScript_CheckEntrance:: @ 82759F1 SecretBase_EventScript_CheckEntrance:: @ 82759F1
special GetSecretBaseTypeInFrontOfPlayer special GetSecretBaseTypeInFrontOfPlayer
special CheckPlayerHasSecretBase special CheckPlayerHasSecretBase
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase
checkpartymove MOVE_SECRET_POWER checkpartymove MOVE_SECRET_POWER
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
@@ -185,7 +185,7 @@ SecretBase_EventScript_Enter:: @ 8275BB7
setvar VAR_INIT_SECRET_BASE, 1 setvar VAR_INIT_SECRET_BASE, 1
playse SE_KAIDAN playse SE_KAIDAN
special IsCurSecretBaseOwnedByAnotherPlayer special IsCurSecretBaseOwnedByAnotherPlayer
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq SecretBase_EventScript_EnterPlayersBase goto_if_eq SecretBase_EventScript_EnterPlayersBase
clearflag FLAG_DECORATION_0 clearflag FLAG_DECORATION_0
special EnterSecretBase special EnterSecretBase
data/scripts/shared_secret_base.inc
+8 -8
View File
@@ -1,25 +1,25 @@
SecretBase_MapScripts:: SecretBase_MapScripts::
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp
map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame
map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume
.byte 0 .byte 0
SecretBase_MapScript2_OnWarp: @ 823B498 SecretBase_OnWarp: @ 823B498
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations
.2byte 0 .2byte 0
SecretBase_MapScript1_OnTransition: @ 823B4A2 SecretBase_OnTransition: @ 823B4A2
call SecretBase_EventScript_SetDecorationFlags call SecretBase_EventScript_SetDecorationFlags
special SetSecretBaseOwnerGfxId special SetSecretBaseOwnerGfxId
special InitSecretBaseVars special InitSecretBaseVars
end end
SecretBase_MapScript2_OnFrame: @ 823B4AE SecretBase_OnFrame: @ 823B4AE
map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance
.2byte 0 .2byte 0
SecretBase_MapScript1_OnResume: @ 823B4B8 SecretBase_OnResume: @ 823B4B8
setstepcallback STEP_CB_SECRET_BASE setstepcallback STEP_CB_SECRET_BASE
end end
data/scripts/tv.inc
+29 -29
View File
@@ -7,28 +7,28 @@ EventScript_TV:: @ 827EE0B
goto_if_eq EventScript_PlayersHouseMovie goto_if_eq EventScript_PlayersHouseMovie
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq EventScript_PlayersHouseLatiNewsFlash goto_if_eq EventScript_PlayersHouseLatiNewsFlash
goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq EventScript_27EEFF goto_if_eq EventScript_DoInSearchOfTrainers
goto EventScript_27EEE9 goto EventScript_TryDoPokeNews
end end
EventScript_27EE54:: @ 827EE54 EventScript_TryDoTVShow:: @ 827EE54
specialvar VAR_0x8004, special_0x44 specialvar VAR_0x8004, GetRandomActiveShowIdx
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq EventScript_27EED8 goto_if_eq EventScript_MomDadMightLikeThis2
specialvar VAR_RESULT, special_0x4a specialvar VAR_RESULT, GetNextActiveShowIfMassOutbreak
compare VAR_RESULT, 255 compare VAR_RESULT, 255
goto_if_eq EventScript_27EED8 goto_if_eq EventScript_MomDadMightLikeThis2
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, special_0x45 specialvar VAR_RESULT, GetSelectedTVShow
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne EventScript_27EEBA goto_if_ne EventScript_DoTVShow
end end
EventScript_27EE8A:: @ 827EE8A EventScript_MomDadMightLikeThis1:: @ 827EE8A
special GetMomOrDadStringForTVMessage special GetMomOrDadStringForTVMessage
msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
special TurnOffTVScreen special TurnOffTVScreen
@@ -40,11 +40,11 @@ EventScript_PlayersHouseMovie:: @ 827EE9A
releaseall releaseall
end end
EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 @ special InitRoamer is a junk call. Its input var (VAR_0x8004) hasn't been set, and
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 @ It's called again when Mom actually asks for the color, overwriting
@ whatever it does here. @ whatever it does here.
EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
special InitRoamer special InitRoamer
clearflag FLAG_SYS_TV_LATIAS_LATIOS clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING setflag FLAG_LATIOS_OR_LATIAS_ROAMING
@@ -52,41 +52,41 @@ EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
releaseall releaseall
end end
EventScript_27EEBA:: @ 827EEBA EventScript_DoTVShow:: @ 827EEBA
special DoTVShow special DoTVShow
waitmessage waitmessage
waitbuttonpress waitbuttonpress
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_ne EventScript_27EEBA goto_if_ne EventScript_DoTVShow
goto EventScript_27EED0 goto EventScript_TurnOffTV
end end
EventScript_27EED0:: @ 827EED0 EventScript_TurnOffTV:: @ 827EED0
special TurnOffTVScreen special TurnOffTVScreen
setflag FLAG_SYS_TV_WATCH setflag FLAG_SYS_TV_WATCH
releaseall releaseall
end end
EventScript_27EED8:: @ 827EED8 EventScript_MomDadMightLikeThis2:: @ 827EED8
special GetMomOrDadStringForTVMessage special GetMomOrDadStringForTVMessage
msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
goto EventScript_27EED0 goto EventScript_TurnOffTV
end end
EventScript_27EEE9:: @ 827EEE9 EventScript_TryDoPokeNews:: @ 827EEE9
special DoPokeNews special DoPokeNews
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_27EE54 goto_if_eq EventScript_TryDoTVShow
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto EventScript_27EED0 goto EventScript_TurnOffTV
end end
EventScript_27EEFF:: @ 827EEFF EventScript_DoInSearchOfTrainers:: @ 827EEFF
special DoTVShowInSearchOfTrainers special DoTVShowInSearchOfTrainers
waitmessage waitmessage
waitbuttonpress waitbuttonpress
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq EventScript_27EEFF goto_if_eq EventScript_DoInSearchOfTrainers
goto EventScript_27EED0 goto EventScript_TurnOffTV
end end
data/specials.inc
+4 -4
View File
@@ -76,13 +76,13 @@ gSpecials:: @ 81DBA64
def_special TurnOffTVScreen def_special TurnOffTVScreen
def_special DoTVShow def_special DoTVShow
def_special DoPokeNews def_special DoPokeNews
def_special special_0x44 def_special GetRandomActiveShowIdx
def_special special_0x45 def_special GetSelectedTVShow
def_special InterviewBefore def_special InterviewBefore
def_special InterviewAfter def_special InterviewAfter
def_special sub_80EF8F8 def_special IsLeadMonNicknamedOrNotEnglish
def_special SetContestCategoryStringVarForInterview def_special SetContestCategoryStringVarForInterview
def_special special_0x4a def_special GetNextActiveShowIfMassOutbreak
def_special TV_IsScriptShowKindAlreadyInQueue def_special TV_IsScriptShowKindAlreadyInQueue
def_special CheckForBigMovieOrEmergencyNewsOnTV def_special CheckForBigMovieOrEmergencyNewsOnTV
def_special GetMomOrDadStringForTVMessage def_special GetMomOrDadStringForTVMessage
data/text/tv.inc
+42 -42
View File
@@ -1,4 +1,4 @@
LilycoveCity_ContestLobby_Text_27EF15: @ 827EF15 LilycoveCity_ContestLobby_Text_InterviewRequest: @ 827EF15
.string "Oh, hello! You were in a POKéMON\n" .string "Oh, hello! You were in a POKéMON\n"
.string "CONTEST, weren't you?\l" .string "CONTEST, weren't you?\l"
.string "It's easy to tell from your POKéMON.\p" .string "It's easy to tell from your POKéMON.\p"
@@ -7,13 +7,13 @@ LilycoveCity_ContestLobby_Text_27EF15: @ 827EF15
.string "If I may, would you be willing to answer\n" .string "If I may, would you be willing to answer\n"
.string "a few questions?$" .string "a few questions?$"
LilycoveCity_ContestLobby_Text_27EFE7: @ 827EFE7 LilycoveCity_ContestLobby_Text_DescribeContest: @ 827EFE7
.string "Oh, you will?\n" .string "Oh, you will?\n"
.string "Thank you.\p" .string "Thank you.\p"
.string "Briefly, how would you describe the\n" .string "Briefly, how would you describe the\n"
.string "CONTEST you just entered?$" .string "CONTEST you just entered?$"
LilycoveCity_ContestLobby_Text_27F03E: @ 827F03E LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX: @ 827F03E
.string "Ah, I see.\n" .string "Ah, I see.\n"
.string "That's a very edifying comment.\p" .string "That's a very edifying comment.\p"
.string "You get a good feel for what\n" .string "You get a good feel for what\n"
@@ -22,7 +22,7 @@ LilycoveCity_ContestLobby_Text_27F03E: @ 827F03E
.string "When you hear the word “{STR_VAR_2},”\n" .string "When you hear the word “{STR_VAR_2},”\n"
.string "what image do you get?$" .string "what image do you get?$"
LilycoveCity_ContestLobby_Text_27F0EC: @ 827F0EC LilycoveCity_ContestLobby_Text_ThatsAllForInterview: @ 827F0EC
.string "I see!\p" .string "I see!\p"
.string "So that's how you imagine the concept\n" .string "So that's how you imagine the concept\n"
.string "of “{STR_VAR_2}” to be.\p" .string "of “{STR_VAR_2}” to be.\p"
@@ -34,12 +34,12 @@ LilycoveCity_ContestLobby_Text_27F0EC: @ 827F0EC
.string "make it to television.\l" .string "make it to television.\l"
.string "I hope you'll look forward to it!$" .string "I hope you'll look forward to it!$"
LilycoveCity_ContestLobby_Text_27F1EF: @ 827F1EF LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe: @ 827F1EF
.string "Oh, too bad…\p" .string "Oh, too bad…\p"
.string "Well, if you come across a good story,\n" .string "Well, if you come across a good story,\n"
.string "please do share it with me.$" .string "please do share it with me.$"
LilycoveCity_ContestLobby_Text_27F23F: @ 827F23F LilycoveCity_ContestLobby_Text_LookingForwardToNextContest: @ 827F23F
.string "I'll be looking forward to your next\n" .string "I'll be looking forward to your next\n"
.string "POKéMON CONTEST.$" .string "POKéMON CONTEST.$"
@@ -108,7 +108,7 @@ gTVBravoTrainerText07:: @ 0827F65C
gTVBravoTrainerText08:: @ 0827F6E6 gTVBravoTrainerText08:: @ 0827F6E6
.string "Introducing the TRAINER's {STR_VAR_1}!$" .string "Introducing the TRAINER's {STR_VAR_1}!$"
BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704 BattleFrontier_BattleTowerLobby_Text_InterviewRequest:: @ 0827F704
.string "Hello! You're the TRAINER who just had\n" .string "Hello! You're the TRAINER who just had\n"
.string "a battle, right?\p" .string "a battle, right?\p"
.string "I'm gathering interviews with TRAINERS\n" .string "I'm gathering interviews with TRAINERS\n"
@@ -116,7 +116,7 @@ BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704
.string "May I get a few words from you about\n" .string "May I get a few words from you about\n"
.string "your impressions on battling?$" .string "your impressions on battling?$"
BattleFrontier_BattleTowerLobby_Text_27F7BA:: @ 0827F7BA BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut:: @ 0827F7BA
.string "You will? Really?\n" .string "You will? Really?\n"
.string "Thank you!\l" .string "Thank you!\l"
.string "Then, uh…\p" .string "Then, uh…\p"
@@ -125,44 +125,44 @@ BattleFrontier_BattleTowerLobby_Text_27F7BA:: @ 0827F7BA
.string "Were you satisfied with the battle?\n" .string "Were you satisfied with the battle?\n"
.string "Or are you unhappy?$" .string "Or are you unhappy?$"
BattleFrontier_BattleTowerLobby_Text_27F84C:: @ 0827F84C BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou:: @ 0827F84C
.string "Oh…\n" .string "Oh…\n"
.string "Sorry we disturbed you.\p" .string "Sorry we disturbed you.\p"
.string "Please give us an interview the next\n" .string "Please give us an interview the next\n"
.string "time you visit the BATTLE TOWER.$" .string "time you visit the BATTLE TOWER.$"
BattleFrontier_BattleTowerLobby_Text_27F8AE:: @ 0827F8AE BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle:: @ 0827F8AE
.string "Well, of course!\p" .string "Well, of course!\p"
.string "That unmistakable look of satisfaction\n" .string "That unmistakable look of satisfaction\n"
.string "on your face…\p" .string "on your face…\p"
.string "It's obvious that you've had a great\n" .string "It's obvious that you've had a great\n"
.string "battle.$" .string "battle.$"
BattleFrontier_BattleTowerLobby_Text_27F921:: @ 0827F921 BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned:: @ 0827F921
.string "Oh, I see…\p" .string "Oh, I see…\p"
.string "Well, it certainly is difficult to make a\n" .string "Well, it certainly is difficult to make a\n"
.string "battle turn out exactly as planned.$" .string "battle turn out exactly as planned.$"
BattleFrontier_BattleTowerLobby_Text_27F97A:: @ 0827F97A BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle:: @ 0827F97A
.string "Oh, oh, may I ask one more question?\p" .string "Oh, oh, may I ask one more question?\p"
.string "If you were to describe your\n" .string "If you were to describe your\n"
.string "impressions about this battle with\l" .string "impressions about this battle with\l"
.string "one saying, what would it be?$" .string "one saying, what would it be?$"
BattleFrontier_BattleTowerLobby_Text_27F9FD:: @ 0827F9FD BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine:: @ 0827F9FD
.string "Oh, that is stunningly cool!\p" .string "Oh, that is stunningly cool!\p"
.string "That's a great line!\n" .string "That's a great line!\n"
.string "I hope you'll do great next time, too.\p" .string "I hope you'll do great next time, too.\p"
.string "I hope to see you again!$" .string "I hope to see you again!$"
BattleFrontier_BattleTowerLobby_Text_27FA6F:: @ 0827FA6F BattleFrontier_BattleTowerLobby_Text_SilentType:: @ 0827FA6F
.string "Oh, I see…\p" .string "Oh, I see…\p"
.string "Still, being the silent type is also\n" .string "Still, being the silent type is also\n"
.string "cool, isn't it?\p" .string "cool, isn't it?\p"
.string "I hope you'll give me the opportunity\n" .string "I hope you'll give me the opportunity\n"
.string "to share your thoughts again!$" .string "to share your thoughts again!$"
BattleFrontier_BattleTowerLobby_Text_27FAF3:: @ 0827FAF3 BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle:: @ 0827FAF3
.string "I'll be looking forward to your\n" .string "I'll be looking forward to your\n"
.string "next battle!$" .string "next battle!$"
@@ -269,7 +269,7 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6
.string "That's all the time we have!\n" .string "That's all the time we have!\n"
.string "Until next time, see you!$" .string "Until next time, see you!$"
SlateportCity_PokemonFanClub_Text_280270: @ 08280270 SlateportCity_PokemonFanClub_Text_InterviewRequestHasName: @ 08280270
.string "Wow!\p" .string "Wow!\p"
.string "It's plain to see that you lavish your\n" .string "It's plain to see that you lavish your\n"
.string "love on your {STR_VAR_1}.\p" .string "love on your {STR_VAR_1}.\p"
@@ -280,36 +280,36 @@ SlateportCity_PokemonFanClub_Text_280270: @ 08280270
.string "Would you be willing to answer a few\n" .string "Would you be willing to answer a few\n"
.string "simple questions for me?$" .string "simple questions for me?$"
SlateportCity_PokemonFanClub_Text_28034F: @ 0828034F SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers: @ 0828034F
.string "Great! Thank you!\p" .string "Great! Thank you!\p"
.string "Okay, here goes.\n" .string "Okay, here goes.\n"
.string "I just need quick answers, okay?$" .string "I just need quick answers, okay?$"
SlateportCity_PokemonFanClub_Text_280393: @ 08280393 SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon: @ 08280393
.string "When you first met {STR_VAR_1},\n" .string "When you first met {STR_VAR_1},\n"
.string "what did you feel?\p" .string "what did you feel?\p"
.string "How would you describe your feelings\n" .string "How would you describe your feelings\n"
.string "at the time?$" .string "at the time?$"
SlateportCity_PokemonFanClub_Text_2803EF: @ 082803EF SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike: @ 082803EF
.string "Your {STR_VAR_1} is cared for lovingly.\p" .string "Your {STR_VAR_1} is cared for lovingly.\p"
.string "If you were to liken it to something\n" .string "If you were to liken it to something\n"
.string "that you like, what would it be?$" .string "that you like, what would it be?$"
SlateportCity_PokemonFanClub_Text_280454: @ 08280454 SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon: @ 08280454
.string "This question also relates to your\n" .string "This question also relates to your\n"
.string "beloved {STR_VAR_1}.\p" .string "beloved {STR_VAR_1}.\p"
.string "What was it about {STR_VAR_1} that\n" .string "What was it about {STR_VAR_1} that\n"
.string "attracted you?$" .string "attracted you?$"
SlateportCity_PokemonFanClub_Text_2804AC: @ 082804AC SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou: @ 082804AC
.string "Okay, that makes sense.\p" .string "Okay, that makes sense.\p"
.string "The next question might be a little\n" .string "The next question might be a little\n"
.string "on the tough side.\p" .string "on the tough side.\p"
.string "Here goes…\p" .string "Here goes…\p"
.string "What do POKéMON mean to you?$" .string "What do POKéMON mean to you?$"
SlateportCity_PokemonFanClub_Text_280523: @ 08280523 SlateportCity_PokemonFanClub_Text_ThatsAllForInterview: @ 08280523
.string "I see!\p" .string "I see!\p"
.string "Hmhm…\p" .string "Hmhm…\p"
.string "Okay!\n" .string "Okay!\n"
@@ -321,16 +321,16 @@ SlateportCity_PokemonFanClub_Text_280523: @ 08280523
.string "Okay, that's all.\n" .string "Okay, that's all.\n"
.string "Bye-bye!$" .string "Bye-bye!$"
SlateportCity_PokemonFanClub_Text_2805E2: @ 082805E2 SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe: @ 082805E2
.string "Oh, okay…\p" .string "Oh, okay…\p"
.string "Well, if you get the urge to tell me\n" .string "Well, if you get the urge to tell me\n"
.string "about POKéMON, I'll be here!$" .string "about POKéMON, I'll be here!$"
SlateportCity_PokemonFanClub_Text_28062E: @ 0828062E SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews: @ 0828062E
.string "I enjoy this job--you get to learn\n" .string "I enjoy this job--you get to learn\n"
.string "about POKéMON by doing interviews.$" .string "about POKéMON by doing interviews.$"
SlateportCity_PokemonFanClub_Text_280674: @ 08280674 SlateportCity_PokemonFanClub_Text_InterviewRequest: @ 08280674
.string "Hi, you seem to be very close to your\n" .string "Hi, you seem to be very close to your\n"
.string "{STR_VAR_1}.\p" .string "{STR_VAR_1}.\p"
.string "Do you know what?\n" .string "Do you know what?\n"
@@ -340,12 +340,12 @@ SlateportCity_PokemonFanClub_Text_280674: @ 08280674
.string "I'm wondering if you'd be willing to tell\n" .string "I'm wondering if you'd be willing to tell\n"
.string "me a little about your {STR_VAR_1}?$" .string "me a little about your {STR_VAR_1}?$"
SlateportCity_PokemonFanClub_Text_28073B: @ 0828073B SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon: @ 0828073B
.string "Wow, thank you!\p" .string "Wow, thank you!\p"
.string "Okay, then, please tell me anything\n" .string "Okay, then, please tell me anything\n"
.string "you'd like about your {STR_VAR_1}.$" .string "you'd like about your {STR_VAR_1}.$"
SlateportCity_PokemonFanClub_Text_280789: @ 08280789 SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2: @ 08280789
.string "Wow…\n" .string "Wow…\n"
.string "That's an interesting account.\p" .string "That's an interesting account.\p"
.string "You really are tight with {STR_VAR_1},\n" .string "You really are tight with {STR_VAR_1},\n"
@@ -479,7 +479,7 @@ gTVFanClubText07:: @ 082810E7
.string "A-whoops, will you look at the time?\n" .string "A-whoops, will you look at the time?\n"
.string "Time to say good-bye until next time!$" .string "Time to say good-bye until next time!$"
SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0 SlateportCity_OceanicMuseum_1F_Text_InterviewRequest: @ 082811A0
.string "Oh?\n" .string "Oh?\n"
.string "Do you perhaps like POKéMON?\p" .string "Do you perhaps like POKéMON?\p"
.string "I'm on assignment with the TV network.\p" .string "I'm on assignment with the TV network.\p"
@@ -488,32 +488,32 @@ SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0
.string "If you don't mind, could you tell me\n" .string "If you don't mind, could you tell me\n"
.string "something about yourself?$" .string "something about yourself?$"
SlateportCity_OceanicMuseum_1F_Text_28126D: @ 0828126D SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort: @ 0828126D
.string "I'm gathering stories on POKéMON and\n" .string "I'm gathering stories on POKéMON and\n"
.string "TRAINERS that occurred recently.\p" .string "TRAINERS that occurred recently.\p"
.string "If you don't mind, could you tell me\n" .string "If you don't mind, could you tell me\n"
.string "something about yourself?$" .string "something about yourself?$"
SlateportCity_OceanicMuseum_1F_Text_2812F2: @ 082812F2 SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon: @ 082812F2
.string "Oh, you will?\n" .string "Oh, you will?\n"
.string "Thank you!\p" .string "Thank you!\p"
.string "Then, please, tell me anything of\n" .string "Then, please, tell me anything of\n"
.string "interest that you experienced recently\l" .string "interest that you experienced recently\l"
.string "involving POKéMON.$" .string "involving POKéMON.$"
SlateportCity_OceanicMuseum_1F_Text_281367: @ 08281367 SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory: @ 08281367
.string "Oh, I see…\p" .string "Oh, I see…\p"
.string "Well, if you do have an interesting\n" .string "Well, if you do have an interesting\n"
.string "story to tell, please let me know.$" .string "story to tell, please let me know.$"
SlateportCity_OceanicMuseum_1F_Text_2813B9: @ 082813B9 SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview: @ 082813B9
.string "Oh, what an uplifting story!\p" .string "Oh, what an uplifting story!\p"
.string "I'll be sure to get your story told\n" .string "I'll be sure to get your story told\n"
.string "on television.\p" .string "on television.\p"
.string "It should be aired sometime, I think,\n" .string "It should be aired sometime, I think,\n"
.string "so please look forward to it.$" .string "so please look forward to it.$"
SlateportCity_OceanicMuseum_1F_Text_28144D: @ 0828144D SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory: @ 0828144D
.string "Hmmm…\n" .string "Hmmm…\n"
.string "I've got a good story for a TV program.\p" .string "I've got a good story for a TV program.\p"
.string "I'd better write it up in a hurry!$" .string "I'd better write it up in a hurry!$"
@@ -612,44 +612,44 @@ gTV3CheersForPokeblocksText05:: @ 08281B93
.string "Tune in next time!\n" .string "Tune in next time!\n"
.string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$" .string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$"
LilycoveCity_PokemonTrainerFanClub_Text_281BCB:: @ 8281BCB LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer:: @ 8281BCB
.string "Hi, there!\p" .string "Hi, there!\p"
.string "I'm a big fan of {STR_VAR_1}.\n" .string "I'm a big fan of {STR_VAR_1}.\n"
.string "What's your opinion of {STR_VAR_1}?$" .string "What's your opinion of {STR_VAR_1}?$"
LilycoveCity_PokemonTrainerFanClub_Text_281C06:: @ 8281C06 LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink:: @ 8281C06
.string "I see, I see. That's what you think\n" .string "I see, I see. That's what you think\n"
.string "about the TRAINER.$" .string "about the TRAINER.$"
LilycoveCity_PokemonTrainerFanClub_Text_281C3D:: @ 8281C3D LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer:: @ 8281C3D
.string "Have you completely forgotten\n" .string "Have you completely forgotten\n"
.string "about {STR_VAR_1}?$" .string "about {STR_VAR_1}?$"
LilycoveCity_PokemonTrainerFanClub_Text_281C65:: @ 8281C65 LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2:: @ 8281C65
.string "I'm a big fan of {STR_VAR_1}.\n" .string "I'm a big fan of {STR_VAR_1}.\n"
.string "What's your opinion of {STR_VAR_1}?$" .string "What's your opinion of {STR_VAR_1}?$"
LilycoveCity_PokemonTrainerFanClub_Text_281C95:: @ 8281C95 LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer:: @ 8281C95
.string "How strong would you rate {STR_VAR_1}\n" .string "How strong would you rate {STR_VAR_1}\n"
.string "on a scale of one hundred?$" .string "on a scale of one hundred?$"
LilycoveCity_PokemonTrainerFanClub_Text_281CCD:: @ 8281CCD LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2:: @ 8281CCD
.string "Have you completely forgotten\n" .string "Have you completely forgotten\n"
.string "about {STR_VAR_1}?$" .string "about {STR_VAR_1}?$"
LilycoveCity_PokemonTrainerFanClub_Text_281CF5:: @ 8281CF5 LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer:: @ 8281CF5
.string "Oh, I see!\n" .string "Oh, I see!\n"
.string "You should meet {STR_VAR_1} sometime.\l" .string "You should meet {STR_VAR_1} sometime.\l"
.string "I'm sure you'll become a fan, too!$" .string "I'm sure you'll become a fan, too!$"
LilycoveCity_PokemonTrainerFanClub_Text_281D40:: @ 8281D40 LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo:: @ 8281D40
.string "I see, I see.\p" .string "I see, I see.\p"
.string "Thank you!\n" .string "Thank you!\n"
.string "That's very useful to know.\p" .string "That's very useful to know.\p"
.string "I'll share this information with other\n" .string "I'll share this information with other\n"
.string "{STR_VAR_1} fans and discuss it.$" .string "{STR_VAR_1} fans and discuss it.$"
LilycoveCity_PokemonTrainerFanClub_Text_281DB4:: @ 8281DB4 LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial:: @ 8281DB4
.string "There's going to be a TV special on\n" .string "There's going to be a TV special on\n"
.string "{STR_VAR_1} very soon.\p" .string "{STR_VAR_1} very soon.\p"
.string "I hope you catch it!$" .string "I hope you catch it!$"
src/tv.c
+15 -23
View File
@@ -762,7 +762,7 @@ void ClearTVShowData(void)
ClearPokemonNews(); ClearPokemonNews();
} }
u8 special_0x44(void) u8 GetRandomActiveShowIdx(void)
{ {
u8 i; u8 i;
u8 j; u8 j;
@@ -771,11 +771,9 @@ u8 special_0x44(void)
for (i = 5; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++) for (i = 5; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++)
{ {
if (gSaveBlock1Ptr->tvShows[i].common.kind == 0) if (gSaveBlock1Ptr->tvShows[i].common.kind == TVSHOW_OFF_AIR)
{
break; break;
} }
}
j = Random() % i; j = Random() % i;
selIdx = j; selIdx = j;
do do
@@ -783,44 +781,38 @@ u8 special_0x44(void)
if (GetTVChannelByShowType(gSaveBlock1Ptr->tvShows[j].common.kind) != 4) if (GetTVChannelByShowType(gSaveBlock1Ptr->tvShows[j].common.kind) != 4)
{ {
if (gSaveBlock1Ptr->tvShows[j].common.active == TRUE) if (gSaveBlock1Ptr->tvShows[j].common.active == TRUE)
{
return j; return j;
} }
}
else else
{ {
show = &gSaveBlock1Ptr->tvShows[j]; show = &gSaveBlock1Ptr->tvShows[j];
if (show->massOutbreak.daysLeft == 0 && show->massOutbreak.active == TRUE) if (show->massOutbreak.daysLeft == 0 && show->massOutbreak.active == TRUE)
{
return j; return j;
} }
}
if (j == 0) if (j == 0)
{
j = ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 2; j = ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 2;
}
else else
{
j --; j --;
}
} while (j != selIdx); } while (j != selIdx);
return 0xFF; return 0xFF;
} }
u8 FindAnyTVShowOnTheAir(void) u8 FindAnyTVShowOnTheAir(void)
{ {
u8 response; u8 show;
response = special_0x44(); show = GetRandomActiveShowIdx();
if (response == 0xFF) if (show == 0xFF)
{ {
return 0xFF; return 0xFF;
} }
if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK) if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[show].common.kind == TVSHOW_MASS_OUTBREAK)
{ {
return FindFirstActiveTVShowThatIsNotAMassOutbreak(); return FindFirstActiveTVShowThatIsNotAMassOutbreak();
} }
return response; return show;
} }
void UpdateTVScreensOnMap(int width, int height) void UpdateTVScreensOnMap(int width, int height)
@@ -876,7 +868,7 @@ void TurnOnTVScreen(void)
DrawWholeMapView(); DrawWholeMapView();
} }
u8 special_0x45(void) u8 GetSelectedTVShow(void)
{ {
return gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004].common.kind; return gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004].common.kind;
} }
@@ -887,7 +879,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++) for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i ++)
{ {
if (gSaveBlock1Ptr->tvShows[i].common.kind != 0 && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].common.active == TRUE) if (gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_OFF_AIR && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
{ {
return i; return i;
} }
@@ -895,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
return 0xFF; return 0xFF;
} }
u8 special_0x4a(void) u8 GetNextActiveShowIfMassOutbreak(void)
{ {
TVShow *tvShow; TVShow *tvShow;
@@ -3149,7 +3141,7 @@ static void InterviewBefore_FanClubSpecial(void)
} }
} }
bool8 sub_80EF88C(u8 monIdx) static bool8 IsPartyMonNicknamedOrNotEnglish(u8 monIdx)
{ {
struct Pokemon *pokemon; struct Pokemon *pokemon;
u8 language; u8 language;
@@ -3164,9 +3156,9 @@ bool8 sub_80EF88C(u8 monIdx)
return TRUE; return TRUE;
} }
bool8 sub_80EF8F8(void) bool8 IsLeadMonNicknamedOrNotEnglish(void)
{ {
return sub_80EF88C(GetLeadMonIndex()); return IsPartyMonNicknamedOrNotEnglish(GetLeadMonIndex());
} }
void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx) void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx)