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/11/asm/module_11.s | |
| parent | 8f09b9e7138325b4ec2255a1c0a58f385e586f1b (diff) | |
| parent | 49e14283e13c146018f2a2785dfc77e0e1ff5368 (diff) | |
Merge from upstream
Diffstat (limited to 'arm9/modules/11/asm/module_11.s')
| -rw-r--r-- | arm9/modules/11/asm/module_11.s | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 8288a770..21746e52 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -3379,7 +3379,7 @@ _0222F27C: _0222F280: .word 0x00002434
thumb_func_start MOD11_0222F284
-MOD11_0222F284: ; 0x0222F284
+MOD11_0222F284: ; 0x0222F284 __sinit
push {r3, lr}
bl FUN_02033590
cmp r0, #0
@@ -98632,6 +98632,20 @@ MOD11_0225D98C: ; 0x0225D98C strb r1, [r0, #0x1e]
bx lr
- .section .data
+ .section .rodata
; 0x0225D998
- .incbin "baserom.nds", 0x1dd7d8, 0x2608
+ .incbin "baserom.nds", 0x1dd7d8, 0x2580
+
+ ; Stupid hack to override alignment
+ ; .section .sinit
+ ; 0x0225FF18
+ .global SDK_OVERLAY.MODULE_11.SINIT_START
+ .global SDK_OVERLAY.MODULE_11.SINIT_END
+SDK_OVERLAY.MODULE_11.SINIT_START:
+ .word MOD11_0222F284
+ .word 0
+SDK_OVERLAY.MODULE_11.SINIT_END:
+
+ .section .data
+ ; 0x0225FF20
+ .incbin "baserom.nds", 0x1dfd60, 0x80
|