From 1bb08eca421052de9348e62e9490e21813457c6a Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 23:08:52 +0300
Subject: [PATCH] Put const data in manager1B

---
 assets/assets.json             | 15 ---------------
 data/const/manager/manager1B.s | 18 ------------------
 linker.ld                      |  2 +-
 src/manager/manager1B.c        | 18 ++++++++++++------
 4 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 data/const/manager/manager1B.s

diff --git a/assets/assets.json b/assets/assets.json
index d30b25e6..6ad3126c 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -32723,21 +32723,6 @@
     "start": 1084332,
     "size": 124
   },
-  {
-    "path": "manager1B/gUnk_08108C28.bin",
-    "start": 1084456,
-    "size": 28
-  },
-  {
-    "path": "manager1B/gUnk_08108C44.bin",
-    "start": 1084484,
-    "size": 16
-  },
-  {
-    "path": "manager1B/gUnk_08108C5C.bin",
-    "start": 1084508,
-    "size": 8
-  },
   {
     "path": "manager1C/gUnk_08108C6C.bin",
     "start": 1084524,
diff --git a/data/const/manager/manager1B.s b/data/const/manager/manager1B.s
deleted file mode 100644
index fa43508e..00000000
--- a/data/const/manager/manager1B.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108C28:: @ 08108C28
-	.incbin "manager1B/gUnk_08108C28.bin"
-
-gUnk_08108C44:: @ 08108C44
-	.incbin "manager1B/gUnk_08108C44.bin"
-
-gUnk_08108C54:: @ 08108C54
-	.4byte sub_0805B448
-	.4byte sub_0805B474
-
-gUnk_08108C5C:: @ 08108C5C
-	.incbin "manager1B/gUnk_08108C5C.bin"
diff --git a/linker.ld b/linker.ld
index a00d9885..93c4bf45 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1126,7 +1126,7 @@ SECTIONS {
         src/manager/manager17.o(.rodata);
         src/manager/manager18.o(.rodata);
         data/const/manager/manager1A.o(.rodata);
-        data/const/manager/manager1B.o(.rodata);
+        src/manager/manager1B.o(.rodata);
         data/const/manager/manager1C.o(.rodata);
         data/const/manager/manager1D.o(.rodata);
         src/manager/manager1E.o(.rodata);
diff --git a/src/manager/manager1B.c b/src/manager/manager1B.c
index 4eafda98..a0b80066 100644
--- a/src/manager/manager1B.c
+++ b/src/manager/manager1B.c
@@ -9,19 +9,24 @@ typedef struct {
     u32 field_0x20;
 } Manager1B;
 
-extern u8 gUnk_08108C28[];
-extern void (*const gUnk_08108C54[])(Manager1B*);
-
 void sub_0805B4B4(Manager1B*);
+void sub_0805B448(Manager1B*);
+void sub_0805B474(Manager1B*);
 
 void sub_0806D0F8(void); // in bigGoron?
 
-extern u8 gUnk_08108C5C[];
-extern u16 gUnk_08108C44[];
+static const u8 gUnk_08108C28[] = { 0x14, 0x0, 0x0,  0x0, 0x15, 0x0, 0x0,  0x0, 0x14, 0x0, 0xd8, 0x0, 0x2f, 0x0,
+                                    0x70, 0x0, 0x4b, 0x0, 0x0,  0x0, 0x4e, 0x0, 0x0,  0x0, 0x4d, 0x1, 0x0,  0x0 };
+static const u16 gUnk_08108C44[] = { 0, 0, -0x28, 0x70, 0, 0, 0, 0 };
 
 void Manager1B_Main(Manager1B* this) {
+    static void (*const gUnk_08108C54[])(Manager1B*) = {
+        sub_0805B448,
+        sub_0805B474,
+    };
+
     s32 iVar3;
-    u8* tmp;
+    const u8* tmp;
 
     if (EntityHasDuplicateID((Entity*)this) != 0) {
         DeleteThisEntity();
@@ -66,6 +71,7 @@ void sub_0805B4B4(Manager1B* this) {
 }
 
 void sub_0805B4D0(u32 param_1) {
+    static const u8 gUnk_08108C5C[] = { 0x14, 0x15, 0x14, 0x2f, 0x4b, 0x4e, 0x4d, 0 };
     s32 iVar1;
     u32 uVar2;