sub_8044124

This commit is contained in:
DizzyEggg
2024-10-12 21:08:16 +02:00
parent 854680fe7f
commit 8b7e2e324e
8 changed files with 277 additions and 667 deletions

View File

@@ -91,4 +91,11 @@ u32 sub_80913E0(Item *slot, u32, struct subStruct_203B240 **);
UNUSED Item *item = &gTeamInventoryRef->teamItems[id]; \
}
static inline void ZeroOutItem(Item *item)
{
item->id = 0;
item->quantity = 0;
item->flags = 0;
}
#endif // GUARD_ITEMS_H

View File

@@ -89,4 +89,9 @@ void sub_8094060(Move *srcMoves, Move *destMoves);
void sub_8094184(struct unkStruct_8094924 *, struct Moves *);
void sub_80941FC(struct unkStruct_8094924 *, struct Moves *);
static inline bool8 MoveFlagExists(Move *move)
{
return (move->moveFlags & MOVE_FLAG_EXISTS);
}
#endif // GUARD_MOVES_H

View File

@@ -98,4 +98,21 @@ extern PokemonStruct1 *sub_808D3F8(void);
extern s32 GetUnitSum_808D544(u32);
extern s32 sub_808D580(s32 *);
static inline bool8 PokemonFlag1(PokemonStruct1 *mon)
{
return ((mon->unk0 & 1));
}
static inline bool8 PokemonFlag2(PokemonStruct1 *mon)
{
return (((mon->unk0 >> 1) & 1));
}
#include "constants/dungeon.h"
static inline bool8 IsMonPartner(PokemonStruct1 *mon)
{
return (mon->dungeonLocation.id == DUNGEON_JOIN_LOCATION_PARTNER);
}
#endif // GUARD_POKEMON_H

View File

@@ -202,6 +202,7 @@ struct unkStruct_Dungeon5C4_sub
struct unkStruct_Dungeon64C
{
u8 unk0;
u8 unk1;
u32 unk4;
};
@@ -237,7 +238,7 @@ typedef struct Dungeon
/* 0x57C */ u8 fill57C[0x5C0 - 0x57c];
/* 0x5C0 */ s32 unk5C0;
/* 0x5C4 */ struct unkStruct_Dungeon5C4_sub unk5C4[3];
u8 fill5F4[0x644 - 0x5f4];
/* 0x5F4 */ u8 faintStringBuffer[80];
/* 0x644 */ DungeonLocation dungeonLocation;
/* 0x648 */ DungeonLocation dungeonLocation2;
struct unkStruct_Dungeon64C unk64C;

View File

@@ -30,7 +30,7 @@ typedef struct PokemonStruct1
/* 0x8 */ s16 speciesNum;
unkPokeSubStruct_C unkC[2];
/* 0x14 */ s16 IQ;
/* 0x16 */ u16 pokeHP;
/* 0x16 */ s16 pokeHP;
/* 0x18 */ Offense offense;
/* 0x1C */ u32 currExp;
/* 0x20 */ u32 IQSkills;