decomp event E3

MokhaLeee · Jul 23, 2024 · 7929abf · 7929abf
1 parent 4b8a638
commit 7929abf
Show file tree

Hide file tree

Showing 11 changed files with 498 additions and 586 deletions.
diff --git a/FireEmblem7J.lds b/FireEmblem7J.lds
@@ -156,6 +156,7 @@ SECTIONS
 		. = ALIGN(4); src/random.o(.bss);
 		. = ALIGN(4); src/hardware.o(.bss);
 		. = ALIGN(4); src/oam.o(.bss);
+		. = 0x000040; sTalkStObj = .;
 		. = 0x000110;
 		. = ALIGN(4); src/sprite-anim.o(.bss);
 		. = 0x002778; gArenaLevelBackup = .;
@@ -210,6 +211,9 @@ SECTIONS
 		asm/eventscr_snowstorm.o(.text);
 		src/eventscr_thunderfx.o(.text);
 		asm/eventscr_08011AFC.o(.text);
+		src/eventscr_screenflashfx.o(.text);
+		asm/eventscr_screenflashfx.o(.text);
+		asm/eventscr_080120D8.o(.text);
 		src/eventscr_spriteanim.o(.text);
 		asm/eventscr_08012378.o(.text);
 		src/sprite-anim.o(.text);
@@ -357,6 +361,9 @@ SECTIONS
 		. = ALIGN(4); data/data_08C012BC.o(.data)
 		. = ALIGN(4); src/eventscr_thunderfx.o(.data)
 		. = ALIGN(4); data/data_08C013F0.o(.data)
+		. = ALIGN(4); src/eventscr_screenflashfx.o(.data)
+		. = ALIGN(4); asm/eventscr_screenflashfx.o(.data)
+		. = ALIGN(4); asm/eventscr_080120D8.o(.data)
 		. = ALIGN(4); src/eventscr_spriteanim.o(.data)
 		. = ALIGN(4); src/sprite-anim.o(.data)
 		. = ALIGN(4); data/gamecontrol.o(.data)

diff --git a/asm/eventcall.s b/asm/eventcall.s
@@ -6345,7 +6345,7 @@ sub_807B498: @ 0x0807B498
 	movs r1, #2
 	movs r2, #0x20
 	movs r3, #4
-	bl sub_8012030
+	bl StartScreenFlashing
 	add sp, #0x10
 	pop {r0}
 	bx r0
@@ -6368,7 +6368,7 @@ sub_807B4C0: @ 0x0807B4C0
 	movs r1, #2
 	movs r2, #0x20
 	movs r3, #4
-	bl sub_8012030
+	bl StartScreenFlashing
 	add sp, #0x10
 	pop {r0}
 	bx r0