Port berry_crush_3 from Emerald

5 files changed, 47 insertions, 6 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
diff --git a/include/digit_obj_util.h b/include/digit_obj_util.h
index 11d51f1fc..1db775d26 100644
--- a/include/digit_obj_util.h
+++ b/include/digit_obj_util.h
@@ -11,8 +11,12 @@ struct DigitObjUtilTemplate
     u8 xDelta;
     s16 x;
     s16 y;
-    const struct SpriteSheet *spriteSheet;
-    const struct SpritePalette *spritePal;
+    union
+    {
+        const struct SpriteSheet * uncompressed;
+        const struct CompressedSpriteSheet * compressed;
+    } spriteSheet;
+    const struct SpritePalette * spritePal;
 };
 
 extern const u16 gUnknown_8479668[];
diff --git a/include/graphics.h b/include/graphics.h
index 1405cdcf1..2c3aa7c4b 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4875,10 +4875,15 @@ extern const u32 gLinkMiscMenu_Tilemap[];
 // union_room_chat_objects
 extern const u32 gUnionRoomChatIcons[];
 
-//battle_bg
+// battle_bg
 extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[];
 extern const u32 gVsLettersGfx[];
 extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[];
 extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[];
 
+// berry_crush
+extern const u16 gUnknown_8EAFEA0[];
+extern const u32 gUnknown_8EAFFC0[];
+extern const u32 gUnknown_8EB0ADC[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/math_util.h b/include/math_util.h
index 946ecd949..71e87dad1 100644
--- a/include/math_util.h
+++ b/include/math_util.h
@@ -5,5 +5,7 @@ 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);
+s16 sub_80D8B40(u8 s, s16 x, s16 y);
+s16 sub_80D8ABC(u8 s, s16 x, s16 y);
 
 #endif //GUARD_MATH_UTIL_H
diff --git a/include/strings.h b/include/strings.h
index 38252f6e6..2587d7008 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1158,5 +1158,28 @@ extern const u8 gUnknown_841CF70[];
 extern const u8 gUnknown_841CFA0[];
 extern const u8 gUnknown_841CFD4[];
 extern const u8 gUnknown_841D008[];
+extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
+extern const u8 gText_1_Dynamic0[];
+extern const u8 gText_SpaceTimes[];
+extern const u8 gText_XDotY[];
+extern const u8 gText_StrVar1Berry[];
+extern const u8 gText_TimeColon[];
+extern const u8 gText_PressingSpeed[];
+extern const u8 gText_Silkiness[];
+extern const u8 gText_StrVar1[];
+extern const u8 gText_SpaceMin[];
+extern const u8 gText_XDotY2[];
+extern const u8 gText_SpaceSec[];
+extern const u8 gText_XDotY3[];
+extern const u8 gText_TimesPerSec[];
+extern const u8 gText_Var1Percent[];
+extern const u8 gText_PressesRankings[];
+extern const u8 gText_CrushingResults[];
+extern const u8 gText_BerryCrush2[];
+extern const u8 gText_PressingSpeedRankings[];
+extern const u8 gText_Var1Players[];
+extern const u8 gText_NeatnessRankings[];
+extern const u8 gText_CooperativeRankings[];
+extern const u8 gText_PressingPowerRankings[];
 
 #endif //GUARD_STRINGS_H