diff options
author | Demki <mordbz@gmail.com> | 2020-05-11 03:03:25 +0300 |
---|---|---|
committer | Demki <mordbz@gmail.com> | 2020-05-11 03:06:27 +0300 |
commit | bc005e7d2537150516119f7074bb767c054de722 (patch) | |
tree | 83e127100c7af68c6e92fcd4d0419a8a5c73b8bb /arm9/modules/21/asm/module_21.s | |
parent | 8f09b9e7138325b4ec2255a1c0a58f385e586f1b (diff) | |
parent | 49e14283e13c146018f2a2785dfc77e0e1ff5368 (diff) |
Merge from upstream
Diffstat (limited to 'arm9/modules/21/asm/module_21.s')
-rw-r--r-- | arm9/modules/21/asm/module_21.s | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s index cea8f6e8..0c30eb9a 100644 --- a/arm9/modules/21/asm/module_21.s +++ b/arm9/modules/21/asm/module_21.s @@ -721,6 +721,15 @@ _02254D78: .word 0x040002A0 _02254D7C: .word 0x040002A8 thumb_func_end MOD21_02254C5C - .section .data + .section .rodata ; 0x02254D80 - .incbin "baserom.nds", 0x285B40, 0x80 + .incbin "baserom.nds", 0x285B40, 0x68 + + ; Dumb hack because the compiler aligns to 16 instead of 8 + ;.section .sinit + .global SDK_OVERLAY.MODULE_21.SINIT_START + .global SDK_OVERLAY.MODULE_21.SINIT_END +SDK_OVERLAY.MODULE_21.SINIT_START: + .word MOD21_02254840 + .word 0 +SDK_OVERLAY.MODULE_21.SINIT_END: |