split unk_8159F40

4 files changed, 25 insertions, 20 deletions

diff --git a/asm/unk_8159F40.s b/asm/dodrio_berry_picking_2.s
index 792dc4b0f..792dc4b0f 100644
--- a/asm/unk_8159F40.s
+++ b/asm/dodrio_berry_picking_2.s
diff --git a/ld_script.txt b/ld_script.txt
index 50c737c8b..ff20df156 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -258,7 +258,8 @@ SECTIONS {
         asm/dodrio_berry_picking.o(.text);
         asm/battle_controller_pokedude.o(.text);
         src/unk_8159F40.o(.text);
-        asm/unk_8159F40.o(.text);
+        src/dodrio_berry_picking_2.o(.text);
+        asm/dodrio_berry_picking_2.o(.text);
         asm/teachy_tv.o(.text);
         asm/unk_815C27C.o(.text);
         asm/unk_815C980.o(.text);
diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c
new file mode 100644
index 000000000..fc6aa14c6
--- /dev/null
+++ b/src/dodrio_berry_picking_2.c
@@ -0,0 +1,23 @@
+#include "global.h"
+#include "link.h"
+#include "link_rfu.h"
+
+void sub_815A5BC(s32 a0)
+{
+    struct Padded_U8 data[2];
+    data[0].value = 1;
+    data[1].value = a0;
+    sub_80F9E2C(data);
+}
+
+u8 sub_815A5E8(s32 a0)
+{
+    u8 * r1;
+    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
+        return 0;
+    r1 = (u8 *)&gRecvCmds[a0][1];
+    if (r1[0] == 1)
+        return r1[4];
+    return 0;
+}
+
diff --git a/src/unk_8159F40.c b/src/unk_8159F40.c
index 45139152e..a6f6e67fc 100644
--- a/src/unk_8159F40.c
+++ b/src/unk_8159F40.c
@@ -620,22 +620,3 @@ void sub_815A540(void)
         }
     }
 }
-
-void sub_815A5BC(s32 a0)
-{
-    struct Padded_U8 data[2];
-    data[0].value = 1;
-    data[1].value = a0;
-    sub_80F9E2C(data);
-}
-
-u8 sub_815A5E8(s32 a0)
-{
-    u8 * r1;
-    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
-        return 0;
-    r1 = (u8 *)&gRecvCmds[a0][1];
-    if (r1[0] == 1)
-        return r1[4];
-    return 0;
-}