From bad7f7f688253c87c2cb2d063ea57c884cb6adff Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 17 Jul 2021 18:45:13 +0200 Subject: More item related decomp (#45) * decompile sub_80918EC * some more item related functions * more item functions * more decomp, fix types in other places * more small functions * more item related decomp * one more weird branching item function * fix global.h includes * figured out branch pattern * decompile sub_8090F58 * make temporary struct for function * :crab: items.s is gone :crab: * some renaming * rename some obvious item related constants * fix spelling error --- include/pokemon.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 679a1d1..23a1311 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -2,6 +2,8 @@ #define GUARD_POKEMON_H #include "file_system.h" +#include "item.h" + struct PokemonStruct { @@ -28,9 +30,7 @@ struct PokemonStruct u8 unk20[4]; u8 unk24; u8 fill25[3]; - u8 itemIndexHeld; - u8 unk29; - u8 fill2A[2]; + struct HeldItem heldItem; u8 unk2C[4]; u8 fill30[0x4C - 0x30]; /* 0x4C */ u8 name[0xA]; -- cgit v1.2.3