Duplicate data in dodrio_berry_picking.c

3 files changed, 122 insertions, 37 deletions

diff --git a/data/berry_powder.s b/data/berry_powder.s
deleted file mode 100644
index 0f812d79d..000000000
--- a/data/berry_powder.s
+++ /dev/null
@@ -1,36 +0,0 @@
-	.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/ld_script.txt b/ld_script.txt
index 814bea4cd..0b2c0e06c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -578,7 +578,6 @@ SECTIONS {
         src/braille_text.o(.rodata);
         src/text_window_graphics.o(.rodata);
         src/quest_log_player.o(.rodata);
-        data/berry_powder.o(.rodata);
         src/dodrio_berry_picking.o(.rodata);
         src/battle_controller_pokedude.o(.rodata);
         src/teachy_tv.o(.rodata);
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 1860f1917..36dc3fdd2 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -32,6 +32,128 @@
 /*static*/ void nullsub_98(void);
 
 // const rom data
+
+// Large chunk of data
+/*static*/ const struct BgTemplate sUnknown_847565C_Unref_Dupe[] =
+{
+    {
+        .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_Unref_Dupe[] = {255, 0};
+
+/*static*/ const struct WindowTemplate sUnknown_8475674_Unref_Dupe[] =
+{
+    {
+        .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 sUnknown_8475684_Unref_Dupe =
+{
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 6,
+    .width = 28,
+    .height = 7,
+    .paletteNum = 13,
+    .baseBlock = 0x67,
+};
+
+/*static*/ const struct WindowTemplate sUnknown_847568C_Unref_Dupe[] =
+{
+    {
+        .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 sUnknown_847569C_Unref_Dupe =
+{
+    .bg = 0,
+    .tilemapLeft = 4,
+    .tilemapTop = 6,
+    .width = 22,
+    .height = 5,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+
+/*static*/ const struct WindowTemplate sUnknown_84756A4_Unref_Dupe =
+{
+    .bg = 0,
+    .tilemapLeft = 5,
+    .tilemapTop = 8,
+    .width = 19,
+    .height = 3,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+
 /*static*/ const u8 sUnknown_8471F50[5][5][11] =
 {
     {