through sub_8131338

5 files changed, 143 insertions, 49 deletions

diff --git a/data/data_845FD54.s b/data/data_845FD54.s
index b17d0fd12..42d8923b3 100644
--- a/data/data_845FD54.s
+++ b/data/data_845FD54.s
@@ -5,56 +5,10 @@
 
 	.align 2
 	// oak_speech
-gUnknown_8460D94:: @ 8460D94
-	.incbin "baserom.gba", 0x460D94, 0xA0
-
-gUnknown_8460E34:: @ 8460E34
-	.incbin "baserom.gba", 0x460E34, 0xA0
-
-gUnknown_8460ED4:: @ 8460ED4
-	.incbin "baserom.gba", 0x460ED4, 0x40
-
-gUnknown_8460F14:: @ 8460F14
-	.incbin "baserom.gba", 0x460F14, 0x6E8
-
-gUnknown_84615FC:: @ 84615FC
-	.incbin "baserom.gba", 0x4615FC, 0x40
-
-gUnknown_846163C:: @ 846163C
-	.incbin "baserom.gba", 0x46163C, 0x698
-
-gUnknown_8461CD4:: @ 8461CD4
-	.incbin "baserom.gba", 0x461CD4, 0x40
-
-gUnknown_8461D14:: @ 8461D14
-	.incbin "baserom.gba", 0x461D14, 0x698
-
-gUnknown_84623AC:: @ 84623AC
-	.incbin "baserom.gba", 0x4623AC, 0x40
-
-gUnknown_84623EC:: @ 84623EC
-	.incbin "baserom.gba", 0x4623EC, 0x5E4
-
-gUnknown_84629D0::
-	.incbin "data/oak_speech/unk_84629D0.gbapal"
-
-gUnknown_84629F0::
-	.incbin "data/oak_speech/unk_84629F0.gbapal"
-
-gUnknown_8462A10::
-	.incbin "data/oak_speech/unk_8462A10.4bpp.lz"
-
-gUnknown_8462B74::
-	.incbin "data/oak_speech/unk_8462B74.4bpp.lz"
-
-gUnknown_8462D34::
-	.incbin "data/oak_speech/unk_8462D34.4bpp.lz"
-
-gUnknown_8462E18::
-	.incbin "data/oak_speech/unk_8462E18.4bpp.lz"
-
 gUnknown_8462E58:: @ 8462E58
-	.incbin "baserom.gba", 0x462E58, 0xC
+	.4byte 0x000001f8
+	.4byte 0x000021e1
+	.4byte 0x00001bc2
 
 gUnknown_8462E64:: @ 8462E64
 	window_template 0x00, 0x00, 0x07, 0x1e, 0x04, 0x0f, 0x0001
diff --git a/data/oak_speech/unk_8460ED4.pal b/data/oak_speech/unk_8460ED4.pal
new file mode 100644
index 000000000..feb1214a1
--- /dev/null
+++ b/data/oak_speech/unk_8460ED4.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 238 205
+246 205 180
+213 164 148
+172 131 106
+106 74 65
+205 164 139
+164 123 98
+115 74 49
+74 41 16
+222 222 222
+180 180 180
+131 131 131
+82 82 90
+41 41 49
+255 255 255
+0 0 0
+131 189 213
+106 156 180
+82 131 156
+49 90 115
+32 65 90
+0 0 255
+255 255 189
+222 222 82
+172 172 57
+98 98 0
+213 131 123
+189 106 98
+164 82 74
+139 57 49
+98 24 16
diff --git a/data/oak_speech/unk_84615FC.pal b/data/oak_speech/unk_84615FC.pal
new file mode 100644
index 000000000..7eec09831
--- /dev/null
+++ b/data/oak_speech/unk_84615FC.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 131
+148 106 90
+106 74 65
+205 164 139
+164 123 98
+115 74 49
+82 65 32
+222 222 222
+180 180 180
+131 131 131
+82 82 90
+57 57 65
+255 255 255
+0 0 0
+131 189 213
+106 156 180
+82 131 156
+49 90 115
+32 65 90
+0 0 255
+238 238 74
+205 205 49
+164 164 32
+98 98 0
+213 131 123
+189 106 98
+164 82 74
+139 57 49
+98 24 16
diff --git a/data/oak_speech/unk_8461CD4.pal b/data/oak_speech/unk_8461CD4.pal
new file mode 100644
index 000000000..a0b648b2b
--- /dev/null
+++ b/data/oak_speech/unk_8461CD4.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 115
+106 74 65
+238 222 148
+205 189 115
+172 156 90
+139 123 65
+98 90 49
+255 0 255
+205 205 222
+123 131 156
+57 74 106
+255 255 255
+0 0 0
+0 0 255
+172 148 222
+131 115 172
+82 65 115
+230 222 180
+205 197 156
+180 172 139
+164 156 123
+123 115 90
+82 57 49
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/oak_speech/unk_84623AC.pal b/data/oak_speech/unk_84623AC.pal
new file mode 100644
index 000000000..8240527a6
--- /dev/null
+++ b/data/oak_speech/unk_84623AC.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+115 197 164
+255 230 205
+222 189 156
+197 148 115
+106 74 65
+238 189 74
+213 156 57
+189 123 41
+139 82 41
+164 123 106
+222 222 222
+197 197 197
+139 139 139
+98 98 98
+65 65 65
+255 255 255
+0 0 0
+180 148 180
+139 106 139
+106 74 106
+82 49 82
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+246 131 131
+205 82 82