diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-10-22 13:20:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 10:20:01 -0700 |
| commit | c98fb2c11272680a20b9cfb9efe2ce482d3779dd (patch) | |
| tree | d5001c7adfe550c52f8190934a74849920bd9eaa /include/dungeon_entity.h | |
| parent | 3e5dd1d047bada52ab0dce2fe58b04e39bcaa1cc (diff) | |
Decomped DecideAction() (#66)
* Decomped DecideAction()
* Defined dungeon Pokémon array sizes
Diffstat (limited to 'include/dungeon_entity.h')
| -rw-r--r-- | include/dungeon_entity.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 57ea24b..58a7d24 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -10,9 +10,8 @@ struct DungeonEntityData // Pokemon: MovementFlag // Items: ItemFlag // Traps: TrapType - /* 0x0 */ u8 flags; - /* 0x1 */ bool8 moving; - /* 0x2 */ u16 entityID; // Pokémon species or item ID. + /* 0x0 */ u16 flags; + /* 0x2 */ s16 entityID; // Pokémon species or item ID. // Everything from here on only applies to Pokémon. /* 0x4 */ u16 transformSpecies; // Shows a different Pokémon when using Transform. /* 0x6 */ bool8 isEnemy; @@ -97,7 +96,7 @@ struct DungeonEntityData /* 0x90 */ u8 IQSkillsEnabled[4]; /* 0x94 */ u8 tactics; u8 fill95[0xA4 - 0x95]; - /* 0xA4 */ u8 clientFlags; + /* 0xA4 */ u8 clientType; u8 fillA5[0xA8 - 0xA5]; // Statuses are split into groups based on which ones can't overlap. // See status.h for which statuses are in each group. @@ -290,6 +289,7 @@ enum EntityType enum MovementFlag { MOVEMENT_FLAG_SWAPPED_PLACES = 1 << 5, + MOVEMENT_FLAG_MOVING = 1 << 9, MOVEMENT_FLAG_SWAPPED_PLACES_PETRIFIED = 1 << 15 // Set if the Pokémon is petrified and the leader cures them by swapping places. }; @@ -312,10 +312,11 @@ enum MovementAction MOVEMENT_ACTION_TAKE_ITEM = 7 }; -enum ClientFlag +enum ClientType { - CLIENT_FLAGS_CLIENT = 1, // Used for mission clients that need rescuing. - CLIENT_FLAGS_DONT_MOVE = 3 // Used for Diglett in the Skarmory boss fight. + CLIENT_TYPE_NONE = 0, + CLIENT_TYPE_CLIENT = 1, // Used for mission clients that need rescuing. + CLIENT_TYPE_DONT_MOVE = 3 // Used for Diglett in the Skarmory boss fight. }; enum VisualFlag |