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/12/asm/module_12.s | |
| parent | 8f09b9e7138325b4ec2255a1c0a58f385e586f1b (diff) | |
| parent | 49e14283e13c146018f2a2785dfc77e0e1ff5368 (diff) | |
Merge from upstream
Diffstat (limited to 'arm9/modules/12/asm/module_12.s')
| -rw-r--r-- | arm9/modules/12/asm/module_12.s | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 36381bcf..b2e41348 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -7445,7 +7445,7 @@ _022312B4: .word 0x00001158 _022312B8: .word 0x00000127 thumb_func_start MOD12_022312BC -MOD12_022312BC: ; 0x022312BC +MOD12_022312BC: ; 0x022312BC __sinit push {r3, lr} ldr r0, _022312D0 ; =SDK_OVERLAY_MODULE_08_ID mov r1, #2 @@ -48103,6 +48103,9 @@ _0224496A: _02244988: pop {r4, r5, r6, pc} - .section .data + .section .rodata ; 0x0224498C - .incbin "baserom.nds", 0x1F71CC, 0x1E94 + .incbin "baserom.nds", 0x1F71CC, 0x1E84 + + .section .sinit + .word MOD12_022312BC |