Remaining oak_speech data

3 files changed, 381 insertions, 197 deletions

diff --git a/data/data_845FD54.s b/data/data_845FD54.s
index d26c0c7ab..52b6dcb1f 100644
--- a/data/data_845FD54.s
+++ b/data/data_845FD54.s
@@ -4,180 +4,7 @@
 	.section .rodata
 
 	.align 2
-	// oak_speech
-gUnknown_8462E58:: @ 8462E58
-	.4byte 0x000001f8
-	.4byte 0x000021e1
-	.4byte 0x00001bc2
-
-gUnknown_8462E64:: @ 8462E64
-	window_template 0x00, 0x00, 0x07, 0x1e, 0x04, 0x0f, 0x0001
-
-gUnknown_8462E6C:: @ 8462E6C
-	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
-
-gUnknown_8462E74:: @ 8462E74
-	window_template 0x00, 0x06, 0x03, 0x18, 0x06, 0x0f, 0x0001
-
-gUnknown_8462E7C:: @ 8462E7C
-	window_template 0x00, 0x06, 0x0a, 0x18, 0x04, 0x0f, 0x0092
-
-gUnknown_8462E84:: @ 8462E84
-	window_template 0x00, 0x06, 0x0f, 0x18, 0x04, 0x0f, 0x00f3
-
-gUnknown_8462E8C:: @ 8462E8C
-	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
-
-gUnknown_8462E94:: @ 8462E94
-	window_template 0x00, 0x06, 0x03, 0x18, 0x04, 0x0f, 0x0001
-
-gUnknown_8462E9C:: @ 8462E9C
-	window_template 0x00, 0x06, 0x08, 0x18, 0x04, 0x0f, 0x0062
-
-gUnknown_8462EA4:: @ 8462EA4
-	window_template 0x00, 0x06, 0x0d, 0x18, 0x06, 0x0f, 0x00c3
-
-gUnknown_8462EAC:: @ 8462EAC
-	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
-
-gUnknown_8462EB4:: @ 8462EB4
-	.4byte gUnknown_8462E64
-	.4byte gUnknown_8462E74
-	.4byte gUnknown_8462E94
-
-gUnknown_8462EC0:: @ 8462EC0
-	window_template 0x00, 0x01, 0x04, 0x1c, 0x0f, 0x0f, 0x0001
-
-gUnknown_8462EC8:: @ 8462EC8
-	window_template 0x00, 0x12, 0x09, 0x09, 0x04, 0x0f, 0x0174
-
-gUnknown_8462ED0:: @ 8462ED0
-	window_template 0x00, 0x02, 0x02, 0x06, 0x04, 0x0f, 0x0180
-
-gUnknown_8462ED8:: @ 8462ED8
-	window_template 0x00, 0x02, 0x02, 0x0c, 0x0a, 0x0f, 0x0001
-	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
-
-	.align 2
-gUnknown_8462EE8:: @ 8462EE8
-	.byte 0x00, 0x01, 0x02
-
-	.align 2
-gUnknown_8462EEC:: @ 8462EEC
-	.byte 0x00, 0x02, 0x03
-
-	.align 2
-gUnknown_8462EF0:: @ 8462EF0
-	.4byte gUnknown_81C5A04
-	.4byte gUnknown_81C5AEB
-	.4byte gUnknown_81C5BB9
-
-gUnknown_8462EFC:: @ 8462EFC
-	obj_tiles gUnknown_8462B74, 0x0400, 0x1001
-	obj_tiles gUnknown_8462D34, 0x0200, 0x1002
-	obj_tiles gUnknown_8462E18, 0x0080, 0x1003
-
-gUnknown_8462F14:: @ 8462F14
-	obj_tiles gUnknown_8462A10, 0x0600, 0x1000
-
-gUnknown_8462F1C:: @ 8462F1C
-	obj_pal gUnknown_84629F0, 0x1001
-
-gUnknown_8462F24:: @ 8462F14
-	obj_pal gUnknown_84629D0, 0x1000
-
-gUnknown_8462F2C::
-	obj_image_anim_frame  0, 0
-	obj_image_anim_end
-
-gUnknown_8462F34::
-	obj_image_anim_frame 16, 0
-	obj_image_anim_end
-
-gUnknown_8462F3C::
-	obj_image_anim_frame 32, 0
-	obj_image_anim_end
-
-gUnknown_8462F44::
-	.4byte gUnknown_8462F2C
-
-gUnknown_8462F48::
-	.4byte gUnknown_8462F34
-
-gUnknown_8462F4C::
-	.4byte gUnknown_8462F3C
-
-gUnknown_8462F50:: @ 8462F50
-	spr_template 0x1000, 0x1000, gUnknown_83ACAF8, gUnknown_8462F44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x1000, 0x1000, gUnknown_83ACAF8, gUnknown_8462F48, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x1000, 0x1000, gUnknown_83ACAF8, gUnknown_8462F4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_8462F98::
-	obj_image_anim_frame 0x00, 30
-	obj_image_anim_frame 0x10, 30
-	obj_image_anim_jump 0
-
-gUnknown_8462FA4::
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 8, 12
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 8, 12
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 8, 12
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 8, 12
-	obj_image_anim_jump 0
-
-gUnknown_8462FE4::
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 2,  8
-	obj_image_anim_frame 0,  8
-	obj_image_anim_frame 2,  8
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 0, 60
-	obj_image_anim_frame 2,  8
-	obj_image_anim_frame 0,  8
-	obj_image_anim_frame 2,  8
-	obj_image_anim_jump 0
-
-gUnknown_8463020::
-	.4byte gUnknown_8462F98
-
-gUnknown_8463024::
-	.4byte gUnknown_8462FA4
-
-gUnknown_8463028::
-	.4byte gUnknown_8462FE4
-
-gUnknown_846302C:: @ 846302C
-	spr_template 0x1001, 0x1001, gUnknown_83AC9D8, gUnknown_8463020, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x1002, 0x1001, gUnknown_83AC9F8, gUnknown_8463024, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x1003, 0x1001, gUnknown_83AC9E8, gUnknown_8463028, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_8463074:: @ 8463074
-	.incbin "baserom.gba", 0x463074, 0x18
-
-gUnknown_846308C:: @ 846308C
-	.incbin "baserom.gba", 0x46308C, 0x4C
-
-gUnknown_84630D8:: @ 84630D8
-	.incbin "baserom.gba", 0x4630D8, 0x4C
-
-gUnknown_8463124:: @ 8463124
-	.incbin "baserom.gba", 0x463124, 0x10
-
+	@ tm_case
 gUnknown_8463134:: @ 8463134
 	.incbin "baserom.gba", 0x463134, 0xC
 
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 101148d60..d925f4b52 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -706,8 +706,59 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 
 extern const u8 gUnknown_81C574F[];
