diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/dungeon.h | 3 | ||||
| -rw-r--r-- | include/friend_area_action_menu.h | 2 | ||||
| -rw-r--r-- | include/item.h | 4 | ||||
| -rw-r--r-- | include/kecleon_items.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 5 |
5 files changed, 10 insertions, 6 deletions
diff --git a/include/constants/dungeon.h b/include/constants/dungeon.h index 19f5340..6987c61 100644 --- a/include/constants/dungeon.h +++ b/include/constants/dungeon.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_DUNGEON_H #define GUARD_CONSTANTS_DUNGEON_H +#define NUM_DUNGEON_MAZE (NUM_DUNGEONS - DUNGEON_NORMAL_MAZE_2) + enum Dungeon { DUNGEON_TINY_WOODS = 0, @@ -101,6 +103,7 @@ enum Dungeon DUNGEON_TEAM_RUMBLEROCK = 95, DUNGEON_RESCUE_TEAM_2 = 96, DUNGEON_RESCUE_TEAM_MAZE = 97, + NUM_DUNGEONS }; #endif diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h index dfddc22..1080679 100644 --- a/include/friend_area_action_menu.h +++ b/include/friend_area_action_menu.h @@ -12,7 +12,7 @@ struct unkStruct_203B2BC struct HeldItem itemToGive; struct HeldItem unk14; struct PokemonStruct *unk18; - u32 unk1C; + u8 unk1C; u32 unk20; u16 unk24; struct PokemonMove unk28[8]; diff --git a/include/item.h b/include/item.h index 5da4c67..6ac6847 100644 --- a/include/item.h +++ b/include/item.h @@ -104,15 +104,17 @@ bool8 IsGummiItem(u8); void xxx_init_unk230_substruct(u8); bool8 xxx_insert_unk230_80919FC(u8); struct HeldItem *xxx_get_inv_unk230_at_809185C(u8); +void xxx_fill_unk230_gaps(); struct HeldItem* xxx_get_unk250_at_8091A90(u8); s32 xxx_count_inv_unk230(); u32 xxx_count_non_empty_inv_unk250_8091A48(); void sub_8091BB4(u8); void sub_8090F58(void*, u8 *, struct ItemSlot *, struct unkStruct_8090F58*); void ShiftItemsDownFrom(s32 start); +void ClearItemSlotAt(u32 index); void MoveToStorage(struct ItemSlot* slot); void FillInventoryGaps(); -bool8 sub_8091274(struct HeldItem* slot); +bool8 AddHeldItemToInventory(struct HeldItem* slot); bool8 IsNotMoneyOrUsedTMItem(u8 id); s32 FindItemInInventory(u8 itemIndex); diff --git a/include/kecleon_items.h b/include/kecleon_items.h index 11cb0a7..0719804 100644 --- a/include/kecleon_items.h +++ b/include/kecleon_items.h @@ -15,7 +15,7 @@ struct unkStruct_203B210 u32 unkC; s32 itemSellPrice; u32 unk14; - u32 unk18; + s32 unk18; struct ItemSlot unk1C; u8 unk20; u8 unk21; diff --git a/include/pokemon.h b/include/pokemon.h index af6c103..c50dc75 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -22,7 +22,6 @@ struct Offense { struct unkPokeSubStruct_4 { u8 dungeonIndex; u8 dungeonFloor; - u16 fill6; }; struct unkPokeSubStruct_C @@ -35,7 +34,7 @@ struct PokemonStruct { // size: 0x58 /* 0x0 */ u16 unk0; // recruited?? - /* 0x1 */ u8 unk2; + /* 0x1 */ bool8 isLeader; /* 0x3 */ u8 unkHasNextStage; // set to a random value? /* 0x4 */ struct unkPokeSubStruct_4 unk4; /* 0x8 */ s16 speciesNum; // species # @@ -76,7 +75,7 @@ struct PokemonStruct2 { // size 0x68 u16 unk0; // corresponds to unk0 inPokemonStruct - u8 unk2; // unk2 + bool8 isLeader; // unk2 u8 unkHasNextStage; // unk3 struct unkPokeSubStruct_4 unk4; // unk4 u16 IQ; // IQ (other offset) |