diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 12:23:05 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 12:23:05 -0400 |
| commit | e05e121ca0ed125946f8634cdc54b73ba295ecb1 (patch) | |
| tree | 7cd31f6075f7d03a9c25f29146b392610f6c5efe /arm9/asm | |
| parent | 63b108234ed6e0d816c86dcbd88457b0ae1e06d6 (diff) | |
| parent | 863e1d40a46f50ea66a30fe6b68e7a2c5ceb82d2 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
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 |