From 4bf154654bbf3dbb259e5ce6985e17d24260a72e Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 26 Dec 2021 00:03:03 -0600 Subject: Decomped TargetThrownItem() --- include/dungeon_ai_items.h | 2 ++ include/dungeon_entity.h | 1 + 2 files changed, 3 insertions(+) (limited to 'include') 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..527d817 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -2,6 +2,7 @@ #define GUARD_DUNGEON_ENTITY_H #include "constants/move.h" +#include "global.h" #include "item.h" #include "position.h" -- cgit v1.2.3 From d40d2e55a304ec355595b4a0f9f8d51ca3eb2769 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 27 Dec 2021 23:21:11 -0600 Subject: Decomped IsTargetStraightAhead() --- include/dungeon_ai_attack.h | 9 +++++++++ include/map.h | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 include/dungeon_ai_attack.h (limited to 'include') 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/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, -- cgit v1.2.3 From ea10f7b7bd6957312b9b0dfa371761c5936bc80a Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 28 Dec 2021 22:15:56 -0600 Subject: Created header for pokemon_3 --- include/dungeon_entity.h | 2 +- include/pokemon_3.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 include/pokemon_3.h (limited to 'include') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 527d817..233ef8e 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -1,8 +1,8 @@ #ifndef GUARD_DUNGEON_ENTITY_H #define GUARD_DUNGEON_ENTITY_H +#include "constants/global.h" #include "constants/move.h" -#include "global.h" #include "item.h" #include "position.h" 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 -- cgit v1.2.3