diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-03 12:24:18 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-03 12:24:18 -0500 |
| commit | 8a7c2ded11a2adf4f09ddca814eb06fdbca13fd1 (patch) | |
| tree | b52341e283d9e1c5abb35a5cdf4e33471d8ce777 /include/berry_crush.h | |
| parent | 8594e7f72d070ce10fcc41a8c2dfe32420e7c560 (diff) | |
Port berry_crush_3 from Emerald
Diffstat (limited to 'include/berry_crush.h')
| -rw-r--r-- | include/berry_crush.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/berry_crush.h b/include/berry_crush.h index 97e530f5e..18ac6d1bd 100644 --- a/include/berry_crush.h +++ b/include/berry_crush.h @@ -151,6 +151,12 @@ struct BerryCrushGame u8 unk31C0[0x1000]; }; +#define PLAYER_UNK14(game, i) \ + ((u8 *)(game) \ + + offsetof(struct BerryCrushGame, unk68) \ + + offsetof(struct BerryCrushGame_68_x, unk30) \ + + sizeof(struct BerryCrushGame_Player) * (i)) + struct BerryCrushGame *sub_814B6F0(void); void StartBerryCrush(MainCallback callback); u32 sub_814B6FC(MainCallback callback); @@ -161,9 +167,9 @@ void sub_814B930(void); 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); +int sub_814D9CC(struct BerryCrushGame *arg0); +int sub_814D5C8(void); +int 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); @@ -173,5 +179,6 @@ 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); +void ShowBerryCrushRankings(void); #endif //GUARD_BERRY_CRUSH_H |