From 6de7b5c333869ba6329cd355f2b3544653145677 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 00:40:47 +0300
Subject: [PATCH] Put const data in object86

---
 data/const/object/object86.s | 12 ------------
 linker.ld                    |  2 +-
 src/object/object86.c        | 12 +++++++++---
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 data/const/object/object86.s

diff --git a/data/const/object/object86.s b/data/const/object/object86.s
deleted file mode 100644
index 7f520f2c..00000000
--- a/data/const/object/object86.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081237F8:: @ 081237F8
-	.4byte sub_08099DD0
-	.4byte sub_08099E10
-	.4byte sub_08099E58
-	.4byte sub_08099E8C
-	.4byte nullsub_534
diff --git a/linker.ld b/linker.ld
index 1c8463d3..32c9836f 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1495,7 +1495,7 @@ SECTIONS {
         data/animations/object/smallIceBlock.o(.rodata);
         src/object/bigIceBlock.o(.rodata);
         data/animations/object/bigIceBlock.o(.rodata);
-        data/const/object/object86.o(.rodata);
+        src/object/object86.o(.rodata);
         data/animations/object/object86.o(.rodata);
         src/object/octorokBossObject.o(.rodata);
         src/object/macroBook.o(.rodata);
diff --git a/src/object/object86.c b/src/object/object86.c
index 72f880e4..98017cc7 100644
--- a/src/object/object86.c
+++ b/src/object/object86.c
@@ -2,12 +2,18 @@
 #include "item.h"
 
 void sub_08099ECC(Entity*);
+void sub_08099DD0(Entity*);
+void sub_08099E10(Entity*);
+void sub_08099E58(Entity*);
+void sub_08099E8C(Entity*);
+void nullsub_534(Entity*);
 extern void sub_0805B390(u32);
 
-extern void (*const gUnk_081237F8[])(Entity*);
-
 void Object86(Entity* this) {
-    gUnk_081237F8[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_08099DD0, sub_08099E10, sub_08099E58, sub_08099E8C, nullsub_534,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_08099DD0(Entity* this) {