Decompile more of contest_link_80F57C4.c

This commit is contained in:
Marcus Huderle 2019-01-04 16:55:03 -06:00 committed by huderlem
parent 55202eac24
commit 95db853a78
10 changed files with 1316 additions and 2819 deletions

File diff suppressed because it is too large Load Diff

View File

@ -442,6 +442,8 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
void sub_80DB09C(u8 contestCategory);
void sub_80DCE58(u8);
void sub_80DFA08(struct ContestPokemon *mon, int language);
void sub_80DBED4(void);
u8 sub_80DEFA8(u8, u8);
// contest link
void sub_81D9DE4(u8 taskId);
@ -454,4 +456,5 @@ bool8 sub_80FC55C(void);
bool8 sub_80FC530(u8);
u8 sub_80F86E0(u8 *);
#endif //GUARD_CONTEST_H

View File

@ -13,4 +13,7 @@ enum
void sub_812FDA8(int);
void CB2_ContestPainting(void);
extern u8 gUnknown_02039F5C;
extern u8 gUnknown_02039F5D;
#endif

View File

@ -4834,5 +4834,16 @@ extern const u32 gUnknown_08C19EEC[];
extern const u32 gUnknown_08C1A000[];
extern const u32 gUnknown_08C1A12C[];
extern const u32 gUnknown_08C1A2B4[];
extern const u16 gUnknown_08DC6498[];
extern const u16 gUnknown_08DC63F8[];
extern const u16 gUnknown_08DC6420[];
extern const u16 gUnknown_08DC6448[];
extern const u16 gUnknown_08DC6470[];
extern const u16 gUnknown_08DC64AC[];
extern const u16 gUnknown_08DC64C0[];
extern const u16 gUnknown_08DC64D4[];
extern const u16 gUnknown_08DC64E8[];
extern const u16 gUnknown_08DC64FC[];
extern const u16 gUnknown_08DC6510[];
#endif //GUARD_GRAPHICS_H

View File

@ -210,6 +210,7 @@ struct UnkRfuStruct_8010A14
extern struct UnkRfuStruct_1 gUnknown_03004140;
extern struct UnkRfuStruct_2 gUnknown_03005000;
extern u8 gWirelessStatusIndicatorSpriteId;
// Exported ROM declarations
u32 sub_800BEC0(void);

View File

@ -2209,5 +2209,10 @@ extern const u8 MatchCall_BattlePyramidText14[];
// Contest Link
extern const u8 gText_ColorDarkGrey[];
extern const u8 gText_CommunicationStandby[];
extern const u8 gText_AnnouncingResults[];
extern const u8 gText_PreliminaryResults[];
extern const u8 gText_Round2Results[];
extern const u8 gText_Var1sVar2Won[];
#endif //GUARD_STRINGS_H

View File

@ -48,10 +48,13 @@ void PutPokemonTodayCaughtOnAir(void);
void TV_PutSecretBaseVisitOnTheAir(void);
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
void InterviewBefore(void);
void InterviewAfter(void);
void UpdateTVScreensOnMap(int, int);
void TV_PrintIntToStringVar(u8 varIdx, int value);
void SaveRecordedItemPurchasesForTVShow(void);
bool8 sub_80EE818(void);
void sub_80EE8C8(u16 winStreak, u8 facilityAndMode);
void BravoTrainerPokemonProfile_BeforeInterview2(u8 contestStandingPlace);
#endif //GUARD_TV_H

File diff suppressed because it is too large Load Diff

View File

@ -20,9 +20,6 @@
#include "window.h"
#include "constants/rgb.h"
extern u8 gUnknown_02039F5C;
extern u8 gUnknown_02039F5D;
extern u16 (*gUnknown_03006190)[][32];
extern struct ContestWinner *gUnknown_030061C0;
extern u16 *gContestPaintingMonPalette;

View File

@ -1516,7 +1516,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0)
}
}
void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0)
void BravoTrainerPokemonProfile_BeforeInterview2(u8 contestStandingPlace)
{
TVShow *show;
@ -1524,7 +1524,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0)
sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
if (sCurTVShowSlot != -1)
{
show->bravoTrainer.contestResult = a0;
show->bravoTrainer.contestResult = contestStandingPlace;
show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory;
show->bravoTrainer.contestRank = gSpecialVar_ContestRank;
show->bravoTrainer.species = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SPECIES, NULL);