summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/berry_crush.h2
-rw-r--r--include/dodrio_berry_picking.h8
-rw-r--r--include/graphics.h3
-rw-r--r--include/link_rfu.h2
-rw-r--r--include/menu.h2
-rw-r--r--include/strings.h29
6 files changed, 44 insertions, 2 deletions
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/graphics.h b/include/graphics.h
index d77e8e4c7..bbb70590d 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4939,6 +4939,9 @@ extern const u32 gLinkMiscMenu_Tilemap[];
// Use Pokeblock
extern const u8 gPokenavConditionCancel_Gfx[];
extern const u16 gPokenavConditionCancel_Pal[];
+extern const u8 gUsePokeblockUpDown_Gfx[];
+extern const u16 gUsePokeblockUpDown_Pal[];
+extern const u16 gUsePokeblockCondition_Pal[];
// Berry Crush
extern const u32 gUnknown_08DE34B8[];
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/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 5d8d2eb79..d1a90cfaa 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2708,6 +2708,28 @@ extern const u8 gText_Symbols[];
extern const u8 gText_Register2[];
extern const u8 gText_Exit2[];
+// Dodrio Berry Picking
+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[];
+
// Pokemon jump
extern const u8 gText_WantToPlayAgain2[];
extern const u8 gText_SomeoneDroppedOut2[];
@@ -2744,4 +2766,11 @@ extern const u8 gUnknown_085EC017[];
extern const u8 gUnknown_085EC01C[];
extern const u8 gUnknown_085EC022[];
+// use_pokeblock
+extern const u8 gText_Coolness[];
+extern const u8 gText_Toughness[];
+extern const u8 gText_Smartness[];
+extern const u8 gText_Cuteness[];
+extern const u8 gText_Beauty3[];
+
#endif // GUARD_STRINGS_H