From 6e38ea7c86a5ef05f685340fe602649ac0ad3da8 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 23:44:06 +0300
Subject: [PATCH] Put const data in manager38

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

diff --git a/data/const/manager/manager38.s b/data/const/manager/manager38.s
deleted file mode 100644
index 56ad6d03..00000000
--- a/data/const/manager/manager38.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108DE0:: @ 08108DE0
-	.4byte sub_0805E0C0
-	.4byte sub_0805E0F4
diff --git a/linker.ld b/linker.ld
index de116758..5e7b9e8c 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1145,7 +1145,7 @@ SECTIONS {
         src/manager/manager35.o(.rodata);
         src/manager/manager36.o(.rodata);
         src/manager/manager37.o(.rodata);
-        data/const/manager/manager38.o(.rodata);
+        src/manager/manager38.o(.rodata);
         data/const/manager/manager39.o(.rodata);
         data/data_08108E6C.o(.rodata);
         src/playerItem/playerItemSpiralBeam.o(.rodata);
diff --git a/src/manager/manager38.c b/src/manager/manager38.c
index 3bfae97f..081beb14 100644
--- a/src/manager/manager38.c
+++ b/src/manager/manager38.c
@@ -1,12 +1,17 @@
 #include "entity.h"
 #include "room.h"
 
-extern void (*const gUnk_08108DE0[])(Entity*);
-
 extern Entity* LoadRoomEntity(EntityData*);
 
+void sub_0805E0C0(Entity*);
+void sub_0805E0F4(Entity*);
+
 void Manager38_Main(Entity* this) {
-    gUnk_08108DE0[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_0805E0C0,
+        sub_0805E0F4,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_0805E0C0(Entity* this) {