From e3e6498cc233f30248ee7e0b2ffbd002e5e7f6cb Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Sat, 16 Apr 2022 11:10:45 +0300
Subject: [PATCH] Put const data in farmers

---
 assets/assets.json       | 10 ----------
 data/const/npc/farmers.s | 11 -----------
 linker.ld                |  2 +-
 src/npc/farmers.c        |  9 +++++++--
 4 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 data/const/npc/farmers.s

diff --git a/assets/assets.json b/assets/assets.json
index a386f274..b3f82675 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -39078,16 +39078,6 @@
     "size": 5,
     "type": "animation"
   },
-  {
-    "path": "farmers/gUnk_08113140.bin",
-    "start": 1126720,
-    "size": 24
-  },
-  {
-    "path": "farmers/gUnk_08113158.bin",
-    "start": 1126744,
-    "size": 16
-  },
   {
     "path": "animations/gSpriteAnimations_Carlov_0_0.bin",
     "start": 1127000,
diff --git a/data/const/npc/farmers.s b/data/const/npc/farmers.s
deleted file mode 100644
index 459c789c..00000000
--- a/data/const/npc/farmers.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08113140:: @ 08113140
-	.incbin "farmers/gUnk_08113140.bin"
-
-gUnk_08113158:: @ 08113158
-	.incbin "farmers/gUnk_08113158.bin"
diff --git a/linker.ld b/linker.ld
index 51923adf..abdeec66 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1260,7 +1260,7 @@ SECTIONS {
         data/animations/npc/moblinLady.o(.rodata);
         src/npc/librarians.o(.rodata);
         data/animations/npc/librarians.o(.rodata);
-        data/const/npc/farmers.o(.rodata);
+        src/npc/farmers.o(.rodata);
         data/animations/npc/farmers.o(.rodata);
         data/animations/npc/carlov.o(.rodata);
         data/const/npc/dampe.o(.rodata);
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index 1066168b..7b1c4def 100644
--- a/src/npc/farmers.c
+++ b/src/npc/farmers.c
@@ -3,9 +3,10 @@
 #include "functions.h"
 #include "npc.h"
 
-extern Dialog gUnk_08113158[];
+static const SpriteLoadData gUnk_08113140[] = {
+    { 0xf7, 0x48, 0x4 }, { 0x40f7, 0x48, 0x4 }, { 0, 0, 0 }, { 0xf8, 0x49, 0x4 }, { 0x40f8, 0x49, 0x4 }, { 0, 0, 0 },
+};
 
-extern SpriteLoadData gUnk_08113140[];
 void sub_0806BC58(Entity* this);
 
 void Farmers(Entity* this) {
@@ -63,6 +64,10 @@ void sub_0806BCD4(Entity* this) {
 }
 
 void sub_0806BCE8(Entity* this) {
+    static const Dialog gUnk_08113158[] = {
+        { 0x29, 3, 4, 1, { 0x1a07, 0x1a02 } },
+        { 0x29, 3, 4, 1, { 0x1a11, 0x1a0d } },
+    };
     ShowNPCDialogue(this, &gUnk_08113158[this->type]);
 }