diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_entity.h | 6 | ||||
| -rw-r--r-- | include/status_checks.h | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 640183f..7e562fc 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -6,6 +6,8 @@ #include "item.h" #include "position.h" +#define NUM_SPEED_TURN_COUNTERS 5 + struct DungeonActionContainer { /* 0x0 */ u16 action; @@ -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. diff --git a/include/status_checks.h b/include/status_checks.h new file mode 100644 index 0000000..e899f74 --- /dev/null +++ b/include/status_checks.h @@ -0,0 +1,9 @@ +#ifndef GUARD_STATUS_CHECKS_H +#define GUARD_STATUS_CHECKS_H + +#include "dungeon_entity.h" + +// 0x70A58 +bool8 HasNegativeStatus(struct DungeonEntity *pokemon); + +#endif |