diff options
45 files changed, 145 insertions, 145 deletions
diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s index f3c838d8..440ba8e2 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -170,7 +170,7 @@ _020011AC: mov r1, #0x1 bl FUN_02001B64 ldr r0, [r5, #0xc] - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0x0 pop {r3-r7, pc} .balign 4 @@ -353,7 +353,7 @@ FUN_02001328: ; 0x02001328 add r0, r4, #0x0 bl FUN_020017AC ldr r0, [r4, #0xc] - bl FUN_020191D0 + bl CopyWindowToVram pop {r4, pc} .balign 4 @@ -1473,7 +1473,7 @@ _02001B1A: mov r1, #0x0 bl FUN_02001B64 ldr r0, [r4, #0xc] - bl FUN_020191D0 + bl CopyWindowToVram b _02001B5E _02001B38: ldr r1, [sp, #0xc] @@ -1489,7 +1489,7 @@ _02001B38: mov r1, #0x0 bl FUN_02001B64 ldr r0, [r4, #0xc] - bl FUN_020191D0 + bl CopyWindowToVram _02001B5E: mov r0, #0x0 add sp, #0x10 diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 3ad4b3b7..4962171d 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -14,11 +14,11 @@ UNK_020ECAC8: ; 0x020ECAC8 thumb_func_start FUN_02001B80 FUN_02001B80: ; 0x02001B80 - ldr r3, _02001B88 ; =FUN_020191D0 + ldr r3, _02001B88 ; =CopyWindowToVram ldr r0, [r0, #0xc] bx r3 nop -_02001B88: .word FUN_020191D0 +_02001B88: .word CopyWindowToVram thumb_func_start FUN_02001B8C FUN_02001B8C: ; 0x02001B8C @@ -94,7 +94,7 @@ FUN_02001C14: ; 0x02001C14 bl FUN_02001B8C add r4, r0, #0x0 ldr r0, [r4, #0x4] - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0x0 add sp, #0x8 pop {r4, pc} diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 604c7211..baa1b890 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -290,7 +290,7 @@ _0200259E: ldrb r0, [r4, #0x11] ldrb r1, [r4, #0x12] ldrb r2, [r4, #0x13] - bl FUN_0201C05C + bl GenerateFontHalfRowLookupTable b _020026CA _020025B4: ldr r0, [r4, #0x0] @@ -309,7 +309,7 @@ _020025B4: lsr r0, r0, #0x1f beq _020026CA ldr r0, [r4, #0x4] - bl FUN_020191D0 + bl CopyWindowToVram b _020026CA _020025DE: ldr r0, [r4, #0x0] @@ -570,7 +570,7 @@ _020027F2: add r0, #0x27 strb r1, [r0, #0x0] ldr r0, [r4, #0x4] - bl FUN_020191D0 + bl CopyWindowToVram b _02002806 _02002800: mov r0, #0x0 diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 70ccee6d..0920c2fb 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -308,7 +308,7 @@ FUN_0200CCA4: ; 0x0200CCA4 cmp r4, #0x0 bne _0200CCF4 add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram _0200CCF4: add sp, #0x20 pop {r3-r7, pc} @@ -791,7 +791,7 @@ FUN_0200D0BC: ; 0x0200D0BC cmp r4, #0x0 bne _0200D0D6 add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram _0200D0D6: add r0, r5, #0x0 add r1, r6, #0x0 @@ -1622,7 +1622,7 @@ _0200D788: cmp r0, #0x0 bne _0200D794 add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram _0200D794: add r0, r5, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s index a97700a5..61fc9de5 100644 --- a/arm9/asm/unk_02016B94.s +++ b/arm9/asm/unk_02016B94.s @@ -5283,8 +5283,8 @@ _020191C8: bl FreeToHeap pop {r4-r6, pc} - thumb_func_start FUN_020191D0 -FUN_020191D0: ; 0x020191D0 + thumb_func_start CopyWindowToVram +CopyWindowToVram: ; 0x020191D0 push {r4, lr} add r4, r0, #0x0 bne _020191DA diff --git a/arm9/asm/unk_0201BCBC.s b/arm9/asm/unk_0201BCBC.s index 40471942..5d1a9d7f 100644 --- a/arm9/asm/unk_0201BCBC.s +++ b/arm9/asm/unk_0201BCBC.s @@ -29,7 +29,7 @@ FUN_0201BFDC: ; 0x0201BFDC ldrb r0, [r4, #0x11] ldrb r1, [r4, #0x12] ldrb r2, [r4, #0x13] - bl FUN_0201C05C + bl GenerateFontHalfRowLookupTable add r0, r4, #0x0 bl RenderFont cmp r0, #0x0 @@ -41,7 +41,7 @@ FUN_0201BFDC: ; 0x0201BFDC pop {r4, pc} _0201C014: ldr r0, [r4, #0x4] - bl FUN_020191D0 + bl CopyWindowToVram _0201C01A: ldr r2, [r4, #0x18] cmp r2, #0x0 @@ -82,8 +82,8 @@ _0201C04C: pop {r4, pc} .balign 4 - thumb_func_start FUN_0201C05C -FUN_0201C05C: ; 0x0201C05C + thumb_func_start GenerateFontHalfRowLookupTable +GenerateFontHalfRowLookupTable: ; 0x0201C05C push {r3-r7, lr} sub sp, #0x30 ldr r3, _0201C0F8 ; =UNK_021C570C diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index f28f76eb..3c92ba05 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -122,7 +122,7 @@ _020481E6: _020481F2: add r0, r4, #0x0 add r0, #0xc - bl FUN_020191D0 + bl CopyWindowToVram ldr r1, _02048210 ; =FUN_02048214 add r0, r6, #0x0 add r2, r4, #0x0 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 8383e9bb..2ec122fa 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1814,7 +1814,7 @@ _020633D6: _020633EA: add r0, r4, #0x0 add r0, #0xd4 - bl FUN_020191D0 + bl CopyWindowToVram add r1, r4, #0x0 ldr r0, [sp, #0x18] add r1, #0x21 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 45f5de1d..3d43d136 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -2129,7 +2129,7 @@ _0206649E: strb r0, [r5, r1] add r1, #0x4c add r0, r5, r1 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, _020664D4 ; =0x00000139 strb r7, [r5, r0] add sp, #0x10 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index eba7f739..ecca3742 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1036,7 +1036,7 @@ _02077594: str r0, [r4, r1] sub r1, #0x10 add r0, r4, r1 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, _020776AC ; =0x0000045C mov r1, #0x6 str r1, [r4, r0] @@ -3338,7 +3338,7 @@ FUN_02078894: ; 0x02078894 str r3, [sp, #0x8] bl AddTextPrinterParameterized add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0xc pop {r4-r5, pc} @@ -3371,7 +3371,7 @@ _020788DE: str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r4-r6, pc} nop @@ -3560,7 +3560,7 @@ _020789D8: bl FUN_020788C4 ldr r0, _02078B74 ; =0x00000438 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram _02078A90: mov r0, #0x13 str r0, [sp, #0x0] @@ -4717,7 +4717,7 @@ _0207936A: mov r0, #0xfa lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram b _020793BC _0207939E: mov r0, #0xc @@ -5298,7 +5298,7 @@ _020797FC: cmp r7, #0x5 blt _020797FC add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x18 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02083D48.s b/arm9/asm/unk_02083D48.s index bb880a24..4a15e685 100644 --- a/arm9/asm/unk_02083D48.s +++ b/arm9/asm/unk_02083D48.s @@ -171,7 +171,7 @@ _02083D9C: mov r0, #0xb2 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram pop {r3-r5, pc} _02083DBA: ldr r1, _02083DEC ; =0x000043CC diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 09d66fb6..de7be3b2 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -554,7 +554,7 @@ FUN_02086784: ; 0x02086784 mov r1, #0xf bl FUN_02019620 add r0, r5, #0x0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4-r7, pc} diff --git a/arm9/global.inc b/arm9/global.inc index d6759f95..0053d427 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1078,7 +1078,7 @@ .extern FUN_02019150 .extern FUN_02019178 .extern FUN_020191A4 -.extern FUN_020191D0 +.extern CopyWindowToVram .extern FUN_02019220 .extern FUN_02019270 .extern FUN_0201928C @@ -1160,7 +1160,7 @@ .extern AddTextPrinterParameterized .extern AddTextPrinterParameterized2 .extern AddTextPrinterParameterized3 -.extern FUN_0201C05C +.extern GenerateFontHalfRowLookupTable .extern FUN_0201C100 .extern FUN_0201C1EC .extern FUN_0201C24C diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 3dc5d0bb..0b72da2a 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -1334,7 +1334,7 @@ _021E2496: add r0, #8 add r1, #0xa8 str r0, [r1] - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, _021E253C ; =MOD05_021E25A4 add r1, r5, #0 mov r2, #0 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index f49a1f99..6d69341c 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -309,7 +309,7 @@ _021E3078: _021E30F2: add r5, #0x20 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 23f6ea7b..ad35672e 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -15281,7 +15281,7 @@ _021EFF54: str r0, [r5, #4] add r0, r5, #0 add r0, #0x20 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #9 str r0, [r5, #0x48] mov r0, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index d39eedbd..1dd5e52a 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -11394,7 +11394,7 @@ _0223EEB8: str r0, [r2, #0x5c] ldr r0, [r1] add r0, #0x20 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r3, r4} pop {r3} @@ -11857,7 +11857,7 @@ _0223F2AA: ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 mov r1, #1 add r0, #0x97 @@ -12170,7 +12170,7 @@ _0223F53C: ldr r0, _0223F580 ; =0x02252420 ldr r0, [r0] add r0, #0x20 - bl FUN_020191D0 + bl CopyWindowToVram _0223F57A: add sp, #8 pop {r3, pc} @@ -12615,7 +12615,7 @@ _0223F910: ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #1 add r4, #0x97 strb r0, [r4] @@ -14670,7 +14670,7 @@ _022409D2: str r0, [r5] add r5, #0x34 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r4, r5, r6, r7, pc} nop @@ -14859,7 +14859,7 @@ _02240B4A: str r0, [r5, #4] add r5, #0x44 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r3, r4, r5, r6, pc} nop @@ -15262,7 +15262,7 @@ _02240EE0: ldr r0, [sp, #0x30] bl DestroyMsgData ldr r0, [sp, #0x24] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -41077,7 +41077,7 @@ _0224D60C: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} @@ -41877,7 +41877,7 @@ _0224DCEC: bl AddTextPrinterParameterized2 str r0, [r5, #0xc] ldr r0, [r5, #4] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index c24f23a7..4f1ef252 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -15228,7 +15228,7 @@ MOD12_02234EFC: ; 0x02234EFC bl FUN_02019620 add r4, #0x34 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram pop {r4, pc} .align 2, 0 @@ -15294,7 +15294,7 @@ _02234F42: strb r0, [r5, r1] add r0, r5, #0 add r0, #0x34 - bl FUN_020191D0 + bl CopyWindowToVram _02234F96: ldr r0, [r5, #0x30] mov r1, #1 @@ -47017,7 +47017,7 @@ _022440EE: bl FUN_02019620 ldr r0, [r4] add r0, #0x34 - bl FUN_020191D0 + bl CopyWindowToVram mov r6, #0 add r5, r6, #0 mov r7, #6 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 0bded4bf..824cb507 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -22720,7 +22720,7 @@ MOD14_021E26E4: ; 0x021E26E4 bl AddTextPrinterParameterized2 ldr r0, [r5, #0x10] add r0, #0x20 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 add r1, r6, #0 bl MOD14_021E2940 @@ -24687,7 +24687,7 @@ MOD14_021E355C: ; 0x021E355C bl FUN_02019620 add r0, r4, #0 add r0, #0x88 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 bl MOD14_021E4764 mov r0, #0x60 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 6c23c898..f7f9881d 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -5512,7 +5512,7 @@ MOD15_021D9ECC: ; 0x021D9ECC bl FUN_020136F8 add r5, #0x2c add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index e30640a5..cfff4a29 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -3520,7 +3520,7 @@ MOD16_021D8F60: ; 0x021D8F60 mov r1, #0 bl FUN_02019620 add r0, r4, #4 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r3, r4, pc} thumb_func_end MOD16_021D8F60 @@ -27385,7 +27385,7 @@ MOD16_021E3E6C: ; 0x021E3E6C bl MOD16_021DB728 ldr r0, [r4] add r0, r0, #4 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x18 pop {r3, r4, r5, pc} .align 2, 0 @@ -42170,7 +42170,7 @@ MOD16_021EACB0: ; 0x021EACB0 bl MOD16_021EABC4 ldr r0, [r4] add r0, r0, #4 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 @@ -51475,7 +51475,7 @@ MOD16_021EF318: ; 0x021EF318 mov r1, #0 bl FUN_02019620 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 add sp, #0x14 pop {r4, r5, pc} diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 1f3abbf2..3615681b 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4734,7 +4734,7 @@ MOD17_021D9918: ; 0x021D9918 bl DestroyMsgData ldr r0, _021D99D4 ; =0x000006A8 ldr r0, [r5, r0] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -4792,7 +4792,7 @@ MOD17_021D99E0: ; 0x021D99E0 bl DestroyMsgData ldr r0, _021D9A58 ; =0x000006A8 ldr r0, [r5, r0] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -4871,7 +4871,7 @@ _021D9AD0: bl DestroyMsgData ldr r0, _021D9B08 ; =0x000006A8 ldr r0, [r5, r0] - bl FUN_020191D0 + bl CopyWindowToVram add r0, r6, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -11828,7 +11828,7 @@ MOD17_021DCC68: ; 0x021DCC68 bl FUN_0200D0BC _021DCCCC: ldr r0, [r5] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -12423,7 +12423,7 @@ _021DD0D0: mov r3, #5 bl MOD17_021DCD80 ldr r0, [r7, #0x18] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x60 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14327,7 +14327,7 @@ _021DDFD0: mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_020191D0 + bl CopyWindowToVram pop {r4, pc} thumb_func_end MOD17_021DDFAC diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 6581e679..233dbc05 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -23390,7 +23390,7 @@ _02244AF8: add r3, r1, #0 bl FUN_0201A8C8 ldr r0, [sp, #0xc] - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -29597,7 +29597,7 @@ _02247AFA: str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram bl FUN_0204F7E4 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -29749,7 +29749,7 @@ _02247C40: str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -29902,7 +29902,7 @@ _02247D6C: str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -31282,7 +31282,7 @@ _02248870: str r0, [r5, #0x1c] add r5, #8 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -38615,7 +38615,7 @@ _0224C396: strh r1, [r5, r0] add r0, r5, #0 add r0, #0x10 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 add sp, #0x34 pop {r4, r5, pc} @@ -39232,7 +39232,7 @@ _0224C87C: str r0, [r5, #0x48] add r5, #0x10 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x34 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -39493,7 +39493,7 @@ _0224CB1A: bl FUN_02019620 add r4, #0x20 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -39534,7 +39534,7 @@ MOD18_0224CB34: ; 0x0224CB34 bl FUN_02019620 add r0, r5, #0 add r0, #0x30 - bl FUN_020191D0 + bl CopyWindowToVram bl MOD18_0223D658 bl MOD18_0224DBB4 ldr r2, [r5, #0x68] @@ -42405,10 +42405,10 @@ _0224E186: bl FUN_020010A8 str r0, [r5, #0x28] add r0, r5, #4 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 add r0, #0x14 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #1 add r5, #0x38 strb r0, [r5] @@ -42960,10 +42960,10 @@ _0224E5CE: str r0, [r5, #0x2c] add r0, r5, #0 add r0, #8 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 add r0, #0x18 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #4 bl FUN_0205EB38 str r0, [r5, #4] diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index e7eb3899..2888f12d 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -843,7 +843,7 @@ _02254E68: add r0, r5, #0 bl MOD24_02254D00 ldr r0, [r5, #0x70] - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #8 bl FUN_02016B90 cmp r0, #0 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 0eea16a7..848caed1 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -167,7 +167,7 @@ _02254960: mov r1, #0 bl FUN_02019620 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [sp, #0x18] add r2, r4, #4 lsl r0, r0, #0x18 @@ -196,7 +196,7 @@ _02254960: bl FUN_02019620 add r0, r5, #0 add r0, #0x10 - bl FUN_020191D0 + bl CopyWindowToVram lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -224,7 +224,7 @@ _02254960: bl FUN_02019620 add r0, r5, #0 add r0, #0x20 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [sp, #0x20] add r4, r4, #1 add r0, #0x10 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 366c45bd..f55e7c99 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -2104,7 +2104,7 @@ _021D8660: mov r0, #0xb2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram b _021D86BA _021D8672: add r0, r5, #0 @@ -2125,7 +2125,7 @@ _021D8672: mov r0, #0xb2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram bl FUN_02031190 cmp r0, #0 bne _021D86BA @@ -2827,7 +2827,7 @@ _021D8C22: mov r0, #0xb2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram _021D8C32: mov r0, #0x92 lsl r0, r0, #2 @@ -3245,7 +3245,7 @@ _021D8F0A: cmp r0, #0 beq _021D8F2A ldr r0, [sp, #0x10] - bl FUN_020191D0 + bl CopyWindowToVram _021D8F2A: ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] @@ -3477,7 +3477,7 @@ _021D90C0: bl AddTextPrinterParameterized2 _021D90DC: add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r6, r6, #1 add r7, #8 add r4, r4, #4 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 49c51d11..2091a0c6 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -2890,7 +2890,7 @@ _021D8BE4: cmp r0, #5 blt _021D8B2A add r0, r6, #0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #1 add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 6f58ea67..2e0c7acd 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -3560,7 +3560,7 @@ _021D9164: add r3, r1, #0 bl FUN_020196F4 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index a22e6e08..3e04165c 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1650,7 +1650,7 @@ _021DA7A4: mov r0, #0xb1 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram b _021DA7EC _021DA7D4: mov r0, #0xc3 @@ -2104,7 +2104,7 @@ _021DAAEA: cmp r0, #0 beq _021DAB0A add r0, r7, #0 - bl FUN_020191D0 + bl CopyWindowToVram _021DAB0A: ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 77f574fd..cd947e57 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -1105,7 +1105,7 @@ _021D7DF2: bl FUN_0200CCA4 add r0, r5, #0 add r0, #0x30 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #1 str r0, [r5, #0x2c] b _021D7E96 @@ -1293,7 +1293,7 @@ _021D7FCC: b _021D803C _021D7FD8: add r0, #0x1c - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #2 str r0, [r4, #0x54] b _021D803C diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 4e03cbe3..3a2ba4ad 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -559,7 +559,7 @@ _021D9C9A: bl String_dtor add r0, r4, #0 add r0, #0x10 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #2 mov r1, #1 bl FUN_0201797C diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 81f6d273..d55b37fc 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -1077,13 +1077,13 @@ _021D7DB6: blo _021D7DB6 add r0, r6, #0 add r0, #0x2c - bl FUN_020191D0 + bl CopyWindowToVram add r0, r6, #0 add r0, #0x3c - bl FUN_020191D0 + bl CopyWindowToVram add r6, #0x4c add r0, r6, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 bl String_dtor add sp, #0x10 @@ -1238,7 +1238,7 @@ MOD60_021D7EA4: ; 0x021D7EA4 bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] add r0, #0x3c - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [sp, #0x10] ldr r1, [r0, #0x10] mov r0, #2 @@ -1365,7 +1365,7 @@ _021D8002: ldr r0, [sp, #0x10] add r0, #0x3c str r0, [sp, #0x10] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index ed38301b..bcb6e9b6 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -1488,7 +1488,7 @@ _021D80BE: cmp r4, #5 bge _021D80D0 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram _021D80D0: add r4, r4, #1 add r5, #0x10 @@ -1561,7 +1561,7 @@ _021D8122: ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 - bl FUN_020191D0 + bl CopyWindowToVram _021D8164: add r7, r7, #1 add r5, #8 @@ -1622,7 +1622,7 @@ _021D8196: ldr r1, [sp, #0x14] ldr r0, [sp, #0x18] add r0, r0, r1 - bl FUN_020191D0 + bl CopyWindowToVram add r6, r6, #1 cmp r6, #2 blt _021D8196 @@ -1646,7 +1646,7 @@ _021D81F8: bl AddTextPrinterParameterized2 add r4, #0x74 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 76088322..86eebba7 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -3253,7 +3253,7 @@ MOD62_0222EE78: ; 0x0222EE78 mov r1, #0xf bl FUN_02019620 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5, r6, pc} _0222EE96: @@ -3278,7 +3278,7 @@ _0222EE96: str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 bl String_dtor add r0, r6, #0 @@ -3333,7 +3333,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 mov r1, #0xf bl FUN_02019620 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD62_0222EEE0 @@ -3379,7 +3379,7 @@ MOD62_0222EF44: ; 0x0222EF44 mov r1, #0xf bl FUN_02019620 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD62_0222EF44 @@ -3554,7 +3554,7 @@ _0222F0E2: mov r1, #0xee bl FUN_02019620 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram b _0222F152 _0222F0FE: add r0, r5, #0 @@ -3589,7 +3589,7 @@ _0222F0FE: mov r3, #7 bl AddTextPrinterParameterized2 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 bl String_dtor _0222F152: @@ -3623,7 +3623,7 @@ MOD62_0222F168: ; 0x0222F168 mov r1, #0xee bl FUN_02019620 add r0, r5, r4 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} _0222F194: @@ -3655,7 +3655,7 @@ _0222F194: str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r5, r4 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [sp, #0x10] bl String_dtor add sp, #0x14 @@ -3695,7 +3695,7 @@ MOD62_0222F208: ; 0x0222F208 mov r1, #0xf bl FUN_02019620 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5, r6, pc} _0222F226: @@ -3720,7 +3720,7 @@ _0222F226: str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r5, #0 bl String_dtor add r0, r6, #0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 4ff5aca1..890b3348 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -1889,7 +1889,7 @@ _021D8392: add r4, #0xe8 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD65_021D8280 @@ -1960,7 +1960,7 @@ _021D83D2: mov r0, #0x52 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5, pc} _021D8434: @@ -2148,7 +2148,7 @@ _021D8578: bl MOD65_021D847C add r0, r4, #0 add r0, #0xf8 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 8f27daeb..65c5c857 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -1362,10 +1362,10 @@ _021D7F44: mov r1, #1 bl AddTextPrinterParameterized add r0, r7, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r4, #0x58 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -1784,7 +1784,7 @@ _021D8278: bl String_dtor _021D82AA: add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1803,7 +1803,7 @@ MOD66_021D82B8: ; 0x021D82B8 mov r1, #0 bl FUN_02019620 add r0, r6, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r6, #0 bl FUN_02019570 add sp, #0x10 @@ -2117,7 +2117,7 @@ MOD66_021D84C8: ; 0x021D84C8 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r6, #0 bl String_dtor add sp, #0x1c @@ -2231,7 +2231,7 @@ MOD66_021D8554: ; 0x021D8554 bl FUN_02019620 add r0, r4, #0 add r0, #0x28 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 add r0, #0x38 bl FUN_02019570 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index e06f4d00..b4e14758 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -6114,7 +6114,7 @@ _021DA446: mov r1, #1 bl AddTextPrinterParameterized2 ldr r0, [r5, #8] - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #2 mov r1, #1 bl FUN_0201E6E4 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 637691d0..14dc995b 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -1059,7 +1059,7 @@ MOD74_021D7C10: ; 0x021D7C10 add r0, r4, #0 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -1425,7 +1425,7 @@ _021D7FC0: blt _021D7FA4 _021D7FF0: ldr r0, [sp, #0x14] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x24 pop {r4, r5, r6, r7, pc} nop @@ -1607,7 +1607,7 @@ _021D813C: _021D8172: add r0, r4, #0 add r0, #0x8c - bl FUN_020191D0 + bl CopyWindowToVram add r0, r4, #0 mov r1, #0 bl MOD74_021D8388 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 4536decb..8ed82bcb 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1821,7 +1821,7 @@ _021D83B2: mov r3, #7 bl FUN_0200CCA4 ldr r0, [sp] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x24 pop {r4, r5, r6, r7, pc} nop @@ -1911,7 +1911,7 @@ _021D8462: mov r3, #7 bl FUN_0200CCA4 ldr r0, [sp] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x2c pop {r4, r5, r6, r7, pc} nop @@ -2024,7 +2024,7 @@ MOD77_021D8510: ; 0x021D8510 bl String_dtor ldr r0, _021D85CC ; =0x0000C044 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -2110,7 +2110,7 @@ _021D865C: bl String_dtor ldr r0, _021D8690 ; =0x0000C044 add r0, r5, r0 - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 9e91c64e..128c6280 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -3650,7 +3650,7 @@ _0222F220: add r0, r5, #0 bl MOD80_0222F300 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r6, r6, #1 add r4, r4, #4 add r5, #0x10 @@ -9153,7 +9153,7 @@ MOD80_02231EA8: ; 0x02231EA8 bl FUN_02019620 ldr r0, _02231FE4 ; =0x00000EC8 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0x15 str r0, [sp] mov r0, #0x1b @@ -11970,7 +11970,7 @@ _0223357E: mov r1, #0 bl FUN_02019620 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, [sp, #0x14] add r6, #0x16 add r0, r0, #1 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 927b69b6..b7492d39 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2485,7 +2485,7 @@ _022390F4: bl FUN_0200D06C add r0, r4, #0 add r0, #0x44 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0 str r0, [r4, #8] str r6, [r5] @@ -9609,7 +9609,7 @@ _0223C982: bl FUN_0200D06C add r0, r4, #0 add r0, #0x48 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, _0223CA90 ; =0x00000484 bl PlayBGM mov r0, #0 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index f1cd74ed..925315fb 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -2550,7 +2550,7 @@ MOD82_0222E988: ; 0x0222E988 mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0xd str r0, [r4, #0x1c] mov r0, #3 @@ -3141,7 +3141,7 @@ MOD82_0222EE28: ; 0x0222EE28 mov r0, #0xd9 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0x1d str r0, [r4, #0x1c] mov r0, #3 @@ -3289,7 +3289,7 @@ MOD82_0222EF54: ; 0x0222EF54 mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0x20 str r0, [r4, #0x1c] mov r0, #3 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 59fd717f..92b5807e 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -8257,7 +8257,7 @@ MOD83_022317A8: ; 0x022317A8 str r3, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r5, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -9162,7 +9162,7 @@ _02231EBE: bl String_dtor _02231F20: add r0, r6, #0 - bl FUN_020191D0 + bl CopyWindowToVram ldr r1, [r4, #0xc] ldr r0, [r4, #0x10] mul r0, r1 @@ -10697,7 +10697,7 @@ _02232B94: bl FUN_02019620 ldr r0, _02232D1C ; =0x00002AA8 add r0, r4, r0 - bl FUN_020191D0 + bl CopyWindowToVram ldr r0, _02232D18 ; =0x00002BD0 mov r1, #0 str r1, [r4, r0] @@ -11191,7 +11191,7 @@ _02232FAE: cmp r6, #0 beq _02232FB8 ldr r0, [sp, #0x10] - bl FUN_020191D0 + bl CopyWindowToVram _02232FB8: ldr r0, [sp, #0x1c] bl DestroyMsgData @@ -11260,7 +11260,7 @@ MOD83_02232FE4: ; 0x02232FE4 str r3, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_020191D0 + bl CopyWindowToVram add r0, r6, #0 bl String_dtor ldr r0, _02233078 ; =0x000029A4 @@ -15626,7 +15626,7 @@ _0223507A: tst r0, r4 bne _02235086 ldr r0, [r5] - bl FUN_020191D0 + bl CopyWindowToVram _02235086: mov r0, #8 tst r0, r4 @@ -17219,7 +17219,7 @@ _02235C5C: cmp r4, #0 bne _02235CCA ldr r0, [sp, #0x2c] - bl FUN_020191D0 + bl CopyWindowToVram add sp, #0x78 pop {r3, r4, r5, r6, r7, pc} _02235CCA: diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index eef0fa0b..048adbf9 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -581,7 +581,7 @@ MOD84_021D84F8: ; 0x021D84F8 ldr r0, [r4, #0x24] bl FUN_02019270 ldr r0, [r4, #0x24] - bl FUN_020191D0 + bl CopyWindowToVram mov r0, #0x4b mov r1, #1 bl FUN_02018FF4 diff --git a/arm9/src/text.c b/arm9/src/text.c index ccc86bab..58bfa220 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -17,8 +17,8 @@ extern void FUN_0201C238(struct TextPrinter *printer); extern u32 RenderFont(struct TextPrinter *printer); extern void FUN_0201C1A8(struct TextPrinter *printer); extern FUN_0201BFDC(); //no idea what this is -extern void FUN_0201C05C(u8 fgColor, u8 bgColor, u8 shadowColor); -extern void FUN_020191D0(u32 windowId); +extern void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); +extern void CopyWindowToVram(u32 windowId); THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts) { @@ -196,7 +196,7 @@ THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 s u32 j = 0; printer->textSpeedBottom = 0; printer->textSpeedTop = 0; - FUN_0201C05C(printerTemplate->fgColor, printerTemplate->bgColor, printerTemplate->shadowColor); //GenerateFontHalfRowLookupTable ? + GenerateFontHalfRowLookupTable(printerTemplate->fgColor, printerTemplate->bgColor, printerTemplate->shadowColor); for (; j < 0x400; ++j) { if (RenderFont(printer) == 1) @@ -206,7 +206,7 @@ THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 s } if (speed != 0xff) { - FUN_020191D0(printer->printerTemplate.windowId); // CopyWindowToVram? + CopyWindowToVram(printer->printerTemplate.windowId); // CopyWindowToVram? } FUN_0201C238(printer); FreeToHeap((void *)printer); |