diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-05-01 00:40:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 00:40:32 +0300 |
| commit | c7dd102f628b7a64a34223278c2de09718da19f4 (patch) | |
| tree | a40475eaa9659647764eebbdd4d28ebb3f57fcd1 /arm9/asm | |
| parent | 837c28444a009f52e5090bc9e2e98e67a7c6b313 (diff) | |
| parent | 5e3a27d3f7af07745c39990b59ca7fcf2813cf58 (diff) | |
Merge pull request #45 from PikalaxALT/pikalax_work
Decompile overlay 01; disassemble overlay 04
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/unk_02006864.s | 8 | ||||
| -rw-r--r-- | arm9/asm/unk_0208AC14.s | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index f212d36f..fbfb90df 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -95240,7 +95240,7 @@ _02031CEE: bl FUN_02033590
cmp r0, #0x0
beq _02031D04
- blx FUN_021DDB08
+ bl FUN_021DDB08
mov r1, #0x3
sub r0, r1, r0
bl FUN_02033EEC
@@ -98149,10 +98149,10 @@ _020333AA: bne _020333C8
add r0, sp, #0x4
add r1, sp, #0x0
- blx FUN_021DD718
+ bl FUN_021DD718
cmp r0, #0x0
beq _020333E4
- blx FUN_021DD6F0
+ bl FUN_021DD6F0
add sp, #0x8
mov r0, #0x1
pop {r3, pc}
@@ -98161,7 +98161,7 @@ _020333C8: bne _020333E4
add r0, sp, #0x4
add r1, sp, #0x0
- blx FUN_021DD718
+ bl FUN_021DD718
cmp r0, #0x0
beq _020333E4
ldr r0, [sp, #0x0]
diff --git a/arm9/asm/unk_0208AC14.s b/arm9/asm/unk_0208AC14.s index 0adafb8b..8fbcff45 100644 --- a/arm9/asm/unk_0208AC14.s +++ b/arm9/asm/unk_0208AC14.s @@ -13644,7 +13644,9 @@ _02096C6C: mov r0, #0x0 add sp, sp, #0x4 ldmia sp!, {r4-r7,pc} -_02096C78: ; 0x02096C78 + + arm_func_start FUN_02096C78 +FUN_02096C78: ; 0x02096C78 ldr ip, _02096C8C ; =FUN_02097218 mov r3, r0 mov r0, r1 |