diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-04-07 00:21:45 +0100 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-04-06 23:50:08 -0700 |
| commit | b13c0bae0e9d709af89d36d7fb3c0f1c6fe42fc6 (patch) | |
| tree | 03c7765fd5a1fd3c0996960585c6f154053b4ef8 /data | |
| parent | 598bb72f090789f2ac30b5eab6516de40e00ec88 (diff) | |
split out fldeff_flash.s
Diffstat (limited to 'data')
| -rw-r--r-- | data/fldeff_flash.s | 71 | ||||
| -rw-r--r-- | data/rom_810CBB4.s | 67 |
2 files changed, 71 insertions, 67 deletions
diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s new file mode 100644 index 000000000..c8b6185f2 --- /dev/null +++ b/data/fldeff_flash.s @@ -0,0 +1,71 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_083F7FC4:: @ 83F7FC4 + .byte 1, 4, 1, 0 + .4byte sub_810CFF8 + .byte 2, 4, 1, 0 + .4byte sub_810CFF8 + .byte 3, 4, 1, 0 + .4byte sub_810CFF8 + .byte 5, 4, 1, 0 + .4byte sub_810CFF8 + .byte 6, 4, 1, 0 + .4byte sub_810CFF8 + .byte 7, 4, 1, 0 + .4byte sub_810CFF8 + .byte 8, 4, 1, 0 + .4byte sub_810CFF8 + .byte 9, 4, 1, 0 + .4byte sub_810CFF8 + + .byte 4, 1, 0, 1 + .4byte sub_810CE48 + .byte 4, 2, 0, 1 + .4byte sub_810CE48 + .byte 4, 3, 0, 1 + .4byte sub_810CE48 + .byte 4, 5, 0, 1 + .4byte sub_810CE48 + .byte 4, 6, 0, 1 + .4byte sub_810CE48 + .byte 4, 7, 0, 1 + .4byte sub_810CE48 + .byte 4, 8, 0, 1 + .4byte sub_810CE48 + .byte 4, 9, 0, 1 + .4byte sub_810CE48 + + .byte 0, 0, 0, 0 + .4byte NULL + + .align 2 +gCaveTransitionPalette_White:: @ 83F804C + .rept 16 + .2byte 0x7FFF + .endr + + .align 2 +gCaveTransitionPalette_Black:: @ 83F806C + .rept 16 + .2byte 0x0000 + .endr + + .align 1 +gUnknown_083F808C:: @ 83F808C + .incbin "graphics/misc/83F808C.gbapal" + + .align 1 +gUnknown_083F809C:: @ 83F809C + .incbin "graphics/misc/83F809C.gbapal" + + .align 2 +gCaveTransitionTilemap:: @ 83F80AC + .incbin "graphics/misc/cave_transition_map.bin.lz" + + .align 2 +gCaveTransitionTiles:: @ 83F828C + .incbin "graphics/misc/cave_transition.4bpp.lz" diff --git a/data/rom_810CBB4.s b/data/rom_810CBB4.s index 3860788cf..41565028f 100644 --- a/data/rom_810CBB4.s +++ b/data/rom_810CBB4.s @@ -3,73 +3,6 @@ .section .rodata - .align 2 -gUnknown_083F7FC4:: @ 83F7FC4 - .byte 1, 4, 1, 0 - .4byte sub_810CFF8 - .byte 2, 4, 1, 0 - .4byte sub_810CFF8 - .byte 3, 4, 1, 0 - .4byte sub_810CFF8 - .byte 5, 4, 1, 0 - .4byte sub_810CFF8 - .byte 6, 4, 1, 0 - .4byte sub_810CFF8 - .byte 7, 4, 1, 0 - .4byte sub_810CFF8 - .byte 8, 4, 1, 0 - .4byte sub_810CFF8 - .byte 9, 4, 1, 0 - .4byte sub_810CFF8 - - .byte 4, 1, 0, 1 - .4byte sub_810CE48 - .byte 4, 2, 0, 1 - .4byte sub_810CE48 - .byte 4, 3, 0, 1 - .4byte sub_810CE48 - .byte 4, 5, 0, 1 - .4byte sub_810CE48 - .byte 4, 6, 0, 1 - .4byte sub_810CE48 - .byte 4, 7, 0, 1 - .4byte sub_810CE48 - .byte 4, 8, 0, 1 - .4byte sub_810CE48 - .byte 4, 9, 0, 1 - .4byte sub_810CE48 - - .byte 0, 0, 0, 0 - .4byte NULL - - .align 2 -gCaveTransitionPalette_White:: @ 83F804C - .rept 16 - .2byte 0x7FFF - .endr - - .align 2 -gCaveTransitionPalette_Black:: @ 83F806C - .rept 16 - .2byte 0x0000 - .endr - - .align 1 -gUnknown_083F808C:: @ 83F808C - .incbin "graphics/misc/83F808C.gbapal" - - .align 1 -gUnknown_083F809C:: @ 83F809C - .incbin "graphics/misc/83F809C.gbapal" - - .align 2 -gCaveTransitionTilemap:: @ 83F80AC - .incbin "graphics/misc/cave_transition_map.bin.lz" - - .align 2 -gCaveTransitionTiles:: @ 83F828C - .incbin "graphics/misc/cave_transition.4bpp.lz" - gUnknown_083F8340:: @ 83F8340 .byte 1 .byte 1 |