Put const data in mama

4 files changed, 14 insertions, 27 deletions

diff --git a/assets/assets.json b/assets/assets.json
index 2fafe3c9..e1f024da 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -39343,16 +39343,6 @@
     "type": "animation"
   },
   {
-    "path": "mama/gUnk_08113754.bin",
-    "start": 1128276,
-    "size": 12
-  },
-  {
-    "path": "mama/gUnk_08113760.bin",
-    "start": 1128288,
-    "size": 80
-  },
-  {
     "path": "animations/gSpriteAnimations_Emma_0.bin",
     "start": 1128668,
     "size": 5,
diff --git a/data/const/npc/mama.s b/data/const/npc/mama.s
deleted file mode 100644
index 4d0fcbe5..00000000
--- a/data/const/npc/mama.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08113754:: @ 08113754
-	.incbin "mama/gUnk_08113754.bin"
-
-gUnk_08113760:: @ 08113760
-	.incbin "mama/gUnk_08113760.bin"
diff --git a/linker.ld b/linker.ld
index f6827934..3aeb7ca9 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1271,7 +1271,7 @@ SECTIONS {
         data/animations/npc/gina.o(.rodata);
         data/animations/npc/simon.o(.rodata);
         data/animations/npc/anju.o(.rodata);
-        data/const/npc/mama.o(.rodata);
+        src/npc/mama.o(.rodata);
         data/animations/npc/mama.o(.rodata);
         data/animations/npc/emma.o(.rodata);
         data/const/npc/teachers.o(.rodata);
diff --git a/src/npc/mama.c b/src/npc/mama.c
index 974aa58f..11f291d2 100644
--- a/src/npc/mama.c
+++ b/src/npc/mama.c
@@ -3,9 +3,11 @@
 #include "save.h"
 #include "npc.h"
 
-extern Dialog gUnk_08113760[];
-
-extern SpriteLoadData gUnk_08113754;
+static const SpriteLoadData gUnk_08113754[] = {
+    { 0x101, 0x4e, 0x4 },
+    { 0x2101, 0x4e, 0x4 },
+    { 0, 0, 0 },
+};
 
 bool32 sub_0806C454(Entity* this);
 
@@ -44,7 +46,7 @@ void Mama(Entity* this) {
 }
 
 bool32 sub_0806C454(Entity* this) {
-    if (LoadExtraSpriteData(this, &gUnk_08113754) == 0) {
+    if (LoadExtraSpriteData(this, gUnk_08113754) == 0) {
         return FALSE;
     } else {
         SetDefaultPriority(this, PRIO_MESSAGE);
@@ -75,7 +77,13 @@ void sub_0806C4A8(Entity* this, ScriptExecutionContext* context) {
 }
 
 void sub_0806C4DC(Entity* this) {
-    ShowNPCDialogue(this, &gUnk_08113760[gSave.global_progress]);
+    static const Dialog dialogs[] = {
+        { 1, 0, 3, 1, { 0x4f03, 0x4f02 } }, { 1, 0, 3, 1, { 0x4f03, 0x4f02 } }, { 1, 0, 3, 1, { 0x4f03, 0x4f02 } },
+        { 1, 0, 3, 1, { 0x4f03, 0x4f02 } }, { 1, 0, 3, 1, { 0x4f0d, 0x4f0c } }, { 1, 0, 3, 1, { 0x4f1b, 0x4f1a } },
+        { 1, 0, 3, 1, { 0x4f27, 0x4f26 } }, { 1, 0, 3, 1, { 0x4f33, 0x4f32 } }, { 1, 0, 3, 1, { 0x4f3f, 0x4f3e } },
+        { 1, 0, 3, 1, { 0x4f49, 0x4f48 } },
+    };
+    ShowNPCDialogue(this, &dialogs[gSave.global_progress]);
 }
 
 void sub_0806C4F8(Entity* this) {