diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_020010A8.s | 44 | ||||
-rw-r--r-- | arm9/asm/unk_02001B80.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02012CC8.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02050E48.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0208A338.s | 2 |
7 files changed, 10 insertions, 54 deletions
diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s index 0551ad9c..dba61431 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -5,50 +5,6 @@ .text - thumb_func_start FUN_02001300 -FUN_02001300: ; 0x02001300 - push {r4, lr} - add r4, r0, #0x0 - cmp r1, #0x0 - beq _0200130C - ldrh r0, [r4, #0x2c] - strh r0, [r1, #0x0] -_0200130C: - cmp r2, #0x0 - beq _02001314 - ldrh r0, [r4, #0x2e] - strh r0, [r2, #0x0] -_02001314: - ldr r0, [r4, #0x28] - bl FUN_020136C0 - add r0, r4, #0x0 - add r0, #0x34 - ldrb r0, [r0, #0x0] - add r1, r4, #0x0 - bl FUN_02016A8C - pop {r4, pc} - - thumb_func_start FUN_02001328 -FUN_02001328: ; 0x02001328 - push {r4, lr} - add r4, r0, #0x0 - ldrb r1, [r4, #0x18] - ldr r0, [r4, #0xc] - lsl r1, r1, #0x1c - lsr r1, r1, #0x1c - bl FillWindowPixelBuffer - ldrh r1, [r4, #0x2c] - ldrh r3, [r4, #0x12] - add r0, r4, #0x0 - mov r2, #0x0 - bl ListMenuPrintEntries - add r0, r4, #0x0 - bl ListMenuDrawCursor - ldr r0, [r4, #0xc] - bl CopyWindowToVram - pop {r4, pc} - .balign 4 - thumb_func_start FUN_02001354 FUN_02001354: ; 0x02001354 push {r4-r6, lr} diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index c00d6dd7..65ba52af 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -130,7 +130,7 @@ FUN_02001C5C: ; 0x02001C5C strb r0, [r1, #0x0] _02001C68: ldr r0, [r4, #0xc] - bl FUN_020136C0 + bl DestroyListMenuCursorObj ldrb r0, [r4, #0x1c] add r1, r4, #0x0 bl FUN_02016A8C diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index b77e441c..92e460b6 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -1511,8 +1511,8 @@ _020136B2: _020136B8: .word 0x0001020F _020136BC: .word UNK_020ED548 - thumb_func_start FUN_020136C0 -FUN_020136C0: ; 0x020136C0 + thumb_func_start DestroyListMenuCursorObj +DestroyListMenuCursorObj: ; 0x020136C0 push {r4, lr} add r4, r0, #0x0 bne _020136CA @@ -1530,8 +1530,8 @@ _020136D8: _020136DE: pop {r4, pc} - thumb_func_start FUN_020136E0 -FUN_020136E0: ; 0x020136E0 + thumb_func_start CreateListMenuCursorObj +CreateListMenuCursorObj: ; 0x020136E0 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index b5eed02a..95b46dc5 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1442,7 +1442,7 @@ _020519BA: ldr r0, [r4, #0x10] bl String_dtor ldr r0, [r4, #0x78] - bl FUN_020136C0 + bl DestroyListMenuCursorObj add r0, r4, #0x0 mov r1, #0x1 bl FUN_02051810 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 024e66de..bf248464 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1515,7 +1515,7 @@ FUN_02063178: ; 0x02063178 ldr r0, [r0, #0x0] add r1, #0x22 add r2, #0x24 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0x0 add r0, #0xc4 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index e2feaf96..50cb5318 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1418,7 +1418,7 @@ FUN_02065EF8: ; 0x02065EF8 ldr r0, [r4, r0] add r1, #0x2 add r2, sp, #0x0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x59 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1495,7 +1495,7 @@ FUN_02065F8C: ; 0x02065F8C ldr r0, [r4, r0] add r1, #0x2 add r2, sp, #0x0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x59 lsl r0, r0, #0x2 ldr r0, [r4, r0] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 94714e95..f1e7c357 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -73,7 +73,7 @@ FUN_0208A3C8: ; 0x0208A3C8 ldr r0, [r4, #0x50] bl FUN_020853A8 ldr r0, [r4, #0x14] - bl FUN_020136C0 + bl DestroyListMenuCursorObj ldr r0, [r4, #0x4] bl String_dtor ldr r0, [r4, #0x8] |