Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-27 06:50:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label TV specials, and port over some TV changes from pokeemerald

Browse Source
This commit is contained in:
Marcus Huderle 2018-01-01 09:34:13 -06:00
parent c8d963b26a
commit 2da819cabb
7 changed files with 355 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data-de/event_scripts.s vendored
View File

@ -4415,14 +4415,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
@ -4467,7 +4467,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
@ -4522,11 +4522,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
@ -4603,7 +4603,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
@ -4663,7 +4663,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
@ -4700,7 +4700,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
@ -4769,7 +4769,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

18
data/event_scripts.s vendored
View File

@ -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

10
data/scripts/maps/SlateportCity_House1.inc vendored
View File

@ -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

6
data/scripts/tv.inc vendored
View File

@ -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

20
data/specials.inc
View File

@ -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

58
include/global.h
View File

@ -241,8 +241,8 @@ struct EasyChatPair
struct TVShowCommon
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 pad02[20];
/*0x16*/ u16 var16[3];
/*0x1C*/ u8 srcTrainerId3Lo;
@ -257,8 +257,8 @@ struct TVShowCommon
struct TVShowFanClubLetter
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 species;
/*0x04*/ u16 pad04[6];
/*0x10*/ u8 playerName[8];
@ -267,8 +267,8 @@ struct TVShowFanClubLetter
struct TVShowRecentHappenings
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 var02;
/*0x04*/ u16 var04[6];
/*0x10*/ u8 playerName[8];
@ -278,8 +278,8 @@ struct TVShowRecentHappenings
struct TVShowFanclubOpinions
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 var02;
/*0x04*/ u8 var04A:4;
/*0x04*/ u8 var04B:4;
@ -294,16 +294,16 @@ struct TVShowFanclubOpinions
struct TVShowUnknownType04
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 pad02[4];
/*0x06*/ u16 var06;
};
struct TVShowNameRaterShow
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 species;
/*0x04*/ u8 pokemonName[11];
/*0x0F*/ u8 trainerName[11];
@ -316,8 +316,8 @@ struct TVShowNameRaterShow
struct TVShowBravoTrainerPokemonProfiles
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 species;
/*0x04*/ u16 var04[2];
/*0x08*/ u8 pokemonNickname[11];
@ -333,8 +333,8 @@ struct TVShowBravoTrainerPokemonProfiles
struct TVShowBravoTrainerBattleTowerSpotlight
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 trainerName[8];
/*0x0A*/ u16 species;
/*0x0C*/ u8 pokemonName[8];
@ -349,8 +349,8 @@ struct TVShowBravoTrainerBattleTowerSpotlight
struct TVShowPokemonToday
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 language;
/*0x03*/ u8 language2;
/*0x04*/ u8 nickname[11];
@ -362,8 +362,8 @@ struct TVShowPokemonToday
struct TVShowSmartShopper
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 priceReduced;
/*0x03*/ u8 language;
/*0x04*/ u8 pad04[2];
@ -375,8 +375,8 @@ struct TVShowSmartShopper
struct TVShowPokemonTodayFailed
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 language;
/*0x03*/ u8 pad03[9];
/*0x0c*/ u16 species;
@ -389,8 +389,8 @@ struct TVShowPokemonTodayFailed
struct TVShowPokemonAngler
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 var02;
/*0x03*/ u8 var03;
/*0x04*/ u16 var04;
@ -401,8 +401,8 @@ struct TVShowPokemonAngler
struct TVShowWorldOfMasters
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u16 var02;
/*0x04*/ u16 var04;
/*0x06*/ u16 var06;
@ -415,8 +415,8 @@ struct TVShowWorldOfMasters
struct TVShowMassOutbreak
{
/*0x00*/ u8 var00;
/*0x01*/ u8 var01;
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 var02;
/*0x03*/ u8 var03;
/*0x04*/ u16 moves[4];
@ -428,7 +428,7 @@ struct TVShowMassOutbreak
/*0x13*/ u8 probability;
/*0x14*/ u8 level;
/*0x15*/ u8 var15;
/*0x16*/ u16 var16;
/*0x16*/ u16 daysLeft;
/*0x18*/ u8 language;
u8 pad19[11];
};

571
src/field/tv.c
View File

File diff suppressed because it is too large Load Diff