From da7b30612f2cac57da0ffe09d1d7c42e309d15f2 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 12 Jul 2021 21:10:32 +0200 Subject: More work on item related functions (#44) * decompile sub_8091290 * decompile sub_80912c8 * rename functions / struct field * more names * decompile 80913A0 * decompile GetItemMove * decompile sub_80913E0 * rename function * decompile CanSellItem function * rename inventory struct * add some item check functions * fix renaming stuff * this file shouldnt have been here * forgot merge conflict * decompile more item functions * rename some stuff * fix HM/TM naming * Update src/code_801AFA4.c Use enum value for USED_TM * Fix incorrect value * decompile sub_80915F4 * decompile HasGummiItem * decompiled another function and renamed stuff * decompile 2 smaller functions * more functions * more decompiling and renaming * redo change that was undone in the merge --- include/pokemon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 38f4bc8..e3a5ab1 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -18,7 +18,7 @@ struct PokemonStruct u8 fillD[0x10 - 0xD]; u8 unk10; u8 fill11[0x14 - 0x11]; - u16 unk14; + /* 0x14 */ u16 IQ; /* 0x16 */ u16 pokeHP; // HP /* 0x18 */ u8 pokeAtt; // attack /* 0x19 */ u8 pokeSPAtt; // sp attack @@ -144,7 +144,7 @@ u8 GetUnk12(s16 index); s16 GetPokemonEvolveFrom(s16 index); u16 GetPokemonAttSpatt(s16 index, u32 r1); u16 GetPokemonDefSpdef(s16 index, u32 r1); -u8 GetPokemonType(s32 index, u32 typeIndex);; +u8 GetPokemonType(s32 index, u32 typeIndex); u8 GetPokemonAbility(s16 index, u32 abilityIndex); s16 GetDexInternalNo(s16 index, u32 r1); s16 GetBaseRecruit(s16 index); -- cgit v1.2.3