+extern const u8 gUnknown_81C5758[];
+extern const u8 gUnknown_81C575E[];
+extern const u8 gUnknown_81C575E[];
+extern const u8 gUnknown_81C5767[];
+extern const u8 gUnknown_81C5767[];
+extern const u8 gUnknown_81C576C[];
+extern const u8 gUnknown_81C5771[];
+extern const u8 gUnknown_81C5775[];
+extern const u8 gUnknown_81C577A[];
+extern const u8 gUnknown_81C577E[];
+extern const u8 gUnknown_81C5783[];
+extern const u8 gUnknown_81C5788[];
+extern const u8 gUnknown_81C578C[];
+extern const u8 gUnknown_81C5792[];
+extern const u8 gUnknown_81C5797[];
+extern const u8 gUnknown_81C579D[];
+extern const u8 gUnknown_81C57A2[];
+extern const u8 gUnknown_81C57A9[];
+extern const u8 gUnknown_81C57AF[];
+extern const u8 gUnknown_81C57B4[];
+extern const u8 gUnknown_81C57B8[];
+extern const u8 gUnknown_81C57BC[];
+extern const u8 gUnknown_81C57C2[];
+extern const u8 gUnknown_81C57C6[];
+extern const u8 gUnknown_81C57CB[];
+extern const u8 gUnknown_81C57D0[];
+extern const u8 gUnknown_81C57D4[];
+extern const u8 gUnknown_81C57D9[];
+extern const u8 gUnknown_81C57E0[];
+extern const u8 gUnknown_81C57E8[];
+extern const u8 gUnknown_81C57EE[];
+extern const u8 gUnknown_81C57F4[];
+extern const u8 gUnknown_81C57FA[];
+extern const u8 gUnknown_81C57FF[];
+extern const u8 gUnknown_81C5806[];
+extern const u8 gUnknown_81C580A[];
+extern const u8 gUnknown_81C580F[];
+extern const u8 gUnknown_81C5814[];
+extern const u8 gUnknown_81C5819[];
+extern const u8 gUnknown_81C581F[];
+extern const u8 gUnknown_81C5823[];
+extern const u8 gUnknown_81C5828[];
 extern const u8 gUnknown_81C582D[];
