From 8e56dfeec0398cf62d3d87e0202f560031728853 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 10 Jan 2022 07:25:41 +0200
Subject: [PATCH] curtain: Added const data

---
 data/const/enemy/curtain.s | 19 -------------------
 linker.ld                  |  2 +-
 src/enemy/curtain.c        | 15 +++++++++++++--
 3 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 data/const/enemy/curtain.s

diff --git a/data/const/enemy/curtain.s b/data/const/enemy/curtain.s
deleted file mode 100644
index 66457e8f..00000000
--- a/data/const/enemy/curtain.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D1CC8:: @ 080D1CC8
-	.4byte sub_080481D0
-	.4byte sub_080481E8
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_26
-
-gUnk_080D1CE0:: @ 080D1CE0
-	.4byte sub_08048224
-	.4byte sub_08048268
-	.4byte sub_08048294
-	.4byte nullsub_27
diff --git a/linker.ld b/linker.ld
index 3583decb..6cbdf8f5 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1101,7 +1101,7 @@ SECTIONS {
         data/const/enemy/gyorgFemale.o(.rodata);
         src/enemy/gyorgMale.o(.rodata);
         data/animations/enemy/gyorgMale.o(.rodata);
-        data/const/enemy/curtain.o(.rodata);
+        src/enemy/curtain.o(.rodata);
         data/animations/enemy/curtain.o(.rodata);
         src/enemy/vaatiWrathEye.o(.rodata);
         data/animations/enemy/vaatiWrathEye.o(.rodata);
diff --git a/src/enemy/curtain.c b/src/enemy/curtain.c
index 9c73955d..895a578c 100644
--- a/src/enemy/curtain.c
+++ b/src/enemy/curtain.c
@@ -1,8 +1,8 @@
 #include "enemy.h"
 #include "entity.h"
 
-extern void (*const gUnk_080D1CC8[])(Entity*);
-extern void (*const gUnk_080D1CE0[])(Entity*);
+void (*const gUnk_080D1CC8[])(Entity*);
+void (*const gUnk_080D1CE0[])(Entity*);
 
 void Curtain(Entity* this) {
     EnemyFunctionHandler(this, gUnk_080D1CC8);
@@ -67,3 +67,14 @@ void sub_08048294(Entity* this) {
 
 void nullsub_27() {
 }
+
+void (*const gUnk_080D1CC8[])(Entity*) = {
+    sub_080481D0, sub_080481E8, sub_08001324, sub_0804A7D4, sub_08001242, nullsub_26,
+};
+
+void (*const gUnk_080D1CE0[])(Entity*) = {
+    sub_08048224,
+    sub_08048268,
+    sub_08048294,
+    nullsub_27,
+};