diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-10-13 11:09:36 -0400 |
---|---|---|
committer | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-13 10:09:36 -0500 |
commit | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (patch) | |
tree | 60f8af2ad4311a7b83455e5acf1a702e824757fa /src/battle_2.c | |
parent | 428dd0e0a8539b171fccc59ea717fda970a22e91 (diff) |
Decompile TV (#80)
* ClearTVShowData
* special_0x44
* DoTVShow (nonmatching because align)
* DoTVShowBravoTrainerPokemonProfile
* Update field names
* DoTVShowBravoTrainerBattleTower
* Renaming of struct fields
* sub_80EBFF4 and UpdateTVScreensOnMap
* SetTVMetatilesOnMap
* Power buttons for the TV screens on the map
* special_0x45
* sub_80EC18C
* special_0x4a
* ResetGabbyAndTy
* GabbyAndTyBeforeInterview
* GabbyAndTyAfterInterview
* Through IsTVShowInSearchOfTrainersAiring
* GabbyAndTyGetLastQuote
* GabbyAndTyGetLastBattleTrivia
* GabbyAndTySetScriptVarsToFieldObjectLocalIds
* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous
* Make TV structs anonymous within the union
* Move the TV union to its own subheader
* Move TV show enums to the global.tv.h subheader
* Funcion renaming
* Apply static attributes where able
* PutPokemonTodayCaughtOnAir
* sub_80EC8A4
* PutPokemonTodayFailedOnTheAir
* sub_80EC9E8, sub_80ECA10
* sub_80ECA38
* sub_80ECB00
* Put3CheersForPokeblocksOnTheAir
* PutFanClubSpecialOnTheAir
* ContestLiveUpdates_BeforeInterview
* Other before-interview Contest Live Updates functions
* ContestLiveUpdates_BeforeInterview_5
* InterviewAfter_BravoTrainerPokemonProfile
* BravoTrainerPokemonProfile_BeforeInterview1
* BravoTrainerPokemonProfile_BeforeInterview2
* Disassemble TV data
* Decompile TV data
* InterviewAfter_BravoTrainerBattleTowerProfile
* SaveRecordedItemPurchasesForTVShow
* PutNameRaterShowOnTheAir
* StartMassOutbreak
* PutLilycoveContestLadyShowOnTheAir
* InterviewAfter_FanClubLetter
* Rip TV strings
* InterviewAfter_RecentHappenings
* InterviewAfter_PkmnFanClubOpinions
* sub_80ED718
* EndMassOutbreak
* sub_80ED888
* sub_80ED8B4
* UpdateMassOutbreakTimeLeft
* sub_80ED950
* PutFishingAdviceShowOnTheAir
* through sub_80EDA80
* ewram and common syms are now fetched from the object files
* BSS symbols are taken from the tv.o file
* through sub_80EDC60
* sub_80EDCE8
* sub_80EDD78
* through sub_80EDE84
* nomatching sub_80EDE98
* sub_80EDFB4
* sub_80EE104
* sub_80EE104
* sub_80EE184
* sub_80EE2CC
* sub_80EE35C
* sub_80EE44C
* sub_80EE4DC
* sub_80EE5A4
* sub_80EE69C
* sub_80EE72C
* sub_80EE7C0
* sub_80EE818
* sub_80EE8C8
* sub_80EEA70
* sub_80EEB98
* sub_80EEBF4
* through sub_80EED60
* Functions relating to Pokemon News
* sub_80EEF6C
* GetPriceReduction
* IsPriceDiscounted
* sub_80EF120
* through sub_80EF370
* sub_80EF40C
* HasMixableShowAlreadyBeenSpawnedWithPlayerID
* TV_SortPurchasesByQuantity
* FindActiveBroadcastByShowType_SetScriptResult
* InterviewBefore
* through sub_80EF88C
* through sub_80EF93C
* through sub_80EFA24
* through TV_BernoulliTrial
* sub_80EFB58
* sub_80EFBA4
* sub_80EFBDC
* through sub_80EFD98
* ChangePokemonNickname
* ChangeBoxPokemonNickname
* sub_80EFF9C
* through player_id_to_dword
* CheckForBigMovieOrEmergencyNewsOnTV
* GetMomOrDadStringForTVMessage
* sub_80F01E8
* sub_80F0358
* sub_80F049C
* TV record mixing functions
* sub_80F06D0
* sub_80F0708 nonmatching
* through sub_80F0B24
* sub_80F0B64
* through sub_80F0C04
* sub_80F0C7C
* sub_80F0D60
* sub_80F0E58
* sub_80F0E84
* through sub_80F0F24
* sub_80F0F64
* sub_80F1208
* sub_80F1254
* sub_80F1290
* sub_80F12A4
* sub_80F14F8
* DoTVShowTodaysSmartShopper
* DoTVShowTheNameRaterShow
* DoTVShowPokemonTodaySuccessfulCapture
* DoTVShowPokemonTodayFailedCapture
* DoTVShowPokemonFanClubLetter
* DoTVShowRecentHappenings
* DoTVShowPokemonFanClubOpinions
* DoTVShowPokemonNewsMassOutbreak
* DoTVShowPokemonContestLiveUpdates
* DoTVShowPokemonBattleUpdate
* DoTVShow3CheersForPokeblocks
* DoTVShowInSearchOfTrainers
* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc
* DoTVShowPokemonAngler
* DoTVShowTheWorldOfMasters; update RAM symbols and field names
* Decorate static functions
* DoTVShowTodaysRivalTrainer; region map enums
* TVDewfordTrendWatcherNetworkTextGroup
* DoTVShowHoennTreasureInvestigators
* DoTVShowFindThatGamer
* DoTVShowBreakingNewsTV
* DoTVShowSecretBaseVisit
* DoTVShowPokemonLotterWinnerFlashReport
* DoTVShowThePokemonBattleSeminar
* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub
* DoTVShowSpotTheCuties
* DoTVShowPokemonNewsBattleFrontier
* DoTVShowWhatsNo1InHoennToday
* Helpers for DoTVShowSecretBaseSecrets
* DoTVShowSecretBaseSecrets
* DoTVShowSafariFanClub
* Finish decompilation of tv.s
* Some renaming
* Rename text group pointers
* revoke statis; pokenews enums
* Labels are number one
* Label all TV struct fields
* Make data/text/tv.inc more readable
* Split data/text/tv.inc
* Rename pokenews text pointers
* Frontier Symbol constants; indicate static rodata objects with 's' prefix
* Fix leading spaces/tabs
F*** CLion sometimes
* Fix inconsequential warning
Diffstat (limited to 'src/battle_2.c')
-rw-r--r-- | src/battle_2.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index c4da02e36..306008cdb 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -40,6 +40,7 @@ #include "trainer_classes.h" #include "evolution_scene.h" #include "roamer.h" +#include "tv.h" #include "safari_zone.h" #include "battle_string_ids.h" @@ -64,7 +65,6 @@ struct UnknownPokemonStruct2 /*0x1D*/ u8 language; }; -extern u32 gBattleTypeFlags; extern u8 gBattleCommunication[]; extern u8 gBattleTerrain; extern u16 gBattle_BG0_X; @@ -88,7 +88,6 @@ extern void (*gBattleMainFunc)(void); extern void (*gUnknown_030061E8)(void); extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for? extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for? -extern u8 gBattleOutcome; extern u8 gUnknown_02039B28[]; // possibly a struct? extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document extern struct MusicPlayerInfo gMPlay_SE1; @@ -139,7 +138,6 @@ extern u8 gActionForBanks[BATTLE_BANKS_COUNT]; extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT]; extern u8 gCurrentActionFuncId; extern u8 gLastUsedAbility; -extern u16 gLastUsedItem; extern u8 gUnknown_0203CF00[]; extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT]; extern const u8* gBattlescriptCurrInstr; @@ -152,7 +150,6 @@ extern u8 gCurrMovePos; extern u8 gUnknown_020241E9; extern u16 gLastUsedMove; -extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const struct BattleMove gBattleMoves[]; extern const u16 gUnknown_08C004E0[]; // battle textbox palette extern const struct BgTemplate gUnknown_0831AA08[]; @@ -226,8 +223,6 @@ extern u8 sub_81A9E28(void); // battle frontier 2 extern void sub_81A56E8(u8 bank); // battle frontier 2 extern void sub_81B8FB0(u8, u8); // party menu extern u8 pokemon_order_func(u8); // party menu -extern void sub_80EC728(void); // tv -extern void sub_80EE184(void); // tv extern bool8 InBattlePyramid(void); // this file's functions @@ -859,7 +854,7 @@ static void CB2_HandleStartBattle(void) { s32 i; - for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == 3; i++); + for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); if (i == 2) gBattleCommunication[MULTIUSE_STATE] = 16; @@ -2073,7 +2068,7 @@ static void sub_8038F34(void) else monsCount = 2; - for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == 3; i++); + for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount) { @@ -4927,7 +4922,7 @@ static void HandleEndTurn_FinishBattle(void) } } } - sub_80EC728(); + PutPokemonTodayCaughtOnAir(); } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK |