From 385740fc144fb051a139dc764b7b2598599678e8 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Mon, 2 Dec 2019 13:18:19 -0800
Subject: [PATCH 1/6] Split out data/berry_powder.s

---
 data/berry_powder.s                     | 36 +++++++++++++++++++++++++
 data/{data_8471F00.s => data_8471F50.s} |  3 ---
 ld_script.txt                           |  7 ++---
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 data/berry_powder.s
 rename data/{data_8471F00.s => data_8471F50.s} (99%)

diff --git a/data/berry_powder.s b/data/berry_powder.s
new file mode 100644
index 000000000..0f812d79d
--- /dev/null
+++ b/data/berry_powder.s
@@ -0,0 +1,36 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+
+	.align 2
+gUnknown_847565C_UnrefDupe:: @ 8471F00 struct BgTemplate(???)
+	.4byte 0x000001e0
+	.4byte 0x000012c9
+	.4byte 0x000012ea
+	.4byte 0x000021ff
+	.4byte 0x000000ff
+	.4byte 0x00000000
+
+	.align 2
+gUnknown_8475674_UnrefDupe:: @ 8471F18
+	window_template 0x00, 0x01, 0x01, 0x1c, 0x03, 0x0d, 0x0013
+	window_template 0x00, 0x01, 0x06, 0x1c, 0x0d, 0x0d, 0x0067
+
+	.align 2
+gUnknown_8475684_UnrefDupe:: @ 8471F28
+	window_template 0x00, 0x01, 0x06, 0x1c, 0x07, 0x0d, 0x0067
+
+	.align 2
+gUnknown_847568C_UnrefDupe:: @ 8471F30
+	window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
+	window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
+
+	.align 2
+gUnknown_847569C_UnrefDupe:: @ 8471F40
+	window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
+
+	.align 2
+gUnknown_84756A4_UnrefDupe:: @ 8471F48
+	window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
diff --git a/data/data_8471F00.s b/data/data_8471F50.s
similarity index 99%
rename from data/data_8471F00.s
rename to data/data_8471F50.s
index c3b4b7c01..8a3a7ae77 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F50.s
@@ -14,9 +14,6 @@
 	.section .rodata
 
 	.align 2
-gUnknown_8471F00::
-	.incbin "baserom.gba", 0x471F00, 0x50
-
 gUnknown_8471F50:: @ 8471F50
 	.incbin "baserom.gba", 0x471F50, 0x113
 
