diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 2 | ||||
| -rw-r--r-- | include/berry_crush.h | 12 | ||||
| -rw-r--r-- | include/item.h | 1 | ||||
| -rw-r--r-- | include/link_rfu.h | 1 | ||||
| -rw-r--r-- | include/math_util.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 11 |
6 files changed, 27 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h index 5bf272d42..905ce291b 100644 --- a/include/berry.h +++ b/include/berry.h @@ -72,6 +72,6 @@ struct UnkStruct_0858AB24 { u16 unk1; }; -extern const struct UnkStruct_0858AB24 gUnknown_0858AB24[]; +extern const struct UnkStruct_0858AB24 gUnknown_83DFC9C[]; #endif // GUARD_BERRY_H diff --git a/include/berry_crush.h b/include/berry_crush.h index 864d9b9d3..97e530f5e 100644 --- a/include/berry_crush.h +++ b/include/berry_crush.h @@ -151,6 +151,7 @@ struct BerryCrushGame u8 unk31C0[0x1000]; }; +struct BerryCrushGame *sub_814B6F0(void); void StartBerryCrush(MainCallback callback); u32 sub_814B6FC(MainCallback callback); void sub_814B8F0(void); @@ -161,5 +162,16 @@ void sub_814BABC(struct BerryCrushGame *arg0); void sub_814BB4C(u16, u8, u8 *); void sub_814D564(u8 *, u32, s32, u32, u32, u32, u32); void sub_814D9CC(struct BerryCrushGame *arg0); +bool32 sub_814D5C8(void); +bool32 sub_814D888(void); +void sub_814DA24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); +void sub_814DC24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); +void sub_814DC5C(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); +bool32 sub_814DE50(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); +bool32 sub_814E644(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); +void sub_814E80C(struct BerryCrushGame *arg0); +void sub_814DA04(struct BerryCrushGame *arg0); +void sub_814EB04(struct BerryCrushGame_138 *arg0); +void sub_814DB84(struct Sprite * sprite); #endif //GUARD_BERRY_CRUSH_H diff --git a/include/item.h b/include/item.h index 1d63c1a22..2c5852617 100644 --- a/include/item.h +++ b/include/item.h @@ -79,5 +79,6 @@ void RemovePCItem(u16 itemId, u16 quantity); void SortAndCompactBagPocket(struct BagPocket * pocket); u8 CountItemsInPC(void); void ApplyNewEncryptionKeyToBagItems_(u32 newKey); +bool8 CheckHasAtLeastOneBerry(void); #endif // GUARD_ITEM_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 5ef954dd5..ba2eb0120 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -275,6 +275,7 @@ bool32 GetRfuUnkCE8(void); void sub_80FA4A8(void); void sub_80FB9D0(void); void sub_80FB030(u32 a0); +void sub_80FBA44(void); #include "mevent_server.h" extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[]; diff --git a/include/math_util.h b/include/math_util.h index 7a81ee7e3..946ecd949 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -4,5 +4,6 @@ s16 sub_80D8B90(s16 y); s16 sub_80D8AA0(s16 x, s16 y); s32 sub_80D8B68(s32 x, s32 y); +s32 sub_80D8AE0(s32 x, s32 y); #endif //GUARD_MATH_UTIL_H diff --git a/include/strings.h b/include/strings.h index ec5965b75..38252f6e6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1148,4 +1148,15 @@ extern const u8 gUnknown_841DF92[]; extern const u8 gUnknown_841DF99[]; extern const u8 gUnknown_841DFA0[]; +// berry_cursh +extern const u8 gUnknown_841CE3C[]; +extern const u8 gUnknown_841CE78[]; +extern const u8 gUnknown_841CEA8[]; +extern const u8 gUnknown_841CF14[]; +extern const u8 gUnknown_841CF50[]; +extern const u8 gUnknown_841CF70[]; +extern const u8 gUnknown_841CFA0[]; +extern const u8 gUnknown_841CFD4[]; +extern const u8 gUnknown_841D008[]; + #endif //GUARD_STRINGS_H |