Put const data in melari

assets/assets.json

@@ -37619,21 +37619,6 @@
     "size": 8,
     "type": "animation"
   },
-  {
-    "path": "melari/gUnk_08111520.bin",
-    "start": 1119520,
-    "size": 16
-  },
-  {
-    "path": "melari/gUnk_08111538.bin",
-    "start": 1119544,
-    "size": 6
-  },
-  {
-    "path": "melari/gUnk_0811153E.bin",
-    "start": 1119550,
-    "size": 6
-  },
   {
     "path": "animations/gSpriteAnimations_BladeBrothers_1_0.bin",
     "start": 1120113,

data/const/npc/melari.s

@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08111520:: @ 08111520
-	.incbin "melari/gUnk_08111520.bin"
-
-gUnk_08111530:: @ 08111530
-	.4byte sub_08068708
-	.4byte sub_08068730
-
-gUnk_08111538:: @ 08111538
-	.incbin "melari/gUnk_08111538.bin"
-
-gUnk_0811153E:: @ 0811153E
-	.incbin "melari/gUnk_0811153E.bin"

linker.ld

@@ -1231,7 +1231,7 @@ SECTIONS {
         data/animations/npc/cat.o(.rodata);
         src/npc/mountainMinish.o(.rodata);
         data/animations/npc/mountainMinish.o(.rodata);
-        data/const/npc/melari.o(.rodata);
+        src/npc/melari.o(.rodata);
         data/animations/npc/melari.o(.rodata);
         data/const/npc/bladeBrothers.o(.rodata);
         data/animations/npc/bladeBrothers.o(.rodata);

src/npc/melari.c

@@ -1,17 +1,24 @@
 #include "npc.h"
 #include "item.h"
 
-extern void sub_08068780(Entity*);
+void sub_08068780(Entity*);
+void sub_08068708(Entity*);
+void sub_08068730(Entity*);
 
-extern void (*const gUnk_08111530[])(Entity*);
-
-extern SpriteLoadData gUnk_08111520;
-extern u16 gUnk_0811153E[];
-extern u16 gUnk_08111538[];
+static const SpriteLoadData gUnk_08111520[] = {
+    { 0xb5, 0x1a, 0x4 },
+    { 0x1cb5, 0x1a, 0x4 },
+    { 0x50b4, 0x1c, 0x4 },
+    { 0, 0, 0 },
+};
 
 void Melari(Entity* this) {
+    static void (*const scriptedActionFuncs[])(Entity*) = {
+        sub_08068708,
+        sub_08068730,
+    };
     if ((this->flags & ENT_SCRIPTED) == 0) {
-        gUnk_08111530[this->action](this);
+        scriptedActionFuncs[this->action](this);
         sub_0806ED78(this);
     } else {
         sub_08068780(this);
@@ -19,7 +26,7 @@ void Melari(Entity* this) {
 }
 
 void sub_08068708(Entity* this) {
-    if (LoadExtraSpriteData(this, &gUnk_08111520) != 0) {
+    if (LoadExtraSpriteData(this, gUnk_08111520) != 0) {
         this->action = 1;
         InitializeAnimation(this, 0);
         sub_08078778(this);
@@ -47,11 +54,13 @@ void sub_08068730(Entity* this) {
 }
 
 void sub_08068780(Entity* this) {
+    static const u16 soundOnScreen[] = { SFX_HAMMER1, SFX_HAMMER2, SFX_HAMMER3 };
+    static const u16 soundNotOnScreen[] = { SFX_HAMMER4, SFX_HAMMER5, SFX_HAMMER6 };
     Entity* ent;
 
     switch (this->action) {
         case 0:
-            if (LoadExtraSpriteData(this, &gUnk_08111520) == 0) {
+            if (LoadExtraSpriteData(this, gUnk_08111520) == 0) {
                 return;
             }
             this->action = 1;
@@ -80,9 +89,9 @@ void sub_08068780(Entity* this) {
     if (this->frame & 0x40) {
         this->frame &= 0xbf;
         if (CheckOnScreen(this) == 0) {
-            SoundReq(gUnk_0811153E[(s32)Random() % 3]);
+            SoundReq(soundNotOnScreen[(s32)Random() % 3]);
         } else {
-            EnqueueSFX(gUnk_08111538[(s32)Random() % 3]);
+            EnqueueSFX(soundOnScreen[(s32)Random() % 3]);
         }
         ent = CreateFx(this, FX_STARS2, 0x20);
         if (ent != NULL) {
@@ -140,7 +149,7 @@ void sub_08068964(Entity* this) {
 
 void Melari_Fusion(Entity* this) {
     if (this->action == 0) {
-        if (LoadExtraSpriteData(this, &gUnk_08111520)) {
+        if (LoadExtraSpriteData(this, gUnk_08111520)) {
             this->action++;
             this->spriteSettings.draw = TRUE;
             InitializeAnimation(this, 6);