From 46b82dce97f5a3c1f8c4e0f339ef95993b744293 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 18 Apr 2022 23:02:08 +0300
Subject: [PATCH] Put const data in manager18

---
 assets/assets.json             | 5 -----
 data/const/manager/manager18.s | 8 --------
 linker.ld                      | 2 +-
 src/manager/manager18.c        | 4 +++-
 4 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 data/const/manager/manager18.s

diff --git a/assets/assets.json b/assets/assets.json
index fd9ceac4..d30b25e6 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -32288,11 +32288,6 @@
       "JP": -828
     }
   },
-  {
-    "path": "manager18/gUnk_0810865C.bin",
-    "start": 1082972,
-    "size": 12
-  },
   {
     "path": "manager1A/gUnk_08108670_EU.bin",
     "variants": [
diff --git a/data/const/manager/manager18.s b/data/const/manager/manager18.s
deleted file mode 100644
index d3d5712d..00000000
--- a/data/const/manager/manager18.s
+++ /dev/null
@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0810865C:: @ 0810865C
-	.incbin "manager18/gUnk_0810865C.bin"
diff --git a/linker.ld b/linker.ld
index d1a988d3..a00d9885 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1124,7 +1124,7 @@ SECTIONS {
         src/manager/manager14.o(.rodata);
         src/manager/manager15.o(.rodata);
         src/manager/manager17.o(.rodata);
-        data/const/manager/manager18.o(.rodata);
+        src/manager/manager18.o(.rodata);
         data/const/manager/manager1A.o(.rodata);
         data/const/manager/manager1B.o(.rodata);
         data/const/manager/manager1C.o(.rodata);
diff --git a/src/manager/manager18.c b/src/manager/manager18.c
index fd7ba93f..16ea8a8f 100644
--- a/src/manager/manager18.c
+++ b/src/manager/manager18.c
@@ -10,9 +10,11 @@ typedef struct {
 
 void sub_0805AEDC(Manager18*);
 void sub_0805AF3C(Manager18*);
-extern u16 gUnk_0810865C[];
 
 void Manager18_Main(Manager18* this) {
+    static const u16 gUnk_0810865C[] = {
+        0xf01, 0xe02, 0xe03, 0xe04, 0, 0,
+    };
     if (this == NULL) {
         if (gArea.onEnter != sub_0805AEDC) {
             sub_0805AEDC(NULL);