diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-18 18:31:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 18:31:03 +0100 |
| commit | 0162177c32a3b0f3047d360635b8bedce8e7bf95 (patch) | |
| tree | e2496f6679cfe9d819723906832007b423987a17 /arm9/asm | |
| parent | 71c737c85b671425f887dd1670e200f95bfeb0cf (diff) | |
| parent | 4d8063e863fa441462fbcd787d5b4a9e81822bc4 (diff) | |
Merge branch 'master' into scrcmd_24
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/scrcmd_asm.s | 44 | ||||
| -rw-r--r-- | arm9/asm/unk_02038C78.s | 2 |
2 files changed, 1 insertions, 45 deletions
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 3d6645c2..c1e91c9f 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -14,50 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C .text - thumb_func_start FUN_0203AFC4 -FUN_0203AFC4: ; 0x0203AFC4 - push {r4-r6, lr} - add r5, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r6, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadWord - add r4, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - add r1, r6, #0x0 - bl FUN_0203B120 - add r6, r0, #0x0 - bne _0203AFF6 - bl ErrorHandling -_0203AFF6: - ldr r1, [r5, #0x8] - add r0, r6, #0x0 - add r1, r1, r4 - bl FUN_0205AEA4 - add r4, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x4 - bl FUN_02039438 - ldrb r1, [r0, #0x0] - add r5, #0x80 - mov r2, #0x0 - add r1, r1, #0x1 - strb r1, [r0, #0x0] - ldr r0, [r5, #0x0] - add r1, r4, #0x0 - bl FUN_0203B174 - mov r0, #0x0 - pop {r4-r6, pc} - thumb_func_start FUN_0203B024 FUN_0203B024: ; 0x0203B024 push {r3-r7, lr} diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 09eb287a..b60088a5 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -243,7 +243,7 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk005B .word ScrCmd_Unk005C .word ScrCmd_Unk005D - .word FUN_0203AFC4 + .word ScrCmd_Unk005E .word FUN_0203B148 .word FUN_0203B1F0 .word FUN_0203B3B0 |