diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-05 03:47:33 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-05 03:47:33 -0800 |
| commit | 861adbbe6a164432694a06303149b58c9edd91f0 (patch) | |
| tree | 58931224247611085b8983158d0896dc57ef9d13 | |
| parent | 3dc2f8992446b2fffa0f7da16351e1445856f190 (diff) | |
split out field_tasks data
| -rw-r--r-- | asm/reset_rtc_screen.s | 4 | ||||
| -rw-r--r-- | data/data_83760F0.s | 29 | ||||
| -rw-r--r-- | data/field_tasks.s | 31 | ||||
| -rw-r--r-- | ld_script.txt | 1 |
4 files changed, 36 insertions, 29 deletions
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index d80d374f1..1b58b417b 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -655,7 +655,7 @@ Task_ResetRtc_1: @ 806A958 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 - ldr r1, _0806A9A0 @ =gUnknown_08376414 + ldr r1, _0806A9A0 @ =gUnknown_08376420 - 0xC adds r2, r0, r1 ldr r1, _0806A9A4 @ =gMain ldrh r3, [r1, 0x2E] @@ -675,7 +675,7 @@ Task_ResetRtc_1: @ 806A958 b _0806A9CC .align 2, 0 _0806A99C: .4byte gTasks + 0x8 -_0806A9A0: .4byte gUnknown_08376414 +_0806A9A0: .4byte gUnknown_08376420 - 0xC _0806A9A4: .4byte gMain _0806A9A8: .4byte Task_ResetRtc_2 _0806A9AC: diff --git a/data/data_83760F0.s b/data/data_83760F0.s index 3e69efb6c..059f79345 100644 --- a/data/data_83760F0.s +++ b/data/data_83760F0.s @@ -4,33 +4,8 @@ .section .rodata .align 2 -gUnknown_08376364:: @ 8376364 - .4byte DummyPerStepCallback - .4byte PerStepCallback_8069F64 - .4byte PerStepCallback_8069AA0 - .4byte PerStepCallback_8069864 - .4byte PerStepCallback_8069DD4 - .4byte EndTruckSequence - .4byte sub_80BCF1C - .4byte PerStepCallback_806A07C - -gUnknown_08376384:: @ 8376384 - .incbin "baserom.gba", 0x00376384, 0x20 - -gUnknown_083763A4:: @ 83763A4 - .incbin "baserom.gba", 0x003763a4, 0x20 - -gUnknown_083763C4:: @ 83763C4 - .incbin "baserom.gba", 0x003763c4, 0x20 - -gUnknown_083763E4:: @ 83763E4 - .incbin "baserom.gba", 0x003763e4, 0x30 - -gUnknown_08376414:: @ 8376414 - .space 4 - -gUnknown_08376418:: @ 8376418 - .incbin "baserom.gba", 0x00376418, 0x44 +gUnknown_08376420:: @ 8376420 + .incbin "baserom.gba", 0x00376420, 0x3C .align 2 gOamData_837645C:: @ 837645C diff --git a/data/field_tasks.s b/data/field_tasks.s new file mode 100644 index 000000000..d7de1fe16 --- /dev/null +++ b/data/field_tasks.s @@ -0,0 +1,31 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_08376364:: @ 8376364 + .4byte DummyPerStepCallback + .4byte PerStepCallback_8069F64 + .4byte PerStepCallback_8069AA0 + .4byte PerStepCallback_8069864 + .4byte PerStepCallback_8069DD4 + .4byte EndTruckSequence + .4byte sub_80BCF1C + .4byte PerStepCallback_806A07C + +gUnknown_08376384:: @ 8376384 + .incbin "baserom.gba", 0x00376384, 0x20 + +gUnknown_083763A4:: @ 83763A4 + .incbin "baserom.gba", 0x003763a4, 0x20 + +gUnknown_083763C4:: @ 83763C4 + .incbin "baserom.gba", 0x003763c4, 0x20 + +gUnknown_083763E4:: @ 83763E4 + .incbin "baserom.gba", 0x003763e4, 0x34 + + .align 1 +gUnknown_08376418:: @ 8376418 + .2byte 0xE8, 0xEB, 0xEA, 0xE9 diff --git a/ld_script.txt b/ld_script.txt index c86a82a0f..f6620ee45 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -315,6 +315,7 @@ SECTIONS { src/script.o(.rodata); src/scrcmd.o(.rodata); src/coord_event_weather.o(.rodata); + data/field_tasks.o(.rodata); data/data_83760F0.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); |