From 51ee1d70289a0baa982d47f5eee550a43f3ee041 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Wed, 13 Apr 2022 22:43:29 +0300
Subject: [PATCH] Put const data into npc9

---
 data/const/npc/npc9.s | 11 -----------
 linker.ld             |  2 +-
 src/npc/npc9.c        | 13 +++++++++++--
 3 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 data/const/npc/npc9.s

diff --git a/data/const/npc/npc9.s b/data/const/npc/npc9.s
deleted file mode 100644
index 0a047807..00000000
--- a/data/const/npc/npc9.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0810C290:: @ 0810C290
-	.4byte sub_08062AF0
-	.4byte sub_08062B14
-	.4byte sub_08062B48
-	.4byte sub_08062B70
diff --git a/linker.ld b/linker.ld
index 080aadfd..88c5aa40 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1163,7 +1163,7 @@ SECTIONS {
         data/animations/npc/townsperson.o(.rodata);
         data/const/npc/kid.o(.rodata);
         data/animations/npc/kid.o(.rodata);
-        data/const/npc/npc9.o(.rodata);
+        src/npc/npc9.o(.rodata);
         data/animations/npc/npc9.o(.rodata);
         data/const/npc/stamp.o(.rodata);
         data/animations/npc/stamp.o(.rodata);
diff --git a/src/npc/npc9.c b/src/npc/npc9.c
index 6e1ff9f6..087b8c2d 100644
--- a/src/npc/npc9.c
+++ b/src/npc/npc9.c
@@ -3,10 +3,19 @@
 #include "message.h"
 #include "npc.h"
 
-extern void (*const gUnk_0810C290[])(Entity*);
+void sub_08062AF0(Entity*);
+void sub_08062B14(Entity*);
+void sub_08062B48(Entity*);
+void sub_08062B70(Entity*);
 
 void NPC9(Entity* this) {
-    gUnk_0810C290[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_08062AF0,
+        sub_08062B14,
+        sub_08062B48,
+        sub_08062B70,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_08062AF0(Entity* this) {