diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-31 14:25:20 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-31 14:25:20 -0400 |
commit | 5787ba96ba2bcb0860422c3e66c179e63368acac (patch) | |
tree | 38ff48e4d286804b19f920af382351d4d11a13d0 /arm9/asm | |
parent | 00cbfe2e138c842d9c0bce4e1848d3eaa88a39b8 (diff) | |
parent | bf25a361cd0d013beb86a936b516957b66cfa011 (diff) |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/MI_init.s | 17 | ||||
-rw-r--r-- | arm9/asm/MI_uncompress.s | 50 | ||||
-rw-r--r-- | arm9/asm/MI_wram.s | 12 | ||||
-rw-r--r-- | arm9/asm/error_handling.s | 17 |
4 files changed, 0 insertions, 96 deletions
diff --git a/arm9/asm/MI_init.s b/arm9/asm/MI_init.s deleted file mode 100644 index 282dde3b..00000000 --- a/arm9/asm/MI_init.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start MI_Init -MI_Init: ; 0x020CE648 - stmdb sp!, {lr} - sub sp, sp, #0x4 - mov r0, #0x3 - bl MI_SetWramBank - mov r0, #0x0 - bl MI_StopDma - add sp, sp, #0x4 - ldmfd sp!, {lr} - bx lr - diff --git a/arm9/asm/MI_uncompress.s b/arm9/asm/MI_uncompress.s deleted file mode 100644 index 5f736e14..00000000 --- a/arm9/asm/MI_uncompress.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start MI_UncompressLZ8 -MI_UncompressLZ8: ; 0x020CE528 - stmdb sp!, {r4-r6,lr} - ldr r5, [r0], #0x4 - mov r2, r5, lsr #0x8 -_020CE534: - cmp r2, #0x0 - ble _020CE5B4 - ldrb lr, [r0], #0x1 - mov r4, #0x8 -_020CE544: - subs r4, r4, #0x1 - blt _020CE534 - tst lr, #0x80 - bne _020CE568 - ldrb r6, [r0], #0x1 - .word 0xE1416096 - add r1, r1, #0x1 - sub r2, r2, #0x1 - b _020CE5A4 -_020CE568: - ldrb r5, [r0, #0x0] - mov r6, #0x3 - add r3, r6, r5, asr #0x4 - ldrb r6, [r0], #0x1 - and r5, r6, #0xf - mov r12, r5, lsl #0x8 - ldrb r6, [r0], #0x1 - orr r5, r6, r12 - add r12, r5, #0x1 - sub r2, r2, r3 -_020CE590: - ldrb r5, [r1, -r12] - .word 0xE1415095 - add r1, r1, #0x1 - subs r3, r3, #0x1 - bgt _020CE590 -_020CE5A4: - cmp r2, #0x0 - movgt lr, lr, lsl #0x1 - bgt _020CE544 - b _020CE534 -_020CE5B4: - ldmia sp!, {r4-r6,lr} - bx lr diff --git a/arm9/asm/MI_wram.s b/arm9/asm/MI_wram.s deleted file mode 100644 index 3f245464..00000000 --- a/arm9/asm/MI_wram.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start MI_SetWramBank -MI_SetWramBank: - ldr r1, _020CD870 ; =0x04000247 - strb r0, [r1, #0x0] - bx lr - .balign 4 -_020CD870: .word 0x04000247 diff --git a/arm9/asm/error_handling.s b/arm9/asm/error_handling.s deleted file mode 100644 index d6330897..00000000 --- a/arm9/asm/error_handling.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start ErrorHandling -ErrorHandling: ; 0x02020C2C - push {r3, lr} - bl FUN_02031810 - cmp r0, #0x0 - beq _02020C42 - bl OS_GetProcMode - cmp r0, #0x12 - beq _02020C42 - bl PrintErrorMessageAndReset -_02020C42: - pop {r3, pc} |