Finish decomp and dism of mevent_8145654

14 files changed, 59 insertions, 50 deletions

diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s
index 276658b7a..9436bc4fd 100644
--- a/data/data_8466FB8.s
+++ b/data/data_8466FB8.s
@@ -4,57 +4,9 @@
 	.section .rodata
 
 	.align 2
-gUnknown_8468060::
-	.incbin "baserom.gba", 0x468060, 0x20
-
-gUnknown_8468080::
-	.incbin "baserom.gba", 0x468080, 0x20
-
-gUnknown_84680A0::
-	.incbin "baserom.gba", 0x4680A0, 0x20
-
-gUnknown_84680C0::
-	.incbin "baserom.gba", 0x4680C0, 0x80
-
-gUnknown_8468140::
-	.incbin "baserom.gba", 0x468140, 0xdc
-
-gUnknown_846821C::
-	.incbin "baserom.gba", 0x46821C, 0x30
-
-gUnknown_846824C::
-	.incbin "baserom.gba", 0x46824C, 0xc0
-
-gUnknown_846830C::
-	.incbin "baserom.gba", 0x46830C, 0x70
-
-gUnknown_846837C::
-	.incbin "baserom.gba", 0x46837C, 0xcc
-
-gUnknown_8468448::
-	.incbin "baserom.gba", 0x468448, 0x90
-
-gUnknown_84684D8::
-	.incbin "baserom.gba", 0x4684D8, 0xdc
-
-gUnknown_84685B4::
-	.incbin "baserom.gba", 0x4685B4, 0x90
-
-gUnknown_8468644::
-	.incbin "baserom.gba", 0x468644, 0xdc
-
-gUnknown_8468720:: @ 8468720
-	.4byte 1, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060
-	.4byte 1, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC
-	.4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC
-	.4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC
-	.4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C
-	.4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C
-	.4byte 1, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080
-	.4byte 1, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0
-
 gUnknown_84687A0::
-	.incbin "baserom.gba", 0x4687a0, 0x40
+	.string "You have collected all STAMPs!\n"
+	.string "Want to input a CARD as a prize?$"
 
     .include "data/mevent/script_ish.inc"
     .include "data/mevent/script_common.inc"
diff --git a/data/graphics/mevent/gfx_4680C0.png b/data/graphics/mevent/gfx_4680C0.png
new file mode 100644
index 000000000..1a27f3213
--- /dev/null
+++ b/data/graphics/mevent/gfx_4680C0.png
diff --git a/data/graphics/mevent/gfx_46821C.png b/data/graphics/mevent/gfx_46821C.png
new file mode 100644
index 000000000..aab27d16c
--- /dev/null
+++ b/data/graphics/mevent/gfx_46821C.png
diff --git a/data/graphics/mevent/gfx_46830C.png b/data/graphics/mevent/gfx_46830C.png
new file mode 100644
index 000000000..3c2b8e6d1
--- /dev/null
+++ b/data/graphics/mevent/gfx_46830C.png
diff --git a/data/graphics/mevent/gfx_468448.png b/data/graphics/mevent/gfx_468448.png
new file mode 100644
index 000000000..137dbe9f3
--- /dev/null
+++ b/data/graphics/mevent/gfx_468448.png
diff --git a/data/graphics/mevent/gfx_4685B4.png b/data/graphics/mevent/gfx_4685B4.png
new file mode 100644
index 000000000..137dbe9f3
--- /dev/null
+++ b/data/graphics/mevent/gfx_4685B4.png
diff --git a/data/graphics/mevent/pal_468060.pal b/data/graphics/mevent/pal_468060.pal
new file mode 100644
index 000000000..970736bbb
--- /dev/null
+++ b/data/graphics/mevent/pal_468060.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+90 197 148
+213 213 213
+74 74 74
+98 106 106
+213 189 74
+238 213 82
+246 246 213
+255 255 255
+230 230 213
+238 238 213
+246 246 238
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/data/graphics/mevent/pal_468080.pal b/data/graphics/mevent/pal_468080.pal
new file mode 100644
index 000000000..01832b5e2
--- /dev/null
+++ b/data/graphics/mevent/pal_468080.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 123 148
+213 213 213
+74 74 74
+115 123 123
+164 156 90
+164 148 90
+197 197 90
+213 205 90
+222 213 90
+213 213 106
+238 246 98
+230 222 98
+213 205 98
+197 180 98
+238 230 98
+246 238 106
diff --git a/data/graphics/mevent/pal_4680A0.pal b/data/graphics/mevent/pal_4680A0.pal
new file mode 100644
index 000000000..28a498b57
--- /dev/null
+++ b/data/graphics/mevent/pal_4680A0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 123 148
+213 213 213
+74 74 74
+115 123 123
+156 156 156
+139 139 148
+180 180 197
+197 189 205
+205 205 222
+189 189 189
+197 230 222
+189 213 213
+180 197 197
+156 164 172
+222 222 230
+230 230 238
diff --git a/data/graphics/mevent/tilemap_468140.bin b/data/graphics/mevent/tilemap_468140.bin
new file mode 100644
index 000000000..f8185b28e
--- /dev/null
+++ b/data/graphics/mevent/tilemap_468140.bin
diff --git a/data/graphics/mevent/tilemap_46824C.bin b/data/graphics/mevent/tilemap_46824C.bin
new file mode 100644
index 000000000..72c7ea278
--- /dev/null
+++ b/data/graphics/mevent/tilemap_46824C.bin
diff --git a/data/graphics/mevent/tilemap_46837C.bin b/data/graphics/mevent/tilemap_46837C.bin
new file mode 100644
index 000000000..c7b2e3e21
--- /dev/null
+++ b/data/graphics/mevent/tilemap_46837C.bin
diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/data/graphics/mevent/tilemap_4684D8.bin
new file mode 100644
index 000000000..f8185b28e
--- /dev/null
+++ b/data/graphics/mevent/tilemap_4684D8.bin
diff --git a/data/graphics/mevent/tilemap_468644.bin b/data/graphics/mevent/tilemap_468644.bin
new file mode 100644
index 000000000..f8185b28e
--- /dev/null
+++ b/data/graphics/mevent/tilemap_468644.bin