From 2c473c443cba8e95b9b90f0f4c7ad68ea74b7f2f Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Thu, 14 Apr 2022 20:33:09 +0300
Subject: [PATCH] Put const data in pina

---
 assets/assets.json    | 5 -----
 data/const/npc/pina.s | 9 ---------
 linker.ld             | 1 -
 src/npc/pina.c        | 8 ++++++--
 4 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 data/const/npc/pina.s

diff --git a/assets/assets.json b/assets/assets.json
index 1f006ed0..60911c96 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -36164,11 +36164,6 @@
     "size": 7,
     "type": "animation"
   },
-  {
-    "path": "pina/gUnk_0810CE04.bin",
-    "start": 1101316,
-    "size": 80
-  },
   {
     "path": "guard/gUnk_0810F560.bin",
     "start": 1111392,
diff --git a/data/const/npc/pina.s b/data/const/npc/pina.s
deleted file mode 100644
index fbaff6c9..00000000
--- a/data/const/npc/pina.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0810CE04:: @ 0810CE04
-	.incbin "pina/gUnk_0810CE04.bin"
-
diff --git a/linker.ld b/linker.ld
index 464fb4b7..ae977ac8 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1184,7 +1184,6 @@ SECTIONS {
         data/const/npc/sittingPerson.o(.rodata);
         data/animations/npc/sittingPerson.o(.rodata);
         src/npc/pina.o(.rodata);
-        data/const/npc/pina.o(.rodata);
         data/animations/npc/pina.o(.rodata);
         data/const/npc/guard.o(.rodata);
         src/npc/guardWithSpear.o(.rodata);
diff --git a/src/npc/pina.c b/src/npc/pina.c
index 17473005..a6ff993e 100644
--- a/src/npc/pina.c
+++ b/src/npc/pina.c
@@ -11,8 +11,6 @@ void sub_08063A98(Entity* this);
 void sub_08063AC0(Entity* this);
 void sub_08063B44(Entity* this);
 
-extern Dialog gUnk_0810CE04[];
-
 void Pina(Entity* this) {
     if ((this->flags & ENT_SCRIPTED) != 0) {
         sub_08063B68(this);
@@ -137,6 +135,12 @@ void sub_08063C74(void) {
 }
 
 void sub_08063C90(Entity* this) {
+    static const Dialog gUnk_0810CE04[] = {
+        { 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x3422, 0x3421 } },
+        { 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x351d, 0x351c } }, { 6, 0, 3, 1, { 0x361c, 0x361b } },
+        { 6, 0, 3, 1, { 0x371d, 0x371c } }, { 6, 0, 3, 1, { 0x381d, 0x381c } }, { 6, 0, 3, 1, { 0x3917, 0x3916 } },
+        { 6, 0, 3, 1, { 0x3917, 0x3916 } },
+    };
     ShowNPCDialogue(this, &gUnk_0810CE04[gSave.global_progress]);
 }