From d1efbcd282aa68634b275af25ca1bf187e85cb9e Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 25 Sep 2017 16:26:45 -0500 Subject: Extract scattered baseroms and cleanup --- data/clear_save_data_screen.s | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'data/clear_save_data_screen.s') diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index a566152be..8e30a6303 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -3,11 +3,15 @@ .section .rodata + .align 2 gUnknown_085F06C0:: @ 85F06C0 - .incbin "baserom.gba", 0x5f06c0, 0x8 + .4byte 0x000001f0, 0x000011e3 + .align 2 gUnknown_085F06C8:: @ 85F06C8 - .incbin "baserom.gba", 0x5f06c8, 0x10 + window_template 0x00, 0x03, 0x0f, 0x1a, 0x04, 0x0f, 0x000b + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_085F06D8:: @ 85F06D8 - .incbin "baserom.gba", 0x5f06d8, 0x8 + window_template 0x00, 0x03, 0x02, 0x05, 0x04, 0x0f, 0x0073 -- cgit v1.2.3 From 6f230848f62d1229ec46407b0a7411f1d41c6014 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 25 Sep 2017 20:24:14 -0500 Subject: Add window_template_terminator macro --- data/clear_save_data_screen.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/clear_save_data_screen.s') diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 8e30a6303..3abf9bf6d 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -10,7 +10,7 @@ gUnknown_085F06C0:: @ 85F06C0 .align 2 gUnknown_085F06C8:: @ 85F06C8 window_template 0x00, 0x03, 0x0f, 0x1a, 0x04, 0x0f, 0x000b - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_085F06D8:: @ 85F06D8 -- cgit v1.2.3