diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-06-08 12:18:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 12:18:23 -0400 |
| commit | 863e1d40a46f50ea66a30fe6b68e7a2c5ceb82d2 (patch) | |
| tree | 1fc64a437d7305403a2115ece9f044550ddc987f /arm9/asm | |
| parent | 7594546ee990c55b5427a7f5bfc62263dc53ae5f (diff) | |
| parent | 5bd65c61af7865f213ae142aa369c41ed272d24c (diff) | |
Merge pull request #146 from red031000/master
finally finish OS_reset and stop git being stupid
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/arm9_itcm.s | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arm9/asm/arm9_itcm.s b/arm9/asm/arm9_itcm.s index 13f0ad5c..5c3dc240 100644 --- a/arm9/asm/arm9_itcm.s +++ b/arm9/asm/arm9_itcm.s @@ -2,27 +2,6 @@ .include "global.inc" .section .text - ; OS - arm_func_start OSi_DoResetSystem ;OS_reset.c -OSi_DoResetSystem: ; 0x01FF84A4 - stmfd sp!, {lr} - sub sp, sp, #4 - ldr r0, _01FF84DC -_01FF84B0: - ldrh r1, [r0] - cmp r1, #0 - beq _01FF84B0 - ldr r0, _01FF84E0 - mov r1, #0 - strh r1, [r0] - bl OSi_ReloadRomData - bl OSi_DoBoot - add sp, sp, #4 - ldmfd sp!, {lr} - bx lr -_01FF84DC: .word OSi_IsResetOccurred -_01FF84E0: .word 0x04000208 - ; MI arm_func_start MIi_DmaSetParams_wait_noInt MIi_DmaSetParams_wait_noInt: ; 0x01FF84E4 |
