diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-19 16:38:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 16:38:51 -0600 |
| commit | 8e1c66d8bd01807285b05d8333f36cd2d70e062c (patch) | |
| tree | bb1bf94d56b770eca66780948ff9e05401967ed1 /include/dungeon_entity.h | |
| parent | 087405b9d975b447ef7b17afd1e73e449cc7881b (diff) | |
| parent | 0369264407563b64d60c885f8bf79322b6f663c8 (diff) | |
Merge pull request #85 from AnonymousRandomPerson/master
More AI decomp
Diffstat (limited to 'include/dungeon_entity.h')
| -rw-r--r-- | include/dungeon_entity.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index b894a2f..f4e836c 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -3,7 +3,7 @@ #include "constants/move.h" #include "item.h" -#include "map.h" +#include "position.h" struct DungeonActionContainer { @@ -272,10 +272,10 @@ struct DungeonEntity enum EntityType { - ENTITY_NONE = 0, - ENTITY_POKEMON = 1, - ENTITY_TRAP = 2, - ENTITY_ITEM = 3 + ENTITY_NONE, + ENTITY_POKEMON, + ENTITY_TRAP, + ENTITY_ITEM }; enum MovementFlag @@ -287,10 +287,11 @@ enum MovementFlag enum ShopkeeperMode { - SHOPKEEPER_FRIENDLY = 1, + SHOPKEEPER_NONE, + SHOPKEEPER_FRIENDLY, // These two modes trigger if an explosion damages the shopkeeper. The shopkeeper attacks the side that damaged it. - SHOPKEEPER_AGGRESSIVE_TO_WILD = 2, - SHOPKEEPER_AGGRESSIVE_TO_PLAYER = 3 + SHOPKEEPER_AGGRESSIVE_TO_WILD, + SHOPKEEPER_AGGRESSIVE_TO_PLAYER }; enum MovementAction @@ -308,7 +309,7 @@ enum ClientType { 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. + CLIENT_TYPE_DONT_MOVE = 4 // Used for Diglett in the Skarmory boss fight. }; enum VisualFlag |