From 720ed706f1c1008a10bd3eaaeb2b35aaa4f9aa20 Mon Sep 17 00:00:00 2001
From: Rainchus <rainmachus@gmail.com>
Date: Wed, 29 Nov 2023 14:24:40 -0600
Subject: [PATCH] fix file splits for w10Dll

---
 config/GMPE01_00/rels/w10Dll/splits.txt |  7 ++--
 include/REL/w10Dll.h                    |  2 +-
 src/REL/w10Dll/w10Dll.c                 | 44 +------------------------
 src/REL/w10Dll/w10Dll2.c                | 39 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/config/GMPE01_00/rels/w10Dll/splits.txt b/config/GMPE01_00/rels/w10Dll/splits.txt
index bb5f36ac..1a8de7f9 100644
--- a/config/GMPE01_00/rels/w10Dll/splits.txt
+++ b/config/GMPE01_00/rels/w10Dll/splits.txt
@@ -10,14 +10,15 @@ REL/w10Dll/w10Dll_init.c:
 	.text       start:0x00000000 end:0x000000E0
 
 REL/w10Dll/w10Dll.c:
-	.text       start:0x000000E0 end:0x00000C20
+	.text       start:0x000000E0 end:0x00000AEC
 	.rodata     start:0x00000000 end:0x00000038
-	.data       start:0x00000000 end:0x00000098
+	.data       start:0x00000000 end:0x00000078
 	.bss        start:0x00000000 end:0x00000038
 
 REL/w10Dll/w10Dll2.c:
-	.text       start:0x00000C20 end:0x00000D2C
+	.text       start:0x00000AEC end:0x00000D2C
 	.rodata     start:0x00000038 end:0x00000048
+	.data       start:0x00000078 end:0x00000098
 
 REL/w10Dll/w10Dll3.c:
 	.text       start:0x00000D2C end:0x0000176C
diff --git a/include/REL/w10Dll.h b/include/REL/w10Dll.h
index 03b56edb..0bcd9075 100644
--- a/include/REL/w10Dll.h
+++ b/include/REL/w10Dll.h
@@ -192,5 +192,5 @@ extern s16 lbl_1_data_32;
 extern s32 lbl_1_data_54[2];
 extern s32 lbl_1_data_5C[2];
 extern s32 lbl_1_data_64[2];
-extern s32 lbl_1_data_6C[3]; //HACK: should be 2
+extern s32 lbl_1_data_6C[2];
 extern BoardState lbl_8018FCF8;
\ No newline at end of file
diff --git a/src/REL/w10Dll/w10Dll.c b/src/REL/w10Dll/w10Dll.c
index 18f05e5c..23ab3eb4 100644
--- a/src/REL/w10Dll/w10Dll.c
+++ b/src/REL/w10Dll/w10Dll.c
@@ -52,21 +52,9 @@ s32 lbl_1_data_64[2] = {
     -1
 };
 
-//HACK: should be just 2 entries but there is 0 padding
-s32 lbl_1_data_6C[3] = {
+s32 lbl_1_data_6C[2] = {
     0x0002000E,
     -1,
-    0
-};
-
-s32 lbl_1_data_78[2] = {
-    0x007B0010,
-    -1
-};
-
-Vec3f lbl_1_data_80[2] = {
-    {70.0f, 355.0f, 200.f},
-    {70.0f, 175.0f, 200.f},
 };
 
 //RODATA
@@ -256,33 +244,3 @@ s32 fn_1_920(s32 arg0, f32 arg8, f32 arg9) {
     }
     return var_r31;
 }
-
-void fn_1_AEC(void) {
-    lbl_1_bss_1C = 0;
-    lbl_1_bss_1E = fn_8006D9A4(0x7B000F, &lbl_1_data_78, 0);
-    fn_8006E2B8(lbl_1_bss_1E, 1, 0x40000001);
-    fn_800B42BC(lbl_1_bss_1E);
-    fn_8006F61C(lbl_1_bss_1E, 6);
-    lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
-}
-
-void fn_1_BA0(s32 arg0) {
-    s32 var_r31;
-
-    switch (lbl_1_bss_1C) {
-    case 0:
-        var_r31 = 5;
-        break;
-    case 1:
-        var_r31 = 6;
-        break;
-    }
-    BoardMessCreate(var_r31, arg0, -1);
-    BoardMessWait();
-    BoardMessKill();
-}
-
-void fn_1_C10(s16 arg0) {
-    lbl_1_bss_1C = arg0;
-}
-
diff --git a/src/REL/w10Dll/w10Dll2.c b/src/REL/w10Dll/w10Dll2.c
index 573539b3..431fbde2 100644
--- a/src/REL/w10Dll/w10Dll2.c
+++ b/src/REL/w10Dll/w10Dll2.c
@@ -1,5 +1,44 @@
 #include "REL/w10Dll.h"
 
+s32 lbl_1_data_78[2] = {
+    0x007B0010,
+    -1
+};
+
+Vec3f lbl_1_data_80[2] = {
+    {70.0f, 355.0f, 200.f},
+    {70.0f, 175.0f, 200.f},
+};
+
+void fn_1_AEC(void) {
+    lbl_1_bss_1C = 0;
+    lbl_1_bss_1E = fn_8006D9A4(0x7B000F, &lbl_1_data_78, 0);
+    fn_8006E2B8(lbl_1_bss_1E, 1, 0x40000001);
+    fn_800B42BC(lbl_1_bss_1E);
+    fn_8006F61C(lbl_1_bss_1E, 6);
+    lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
+}
+
+void fn_1_BA0(s32 arg0) {
+    s32 var_r31;
+
+    switch (lbl_1_bss_1C) {
+    case 0:
+        var_r31 = 5;
+        break;
+    case 1:
+        var_r31 = 6;
+        break;
+    }
+    BoardMessCreate(var_r31, arg0, -1);
+    BoardMessWait();
+    BoardMessKill();
+}
+
+void fn_1_C10(s16 arg0) {
+    lbl_1_bss_1C = arg0;
+}
+
 void fn_1_C20(void) {
     Mtx sp20;
     Vec3f sp14;