summaryrefslogtreecommitdiff
path: root/arm9/modules/11/asm/module_11.s
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2020-05-10 20:02:11 -0400
committerGitHub <noreply@github.com>2020-05-10 20:02:11 -0400
commit49e14283e13c146018f2a2785dfc77e0e1ff5368 (patch)
tree49e05a9eadfcc449943eabdbf2ddf85edb15c09a /arm9/modules/11/asm/module_11.s
parent584e6caadd3332e555a40979d98a8fd871d36a23 (diff)
parent28370e78b2357915fa0bd0c299fa1fbbd91da0b3 (diff)
Merge pull request #72 from PikalaxALT/pikalax_work
More module disassembly; main.c
Diffstat (limited to 'arm9/modules/11/asm/module_11.s')
-rw-r--r--arm9/modules/11/asm/module_11.s20
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