text_window_graphics

asm/text_window_graphics.s

@@ -1,30 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8069788
-sub_8069788: @ 8069788
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x13
-	bhi _080697A0
-	lsls r0, 3
-	ldr r1, _0806979C @ =gUnknown_8471E8C
-	adds r0, r1
-	b _080697A2
-	.align 2, 0
-_0806979C: .4byte gUnknown_8471E8C
-_080697A0:
-	ldr r0, _080697A8 @ =gUnknown_8471E8C
-_080697A2:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080697A8: .4byte gUnknown_8471E8C
-	thumb_func_end sub_8069788
-
-	.align 2, 0 @ Don't pad with nop.

data/data_8468C98.s

@@ -321,16 +321,4 @@ gUnknown_846FB0C:: @ 846FB0C
 	.incbin "baserom.gba", 0x46FB0C, 0x1000
 
 gUnknown_8470B0C:: @ 8470B0C
-	.incbin "baserom.gba", 0x470B0C, 0xF40
-
-gUnknown_8471A4C:: @ 8471A4C
-	.incbin "baserom.gba", 0x471A4C, 0x120
-
-gUnknown_8471B6C:: @ 8471B6C
-	.incbin "baserom.gba", 0x471B6C, 0x280
-
-gUnknown_8471DEC:: @ 8471DEC
-	.incbin "baserom.gba", 0x471DEC, 0xA0
-
-gUnknown_8471E8C:: @ 8471E8C
-	.incbin "baserom.gba", 0x471E8C, 0x50
+	.incbin "baserom.gba", 0x470B0C, 0x260

graphics/text_window/stdpal_0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+213 230 246
+164 213 230
+230 246 255
+115 164 197
+74 115 164

graphics/text_window/stdpal_1.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+205 205 222
+205 205 222
+230 246 255
+205 205 222
+106 115 123

graphics/text_window/stdpal_2.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+74 205 238
+16 172 222
+0 82 115
+0 115 139
+0 123 197

graphics/text_window/stdpal_3.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 0 255
+205 213 213
+156 205 222
+98 115 123
+65 172 230
+131 164 180

graphics/text_window/stdpal_4.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+57 98 115
+131 131 131
+164 164 164
+197 197 205
+230 230 238
+65 90 106

include/text_window_graphics.h

@@ -0,0 +1,18 @@
+#ifndef GUARD_TEXT_WINDOW_GRAPHICS_H
+#define GUARD_TEXT_WINDOW_GRAPHICS_H
+
+struct TextWindowGraphics
+{
+    const void * tiles;
+    const void * palette;
+};
+
+extern const u16 gUnknown_8471A4C[];
+extern const u16 gUnknown_8471B6C[];
+extern const u16 gUnknown_8471DEC[][16];
+
+extern const struct TextWindowGraphics gUnknown_8471E8C[];
+
+const struct TextWindowGraphics * sub_8069788(u8 idx);
+
+#endif //GUARD_TEXT_WINDOW_GRAPHICS_H

ld_script.txt

