diff options
Diffstat (limited to 'arm9/modules')
35 files changed, 351 insertions, 351 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 20fc2752..78c16fd0 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -290,7 +290,7 @@ _021E1CA8: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 bl MOD05_021E1DE4 add r1, r4, #0 @@ -541,7 +541,7 @@ MOD05_021E1ECC: ; 0x021E1ECC add r0, #0xa8 ldr r0, [r0] mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] @@ -727,7 +727,7 @@ _021E2032: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 bl MOD05_021E2170 add r2, r4, #0 @@ -1139,7 +1139,7 @@ MOD05_021E2368: ; 0x021E2368 lsl r0, r0, #4 ldr r0, [r6, r0] mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r6, #0 add r0, #8 bl RemoveWindow @@ -1307,7 +1307,7 @@ _021E2496: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 lsl r0, r4, #0x13 lsr r0, r0, #0x10 str r0, [sp] @@ -1407,7 +1407,7 @@ MOD05_021E25A4: ; 0x021E25A4 add r0, #0xa8 ldr r0, [r0] mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] @@ -1642,7 +1642,7 @@ _021E270A: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r1, r6, #0 add r2, r4, #0 @@ -1747,7 +1747,7 @@ MOD05_021E27E8: ; 0x021E27E8 add r0, r4, #0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -1788,7 +1788,7 @@ MOD05_021E288C: ; 0x021E288C push {r4, lr} add r4, r0, #0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 mov r1, #1 bl WindowArray_dtor @@ -1907,7 +1907,7 @@ MOD05_021E2950: ; 0x021E2950 add r0, r4, #0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r1, r4, #0 bl MOD05_021E29C8 @@ -1922,7 +1922,7 @@ MOD05_021E29B4: ; 0x021E29B4 push {r4, lr} add r4, r0, #0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 mov r1, #1 bl WindowArray_dtor @@ -2036,7 +2036,7 @@ MOD05_021E2A70: ; 0x021E2A70 add r0, r4, #0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r1, r4, #0 bl MOD05_021E2AD4 diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index 6c9c422b..d6f55205 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -286,7 +286,7 @@ MOD05_021E84F4: ; 0x021E84F4 ldr r2, _021E8568 ; =0x000003D9 mov r1, #0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add sp, #0x14 pop {r3, r4, pc} .balign 4, 0 @@ -299,7 +299,7 @@ MOD05_021E856C: ; 0x021E856C add r4, r0, #0 ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, [r4, #0x10] bl RemoveWindow ldr r0, [r4, #0x10] diff --git a/arm9/modules/05/asm/mod05_021EFBF8.s b/arm9/modules/05/asm/mod05_021EFBF8.s index 3437ee91..5f6b0a3b 100644 --- a/arm9/modules/05/asm/mod05_021EFBF8.s +++ b/arm9/modules/05/asm/mod05_021EFBF8.s @@ -413,7 +413,7 @@ MOD05_021EFEDC: ; 0x021EFEDC add r0, #0x20 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r4, #0 _021EFF2E: add r0, r6, #0 @@ -551,7 +551,7 @@ _021F0056: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r5, #0 add r0, #0x20 bl RemoveWindow diff --git a/arm9/modules/05/asm/mod05_021F5C44.s b/arm9/modules/05/asm/mod05_021F5C44.s index 15d94fbb..5bf30612 100644 --- a/arm9/modules/05/asm/mod05_021F5C44.s +++ b/arm9/modules/05/asm/mod05_021F5C44.s @@ -724,7 +724,7 @@ MOD05_021F617C: ; 0x021F617C add r0, r4, #0 add r0, #0x38 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r4, #0x38 add r0, r4, #0 bl RemoveWindow diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 13b58921..68ab4fbd 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8553,7 +8553,7 @@ _0223D710: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xb str r0, [sp] mov r0, #2 @@ -8606,7 +8606,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 add r4, r0, #0 add r0, #8 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #8 bl ClearWindowTilemapAndCopyToVram @@ -8646,7 +8646,7 @@ _0223D804: add r0, r4, #0 add r0, #0x18 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x18 bl RemoveWindow @@ -8850,7 +8850,7 @@ MOD06_0223D9C0: ; 0x0223D9C0 add r5, r0, #0 add r0, #0x28 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r4, #0 add r5, #8 _0223D9D0: @@ -9462,7 +9462,7 @@ MOD06_0223DED0: ; 0x0223DED0 mov r1, #1 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0x88 ldr r0, [r0] @@ -9646,7 +9646,7 @@ _0223E034: mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r1, _0223E190 ; =0x00000242 mov r2, #1 strh r4, [r5, r1] @@ -9838,7 +9838,7 @@ _0223E214: mov r1, #1 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x18 mov r1, #0xb bl String_ctor @@ -9926,11 +9926,11 @@ _0223E2C4: add r0, r4, #0 add r0, #0x48 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x38 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x58 mov r1, #0xf @@ -9946,15 +9946,15 @@ _0223E314: beq _0223E374 add r0, r4, #0 add r0, #0x48 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x38 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x58 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 mov r1, #0 bl MOD06_0223EBF8 @@ -10175,7 +10175,7 @@ MOD06_0223E4E8: ; 0x0223E4E8 mov r1, #1 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _0223E50A: mov r0, #0x18 mov r1, #0xb @@ -10450,7 +10450,7 @@ _0223E74A: add r0, r5, #0 add r0, #0x58 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 mov r1, #0 bl MOD06_0223EBF8 @@ -10663,7 +10663,7 @@ _0223E902: add r0, r5, #0 add r0, #0x58 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 mov r1, #0 bl MOD06_0223EBF8 @@ -10715,7 +10715,7 @@ _0223E966: add r0, r4, #0 add r0, #0x58 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 mov r1, #0 bl MOD06_0223EBF8 @@ -11366,7 +11366,7 @@ _0223EEB8: mov r1, #1 add r0, #0x20 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r4, sp, #0x40 add r3, sp, #0x14 add r2, r3, #0 @@ -11848,7 +11848,7 @@ _0223F2AA: mov r1, #1 add r0, #0x30 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, _0223F330 ; =0x02252420 mov r1, #0xf ldr r0, [r0] @@ -12606,7 +12606,7 @@ _0223F910: mov r1, #1 add r0, #0x30 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, _0223F950 ; =0x02252420 mov r1, #0xf ldr r0, [r0] @@ -13847,7 +13847,7 @@ MOD06_02240364: ; 0x02240364 add r0, r4, #0 add r0, #0x20 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, [r4, #0x64] bl ListMenuItems_dtor mov r1, #0 @@ -13869,7 +13869,7 @@ MOD06_02240364: ; 0x02240364 mov r1, #0 ldr r0, [r0] add r0, #0x30 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -14521,7 +14521,7 @@ MOD06_022408D4: ; 0x022408D4 beq _022408EC add r0, #0x54 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x54 bl ClearWindowTilemapAndCopyToVram @@ -14600,7 +14600,7 @@ _02240940: add r0, #0x34 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r5, #8] ldr r1, [r5, #0x68] mov r2, #0x7b @@ -14690,7 +14690,7 @@ MOD06_02240A28: ; 0x02240A28 add r0, r4, #0 add r0, #0x34 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r1, r4, #0 add r1, #0x38 ldrb r1, [r1] @@ -14816,7 +14816,7 @@ MOD06_02240B04: ; 0x02240B04 add r0, #0x44 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r6, #0 _02240B4A: ldr r0, [r5, #0xc] @@ -14925,7 +14925,7 @@ _02240C1A: add r0, r5, #0 add r0, #0x44 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r1, r5, #0 add r1, #0x48 ldrb r1, [r1] @@ -14989,7 +14989,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r2, _02240F00 ; =0x000003D9 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp, #0x24] mov r1, #0xf bl FillWindowPixelBuffer @@ -15281,7 +15281,7 @@ MOD06_02240F1C: ; 0x02240F1C add r4, r0, #0 add r0, #0x24 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r1, r4, #0 add r1, #0x28 ldrb r1, [r1] @@ -19020,7 +19020,7 @@ MOD06_02242CDC: ; 0x02242CDC add r0, r4, #4 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 bl MOD06_02242DA8 add r0, r4, #0 @@ -19430,7 +19430,7 @@ MOD06_02243024: ; 0x02243024 add r0, r6, #0 add r0, #0x14 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r6, #0 add r0, #0x14 bl RemoveWindow @@ -19442,7 +19442,7 @@ MOD06_02243024: ; 0x02243024 bl DestroyListMenu ldr r0, [r6, #0x74] mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r6, #4 bl RemoveWindow mov r4, #0 @@ -40889,7 +40889,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r4, #0 add r2, r1, #0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -41091,7 +41091,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 @@ -41818,7 +41818,7 @@ MOD06_0224DC5C: ; 0x0224DC5C mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #1 str r0, [r5] _0224DCAE: @@ -42178,7 +42178,7 @@ _0224DF64: mov r1, #0 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -42338,7 +42338,7 @@ _0224E084: mov r1, #0 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r7, #0x4e mov r4, #0 add r6, r5, #0 @@ -42526,7 +42526,7 @@ MOD06_0224E24C: ; 0x0224E24C mov r1, #0 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 bl MOD06_0224E39C pop {r4, pc} diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index c5b40b5e..a84812be 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -1518,7 +1518,7 @@ MOD09_02212A74: ; 0x02212A74 ldr r1, _02212A84 ; =0x00002060 add r0, r0, r1 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #2 pop {r3, pc} .align 2, 0 @@ -4714,7 +4714,7 @@ MOD09_022143F8: ; 0x022143F8 add r0, r4, r0 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, _02214450 ; =0x00002050 mov r1, #0xf add r0, r4, r0 @@ -8271,7 +8271,7 @@ MOD09_02216314: ; 0x02216314 add r0, r4, r0 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, _02216338 ; =0x00002060 mov r1, #0xf add r0, r4, r0 @@ -13561,7 +13561,7 @@ MOD09_02218E68: ; 0x02218E68 push {r3, lr} add r0, #0x1c mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #3 pop {r3, pc} .align 2, 0 @@ -15226,7 +15226,7 @@ MOD09_02219BE0: ; 0x02219BE0 add r0, #0x1c mov r1, #1 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 add r0, #0x1c mov r1, #0xf diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 1040df95..72e5cdbb 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -638,7 +638,7 @@ _0222D99A: mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 bl MOD11_0222FE94 add sp, #0x68 @@ -800,7 +800,7 @@ _0222DC42: mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #5 bl FUN_0200BB14 add r1, r4, #0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 1905bce4..0d0c4341 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -191,7 +191,7 @@ _0222F30E: mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r2, #0x51 mov r0, #1 mov r1, #0x1a @@ -23867,7 +23867,7 @@ _0223AC50: mov r1, #0 mov r2, #1 mov r3, #8 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xa add sp, #0xd4 str r0, [r4, #0x28] @@ -24053,7 +24053,7 @@ _0223AE5E: bl MOD11_0222FF6C add r6, r0, #0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r6, #0 bl RemoveWindow ldr r1, _0223AF50 ; =0x04000008 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 88cebb83..dd36a17b 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -28090,7 +28090,7 @@ _0223AED6: add r0, #0x34 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] @@ -28136,7 +28136,7 @@ _0223AF34: ldr r0, [r4] mov r1, #1 add r0, #0x34 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] @@ -35076,7 +35076,7 @@ _0223E49A: add r0, #0x88 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r5, #0x74] mov r1, #1 bl ScheduleBgTilemapBufferTransfer @@ -35135,7 +35135,7 @@ MOD12_0223E528: ; 0x0223E528 add r4, r0, #0 add r0, #0x88 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, [r4, #0x74] mov r1, #1 bl ScheduleBgTilemapBufferTransfer @@ -39309,7 +39309,7 @@ _02240522: add r0, #0x78 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] @@ -39355,7 +39355,7 @@ _02240580: ldr r0, [r4] mov r1, #1 add r0, #0x78 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] @@ -46795,7 +46795,7 @@ _02243F56: add r0, #0x34 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] @@ -46842,7 +46842,7 @@ _02243FBA: ldr r0, [r4] mov r1, #1 add r0, #0x34 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] @@ -47010,7 +47010,7 @@ _022440EE: add r0, #0x34 mov r2, #1 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4] mov r1, #0xff add r0, #0x34 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index ba4f57ae..3b404a7b 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -4529,7 +4529,7 @@ MOD15_021D9694: ; 0x021D9694 add r0, #0x1c add r1, r4, #0 mov r2, #0xf - bl FUN_0200D06C + bl DrawWindowFrame2 add r0, r5, #0 add r0, #0xc bl PutWindowTilemap @@ -5503,7 +5503,7 @@ MOD15_021D9ECC: ; 0x021D9ECC mov r1, #0 lsr r2, r2, #0x10 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r1, r5, #0 ldr r0, [r5, #0x50] add r1, #0x2c @@ -5549,7 +5549,7 @@ MOD15_021D9F88: ; 0x021D9F88 add r4, r0, #0 add r0, #0x2c mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r4, #0x2c add r0, r4, #0 bl ClearWindowTilemapAndCopyToVram diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 9111403a..485836b0 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4707,7 +4707,7 @@ MOD17_021D9918: ; 0x021D9918 ldr r0, [r5, r0] mov r2, #0x74 mov r3, #8 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r2, _021D99D8 ; =0x00000151 mov r0, #0 mov r1, #0x1a @@ -11470,7 +11470,7 @@ _021DC9CC: ldr r0, [r5, r0] mov r1, #0 add r3, r2, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _021DCA42: ldr r0, [r4, #4] str r0, [r5, #0x30] @@ -11825,7 +11825,7 @@ MOD17_021DCC68: ; 0x021DCC68 ldr r0, [r5] mov r1, #0 add r3, r2, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _021DCCCC: ldr r0, [r5] bl CopyWindowToVram @@ -11879,7 +11879,7 @@ MOD17_021DCCEC: ; 0x021DCCEC add r0, r5, #0 mov r1, #0 add r3, r2, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -11917,7 +11917,7 @@ MOD17_021DCD34: ; 0x021DCD34 add r0, r5, #0 mov r1, #0 add r3, r2, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 add sp, #0x14 pop {r4, r5, r6, r7, pc} diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index ac5296d1..abced62a 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -22707,7 +22707,7 @@ _02244588: lsl r0, r0, #4 add r0, r4, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x39 lsl r0, r0, #4 add r0, r4, r0 @@ -25590,7 +25590,7 @@ MOD18_02245B1C: ; 0x02245B1C ldr r2, [sp, #8] ldr r3, [sp, #0xc] mov r1, #1 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp, #0x30] mov r2, #0 lsl r0, r0, #0x18 @@ -29555,7 +29555,7 @@ MOD18_02247AA8: ; 0x02247AA8 add r0, #0xc mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _02247B58 ; =0x0000023F mov r0, #0 mov r1, #0x1a @@ -29681,7 +29681,7 @@ MOD18_02247BB8: ; 0x02247BB8 add r0, #0xc mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _02247C90 ; =0x0000023E mov r0, #0 mov r1, #0x1a @@ -29854,7 +29854,7 @@ MOD18_02247D1C: ; 0x02247D1C add r0, #0xc mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _02247DD0 ; =0x0000023D mov r0, #0 mov r1, #0x1a @@ -30155,7 +30155,7 @@ MOD18_02247FC0: ; 0x02247FC0 add r0, r4, #0 add r0, #0xc mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r1, #0 ldr r0, [r4, #0x20] add r2, r1, #0 @@ -31131,7 +31131,7 @@ MOD18_02248784: ; 0x02248784 add r0, r4, #0 add r0, #8 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r1, #0 ldr r0, [r4, #0x1c] add r2, r1, #0 @@ -31225,7 +31225,7 @@ MOD18_02248820: ; 0x02248820 add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _022488E8 ; =0x0000023D mov r0, #0 mov r1, #0x1a @@ -32967,7 +32967,7 @@ MOD18_02249564: ; 0x02249564 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D638 bl MOD18_0224DBB4 ldr r4, _0224967C ; =0x022505B8 @@ -33405,7 +33405,7 @@ _02249936: add r0, r4, #0 add r0, #0x10 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldrb r1, [r4, #0x14] ldr r0, [r4, #0x10] bl ScheduleBgTilemapBufferTransfer @@ -33486,7 +33486,7 @@ _022499A2: add r0, #0x20 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D638 bl MOD18_0224DBB4 mov r7, #0 @@ -33571,7 +33571,7 @@ _02249A8C: add r0, r4, #0 add r0, #0x20 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r4, #0x20 add r0, r4, #0 bl RemoveWindow @@ -33752,7 +33752,7 @@ MOD18_02249BA8: ; 0x02249BA8 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D678 bl MOD18_0224DBB4 mov r4, #0 @@ -34219,7 +34219,7 @@ MOD18_02249F8C: ; 0x02249F8C add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D678 bl MOD18_0224DBB4 mov r4, #0 @@ -34668,7 +34668,7 @@ MOD18_0224A360: ; 0x0224A360 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D678 bl MOD18_0224DBB4 mov r4, #0 @@ -35606,7 +35606,7 @@ MOD18_0224AB08: ; 0x0224AB08 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 bl MOD18_0223D678 bl MOD18_0224DBB4 mov r4, #0 @@ -36652,7 +36652,7 @@ _0224B374: add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r2, #0x91 mov r0, #0 mov r1, #0x1a @@ -36775,7 +36775,7 @@ MOD18_0224B464: ; 0x0224B464 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r2, #0x91 mov r0, #0 mov r1, #0x1a @@ -38486,7 +38486,7 @@ _0224C288: add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0x92 lsl r1, r1, #2 ldrb r0, [r5, r1] @@ -39108,7 +39108,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 add r0, #0x10 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r2, #0x92 lsl r2, r2, #2 ldrb r0, [r5, r2] @@ -39256,7 +39256,7 @@ MOD18_0224C94C: ; 0x0224C94C add r0, r4, #0 add r0, #0x20 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x20 bl RemoveWindow @@ -39485,7 +39485,7 @@ MOD18_0224CADC: ; 0x0224CADC add r0, #0x20 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _0224CB1A: add r0, r4, #0 add r0, #0x20 @@ -39527,7 +39527,7 @@ MOD18_0224CB34: ; 0x0224CB34 add r0, #0x30 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0x30 mov r1, #0xf @@ -39566,7 +39566,7 @@ MOD18_0224CBAC: ; 0x0224CBAC add r0, r4, #0 add r0, #0x30 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r4, #0x30 add r0, r4, #0 bl RemoveWindow @@ -40736,7 +40736,7 @@ MOD18_0224D56C: ; 0x0224D56C add r0, r4, #0 add r0, #8 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #8 bl ClearWindowTilemapAndCopyToVram @@ -40817,7 +40817,7 @@ MOD18_0224D5CC: ; 0x0224D5CC add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _0224D688 ; =0x00000245 mov r0, #0 mov r1, #0x1a @@ -41321,7 +41321,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r2, #0x91 mov r0, #0 mov r1, #0x1a @@ -41364,7 +41364,7 @@ MOD18_0224DAA8: ; 0x0224DAA8 add r4, r0, #0 add r0, #8 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #8 bl ClearWindowTilemapAndCopyToVram @@ -41597,7 +41597,7 @@ _0224DC4C: add r0, #8 mov r1, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 cmp r4, #0 beq _0224DC74 ldr r0, _0224DCB4 ; =MOD18_0224DBB8 @@ -41729,7 +41729,7 @@ _0224DD4C: add r0, r5, #0 add r0, #8 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r0, #8 bl ClearWindowTilemapAndCopyToVram @@ -41741,7 +41741,7 @@ _0224DD6C: add r0, r5, #0 add r0, #8 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 _0224DD76: mov r0, #8 str r0, [r5, #0x30] @@ -42324,13 +42324,13 @@ MOD18_0224E0CC: ; 0x0224E0CC add r0, r5, #4 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 ldr r2, _0224E1FC ; =0x000003D9 add r0, #0x14 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r3, _0224E200 ; =0x022507C0 add r2, sp, #0x14 ldmia r3!, {r0, r1} @@ -42480,14 +42480,14 @@ MOD18_0224E26C: ; 0x0224E26C add r0, r4, #0 add r0, #0x14 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, [r4, #0x28] ldr r1, [r4, #0x30] ldr r2, [r4, #0x34] bl DestroyListMenu add r0, r4, #4 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldrb r1, [r4, #8] ldr r0, [r4, #4] bl ScheduleBgTilemapBufferTransfer @@ -42783,13 +42783,13 @@ _0224E454: add r0, #8 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 ldr r2, _0224E688 ; =0x000003D9 add r0, #0x18 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _0224E68C ; =0x00000237 mov r0, #0 mov r1, #0x1a @@ -43007,7 +43007,7 @@ MOD18_0224E6A8: ; 0x0224E6A8 add r0, r4, #0 add r0, #0x18 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, [r4, #0x2c] ldr r1, [r4, #0x38] ldr r2, [r4, #0x3c] @@ -43015,7 +43015,7 @@ MOD18_0224E6A8: ; 0x0224E6A8 add r0, r4, #0 add r0, #8 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldrb r1, [r4, #0xc] ldr r0, [r4, #8] bl ScheduleBgTilemapBufferTransfer diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 388e4ef0..08da06f3 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -2097,7 +2097,7 @@ _021D861E: lsl r0, r0, #2 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 _021D8660: add r0, r5, #0 bl MOD53_021D9440 @@ -2119,7 +2119,7 @@ _021D8672: lsl r0, r0, #2 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 bl MOD53_021D9440 mov r0, #0xb2 @@ -2446,7 +2446,7 @@ _021D8916: lsl r0, r0, #2 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 bl MOD53_021D9440 bl FUN_02031190 @@ -3640,7 +3640,7 @@ MOD53_021D91C8: ; 0x021D91C8 mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 cmp r4, #0 bne _021D9218 mov r4, #0 @@ -3691,11 +3691,11 @@ MOD53_021D925C: ; 0x021D925C mov r1, #0xb6 lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021D9268 ; =FUN_0200D0E0 + ldr r3, _021D9268 ; =ClearFrameAndWindow2 mov r1, #0 bx r3 .align 2, 0 -_021D9268: .word FUN_0200D0E0 +_021D9268: .word ClearFrameAndWindow2 thumb_func_end MOD53_021D925C thumb_func_start MOD53_021D926C diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 83feae5d..c91a960a 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -3020,7 +3020,7 @@ MOD54_021D8C90: ; 0x021D8C90 mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 cmp r6, #0 bne _021D8D00 add r0, r5, #0 @@ -3082,11 +3082,11 @@ MOD54_021D8D40: ; 0x021D8D40 mov r1, #0xba lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021D8D4C ; =FUN_0200D0E0 + ldr r3, _021D8D4C ; =ClearFrameAndWindow2 mov r1, #0 bx r3 .align 2, 0 -_021D8D4C: .word FUN_0200D0E0 +_021D8D4C: .word ClearFrameAndWindow2 thumb_func_end MOD54_021D8D40 thumb_func_start MOD54_021D8D50 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index f23c5281..9c3b42a6 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -2203,7 +2203,7 @@ MOD55_021D868C: ; 0x021D868C lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -3295,7 +3295,7 @@ _021D8F1A: add r0, r5, r0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r5, #0x14] mov r1, #0 str r0, [sp, #0x1c] @@ -3448,7 +3448,7 @@ _021D9098: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 @@ -5404,7 +5404,7 @@ _021DA0D0: add r0, r5, r0 mov r1, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -5485,7 +5485,7 @@ _021DA17C: add r0, r5, r0 mov r1, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 add r2, r5, #0 str r3, [sp] @@ -5518,11 +5518,11 @@ MOD55_021DA214: ; 0x021DA214 mov r1, #0xce lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021DA220 ; =FUN_0200D0E0 + ldr r3, _021DA220 ; =ClearFrameAndWindow2 mov r1, #0 bx r3 .align 2, 0 -_021DA220: .word FUN_0200D0E0 +_021DA220: .word ClearFrameAndWindow2 thumb_func_end MOD55_021DA214 thumb_func_start MOD55_021DA224 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 5b49451e..76c24a3f 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1313,7 +1313,7 @@ MOD56_022128A4: ; 0x022128A4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -1768,7 +1768,7 @@ _02212C74: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -1828,7 +1828,7 @@ _02212CEC: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -1896,7 +1896,7 @@ _02212D74: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -2279,7 +2279,7 @@ MOD56_02213048: ; 0x02213048 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -2336,7 +2336,7 @@ MOD56_022130A4: ; 0x022130A4 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -2747,7 +2747,7 @@ _022133DA: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -3515,7 +3515,7 @@ MOD56_02213990: ; 0x02213990 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 @@ -3591,7 +3591,7 @@ MOD56_02213A40: ; 0x02213A40 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 @@ -3655,7 +3655,7 @@ MOD56_02213A94: ; 0x02213A94 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -5089,7 +5089,7 @@ _02214602: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 @@ -5120,7 +5120,7 @@ _02214642: add r0, r5, r0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] @@ -5245,7 +5245,7 @@ _0221476E: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 @@ -5286,7 +5286,7 @@ _022147CE: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 @@ -5370,7 +5370,7 @@ _02214868: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 @@ -5406,7 +5406,7 @@ _0221488C: add r0, r5, r0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] @@ -5506,7 +5506,7 @@ _02214994: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 @@ -5704,7 +5704,7 @@ _02214ADC: add r0, r5, r0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] @@ -6064,7 +6064,7 @@ _02214DEC: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe3 lsl r0, r0, #2 add r0, r4, r0 @@ -6990,7 +6990,7 @@ MOD56_022154BC: ; 0x022154BC lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 @@ -7536,7 +7536,7 @@ MOD56_022159B0: ; 0x022159B0 add r4, r1, #0 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 @@ -8176,7 +8176,7 @@ MOD56_02215EA4: ; 0x02215EA4 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -8192,7 +8192,7 @@ _02215EE0: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 @@ -8279,7 +8279,7 @@ _02215F82: add r0, r5, r0 mov r1, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #1 bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 @@ -8327,7 +8327,7 @@ MOD56_02215FF4: ; 0x02215FF4 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -8343,7 +8343,7 @@ _02216024: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 @@ -8395,7 +8395,7 @@ _02216048: add r0, r5, r0 mov r1, #1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r3, #0 mov r0, #0xdb lsl r0, r0, #2 @@ -8487,7 +8487,7 @@ _02216154: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 @@ -8670,7 +8670,7 @@ _022162B8: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index f9301441..88628998 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1567,7 +1567,7 @@ _021DA70E: lsl r0, r0, #2 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _021DA784 ; =0x00005C9C ldr r0, [r5, r0] bl FUN_020146C4 @@ -1598,7 +1598,7 @@ _021DA748: lsl r0, r0, #2 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _021DA784 ; =0x00005C9C ldr r0, [r5, r0] bl FUN_020146C4 @@ -1638,7 +1638,7 @@ _021DA7A4: str r1, [r5, r0] sub r0, #0x38 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _021DA7F0 ; =0x00005C9C ldr r0, [r5, r0] bl FUN_020146C4 @@ -1659,7 +1659,7 @@ _021DA7D4: str r1, [r5, r0] sub r0, #0x38 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _021DA7F0 ; =0x00005C9C ldr r0, [r5, r0] bl FUN_020146C4 @@ -2224,7 +2224,7 @@ MOD58_021DAB94: ; 0x021DAB94 mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r5, #0xc] bl Options_GetTextFrameDelay mov r3, #0 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 6e1c1392..7cb6272f 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -630,7 +630,7 @@ _021D7C5E: add r0, #0x1c add r1, r4, #0 mov r3, #4 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #1 bl TextFlags_SetCanABSpeedUpPrint add r0, r4, #0 @@ -843,7 +843,7 @@ _021D7DF2: ldr r2, _021D7EC4 ; =0x000003D9 mov r1, #1 mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 add r0, #0x30 bl CopyWindowToVram @@ -867,7 +867,7 @@ _021D7E66: add r0, r5, #0 add r0, #0x30 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r5, #0 add r0, #0x30 bl RemoveWindow diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 6d3eade4..f2a76930 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -945,13 +945,13 @@ MOD60_021D7BA4: ; 0x021D7BA4 add r0, #0x3c mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r4, #0x4c ldr r2, _021D7CD0 ; =0x0000023B add r0, r4, #0 mov r1, #1 mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add sp, #0x14 pop {r3, r4, pc} nop @@ -966,11 +966,11 @@ MOD60_021D7CD4: ; 0x021D7CD4 add r5, r0, #0 add r0, #0x3c mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r5, #0 add r0, #0x4c mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r6, #0 add r5, #0x2c add r7, r6, #0 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index d58310fa..4c119173 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -301,7 +301,7 @@ _021D7702: mov r1, #1 mov r2, #0xa mov r3, #6 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 add r0, #0x94 mov r1, #0xff @@ -341,7 +341,7 @@ _021D775E: add r0, r5, #0 add r0, #0x94 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r0, #0x94 bl ClearWindowTilemapAndCopyToVram @@ -428,7 +428,7 @@ _021D77F2: mov r2, #0xa mov r3, #6 strb r1, [r5, #0x13] - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 add r0, #0x94 mov r1, #0xff @@ -496,7 +496,7 @@ _021D788A: add r0, r5, #0 add r0, #0x94 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r0, #0x94 bl ClearWindowTilemapAndCopyToVram diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 35c6e17d..722bfcff 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -2030,7 +2030,7 @@ _0222E4D0: ldr r0, [sp, #0x18] mov r2, #0x1f mov r3, #0xd - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x35 str r0, [sp] mov r0, #2 @@ -3328,7 +3328,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 add r0, r5, #0 add r2, r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -4600,7 +4600,7 @@ MOD62_0222F904: ; 0x0222F904 add r4, r0, #0 add r0, #0xfc mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0xfc bl ClearWindowTilemapAndCopyToVram @@ -6693,7 +6693,7 @@ _022309DC: lsl r0, r0, #2 add r0, r4, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index e3f91882..aaf61da1 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -711,7 +711,7 @@ MOD64_021D7A54: ; 0x021D7A54 ldr r0, [r5] lsl r2, r2, #8 add r3, r1, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -2336,7 +2336,7 @@ _021D86F8: add r0, r5, #0 lsl r2, r2, #8 add r3, r1, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -2393,7 +2393,7 @@ _021D8770: add r0, r5, #0 lsl r2, r2, #8 add r3, r1, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r6, #0 bl DestroyMsgData add r0, r4, #0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 0e8bbfba..932f17df 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -542,7 +542,7 @@ _021D78FC: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #1 strh r0, [r4, #0x18] mov r0, #0 @@ -577,7 +577,7 @@ _021D7940: lsl r0, r0, #2 add r0, r4, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x42 lsl r0, r0, #2 add r0, r4, r0 @@ -1393,7 +1393,7 @@ MOD65_021D7FAC: ; 0x021D7FAC add r0, r5, r0 add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _021D7FCA: mov r0, #0xd8 str r0, [sp] @@ -2268,7 +2268,7 @@ _021D8648: mov r1, #1 mov r2, #0x1f mov r3, #0xf - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r3, [r5] add r0, r5, #0 mov r1, #0 @@ -2293,7 +2293,7 @@ MOD65_021D86BC: ; 0x021D86BC lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x46 lsl r0, r0, #2 add r0, r4, r0 @@ -3838,7 +3838,7 @@ MOD65_021D92C4: ; 0x021D92C4 add r0, #0x6c add r2, r1, #0 mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 add r0, #0x6c mov r1, #0xff @@ -3914,7 +3914,7 @@ _021D9366: add r0, r4, #0 add r0, #0x6c mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r4, #0x6c add r0, r4, #0 bl ClearWindowTilemapAndCopyToVram diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index ca8faeb0..ec275cac 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -1347,7 +1347,7 @@ _021D7F44: lsr r0, r0, #0x18 str r0, [sp] add r0, r7, #0 - bl FUN_0200D6F8 + bl DrawFrameAndWindow3 add r0, r7, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -2052,7 +2052,7 @@ MOD66_021D8494: ; 0x021D8494 mov r2, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x1c - bl FUN_0200D7A0 + bl ClearFrameAndWindow3 ldr r0, [r6, #0x28] mov r1, #4 bl ScheduleBgTilemapBufferTransfer diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 66e1a85e..e2ede862 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -890,14 +890,14 @@ MOD70_021D7AF4: ; 0x021D7AF4 mov r1, #0 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 lsl r2, r4, #0x10 add r0, #0x24 mov r1, #0 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r5, #0x10] mov r1, #1 bl BgCommitTilemapBufferToVram diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index acd8756a..9499d99e 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1291,7 +1291,7 @@ _0222E094: ldr r0, _0222E110 ; =0x000005A8 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r1, #0 str r1, [sp] mov r0, #0x20 @@ -4374,7 +4374,7 @@ _0222F9E4: ldr r0, _0222FA30 ; =0x00003684 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _0222FA30 ; =0x00003684 add r0, r5, r0 bl RemoveWindow @@ -6984,14 +6984,14 @@ MOD71_02230F40: ; 0x02230F40 add r0, r5, #0 mov r1, #0 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 b _02230F76 _02230F6A: ldr r2, _02230FA8 ; =0x000001F7 add r0, r5, #0 mov r1, #0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _02230F76: add r0, r5, #0 mov r1, #0xf @@ -7070,7 +7070,7 @@ MOD71_02231004: ; 0x02231004 ldr r2, _02231014 ; =0x000001F7 mov r1, #0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 pop {r3, pc} nop _02231014: .word 0x000001F7 @@ -7102,7 +7102,7 @@ MOD71_02231018: ; 0x02231018 add r0, r4, #0 mov r1, #0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r3, _02231090 ; =0x022313D4 add r2, sp, #0x14 add r7, r2, #0 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index c61aa026..4fe0dba7 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -4816,7 +4816,7 @@ MOD73_021D9AC8: ; 0x021D9AC8 ldr r0, [r4, #8] mov r2, #1 add r3, r1, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 pop {r4, pc} thumb_func_end MOD73_021D9AC8 @@ -5006,7 +5006,7 @@ MOD73_021D9BE0: ; 0x021D9BE0 ldr r0, [r5, #8] add r2, r1, #0 mov r3, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -6189,7 +6189,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 mov r1, #0 mov r2, #0x1f mov r3, #1 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r4, #0x10] mov r1, #0xf bl FillWindowPixelBuffer @@ -6208,7 +6208,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 mov r1, #0 mov r2, #0x1f mov r3, #1 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r4, #0xc] bl ScheduleWindowCopyToVram ldr r0, [r4, #0x10] @@ -6570,7 +6570,7 @@ _021DA7EC: ldr r0, [r4, #0x14] mov r2, #1 add r3, r1, #0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4, #0x14] bl ScheduleWindowCopyToVram add sp, #0x10 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 23d75c48..3726aeb3 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -4461,7 +4461,7 @@ MOD75_021E8E1C: ; 0x021E8E1C add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 bl MOD75_021EB660 ldr r1, _021E8EAC ; =0x00000426 @@ -4501,7 +4501,7 @@ _021E8ED2: add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -4573,7 +4573,7 @@ _021E8F3A: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 bl MOD75_021EB660 ldr r1, _021E8FBC ; =0x00000426 @@ -4692,7 +4692,7 @@ _021E9046: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 bl MOD75_021EB660 ldr r1, _021E91AC ; =0x00000426 @@ -4831,7 +4831,7 @@ _021E917A: add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -5108,7 +5108,7 @@ _021E93AA: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 bl MOD75_021EB660 ldr r1, _021E9430 ; =0x00000426 @@ -5136,7 +5136,7 @@ _021E93F0: add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _021E9428 ; =0x00000483 mov r1, #2 strb r1, [r4, r0] @@ -5504,7 +5504,7 @@ _021E96EC: add r0, r5, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -5574,7 +5574,7 @@ _021E9772: strb r1, [r4, r0] add r0, r4, #0 add r0, #0x64 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -5717,7 +5717,7 @@ _021E9872: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r2, r5, #0 add r2, #0xc4 ldr r2, [r2] @@ -5804,7 +5804,7 @@ _021E9952: add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -5870,7 +5870,7 @@ _021E99C6: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r2, r5, #0 add r2, #0xc4 ldr r2, [r2] @@ -6096,7 +6096,7 @@ _021E9BAC: add r0, r4, #0 add r0, #0x74 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x64 mov r1, #0xf @@ -6191,7 +6191,7 @@ _021E9C80: add r0, r4, #0 add r0, #0x74 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x64 mov r1, #0xf @@ -6247,15 +6247,15 @@ _021E9D00: add r0, r4, #0 add r0, #0x84 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x74 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -6439,11 +6439,11 @@ _021E9EA2: add r0, r5, #0 add r0, #0x84 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r5, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -6560,11 +6560,11 @@ _021E9F96: add r0, r4, #0 add r0, #0x84 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x64 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x14 bl ScheduleWindowCopyToVram @@ -6660,7 +6660,7 @@ _021EA016: add r0, #0x64 mov r1, #0 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 bl MOD75_021EB660 ldr r1, _021EA0C8 ; =0x00000426 @@ -8998,7 +8998,7 @@ _021EB298: ldr r2, _021EB33C ; =0x000003D9 add r0, r4, r6 mov r1, #1 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, r6 mov r1, #0xf bl FillWindowPixelBuffer @@ -9055,7 +9055,7 @@ _021EB31E: add r0, #0xb4 mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r5, #0xb4 add r0, r5, #0 bl ScheduleWindowCopyToVram @@ -9093,14 +9093,14 @@ _021EB364: add r4, r5, #4 add r0, r4, r6 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, r6 bl ClearWindowTilemapAndScheduleTransfer _021EB37A: add r0, r5, #0 add r0, #0xb4 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r5, #0 add r0, #0xb4 bl ClearWindowTilemapAndScheduleTransfer @@ -9202,7 +9202,7 @@ MOD75_021EB454: ; 0x021EB454 add r0, #0x94 mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 bl MOD75_021EB504 add r0, r5, #0 @@ -9210,7 +9210,7 @@ MOD75_021EB454: ; 0x021EB454 add r0, #0x34 mov r1, #1 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 add r0, #0x34 mov r1, #0xf @@ -9335,11 +9335,11 @@ MOD75_021EB580: ; 0x021EB580 add r4, r0, #0 add r0, #0x34 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 add r0, #0x94 mov r1, #1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0 add r0, #0x34 bl ClearWindowTilemapAndScheduleTransfer @@ -9361,7 +9361,7 @@ MOD75_021EB5B0: ; 0x021EB5B0 add r0, #0x64 mov r1, #1 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0 add r0, #0x64 mov r1, #0xf @@ -9539,7 +9539,7 @@ MOD75_021EB708: ; 0x021EB708 add r0, r4, #0 mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _021EB722: add r0, r4, #0 mov r1, #0xf @@ -9659,7 +9659,7 @@ MOD75_021EB808: ; 0x021EB808 add r0, r4, #0 mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9760,7 +9760,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 add r0, r4, #0 mov r1, #1 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index ae83c7a7..8c70dc91 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -484,7 +484,7 @@ _021D78A8: mov r1, #0 mov r2, #0xa mov r3, #0xd - bl FUN_0200D0BC + bl DrawFrameAndWindow2 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _021D78E4: .word MOD76_021D8FC4 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 4b8e4702..25e3330a 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -607,7 +607,7 @@ _021D79D0: add r0, r4, r0 mov r1, #0 mov r3, #7 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, _021D7B84 ; =0x0000C314 ldr r0, [r4, r0] cmp r0, #0 @@ -644,7 +644,7 @@ _021D7A4E: ldr r0, _021D7B7C ; =0x0000C034 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _021D7B98 ; =0x000005DD bl PlaySE mov r0, #0xd8 @@ -1438,7 +1438,7 @@ MOD77_021D7FAC: ; 0x021D7FAC add r0, r5, r0 mov r1, #0 mov r3, #6 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, _021D8228 ; =0x0000C064 mov r3, #0 str r3, [r5, r0] @@ -1819,7 +1819,7 @@ _021D83B2: ldr r0, [sp, #0x10] mov r1, #1 mov r3, #7 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp] bl CopyWindowToVram add sp, #0x24 @@ -1909,7 +1909,7 @@ _021D8462: ldr r0, [sp, #0x18] mov r1, #1 mov r3, #7 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp] bl CopyWindowToVram add sp, #0x2c @@ -1929,7 +1929,7 @@ MOD77_021D84D8: ; 0x021D84D8 ldr r0, _021D8504 ; =0x0000C024 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _021D8504 ; =0x0000C024 add r0, r4, r0 bl RemoveWindow @@ -1984,7 +1984,7 @@ MOD77_021D8510: ; 0x021D8510 add r0, r5, r0 mov r1, #0 mov r3, #7 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, _021D85D4 ; =0x0000C070 ldr r2, _021D85D8 ; =0x0000C314 ldr r0, [r5, r0] @@ -2073,7 +2073,7 @@ MOD77_021D85E0: ; 0x021D85E0 add r0, r5, r0 mov r1, #0 mov r3, #7 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [r5] add r1, r4, #0 str r0, [sp] @@ -2127,7 +2127,7 @@ MOD77_021D8698: ; 0x021D8698 ldr r0, _021D86B0 ; =0x0000C044 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _021D86B0 ; =0x0000C044 add r0, r4, r0 bl RemoveWindow diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 3b68da11..5ffe3380 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -3547,7 +3547,7 @@ MOD80_0222F14C: ; 0x0222F14C bne _0222F18A add r0, r4, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 bl ClearWindowTilemapAndCopyToVram @@ -3561,7 +3561,7 @@ MOD80_0222F14C: ; 0x0222F14C _0222F18A: add r0, r4, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 bl ClearWindowTilemapAndCopyToVram @@ -3684,7 +3684,7 @@ MOD80_0222F250: ; 0x0222F250 add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -3726,7 +3726,7 @@ MOD80_0222F2A8: ; 0x0222F2A8 add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -4524,7 +4524,7 @@ MOD80_0222F918: ; 0x0222F918 mov r1, #0 add r0, r4, r0 str r1, [r4, #0x2c] - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 b _0222F956 _0222F942: mov r0, #2 @@ -4598,7 +4598,7 @@ MOD80_0222F96C: ; 0x0222F96C mov r1, #0 mov r3, #0xb str r0, [sp, #0xc] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x3e str r0, [sp] mov r0, #2 @@ -4651,7 +4651,7 @@ _0222FA26: ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r4, r5, #0 add r4, #0xd4 add r0, r4, #0 @@ -4706,7 +4706,7 @@ _0222FAA4: ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #2 str r0, [r5, #0x2c] add r0, r5, #0 @@ -4811,7 +4811,7 @@ MOD80_0222FB3C: ; 0x0222FB3C add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -5989,7 +5989,7 @@ MOD80_022304F8: ; 0x022304F8 add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -7650,11 +7650,11 @@ _02231266: ldr r0, _022312C0 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _022312C4 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _022312C0 ; =0x00000ED8 add r0, r4, r0 bl RemoveWindow @@ -7754,7 +7754,7 @@ _02231342: ldr r0, _0223146C ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02231470 ; =0x000005DC bl PlaySE mov r0, #4 @@ -7787,11 +7787,11 @@ _0223138C: ldr r0, _02231474 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _0223146C ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02231474 ; =0x00000ED8 add r0, r4, r0 bl RemoveWindow @@ -7987,11 +7987,11 @@ _0223154A: ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _022315FC ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -8012,7 +8012,7 @@ _0223158E: ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -8160,11 +8160,11 @@ _022316D0: ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02231778 ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -8185,7 +8185,7 @@ _0223170C: ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -8383,7 +8383,7 @@ MOD80_0223187C: ; 0x0223187C add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -9855,7 +9855,7 @@ MOD80_02232470: ; 0x02232470 mov r1, #1 mov r3, #0xb str r0, [sp, #0xc] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x3e str r0, [sp] mov r0, #2 @@ -9916,7 +9916,7 @@ _02232546: ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #2 str r0, [r5, #0x2c] add r0, r5, #0 @@ -9936,7 +9936,7 @@ _02232574: ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r2, r5, #0 add r3, r5, #0 ldr r1, [r5] @@ -10020,11 +10020,11 @@ _0223262E: ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _0223266C ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #1 str r0, [r5, #0x2c] _0223265A: @@ -10095,7 +10095,7 @@ MOD80_02232670: ; 0x02232670 mov r1, #0 mov r3, #0xb str r0, [sp, #0xc] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x3e str r0, [sp] mov r0, #2 @@ -10156,7 +10156,7 @@ _02232746: ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #2 str r0, [r5, #0x2c] add r0, r5, #0 @@ -10176,7 +10176,7 @@ _02232774: ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r2, r5, #0 add r3, r5, #0 ldr r1, [r5] @@ -10243,11 +10243,11 @@ _0223280A: ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02232848 ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #1 str r0, [r5, #0x2c] _02232836: @@ -10420,7 +10420,7 @@ MOD80_02232950: ; 0x02232950 ldr r0, _0223298C ; =0x00000FB8 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #1 str r0, [r4, #0x2c] b _02232982 @@ -10574,7 +10574,7 @@ MOD80_02232A84: ; 0x02232A84 ldr r0, _02232AE4 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #1 str r0, [r4, #0x2c] b _02232ADA @@ -10641,7 +10641,7 @@ MOD80_02232B08: ; 0x02232B08 ldr r0, _02232B30 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, [r4, #0x30] str r0, [r4, #0x2c] _02232B2C: @@ -10684,7 +10684,7 @@ _02232B62: mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r6, [sp, #4] @@ -11663,7 +11663,7 @@ MOD80_022332EC: ; 0x022332EC add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -12284,11 +12284,11 @@ _02233820: ldr r0, _02233884 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233888 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02233884 ; =0x00000ED8 add r0, r4, r0 bl RemoveWindow @@ -12422,7 +12422,7 @@ _02233932: ldr r0, _02233A54 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 bl RemoveWindow @@ -12461,11 +12461,11 @@ _0223398C: ldr r0, _02233A58 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233A54 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 bl RemoveWindow @@ -12651,11 +12651,11 @@ _02233B26: ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233BD8 ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -12676,7 +12676,7 @@ _02233B6A: ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -12823,11 +12823,11 @@ _02233CA4: ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233D78 ; =0x00000E98 mov r1, #0 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -12863,7 +12863,7 @@ _02233CFA: ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 bl RemoveWindow @@ -13710,7 +13710,7 @@ _02234388: mov r2, #0x1f mov r3, #0xb str r0, [sp, #0x10] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xfe lsl r0, r0, #4 ldr r2, [r7, r0] @@ -13903,7 +13903,7 @@ MOD80_022344DC: ; 0x022344DC mov r2, #0x1f mov r3, #0xb str r0, [sp, #0x24] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 lsl r1, r4, #1 ldr r2, _0223455C ; =0x0000101C add r3, r7, r1 @@ -13963,7 +13963,7 @@ _02234578: mov r2, #0x1f mov r3, #0xb str r0, [sp, #0x10] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0 add r0, sp, #4 add r2, r1, #0 @@ -14019,7 +14019,7 @@ _022345E8: mov r2, #0x1f mov r3, #0xb str r0, [sp, #0x10] - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0 add r0, sp, #4 add r2, r1, #0 @@ -18794,7 +18794,7 @@ _02236AC0: ldr r0, _02236AD8 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0 str r0, [r4, #0x2c] _02236ACE: @@ -19057,7 +19057,7 @@ MOD80_02236C70: ; 0x02236C70 add r0, r5, r0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -19212,7 +19212,7 @@ MOD80_02236D8C: ; 0x02236D8C add r0, r5, r0 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -19260,7 +19260,7 @@ _02236E16: ldr r0, _02236E44 ; =0x00000E98 mov r1, #1 add r0, r5, r0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r1, r4, #0 bl MOD80_02236D8C diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index f3c96168..ee333134 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2482,7 +2482,7 @@ _022390F4: add r0, #0x44 mov r1, #0x6d mov r2, #2 - bl FUN_0200D06C + bl DrawWindowFrame2 add r0, r4, #0 add r0, #0x44 bl CopyWindowToVram @@ -2556,7 +2556,7 @@ _022391BE: add r0, r4, #0 add r0, #0x44 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0 str r0, [r4, #8] ldr r0, [r5] @@ -9606,7 +9606,7 @@ _0223C982: add r0, #0x48 mov r1, #0x6d mov r2, #2 - bl FUN_0200D06C + bl DrawWindowFrame2 add r0, r4, #0 add r0, #0x48 bl CopyWindowToVram @@ -9668,7 +9668,7 @@ _0223CA32: add r0, r4, #0 add r0, #0x48 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0 str r0, [r4, #8] ldr r0, [r5] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index c04d7d65..a799ebaa 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -2533,7 +2533,7 @@ MOD82_0222E988: ; 0x0222E988 mov r1, #0 mov r2, #0x1f mov r3, #0xa - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0xb9 mov r0, #0xda lsl r1, r1, #4 @@ -3125,7 +3125,7 @@ MOD82_0222EE28: ; 0x0222EE28 mov r1, #0 mov r2, #0x1f mov r3, #0xa - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r1, _0222EE70 ; =0x00000B94 mov r0, #0xd9 lsl r0, r0, #4 @@ -3272,7 +3272,7 @@ MOD82_0222EF54: ; 0x0222EF54 mov r1, #0 mov r2, #0x1f mov r3, #0xa - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0xb9 mov r0, #0xda lsl r1, r1, #4 @@ -4044,7 +4044,7 @@ MOD82_0222F4D8: ; 0x0222F4D8 mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -4107,7 +4107,7 @@ _0222F584: lsl r0, r0, #6 add r0, r4, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0 str r0, [r4, #0x1c] _0222F594: @@ -4139,7 +4139,7 @@ MOD82_0222F59C: ; 0x0222F59C mov r1, #0 mov r2, #1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -4382,7 +4382,7 @@ MOD82_0222F740: ; 0x0222F740 mov r1, #1 mov r2, #0x1f mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -4432,7 +4432,7 @@ _0222F7D2: lsl r0, r0, #6 add r0, r5, r0 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0 add r1, r4, #0 bl MOD82_0222F740 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 7c18c8e8..0c993cd6 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -82,7 +82,7 @@ _0222D63C: lsl r0, r0, #6 add r0, r5, r0 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 @@ -1127,7 +1127,7 @@ _0222DE76: mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r1, _0222DEC8 ; =MOD83_0223A854 ldr r0, [sp, #0x20] ldr r2, [r1, r0] @@ -1490,7 +1490,7 @@ _0222E104: mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp, #0x18] add r0, #0xe8 ldr r3, [r0] @@ -1593,7 +1593,7 @@ _0222E206: mov r1, #1 mov r2, #0xa mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 bl GetWindowX str r0, [sp, #0x10] @@ -1620,7 +1620,7 @@ _0222E256: add r0, r5, #0 add r2, r1, #0 mov r3, #2 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0 bl GetWindowX str r0, [sp, #0x18] @@ -2736,7 +2736,7 @@ _0222EB4E: add r0, r4, #0 add r0, #0x18 mov r1, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r4, #0x18 add r0, r4, #0 bl RemoveWindow @@ -4731,7 +4731,7 @@ MOD83_0222FB44: ; 0x0222FB44 bne _0222FB5A add r0, r5, #0 add r1, r4, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 _0222FB5A: pop {r3, r4, r5, pc} thumb_func_end MOD83_0222FB44 @@ -5050,7 +5050,7 @@ _0222FDC6: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r1, _0222FDE4 ; =MOD83_0223ADD8 add r0, r6, #0 mov r2, #2 @@ -5138,7 +5138,7 @@ _0222FE76: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r2, #2 ldr r1, _0222FE9C ; =MOD83_0223ADC8 add r0, r6, #0 @@ -5192,7 +5192,7 @@ _0222FEE6: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x4e str r0, [sp] ldr r1, _0222FF0C ; =MOD83_0223AD98 @@ -5247,7 +5247,7 @@ _0222FF56: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x4d str r0, [sp] ldr r1, _0222FF7C ; =MOD83_0223ADA8 @@ -5294,7 +5294,7 @@ _0222FFB4: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #4 str r0, [sp] ldr r1, _0222FFD4 ; =MOD83_0223ADB8 @@ -5518,7 +5518,7 @@ _02230172: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #1 str r0, [sp] ldr r1, _02230198 ; =MOD83_0223AE20 @@ -5957,7 +5957,7 @@ _022304E6: mov r1, #1 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r0, [sp, #0x18] add r1, sp, #0x20 str r0, [sp] @@ -6026,7 +6026,7 @@ _0223057A: mov r1, #0 mov r2, #1 mov r3, #2 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0xc] @@ -6075,7 +6075,7 @@ MOD83_022305A4: ; 0x022305A4 mov r1, #0 mov r2, #0x1f mov r3, #3 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -8110,7 +8110,7 @@ MOD83_022316C0: ; 0x022316C0 bne _022316D6 add r0, r5, #0 add r1, r4, #0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 _022316D6: pop {r3, r4, r5, pc} thumb_func_end MOD83_022316C0 @@ -8125,7 +8125,7 @@ MOD83_022316D8: ; 0x022316D8 bne _022316EE add r0, r5, #0 add r1, r4, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 _022316EE: pop {r3, r4, r5, pc} thumb_func_end MOD83_022316D8 @@ -9312,14 +9312,14 @@ _02232054: mov r1, #0 mov r2, #0x13 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 b _02232076 _0223206A: add r0, r6, #0 mov r1, #0 mov r2, #0xa mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _02232076: ldr r1, [r4, #0xc] ldr r0, [r4, #0x10] @@ -10560,14 +10560,14 @@ _02232A56: add r0, r4, r0 mov r2, #0x13 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 mov r1, #0 mov r2, #0xa mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -15638,7 +15638,7 @@ _02235086: ldr r2, _022350B8 ; =0x000003D2 mov r1, #0 mov r3, #0xd - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add sp, #0x1c pop {r4, r5, r6, r7, pc} _022350A2: @@ -15646,7 +15646,7 @@ _022350A2: mov r1, #0 lsl r2, r2, #4 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 _022350AE: add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -17919,7 +17919,7 @@ MOD83_02236298: ; 0x02236298 cmp r1, #0 beq _022362B4 mov r1, #0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0 bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 @@ -23258,7 +23258,7 @@ _02238AB8: mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 b _02238AEC _02238ADA: ldr r2, [r4, #0x38] @@ -23268,7 +23268,7 @@ _02238ADA: mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _02238AEC: add r0, r5, #0 add sp, #0x14 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 8d6b495f..2733fd96 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -843,7 +843,7 @@ MOD85_021D7BEC: ; 0x021D7BEC mov r1, #1 mov r2, #0x1f mov r3, #0xe - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r4, #0 add r0, #8 mov r1, #0xf @@ -880,7 +880,7 @@ MOD85_021D7C44: ; 0x021D7C44 add r0, r5, r4 add r0, #8 mov r1, #1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, r4 add r0, #8 mov r1, #0 |