diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-21 08:22:23 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-21 08:22:23 -0400 |
| commit | 8b0123170320acdf8cd8b472e057987828955c7f (patch) | |
| tree | 5b083f18544e1e2376d24cc6d94f7f82078c04cf /asm | |
| parent | 43eb982a80c45fe26f1cbbc23285c4d8a2cc64b4 (diff) | |
Fix icon.o; dism two libmwcc funcs
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom1.5.s | 8 | ||||
| -rw-r--r-- | asm/rom2.s | 29 |
2 files changed, 33 insertions, 4 deletions
diff --git a/asm/rom1.5.s b/asm/rom1.5.s index 50021ed7..fffa35a6 100644 --- a/asm/rom1.5.s +++ b/asm/rom1.5.s @@ -1,5 +1,7 @@ /* rom1.5.s TODO: Disassemble */ + .include "asm/macros.inc" + .section .text -.section .text - -.incbin "baserom.nds", 0x8EC14, 0x3EFF8 + arm_func_start FUN_0208AC14 +FUN_0208AC14: + .incbin "baserom.nds", 0x8EC14, 0x3EFF8 @@ -3,7 +3,34 @@ .section .text - .incbin "baserom.nds", 0xD9150, 0x16B30 + .incbin "baserom.nds", 0xD9150, 0x16AE0 + + arm_func_start FUN_020EBC30 +FUN_020EBC30: ; 0x020EBC30 + stmdb sp!, {r4, r5, lr} + umull r5, r4, r0, r2 + mla r4, r0, r3, r4 + mla r4, r2, r1, r4 + mov r1, r4 + mov r0, r5 + ldmia sp!, {r4, r5, lr} + bx lr + + arm_func_start FUN_020EBC50 +FUN_020EBC50: ; 0x020EBC50 + ands r2, r2, #0x3F + bxeq lr + subs r3, r2, #0x20 + bge _020EBC74 + rsb r3, r2, #0x20 + mov r1, r1, lsl r2 + orr r1, r1, r0, lsr r3 + mov r0, r0, lsl r2 + bx lr +_020EBC74: + mov r1, r0, lsl r3 + mov r0, #0x0 + bx lr arm_func_start _s32_div_f _s32_div_f: ; 0x20EBC80 |