From a61f7ea2a1913df28ea4f3ecd71c57fa4e5bbf5c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 29 Dec 2021 23:33:22 -0600 Subject: Decomped HasItem() --- src/dungeon_pokemon_attributes_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dungeon_pokemon_attributes_1.c') diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c index a5d6acf..f3829b2 100644 --- a/src/dungeon_pokemon_attributes_1.c +++ b/src/dungeon_pokemon_attributes_1.c @@ -1,19 +1,19 @@ #include "global.h" -#include "dungeon_global_data.h" #include "dungeon_pokemon_attributes_1.h" -#include "dungeon_util.h" -#include "pokemon.h" #include "constants/dungeon.h" #include "constants/iq_skill.h" #include "constants/move_id.h" #include "constants/status.h" #include "constants/tactic.h" +#include "dungeon_global_data.h" +#include "dungeon_items.h" +#include "dungeon_util.h" +#include "pokemon.h" #include "pokemon_3.h" extern s16 gItemMasterMinWildLevel; -extern u8 HasItem(struct DungeonEntity *, u32); extern bool8 IsIQSkillSet(u8 *, u32); extern void SetIQSkill(u8 *param_1, u32 skillIndex); -- cgit v1.2.3 From 2fa42b2987c9623b0bbfae37eba9569ceb69930b Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 4 Jan 2022 23:34:35 -0600 Subject: Moved some constants from data to source --- src/dungeon_pokemon_attributes_1.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/dungeon_pokemon_attributes_1.c') diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c index f3829b2..93d8d4a 100644 --- a/src/dungeon_pokemon_attributes_1.c +++ b/src/dungeon_pokemon_attributes_1.c @@ -12,8 +12,7 @@ #include "pokemon.h" #include "pokemon_3.h" -extern s16 gItemMasterMinWildLevel; - +const s16 gItemMasterMinWildLevel[] = {16}; extern bool8 IsIQSkillSet(u8 *, u32); extern void SetIQSkill(u8 *param_1, u32 skillIndex); @@ -73,7 +72,7 @@ void LoadIQSkills(struct DungeonEntity *pokemon) SetIQSkill(iVar2, IQ_SKILL_ITEM_CATCHER); if (pokemonData->isBoss) SetIQSkill(iVar2, IQ_SKILL_SELF_CURER); - if (pokemonData->level >= gItemMasterMinWildLevel) + if (pokemonData->level >= *gItemMasterMinWildLevel) SetIQSkill(iVar2, IQ_SKILL_ITEM_MASTER); pokemonData->tactic = TACTIC_GO_AFTER_FOES; } -- cgit v1.2.3