From 24b936f2fb292a6d86d1e6e5e0d12b5335ca644d Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 00:41:56 +0300
Subject: [PATCH] Put const data in fireplace

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

diff --git a/data/const/object/fireplace.s b/data/const/object/fireplace.s
deleted file mode 100644
index c59473e2..00000000
--- a/data/const/object/fireplace.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123D98:: @ 08123D98
-	.4byte sub_0809B708
-	.4byte sub_0809B7A0
diff --git a/linker.ld b/linker.ld
index 32c9836f..65bffe6f 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1504,7 +1504,7 @@ SECTIONS {
         src/object/cabinFurniture.o(.rodata);
         src/object/doubleBookshelf.o(.rodata);
         src/object/book.o(.rodata);
-        data/const/object/fireplace.o(.rodata);
+        src/object/fireplace.o(.rodata);
         src/object/object8E.o(.rodata);
         src/object/frozenWaterElement.o(.rodata);
         src/object/object90.o(.rodata);
diff --git a/src/object/fireplace.c b/src/object/fireplace.c
index 5a86491a..e1c0f0d7 100644
--- a/src/object/fireplace.c
+++ b/src/object/fireplace.c
@@ -1,14 +1,17 @@
 #include "object.h"
 #include "functions.h"
 
-extern void (*gUnk_08123D98[])(Entity*);
-
 void sub_0809B7A0(Entity* this);
 void sub_0809B7DC(Entity* this);
 void sub_0809B7C0(Entity* this);
+void sub_0809B708(Entity* this);
 
 void Fireplace(Entity* e) {
-    gUnk_08123D98[e->action](e);
+    static void (*const actionFuncs[])(Entity*) = {
+        sub_0809B708,
+        sub_0809B7A0,
+    };
+    actionFuncs[e->action](e);
 }
 
 void sub_0809B708(Entity* this) {