From b703cced65e66ba92d06797c51c806adc5aca3be Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 13:14:25 +0300
Subject: [PATCH] Put const data in minishLight

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

diff --git a/data/const/object/minishLight.s b/data/const/object/minishLight.s
deleted file mode 100644
index 65089903..00000000
--- a/data/const/object/minishLight.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081247F8:: @ 081247F8
-	.4byte sub_0809F840
-	.4byte sub_0809F868
diff --git a/linker.ld b/linker.ld
index 252ab931..7ffc45c8 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1532,7 +1532,7 @@ SECTIONS {
         src/object/objectA2.o(.rodata);
         data/animations/object/objectA2.o(.rodata);
         src/object/cloud.o(.rodata);
-        data/const/object/minishLight.o(.rodata);
+        src/object/minishLight.o(.rodata);
         src/object/objectA6.o(.rodata);
         data/animations/object/objectA6.o(.rodata);
         src/object/objectA8.o(.rodata);
diff --git a/src/object/minishLight.c b/src/object/minishLight.c
index 3ec27575..361e6768 100644
--- a/src/object/minishLight.c
+++ b/src/object/minishLight.c
@@ -1,9 +1,14 @@
 #include "entity.h"
 
-extern void (*const gUnk_081247F8[])(Entity*);
+void sub_0809F840(Entity*);
+void sub_0809F868(Entity*);
 
 void MinishLight(Entity* this) {
-    gUnk_081247F8[this->action](this);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_0809F840,
+        sub_0809F868,
+    };
+    actionFuncs[this->action](this);
 }
 
 void sub_0809F840(Entity* this) {