summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_835B488.s13
-rw-r--r--data/data_845FD54.s76
-rw-r--r--data/oak_speech/unk_84629D0.pal19
-rw-r--r--data/oak_speech/unk_84629F0.pal19
-rw-r--r--data/oak_speech/unk_8462A10.pngbin0 -> 271 bytes
-rw-r--r--data/oak_speech/unk_8462B74.pngbin0 -> 350 bytes
-rw-r--r--data/oak_speech/unk_8462D34.pngbin0 -> 228 bytes
-rw-r--r--data/oak_speech/unk_8462E18.pngbin0 -> 119 bytes
8 files changed, 117 insertions, 10 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 71e98b2ba..c5b533348 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -738,13 +738,22 @@ sFanfares:: @ 83AC990
.incbin "baserom.gba", 0x3AC990, 0x40
gUnknown_83AC9D0:: @ 83AC9D0
- .incbin "baserom.gba", 0x3AC9D0, 0x28
+ .incbin "baserom.gba", 0x3AC9D0, 0x8
+
+gUnknown_83AC9D8::
+ .incbin "baserom.gba", 0x3AC9D8, 0x10
+
+gUnknown_83AC9E8::
+ .incbin "baserom.gba", 0x3AC9E8, 0x10
gUnknown_83AC9F8::
.incbin "baserom.gba", 0x3AC9F8, 0x8
gUnknown_83ACA00::
- .incbin "baserom.gba", 0x3ACA00, 0x208
+ .incbin "baserom.gba", 0x3ACA00, 0xF8
+
+gUnknown_83ACAF8::
+ .incbin "baserom.gba", 0x3ACAF8, 0x110
gUnknown_83ACC08:: @ 83ACC08
.incbin "baserom.gba", 0x3ACC08, 0x440
diff --git a/data/data_845FD54.s b/data/data_845FD54.s
index 67c69c261..41c9ac2d3 100644
--- a/data/data_845FD54.s
+++ b/data/data_845FD54.s
@@ -33,7 +33,25 @@ gUnknown_84623AC:: @ 84623AC
.incbin "baserom.gba", 0x4623AC, 0x40
gUnknown_84623EC:: @ 84623EC
- .incbin "baserom.gba", 0x4623EC, 0xA6C
+ .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
@@ -100,22 +118,64 @@ gUnknown_8462EF0:: @ 8462EF0
.4byte gUnknown_81C5BB9
gUnknown_8462EFC:: @ 8462EFC
- .incbin "baserom.gba", 0x462EFC, 0x18
+ obj_tiles gUnknown_8462B74, 0x0400, 0x1001
+ obj_tiles gUnknown_8462D34, 0x0200, 0x1002
+ obj_tiles gUnknown_8462E18, 0x0080, 0x1003
gUnknown_8462F14:: @ 8462F14
- .incbin "baserom.gba", 0x462F14, 0x8
+ obj_tiles gUnknown_8462A10, 0x0600, 0x1000
gUnknown_8462F1C:: @ 8462F1C
- .incbin "baserom.gba", 0x462F1C, 0x8
+ obj_pal gUnknown_84629F0, 0x1001
+
+gUnknown_8462F24:: @ 8462F14
+ obj_pal gUnknown_84629D0, 0x1000
+
+gUnknown_8462F2C::
+ .incbin "baserom.gba", 0x462F2C, 0x8
+
+gUnknown_8462F34::
+ .incbin "baserom.gba", 0x462F34, 0x8
-gUnknown_8462F24:: @ 8462F24
- .incbin "baserom.gba", 0x462F24, 0x2C
+gUnknown_8462F3C::
+ .incbin "baserom.gba", 0x462F3C, 0x8
+
+gUnknown_8462F44::
+ .4byte gUnknown_8462F2C
+
+gUnknown_8462F48::
+ .4byte gUnknown_8462F34
+
+gUnknown_8462F4C::
+ .4byte gUnknown_8462F3C
gUnknown_8462F50:: @ 8462F50
- .incbin "baserom.gba", 0x462F50, 0xDC
+ 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::
+ .incbin "baserom.gba", 0x462F98, 0xC
+
+gUnknown_8462FA4::
+ .incbin "baserom.gba", 0x462FA4, 0x40
+
+gUnknown_8462FE4::
+ .incbin "baserom.gba", 0x462FE4, 0x3C
+
+gUnknown_8463020::
+ .4byte gUnknown_8462F98
+
+gUnknown_8463024::
+ .4byte gUnknown_8462FA4
+
+gUnknown_8463028::
+ .4byte gUnknown_8462FE4
gUnknown_846302C:: @ 846302C
- .incbin "baserom.gba", 0x46302C, 0x48
+ 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
diff --git a/data/oak_speech/unk_84629D0.pal b/data/oak_speech/unk_84629D0.pal
new file mode 100644
index 000000000..4fb339128
--- /dev/null
+++ b/data/oak_speech/unk_84629D0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 189 164
+65 139 131
+82 148 139
+106 164 156
+131 180 172
+156 197 189
+180 213 205
+205 230 222
+230 246 238
+0 0 0
+255 0 255
+139 189 164
+156 205 172
+180 222 197
+205 238 222
+115 172 156
diff --git a/data/oak_speech/unk_84629F0.pal b/data/oak_speech/unk_84629F0.pal
new file mode 100644
index 000000000..4d2e92c74
--- /dev/null
+++ b/data/oak_speech/unk_84629F0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 180
+255 255 255
+255 246 106
+246 213 0
+238 172 0
+197 139 0
+131 82 0
+255 0 255
+255 0 255
+180 180 180
+255 74 74
+230 0 0
+180 0 0
+106 106 106
+16 16 16
+255 0 255
diff --git a/data/oak_speech/unk_8462A10.png b/data/oak_speech/unk_8462A10.png
new file mode 100644
index 000000000..324529e90
--- /dev/null
+++ b/data/oak_speech/unk_8462A10.png
Binary files differ
diff --git a/data/oak_speech/unk_8462B74.png b/data/oak_speech/unk_8462B74.png
new file mode 100644
index 000000000..674cef46d
--- /dev/null
+++ b/data/oak_speech/unk_8462B74.png
Binary files differ
diff --git a/data/oak_speech/unk_8462D34.png b/data/oak_speech/unk_8462D34.png
new file mode 100644
index 000000000..56715aadb
--- /dev/null
+++ b/data/oak_speech/unk_8462D34.png
Binary files differ
diff --git a/data/oak_speech/unk_8462E18.png b/data/oak_speech/unk_8462E18.png
new file mode 100644
index 000000000..f6796f724
--- /dev/null
+++ b/data/oak_speech/unk_8462E18.png
Binary files differ