diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-28 23:00:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-28 23:00:59 -0600 |
| commit | edf909be4da55a435bf81f96ffcbd156b2120562 (patch) | |
| tree | 7bbce0d40ce8c714e793ef22f3a7c125f9ff3fbd /include | |
| parent | 6512ebff67e163a5a6c0f5e19847e2a4dda19ad1 (diff) | |
| parent | ea10f7b7bd6957312b9b0dfa371761c5936bc80a (diff) | |
Merge pull request #91 from AnonymousRandomPerson/master
More item AI decomp
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_ai_attack.h | 9 | ||||
| -rw-r--r-- | include/dungeon_ai_items.h | 2 | ||||
| -rw-r--r-- | include/dungeon_entity.h | 1 | ||||
| -rw-r--r-- | include/map.h | 4 | ||||
| -rw-r--r-- | include/pokemon_3.h | 6 |
5 files changed, 20 insertions, 2 deletions
diff --git a/include/dungeon_ai_attack.h b/include/dungeon_ai_attack.h new file mode 100644 index 0000000..75abcab --- /dev/null +++ b/include/dungeon_ai_attack.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DUNGEON_AI_ATTACK_H +#define GUARD_DUNGEON_AI_ATTACK_H + +#include "dungeon_entity.h" + +// 0x7C9F8 +bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange); + +#endif diff --git a/include/dungeon_ai_items.h b/include/dungeon_ai_items.h index 676200a..5daf7b0 100644 --- a/include/dungeon_ai_items.h +++ b/include/dungeon_ai_items.h @@ -10,5 +10,7 @@ void DecideUseItem(struct DungeonEntity *pokemon); void FindStraightThrowableTargets(struct DungeonEntity *pokemon, s32 thrownAIFlag, struct ItemSlot *item, bool8 ignoreRollChance); // 0x73AA0 void FindRockItemTargets(struct DungeonEntity *pokemon, struct ItemSlot *item, struct Position potentialTargets[], bool8 ignoreRollChance); +// 0x73B78 +void TargetThrownItem(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, struct ItemSlot *item, s32 targetingFlags, bool8 ignoreRollChance); #endif diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 29fda0a..233ef8e 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -1,6 +1,7 @@ #ifndef GUARD_DUNGEON_ENTITY_H #define GUARD_DUNGEON_ENTITY_H +#include "constants/global.h" #include "constants/move.h" #include "item.h" #include "position.h" diff --git a/include/map.h b/include/map.h index 2989c6c..bb991ff 100644 --- a/include/map.h +++ b/include/map.h @@ -42,8 +42,8 @@ struct MapRoom enum TileType { TILE_TYPE_FLOOR = 1 << 0, - TILE_TYPE_UNK_1 = 1 << 1, - TILE_TYPE_LIQUID = 1 << 2, // Water or lava depending on the dungeon. + TILE_TYPE_LIQUID = 1 << 1, // Water or lava depending on the dungeon. + TILE_TYPE_UNK_2 = 1 << 2, TILE_TYPE_ROOM_EXIT = 1 << 3, TILE_TYPE_MAP_EDGE = 1 << 4, TILE_TYPE_SHOP = 1 << 5, diff --git a/include/pokemon_3.h b/include/pokemon_3.h new file mode 100644 index 0000000..968e2ef --- /dev/null +++ b/include/pokemon_3.h @@ -0,0 +1,6 @@ +#ifndef GUARD_POKEMON_3_H +#define GUARD_POKEMON_3_H + +bool8 IsIQSkillSet(u8 *IQSkillsEnabled, u32 IQSkill); + +#endif |