diff options
author | YamaArashi <shadow962@live.com> | 2017-01-05 03:52:07 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2017-01-05 03:52:07 -0800 |
commit | fc29d14c6c6bc2a7e92a7ac607b5c6ff7109b2da (patch) | |
tree | a9c677c90d366f203b37ba3085e2e72e6e3f6dc4 | |
parent | 861adbbe6a164432694a06303149b58c9edd91f0 (diff) |
split out reset_rtc_screen data
-rw-r--r-- | data/data_83760F0.s | 59 | ||||
-rw-r--r-- | data/reset_rtc_screen.s | 63 | ||||
-rw-r--r-- | ld_script.txt | 1 |
3 files changed, 64 insertions, 59 deletions
diff --git a/data/data_83760F0.s b/data/data_83760F0.s index 059f79345..c74e17133 100644 --- a/data/data_83760F0.s +++ b/data/data_83760F0.s @@ -3,65 +3,6 @@ .section .rodata - .align 2 -gUnknown_08376420:: @ 8376420 - .incbin "baserom.gba", 0x00376420, 0x3C - - .align 2 -gOamData_837645C:: @ 837645C - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteImage_8376464:: @ 8376464 - .incbin "graphics/unknown_sprites/83764AC/0.4bpp" - - .align 2 -gSpriteImage_8376484:: @ 8376484 - .incbin "graphics/unknown_sprites/83764AC/1.4bpp" - - .align 2 -Palette_3764A4: @ 83764A4 - .incbin "baserom.gba", 0x3764a4, 0x8 - - .align 2 -gSpriteImageTable_83764AC:: @ 83764AC - obj_frame_tiles gSpriteImage_8376464, 0x20 - obj_frame_tiles gSpriteImage_8376484, 0x20 - - .align 2 -gUnknown_083764BC:: @ 83764BC - obj_pal Palette_3764A4, 0x1000 - - .align 2 -gSpriteAnim_83764C4:: @ 83764C4 - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764CC:: @ 83764CC - obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764D4:: @ 83764D4 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83764DC:: @ 83764DC - .4byte gSpriteAnim_83764C4 - .4byte gSpriteAnim_83764CC - .4byte gSpriteAnim_83764D4 - - .align 2 -gSpriteTemplate_83764E8:: @ 83764E8 - spr_template 0xFFFF, 0x1000, gOamData_837645C, gSpriteAnimTable_83764DC, gSpriteImageTable_83764AC, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08376500:: @ 8376500 - .incbin "baserom.gba", 0x00376500, 0x4 - .align 1 gUnknown_08376504:: @ 8376504 .2byte MOVE_FOCUS_PUNCH diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s new file mode 100644 index 000000000..a50f5c07b --- /dev/null +++ b/data/reset_rtc_screen.s @@ -0,0 +1,63 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_08376420:: @ 8376420 + .incbin "baserom.gba", 0x00376420, 0x3C + + .align 2 +gOamData_837645C:: @ 837645C + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gSpriteImage_8376464:: @ 8376464 + .incbin "graphics/unknown_sprites/83764AC/0.4bpp" + + .align 2 +gSpriteImage_8376484:: @ 8376484 + .incbin "graphics/unknown_sprites/83764AC/1.4bpp" + + .align 2 +Palette_3764A4: @ 83764A4 + .incbin "baserom.gba", 0x3764a4, 0x8 + + .align 2 +gSpriteImageTable_83764AC:: @ 83764AC + obj_frame_tiles gSpriteImage_8376464, 0x20 + obj_frame_tiles gSpriteImage_8376484, 0x20 + + .align 2 +gUnknown_083764BC:: @ 83764BC + obj_pal Palette_3764A4, 0x1000 + + .align 2 +gSpriteAnim_83764C4:: @ 83764C4 + obj_image_anim_frame 0, 30 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83764CC:: @ 83764CC + obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83764D4:: @ 83764D4 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_83764DC:: @ 83764DC + .4byte gSpriteAnim_83764C4 + .4byte gSpriteAnim_83764CC + .4byte gSpriteAnim_83764D4 + + .align 2 +gSpriteTemplate_83764E8:: @ 83764E8 + spr_template 0xFFFF, 0x1000, gOamData_837645C, gSpriteAnimTable_83764DC, gSpriteImageTable_83764AC, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_08376500:: @ 8376500 + .string " : $" diff --git a/ld_script.txt b/ld_script.txt index f6620ee45..7da3a7f8a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -316,6 +316,7 @@ SECTIONS { src/scrcmd.o(.rodata); src/coord_event_weather.o(.rodata); data/field_tasks.o(.rodata); + data/reset_rtc_screen.o(.rodata); data/data_83760F0.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); |