diff options
| -rw-r--r-- | asm/main.s | 14 | ||||
| -rw-r--r-- | asm/rom.s | 3 |
2 files changed, 10 insertions, 7 deletions
@@ -41,11 +41,11 @@ _02000808: ldr r1, _02000924 @ =0x07000000 mov r2, #1024 bl INITi_CpuClear32 - ldr r1, _02000928 @ = 0x02000B68 + ldr r1, _02000928 @ =_02000B68 ldr r0, [r1, #20] bl MIi_UncompressBackward bl do_autoload - ldr r0, _02000928 @ =0x02000B68 + ldr r0, _02000928 @ =_02000B68 ldr r1, [r0, #12] ldr r2, [r0, #16] mov r3, r1 @@ -81,10 +81,10 @@ _02000918: .4byte 0x027E0000 _0200091C: .4byte 0x00000400 _02000920: .4byte 0x05000000 _02000924: .4byte 0x07000000 -_02000928: .4byte 0x02000B68 +_02000928: .4byte _02000B68 _0200092C: .4byte 0x027FFF9C _02000930: .4byte 0x01FF8000 -_02000934: .4byte 0x02000C55 @ NdsMain +_02000934: .4byte NdsMain+1 _02000938: .4byte 0xFFFF0000 arm_func_end Entry @@ -155,7 +155,7 @@ _020009F8: arm_func_start do_autoload do_autoload: - ldr r0, =0x02000B68 + ldr r0, =_02000B68 ldr r1, [r0] ldr r2, [r0, #4] ldr r3, [r0, #8] @@ -189,7 +189,7 @@ _02000A50: b _02000A0C _02000A6C: b _2000A74 - .pool + .pool _2000A74: bx lr arm_func_end do_autoload @@ -243,7 +243,7 @@ init_cp15: @ 0x02000A78 mcr p15, #0, r0, c1, c0, #0 bx lr .align 2, 0 - .pool + .pool arm_func_start sub_2000B60_dummy sub_2000B60_dummy: @ 0x02000B60 @@ -1,5 +1,8 @@ /* rom.s TODO: Disassemble */ +.include "asm/macros.inc" .section .text + thumb_func_start NdsMain +NdsMain: .incbin "baserom.nds", 0x4C54, 0x1A0 |