From 94918e8dc35c2a002c71c3cfaf208a5b159f161f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 27 Feb 2025 15:26:47 +0100
Subject: [PATCH] move some data to code_803E724

---
 data/data_80F59C8_3.s      | 20 -----------------
 include/structs/str_text.h |  1 +
 src/code_803E724.c         | 45 +++++++++++++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/data/data_80F59C8_3.s b/data/data_80F59C8_3.s
index 20e82b16b..e8ef47bc7 100644
--- a/data/data_80F59C8_3.s
+++ b/data/data_80F59C8_3.s
@@ -24,23 +24,3 @@ gUnknown_80F6224: @ 80F6224
 .byte 0x0a, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
 .byte 0x02, 0x00, 0x00, 0x00, 0x2a, 0x02, 0x00, 0x00
 
-.global gUnknown_80F62AC
-gUnknown_80F62AC: @ 80F62AC
-@ replacing .incbin "baserom.gba", 0x000f62ac, 0x4
-.byte 0x00, 0x00, 0x00, 0x00
-
-.global gUnknown_80F62B0
-gUnknown_80F62B0: @ 80F62B0
-@ replacing .incbin "baserom.gba", 0x000f62b0, 0x60
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0f, 0x00, 0x1a, 0x00, 0x05, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-.global gUnknown_80F6310
-gUnknown_80F6310: @ 80F6310
-@ replacing .incbin "baserom.gba", 0x000f6310, 0x60
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x06, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-
diff --git a/include/structs/str_text.h b/include/structs/str_text.h
index a41fd0cf2..873ee8e15 100644
--- a/include/structs/str_text.h
+++ b/include/structs/str_text.h
@@ -53,6 +53,7 @@ typedef struct Window
 
 #define WINDOW_DUMMY (Window) {.type = WINDOW_TYPE_NORMAL, .width = 0}
 
+#define WINDOW_TYPE_0                   0
 #define WINDOW_TYPE_WITHOUT_BORDER      1
 #define WINDOW_TYPE_NORMAL              3
 #define WINDOW_TYPE_FILL_TRANSPARENT    5
diff --git a/src/code_803E724.c b/src/code_803E724.c
index 4b38499ed..85dcfaddc 100644
--- a/src/code_803E724.c
+++ b/src/code_803E724.c
@@ -43,9 +43,6 @@ extern u8 gUnknown_203B40C;
 extern MenuInputStruct gUnknown_202EE10;
 extern SpriteOAM gUnknown_202EDDC;
 
-extern const RGB gUnknown_80F62AC;
-extern const struct Windows gUnknown_80F62B0;
-extern const struct Windows gUnknown_80F6310;
 extern const u32 gUnknown_80F6490[];
 extern const s32 gUnknown_80F64B4[];
 extern const s32 gUnknown_80F64FC[];
@@ -74,13 +71,15 @@ void sub_803FB74(void);
 void sub_803FE30(s32 a0, u16 *a1, bool8 a2, bool8 a3);
 void sub_803FF18(s32 a0, u16 *a1, bool8 a2);
 
+static const RGB sBlackRgb = {0, 0, 0};
+
 void sub_803E874(bool8 r10, s32 r9)
 {
     s32 i, index, count;
     const RGB *color;
 
     color = gDungeonPaletteFile->unk4;
-    SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gDungeonBrightness, gDungeon->colorRamp);
+    SetBGPaletteBufferColorRGB(0, &sBlackRgb, gDungeonBrightness, gDungeon->colorRamp);
     color++;
     index = 1;
     count = 159;
@@ -148,7 +147,7 @@ void sub_803EA10(void)
     const RGB *color;
 
     color= gDungeonPaletteFile->unk4;
-    SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gDungeonBrightness, gDungeon->colorRamp);
+    SetBGPaletteBufferColorRGB(0, &sBlackRgb, gDungeonBrightness, gDungeon->colorRamp);
     color++;
     index = 1;
     count = 159;
@@ -174,6 +173,42 @@ void sub_803EA10(void)
     SetBGPaletteBufferColorRGB(248, &gFontPalette[8], gDungeonBrightness, NULL);
 }
 
+static const struct Windows gUnknown_80F62B0 =
+{
+    .id = {
+        [0] = {
+            .type = WINDOW_TYPE_0,
+            .pos = {2, 15},
+            .width = 26,
+            .height = 5,
+            .unk10 = 7,
+            .unk12 = 0,
+            .unk14 = NULL,
+        },
+        [1] = WINDOW_DUMMY,
+        [2] = WINDOW_DUMMY,
+        [3] = WINDOW_DUMMY,
+    }
+};
+
+static const struct Windows gUnknown_80F6310 =
+{
+    .id = {
+        [0] = {
+            .type = WINDOW_TYPE_NORMAL,
+            .pos = {2, 3},
+            .width = 6,
+            .height = 7,
+            .unk10 = 7,
+            .unk12 = 0,
+            .unk14 = NULL,
+        },
+        [1] = WINDOW_DUMMY,
+        [2] = WINDOW_DUMMY,
+        [3] = WINDOW_DUMMY,
+    }
+};
+
 static const struct Windows gUnknown_80F6370 =
 {
     .id = {