diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 1 | ||||
| -rw-r--r-- | include/constants/global.h | 2 | ||||
| -rw-r--r-- | include/item.h | 2 | ||||
| -rw-r--r-- | include/load_save.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h index 40715868b..c5a132ccb 100644 --- a/include/berry.h +++ b/include/berry.h @@ -62,6 +62,7 @@ void FieldObjectInteractionPickBerryTree(void); void FieldObjectInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); +const struct Berry * sub_809C8A0(u8 berryIdx); extern const struct Berry gBerries[]; diff --git a/include/constants/global.h b/include/constants/global.h index 4e798d1ef..b1c8fed3e 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -76,4 +76,6 @@ enum POCKET_BERRY_POUCH, }; +#define NUM_BAG_POCKETS 5 + #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/item.h b/include/item.h index f21c207e0..164dd674f 100644 --- a/include/item.h +++ b/include/item.h @@ -73,7 +73,7 @@ u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1); u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1); bool8 itemid_is_unique(u16 itemId); void sub_809A584(struct ItemSlot * slots, u8 capacity); -u16 GetBagItemId(u16 *); +u16 GetPcItemQuantity(u16 *); void ItemPcCompaction(void); void RemoveItemFromPC(u16 itemId, u16 quantity); diff --git a/include/load_save.h b/include/load_save.h index f62bc05aa..bd33f89c8 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -25,5 +25,6 @@ void MoveSaveBlocks_ResetHeap(void); void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey); void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey); +void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey); #endif // GUARD_LOAD_SAVE_H diff --git a/include/strings.h b/include/strings.h index 805516cec..8b98abb20 100644 --- a/include/strings.h +++ b/include/strings.h @@ -164,4 +164,6 @@ extern const u8 gText_ReturnToPC[]; extern const u8 gUnknown_8416425[]; extern const u8 gUnknown_8416451[]; +extern const u8 gUnknown_84162BD[]; + #endif //GUARD_STRINGS_H |