diff --git a/ld_script.txt b/ld_script.txt
index cf7005555..6b8c45d96 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -551,18 +551,19 @@ SECTIONS {
         src/braille_text.o(.rodata);
         src/text_window_graphics.o(.rodata);
         src/quest_log_8150454.o(.rodata);
-        data/data_8471F00.o(.rodata);
+        data/berry_powder.o(.rodata);
+        data/data_8471F50.o(.rodata);
         src/battle_controller_pokedude.o(.rodata);
         src/teachy_tv.o(.rodata);
         src/unk_815C980.o(.rodata);
-        data/data_8471F00.o(.rodata.8479668);
+        data/data_8471F50.o(.rodata.8479668);
         src/ss_anne.o(.rodata);
         src/cereader_tool.o(.rodata);
         src/renewable_hidden_items.o(.rodata);
         src/trainer_tower.o(.rodata);
         src/unk_815F138.o(.rodata);
         src/berry_fix_program.o(.rodata);
-        data/data_8471F00.o(.rodata.after_trainer_tower);
+        data/data_8471F50.o(.rodata.after_trainer_tower);
 
         /* These should not be moved to C files */
         src/mystery_event_msg.o(.rodata);

From e45aee1ff2c693d09b47cd381a94557b3f3cdcb8 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Mon, 2 Dec 2019 22:47:45 -0800
Subject: [PATCH 2/6] Port/dump dodrio_berry_picking data.

---
 asm/dodrio_berry_picking.s                    |  98 +--
 data/{data_8471F50.s => data_8479668.s}       | 177 -----
 data/strings.s                                |  31 +-
 .../link_games/dodrioberry_berrysprites.png   | Bin 0 -> 395 bytes
 graphics/link_games/dodrioberry_bg1.bin       | Bin 0 -> 1280 bytes
 graphics/link_games/dodrioberry_bg1.pal       |  19 +
 graphics/link_games/dodrioberry_bg1.png       | Bin 0 -> 1887 bytes
 graphics/link_games/dodrioberry_bg2.pal       |  19 +
 graphics/link_games/dodrioberry_bg2.png       | Bin 0 -> 2856 bytes
 graphics/link_games/dodrioberry_bg2left.bin   | Bin 0 -> 1280 bytes
 graphics/link_games/dodrioberry_bg2right.bin  | Bin 0 -> 1280 bytes
 graphics/link_games/dodrioberry_pkmn.png      | Bin 0 -> 3330 bytes
 graphics/link_games/dodrioberry_platform.png  | Bin 0 -> 310 bytes
 graphics/link_games/dodrioberry_shiny.pal     |  19 +
 graphics/link_games/dodrioberry_status.png    | Bin 0 -> 195 bytes
 include/strings.h                             |  22 +
 ld_script.txt                                 |   6 +-
 src/dodrio_berry_picking.c                    | 748 ++++++++++++++++++
 18 files changed, 899 insertions(+), 240 deletions(-)
 rename data/{data_8471F50.s => data_8479668.s} (81%)
 create mode 100644 graphics/link_games/dodrioberry_berrysprites.png
 create mode 100644 graphics/link_games/dodrioberry_bg1.bin
 create mode 100644 graphics/link_games/dodrioberry_bg1.pal
 create mode 100644 graphics/link_games/dodrioberry_bg1.png
 create mode 100644 graphics/link_games/dodrioberry_bg2.pal
 create mode 100644 graphics/link_games/dodrioberry_bg2.png
 create mode 100644 graphics/link_games/dodrioberry_bg2left.bin
 create mode 100644 graphics/link_games/dodrioberry_bg2right.bin
 create mode 100644 graphics/link_games/dodrioberry_pkmn.png
 create mode 100644 graphics/link_games/dodrioberry_platform.png
 create mode 100644 graphics/link_games/dodrioberry_shiny.pal
 create mode 100644 graphics/link_games/dodrioberry_status.png
 create mode 100644 src/dodrio_berry_picking.c

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index ceccf74ff..892dff901 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -6691,7 +6691,7 @@ sub_8153A9C: @ 8153A9C
 	ldr r0, [r0]
 	str r0, [sp, 0x10]
 	str r1, [sp, 0x14]
-	ldr r0, _08153AF8 @ =gUnknown_8477374
+	ldr r0, _08153AF8 @ =gDodrioBerryPkmnGfx
 	adds r1, r4, 0
 	bl LZ77UnCompWram
 	cmp r4, 0
@@ -6714,7 +6714,7 @@ _08153ADC:
 	.align 2, 0
 _08153AF0: .4byte gUnknown_8478D90
 _08153AF4: .4byte gUnknown_8478D98
-_08153AF8: .4byte gUnknown_8477374
+_08153AF8: .4byte gDodrioBerryPkmnGfx
 	thumb_func_end sub_8153A9C
 
 	thumb_func_start sub_8153AFC
@@ -6741,9 +6741,9 @@ sub_8153AFC: @ 8153AFC
 	mov r0, sp
 	adds r0, 0x1A
 	strh r2, [r0]
-	ldr r0, _08153B88 @ =gUnknown_8478C98
+	ldr r0, _08153B88 @ =sOamData_8478C98
 	str r0, [sp, 0x1C]
-	ldr r0, _08153B8C @ =gUnknown_8478CE0
+	ldr r0, _08153B8C @ =sSpriteAnimTable_8478CE0
 	str r0, [sp, 0x20]
 	str r3, [sp, 0x24]
 	ldr r0, _08153B90 @ =gDummySpriteAffineAnimTable
@@ -6784,8 +6784,8 @@ sub_8153AFC: @ 8153AFC
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08153B88: .4byte gUnknown_8478C98
-_08153B8C: .4byte gUnknown_8478CE0
+_08153B88: .4byte sOamData_8478C98
+_08153B8C: .4byte sSpriteAnimTable_8478CE0
 _08153B90: .4byte gDummySpriteAffineAnimTable
 _08153B94: .4byte sub_8153B9C
 _08153B98: .4byte gUnknown_203F3E4
@@ -7167,7 +7167,7 @@ sub_8153E28: @ 8153E28
 	ldr r0, [r0]
 	str r0, [sp, 0x20]
 	str r1, [sp, 0x24]
-	ldr r0, _08153ECC @ =gUnknown_8477198
+	ldr r0, _08153ECC @ =gDodrioBerryStatusGfx
 	adds r1, r6, 0
 	bl LZ77UnCompWram
 	cmp r6, 0
@@ -7231,7 +7231,7 @@ _08153EB8:
 	bx r0
 	.align 2, 0
 _08153EC8: .4byte gUnknown_8478DA0
-_08153ECC: .4byte gUnknown_8477198
+_08153ECC: .4byte gDodrioBerryStatusGfx
 _08153ED0: .4byte gUnknown_8478DA8
 _08153ED4: .4byte gUnknown_203F43C
 	thumb_func_end sub_8153E28
@@ -7563,7 +7563,7 @@ sub_8154128: @ 8154128
 	ldr r0, [r0]
 	str r0, [sp, 0x8]
 	str r1, [sp, 0xC]
-	ldr r0, _08154178 @ =gUnknown_8475968
+	ldr r0, _08154178 @ =gDodrioBerrySpritesGfx
 	adds r1, r4, 0
 	bl LZ77UnCompWram
 	cmp r4, 0
@@ -7586,7 +7586,7 @@ _0815415E:
 	bx r0
 	.align 2, 0
 _08154174: .4byte gUnknown_8478DCC
-_08154178: .4byte gUnknown_8475968
+_08154178: .4byte gDodrioBerrySpritesGfx
 	thumb_func_end sub_8154128
 
 	thumb_func_start sub_815417C
@@ -7971,7 +7971,7 @@ sub_8154438: @ 8154438
 	ldr r0, [r0]
 	str r0, [sp, 0x20]
 	str r1, [sp, 0x24]
-	ldr r0, _081544E0 @ =gUnknown_847722C
+	ldr r0, _081544E0 @ =gDodrioBerryPlatformGfx
 	adds r1, r6, 0
 	bl LZ77UnCompWram
 	cmp r6, 0
@@ -8034,7 +8034,7 @@ _081544C6:
 	bx r0
 	.align 2, 0
 _081544DC: .4byte gUnknown_8478E18
-_081544E0: .4byte gUnknown_847722C
+_081544E0: .4byte gDodrioBerryPlatformGfx
 _081544E4: .4byte gUnknown_8478E20
 _081544E8: .4byte gUnknown_8478E0E
 _081544EC: .4byte gUnknown_203F3F8
@@ -8777,17 +8777,17 @@ _08154A6E:
 _08154A80: .4byte gUnknown_203F440
 _08154A84: .4byte 0x00003014
 _08154A88:
-	ldr r1, _08154AC0 @ =gUnknown_8478590
+	ldr r1, _08154AC0 @ =gDodrioBerryBgTilemap1
 	movs r0, 0x3
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r1, _08154AC4 @ =gUnknown_8478A4C
+	ldr r1, _08154AC4 @ =gDodrioBerryBgTilemap2Left
 	movs r0, 0x1
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r1, _08154AC8 @ =gUnknown_84787FC
+	ldr r1, _08154AC8 @ =gDodrioBerryBgTilemap2Right
 	movs r0, 0x2
 	movs r2, 0
 	movs r3, 0
@@ -8800,9 +8800,9 @@ _08154A88:
 	bl CopyBgTilemapBufferToVram
 	b _08154B08
 	.align 2, 0
-_08154AC0: .4byte gUnknown_8478590
-_08154AC4: .4byte gUnknown_8478A4C
-_08154AC8: .4byte gUnknown_84787FC
+_08154AC0: .4byte gDodrioBerryBgTilemap1
+_08154AC4: .4byte gDodrioBerryBgTilemap2Left
+_08154AC8: .4byte gDodrioBerryBgTilemap2Right
 _08154ACC:
 	movs r0, 0
 	bl ShowBg
@@ -9215,7 +9215,7 @@ _08154E1C:
 	bcc _08154DF4
 _08154E22:
 	movs r5, 0
-	ldr r4, _08154F68 @ =gUnknown_841CE1C
+	ldr r4, _08154F68 @ =gText_SpacePoints
 	cmp r5, r7
 	bcs _08154E48
 	add r1, sp, 0x34
@@ -9354,7 +9354,7 @@ _08154EC8:
 	str r4, [sp, 0x4]
 	movs r1, 0
 	str r1, [sp, 0x8]
-	ldr r2, _08154F68 @ =gUnknown_841CE1C
+	ldr r2, _08154F68 @ =gText_SpacePoints
 	lsrs r3, 24
 	bl AddTextPrinterParameterized
 	adds r0, r5, 0x1
@@ -9373,7 +9373,7 @@ _08154F52:
 	bx r0
 	.align 2, 0
 _08154F64: .4byte gUnknown_8478F14
-_08154F68: .4byte gUnknown_841CE1C
+_08154F68: .4byte gText_SpacePoints
 _08154F6C: .4byte 0x00003009
 _08154F70: .4byte gUnknown_203F440
 _08154F74: .4byte gUnknown_8478E94
@@ -9488,7 +9488,7 @@ _08155060:
 	ldrb r0, [r0]
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
-	ldr r2, _081551B4 @ =gUnknown_841CD03
+	ldr r2, _081551B4 @ =gText_BerryPickingResults
 	mov r8, r2
 	movs r2, 0x1
 	negs r2, r2
@@ -9516,7 +9516,7 @@ _08155060:
 	ldr r0, [r4]
 	add r0, r9
 	ldrb r0, [r0]
-	ldr r2, _081551B8 @ =gUnknown_841CD25
+	ldr r2, _081551B8 @ =gText_10P30P50P50P
 	movs r1, 0x10
 	str r1, [sp]
 	str r6, [sp, 0x4]
@@ -9616,7 +9616,7 @@ _0815512E:
 	lsrs r2, 24
 	mov r1, r8
 	ldrb r3, [r1]
-	ldr r1, _081551CC @ =gUnknown_8478E3B
+	ldr r1, _081551CC @ =gUnknown_8478E38+0x3
 	str r1, [sp]
 	movs r1, 0x1
 	negs r1, r1
@@ -9630,13 +9630,13 @@ _0815512E:
 _081551A8: .4byte gUnknown_203F440
 _081551AC: .4byte 0x00003008
 _081551B0: .4byte 0x00003009
-_081551B4: .4byte gUnknown_841CD03
-_081551B8: .4byte gUnknown_841CD25
+_081551B4: .4byte gText_BerryPickingResults
+_081551B8: .4byte gText_10P30P50P50P
 _081551BC: .4byte gUnknown_8478EB0
 _081551C0: .4byte gUnknown_8478E38
 _081551C4: .4byte gUnknown_8478EA8
 _081551C8: .4byte 0x0000270f
-_081551CC: .4byte gUnknown_8478E3B
+_081551CC: .4byte gUnknown_8478E38+0x3
 _081551D0:
 	ldr r0, _0815523C @ =gUnknown_203F440
 	ldr r0, [r0]
@@ -9773,7 +9773,7 @@ _081552DC:
 	ldrb r0, [r0]
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
-	ldr r6, _0815533C @ =gUnknown_841CD43
+	ldr r6, _0815533C @ =gText_AnnouncingRankings
 	movs r2, 0x1
 	negs r2, r2
 	movs r0, 0
@@ -9801,7 +9801,7 @@ _081552DC:
 _08155330: .4byte gUnknown_203F440
 _08155334: .4byte 0x00003008
 _08155338: .4byte 0x00003009
-_0815533C: .4byte gUnknown_841CD43
+_0815533C: .4byte gText_AnnouncingRankings
 _08155340:
 	ldr r0, [sp, 0x84]
 	bl sub_8154D9C
@@ -9957,7 +9957,7 @@ _08155480:
 	ldrb r0, [r0]
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
-	ldr r5, _08155568 @ =gUnknown_841CD58
+	ldr r5, _08155568 @ =gText_AnnouncingPrizes
 	movs r2, 0x1
 	negs r2, r2
 	movs r0, 0
@@ -9993,7 +9993,7 @@ _08155480:
 	movs r0, 0
 	adds r1, r5, 0
 	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
-	ldr r1, _0815556C @ =gUnknown_841CD7A
+	ldr r1, _0815556C @ =gText_FirstPlacePrize
 	add r0, sp, 0xC
 	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r0, [r4]
@@ -10027,7 +10027,7 @@ _08155480:
 	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	cmp r4, 0x2
 	bne _08155574
-	ldr r1, _08155570 @ =gUnknown_841CD9F
+	ldr r1, _08155570 @ =gText_CantHoldAnyMore
 	add r0, sp, 0xC
 	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _08155580
@@ -10036,13 +10036,13 @@ _08155558: .4byte 0x00000101
 _0815555C: .4byte gUnknown_203F440
 _08155560: .4byte 0x00003008
 _08155564: .4byte 0x00003009
-_08155568: .4byte gUnknown_841CD58
-_0815556C: .4byte gUnknown_841CD7A
-_08155570: .4byte gUnknown_841CD9F
+_08155568: .4byte gText_AnnouncingPrizes
+_0815556C: .4byte gText_FirstPlacePrize
+_08155570: .4byte gText_CantHoldAnyMore
 _08155574:
 	cmp r6, 0x1
 	bne _08155580
-	ldr r1, _081555C4 @ =gUnknown_841CDBA
+	ldr r1, _081555C4 @ =gText_FilledStorageSpace
 	add r0, sp, 0xC
 	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 _08155580:
@@ -10079,7 +10079,7 @@ _0815559E:
 	adds r1, r0
 	b _0815565E
 	.align 2, 0
-_081555C4: .4byte gUnknown_841CDBA
+_081555C4: .4byte gText_FilledStorageSpace
 _081555C8: .4byte gUnknown_203F440
 _081555CC: .4byte 0x00003009
 _081555D0: .4byte 0x00003008
@@ -10310,7 +10310,7 @@ _0815579C:
 	ldr r0, [r2]
 	add r0, r8
 	ldrb r0, [r0]
-	ldr r2, _08155854 @ =gUnknown_841CDD7
+	ldr r2, _08155854 @ =gText_WantToPlayAgain
 	movs r1, 0x6
 	str r1, [sp]
 	movs r5, 0xFF
@@ -10376,7 +10376,7 @@ _0815579C:
 	.align 2, 0
 _0815584C: .4byte 0x00003008
 _08155850: .4byte 0x00003009
-_08155854: .4byte gUnknown_841CDD7
+_08155854: .4byte gText_WantToPlayAgain
 _08155858: .4byte gText_Yes
 _0815585C: .4byte gText_No
 _08155860: .4byte gFameCheckerText_ListMenuCursor
@@ -10789,7 +10789,7 @@ _08155BA4:
 	ldr r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
-	ldr r2, _08155BE4 @ =gUnknown_841CE24
+	ldr r2, _08155BE4 @ =gText_CommunicationStandby3
 	movs r1, 0x6
 	str r1, [sp]
 	movs r1, 0xFF
@@ -10810,7 +10810,7 @@ _08155BA4:
 	b _08155C0C
 	.align 2, 0
 _08155BE0: .4byte 0x00003008
-_08155BE4: .4byte gUnknown_841CE24
+_08155BE4: .4byte gText_CommunicationStandby3
 _08155BE8: .4byte 0x00003014
 _08155BEC:
 	bl IsDma3ManagerBusyWithBgCopy
@@ -10961,7 +10961,7 @@ _08155D08:
 	ldr r0, [r6]
 	adds r0, r4
 	ldrb r0, [r0]
-	ldr r2, _08155D48 @ =gUnknown_841CDEB
+	ldr r2, _08155D48 @ =gText_SomeoneDroppedOut
 	movs r1, 0x6
 	str r1, [sp]
 	movs r1, 0xFF
@@ -10982,7 +10982,7 @@ _08155D08:
 	b _08155D70
 	.align 2, 0
 _08155D44: .4byte 0x00003008
-_08155D48: .4byte gUnknown_841CDEB
+_08155D48: .4byte gText_SomeoneDroppedOut
 _08155D4C: .4byte 0x00003014
 _08155D50:
 	bl IsDma3ManagerBusyWithBgCopy
@@ -11340,26 +11340,26 @@ _08156008:
 	.4byte _0815605C
 	.4byte _0815606A
 _08156020:
-	ldr r0, _0815602C @ =gUnknown_84758A8
+	ldr r0, _0815602C @ =gDodrioBerryBgPal1
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadPalette
 	b _08156082
 	.align 2, 0
-_0815602C: .4byte gUnknown_84758A8
+_0815602C: .4byte gDodrioBerryBgPal1
 _08156030:
 	bl ResetTempTileDataBuffers
 	b _08156082
 _08156036:
-	ldr r1, _08156040 @ =gUnknown_8475B3C
+	ldr r1, _08156040 @ =gDodrioBerryBgGfx1
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x3
 	b _0815604C
 	.align 2, 0
-_08156040: .4byte gUnknown_8475B3C
+_08156040: .4byte gDodrioBerryBgGfx1
 _08156044:
-	ldr r1, _08156058 @ =gUnknown_84763CC
+	ldr r1, _08156058 @ =gDodrioBerryBgGfx2
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x1
@@ -11369,7 +11369,7 @@ _0815604C:
 	bl DecompressAndCopyTileDataToVram
 	b _08156082
 	.align 2, 0
-_08156058: .4byte gUnknown_84763CC
+_08156058: .4byte gDodrioBerryBgGfx2
 _0815605C:
 	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
diff --git a/data/data_8471F50.s b/data/data_8479668.s
similarity index 81%
rename from data/data_8471F50.s
rename to data/data_8479668.s
index 8a3a7ae77..8527b4f09 100644
--- a/data/data_8471F50.s
+++ b/data/data_8479668.s
@@ -13,183 +13,6 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_8471F50:: @ 8471F50
-	.incbin "baserom.gba", 0x471F50, 0x113
-
-gUnknown_8472063:: @ 8472063
-	.incbin "baserom.gba", 0x472063, 0x4B
-
-gUnknown_84720AE:: @ 84720AE
-	.incbin "baserom.gba", 0x4720AE, 0x4E
-
-gUnknown_84720FC:: @ 84720FC
-	.incbin "baserom.gba", 0x4720FC, 0x37
-
-gUnknown_8472133:: @ 8472133
-	.incbin "baserom.gba", 0x472133, 0x3409
-
-gUnknown_847553C:: @ 847553C
-	.incbin "baserom.gba", 0x47553C, 0xC
-
-gUnknown_8475548:: @ 8475548
-	.incbin "baserom.gba", 0x475548, 0x8
-
-gUnknown_8475550:: @ 8475550
-	.incbin "baserom.gba", 0x475550, 0x8
-
-gUnknown_8475558:: @ 8475558
-	.incbin "baserom.gba", 0x475558, 0x20
-
-gUnknown_8475578:: @ 8475578
-	.incbin "baserom.gba", 0x475578, 0x30
-
-gUnknown_84755A8:: @ 84755A8
-	.incbin "baserom.gba", 0x4755A8, 0x30
-
-gUnknown_84755D8:: @ 84755D8
-	.incbin "baserom.gba", 0x4755D8, 0x8
-
-gUnknown_84755E0:: @ 84755E0
-	.incbin "baserom.gba", 0x4755E0, 0x8
-
-gUnknown_84755E8:: @ 84755E8
-	.incbin "baserom.gba", 0x4755E8, 0x10
-
-gUnknown_84755F8:: @ 84755F8
-	.incbin "baserom.gba", 0x4755F8, 0x4
-
-gUnknown_84755FC:: @ 84755FC
-	.incbin "baserom.gba", 0x4755FC, 0x6
-
-gUnknown_8475602:: @ 8475602
-	.incbin "baserom.gba", 0x475602, 0x6
-
-gUnknown_8475608:: @ 8475608
-	.incbin "baserom.gba", 0x475608, 0x40
-
-gUnknown_8475648:: @ 8475648
-	.incbin "baserom.gba", 0x475648, 0x14
-
-gUnknown_847565C:: @ 847565C
-	.incbin "baserom.gba", 0x47565C, 0x18
-
-gUnknown_8475674:: @ 8475674
-	.incbin "baserom.gba", 0x475674, 0x10
-
-gUnknown_8475684:: @ 8475684
-	.incbin "baserom.gba", 0x475684, 0x8
-
-gUnknown_847568C:: @ 847568C
-	.incbin "baserom.gba", 0x47568C, 0x10
-
-gUnknown_847569C:: @ 847569C
-	.incbin "baserom.gba", 0x47569C, 0x8
-
-gUnknown_84756A4:: @ 84756A4
-	.incbin "baserom.gba", 0x4756A4, 0x204
-
-gUnknown_84758A8:: @ 84758A8
-	.incbin "baserom.gba", 0x4758A8, 0xC0
-
-gUnknown_8475968:: @ 8475968
-	.incbin "baserom.gba", 0x475968, 0x1D4
-
-gUnknown_8475B3C:: @ 8475B3C
-	.incbin "baserom.gba", 0x475B3C, 0x890
-
-gUnknown_84763CC:: @ 84763CC
-	.incbin "baserom.gba", 0x4763CC, 0xDCC
-
-gUnknown_8477198:: @ 8477198
-	.incbin "baserom.gba", 0x477198, 0x94
-
-gUnknown_847722C:: @ 847722C
-	.incbin "baserom.gba", 0x47722C, 0x148
-
-gUnknown_8477374:: @ 8477374
-	.incbin "baserom.gba", 0x477374, 0x121C
-
-gUnknown_8478590:: @ 8478590
-	.incbin "baserom.gba", 0x478590, 0x26C
-
-gUnknown_84787FC:: @ 84787FC
-	.incbin "baserom.gba", 0x4787FC, 0x250
-
-gUnknown_8478A4C:: @ 8478A4C
-	.incbin "baserom.gba", 0x478A4C, 0x24C
-
-gUnknown_8478C98:: @ 8478C98
-	.incbin "baserom.gba", 0x478C98, 0x48
-
-gUnknown_8478CE0:: @ 8478CE0
-	.incbin "baserom.gba", 0x478CE0, 0xB0
-
-gUnknown_8478D90:: @ 8478D90
-	.incbin "baserom.gba", 0x478D90, 0x8
-
-gUnknown_8478D98:: @ 8478D98
-	.incbin "baserom.gba", 0x478D98, 0x8
-
-gUnknown_8478DA0:: @ 8478DA0
-	.incbin "baserom.gba", 0x478DA0, 0x8
-
-gUnknown_8478DA8:: @ 8478DA8
-	.incbin "baserom.gba", 0x478DA8, 0x24
-
-gUnknown_8478DCC:: @ 8478DCC
-	.incbin "baserom.gba", 0x478DCC, 0x8
-
-gUnknown_8478DD4:: @ 8478DD4
-	.incbin "baserom.gba", 0x478DD4, 0x8
-
-gUnknown_8478DDC:: @ 8478DDC
-	.incbin "baserom.gba", 0x478DDC, 0x18
-
-gUnknown_8478DF4:: @ 8478DF4
-	.incbin "baserom.gba", 0x478DF4, 0x18
-
-gUnknown_8478E0C:: @ 8478E0C
-	.incbin "baserom.gba", 0x478E0C, 0x2
-
-gUnknown_8478E0E:: @ 8478E0E
-	.incbin "baserom.gba", 0x478E0E, 0xA
-
-gUnknown_8478E18:: @ 8478E18
-	.incbin "baserom.gba", 0x478E18, 0x8
-
-gUnknown_8478E20:: @ 8478E20
-	.incbin "baserom.gba", 0x478E20, 0x18
-
-gUnknown_8478E38:: @ 8478E38
-	.incbin "baserom.gba", 0x478E38, 0x3
-
-gUnknown_8478E3B:: @ 8478E3B
-	.incbin "baserom.gba", 0x478E3B, 0x45
-
-gUnknown_8478E80:: @ 8478E80
-	.incbin "baserom.gba", 0x478E80, 0x14
-
-gUnknown_8478E94:: @ 8478E94
-	.incbin "baserom.gba", 0x478E94, 0x14
-
-gUnknown_8478EA8:: @ 8478EA8
-	.incbin "baserom.gba", 0x478EA8, 0x8
-
-gUnknown_8478EB0:: @ 8478EB0
-	.incbin "baserom.gba", 0x478EB0, 0xA
-
-gUnknown_8478EBA:: @ 8478EBA
-	.incbin "baserom.gba", 0x478EBA, 0xA
-
-gUnknown_8478EC4:: @ 8478EC4
-	.incbin "baserom.gba", 0x478EC4, 0x50
-
-gUnknown_8478F14:: @ 8478F14
-	.incbin "baserom.gba", 0x478F14, 0x8
-
-	.section .rodata.8479668
-
 	.align 2
 gUnknown_8479668:: @ 8479668
 	.incbin "graphics/misc/unk_8479688.gbapal"
diff --git a/data/strings.s b/data/strings.s
index ac7241354..27481f0a0 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3351,58 +3351,67 @@ gUnknown_841CC64:: @ 841CC64
 	.string "SAVING...\n"
 	.string "DON'T TURN OFF THE POWER.$"
 
+gText_BerryPickingRecords::
 	.string "DODRIO BERRY-PICKING RECORDS$"
 
+gText_BerriesPicked::
 	.string "BERRIES picked:$"
 
+gText_BestScore::
 	.string "Best score:$"
 
+gText_BerriesInRowFivePlayers::
 	.string "BERRIES picked in a row with\n"
 	.string "five players:$"
 
-gUnknown_841CD03:: @ 841CD03
+gText_BerryPickingResults:: @ 841CD03
 	.string "Announcing BERRY-PICKING results!$"
 
-gUnknown_841CD25:: @ 841CD25
+gText_10P30P50P50P:: @ 841CD25
 	.string "10P     30P     50P     {EXTRA 0xDD}50P$"
 
-gUnknown_841CD43:: @ 841CD43
+gText_AnnouncingRankings:: @ 841CD43
 	.string "Announcing rankings!$"
 
-gUnknown_841CD58:: @ 841CD58
+gText_AnnouncingPrizes:: @ 841CD58
 	.string "Announcing prizes!$"
 
+gText_1Colon::
 	.string "1:$"
 
+gText_2Colon::
 	.string "2:$"
 
+gText_3Colon::
 	.string "3:$"
 
+gText_4Colon::
 	.string "4:$"
 
+gText_5Colon::
 	.string "5:$"
 
-gUnknown_841CD7A:: @ 841CD7A
+gText_FirstPlacePrize:: @ 841CD7A
 	.string "The first-place winner gets\n"
 	.string "this {DYNAMIC 00}!$"
 
-gUnknown_841CD9F:: @ 841CD9F
+gText_CantHoldAnyMore:: @ 841CD9F
 	.string "You can't hold any more...$"
 
-gUnknown_841CDBA:: @ 841CDBA
+gText_FilledStorageSpace:: @ 841CDBA
 	.string "It filled its storage space.$"
 
-gUnknown_841CDD7:: @ 841CDD7
+gText_WantToPlayAgain:: @ 841CDD7
 	.string "Want to play again?$"
 
-gUnknown_841CDEB:: @ 841CDEB
+gText_SomeoneDroppedOut:: @ 841CDEB
 	.string "Somebody dropped out.\n"
 	.string "The link will be canceled.$"
 
-gUnknown_841CE1C:: @ 841CE1C
+gText_SpacePoints:: @ 841CE1C
 	.string " points$"
 
-gUnknown_841CE24:: @ 841CE24
+gText_CommunicationStandby3:: @ 841CE24
 	.string "Communication standby…$"
 
 	.align 2
diff --git a/graphics/link_games/dodrioberry_berrysprites.png b/graphics/link_games/dodrioberry_berrysprites.png
new file mode 100644
index 0000000000000000000000000000000000000000..81d3a6f97ca27078cf92a551eb4db9ae7370394c
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000mG0058#0{{R3^KJHu0000mP)t-s=Kude
zK|!3H=5uqsi}uxG)vW*3IrgkM?(XgYl-1^gF#w#s|CEaW=Ks}VS^)0<<<lrw0003N
zNkl<ZIE`aqzz+nVw4fk_W^B}e2uU;>8A2FJN)U#SkusE_1eIbmHWonDPBFlAj|bE}
zts#LBhKmb?Arj&WWw=147(+v8@16{(d)mtiA&j&%2t%wa9m+_9N->s~Q`<cx0d&VN
zY*dm0(OeeF#)b<R7}%DjDH*3_fkcwi(ySJM<kn=ZI=}{IEugu39yYqjfoQ%6*U-QR
z3=BMP&bWl0IR_Fsdge^r1CZRSbMF@LfLRY{?w*Z}Y0@B?yCS{3a03Ga@7}v<<#%s`
zM6TbxTfG4!xApe!0A4U_15R@}85kx&7!x?5jGyztjG6QQ|Nl7?B=G;|{QqE~`4c#Q
pG9WYHQgFp^?MMc~tQZ9(0RSHyT;dQHEw}&x002ovPDHLkV1nZUs2KnN

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_bg1.bin b/graphics/link_games/dodrioberry_bg1.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8547f63fbd862fadbc82116f170f861638d57eac
GIT binary patch
literal 1280
zcmbW#Wly9r6oz5k<pv%W53<AJGPt|z;_mLUi}T}o=kS3cB+R_DY0i_=UQL?ROC9yp
zt4>~dUFHyH^wLK^{pwS%+-9F|pphm97-Wcf7Fc9XvzpNiv&?<Ui(1gUhBT-FHK|bz
z^7&|Dh$W7A5=bP8?Qdq15|yBM#VJ-XiZ-7?CRt>YLoRt-2bg)vRgSWirA%d*FQJq&
z%BdjOQK52`sZ=HAn`xnywqUXEoZ8f?7B!n6W`t2U+VN;qBN{fp#IieW9xZFh{1L}L
z^2a(df5PdH{HadNudvFPyBnPMk7-pa<}0b9ni@AZs7BSQQl<HJI_RW}Zg$vZk9`g}
zw0vOsz3ac%tuA${L+$3rnP8GBrn%#ufBX+vr!}QXO=#Tw8tZJZ$revM^TKPux}{BR
zXkBaO&p79TORl)#mIodK)+=4=LgzX&A4(YEL=Z`Vv!a4nk%~~b!W3#gg;dg<FPTm)
uzxYeOU-s{R<a9}CN>z&aLW)SnLoq%4aq{mk+2hwwc5<;i>Y+%5=HCE{^`3+P

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_bg1.pal b/graphics/link_games/dodrioberry_bg1.pal
new file mode 100644
index 000000000..c06550002
--- /dev/null
+++ b/graphics/link_games/dodrioberry_bg1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 246 255
+82 180 172
+82 205 189
+156 156 131
+106 156 148
+123 123 98
+189 172 98
+189 189 139
+74 172 156
+172 172 131
+74 156 123
+115 115 82
+139 139 106
+164 164 115
+197 197 148
+230 246 255
diff --git a/graphics/link_games/dodrioberry_bg1.png b/graphics/link_games/dodrioberry_bg1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7079e8094308b227e0d656f486486159cf5f05e0
GIT binary patch
literal 1887
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
Z!v7K2ZmhO?^_u_y002ovPDHLkV1f-LV{-ri

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_bg2.pal b/graphics/link_games/dodrioberry_bg2.pal
new file mode 100644
index 000000000..be2b62cc9
--- /dev/null
+++ b/graphics/link_games/dodrioberry_bg2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 246 255
+246 246 222
+230 230 180
+139 238 139
+246 246 189
+197 246 164
+246 230 197
+230 246 255
+230 213 180
+205 197 164
+148 222 148
+222 238 255
+139 205 139
+213 238 246
+222 246 255
+213 205 164
diff --git a/graphics/link_games/dodrioberry_bg2.png b/graphics/link_games/dodrioberry_bg2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee343dd1321ed036047856d753902ff0be4cfc87
GIT binary patch
literal 2856
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
GLSTXxH#Ld?

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_bg2left.bin b/graphics/link_games/dodrioberry_bg2left.bin
new file mode 100644
index 0000000000000000000000000000000000000000..73e83c6dd5a2d19c87c6867ce32755aaa7e4e97d
GIT binary patch
literal 1280
zcmb8qWp9*07=_^r3l7Cyio3g|#l5)0;tmTGcXxMpcb9Lt^Pkvvmu5e9n91CEGRgg%
zoGjUT%eB%fS;;xYTxFD%{~2MVQFhpAm(-m1Q(K+<b<@o-(+MY?`ZwqOw9-1jUuL-#
zZn)`|#+qoVndVw(=}LgjR@-cM)iu`@RZMXulvGOTAe*C(Iqs=vo~xp&YO1TDrdomd
z1r$_BVMWBe@X{-<z46w&!2Hd&n3iyRCEj}<eDuj@Uwri>XhY;LO>T(!=DQz$`sKGj
zK{hErZnzv7$|<jciYlob*gx`P$^0C3WvZvX1{!MgANlb_gLq;~8*R1IUI!g@3haN_
zk%S%HxX!xhs+;b5=oy&bS3iA3>~Da91{rLKp@s$aA7iZ1B91fO1QSg%*%VU)^Jkl5
zmWXrBGv5LWEwb2>!2WBjwOX3%thd2Nn*#Iq*lV{m_u21&gAN7yXPk9fn&+H%!9|x`
V4%%?XUALuq&wUR(^vL5N|1bSVaCiU!

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_bg2right.bin b/graphics/link_games/dodrioberry_bg2right.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a93db06df057f30db2c2ce2bca06d75d7cc93ee8
GIT binary patch
literal 1280
zcmb8tMUNCw6oAnJ4#C~s-Q5Z9?moCPgS)%CTjLIc%MN$`6Wz_E)2o?BCGT6@%6T`b
zR21d*lv2_vee~8Vr)#WEO>&d}-qljmE@O-~DyMtwPEGRmt+aH?Y_rVF=^3X}le~Q-
zriJF3X{w3F8oBM3n^sz3xey;Ip}1m-Dx$DLZn*B6op#tB<YQ{6u9~W<sH~Fbo_Xq|
z6OIS@$UASn@!Bgdy^x_G3dk>Ckk9tj7oUCd(FgD2zGwW*u+7#WANk|AUw-=GyKixu
z(3!zLrlJbUE2pe7N*if}tpD(lh8n1^p1SI&9rua-8NvIrb<{z7?X=ZK>$ps8&kFXD
z9=hwMt1de0l+>B=8;&^|^!;Ln8)m2>1{-9c0s8BwZ?a+k-*nSVHN|9;Of<oG<BUx<
z#AjP(sU;R$WT6G-n`f>$$%gpI7MpFd(FW_Svo@_^{)od4Ip~1>_Su`(5P#JbmtAtv
a1?Qb}HmxE4iN_v!=z;t0x$90^6aFvoEOjUV

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_pkmn.png b/graphics/link_games/dodrioberry_pkmn.png
new file mode 100644
index 0000000000000000000000000000000000000000..41ecd921d3d07c4ba215d1f72dd1fd6a400c5e68
GIT binary patch
literal 3330
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
M07*qoM6N<$g0`|BW&i*H

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_platform.png b/graphics/link_games/dodrioberry_platform.png
new file mode 100644
index 0000000000000000000000000000000000000000..9074ec74045a74cc91f48ab5954a634d7e7d6965
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A9B*|+~d@b3SAApPvw
zw|not-TU_K-MjxlDNL|O|D_U8^q{AUV~9oX+lk(MEebpiJDFyB-jLRJcy-A13ztgV
zVIQ^9{2rNVuTZv&%0I$d_SI>4{dfG*(7~{6N67Jqy-nG(rpZQg%Vco{Noufo+Dwj;
zJ+%6;)gI|GVTSiD)7(FXNl)d9kuo?}$a}ttafjfomMH<higO>b++j5?zpDMMWS-Hf
z3HK$f&SXz=U7GS@`i8EAX&eo#^R|mPb1?VbUX;PLCg+P`Ys=J6YG*~V!n|Jo)bE(4
mY&5~(+I~;TS~pu8kv|OaW{DaWb)pAAUi5VJb6Mw<&;$TYW_e2h

literal 0
HcmV?d00001

diff --git a/graphics/link_games/dodrioberry_shiny.pal b/graphics/link_games/dodrioberry_shiny.pal
new file mode 100644
index 000000000..5d8b5b7a5
--- /dev/null
+++ b/graphics/link_games/dodrioberry_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 255 238
+41 41 41
+213 222 90
+172 180 49
+90 98 16
+246 131 164
+197 82 82
+255 255 156
+255 205 98
+139 106 16
+148 148 148
+82 82 82
+255 205 230
+131 139 16
+0 0 0
+255 255 255
diff --git a/graphics/link_games/dodrioberry_status.png b/graphics/link_games/dodrioberry_status.png
new file mode 100644
index 0000000000000000000000000000000000000000..e48d499f03853a0f3ff5310d998412e1069c6140
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT%Y~_@960G|Nq|q?~4B)
zWjK2D>XIc}nwzKmKYH|kclUooL!d%9_;1L-{rAQuAm7i^#W6%;YI4E>W(n3t2ZkdB
zj7$cHZ{E1Uaws53=}d!WTXwsohn&NX<uV)xdNys@QgTVM;O&*7^I8fF#$o5?SaKhF
g@j?NtPW^=(!!%*-i4jHnPJ(RmboFyt=akR{07e~1{r~^~

literal 0
HcmV?d00001

diff --git a/include/strings.h b/include/strings.h
index e55cb02f5..a4c550a51 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -589,6 +589,28 @@ extern const u8 gText_HaventReceivedGiftOkayToDiscard[];
 extern const u8 gText_SendingWonderCard[];
 extern const u8 gText_SendingWonderNews[];
 
+// 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[];
+
 // player_pc
 extern const u8 gText_WhatWouldYouLikeToDo[];
 extern const u8 gText_TakeOutItemsFromThePC[];
diff --git a/ld_script.txt b/ld_script.txt
index 6b8c45d96..793c9466b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -552,18 +552,18 @@ SECTIONS {
         src/text_window_graphics.o(.rodata);
         src/quest_log_8150454.o(.rodata);
         data/berry_powder.o(.rodata);
-        data/data_8471F50.o(.rodata);
+        src/dodrio_berry_picking.o(.rodata);
         src/battle_controller_pokedude.o(.rodata);
         src/teachy_tv.o(.rodata);
         src/unk_815C980.o(.rodata);
-        data/data_8471F50.o(.rodata.8479668);
+        data/data_8479668.o(.rodata);
         src/ss_anne.o(.rodata);
         src/cereader_tool.o(.rodata);
         src/renewable_hidden_items.o(.rodata);
         src/trainer_tower.o(.rodata);
         src/unk_815F138.o(.rodata);
         src/berry_fix_program.o(.rodata);
-        data/data_8471F50.o(.rodata.after_trainer_tower);
+        data/data_8479668.o(.rodata.after_trainer_tower);
 
         /* These should not be moved to C files */
         src/mystery_event_msg.o(.rodata);
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
new file mode 100644
index 000000000..35e8ceed7
--- /dev/null
+++ b/src/dodrio_berry_picking.c
@@ -0,0 +1,748 @@
+#include "global.h"
+#include "bg.h"
+#include "strings.h"
+#include "window.h"
+
+/*static*/ void sub_8150C78(void);
+/*static*/ void sub_8150CBC(void);
+/*static*/ void sub_8150CF4(void);
+/*static*/ void sub_8150D7C(void);
+/*static*/ void sub_8150DA4(void);
+/*static*/ void sub_8150FDC(void);
+/*static*/ void sub_8151198(void);
+/*static*/ void sub_81512B4(void);
+/*static*/ void sub_8151488(void);
+/*static*/ void sub_81514F0(void);
+/*static*/ void sub_815159C(void);
+/*static*/ void sub_8150F40(void);
+/*static*/ void sub_8150E68(void);
+/*static*/ void sub_815109C(void);
+/*static*/ void sub_8150FC4(void);
+/*static*/ void nullsub_97(struct Sprite *sprite);
+/*static*/ void sub_81543E8(struct Sprite *sprite);
+/*static*/ void sub_8154A2C(void);
+/*static*/ void sub_8154B34(void);
+/*static*/ void sub_8154F80(void);
+/*static*/ void sub_81556E0(void);
+/*static*/ void sub_8155A78(void);
+/*static*/ void sub_8155B4C(void);
+/*static*/ void sub_8155C2C(void);
+/*static*/ void sub_8155C80(void);
+/*static*/ void unused_0(void);
+/*static*/ void nullsub_98(void);
+
+// const rom data
+/*static*/ const u8 gUnknown_8471F50[5][5][11] =
+{
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0},
+        {0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 2, 9, 0},
+        {0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0},
+        {0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0},
+        {0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0},
+        {0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0},
+        {0, 7, 8, 1, 2, 3, 4, 5, 6, 7, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
+        {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2},
+        {4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4},
+        {6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6},
+        {8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8},
+    },
+};
+
+/*static*/ const u8 gUnknown_8472063[5][5][3] =
+{
+    {
+        {4, 5, 6},
+    },
+    {
+        {3, 4, 5},
+        {5, 6, 3},
+    },
+    {
+        {4, 5, 6},
+        {6, 7, 2},
+        {2, 3, 4},
+    },
+    {
+        {3, 4, 5},
+        {5, 6, 7},
+        {7, 8, 1},
+        {1, 2, 3},
+    },
+    {
+        {4, 5, 6},
+        {6, 7, 8},
+        {8, 9, 0},
+        {0, 1, 2},
+        {2, 3, 4},
+    },
+};
+
+/*static*/ const u8 gUnknown_84720AE[5][5][3] =
+{
+    {
+        {1, 0, 1},
+    },
+    {
+        {1, 0, 1},
+        {0, 1, 0},
+    },
+    {
+        {2, 0, 1},
+        {0, 1, 2},
+        {1, 2, 0},
+    },
+    {
+        {3, 0, 1},
+        {0, 1, 2},
+        {1, 2, 3},
+        {2, 3, 0},
+    },
+    {
+        {4, 0, 1},
+        {0, 1, 2},
+        {1, 2, 3},
+        {2, 3, 4},
+        {3, 4, 0},
+    },
+};
+
+ALIGNED(4)
+/*static*/ const u8 gUnknown_84720FC[5][11] =
+{
+    {9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9},
+    {9, 9, 9, 0, 0, 1, 1, 0, 9, 9, 9},
+    {9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9},
+    {9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9},
+    {3, 3, 4, 4, 0, 0, 1, 1, 2, 2, 3},
+};
+
+/*static*/ const u8 gUnknown_8472133[5][5] =
+{
+    {5},
+    {4, 6},
+    {3, 5, 7},
+    {2, 4, 6, 8},
+    {1, 3, 5, 6, 9},
+};
+
+// Duplicate and unused gfx. Feel free to remove.
+/*static*/ const u32 sDuplicateGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.gbapal",
+                                     "graphics/link_games/dodrioberry_bg2.gbapal",
+                                     "graphics/link_games/dodrioberry_pkmn.gbapal",
+                                     "graphics/link_games/dodrioberry_shiny.gbapal",
+                                     "graphics/link_games/dodrioberry_status.gbapal",
+                                     "graphics/link_games/dodrioberry_berrysprites.gbapal",
+                                     "graphics/link_games/dodrioberry_berrysprites.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_platform.gbapal",
+                                     "graphics/link_games/dodrioberry_bg1.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_bg2.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_status.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_platform.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_pkmn.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_bg1.bin.lz",
+                                     "graphics/link_games/dodrioberry_bg2right.bin.lz",
+                                     "graphics/link_games/dodrioberry_bg2left.bin.lz");
+
+/*static*/ const u8 gUnknown_847553C[][3] =
+{
+    {40, 24, 13},
+    {32, 19, 10},
+    {22, 13, 7},
+};
+
+ALIGNED(4)
+/*static*/ const u8 gUnknown_8475548[] = {8, 5, 8, 11, 15};
+
+ALIGNED(4)
+/*static*/ const u8 gUnknown_8475550[] = {5, 10, 20, 30, 50, 70, 100};
+
+ALIGNED(4)
+/*static*/ const u8 gUnknown_8475558[][10] =
+{
+    {15, 16, 17, 18, 19, 19, 18, 17, 16, 15},
+    {20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
+    {30, 31, 32, 33, 34, 34, 33, 32, 31, 30},
+};
+
+/*static*/ void (*const gUnknown_8475578[])(void) =
+{
+    sub_8150C78,
+    sub_8150CBC,
+    sub_8150CF4,
+    sub_8150D7C,
+    sub_8150DA4,
+    sub_8150FDC,
+    sub_8151198,
+    sub_81512B4,
+    sub_8151488,
+    sub_81514F0,
+    sub_815159C,
+    sub_8150F40
+};
+
+/*static*/ void (*const gUnknown_84755A8[])(void) =
+{
+    sub_8150C78,
+    sub_8150CBC,
+    sub_8150CF4,
+    sub_8150D7C,
+    sub_8150E68,
+    sub_815109C,
+    sub_8151198,
+    sub_81512B4,
+    sub_8151488,
+    sub_81514F0,
+    sub_815159C,
+    sub_8150FC4
+};
+
+/*static*/ const s16 gUnknown_84755D8[] = {10, 30, 50, 50};
+
+// Data related to printing saved results.
+/*static*/ const struct WindowTemplate gUnknown_84755E0 =
+{
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 1,
+    .width = 28,
+    .height = 11,
+    .paletteNum = 15,
+    .baseBlock = 1,
+};
+
+/*static*/ const u8 *const gUnknown_84755E8[] = {gText_BerryPickingRecords, gText_BerriesPicked, gText_BestScore, gText_BerriesInRowFivePlayers};
+/*static*/ const u8 gUnknown_84755F8[] = {4, 7, 4};
+
+ALIGNED(4)
+/*static*/ const u8 gUnknown_84755FC[][2] = {{24}, {40}, {56}};
+/*static*/ const u8 gUnknown_8475602[][2] = {{24}, {40}, {70}};
+
+// Debug functions?
+/*static*/ const u16 gUnknown_8475608[][4] =
+{
+    {9999, 0, 90, 9999},
+    {9999, 9999, 70, 9999},
+    {9999, 0, 9999, 0},
+    {9999, 9999, 60, 0},
+    {9999, 9999, 9999, 0},
+};
+
+/*static*/ const u8 gUnknown_8475630[] = _("あいうえおかき");
+/*static*/ const u8 gUnknown_8475638[] = _("ABCDEFG");
+/*static*/ const u8 gUnknown_8475640[] = _("0123456");
+
+/*static*/ const u8 *const gUnknown_8475648[] =
+{
+    gUnknown_8475630,
+    gUnknown_8475630,
+    gUnknown_8475630,
+    gUnknown_8475638,
+    gUnknown_8475640
+};
+
+// Large chunk of data
+/*static*/ const struct BgTemplate gUnknown_847565C[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 12,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 14,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+};
+
+// Unknown unreferenced data, feel free to remove.
+/*static*/ const u32 sUnused[] = {255, 0};
+
+/*static*/ const struct WindowTemplate gUnknown_8475674[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 28,
+        .height = 3,
+        .paletteNum = 13,
+        .baseBlock = 0x13,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 6,
+        .width = 28,
+        .height = 13,
+        .paletteNum = 13,
+        .baseBlock = 0x67,
+    }
+};
+
+/*static*/ const struct WindowTemplate gUnknown_8475684 =
+{
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 6,
+    .width = 28,
+    .height = 7,
+    .paletteNum = 13,
+    .baseBlock = 0x67,
+};
+
+/*static*/ const struct WindowTemplate gUnknown_847568C[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 19,
+        .height = 3,
+        .paletteNum = 13,
+        .baseBlock = 0x13,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 7,
+        .width = 6,
+        .height = 4,
+        .paletteNum = 13,
+        .baseBlock = 0x4C,
+    }
+};
+
+/*static*/ const struct WindowTemplate gUnknown_847569C =
+{
+    .bg = 0,
+    .tilemapLeft = 4,
+    .tilemapTop = 6,
+    .width = 22,
+    .height = 5,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+
+/*static*/ const struct WindowTemplate gUnknown_84756A4 =
+{
+    .bg = 0,
+    .tilemapLeft = 5,
+    .tilemapTop = 8,
+    .width = 19,
+    .height = 3,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+
+// This is an unused copy of the tables from the top of the file. Feel free to remove.
+/*static*/ const u8 sDuplicateArray[] =
+{
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0, 0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 2, 9,
+    0, 0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0, 0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0, 0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0, 0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0, 0, 7,
+    8, 1, 2, 3, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 2, 3, 4, 5, 6, 7, 8, 9, 0,
+    1, 2, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 4, 5, 6, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 5, 6, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 6, 7, 2, 2, 3, 4, 0, 0, 0, 0, 0, 0,
+    3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2, 3, 0, 0, 0, 4, 5, 6, 6, 7, 8, 8, 9, 0, 0, 1, 2, 2, 3, 4, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 1, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 1,
+    2, 1, 2, 3, 2, 3, 0, 0, 0, 0, 4, 0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 0, 0, 0, 0, 9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9, 9,
+    9, 9, 0, 0, 1, 1, 0, 9, 9, 9, 9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9, 9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9, 3, 3, 4, 4, 0, 0, 1, 1,
+    2, 2, 3, 5, 0, 0, 0, 0, 4, 6, 0, 0, 0, 3, 5, 7, 0, 0, 2, 4, 6, 8, 0, 1, 3, 5, 6, 9
+};
+
+/*static*/ const u16 gDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
+                                            "graphics/link_games/dodrioberry_bg2.gbapal");
+/*static*/ const u16 gDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
+/*static*/ const u16 gDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
+/*static*/ const u16 gDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
+/*static*/ const u16 gDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
+/*static*/ const u32 gDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
+/*static*/ const u16 gDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
+/*static*/ const u32 gDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
+/*static*/ const u32 gDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
+/*static*/ const u32 gDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
+/*static*/ const u32 gDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
+/*static*/ const u32 gDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
+/*static*/ const u32 gDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
+/*static*/ const u32 gDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
+/*static*/ const u32 gDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
+
+/*static*/ const struct OamData sOamData_8478C98 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+/*static*/ const struct OamData sOamData_8478CA0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+/*static*/ const struct OamData sOamData_8478CA8 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+/*static*/ const struct OamData sOamData_8478CB0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 3,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CB8[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CC0[] =
+{
+    ANIMCMD_FRAME(64, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CC8[] =
+{
+    ANIMCMD_FRAME(128, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CD0[] =
+{
+    ANIMCMD_FRAME(192, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CD8[] =
+{
+    ANIMCMD_FRAME(256, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd *const sSpriteAnimTable_8478CE0[] =
+{
+    sSpriteAnim_8478CB8,
+    sSpriteAnim_8478CC0,
+    sSpriteAnim_8478CC8,
+    sSpriteAnim_8478CD0,
+    sSpriteAnim_8478CD8
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CF4[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478CFC[] =
+{
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D04[] =
+{
+    ANIMCMD_FRAME(8, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd *const sSpriteAnimTable_8478D0C[] =
+{
+    sSpriteAnim_8478CF4,
+    sSpriteAnim_8478CFC,
+    sSpriteAnim_8478D04
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D18[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D20[] =
+{
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D28[] =
+{
+    ANIMCMD_FRAME(8, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D30[] =
+{
+    ANIMCMD_FRAME(12, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D38[] =
+{
+    ANIMCMD_FRAME(16, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D40[] =
+{
+    ANIMCMD_FRAME(20, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D48[] =
+{
+    ANIMCMD_FRAME(24, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D50[] =
+{
+    ANIMCMD_FRAME(28, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D58[] =
+{
+    ANIMCMD_FRAME(32, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd *const sSpriteAnimTable_8478D60[] =
+{
+    sSpriteAnim_8478D18,
+    sSpriteAnim_8478D20,
+    sSpriteAnim_8478D28,
+    sSpriteAnim_8478D30,
+    sSpriteAnim_8478D38,
+    sSpriteAnim_8478D40,
+    sSpriteAnim_8478D48,
+    sSpriteAnim_8478D50,
+    sSpriteAnim_8478D58
+};
+
+/*static*/ const union AnimCmd sSpriteAnim_8478D84[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+/*static*/ const union AnimCmd *const sSpriteAnimTable_8478D8C[] =
+{
+    sSpriteAnim_8478D84
+};
+
+// These are declared inside pokeemerald's sub_80283A8
+const struct SpritePalette gUnknown_8478D90 = {gDodrioBerryPkmnPal, 0};
+const struct SpritePalette gUnknown_8478D98 = {gDodrioBerryShinyPal, 1};
+
+// These are declared inside pokeemerald's sub_8028734
+const struct SpritePalette gUnknown_8478DA0 = {gDodrioBerryStatusPal, 2};
+const struct SpriteTemplate gUnknown_8478DA8 =
+        {
+            .tileTag = 1,
+            .paletteTag = 2,
+            .oam = &sOamData_8478CA0,
+            .anims = sSpriteAnimTable_8478D0C,
+            .images = NULL,
+            .affineAnims = gDummySpriteAffineAnimTable,
+            .callback = nullsub_97,
+        };
+
+// Unknown unused data, feel free to remove.
+/*static*/ const u8 sUnused2[] = {0xCD, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0xF4, 0x0, 0x0};
+
+// This is declared inside pokeemerald's sub_8028A34
+const struct SpritePalette gUnknown_8478DCC = {gDodrioBerrySpritesPal, 3};
+
+/*static*/ const s16 gUnknown_8478DD4[] = {88, 128, 168, 208};
+
+// These are declared inside pokeemerald's sub_8028A88
+const struct SpriteTemplate gUnknown_8478DDC =
+    {
+        .tileTag = 2,
+        .paletteTag = 3,
+        .oam = &sOamData_8478CA8,
+        .anims = sSpriteAnimTable_8478D60,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+const struct SpriteTemplate gUnknown_8478DF4 =
+    {
+        .tileTag = 2,
+        .paletteTag = 3,
+        .oam = &sOamData_8478CA0,
+        .anims = sSpriteAnimTable_8478D60,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+
+// This is declared inside pokeemerald's sub_8028CF4
+/*static*/ const u8 gUnknown_8478E0C[] = {30, 20};
+
+/*static*/ const s16 gUnknown_8478E0E[][2] = {{230, 55}, {30, 74}};
+
+// These are declared inside pokeemerald's sub_8028D44
+const struct SpritePalette gUnknown_8478E18 = {gDodrioBerryPlatformPal, 6};
+const struct SpriteTemplate gUnknown_8478E20 =
+    {
+        .tileTag = 5,
+        .paletteTag = 6,
+        .oam = &sOamData_8478CB0,
+        .anims = sSpriteAnimTable_8478D8C,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = sub_81543E8,
+    };
+
+struct WinCoords
+{
+    u8 left;
+    u8 top;
+};
+
+/*static*/ const u8 gUnknown_8478E38[][3] =
+{
+    {1, 2, 3},
+    {1, 4, 5},
+    {1, 8, 9},
+    {1, 6, 7},
+};
+
+/*static*/ const struct WinCoords gUnknown_8478E44[] = {{12, 6}};
+/*static*/ const struct WinCoords gUnknown_8478E48[] = {{9, 10}, {15, 6}};
+/*static*/ const struct WinCoords gUnknown_8478E50[] = {{12, 6}, {18, 10}, {6, 10}};
+/*static*/ const struct WinCoords gUnknown_8478E5C[] = {{9, 10}, {15, 6}, {21, 10}, {3, 6}};
+/*static*/ const struct WinCoords gUnknown_8478E6C[] = {{12, 6}, {18, 10}, {23, 6}, {1, 6}, {6, 10}};
+
+/*static*/ const struct WinCoords *const gUnknown_8478E80[] =
+{
+    gUnknown_8478E44,
+    gUnknown_8478E48,
+    gUnknown_8478E50,
+    gUnknown_8478E5C,
+    gUnknown_8478E6C,
+};
+
+/*static*/ const u8 *const gUnknown_8478E94[] =
+{
+    gText_1Colon,
+    gText_2Colon,
+    gText_3Colon,
+    gText_4Colon,
+    gText_5Colon,
+};
+
+/*static*/ const u16 gUnknown_8478EA8[] = {92, 132, 172, 212};
+/*static*/ const u16 gUnknown_8478EB0[] = {30, 45, 60, 75, 90};
+/*static*/ const u16 gUnknown_8478EBA[] = {12, 28, 44, 60, 76};
+
+struct
+{
+    u8 id;
+    void (*func)(void);
+} const gUnknown_8478EC4[] =
+{
+    {0, sub_8154A2C},
+    {1, sub_8154B34},
+    {2, sub_8154F80},
+    {3, sub_81556E0},
+    {4, sub_8155A78},
+    {5, sub_8155B4C},
+    {6, sub_8155C2C},
+    {7, sub_8155C80},
+    {8, unused_0},
+    {9, nullsub_98},
+};
+
+// This is declared inside pokeemerald's sub_80296A8
+const u8 gUnknown_8478F14[5] = {0, 1, 2, 3, 4};

From ff63194f8fd75e428752e672c4f5c0f2d70e1819 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Mon, 2 Dec 2019 22:50:30 -0800
Subject: [PATCH 3/6] Bump baserom.ips

---
 baserom.ips | Bin 151672 -> 122967 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/baserom.ips b/baserom.ips
index a72abbfcb45178f8c610d35070c869ac0d6bc828..095e1b9d9b7be779c61c48e21f2e97a4de1bfcc2 100644
GIT binary patch
delta 17
Zcmeydfb;qR_J%Et0mj=47c;W21prGW2Y3Jg

delta 28109
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
Dp>;H|


From 8c57e32b95ec9d8f4c7a60b326739c64734cd37a Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Tue, 3 Dec 2019 09:35:34 -0800
Subject: [PATCH 4/6] Rename static symbols.

---
 asm/dodrio_berry_picking.s | 202 ++++++++++++++++++-------------------
 src/dodrio_berry_picking.c | 140 ++++++++++++-------------
 2 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 892dff901..9928f14b4 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -503,7 +503,7 @@ _08150C04: .4byte sub_81516DC
 sub_8150C08: @ 8150C08
 	push {lr}
 	bl sub_8151B54
-	ldr r1, _08150C34 @ =gUnknown_8475578
+	ldr r1, _08150C34 @ =sUnknown_8475578
 	ldr r0, _08150C38 @ =gUnknown_203F3E0
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x18]
@@ -521,7 +521,7 @@ _08150C2C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08150C34: .4byte gUnknown_8475578
+_08150C34: .4byte sUnknown_8475578
 _08150C38: .4byte gUnknown_203F3E0
 _08150C3C: .4byte gUnknown_3002044
 	thumb_func_end sub_8150C08
@@ -530,7 +530,7 @@ _08150C3C: .4byte gUnknown_3002044
 sub_8150C40: @ 8150C40
 	push {lr}
 	bl sub_8151C5C
-	ldr r1, _08150C6C @ =gUnknown_84755A8
+	ldr r1, _08150C6C @ =sUnknown_84755A8
 	ldr r0, _08150C70 @ =gUnknown_203F3E0
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x18]
@@ -548,7 +548,7 @@ _08150C64:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08150C6C: .4byte gUnknown_84755A8
+_08150C6C: .4byte sUnknown_84755A8
 _08150C70: .4byte gUnknown_203F3E0
 _08150C74: .4byte gUnknown_3002044
 	thumb_func_end sub_8150C40
@@ -3172,7 +3172,7 @@ sub_81520B4: @ 81520B4
 	ands r0, r1
 	cmp r0, 0
 	bne _08152108
-	ldr r1, _081520EC @ =gUnknown_8475548
+	ldr r1, _081520EC @ =sUnknown_8475548
 	adds r0, r3, 0
 	adds r0, 0x24
 	ldrb r0, [r0]
@@ -3185,7 +3185,7 @@ sub_81520B4: @ 81520B4
 	b _0815210A
 	.align 2, 0
 _081520E8: .4byte gUnknown_203F3E0
-_081520EC: .4byte gUnknown_8475548
+_081520EC: .4byte sUnknown_8475548
 _081520F0:
 	lsls r4, r2, 3
 	adds r1, r4, 0
@@ -3321,7 +3321,7 @@ _081521B0:
 	bcs _08152284
 	adds r7, r3, 0
 _081521E6:
-	ldr r0, _08152250 @ =gUnknown_8471F50
+	ldr r0, _08152250 @ =sUnknown_8471F50
 	add r0, r10
 	ldrb r5, [r0]
 	ldr r1, [r7]
@@ -3372,7 +3372,7 @@ _0815221E:
 	.align 2, 0
 _08152248: .4byte gUnknown_203F3E0
 _0815224C: .4byte 0x000031cc
-_08152250: .4byte gUnknown_8471F50
+_08152250: .4byte sUnknown_8471F50
 _08152254:
 	adds r0, r2, 0x1
 	lsls r0, 24
@@ -3418,7 +3418,7 @@ _0815229C:
 	mov r9, r1
 _081522A0:
 	movs r6, 0xFF
-	ldr r0, _0815235C @ =gUnknown_8471F50
+	ldr r0, _0815235C @ =sUnknown_8471F50
 	add r0, r10
 	ldrb r5, [r0]
 	mov r2, r9
@@ -3448,7 +3448,7 @@ _081522B8:
 	bls _081522DE
 	movs r3, 0x2
 _081522DE:
-	ldr r2, _08152360 @ =gUnknown_847553C
+	ldr r2, _08152360 @ =sUnknown_847553C
 	ldr r0, _08152364 @ =0x000031b4
 	adds r1, r4, r0
 	adds r1, r5
@@ -3512,8 +3512,8 @@ _08152350:
 	.align 2, 0
 _08152354: .4byte 0x000031d4
 _08152358: .4byte gUnknown_203F3E0
-_0815235C: .4byte gUnknown_8471F50
-_08152360: .4byte gUnknown_847553C
+_0815235C: .4byte sUnknown_8471F50
+_08152360: .4byte sUnknown_847553C
 _08152364: .4byte 0x000031b4
 _08152368:
 	adds r0, r3, 0
@@ -3704,7 +3704,7 @@ _081524C6:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bhi _08152524
-	ldr r0, _08152518 @ =gUnknown_8472063
+	ldr r0, _08152518 @ =sUnknown_8472063
 	lsls r1, r4, 1
 	adds r1, r4
 	adds r1, r7, r1
@@ -3736,13 +3736,13 @@ _081524C6:
 	strb r1, [r0]
 	b _0815255A
 	.align 2, 0
-_08152518: .4byte gUnknown_8472063
+_08152518: .4byte sUnknown_8472063
 _0815251C: .4byte 0x000031d4
 _08152520:
 	movs r0, 0x1
 	b _0815255C
 _08152524:
-	ldr r0, _08152564 @ =gUnknown_8472063
+	ldr r0, _08152564 @ =sUnknown_8472063
 	lsls r1, r4, 1
 	adds r1, r4
 	adds r1, r7, r1
@@ -3776,7 +3776,7 @@ _0815255C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08152564: .4byte gUnknown_8472063
+_08152564: .4byte sUnknown_8472063
 _08152568: .4byte 0x000031d4
 	thumb_func_end sub_8152484
 
@@ -3914,7 +3914,7 @@ _0815264C:
 	bls _08152672
 	movs r3, 0x2
 _08152672:
-	ldr r2, _081526B4 @ =gUnknown_847553C
+	ldr r2, _081526B4 @ =sUnknown_847553C
 	ldr r0, _081526B8 @ =0x000032e0
 	adds r1, r4, r0
 	adds r1, r5
@@ -3947,7 +3947,7 @@ _081526AC:
 	bl sub_8152174
 	b _081527AC
 	.align 2, 0
-_081526B4: .4byte gUnknown_847553C
+_081526B4: .4byte sUnknown_847553C
 _081526B8: .4byte 0x000032e0
 _081526BC:
 	cmp r0, 0x2
@@ -4101,7 +4101,7 @@ sub_81527D0: @ 81527D0
 	ldrb r6, [r1]
 	cmp r6, r8
 	bcs _081528C2
-	ldr r0, _0815283C @ =gUnknown_8471F50
+	ldr r0, _0815283C @ =sUnknown_8471F50
 	mov r9, r0
 _081527F0:
 	ldr r0, _08152838 @ =gUnknown_203F3E0
@@ -4141,7 +4141,7 @@ _081527F0:
 	b _0815284C
 	.align 2, 0
 _08152838: .4byte gUnknown_203F3E0
-_0815283C: .4byte gUnknown_8471F50
+_0815283C: .4byte sUnknown_8471F50
 _08152840: .4byte 0x000031a0
 _08152844:
 	adds r0, r6, 0
@@ -4548,7 +4548,7 @@ sub_8152AD8: @ 8152AD8
 	lsls r1, r3, 4
 	subs r1, r3
 	lsls r1, 2
-	ldr r6, _08152B54 @ =gUnknown_8471F50
+	ldr r6, _08152B54 @ =sUnknown_8471F50
 	subs r0, 0x4
 	ldrb r2, [r0]
 	subs r2, 0x1
@@ -4580,7 +4580,7 @@ _08152B4C:
 	b _08152B5E
 	.align 2, 0
 _08152B50: .4byte gUnknown_203F3E0
-_08152B54: .4byte gUnknown_8471F50
+_08152B54: .4byte sUnknown_8471F50
 _08152B58: .4byte 0x000031bf
 _08152B5C:
 	movs r0, 0
@@ -4599,7 +4599,7 @@ sub_8152B64: @ 8152B64
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
-	ldr r0, _08152BCC @ =gUnknown_8475550
+	ldr r0, _08152BCC @ =sUnknown_8475550
 	mov r8, r0
 	ldr r0, _08152BD0 @ =gUnknown_203F3E0
 	ldr r6, [r0]
@@ -4643,7 +4643,7 @@ _08152BBE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08152BCC: .4byte gUnknown_8475550
+_08152BCC: .4byte sUnknown_8475550
 _08152BD0: .4byte gUnknown_203F3E0
 	thumb_func_end sub_8152B64
 
@@ -4651,7 +4651,7 @@ _08152BD0: .4byte gUnknown_203F3E0
 sub_8152BD4: @ 8152BD4
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r3, _08152BF0 @ =gUnknown_84720FC
+	ldr r3, _08152BF0 @ =sUnknown_84720FC
 	ldr r1, _08152BF4 @ =gUnknown_203F3E0
 	ldr r1, [r1]
 	adds r1, 0x24
@@ -4664,7 +4664,7 @@ sub_8152BD4: @ 8152BD4
 	ldrb r0, [r0]
 	bx lr
 	.align 2, 0
-_08152BF0: .4byte gUnknown_84720FC
+_08152BF0: .4byte sUnknown_84720FC
 _08152BF4: .4byte gUnknown_203F3E0
 	thumb_func_end sub_8152BD4
 
@@ -4684,7 +4684,7 @@ sub_8152BF8: @ 8152BF8
 	subs r2, 0x1
 	lsls r2, 24
 	lsrs r2, 24
-	ldr r3, _08152C7C @ =gUnknown_84720AE
+	ldr r3, _08152C7C @ =sUnknown_84720AE
 	lsls r1, r0, 1
 	adds r1, r0
 	lsls r0, r2, 4
@@ -4701,7 +4701,7 @@ sub_8152BF8: @ 8152BF8
 	ldrb r1, [r1]
 	mov r8, r1
 	movs r3, 0
-	ldr r1, _08152C80 @ =gUnknown_8472133
+	ldr r1, _08152C80 @ =sUnknown_8472133
 	lsls r0, r2, 2
 	adds r2, r0, r2
 	adds r0, r2, r1
@@ -4737,8 +4737,8 @@ _08152C60:
 	b _08152C90
 	.align 2, 0
 _08152C78: .4byte gUnknown_203F3E0
-_08152C7C: .4byte gUnknown_84720AE
-_08152C80: .4byte gUnknown_8472133
+_08152C7C: .4byte sUnknown_84720AE
+_08152C80: .4byte sUnknown_8472133
 _08152C84:
 	ldr r0, [r4]
 	adds r0, 0x90
@@ -5432,7 +5432,7 @@ _08153172:
 	movs r3, 0
 	lsls r1, r4, 2
 	ldr r5, _081531B4 @ =gUnknown_203F3E0
-	ldr r2, _081531B8 @ =gUnknown_8475558
+	ldr r2, _081531B8 @ =sUnknown_8475558
 	adds r1, r4
 	lsls r1, 1
 	adds r0, r1
@@ -5456,7 +5456,7 @@ _08153196:
 	bx r0
 	.align 2, 0
 _081531B4: .4byte gUnknown_203F3E0
-_081531B8: .4byte gUnknown_8475558
+_081531B8: .4byte sUnknown_8475558
 	thumb_func_end sub_8153150
 
 	thumb_func_start sub_81531BC
@@ -5806,7 +5806,7 @@ sub_8153424: @ 8153424
 	movs r3, 0
 	ldr r0, _08153490 @ =gUnknown_203F3E0
 	mov r9, r0
-	ldr r2, _08153494 @ =gUnknown_84755D8
+	ldr r2, _08153494 @ =sUnknown_84755D8
 	mov r10, r2
 	ldr r2, [r0]
 	lsls r1, r4, 1
@@ -5851,7 +5851,7 @@ _08153452:
 	b _0815349A
 	.align 2, 0
 _08153490: .4byte gUnknown_203F3E0
-_08153494: .4byte gUnknown_84755D8
+_08153494: .4byte sUnknown_84755D8
 _08153498:
 	movs r0, 0
 _0815349A:
@@ -6393,7 +6393,7 @@ _08153858:
 	beq _081538B0
 	b _081538CA
 _08153862:
-	ldr r0, _08153878 @ =gUnknown_84755E0
+	ldr r0, _08153878 @ =sUnknown_84755E0
 	bl AddWindow
 	strh r0, [r4, 0x2]
 	lsls r0, 24
@@ -6403,7 +6403,7 @@ _08153862:
 	movs r1, 0x3
 	b _0815389E
 	.align 2, 0
-_08153878: .4byte gUnknown_84755E0
+_08153878: .4byte sUnknown_84755E0
 _0815387C:
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -6482,7 +6482,7 @@ sub_81538D0: @ 81538D0
 	adds r0, r7, 0
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
-	ldr r0, _081539DC @ =gUnknown_84755E8
+	ldr r0, _081539DC @ =sUnknown_84755E8
 	ldr r2, [r0]
 	movs r0, 0x1
 	str r0, [sp]
@@ -6507,7 +6507,7 @@ _08153946:
 	ldr r0, [sp, 0x2C]
 	ldm r0!, {r1}
 	str r0, [sp, 0x2C]
-	ldr r0, _081539E0 @ =gUnknown_84755F8
+	ldr r0, _081539E0 @ =sUnknown_84755F8
 	adds r0, r4, r0
 	ldrb r3, [r0]
 	mov r0, r8
@@ -6519,12 +6519,12 @@ _08153946:
 	negs r2, r2
 	bl GetStringWidth
 	adds r5, r0, 0
-	ldr r1, _081539DC @ =gUnknown_84755E8
+	ldr r1, _081539DC @ =sUnknown_84755E8
 	adds r6, r4, 0x1
 	lsls r0, r6, 2
 	adds r0, r1
 	ldr r2, [r0]
-	ldr r0, _081539E4 @ =gUnknown_84755FC
+	ldr r0, _081539E4 @ =sUnknown_84755FC
 	lsls r4, 1
 	adds r0, r4, r0
 	ldrb r0, [r0]
@@ -6541,7 +6541,7 @@ _08153946:
 	subs r3, r5
 	lsls r3, 24
 	lsrs r3, 24
-	ldr r0, _081539E8 @ =gUnknown_8475602
+	ldr r0, _081539E8 @ =sUnknown_8475602
 	adds r4, r0
 	ldrb r0, [r4]
 	str r0, [sp]
@@ -6571,10 +6571,10 @@ _081539CC: .4byte gSaveBlock2Ptr
 _081539D0: .4byte 0x00000b14
 _081539D4: .4byte 0x00000b16
 _081539D8: .4byte 0x0000021d
-_081539DC: .4byte gUnknown_84755E8
-_081539E0: .4byte gUnknown_84755F8
-_081539E4: .4byte gUnknown_84755FC
-_081539E8: .4byte gUnknown_8475602
+_081539DC: .4byte sUnknown_84755E8
+_081539E0: .4byte sUnknown_84755F8
+_081539E4: .4byte sUnknown_84755FC
+_081539E8: .4byte sUnknown_8475602
 	thumb_func_end sub_81538D0
 
 	thumb_func_start sub_81539EC
@@ -6600,7 +6600,7 @@ sub_8153A04: @ 8153A04
 	ldrb r4, [r0]
 	cmp r4, 0x4
 	bhi _08153A32
-	ldr r5, _08153A90 @ =gUnknown_8475648
+	ldr r5, _08153A90 @ =sUnknown_8475648
 _08153A14:
 	lsls r0, r4, 3
 	subs r0, r4
@@ -6635,7 +6635,7 @@ _08153A40:
 	bcs _08153A7E
 	ldr r7, _08153A8C @ =gUnknown_203F3E0
 	lsls r3, r1, 1
-	ldr r6, _08153A98 @ =gUnknown_8475608
+	ldr r6, _08153A98 @ =sUnknown_8475608
 _08153A56:
 	ldr r2, [r7]
 	lsls r0, r4, 1
@@ -6667,9 +6667,9 @@ _08153A7E:
 	bx r0
 	.align 2, 0
 _08153A8C: .4byte gUnknown_203F3E0
-_08153A90: .4byte gUnknown_8475648
+_08153A90: .4byte sUnknown_8475648
 _08153A94: .4byte gLinkPlayers + 8
-_08153A98: .4byte gUnknown_8475608
+_08153A98: .4byte sUnknown_8475608
 	thumb_func_end sub_8153A04
 
 	thumb_func_start sub_8153A9C
@@ -6691,7 +6691,7 @@ sub_8153A9C: @ 8153A9C
 	ldr r0, [r0]
 	str r0, [sp, 0x10]
 	str r1, [sp, 0x14]
-	ldr r0, _08153AF8 @ =gDodrioBerryPkmnGfx
+	ldr r0, _08153AF8 @ =sDodrioBerryPkmnGfx
 	adds r1, r4, 0
 	bl LZ77UnCompWram
 	cmp r4, 0
@@ -6714,7 +6714,7 @@ _08153ADC:
 	.align 2, 0
 _08153AF0: .4byte gUnknown_8478D90
 _08153AF4: .4byte gUnknown_8478D98
-_08153AF8: .4byte gDodrioBerryPkmnGfx
+_08153AF8: .4byte sDodrioBerryPkmnGfx
 	thumb_func_end sub_8153A9C
 
 	thumb_func_start sub_8153AFC
@@ -7167,7 +7167,7 @@ sub_8153E28: @ 8153E28
 	ldr r0, [r0]
 	str r0, [sp, 0x20]
 	str r1, [sp, 0x24]
-	ldr r0, _08153ECC @ =gDodrioBerryStatusGfx
+	ldr r0, _08153ECC @ =sDodrioBerryStatusGfx
 	adds r1, r6, 0
 	bl LZ77UnCompWram
 	cmp r6, 0
@@ -7231,7 +7231,7 @@ _08153EB8:
 	bx r0
 	.align 2, 0
 _08153EC8: .4byte gUnknown_8478DA0
-_08153ECC: .4byte gDodrioBerryStatusGfx
+_08153ECC: .4byte sDodrioBerryStatusGfx
 _08153ED0: .4byte gUnknown_8478DA8
 _08153ED4: .4byte gUnknown_203F43C
 	thumb_func_end sub_8153E28
@@ -7563,7 +7563,7 @@ sub_8154128: @ 8154128
 	ldr r0, [r0]
 	str r0, [sp, 0x8]
 	str r1, [sp, 0xC]
-	ldr r0, _08154178 @ =gDodrioBerrySpritesGfx
+	ldr r0, _08154178 @ =sDodrioBerrySpritesGfx
 	adds r1, r4, 0
 	bl LZ77UnCompWram
 	cmp r4, 0
@@ -7586,7 +7586,7 @@ _0815415E:
 	bx r0
 	.align 2, 0
 _08154174: .4byte gUnknown_8478DCC
-_08154178: .4byte gDodrioBerrySpritesGfx
+_08154178: .4byte sDodrioBerrySpritesGfx
 	thumb_func_end sub_8154128
 
 	thumb_func_start sub_815417C
@@ -7639,7 +7639,7 @@ _081541A4:
 	bls _081541A4
 	movs r5, 0
 	ldr r7, _08154218 @ =gUnknown_203F42C
-	ldr r4, _0815421C @ =gUnknown_8478DD4
+	ldr r4, _0815421C @ =sUnknown_8478DD4
 	mov r8, r4
 _081541E4:
 	movs r0, 0x4
@@ -7664,7 +7664,7 @@ _0815420C: .4byte gUnknown_8478DDC
 _08154210: .4byte gUnknown_8478DF4
 _08154214: .4byte gUnknown_203F400
 _08154218: .4byte gUnknown_203F42C
-_0815421C: .4byte gUnknown_8478DD4
+_0815421C: .4byte sUnknown_8478DD4
 _08154220:
 	lsls r0, r5, 1
 	add r0, r8
@@ -7971,7 +7971,7 @@ sub_8154438: @ 8154438
 	ldr r0, [r0]
 	str r0, [sp, 0x20]
 	str r1, [sp, 0x24]
-	ldr r0, _081544E0 @ =gDodrioBerryPlatformGfx
+	ldr r0, _081544E0 @ =sDodrioBerryPlatformGfx
 	adds r1, r6, 0
 	bl LZ77UnCompWram
 	cmp r6, 0
@@ -8034,7 +8034,7 @@ _081544C6:
 	bx r0
 	.align 2, 0
 _081544DC: .4byte gUnknown_8478E18
-_081544E0: .4byte gDodrioBerryPlatformGfx
+_081544E0: .4byte sDodrioBerryPlatformGfx
 _081544E4: .4byte gUnknown_8478E20
 _081544E8: .4byte gUnknown_8478E0E
 _081544EC: .4byte gUnknown_203F3F8
@@ -8777,17 +8777,17 @@ _08154A6E:
 _08154A80: .4byte gUnknown_203F440
 _08154A84: .4byte 0x00003014
 _08154A88:
-	ldr r1, _08154AC0 @ =gDodrioBerryBgTilemap1
+	ldr r1, _08154AC0 @ =sDodrioBerryBgTilemap1
 	movs r0, 0x3
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r1, _08154AC4 @ =gDodrioBerryBgTilemap2Left
+	ldr r1, _08154AC4 @ =sDodrioBerryBgTilemap2Left
 	movs r0, 0x1
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r1, _08154AC8 @ =gDodrioBerryBgTilemap2Right
+	ldr r1, _08154AC8 @ =sDodrioBerryBgTilemap2Right
 	movs r0, 0x2
 	movs r2, 0
 	movs r3, 0
@@ -8800,9 +8800,9 @@ _08154A88:
 	bl CopyBgTilemapBufferToVram
 	b _08154B08
 	.align 2, 0
-_08154AC0: .4byte gDodrioBerryBgTilemap1
-_08154AC4: .4byte gDodrioBerryBgTilemap2Left
-_08154AC8: .4byte gDodrioBerryBgTilemap2Right
+_08154AC0: .4byte sDodrioBerryBgTilemap1
+_08154AC4: .4byte sDodrioBerryBgTilemap2Left
+_08154AC8: .4byte sDodrioBerryBgTilemap2Right
 _08154ACC:
 	movs r0, 0
 	bl ShowBg
@@ -8895,7 +8895,7 @@ _08154B7C:
 	bl sub_81533B4
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r1, _08154CB8 @ =gUnknown_8478E80
+	ldr r1, _08154CB8 @ =sUnknown_8478E80
 	subs r0, r7, 0x1
 	lsls r0, 2
 	adds r0, r1
@@ -9005,7 +9005,7 @@ _08154C4E:
 	mov r3, r8
 	lsls r1, r3, 1
 	add r1, r8
-	ldr r3, _08154CD4 @ =gUnknown_8478E38
+	ldr r3, _08154CD4 @ =sUnknown_8478E38
 	adds r1, r3
 	str r1, [sp]
 	movs r1, 0x1
@@ -9041,14 +9041,14 @@ _08154CAC:
 	adds r1, r0
 	b _08154D1E
 	.align 2, 0
-_08154CB8: .4byte gUnknown_8478E80
+_08154CB8: .4byte sUnknown_8478E80
 _08154CBC: .4byte 0xffffff00
 _08154CC0: .4byte 0x00ffffff
 _08154CC4: .4byte 0xffff00ff
 _08154CC8: .4byte 0x0000ffff
 _08154CCC: .4byte 0x00003008
 _08154CD0: .4byte 0xff00ffff
-_08154CD4: .4byte gUnknown_8478E38
+_08154CD4: .4byte sUnknown_8478E38
 _08154CD8: .4byte gUnknown_203F440
 _08154CDC: .4byte 0x00003014
 _08154CE0:
@@ -9272,14 +9272,14 @@ _08154E70:
 	ldr r0, [r2]
 	add r0, r10
 	ldrb r0, [r0]
-	ldr r2, _08154F74 @ =gUnknown_8478E94
+	ldr r2, _08154F74 @ =sUnknown_8478E94
 	ldr r3, [sp, 0x68]
 	adds r1, r3, r1
 	ldrb r1, [r1]
 	lsls r1, 2
 	adds r1, r2
 	ldr r2, [r1]
-	ldr r3, _08154F78 @ =gUnknown_8478EBA
+	ldr r3, _08154F78 @ =sUnknown_8478EBA
 	lsls r1, r5, 1
 	adds r1, r3
 	ldrb r6, [r1]
@@ -9309,7 +9309,7 @@ _08154EC8:
 	mov r2, r8
 	lsls r1, r2, 1
 	add r1, r8
-	ldr r2, _08154F7C @ =gUnknown_8478E38
+	ldr r2, _08154F7C @ =sUnknown_8478E38
 	adds r1, r2
 	str r1, [sp]
 	movs r4, 0x1
@@ -9376,9 +9376,9 @@ _08154F64: .4byte gUnknown_8478F14
 _08154F68: .4byte gText_SpacePoints
 _08154F6C: .4byte 0x00003009
 _08154F70: .4byte gUnknown_203F440
-_08154F74: .4byte gUnknown_8478E94
-_08154F78: .4byte gUnknown_8478EBA
-_08154F7C: .4byte gUnknown_8478E38
+_08154F74: .4byte sUnknown_8478E94
+_08154F78: .4byte sUnknown_8478EBA
+_08154F7C: .4byte sUnknown_8478E38
 	thumb_func_end sub_8154D9C
 
 	thumb_func_start sub_8154F80
@@ -9438,7 +9438,7 @@ _08154FEC:
 _08155000: .4byte gUnknown_203F440
 _08155004: .4byte 0x0000301c
 _08155008:
-	ldr r6, _08155050 @ =gUnknown_8475674
+	ldr r6, _08155050 @ =sUnknown_8475674
 	adds r0, r6, 0
 	bl AddWindow
 	ldr r4, _08155054 @ =gUnknown_203F440
@@ -9469,7 +9469,7 @@ _08155008:
 	bl sub_8154868
 	b _08155658
 	.align 2, 0
-_08155050: .4byte gUnknown_8475674
+_08155050: .4byte sUnknown_8475674
 _08155054: .4byte gUnknown_203F440
 _08155058: .4byte 0x00003008
 _0815505C: .4byte 0x00003009
@@ -9547,14 +9547,14 @@ _081550EA:
 	ldr r2, _081551B0 @ =0x00003009
 	adds r0, r2
 	ldrb r0, [r0]
-	ldr r1, _081551BC @ =gUnknown_8478EB0
+	ldr r1, _081551BC @ =sUnknown_8478EB0
 	mov r2, r9
 	lsls r4, r2, 1
 	adds r4, r1
 	ldrb r3, [r4]
 	lsls r1, r5, 1
 	adds r1, r5
-	ldr r2, _081551C0 @ =gUnknown_8478E38
+	ldr r2, _081551C0 @ =sUnknown_8478E38
 	adds r1, r2
 	str r1, [sp]
 	movs r5, 0x1
@@ -9569,7 +9569,7 @@ _081550EA:
 	adds r0, 0x1
 	str r0, [sp, 0x88]
 	mov r8, r4
-	ldr r1, _081551C4 @ =gUnknown_8478EA8
+	ldr r1, _081551C4 @ =sUnknown_8478EA8
 	mov r10, r1
 _0815512E:
 	mov r0, r9
@@ -9616,7 +9616,7 @@ _0815512E:
 	lsrs r2, 24
 	mov r1, r8
 	ldrb r3, [r1]
-	ldr r1, _081551CC @ =gUnknown_8478E38+0x3
+	ldr r1, _081551CC @ =sUnknown_8478E38+0x3
 	str r1, [sp]
 	movs r1, 0x1
 	negs r1, r1
@@ -9632,11 +9632,11 @@ _081551AC: .4byte 0x00003008
 _081551B0: .4byte 0x00003009
 _081551B4: .4byte gText_BerryPickingResults
 _081551B8: .4byte gText_10P30P50P50P
-_081551BC: .4byte gUnknown_8478EB0
-_081551C0: .4byte gUnknown_8478E38
-_081551C4: .4byte gUnknown_8478EA8
+_081551BC: .4byte sUnknown_8478EB0
+_081551C0: .4byte sUnknown_8478E38
+_081551C4: .4byte sUnknown_8478EA8
 _081551C8: .4byte 0x0000270f
-_081551CC: .4byte gUnknown_8478E38+0x3
+_081551CC: .4byte sUnknown_8478E38+0x3
 _081551D0:
 	ldr r0, _0815523C @ =gUnknown_203F440
 	ldr r0, [r0]
@@ -9922,7 +9922,7 @@ _0815542C:
 	adds r0, r4
 	ldrb r0, [r0]
 	bl RemoveWindow
-	ldr r6, _0815547C @ =gUnknown_8475684
+	ldr r6, _0815547C @ =sUnknown_8475684
 	adds r0, r6, 0
 	bl AddWindow
 	ldr r1, [r5]
@@ -9939,7 +9939,7 @@ _0815542C:
 _08155470: .4byte 0x00003014
 _08155474: .4byte gUnknown_203F440
 _08155478: .4byte 0x00003009
-_0815547C: .4byte gUnknown_8475684
+_0815547C: .4byte sUnknown_8475684
 _08155480:
 	ldr r0, _08155558 @ =0x00000101
 	bl PlayNewMapMusic
@@ -10240,7 +10240,7 @@ _08155716:
 _0815571C:
 	b _081559EC
 _0815571E:
-	ldr r5, _08155788 @ =gUnknown_847568C
+	ldr r5, _08155788 @ =sUnknown_847568C
 	adds r0, r5, 0
 	bl AddWindow
 	mov r2, r10
@@ -10287,7 +10287,7 @@ _0815571E:
 	strb r7, [r0]
 	b _08155A58
 	.align 2, 0
-_08155788: .4byte gUnknown_847568C
+_08155788: .4byte sUnknown_847568C
 _0815578C: .4byte 0x00003008
 _08155790: .4byte 0x00003009
 _08155794: .4byte 0x00003020
@@ -10763,7 +10763,7 @@ _08155B74:
 	beq _08155BEC
 	b _08155C18
 _08155B7A:
-	ldr r4, _08155B9C @ =gUnknown_84756A4
+	ldr r4, _08155B9C @ =sUnknown_84756A4
 	adds r0, r4, 0
 	bl AddWindow
 	ldr r1, [r5]
@@ -10778,7 +10778,7 @@ _08155B7A:
 	bl sub_8154868
 	b _08155C08
 	.align 2, 0
-_08155B9C: .4byte gUnknown_84756A4
+_08155B9C: .4byte sUnknown_84756A4
 _08155BA0: .4byte 0x00003008
 _08155BA4:
 	ldr r4, _08155BE0 @ =0x00003008
@@ -10916,7 +10916,7 @@ _08155CA8:
 	beq _08155D7C
 	b _08155D9C
 _08155CB2:
-	ldr r4, _08155CF8 @ =gUnknown_847569C
+	ldr r4, _08155CF8 @ =sUnknown_847569C
 	adds r0, r4, 0
 	bl AddWindow
 	ldr r1, [r6]
@@ -10948,7 +10948,7 @@ _08155CB2:
 	strb r2, [r0]
 	b _08155DE2
 	.align 2, 0
-_08155CF8: .4byte gUnknown_847569C
+_08155CF8: .4byte sUnknown_847569C
 _08155CFC: .4byte 0x00003008
 _08155D00: .4byte 0x0000301c
 _08155D04: .4byte 0x00003020
@@ -11240,7 +11240,7 @@ _08155EC6:
 	bl SetGpuReg
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, _08155FD8 @ =gUnknown_847565C
+	ldr r1, _08155FD8 @ =sUnknown_847565C
 	movs r0, 0
 	movs r2, 0x4
 	bl InitBgsFromTemplates
@@ -11307,7 +11307,7 @@ _08155EC6:
 	.align 2, 0
 _08155FD0: .4byte 0x040000d4
 _08155FD4: .4byte 0x81000800
-_08155FD8: .4byte gUnknown_847565C
+_08155FD8: .4byte sUnknown_847565C
 _08155FDC: .4byte gUnknown_203F440
 	thumb_func_end sub_8155EA0
 
@@ -11340,26 +11340,26 @@ _08156008:
 	.4byte _0815605C
 	.4byte _0815606A
 _08156020:
-	ldr r0, _0815602C @ =gDodrioBerryBgPal1
+	ldr r0, _0815602C @ =sDodrioBerryBgPal1
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadPalette
 	b _08156082
 	.align 2, 0
-_0815602C: .4byte gDodrioBerryBgPal1
+_0815602C: .4byte sDodrioBerryBgPal1
 _08156030:
 	bl ResetTempTileDataBuffers
 	b _08156082
 _08156036:
-	ldr r1, _08156040 @ =gDodrioBerryBgGfx1
+	ldr r1, _08156040 @ =sDodrioBerryBgGfx1
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x3
 	b _0815604C
 	.align 2, 0
-_08156040: .4byte gDodrioBerryBgGfx1
+_08156040: .4byte sDodrioBerryBgGfx1
 _08156044:
-	ldr r1, _08156058 @ =gDodrioBerryBgGfx2
+	ldr r1, _08156058 @ =sDodrioBerryBgGfx2
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x1
@@ -11369,7 +11369,7 @@ _0815604C:
 	bl DecompressAndCopyTileDataToVram
 	b _08156082
 	.align 2, 0
-_08156058: .4byte gDodrioBerryBgGfx2
+_08156058: .4byte sDodrioBerryBgGfx2
 _0815605C:
 	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 35e8ceed7..7fd135d52 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -32,7 +32,7 @@
 /*static*/ void nullsub_98(void);
 
 // const rom data
-/*static*/ const u8 gUnknown_8471F50[5][5][11] =
+/*static*/ const u8 sUnknown_8471F50[5][5][11] =
 {
     {
         {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
@@ -61,7 +61,7 @@
     },
 };
 
-/*static*/ const u8 gUnknown_8472063[5][5][3] =
+/*static*/ const u8 sUnknown_8472063[5][5][3] =
 {
     {
         {4, 5, 6},
@@ -90,7 +90,7 @@
     },
 };
 
-/*static*/ const u8 gUnknown_84720AE[5][5][3] =
+/*static*/ const u8 sUnknown_84720AE[5][5][3] =
 {
     {
         {1, 0, 1},
@@ -120,7 +120,7 @@
 };
 
 ALIGNED(4)
-/*static*/ const u8 gUnknown_84720FC[5][11] =
+/*static*/ const u8 sUnknown_84720FC[5][11] =
 {
     {9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9},
     {9, 9, 9, 0, 0, 1, 1, 0, 9, 9, 9},
@@ -129,7 +129,7 @@ ALIGNED(4)
     {3, 3, 4, 4, 0, 0, 1, 1, 2, 2, 3},
 };
 
-/*static*/ const u8 gUnknown_8472133[5][5] =
+/*static*/ const u8 sUnknown_8472133[5][5] =
 {
     {5},
     {4, 6},
@@ -156,7 +156,7 @@ ALIGNED(4)
                                      "graphics/link_games/dodrioberry_bg2right.bin.lz",
                                      "graphics/link_games/dodrioberry_bg2left.bin.lz");
 
-/*static*/ const u8 gUnknown_847553C[][3] =
+/*static*/ const u8 sUnknown_847553C[][3] =
 {
     {40, 24, 13},
     {32, 19, 10},
@@ -164,20 +164,20 @@ ALIGNED(4)
 };
 
 ALIGNED(4)
-/*static*/ const u8 gUnknown_8475548[] = {8, 5, 8, 11, 15};
+/*static*/ const u8 sUnknown_8475548[] = {8, 5, 8, 11, 15};
 
 ALIGNED(4)
-/*static*/ const u8 gUnknown_8475550[] = {5, 10, 20, 30, 50, 70, 100};
+/*static*/ const u8 sUnknown_8475550[] = {5, 10, 20, 30, 50, 70, 100};
 
 ALIGNED(4)
-/*static*/ const u8 gUnknown_8475558[][10] =
+/*static*/ const u8 sUnknown_8475558[][10] =
 {
     {15, 16, 17, 18, 19, 19, 18, 17, 16, 15},
     {20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
     {30, 31, 32, 33, 34, 34, 33, 32, 31, 30},
 };
 
-/*static*/ void (*const gUnknown_8475578[])(void) =
+/*static*/ void (*const sUnknown_8475578[])(void) =
 {
     sub_8150C78,
     sub_8150CBC,
@@ -193,7 +193,7 @@ ALIGNED(4)
     sub_8150F40
 };
 
-/*static*/ void (*const gUnknown_84755A8[])(void) =
+/*static*/ void (*const sUnknown_84755A8[])(void) =
 {
     sub_8150C78,
     sub_8150CBC,
@@ -209,10 +209,10 @@ ALIGNED(4)
     sub_8150FC4
 };
 
-/*static*/ const s16 gUnknown_84755D8[] = {10, 30, 50, 50};
+/*static*/ const s16 sUnknown_84755D8[] = {10, 30, 50, 50};
 
 // Data related to printing saved results.
-/*static*/ const struct WindowTemplate gUnknown_84755E0 =
+/*static*/ const struct WindowTemplate sUnknown_84755E0 =
 {
     .bg = 0,
     .tilemapLeft = 1,
@@ -223,15 +223,15 @@ ALIGNED(4)
     .baseBlock = 1,
 };
 
-/*static*/ const u8 *const gUnknown_84755E8[] = {gText_BerryPickingRecords, gText_BerriesPicked, gText_BestScore, gText_BerriesInRowFivePlayers};
-/*static*/ const u8 gUnknown_84755F8[] = {4, 7, 4};
+/*static*/ const u8 *const sUnknown_84755E8[] = {gText_BerryPickingRecords, gText_BerriesPicked, gText_BestScore, gText_BerriesInRowFivePlayers};
+/*static*/ const u8 sUnknown_84755F8[] = {4, 7, 4};
 
 ALIGNED(4)
-/*static*/ const u8 gUnknown_84755FC[][2] = {{24}, {40}, {56}};
-/*static*/ const u8 gUnknown_8475602[][2] = {{24}, {40}, {70}};
+/*static*/ const u8 sUnknown_84755FC[][2] = {{24}, {40}, {56}};
+/*static*/ const u8 sUnknown_8475602[][2] = {{24}, {40}, {70}};
 
 // Debug functions?
-/*static*/ const u16 gUnknown_8475608[][4] =
+/*static*/ const u16 sUnknown_8475608[][4] =
 {
     {9999, 0, 90, 9999},
     {9999, 9999, 70, 9999},
@@ -240,21 +240,21 @@ ALIGNED(4)
     {9999, 9999, 9999, 0},
 };
 
-/*static*/ const u8 gUnknown_8475630[] = _("あいうえおかき");
-/*static*/ const u8 gUnknown_8475638[] = _("ABCDEFG");
-/*static*/ const u8 gUnknown_8475640[] = _("0123456");
+/*static*/ const u8 sUnknown_8475630[] = _("あいうえおかき");
+/*static*/ const u8 sUnknown_8475638[] = _("ABCDEFG");
+/*static*/ const u8 sUnknown_8475640[] = _("0123456");
 
-/*static*/ const u8 *const gUnknown_8475648[] =
+/*static*/ const u8 *const sUnknown_8475648[] =
 {
-    gUnknown_8475630,
-    gUnknown_8475630,
-    gUnknown_8475630,
-    gUnknown_8475638,
-    gUnknown_8475640
+    sUnknown_8475630,
+    sUnknown_8475630,
+    sUnknown_8475630,
+    sUnknown_8475638,
+    sUnknown_8475640
 };
 
 // Large chunk of data
-/*static*/ const struct BgTemplate gUnknown_847565C[] =
+/*static*/ const struct BgTemplate sUnknown_847565C[] =
 {
     {
         .bg = 0,
@@ -297,7 +297,7 @@ ALIGNED(4)
 // Unknown unreferenced data, feel free to remove.
 /*static*/ const u32 sUnused[] = {255, 0};
 
-/*static*/ const struct WindowTemplate gUnknown_8475674[] =
+/*static*/ const struct WindowTemplate sUnknown_8475674[] =
 {
     {
         .bg = 0,
@@ -319,7 +319,7 @@ ALIGNED(4)
     }
 };
 
-/*static*/ const struct WindowTemplate gUnknown_8475684 =
+/*static*/ const struct WindowTemplate sUnknown_8475684 =
 {
     .bg = 0,
     .tilemapLeft = 1,
@@ -330,7 +330,7 @@ ALIGNED(4)
     .baseBlock = 0x67,
 };
 
-/*static*/ const struct WindowTemplate gUnknown_847568C[] =
+/*static*/ const struct WindowTemplate sUnknown_847568C[] =
 {
     {
         .bg = 0,
@@ -352,7 +352,7 @@ ALIGNED(4)
     }
 };
 
-/*static*/ const struct WindowTemplate gUnknown_847569C =
+/*static*/ const struct WindowTemplate sUnknown_847569C =
 {
     .bg = 0,
     .tilemapLeft = 4,
@@ -363,7 +363,7 @@ ALIGNED(4)
     .baseBlock = 0x13,
 };
 
-/*static*/ const struct WindowTemplate gUnknown_84756A4 =
+/*static*/ const struct WindowTemplate sUnknown_84756A4 =
 {
     .bg = 0,
     .tilemapLeft = 5,
@@ -392,22 +392,22 @@ ALIGNED(4)
     2, 2, 3, 5, 0, 0, 0, 0, 4, 6, 0, 0, 0, 3, 5, 7, 0, 0, 2, 4, 6, 8, 0, 1, 3, 5, 6, 9
 };
 
-/*static*/ const u16 gDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
+/*static*/ const u16 sDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
                                             "graphics/link_games/dodrioberry_bg2.gbapal");
-/*static*/ const u16 gDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
-/*static*/ const u16 gDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
-/*static*/ const u16 gDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
-/*static*/ const u16 gDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
-/*static*/ const u32 gDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
-/*static*/ const u16 gDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
-/*static*/ const u32 gDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
-/*static*/ const u32 gDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
-/*static*/ const u32 gDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
-/*static*/ const u32 gDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
-/*static*/ const u32 gDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
-/*static*/ const u32 gDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
-/*static*/ const u32 gDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
-/*static*/ const u32 gDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
+/*static*/ const u16 sDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
+/*static*/ const u16 sDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
+/*static*/ const u16 sDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
+/*static*/ const u16 sDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
+/*static*/ const u32 sDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
+/*static*/ const u16 sDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
+/*static*/ const u32 sDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
+/*static*/ const u32 sDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
+/*static*/ const u32 sDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
+/*static*/ const u32 sDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
+/*static*/ const u32 sDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
+/*static*/ const u32 sDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
+/*static*/ const u32 sDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
+/*static*/ const u32 sDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
 
 /*static*/ const struct OamData sOamData_8478C98 =
 {
@@ -620,11 +620,11 @@ ALIGNED(4)
 };
 
 // These are declared inside pokeemerald's sub_80283A8
-const struct SpritePalette gUnknown_8478D90 = {gDodrioBerryPkmnPal, 0};
-const struct SpritePalette gUnknown_8478D98 = {gDodrioBerryShinyPal, 1};
+const struct SpritePalette gUnknown_8478D90 = {sDodrioBerryPkmnPal, 0};
+const struct SpritePalette gUnknown_8478D98 = {sDodrioBerryShinyPal, 1};
 
 // These are declared inside pokeemerald's sub_8028734
-const struct SpritePalette gUnknown_8478DA0 = {gDodrioBerryStatusPal, 2};
+const struct SpritePalette gUnknown_8478DA0 = {sDodrioBerryStatusPal, 2};
 const struct SpriteTemplate gUnknown_8478DA8 =
         {
             .tileTag = 1,
@@ -640,9 +640,9 @@ const struct SpriteTemplate gUnknown_8478DA8 =
 /*static*/ const u8 sUnused2[] = {0xCD, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0xF4, 0x0, 0x0};
 
 // This is declared inside pokeemerald's sub_8028A34
-const struct SpritePalette gUnknown_8478DCC = {gDodrioBerrySpritesPal, 3};
+const struct SpritePalette gUnknown_8478DCC = {sDodrioBerrySpritesPal, 3};
 
-/*static*/ const s16 gUnknown_8478DD4[] = {88, 128, 168, 208};
+/*static*/ const s16 sUnknown_8478DD4[] = {88, 128, 168, 208};
 
 // These are declared inside pokeemerald's sub_8028A88
 const struct SpriteTemplate gUnknown_8478DDC =
@@ -672,7 +672,7 @@ const struct SpriteTemplate gUnknown_8478DF4 =
 /*static*/ const s16 gUnknown_8478E0E[][2] = {{230, 55}, {30, 74}};
 
 // These are declared inside pokeemerald's sub_8028D44
-const struct SpritePalette gUnknown_8478E18 = {gDodrioBerryPlatformPal, 6};
+const struct SpritePalette gUnknown_8478E18 = {sDodrioBerryPlatformPal, 6};
 const struct SpriteTemplate gUnknown_8478E20 =
     {
         .tileTag = 5,
@@ -690,7 +690,7 @@ struct WinCoords
     u8 top;
 };
 
-/*static*/ const u8 gUnknown_8478E38[][3] =
+/*static*/ const u8 sUnknown_8478E38[][3] =
 {
     {1, 2, 3},
     {1, 4, 5},
@@ -698,22 +698,22 @@ struct WinCoords
     {1, 6, 7},
 };
 
-/*static*/ const struct WinCoords gUnknown_8478E44[] = {{12, 6}};
-/*static*/ const struct WinCoords gUnknown_8478E48[] = {{9, 10}, {15, 6}};
-/*static*/ const struct WinCoords gUnknown_8478E50[] = {{12, 6}, {18, 10}, {6, 10}};
-/*static*/ const struct WinCoords gUnknown_8478E5C[] = {{9, 10}, {15, 6}, {21, 10}, {3, 6}};
-/*static*/ const struct WinCoords gUnknown_8478E6C[] = {{12, 6}, {18, 10}, {23, 6}, {1, 6}, {6, 10}};
+/*static*/ const struct WinCoords sUnknown_8478E44[] = {{12, 6}};
+/*static*/ const struct WinCoords sUnknown_8478E48[] = {{9, 10}, {15, 6}};
+/*static*/ const struct WinCoords sUnknown_8478E50[] = {{12, 6}, {18, 10}, {6, 10}};
+/*static*/ const struct WinCoords sUnknown_8478E5C[] = {{9, 10}, {15, 6}, {21, 10}, {3, 6}};
+/*static*/ const struct WinCoords sUnknown_8478E6C[] = {{12, 6}, {18, 10}, {23, 6}, {1, 6}, {6, 10}};
 
-/*static*/ const struct WinCoords *const gUnknown_8478E80[] =
+/*static*/ const struct WinCoords *const sUnknown_8478E80[] =
 {
-    gUnknown_8478E44,
-    gUnknown_8478E48,
-    gUnknown_8478E50,
-    gUnknown_8478E5C,
-    gUnknown_8478E6C,
+    sUnknown_8478E44,
+    sUnknown_8478E48,
+    sUnknown_8478E50,
+    sUnknown_8478E5C,
+    sUnknown_8478E6C,
 };
 
-/*static*/ const u8 *const gUnknown_8478E94[] =
+/*static*/ const u8 *const sUnknown_8478E94[] =
 {
     gText_1Colon,
     gText_2Colon,
@@ -722,9 +722,9 @@ struct WinCoords
     gText_5Colon,
 };
 
-/*static*/ const u16 gUnknown_8478EA8[] = {92, 132, 172, 212};
-/*static*/ const u16 gUnknown_8478EB0[] = {30, 45, 60, 75, 90};
-/*static*/ const u16 gUnknown_8478EBA[] = {12, 28, 44, 60, 76};
+/*static*/ const u16 sUnknown_8478EA8[] = {92, 132, 172, 212};
+/*static*/ const u16 sUnknown_8478EB0[] = {30, 45, 60, 75, 90};
+/*static*/ const u16 sUnknown_8478EBA[] = {12, 28, 44, 60, 76};
 
 struct
 {

From b116608e12940141e7c1167d0a2868abc72829fc Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Wed, 4 Dec 2019 11:41:07 -0800
Subject: [PATCH 5/6] Use ST_OAM defines for OamData.

---
 src/dodrio_berry_picking.c | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 7fd135d52..515c20f9f 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -412,14 +412,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478C98 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = ST_OAM_SIZE_3,
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -429,14 +429,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CA0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = ST_OAM_SIZE_1,
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -446,14 +446,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CA8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = ST_OAM_SIZE_1,
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -463,14 +463,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CB0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_H_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = ST_OAM_SIZE_3,
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,

From 5eb42eecfd59940bc9ef21d29642e13237901794 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Wed, 4 Dec 2019 12:39:54 -0800
Subject: [PATCH 6/6] Use SPRITE_SHAPE and SPRITE_SIZE macros.

---
 src/dodrio_berry_picking.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 515c20f9f..1860f1917 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -416,10 +416,10 @@ ALIGNED(4)
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = FALSE,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = ST_OAM_SIZE_3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -433,10 +433,10 @@ ALIGNED(4)
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = FALSE,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = ST_OAM_SIZE_1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -450,10 +450,10 @@ ALIGNED(4)
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = FALSE,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = ST_OAM_SIZE_1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -467,10 +467,10 @@ ALIGNED(4)
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = FALSE,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = ST_OAM_SIZE_3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,