Put const data in manager13

4 files changed, 19 insertions, 26 deletions

diff --git a/assets/assets.json b/assets/assets.json
index d77119a5..c288f3d2 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -32289,16 +32289,6 @@
     }
   },
   {
-    "path": "manager13/gUnk_081084C8.bin",
-    "start": 1082568,
-    "size": 104
-  },
-  {
-    "path": "manager13/gUnk_08108530.bin",
-    "start": 1082672,
-    "size": 88
-  },
-  {
     "path": "manager15/gUnk_081085B8.bin",
     "start": 1082808,
     "size": 32
diff --git a/data/const/manager/manager13.s b/data/const/manager/manager13.s
deleted file mode 100644
index 6937afcb..00000000
--- a/data/const/manager/manager13.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081084C8:: @ 081084C8
-	.incbin "manager13/gUnk_081084C8.bin"
-
-gUnk_08108530:: @ 08108530
-	.incbin "manager13/gUnk_08108530.bin"
diff --git a/linker.ld b/linker.ld
index 0423a30b..96aaf719 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1120,7 +1120,7 @@ SECTIONS {
         src/manager/managerF.o(.rodata);
         src/manager/manager10.o(.rodata);
         src/manager/manager12.o(.rodata);
-        data/const/manager/manager13.o(.rodata);
+        src/manager/manager13.o(.rodata);
         src/manager/manager14.o(.rodata);
         data/const/manager/manager15.o(.rodata);
         data/const/manager/manager17.o(.rodata);
diff --git a/src/manager/manager13.c b/src/manager/manager13.c
index e1d7820b..142a0801 100644
--- a/src/manager/manager13.c
+++ b/src/manager/manager13.c
@@ -17,9 +17,6 @@ typedef struct {
     u8 _padding;
 } SpawnData;
 
-extern SpawnData gUnk_081084C8[];
-extern SpawnData gUnk_08108530[];
-
 extern u32 CheckRectOnScreen(u16, u16, u32, u32);
 
 /*
@@ -27,7 +24,24 @@ Keeps track in its bitfield of whether 0x10 x 0x10 rects at certain positions ar
 Spawns OBJECT_1C objects that check this and unsets the value in the bitfield.
 */
 void Manager13_Main(Manager13* this) {
-    SpawnData* spawnData;
+    static const SpawnData gUnk_081084C8[] = {
+        { 0x48, 0x90, 0x0, 0x0, 0x2, 0x0 },   { 0x138, 0x30, 0x1, 0x1, 0x2, 0x0 },
+        { 0x168, 0x90, 0x2, 0x2, 0x2, 0x0 },  { 0x2c8, 0x80, 0x3, 0x3, 0x2, 0x0 },
+        { 0x388, 0x240, 0x4, 0x4, 0x2, 0x0 }, { 0x158, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
+        { 0x15a, 0x228, 0x6, 0x6, 0x2, 0x0 }, { 0x158, 0x26b, 0x7, 0x7, 0x2, 0x0 },
+        { 0x198, 0x2b1, 0x8, 0x8, 0x2, 0x0 }, { 0x258, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
+        { 0x298, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x298, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
+        { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
+    };
+    static const SpawnData gUnk_08108530[] = {
+        { 0x8, 0x30, 0x1, 0x1, 0x2, 0x0 },    { 0x38, 0x90, 0x2, 0x2, 0x2, 0x0 },
+        { 0x198, 0x80, 0x3, 0x2, 0x2, 0x0 },  { 0x28, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
+        { 0x2a, 0x228, 0x6, 0x6, 0x2, 0x0 },  { 0x28, 0x26b, 0x7, 0x7, 0x2, 0x0 },
+        { 0x68, 0x2b1, 0x8, 0x8, 0x2, 0x0 },  { 0x128, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
+        { 0x168, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x168, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
+        { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
+    };
+    const SpawnData* spawnData;
     u32 type2;
 
     if (this->manager.action == 0) {