rebase updates

This commit is contained in:
Seth Barberee
2024-09-18 19:35:14 -07:00
parent 24ff46c585
commit 0ceb445c25
27 changed files with 92 additions and 91 deletions

View File

@@ -168,6 +168,12 @@ typedef struct Unk_Entity_x184
/* 0x19e - 0x1a */ u8 unk1A;
} Unk_Entity_x184 ;
typedef struct Moves
{
/* 0x118 */ Move moves[MAX_MON_MOVES];
/* 0x138 */ u8 struggleMoveFlags;
} Moves;
// size: 0x208
typedef struct EntityInfo
{
@@ -272,8 +278,7 @@ typedef struct EntityInfo
// When non-zero, an AI Pokémon will move in a random direction every turn when it is a room.
// There is a chance of this flag being set when a wild Pokémon spawns. The chance depends on the dungeon's randomMovementChance.
/* 0x114 */ u32 moveRandomly;
/* 0x118 */ Move moves[MAX_MON_MOVES];
/* 0x138 */ u8 struggleMoveFlags;
/* 0x118 */ Moves moves;
/* 0x13C */ FixedPoint belly;
/* 0x140 */ FixedPoint maxBelly;
/* 0x144 */ bool8 aiNextToTarget; // True if an AI Pokémon is following another Pokémon and is already adjacent to them.

View File

@@ -69,10 +69,10 @@ typedef struct PokemonStruct2
u16 unk12; // pokeHP
/* 0x14 */ Offense offense; // offense (other offset)
/* 0x18 */ u32 currExp;
/* 0x1C */ unkStruct_8094184 moves;
/* 0x1C */ Moves moves;
/* 0x40 */ Item itemSlot; // heldItem
u32 belly; // some struct
u32 maxBelly; // some struct (same type as 44)
FixedPoint belly; // some struct
FixedPoint maxBelly; // some struct (same type as 44)
/* 0x4C */ u32 IQSkills; // unk20
/* 0x50 */ u8 tacticIndex;
/* 0x54 */ HiddenPower hiddenPower;