diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/bag.h | 19 | ||||
-rw-r--r-- | include/constants/items.h | 9 | ||||
-rw-r--r-- | include/save_block_2.h | 9 | ||||
-rw-r--r-- | include/sound.h | 4 |
4 files changed, 39 insertions, 2 deletions
diff --git a/include/bag.h b/include/bag.h new file mode 100644 index 00000000..d4b4ff3c --- /dev/null +++ b/include/bag.h @@ -0,0 +1,19 @@ +#ifndef POKEDIAMOND_BAG_H +#define POKEDIAMOND_BAG_H + +#include "itemtool.h" + +struct Bag +{ + struct ItemSlot items[NUM_BAG_ITEMS]; + struct ItemSlot keyItems[NUM_BAG_KEY_ITEMS]; + struct ItemSlot TMsHMs[NUM_BAG_TMS_HMS]; + struct ItemSlot mail[NUM_BAG_MAIL]; + struct ItemSlot medicine[NUM_BAG_MEDICINE]; + struct ItemSlot berries[NUM_BAG_BERRIES]; + struct ItemSlot balls[NUM_BAG_BALLS]; + struct ItemSlot battleItems[NUM_BAG_BATTLE_ITEMS]; + u32 registeredItem; +}; + +#endif //POKEDIAMOND_BAG_H diff --git a/include/constants/items.h b/include/constants/items.h index 5fb58947..f1649cf3 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -10,6 +10,15 @@ #define POCKET_BATTLE_ITEMS 6 #define POCKET_KEY_ITEMS 7 +#define NUM_BAG_ITEMS 165 +#define NUM_BAG_KEY_ITEMS 50 +#define NUM_BAG_TMS_HMS 100 +#define NUM_BAG_MAIL 12 +#define NUM_BAG_MEDICINE 40 +#define NUM_BAG_BERRIES 64 +#define NUM_BAG_BALLS 15 +#define NUM_BAG_BATTLE_ITEMS 30 + #define HOLD_EFFECT_NONE 0 #define HOLD_EFFECT_HP_RESTORE 1 #define HOLD_EFFECT_DIALGA_BOOST 2 diff --git a/include/save_block_2.h b/include/save_block_2.h index fe052b1d..8ab96183 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -13,6 +13,15 @@ struct SavArrayHeader u16 field_E; }; +struct SavArrayFooter +{ + u32 magic; + u32 next; + u32 size; + u16 id; + u16 crc; +}; + struct SaveBlock2_Sub_20464 { u8 unk_0; u8 padding[3]; diff --git a/include/sound.h b/include/sound.h index 6e78bfa4..9cec824d 100644 --- a/include/sound.h +++ b/include/sound.h @@ -42,7 +42,7 @@ struct SoundData u32 unk_BCD3C; u64 unk_BCD40; u32 unk_BCD48; - u32 unk_BCD4C; + void * unk_BCD4C; u32 unk_BCD50; u32 unk_BCD54; u32 unk_BCD58; @@ -50,7 +50,7 @@ struct SoundData }; struct SoundData * GetSoundDataPointer(void); -void InitSoundData(u32 a0, struct Options * a1); +void InitSoundData(void * a0, struct Options * a1); void * FUN_02003D38(u32 a0); int FUN_02003F3C(int * a0); void FUN_02003F64(int a0); |