diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-01-20 15:26:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 15:26:19 -0800 |
| commit | 408fe77d7b9440d7eb5d46eda5f920572d516d67 (patch) | |
| tree | 38953616b74da130bd832635bed1c605d4b0e322 /include/dungeon_entity.h | |
| parent | 3cdde2a92a187d437dc7d24273177b59ab5b9511 (diff) | |
| parent | c5cd6e137fbad180a21ec24a50fde76633db0c20 (diff) | |
Merge pull request #93 from AnonymousRandomPerson/master
More AI decomp
Diffstat (limited to 'include/dungeon_entity.h')
| -rw-r--r-- | include/dungeon_entity.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 640183f..9e9f1f7 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -6,10 +6,12 @@ #include "item.h" #include "position.h" +#define NUM_SPEED_TURN_COUNTERS 5 + struct DungeonActionContainer { /* 0x0 */ u16 action; - /* 0x2 */ s8 facingDir; + /* 0x2 */ u8 facingDir; u8 fill3; // Additional parameter alongside actionIndex. Used for things like indicating which move a Pokémon should use from its moveset. /* 0x4 */ u8 actionUseIndex; @@ -167,8 +169,8 @@ struct DungeonEntityData /* 0x104 */ s32 movementSpeed; // The turn counter for movement speed up/down is split into five timers each. Multiple timers are used if the Pokémon is affected by multiple // speed-up/slow effects at once, like using Agility twice. - /* 0x108 */ u8 speedUpTurnsLeft[5]; - /* 0x10D */ u8 slowTurnsLeft[5]; + /* 0x108 */ u8 speedUpTurnsLeft[NUM_SPEED_TURN_COUNTERS]; + /* 0x10D */ u8 slowTurnsLeft[NUM_SPEED_TURN_COUNTERS]; /* 0x112 */ u8 stockpileCount; u8 fill113; // When true, an AI Pokémon will move in a random direction every turn. |