From 2fe7c42dcf475528c432e3420f38ba576712e058 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 13:16:21 +0300
Subject: [PATCH] Put const data in objectAF

---
 data/const/object/objectAF.s | 10 ----------
 linker.ld                    |  2 +-
 src/object/objectAF.c        | 14 ++++++++++----
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 data/const/object/objectAF.s

diff --git a/data/const/object/objectAF.s b/data/const/object/objectAF.s
deleted file mode 100644
index 5dfc2d66..00000000
--- a/data/const/object/objectAF.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081248C4:: @ 081248C4
-	.4byte sub_080A05A4
-	.4byte sub_080A05F4
-	.4byte sub_080A0624
diff --git a/linker.ld b/linker.ld
index 7ffc45c8..391fd7d6 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1542,7 +1542,7 @@ SECTIONS {
         data/animations/object/objectAB.o(.rodata);
         src/object/fourElements.o(.rodata);
         src/object/objectAD.o(.rodata);
-        data/const/object/objectAF.o(.rodata);
+        src/object/objectAF.o(.rodata);
         data/animations/object/objectAF.o(.rodata);
         src/object/metalDoor.o(.rodata);
         data/const/object/jailBars.o(.rodata);
diff --git a/src/object/objectAF.c b/src/object/objectAF.c
index e0771380..d2707ab4 100644
--- a/src/object/objectAF.c
+++ b/src/object/objectAF.c
@@ -2,12 +2,18 @@
 #include "entity.h"
 #include "physics.h"
 
-extern void sub_080A0640(Entity*);
-
-extern void (*const gUnk_081248C4[])(Entity*);
+void sub_080A0640(Entity*);
+void sub_080A05A4(Entity*);
+void sub_080A05F4(Entity*);
+void sub_080A0624(Entity*);
 
 void ObjectAF(Entity* this) {
-    gUnk_081248C4[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_080A05A4,
+        sub_080A05F4,
+        sub_080A0624,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_080A05A4(Entity* this) {