From d3a9d40206668379717bec4991e22d0ec5258552 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Tue, 19 Apr 2022 22:03:51 +0300
Subject: [PATCH] Put const data in windcrest

---
 assets/assets.json            | 5 -----
 data/const/object/windcrest.s | 9 ---------
 linker.ld                     | 2 +-
 src/object/windcrest.c        | 5 ++---
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 data/const/object/windcrest.s

diff --git a/assets/assets.json b/assets/assets.json
index 8fb062be..4520058a 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -43822,11 +43822,6 @@
     "size": 83,
     "type": "animation"
   },
-  {
-    "path": "windcrest/gUnk_08125010.bin",
-    "start": 1200144,
-    "size": 4
-  },
   {
     "path": "animations/gSpriteAnimations_Pinwheel_0.bin",
     "start": 1200232,
diff --git a/data/const/object/windcrest.s b/data/const/object/windcrest.s
deleted file mode 100644
index 192666fe..00000000
--- a/data/const/object/windcrest.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08125010:: @ 08125010
-	.incbin "windcrest/gUnk_08125010.bin"
-
diff --git a/linker.ld b/linker.ld
index db61337a..e154e144 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1556,7 +1556,7 @@ SECTIONS {
         src/object/windTribeTeleporter.o(.rodata);
         src/object/cuccoMinigame.o(.rodata);
         src/object/gyorgBossObject.o(.rodata);
-        data/const/object/windcrest.o(.rodata);
+        src/object/windcrest.o(.rodata);
         src/object/objectBD.o(.rodata);
         src/object/pinwheel.o(.rodata);
         data/animations/object/pinwheel.o(.rodata);
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index 97d88300..5fdeb9c0 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -6,8 +6,6 @@
 #include "effects.h"
 #include "functions.h"
 
-extern u8 gUnk_08125010;
-
 void Windcrest(Entity* this) {
     if (this->action == 0) {
         this->action++;
@@ -19,7 +17,8 @@ void Windcrest(Entity* this) {
 }
 
 void sub_080A2124(Entity* this) {
-    sub_08078850(this, 1, 0xe, &gUnk_08125010);
+    static const u8 gUnk_08125010[] = { 0, 0, 12, 12 };
+    sub_08078850(this, 1, 0xe, gUnk_08125010);
 }
 
 void Windcrest_Unlock(Entity* this) {