diff options
82 files changed, 1255 insertions, 1397 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 898904d3..18ed6d18 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -6,6 +6,7 @@ Static arm9 { Address 0x02000000 Object main.o + Object list_menu.o Object unk_020010A8.o Object unk_02001B80.o Object string_util.o diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index c1e91c9f..71187dd6 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -3490,7 +3490,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 440ba8e2..dba61431 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -5,358 +5,6 @@ .text - thumb_func_start FUN_020010A8 -FUN_020010A8: ; 0x020010A8 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - add r0, r3, #0x0 - mov r1, #0x38 - add r7, r2, #0x0 - str r3, [sp, #0x0] - bl AllocFromHeap - add r4, r0, #0x0 - add r3, r5, #0x0 - add r2, r4, #0x0 - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldr r0, [sp, #0x0] - bl FUN_02013690 - str r0, [r4, #0x28] - strh r6, [r4, #0x2c] - add r1, r4, #0x0 - strh r7, [r4, #0x2e] - mov r0, #0x0 - add r1, #0x30 - strb r0, [r1, #0x0] - add r1, r4, #0x0 - add r1, #0x31 - strb r0, [r1, #0x0] - add r1, r4, #0x0 - mov r2, #0xff - add r1, #0x32 - strb r2, [r1, #0x0] - add r1, r4, #0x0 - add r1, #0x33 - strb r0, [r1, #0x0] - add r1, r4, #0x0 - ldr r0, [sp, #0x0] - add r1, #0x34 - strb r0, [r1, #0x0] - add r0, r4, #0x0 - ldrb r1, [r4, #0x17] - add r0, #0x20 - ldrb r2, [r0, #0x0] - lsl r1, r1, #0x18 - mov r0, #0xf - lsr r3, r1, #0x1c - mov r1, #0xf - bic r2, r0 - and r3, r1 - orr r3, r2 - add r2, r4, #0x0 - add r2, #0x20 - strb r3, [r2, #0x0] - add r2, r4, #0x0 - add r2, #0x20 - ldrb r2, [r2, #0x0] - mov r3, #0xf0 - bic r2, r3 - ldrb r3, [r4, #0x18] - lsl r3, r3, #0x1c - lsr r3, r3, #0x1c - lsl r3, r3, #0x1c - lsr r3, r3, #0x18 - orr r3, r2 - add r2, r4, #0x0 - add r2, #0x20 - strb r3, [r2, #0x0] - add r2, r4, #0x0 - add r2, #0x21 - ldrb r2, [r2, #0x0] - bic r2, r0 - ldrb r0, [r4, #0x18] - lsl r0, r0, #0x18 - lsr r0, r0, #0x1c - and r0, r1 - add r1, r2, #0x0 - orr r1, r0 - add r0, r4, #0x0 - add r0, #0x21 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x22 - ldrb r0, [r0, #0x0] - mov r1, #0x3f - bic r0, r1 - ldrh r1, [r4, #0x1a] - lsl r1, r1, #0x1d - lsr r1, r1, #0x1d - lsl r1, r1, #0x18 - lsr r2, r1, #0x18 - mov r1, #0x3f - and r1, r2 - orr r1, r0 - add r0, r4, #0x0 - add r0, #0x22 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x24 - ldrb r0, [r0, #0x0] - mov r1, #0x7f - bic r0, r1 - ldrh r1, [r4, #0x1a] - lsl r1, r1, #0x11 - lsr r1, r1, #0x1a - lsl r1, r1, #0x18 - lsr r2, r1, #0x18 - mov r1, #0x7f - and r1, r2 - orr r1, r0 - add r0, r4, #0x0 - add r0, #0x24 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x24 - ldrb r1, [r0, #0x0] - mov r0, #0x80 - bic r1, r0 - add r0, r4, #0x0 - add r0, #0x24 - strb r1, [r0, #0x0] - ldrh r1, [r4, #0x10] - ldrh r0, [r4, #0x12] - cmp r1, r0 - bhs _020011AC - strh r1, [r4, #0x12] -_020011AC: - ldrb r2, [r4, #0x18] - ldr r0, [r4, #0x28] - lsl r1, r2, #0x1c - lsr r1, r1, #0x1c - lsl r1, r1, #0x18 - lsr r3, r1, #0x18 - ldrb r1, [r4, #0x17] - lsl r2, r2, #0x18 - lsr r2, r2, #0x1c - lsl r1, r1, #0x18 - lsr r1, r1, #0x1c - lsl r1, r1, #0x18 - lsl r2, r2, #0x18 - lsr r1, r1, #0x8 - lsr r2, r2, #0x10 - orr r1, r2 - orr r1, r3 - bl FUN_020136E0 - ldrb r1, [r4, #0x18] - ldr r0, [r4, #0xc] - lsl r1, r1, #0x1c - lsr r1, r1, #0x1c - bl FUN_02019620 - ldrh r1, [r4, #0x2c] - ldrh r3, [r4, #0x12] - add r0, r4, #0x0 - mov r2, #0x0 - bl FUN_02001714 - add r0, r4, #0x0 - bl FUN_020017AC - add r0, r4, #0x0 - mov r1, #0x1 - bl FUN_02001B64 - ldr r0, [r5, #0xc] - bl CopyWindowToVram - add r0, r4, #0x0 - pop {r3-r7, pc} - .balign 4 - - 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} - 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 FUN_02019620 - ldrh r1, [r4, #0x2c] - ldrh r3, [r4, #0x12] - add r0, r4, #0x0 - mov r2, #0x0 - bl FUN_02001714 - add r0, r4, #0x0 - bl FUN_020017AC - ldr r0, [r4, #0xc] - bl CopyWindowToVram - pop {r4, pc} - .balign 4 - thumb_func_start FUN_02001354 FUN_02001354: ; 0x02001354 push {r4-r6, lr} @@ -391,7 +39,7 @@ _0200136E: mov r2, #0x1 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02001AA4 + bl ListMenuChangeSelection b _020013AC _02001398: cmp r0, #0x80 @@ -402,7 +50,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 @@ -912,8 +560,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 @@ -994,8 +642,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] @@ -1279,12 +927,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: @@ -1321,7 +969,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 @@ -1377,7 +1025,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 @@ -1398,8 +1046,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] @@ -1468,10 +1116,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 @@ -1484,10 +1132,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: @@ -1495,8 +1143,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..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 @@ -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_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_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..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 @@ -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 2ec122fa..bf248464 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 @@ -1455,7 +1455,7 @@ _02063094: ldr r2, [sp, #0x18] add r0, #0xa0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0x0 add r1, #0xc0 str r0, [r1, #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 @@ -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] @@ -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 3d43d136..50cb5318 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 @@ -1110,7 +1110,7 @@ _02065C64: lsl r3, r3, #0x18 ldrh r2, [r5, r2] lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x16 lsl r1, r1, #0x4 str r0, [r5, r1] @@ -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 @@ -1362,7 +1362,7 @@ _02065E14: ldr r2, [sp, #0x4] add r0, r5, r0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x16 lsl r1, r1, #0x4 str r0, [r5, r1] @@ -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] @@ -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..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] @@ -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: diff --git a/arm9/global.inc b/arm9/global.inc index 71b29db9..59d2d3da 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -188,10 +188,10 @@ .extern FUN_02000EE8 .extern FUN_02000F18 .extern HandleDSLidAction -.extern FUN_020010A8 -.extern FUN_02001204 -.extern FUN_02001300 -.extern FUN_02001328 +.extern ListMenuInit +.extern ListMenu_ProcessInput +.extern DestroyListMenu +.extern RedrawListMenu .extern FUN_02001354 .extern FUN_020013C8 .extern FUN_020013E8 @@ -883,8 +883,8 @@ .extern FUN_0201365C .extern FUN_02013674 .extern FUN_02013690 -.extern FUN_020136C0 -.extern FUN_020136E0 +.extern DestroyListMenuCursorObj +.extern CreateListMenuCursorObj .extern FUN_020136F8 .extern MailMsg_init .extern MailMsg_init_withBank @@ -1098,7 +1098,7 @@ .extern FUN_020195D0 .extern FUN_020195E4 .extern FUN_0201960C -.extern FUN_02019620 +.extern FillWindowPixelBuffer .extern FUN_02019658 .extern FUN_02019684 .extern FUN_020196F4 @@ -7708,6 +7708,7 @@ .extern MTX_TransApply44 .extern NitroMain .extern gBacklightTop +.extern UNK_02016FA4 .extern OS_AllocFromArenaHi .extern OS_AllocFromArenaLo .extern OS_AllocFromHeap diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 0b72da2a..d9ec58bf 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -738,7 +738,7 @@ _021E2032: add r0, r4, r0 mov r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x6d lsl r1, r1, #2 str r0, [r4, r1] @@ -1045,7 +1045,7 @@ _021E22B8: mov r0, #0x6d lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #0x6d mov r1, #0xb5 @@ -1134,7 +1134,7 @@ MOD05_021E2368: ; 0x021E2368 mov r1, #0 ldr r0, [r6, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r6, r0] @@ -1189,7 +1189,7 @@ MOD05_021E23D0: ; 0x021E23D0 add r6, r0, #0 ldr r0, [r5, #0x18] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -1750,7 +1750,7 @@ MOD05_021E27E8: ; 0x021E27E8 bl FUN_0200CCA4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x7a mov r0, #0 mov r1, #0x1a @@ -1936,7 +1936,7 @@ MOD05_021E29C8: ; 0x021E29C8 str r1, [sp, #0xc] add r0, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E2A6C ; =0x00000141 mov r0, #0 mov r1, #0x1a @@ -2054,7 +2054,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 str r1, [sp, #0xc] add r0, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E2B7C ; =0x00000141 mov r0, #0 mov r1, #0x1a diff --git a/arm9/modules/05/asm/mod05_021E2B80.s b/arm9/modules/05/asm/mod05_021E2B80.s index 16e19ae0..8a1f9413 100644 --- a/arm9/modules/05/asm/mod05_021E2B80.s +++ b/arm9/modules/05/asm/mod05_021E2B80.s @@ -296,7 +296,7 @@ MOD05_CreateMessageBox: ; 0x021E2D9C _021E2DC8: ldr r0, [r4, #0xc] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 0666b52d..f83ed12c 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -146,7 +146,7 @@ _021E2F92: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #8 str r2, [sp] add r0, r5, #0 diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index 7a66cdcb..08407e83 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -279,7 +279,7 @@ MOD05_021E84F4: ; 0x021E84F4 bl FUN_02002E4C add r1, r0, #0 ldr r0, [r4, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD05_021E8410 ldr r0, [r4, #0x10] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index fe346300..0528681a 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2766,7 +2766,7 @@ _021E9C02: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3738,7 +3738,7 @@ _021EA430: lsl r0, r0, #8 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -5404,7 +5404,7 @@ _021EB18E: bl FUN_02017FB4 ldr r0, [r4] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] bl FUN_02019220 ldr r0, [r5] @@ -15277,7 +15277,7 @@ _021EFF54: add r0, r2, #0 add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #4] add r0, r5, #0 add r0, #0x20 @@ -15298,7 +15298,7 @@ MOD05_021EFFC8: ; 0x021EFFC8 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 ldr r0, [r5, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -15366,7 +15366,7 @@ _021F0056: mov r1, #0 ldr r0, [r5, #4] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5] bl ListMenu_dtor mov r0, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index d46e003b..9336c826 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -9220,7 +9220,7 @@ _0223DC8E: add r0, r2, #0 add r2, r1, #0 str r5, [sp, #0x20] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x78] add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -9246,7 +9246,7 @@ _0223DD0C: add r0, r4, #0 add r0, #0x18 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r5, r1 @@ -9456,7 +9456,7 @@ MOD06_0223DED0: ; 0x0223DED0 bne _0223DF1C add r0, #0x28 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x28 mov r1, #1 @@ -9560,7 +9560,7 @@ MOD06_0223DFB4: ; 0x0223DFB4 add r2, #2 bl FUN_02001448 ldr r0, [r5, #0x78] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r0, [r5, #0x78] mov r1, #0 @@ -9595,7 +9595,7 @@ _0223E006: mov r1, #0 ldr r0, [r5, #0x78] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x7c] bl ListMenu_dtor add r0, r5, #0 @@ -9637,7 +9637,7 @@ _0223E034: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x18 bl FUN_02019570 @@ -9832,7 +9832,7 @@ _0223E214: add r0, r5, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x48 mov r1, #1 @@ -9934,7 +9934,7 @@ _0223E2C4: add r0, r4, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223E380 ; =0x000005DC bl FUN_020054C8 add r0, r4, #0 @@ -10167,7 +10167,7 @@ MOD06_0223E4E8: ; 0x0223E4E8 add r4, r1, #0 add r0, #0x38 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #0 bne _0223E50A add r0, r5, #0 @@ -10429,7 +10429,7 @@ _0223E704: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x23 lsl r2, r2, #4 ldr r1, [r5, r2] @@ -10644,7 +10644,7 @@ _0223E88A: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x23 lsl r2, r2, #4 ldr r1, [r5, r2] @@ -11388,7 +11388,7 @@ _0223EEB8: mov r1, #0 add r0, r2, #0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _0223EF10 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x5c] @@ -11853,7 +11853,7 @@ _0223F2AA: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -12074,7 +12074,7 @@ _0223F49A: ldr r0, _0223F518 ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput _0223F4A4: mov r1, #1 mvn r1, r1 @@ -12611,7 +12611,7 @@ _0223F910: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -12727,7 +12727,7 @@ _0223FA02: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223FA5C ; =0x02252420 add r1, r4, #0 ldr r2, [r0] @@ -12966,7 +12966,7 @@ _0223FBDA: strb r0, [r2] ldr r0, [r1] ldr r0, [r0, #0x5c] - bl FUN_02001328 + bl RedrawListMenu ldr r0, _0223FCF0 ; =0x02252420 mov r1, #3 ldr r0, [r0] @@ -12995,7 +12995,7 @@ _0223FC14: _0223FC32: ldr r0, [sp, #4] ldr r0, [r0, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 bl FUN_0202DF08 cmp r0, #0xff @@ -13094,7 +13094,7 @@ MOD06_0223FD08: ; 0x0223FD08 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r4, #0x60] mov r1, #4 bl FUN_020021AC @@ -13421,7 +13421,7 @@ MOD06_0223FFD4: ; 0x0223FFD4 mov r0, #0 bl FUN_02031A24 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240020 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13459,7 +13459,7 @@ MOD06_02240030: ; 0x02240030 add r0, r5, #0 bl MOD06_0223F9D8 ldr r0, [r5, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r5, #0x60] mov r1, #4 bl FUN_020021AC @@ -13681,7 +13681,7 @@ MOD06_02240204: ; 0x02240204 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240248 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13719,7 +13719,7 @@ MOD06_02240258: ; 0x02240258 add r0, r5, #0 bl MOD06_0223F9D8 ldr r0, [r5, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r5, #0x60] mov r1, #4 bl FUN_020021AC @@ -13778,7 +13778,7 @@ _022402DC: add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r0, #0xa bl FUN_020315D8 cmp r0, #0 @@ -13804,7 +13804,7 @@ MOD06_02240310: ; 0x02240310 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240354 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13843,7 +13843,7 @@ MOD06_02240364: ; 0x02240364 ldr r0, [r0] mov r1, #0xf add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x20 mov r1, #0 @@ -13853,7 +13853,7 @@ MOD06_02240364: ; 0x02240364 mov r1, #0 ldr r0, [r4, #0x5c] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0x20 bl FUN_02019570 @@ -14666,7 +14666,7 @@ _022409D2: add r2, #0x78 ldrh r2, [r2] mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5] add r5, #0x34 add r0, r5, #0 @@ -14686,7 +14686,7 @@ MOD06_02240A28: ; 0x02240A28 beq _02240A62 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0x34 mov r1, #1 @@ -14711,7 +14711,7 @@ MOD06_02240A64: ; 0x02240A64 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r2, r5, #0 ldr r0, [r5] @@ -14855,7 +14855,7 @@ _02240B4A: add r2, #0x7a ldrh r2, [r2] mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #4] add r5, #0x44 add r0, r5, #0 @@ -14873,7 +14873,7 @@ MOD06_02240BB8: ; 0x02240BB8 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r2, r5, #0 ldr r0, [r5, #4] @@ -14921,7 +14921,7 @@ _02240C1A: beq _02240C50 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0x44 mov r1, #1 @@ -14992,7 +14992,7 @@ MOD06_02240C58: ; 0x02240C58 bl FUN_0200CCA4 ldr r0, [sp, #0x24] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r1, r0, #0 add r1, #0x78 @@ -19028,7 +19028,7 @@ MOD06_02242CDC: ; 0x02242CDC mov r1, #0 add r2, r5, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit add r4, #0x88 str r0, [r4] add sp, #0x14 @@ -19287,7 +19287,7 @@ MOD06_02242F1C: ; 0x02242F1C add r4, r0, #0 add r0, #0x88 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #1 mvn r1, r1 cmp r0, r1 @@ -19331,7 +19331,7 @@ _02242F6E: add r0, r4, #0 add r0, #0x88 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #1 mvn r1, r1 cmp r0, r1 @@ -19439,7 +19439,7 @@ MOD06_02243024: ; 0x02243024 mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r6, #0x74] mov r1, #0 bl FUN_0200CCF8 @@ -19480,7 +19480,7 @@ MOD06_02243080: ; 0x02243080 add r0, r5, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x54] ldr r1, [sp, #0xc] add r2, r4, #0 @@ -40892,7 +40892,7 @@ MOD06_0224D46C: ; 0x0224D46C bl FUN_0200CCA4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0xb bl String_ctor @@ -41813,7 +41813,7 @@ MOD06_0224DC5C: ; 0x0224DC5C bl FUN_02019064 ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #4] mov r1, #0 mov r2, #1 @@ -41859,7 +41859,7 @@ MOD06_0224DCD8: ; 0x0224DCD8 _0224DCEC: ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r1, r6, #0 bl StringDup @@ -42077,7 +42077,7 @@ _0224DEA8: str r0, [r6, #0xc] ldr r0, [r6, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [r6] _0224DED2: @@ -42148,7 +42148,7 @@ MOD06_0224DF1C: ; 0x0224DF1C bl BufferIntegerAsString ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r7, #0 add r6, r5, #0 add r4, r7, #0 @@ -42332,7 +42332,7 @@ _0224E084: mov r1, #0 ldr r0, _0224E16C ; =MOD6_022523A0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #8] ldr r0, [r5, #4] mov r1, #0 @@ -42445,7 +42445,7 @@ _0224E1C0: mov r1, #0 ldr r0, [r6, #8] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r6, #4] bl FUN_02019570 ldr r0, [r6, #4] @@ -42463,7 +42463,7 @@ MOD06_0224E1E4: ; 0x0224E1E4 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #8] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0 add r4, r0, #0 mvn r1, r1 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 3cef2d24..48e34649 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -4900,19 +4900,19 @@ MOD07_02214600: ; 0x02214600 mov r1, #0 str r2, [sp, #0xc] str r3, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x30 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] ldr r1, [sp, #8] str r0, [sp] diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 55a90a71..ade67f55 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -4718,7 +4718,7 @@ MOD09_022143F8: ; 0x022143F8 ldr r0, _02214450 ; =0x00002050 mov r1, #0xf add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02214454 ; =0x00001FA8 add r1, r5, #0 ldr r0, [r4, r0] @@ -6461,7 +6461,7 @@ _02215362: _02215368: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022153A8 ; =0x00001FA8 mov r1, #0x3c ldr r0, [r4, r0] @@ -6748,7 +6748,7 @@ _022155EE: ldr r0, [sp, #8] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r0, [r6, #8] cmp r0, #0 beq _0221563E @@ -6884,22 +6884,22 @@ MOD09_022156FC: ; 0x022156FC ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4] add r0, r4, #0 ldrb r1, [r1, #0x11] @@ -7122,7 +7122,7 @@ MOD09_022158EC: ; 0x022158EC lsl r0, r6, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #1 lsl r0, r0, #4 str r0, [sp, #0x18] @@ -7131,7 +7131,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x18] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #2 lsl r0, r0, #4 str r0, [sp, #0x14] @@ -7140,7 +7140,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x14] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #3 lsl r0, r0, #4 str r0, [sp, #0x10] @@ -7149,7 +7149,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x10] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #4 lsl r0, r0, #4 str r0, [sp, #0xc] @@ -7158,12 +7158,12 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0xc] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215A20 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 str r2, [sp] str r2, [sp, #4] @@ -7269,63 +7269,63 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #5 lsl r0, r0, #6 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xe0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xf0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #1 lsl r0, r0, #8 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x11 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x12 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xd0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x15 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] lsl r0, r4, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7333,7 +7333,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7341,7 +7341,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7349,28 +7349,28 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #5 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #6 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #7 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7378,7 +7378,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7386,35 +7386,35 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #4 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #1 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #2 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #3 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 str r2, [sp] str r2, [sp, #4] @@ -7502,68 +7502,68 @@ MOD09_02215C44: ; 0x02215C44 mul r4, r1 add r0, #0x60 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x80 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x90 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xa0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #1 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] lsl r0, r4, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #2 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #3 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #5 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #4 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] add r2, r5, #0 ldrb r3, [r0, #0x11] @@ -7652,32 +7652,32 @@ MOD09_02215DA8: ; 0x02215DA8 ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7785,62 +7785,62 @@ MOD09_02215ED0: ; 0x02215ED0 ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x90 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xa0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x80 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xb0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7983,27 +7983,27 @@ MOD09_0221609C: ; 0x0221609C ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -8112,37 +8112,37 @@ MOD09_022161B0: ; 0x022161B0 ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -8275,7 +8275,7 @@ MOD09_02216314: ; 0x02216314 ldr r0, _02216338 ; =0x00002060 mov r1, #0xf add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD09_0221633C pop {r4, pc} @@ -14486,7 +14486,7 @@ _022195C4: ldr r0, [r5, #0x2c] add r1, r7, #0 add r0, r0, r4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0x10 cmp r6, #5 @@ -14588,7 +14588,7 @@ MOD09_02219694: ; 0x02219694 add r0, r4, r6 mov r1, #0 str r2, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02219730 ; =0x0000114D lsl r7, r7, #2 ldrb r1, [r5, r0] @@ -14664,7 +14664,7 @@ MOD09_02219738: ; 0x02219738 add r0, r4, r7 mov r1, #0 str r2, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022197C4 ; =0x0000114D lsl r6, r6, #2 ldrb r1, [r5, r0] @@ -14827,7 +14827,7 @@ MOD09_02219884: ; 0x02219884 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] mov r1, #0x1c ldr r4, [r5, #0x2c] @@ -14962,7 +14962,7 @@ MOD09_022199B4: ; 0x022199B4 lsl r0, r0, #6 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02219A6C ; =0x0000114D ldrb r0, [r4, r0] cmp r0, #3 @@ -15089,7 +15089,7 @@ MOD09_02219A8C: ; 0x02219A8C bl StringExpandPlaceholders add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -15170,7 +15170,7 @@ _02219B6C: ldr r0, [r5, #0x2c] add r1, r7, #0 add r0, r0, r4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0x10 cmp r6, #4 @@ -15230,7 +15230,7 @@ MOD09_02219BE0: ; 0x02219BE0 add r0, r4, #0 add r0, #0x1c mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD09_02219C08 pop {r4, pc} diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 32981b60..08cd42c8 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -633,7 +633,7 @@ _0222D99A: bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] mov r1, #0 mov r2, #1 @@ -795,7 +795,7 @@ _0222DC42: bl FUN_02019064 ldr r0, [r4, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #8] mov r1, #0 mov r2, #1 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 62996375..6f66fe90 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -186,7 +186,7 @@ _0222F30E: bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] mov r1, #0 mov r2, #1 @@ -4854,7 +4854,7 @@ _022316CC: add r4, r0, #0 add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4892,7 +4892,7 @@ _02231708: add r4, r0, #0 add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4917,7 +4917,7 @@ _0223174C: bl GetTrainerMessageByIdPair add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4962,7 +4962,7 @@ MOD11_0223178C: ; 0x0223178C bl MOD11_022321EC add r0, r7, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _022317DC ; =MOD11_0223220C @@ -5000,7 +5000,7 @@ MOD11_022317E0: ; 0x022317E0 beq _02231814 add r0, r4, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer _02231814: ldr r1, [sp, #0x28] mov r0, #2 @@ -23862,7 +23862,7 @@ _0223AC50: bl FUN_02019064 add r0, r5, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r1, #0 mov r2, #1 @@ -62294,7 +62294,7 @@ MOD11_0224D518: ; 0x0224D518 bl MOD11_0222FF6C add r6, r0, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl FUN_02019548 mov r1, #0x65 @@ -71657,7 +71657,7 @@ _022520D2: bl MOD11_0222FF6C add r6, r0, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl FUN_02019548 ldr r0, [r4] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index f717789a..247571cb 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -15225,7 +15225,7 @@ MOD12_02234EFC: ; 0x02234EFC add r4, r0, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x34 add r0, r4, #0 bl CopyWindowToVram @@ -15275,7 +15275,7 @@ _02234F42: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -25518,7 +25518,7 @@ _02239AF4: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -34767,7 +34767,7 @@ _0223E210: add r0, r5, #0 add r0, #0x78 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -35104,7 +35104,7 @@ _0223E49A: add r0, r5, #0 add r0, #0x88 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -43554,7 +43554,7 @@ _02242618: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -43894,13 +43894,13 @@ _022428E6: str r0, [sp, #0x14] add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #5 lsl r0, r0, #4 str r0, [sp, #0x18] add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [sp] mov r0, #0 @@ -47014,7 +47014,7 @@ _022440EE: ldr r0, [r4] mov r1, #0xff add r0, #0x34 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] add r0, #0x34 bl CopyWindowToVram diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 37a18d6d..9399db6e 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -20058,7 +20058,7 @@ MOD14_021E1284: ; 0x021E1284 ldr r4, [r0, #4] add r4, #0x30 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r2, [r5, #2] ldr r1, [r5, #8] add r0, r4, #0 @@ -20233,19 +20233,19 @@ MOD14_021E13F0: ; 0x021E13F0 beq _021E144E ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] bl MOD14_021DC408 cmp r0, #0 @@ -20276,19 +20276,19 @@ MOD14_021E1450: ; 0x021E1450 beq _021E14CC ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] cmp r0, #0 beq _021E148E @@ -20334,19 +20334,19 @@ MOD14_021E14D0: ; 0x021E14D0 beq _021E153A ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] cmp r0, #0 beq _021E150E @@ -20615,7 +20615,7 @@ MOD14_021E1704: ; 0x021E1704 ldr r0, [r5, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r4, #0xf] cmp r0, #0 bne _021E1742 @@ -20828,7 +20828,7 @@ MOD14_021E189C: ; 0x021E189C bl MOD14_021E1908 ldr r0, [r5, #0x18] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] ldr r2, [r5, #0x30] add r1, r4, #0 @@ -20976,7 +20976,7 @@ _021E19E8: str r0, [sp, #0x14] add r0, #0x10 str r0, [sp, #0x14] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x10] mov r6, #0 add r0, #0x21 @@ -22259,7 +22259,7 @@ MOD14_021E2394: ; 0x021E2394 add r6, r0, #0 add r0, r4, #0 mov r1, #7 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -22288,7 +22288,7 @@ MOD14_021E23F8: ; 0x021E23F8 ldr r4, [r0, #0x10] mov r1, #7 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -22303,7 +22303,7 @@ MOD14_021E240C: ; 0x021E240C str r0, [sp, #0xc] add r0, #0x10 str r0, [sp, #0xc] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 bl MOD14_021E2188 mov r6, #0 @@ -22345,7 +22345,7 @@ MOD14_021E2464: ; 0x021E2464 mov r1, #4 add r4, #0x10 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -22698,7 +22698,7 @@ MOD14_021E26E4: ; 0x021E26E4 ldr r0, [r5, #0x10] mov r1, #4 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E279C ; =0x00004BF8 add r1, r6, #0 ldr r0, [r5, r2] @@ -24684,7 +24684,7 @@ MOD14_021E355C: ; 0x021E355C add r0, r4, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x88 bl CopyWindowToVram @@ -28653,11 +28653,11 @@ _021E541E: add r0, r7, #0 add r0, #0x78 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r7, #0 mov r5, #0 add r4, #0x78 @@ -28797,7 +28797,7 @@ _021E554C: bl FUN_02019270 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r7, #8 cmp r6, #2 @@ -28983,7 +28983,7 @@ _021E56B4: bl FUN_02019270 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r7, #8 cmp r6, #2 @@ -29032,7 +29032,7 @@ MOD14_021E5718: ; 0x021E5718 add r7, #0x98 add r0, r7, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl MOD14_021DC560 cmp r0, #0 @@ -29116,7 +29116,7 @@ MOD14_021E57CC: ; 0x021E57CC add r4, #0x98 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -29156,7 +29156,7 @@ _021E581A: str r0, [sp, #0x14] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x18] cmp r0, #1 bne _021E5836 @@ -29299,7 +29299,7 @@ _021E593E: str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x1c] cmp r0, #1 bne _021E595A @@ -29753,7 +29753,7 @@ MOD14_021E5CFC: ; 0x021E5CFC add r4, r1, r0 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl MOD14_021DC3F0 cmp r0, #0 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 560be120..0b2abaab 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -4359,7 +4359,7 @@ MOD15_021D9634: ; 0x021D9634 ldr r0, [r4, #0x50] cmp r0, #0 beq _021D9642 - bl FUN_020136C0 + bl DestroyListMenuCursorObj _021D9642: ldr r0, [r4, #0x3c] cmp r0, #0 @@ -4749,7 +4749,7 @@ MOD15_021D9964: ; 0x021D9964 add r0, r4, #0 add r0, #0xc mov r1, #0xd - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] bl MOD15_021D86E4 cmp r0, #0 @@ -5194,7 +5194,7 @@ MOD15_021D9CB4: ; 0x021D9CB4 add r5, r1, #0 add r0, #0x1c mov r1, #9 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r5, #3 bhi _021D9DB0 add r0, r5, r5 @@ -5462,7 +5462,7 @@ MOD15_021D9ECC: ; 0x021D9ECC add r4, r1, #0 add r0, #0x2c mov r1, #9 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x48] ldr r2, [r5, #0x4c] mov r1, #9 @@ -5650,7 +5650,7 @@ MOD15_021DA044: ; 0x021DA044 bl FUN_02019270 add r0, sp, #0x10 mov r1, #0xe - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _021DA0B0 ; =0x00000183 mov r0, #0x1a add r2, r4, #0 @@ -6021,7 +6021,7 @@ _021DA31A: bl FUN_02019064 add r0, sp, #0x28 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -6102,7 +6102,7 @@ _021DA3CC: add r4, r0, #0 add r0, sp, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer bl MOD15_021DB770 add r7, r0, #0 ldr r5, _021DA474 ; =0x00000000 @@ -6215,7 +6215,7 @@ _021DA4C2: bl FUN_02019064 add r0, r6, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #0xff @@ -6769,7 +6769,7 @@ MOD15_021DA8E8: ; 0x021DA8E8 add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x10 bl FUN_02019270 @@ -6853,7 +6853,7 @@ MOD15_021DA9D4: ; 0x021DA9D4 add r6, r0, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl MOD15_021DAD78 ldr r0, [r6, #4] @@ -7378,7 +7378,7 @@ _021DADD4: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 26ae4fbf..68e9336c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -3518,7 +3518,7 @@ MOD16_021D8F60: ; 0x021D8F60 bl FUN_02019064 add r0, r4, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #4 bl CopyWindowToVram add sp, #0x14 @@ -13350,7 +13350,7 @@ _021DD77E: ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -13505,7 +13505,7 @@ _021DD8A8: ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -16653,7 +16653,7 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #7 add r0, r0, #4 @@ -16737,7 +16737,7 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #0 add r0, r0, #4 @@ -17852,7 +17852,7 @@ _021DF92E: ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] add r0, r0, #4 bl FUN_02019220 @@ -17883,7 +17883,7 @@ MOD16_021DF970: ; 0x021DF970 add r4, r1, #0 add r0, r5, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x5e add r1, r4, #0 bl MOD16_021D8270 @@ -17928,7 +17928,7 @@ MOD16_021DF9C0: ; 0x021DF9C0 ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4] add r0, r5, #0 add r2, r6, #0 @@ -26946,7 +26946,7 @@ MOD16_021E3B70: ; 0x021E3B70 add r6, r2, #0 add r0, r0, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer str r6, [sp] ldr r3, _021E3BBC ; =0x000007F8 ldr r0, [r4] @@ -26985,7 +26985,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -27335,7 +27335,7 @@ MOD16_021E3E6C: ; 0x021E3E6C ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 lsl r0, r0, #0xa ldr r3, [r5, r0] @@ -29593,7 +29593,7 @@ MOD16_021E4EE4: ; 0x021E4EE4 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r4, #0 bl MOD16_021E5224 @@ -34307,7 +34307,7 @@ MOD16_021E71A8: ; 0x021E71A8 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r4, #0 bl MOD16_021E753C @@ -45513,7 +45513,7 @@ MOD16_021EC574: ; 0x021EC574 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -48265,7 +48265,7 @@ MOD16_021EDA3C: ; 0x021EDA3C ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -51473,7 +51473,7 @@ MOD16_021EF318: ; 0x021EF318 bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add r0, r4, #0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 82398e6b..03989527 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4691,7 +4691,7 @@ MOD17_021D9918: ; 0x021D9918 ldr r0, _021D99D4 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -4753,7 +4753,7 @@ MOD17_021D99E0: ; 0x021D99E0 add r4, r1, #0 ldr r0, [r5, r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021D9A5C ; =0x00000151 mov r0, #0 mov r1, #0x1a @@ -4818,7 +4818,7 @@ _021D9A7E: ldr r0, _021D9B08 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021D9B0C ; =0x00000151 mov r0, #0 mov r1, #0x1a @@ -11436,7 +11436,7 @@ _021DC9CC: lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -11817,7 +11817,7 @@ MOD17_021DCC68: ; 0x021DCC68 bl FUN_02019064 ldr r0, [r5] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x34] cmp r0, #0 beq _021DCCCC @@ -11860,7 +11860,7 @@ MOD17_021DCCEC: ; 0x021DCCEC add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] add r1, r4, #0 str r0, [sp] @@ -11896,7 +11896,7 @@ MOD17_021DCD34: ; 0x021DCD34 add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] add r1, r4, #0 str r0, [sp] @@ -12396,7 +12396,7 @@ _021DD0D0: bl MOD17_021DCC68 ldr r0, [r7, #0x18] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r3, #4 @@ -14313,7 +14313,7 @@ MOD17_021DDFAC: ; 0x021DDFAC lsl r0, r0, #4 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0xc] cmp r0, #0 bne _021DDFCA diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index d0f6db33..99b0d4ca 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -22037,7 +22037,7 @@ MOD18_02244028: ; 0x02244028 ldr r1, [sp, #0xc] str r0, [r1, #0x10] ldr r1, _022440C0 ; =0x0008090F - bl FUN_020136E0 + bl CreateListMenuCursorObj ldr r1, [sp, #8] ldr r0, [sp, #0xc] strb r1, [r0, #0x1d] @@ -22075,7 +22075,7 @@ _0224409E: ldr r2, [sp, #4] ldr r3, [sp, #8] add r0, r5, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, [sp, #0xc] str r0, [r1, #0xc] add r0, r1, #0 @@ -22316,7 +22316,7 @@ _02244268: mov r0, #0 strb r0, [r5, #0x1c] ldr r0, [sp, #4] - bl FUN_02001328 + bl RedrawListMenu mov r0, #0 add sp, #0x10 mvn r0, r0 @@ -22355,7 +22355,7 @@ _022442B2: pop {r3, r4, r5, r6, r7, pc} _022442CA: ldr r0, [sp, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, r5, #0 ldr r0, [sp, #4] @@ -22397,12 +22397,12 @@ MOD18_02244318: ; 0x02244318 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r4] cmp r0, #0 beq _02244334 ldr r0, [r4, #0x10] - bl FUN_020136C0 + bl DestroyListMenuCursorObj ldr r0, [r4, #8] bl FreeToHeap _02244334: @@ -23187,7 +23187,7 @@ MOD18_0224486C: ; 0x0224486C bl FUN_020545B8 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x80 str r3, [sp] mov r2, #4 @@ -29593,7 +29593,7 @@ _02247AFA: strh r1, [r5, #0x3a] add r0, sp, #0x14 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29745,7 +29745,7 @@ _02247C40: strh r1, [r5, #0x3a] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29766,7 +29766,7 @@ MOD18_02247C98: ; 0x02247C98 add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -29898,7 +29898,7 @@ _02247D6C: strh r1, [r5, #0x3a] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29919,7 +29919,7 @@ MOD18_02247DD8: ; 0x02247DD8 add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -30102,7 +30102,7 @@ MOD18_02247F5C: ; 0x02247F5C add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -30159,7 +30159,7 @@ MOD18_02247FC0: ; 0x02247FC0 mov r1, #0 ldr r0, [r4, #0x20] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0xc bl FUN_02019570 @@ -31135,7 +31135,7 @@ MOD18_02248784: ; 0x02248784 mov r1, #0 ldr r0, [r4, #0x1c] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #8 bl FUN_02019570 @@ -31278,7 +31278,7 @@ _02248870: strh r1, [r5, #0x36] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x1c] add r5, #8 add r0, r5, #0 @@ -31298,7 +31298,7 @@ MOD18_022488F0: ; 0x022488F0 add r5, r1, #0 add r7, r0, #0 ldr r0, [r5, #0x1c] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, r5, #0 ldr r0, [r5, #0x1c] @@ -33377,7 +33377,7 @@ _02249902: beq _02249916 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0 str r0, [r4, #0x48] b _02249936 @@ -33530,7 +33530,7 @@ _02249A0E: add r2, r1, #0 mov r3, #4 str r5, [sp, #0x3c] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x50] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -33552,7 +33552,7 @@ MOD18_02249A64: ; 0x02249A64 beq _02249A8C mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r1, r4, #0 add r1, #0x24 ldrb r1, [r1] @@ -33957,7 +33957,7 @@ MOD18_02249DB8: ; 0x02249DB8 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 @@ -34434,7 +34434,7 @@ MOD18_0224A1C0: ; 0x0224A1C0 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 @@ -34858,7 +34858,7 @@ MOD18_0224A550: ; 0x0224A550 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 @@ -35800,7 +35800,7 @@ MOD18_0224AD04: ; 0x0224AD04 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 @@ -36486,7 +36486,7 @@ MOD18_0224B250: ; 0x0224B250 push {r3, r4, r5, lr} add r4, r1, #0 ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #0 ldr r0, [r4, #0x48] @@ -36727,7 +36727,7 @@ _0224B42C: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -36848,7 +36848,7 @@ _0224B528: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -36862,7 +36862,7 @@ MOD18_0224B560: ; 0x0224B560 push {r3, r4, r5, lr} add r5, r1, #0 ldr r0, [r5, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, sp, #0 ldr r0, [r5, #0x48] @@ -38606,7 +38606,7 @@ _0224C396: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] mov r0, #0x8b lsl r0, r0, #2 @@ -38642,7 +38642,7 @@ _0224C434: add r0, r4, #0 add r0, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer bl MOD18_0223D658 bl MOD18_0224DBB4 ldr r1, _0224C504 ; =0x00000247 @@ -38756,7 +38756,7 @@ MOD18_0224C510: ; 0x0224C510 add r0, #0x20 mov r1, #0xf mov r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x10] cmp r0, #0 beq _0224C546 @@ -39228,7 +39228,7 @@ _0224C87C: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add r5, #0x10 add r0, r5, #0 @@ -39490,7 +39490,7 @@ _0224CB1A: add r0, r4, #0 add r0, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x20 add r0, r4, #0 bl CopyWindowToVram @@ -39531,7 +39531,7 @@ MOD18_0224CB34: ; 0x0224CB34 add r0, r5, #0 add r0, #0x30 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x30 bl CopyWindowToVram @@ -39680,7 +39680,7 @@ _0224CC7E: pop {r4, r5, r6, pc} _0224CC8E: ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #4 ldr r0, [r4, #0x48] @@ -39771,7 +39771,7 @@ _0224CD32: pop {r4, r5, r6, pc} _0224CD48: ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #4 ldr r0, [r4, #0x48] @@ -40827,7 +40827,7 @@ MOD18_0224D5CC: ; 0x0224D5CC add r0, r4, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x30] cmp r0, #0 beq _0224D644 @@ -41332,7 +41332,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r0, r5, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r3, _0224DAA0 ; =0x022513FC str r6, [sp] @@ -41590,7 +41590,7 @@ _0224DC4C: add r0, r5, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _0224DCB0 ; =0x000001E2 add r0, #8 @@ -42345,7 +42345,7 @@ MOD18_0224E0CC: ; 0x0224E0CC add r0, r5, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 mov r1, #0 bl NewString_ReadMsgData @@ -42402,7 +42402,7 @@ _0224E186: ldr r2, [r5, #0x34] ldrh r1, [r1] ldrh r2, [r2] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x28] add r0, r5, #4 bl CopyWindowToVram @@ -42429,7 +42429,7 @@ MOD18_0224E210: ; 0x0224E210 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0x28] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_0224E73C @@ -42483,7 +42483,7 @@ MOD18_0224E26C: ; 0x0224E26C ldr r0, [r4, #0x28] ldr r1, [r4, #0x30] ldr r2, [r4, #0x34] - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #4 mov r1, #1 bl FUN_0200CCF8 @@ -42804,7 +42804,7 @@ _0224E454: add r0, r5, #0 add r0, #0x18 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x24] mov r1, #9 bl NewString_ReadMsgData diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 2888f12d..19ece474 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -681,7 +681,7 @@ MOD24_02254D00: ; 0x02254D00 bne _02254D38 ldr r0, [r4, #0x70] mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer _02254D38: mov r0, #1 pop {r4, pc} diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index fcd3cbc9..2bbabb41 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -1108,7 +1108,7 @@ MOD36_0225503C: ; 0x0225503C add r0, r4, #0 add r0, #0x48 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer _02255082: add r0, r4, #0 add r0, #0x48 @@ -1298,7 +1298,7 @@ MOD36_022551E0: ; 0x022551E0 add r0, r4, #0 add r0, #0x48 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x48 add r0, r4, #0 bl FUN_02019548 diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index e1d888d4..89e7ff79 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -1046,7 +1046,7 @@ MOD38_0225500C: ; 0x0225500C add r0, r4, #0 mov r1, #4 add r6, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #0x12 bne _02255036 add r0, r5, #0 @@ -1106,7 +1106,7 @@ MOD38_02255084: ; 0x02255084 add r0, r4, #0 mov r1, #4 add r6, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r2, r5, #0 add r0, #0xb8 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 89b23259..fd20dc17 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -654,7 +654,7 @@ MOD43_02254CD0: ; 0x02254CD0 bl FUN_02019064 add r0, sp, #0x14 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index abb1ea34..3ec4768c 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -1162,7 +1162,7 @@ MOD47_022550FC: ; 0x022550FC add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #0 @@ -1225,7 +1225,7 @@ MOD47_02255184: ; 0x02255184 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #1 @@ -1265,7 +1265,7 @@ MOD47_022551D8: ; 0x022551D8 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #2 @@ -1322,7 +1322,7 @@ MOD47_02255250: ; 0x02255250 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #2 @@ -1386,7 +1386,7 @@ MOD47_022552D8: ; 0x022552D8 add r7, r1, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x58] ldr r2, [r5, #0x5c] mov r1, #5 diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index bce289da..1de7ea96 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -421,7 +421,7 @@ MOD49_02254AD4: ; 0x02254AD4 bl FUN_02019064 add r0, sp, #0x1c mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, sp, #0x1c bl FUN_02019270 ldr r1, _02254BD4 ; =0x00000197 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 60bdd016..aa0549bd 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -165,7 +165,7 @@ _02254960: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram ldr r0, [sp, #0x18] @@ -193,7 +193,7 @@ _02254960: add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x10 bl CopyWindowToVram @@ -221,7 +221,7 @@ _02254960: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x20 bl CopyWindowToVram @@ -792,20 +792,20 @@ MOD51_02254E48: ; 0x02254E48 add r7, r5, r0 add r0, r7, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x76 lsl r0, r0, #2 add r0, r5, r0 str r0, [sp, #0x1c] add r0, r0, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7a lsl r0, r0, #2 add r5, r5, r0 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r0, #0xff diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index b4fd4d80..42385e75 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -1325,7 +1325,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r0, #0x1e @@ -1346,7 +1346,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #6 @@ -1368,7 +1368,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r7, #0x28] mov r0, #1 mov r2, #0 @@ -1415,7 +1415,7 @@ _021D80A8: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r6, #0x14 add r0, r0, #1 @@ -3633,7 +3633,7 @@ MOD53_021D91C8: ; 0x021D91C8 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb6 lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 904d1c7f..1131a268 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1081,7 +1081,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -1103,7 +1103,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0x1a @@ -1148,7 +1148,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xa6 lsl r0, r0, #2 ldr r2, _021D7E94 ; =0x00010300 @@ -1176,7 +1176,7 @@ MOD54_021D7E98: ; 0x021D7E98 add r6, r0, #0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 str r1, [sp] mov r0, #0x41 @@ -2787,7 +2787,7 @@ MOD54_021D8AF8: ; 0x021D8AF8 _021D8B18: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r7, [sp, #0x14] mov r0, #0 str r0, [sp, #0x20] @@ -3013,7 +3013,7 @@ MOD54_021D8C90: ; 0x021D8C90 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xba lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 0d96ce13..704cf6de 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -1238,7 +1238,7 @@ _021D7F02: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xc0 ldr r0, [r5, #0x10] @@ -1305,7 +1305,7 @@ _021D7F86: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #2 bne _021D7FF4 ldr r0, [r5, #8] @@ -2618,7 +2618,7 @@ _021D89AE: add r7, r0, #0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0xff @@ -2775,7 +2775,7 @@ _021D8AEE: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xc0 ldr r0, [r5, #0x10] @@ -2834,7 +2834,7 @@ _021D8B6C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xd0 ldr r0, [r5, #0x10] @@ -2917,7 +2917,7 @@ _021D8C02: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019220 add r6, r6, #1 @@ -3306,7 +3306,7 @@ _021D8F1A: add r0, sp, #0x1c add r2, r1, #0 mov r3, #0x34 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0xea lsl r1, r1, #2 str r0, [r5, r1] @@ -3374,7 +3374,7 @@ _021D9002: mov r0, #0xea lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r1, _021D90D0 ; =0x00000418 add r4, r0, #0 add r0, r1, #0 @@ -3458,7 +3458,7 @@ _021D9098: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x14] bl ListMenu_dtor add r0, r6, #0 @@ -3605,7 +3605,7 @@ _021D91D6: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 @@ -3677,7 +3677,7 @@ _021D9278: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 mov r0, #0 eor r1, r4 @@ -3781,7 +3781,7 @@ _021D9338: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xbc mov r0, #0 @@ -4164,7 +4164,7 @@ _021D969A: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x34 bl PlayerProfile_new str r0, [sp, #0x20] @@ -4243,7 +4243,7 @@ _021D974E: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 @@ -4382,7 +4382,7 @@ _021D987C: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r4, #0 add r2, #0xc4 ldr r0, [r4, #0x10] @@ -5397,7 +5397,7 @@ _021DA0D0: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xce lsl r0, r0, #2 ldr r2, _021DA158 ; =0x000001E2 @@ -5478,7 +5478,7 @@ _021DA17C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xce lsl r0, r0, #2 ldr r2, _021DA210 ; =0x000001E2 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index d1046c7b..ba3275fa 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1342,7 +1342,7 @@ _022128CE: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r2, #0x16 add r0, #0xcc @@ -1450,7 +1450,7 @@ _022129D8: beq _022129EA mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _022129EA: add r0, r4, #0 add r0, #0xb0 @@ -2479,7 +2479,7 @@ MOD56_02213194: ; 0x02213194 mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r6, #0 mov r1, #0 add r0, #0xb4 @@ -2786,7 +2786,7 @@ _0221344C: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -3567,7 +3567,7 @@ _022139D0: add r2, r1, #0 mov r3, #0x36 str r5, [sp, #0x30] - bl FUN_020010A8 + bl ListMenuInit add r5, #0xb4 str r0, [r5] add sp, #0x34 @@ -3675,7 +3675,7 @@ _02213AF0: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 mov r1, #0 add r0, #0xb4 @@ -3712,7 +3712,7 @@ _02213B2C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -3864,7 +3864,7 @@ _02213C84: add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001328 + bl RedrawListMenu str r4, [r5, #8] _02213CA8: add r0, r5, #0 @@ -3917,7 +3917,7 @@ _02213CF0: add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001328 + bl RedrawListMenu _02213D0C: add r1, sp, #0xc ldrh r1, [r1, #2] @@ -4099,7 +4099,7 @@ _02213E5C: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 mov r1, #0 add r0, #0xb4 @@ -4139,7 +4139,7 @@ _02213ECE: add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 _02213EE8: mov r0, #1 @@ -5134,7 +5134,7 @@ _02214642: add r0, sp, #0x14 mov r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5180,7 +5180,7 @@ _022146EE: add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD56_02213BF4 @@ -5257,7 +5257,7 @@ _0221476E: ldr r0, [r0] mov r1, #0 add r2, r5, r2 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] @@ -5298,7 +5298,7 @@ _022147CE: ldr r0, [r0] mov r1, #0 add r2, r5, r2 - bl FUN_02001300 + bl DestroyListMenu add r5, #0xb8 ldr r0, [r5] bl ListMenu_dtor @@ -5425,7 +5425,7 @@ _0221488C: ldrh r2, [r2, r3] mov r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5463,7 +5463,7 @@ _0221493C: add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD56_02213BF4 @@ -5521,7 +5521,7 @@ _02214994: lsl r3, r3, #1 mov r1, #0 add r2, r2, r3 - bl FUN_02001300 + bl DestroyListMenu add r5, #0xb8 ldr r0, [r5] bl ListMenu_dtor @@ -5717,7 +5717,7 @@ _02214ADC: add r0, sp, #0x2c add r2, r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5837,7 +5837,7 @@ _02214C1E: add r0, r4, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r0, r4, #0 bl MOD56_02213BF4 @@ -6074,7 +6074,7 @@ _02214DEC: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r4, #0xb8 ldr r0, [r4] bl ListMenu_dtor @@ -7019,7 +7019,7 @@ _02215532: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] @@ -7569,7 +7569,7 @@ MOD56_022159B0: ; 0x022159B0 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -8272,7 +8272,7 @@ _02215F82: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xcf lsl r0, r0, #2 ldr r2, _02215FF0 ; =0x000001E2 @@ -8388,7 +8388,7 @@ _02216048: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xdb lsl r0, r0, #2 ldr r2, _022160E0 ; =0x000001D9 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 93c1c39d..9a7a8402 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1077,7 +1077,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #9 str r0, [sp] mov r0, #0x18 @@ -1097,7 +1097,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #8 @@ -1118,7 +1118,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021DA4BC ; =0x000E0702 mov r2, #1 str r0, [sp] @@ -1189,7 +1189,7 @@ _021DA3C2: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r3, #0xe0 @@ -1234,7 +1234,7 @@ _021DA46A: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r7, #0x14 add r0, r0, #1 @@ -1646,7 +1646,7 @@ _021DA7A4: lsl r0, r0, #2 add r0, r5, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb1 lsl r0, r0, #2 add r0, r5, r0 @@ -2217,7 +2217,7 @@ MOD58_021DAB94: ; 0x021DAB94 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb5 lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index c86d2c94..dbad5e9c 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -1096,7 +1096,7 @@ _021D7DF2: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x40] ldr r0, [sp, #0x10] ldr r2, _021D7EC4 ; =0x000003D9 @@ -1111,7 +1111,7 @@ _021D7DF2: b _021D7E96 _021D7E4C: ldr r0, [r5, #0x40] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0 mvn r1, r1 str r0, [r5, #0x48] @@ -1133,7 +1133,7 @@ _021D7E66: mov r1, #0 ldr r0, [r5, #0x40] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x44] bl ListMenu_dtor ldr r0, _021D7EC8 ; =0x000005DC diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 418fa446..c01c83ff 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -922,15 +922,15 @@ MOD60_021D7BA4: ; 0x021D7BA4 add r0, r4, #0 add r0, #0x2c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x3c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c bl FUN_020192B8 @@ -980,7 +980,7 @@ _021D7CF0: bl FUN_02019570 add r0, r5, r4 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 bl FUN_020192B8 add r0, r5, r4 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 3afc1e03..54af7ce1 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -305,7 +305,7 @@ _021D7702: add r0, r5, #0 add r0, #0x94 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r5] mov r0, #0x4c bl String_ctor @@ -432,7 +432,7 @@ _021D77F2: add r0, r5, #0 add r0, #0x94 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r5] mov r0, #0x4c bl String_ctor @@ -1484,7 +1484,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 _021D80BE: add r0, r5, #0 add r1, r6, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #5 bge _021D80D0 add r0, r5, #0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index d65fb117..d0afdb75 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -3251,7 +3251,7 @@ MOD62_0222EE78: ; 0x0222EE78 cmp r5, r1 bne _0222EE96 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add sp, #0xc @@ -3268,7 +3268,7 @@ _0222EE96: add r5, r0, #0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -3331,7 +3331,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 bl FUN_0200D0BC add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram add sp, #0x14 @@ -3377,7 +3377,7 @@ MOD62_0222EF44: ; 0x0222EF44 bl FUN_02019064 add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram add sp, #0x14 @@ -3552,14 +3552,14 @@ _0222F0E2: bne _0222F0FE add r0, r5, #0 mov r1, #0xee - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram b _0222F152 _0222F0FE: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0x35 bl String_ctor @@ -3621,7 +3621,7 @@ MOD62_0222F168: ; 0x0222F168 bne _0222F194 add r0, r5, r4 mov r1, #0xee - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 bl CopyWindowToVram add sp, #0x14 @@ -3629,7 +3629,7 @@ MOD62_0222F168: ; 0x0222F168 _0222F194: add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0x35 bl String_ctor @@ -3693,7 +3693,7 @@ MOD62_0222F208: ; 0x0222F208 cmp r5, r1 bne _0222F226 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add sp, #0xc @@ -3710,7 +3710,7 @@ _0222F226: add r5, r0, #0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 0ade6b6c..d8d29678 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -683,7 +683,7 @@ MOD64_021D7A54: ; 0x021D7A54 add r0, #0x98 ldr r0, [r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021D7AE8 ; =0x000006A8 mov r1, #1 ldr r0, [r5, r0] @@ -2318,7 +2318,7 @@ _021D86F8: add r6, r0, #0 add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x2c] str r3, [sp] @@ -2375,7 +2375,7 @@ _021D8770: str r0, [r4] add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x2c] str r3, [sp] @@ -3511,7 +3511,7 @@ _021D8FEC: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 229a9214..c8d4ac1a 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -335,7 +335,7 @@ _021D7762: add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 b _021D7796 _021D7784: @@ -425,7 +425,7 @@ MOD65_021D7818: ; 0x021D7818 add r5, r0, #0 add r0, #0xc8 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r0, _021D78A4 ; =gMain ldr r1, [r0, #0x48] @@ -998,7 +998,7 @@ _021D7C68: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -1684,7 +1684,7 @@ _021D81C0: ldrh r2, [r2] add r0, #0x84 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xc4 str r0, [r1] @@ -1725,7 +1725,7 @@ _021D823E: ldr r0, [r0] add r1, #0x80 add r2, #0x82 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0xcc ldr r0, [r0] @@ -2276,7 +2276,7 @@ _021D8648: add r0, #0xa4 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit add r5, #0xc8 str r0, [r5] pop {r3, r4, r5, pc} @@ -2304,7 +2304,7 @@ MOD65_021D86BC: ; 0x021D86BC ldr r0, [r0] add r1, sp, #0 add r2, #2 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] @@ -3269,7 +3269,7 @@ MOD65_021D8E68: ; 0x021D8E68 add r0, r4, #0 add r0, #0x6c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] mov r1, #1 ldrb r0, [r0, #0xb] @@ -3842,7 +3842,7 @@ MOD65_021D92C4: ; 0x021D92C4 add r0, r4, #0 add r0, #0x6c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x20] bl StringSetEmpty mov r0, #1 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index e0b21bf2..0dda816f 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -1350,7 +1350,7 @@ _021D7F44: bl FUN_0200D6F8 add r0, r7, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff @@ -1720,7 +1720,7 @@ MOD66_021D820C: ; 0x021D820C bl StringSetEmpty add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, #0xa0 ldr r0, [r6] cmp r0, #0 @@ -1801,7 +1801,7 @@ MOD66_021D82B8: ; 0x021D82B8 bne _021D82DC add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl CopyWindowToVram add r0, r6, #0 @@ -1811,7 +1811,7 @@ MOD66_021D82B8: ; 0x021D82B8 _021D82DC: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r4, #8] ldr r0, _021D8378 ; =0x0000FFFF cmp r1, r0 @@ -2044,7 +2044,7 @@ MOD66_021D8494: ; 0x021D8494 cmp r5, #0 beq _021D84C6 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl FUN_02019570 ldrb r1, [r4, #0x15] @@ -2104,7 +2104,7 @@ MOD66_021D84C8: ; 0x021D84C8 sub r4, r1, r0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -2212,23 +2212,23 @@ MOD66_021D8554: ; 0x021D8554 add r0, r4, #0 add r0, #0x28 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x38 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x48 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x58 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x68 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x28 bl CopyWindowToVram diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 4982fa30..2d417cd2 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -1122,10 +1122,10 @@ _021D7DAC: _021D7DB4: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r6, #0 add r2, r4, #0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 5c2c1740..e80e78c9 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -555,7 +555,7 @@ MOD68_021D7958: ; 0x021D7958 add r4, r0, #0 add r0, r4, #4 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 ldr r3, _021D7974 ; =0x00010204 add r0, r4, #0 @@ -572,7 +572,7 @@ MOD68_021D7978: ; 0x021D7978 add r4, r0, #0 add r0, #0x24 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D7994 ; =0x000F0200 add r0, r4, #0 mov r1, #2 @@ -589,7 +589,7 @@ MOD68_021D7998: ; 0x021D7998 add r4, r0, #0 add r0, #0x34 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79B4 ; =0x000F0200 add r0, r4, #0 mov r1, #3 @@ -606,7 +606,7 @@ MOD68_021D79B8: ; 0x021D79B8 add r4, r0, #0 add r0, #0x44 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79D4 ; =0x000F0200 add r0, r4, #0 mov r1, #4 @@ -623,7 +623,7 @@ MOD68_021D79D8: ; 0x021D79D8 add r4, r0, #0 add r0, #0x54 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79F4 ; =0x000F0200 add r0, r4, #0 mov r1, #5 @@ -640,7 +640,7 @@ MOD68_021D79F8: ; 0x021D79F8 add r4, r0, #0 add r0, #0x64 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D7A14 ; =0x000F0200 add r0, r4, #0 mov r1, #6 @@ -660,7 +660,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r4, #0x14 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] add r0, r5, #0 @@ -752,7 +752,7 @@ MOD68_021D7AE4: ; 0x021D7AE4 add r5, #0xb4 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -790,7 +790,7 @@ MOD68_021D7B34: ; 0x021D7B34 add r5, #0x94 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0xc4 ldr r0, [r4] mov r1, #0xa @@ -826,7 +826,7 @@ MOD68_021D7B80: ; 0x021D7B80 add r5, #0xa4 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] @@ -871,7 +871,7 @@ MOD68_021D7BDC: ; 0x021D7BDC add r5, #0x74 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0xc4 ldr r0, [r4] mov r1, #8 @@ -907,7 +907,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r6, #0x84 add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r5, r0] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 33fafb4f..d88f4eb8 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -793,7 +793,7 @@ MOD69_0222DBAC: ; 0x0222DBAC add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019548 @@ -2608,7 +2608,7 @@ _0222EAEA: _0222EB16: ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] bl FUN_02019548 ldr r0, [r4, #0x28] diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index a0966fec..eb5ef973 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -1022,11 +1022,11 @@ MOD70_021D7CC0: ; 0x021D7CC0 add r4, r0, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x24 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019548 @@ -1102,7 +1102,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 bl StringExpandPlaceholders add r0, r6, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r2, #0xff @@ -1136,7 +1136,7 @@ MOD70_021D7D98: ; 0x021D7D98 add r0, #0x24 mov r1, #0xf str r0, [sp, #0xc] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x1c] cmp r0, #0 beq _021D7DC8 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index ac2559a6..1ae20a7e 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -2700,7 +2700,7 @@ MOD71_0222EC5C: ; 0x0222EC5C bl GetMonData add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x20] ldr r2, [sp, #8] str r0, [sp] @@ -2910,7 +2910,7 @@ _0222EE14: str r0, [sp, #0x30] add r0, r6, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2985,7 +2985,7 @@ _0222EEA6: lsr r7, r0, #0x10 add r0, r6, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x14 mov r1, #0x1a bl String_ctor @@ -4313,7 +4313,7 @@ MOD71_0222F954: ; 0x0222F954 mov r0, #0xda lsl r0, r0, #6 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -4383,7 +4383,7 @@ _0222F9E4: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0222FA34 ; =0x0000367C ldr r0, [r5, r0] bl ListMenu_dtor @@ -6627,7 +6627,7 @@ MOD71_02230C48: ; 0x02230C48 bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #1 add r1, r5, #0 str r2, [sp] @@ -6646,7 +6646,7 @@ MOD71_02230C48: ; 0x02230C48 add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #5 @@ -6666,7 +6666,7 @@ MOD71_02230C48: ; 0x02230C48 add r0, r5, #0 add r0, #0x60 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl Options_GetFrame lsl r0, r0, #0x18 @@ -6706,7 +6706,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0xe @@ -6728,7 +6728,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -6750,7 +6750,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x11 str r0, [sp] mov r0, #0xb @@ -6771,7 +6771,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0xb @@ -6792,7 +6792,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r4, _02230E80 ; =0x022313F4 mov r7, #0 mov r6, #0x33 @@ -6824,7 +6824,7 @@ _02230DE2: ldr r0, [sp, #0x18] mov r1, #0 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r6, #0x10 add r4, r4, #4 @@ -6861,7 +6861,7 @@ _02230E2C: bl FUN_02019064 add r0, r5, r7 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0xa cmp r6, #8 @@ -6995,7 +6995,7 @@ _02230F6A: _02230F76: add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _02230FAC ; =0x0001020F @@ -7127,7 +7127,7 @@ MOD71_02231018: ; 0x02231018 mov r3, #0x1a str r5, [sp, #0x14] str r4, [sp, #0x20] - bl FUN_020010A8 + bl ListMenuInit add sp, #0x34 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index d5105d7e..cf221b3f 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -4805,7 +4805,7 @@ MOD73_021D9AC8: ; 0x021D9AC8 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #0x18] mov r2, #0 ldr r0, [r4, #8] @@ -4984,10 +4984,10 @@ MOD73_021D9BE0: ; 0x021D9BE0 bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] mov r1, #4 lsl r0, r0, #0x18 @@ -5953,7 +5953,7 @@ _021DA2FA: bl FUN_02019064 ldr r0, [r4, #8] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, r4, #4 add r5, #0xc @@ -6099,7 +6099,7 @@ _021DA446: mov r1, #0 str r1, [r5, #0x30] ldr r0, [r5, #8] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _021DA498 ; =0x0001020F @@ -6173,7 +6173,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 bl FUN_02018744 ldr r0, [r4, #0xc] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] ldr r0, _021DA54C ; =0x0001020F @@ -6192,7 +6192,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 bl FUN_0200CCA4 ldr r0, [r4, #0x10] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] ldr r0, _021DA54C ; =0x0001020F @@ -6494,7 +6494,7 @@ MOD73_021DA770: ; 0x021DA770 ldr r0, [r4, #0x14] add r6, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #6 bhi _021DA7EC add r0, r6, r6 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 1fce128e..0189a34d 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -771,7 +771,7 @@ _021D7A9A: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -790,7 +790,7 @@ _021D7AC0: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -1343,7 +1343,7 @@ MOD74_021D7F44: ; 0x021D7F44 mov r1, #0 add r5, r2, #0 add r4, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #8 blo _021D7F8C mov r0, #2 @@ -1637,7 +1637,7 @@ MOD74_021D818C: ; 0x021D818C add r0, r4, #0 add r0, #0x8c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #4 str r0, [sp] mov r1, #0 @@ -1664,7 +1664,7 @@ MOD74_021D81E0: ; 0x021D81E0 add r4, r0, #0 add r0, #0x8c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x8c bl FUN_02019570 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 1a9861c9..8ecfcb91 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -1606,7 +1606,7 @@ _021E784E: add r1, r3, #0 add r0, sp, #0 mov r3, #6 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x57 lsl r1, r1, #2 str r0, [r4, r1] @@ -1693,7 +1693,7 @@ _021E78F8: add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r7, r1 @@ -1911,7 +1911,7 @@ MOD75_021E7AA4: ; 0x021E7AA4 add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -1959,7 +1959,7 @@ _021E7B12: add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019570 @@ -2038,7 +2038,7 @@ _021E7BC0: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 mov r0, #0x57 lsl r0, r0, #2 @@ -2396,11 +2396,11 @@ MOD75_021E7E60: ; 0x021E7E60 bl MOD75_021E7AA4 add r0, r4, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #4 bl FUN_02019220 add r0, r4, #0 @@ -2830,7 +2830,7 @@ _021E81D2: add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -3709,7 +3709,7 @@ MOD75_021E8864: ; 0x021E8864 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021E8AAC pop {r4, pc} @@ -3776,7 +3776,7 @@ _021E892E: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 mov r0, #0x57 lsl r0, r0, #2 @@ -3928,7 +3928,7 @@ MOD75_021E8A48: ; 0x021E8A48 ldr r0, [r5, r0] add r1, r4, #6 add r2, r4, #4 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x57 mov r1, #0 lsl r0, r0, #2 @@ -4455,7 +4455,7 @@ MOD75_021E8E1C: ; 0x021E8E1C add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E8EA8 ; =0x000003D9 add r0, #0x64 @@ -4567,7 +4567,7 @@ _021E8F3A: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E8FB8 ; =0x000003D9 add r0, #0x64 @@ -4686,7 +4686,7 @@ _021E9046: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E91A8 ; =0x000003D9 add r0, #0x64 @@ -4726,7 +4726,7 @@ _021E908E: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -5022,7 +5022,7 @@ MOD75_021E92BC: ; 0x021E92BC add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -5102,7 +5102,7 @@ MOD75_021E9394: ; 0x021E9394 _021E93AA: add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E942C ; =0x000003D9 add r0, #0x64 @@ -5473,7 +5473,7 @@ _021E967A: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl MOD75_021EB660 ldr r1, _021E9718 ; =0x00000426 @@ -5608,7 +5608,7 @@ MOD75_021E97A8: ; 0x021E97A8 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021EB344 add r0, r4, #0 @@ -5633,7 +5633,7 @@ MOD75_021E97E4: ; 0x021E97E4 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021EB344 add r0, r4, #0 @@ -5711,7 +5711,7 @@ _021E9872: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _021E9928 ; =0x000003D9 add r0, #0x64 @@ -5864,7 +5864,7 @@ _021E99C6: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _021E9B3C ; =0x000003D9 add r0, #0x64 @@ -6100,7 +6100,7 @@ _021E9BAC: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6195,7 +6195,7 @@ _021E9C80: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6405,7 +6405,7 @@ _021E9E2A: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl MOD75_021EB660 ldr r1, _021E9EDC ; =0x00000426 @@ -6654,7 +6654,7 @@ _021EA016: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021EA0C4 ; =0x000003D9 add r0, #0x64 @@ -7755,7 +7755,7 @@ MOD75_021EA8BC: ; 0x021EA8BC add r4, r0, #0 add r0, #0x24 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r4, #0 add r2, #0xc4 ldr r6, [r2] @@ -7922,7 +7922,7 @@ MOD75_021EA9F8: ; 0x021EA9F8 add r0, r5, #0 add r0, #0x54 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021EAAA0 ; =0x00000424 mov r4, #0 ldrb r0, [r5, r0] @@ -8971,7 +8971,7 @@ _021EB22E: add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9001,7 +9001,7 @@ _021EB298: bl FUN_0200D0BC add r0, r4, r6 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9119,7 +9119,7 @@ _021EB37A: add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9144,7 +9144,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 add r5, r0, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9214,7 +9214,7 @@ MOD75_021EB454: ; 0x021EB454 add r0, r5, #0 add r0, #0x34 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9280,7 +9280,7 @@ MOD75_021EB504: ; 0x021EB504 add r4, #0x94 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9365,7 +9365,7 @@ MOD75_021EB5B0: ; 0x021EB5B0 add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9543,7 +9543,7 @@ MOD75_021EB708: ; 0x021EB708 _021EB722: add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9654,7 +9654,7 @@ MOD75_021EB808: ; 0x021EB808 bne _021EB854 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021EB8E4 ; =0x000003F7 add r0, r4, #0 mov r1, #1 @@ -9755,7 +9755,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 add r4, #0xa4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021EB9B0 ; =0x000003F7 add r0, r4, #0 mov r1, #1 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 13ddf00c..9f7f7745 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -467,7 +467,7 @@ _021D78A8: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -478,7 +478,7 @@ _021D78A8: add r0, r7, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, #0xc8 add r0, r7, #0 mov r1, #0 @@ -600,7 +600,7 @@ _021D799C: mov r0, #0x41 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r2, [r5] mov r0, #0x41 @@ -1340,7 +1340,7 @@ _021D7F50: ldrh r1, [r3, #0x12] ldrh r2, [r3, #0x10] mov r3, #0x43 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x41 lsl r1, r1, #2 str r0, [r5, r1] @@ -1365,7 +1365,7 @@ MOD76_021D7FAC: ; 0x021D7FAC ldr r0, [r4, r0] add r1, #0x12 add r2, #0x10 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1418,19 +1418,19 @@ MOD76_021D800C: ; 0x021D800C add r4, r1, #0 add r0, #0xa8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x78 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x98 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x4b lsl r0, r0, #2 ldr r0, [r5, r0] @@ -1601,7 +1601,7 @@ MOD76_021D81AC: ; 0x021D81AC add r4, r1, #0 add r0, #0xb8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r4, r1 @@ -2043,7 +2043,7 @@ MOD76_021D853C: ; 0x021D853C add r5, r1, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r1, r5, #0 bl MOD76_021D8354 @@ -2169,7 +2169,7 @@ MOD76_021D862C: ; 0x021D862C add r4, r0, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 bl MOD76_021D8354 @@ -2217,7 +2217,7 @@ MOD76_021D8688: ; 0x021D8688 add r4, r0, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 bl MOD76_021D8354 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index a5eaa94b..01cab9b7 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -242,7 +242,7 @@ _021D76D6: _021D76FA: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -358,7 +358,7 @@ _021D77A2: _021D77DE: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -438,7 +438,7 @@ _021D7838: _021D7886: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -1812,7 +1812,7 @@ _021D83B2: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _021D8410 ; =0x0000C054 ldr r2, _021D8414 ; =0x000001D9 str r0, [r5, r1] @@ -1902,7 +1902,7 @@ _021D8462: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _021D84D0 ; =0x0000C054 ldr r2, _021D84D4 ; =0x000001D9 str r0, [r5, r1] @@ -1937,7 +1937,7 @@ MOD77_021D84D8: ; 0x021D84D8 mov r1, #0 ldr r0, [r4, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _021D850C ; =0x0000C058 ldr r0, [r4, r0] bl ListMenu_dtor diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index f0b34ee0..5982ed76 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2951,7 +2951,7 @@ MOD80_0222EC98: ; 0x0222EC98 ldr r0, _0222ED88 ; =0x00000EB8 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r3, #0 @@ -2992,7 +2992,7 @@ _0222ECF2: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r6, #0x1e add r0, r0, #1 @@ -3019,7 +3019,7 @@ _0222ECF2: ldr r0, _0222ED94 ; =0x00000E98 mov r1, #0xf add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -3039,7 +3039,7 @@ _0222ECF2: ldr r0, _0222ED98 ; =0x00000FB8 mov r1, #0xf add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3678,7 +3678,7 @@ MOD80_0222F250: ; 0x0222F250 ldr r0, _0222F2A0 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222F2A0 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -3720,7 +3720,7 @@ MOD80_0222F2A8: ; 0x0222F2A8 ldr r0, _0222F2F8 ; =0x00000FB8 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222F2F8 ; =0x00000FB8 mov r1, #0 add r0, r5, r0 @@ -3761,7 +3761,7 @@ MOD80_0222F300: ; 0x0222F300 add r6, r0, #0 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -4250,7 +4250,7 @@ MOD80_0222F6EC: ; 0x0222F6EC ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xf str r0, [sp] mov r0, #0xa @@ -4303,7 +4303,7 @@ _0222F754: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #8] ldr r0, [r4, #0xc] add r7, r7, #1 @@ -4805,7 +4805,7 @@ MOD80_0222FB3C: ; 0x0222FB3C ldr r0, _0222FBB8 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222FBB8 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -4912,7 +4912,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 _0222FC64: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -5506,7 +5506,7 @@ MOD80_02230128: ; 0x02230128 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xf str r0, [sp] mov r0, #0xa @@ -5559,7 +5559,7 @@ _02230190: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #8] ldr r0, [r4, #0xc] add r7, r7, #1 @@ -5983,7 +5983,7 @@ MOD80_022304F8: ; 0x022304F8 ldr r0, _02230548 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02230548 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -6061,7 +6061,7 @@ MOD80_022305A8: ; 0x022305A8 add r5, r0, #0 add r7, r2, #0 add r4, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [sp] ldr r0, _02230610 ; =0x000F0200 @@ -6113,7 +6113,7 @@ MOD80_02230614: ; 0x02230614 mov r1, #0 add r6, r0, #0 add r4, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r5, #0 beq _0223063A mov r2, #0 @@ -6516,7 +6516,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r3, #0xb5 ldr r0, _02230A70 ; =0x000F0D00 @@ -6551,7 +6551,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _02230A78 ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _02230A7C ; =0x0223719C @@ -6582,7 +6582,7 @@ _022309D2: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r6, #0x16 add r4, r4, #4 @@ -6624,7 +6624,7 @@ _02230A20: ldr r0, [sp, #0x18] mov r1, #0 add r0, r0, r7 - bl FUN_02019620 + bl FillWindowPixelBuffer add r5, r5, #1 add r6, #0x10 add r4, r4, #4 @@ -7524,7 +7524,7 @@ MOD80_0223113C: ; 0x0223113C ldr r0, _022311BC ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] mov r0, #0xa @@ -7543,7 +7543,7 @@ MOD80_0223113C: ; 0x0223113C ldr r0, _022311C4 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -7626,7 +7626,7 @@ _02231240: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -7643,7 +7643,7 @@ _02231266: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -7747,7 +7747,7 @@ _02231342: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -7780,7 +7780,7 @@ _0223138C: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -7807,7 +7807,7 @@ _0223138C: ldr r0, _0223147C ; =0x00000F18 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] ldr r0, _02231480 ; =0x00010200 @@ -7847,7 +7847,7 @@ _0223138C: ldr r0, _02231488 ; =0x00000F38 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #2 @@ -7913,7 +7913,7 @@ MOD80_02231490: ; 0x02231490 ldr r0, _022314E8 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -7980,7 +7980,7 @@ _0223154A: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -8005,7 +8005,7 @@ _0223158E: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -8025,7 +8025,7 @@ _0223158E: mov r1, #0 add r0, r5, r0 str r1, [r5, #0x2c] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #2 @@ -8089,7 +8089,7 @@ MOD80_02231614: ; 0x02231614 ldr r0, _0223166C ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -8153,7 +8153,7 @@ _022316D0: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -8178,7 +8178,7 @@ _0223170C: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -8199,7 +8199,7 @@ _0223170C: mov r1, #0 add r0, r5, r0 str r1, [r5, #0x2c] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] ldr r0, _02231788 ; =0x00010200 @@ -8377,7 +8377,7 @@ MOD80_0223187C: ; 0x0223187C ldr r0, _022318CC ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022318CC ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -9121,7 +9121,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FDC ; =0x00000EB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r1, #0xb5 ldr r0, _02231FE0 ; =0x000F0E00 @@ -9150,7 +9150,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FE4 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02231FE4 ; =0x00000EC8 add r0, r4, r0 bl CopyWindowToVram @@ -9172,7 +9172,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FE8 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -9192,7 +9192,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FF0 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #6 @@ -9212,7 +9212,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FF8 ; =0x00000EE8 mov r1, #6 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 ldr r0, _02231FFC ; =0x00010306 str r3, [sp] @@ -10679,7 +10679,7 @@ _02232B62: add r4, r5, r0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 mov r2, #1 @@ -11146,7 +11146,7 @@ _02232F22: ldr r0, _02232F9C ; =0x00000EC8 mov r1, #0 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] ldr r0, _02232FA0 ; =0x00010200 @@ -11657,7 +11657,7 @@ MOD80_022332EC: ; 0x022332EC ldr r0, _02233350 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02233350 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -11908,7 +11908,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, _022335CC ; =0x00000EB8 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r1, #0xb5 ldr r0, _022335D0 ; =0x000F0E00 @@ -11938,7 +11938,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, _022335D4 ; =0x00000E98 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp, #0x14] ldr r0, _022335D8 ; =0x00000F08 @@ -11968,7 +11968,7 @@ _0223357E: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram ldr r0, [sp, #0x14] @@ -12158,7 +12158,7 @@ _02233714: ldr r0, _02233778 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] mov r0, #0xa @@ -12177,7 +12177,7 @@ _02233714: ldr r0, _02233780 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [r4, #0x2c] add sp, #0x14 @@ -12260,7 +12260,7 @@ _022337FA: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -12277,7 +12277,7 @@ _02233820: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -12415,7 +12415,7 @@ _02233932: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -12454,7 +12454,7 @@ _0223398C: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] bl ListMenu_dtor @@ -12577,7 +12577,7 @@ MOD80_02233A6C: ; 0x02233A6C ldr r0, _02233AC4 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -12644,7 +12644,7 @@ _02233B26: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -12669,7 +12669,7 @@ _02233B6A: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -12752,7 +12752,7 @@ MOD80_02233BE8: ; 0x02233BE8 ldr r0, _02233C40 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -12816,7 +12816,7 @@ _02233CA4: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -12856,7 +12856,7 @@ _02233CFA: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] bl ListMenu_dtor @@ -13235,7 +13235,7 @@ MOD80_02233FB4: ; 0x02233FB4 _02233FE0: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -13307,7 +13307,7 @@ MOD80_02234048: ; 0x02234048 _02234074: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -13416,7 +13416,7 @@ _0223415A: _0223415E: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -13718,7 +13718,7 @@ _02234388: ldrh r1, [r2, #6] ldrh r2, [r2, #4] mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -13867,7 +13867,7 @@ MOD80_022344DC: ; 0x022344DC mov r1, #0xf str r2, [sp, #0x10] str r3, [sp, #0x14] - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r5, #6] ldrh r0, [r5, #4] ldr r2, [sp, #0x14] @@ -13912,7 +13912,7 @@ MOD80_022344DC: ; 0x022344DC ldrh r2, [r3, r2] add r0, sp, #0x18 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} nop @@ -13968,7 +13968,7 @@ _02234578: add r0, sp, #4 add r2, r1, #0 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14024,7 +14024,7 @@ _022345E8: add r0, sp, #4 add r2, r1, #0 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14089,7 +14089,7 @@ MOD80_02234698: ; 0x02234698 sub sp, #4 add r5, r0, #0 add r4, r1, #0 - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 add r0, r5, #0 add r1, sp, #0 @@ -14449,7 +14449,7 @@ MOD80_02234958: ; 0x02234958 ldr r0, _02234990 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -18128,7 +18128,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _02236628 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0x18 @@ -18149,7 +18149,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _0223662C ; =0x00000EB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 mov r1, #0xb5 ldr r0, _02236630 ; =0x000F0E00 @@ -18180,7 +18180,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _02236634 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -19051,7 +19051,7 @@ MOD80_02236C70: ; 0x02236C70 ldr r0, _02236CD8 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02236CD8 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -19206,7 +19206,7 @@ MOD80_02236D8C: ; 0x02236D8C ldr r0, _02236DFC ; =0x00000EC8 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02236DFC ; =0x00000EC8 mov r1, #1 add r0, r5, r0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 94767f70..63312258 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2229,7 +2229,7 @@ MOD81_02238E44: ; 0x02238E44 add r0, r4, #0 add r0, #0x44 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x20 str r3, [sp] mov r0, #0x3a @@ -2527,7 +2527,7 @@ _0223918A: add r0, r4, #0 add r0, #0x44 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9281,7 +9281,7 @@ MOD81_0223C658: ; 0x0223C658 add r0, r4, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x20 str r3, [sp] mov r0, #0x3a @@ -9640,7 +9640,7 @@ _0223C9D0: add r0, r4, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index b9d0df31..6af5c444 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1744,7 +1744,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #6 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xe str r0, [sp] mov r0, #4 @@ -1766,7 +1766,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xe str r0, [sp] mov r0, #4 @@ -1788,7 +1788,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #1 mov r1, #0xdb lsl r1, r1, #4 @@ -1810,7 +1810,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #6 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 ldr r0, _0222E46C ; =0x00010406 str r3, [sp] @@ -1842,7 +1842,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #6 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -4037,7 +4037,7 @@ MOD82_0222F4D8: ; 0x0222F4D8 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 @@ -4132,7 +4132,7 @@ MOD82_0222F59C: ; 0x0222F59C lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 @@ -4258,7 +4258,7 @@ MOD82_0222F694: ; 0x0222F694 add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] add r0, r4, #0 @@ -4375,7 +4375,7 @@ MOD82_0222F740: ; 0x0222F740 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x37 lsl r0, r0, #6 add r0, r5, r0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 7e36aa68..8551901e 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -4616,7 +4616,7 @@ _0222FA62: beq _0222FA70 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _0222FA70: add r0, r7, #0 add r0, #0x18 @@ -5863,13 +5863,13 @@ _022303FE: beq _02230436 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _02230436: mov r1, #0 add r0, sp, #8 add r2, r1, #0 mov r3, #0x56 - bl FUN_020010A8 + bl ListMenuInit str r0, [r4, #0x78] mov r0, #0 ldr r2, [sp, #0x40] @@ -5993,7 +5993,7 @@ MOD83_0223050C: ; 0x0223050C bl FUN_02002E4C add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r6, [r4, #0x14] cmp r6, #0 bne _02230554 @@ -6059,7 +6059,7 @@ MOD83_022305A4: ; 0x022305A4 bl FUN_02002E4C add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -6092,7 +6092,7 @@ MOD83_02230604: ; 0x02230604 add r6, r2, #0 bl OverlayManager_GetData ldr r0, [r0, #0x78] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -8150,7 +8150,7 @@ _02231708: beq _02231718 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _02231718: add r0, r7, #0 mov r1, #0x57 @@ -8205,7 +8205,7 @@ _02231752: str r0, [sp, #0x10] add r0, r2, #0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _02231798 ; =0x00002B68 str r0, [r5, r1] add sp, #0x24 @@ -8238,7 +8238,7 @@ MOD83_022317A8: ; 0x022317A8 bl FUN_02002E4C add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 add r1, r4, #0 add r2, r7, #0 @@ -8510,7 +8510,7 @@ MOD83_02231A00: ; 0x02231A00 str r1, [r4, r0] sub r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231A44 ; =0x00002B68 mov r1, #0 str r1, [r4, r0] @@ -9125,7 +9125,7 @@ _02231EBE: bl FUN_02002E4C add r1, r0, #0 add r0, r6, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x18] ldr r3, [r4, #0x24] str r0, [sp, #0x28] @@ -9249,7 +9249,7 @@ _02231FD2: add r0, r6, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x20] cmp r0, #0 beq _02231FFE @@ -9529,7 +9529,7 @@ MOD83_02232208: ; 0x02232208 bl OverlayManager_GetData ldr r1, _02232270 ; =0x00002B68 ldr r0, [r0, r1] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -10694,7 +10694,7 @@ _02232B94: ldr r0, _02232D1C ; =0x00002AA8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02232D1C ; =0x00002AA8 add r0, r4, r0 bl CopyWindowToVram @@ -11088,7 +11088,7 @@ _02232E7E: mov r5, #0 ldr r0, [sp, #0x10] add r1, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 str r0, [sp, #0x14] cmp r6, #0 @@ -11230,7 +11230,7 @@ MOD83_02232FE4: ; 0x02232FE4 str r0, [r5, r1] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 str r3, [sp] ldr r0, _0223307C ; =0x000029A0 @@ -15511,7 +15511,7 @@ _02234F7A: ldr r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer _02234F8C: mov r0, #0 ldr r1, [r5, #0x34] @@ -18576,7 +18576,7 @@ MOD83_02236804: ; 0x02236804 bl CTRDG_IsPulledOut cmp r0, #1 beq _02236822 - ldr r0, _02236B3C ; =gBacklightTop + 4 + ldr r0, _02236B3C ; =UNK_02016FA4 ldr r0, [r0] cmp r0, #0 beq _02236828 @@ -18966,7 +18966,7 @@ _02236B2E: str r0, [r5] b _02236D90 .align 2, 0 -_02236B3C: .word gBacklightTop + 4 +_02236B3C: .word UNK_02016FA4 _02236B40: .word 0x000004A8 _02236B44: .word 0x000004AC _02236B48: .word 0x0000E880 @@ -23084,7 +23084,7 @@ MOD83_0223894C: ; 0x0223894C add r1, #0x48 ldrb r1, [r1] ldr r0, [r5, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer _02238976: mov r0, #0 ldr r1, [r5, #0x4c] diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 66e7a196..969429f0 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -577,7 +577,7 @@ MOD84_021D84F8: ; 0x021D84F8 bl FUN_02019064 ldr r0, [r4, #0x24] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] bl FUN_02019270 ldr r0, [r4, #0x24] @@ -712,7 +712,7 @@ _021D864C: ble _021D86D0 ldr r0, [r5, #0x28] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -880,7 +880,7 @@ MOD84_021D87B0: ; 0x021D87B0 beq _021D87CE ldr r0, [r5, #0x24] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r4, _021D8814 ; =0x0001020F b _021D87D0 _021D87CE: diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index adb49508..a7798340 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -847,7 +847,7 @@ MOD85_021D7BEC: ; 0x021D7BEC add r0, r4, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021D7C40 ; =0x00000408 ldr r2, [r4, #0x18] ldr r0, [r5, r0] @@ -884,7 +884,7 @@ MOD85_021D7C44: ; 0x021D7C44 add r0, r5, r4 add r0, #8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #8 bl FUN_02019220 diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index a7508fab..a9e0b94e 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -344,8 +344,8 @@ void FUN_020163BC(void) gMain.unk3C = 0; gMain.unk40 = 0; gMain.unk44 = 0; - gMain.unk48 = 0; - gMain.unk4C = 0; + gMain.newKeys = 0; + gMain.newAndRepeatedKeys = 0; gMain.unk50 = 0; gMain.unk54 = 8; gMain.unk58 = 15; @@ -387,9 +387,9 @@ void FUN_02016464(void) TPData raw, calib; if (PAD_DetectFold()) { - gMain.unk48 = 0; + gMain.newKeys = 0; gMain.unk44 = 0; - gMain.unk4C = 0; + gMain.newAndRepeatedKeys = 0; gMain.unk60 = 0; gMain.unk62 = 0; return; @@ -409,9 +409,9 @@ void FUN_02016464(void) gMain.unk50 = gMain.unk58; } gMain.unk38 = r0; - gMain.unk48 = gMain.unk3C; + gMain.newKeys = gMain.unk3C; gMain.unk44 = r0; - gMain.unk4C = gMain.unk40; + gMain.newAndRepeatedKeys = gMain.unk40; FUN_02016568(); if (gMain.unk64 == 0) { @@ -453,26 +453,26 @@ void FUN_02016568(void) case 0: // Normal break; case 1: // Start = X - if (gMain.unk48 & PAD_BUTTON_START) - gMain.unk48 |= PAD_BUTTON_X; + if (gMain.newKeys & PAD_BUTTON_START) + gMain.newKeys |= PAD_BUTTON_X; if (gMain.unk44 & PAD_BUTTON_START) gMain.unk44 |= PAD_BUTTON_X; - if (gMain.unk4C & PAD_BUTTON_START) - gMain.unk4C |= PAD_BUTTON_X; + if (gMain.newAndRepeatedKeys & PAD_BUTTON_START) + gMain.newAndRepeatedKeys |= PAD_BUTTON_X; break; case 2: // Swap X and Y; unused in the retail game { u32 r1 = 0; - if (gMain.unk48 & PAD_BUTTON_X) + if (gMain.newKeys & PAD_BUTTON_X) { r1 |= PAD_BUTTON_Y; } - if (gMain.unk48 & PAD_BUTTON_Y) + if (gMain.newKeys & PAD_BUTTON_Y) { r1 |= PAD_BUTTON_X; } - gMain.unk48 &= 0xF3FF; - gMain.unk48 |= r1; + gMain.newKeys &= 0xF3FF; + gMain.newKeys |= r1; } { u32 r1 = 0; @@ -489,28 +489,28 @@ void FUN_02016568(void) } { u32 r1 = 0; - if (gMain.unk4C & PAD_BUTTON_X) + if (gMain.newAndRepeatedKeys & PAD_BUTTON_X) { r1 |= PAD_BUTTON_Y; } - if (gMain.unk4C & PAD_BUTTON_Y) + if (gMain.newAndRepeatedKeys & PAD_BUTTON_Y) { r1 |= PAD_BUTTON_X; } - gMain.unk4C &= 0xF3FF; - gMain.unk4C |= r1; + gMain.newAndRepeatedKeys &= 0xF3FF; + gMain.newAndRepeatedKeys |= r1; } break; case 3: // L = A - if (gMain.unk48 & PAD_BUTTON_L) - gMain.unk48 |= PAD_BUTTON_A; + if (gMain.newKeys & PAD_BUTTON_L) + gMain.newKeys |= PAD_BUTTON_A; if (gMain.unk44 & PAD_BUTTON_L) gMain.unk44 |= PAD_BUTTON_A; - if (gMain.unk4C & PAD_BUTTON_L) - gMain.unk4C |= PAD_BUTTON_A; - gMain.unk48 &= 0xFCFF; + if (gMain.newAndRepeatedKeys & PAD_BUTTON_L) + gMain.newAndRepeatedKeys |= PAD_BUTTON_A; + gMain.newKeys &= 0xFCFF; gMain.unk44 &= 0xFCFF; - gMain.unk4C &= 0xFCFF; + gMain.newAndRepeatedKeys &= 0xFCFF; } } diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c new file mode 100644 index 00000000..6d440ad1 --- /dev/null +++ b/arm9/src/list_menu.c @@ -0,0 +1,126 @@ +#include "global.h" +#include "heap.h" +#include "main.h" +#include "list_menu.h" + +extern void * FUN_02013690(u32 heap_id); +extern void CreateListMenuCursorObj(void *, u32); +extern void DestroyListMenuCursorObj(void *); +extern void FillWindowPixelBuffer(struct Window *, u32); +void ListMenuPrintEntries(struct ListMenu *, u16, u16, u16); +void ListMenuDrawCursor(struct ListMenu *); +BOOL ListMenuChangeSelection(struct ListMenu *, s32, u8, s32); +void ListMenuCallSelectionChangedCallback(struct ListMenu *, BOOL); +extern void CopyWindowToVram(struct Window *); + +THUMB_FUNC struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id) +{ + struct ListMenu * list = AllocFromHeap(heap_id, sizeof(struct ListMenu)); + list->template = *template; + list->cursor = FUN_02013690(heap_id); + list->cursorPos = cursorPos; + list->itemsAbove = itemsAbove; + list->unk_30 = 0; + list->unk_31 = 0; + list->taskId = 0xFF; + list->unk_33 = 0; + list->heap_id = (u8)heap_id; + list->cursorPal = list->template.cursorPal; + list->fillValue = list->template.fillValue; + list->cursorShadowPal = list->template.cursorShadowPal; + list->lettersSpacing = list->template.lettersSpacing; + list->fontId = list->template.fontId; + list->enabled = 0; + if (list->template.totalItems < list->template.maxShowed) + list->template.maxShowed = list->template.totalItems; + CreateListMenuCursorObj( + list->cursor, + (u32)( + ((u32)(list->template.cursorPal << 24) >> 8) + | ((u32)(list->template.cursorShadowPal << 24) >> 16) + | ((u32)(list->template.fillValue << 24) >> 24) + ) + ); + FillWindowPixelBuffer(list->template.window, list->template.fillValue); + ListMenuPrintEntries(list, list->cursorPos, 0, list->template.maxShowed); + ListMenuDrawCursor(list); + ListMenuCallSelectionChangedCallback(list, TRUE); + CopyWindowToVram(template->window); + return list; +} + +THUMB_FUNC s32 ListMenu_ProcessInput(struct ListMenu * list) +{ + list->unk_33 = 0; + + if (gMain.newKeys & REG_PAD_KEYINPUT_A_MASK) { + return list->template.items[list->cursorPos + list->itemsAbove].index; + } + else if (gMain.newKeys & REG_PAD_KEYINPUT_B_MASK) { + return LIST_CANCEL; + } + else if (gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_UP_MASK) { + if (!ListMenuChangeSelection(list, TRUE, 1, FALSE)) + list->unk_33 = 1; + return LIST_NOTHING_CHOSEN; + } + else if (gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_DOWN_MASK) { + if (!ListMenuChangeSelection(list, TRUE, 1, TRUE)) + list->unk_33 = 2; + return LIST_NOTHING_CHOSEN; + } + else + { + u16 rightButton, leftButton; + switch (list->template.scrollMultiple) + { + case LIST_NO_MULTIPLE_SCROLL: + default: + leftButton = FALSE; + rightButton = FALSE; + break; + case LIST_MULTIPLE_SCROLL_DPAD: + leftButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_LEFT_MASK; + rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_RIGHT_MASK; + break; + case LIST_MULTIPLE_SCROLL_L_R: + leftButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_L_MASK; + rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_R_MASK; + break; + } + if (leftButton) + { + if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, FALSE)) + list->unk_33 = 3; + return LIST_NOTHING_CHOSEN; + } + else if (rightButton) + { + if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, TRUE)) + list->unk_33 = 4; + return LIST_NOTHING_CHOSEN; + } + else + { + return LIST_NOTHING_CHOSEN; + } + } +} + +THUMB_FUNC void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove) +{ + if (cursorPos != NULL) + *cursorPos = list->cursorPos; + if (itemsAbove != NULL) + *itemsAbove = list->itemsAbove; + DestroyListMenuCursorObj(list->cursor); + FUN_02016A8C(list->heap_id, list); +} + +THUMB_FUNC void RedrawListMenu(struct ListMenu * list) +{ + FillWindowPixelBuffer(list->template.window, list->template.fillValue); + ListMenuPrintEntries(list, list->cursorPos, 0, list->template.maxShowed); + ListMenuDrawCursor(list); + CopyWindowToVram(list->template.window); +} diff --git a/arm9/src/main.c b/arm9/src/main.c index 117535b2..4879cb4c 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -22,7 +22,9 @@ FS_EXTERN_OVERLAY(MODULE_63); #define SOFT_RESET_KEY (PAD_BUTTON_L | PAD_BUTTON_R | PAD_BUTTON_START | PAD_BUTTON_SELECT) -struct Unk2106FA0 gBacklightTop; +s32 UNK_02016FA4; +PMBackLightSwitch gBacklightTop; +struct UnkStruct_02016FA8 UNK_02016FA8;; extern void InitSystemForTheGame(void); extern void InitGraphicMemory(void); @@ -52,6 +54,7 @@ extern u8 SDK_STATIC_BSS_START[]; const int gGameLanguage = GAME_LANGUAGE; const int gGameVersion = GAME_VERSION; +__declspec(noreturn) THUMB_FUNC void NitroMain(void) { InitSystemForTheGame(); @@ -68,13 +71,13 @@ THUMB_FUNC void NitroMain(void) FUN_02002C50(0, 3); FUN_02002C50(1, 3); FUN_02002C50(3, 3); - gBacklightTop.unk18 = -1; - gBacklightTop.unk20 = SaveBlock2_new(); - InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20)); + UNK_02016FA8.unk10 = -1; + UNK_02016FA8.unk18 = SaveBlock2_new(); + InitSoundData(FUN_02029EF8(UNK_02016FA8.unk18), Sav2_PlayerData_GetOptionsAddr(UNK_02016FA8.unk18)); Init_Timer3(); if (FUN_020337E8(3) == 3) FUN_02034188(3, 0); - if (FUN_020227FC(gBacklightTop.unk20) == 0) + if (FUN_020227FC(UNK_02016FA8.unk18) == 0) { FUN_02089D90(0); } @@ -84,12 +87,12 @@ THUMB_FUNC void NitroMain(void) { case 0: // Title Demo - gBacklightTop.unk1C = 0; + UNK_02016FA8.unk14 = 0; RegisterMainOverlay(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); break; case 1: // Reset transition? - gBacklightTop.unk1C = 1; + UNK_02016FA8.unk14 = 1; RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8); break; default: @@ -102,7 +105,7 @@ THUMB_FUNC void NitroMain(void) InitializeMainRNG(); FUN_0200A2AC(); FUN_02015E30(); - gBacklightTop.unk4 = 0; + UNK_02016FA4 = 0; for (;;) { FUN_02000EE8(); @@ -141,40 +144,40 @@ THUMB_FUNC void NitroMain(void) THUMB_FUNC void FUN_02000DF4(void) { - gBacklightTop.unk8 = (FSOverlayID)-1; - gBacklightTop.unkC = 0; - gBacklightTop.unk10 = (FSOverlayID)-1; // overlay invalid - gBacklightTop.unk14 = NULL; + UNK_02016FA8.unk0 = SDK_OVERLAY_INVALID_ID; + UNK_02016FA8.unk4 = NULL; + UNK_02016FA8.unk8 = SDK_OVERLAY_INVALID_ID; // overlay invalid + UNK_02016FA8.unkC = NULL; } THUMB_FUNC void Main_RunOverlayManager(void) { - if (!gBacklightTop.unkC) + if (UNK_02016FA8.unk4 == NULL) { - if (gBacklightTop.unk14 == NULL) + if (UNK_02016FA8.unkC == NULL) return; - if (gBacklightTop.unk10 != SDK_OVERLAY_INVALID_ID) - HandleLoadOverlay(gBacklightTop.unk10, 0); - gBacklightTop.unk8 = gBacklightTop.unk10; - gBacklightTop.unkC = OverlayManager_new(gBacklightTop.unk14, &gBacklightTop.unk18, 0); - gBacklightTop.unk10 = SDK_OVERLAY_INVALID_ID; - gBacklightTop.unk14 = NULL; + if (UNK_02016FA8.unk8 != SDK_OVERLAY_INVALID_ID) + HandleLoadOverlay(UNK_02016FA8.unk8, 0); + UNK_02016FA8.unk0 = UNK_02016FA8.unk8; + UNK_02016FA8.unk4 = OverlayManager_new(UNK_02016FA8.unkC, &UNK_02016FA8.unk10, 0); + UNK_02016FA8.unk8 = SDK_OVERLAY_INVALID_ID; + UNK_02016FA8.unkC = NULL; } - if (OverlayManager_Run(gBacklightTop.unkC)) + if (OverlayManager_Run(UNK_02016FA8.unk4)) { - OverlayManager_delete(gBacklightTop.unkC); - gBacklightTop.unkC = 0; - if (gBacklightTop.unk8 != SDK_OVERLAY_INVALID_ID) - UnloadOverlayByID(gBacklightTop.unk8); + OverlayManager_delete(UNK_02016FA8.unk4); + UNK_02016FA8.unk4 = NULL; + if (UNK_02016FA8.unk0 != SDK_OVERLAY_INVALID_ID) + UnloadOverlayByID(UNK_02016FA8.unk0); } } THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1) { - if (gBacklightTop.unk14 != NULL) + if (UNK_02016FA8.unkC != NULL) ErrorHandling(); - gBacklightTop.unk10 = id; - gBacklightTop.unk14 = arg1; + UNK_02016FA8.unk8 = id; + UNK_02016FA8.unkC = arg1; } THUMB_FUNC void FUN_02000E9C(void) @@ -215,7 +218,7 @@ THUMB_FUNC void FUN_02000EE8(void) extern void FUN_0200E3A0(PMLCDTarget, int); -// No Return +__declspec(noreturn) THUMB_FUNC void DoSoftReset(u32 parameter) { FUN_0200E3A0(PM_LCD_TOP, 0x7FFF); @@ -252,7 +255,7 @@ THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1) { HandleDSLidAction(); FUN_02016464(); - if (gMain.unk48 & 1) + if (gMain.newKeys & 1) break; FUN_02000E9C(); } @@ -289,10 +292,10 @@ THUMB_FUNC void HandleDSLidAction(void) FUN_0201CE04(); if (CTRDG_IsPulledOut() == TRUE) { - gBacklightTop.unk4 = 1; + UNK_02016FA4 = 1; } { - int r1 = gBacklightTop.unk4; + int r1 = UNK_02016FA4; while (1) { PMWakeUpTrigger trigger = PM_TRIGGER_COVER_OPEN | PM_TRIGGER_CARD; @@ -306,7 +309,7 @@ THUMB_FUNC void HandleDSLidAction(void) } else if (PAD_DetectFold()) { - r1 = gBacklightTop.unk4 = 1; + r1 = UNK_02016FA4 = 1; } else break; @@ -326,6 +329,6 @@ THUMB_FUNC void HandleDSLidAction(void) { PM_GetBackLight(&top, &bottom); if (top == PM_BACKLIGHT_OFF) - PM_SetBackLight(PM_LCD_ALL, gBacklightTop.unk0); + PM_SetBackLight(PM_LCD_ALL, gBacklightTop); } } diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index fb88da54..00ccd34d 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -676,7 +676,7 @@ THUMB_FUNC BOOL ScrCmd_WaitButtonAB(struct ScriptContext *ctx) THUMB_FUNC static BOOL FUN_0203A46C(struct ScriptContext *ctx) { #pragma unused(ctx) - if (gMain.unk48 & 0x3) // Mask (A | B) ? + if (gMain.newKeys & 0x3) // Mask (A | B) ? { return TRUE; } @@ -692,7 +692,7 @@ THUMB_FUNC BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx) THUMB_FUNC static BOOL FUN_0203A4AC(struct ScriptContext *ctx) { - if (gMain.unk48 & 0x3) // Mask (A | B) ? + if (gMain.newKeys & 0x3) // Mask (A | B) ? { return TRUE; } @@ -713,27 +713,27 @@ THUMB_FUNC BOOL ScrCmd_WaitButton(struct ScriptContext *ctx) THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx) { - if (gMain.unk48 & 3) + if (gMain.newKeys & 3) { return TRUE; } - else if (gMain.unk48 & 0x40) + else if (gMain.newKeys & 0x40) { FUN_02055304(ctx->unk80->unk38, 0); } - else if (gMain.unk48 & 0x80) + else if (gMain.newKeys & 0x80) { FUN_02055304(ctx->unk80->unk38, 1); } - else if (gMain.unk48 & 0x20) + else if (gMain.newKeys & 0x20) { FUN_02055304(ctx->unk80->unk38, 2); } - else if (gMain.unk48 & 0x10) + else if (gMain.newKeys & 0x10) { FUN_02055304(ctx->unk80->unk38, 3); } - else if (gMain.unk48 & 0x400) + else if (gMain.newKeys & 0x400) { FUN_02039460(ctx->unk80); } @@ -753,11 +753,11 @@ THUMB_FUNC BOOL ScrCmd_Unk0032(struct ScriptContext *ctx) THUMB_FUNC static BOOL FUN_0203A570(struct ScriptContext *ctx) { #pragma unused(ctx) - if (gMain.unk48 & 0x3) + if (gMain.newKeys & 0x3) { return TRUE; } - else if (gMain.unk48 & 0xf0) + else if (gMain.newKeys & 0xf0) { return TRUE; } @@ -973,19 +973,19 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx) return TRUE; } - if (gMain.unk48 & 0x40) + if (gMain.newKeys & 0x40) { tmp = 0; } - else if (gMain.unk48 & 0x80) + else if (gMain.newKeys & 0x80) { tmp = 1; } - else if (gMain.unk48 & 0x20) + else if (gMain.newKeys & 0x20) { tmp = 2; } - else if (gMain.unk48 & 0x10) + else if (gMain.newKeys & 0x10) { tmp = 3; } @@ -999,7 +999,7 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx) } else { - if (gMain.unk48 & 0x400) + if (gMain.newKeys & 0x400) { FUN_0201BD7C(*unk1); *varPtr = 1; @@ -1022,24 +1022,24 @@ THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx) u16 *unk = GetVarPointer(ctx->unk80, (u16)ctx->data[0]); u32 tmp = 0xFFFF; - if (gMain.unk48 & 0x3) + if (gMain.newKeys & 0x3) { *unk = 0; return TRUE; } - else if (gMain.unk48 & 0x40) + else if (gMain.newKeys & 0x40) { tmp = 0; } - else if (gMain.unk48 & 0x80) + else if (gMain.newKeys & 0x80) { tmp = 1; } - else if (gMain.unk48 & 0x20) + else if (gMain.newKeys & 0x20) { tmp = 2; } - else if (gMain.unk48 & 0x10) + else if (gMain.newKeys & 0x10) { tmp = 3; } @@ -1052,7 +1052,7 @@ THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx) } else { - if (gMain.unk48 & 0x400) + if (gMain.newKeys & 0x400) { *unk = 1; return TRUE; diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index 470a2fe3..392af46d 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -11,7 +11,7 @@ extern void FUN_0200CD68(u32 param0, u32 param1, u32 param2, u32 param3, u8 para extern u32 FUN_0201AB08(u32 *param0); extern void FUN_0200D0BC(u32 *param0, u32 param1, u32 param2, u32 param3); -extern void FUN_02019620(u32 *param0, u32 param1); +extern void FillWindowPixelBuffer(u32 *param0, u32 param1); extern void FUN_02002B60(u8 param0); extern void FUN_02002B7C(u32 param0); @@ -52,7 +52,7 @@ THUMB_FUNC void FUN_02054608(u32 *param0, struct Options *options) THUMB_FUNC void FUN_0205464C(u32 *param0) { - FUN_02019620(param0, 15); + FillWindowPixelBuffer(param0, 15); } THUMB_FUNC u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3) @@ -103,6 +103,6 @@ THUMB_FUNC void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3) THUMB_FUNC void FUN_02054744(u32 *param0, u32 param1, u32 param2) { FUN_0200D300(*param0, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4); - FUN_02019620(param0, 15); + FillWindowPixelBuffer(param0, 15); FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1); } diff --git a/arm9/src/unk_0202E29C.c b/arm9/src/unk_0202E29C.c index 5f99ca8f..938107f2 100644 --- a/arm9/src/unk_0202E29C.c +++ b/arm9/src/unk_0202E29C.c @@ -17,13 +17,9 @@ struct UnkStruct_0202E29C_const const struct UnkStruct_0202E29C_const UNK_020EEC40 = { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } }; -struct -{ - u16 unk0; - u32 unk4; - struct UnkStruct_0202E29C *unk8; - -} UNK_021C59E8; +u16 UNK_021C59E8; +struct UnkStruct_0202E29C *UNK_021C59F0; +u32 UNK_021C59EC; extern u32 FUN_0202CEEC(); extern u32 FUN_02023AC4(); @@ -59,28 +55,28 @@ extern BOOL FUN_0202D2D0(); THUMB_FUNC void FUN_0202E29C(struct PlayerData *player_data) { - if (UNK_021C59E8.unk8 == NULL) + if (UNK_021C59F0 == NULL) { - UNK_021C59E8.unk8 = AllocFromHeap(0xf, sizeof(struct UnkStruct_0202E29C)); - MI_CpuFill8(UNK_021C59E8.unk8, 0, sizeof(struct UnkStruct_0202E29C)); + UNK_021C59F0 = AllocFromHeap(0xf, sizeof(struct UnkStruct_0202E29C)); + MI_CpuFill8(UNK_021C59F0, 0, sizeof(struct UnkStruct_0202E29C)); - UNK_021C59E8.unk8->unkCA4 = AllocFromHeap(0xf, FUN_0202CEEC()); - MI_CpuFill8(UNK_021C59E8.unk8->unkCA4, 0, FUN_0202CEEC()); + UNK_021C59F0->unkCA4 = AllocFromHeap(0xf, FUN_0202CEEC()); + MI_CpuFill8(UNK_021C59F0->unkCA4, 0, FUN_0202CEEC()); - UNK_021C59E8.unk8->unkCBC = AllocFromHeap(0xf, FUN_02023AC4()); - MI_CpuFill8(UNK_021C59E8.unk8->unkCBC, 0, FUN_02023AC4()); + UNK_021C59F0->unkCBC = AllocFromHeap(0xf, FUN_02023AC4()); + MI_CpuFill8(UNK_021C59F0->unkCBC, 0, FUN_02023AC4()); - UNK_021C59E8.unk8->unkCC0 = 0x333; - UNK_021C59E8.unk8->unkCB8 = player_data; + UNK_021C59F0->unkCC0 = 0x333; + UNK_021C59F0->unkCB8 = player_data; - MailMsg_init(&UNK_021C59E8.unk8->unkCA8); + MailMsg_init(&UNK_021C59F0->unkCA8); FUN_0202E500(); } } THUMB_FUNC BOOL FUN_0202E344() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { return TRUE; } @@ -142,26 +138,26 @@ THUMB_FUNC void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1) for (int i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { continue; } - if (!FUN_0202E358(UNK_021C59E8.unk8->unk054[i].unk04, param0->unk04, 6)) + if (!FUN_0202E358(UNK_021C59F0->unk054[i].unk04, param0->unk04, 6)) { continue; } - UNK_021C59E8.unk8->unkC84[i] = 0x96; + UNK_021C59F0->unkC84[i] = 0x96; - MI_CpuCopy8(param0, &UNK_021C59E8.unk8->unk054[i], sizeof(struct UnkStruct_0202E29C_sub)); + MI_CpuCopy8(param0, &UNK_021C59F0->unk054[i], sizeof(struct UnkStruct_0202E29C_sub)); return; } int i; for (i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { break; } @@ -169,9 +165,9 @@ THUMB_FUNC void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1) if (i < 0x10) { - UNK_021C59E8.unk8->unkC84[i] = 0x96; - MI_CpuCopy8(param0, &UNK_021C59E8.unk8->unk054[i], sizeof(struct UnkStruct_0202E29C_sub)); - UNK_021C59E8.unk8->unkCB4 = 1; + UNK_021C59F0->unkC84[i] = 0x96; + MI_CpuCopy8(param0, &UNK_021C59F0->unk054[i], sizeof(struct UnkStruct_0202E29C_sub)); + UNK_021C59F0->unkCB4 = 1; } } @@ -183,19 +179,19 @@ THUMB_FUNC void FUN_0202E470(u32 param0, u32 param1) OS_Terminate(); } - UNK_021C59E8.unk4 = 2; + UNK_021C59EC = 2; } THUMB_FUNC void FUN_0202E488() { - UNK_021C59E8.unk4 = 0; + UNK_021C59EC = 0; FUN_02016454(4); } THUMB_FUNC void FUN_0202E49C() { FUN_02016444(4); - UNK_021C59E8.unk4 = 1; + UNK_021C59EC = 1; if (FUN_02090DB8(8, FUN_0202E470, 0) != 1) { OS_Terminate(); @@ -204,7 +200,7 @@ THUMB_FUNC void FUN_0202E49C() THUMB_FUNC BOOL FUN_0202E4C8() { - if (UNK_021C59E8.unk4 == 2) + if (UNK_021C59EC == 2) { return TRUE; } @@ -214,7 +210,7 @@ THUMB_FUNC BOOL FUN_0202E4C8() THUMB_FUNC BOOL FUN_0202E4DC() { - if (UNK_021C59E8.unk4 != 0) + if (UNK_021C59EC != 0) { return TRUE; } @@ -229,42 +225,42 @@ THUMB_FUNC void FUN_0202E4F0() THUMB_FUNC void FUN_0202E500() { - UNK_021C59E8.unk8->unkCB0 = 0; - FUN_0202CE64(UNK_021C59E8.unk8->unkCA4 + (32 - (u32)(UNK_021C59E8.unk8->unkCA4) % 32)); + UNK_021C59F0->unkCB0 = 0; + FUN_0202CE64(UNK_021C59F0->unkCA4 + (32 - (u32)(UNK_021C59F0->unkCA4) % 32)); - FUN_0202CB70(UNK_021C59E8.unk8->unkCC0); + FUN_0202CB70(UNK_021C59F0->unkCC0); } THUMB_FUNC void FUN_0202E538() { for (int i = 0; i < 0x10; i++) { - UNK_021C59E8.unk8->unkC84[i] = 0; + UNK_021C59F0->unkC84[i] = 0; } - MI_CpuFill8(UNK_021C59E8.unk8->unk054, 0, 0xC00); + MI_CpuFill8(UNK_021C59F0->unk054, 0, 0xC00); } THUMB_FUNC void FUN_0202E56C(u32 param0) { - UNK_021C59E8.unk8->unkDAD_3 = (u8)param0; + UNK_021C59F0->unkDAD_3 = (u8)param0; } THUMB_FUNC void FUN_0202E594() { - UNK_021C59E8.unk8->unkCB4 = 0; + UNK_021C59F0->unkCB4 = 0; - UNK_021C59E8.unk8->unkDAD_0 = 0; + UNK_021C59F0->unkDAD_0 = 0; - UNK_021C59E8.unk8->unkDAD_2 = 0; + UNK_021C59F0->unkDAD_2 = 0; - UNK_021C59E8.unk8->unkDAA = 0; + UNK_021C59F0->unkDAA = 0; - UNK_021C59E8.unk8->unkDAD_4 = 0; + UNK_021C59F0->unkDAD_4 = 0; - UNK_021C59E8.unk8->unkDAC = 0; + UNK_021C59F0->unkDAC = 0; - UNK_021C59E8.unk8->unkDAB = 0; + UNK_021C59F0->unkDAB = 0; } THUMB_FUNC BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2) @@ -274,13 +270,13 @@ THUMB_FUNC BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2) FUN_0202E56C(param1); FUN_0202D2F4(); - if (UNK_021C59E8.unk8->unkDAB == 0) + if (UNK_021C59F0->unkDAB == 0) { FUN_0202D0A0(FUN_020303BC, 0xe); - UNK_021C59E8.unk8->unkDAB = 1; + UNK_021C59F0->unkDAB = 1; } - UNK_021C59E8.unk8->unkDAD_5 = (u8)param2; + UNK_021C59F0->unkDAD_5 = (u8)param2; if (FUN_0202CBD4() == 1 && FUN_0202CBFC() != 0) { return TRUE; @@ -298,10 +294,10 @@ THUMB_FUNC u32 FUN_0202E66C(u32 param0, u32 param1) FUN_0202E538(); } - if (UNK_021C59E8.unk8->unkDAB == 0) + if (UNK_021C59F0->unkDAB == 0) { FUN_0202D0A0(FUN_02030238, 0xe); - UNK_021C59E8.unk8->unkDAB = 1; + UNK_021C59F0->unkDAB = 1; } if (FUN_0202CBD4() == 1) @@ -319,23 +315,23 @@ THUMB_FUNC u32 FUN_0202E66C(u32 param0, u32 param1) THUMB_FUNC u32 FUN_0202E6F0() { - if (UNK_021C59E8.unk8 == NULL) + if (UNK_021C59F0 == NULL) { return 1; } - switch (UNK_021C59E8.unk8->unkDAC) + switch (UNK_021C59F0->unkDAC) { case 0: if (FUN_0202D21C() != 0) { FUN_0202C770(); - UNK_021C59E8.unk8->unkDAC = 1; + UNK_021C59F0->unkDAC = 1; } else if (FUN_0202D1E4() == 0) { FUN_0202D100(); - UNK_021C59E8.unk8->unkDAC = 2; + UNK_021C59F0->unkDAC = 2; } break; @@ -343,7 +339,7 @@ THUMB_FUNC u32 FUN_0202E6F0() if (FUN_0202D1E4() == 0) { FUN_0202D100(); - UNK_021C59E8.unk8->unkDAC = 2; + UNK_021C59F0->unkDAC = 2; } break; case 2: @@ -354,7 +350,7 @@ THUMB_FUNC u32 FUN_0202E6F0() if (FUN_0202D200() != 0) { - UNK_021C59E8.unk8->unkDAC = 1; + UNK_021C59F0->unkDAC = 1; } break; } @@ -364,9 +360,9 @@ THUMB_FUNC u32 FUN_0202E6F0() THUMB_FUNC BOOL FUN_0202E784() { - if (UNK_021C59E8.unk8 != NULL && UNK_021C59E8.unk8->unkDAA == 0) + if (UNK_021C59F0 != NULL && UNK_021C59F0->unkDAA == 0) { - UNK_021C59E8.unk8->unkDAA = 1; + UNK_021C59F0->unkDAA = 1; FUN_0202D100(); return TRUE; } @@ -376,26 +372,26 @@ THUMB_FUNC BOOL FUN_0202E784() THUMB_FUNC void FUN_0202E7B0(u32 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { if (param0 != 0) { - UNK_021C59E8.unk8->unkDAA = 2; + UNK_021C59F0->unkDAA = 2; return; } - UNK_021C59E8.unk8->unkDAA = 0; + UNK_021C59F0->unkDAA = 0; FUN_0202E500(); } } THUMB_FUNC void FUN_0202E7D8() { - FreeToHeap(UNK_021C59E8.unk8->unkCBC); - FreeToHeap(UNK_021C59E8.unk8->unkCA4); - FreeToHeap(UNK_021C59E8.unk8); + FreeToHeap(UNK_021C59F0->unkCBC); + FreeToHeap(UNK_021C59F0->unkCA4); + FreeToHeap(UNK_021C59F0); - UNK_021C59E8.unk8 = NULL; + UNK_021C59F0 = NULL; } THUMB_FUNC u32 FUN_0202E810() @@ -408,7 +404,7 @@ THUMB_FUNC u32 FUN_0202E810() u32 count = 0; for (int i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] != 0) + if (UNK_021C59F0->unkC84[i] != 0) { count++; } @@ -423,7 +419,7 @@ THUMB_FUNC s32 FUN_0202E844(u32 param0) u32 count = 0; for (i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { continue; } @@ -442,25 +438,25 @@ THUMB_FUNC s32 FUN_0202E844(u32 param0) THUMB_FUNC u8 FUN_0202E878() { - return UNK_021C59E8.unk8->unkCB4; + return UNK_021C59F0->unkCB4; } THUMB_FUNC void FUN_0202E88C() { - UNK_021C59E8.unk8->unkCB4 = 0; + UNK_021C59F0->unkCB4 = 0; } THUMB_FUNC s32 FUN_0202E8A0(s32 param0) { - if (UNK_021C59E8.unk8->unkC84[param0] != 0) + if (UNK_021C59F0->unkC84[param0] != 0) { - if (UNK_021C59E8.unk8->unk054[param0].unk50.unk06 == 0) + if (UNK_021C59F0->unk054[param0].unk50.unk06 == 0) { return 1; } else { - return UNK_021C59E8.unk8->unk054[param0].unk50.unk06; + return UNK_021C59F0->unk054[param0].unk50.unk06; } } @@ -490,7 +486,7 @@ THUMB_FUNC s32 FUN_0202E8F4() for (int i = 0xf; i >= 0; i--) { - if (UNK_021C59E8.unk8->unkC84[i] != 0 && FUN_0202EFE4(UNK_021C59E8.unk8->unk054[i].unk04)) + if (UNK_021C59F0->unkC84[i] != 0 && FUN_0202EFE4(UNK_021C59F0->unk054[i].unk04)) { s32 ret2 = FUN_0202E8A0(i); if (ret2 > 1 && ret2 < 8) @@ -512,7 +508,7 @@ THUMB_FUNC s32 FUN_0202E950() for (int i = 0xf; i >= 0; i--) { - if (UNK_021C59E8.unk8->unkC84[i] != 0 && FUN_0202EFE4(UNK_021C59E8.unk8->unk054[i].unk04)) + if (UNK_021C59F0->unkC84[i] != 0 && FUN_0202EFE4(UNK_021C59F0->unk054[i].unk04)) { return i; @@ -534,7 +530,7 @@ THUMB_FUNC void FUN_0202E9AC(u32 param0, struct PlayerData *player_data) u32 count = 0; for (i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { continue; } @@ -561,14 +557,14 @@ THUMB_FUNC u32 FUN_0202E9E8(u32 param0) if (FUN_0202CBD4() == 1) { s32 ret = FUN_02033534(); - UNK_021C59E8.unk8->unkDA8 = (u8)UNK_021C59E8.unk8->unk054[param0].unk36; + UNK_021C59F0->unkDA8 = (u8)UNK_021C59F0->unk054[param0].unk36; if (FUN_0202D8B0(ret) != 0) { - FUN_0202C4D8(1, UNK_021C59E8.unk8->unk054[param0].unk04, 0); + FUN_0202C4D8(1, UNK_021C59F0->unk054[param0].unk04, 0); } else { - FUN_0202D034(1, &UNK_021C59E8.unk8->unk054[param0]); + FUN_0202D034(1, &UNK_021C59F0->unk054[param0]); } return 1; @@ -581,20 +577,20 @@ THUMB_FUNC void FUN_0202EA54() { for (int i = 0; i < 0x10; i++) { - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { continue; } - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { continue; } - UNK_021C59E8.unk8->unkC84[i]--; + UNK_021C59F0->unkC84[i]--; - if (UNK_021C59E8.unk8->unkC84[i] == 0) + if (UNK_021C59F0->unkC84[i] == 0) { - UNK_021C59E8.unk8->unkCB4 = 1; + UNK_021C59F0->unkCB4 = 1; } } } @@ -606,48 +602,48 @@ THUMB_FUNC void FUN_0202EA9C() if (res != 0xf) { - struct UnkStruct_0202E29C_sub2 *res = &UNK_021C59E8.unk8->unkCC4; + struct UnkStruct_0202E29C_sub2 *res = &UNK_021C59F0->unkCC4; GF_ASSERT((s32)FUN_02023AC4() <= 0x20); GF_ASSERT(PlayerProfile_sizeof() == 0x20); MI_CpuCopy8(player_data, &res->unk08.unk08, PlayerProfile_sizeof()); - MI_CpuCopy8(UNK_021C59E8.unk8->unkCBC, res->unk08.unk28, FUN_02023AC4()); + MI_CpuCopy8(UNK_021C59F0->unkCBC, res->unk08.unk28, FUN_02023AC4()); res->unk00 = PlayerProfile_GetTrainerID(player_data); res->unk04 = (u8)FUN_02033534(); res->unk05 = FUN_0203354C(); - MI_CpuCopy8(&UNK_021C59E8.unk8->unkCA8, &res->unk08.unk00, sizeof(struct MailMessage)); + MI_CpuCopy8(&UNK_021C59F0->unkCA8, &res->unk08.unk00, sizeof(struct MailMessage)); res->unk08.unk4C = (u8)FUN_0202D358(); } else { - struct UnkStruct_0202E29C_sub2 *res = &UNK_021C59E8.unk8->unkCC4; + struct UnkStruct_0202E29C_sub2 *res = &UNK_021C59F0->unkCC4; res->unk00 = PlayerProfile_GetTrainerID(player_data); res->unk04 = (u8)FUN_02033534(); res->unk05 = FUN_0203354C(); - MI_CpuCopy8(&UNK_021C59E8.unk8->unk000, &res->unk08, sizeof(struct UnkStruct_0202E29C_sub3)); + MI_CpuCopy8(&UNK_021C59F0->unk000, &res->unk08, sizeof(struct UnkStruct_0202E29C_sub3)); } - DC_FlushRange(&UNK_021C59E8.unk8->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); - FUN_0202CB7C(&UNK_021C59E8.unk8->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); + DC_FlushRange(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); + FUN_0202CB7C(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); } THUMB_FUNC void FUN_0202EB7C() { - struct UnkStruct_0202E29C_sub2 *r4 = &UNK_021C59E8.unk8->unkCC4; + struct UnkStruct_0202E29C_sub2 *r4 = &UNK_021C59F0->unkCC4; if (r4->unk06 != FUN_0202EDB8()) { r4->unk06 = (u8)FUN_0202EDB8(); - DC_FlushRange(&UNK_021C59E8.unk8->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); - FUN_0202CB7C(&UNK_021C59E8.unk8->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); + DC_FlushRange(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); + FUN_0202CB7C(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); - FUN_0202D240(&UNK_021C59E8.unk8->unkCC4, + FUN_0202D240(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2), - UNK_021C59E8.unk8->unkCC0, - UNK_021C59E8.unk0); + UNK_021C59F0->unkCC0, + UNK_021C59E8); } } @@ -657,20 +653,20 @@ THUMB_FUNC void FUN_0202EBD0(u16 param0) FUN_0202DF54(); FUN_0202EB7C(); - if (FUN_0202D19C() == 0 && FUN_0202EE24() == 0 && UNK_021C59E8.unk8->unkDAD_2) + if (FUN_0202D19C() == 0 && FUN_0202EE24() == 0 && UNK_021C59F0->unkDAD_2) { - UNK_021C59E8.unk8->unkDAD_0 = 1; + UNK_021C59F0->unkDAD_0 = 1; } - if (UNK_021C59E8.unk8->unkDA6 == 0xFFFF) + if (UNK_021C59F0->unkDA6 == 0xFFFF) { - UNK_021C59E8.unk8->unkDA6 = param0; + UNK_021C59F0->unkDA6 = param0; } - if (UNK_021C59E8.unk8->unkDAD_1 && - UNK_021C59E8.unk8->unkDA6 > param0) + if (UNK_021C59F0->unkDAD_1 && + UNK_021C59F0->unkDA6 > param0) { - UNK_021C59E8.unk8->unkDAD_0 = 1; + UNK_021C59F0->unkDAD_0 = 1; } if (FUN_0202CBE8() == 25) @@ -681,24 +677,24 @@ THUMB_FUNC void FUN_0202EBD0(u16 param0) switch (r5) { case 0: - if (UNK_021C59E8.unk8->unkDAA == 1) + if (UNK_021C59F0->unkDAA == 1) { FUN_0202E7D8(); return; } - else if (UNK_021C59E8.unk8->unkDAA == 2) + else if (UNK_021C59F0->unkDAA == 2) { - UNK_021C59E8.unk8->unkDAA = 3; + UNK_021C59F0->unkDAA = 3; } break; case 1: - if (UNK_021C59E8.unk8->unkDAA == 1 && FUN_0202D178() != 0) + if (UNK_021C59F0->unkDAA == 1 && FUN_0202D178() != 0) { return; } - if (UNK_021C59E8.unk8->unkDAA == 2 && FUN_0202D178() != 0) + if (UNK_021C59F0->unkDAA == 2 && FUN_0202D178() != 0) { return; } @@ -708,41 +704,41 @@ THUMB_FUNC void FUN_0202EBD0(u16 param0) case 8: case 9: - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - UNK_021C59E8.unk8->unkDAD_0 = 1; + UNK_021C59F0->unkDAD_0 = 1; return; } break; case 7: u16 r0 = FUN_0202CDA4(); - if (UNK_021C59E8.unk8->unkDA9 == 0) + if (UNK_021C59F0->unkDA9 == 0) { - UNK_021C59E8.unk8->unkDA4 = r0; - UNK_021C59E8.unk8->unkDA9 = 5; + UNK_021C59F0->unkDA4 = r0; + UNK_021C59F0->unkDA9 = 5; } else { - UNK_021C59E8.unk8->unkDA9--; + UNK_021C59F0->unkDA9--; } - u16 r5 = UNK_021C59E8.unk8->unkDA4; - if (UNK_021C59E8.unk8->unkDAD_3) + u16 r5 = UNK_021C59F0->unkDA4; + if (UNK_021C59F0->unkDAD_3) { - UNK_021C59E8.unk0++; + UNK_021C59E8++; } FUN_0202EA9C(); FUN_0202CF84(0, - UNK_021C59E8.unk0, + UNK_021C59E8, r5, FUN_0202D858((u16)FUN_02033534()), FUN_0202EEE8((u16)FUN_02033534()), - UNK_021C59E8.unk8->unkDAD_5); + UNK_021C59F0->unkDAD_5); - UNK_021C59E8.unk8->unkDA8 = (u8)r5; + UNK_021C59F0->unkDA8 = (u8)r5; break; } @@ -750,7 +746,7 @@ THUMB_FUNC void FUN_0202EBD0(u16 param0) THUMB_FUNC void FUN_0202ED70(u16 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { FUN_0202EBD0(param0); } @@ -758,7 +754,7 @@ THUMB_FUNC void FUN_0202ED70(u16 param0) THUMB_FUNC u32 FUN_0202ED84(u16 param0) { - if (UNK_021C59E8.unk8 == NULL) + if (UNK_021C59F0 == NULL) { return 0; } @@ -792,9 +788,9 @@ THUMB_FUNC u32 FUN_0202EDB8() THUMB_FUNC BOOL FUN_0202EDD8() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - if (UNK_021C59E8.unk8->unkDAA == 3) + if (UNK_021C59F0->unkDAA == 3) { return TRUE; } @@ -805,7 +801,7 @@ THUMB_FUNC BOOL FUN_0202EDD8() THUMB_FUNC BOOL FUN_0202EDF8() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { return TRUE; } @@ -815,7 +811,7 @@ THUMB_FUNC BOOL FUN_0202EDF8() THUMB_FUNC u32 FUN_0202EE0C() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { return FUN_0202D1C8(); } @@ -825,7 +821,7 @@ THUMB_FUNC u32 FUN_0202EE0C() THUMB_FUNC u32 FUN_0202EE24() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { return FUN_0202CB8C() & 0xFFFE; } @@ -845,7 +841,7 @@ THUMB_FUNC BOOL FUN_0202EE44() THUMB_FUNC BOOL FUN_0202EE60() { - if (UNK_021C59E8.unk8 != NULL && UNK_021C59E8.unk8->unkDAD_0) + if (UNK_021C59F0 != NULL && UNK_021C59F0->unkDAD_0) { return TRUE; } @@ -855,19 +851,19 @@ THUMB_FUNC BOOL FUN_0202EE60() THUMB_FUNC void FUN_0202EE84(u32 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - UNK_021C59E8.unk8->unkDAD_2 = (u8)param0; + UNK_021C59F0->unkDAD_2 = (u8)param0; } } THUMB_FUNC void FUN_0202EEB0(u32 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - UNK_021C59E8.unk8->unkDAD_1 = (u8)param0; + UNK_021C59F0->unkDAD_1 = (u8)param0; - UNK_021C59E8.unk8->unkDA6 = 0xFFFF; + UNK_021C59F0->unkDA6 = 0xFFFF; } } @@ -891,11 +887,11 @@ THUMB_FUNC u32 FUN_0202EEE8(u16 param0) THUMB_FUNC struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - if (UNK_021C59E8.unk8->unkC84[param0] != 0) + if (UNK_021C59F0->unkC84[param0] != 0) { - return &UNK_021C59E8.unk8->unk054[param0]; + return &UNK_021C59F0->unk054[param0]; } } @@ -904,11 +900,11 @@ THUMB_FUNC struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0) THUMB_FUNC struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - if (UNK_021C59E8.unk8->unkC84[param0] != 0) + if (UNK_021C59F0->unkC84[param0] != 0) { - return &UNK_021C59E8.unk8->unk054[param0].unk50; + return &UNK_021C59F0->unk054[param0].unk50; } } @@ -917,63 +913,49 @@ THUMB_FUNC struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0) THUMB_FUNC struct PlayerData *FUN_0202EF70() { - return UNK_021C59E8.unk8->unkCB8; + return UNK_021C59F0->unkCB8; } THUMB_FUNC struct PlayerData *FUN_0202EF84(int param0) { - if (UNK_021C59E8.unk8->unkC84[param0] == 0) + if (UNK_021C59F0->unkC84[param0] == 0) { return NULL; } - struct UnkStruct_0202E29C_sub4 *r0 = &UNK_021C59E8.unk8->unk054[param0].unk50; + struct UnkStruct_0202E29C_sub4 *r0 = &UNK_021C59F0->unk054[param0].unk50; return &r0->unk10; } THUMB_FUNC void FUN_0202EFAC(u8 *param0, s32 param1) { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { GF_ASSERT(param1 < 8); - MI_CpuCopy8(param0, UNK_021C59E8.unk8->unkC54[param1], 6); + MI_CpuCopy8(param0, UNK_021C59F0->unkC54[param1], 6); } } #ifdef NONMATCHING THUMB_FUNC BOOL FUN_0202EFE4(u8 *param0) { - + u8 (*ptr)[6] = UNK_021C59F0->unkC54; for (int i = 0; i < 8; i++) { - if (UNK_021C59E8.unk8->unkC54[i][0] != param0[0]) - { + if (ptr[i][0] != param0[0]) continue; - } - - if (UNK_021C59E8.unk8->unkC54[i][1] != param0[1]) - { + if (ptr[i][1] != param0[1]) continue; - } - if (UNK_021C59E8.unk8->unkC54[i][2] != param0[2]) - { + if (ptr[i][2] != param0[2]) continue; - } - if (UNK_021C59E8.unk8->unkC54[i][3] != param0[3]) - { + if (ptr[i][3] != param0[3]) continue; - } - if (UNK_021C59E8.unk8->unkC54[i][4] != param0[4]) - { + if (ptr[i][4] != param0[4]) continue; - } - if (UNK_021C59E8.unk8->unkC54[i][5] != param0[5]) - { + if (ptr[i][5] != param0[5]) continue; - } - return TRUE; } @@ -1031,9 +1013,9 @@ _0202F026: THUMB_FUNC u32 FUN_0202F03C() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - return UNK_021C59E8.unk8->unkDAD_4; + return UNK_021C59F0->unkDAD_4; } return 0; @@ -1041,29 +1023,29 @@ THUMB_FUNC u32 FUN_0202F03C() THUMB_FUNC void FUN_0202F05C() { - if (UNK_021C59E8.unk8 != NULL) + if (UNK_021C59F0 != NULL) { - UNK_021C59E8.unk8->unkDAD_4 = 1; + UNK_021C59F0->unkDAD_4 = 1; } } THUMB_FUNC void FUN_0202F078(struct MailMessage *mail_message) { - MI_CpuCopy8(mail_message, &UNK_021C59E8.unk8->unkCA8, sizeof(struct MailMessage)); + MI_CpuCopy8(mail_message, &UNK_021C59F0->unkCA8, sizeof(struct MailMessage)); } THUMB_FUNC void FUN_0202F094(void *param0) { - MI_CpuCopy8(param0, UNK_021C59E8.unk8->unkCBC, FUN_02023AC4()); + MI_CpuCopy8(param0, UNK_021C59F0->unkCBC, FUN_02023AC4()); } THUMB_FUNC void FUN_0202F0B8() { FUN_0202EA9C(); - FUN_0202D240(&UNK_021C59E8.unk8->unkCC4, + FUN_0202D240(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2), - UNK_021C59E8.unk8->unkCC0, - UNK_021C59E8.unk0); + UNK_021C59F0->unkCC0, + UNK_021C59E8); } THUMB_FUNC u32 FUN_0202F0DC(u8 param0) @@ -1089,15 +1071,15 @@ THUMB_FUNC BOOL FUN_0202F104() THUMB_FUNC void FUN_0202F10C(struct UnkStruct_0202E29C_sub3 *param0) { - MI_CpuCopy8(param0, &UNK_021C59E8.unk8->unk000, sizeof(struct UnkStruct_0202E29C_sub3)); + MI_CpuCopy8(param0, &UNK_021C59F0->unk000, sizeof(struct UnkStruct_0202E29C_sub3)); FUN_0202F0B8(); } THUMB_FUNC u8 *FUN_0202F124(u32 param0) { - if (UNK_021C59E8.unk8 != NULL && UNK_021C59E8.unk8->unkC84[param0] != 0) + if (UNK_021C59F0 != NULL && UNK_021C59F0->unkC84[param0] != 0) { - struct UnkStruct_0202E29C_sub4 *r0 = &UNK_021C59E8.unk8->unk054[param0].unk50; + struct UnkStruct_0202E29C_sub4 *r0 = &UNK_021C59F0->unk054[param0].unk50; return r0->unk08; } diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index 3d295156..a217f52c 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -111,7 +111,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0) case 5: unkStruct1->unkE += 1; - if (unkStruct1->unkE < 0x3c && !(gMain.unk48 & 1)) + if (unkStruct1->unkE < 0x3c && !(gMain.newKeys & 1)) break; MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4); diff --git a/include/list_menu.h b/include/list_menu.h new file mode 100644 index 00000000..67b73893 --- /dev/null +++ b/include/list_menu.h @@ -0,0 +1,83 @@ +#ifndef POKEDIAMOND_LIST_MENU_H +#define POKEDIAMOND_LIST_MENU_H + +#define LIST_HEADER -3 +#define LIST_CANCEL -2 +#define LIST_NOTHING_CHOSEN -1 + +#define LIST_NO_MULTIPLE_SCROLL 0 +#define LIST_MULTIPLE_SCROLL_DPAD 1 +#define LIST_MULTIPLE_SCROLL_L_R 2 + +struct ListMenu; + +// TODO: Move to its own header, and fill it out +struct Window +{ + u8 * unk_00; + u8 unk_04; +}; + +// TODO: Move to its own header, and fill it out +struct ListMenuCursor +{ + // ??? +}; + +struct ListMenuItem +{ + const u16 * text; + s32 index; +}; + +// TODO: Document remaining fields. +// A lot of these are named based on similar fields in gen 3. +struct ListMenuTemplate +{ + struct ListMenuItem * items; + u8 filler_04[8]; + /*0x0C*/ struct Window * window; + /*0x10*/ u16 totalItems; + /*0x12*/ u16 maxShowed; + /*0x14*/ u8 header_X; + /*0x15*/ u8 item_X; + /*0x16*/ u8 cursor_X; + /*0x17*/ u8 upText_Y:4; + u8 cursorPal:4; + /*0x18*/ u8 fillValue:4; + u8 cursorShadowPal:4; + /*0x1A*/ u16 lettersSpacing:3; + u16 itemVerticalPadding:4; + u16 scrollMultiple:2; + u16 fontId:6; + /*0x1C*/ u8 filler_1C[4]; +}; + +struct ListMenu +{ + /*0x00*/ struct ListMenuTemplate template; + // ListMenuOverride from gen 3 + /*0x20*/ u8 cursorPal:4; + u8 fillValue:4; + /*0x21*/ u8 cursorShadowPal:4; + u8 unk_21_4:4; + /*0x22*/ u8 lettersSpacing:6; + /*0x23*/ u8 unk_23; + /*0x24*/ u8 fontId:7; + u8 enabled:1; + /*0x28*/ struct ListMenuCursor *cursor; + /*0x2c*/ u16 cursorPos; + /*0x2e*/ u16 itemsAbove; + /*0x30*/ u8 unk_30; + /*0x31*/ u8 unk_31; + /*0x32*/ u8 taskId; + /*0x33*/ u8 unk_33; + /*0x34*/ u8 heap_id; +}; + +THUMB_FUNC struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id); +THUMB_FUNC s32 ListMenu_ProcessInput(struct ListMenu * list); +THUMB_FUNC void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove); +THUMB_FUNC void RedrawListMenu(struct ListMenu * list); + +#endif // POKEDIAMOND_LIST_MENU_H diff --git a/include/main.h b/include/main.h index 2e424e09..9227d9a8 100644 --- a/include/main.h +++ b/include/main.h @@ -84,8 +84,8 @@ struct Main u32 unk3C; u32 unk40; u32 unk44; - u32 unk48; - u32 unk4C; + u32 newKeys; + u32 newAndRepeatedKeys; s32 unk50; s32 unk54; s32 unk58; @@ -104,8 +104,22 @@ struct Main //extern struct UnkStruct_021C4918 gMain + 0x60; -extern struct Unk2106FA0 gBacklightTop; -extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool... +extern PMBackLightSwitch gBacklightTop; +extern s32 UNK_02016FA4; + +struct UnkStruct_02016FA8 +{ + FSOverlayID unk0; + struct UnkStruct_02006234 *unk4; + FSOverlayID unk8; + const struct Unk21DBE18 * unkC; + s32 unk10; + s32 unk14; + struct SaveBlock2 * unk18; + +}; + +extern struct UnkStruct_02016FA8 UNK_02016FA8; void NitroMain(void); |