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

---
 assets/assets.json             |  5 -----
 data/const/manager/manager1F.s | 12 ------------
 linker.ld                      |  2 +-
 src/manager/manager1F.c        | 12 ++++++++----
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 data/const/manager/manager1F.s

diff --git a/assets/assets.json b/assets/assets.json
index a9a2f276..dedc213b 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -32723,11 +32723,6 @@
     "start": 1084332,
     "size": 124
   },
-  {
-    "path": "manager1F/gUnk_08108C9C.bin",
-    "start": 1084572,
-    "size": 12
-  },
   {
     "path": "manager24/gUnk_08108CFC.bin",
     "start": 1084668,
diff --git a/data/const/manager/manager1F.s b/data/const/manager/manager1F.s
deleted file mode 100644
index 4036b98d..00000000
--- a/data/const/manager/manager1F.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108C94:: @ 08108C94
-	.4byte sub_0805B70C
-	.4byte sub_0805B744
-
-gUnk_08108C9C:: @ 08108C9C
-	.incbin "manager1F/gUnk_08108C9C.bin"
diff --git a/linker.ld b/linker.ld
index f5fd46da..6c194680 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1130,7 +1130,7 @@ SECTIONS {
         src/manager/manager1C.o(.rodata);
         src/manager/manager1D.o(.rodata);
         src/manager/manager1E.o(.rodata);
-        data/const/manager/manager1F.o(.rodata);
+        src/manager/manager1F.o(.rodata);
         src/manager/manager22.o(.rodata);
         data/const/manager/manager23.o(.rodata);
         data/const/manager/manager24.o(.rodata);
diff --git a/src/manager/manager1F.c b/src/manager/manager1F.c
index 1ad3135e..49effc47 100644
--- a/src/manager/manager1F.c
+++ b/src/manager/manager1F.c
@@ -13,14 +13,17 @@ typedef struct {
     u8 field_0x3d;
     u16 field_0x3e;
 } Manager1F;
-extern void (*const gUnk_08108C94[])(Manager1F*);
 
 void sub_0805B778(Manager1F*);
-
-extern u16 gUnk_08108C9C[];
+void sub_0805B70C(Manager1F*);
+void sub_0805B744(Manager1F*);
 
 void Manager1F_Main(Manager1F* this) {
-    gUnk_08108C94[this->manager.action](this);
+    static void (*const actionFuncs[])(Manager1F*) = {
+        sub_0805B70C,
+        sub_0805B744,
+    };
+    actionFuncs[this->manager.action](this);
 }
 
 void sub_0805B70C(Manager1F* this) {
@@ -47,5 +50,6 @@ void sub_0805B744(Manager1F* this) {
 }
 
 void sub_0805B778(Manager1F* this) {
+    static const u16 gUnk_08108C9C[] = { 0x358, 0x359, 0x356, 0x35a, 0x35a, 0x357 };
     SetTileType(gUnk_08108C9C[this->manager.unk_0a * 2 + this->manager.unk_0b], this->field_0x38, this->field_0x36);
 }