Dump data/fldeff_flash

7 files changed, 99 insertions, 14 deletions

diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s
index 63067bb03..51e55de63 100644
--- a/asm/fldeff_flash.s
+++ b/asm/fldeff_flash.s
@@ -421,7 +421,7 @@ sub_80C9E4C: @ 80C9E4C
 	movs r1, 0xE0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, _080C9EDC @ =gUnknown_83F5854
+	ldr r0, _080C9EDC @ =gUnknown_83F5844 + 0x10
 	movs r1, 0xE0
 	movs r2, 0x10
 	bl LoadPalette
@@ -434,7 +434,7 @@ sub_80C9E4C: @ 80C9E4C
 	movs r0, 0x54
 	movs r1, 0
 	bl SetGpuReg
-	ldr r1, _080C9EE4 @ =0x00001f0c
+	ldr r1, _080C9EE4 @ =0x00001f0c =BGCNT_PRIORITY(0) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(31)
 	movs r0, 0x8
 	bl SetGpuReg
 	movs r1, 0x8A
@@ -461,7 +461,7 @@ _080C9ECC: .4byte 0x0600c000
 _080C9ED0: .4byte gUnknown_83F5864
 _080C9ED4: .4byte 0x0600f800
 _080C9ED8: .4byte gUnknown_83F5804
-_080C9EDC: .4byte gUnknown_83F5854
+_080C9EDC: .4byte gUnknown_83F5844 + 0x10
 _080C9EE0: .4byte 0x00003e41
 _080C9EE4: .4byte 0x00001f0c
 _080C9EE8: .4byte gTasks
@@ -527,7 +527,7 @@ sub_80C9F38: @ 80C9F38
 	adds r0, r1, 0x1
 	strh r0, [r4, 0xC]
 	lsls r1, 1
-	ldr r0, _080C9F7C @ =gUnknown_83F5854
+	ldr r0, _080C9F7C @ =gUnknown_83F5844 + 0x10
 	adds r0, r1, r0
 	movs r2, 0x10
 	subs r2, r1
@@ -539,7 +539,7 @@ sub_80C9F38: @ 80C9F38
 	.align 2, 0
 _080C9F74: .4byte 0x00001010
 _080C9F78: .4byte gTasks
-_080C9F7C: .4byte gUnknown_83F5854
+_080C9F7C: .4byte gUnknown_83F5844 + 0x10
 _080C9F80:
 	ldr r0, _080C9F98 @ =gUnknown_83F5804
 	movs r1, 0
diff --git a/baserom.ips b/baserom.ips
index ba29beb15..5a7798ff2 100644
--- a/baserom.ips
+++ b/baserom.ips
diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s
index 113cf42d1..ddffff5c1 100644
--- a/data/fldeff_flash.s
+++ b/data/fldeff_flash.s
@@ -6,22 +6,69 @@
 	.align 2
 
 gUnknown_83F5738:: @ 83F5738
-	.incbin "baserom.gba", 0x3F5738, 0xCC
+	.byte 1, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 2, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 3, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 5, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 6, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 7, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 8, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 9, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 4, 1, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 2, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 3, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 5, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 6, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 7, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 8, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 9, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 0, 0, 0, 0
+	.4byte NULL
+	.4byte NULL
 
 gUnknown_83F5804:: @ 83F5804
-	.incbin "baserom.gba", 0x3F5804, 0x20
+	.incbin "graphics/field_effects/flash_white.gbapal"
 
 gUnknown_83F5824:: @ 83F5824
-	.incbin "baserom.gba", 0x3F5824, 0x20
+	.incbin "graphics/field_effects/flash_black.gbapal"
 
 gUnknown_83F5844:: @ 83F5844
-	.incbin "baserom.gba", 0x3F5844, 0x10
-
-gUnknown_83F5854:: @ 83F5854
-	.incbin "baserom.gba", 0x3F5854, 0x10
+	.incbin "graphics/field_effects/flash_gradient.gbapal"
 
 gUnknown_83F5864:: @ 83F5864
-	.incbin "baserom.gba", 0x3F5864, 0x1E0
+	.incbin "graphics/field_effects/flash_effect_map.bin.lz"
 
 gUnknown_83F5A44:: @ 83F5A44
-	.incbin "baserom.gba", 0x3F5A44, 0xB4
+	.incbin "graphics/field_effects/flash_effect_tiles.4bpp.lz"
diff --git a/graphics/field_effects/flash_black.pal b/graphics/field_effects/flash_black.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/graphics/field_effects/flash_black.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/field_effects/flash_effect_map.bin b/graphics/field_effects/flash_effect_map.bin
new file mode 100644
index 000000000..4293bfd1c
--- /dev/null
+++ b/graphics/field_effects/flash_effect_map.bin
diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png
new file mode 100644
index 000000000..4079a5a84
--- /dev/null
+++ b/graphics/field_effects/flash_effect_tiles.png
diff --git a/graphics/field_effects/flash_white.pal b/graphics/field_effects/flash_white.pal
new file mode 100644
index 000000000..98a1fb3c8
--- /dev/null
+++ b/graphics/field_effects/flash_white.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255