diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-26 18:39:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-26 18:39:41 -0400 |
| commit | 52cafb3668633e3c41ab3e69d47848cacb911e1c (patch) | |
| tree | 9f84547a65bac749081167f5ebc6b032dc87766f /arm9/asm | |
| parent | 059a3d1496fc192b35e3a6779195d28ad35cc499 (diff) | |
Finish decomping scrcmd_mart.c
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/scrcmd_2.s | 119 | ||||
| -rw-r--r-- | arm9/asm/unk_02038C78.s | 10 |
2 files changed, 5 insertions, 124 deletions
diff --git a/arm9/asm/scrcmd_2.s b/arm9/asm/scrcmd_2.s deleted file mode 100644 index 418d10bf..00000000 --- a/arm9/asm/scrcmd_2.s +++ /dev/null @@ -1,119 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .extern UNK_02105DEC - .extern UNK_02105DF4 - .extern UNK_02105E10 - - .text - - thumb_func_start FUN_0203FDBC -FUN_0203FDBC: ; 0x0203FDBC - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - ldr r0, _0203FE00 ; =0x0000FFF8 - add r0, r2, r0 - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - cmp r0, #0x5 - bhi _0203FDE4 - mov r0, #0x1 - b _0203FDE6 -_0203FDE4: - mov r0, #0x0 -_0203FDE6: - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE04 ; =UNK_02105E10 - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x0 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE00: .word 0x0000FFF8 -_0203FE04: .word UNK_02105E10 - - thumb_func_start FUN_0203FE08 -FUN_0203FE08: ; 0x0203FE08 - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - cmp r2, #0x1 - bhi _0203FE28 - mov r0, #0x1 - b _0203FE2A -_0203FE28: - mov r0, #0x0 -_0203FE2A: - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE44 ; =UNK_02105DEC - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x1 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE44: .word UNK_02105DEC - - thumb_func_start FUN_0203FE48 -FUN_0203FE48: ; 0x0203FE48 - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - mov r0, #0x0 - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE7C ; =UNK_02105DF4 - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x2 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE7C: .word UNK_02105DF4 - - thumb_func_start FUN_0203FE80 -FUN_0203FE80: ; 0x0203FE80 - push {r3, lr} - add r0, #0x80 - ldr r0, [r0, #0x0] - ldr r0, [r0, #0x10] - bl FUN_02038AD0 - mov r0, #0x1 - pop {r3, pc} diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index bcf7b7cf..a49b0387 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -476,10 +476,10 @@ gScriptCmdTable: ; 0x020F355C .word FUN_0203D66C .word FUN_0203D6C4 .word FUN_0203D560 - .word FUN_0203FCF4 - .word FUN_0203FDBC - .word FUN_0203FE08 - .word FUN_0203FE48 + .word ScrCmd_NormalMart + .word ScrCmd_SpecialMart + .word ScrCmd_GoodsMart + .word ScrCmd_SealsMart .word FUN_0203D868 .word FUN_0203D874 .word ScrCmd_getplayergender @@ -748,7 +748,7 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk0254 .word ScrCmd_Unk0255 .word ScrCmd_Unk0256 - .word FUN_0203FE80 + .word ScrCmd_AccessoriesShop .word FUN_0203EDA4 .word FUN_0203EDC8 .word FUN_0203EDE0 |