@@ -100,7 +100,7 @@ SECTIONS {
         asm/map_obj_80688E4.o(.text);
         asm/field_message_box.o(.text);
         asm/map_obj_lock.o(.text);
-        asm/text_window_graphics.o(.text);
+        src/text_window_graphics.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
@@ -428,6 +428,7 @@ SECTIONS {
         . = ALIGN(4);
         src/seagallop.o(.rodata);
         data/data_8468C98.o(.rodata);
+        src/text_window_graphics.o(.rodata);
         src/quest_log_8150454.o(.rodata);
         data/data_8471F00.o(.rodata);
         src/unk_815C980.o(.rodata);

src/text_window_graphics.c

@@ -0,0 +1,58 @@
+#include "global.h"
+#include "text_window_graphics.h"
+
+static const u16 gUnknown_8470D6C[] = INCBIN_U16("graphics/text_window/unk_8470D6C.4bpp");
+static const u16 gUnknown_8470E8C[] = INCBIN_U16("graphics/text_window/unk_8470E8C.4bpp");
+static const u16 gUnk_Empty_Space_8470FAC[16] = {0};
+static const u16 gUnknown_8470FCC[] = INCBIN_U16("graphics/text_window/unk_8470FCC.4bpp");
+static const u16 gUnknown_84710EC[] = INCBIN_U16("graphics/text_window/unk_84710EC.4bpp");
+static const u16 gUnknown_847120C[] = INCBIN_U16("graphics/text_window/unk_847120C.4bpp");
+static const u16 gUnknown_847132C[] = INCBIN_U16("graphics/text_window/unk_847132C.4bpp");
+static const u16 gUnknown_847144C[] = INCBIN_U16("graphics/text_window/unk_847144C.4bpp");
+static const u16 gUnknown_847156C[] = INCBIN_U16("graphics/text_window/unk_847156C.4bpp");
+static const u16 gUnk_Empty_Space_847168C[16] = {0};
+static const u16 gUnknown_84716AC[] = INCBIN_U16("graphics/text_window/unk_84716AC.4bpp");
+static const u16 gUnknown_84717CC[] = INCBIN_U16("graphics/text_window/unk_84717CC.4bpp");
+static const u16 gUnk_Empty_Space_84718EC[16] = {0};
+static const u16 gUnknown_847190C[] = INCBIN_U16("graphics/text_window/unk_8470D6C.gbapal");
+static const u16 gUnknown_847192C[] = INCBIN_U16("graphics/text_window/unk_8470E8C.gbapal");
+static const u16 gUnknown_847194C[] = INCBIN_U16("graphics/text_window/unk_8470FCC.gbapal");
+static const u16 gUnknown_847196C[] = INCBIN_U16("graphics/text_window/unk_84710EC.gbapal");
+static const u16 gUnknown_847198C[] = INCBIN_U16("graphics/text_window/unk_847120C.gbapal");
+static const u16 gUnknown_84719AC[] = INCBIN_U16("graphics/text_window/unk_847132C.gbapal");
+static const u16 gUnknown_84719CC[] = INCBIN_U16("graphics/text_window/unk_847144C.gbapal");
+static const u16 gUnknown_84719EC[] = INCBIN_U16("graphics/text_window/unk_847156C.gbapal");
+static const u16 gUnknown_8471A0C[] = INCBIN_U16("graphics/text_window/unk_84716AC.gbapal");
+static const u16 gUnknown_8471A2C[] = INCBIN_U16("graphics/text_window/unk_84717CC.gbapal");
+
+const u16 gUnknown_8471A4C[] = INCBIN_U16("graphics/text_window/unk_8471A4C.4bpp");
+const u16 gUnknown_8471B6C[] = INCBIN_U16("graphics/text_window/unk_8471B6C.4bpp");
+
+const u16 gUnknown_8471DEC[][16] = {
+    INCBIN_U16("graphics/text_window/stdpal_0.gbapal"),
+    INCBIN_U16("graphics/text_window/stdpal_1.gbapal"),
+    INCBIN_U16("graphics/text_window/stdpal_2.gbapal"),
+    INCBIN_U16("graphics/text_window/stdpal_3.gbapal"),
+    INCBIN_U16("graphics/text_window/stdpal_4.gbapal")
+};
+
+const struct TextWindowGraphics gUnknown_8471E8C[] = {
+    {gUnknown_8470D6C, gUnknown_847190C},
+    {gUnknown_8470E8C, gUnknown_847192C},
+    {gUnknown_8470FCC, gUnknown_847194C},
+    {gUnknown_84710EC, gUnknown_847196C},
+    {gUnknown_847120C, gUnknown_847198C},
+    {gUnknown_847132C, gUnknown_84719AC},
+    {gUnknown_847144C, gUnknown_84719CC},
+    {gUnknown_847156C, gUnknown_84719EC},
+    {gUnknown_84716AC, gUnknown_8471A0C},
+    {gUnknown_84717CC, gUnknown_8471A2C}
+}; // NELEMS = 10
+
+const struct TextWindowGraphics * sub_8069788(u8 idx)
+{
+    if (idx >= 20) // if (idx >= NELEMS(gUnknown_8471E8C))
+        return &gUnknown_8471E8C[0];
+    else
+        return &gUnknown_8471E8C[idx];
+}