diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-01-07 16:30:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 16:30:55 -0800 |
| commit | 3cdde2a92a187d437dc7d24273177b59ab5b9511 (patch) | |
| tree | 2d5924a28e208e14d302c24f9ea5f0a17a8e81a2 /include/dungeon_entity.h | |
| parent | edf909be4da55a435bf81f96ffcbd156b2120562 (diff) | |
| parent | 42bcb068b61656f083009816b927207393a35b10 (diff) | |
Merge pull request #92 from AnonymousRandomPerson/master
More item AI decomp
Diffstat (limited to 'include/dungeon_entity.h')
| -rw-r--r-- | include/dungeon_entity.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 233ef8e..640183f 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -164,8 +164,7 @@ struct DungeonEntityData u8 fillFE[0x100 - 0xFE]; /* 0x100 */ u8 targetingDecoy; // If the Pokémon is targeting a decoy, this indicates whether the decoy target is a team or wild Pokémon. u8 fill101[0x104 - 0x101]; - /* 0x104 */ u8 movementSpeed; - u8 fill105[0x108 - 0x105]; + /* 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]; @@ -195,7 +194,9 @@ struct DungeonEntityData u8 unk15D; u8 unk15E; u8 unk15F; - u8 fill160[0x16C - 0x160]; + u8 fill160[0x169 - 0x160]; + u8 turnsSinceWarpScarfActivation; + u8 fill16A[0x16C - 0x16A]; /* 0x16C */ struct Position targetPosition; /* 0x170 */ struct Position posPixel; u32 unk174; |