From 02cadbee60c7b1a4806f790416a21619391fef15 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Aug 2019 19:01:50 +0200
Subject: MORE DODRIO BERRY PICKINGgit status!

---
 include/link_rfu.h | 2 +-
 include/strings.h  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/link_rfu.h b/include/link_rfu.h
index 4bf106ec1..d6e1009e1 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -275,7 +275,7 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2);
 void sub_8011C84(void);
 void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2);
 bool32 sub_8011B90(void);
-void sub_800FE50(u16 *a0);
+void sub_800FE50(void *a0);
 bool32 sub_800E540(u16 id, u8 *name);
 void sub_8011DE0(u32 arg0);
 u8 sub_801100C(s32 a0);
diff --git a/include/strings.h b/include/strings.h
index a959821d4..dfec425d5 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2723,4 +2723,10 @@ extern const u8 gText_NumberOfBattles[];
 extern const u8 gText_Unknown[];
 extern const u8 gText_TrainerCloseBy[];
 
+// Dodrio Berry Picking
+extern const u8 gText_BerryPickingRecords[];
+extern const u8 gText_BerriesPicked[];
+extern const u8 gText_BerriesInRowFivePlayers[];
+extern const u8 gText_BestScore[];
+
 #endif // GUARD_STRINGS_H
-- 
cgit v1.2.3


From 4d2d8779bfb56385b5e35d3010d28a248780f134 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Aug 2019 00:41:55 +0200
Subject: Dodrio berry picking decompiled

---
 include/berry_crush.h          |  2 ++
 include/dodrio_berry_picking.h |  8 ++++++++
 include/menu.h                 |  2 +-
 include/strings.h              | 16 ++++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 include/dodrio_berry_picking.h

(limited to 'include')

diff --git a/include/berry_crush.h b/include/berry_crush.h
index 101450a33..8909ae821 100755
--- a/include/berry_crush.h
+++ b/include/berry_crush.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BERRY_CRUSH_H
 #define GUARD_BERRY_CRUSH_H
 
+#include "main.h"
+
 void sub_8020C70(MainCallback callback);
 
 #endif // GUARD_BERRY_CRUSH_H
diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h
new file mode 100644
index 000000000..55e8fa880
--- /dev/null
+++ b/include/dodrio_berry_picking.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_DODRIO_BERRY_PICKING_H
+#define GUARD_DODRIO_BERRY_PICKING_H
+
+void sub_802493C(u16 a0, void (*callback)(void));
+void sub_8027A5C(void);
+void sub_8027AAC(void);
+
+#endif // GUARD_DODRIO_BERRY_PICKING_H
diff --git a/include/menu.h b/include/menu.h
index 08cad40bd..62e2558dc 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -25,7 +25,7 @@ void InitStandardTextBoxWindows(void);
 void sub_8197200(void);
 u16 RunTextPrintersAndIsPrinter0Active(void);
 void sub_81973A4(void);
-void DrawDialogueFrame(u8, u8);
+void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
 void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
 u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
diff --git a/include/strings.h b/include/strings.h
index dfec425d5..7e80a2ac1 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2728,5 +2728,21 @@ extern const u8 gText_BerryPickingRecords[];
 extern const u8 gText_BerriesPicked[];
 extern const u8 gText_BerriesInRowFivePlayers[];
 extern const u8 gText_BestScore[];
+extern const u8 gText_1Colon[];
+extern const u8 gText_2Colon[];
+extern const u8 gText_3Colon[];
+extern const u8 gText_4Colon[];
+extern const u8 gText_5Colon[];
+extern const u8 gText_SpacePoints[];
+extern const u8 gText_10P30P50P50P[];
+extern const u8 gText_AnnouncingPrizes[];
+extern const u8 gText_AnnouncingRankings[];
+extern const u8 gText_FirstPlacePrize[];
+extern const u8 gText_CantHoldAnyMore[];
+extern const u8 gText_FilledStorageSpace[];
+extern const u8 gText_BerryPickingResults[];
+extern const u8 gText_WantToPlayAgain[];
+extern const u8 gText_CommunicationStandby3[];
+extern const u8 gText_SomeoneDroppedOut[];
 
 #endif // GUARD_STRINGS_H
-- 
cgit v1.2.3