diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-01-07 16:30:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 16:30:55 -0800 |
| commit | 3cdde2a92a187d437dc7d24273177b59ab5b9511 (patch) | |
| tree | 2d5924a28e208e14d302c24f9ea5f0a17a8e81a2 /src/dungeon_pokemon_attributes_1.c | |
| parent | edf909be4da55a435bf81f96ffcbd156b2120562 (diff) | |
| parent | 42bcb068b61656f083009816b927207393a35b10 (diff) | |
Merge pull request #92 from AnonymousRandomPerson/master
More item AI decomp
Diffstat (limited to 'src/dungeon_pokemon_attributes_1.c')
| -rw-r--r-- | src/dungeon_pokemon_attributes_1.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c index a5d6acf..93d8d4a 100644 --- a/src/dungeon_pokemon_attributes_1.c +++ b/src/dungeon_pokemon_attributes_1.c @@ -1,19 +1,18 @@ #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); +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; } |