diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/event_scripts.s | 18 | ||||
-rw-r--r-- | data/scripts/maps/SlateportCity_House1.inc | 10 | ||||
-rw-r--r-- | data/scripts/tv.inc | 6 | ||||
-rw-r--r-- | data/specials.inc | 20 |
4 files changed, 27 insertions, 27 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 7b69ac338..5ff370f99 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4383,14 +4383,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special sub_80BDE48 + special InterviewAfter incrementgamestat GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar VAR_SPECIAL_5, 1 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4435,7 +4435,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar VAR_SPECIAL_5, 2 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4490,11 +4490,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialvar RESULT, sub_80BF544 + specialvar RESULT, LeadMonNicknamed compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar VAR_SPECIAL_5, 3 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4571,7 +4571,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4631,7 +4631,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch VAR_CONTEST_LOCATION @@ -4668,7 +4668,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4737,7 +4737,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e760beab5..2a25ded19 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -30,12 +30,12 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C - special sub_80BFAE0 - special sub_80BFB10 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C - special sub_80BFAE0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 @@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialvar RESULT, sub_80BF9B4 - special sub_80BFAE0 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index d893a729f..cf82cf943 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,7 +1,7 @@ Event_TV:: @ 81A6E72 lockall incrementgamestat GAME_STAT_WATCHED_TV - special sub_80C2014 + special ResetTVShowState specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 goto_if_eq EventScript_1A6F01 @@ -21,11 +21,11 @@ EventScript_1A6EBB: specialvar VAR_SPECIAL_4, special_0x44 compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F - specialvar RESULT, special_0x4a + specialvar RESULT, GetNonMassOutbreakActiveTVShow compare RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar VAR_SPECIAL_4, RESULT - specialvar RESULT, sub_80BDA0C + specialvar RESULT, GetTVShowType compare RESULT, 0 goto_if 5, EventScript_1A6F21 end diff --git a/data/specials.inc b/data/specials.inc index f8f6f1c52..71e08d91e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -73,16 +73,16 @@ gSpecials:: def_special DoTVShow def_special DoPokeNews def_special special_0x44 - def_special sub_80BDA0C - def_special sub_80BF2C4 - def_special sub_80BDE48 - def_special sub_80BF544 + def_special GetTVShowType + def_special InterviewBefore + def_special InterviewAfter + def_special LeadMonNicknamed def_special SetContestCategoryStringVarForInterview - def_special special_0x4a - def_special sub_80BF974 + def_special GetNonMassOutbreakActiveTVShow + def_special TV_IsScriptShowKindAlreadyInQueue def_special CheckForBigMovieOrEmergencyNewsOnTV def_special GetMomOrDadStringForTVMessage - def_special sub_80C2014 + def_special ResetTVShowState def_special sub_80C47C0 def_special sub_80C496C def_special sub_80C4C28 @@ -130,9 +130,9 @@ gSpecials:: def_special CompareShroomishSize def_special GetBarboachSizeRecordInfo def_special CompareBarboachSize - def_special sub_80BF9B4 - def_special sub_80BFAE0 - def_special sub_80BFB10 + def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID def_special sub_80FA5BC def_special sub_80FA5E4 def_special sub_80EB83C |