From 809ad1331b120e3689beb173235039735f37b97b Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Sun, 17 Apr 2022 20:34:58 +0300
Subject: [PATCH] Put const data in jarPortal

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

diff --git a/data/const/object/jarPortal.s b/data/const/object/jarPortal.s
deleted file mode 100644
index 29fd4af3..00000000
--- a/data/const/object/jarPortal.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121488:: @ 08121488
-	.4byte sub_0808BE9C
-	.4byte sub_0808BF14
-	.4byte sub_0808BF58
-	.4byte sub_0808BFD8
-	.4byte sub_0808C0AC
-
diff --git a/linker.ld b/linker.ld
index b7215ce3..8722e600 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1400,7 +1400,7 @@ SECTIONS {
         data/animations/object/object35.o(.rodata);
         src/object/object36.o(.rodata);
         src/object/object37.o(.rodata);
-        data/const/object/jarPortal.o(.rodata);
+        src/object/jarPortal.o(.rodata);
         data/animations/object/jarPortal.o(.rodata);
         src/object/bossDoor.o(.rodata);
         data/animations/object/bossDoor.o(.rodata);
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index 4cdcf642..550cc6c4 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -2,17 +2,23 @@
 #include "area.h"
 #include "functions.h"
 
-extern void (*gUnk_08121488[])(Entity*);
-
 extern u32 PortalReadyForMinish(void);
 
 u32 sub_0808C128(Entity*);
 void sub_0808C13C(Entity*);
+void sub_0808BE9C(Entity*);
+void sub_0808BF14(Entity*);
+void sub_0808BF58(Entity*);
+void sub_0808BFD8(Entity*);
+void sub_0808C0AC(Entity*);
 void sub_0808C148(Entity*, u32);
 void sub_0808C01C(Entity*, u32);
 
 void JarPortal(Entity* this) {
-    gUnk_08121488[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_0808BE9C, sub_0808BF14, sub_0808BF58, sub_0808BFD8, sub_0808C0AC,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_0808BE9C(Entity* this) {