From 1c6bc876b5fd15d3703954a50acab9169c7562f9 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Sun, 17 Apr 2022 20:40:55 +0300
Subject: [PATCH] Put const data in giantLeaf

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

diff --git a/assets/assets.json b/assets/assets.json
index 3000863c..08cd07d8 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -42544,16 +42544,6 @@
     "size": 4,
     "type": "animation"
   },
-  {
-    "path": "giantLeaf/gUnk_08121750.bin",
-    "start": 1185616,
-    "size": 26
-  },
-  {
-    "path": "giantLeaf/gUnk_0812176A.bin",
-    "start": 1185642,
-    "size": 26
-  },
   {
     "path": "animations/gSpriteAnimations_Object43_0.bin",
     "start": 1185760,
diff --git a/data/const/object/giantLeaf.s b/data/const/object/giantLeaf.s
deleted file mode 100644
index b1883e37..00000000
--- a/data/const/object/giantLeaf.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121750:: @ 08121750 
-	.incbin "giantLeaf/gUnk_08121750.bin"
-
-gUnk_0812176A:: @ 0812176A
-	.incbin "giantLeaf/gUnk_0812176A.bin"
diff --git a/linker.ld b/linker.ld
index 8722e600..f8d8de49 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1411,7 +1411,7 @@ SECTIONS {
         src/object/macroPlayer.o(.rodata);
         src/object/object3D.o(.rodata);
         src/object/object3E.o(.rodata);
-        data/const/object/giantLeaf.o(.rodata);
+        src/object/giantLeaf.o(.rodata);
         src/object/fairy.o(.rodata);
         src/object/object42.o(.rodata);
         src/object/object43.o(.rodata);
diff --git a/src/object/giantLeaf.c b/src/object/giantLeaf.c
index ab3ebac8..23a998e8 100644
--- a/src/object/giantLeaf.c
+++ b/src/object/giantLeaf.c
@@ -2,9 +2,6 @@
 
 void sub_0808D618(Entity* ent);
 
-extern s16 gUnk_08121750[];
-extern s16 gUnk_0812176A[];
-
 void GiantLeaf(Entity* ent) {
     if (ent->action == 0) {
         ent->action = 1;
@@ -17,8 +14,14 @@ void GiantLeaf(Entity* ent) {
 }
 
 void sub_0808D618(Entity* ent) {
+    static const s16 gUnk_08121750[] = {
+        0x41, 0x40, 0x3f, 0x3e, 0x1, 0x0, -0x1, -0x2, -0x3e, -0x3f, -0x40, -0x41, -0x7e,
+    };
+    static const s16 gUnk_0812176A[] = {
+        0x3f, 0x40, 0x41, 0x42, -0x1, 0x0, 0x1, 0x2, -0x42, -0x41, -0x40, -0x3f, -0x82,
+    };
     u32 tilePos;
-    s16* arr;
+    const s16* arr;
     u32 i;
 
     arr = (ent->type != 0) ? gUnk_0812176A : gUnk_08121750;