+extern const u8 gUnknown_81C5875[];
+extern const u8 gUnknown_81C58BA[];
+extern const u8 gUnknown_81C58F9[];
+extern const u8 gUnknown_81C592B[];
+extern const u8 gUnknown_81C594F[];
+extern const u8 gUnknown_81C5981[];
 extern const u8 gUnknown_81C59D5[];
+extern const u8 gUnknown_81C5A04[];
+extern const u8 gUnknown_81C5AEB[];
+extern const u8 gUnknown_81C5BB9[];
 extern const u8 gUnknown_81C5C78[];
 extern const u8 gUnknown_81C5D06[];
 extern const u8 gUnknown_81C5D12[];
diff --git a/src/oak_speech.c b/src/oak_speech.c
index 63e3ae87d..f400c6dbb 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -551,25 +551,331 @@ const u32 gUnknown_8462B74[] = INCBIN_U32("data/oak_speech/unk_8462B74.4bpp.lz")
 const u32 gUnknown_8462D34[] = INCBIN_U32("data/oak_speech/unk_8462D34.4bpp.lz");
 const u32 gUnknown_8462E18[] = INCBIN_U32("data/oak_speech/unk_8462E18.4bpp.lz");
 
-extern const struct BgTemplate gUnknown_8462E58[3];
-extern const struct WindowTemplate *const gUnknown_8462EB4[3];
-extern const struct WindowTemplate gUnknown_8462EC0;
-extern const struct WindowTemplate gUnknown_8462EC8;
-extern const struct WindowTemplate gUnknown_8462ED0;
-extern const struct WindowTemplate gUnknown_8462ED8;
-extern const struct TextColor gUnknown_8462EE8;
-extern const struct TextColor gUnknown_8462EEC;
-extern const u8 *const gUnknown_8462EF0[];
-extern const struct CompressedSpriteSheet gUnknown_8462EFC[3];
-extern const struct CompressedSpriteSheet gUnknown_8462F14;
-extern const struct SpritePalette gUnknown_8462F1C;
-extern const struct SpritePalette gUnknown_8462F24;
-extern const struct SpriteTemplate gUnknown_8462F50[3];
-extern const struct SpriteTemplate gUnknown_846302C[3];
-extern const u8 *const gUnknown_8463074[];
-extern const u8 *const gUnknown_846308C[];
-extern const u8 *const gUnknown_84630D8[];
-extern const u8 *const gUnknown_8463124[];
+const struct BgTemplate gUnknown_8462E58[3] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0x000
+    }, {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0x000
+    }, {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 28,
+        .screenSize = 1,
+        .paletteMode = 1,
+        .priority = 1,
+        .baseTile = 0x000
+    }
+};
+
+const struct WindowTemplate gUnknown_8462E64[] = {
+    {
+        .priority = 0x00,
+        .tilemapLeft = 0x00,
+        .tilemapTop = 0x07,
+        .width = 0x1e,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gUnknown_8462E74[] = {
+    {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x03,
+        .width = 0x18,
+        .height = 0x06,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x0a,
+        .width = 0x18,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0092
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x0f,
+        .width = 0x18,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x00f3
+    }, DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gUnknown_8462E94[] = {
+    {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x03,
+        .width = 0x18,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x08,
+        .width = 0x18,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0062
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x06,
+        .tilemapTop = 0x0d,
+        .width = 0x18,
+        .height = 0x06,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x00c3
+    }, DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate *const gUnknown_8462EB4[3] = {
+    gUnknown_8462E64,
+    gUnknown_8462E74,
+    gUnknown_8462E94
+};
+
+const struct WindowTemplate gUnknown_8462EC0[] = {
+    {
+        .priority = 0x00,
+        .tilemapLeft = 0x01,
+        .tilemapTop = 0x04,
+        .width = 0x1c,
+        .height = 0x0f,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x12,
+        .tilemapTop = 0x09,
+        .width = 0x09,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0174
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x02,
+        .tilemapTop = 0x02,
+        .width = 0x06,
+        .height = 0x04,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0180
+    }, {
+        .priority = 0x00,
+        .tilemapLeft = 0x02,
+        .tilemapTop = 0x02,
+        .width = 0x0c,
+        .height = 0x0a,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, DUMMY_WIN_TEMPLATE
+};
+
+ALIGNED(4) const struct TextColor gUnknown_8462EE8 = {
+    0x00, 0x01, 0x02
+};
+
+ALIGNED(4) const struct TextColor gUnknown_8462EEC = {
+    0x00, 0x02, 0x03
+};
+
+const u8 *const gUnknown_8462EF0[] = {
+    gUnknown_81C5A04,
+    gUnknown_81C5AEB,
+    gUnknown_81C5BB9
+};
+
+const struct CompressedSpriteSheet gUnknown_8462EFC[3] = {
+    { (const void *)gUnknown_8462B74, 0x0400, 0x1001 },
+    { (const void *)gUnknown_8462D34, 0x0200, 0x1002 },
+    { (const void *)gUnknown_8462E18, 0x0080, 0x1003 },
+};
+
+const struct CompressedSpriteSheet gUnknown_8462F14 = {
+    (const void *)gUnknown_8462A10, 0x0600, 0x1000
+};
+
+const struct SpritePalette gUnknown_8462F1C = {
+    (const void *)gUnknown_84629F0, 0x1001
+};
+const struct SpritePalette gUnknown_8462F24 = {
+    (const void *)gUnknown_84629D0, 0x1000
+};
+
+const union AnimCmd gUnknown_8462F2C[] = {
+    ANIMCMD_FRAME( 0, 0),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_8462F34[] = {
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_8462F3C[] = {
+    ANIMCMD_FRAME(32, 0),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_8462F44[] = {
+    gUnknown_8462F2C
+};
+const union AnimCmd *const gUnknown_8462F48[] = {
+    gUnknown_8462F34
+};
+const union AnimCmd *const gUnknown_8462F4C[] = {
+    gUnknown_8462F3C
+};
+
+extern const struct OamData gUnknown_83ACAF8;
+
+const struct SpriteTemplate gUnknown_8462F50[3] = {
+    { 0x1000, 0x1000, &gUnknown_83ACAF8, gUnknown_8462F44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
+    { 0x1000, 0x1000, &gUnknown_83ACAF8, gUnknown_8462F48, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
+    { 0x1000, 0x1000, &gUnknown_83ACAF8, gUnknown_8462F4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
+};
+
+const union AnimCmd gUnknown_8462F98[] = {
+    ANIMCMD_FRAME( 0, 30),
+    ANIMCMD_FRAME(16, 30),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gUnknown_8462FA4[] = {
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gUnknown_8462FE4[] = {
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(2,  8),
+    ANIMCMD_FRAME(0,  8),
+    ANIMCMD_FRAME(2,  8),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_FRAME(2,  8),
+    ANIMCMD_FRAME(0,  8),
+    ANIMCMD_FRAME(2,  8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd *const gUnknown_8463020[] = {
+    gUnknown_8462F98
+};
+const union AnimCmd *const gUnknown_8463024[] = {
+    gUnknown_8462FA4
+};
+const union AnimCmd *const gUnknown_8463028[] = {
+    gUnknown_8462FE4
+};
+
+extern const struct OamData gUnknown_83AC9D8;
+extern const struct OamData gUnknown_83AC9F8;
+extern const struct OamData gUnknown_83AC9E8;
+
+const struct SpriteTemplate gUnknown_846302C[3] = {
+    { 0x1001, 0x1001, &gUnknown_83AC9D8, gUnknown_8463020, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
+    { 0x1002, 0x1001, &gUnknown_83AC9F8, gUnknown_8463024, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
+    { 0x1003, 0x1001, &gUnknown_83AC9E8, gUnknown_8463028, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }
+};
+
+const u8 *const gUnknown_8463074[] = {
+    gUnknown_81C5875,
+    gUnknown_81C58BA,
+    gUnknown_81C58F9,
+    gUnknown_81C592B,
+    gUnknown_81C594F,
+    gUnknown_81C5981
+};
+
+const u8 *const gUnknown_846308C[] = {
+    gUnknown_81C575E,
+    gUnknown_81C5767,
+    gUnknown_81C577A,
+    gUnknown_81C577E,
+    gUnknown_81C5783,
+    gUnknown_81C5788,
+    gUnknown_81C578C,
+    gUnknown_81C5792,
+    gUnknown_81C5797,
+    gUnknown_81C579D,
+    gUnknown_81C57A2,
+    gUnknown_81C57A9,
+    gUnknown_81C57AF,
+    gUnknown_81C57B4,
+    gUnknown_81C57B8,
+    gUnknown_81C57BC,
+    gUnknown_81C57C2,
+    gUnknown_81C57C6,
+    gUnknown_81C57CB
+};
+
+const u8 *const gUnknown_84630D8[] = {
+    gUnknown_81C575E,
+    gUnknown_81C5767,
+    gUnknown_81C57D0,
+    gUnknown_81C57D4,
+    gUnknown_81C57D9,
+    gUnknown_81C57E0,
+    gUnknown_81C57E8,
+    gUnknown_81C57EE,
+    gUnknown_81C57F4,
+    gUnknown_81C57FA,
+    gUnknown_81C57FF,
+    gUnknown_81C5806,
+    gUnknown_81C580A,
+    gUnknown_81C580F,
+    gUnknown_81C5814,
+    gUnknown_81C5819,
+    gUnknown_81C581F,
+    gUnknown_81C5823,
+    gUnknown_81C5828
+};
+
+const u8 *const gUnknown_8463124[] = {
+    gUnknown_81C5758,
+    gUnknown_81C576C,
+    gUnknown_81C5771,
+    gUnknown_81C5775
+};
+
 
 void sub_812E944(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5)
 {
@@ -919,7 +1225,7 @@ void sub_812F33C(u8 taskId)
         CopyBgTilemapBufferToVram(1);
         Free(sOakSpeechResources->unk_0008);
         sOakSpeechResources->unk_0008 = NULL;
-        data[14] = AddWindow(&gUnknown_8462EC0);
+        data[14] = AddWindow(&gUnknown_8462EC0[0]);
         PutWindowTilemap(data[14]);
         FillWindowPixelBuffer(data[14], 0x00);
         CopyWindowToVram(data[14], 3);
@@ -1248,7 +1554,7 @@ void sub_812FE88(u8 taskId)
 {
     if (!IsTextPrinterActive(0))
     {
-        gTasks[taskId].data[13] = AddWindow(&gUnknown_8462EC8);
+        gTasks[taskId].data[13] = AddWindow(&gUnknown_8462EC0[1]);
         PutWindowTilemap(gTasks[taskId].data[13]);
         SetWindowBorderStyle(gTasks[taskId].data[13], 1, sub_80F796C(), 14);
         FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11);
@@ -1442,7 +1748,7 @@ void sub_8130464(u8 taskId)
                 data[3]--;
             else
             {
-                sub_810FF60(&gUnknown_8462ED0, 2, 0, 2, sub_80F796C(), 14, 0);
+                sub_810FF60(&gUnknown_8462EC0[2], 2, 0, 2, sub_80F796C(), 14, 0);
                 gTasks[taskId].func = sub_8130554;
             }
         }
@@ -2044,7 +2350,7 @@ void sub_8131660(u8 taskId, u8 state)
     const u8 *const * textPtrs;
     u8 i;
 
-    data[13] = AddWindow(&gUnknown_8462ED8);
+    data[13] = AddWindow(&gUnknown_8462EC0[3]);
     PutWindowTilemap(data[13]);
     SetWindowBorderStyle(data[13], 1, sub_80F796C(), 14);
     FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11);