Match CreatePokemonInfoTabScreen

This commit is contained in:
DizzyEggg 2025-02-25 22:54:57 +01:00
parent a7d4629e6f
commit e47260c871
5 changed files with 233 additions and 809 deletions

View File

@ -13,8 +13,7 @@ struct unkStruct_203B2AC
u8 unk40[0x48 - 0x40];
s16 speciesNum;
struct unkStruct_808FF20 unk4C;
u32 unkB0;
u8 fillB4[0xE0 - 0xB4];
struct UnkInfoTabStruct unkB0;
u32 unkE0;
UnkTextStruct2 *unkE4;
UnkTextStruct3 unkE8;

View File

@ -49,6 +49,12 @@ struct unkStruct_808FF20
u8 unk58[12];
};
struct UnkInfoTabStruct
{
u8 unk0[0xC];
s32 unkC[9];
};
bool8 HasRecruitedMon(s16 species);
s16 GetBaseSpecies(s16 index);
s16 GetBaseSpeciesNoUnown(s16 index);
@ -70,7 +76,7 @@ s16 ExtractSpeciesIndex(UnkDungeonGlobal_unk1CD98 *r0);
void SetSpeciesLevelToExtract(UnkDungeonGlobal_unk1CD98 *r0, s32 level, s32 species);
s32 ExtractLevel(UnkDungeonGlobal_unk1CD98 *r0);
PokemonStruct1 *sub_808F798(PokemonStruct1 *pokemon, short _species);
void CreatePokemonInfoTabScreen(u32, s32, struct unkStruct_808FF20 *, u8 *, u32);
void CreatePokemonInfoTabScreen(s32 param_1, s32 param_2, struct unkStruct_808FF20 *mon, struct UnkInfoTabStruct *param_4, u32 windowId);
void sub_808FF20(struct unkStruct_808FF20 *param_1, struct PokemonStruct1 *pokemon, bool8 param_3);
#endif // GUARD_POKEMON_3_H

View File

@ -83,7 +83,7 @@ static void sub_8024588(void)
static void sub_80245D0(void)
{
CreatePokemonInfoTabScreen(sUnknown_203B2AC->unk34[sUnknown_203B2AC->input.unk1E], sUnknown_203B2AC->input.unk1E, &sUnknown_203B2AC->unk4C, (u8 *)&sUnknown_203B2AC->unkB0, sUnknown_203B2AC->unkE0);
CreatePokemonInfoTabScreen(sUnknown_203B2AC->unk34[sUnknown_203B2AC->input.unk1E], sUnknown_203B2AC->input.unk1E, &sUnknown_203B2AC->unk4C, &sUnknown_203B2AC->unkB0, sUnknown_203B2AC->unkE0);
}
static void sub_8024604(void)

View File

@ -1256,7 +1256,7 @@ void sub_8067F00(u8 a0, PokemonStruct1 **a1, s32 a2_, s32 a3, s32 a4)
void sub_806806C(PokemonStruct1 *a0)
{
struct unkStruct_808FF20 unkStruct;
u8 var_C8[48];
struct UnkInfoTabStruct var_C8;
UnkTextStruct3 spTxtStruct = {0};
s32 r7;
@ -1299,7 +1299,7 @@ void sub_806806C(PokemonStruct1 *a0)
sub_801317C(&gUnknown_202EE10.unk28);
sub_803ECB4(&spTxtStruct, 1);
sub_808FF20(&unkStruct, a0, gDungeon->unk644.unk16);
CreatePokemonInfoTabScreen(spF8[r7], r7, &unkStruct, var_C8, 0);
CreatePokemonInfoTabScreen(spF8[r7], r7, &unkStruct, &var_C8, 0);
gUnknown_202EE10.unkC = (gUnknown_2027370[0].unk0 + 15) * 8;
gUnknown_202EE10.unkE = ((gUnknown_2027370[0].unk2 + 1) * 8) - 2;
@ -1309,7 +1309,7 @@ void sub_806806C(PokemonStruct1 *a0)
AddMenuCursorSprite(&gUnknown_202EE10);
if (spF8[r7] == 4) {
if (var_C8[8] != 0) {
if (var_C8.unk0[8] != 0) {
sub_80684C4();
}
if (unkStruct.unk40 != 0) {
@ -1335,7 +1335,7 @@ void sub_806806C(PokemonStruct1 *a0)
}
if (spF8[r7] == 4) {
if (((gRealInputs.repeated & DPAD_DOWN) || r5 == 2) && var_C8[8] != 0) {
if (((gRealInputs.repeated & DPAD_DOWN) || r5 == 2) && var_C8.unk0[8] != 0) {
s32 i;
sub_8083CE0(0);

File diff suppressed because it is too large Load Diff