From 4ce714ee5c597172f4de57ad7703f8c0e2d39b8d Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 23:00:16 +0300
Subject: [PATCH] Put const data in manager17

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

diff --git a/data/const/manager/manager17.s b/data/const/manager/manager17.s
deleted file mode 100644
index d1c21868..00000000
--- a/data/const/manager/manager17.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108654:: @ 08108654
-	.4byte sub_0805AD60
-	.4byte sub_0805AD80
diff --git a/linker.ld b/linker.ld
index 265d9fd3..d1a988d3 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1123,7 +1123,7 @@ SECTIONS {
         src/manager/manager13.o(.rodata);
         src/manager/manager14.o(.rodata);
         src/manager/manager15.o(.rodata);
-        data/const/manager/manager17.o(.rodata);
+        src/manager/manager17.o(.rodata);
         data/const/manager/manager18.o(.rodata);
         data/const/manager/manager1A.o(.rodata);
         data/const/manager/manager1B.o(.rodata);
diff --git a/src/manager/manager17.c b/src/manager/manager17.c
index 9ba38cda..61cbacd6 100644
--- a/src/manager/manager17.c
+++ b/src/manager/manager17.c
@@ -15,12 +15,15 @@ typedef struct {
     u16 field_0x3e;
 } Manager17;
 
-extern void (*const gUnk_08108654[])(Manager17*);
-
+void sub_0805AD60(Manager17*);
 void sub_0805AD80(Manager17*);
 
 void Manager17_Main(Manager17* manager) {
-    gUnk_08108654[manager->manager.action](manager);
+    static void (*const actionFuncs[])(Manager17*) = {
+        sub_0805AD60,
+        sub_0805AD80,
+    };
+    actionFuncs[manager->manager.action](manager);
 }
 
 void sub_0805AD60(Manager17* manager) {