diff options
| author | red031000 <rubenru09@aol.com> | 2021-03-18 16:00:46 +0000 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2021-03-18 16:00:46 +0000 |
| commit | 777bb376069caa8ef66a7ac753d9d2d0250af052 (patch) | |
| tree | 286c31e40390a7fbbd310d2d7754d4d92575c4e3 /arm9/asm | |
| parent | 8b699fd13008875cf59601d6a8c9d55bd3f8ae08 (diff) | |
fix main scrcmd struct
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/scrcmd_asm.s | 66 | ||||
| -rw-r--r-- | arm9/asm/unk_02038C78.s | 2 |
2 files changed, 1 insertions, 67 deletions
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 3c73d00c..19159d18 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -15,72 +15,6 @@ UNK_021C5A0C: ; 0x021C5A0C .text - thumb_func_start FUN_0203A188 -FUN_0203A188: ; 0x0203A188 - push {r4-r6, lr} - sub sp, #0x8 - add r5, r0, #0x0 - ldr r2, [r5, #0x8] - add r1, r2, #0x1 - str r1, [r5, #0x8] - add r1, r5, #0x0 - add r1, #0x80 - ldr r1, [r1, #0x0] - ldrb r3, [r2, #0x0] - add r1, #0xa8 - ldr r2, [r1, #0x0] - cmp r2, #0x0 - bne _0203A1AA - add sp, #0x8 - mov r0, #0x0 - pop {r4-r6, pc} -_0203A1AA: - lsl r1, r3, #0x4 - add r1, r3, r1 - add r2, #0x90 - lsl r1, r1, #0x4 - add r4, r2, r1 - ldrh r1, [r2, r1] - ldr r2, _0203A204 ; =0x0000FFFF - cmp r1, r2 - bne _0203A1E2 - ldr r2, _0203A208 ; =0x0000022B - mov r0, #0x1 - mov r1, #0x1a - mov r3, #0x20 - bl NewMsgDataFromNarc - add r6, r0, #0x0 - mov r0, #0x0 - str r0, [sp, #0x0] - ldrh r2, [r4, #0x2] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x1 - bl MOD05_021E2BD0 - add r0, r6, #0x0 - bl DestroyMsgData - b _0203A1F4 -_0203A1E2: - mov r2, #0x6 - ldrsh r2, [r4, r2] - str r2, [sp, #0x0] - mov r2, #0x1 - str r2, [sp, #0x4] - ldrh r2, [r4, #0x2] - ldrh r3, [r4, #0x4] - bl MOD05_021E2C58 -_0203A1F4: - ldr r1, _0203A20C ; =FUN_0203A2F0 - add r0, r5, #0x0 - bl SetupNativeScript - mov r0, #0x1 - add sp, #0x8 - pop {r4-r6, pc} - nop -_0203A204: .word 0x0000FFFF -_0203A208: .word 0x0000022B -_0203A20C: .word FUN_0203A2F0 - thumb_func_start FUN_0203A210 FUN_0203A210: ; 0x0203A210 push {r3-r7, lr} diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 2bada91e..7011ab90 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -659,7 +659,7 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_MessageFrom2 .word ScrCmd_Unk01FC .word ScrCmd_Unk01FD - .word FUN_0203A188 + .word ScrCmd_Unk01FE .word FUN_0203A210 .word FUN_0203C7F4 .word FUN_0203C820 |