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/items.c | |
| parent | edf909be4da55a435bf81f96ffcbd156b2120562 (diff) | |
| parent | 42bcb068b61656f083009816b927207393a35b10 (diff) | |
Merge pull request #92 from AnonymousRandomPerson/master
More item AI decomp
Diffstat (limited to 'src/items.c')
| -rw-r--r-- | src/items.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/items.c b/src/items.c index ff79822..a19b71b 100644 --- a/src/items.c +++ b/src/items.c @@ -1,6 +1,7 @@ #include "global.h" #include "file_system.h" #include "item.h" +#include "moves.h" #include "team_inventory.h" #include "random.h" #include "pokemon.h" @@ -42,7 +43,6 @@ extern void InitPokemonMove(void*, u16); // first arg is some struct extern void sub_80078A4(u32, u32, u32, u32, u32); extern u32 GetMoveType(void*); extern u8* GetUnformattedTypeString(s16); -extern u32 GetMoveMaxPP(void*); extern void sub_80073E0(u32); extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32); extern s32 sub_8091E94(s32 a1, s32 a2, s32 a3); @@ -698,7 +698,7 @@ u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3) xxx_format_and_draw(8, 24, GetItemDescription(slot->itemIndex), a2, 0); if (GetItemType(slot->itemIndex) == ITEM_TYPE_TM) { - u8* buffer8 = buffer88 + 0x50; // field in struct + struct PokemonMove *buffer8 = (struct PokemonMove*) (buffer88 + 0x50); // field in struct u16 move = GetItemMove(slot->itemIndex); u8 moves_data; u8* typestring; |