Port berry_crush_2 from emerald

data/berry_crush.s

@@ -3,80 +3,6 @@
 
 	.section .rodata
 	.align 2
-gUnknown_846E2E0:: @ 846E2E0
-	.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-gUnknown_846E2E8:: @ 846E2E8
-	.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
-
-gUnknown_846E2F0:: @ 846E2F0
-	.byte 0x04, 0x01, 0x00, 0xff
-	.byte 0x00, 0x00, 0x00, 0x04
-	.byte 0x02, 0x00, 0xff, 0x00
-	.byte 0x00, 0x00, 0x04, 0x02
-	.byte 0x00, 0xfe, 0x00, 0x00
-	.byte 0x00, 0x06, 0x03, 0x01
-	.byte 0xff, 0xfd, 0xff, 0x00
-	.byte 0x06, 0x04, 0x01, 0xfe
-	.byte 0xfc, 0xfe, 0x00, 0x00
-
-gUnknown_846E314:: @ 846E314
-	.byte 0x03, 0x02, 0x01, 0x00
-	.byte 0x03, 0x03, 0x01, 0x00
-	.byte 0x03, 0x03, 0x02, 0x00
-	.byte 0x03, 0x04, 0x02, 0x00
-	.byte 0x03, 0x05, 0x03, 0x00
-
-gUnknown_846E328:: @ 846E328
-	.4byte gUnknown_841CE3C
-	.4byte gUnknown_841CE78
-	.4byte gUnknown_841CEA8
-	.4byte gUnknown_841CF14
-	.4byte gUnknown_841CF50
-	.4byte gUnknown_841CF70
-	.4byte gUnknown_841CFA0
-	.4byte gUnknown_841CFD4
-	.4byte gUnknown_841D008
-
-gUnknown_846E34C:: @ 846E34C
-	.4byte NULL
-	.4byte sub_814BBB8
-	.4byte sub_814BC10
-	.4byte sub_814BC74
-	.4byte sub_814BD7C
-	.4byte sub_814BD9C
-	.4byte sub_814BDBC
-	.4byte sub_814BE0C
-	.4byte sub_814BE64
-	.4byte sub_814BE7C
-	.4byte sub_814BFD0
-	.4byte sub_814C118
-	.4byte sub_814C24C
-	.4byte sub_814C850
-	.4byte sub_814C8F8
-	.4byte sub_814C990
-	.4byte sub_814CB20
-	.4byte sub_814CC0C
-	.4byte sub_814CFA8
-	.4byte sub_814D094
-	.4byte sub_814D188
-	.4byte sub_814D240
-	.4byte sub_814D31C
-	.4byte sub_814D3A4
-	.4byte sub_814D468
-	.4byte sub_814D4C8
-
-gUnknown_846E3B4:: @ 846E3B4
-	.byte 0x02, 0x04, 0x06, 0x07
-	.byte 0x03, 0x05, 0x08, 0x0b
-	.byte 0x03, 0x07, 0x0b, 0x0f
-	.byte 0x04, 0x08, 0x0c, 0x11
-
-gUnknown_846E3C4:: @ 846E3C4
-	.byte 0x05, 0x07, 0x09, 0x0c
-
-gUnknown_846E3C8:: @ 846E3C8
-	.byte 0x03, 0x07, 0x0f, 0x1f
 
 gUnknown_846E3CC:: @ 846E3CC
 	.4byte 0x000000f8

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

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

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

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[];

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

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

ld_script.txt

@@ -280,7 +280,7 @@ SECTIONS {
         src/pokemon_jump_5.o(.text);
         src/pokemon_jump_6.o(.text);
         src/berry_crush.o(.text);
-        asm/berry_crush_2.o(.text);
+        src/berry_crush_2.o(.text);
         asm/berry_crush_3.o(.text);
         src/wireless_communication_status_screen.o(.text);
         src/braille_text.o(.text);
@@ -572,6 +572,7 @@ SECTIONS {
         src/pokemon_jump_4.o(.rodata);
         src/pokemon_jump_5.o(.rodata);
         src/pokemon_jump_6.o(.rodata);
+        src/berry_crush_2.o(.rodata);
         data/berry_crush.o(.rodata);
         src/wireless_communication_status_screen.o(.rodata);
         src/braille_text.o(.rodata);

src/berry_crush.c

@@ -15,7 +15,6 @@
 
 static EWRAM_DATA struct BerryCrushGame *gUnknown_203F3DC = NULL;
 
-struct BerryCrushGame *sub_814B6F0(void);
 static void sub_814B860(void);
 static void sub_814BA6C(void);
 static void sub_814BA80(void);