diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-12 15:20:54 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-12 15:20:54 -0500 |
| commit | 5cc2701e4721bd885da7d9f01943d396775e51d9 (patch) | |
| tree | ed90e0b8d70f0313a4096f3572b09fa7b2986b47 | |
| parent | 9c27830791ba648ce0c470eac53a100e508247b9 (diff) | |
Knock out a few more incbins
| -rw-r--r-- | baserom.ips | bin | 363962 -> 363841 bytes | |||
| -rw-r--r-- | data/clear_save_data_screen.s | 20 | ||||
| -rw-r--r-- | data/evolution_graphics.s | 3 | ||||
| -rw-r--r-- | data/field_tasks.s | 19 | ||||
| -rw-r--r-- | data/save_failed_screen.s | 2 | ||||
| -rw-r--r-- | graphics/interface/save_failed_screen.pal | 19 |
6 files changed, 57 insertions, 6 deletions
diff --git a/baserom.ips b/baserom.ips Binary files differindex 7c99bf40b..9bea735dd 100644 --- a/baserom.ips +++ b/baserom.ips diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 51149a021..32a2d422a 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -7,10 +7,24 @@ .align 2 gUnknown_841EE64:: @ 841EE64 - .incbin "baserom.gba", 0x41EE64, 0x4 + .4byte 0x000001f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } gUnknown_841EE68:: @ 841EE68 - .incbin "baserom.gba", 0x41EE68, 0x18 + .byte 0, 3, 5, 6, 4, 15 + .2byte 0x000a + .byte 0, 3, 15, 23, 4, 15 + .2byte 0x0022 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_841EE80:: @ 841EE80 - .incbin "baserom.gba", 0x41EE80, 0x44 + .byte 0x01, 0x02, 0x03 diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index 0fd702447..08276557a 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -6,6 +6,9 @@ .section .rodata .align 2 +gUnknown_841EE84:: @ 841EE84 + .incbin "baserom.gba", 0x41EE84, 0x40 + gUnknown_841EEC4:: @ 841EEC4 .incbin "baserom.gba", 0x41EEC4, 0x10 diff --git a/data/field_tasks.s b/data/field_tasks.s index a91e6cec9..2ff9ad215 100644 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -1,7 +1,22 @@ .section .rodata .align 2 gUnknown_83A7310:: @ 83A7310 - .incbin "baserom.gba", 0x3A7310, 0x20 + .4byte nullsub_40 + .4byte sub_806EB54 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806E9E0 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806EC40 gUnknown_83A7330:: @ 83A7330 - .incbin "baserom.gba", 0x3A7330, 0x14 + .byte 0x08, 0x03 + .byte 0x0a, 0x05 + .byte 0x0f, 0x05 + .byte 0x08, 0x09 + .byte 0x09, 0x09 + .byte 0x10, 0x09 + .byte 0x08, 0x0a + .byte 0x09, 0x0a + .byte 0x08, 0x0e diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s index cdf68c4de..e19763962 100644 --- a/data/save_failed_screen.s +++ b/data/save_failed_screen.s @@ -7,4 +7,4 @@ .align 2 gUnknown_841EE44:: @ 841EE44 - .incbin "baserom.gba", 0x41EE44, 0x20 + .incbin "graphics/interface/save_failed_screen.gbapal" diff --git a/graphics/interface/save_failed_screen.pal b/graphics/interface/save_failed_screen.pal new file mode 100644 index 000000000..f7932450f --- /dev/null +++ b/graphics/interface/save_failed_screen.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 115 230 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +74 205 238 +49 164 238 +0 90 131 +24 98 197 +16 115 230 |