diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-19 21:15:40 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-19 21:15:40 -0400 |
commit | 8e300b8f7f14f2ef2a1479a27f0e5aed1aa36d40 (patch) | |
tree | a269452187111f54109cfbd3fb02c270fb08f17b /arm9/asm | |
parent | ded31ee11b7c6f4aed68bca2a53a4372ea713492 (diff) |
Decompile ListMenu_ProcessInput
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/scrcmd_asm.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020010A8.s | 180 | ||||
-rw-r--r-- | arm9/asm/unk_02001B80.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020023C0.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02016B94.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02048120.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02050E48.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 20 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02072548.s | 42 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0207550C.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020772F0.s | 30 | ||||
-rw-r--r-- | arm9/asm/unk_0207D5BC.s | 88 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0208A338.s | 4 |
19 files changed, 140 insertions, 278 deletions
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 3d6645c2..e481c6f1 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -3534,7 +3534,7 @@ FUN_0203CBE8: ; 0x0203CBE8 mov r1, #0x1 bl FUN_02039438 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0x1 bl FUN_02039438 diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s index 7c6c1aa7..0551ad9c 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -5,144 +5,6 @@ .text - thumb_func_start FUN_02001204 -FUN_02001204: ; 0x02001204 - push {r4-r6, lr} - add r4, r0, #0x0 - add r1, r4, #0x0 - ldr r6, _020012FC ; =gMain - mov r3, #0x0 - add r1, #0x33 - strb r3, [r1, #0x0] - ldr r1, [r6, #0x48] - mov r2, #0x1 - add r5, r1, #0x0 - tst r5, r2 - beq _0200122C - ldrh r1, [r4, #0x2c] - ldrh r0, [r4, #0x2e] - ldr r2, [r4, #0x0] - add r0, r1, r0 - lsl r0, r0, #0x3 - add r0, r2, r0 - ldr r0, [r0, #0x4] - pop {r4-r6, pc} -_0200122C: - mov r5, #0x2 - tst r1, r5 - beq _02001236 - sub r0, r5, #0x4 - pop {r4-r6, pc} -_02001236: - ldr r5, [r6, #0x4c] - mov r1, #0x40 - tst r1, r5 - beq _02001254 - add r1, r2, #0x0 - bl FUN_02001AA4 - cmp r0, #0x0 - bne _0200124E - mov r0, #0x1 - add r4, #0x33 - strb r0, [r4, #0x0] -_0200124E: - mov r0, #0x0 - mvn r0, r0 - pop {r4-r6, pc} -_02001254: - mov r1, #0x80 - add r3, r5, #0x0 - tst r3, r1 - beq _02001274 - add r1, r2, #0x0 - add r3, r2, #0x0 - bl FUN_02001AA4 - cmp r0, #0x0 - bne _0200126E - mov r0, #0x2 - add r4, #0x33 - strb r0, [r4, #0x0] -_0200126E: - mov r0, #0x0 - mvn r0, r0 - pop {r4-r6, pc} -_02001274: - ldrh r0, [r4, #0x1a] - lsl r0, r0, #0x17 - lsr r0, r0, #0x1e - beq _02001284 - cmp r0, #0x1 - beq _0200128A - cmp r0, #0x2 - beq _0200129C -_02001284: - mov r0, #0x0 - add r1, r0, #0x0 - b _020012AC -_0200128A: - mov r0, #0x20 - mov r1, #0x10 - and r0, r5 - and r1, r5 - lsl r0, r0, #0x10 - lsl r1, r1, #0x10 - lsr r0, r0, #0x10 - lsr r1, r1, #0x10 - b _020012AC -_0200129C: - lsl r0, r1, #0x2 - add r1, #0x80 - and r0, r5 - and r1, r5 - lsl r0, r0, #0x10 - lsl r1, r1, #0x10 - lsr r0, r0, #0x10 - lsr r1, r1, #0x10 -_020012AC: - cmp r0, #0x0 - beq _020012D0 - ldrh r2, [r4, #0x12] - add r0, r4, #0x0 - mov r1, #0x1 - lsl r2, r2, #0x18 - lsr r2, r2, #0x18 - mov r3, #0x0 - bl FUN_02001AA4 - cmp r0, #0x0 - bne _020012CA - mov r0, #0x3 - add r4, #0x33 - strb r0, [r4, #0x0] -_020012CA: - mov r0, #0x0 - mvn r0, r0 - pop {r4-r6, pc} -_020012D0: - cmp r1, #0x0 - beq _020012F4 - ldrh r2, [r4, #0x12] - mov r1, #0x1 - add r0, r4, #0x0 - lsl r2, r2, #0x18 - lsr r2, r2, #0x18 - add r3, r1, #0x0 - bl FUN_02001AA4 - cmp r0, #0x0 - bne _020012EE - mov r0, #0x4 - add r4, #0x33 - strb r0, [r4, #0x0] -_020012EE: - mov r0, #0x0 - mvn r0, r0 - pop {r4-r6, pc} -_020012F4: - mov r0, #0x0 - mvn r0, r0 - pop {r4-r6, pc} - nop -_020012FC: .word gMain - thumb_func_start FUN_02001300 FUN_02001300: ; 0x02001300 push {r4, lr} @@ -174,14 +36,14 @@ FUN_02001328: ; 0x02001328 ldr r0, [r4, #0xc] lsl r1, r1, #0x1c lsr r1, r1, #0x1c - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r4, #0x2c] ldrh r3, [r4, #0x12] add r0, r4, #0x0 mov r2, #0x0 - bl FUN_02001714 + bl ListMenuPrintEntries add r0, r4, #0x0 - bl FUN_020017AC + bl ListMenuDrawCursor ldr r0, [r4, #0xc] bl CopyWindowToVram pop {r4, pc} @@ -221,7 +83,7 @@ _0200136E: mov r2, #0x1 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02001AA4 + bl ListMenuChangeSelection b _020013AC _02001398: cmp r0, #0x80 @@ -232,7 +94,7 @@ _02001398: lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r3, r2, #0x0 - bl FUN_02001AA4 + bl ListMenuChangeSelection _020013AC: ldr r1, [sp, #0x18] cmp r1, #0x0 @@ -742,8 +604,8 @@ _02001710: add sp, #0x18 pop {r4-r6, pc} - thumb_func_start FUN_02001714 -FUN_02001714: ; 0x02001714 + thumb_func_start ListMenuPrintEntries +ListMenuPrintEntries: ; 0x02001714 push {r4-r7, lr} sub sp, #0x14 add r5, r0, #0x0 @@ -824,8 +686,8 @@ _020017A6: pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_020017AC -FUN_020017AC: ; 0x020017AC + thumb_func_start ListMenuDrawCursor +ListMenuDrawCursor: ; 0x020017AC push {r3-r5, lr} add r4, r0, #0x0 ldrh r0, [r4, #0x1a] @@ -1109,12 +971,12 @@ FUN_0200198C: ; 0x0200198C ldr r0, [r5, #0xc] lsl r1, r1, #0x1c lsr r1, r1, #0x1c - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r5, #0x2c] ldrh r3, [r5, #0x12] add r0, r5, #0x0 mov r2, #0x0 - bl FUN_02001714 + bl ListMenuPrintEntries add sp, #0x8 pop {r3-r7, pc} _020019B8: @@ -1151,7 +1013,7 @@ _020019B8: add r0, r5, #0x0 mov r2, #0x0 add r3, r4, #0x0 - bl FUN_02001714 + bl ListMenuPrintEntries ldrb r0, [r5, #0x17] lsl r0, r0, #0x1c lsr r2, r0, #0x1c @@ -1207,7 +1069,7 @@ _02001A46: add r0, r5, #0x0 lsr r1, r1, #0x10 lsr r2, r2, #0x10 - bl FUN_02001714 + bl ListMenuPrintEntries ldr r0, [r5, #0xc] bl FUN_0201AB0C lsl r0, r0, #0x13 @@ -1228,8 +1090,8 @@ _02001A46: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02001AA4 -FUN_02001AA4: ; 0x02001AA4 + thumb_func_start ListMenuChangeSelection +ListMenuChangeSelection: ; 0x02001AA4 push {r3-r7, lr} sub sp, #0x10 str r1, [sp, #0x0] @@ -1298,10 +1160,10 @@ _02001B1A: add r0, r4, #0x0 bl FUN_02001804 add r0, r4, #0x0 - bl FUN_020017AC + bl ListMenuDrawCursor add r0, r4, #0x0 mov r1, #0x0 - bl FUN_02001B64 + bl ListMenuCallSelectionChangedCallback ldr r0, [r4, #0xc] bl CopyWindowToVram b _02001B5E @@ -1314,10 +1176,10 @@ _02001B38: add r1, r6, #0x0 bl FUN_0200198C add r0, r4, #0x0 - bl FUN_020017AC + bl ListMenuDrawCursor add r0, r4, #0x0 mov r1, #0x0 - bl FUN_02001B64 + bl ListMenuCallSelectionChangedCallback ldr r0, [r4, #0xc] bl CopyWindowToVram _02001B5E: @@ -1325,8 +1187,8 @@ _02001B5E: add sp, #0x10 pop {r3-r7, pc} - thumb_func_start FUN_02001B64 -FUN_02001B64: ; 0x02001B64 + thumb_func_start ListMenuCallSelectionChangedCallback +ListMenuCallSelectionChangedCallback: ; 0x02001B64 push {r3-r5, lr} ldr r3, [r0, #0x4] add r2, r1, #0x0 diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 4962171d..c00d6dd7 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -634,7 +634,7 @@ FUN_02001FF4: ; 0x02001FF4 bl FUN_02002E4C add r1, r0, #0x0 ldr r0, [r5, #0x4] - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r5, #0x19] ldrb r1, [r5, #0x16] ldrb r7, [r5, #0x17] diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index baa1b890..54d01d03 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -500,7 +500,7 @@ _0200275C: bl FUN_02002A00 ldrb r1, [r4, #0x12] ldr r0, [r4, #0x4] - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r4, #0xa] strb r0, [r4, #0xc] ldrb r0, [r4, #0xb] diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s index 3c92650d..a050d569 100644 --- a/arm9/asm/unk_02016B94.s +++ b/arm9/asm/unk_02016B94.s @@ -5886,8 +5886,8 @@ FUN_0201960C: ; 0x0201960C pop {r4, pc} .balign 4 - thumb_func_start FUN_02019620 -FUN_02019620: ; 0x02019620 + thumb_func_start FillWindowPixelBuffer +FillWindowPixelBuffer: ; 0x02019620 push {r3-r5, lr} add r4, r0, #0x0 ldrb r2, [r4, #0x4] diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index f0cdc150..38fb3842 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -966,7 +966,7 @@ _0203576C: add r0, r5, #0x0 add r0, #0x10 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0203589C ; =0x00000143 mov r0, #0x0 mov r1, #0x1a diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 6f303045..7c046e25 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -209,7 +209,7 @@ _02048298: add r0, r4, #0x0 add r0, #0xc mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -263,7 +263,7 @@ FUN_020482F4: ; 0x020482F4 add r0, r5, #0x0 add r0, #0xc mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x1c] ldr r1, [sp, #0x10] add r2, r6, #0x0 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index c8a8a153..b5eed02a 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1711,7 +1711,7 @@ FUN_02051B68: ; 0x02051B68 bl FUN_0200CB00 ldr r0, [sp, #0x20] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r7, #0x0 add r6, r7, #0x0 add r4, r7, #0x0 @@ -1837,7 +1837,7 @@ FUN_02051C88: ; 0x02051C88 bl FUN_0200CB00 add r0, r7, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r6, #0x0 add r4, r6, #0x0 _02051CE0: diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 8c5ffee8..024e66de 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -246,7 +246,7 @@ FUN_02062770: ; 0x02062770 add r4, r0, #0x0 add r0, #0xc0 ldr r0, [r0, #0x0] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r1, _020627C8 ; =gMain ldr r3, [r1, #0x48] mov r1, #0x2 @@ -467,7 +467,7 @@ _0206290C: _02062912: add r0, #0xe4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x0 str r3, [sp, #0x0] ldrh r0, [r4, #0x1a] @@ -578,7 +578,7 @@ FUN_020629D8: ; 0x020629D8 _020629EE: add r0, #0xe4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x0 str r3, [sp, #0x0] ldrh r0, [r4, #0x1a] @@ -1173,7 +1173,7 @@ FUN_02062DB0: ; 0x02062DB0 add r4, #0xe4 add r0, r4, #0x0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3-r4, pc} .balign 4 @@ -1385,7 +1385,7 @@ FUN_02063028: ; 0x02063028 add r0, r5, #0x0 add r0, #0xd4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r5, #0x18] mov r6, #0x0 cmp r0, #0x0 @@ -1474,7 +1474,7 @@ _02063094: add r0, r5, #0x0 add r0, #0xe4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x0 str r3, [sp, #0x0] ldr r0, _02063174 ; =0x0001020F @@ -1579,7 +1579,7 @@ FUN_02063208: ; 0x02063208 add r4, r0, #0x0 add r0, #0xe4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x0 str r3, [sp, #0x0] ldr r0, _02063234 ; =0x0001020F @@ -1626,7 +1626,7 @@ FUN_02063264: ; 0x02063264 add r4, r0, #0x0 add r0, #0xe4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x0 str r3, [sp, #0x0] ldr r0, _020632A0 ; =0x0001020F @@ -1675,7 +1675,7 @@ FUN_020632A4: ; 0x020632A4 add r0, r4, #0x0 add r0, #0xd4 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x1 str r0, [sp, #0x1c] mov r0, #0x0 @@ -1901,7 +1901,7 @@ FUN_02063430: ; 0x02063430 add r0, r4, #0x0 add r0, #0xf4 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0x0 str r1, [sp, #0x0] ldr r0, _020634D8 ; =0x00010200 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index e238bee0..e2feaf96 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -146,7 +146,7 @@ FUN_020654D0: ; 0x020654D0 add r5, r1, #0x0 lsl r0, r0, #0x4 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0x0 mov r0, #0x69 lsl r0, r0, #0x2 @@ -256,7 +256,7 @@ FUN_020655B0: ; 0x020655B0 add r4, r1, #0x0 lsl r0, r0, #0x4 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0x0 ldr r0, _02065638 ; =gMain mov r1, #0x2 @@ -967,12 +967,12 @@ FUN_02065AF4: ; 0x02065AF4 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x65 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r5, #0x1b] ldr r1, [r5, #0x0] add r0, r0, #0x1 @@ -1295,7 +1295,7 @@ FUN_02065DD8: ; 0x02065DD8 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r7, #0x43 ldr r6, _02065ECC ; =UNK_020F7EAC mov r4, #0x0 @@ -2006,7 +2006,7 @@ FUN_02066334: ; 0x02066334 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3-r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 879f7f48..2c5a9ba6 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -147,7 +147,7 @@ FUN_0206C700: ; 0x0206C700 bl FUN_02019064 ldr r0, [r4, #0x4] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x4] mov r1, #0x0 mov r2, #0x1 @@ -2673,7 +2673,7 @@ FUN_0206DD6C: ; 0x0206DD6C bl FreeToHeap ldr r0, [r4, #0x4] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x2c] bl Options_GetTextFrameDelay mov r3, #0x0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index b7b79b0e..b1a1edbd 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -5223,7 +5223,7 @@ FUN_02071CB4: ; 0x02071CB4 lsl r1, r1, #0x4 add r0, r0, r1 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r6, #0x0 bl FUN_02072B7C @@ -5645,7 +5645,7 @@ _02072054: bl FUN_0200D0BC add r0, r5, r7 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl FUN_0207322C add r0, r4, #0x0 @@ -5902,7 +5902,7 @@ _02072282: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl FUN_0207322C mov r0, #0xb @@ -6066,7 +6066,7 @@ _020723D6: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl FUN_0207322C ldr r0, _02072410 ; =0x000005A4 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 5b3ed0a3..901eea03 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -1042,14 +1042,14 @@ FUN_02072D1C: ; 0x02072D1C str r0, [sp, #0x4] add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x1 lsl r0, r0, #0x4 add r7, r5, #0x4 str r0, [sp, #0x8] add r0, r7, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0x0 str r0, [sp, #0xc] add r0, r4, #0x2 @@ -1058,7 +1058,7 @@ FUN_02072D1C: ; 0x02072D1C str r0, [sp, #0x10] add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0x0 str r0, [sp, #0x14] add r0, r4, #0x3 @@ -1066,7 +1066,7 @@ FUN_02072D1C: ; 0x02072D1C ldr r0, [sp, #0x14] mov r1, #0x0 add r0, r0, r4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r6, #0x0 bl FUN_02072A54 @@ -1179,13 +1179,13 @@ FUN_02072E4C: ; 0x02072E4C lsl r0, r6, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02072A54 @@ -1249,13 +1249,13 @@ FUN_02072EE4: ; 0x02072EE4 lsl r0, r6, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02072A54 @@ -1319,13 +1319,13 @@ FUN_02072F78: ; 0x02072F78 lsl r0, r6, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02072A54 @@ -1367,13 +1367,13 @@ FUN_02072FDC: ; 0x02072FDC lsl r0, r6, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02072A54 @@ -1463,12 +1463,12 @@ FUN_02073094: ; 0x02073094 add r4, r1, #0x0 add r0, r5, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7d lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x1 tst r0, r4 beq _020730FE @@ -1563,7 +1563,7 @@ FUN_02073160: ; 0x02073160 _0207317A: add r0, r4, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x0 mvn r0, r0 cmp r6, r0 @@ -1634,7 +1634,7 @@ FUN_020731E8: ; 0x020731E8 _02073202: add r0, r5, r6 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x0 mvn r0, r0 cmp r4, r0 @@ -1763,7 +1763,7 @@ FUN_020732F4: ; 0x020732F4 add r0, r4, r6 mov r1, #0x0 add r7, r2, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r7, #0x0 beq _02073318 cmp r7, #0x1 @@ -1817,7 +1817,7 @@ FUN_02073364: ; 0x02073364 add r0, r4, r7 mov r1, #0x0 add r6, r2, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #0x0 beq _0207338C cmp r6, #0x1 @@ -1880,7 +1880,7 @@ FUN_020733E4: ; 0x020733E4 add r0, r4, r6 mov r1, #0x0 add r7, r2, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r7, #0x0 ldr r0, _02073440 ; =0x0000069C bne _0207340E @@ -1928,7 +1928,7 @@ FUN_02073448: ; 0x02073448 add r0, r4, r7 mov r1, #0x0 add r6, r2, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #0x6 ldr r0, _020734B8 ; =0x0000069C bhs _02073476 @@ -2046,7 +2046,7 @@ FUN_020734C0: ; 0x020734C0 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r4, #0x0 str r4, [sp, #0x14] add r7, r5, #0x0 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 6635b399..a854727b 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -316,7 +316,7 @@ _02074018: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl FUN_0207322C mov r0, #0xf diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 14488621..743c2845 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -1403,7 +1403,7 @@ _020760D4: lsl r1, r1, #0x4 add r0, r0, r1 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _02076134 ; =0x00000B25 add r0, r5, #0x0 ldrb r1, [r5, r1] @@ -1672,7 +1672,7 @@ _020762DC: lsl r1, r1, #0x4 add r0, r0, r1 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _020763E0 ; =0x00000B25 add r0, r4, #0x0 ldrb r1, [r4, r1] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index a5d7b26d..6ed83b14 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1013,7 +1013,7 @@ _02077594: ldr r0, _020776B0 ; =0x00000448 mov r1, #0xf add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _020776B0 ; =0x00000448 mov r2, #0x1 add r0, r4, r0 @@ -3359,7 +3359,7 @@ FUN_020788C4: ; 0x020788C4 _020788DE: add r0, r5, #0x0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0x0 str r1, [sp, #0x0] ldr r0, _02078908 ; =0x000E0F01 @@ -3524,7 +3524,7 @@ _020789D8: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x3 str r0, [sp, #0x0] mov r0, #0x7 @@ -3548,7 +3548,7 @@ _020789D8: ldr r0, _02078B74 ; =0x00000438 mov r1, #0x1 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r5, #0x0] cmp r1, #0x5 bne _02078A90 @@ -3581,7 +3581,7 @@ _02078A90: ldr r0, _02078B78 ; =0x00000448 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x5e ldr r0, _02078B78 ; =0x00000448 lsl r2, r2, #0x2 @@ -3640,7 +3640,7 @@ _02078B0E: bl FUN_02019064 add r0, r7, r6 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #0x1 cmp r4, #0x3 blt _02078B0E @@ -3661,7 +3661,7 @@ _02078B0E: ldr r0, _02078B84 ; =0x00000428 mov r1, #0x0 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r4-r7, pc} .balign 4 @@ -4212,7 +4212,7 @@ FUN_02078FA0: ; 0x02078FA0 mov r1, #0x0 add r5, r2, #0x0 add r4, r3, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x0 ldr r3, _0207906C ; =0x000D0E0F add r0, #0x30 @@ -4266,7 +4266,7 @@ _02079012: strh r1, [r0, #0x2] add r0, r6, r7 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 add r1, sp, #0xc bl CopyU16ArrayToString @@ -4563,7 +4563,7 @@ _0207924A: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xc str r0, [sp, #0x0] mov r2, #0x0 @@ -4599,7 +4599,7 @@ _0207927C: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xc str r0, [sp, #0x0] mov r2, #0x0 @@ -4632,7 +4632,7 @@ _020792CA: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xc str r0, [sp, #0x0] mov r2, #0x0 @@ -4708,7 +4708,7 @@ _0207936A: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x56 lsl r0, r0, #0x2 ldrh r0, [r4, r0] @@ -4835,7 +4835,7 @@ _02079470: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xc str r0, [sp, #0x0] mov r2, #0x0 @@ -5203,7 +5203,7 @@ FUN_0207974C: ; 0x0207974C add r5, r0, #0x0 str r3, [sp, #0x14] str r2, [sp, #0x30] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _0207982C ; =UNK_020F9D30 ldr r0, [sp, #0x10] mov r7, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 2546b905..0fab5e2c 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -82,7 +82,7 @@ _0207D5C4: bl FUN_02019150 add r0, r4, r6 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -300,7 +300,7 @@ FUN_0207D768: ; 0x0207D768 lsl r4, r4, #0x2 add r0, r5, r4 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0x0 add r2, r4, #0x0 str r1, [sp, #0x0] @@ -371,7 +371,7 @@ FUN_0207D800: ; 0x0207D800 lsl r6, r6, #0x2 add r0, r5, r6 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0x0 add r0, #0x8c ldr r0, [r5, r0] @@ -444,7 +444,7 @@ FUN_0207D8A0: ; 0x0207D8A0 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0207D918 ; =0x0000025E ldrh r2, [r5, r0] cmp r2, #0x0 @@ -504,7 +504,7 @@ FUN_0207D924: ; 0x0207D924 add r4, r1, #0x0 add r0, r5, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x0 str r0, [sp, #0x0] ldr r3, _0207D954 ; =0x000F0E00 @@ -1151,37 +1151,37 @@ FUN_0207DE3C: ; 0x0207DE3C lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0x93 lsl r1, r1, #0x2 ldr r0, [r4, r1] @@ -1522,7 +1522,7 @@ FUN_0207E190: ; 0x0207E190 lsl r0, r0, #0x2 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl FUN_0207B628 add r6, r0, #0x0 @@ -1601,49 +1601,49 @@ FUN_0207E200: ; 0x0207E200 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1875,7 +1875,7 @@ _0207E4C6: ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0207E584 ; =0x00000674 mov r1, #0xa5 ldr r0, [r4, r2] @@ -1929,7 +1929,7 @@ _0207E4C6: sub r0, #0x8 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0207E584 ; =0x00000674 mov r1, #0xa3 ldr r0, [r4, r2] @@ -1991,25 +1991,25 @@ _0207E5BC: lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207EA44 @@ -2074,25 +2074,25 @@ _0207E678: lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207EA44 @@ -2144,7 +2144,7 @@ FUN_0207E70C: ; 0x0207E70C lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x0 str r0, [sp, #0x0] ldr r2, _0207E780 ; =0x00000699 @@ -2214,7 +2214,7 @@ _0207E7BC: ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0207E830 ; =0x00000674 mov r1, #0xa5 ldr r0, [r4, r2] @@ -2278,7 +2278,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r0] mov r1, #0x0 add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0207E994 ; =0x00000674 mov r1, #0xba ldr r0, [r5, r0] @@ -2436,13 +2436,13 @@ FUN_0207E9A0: ; 0x0207E9A0 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0207EA34 ; =0x0000069A mov r1, #0x3 ldrb r0, [r4, r0] @@ -2659,19 +2659,19 @@ FUN_0207EB64: ; 0x0207EB64 ldr r0, [r5, r0] mov r1, #0x0 add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] mov r1, #0x0 add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] mov r1, #0x0 add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0x2 bl GetWazaAttr @@ -2819,7 +2819,7 @@ FUN_0207ECDC: ; 0x0207ECDC ldr r0, [r4, r0] mov r1, #0x0 add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0x4 bl FUN_0207EA44 @@ -2862,7 +2862,7 @@ FUN_0207ED30: ; 0x0207ED30 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x91 lsl r0, r0, #0x2 ldr r1, [r4, r0] @@ -2873,7 +2873,7 @@ FUN_0207ED30: ; 0x0207ED30 lsl r0, r0, #0x4 add r0, r1, r0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _0207EDB0 ; =0x0000068D add r0, r4, #0x0 ldrb r1, [r4, r1] @@ -2946,7 +2946,7 @@ _0207EDEE: _0207EDF6: add r0, r4, #0x0 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0207EE24 ; =0x00000674 mov r1, #0x9c ldr r0, [r5, r2] @@ -2977,7 +2977,7 @@ FUN_0207EE2C: ; 0x0207EE2C add r4, r1, #0x0 add r0, #0x50 mov r1, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0x0 mov r1, #0xa bl GetWazaAttr @@ -3098,7 +3098,7 @@ _0207EF10: bl FUN_0200D0BC add r0, r6, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _0207EF64 ; =0x00000674 add r1, r5, #0x0 ldr r0, [r4, r2] diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 7e7745fe..b3f2444c 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -552,7 +552,7 @@ FUN_02086784: ; 0x02086784 bl FUN_0200D0BC add r0, r5, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0x0 bl CopyWindowToVram add sp, #0x14 @@ -567,7 +567,7 @@ FUN_020867EC: ; 0x020867EC str r0, [sp, #0xc] str r2, [sp, #0x10] add r6, r3, #0x0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _02086874 ; =0x0000013F mov r0, #0x0 mov r1, #0x1a diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 2be81a9f..94714e95 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -556,7 +556,7 @@ FUN_0208A77C: ; 0x0208A77C bl FUN_02019064 add r0, r7, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r6, #0x0 add r4, r6, #0x0 _0208A7D2: @@ -644,7 +644,7 @@ FUN_0208A82C: ; 0x0208A82C bl FUN_02019064 add r0, r7, #0x0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r6, #0x0 add r4, r6, #0x0 _0208A882: |