diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-10-15 18:30:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 15:30:33 -0700 |
| commit | 3f7ee3a806d965fae70fd98f2cd1af13a2e4cf0b (patch) | |
| tree | d8edbe0b291c2771dd3cf0c52fb088d303a03d2c /include | |
| parent | 18726d97cfe82c38a4809ca1fb4fd4aeda7a7ee1 (diff) | |
Decomped entityExists() (#64)
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_engine.h | 9 | ||||
| -rw-r--r-- | include/dungeon_entity.h | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/dungeon_engine.h b/include/dungeon_engine.h new file mode 100644 index 0000000..152bda6 --- /dev/null +++ b/include/dungeon_engine.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DUNGEON_ENGINE_H +#define GUARD_DUNGEON_ENGINE_H + +#include "dungeon_entity.h" + +// 0x8075990 +void decideAction(struct DungeonEntity *pokemon); + +#endif
\ No newline at end of file diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 6b11b8a..12bb3da 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -229,8 +229,7 @@ struct DungeonEntityData // Used for Pokémon, items, and traps. struct DungeonEntity { - /* 0x0 */ u8 entityType; - u8 fill1[0x4 - 0x1]; + /* 0x0 */ u32 entityType; /* 0x4 */ s16 posWorldX; /* 0x6 */ s16 posWorldY; /* 0x8 */ s16 prevPosWorldX; @@ -282,6 +281,7 @@ struct DungeonEntity enum EntityType { + ENTITY_NONE = 0, ENTITY_POKEMON = 1, ENTITY_ITEM = 2, ENTITY_TRAP = 3 |