From 334972c649c52335ac57d3c42d6c6c5a299b1c30 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 23:36:30 +0300
Subject: [PATCH] Putr const data in manager34

---
 data/const/manager/manager34.s | 10 ----------
 linker.ld                      |  2 +-
 src/manager/manager34.c        | 11 +++++++++--
 3 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 data/const/manager/manager34.s

diff --git a/data/const/manager/manager34.s b/data/const/manager/manager34.s
deleted file mode 100644
index 29ed6cda..00000000
--- a/data/const/manager/manager34.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108D8C:: @ 08108D8C
-	.4byte sub_0805DBB4
-	.4byte sub_0805DBCC
-	.4byte nullsub_498
diff --git a/linker.ld b/linker.ld
index 3fb18504..767cf754 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1141,7 +1141,7 @@ SECTIONS {
         src/manager/manager2E.o(.rodata);
         src/manager/manager31.o(.rodata);
         src/manager/manager32.o(.rodata);
-        data/const/manager/manager34.o(.rodata);
+        src/manager/manager34.o(.rodata);
         data/const/manager/manager35.o(.rodata);
         data/const/manager/manager36.o(.rodata);
         data/const/manager/manager37.o(.rodata);
diff --git a/src/manager/manager34.c b/src/manager/manager34.c
index ae12a2e2..455730a6 100644
--- a/src/manager/manager34.c
+++ b/src/manager/manager34.c
@@ -8,15 +8,22 @@ typedef struct {
     u16 field_0x20;
 } Manager34;
 
-extern void (*const gUnk_08108D8C[])(Manager34*);
 void sub_0805DBF0(Manager34*);
+void sub_0805DBB4(Manager34*);
+void sub_0805DBCC(Manager34*);
+void nullsub_498(Manager34*);
 
 extern ScreenTransitionData gUnk_0813AC48;
 
 void sub_0805DC70(void);
 
 void Manager34_Main(Manager34* this) {
-    gUnk_08108D8C[this->manager.action](this);
+    static void (*const actionFuncs[])(Manager34*) = {
+        sub_0805DBB4,
+        sub_0805DBCC,
+        nullsub_498,
+    };
+    actionFuncs[this->manager.action](this);
     sub_0805DBF0(this);
 }