diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-08-22 12:14:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-22 12:14:20 +0100 |
| commit | 408cdd5611fbc4947545e747812dbbd86b36f3aa (patch) | |
| tree | 820614fcaf4094759d90498156cafed87bedb881 | |
| parent | 352605c1b5af4ff2fa6e792a47b6f6451c1f4be8 (diff) | |
| parent | bdcd439b89deee757fcad4d3ce72cdee97f5a080 (diff) | |
Merge branch 'master' into nitrobanner
69 files changed, 1651 insertions, 3368 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 179bf053..04756a55 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -31,7 +31,7 @@ Static arm9 Object unk_0200BA78.o Object unk_0200BB14.o Object unk_0200CA44.o - Object unk_0200CABC.o + Object render_window.o Object unk_0200E1D0.o Object unk_0200E850.o Object unk_0201137C.o diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 5ddfa9ab..cd5a4010 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -809,7 +809,7 @@ CreateYesNoMenu: ; 0x020020EC ldr r2, [sp, #0xc] ldr r3, [sp, #0x10] mov r1, #0x1 - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 lsl r0, r5, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -881,7 +881,7 @@ FUN_020021EC: ; 0x020021EC ldr r0, [r5, #0x4] add r4, r1, #0x0 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, [r5, #0x4] bl RemoveWindow ldr r1, [r5, #0x4] diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s deleted file mode 100644 index 62bace0d..00000000 --- a/arm9/asm/unk_0200CABC.s +++ /dev/null @@ -1,2866 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020ECE88 -UNK_020ECE88: ; 0x020ECE88 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - - .global UNK_020ECE98 -UNK_020ECE98: ; 0x020ECE98 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - - .global UNK_020ECEA8 -UNK_020ECEA8: ; 0x020ECEA8 - .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global UNK_020ECEC0 -UNK_020ECEC0: ; 0x020ECEC0 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xD5, 0x5C, 0x01, 0x00, 0xD5, 0x5C, 0x01, 0x00, 0xD5, 0x5C, 0x01, 0x00 - .byte 0xD5, 0x5C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .text - - thumb_func_start FUN_0200CABC -FUN_0200CABC: ; 0x0200CABC - push {r3-r5, lr} - sub sp, #0x10 - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r3, #0x0 - str r2, [sp, #0x0] - bne _0200CAE2 - mov r1, #0x0 - str r1, [sp, #0x4] - ldr r0, [sp, #0x20] - str r1, [sp, #0x8] - str r0, [sp, #0xc] - mov r0, #0x26 - add r2, r5, #0x0 - add r3, r4, #0x0 - bl GfGfxLoader_LoadCharData - add sp, #0x10 - pop {r3-r5, pc} -_0200CAE2: - mov r0, #0x0 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r0, [sp, #0x20] - mov r1, #0x1 - str r0, [sp, #0xc] - mov r0, #0x26 - add r2, r5, #0x0 - add r3, r4, #0x0 - bl GfGfxLoader_LoadCharData - add sp, #0x10 - pop {r3-r5, pc} - - thumb_func_start FUN_0200CAFC -FUN_0200CAFC: ; 0x0200CAFC - mov r0, #0x18 - bx lr - - thumb_func_start FUN_0200CB00 -FUN_0200CB00: ; 0x0200CB00 - push {r4-r6, lr} - sub sp, #0x10 - add r6, r0, #0x0 - add r0, sp, #0x10 - ldrb r0, [r0, #0x10] - add r5, r1, #0x0 - add r4, r3, #0x0 - cmp r0, #0x0 - beq _0200CB16 - mov r1, #0x1 - b _0200CB18 -_0200CB16: - mov r1, #0x0 -_0200CB18: - str r2, [sp, #0x0] - mov r0, #0x0 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r0, [sp, #0x24] - add r2, r6, #0x0 - str r0, [sp, #0xc] - mov r0, #0x26 - add r3, r5, #0x0 - bl GfGfxLoader_LoadCharData - add r0, sp, #0x10 - ldrb r0, [r0, #0x10] - cmp r0, #0x2 - bne _0200CB3A - mov r1, #0x2d - b _0200CB3C -_0200CB3A: - mov r1, #0x18 -_0200CB3C: - cmp r5, #0x4 - bhs _0200CB56 - mov r0, #0x20 - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - mov r2, #0x0 - str r0, [sp, #0x4] - mov r0, #0x26 - lsl r3, r4, #0x5 - bl GfGfxLoader_GXLoadPal - add sp, #0x10 - pop {r4-r6, pc} -_0200CB56: - mov r0, #0x20 - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - mov r2, #0x4 - str r0, [sp, #0x4] - mov r0, #0x26 - lsl r3, r4, #0x5 - bl GfGfxLoader_GXLoadPal - add sp, #0x10 - pop {r4-r6, pc} - - thumb_func_start FUN_0200CB6C -FUN_0200CB6C: ; 0x0200CB6C - push {r4-r7, lr} - sub sp, #0x24 - str r1, [sp, #0x14] - str r2, [sp, #0x18] - str r3, [sp, #0x1c] - ldr r2, [sp, #0x1c] - ldr r5, [sp, #0x40] - sub r7, r2, #0x1 - ldr r2, [sp, #0x18] - str r0, [sp, #0x10] - sub r6, r2, #0x1 - lsl r2, r7, #0x18 - lsr r2, r2, #0x18 - str r2, [sp, #0x0] - mov r2, #0x1 - str r2, [sp, #0x4] - str r2, [sp, #0x8] - lsl r3, r6, #0x18 - str r5, [sp, #0xc] - add r2, sp, #0x28 - ldrh r2, [r2, #0x1c] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r1, sp, #0x28 - ldrh r4, [r1, #0x1c] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - ldrb r0, [r1, #0x10] - add r2, r4, #0x1 - lsl r2, r2, #0x10 - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - ldr r3, [sp, #0x18] - lsr r2, r2, #0x10 - bl FillBgTilemapRect - add r0, sp, #0x28 - ldrb r1, [r0, #0x10] - ldr r0, [sp, #0x18] - add r2, r4, #0x2 - add r0, r0, r1 - str r0, [sp, #0x20] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x20] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x3 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - add r0, sp, #0x28 - ldrb r0, [r0, #0x14] - lsl r2, r2, #0x10 - lsl r3, r6, #0x18 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r3, [sp, #0x20] - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - add r0, sp, #0x28 - ldrb r0, [r0, #0x14] - add r2, r4, #0x5 - lsl r2, r2, #0x10 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r0, sp, #0x28 - ldrb r1, [r0, #0x14] - ldr r0, [sp, #0x1c] - add r2, r4, #0x6 - add r7, r0, r1 - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r6, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - add r0, sp, #0x28 - ldrb r0, [r0, #0x10] - add r2, r4, #0x7 - lsl r2, r2, #0x10 - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - ldr r3, [sp, #0x18] - lsr r2, r2, #0x10 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x20] - str r5, [sp, #0xc] - add r4, #0x8 - lsl r2, r4, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add sp, #0x24 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200CCA4 -FUN_0200CCA4: ; 0x0200CCA4 - push {r3-r7, lr} - sub sp, #0x20 - add r5, r0, #0x0 - add r4, r1, #0x0 - add r6, r2, #0x0 - add r7, r3, #0x0 - bl GetWindowBgId - str r0, [sp, #0x10] - add r0, r5, #0x0 - bl GetWindowX - str r0, [sp, #0x14] - add r0, r5, #0x0 - bl GetWindowY - str r0, [sp, #0x18] - add r0, r5, #0x0 - bl GetWindowWidth - str r0, [sp, #0x1c] - add r0, r5, #0x0 - bl GetWindowHeight - ldr r1, [sp, #0x1c] - ldr r2, [sp, #0x14] - str r1, [sp, #0x0] - str r0, [sp, #0x4] - str r7, [sp, #0x8] - str r6, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x10] - ldr r3, [sp, #0x18] - bl FUN_0200CB6C - cmp r4, #0x0 - bne _0200CCF4 - add r0, r5, #0x0 - bl CopyWindowToVram -_0200CCF4: - add sp, #0x20 - pop {r3-r7, pc} - - thumb_func_start FUN_0200CCF8 -FUN_0200CCF8: ; 0x0200CCF8 - push {r3-r7, lr} - sub sp, #0x18 - add r5, r0, #0x0 - add r4, r1, #0x0 - bl GetWindowBgId - str r0, [sp, #0x10] - add r0, r5, #0x0 - bl GetWindowX - add r6, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowY - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowWidth - str r0, [sp, #0x14] - add r0, r5, #0x0 - bl GetWindowHeight - sub r1, r7, #0x1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - str r1, [sp, #0x0] - ldr r1, [sp, #0x14] - add r0, r0, #0x2 - add r1, r1, #0x2 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - lsl r0, r0, #0x18 - str r1, [sp, #0x4] - lsr r0, r0, #0x18 - sub r3, r6, #0x1 - lsl r3, r3, #0x18 - str r0, [sp, #0x8] - mov r2, #0x0 - str r2, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x10] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - cmp r4, #0x0 - bne _0200CD5A - add r0, r5, #0x0 - bl ClearWindowTilemapAndCopyToVram -_0200CD5A: - add sp, #0x18 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200CD60 -FUN_0200CD60: ; 0x0200CD60 - add r0, r0, #0x2 - bx lr - - thumb_func_start FUN_0200CD64 -FUN_0200CD64: ; 0x0200CD64 - add r0, #0x19 - bx lr - - thumb_func_start FUN_0200CD68 -FUN_0200CD68: ; 0x0200CD68 - push {r4-r7, lr} - sub sp, #0x14 - str r0, [sp, #0x10] - add r0, sp, #0x18 - ldrb r7, [r0, #0x10] - add r6, r2, #0x0 - add r5, r1, #0x0 - add r0, r7, #0x0 - add r4, r3, #0x0 - bl FUN_0200CD60 - add r1, r0, #0x0 - str r6, [sp, #0x0] - mov r0, #0x0 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r0, [sp, #0x2c] - ldr r2, [sp, #0x10] - str r0, [sp, #0xc] - mov r0, #0x26 - add r3, r5, #0x0 - bl GfGfxLoader_LoadCharData - cmp r5, #0x4 - bhs _0200CDB8 - add r0, r7, #0x0 - bl FUN_0200CD64 - add r1, r0, #0x0 - mov r0, #0x20 - str r0, [sp, #0x0] - ldr r0, [sp, #0x2c] - mov r2, #0x0 - str r0, [sp, #0x4] - mov r0, #0x26 - lsl r3, r4, #0x5 - bl GfGfxLoader_GXLoadPal - add sp, #0x14 - pop {r4-r7, pc} -_0200CDB8: - add r0, r7, #0x0 - bl FUN_0200CD64 - add r1, r0, #0x0 - mov r0, #0x20 - str r0, [sp, #0x0] - ldr r0, [sp, #0x2c] - mov r2, #0x4 - str r0, [sp, #0x4] - mov r0, #0x26 - lsl r3, r4, #0x5 - bl GfGfxLoader_GXLoadPal - add sp, #0x14 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200CDD8 -FUN_0200CDD8: ; 0x0200CDD8 - push {r3-r7, lr} - sub sp, #0x30 - str r1, [sp, #0x10] - str r2, [sp, #0x14] - str r3, [sp, #0x18] - ldr r2, [sp, #0x4c] - add r7, r0, #0x0 - str r2, [sp, #0x4c] - ldr r2, [sp, #0x18] - ldr r5, [sp, #0x50] - sub r6, r2, #0x1 - ldr r2, [sp, #0x14] - sub r2, r2, #0x2 - str r2, [sp, #0x28] - lsl r2, r6, #0x18 - lsr r2, r2, #0x18 - str r2, [sp, #0x0] - mov r2, #0x1 - str r2, [sp, #0x4] - str r2, [sp, #0x8] - ldr r3, [sp, #0x28] - str r5, [sp, #0xc] - add r2, sp, #0x38 - lsl r3, r3, #0x18 - ldrh r2, [r2, #0x1c] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x14] - sub r0, r0, #0x1 - str r0, [sp, #0x24] - add r0, sp, #0x38 - ldrh r4, [r0, #0x1c] - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x24] - str r5, [sp, #0xc] - add r2, r4, #0x1 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - add r0, sp, #0x38 - ldrb r0, [r0, #0x10] - add r2, r4, #0x2 - lsl r2, r2, #0x10 - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - ldr r1, [sp, #0x10] - ldr r3, [sp, #0x14] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - bl FillBgTilemapRect - add r0, sp, #0x38 - ldrb r1, [r0, #0x10] - ldr r0, [sp, #0x14] - add r2, r4, #0x3 - add r0, r0, r1 - str r0, [sp, #0x2c] - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x2c] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x2c] - add r2, r4, #0x4 - add r0, r0, #0x1 - str r0, [sp, #0x20] - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x20] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x2c] - add r2, r4, #0x5 - add r0, r0, #0x2 - str r0, [sp, #0x1c] - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x1c] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - ldr r3, [sp, #0x28] - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - ldr r0, [sp, #0x4c] - add r2, r4, #0x6 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - ldr r3, [sp, #0x24] - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - ldr r0, [sp, #0x4c] - add r2, r4, #0x7 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - ldr r0, [sp, #0x4c] - ldr r3, [sp, #0x2c] - str r0, [sp, #0x8] - str r5, [sp, #0xc] - add r2, #0x9 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - ldr r0, [sp, #0x4c] - ldr r3, [sp, #0x20] - str r0, [sp, #0x8] - str r5, [sp, #0xc] - add r2, #0xa - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - ldr r0, [sp, #0x4c] - ldr r3, [sp, #0x1c] - str r0, [sp, #0x8] - str r5, [sp, #0xc] - add r2, #0xb - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r2, r4, #0x0 - ldr r3, [sp, #0x28] - add r2, #0xc - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x18] - ldr r0, [sp, #0x4c] - lsr r2, r2, #0x10 - add r6, r1, r0 - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r5, [sp, #0xc] - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x24] - str r5, [sp, #0xc] - add r2, #0xd - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - add r0, sp, #0x38 - ldrb r0, [r0, #0x10] - add r2, r4, #0x0 - add r2, #0xe - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - ldr r1, [sp, #0x10] - ldr r3, [sp, #0x14] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x2c] - str r5, [sp, #0xc] - add r2, #0xf - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x20] - str r5, [sp, #0xc] - add r2, #0x10 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x1c] - str r5, [sp, #0xc] - add r4, #0x11 - lsl r2, r4, #0x10 - lsl r3, r3, #0x18 - ldr r1, [sp, #0x10] - add r0, r7, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add sp, #0x30 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D06C -FUN_0200D06C: ; 0x0200D06C - push {r4-r7, lr} - sub sp, #0x1c - add r5, r0, #0x0 - add r4, r1, #0x0 - add r6, r2, #0x0 - bl GetWindowBgId - str r0, [sp, #0x10] - add r0, r5, #0x0 - bl GetWindowX - str r0, [sp, #0x14] - add r0, r5, #0x0 - bl GetWindowY - str r0, [sp, #0x18] - add r0, r5, #0x0 - bl GetWindowWidth - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowHeight - str r7, [sp, #0x0] - str r0, [sp, #0x4] - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x8] - lsl r0, r4, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x10] - ldr r2, [sp, #0x14] - ldr r3, [sp, #0x18] - bl FUN_0200CDD8 - add sp, #0x1c - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D0BC -FUN_0200D0BC: ; 0x0200D0BC - push {r4-r6, lr} - add r6, r2, #0x0 - add r4, r1, #0x0 - add r1, r6, #0x0 - add r2, r3, #0x0 - add r5, r0, #0x0 - bl FUN_0200D06C - cmp r4, #0x0 - bne _0200D0D6 - add r0, r5, #0x0 - bl CopyWindowToVram -_0200D0D6: - add r0, r5, #0x0 - add r1, r6, #0x0 - bl FUN_0200D18C - pop {r4-r6, pc} - - thumb_func_start FUN_0200D0E0 -FUN_0200D0E0: ; 0x0200D0E0 - push {r3-r7, lr} - sub sp, #0x18 - add r5, r0, #0x0 - add r4, r1, #0x0 - bl GetWindowBgId - str r0, [sp, #0x10] - add r0, r5, #0x0 - bl GetWindowX - add r6, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowY - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowWidth - str r0, [sp, #0x14] - add r0, r5, #0x0 - bl GetWindowHeight - sub r1, r7, #0x1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - str r1, [sp, #0x0] - ldr r1, [sp, #0x14] - add r0, r0, #0x2 - add r1, r1, #0x5 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - lsl r0, r0, #0x18 - str r1, [sp, #0x4] - lsr r0, r0, #0x18 - sub r3, r6, #0x2 - lsl r3, r3, #0x18 - str r0, [sp, #0x8] - mov r2, #0x0 - str r2, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x10] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - cmp r4, #0x0 - bne _0200D142 - add r0, r5, #0x0 - bl ClearWindowTilemapAndCopyToVram -_0200D142: - add sp, #0x18 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D148 -FUN_0200D148: ; 0x0200D148 - push {r4-r5, lr} - sub sp, #0x24 - add r5, r1, #0x0 - str r0, [sp, #0x1c] - add r1, sp, #0x14 - strh r3, [r1, #0xc] - add r4, r2, #0x0 - add r0, sp, #0x20 - ldrh r2, [r0, #0x10] - add r3, r4, #0x0 - strh r2, [r1, #0xe] - ldr r2, [sp, #0x34] - str r2, [sp, #0x14] - ldrh r2, [r0, #0x18] - strh r2, [r1, #0x4] - ldrh r2, [r0, #0x1c] - strh r2, [r1, #0x6] - ldrh r1, [r0, #0x20] - add r2, r5, #0x0 - str r1, [sp, #0x0] - ldrh r1, [r0, #0x24] - str r1, [sp, #0x4] - ldrh r1, [r0, #0x28] - str r1, [sp, #0x8] - ldrh r0, [r0, #0x2c] - add r1, sp, #0x14 - str r0, [sp, #0xc] - mov r0, #0x0 - str r0, [sp, #0x10] - add r0, sp, #0x1c - bl BlitBitmapRect4Bit - add sp, #0x24 - pop {r4-r5, pc} - - thumb_func_start FUN_0200D18C -FUN_0200D18C: ; 0x0200D18C - push {r3-r7, lr} - sub sp, #0x40 - str r1, [sp, #0x24] - str r0, [sp, #0x20] - ldr r0, [r0, #0x0] - bl BgConfig_GetHeapId - add r6, r0, #0x0 - ldr r0, [sp, #0x20] - bl GetWindowBgId - mov r1, #0x6 - str r0, [sp, #0x28] - add r0, r6, #0x0 - lsl r1, r1, #0x6 - bl AllocFromHeap - add r5, r0, #0x0 - ldr r0, [sp, #0x28] - bl BgGetCharPtr - add r4, r0, #0x0 - str r6, [sp, #0x0] - mov r0, #0x26 - mov r1, #0x16 - mov r2, #0x0 - add r3, sp, #0x3c - bl GfGfxLoader_GetCharData - str r0, [sp, #0x2c] - ldr r0, [sp, #0x3c] - mov r7, #0x0 - ldr r0, [r0, #0x14] - str r0, [sp, #0x30] - ldr r0, [sp, #0x24] - add r0, #0xa - lsl r0, r0, #0x5 - str r0, [sp, #0x34] - ldr r0, [sp, #0x24] - add r0, #0xb - lsl r0, r0, #0x5 - str r0, [sp, #0x38] -_0200D1E0: - ldr r1, [sp, #0x34] - lsl r6, r7, #0x7 - add r0, r5, r6 - add r1, r4, r1 - mov r2, #0x20 - bl memcpy - add r0, r6, #0x0 - ldr r1, [sp, #0x38] - add r0, #0x20 - add r0, r5, r0 - add r1, r4, r1 - mov r2, #0x20 - bl memcpy - add r0, r6, #0x0 - ldr r1, [sp, #0x34] - add r0, #0x40 - add r0, r5, r0 - add r1, r4, r1 - mov r2, #0x20 - bl memcpy - ldr r1, [sp, #0x38] - add r6, #0x60 - add r0, r5, r6 - add r1, r4, r1 - mov r2, #0x20 - bl memcpy - add r0, r7, #0x1 - lsl r0, r0, #0x18 - lsr r7, r0, #0x18 - cmp r7, #0x3 - blo _0200D1E0 - mov r1, #0x30 - str r1, [sp, #0x0] - str r5, [sp, #0x4] - mov r3, #0xc - str r3, [sp, #0x8] - str r1, [sp, #0xc] - mov r0, #0x1 - str r0, [sp, #0x10] - mov r2, #0x0 - str r2, [sp, #0x14] - str r3, [sp, #0x18] - str r1, [sp, #0x1c] - ldr r0, [sp, #0x30] - mov r1, #0x4 - bl FUN_0200D148 - ldr r0, [sp, #0x24] - mov r3, #0x6 - add r0, #0x12 - str r0, [sp, #0x0] - ldr r0, [sp, #0x20] - ldr r1, [sp, #0x28] - ldr r0, [r0, #0x0] - add r2, r5, #0x0 - lsl r3, r3, #0x6 - bl BG_LoadCharTilesData - ldr r0, [sp, #0x24] - bl FUN_02002840 - ldr r0, [sp, #0x2c] - bl FreeToHeap - add r0, r5, #0x0 - bl FreeToHeap - add sp, #0x40 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D274 -FUN_0200D274: ; 0x0200D274 - push {r4-r7, lr} - sub sp, #0x14 - str r0, [sp, #0x4] - str r1, [sp, #0x8] - add r0, sp, #0x18 - ldrb r0, [r0, #0x10] - add r7, r2, #0x0 - add r5, r3, #0x0 - bl FUN_0200CD60 - add r1, r0, #0x0 - ldr r0, [sp, #0x2c] - mov r2, #0x0 - str r0, [sp, #0x0] - mov r0, #0x26 - add r3, sp, #0x10 - bl GfGfxLoader_GetCharData - str r0, [sp, #0xc] - mov r1, #0x9 - ldr r0, [sp, #0x2c] - lsl r1, r1, #0x6 - bl AllocFromHeap - ldr r1, [sp, #0x10] - mov r2, #0x9 - ldr r1, [r1, #0x14] - lsl r2, r2, #0x6 - add r4, r0, #0x0 - bl memcpy - mov r0, #0x9 - mov r3, #0x0 - lsl r0, r0, #0x6 - mov r1, #0xf -_0200D2BA: - ldrb r2, [r4, r3] - lsl r6, r2, #0x14 - and r2, r1 - lsl r2, r2, #0x18 - lsr r6, r6, #0x18 - lsr r2, r2, #0x18 - cmp r6, #0x0 - bne _0200D2CC - add r6, r5, #0x0 -_0200D2CC: - cmp r2, #0x0 - bne _0200D2D2 - add r2, r5, #0x0 -_0200D2D2: - lsl r6, r6, #0x4 - orr r2, r6 - strb r2, [r4, r3] - add r3, r3, #0x1 - cmp r3, r0 - blo _0200D2BA - str r7, [sp, #0x0] - mov r3, #0x9 - ldr r0, [sp, #0x4] - ldr r1, [sp, #0x8] - add r2, r4, #0x0 - lsl r3, r3, #0x6 - bl BG_LoadCharTilesData - ldr r0, [sp, #0xc] - bl FreeToHeap - add r0, r4, #0x0 - bl FreeToHeap - add sp, #0x14 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D300 -FUN_0200D300: ; 0x0200D300 - push {r4-r7, lr} - sub sp, #0x1c - str r0, [sp, #0x10] - add r5, r2, #0x0 - mov r0, #0xf - add r6, r1, #0x0 - add r7, r3, #0x0 - str r5, [sp, #0x0] - lsl r0, r0, #0x6 - str r0, [sp, #0x4] - mov r1, #0x0 - ldr r4, [sp, #0x38] - str r1, [sp, #0x8] - ldr r2, [sp, #0x10] - mov r0, #0x24 - add r3, r6, #0x0 - str r4, [sp, #0xc] - bl GfGfxLoader_LoadCharData - mov r0, #0x24 ; NARC_GRAPHIC_FIELD_BOARD - mov r1, #0x1 - add r2, r4, #0x0 - bl AllocAndReadWholeNarcMemberByIdPair - add r1, sp, #0x18 - str r0, [sp, #0x14] - bl NNS_G2dGetUnpackedPaletteData - add r2, sp, #0x20 - ldr r1, [sp, #0x18] - ldrb r2, [r2, #0x10] - lsl r3, r7, #0x15 - ldr r1, [r1, #0xc] - lsl r2, r2, #0x5 - add r1, r1, r2 - add r0, r6, #0x0 - mov r2, #0x20 - lsr r3, r3, #0x10 - bl BG_LoadPlttData - ldr r1, [sp, #0x14] - add r0, r4, #0x0 - bl FreeToHeapExplicit - add r0, sp, #0x20 - ldrb r3, [r0, #0x10] - cmp r3, #0x1 - bhi _0200D374 - ldrh r0, [r0, #0x14] - add r5, #0x1e - lsl r2, r5, #0x10 - str r0, [sp, #0x0] - ldr r0, [sp, #0x10] - add r1, r6, #0x0 - lsr r2, r2, #0x10 - str r4, [sp, #0x4] - bl FUN_0200D378 -_0200D374: - add sp, #0x1c - pop {r4-r7, pc} - - thumb_func_start FUN_0200D378 -FUN_0200D378: ; 0x0200D378 - push {r3-r5, lr} - sub sp, #0x10 - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r1, [sp, #0x20] - cmp r3, #0x0 - bne _0200D38C - add r1, #0x21 - lsl r0, r1, #0x10 - b _0200D390 -_0200D38C: - add r0, r1, #0x2 - lsl r0, r0, #0x10 -_0200D390: - lsr r1, r0, #0x10 - mov r0, #0x3 - str r2, [sp, #0x0] - lsl r0, r0, #0x8 - str r0, [sp, #0x4] - mov r0, #0x0 - str r0, [sp, #0x8] - ldr r0, [sp, #0x24] - add r2, r5, #0x0 - str r0, [sp, #0xc] - mov r0, #0x24 - add r3, r4, #0x0 - bl GfGfxLoader_LoadCharData - add sp, #0x10 - pop {r3-r5, pc} - - thumb_func_start FUN_0200D3B0 -FUN_0200D3B0: ; 0x0200D3B0 - push {r3-r7, lr} - sub sp, #0x40 - str r1, [sp, #0x14] - str r2, [sp, #0x18] - str r3, [sp, #0x1c] - ldr r2, [sp, #0x1c] - ldr r6, [sp, #0x5c] - sub r7, r2, #0x1 - ldr r2, [sp, #0x18] - ldr r5, [sp, #0x60] - str r2, [sp, #0x34] - sub r2, #0x9 - str r2, [sp, #0x34] - lsl r2, r7, #0x18 - lsr r2, r2, #0x18 - str r2, [sp, #0x0] - mov r2, #0x1 - str r2, [sp, #0x4] - str r2, [sp, #0x8] - ldr r3, [sp, #0x34] - str r5, [sp, #0xc] - add r2, sp, #0x48 - lsl r3, r3, #0x18 - ldrh r2, [r2, #0x1c] - lsr r3, r3, #0x18 - str r0, [sp, #0x10] - bl FillBgTilemapRect - ldr r0, [sp, #0x18] - str r0, [sp, #0x30] - sub r0, #0x8 - str r0, [sp, #0x30] - add r0, sp, #0x48 - ldrh r4, [r0, #0x1c] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x30] - str r5, [sp, #0xc] - add r2, r4, #0x1 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r0, sp, #0x48 - ldrb r0, [r0, #0x10] - add r2, r4, #0x2 - lsl r2, r2, #0x10 - str r0, [sp, #0x3c] - add r0, r0, #0x7 - str r0, [sp, #0x24] - ldr r0, [sp, #0x18] - lsr r2, r2, #0x10 - sub r0, r0, #0x7 - str r0, [sp, #0x20] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - ldr r3, [sp, #0x20] - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r5, [sp, #0xc] - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r2, r4, #0x3 - lsl r2, r2, #0x10 - ldr r1, [sp, #0x18] - ldr r0, [sp, #0x3c] - lsr r2, r2, #0x10 - add r0, r1, r0 - str r0, [sp, #0x38] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x38] - str r5, [sp, #0xc] - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x38] - add r2, r4, #0x4 - add r0, r0, #0x1 - str r0, [sp, #0x2c] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x2c] - str r5, [sp, #0xc] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x38] - add r0, r0, #0x2 - str r0, [sp, #0x28] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x28] - str r5, [sp, #0xc] - add r2, r4, #0x5 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r3, [sp, #0x34] - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - str r5, [sp, #0xc] - add r2, r4, #0x6 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r3, [sp, #0x30] - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - str r5, [sp, #0xc] - add r2, r4, #0x7 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - str r5, [sp, #0xc] - ldr r3, [sp, #0x18] - add r2, #0x8 - sub r3, r3, #0x1 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - ldr r3, [sp, #0x38] - str r5, [sp, #0xc] - add r2, #0x9 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - ldr r3, [sp, #0x2c] - str r5, [sp, #0xc] - add r2, #0xa - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x0 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r6, [sp, #0x8] - ldr r3, [sp, #0x28] - str r5, [sp, #0xc] - add r2, #0xb - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - add r2, r4, #0x0 - add r6, r0, r6 - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x34] - str r5, [sp, #0xc] - add r2, #0xc - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x30] - str r5, [sp, #0xc] - add r2, #0xd - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - add r2, r4, #0x0 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - ldr r3, [sp, #0x20] - str r5, [sp, #0xc] - add r2, #0xe - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x38] - str r5, [sp, #0xc] - add r2, #0xf - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r2, r4, #0x0 - ldr r3, [sp, #0x2c] - str r5, [sp, #0xc] - add r2, #0x10 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r6, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r3, [sp, #0x28] - str r5, [sp, #0xc] - add r4, #0x11 - lsl r2, r4, #0x10 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x10] - ldr r1, [sp, #0x14] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add sp, #0x40 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D678 -FUN_0200D678: ; 0x0200D678 - push {r3-r7, lr} - sub sp, #0x28 - str r1, [sp, #0x10] - add r7, r0, #0x0 - str r2, [sp, #0x14] - bl GetWindowBgId - str r0, [sp, #0x20] - add r0, r7, #0x0 - bl GetWindowX - sub r0, r0, #0x7 - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0x18] - add r0, r7, #0x0 - bl GetWindowY - str r0, [sp, #0x1c] - mov r0, #0x0 - str r0, [sp, #0x24] -_0200D6A2: - ldr r2, [sp, #0x24] - ldr r1, [sp, #0x1c] - ldr r0, [sp, #0x24] - add r3, r2, #0x0 - add r0, r1, r0 - mov r1, #0x6 - mul r3, r1 - ldr r1, [sp, #0x10] - lsl r0, r0, #0x18 - mov r4, #0x0 - add r5, r1, r3 - lsr r6, r0, #0x18 -_0200D6BA: - str r6, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - ldr r0, [sp, #0x14] - ldr r3, [sp, #0x18] - str r0, [sp, #0xc] - add r2, r4, r5 - add r3, r3, r4 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [r7, #0x0] - ldr r1, [sp, #0x20] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - add r0, r4, #0x1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - cmp r4, #0x6 - blo _0200D6BA - ldr r0, [sp, #0x24] - add r0, r0, #0x1 - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0x24] - cmp r0, #0x4 - blo _0200D6A2 - add sp, #0x28 - pop {r3-r7, pc} - - thumb_func_start FUN_0200D6F8 -FUN_0200D6F8: ; 0x0200D6F8 - push {r3-r7, lr} - sub sp, #0x28 - add r5, r0, #0x0 - str r1, [sp, #0x10] - add r4, r2, #0x0 - add r6, r3, #0x0 - bl GetWindowBgId - str r0, [sp, #0x14] - add r0, sp, #0x30 - ldrb r0, [r0, #0x10] - cmp r0, #0x1 - bhi _0200D756 - add r0, r5, #0x0 - bl GetWindowX - str r0, [sp, #0x18] - add r0, r5, #0x0 - bl GetWindowY - str r0, [sp, #0x1c] - add r0, r5, #0x0 - bl GetWindowWidth - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowHeight - str r7, [sp, #0x0] - str r0, [sp, #0x4] - str r6, [sp, #0x8] - str r4, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x14] - ldr r2, [sp, #0x18] - ldr r3, [sp, #0x1c] - bl FUN_0200D3B0 - add r1, r4, #0x0 - add r1, #0x1e - lsl r1, r1, #0x10 - add r0, r5, #0x0 - lsr r1, r1, #0x10 - add r2, r6, #0x0 - bl FUN_0200D678 - b _0200D788 -_0200D756: - add r0, r5, #0x0 - bl GetWindowX - str r0, [sp, #0x20] - add r0, r5, #0x0 - bl GetWindowY - str r0, [sp, #0x24] - add r0, r5, #0x0 - bl GetWindowWidth - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowHeight - str r7, [sp, #0x0] - str r0, [sp, #0x4] - str r6, [sp, #0x8] - str r4, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x14] - ldr r2, [sp, #0x20] - ldr r3, [sp, #0x24] - bl FUN_0200CDD8 -_0200D788: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - bne _0200D794 - add r0, r5, #0x0 - bl CopyWindowToVram -_0200D794: - add r0, r5, #0x0 - add r1, r4, #0x0 - bl FUN_0200D18C - add sp, #0x28 - pop {r3-r7, pc} - - thumb_func_start FUN_0200D7A0 -FUN_0200D7A0: ; 0x0200D7A0 - push {r3-r7, lr} - sub sp, #0x18 - add r5, r0, #0x0 - add r4, r1, #0x0 - str r2, [sp, #0x10] - bl GetWindowBgId - str r0, [sp, #0x14] - cmp r4, #0x1 - bhi _0200D7FE - add r0, r5, #0x0 - bl GetWindowX - add r4, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowY - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowWidth - add r6, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowHeight - sub r1, r7, #0x1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - add r0, r0, #0x2 - lsl r0, r0, #0x18 - sub r4, #0x9 - lsl r3, r4, #0x18 - add r6, #0xb - str r1, [sp, #0x0] - lsl r1, r6, #0x18 - lsr r1, r1, #0x18 - str r1, [sp, #0x4] - lsr r0, r0, #0x18 - str r0, [sp, #0x8] - mov r2, #0x0 - str r2, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x14] - lsr r3, r3, #0x18 - bl FillBgTilemapRect - b _0200D846 -_0200D7FE: - add r0, r5, #0x0 - bl GetWindowX - add r4, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowY - add r6, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowWidth - add r7, r0, #0x0 - add r0, r5, #0x0 - bl GetWindowHeight - sub r1, r6, #0x1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - str r1, [sp, #0x0] - add r1, r7, #0x4 - lsl r1, r1, #0x18 - add r0, r0, #0x2 - lsr r1, r1, #0x18 - lsl r0, r0, #0x18 - str r1, [sp, #0x4] - lsr r0, r0, #0x18 - sub r3, r4, #0x2 - lsl r3, r3, #0x18 - str r0, [sp, #0x8] - mov r2, #0x0 - str r2, [sp, #0xc] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x14] - lsr r3, r3, #0x18 - bl FillBgTilemapRect -_0200D846: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - bne _0200D852 - add r0, r5, #0x0 - bl ClearWindowTilemapAndCopyToVram -_0200D852: - add sp, #0x18 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200D858 -FUN_0200D858: ; 0x0200D858 - push {r4-r7, lr} - sub sp, #0x34 - str r0, [sp, #0x20] - ldr r0, [r0, #0x0] - str r1, [sp, #0x24] - bl BgConfig_GetHeapId - str r0, [sp, #0x28] - ldr r0, [sp, #0x20] - bl GetWindowBgId - bl BgGetCharPtr - add r5, r0, #0x0 - ldr r0, [sp, #0x28] - ldr r1, _0200D970 ; =0x0000048C - bl AllocFromHeap - ldr r1, [sp, #0x24] - add r4, r0, #0x0 - ldr r0, _0200D974 ; =0x00000404 - add r1, #0x12 - lsl r1, r1, #0x5 - add r0, r4, r0 - add r1, r5, r1 - mov r2, #0x80 - bl memcpy - ldr r0, [sp, #0x28] - mov r1, #0x80 - bl AllocFromHeap - ldr r1, [sp, #0x24] - mov r2, #0x20 - add r1, #0xa - lsl r1, r1, #0x5 - str r1, [sp, #0x2c] - add r1, r5, r1 - add r6, r0, #0x0 - bl memcpy - ldr r0, [sp, #0x24] - mov r2, #0x20 - add r0, #0xb - lsl r7, r0, #0x5 - add r0, r6, #0x0 - add r0, #0x20 - add r1, r5, r7 - bl memcpy - ldr r1, [sp, #0x2c] - add r0, r6, #0x0 - add r0, #0x40 - add r1, r5, r1 - mov r2, #0x20 - bl memcpy - add r0, r6, #0x0 - add r0, #0x60 - add r1, r5, r7 - mov r2, #0x20 - bl memcpy - mov r5, #0x0 - add r7, r4, #0x4 -_0200D8DA: - lsl r0, r5, #0x7 - add r0, r7, r0 - add r1, r6, #0x0 - mov r2, #0x80 - bl memcpy - add r0, r5, #0x1 - lsl r0, r0, #0x18 - lsr r5, r0, #0x18 - cmp r5, #0x8 - blo _0200D8DA - add r0, r6, #0x0 - bl FreeToHeap - ldr r0, [sp, #0x28] - mov r1, #0x17 - str r0, [sp, #0x0] - mov r0, #0x26 - mov r2, #0x0 - add r3, sp, #0x30 - bl GfGfxLoader_GetCharData - mov r2, #0x80 - add r5, r0, #0x0 - str r2, [sp, #0x0] - add r0, r4, #0x4 - str r0, [sp, #0x4] - mov r3, #0x10 - str r3, [sp, #0x8] - str r2, [sp, #0xc] - mov r1, #0x0 - str r1, [sp, #0x10] - str r1, [sp, #0x14] - str r3, [sp, #0x18] - str r2, [sp, #0x1c] - ldr r0, [sp, #0x30] - add r2, r1, #0x0 - ldr r0, [r0, #0x14] - bl FUN_0200D148 - add r0, r5, #0x0 - bl FreeToHeap - ldr r0, [sp, #0x20] - ldr r1, _0200D978 ; =0x00000484 - str r0, [r4, #0x0] - ldr r0, [sp, #0x24] - mov r2, #0x0 - strh r0, [r4, r1] - add r0, r1, #0x2 - strb r2, [r4, r0] - add r0, r1, #0x3 - ldrb r3, [r4, r0] - mov r0, #0x7f - bic r3, r0 - add r0, r1, #0x3 - strb r3, [r4, r0] - add r0, r1, #0x4 - ldrb r3, [r4, r0] - mov r0, #0x3 - bic r3, r0 - add r0, r1, #0x4 - strb r3, [r4, r0] - ldr r0, _0200D97C ; =FUN_0200DB7C - add r1, r4, #0x0 - bl FUN_0200CA60 - add r0, r4, #0x0 - mov r1, #0x1 - bl FUN_0200D980 - add r0, r4, #0x0 - add sp, #0x34 - pop {r4-r7, pc} - nop -_0200D970: .word 0x0000048C -_0200D974: .word 0x00000404 -_0200D978: .word 0x00000484 -_0200D97C: .word FUN_0200DB7C - - thumb_func_start FUN_0200D980 -FUN_0200D980: ; 0x0200D980 - push {r4-r7, lr} - sub sp, #0x24 - add r5, r0, #0x0 - ldr r0, [r5, #0x0] - add r6, r1, #0x0 - bl GetWindowBgId - add r4, r0, #0x0 - ldr r0, [r5, #0x0] - bl GetWindowX - str r0, [sp, #0x18] - ldr r0, [r5, #0x0] - bl GetWindowY - str r0, [sp, #0x1c] - ldr r0, [r5, #0x0] - bl GetWindowWidth - str r0, [sp, #0x20] - cmp r6, #0x2 - bne _0200DA8A - ldr r2, _0200DB78 ; =0x00000484 - add r1, r4, #0x0 - ldrh r0, [r5, r2] - sub r2, #0x80 - add r2, r5, r2 - add r0, #0x12 - str r0, [sp, #0x0] - ldr r0, [r5, #0x0] - mov r3, #0x80 - ldr r0, [r0, #0x0] - bl BG_LoadCharTilesData - ldr r0, [sp, #0x1c] - ldr r1, [sp, #0x18] - add r7, r0, #0x2 - ldr r0, [sp, #0x20] - ldr r2, _0200DB78 ; =0x00000484 - add r6, r1, r0 - add r0, r6, #0x1 - str r0, [sp, #0x14] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldrh r2, [r5, r2] - ldr r0, [r5, #0x0] - ldr r3, [sp, #0x14] - add r2, #0xa - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - add r6, r6, #0x2 - lsl r3, r6, #0x18 - add r2, #0xb - lsl r2, r2, #0x10 - ldr r0, [r0, #0x0] - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r3, [sp, #0x14] - add r7, r0, #0x3 - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - add r2, #0xa - lsl r2, r2, #0x10 - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - lsl r3, r6, #0x18 - ldr r0, [r0, #0x0] - add r2, #0xb - lsl r2, r2, #0x10 - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [r5, #0x0] - add r1, r4, #0x0 - ldr r0, [r0, #0x0] - bl BgCommitTilemapBufferToVram - add sp, #0x24 - pop {r4-r7, pc} -_0200DA8A: - ldr r3, _0200DB78 ; =0x00000484 - add r2, r5, #0x4 - ldrh r0, [r5, r3] - add r3, r3, #0x3 - add r1, r4, #0x0 - add r0, #0x12 - str r0, [sp, #0x0] - ldrb r3, [r5, r3] - ldr r0, [r5, #0x0] - lsl r3, r3, #0x19 - lsr r3, r3, #0x19 - lsl r3, r3, #0x7 - add r2, r2, r3 - ldr r0, [r0, #0x0] - mov r3, #0x80 - bl BG_LoadCharTilesData - cmp r6, #0x0 - beq _0200DB72 - ldr r0, [sp, #0x1c] - ldr r1, [sp, #0x18] - add r7, r0, #0x2 - ldr r0, [sp, #0x20] - ldr r2, _0200DB78 ; =0x00000484 - add r6, r1, r0 - add r0, r6, #0x1 - str r0, [sp, #0x10] - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldrh r2, [r5, r2] - ldr r0, [r5, #0x0] - ldr r3, [sp, #0x10] - add r2, #0x12 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - add r6, r6, #0x2 - lsl r3, r6, #0x18 - add r2, #0x13 - lsl r2, r2, #0x10 - ldr r0, [r0, #0x0] - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r3, [sp, #0x10] - add r7, r0, #0x3 - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - add r2, #0x14 - lsl r2, r2, #0x10 - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r2, _0200DB78 ; =0x00000484 - ldr r0, [r5, #0x0] - ldrh r2, [r5, r2] - lsl r3, r6, #0x18 - ldr r0, [r0, #0x0] - add r2, #0x15 - lsl r2, r2, #0x10 - add r1, r4, #0x0 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [r5, #0x0] - add r1, r4, #0x0 - ldr r0, [r0, #0x0] - bl BgCommitTilemapBufferToVram -_0200DB72: - add sp, #0x24 - pop {r4-r7, pc} - nop -_0200DB78: .word 0x00000484 - - thumb_func_start FUN_0200DB7C -FUN_0200DB7C: ; 0x0200DB7C - push {r3-r5, lr} - add r4, r0, #0x0 - ldr r0, _0200DBE4 ; =0x00000488 - ldrb r2, [r1, r0] - lsl r2, r2, #0x1e - lsr r2, r2, #0x1e - beq _0200DB9E - cmp r2, #0x1 - bne _0200DB96 - add r0, r1, #0x0 - mov r1, #0x2 - bl FUN_0200D980 -_0200DB96: - add r0, r4, #0x0 - bl FUN_0200CAB4 - pop {r3-r5, pc} -_0200DB9E: - sub r2, r0, #0x2 - ldrb r2, [r1, r2] - add r3, r2, #0x1 - sub r2, r0, #0x2 - strb r3, [r1, r2] - ldrb r2, [r1, r2] - cmp r2, #0x10 - bne _0200DBE0 - mov r3, #0x0 - sub r2, r0, #0x2 - strb r3, [r1, r2] - sub r2, r0, #0x1 - ldrb r2, [r1, r2] - mov r4, #0x7f - bic r2, r4 - sub r4, r0, #0x1 - ldrb r4, [r1, r4] - sub r0, r0, #0x1 - lsl r4, r4, #0x19 - lsr r4, r4, #0x19 - add r5, r4, #0x1 - mov r4, #0x7 - and r4, r5 - lsl r4, r4, #0x18 - lsr r5, r4, #0x18 - mov r4, #0x7f - and r4, r5 - orr r2, r4 - strb r2, [r1, r0] - add r0, r1, #0x0 - add r1, r3, #0x0 - bl FUN_0200D980 -_0200DBE0: - pop {r3-r5, pc} - nop -_0200DBE4: .word 0x00000488 - - thumb_func_start FUN_0200DBE8 -FUN_0200DBE8: ; 0x0200DBE8 - push {r4, lr} - add r4, r0, #0x0 - add r0, r1, #0x0 - bl FreeToHeap - add r0, r4, #0x0 - bl FUN_0200CAB4 - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200DBFC -FUN_0200DBFC: ; 0x0200DBFC - push {r4, lr} - add r4, r0, #0x0 - ldr r0, _0200DC1C ; =FUN_0200DBE8 - add r1, r4, #0x0 - mov r2, #0x0 - bl FUN_0200CA98 - ldr r1, _0200DC20 ; =0x00000488 - mov r0, #0x3 - ldrb r2, [r4, r1] - bic r2, r0 - mov r0, #0x1 - orr r0, r2 - strb r0, [r4, r1] - pop {r4, pc} - nop -_0200DC1C: .word FUN_0200DBE8 -_0200DC20: .word 0x00000488 - - thumb_func_start FUN_0200DC24 -FUN_0200DC24: ; 0x0200DC24 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, _0200DC44 ; =FUN_0200DBE8 - add r1, r4, #0x0 - mov r2, #0x0 - bl FUN_0200CA98 - ldr r1, _0200DC48 ; =0x00000488 - mov r0, #0x3 - ldrb r2, [r4, r1] - bic r2, r0 - mov r0, #0x2 - orr r0, r2 - strb r0, [r4, r1] - pop {r4, pc} - nop -_0200DC44: .word FUN_0200DBE8 -_0200DC48: .word 0x00000488 - - thumb_func_start FUN_0200DC4C -FUN_0200DC4C: ; 0x0200DC4C - push {r4-r7, lr} - sub sp, #0xc - str r2, [sp, #0x4] - ldr r5, [sp, #0x30] - str r3, [sp, #0x8] - add r6, r0, #0x0 - add r7, r1, #0x0 - str r5, [sp, #0x0] - bl FUN_0200DD70 - add r4, r0, #0x0 - add r1, r5, #0x0 - bl FUN_0200DDAC - add r0, r4, #0x0 - bl FUN_0200DDD8 - ldr r1, [sp, #0x4] - ldr r2, [sp, #0x8] - add r0, r4, #0x0 - bl FUN_0200DE30 - add r2, sp, #0x10 - ldrh r1, [r2, #0x18] - ldrb r2, [r2, #0x1c] - add r0, r4, #0x0 - bl FUN_0200DE80 - add r2, sp, #0x10 - ldrb r1, [r2, #0x10] - ldrh r2, [r2, #0x14] - add r0, r4, #0x0 - bl FUN_0200DFD8 - add r0, r6, #0x0 - add r1, r7, #0x0 - bl BgCommitTilemapBufferToVram - ldr r0, _0200DCA0 ; =0x0000016F - add r0, r4, r0 - add sp, #0xc - pop {r4-r7, pc} - .balign 4 -_0200DCA0: .word 0x0000016F - - thumb_func_start FUN_0200DCA4 -FUN_0200DCA4: ; 0x0200DCA4 - push {r4-r7, lr} - sub sp, #0xc - str r2, [sp, #0x4] - ldr r5, [sp, #0x2c] - str r3, [sp, #0x8] - add r6, r0, #0x0 - add r7, r1, #0x0 - str r5, [sp, #0x0] - bl FUN_0200DD70 - add r4, r0, #0x0 - add r1, r5, #0x0 - bl FUN_0200DDAC - add r0, r4, #0x0 - bl FUN_0200DDD8 - ldr r1, [sp, #0x4] - ldr r2, [sp, #0x8] - add r0, r4, #0x0 - bl FUN_0200DE30 - ldr r1, [sp, #0x28] - add r0, r4, #0x0 - bl FUN_0200DEC0 - add r2, sp, #0x10 - ldrb r1, [r2, #0x10] - ldrh r2, [r2, #0x14] - add r0, r4, #0x0 - bl FUN_0200DFD8 - add r0, r6, #0x0 - add r1, r7, #0x0 - bl BgCommitTilemapBufferToVram - ldr r0, _0200DCF4 ; =0x0000016F - add r0, r4, r0 - add sp, #0xc - pop {r4-r7, pc} - .balign 4 -_0200DCF4: .word 0x0000016F - - thumb_func_start FUN_0200DCF8 -FUN_0200DCF8: ; 0x0200DCF8 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0200DD6C ; =0x0000016F - add r4, r1, #0x0 - ldrb r1, [r4, r0] - cmp r1, #0x1 - beq _0200DD10 - cmp r1, #0x2 - beq _0200DD2E - cmp r1, #0x3 - beq _0200DD40 - b _0200DD54 -_0200DD10: - add r0, r4, #0x0 - bl FUN_0200E188 - mov r0, #0x59 - lsl r0, r0, #0x2 - ldr r0, [r4, r0] - bl FUN_0200C3DC - add r0, r4, #0x0 - bl MOD05_021D99F8 - add r0, r5, #0x0 - bl FUN_0200621C - pop {r3-r5, pc} -_0200DD2E: - mov r1, #0x3 - strb r1, [r4, r0] - sub r0, #0xb - ldr r0, [r4, r0] - mov r1, #0x1 - ldr r0, [r0, #0x0] - bl FUN_02020130 - b _0200DD54 -_0200DD40: - sub r0, #0xb - ldr r0, [r4, r0] - ldr r0, [r0, #0x0] - bl FUN_0202022C - cmp r0, #0x6 - bne _0200DD54 - ldr r0, _0200DD6C ; =0x0000016F - mov r1, #0x0 - strb r1, [r4, r0] -_0200DD54: - mov r0, #0x59 - lsl r0, r0, #0x2 - ldr r0, [r4, r0] - mov r1, #0x1 - ldr r0, [r0, #0x0] - lsl r1, r1, #0xc - bl FUN_020201E4 - ldr r0, [r4, #0x0] - bl FUN_0201FDEC - pop {r3-r5, pc} - .balign 4 -_0200DD6C: .word 0x0000016F - - thumb_func_start FUN_0200DD70 -FUN_0200DD70: ; 0x0200DD70 - push {r3-r7, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - add r7, r3, #0x0 - mov r1, #0x17 - add r6, r2, #0x0 - ldr r0, _0200DDA4 ; =FUN_0200DCF8 - ldr r3, [sp, #0x18] - lsl r1, r1, #0x4 - mov r2, #0x0 - bl FUN_020061E8 - bl FUN_0201B6C8 - ldr r1, _0200DDA8 ; =0x0000016F - mov r2, #0x0 - strb r2, [r0, r1] - sub r2, r1, #0x7 - str r5, [r0, r2] - sub r2, r1, #0x3 - strb r4, [r0, r2] - sub r2, r1, #0x2 - strb r6, [r0, r2] - sub r1, r1, #0x1 - strb r7, [r0, r1] - pop {r3-r7, pc} - .balign 4 -_0200DDA4: .word FUN_0200DCF8 -_0200DDA8: .word 0x0000016F - - thumb_func_start FUN_0200DDAC -FUN_0200DDAC: ; 0x0200DDAC - push {r4-r6, lr} - sub sp, #0x18 - ldr r5, _0200DDD4 ; =UNK_020ECEA8 - add r4, sp, #0x0 - add r6, r0, #0x0 - add r3, r1, #0x0 - add r2, r4, #0x0 - ldmia r5!, {r0-r1} - stmia r4!, {r0-r1} - ldmia r5!, {r0-r1} - stmia r4!, {r0-r1} - ldmia r5!, {r0-r1} - stmia r4!, {r0-r1} - add r1, r2, #0x0 - add r0, r6, #0x0 - mov r2, #0x1 - bl MOD05_021D959C - add sp, #0x18 - pop {r4-r6, pc} - .balign 4 -_0200DDD4: .word UNK_020ECEA8 - - thumb_func_start FUN_0200DDD8 -FUN_0200DDD8: ; 0x0200DDD8 - push {r3-r4, lr} - sub sp, #0xc - mov r1, #0x1 - str r1, [sp, #0x0] - str r1, [sp, #0x4] - ldr r1, _0200DE2C ; =0x00015CD5 - mov r2, #0x31 - str r1, [sp, #0x8] - mov r1, #0x26 - mov r3, #0x0 - add r4, r0, #0x0 - bl MOD05_021D967C - ldr r0, _0200DE2C ; =0x00015CD5 - mov r1, #0x26 - str r0, [sp, #0x0] - add r0, r4, #0x0 - mov r2, #0x2f - mov r3, #0x0 - bl MOD05_021D96F4 - ldr r0, _0200DE2C ; =0x00015CD5 - mov r1, #0x26 - str r0, [sp, #0x0] - add r0, r4, #0x0 - mov r2, #0x2e - mov r3, #0x0 - bl MOD05_021D9708 - mov r0, #0x1 - str r0, [sp, #0x0] - ldr r0, _0200DE2C ; =0x00015CD5 - mov r1, #0x26 - str r0, [sp, #0x4] - add r0, r4, #0x0 - mov r2, #0x30 - mov r3, #0x0 - bl MOD05_021D971C - add sp, #0xc - pop {r3-r4, pc} - nop -_0200DE2C: .word 0x00015CD5 - - thumb_func_start FUN_0200DE30 -FUN_0200DE30: ; 0x0200DE30 - push {r4-r7, lr} - sub sp, #0x34 - ldr r5, _0200DE7C ; =UNK_020ECEC0 - add r6, r2, #0x0 - add r4, r0, #0x0 - add r7, r1, #0x0 - add r3, sp, #0x0 - mov r2, #0x6 -_0200DE40: - ldmia r5!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _0200DE40 - ldr r0, [r5, #0x0] - str r0, [r3, #0x0] - add r0, r7, #0x5 - lsl r1, r0, #0x3 - add r0, sp, #0x0 - strh r1, [r0, #0x0] - add r1, r6, #0x5 - lsl r1, r1, #0x3 - strh r1, [r0, #0x2] - add r0, r4, #0x0 - add r1, sp, #0x0 - bl MOD05_021D9820 - mov r1, #0x59 - lsl r1, r1, #0x2 - str r0, [r4, r1] - ldr r0, [r4, #0x0] - bl FUN_0201FDEC - mov r0, #0x10 - mov r1, #0x1 - bl GX_EngineBToggleLayers - add sp, #0x34 - pop {r4-r7, pc} - nop -_0200DE7C: .word UNK_020ECEC0 - - thumb_func_start FUN_0200DE80 -FUN_0200DE80: ; 0x0200DE80 - push {r4-r7, lr} - sub sp, #0x1c - add r5, r0, #0x0 - ldr r0, _0200DEBC ; =0x00000162 - add r4, r1, #0x0 - ldrh r0, [r5, r0] - add r6, r2, #0x0 - bl FUN_02006D98 - add r7, r0, #0x0 - mov r0, #0x0 - str r0, [sp, #0x0] - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r0, sp, #0xc - add r1, r4, #0x0 - add r2, r6, #0x0 - mov r3, #0x2 - bl FUN_02068C00 - add r0, r5, #0x0 - add r1, sp, #0xc - bl FUN_0200DEF4 - add r0, r7, #0x0 - bl FUN_020072E8 - add sp, #0x1c - pop {r4-r7, pc} - nop -_0200DEBC: .word 0x00000162 - - thumb_func_start FUN_0200DEC0 -FUN_0200DEC0: ; 0x0200DEC0 - push {r4-r6, lr} - sub sp, #0x10 - add r5, r0, #0x0 - ldr r0, _0200DEF0 ; =0x00000162 - add r4, r1, #0x0 - ldrh r0, [r5, r0] - bl FUN_02006D98 - add r6, r0, #0x0 - add r0, sp, #0x0 - add r1, r4, #0x0 - mov r2, #0x2 - bl FUN_02068B68 - add r0, r5, #0x0 - add r1, sp, #0x0 - bl FUN_0200DEF4 - add r0, r6, #0x0 - bl FUN_020072E8 - add sp, #0x10 - pop {r4-r6, pc} - nop -_0200DEF0: .word 0x00000162 - - thumb_func_start FUN_0200DEF4 -FUN_0200DEF4: ; 0x0200DEF4 - push {r3-r7, lr} - sub sp, #0x28 - add r5, r0, #0x0 - ldr r0, _0200DFC8 ; =0x00000162 - add r6, r1, #0x0 - mov r1, #0x19 - ldrh r0, [r5, r0] - lsl r1, r1, #0x8 - bl AllocFromHeap - add r2, sp, #0x18 - ldr r3, _0200DFCC ; =UNK_020ECE98 - add r4, r0, #0x0 - add r7, r2, #0x0 - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - str r4, [sp, #0x0] - ldr r2, _0200DFC8 ; =0x00000162 - ldrh r0, [r6, #0x0] - ldrh r1, [r6, #0x2] - ldrh r2, [r5, r2] - add r3, r7, #0x0 - bl FUN_02012400 - ldr r3, _0200DFD0 ; =UNK_020ECE88 - add r2, sp, #0x8 - add r7, r2, #0x0 - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - mov r0, #0x32 - lsl r0, r0, #0x6 - add r0, r4, r0 - str r0, [sp, #0x0] - ldr r2, _0200DFC8 ; =0x00000162 - ldrh r0, [r6, #0x0] - ldrh r1, [r6, #0x2] - ldrh r2, [r5, r2] - add r3, r7, #0x0 - bl FUN_02012400 - mov r0, #0x13 - lsl r0, r0, #0x4 - ldr r0, [r5, r0] - ldr r1, _0200DFD4 ; =0x00015CD5 - bl FUN_020094F0 - bl FUN_02009C5C - mov r1, #0x1 - str r0, [sp, #0x4] - bl NNS_G2dGetImageLocation - mov r1, #0x19 - add r7, r0, #0x0 - add r0, r4, #0x0 - lsl r1, r1, #0x8 - bl DC_FlushRange - mov r2, #0x19 - add r0, r4, #0x0 - add r1, r7, #0x0 - lsl r2, r2, #0x8 - bl GX_LoadOBJ - add r0, r4, #0x0 - bl FreeToHeap - ldr r2, _0200DFC8 ; =0x00000162 - ldrh r0, [r6, #0x0] - ldrh r1, [r6, #0x4] - ldrh r2, [r5, r2] - bl FUN_02012470 - add r4, r0, #0x0 - mov r0, #0x4d - lsl r0, r0, #0x2 - ldr r0, [r5, r0] - ldr r1, _0200DFD4 ; =0x00015CD5 - bl FUN_020094F0 - ldr r1, [sp, #0x4] - bl FUN_02009E54 - mov r1, #0x1 - bl NNS_G2dGetImagePaletteLocation - add r5, r0, #0x0 - add r0, r4, #0x0 - mov r1, #0x20 - bl DC_FlushRange - add r0, r4, #0x0 - add r1, r5, #0x0 - mov r2, #0x20 - bl GX_LoadOBJPltt - add r0, r4, #0x0 - bl FreeToHeap - add sp, #0x28 - pop {r3-r7, pc} - nop -_0200DFC8: .word 0x00000162 -_0200DFCC: .word UNK_020ECE98 -_0200DFD0: .word UNK_020ECE88 -_0200DFD4: .word 0x00015CD5 - - thumb_func_start FUN_0200DFD8 -FUN_0200DFD8: ; 0x0200DFD8 - push {r4-r6, lr} - sub sp, #0x10 - ldr r3, _0200E184 ; =0x0000016E - add r5, r0, #0x0 - ldrb r0, [r5, r3] - add r4, r1, #0x0 - sub r1, r3, #0x2 - sub r0, r0, #0x1 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - sub r3, r3, #0x1 - lsl r3, r3, #0x18 - lsr r3, r3, #0x18 - add r6, r2, #0x0 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x1 - ldrb r0, [r5, r3] - sub r1, r3, #0x2 - lsl r2, r2, #0x10 - sub r0, r0, #0x1 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0xa - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r1, [r5, r1] - ldrb r3, [r5, r3] - ldr r0, [r5, r0] - lsr r2, r2, #0x10 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x2 - ldrb r0, [r5, r3] - lsl r2, r2, #0x10 - sub r1, r3, #0x2 - sub r0, r0, #0x1 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - add r3, #0xa - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x4 - ldrb r0, [r5, r3] - lsl r2, r2, #0x10 - sub r1, r3, #0x2 - str r0, [sp, #0x0] - mov r0, #0xa - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r1, [r5, r1] - ldrb r3, [r5, r3] - ldr r0, [r5, r0] - lsr r2, r2, #0x10 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x3 - ldrb r0, [r5, r3] - lsl r2, r2, #0x10 - sub r1, r3, #0x2 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - mov r0, #0xa - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - sub r3, r3, #0x1 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x5 - ldrb r0, [r5, r3] - lsl r2, r2, #0x10 - sub r1, r3, #0x2 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - mov r0, #0xa - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - add r3, #0xa - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x6 - ldrb r0, [r5, r3] - lsl r2, r2, #0x10 - sub r1, r3, #0x2 - add r0, #0xa - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - sub r3, r3, #0x1 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r2, r6, #0x7 - ldrb r0, [r5, r3] - sub r1, r3, #0x2 - lsl r2, r2, #0x10 - add r0, #0xa - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0xa - str r0, [sp, #0x4] - mov r0, #0x1 - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r1, [r5, r1] - ldrb r3, [r5, r3] - ldr r0, [r5, r0] - lsr r2, r2, #0x10 - bl FillBgTilemapRect - ldr r3, _0200E184 ; =0x0000016E - add r6, #0x8 - ldrb r0, [r5, r3] - lsl r2, r6, #0x10 - sub r1, r3, #0x2 - add r0, #0xa - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r4, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r5, r3] - ldrb r1, [r5, r1] - ldr r0, [r5, r0] - add r3, #0xa - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - mov r1, #0x5a - lsl r1, r1, #0x2 - ldr r0, [r5, r1] - add r1, r1, #0x4 - ldrb r1, [r5, r1] - bl ScheduleBgTilemapBufferTransfer - add sp, #0x10 - pop {r4-r6, pc} - nop -_0200E184: .word 0x0000016E - - thumb_func_start FUN_0200E188 -FUN_0200E188: ; 0x0200E188 - push {r4, lr} - sub sp, #0x10 - ldr r3, _0200E1CC ; =0x0000016E - add r4, r0, #0x0 - ldrb r0, [r4, r3] - mov r2, #0x0 - sub r1, r3, #0x2 - sub r0, r0, #0x1 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0xc - str r0, [sp, #0x4] - str r0, [sp, #0x8] - str r2, [sp, #0xc] - sub r0, r3, #0x6 - sub r3, r3, #0x1 - ldrb r3, [r4, r3] - ldrb r1, [r4, r1] - ldr r0, [r4, r0] - sub r3, r3, #0x1 - lsl r3, r3, #0x18 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - mov r1, #0x5a - lsl r1, r1, #0x2 - ldr r0, [r4, r1] - add r1, r1, #0x4 - ldrb r1, [r4, r1] - bl ScheduleBgTilemapBufferTransfer - add sp, #0x10 - pop {r4, pc} - .balign 4 -_0200E1CC: .word 0x0000016E diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 94c65983..d0bddd04 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -550,7 +550,7 @@ _02035440: bl FUN_02035718 add r0, r4, #0x0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0x0 bl RemoveWindow add r0, r6, #0x0 @@ -630,7 +630,7 @@ FUN_0203549C: ; 0x0203549C add r0, r4, #0x0 mov r1, #0x1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 ldr r2, _02035660 ; =0x00000143 mov r0, #0x0 mov r1, #0x1a @@ -962,7 +962,7 @@ _0203576C: add r0, #0x10 mov r1, #0x1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0x0 add r0, #0x10 mov r1, #0xf @@ -1090,7 +1090,7 @@ _020358CE: add r0, r5, #0x0 add r0, #0x10 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r5, #0x10 add r0, r5, #0x0 bl RemoveWindow @@ -2654,7 +2654,7 @@ FUN_020365BC: ; 0x020365BC bl FUN_02035718 add r0, r4, #0x0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] bl ScheduleBgTilemapBufferTransfer @@ -2924,7 +2924,7 @@ FUN_020367E8: ; 0x020367E8 bl FUN_02035718 add r0, r4, #0x0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] bl ScheduleBgTilemapBufferTransfer diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 74cfef32..55ee967c 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -218,7 +218,7 @@ _020482B2: add r0, r4, #0x0 add r0, #0xc mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r0, #0xc bl RemoveWindow diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 54d87433..6c2c53b9 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -2061,7 +2061,7 @@ _0204992E: add r0, r4, #0x0 add r0, #0x24 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r0, #0x24 bl RemoveWindow @@ -2072,7 +2072,7 @@ _02049946: add r0, r4, #0x0 add r0, #0x24 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r0, #0x24 bl RemoveWindow diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index ae7380b7..e7a0de7c 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1180,7 +1180,7 @@ _02051798: add r0, r4, #0x0 add r0, #0x14 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x0 ldr r2, [r4, #0x8] add r1, r0, #0x0 @@ -1245,7 +1245,7 @@ FUN_02051810: ; 0x02051810 add r0, r5, #0x0 add r0, #0x14 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 add r0, #0x14 bl ClearWindowTilemapAndCopyToVram @@ -1782,7 +1782,7 @@ _02051C34: mov r1, #0x0 mov r2, #0x1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r1, r5, #0x0 ldr r0, [sp, #0x14] add r1, #0x81 @@ -1891,7 +1891,7 @@ _02051D0A: mov r1, #0x0 mov r2, #0x1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add sp, #0x18 pop {r3-r7, pc} .balign 4 @@ -2006,12 +2006,12 @@ _02051E20: .word 0x000005DC thumb_func_start FUN_02051E24 FUN_02051E24: ; 0x02051E24 - ldr r3, _02051E2C ; =FUN_0200CCF8 + ldr r3, _02051E2C ; =ClearFrameAndWindow1 ldr r0, [r0, #0x7c] mov r1, #0x1 bx r3 .balign 4 -_02051E2C: .word FUN_0200CCF8 +_02051E2C: .word ClearFrameAndWindow1 thumb_func_start FUN_02051E30 FUN_02051E30: ; 0x02051E30 @@ -2202,7 +2202,7 @@ _02051F7C: add r0, r4, #0x0 add r0, #0x8 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r0, #0x8 bl RemoveWindow diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index ccff7b32..43f1137e 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1462,7 +1462,7 @@ _0205D95C: beq _0205D9A0 add r0, r4, #0x0 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldrh r0, [r4, #0x16] add r0, r0, #0x1 strh r0, [r4, #0x16] diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 2813b999..f09d524b 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1188,7 +1188,7 @@ FUN_02062EC4: ; 0x02062EC4 add r4, r0, #0x0 add r0, #0xe4 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r0, #0xe4 bl ClearWindowTilemapAndCopyToVram @@ -1464,13 +1464,13 @@ _02063094: add r0, #0xd4 mov r1, #0x0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r5, #0x0 ldr r2, _02063170 ; =0x000003E2 add r0, #0xe4 mov r1, #0x1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0x0 add r0, #0xe4 mov r1, #0xff @@ -1526,7 +1526,7 @@ FUN_02063178: ; 0x02063178 add r0, r4, #0x0 add r0, #0xd4 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0x0 add r0, #0xd4 bl RemoveWindow @@ -1872,7 +1872,7 @@ FUN_02063430: ; 0x02063430 add r0, #0xd4 mov r1, #0x1 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add r0, r4, #0x0 mov r1, #0x0 bl FUN_020632A4 @@ -1933,7 +1933,7 @@ FUN_020634DC: ; 0x020634DC add r0, r4, #0x0 add r0, #0xd4 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0x0 add r0, #0xd4 bl RemoveWindow diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 8fa3df67..1094df5d 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1119,7 +1119,7 @@ _02065C64: ldr r2, _02065CF4 ; =0x000003D9 mov r1, #0x0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r1, #0x0 str r1, [sp, #0x0] mov r2, #0x65 @@ -1139,7 +1139,7 @@ _02065C64: add r0, r5, r0 mov r1, #0x0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x17 lsl r0, r0, #0x4 ldr r0, [r5, r0] @@ -1371,7 +1371,7 @@ _02065E14: ldr r2, _02065EDC ; =0x000003D9 mov r1, #0x0 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x17 lsl r0, r0, #0x4 ldr r0, [r5, r0] @@ -1431,7 +1431,7 @@ FUN_02065EF8: ; 0x02065EF8 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x65 lsl r0, r0, #0x2 add r0, r4, r0 @@ -1444,7 +1444,7 @@ FUN_02065EF8: ; 0x02065EF8 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 @@ -1488,7 +1488,7 @@ FUN_02065F8C: ; 0x02065F8C lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x16 lsl r0, r0, #0x4 add r1, sp, #0x0 @@ -2055,7 +2055,7 @@ FUN_02066404: ; 0x02066404 add r0, r5, r0 mov r1, #0x1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _02066426: mov r1, #0xd8 str r1, [sp, #0x0] @@ -2147,7 +2147,7 @@ FUN_020664D8: ; 0x020664D8 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 90e19c61..345ecae1 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -152,7 +152,7 @@ FUN_0206C700: ; 0x0206C700 mov r1, #0x0 mov r2, #0x1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0x0 bl FUN_02006D98 str r0, [r4, #0x18] @@ -1440,7 +1440,7 @@ _0206D2EE: mov r1, #0x0 mov r2, #0x1 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 ldr r0, [r4, #0x1c] mov r1, #0x6 mov r2, #0x0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index c504af1a..07679fac 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -765,12 +765,12 @@ _0206F914: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 @@ -3665,7 +3665,7 @@ FUN_020710C4: ; 0x020710C4 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0xc mov r1, #0x8 bl AllocFromHeap @@ -4734,7 +4734,7 @@ _020718EC: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 bl FUN_02073DB4 ldr r0, _02071940 ; =0x000005A4 @@ -4992,7 +4992,7 @@ _02071ADE: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02071C28 ; =0x000005C8 mov r1, #0x0 ldr r0, [r4, r0] @@ -5112,7 +5112,7 @@ _02071BE0: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _02071C28 ; =0x000005C8 mov r1, #0x0 ldr r0, [r4, r0] @@ -5642,7 +5642,7 @@ _02072054: mov r1, #0x1 mov r2, #0xa mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, r7 mov r1, #0xf bl FillWindowPixelBuffer @@ -5936,7 +5936,7 @@ FUN_020722B8: ; 0x020722B8 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 @@ -6061,7 +6061,7 @@ _020723D6: mov r1, #0x1 mov r2, #0xa mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #0x89 lsl r0, r0, #0x2 add r0, r5, r0 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 92121142..521570bf 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -540,7 +540,7 @@ _0207291E: add r0, r5, r0 add r2, r1, #0x0 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xc str r0, [sp, #0x0] mov r0, #0x2 @@ -1559,7 +1559,7 @@ FUN_02073160: ; 0x02073160 mov r1, #0x1 mov r2, #0xa mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _0207317A: add r0, r4, #0x0 mov r1, #0xf @@ -1630,7 +1630,7 @@ FUN_020731E8: ; 0x020731E8 mov r1, #0x1 mov r2, #0xa mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _02073202: add r0, r5, r6 mov r1, #0xf @@ -2041,7 +2041,7 @@ FUN_020734C0: ; 0x020734C0 add r0, r5, r0 add r2, r1, #0x0 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r5, r0 @@ -2236,7 +2236,7 @@ FUN_020736F4: ; 0x020736F4 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r4, r0 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 8a959bef..f3d54fee 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -35,7 +35,7 @@ FUN_02073DB4: ; 0x02073DB4 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r4, r0 @@ -124,7 +124,7 @@ FUN_02073DF4: ; 0x02073DF4 strb r6, [r2, #0xb] add r2, r1, #0x0 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xc str r0, [sp, #0x0] mov r0, #0x2 @@ -179,7 +179,7 @@ FUN_02073EEC: ; 0x02073EEC add r4, r1, #0x0 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _02074044 ; =0x000006FC mov r1, #0x0 ldr r0, [r5, r0] @@ -311,7 +311,7 @@ _02074018: mov r1, #0x1 mov r2, #0xa mov r3, #0xf - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #0x89 lsl r0, r0, #0x2 add r0, r5, r0 @@ -349,7 +349,7 @@ FUN_0207405C: ; 0x0207405C lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 @@ -436,7 +436,7 @@ FUN_020740AC: ; 0x020740AC strb r6, [r2, #0xb] add r2, r1, #0x0 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xc str r0, [sp, #0x0] mov r0, #0x2 @@ -490,7 +490,7 @@ FUN_020741A4: ; 0x020741A4 add r4, r1, #0x0 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _020741EC ; =0x000006FC mov r1, #0x0 ldr r0, [r5, r0] @@ -679,7 +679,7 @@ FUN_02074340: ; 0x02074340 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 @@ -706,7 +706,7 @@ FUN_0207436C: ; 0x0207436C lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 @@ -810,7 +810,7 @@ FUN_02074454: ; 0x02074454 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 @@ -889,7 +889,7 @@ FUN_02074480: ; 0x02074480 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 bl FUN_02073DB4 add r0, r5, #0x0 @@ -2049,7 +2049,7 @@ FUN_02074E74: ; 0x02074E74 add r6, r1, #0x0 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 bl FUN_02073DB4 ldr r0, _02074F5C ; =0x000005A4 @@ -2177,7 +2177,7 @@ FUN_02074F6C: ; 0x02074F6C lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x22 mov r2, #0x1 @@ -2288,7 +2288,7 @@ _02075046: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 bl FUN_02073DB4 add r0, r5, #0x0 @@ -2368,7 +2368,7 @@ FUN_020750F8: ; 0x020750F8 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r5, #0x0 bl FUN_02075118 str r0, [r4, #0x0] @@ -2502,7 +2502,7 @@ _0207520A: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 bl FUN_02073DB4 add r0, r4, #0x0 @@ -2733,7 +2733,7 @@ FUN_020753B4: ; 0x020753B4 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 bl FUN_02073DB4 ldr r0, _020754A8 ; =0x00000B25 @@ -2861,7 +2861,7 @@ FUN_020754D0: ; 0x020754D0 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 mov r1, #0x1d mov r2, #0x1 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 0ad8aad2..eec999c6 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -1729,7 +1729,7 @@ _02076360: lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 add r0, r4, #0x0 add r1, r5, #0x0 bl FUN_020709FC @@ -3276,7 +3276,7 @@ _020770DC: add r0, r4, r0 add r2, r1, #0x0 mov r3, #0xe - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0xc str r0, [sp, #0x0] mov r0, #0x2 @@ -3316,12 +3316,12 @@ _02077130: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x91 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _0207722C ; =0x000006FC mov r1, #0x0 ldr r0, [r5, r0] @@ -3341,12 +3341,12 @@ _0207716A: lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 mov r0, #0x91 lsl r0, r0, #0x2 add r0, r5, r0 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 ldr r0, _0207722C ; =0x000006FC mov r1, #0x0 ldr r0, [r5, r0] @@ -3441,7 +3441,7 @@ FUN_02077248: ; 0x02077248 lsl r0, r0, #0x2 add r0, r4, r0 mov r1, #0x1 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 ldr r0, _020772BC ; =0x00000B25 ldr r2, _020772C0 ; =0x0000070C ldrb r1, [r4, r0] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 90334793..00a42326 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1020,7 +1020,7 @@ _02077594: mov r1, #0x0 lsl r2, r2, #0x8 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0x0 mov r2, #0x6 ldr r0, _020776B0 ; =0x00000448 @@ -3328,7 +3328,7 @@ FUN_02078894: ; 0x02078894 lsl r2, r2, #0x8 mov r3, #0xa add r5, r0, #0x0 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r3, #0x0 str r3, [sp, #0x0] str r3, [sp, #0x4] diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 3d3fd3fe..ea1b0029 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -3095,7 +3095,7 @@ _0207EF10: add r0, r6, #0x0 mov r1, #0x1 mov r3, #0xd - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r6, #0x0 mov r1, #0xf bl FillWindowPixelBuffer diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index f5e751fa..66073837 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -549,7 +549,7 @@ FUN_02086784: ; 0x02086784 mov r1, #0x1 mov r2, #0x14 mov r3, #0xc - bl FUN_0200D0BC + bl DrawFrameAndWindow2 add r0, r5, #0x0 mov r1, #0xf bl FillWindowPixelBuffer @@ -711,7 +711,7 @@ _020868DE: ldr r0, [sp, #0x14] mov r2, #0x32 mov r3, #0xd - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 mov r0, #0x47 str r0, [sp, #0x0] mov r0, #0x2 @@ -733,7 +733,7 @@ FUN_02086960: ; 0x02086960 add r4, r0, #0x0 add r0, #0x28 mov r1, #0x1 - bl FUN_0200CCF8 + bl ClearFrameAndWindow1 add r0, r4, #0x0 add r0, #0x28 bl ClearWindowTilemapAndCopyToVram diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index b6b6ec25..ee6d24c9 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -545,7 +545,7 @@ _020898B8: add r0, #0x1c add r1, r6, #0x0 mov r3, #0x2 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #0x1 ldr r1, [r5, #0x0] lsl r0, r0, #0xa diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 7af6109f..d6f9c061 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -472,7 +472,7 @@ _02089CE8: add r0, #0x20 add r1, r6, #0x0 mov r3, #0x2 - bl FUN_0200D0BC + bl DrawFrameAndWindow2 mov r0, #0x1 ldr r1, [r5, #0x0] lsl r0, r0, #0xa diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 8cc2030f..1b590bf4 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -477,7 +477,7 @@ _0208A722: add r0, r4, #0x0 mov r1, #0x0 mov r3, #0xa - bl FUN_0200D0BC + bl DrawFrameAndWindow2 _0208A734: ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] @@ -513,7 +513,7 @@ FUN_0208A760: ; 0x0208A760 beq _0208A778 add r0, r4, #0x0 mov r1, #0x0 - bl FUN_0200D0E0 + bl ClearFrameAndWindow2 _0208A778: pop {r4, pc} .balign 4 @@ -593,18 +593,18 @@ _0208A808: add r0, r7, #0x0 mov r2, #0xa5 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add sp, #0x14 pop {r4-r7, pc} thumb_func_start FUN_0208A820 FUN_0208A820: ; 0x0208A820 - ldr r3, _0208A828 ; =FUN_0200CCF8 + ldr r3, _0208A828 ; =ClearFrameAndWindow1 add r0, #0x28 mov r1, #0x1 bx r3 .balign 4 -_0208A828: .word FUN_0200CCF8 +_0208A828: .word ClearFrameAndWindow1 thumb_func_start FUN_0208A82C FUN_0208A82C: ; 0x0208A82C @@ -681,18 +681,18 @@ _0208A8B8: add r0, r7, #0x0 mov r2, #0xa5 mov r3, #0xb - bl FUN_0200CCA4 + bl DrawFrameAndWindow1 add sp, #0x14 pop {r4-r7, pc} thumb_func_start FUN_0208A8D0 FUN_0208A8D0: ; 0x0208A8D0 - ldr r3, _0208A8D8 ; =FUN_0200CCF8 + ldr r3, _0208A8D8 ; =ClearFrameAndWindow1 add r0, #0x38 mov r1, #0x1 bx r3 .balign 4 -_0208A8D8: .word FUN_0200CCF8 +_0208A8D8: .word ClearFrameAndWindow1 thumb_func_start FUN_0208A8DC FUN_0208A8DC: ; 0x0208A8DC diff --git a/arm9/global.inc b/arm9/global.inc index 9831337f..b7a3a6a6 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -689,18 +689,18 @@ .extern FUN_0200CABC .extern FUN_0200CAFC .extern FUN_0200CB00 -.extern FUN_0200CCA4 -.extern FUN_0200CCF8 +.extern DrawFrameAndWindow1 +.extern ClearFrameAndWindow1 .extern FUN_0200CD60 .extern FUN_0200CD64 .extern FUN_0200CD68 -.extern FUN_0200D06C -.extern FUN_0200D0BC -.extern FUN_0200D0E0 +.extern DrawWindowFrame2 +.extern DrawFrameAndWindow2 +.extern ClearFrameAndWindow2 .extern FUN_0200D274 .extern FUN_0200D300 -.extern FUN_0200D6F8 -.extern FUN_0200D7A0 +.extern DrawFrameAndWindow3 +.extern ClearFrameAndWindow3 .extern FUN_0200D858 .extern FUN_0200DBFC .extern FUN_0200DC24 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 diff --git a/arm9/src/bg_window.c b/arm9/src/bg_window.c index 2986645f..f1a5e525 100644 --- a/arm9/src/bg_window.c +++ b/arm9/src/bg_window.c @@ -1366,7 +1366,7 @@ THUMB_FUNC void CopyBgTilemapRectAffine(struct Bg *bg, } THUMB_FUNC void FillBgTilemapRect(struct BgConfig *bgConfig, - u32 bgId, + u8 bgId, u16 fillValue, u8 x, u8 y, diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c index 04058b83..848e3d0a 100644 --- a/arm9/src/communication_error.c +++ b/arm9/src/communication_error.c @@ -7,9 +7,8 @@ #include "msgdata/msg.naix" #include "text.h" #include "brightness.h" +#include "render_window.h" -extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id); -extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num); extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen); extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32); @@ -136,7 +135,7 @@ THUMB_FUNC void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) AddWindow(bg_config, &window, &sCommunicationErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); BufferIntegerAsString(mgr, 0, (s32)error_code, 5, 2, 1); ReadMsgDataIntoString(error_message_data, error_message_no, tmp_str); diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 97bc7c70..12af3c6f 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -7,6 +7,7 @@ #include "PAD_pad.h" #include "font.h" #include "brightness.h" +#include "render_window.h" const struct WindowTemplate UNK_020FF49C = { @@ -44,8 +45,6 @@ const struct GraphicsBanks UNK_020FF4D8 = { .bg = 3 }; u32 sErrorMessagePrinterLock; extern void FUN_0200E3A0(PMLCDTarget, int); -extern void FUN_0200CB00(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); -extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3); extern void FUN_0200E394(u32 param0); THUMB_FUNC void VBlankHandler() @@ -114,7 +113,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() FUN_0201BD5C(); AddWindow(ptr, &buf, &UNK_020FF49C); FillWindowPixelRect(&buf, 15, 0, 0, 0xd0, 0x90); - FUN_0200CCA4(&buf, 0, 0x1f7, 2); + DrawFrameAndWindow1(&buf, 0, 0x1f7, 2); ReadMsgDataIntoString(msg_data, 3, str); diff --git a/arm9/src/render_window.c b/arm9/src/render_window.c new file mode 100644 index 00000000..7a682eb6 --- /dev/null +++ b/arm9/src/render_window.c @@ -0,0 +1,1027 @@ +#include "global.h" +#include "render_window.h" +#include "filesystem.h" +#include "gf_gfx_loader.h" +#include "graphic/field_board.naix" +#include "graphic/winframe.naix" +#include "pokemon.h" +#include "render_text.h" +#include "unk_020061E8.h" +#include "unk_0200BB14.h" +#include "unk_0200CA44.h" + +const struct UnkStruct_0200CABC_3 UNK_020ECE88 = { + 10, + 0, + 10, + 10, +}; + +const struct UnkStruct_0200CABC_3 UNK_020ECE98 = { + 0, + 0, + 10, + 10, +}; + +extern void FUN_02020130(u32 param0, u32 param1); +extern u32 FUN_0202022C(u32 param0); +extern void FUN_020201E4(u32 param0, u32 param1); +extern void FUN_0201FDEC(u32 param0); +extern void MOD05_021D99F8(struct UnkStruct_0200CABC_2 *param0); +extern void *FUN_0201B6C8(BOOL); +extern void MOD05_021D959C( + struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, u32 param3); +extern void MOD05_021D967C(struct UnkStruct_0200CABC_2 *param0, + NarcId narcId, + s32 memberId, + u32 param3, + u32 param4, + u32 param5, + u32 param6); +extern void MOD05_021D96F4( + struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4); +extern void MOD05_021D9708( + struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4); +extern void MOD05_021D971C(struct UnkStruct_0200CABC_2 *param0, + NarcId narcId, + s32 memberId, + u32 param3, + u32 param4, + u32 param5); +extern u32 *MOD05_021D9820(struct UnkStruct_0200CABC_2 *param0, void *); +extern struct UnkStruct63_021DB450 *FUN_02006D98(u32); +extern void FUN_020072E8(struct UnkStruct63_021DB450 *param0); +extern void FUN_02012400(u16, u16, u16, void *, void *); +extern u32 NNS_G2dGetImageLocation(u32, u32); +extern void *FUN_02012470(u16, u16, u16); +extern u32 NNS_G2dGetImagePaletteLocation(u32, u32); + +THUMB_FUNC u32 FUN_0200CABC( + struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, u32 heap_id) +{ + if (param3 == 0) + { + return GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, + NARC_winframe_narc_0000_NCGR, + bgConfig, + layer, + numTiles, + 0, + FALSE, + heap_id); + } + + return GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, + NARC_winframe_narc_0001_NCGR, + bgConfig, + layer, + numTiles, + 0, + FALSE, + heap_id); +} + +THUMB_FUNC s32 FUN_0200CAFC(void) +{ + return NARC_winframe_narc_0024_NCLR; +} + +THUMB_FUNC void FUN_0200CB00( + struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 param4, u32 heap_id) +{ + s32 r1; + if (param4 != 0) + { + r1 = NARC_winframe_narc_0001_NCGR; + } + else + { + r1 = NARC_winframe_narc_0000_NCGR; + } + + GfGfxLoader_LoadCharData( + NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heap_id); + + if (param4 == 2) + { + r1 = NARC_winframe_narc_0045_NCLR; + } + else + { + r1 = NARC_winframe_narc_0024_NCLR; + } + + if (layer < 4) + { + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, 0, param3 << 5, 32, heap_id); + return; + } + + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, 4, param3 << 5, 32, heap_id); +} + +THUMB_FUNC void DrawFrame1(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue) +{ + FillBgTilemapRect(bgConfig, bgId, fillValue, (u8)(x - 1), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 1), x, (u8)(y - 1), width, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 2), (u8)(x + width), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 3), (u8)(x - 1), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 5), (u8)(x + width), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 6), (u8)(x - 1), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 7), x, (u8)(y + height), width, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 8), (u8)(x + width), (u8)(y + height), 1, 1, paletteNum); +} + +THUMB_FUNC void DrawFrameAndWindow1( + struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num) +{ + DrawFrame1(window->bgConfig, + GetWindowBgId(window), + GetWindowX(window), + GetWindowY(window), + GetWindowWidth(window), + GetWindowHeight(window), + palette_num, + fill_value); + + if (!copy_to_vram) + { + CopyWindowToVram(window); + } +} + +THUMB_FUNC void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram) +{ + + FillBgTilemapRect(window->bgConfig, + GetWindowBgId(window), + 0, + (u8)(GetWindowX(window) - 1), + (u8)(GetWindowY(window) - 1), + (u8)(GetWindowWidth(window) + 2), + (u8)(GetWindowHeight(window) + 2), + 0); + + if (!copy_to_vram) + { + ClearWindowTilemapAndCopyToVram(window); + } +} + +THUMB_FUNC s32 FUN_0200CD60(s32 param0) +{ + return param0 + 2; +} + +THUMB_FUNC s32 FUN_0200CD64(s32 param0) +{ + return param0 + 25; +} + +THUMB_FUNC void FUN_0200CD68( + struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5) +{ + + GfGfxLoader_LoadCharData( + NARC_GRAPHIC_WINFRAME, FUN_0200CD60(param4), param0, param1, param2, 0, FALSE, param5); + + if (param1 < 4) + { + GfGfxLoader_GXLoadPal( + NARC_GRAPHIC_WINFRAME, FUN_0200CD64(param4), 0, param3 << 5, 32, param5); + return; + } + + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, FUN_0200CD64(param4), 4, param3 << 5, 32, param5); +} + +THUMB_FUNC void DrawFrame2(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue) +{ + FillBgTilemapRect(bgConfig, bgId, fillValue, (u8)(x - 2), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 1), (u8)(x - 1), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 2), x, (u8)(y - 1), width, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 3), (u8)(x + width), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 4), (u8)(x + width + 1), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 5), (u8)(x + width + 2), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 6), (u8)(x - 2), y, 1, height, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 7), (u8)(x - 1), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 9), (u8)(x + width), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 10), (u8)(x + width + 1), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 11), (u8)(x + width + 2), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 12), (u8)(x - 2), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 13), (u8)(x - 1), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 14), x, (u8)(y + height), width, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 15), (u8)(x + width), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 16), + (u8)(x + width + 1), + (u8)(y + height), + 1, + 1, + paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 17), + (u8)(x + width + 2), + (u8)(y + height), + 1, + 1, + paletteNum); +} + +THUMB_FUNC void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 palette_num) +{ + DrawFrame2(window->bgConfig, + GetWindowBgId(window), + GetWindowX(window), + GetWindowY(window), + GetWindowWidth(window), + GetWindowHeight(window), + (u8)palette_num, + (u16)fill_value); +} + +THUMB_FUNC void DrawFrameAndWindow2( + struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num) +{ + DrawWindowFrame2(window, fill_value, palette_num); + if (!copy_to_vram) + { + CopyWindowToVram(window); + } + + FUN_0200D18C(window, fill_value); +} + +THUMB_FUNC void ClearFrameAndWindow2(struct Window *window, BOOL param1) +{ + FillBgTilemapRect(window->bgConfig, + GetWindowBgId(window), + 0, + (u8)(GetWindowX(window) - 2), + (u8)(GetWindowY(window) - 1), + (u8)(GetWindowWidth(window) + 5), + (u8)(GetWindowHeight(window) + 2), + 0); + + if (!param1) + { + ClearWindowTilemapAndCopyToVram(window); + } +} + +THUMB_FUNC void BlitRect4Bit(u8 *srcPixels, + u16 srcX, + u16 srcY, + u16 srcWidth, + u16 srcHeight, + u8 *dstPixels, + u16 dstWidth, + u16 dstHeight, + u16 dstX, + u16 dstY, + u16 width, + u16 height) +{ + struct Bitmap src; + src.pixels = srcPixels; + src.width = srcWidth; + src.height = srcHeight; + + struct Bitmap dst; + dst.pixels = dstPixels; + dst.width = dstWidth; + dst.height = dstHeight; + + BlitBitmapRect4Bit(&src, &dst, srcX, srcY, dstX, dstY, width, height, 0); +} + +THUMB_FUNC void FUN_0200D18C(struct Window *window, u16 fill_value) +{ + u32 heap_id = BgConfig_GetHeapId(window->bgConfig); + u8 bg_id = GetWindowBgId(window); + + void *ptr = AllocFromHeap(heap_id, 0x180); + void *charptr = BgGetCharPtr(bg_id); + + NNSG2dCharacterData *pCharData; + void *st30; + void *st2c; + st2c = GfGfxLoader_GetCharData( + NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0022_NCGR, FALSE, &pCharData, heap_id); + st30 = pCharData->pRawData; + + for (u8 i = 0; i < 3; i++) + { + memcpy(ptr + (i << 7), charptr + ((fill_value + 10) << 5), 0x20); + memcpy(ptr + ((i << 7) + 0x20), charptr + ((fill_value + 11) << 5), 0x20); + memcpy(ptr + ((i << 7) + 0x40), charptr + ((fill_value + 10) << 5), 0x20); + memcpy(ptr + ((i << 7) + 0x60), charptr + ((fill_value + 11) << 5), 0x20); + } + + BlitRect4Bit(st30, 4, 0, 12, 0x30, ptr, 12, 0x30, 1, 0, 12, 0x30); + BG_LoadCharTilesData(window->bgConfig, bg_id, ptr, 0x180, (u32)(fill_value + 18)); + FUN_02002840(fill_value); + FreeToHeap(st2c); + FreeToHeap(ptr); +} + +THUMB_FUNC void FUN_0200D274( + struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id) +{ + + NNSG2dCharacterData *pCharData; + void *stc = GfGfxLoader_GetCharData( + NARC_GRAPHIC_WINFRAME, FUN_0200CD60(param4), FALSE, &pCharData, heap_id); + u8 *ptr = AllocFromHeap(heap_id, 0x240); + memcpy(ptr, pCharData->pRawData, 0x240); + + for (u32 r3 = 0; r3 < 0x240; r3++) + { + u8 r6 = (u8)(ptr[r3] >> 4); + u8 r2 = (u8)(ptr[r3] & 0xf); + if (r6 == 0) + { + r6 = param3; + } + if (r2 == 0) + { + r2 = param3; + } + + ptr[r3] = (u8)(r2 | (r6 << 4)); + } + + BG_LoadCharTilesData(bg_config, bg_id, (u32 *)ptr, 0x240, param2); + FreeToHeap(stc); + FreeToHeap(ptr); +} + +THUMB_FUNC void FUN_0200D300(struct BgConfig *bg_config, + u8 bg_id, + u16 numtiles, + u8 param3, + u8 param4, + u16 param5, + u32 heap_id) +{ + GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, + NARC_field_board_narc_0000_NCGR, + bg_config, + bg_id, + numtiles, + 0x3C0, + FALSE, + heap_id); + + NNSG2dPaletteData *pPltData; + void *st14; + st14 = AllocAndReadWholeNarcMemberByIdPair( + NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0001_NCLR, heap_id); + NNS_G2dGetUnpackedPaletteData(st14, &pPltData); + BG_LoadPlttData(bg_id, pPltData->pRawData + param4 * 0x20, 0x20, (u16)(param3 << 5)); + FreeToHeapExplicit(heap_id, st14); + + if (param4 <= 1) + { + FUN_0200D378(bg_config, bg_id, (u16)(numtiles + 30), param4, param5, heap_id); + } +} + +THUMB_FUNC void FUN_0200D378( + struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id) +{ + if (param3 == 0) + { + param4 += 33; + } + else + { + param4 += 2; + } + + GfGfxLoader_LoadCharData( + NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heap_id); +} + +THUMB_FUNC void DrawFrame3(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue) +{ + FillBgTilemapRect(bgConfig, bgId, fillValue, (u8)(x - 9), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 1), (u8)(x - 8), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 2), + (u8)(x - 7), + (u8)(y - 1), + (u8)(width + 7), + 1, + paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 3), (u8)(x + width), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 4), (u8)(x + width + 1), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 5), (u8)(x + width + 2), (u8)(y - 1), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 6), (u8)(x - 9), y, 1, height, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 7), (u8)(x - 8), y, 1, height, paletteNum); + FillBgTilemapRect(bgConfig, bgId, (u16)(fillValue + 8), (u8)(x - 1), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 9), (u8)(x + width), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 10), (u8)(x + width + 1), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 11), (u8)(x + width + 2), y, 1, height, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 12), (u8)(x - 9), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 13), (u8)(x - 8), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 14), + (u8)(x - 7), + (u8)(y + height), + (u8)(width + 7), + 1, + paletteNum); + FillBgTilemapRect( + bgConfig, bgId, (u16)(fillValue + 15), (u8)(x + width), (u8)(y + height), 1, 1, paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 16), + (u8)(x + width + 1), + (u8)(y + height), + 1, + 1, + paletteNum); + FillBgTilemapRect(bgConfig, + bgId, + (u16)(fillValue + 17), + (u8)(x + width + 2), + (u8)(y + height), + 1, + 1, + paletteNum); +} + +THUMB_FUNC void DrawWindowCorner(struct Window *window, u16 fillValue, u8 paletteNum) +{ + u16 i, j; + u16 x, y; + u8 bg_id; + + bg_id = GetWindowBgId(window); + x = (u16)(GetWindowX(window) - 7); + y = GetWindowY(window); + + for (i = 0; i < 4; i++) + { + for (j = 0; j < 6; j++) + { + FillBgTilemapRect(window->bgConfig, + bg_id, + (u16)(fillValue + 6 * i + j), + (u8)(x + j), + (u8)(y + i), + 1, + 1, + paletteNum); + } + } +} + +THUMB_FUNC void DrawFrameAndWindow3( + struct Window *window, BOOL copy_to_vram, u16 fillValue, u8 paletteNum, u8 param4) +{ + u8 bg_id = GetWindowBgId(window); + if (param4 <= 1) + { + DrawFrame3(window->bgConfig, + bg_id, + GetWindowX(window), + GetWindowY(window), + GetWindowWidth(window), + GetWindowHeight(window), + paletteNum, + fillValue); + DrawWindowCorner(window, (u16)(fillValue + 30), paletteNum); + } + else + { + DrawFrame2(window->bgConfig, + bg_id, + GetWindowX(window), + GetWindowY(window), + GetWindowWidth(window), + GetWindowHeight(window), + paletteNum, + fillValue); + } + + if (!copy_to_vram) + { + CopyWindowToVram(window); + } + + FUN_0200D18C(window, fillValue); +} + +THUMB_FUNC void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram) +{ + u8 bg_id = GetWindowBgId(window); + if (param1 <= 1) + { + FillBgTilemapRect(window->bgConfig, + bg_id, + 0, + (u8)(GetWindowX(window) - 9), + (u8)(GetWindowY(window) - 1), + (u8)(GetWindowWidth(window) + 11), + (u8)(GetWindowHeight(window) + 2), + 0); + } + else + { + FillBgTilemapRect(window->bgConfig, + bg_id, + 0, + (u8)(GetWindowX(window) - 2), + (u8)(GetWindowY(window) - 1), + (u8)(GetWindowWidth(window) + 4), + (u8)(GetWindowHeight(window) + 2), + 0); + } + + if (!copy_to_vram) + { + ClearWindowTilemapAndCopyToVram(window); + } +} + +THUMB_FUNC struct UnkStruct_0200CABC_1 *FUN_0200D858(struct Window *window, u32 param1) +{ + u32 heap_id = BgConfig_GetHeapId(window->bgConfig); + void *charptr = BgGetCharPtr(GetWindowBgId(window)); + + struct UnkStruct_0200CABC_1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0200CABC_1)); + memcpy(ptr->unk004[8], charptr + (param1 + 18) * 32, 0x80); + void *ptr2 = AllocFromHeap(heap_id, 0x80); + memcpy(ptr2, charptr + (param1 + 10) * 32, 0x20); + memcpy(ptr2 + 0x20, charptr + (param1 + 11) * 32, 0x20); + memcpy(ptr2 + 0x40, charptr + (param1 + 10) * 32, 0x20); + memcpy(ptr2 + 0x60, charptr + (param1 + 11) * 32, 0x20); + + for (u8 i = 0; i < 8; i++) + { + memcpy(ptr->unk004[i], ptr2, 0x80); + } + FreeToHeap(ptr2); + + NNSG2dCharacterData *pCharData; + void *r5 = GfGfxLoader_GetCharData( + NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0023_NCGR, FALSE, &pCharData, heap_id); + BlitRect4Bit( + pCharData->pRawData, 0, 0, 0x10, 0x80, ptr->unk004[0], 0x10, 0x80, 0, 0, 0x10, 0x80); + FreeToHeap(r5); + + ptr->unk000 = window; + ptr->fillValue = (u16)param1; + ptr->unk486 = 0; + ptr->unk487 = 0; + ptr->unk488 = 0; + + FUN_0200CA60(FUN_0200DB7C, ptr, 0); + FUN_0200D980(ptr, 1); + + return ptr; +} + +THUMB_FUNC void FUN_0200D980(struct UnkStruct_0200CABC_1 *param0, u32 param1) +{ + u8 bg_id = GetWindowBgId(param0->unk000); + u8 x = GetWindowX(param0->unk000); + u8 y = GetWindowY(param0->unk000); + u8 width = GetWindowWidth(param0->unk000); + + if (param1 == 2) + { + BG_LoadCharTilesData(param0->unk000->bgConfig, + bg_id, + (u32 *)param0->unk004[8], + 0x80, + (u32)(param0->fillValue + 18)); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 10), + (u8)(x + width + 1), + (u8)(y + 2), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 11), + (u8)(x + width + 2), + (u8)(y + 2), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 10), + (u8)(x + width + 1), + (u8)(y + 3), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 11), + (u8)(x + width + 2), + (u8)(y + 3), + 1, + 1, + 0x10); + BgCommitTilemapBufferToVram(param0->unk000->bgConfig, bg_id); + return; + } + + BG_LoadCharTilesData(param0->unk000->bgConfig, + bg_id, + (u32 *)param0->unk004[param0->unk487], + 0x80, + (u32)(param0->fillValue + 18)); + if (param1 != 0) + { + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 18), + (u8)(x + width + 1), + (u8)(y + 2), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 19), + (u8)(x + width + 2), + (u8)(y + 2), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 20), + (u8)(x + width + 1), + (u8)(y + 3), + 1, + 1, + 0x10); + FillBgTilemapRect(param0->unk000->bgConfig, + bg_id, + (u16)(param0->fillValue + 21), + (u8)(x + width + 2), + (u8)(y + 3), + 1, + 1, + 0x10); + BgCommitTilemapBufferToVram(param0->unk000->bgConfig, bg_id); + } +} + +THUMB_FUNC void FUN_0200DB7C(u32 param0, void *param1) +{ + struct UnkStruct_0200CABC_1 *r1 = (struct UnkStruct_0200CABC_1 *)param1; + + if (r1->unk488 != 0) + { + if (r1->unk488 == 1) + { + FUN_0200D980(r1, 2); + } + FUN_0200CAB4((s32)param0); + return; + } + + r1->unk486++; + if (r1->unk486 == 16) + { + r1->unk486 = 0; + r1->unk487 = (r1->unk487 + 1) & 7; + FUN_0200D980(r1, 0); + } +} + +THUMB_FUNC void FUN_0200DBE8(u32 param0, void *param1) +{ + FreeToHeap(param1); + FUN_0200CAB4((s32)param0); +} + +THUMB_FUNC void FUN_0200DBFC(struct UnkStruct_0200CABC_1 *param0) +{ + FUN_0200CA98(FUN_0200DBE8, param0, 0); + param0->unk488 = 1; +} + +THUMB_FUNC void FUN_0200DC24(struct UnkStruct_0200CABC_1 *param0) +{ + FUN_0200CA98(FUN_0200DBE8, param0, 0); + param0->unk488 = 2; +} + +THUMB_FUNC u8 *FUN_0200DC4C(struct BgConfig *bg_config, + u8 bg_id, + u8 param2, + u8 param3, + u8 param4, + u16 param5, + u16 param6, + u8 param7, + s32 param8) +{ + struct UnkStruct_0200CABC_2 *r4 = FUN_0200DD70(bg_config, bg_id, param2, param3, (u32)param8); + FUN_0200DDAC(r4, (u32)param8); + FUN_0200DDD8(r4); + FUN_0200DE30(r4, param2, param3); + FUN_0200DE80(r4, param6, param7); + DrawFramed10x10Square(r4, param4, param5); + BgCommitTilemapBufferToVram(bg_config, bg_id); + + return &r4->unk16f; +} + +THUMB_FUNC u8 *FUN_0200DCA4(struct BgConfig *bg_config, + u8 bg_id, + u8 param2, + u8 param3, + u8 param4, + u16 param5, + struct Pokemon *param6, + s32 param7) +{ + struct UnkStruct_0200CABC_2 *r4 = FUN_0200DD70(bg_config, bg_id, param2, param3, (u32)param7); + FUN_0200DDAC(r4, (u32)param7); + FUN_0200DDD8(r4); + FUN_0200DE30(r4, param2, param3); + FUN_0200DEC0(r4, param6); + DrawFramed10x10Square(r4, param4, param5); + BgCommitTilemapBufferToVram(bg_config, bg_id); + + return &r4->unk16f; +} + +THUMB_FUNC void FUN_0200DCF8(u32 param0, void *param1) +{ + struct UnkStruct_0200CABC_2 *unk = (struct UnkStruct_0200CABC_2 *)param1; + switch (unk->unk16f) + { + case 1: + ClearFramed10x10Square(unk); + FUN_0200C3DC(unk->unk164); + MOD05_021D99F8(unk); + FUN_0200621C((s32)param0); + return; + case 2: + unk->unk16f = 3; + FUN_02020130(*unk->unk164, 1); + break; + case 3: + if (FUN_0202022C(*unk->unk164) == 6) + { + unk->unk16f = 0; + } + } + + FUN_020201E4(*unk->unk164, 0x1000); + FUN_0201FDEC(unk->unk000); +} + +THUMB_FUNC struct UnkStruct_0200CABC_2 *FUN_0200DD70( + struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u32 param4) +{ + struct UnkStruct_0200CABC_2 *res = FUN_0201B6C8(FUN_020061E8(FUN_0200DCF8, 0x170, 0, param4)); + + res->unk16f = 0; + res->bgConfig = bg_config; + res->bgId = bg_id; + res->x = param2; + res->y = param3; + + return res; +} + +THUMB_FUNC void FUN_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1) +{ + + const u32 UNK_020ECEA8[] = { + 0x01, + 0x01, + 0x01, + 0x01, + 0x00, + 0x00, + }; + MOD05_021D959C(param0, UNK_020ECEA8, 1, param1); +} + +THUMB_FUNC void FUN_0200DDD8(struct UnkStruct_0200CABC_2 *param0) +{ + MOD05_021D967C(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0049_NCLR, 0, 1, 1, 0x15CD5); + MOD05_021D96F4(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0047_NCER, 0, 0x15CD5); + MOD05_021D9708(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0046_NANR, 0, 0x15CD5); + MOD05_021D971C(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0048_NCGR, 0, 1, 0x15CD5); +} + +THUMB_FUNC void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2) +{ + u32 UNK_020ECEC0[] = { + 0x00, + 0x00, + 0x00, + 0x00, + 0x01, + 0x015CD5, + 0x015CD5, + 0x015CD5, + 0x015CD5, + 0x00, + 0x00, + 0x00, + 0x00, + }; + ((u16 *)UNK_020ECEC0)[0] = (u16)((param1 + 5) * 8); + ((u16 *)UNK_020ECEC0)[1] = (u16)((param2 + 5) * 8); + param0->unk164 = MOD05_021D9820(param0, UNK_020ECEC0); + FUN_0201FDEC(param0->unk000); + GX_EngineBToggleLayers(0x10, GX_LAYER_TOGGLE_ON); +} + +THUMB_FUNC void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2) +{ + struct UnkStruct63_021DB450 *r7 = FUN_02006D98(param0->unk162); + struct SomeDrawPokemonStruct stc; + FUN_02068C00(&stc, param1, param2, 2, 0, 0, 0); + FUN_0200DEF4(param0, &stc); + FUN_020072E8(r7); +} + +THUMB_FUNC void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1) +{ + struct UnkStruct63_021DB450 *r6 = FUN_02006D98(param0->unk162); + struct SomeDrawPokemonStruct st0; + FUN_02068B68(&st0, param1, 2); + FUN_0200DEF4(param0, &st0); + FUN_020072E8(r6); +} + +THUMB_FUNC void FUN_0200DEF4( + struct UnkStruct_0200CABC_2 *param0, struct SomeDrawPokemonStruct *param1) +{ + void *r4 = AllocFromHeap(param0->unk162, 0x1900); + + struct UnkStruct_0200CABC_3 st18 = UNK_020ECE98; + FUN_02012400(param1->unk0, param1->unk2, param0->unk162, &st18, r4); + + struct UnkStruct_0200CABC_3 st8 = UNK_020ECE88; + FUN_02012400(param1->unk0, param1->unk2, param0->unk162, &st8, r4 + 0xc80); + + u32 st4 = FUN_02009C5C(FUN_020094F0(param0->unk130, 0x15CD5)); + + u32 r7 = NNS_G2dGetImageLocation(st4, 1); + DC_FlushRange(r4, 0x1900); + GX_LoadOBJ(r4, r7, 0x1900); + FreeToHeap(r4); + void *res = FUN_02012470(param1->unk0, param1->unk4, param0->unk162); + + u32 r5 = + NNS_G2dGetImagePaletteLocation(FUN_02009E54(FUN_020094F0(param0->unk134, 0x15CD5), st4), 1); + DC_FlushRange(res, 0x20); + GX_LoadOBJPltt(res, r5, 0x20); + FreeToHeap(res); +} + +THUMB_FUNC void DrawFramed10x10Square( + struct UnkStruct_0200CABC_2 *param0, u8 paletteNum, u16 fillValue) +{ + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + fillValue, + (u8)(param0->x - 1), + (u8)(param0->y - 1), + 1, + 1, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 1), + param0->x, + (u8)(param0->y - 1), + 10, + 1, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 2), + (u8)(param0->x + 10), + (u8)(param0->y - 1), + 1, + 1, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 4), + param0->x, + param0->y, + 10, + 10, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 3), + (u8)(param0->x - 1), + param0->y, + 1, + 10, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 5), + (u8)(param0->x + 10), + param0->y, + 1, + 10, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 6), + (u8)(param0->x - 1), + (u8)(param0->y + 10), + 1, + 1, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 7), + param0->x, + (u8)(param0->y + 10), + 10, + 1, + paletteNum); + FillBgTilemapRect(param0->bgConfig, + param0->bgId, + (u16)(fillValue + 8), + (u8)(param0->x + 10), + (u8)(param0->y + 10), + 1, + 1, + paletteNum); + + ScheduleBgTilemapBufferTransfer(param0->bgConfig, param0->bgId); +} + +THUMB_FUNC void ClearFramed10x10Square(struct UnkStruct_0200CABC_2 *param0) +{ + FillBgTilemapRect( + param0->bgConfig, param0->bgId, 0, (u8)(param0->x - 1), (u8)(param0->y - 1), 12, 12, 0); + ScheduleBgTilemapBufferTransfer(param0->bgConfig, param0->bgId); +} diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c index 9524475c..45a0c7bd 100644 --- a/arm9/src/save_data_read_error.c +++ b/arm9/src/save_data_read_error.c @@ -6,10 +6,9 @@ #include "msgdata/msg.naix" #include "save_data_read_error.h" #include "text.h" +#include "render_window.h" extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id); -extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id); -extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num); extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen); extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32); @@ -104,7 +103,7 @@ THUMB_FUNC void ShowSaveDataReadError(u32 heap_id) AddWindow(bg_config, &window, &sSaveDataReadErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); ReadMsgDataIntoString(msg_data, 0, str); AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); @@ -167,7 +166,7 @@ THUMB_FUNC void ShowGBACartRemovedError(u32 heap_id) AddWindow(bg_config, &window, &sSaveDataReadErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); ReadMsgDataIntoString(msg_data, 1, str); AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); diff --git a/arm9/src/save_data_write_error.c b/arm9/src/save_data_write_error.c index 71edb91d..3f03fb4b 100644 --- a/arm9/src/save_data_write_error.c +++ b/arm9/src/save_data_write_error.c @@ -6,10 +6,9 @@ #include "msgdata/msg.naix" #include "save_data_write_error.h" #include "text.h" +#include "render_window.h" extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id); -extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id); -extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num); extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen); extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32); @@ -112,7 +111,7 @@ THUMB_FUNC void ShowSaveDataWriteError(u32 heap_id, u32 err_no) AddWindow(bg_config, &window, &sSaveDataWriteErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); ReadMsgDataIntoString(msg_data, msg_no, str); AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index ceb1a1cf..2d57f0b1 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -6,6 +6,9 @@ #include "player_data.h" #include "text.h" #include "bg_window.h" +#include "render_window.h" +#include "text_02054590.h" + extern void *FUN_02039438(struct UnkSavStruct80* arg, u32 id); extern void *CreateScriptContext(struct UnkSavStruct80* arg, u16 id); @@ -22,27 +25,19 @@ extern void MOD05_021E2C58(struct ScriptContext *ctx, u16 typ, u16 id, u16 word1 extern struct ScrStrBufs *MOD06_02244210(struct SaveBlock2 *sav, u16 poke, u16 sex, u8 flag, u8 *unk); extern void MOD05_021E2CBC(struct ScriptContext *ctx, struct ScrStrBufs *str, u8 param2, u32 param3); extern void MOD05_021E2BB8(void *param0, struct ScriptContext *ctx); -extern BOOL FUN_020546C8(u8 param0); extern u32 FUN_02058488(u32 param0); extern BOOL FUN_02030F40(void); extern void FUN_02055304(u32 param0, u32 param1); extern void FUN_02039460(struct UnkSavStruct80 *arg); -extern void FUN_020545B8(u32 param0, u8 *param1, u32 param2); -extern void FUN_02054608(u8 *param0, struct Options *options); -extern void FUN_0200D0E0(struct Window *param0, u32 param1); extern u32 FUN_02058510(u32 param0, u32 param1); extern void MOD05_021E8128(u32 param0, u8 type, u16 map); extern void MOD05_021E8130(u32 param0, u32 param1); extern void MOD05_021E8158(struct UnkSavStruct80 *unk80); extern struct Window * MOD05_021E8140(u32 param0); extern BOOL MOD05_021E8148(u32 param0); -extern u8 FUN_02054658(struct Window * param0, struct String *str, struct Options *opt, u32 param3); extern void MOD05_021E8144(u32 param0); -extern void FUN_0200CB00(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); -extern u32 Std_CreateYesNoMenu(u32 param0, u8 **param1, u32 param2, u32 param3, u32 param4); +extern u32 Std_CreateYesNoMenu(struct BgConfig *param0, u8 **param1, u32 param2, u32 param3, u32 param4); extern u32 FUN_020021AC(u32 param0, u32 param1); -extern u32 FUN_0200D858(u32 *param0, u32 param1); -extern void FUN_0200DBFC(u32 param0); extern u32 MOD05_021E1BF8(struct UnkSavStruct80 *arg, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u32 param6, u32 *param7, struct MsgData *msgData); extern void MOD05_021E1C4C(u32 param0, u32 param1, u32 param2); extern void MOD05_021E1C54(u32 param0); @@ -773,8 +768,8 @@ THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx) { struct UnkSavStruct80 *unk80 = ctx->unk80; u8 *unk = (u8 *)FUN_02039438(unk80, 6); - FUN_020545B8(unk80->unk08, FUN_02039438(unk80, 1), 3); - FUN_02054608(FUN_02039438(unk80, 1), Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2)); + FUN_020545B8(unk80->unk08, (struct Window *)FUN_02039438(unk80, 1), 3); + FUN_02054608((struct Window *)FUN_02039438(unk80, 1), Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2)); *unk = 1; return FALSE; } @@ -784,7 +779,7 @@ THUMB_FUNC BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) struct UnkSavStruct80 *unk80 = ctx->unk80; struct Window *unk = FUN_02039438(unk80, 0x1); u8 *unk2 = FUN_02039438(unk80, 0x6); - FUN_0200D0E0(unk, 0); //clear window? + ClearFrameAndWindow2(unk, 0); //clear window? RemoveWindow(unk); *unk2 = 0; return FALSE; @@ -958,7 +953,7 @@ THUMB_FUNC BOOL ScrCmd_Unk003A(struct ScriptContext *ctx) ReadMsgDataIntoString(ctx->msgData, msg, *unk2); StringExpandPlaceholders(*unk4, *unk3, *unk2); - *unk1 = FUN_02054658(MOD05_021E8140(unk80->unk60), *unk3, Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2), 1); + *unk1 = (u8)FUN_02054658(MOD05_021E8140(unk80->unk60), *unk3, Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2), 1); ctx->data[0] = wk; SetupNativeScript(ctx, FUN_0203A94C); return TRUE; @@ -1112,15 +1107,16 @@ THUMB_FUNC static BOOL FUN_0203AB00(struct ScriptContext *ctx) THUMB_FUNC BOOL ScrCmd_ShowSaveClock(struct ScriptContext *ctx) { - u32 *unk = FUN_02039438(ctx->unk80, 1); - u32 *unk2 = FUN_02039438(ctx->unk80, 18); + struct Window *unk = (struct Window *)FUN_02039438(ctx->unk80, 1); + struct UnkStruct_0200CABC_1 **unk2 = (struct UnkStruct_0200CABC_1 **)FUN_02039438(ctx->unk80, 18); *unk2 = FUN_0200D858(unk, 994); return FALSE; } + THUMB_FUNC BOOL ScrCmd_HideSaveClock(struct ScriptContext *ctx) { - u32 *unk = FUN_02039438(ctx->unk80, 18); + struct UnkStruct_0200CABC_1 **unk = (struct UnkStruct_0200CABC_1 **)FUN_02039438(ctx->unk80, 18); FUN_0200DBFC(*unk); return FALSE; } @@ -1345,13 +1341,13 @@ THUMB_FUNC BOOL ScrCmd_Unk02A1(struct ScriptContext *ctx) { unk4[0] = 15; pos++; - unk4[1] = unk1 - unk5; + unk4[1] = (u16)(unk1 - unk5); } else if (unk5 > unk1) { unk4[0] = 14; pos++; - unk4[1] = unk5 - unk1; + unk4[1] = (u16)(unk5 - unk1); } if (unk6 < unk2) diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index 3c3d0fed..03d01ae6 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -3,22 +3,10 @@ #include "bg_window.h" #include "font.h" #include "render_text.h" +#include "render_window.h" extern void FUN_0201BD5C(void); -extern void FUN_0200CD68( - struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); -extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3); - -extern void FUN_0200D300(struct BgConfig *param0, - u32 param1, - u32 param2, - u32 param3, - u8 param4, - u32 param5, - u32 param6); -extern void FUN_0200D6F8(struct Window *param0, u32 param1, u32 param2, u32 param3, u8 param4); - THUMB_FUNC void FUN_02054590(u32 param0, u32 param1) { if (param1 == 1) @@ -45,7 +33,7 @@ THUMB_FUNC void FUN_02054608(struct Window *param0, struct Options *options) { FUN_0200CD68(param0->bgConfig, GetWindowBgId(param0), 994, 10, (u8)Options_GetFrame(options), 4); FUN_0205464C(param0); - FUN_0200D0BC(param0, 0, 994, 10); + DrawFrameAndWindow2(param0, 0, 994, 10); } THUMB_FUNC void FUN_0205464C(struct Window *param0) @@ -99,9 +87,9 @@ THUMB_FUNC void FUN_020546E0( } } -THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u32 param2) +THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u16 param2) { FUN_0200D300(param0->bgConfig, GetWindowBgId(param0), 0x399, 9, (u8)param1, param2, 4); FillWindowPixelBuffer(param0, 15); - FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1); + DrawFrameAndWindow3(param0, 0, 0x399, 9, (u8)param1); } diff --git a/arm9/src/wfc_user_info_warning.c b/arm9/src/wfc_user_info_warning.c index da547f3d..e48262b0 100644 --- a/arm9/src/wfc_user_info_warning.c +++ b/arm9/src/wfc_user_info_warning.c @@ -11,10 +11,9 @@ #include "text.h" #include "wfc_user_info_warning.h" #include "brightness.h" +#include "render_window.h" extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id); -extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id); -extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num); extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen); extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32); @@ -109,7 +108,7 @@ THUMB_FUNC void ShowWFCUserInfoWarning(u32 heap_id, u32 a1) FUN_0201BD5C(); AddWindow(bg_config, &window, &sWFCWarningMsgWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); ReadMsgDataIntoString(warning_messages_data, 15, warning_message); AddTextPrinterParameterized(&window, 0, warning_message, 0, 0, 0, 0); diff --git a/include/bg_window.h b/include/bg_window.h index 24ed152b..9ac29965 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -267,7 +267,7 @@ void CopyBgTilemapRectAffine(struct Bg *bg, u8 srcHeight, u8 adjustForSrcDims); void FillBgTilemapRect(struct BgConfig *bgConfig, - u32 bgId, + u8 bgId, u16 fillValue, u8 x, u8 y, diff --git a/include/render_window.h b/include/render_window.h new file mode 100644 index 00000000..385c61ad --- /dev/null +++ b/include/render_window.h @@ -0,0 +1,143 @@ +#ifndef POKEDIAMOND_UNK_0200CABC_H +#define POKEDIAMOND_UNK_0200CABC_H + +#include "global.h" +#include "bg_window.h" +#include "pokemon.h" +#include "unk_02008DEC.h" + +struct UnkStruct_0200CABC_1 +{ + struct Window *unk000; + u8 unk004[9][0x80]; + u16 fillValue; + u8 unk486; + u8 unk487 : 7; + u8 unk488 : 2; +}; + +struct UnkStruct_0200CABC_2 +{ + u32 unk000; + u8 unk004[0x12c]; + struct UnkStruct_02008DEC_1 *unk130; + struct UnkStruct_02008DEC_1 *unk134; + u8 unk138[0x2a]; + u16 unk162; + u32 *unk164; + struct BgConfig *bgConfig; + u8 bgId; + u8 x; + u8 y; + u8 unk16f; +}; + +struct UnkStruct_0200CABC_3 +{ + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0c; +}; + +u32 FUN_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, u32 heap_id); +s32 FUN_0200CAFC(void); +void FUN_0200CB00( + struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 param4, u32 heap_id); +void DrawFrame1(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue); +void DrawFrameAndWindow1(struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num); +void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram); +s32 FUN_0200CD60(s32 param0); +s32 FUN_0200CD64(s32 param0); +void FUN_0200CD68( + struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); +void DrawFrame2(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue); +void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 palette_num); +void DrawFrameAndWindow2(struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num); +void ClearFrameAndWindow2(struct Window *window, BOOL param1); +void BlitRect4Bit(u8 *srcPixels, + u16 srcX, + u16 srcY, + u16 srcWidth, + u16 srcHeight, + u8 *dstPixels, + u16 dstWidth, + u16 dstHeight, + u16 dstX, + u16 dstY, + u16 width, + u16 height); +void FUN_0200D18C(struct Window *window, u16 fill_value); +void FUN_0200D274( + struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id); +void FUN_0200D300(struct BgConfig *bg_config, + u8 bg_id, + u16 numtiles, + u8 param3, + u8 param4, + u16 param5, + u32 heap_id); +void FUN_0200D378( + struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id); +void DrawFrame3(struct BgConfig *bgConfig, + u8 bgId, + u8 x, + u8 y, + u8 width, + u8 height, + u8 paletteNum, + u16 fillValue); +void DrawWindowCorner(struct Window *window, u16 fillValue, u8 paletteNum); +void DrawFrameAndWindow3( + struct Window *window, BOOL copy_to_vram, u16 fillValue, u8 paletteNum, u8 param4); +void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram); +struct UnkStruct_0200CABC_1 *FUN_0200D858(struct Window *window, u32 param1); +void FUN_0200D980(struct UnkStruct_0200CABC_1 *param0, u32 param1); +void FUN_0200DB7C(u32 param0, void *param1); +void FUN_0200DBE8(u32 param0, void *param1); +void FUN_0200DBFC(struct UnkStruct_0200CABC_1 *param0); +void FUN_0200DC24(struct UnkStruct_0200CABC_1 *param0); +u8 *FUN_0200DC4C(struct BgConfig *bg_config, + u8 bg_id, + u8 param2, + u8 param3, + u8 param4, + u16 param5, + u16 param6, + u8 param7, + s32 param8); +u8 *FUN_0200DCA4(struct BgConfig *bg_config, + u8 bg_id, + u8 param2, + u8 param3, + u8 param4, + u16 param5, + struct Pokemon *param6, + s32 param7); +void FUN_0200DCF8(u32 param0, void *param1); +struct UnkStruct_0200CABC_2 *FUN_0200DD70( + struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u32 param4); +void FUN_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1); +void FUN_0200DDD8(struct UnkStruct_0200CABC_2 *param0); +void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2); +void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2); +void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1); +void FUN_0200DEF4(struct UnkStruct_0200CABC_2 *param0, struct SomeDrawPokemonStruct *param1); +void DrawFramed10x10Square(struct UnkStruct_0200CABC_2 *param0, u8 paletteNum, u16 fillValue); +void ClearFramed10x10Square(struct UnkStruct_0200CABC_2 *param0); + +#endif // POKEDIAMOND_UNK_0200CABC_H diff --git a/include/text_02054590.h b/include/text_02054590.h index 4d05260a..d55f0b80 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -15,6 +15,6 @@ u16 FUN_02054658(struct Window * window, struct String *str, struct Options *opt u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5); u8 FUN_020546C8(u32 param0); void FUN_020546E0(struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3); -void FUN_02054744(struct Window *param0, u32 param1, u32 param2); +void FUN_02054744(struct Window *param0, u32 param1, u16 param2); #endif // POKEDIAMOND_UNK_02054590_H |