diff options
Diffstat (limited to 'arm9/asm')
31 files changed, 176 insertions, 1299 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index a8cd984f..5ddfa9ab 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -141,7 +141,7 @@ FUN_02001C78: ; 0x02001C78 tst r3, r5 beq _02001C9E ldr r0, _02001D28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x15] ldr r1, [r4, #0x0] lsl r0, r0, #0x3 @@ -153,7 +153,7 @@ _02001C9E: tst r3, r2 beq _02001CAE ldr r0, _02001D28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE sub r0, r5, #0x3 pop {r3-r5, pc} _02001CAE: @@ -237,7 +237,7 @@ FUN_02001D2C: ; 0x02001D2C tst r6, r3 beq _02001D54 ldr r0, _02001DD8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x15] ldr r1, [r4, #0x0] lsl r0, r0, #0x3 @@ -249,7 +249,7 @@ _02001D54: tst r6, r5 beq _02001D66 ldr r0, _02001DD8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x1 mvn r0, r0 pop {r4-r6, pc} @@ -338,7 +338,7 @@ _02001DF0: ; jump table (using 16-bit offset) .short _02001E44 - _02001DF0 - 2; case 5 _02001DFC: ldr r0, _02001E58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x15] ldr r1, [r4, #0x0] lsl r0, r0, #0x3 @@ -347,7 +347,7 @@ _02001DFC: pop {r4, pc} _02001E0E: ldr r0, _02001E58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x1 mvn r0, r0 pop {r4, pc} @@ -433,7 +433,7 @@ _02001E7C: add r0, r5, #0x0 bl FUN_02002080 add r0, r6, #0x0 - bl FUN_020054C8 + bl PlaySE mov r0, #0x1 add sp, #0xc pop {r4-r7, pc} diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s deleted file mode 100644 index dc0c45ef..00000000 --- a/arm9/asm/unk_020023C0.s +++ /dev/null @@ -1,1123 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .bss - - .extern gMain - .extern gMain - - .global gTextFlags -gTextFlags: ; 0x02106FC4 - .space 0x4 - - .section .rodata - - .global UNK_020ECB50 -UNK_020ECB50: ; 0x020ECB50 - .byte 0x00, 0x01, 0x02, 0x01 - - .text - - thumb_func_start RenderText -RenderText: ; 0x020023C0 - push {r3-r6, lr} - sub sp, #0xc - add r4, r0, #0x0 - add r1, r4, #0x0 - add r1, #0x24 - ldrb r1, [r1, #0x0] - add r6, r4, #0x0 - add r6, #0x1c - cmp r1, #0x6 - bls _020023D6 - b _02002838 -_020023D6: - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_020023E2: ; jump table (using 16-bit offset) - .short _020023F0 - _020023E2 - 2; case 0 - .short _02002742 - _020023E2 - 2; case 1 - .short _0200275C - _020023E2 - 2; case 2 - .short _02002786 - _020023E2 - 2; case 3 - .short _020027B6 - _020023E2 - 2; case 4 - .short _0200280C - _020023E2 - 2; case 5 - .short _02002818 - _020023E2 - 2; case 6 -_020023F0: - ldr r0, _02002658 ; =gMain - ldr r1, [r0, #0x44] - mov r0, #0x3 - tst r0, r1 - beq _02002402 - ldrb r0, [r6, #0x0] - lsl r0, r0, #0x1b - lsr r0, r0, #0x1f - bne _02002414 -_02002402: - ldr r0, _0200265C ; =gMain + 0x40 - ldrh r0, [r0, #0x22] - cmp r0, #0x0 - beq _02002432 - ldr r0, _02002660 ; =gTextFlags - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x1b - lsr r0, r0, #0x1f - beq _02002432 -_02002414: - add r0, r4, #0x0 - mov r1, #0x0 - add r0, #0x26 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x25 - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x19 - lsr r0, r0, #0x19 - beq _02002432 - ldr r1, _02002660 ; =gTextFlags - mov r0, #0x40 - ldrb r2, [r1, #0x0] - orr r0, r2 - strb r0, [r1, #0x0] -_02002432: - add r0, r4, #0x0 - add r0, #0x26 - ldrb r0, [r0, #0x0] - cmp r0, #0x0 - beq _0200248C - add r0, r4, #0x0 - add r0, #0x25 - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x19 - lsr r0, r0, #0x19 - beq _0200248C - add r0, r4, #0x0 - add r0, #0x26 - ldrb r0, [r0, #0x0] - sub r1, r0, #0x1 - add r0, r4, #0x0 - add r0, #0x26 - strb r1, [r0, #0x0] - ldr r0, _02002660 ; =gTextFlags - ldrb r0, [r0, #0x0] - lsl r1, r0, #0x1f - lsr r1, r1, #0x1f - beq _02002486 - ldr r1, _02002658 ; =gMain - ldr r2, [r1, #0x48] - mov r1, #0x3 - tst r1, r2 - bne _02002478 - ldr r1, _0200265C ; =gMain + 0x40 - ldrh r1, [r1, #0x20] - cmp r1, #0x0 - beq _02002486 - lsl r0, r0, #0x1b - lsr r0, r0, #0x1f - beq _02002486 -_02002478: - ldrb r1, [r6, #0x0] - mov r0, #0x10 - add r4, #0x26 - orr r0, r1 - strb r0, [r6, #0x0] - mov r0, #0x0 - strb r0, [r4, #0x0] -_02002486: - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_0200248C: - add r0, r4, #0x0 - add r0, #0x25 - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x19 - lsr r1, r0, #0x19 - add r0, r4, #0x0 - add r0, #0x26 - strb r1, [r0, #0x0] - ldr r0, [r4, #0x0] - ldrh r5, [r0, #0x0] - add r0, r0, #0x2 - str r0, [r4, #0x0] - mov r0, #0xf1 - lsl r0, r0, #0x8 - cmp r5, r0 - bne _020024B0 - bl GF_AssertFail -_020024B0: - ldr r0, _02002664 ; =0x0000F0FD - cmp r5, r0 - bgt _020024DA - bge _0200250E - ldr r1, _02002668 ; =0x000025BD \f - cmp r5, r1 - bgt _020024D0 - sub r0, r1, #0x1 ; \r - cmp r5, r0 - blt _020024CE - bne _020024C8 - b _020026D8 -_020024C8: - cmp r5, r1 - bne _020024CE - b _020026EC -_020024CE: - b _02002700 -_020024D0: - mov r0, #0xe - lsl r0, r0, #0xc - cmp r5, r0 - beq _020024F2 - b _02002700 -_020024DA: - ldr r0, _0200266C ; =0x0000FFFE EXT_CTRL_CODE_BEGIN - cmp r5, r0 - bgt _020024E4 - beq _0200251A - b _02002700 -_020024E4: - add r0, r0, #0x1 ; =0x0000FFFF EOS - cmp r5, r0 - beq _020024EC - b _02002700 -_020024EC: - add sp, #0xc - mov r0, #0x1 - pop {r3-r6, pc} -_020024F2: - ldrb r0, [r4, #0xa] - mov r1, #0x1 - strb r0, [r4, #0xc] - ldrb r0, [r4, #0x9] - bl GetFontAttribute - ldrb r1, [r4, #0xf] - ldrb r2, [r4, #0xd] - add sp, #0xc - add r0, r1, r0 - add r0, r2, r0 - strb r0, [r4, #0xd] - mov r0, #0x2 - pop {r3-r6, pc} -_0200250E: - ldr r0, [r4, #0x0] - add sp, #0xc - add r0, r0, #0x2 - str r0, [r4, #0x0] - mov r0, #0x2 - pop {r3-r6, pc} -_0200251A: - ldr r0, [r4, #0x0] - sub r0, r0, #0x2 - str r0, [r4, #0x0] - bl MsgArray_GetControlCode - lsl r0, r0, #0x10 - ldr r1, _02002670 ; =0x0000FE06 - lsr r0, r0, #0x10 - cmp r0, r1 - bgt _02002552 - blt _02002532 - b _02002678 -_02002532: - mov r1, #0x2 - lsl r1, r1, #0x8 - sub r1, r0, r1 - cmp r1, #0x4 - bhi _0200255C - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_02002548: ; jump table (using 16-bit offset) - .short _020025B4 - _02002548 - 2; case 0x200 - .short _020025DE - _02002548 - 2; case 0x201 - .short _02002600 - _02002548 - 2; case 0x202 - .short _02002618 - _02002548 - 2; case 0x203 - .short _02002624 - _02002548 - 2; case 0x204 -_02002552: - mov r1, #0xff - lsl r1, r1, #0x8 - cmp r0, r1 - bgt _0200255E - beq _02002566 -_0200255C: - b _020026CA -_0200255E: - add r1, r1, #0x1 - cmp r0, r1 - beq _02002630 - b _020026CA -_02002566: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - cmp r0, #0xff - bne _02002596 - ldrb r0, [r4, #0x11] - ldrb r2, [r4, #0x17] - sub r1, r0, #0x1 - lsr r0, r1, #0x1f - add r0, r1, r0 - asr r0, r0, #0x1 - add r0, #0x64 - strb r0, [r4, #0x17] - cmp r2, #0x64 - blo _02002644 - cmp r2, #0x6b - bhs _02002644 - sub r2, #0x64 - lsl r0, r2, #0x10 - lsr r0, r0, #0x10 - b _0200259E -_02002596: - cmp r0, #0x64 - blo _0200259E - strb r0, [r4, #0x17] - b _020026CA -_0200259E: - lsl r1, r0, #0x1 - add r0, r1, #0x1 - strb r0, [r4, #0x11] - add r0, r1, #0x2 - strb r0, [r4, #0x13] - ldrb r0, [r4, #0x11] - ldrb r1, [r4, #0x12] - ldrb r2, [r4, #0x13] - bl GenerateFontHalfRowLookupTable - b _020026CA -_020025B4: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - lsl r0, r0, #0x10 - lsr r3, r0, #0x10 - ldrb r1, [r4, #0xc] - ldrb r2, [r4, #0xd] - add r0, r4, #0x0 - bl FUN_0201C1EC - add r0, r4, #0x0 - add r0, #0x25 - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x18 - lsr r0, r0, #0x1f - beq _020026CA - ldr r0, [r4, #0x4] - bl CopyWindowToVram - b _020026CA -_020025DE: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - add r1, r4, #0x0 - add r1, #0x26 - strb r0, [r1, #0x0] - ldr r0, [r4, #0x0] - bl MsgArray_SkipControlCode - str r0, [r4, #0x0] - mov r0, #0x6 - add r4, #0x24 - strb r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_02002600: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - strh r0, [r4, #0x2a] - ldr r0, [r4, #0x0] - bl MsgArray_SkipControlCode - str r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_02002618: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - strb r0, [r4, #0xc] - b _020026CA -_02002624: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - strb r0, [r4, #0xd] - b _020026CA -_02002630: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - cmp r0, #0x64 - beq _02002646 - cmp r0, #0xc8 - beq _0200264E -_02002644: - b _020026CA -_02002646: - mov r0, #0x0 - strh r0, [r4, #0x14] - strb r0, [r4, #0x16] - b _020026CA -_0200264E: - ldr r0, _02002674 ; =0x0000FFFC - strh r0, [r4, #0x14] - mov r0, #0x0 - strb r0, [r4, #0x16] - b _020026CA - .balign 4 -_02002658: .word gMain -_0200265C: .word gMain + 0x40 -_02002660: .word gTextFlags -_02002664: .word 0x0000F0FD -_02002668: .word 0x000025BD -_0200266C: .word 0x0000FFFE -_02002670: .word 0x0000FE06 -_02002674: .word 0x0000FFFC -_02002678: - ldr r0, [r4, #0x0] - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - mov r0, #0xfe - lsl r0, r0, #0x8 - cmp r1, r0 - beq _020026AE - add r0, r0, #0x1 - cmp r1, r0 - bne _020026CA - add r0, r4, #0x0 - mov r1, #0x2 - add r0, #0x24 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - bl FUN_0200284C - ldr r0, [r4, #0x0] - bl MsgArray_SkipControlCode - str r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_020026AE: - add r0, r4, #0x0 - mov r1, #0x3 - add r0, #0x24 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - bl FUN_0200284C - ldr r0, [r4, #0x0] - bl MsgArray_SkipControlCode - str r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_020026CA: - ldr r0, [r4, #0x0] - bl MsgArray_SkipControlCode - str r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x2 - pop {r3-r6, pc} -_020026D8: - add r0, r4, #0x0 - mov r1, #0x2 - add r0, #0x24 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - bl FUN_0200284C - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_020026EC: - add r0, r4, #0x0 - mov r1, #0x3 - add r0, #0x24 - strb r1, [r0, #0x0] - add r0, r4, #0x0 - bl FUN_0200284C - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_02002700: - ldrb r0, [r6, #0x0] - add r1, r5, #0x0 - lsl r0, r0, #0x1c - lsr r0, r0, #0x1c - bl FUN_02002D94 - add r5, r0, #0x0 - ldrb r0, [r4, #0xc] - add r2, r5, #0x0 - add r3, r5, #0x0 - str r0, [sp, #0x0] - ldrb r0, [r4, #0xd] - add r2, #0x80 - add r3, #0x81 - str r0, [sp, #0x4] - ldrh r0, [r4, #0x14] - add r1, r5, #0x0 - str r0, [sp, #0x8] - ldrb r2, [r2, #0x0] - ldrb r3, [r3, #0x0] - ldr r0, [r4, #0x4] - bl CopyGlyphToWindow - add r5, #0x80 - ldrb r1, [r5, #0x0] - ldrb r0, [r4, #0xe] - ldrb r2, [r4, #0xc] - add sp, #0xc - add r0, r1, r0 - add r0, r2, r0 - strb r0, [r4, #0xc] - mov r0, #0x0 - pop {r3-r6, pc} -_02002742: - bl FUN_02002B3C - cmp r0, #0x0 - beq _02002756 - add r0, r4, #0x0 - bl FUN_02002A00 - mov r0, #0x0 - add r4, #0x24 - strb r0, [r4, #0x0] -_02002756: - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_0200275C: - bl FUN_02002B18 - cmp r0, #0x0 - beq _02002780 - add r0, r4, #0x0 - bl FUN_02002A00 - ldrb r1, [r4, #0x12] - ldr r0, [r4, #0x4] - bl FillWindowPixelBuffer - ldrb r0, [r4, #0xa] - strb r0, [r4, #0xc] - ldrb r0, [r4, #0xb] - strb r0, [r4, #0xd] - mov r0, #0x0 - add r4, #0x24 - strb r0, [r4, #0x0] -_02002780: - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_02002786: - bl FUN_02002B18 - cmp r0, #0x0 - beq _020027B0 - add r0, r4, #0x0 - bl FUN_02002A00 - ldrb r0, [r4, #0x9] - mov r1, #0x1 - bl GetFontAttribute - ldrb r1, [r4, #0xf] - add r1, r1, r0 - add r0, r4, #0x0 - add r0, #0x27 - strb r1, [r0, #0x0] - ldrb r0, [r4, #0xa] - strb r0, [r4, #0xc] - mov r0, #0x4 - add r4, #0x24 - strb r0, [r4, #0x0] -_020027B0: - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_020027B6: - add r0, #0x27 - ldrb r2, [r0, #0x0] - cmp r2, #0x0 - beq _02002800 - cmp r2, #0x4 - ldrb r5, [r4, #0x12] - bge _020027D8 - lsl r3, r5, #0x4 - orr r3, r5 - lsl r3, r3, #0x18 - ldr r0, [r4, #0x4] - mov r1, #0x0 - lsr r3, r3, #0x18 - bl ScrollWindow - mov r1, #0x0 - b _020027F2 -_020027D8: - lsl r3, r5, #0x4 - orr r3, r5 - lsl r3, r3, #0x18 - ldr r0, [r4, #0x4] - mov r1, #0x0 - mov r2, #0x4 - lsr r3, r3, #0x18 - bl ScrollWindow - add r0, r4, #0x0 - add r0, #0x27 - ldrb r0, [r0, #0x0] - sub r1, r0, #0x4 -_020027F2: - add r0, r4, #0x0 - add r0, #0x27 - strb r1, [r0, #0x0] - ldr r0, [r4, #0x4] - bl CopyWindowToVram - b _02002806 -_02002800: - mov r0, #0x0 - add r4, #0x24 - strb r0, [r4, #0x0] -_02002806: - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_0200280C: - mov r0, #0x0 - add r4, #0x24 - strb r0, [r4, #0x0] - add sp, #0xc - mov r0, #0x3 - pop {r3-r6, pc} -_02002818: - add r0, #0x26 - ldrb r0, [r0, #0x0] - cmp r0, #0x0 - beq _0200282C - add r0, r4, #0x0 - add r0, #0x26 - ldrb r0, [r0, #0x0] - add r4, #0x26 - sub r0, r0, #0x1 - b _02002830 -_0200282C: - mov r0, #0x0 - add r4, #0x24 -_02002830: - add sp, #0xc - strb r0, [r4, #0x0] - mov r0, #0x3 - pop {r3-r6, pc} -_02002838: - mov r0, #0x1 - add sp, #0xc - pop {r3-r6, pc} - .balign 4 - - thumb_func_start FUN_02002840 -FUN_02002840: ; 0x02002840 - ldr r1, _02002848 ; =gTextFlags - strh r0, [r1, #0x2] - bx lr - nop -_02002848: .word gTextFlags - - thumb_func_start FUN_0200284C -FUN_0200284C: ; 0x0200284C - ldr r1, _02002874 ; =gTextFlags - add r0, #0x1c - ldrb r1, [r1, #0x0] - lsl r1, r1, #0x1d - lsr r1, r1, #0x1f - beq _02002862 - ldrb r2, [r0, #0x2] - mov r1, #0xff - bic r2, r1 - strb r2, [r0, #0x2] - bx lr -_02002862: - ldrb r2, [r0, #0x1] - mov r1, #0x60 - bic r2, r1 - strb r2, [r0, #0x1] - ldrb r2, [r0, #0x1] - mov r1, #0x1f - bic r2, r1 - strb r2, [r0, #0x1] - bx lr - .balign 4 -_02002874: .word gTextFlags - - thumb_func_start FUN_02002878 -FUN_02002878: ; 0x02002878 - push {r4-r7, lr} - sub sp, #0x2c - add r5, r0, #0x0 - ldr r0, _020029F8 ; =gTextFlags - add r4, r5, #0x0 - ldrb r0, [r0, #0x0] - add r4, #0x1c - lsl r0, r0, #0x1d - lsr r0, r0, #0x1f - beq _0200288E - b _020029F4 -_0200288E: - ldrb r0, [r4, #0x1] - lsl r1, r0, #0x1b - lsr r2, r1, #0x1b - beq _020028AC - mov r1, #0x1f - add r2, #0xff - bic r0, r1 - lsl r1, r2, #0x18 - lsr r2, r1, #0x18 - mov r1, #0x1f - and r1, r2 - orr r0, r1 - add sp, #0x2c - strb r0, [r4, #0x1] - pop {r4-r7, pc} -_020028AC: - ldr r0, [r5, #0x4] - bl GetWindowBgId - str r0, [sp, #0x20] - ldr r0, [r5, #0x4] - bl GetWindowX - str r0, [sp, #0x24] - ldr r0, [r5, #0x4] - bl GetWindowY - str r0, [sp, #0x28] - ldr r0, [r5, #0x4] - bl GetWindowWidth - ldr r1, _020029F8 ; =gTextFlags - ldrh r6, [r1, #0x2] - ldr r1, [sp, #0x28] - add r7, r1, #0x2 - ldr r1, [sp, #0x24] - add r2, r6, #0x0 - add r0, r1, r0 - str r0, [sp, #0x1c] - add r0, r0, #0x1 - str r0, [sp, #0x18] - 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] - add r2, #0x12 - mov r12, r2 - ldrb r2, [r4, #0x1] - ldr r0, [r5, #0x4] - ldr r1, [sp, #0x20] - lsl r2, r2, #0x19 - lsr r3, r2, #0x1e - ldr r2, _020029FC ; =UNK_020ECB50 - ldr r0, [r0, #0x0] - ldrb r2, [r2, r3] - mov r3, r12 - lsl r2, r2, #0x2 - add r2, r3, r2 - ldr r3, [sp, #0x18] - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x1c] - ldr r1, [sp, #0x20] - add r0, r0, #0x2 - 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] - ldrb r2, [r4, #0x1] - add r7, r6, #0x0 - ldr r0, [r5, #0x4] - lsl r2, r2, #0x19 - lsr r3, r2, #0x1e - ldr r2, _020029FC ; =UNK_020ECB50 - add r7, #0x13 - ldrb r2, [r2, r3] - ldr r3, [sp, #0x10] - ldr r0, [r0, #0x0] - lsl r2, r2, #0x2 - add r2, r7, r2 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x28] - add r7, r6, #0x0 - add r0, r0, #0x3 - str r0, [sp, #0x14] - lsl r0, r0, #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] - ldrb r2, [r4, #0x1] - ldr r0, [r5, #0x4] - add r7, #0x14 - lsl r2, r2, #0x19 - lsr r3, r2, #0x1e - ldr r2, _020029FC ; =UNK_020ECB50 - ldr r0, [r0, #0x0] - ldrb r2, [r2, r3] - ldr r3, [sp, #0x18] - ldr r1, [sp, #0x20] - lsl r2, r2, #0x2 - add r2, r7, r2 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [sp, #0x14] - add r6, #0x15 - lsl r0, r0, #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] - ldrb r2, [r4, #0x1] - ldr r0, [r5, #0x4] - ldr r1, [sp, #0x20] - lsl r2, r2, #0x19 - lsr r3, r2, #0x1e - ldr r2, _020029FC ; =UNK_020ECB50 - ldr r0, [r0, #0x0] - ldrb r2, [r2, r3] - ldr r3, [sp, #0x10] - lsl r2, r2, #0x2 - add r2, r6, r2 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [r5, #0x4] - ldr r1, [sp, #0x20] - ldr r0, [r0, #0x0] - bl BgCommitTilemapBufferToVram - ldrb r1, [r4, #0x1] - mov r0, #0x1f - bic r1, r0 - mov r0, #0x8 - orr r0, r1 - strb r0, [r4, #0x1] - ldrb r2, [r4, #0x1] - mov r1, #0x60 - add r0, r2, #0x0 - bic r0, r1 - lsl r1, r2, #0x19 - lsr r1, r1, #0x1e - add r1, r1, #0x1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - lsl r1, r1, #0x1e - lsr r1, r1, #0x19 - orr r0, r1 - strb r0, [r4, #0x1] -_020029F4: - add sp, #0x2c - pop {r4-r7, pc} - .balign 4 -_020029F8: .word gTextFlags -_020029FC: .word UNK_020ECB50 - - thumb_func_start FUN_02002A00 -FUN_02002A00: ; 0x02002A00 - push {r3-r7, lr} - sub sp, #0x18 - add r5, r0, #0x0 - ldr r0, [r5, #0x4] - bl GetWindowBgId - str r0, [sp, #0x10] - ldr r0, [r5, #0x4] - bl GetWindowX - str r0, [sp, #0x14] - ldr r0, [r5, #0x4] - bl GetWindowY - add r6, r0, #0x0 - ldr r0, [r5, #0x4] - bl GetWindowWidth - ldr r1, _02002A90 ; =gTextFlags - add r7, r6, #0x2 - ldrh r4, [r1, #0x2] - ldr r1, [sp, #0x14] - add r6, r1, r0 - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x0] - mov r0, #0x1 - str r0, [sp, #0x4] - mov r0, #0x2 - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r0, [r5, #0x4] - add r2, r4, #0x0 - add r2, #0xa - add r3, r6, #0x1 - lsl r2, r2, #0x10 - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - ldr r1, [sp, #0x10] - 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] - mov r0, #0x2 - str r0, [sp, #0x8] - mov r0, #0x10 - str r0, [sp, #0xc] - ldr r0, [r5, #0x4] - add r4, #0xb - add r3, r6, #0x2 - lsl r2, r4, #0x10 - lsl r3, r3, #0x18 - ldr r0, [r0, #0x0] - ldr r1, [sp, #0x10] - lsr r2, r2, #0x10 - lsr r3, r3, #0x18 - bl FillBgTilemapRect - ldr r0, [r5, #0x4] - ldr r1, [sp, #0x10] - ldr r0, [r0, #0x0] - bl BgCommitTilemapBufferToVram - add sp, #0x18 - pop {r3-r7, pc} - nop -_02002A90: .word gTextFlags - - thumb_func_start FUN_02002A94 -FUN_02002A94: ; 0x02002A94 - push {r3, lr} - ldr r0, _02002ACC ; =gMain - ldr r1, [r0, #0x48] - mov r0, #0x3 - tst r0, r1 - bne _02002AB2 - ldr r0, _02002AD0 ; =gMain + 0x40 - ldrh r0, [r0, #0x20] - cmp r0, #0x0 - beq _02002AC6 - ldr r0, _02002AD4 ; =gTextFlags - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x1b - lsr r0, r0, #0x1f - beq _02002AC6 -_02002AB2: - ldr r0, _02002AD8 ; =0x000005DC - bl FUN_020054C8 - ldr r1, _02002AD4 ; =gTextFlags - mov r0, #0x80 - ldrb r2, [r1, #0x0] - orr r0, r2 - strb r0, [r1, #0x0] - mov r0, #0x1 - pop {r3, pc} -_02002AC6: - mov r0, #0x0 - pop {r3, pc} - nop -_02002ACC: .word gMain -_02002AD0: .word gMain + 0x40 -_02002AD4: .word gTextFlags -_02002AD8: .word 0x000005DC - - thumb_func_start FUN_02002ADC -FUN_02002ADC: ; 0x02002ADC - push {r4, lr} - add r2, r0, #0x0 - add r2, #0x1c - ldrb r1, [r2, #0x2] - add r4, r1, #0x0 - cmp r4, #0x64 - bne _02002AEE - mov r0, #0x1 - pop {r4, pc} -_02002AEE: - mov r3, #0xff - bic r1, r3 - add r3, r4, #0x1 - lsl r3, r3, #0x18 - lsr r3, r3, #0x18 - lsl r3, r3, #0x18 - lsr r3, r3, #0x18 - orr r1, r3 - strb r1, [r2, #0x2] - ldr r1, _02002B14 ; =gTextFlags - ldrb r1, [r1, #0x0] - lsl r1, r1, #0x1a - lsr r1, r1, #0x1f - beq _02002B10 - bl FUN_02002A94 - pop {r4, pc} -_02002B10: - mov r0, #0x0 - pop {r4, pc} - .balign 4 -_02002B14: .word gTextFlags - - thumb_func_start FUN_02002B18 -FUN_02002B18: ; 0x02002B18 - push {r4, lr} - ldr r1, _02002B38 ; =gTextFlags - add r4, r0, #0x0 - ldrb r1, [r1, #0x0] - lsl r1, r1, #0x1d - lsr r1, r1, #0x1f - beq _02002B2C - bl FUN_02002ADC - pop {r4, pc} -_02002B2C: - bl FUN_02002878 - add r0, r4, #0x0 - bl FUN_02002A94 - pop {r4, pc} - .balign 4 -_02002B38: .word gTextFlags - - thumb_func_start FUN_02002B3C -FUN_02002B3C: ; 0x02002B3C - push {r3, lr} - ldr r1, _02002B5C ; =gTextFlags - ldrb r1, [r1, #0x0] - lsl r1, r1, #0x1d - lsr r1, r1, #0x1f - beq _02002B52 - bl FUN_02002ADC - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - pop {r3, pc} -_02002B52: - bl FUN_02002A94 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - pop {r3, pc} - .balign 4 -_02002B5C: .word gTextFlags - - thumb_func_start FUN_02002B60 -FUN_02002B60: ; 0x02002B60 - ldr r2, _02002B78 ; =gTextFlags - mov r1, #0x1 - ldrb r3, [r2, #0x0] - lsl r0, r0, #0x18 - bic r3, r1 - lsr r1, r0, #0x18 - mov r0, #0x1 - and r0, r1 - orr r0, r3 - strb r0, [r2, #0x0] - bx lr - nop -_02002B78: .word gTextFlags - - thumb_func_start FUN_02002B7C -FUN_02002B7C: ; 0x02002B7C - push {r3-r4} - ldr r1, _02002BB4 ; =gTextFlags - mov r3, #0x4 - ldrb r2, [r1, #0x0] - mov r4, #0x1 - bic r2, r3 - add r3, r0, #0x0 - and r3, r4 - lsl r3, r3, #0x18 - lsr r3, r3, #0x18 - lsl r3, r3, #0x1f - lsr r3, r3, #0x1d - orr r2, r3 - asr r0, r0, #0x1 - and r0, r4 - strb r2, [r1, #0x0] - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - lsl r0, r0, #0x1f - ldrb r2, [r1, #0x0] - mov r3, #0x20 - lsr r0, r0, #0x1a - bic r2, r3 - orr r0, r2 - strb r0, [r1, #0x0] - pop {r3-r4} - bx lr - nop -_02002BB4: .word gTextFlags - - thumb_func_start FUN_02002BB8 -FUN_02002BB8: ; 0x02002BB8 - ldr r2, _02002BD0 ; =gTextFlags - lsl r0, r0, #0x18 - ldrb r3, [r2, #0x0] - lsr r0, r0, #0x18 - mov r1, #0x10 - lsl r0, r0, #0x1f - bic r3, r1 - lsr r0, r0, #0x1b - orr r0, r3 - strb r0, [r2, #0x0] - bx lr - nop -_02002BD0: .word gTextFlags - - thumb_func_start FUN_02002BD4 -FUN_02002BD4: ; 0x02002BD4 - ldr r0, _02002BE0 ; =gTextFlags - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x19 - lsr r0, r0, #0x1f - bx lr - nop -_02002BE0: .word gTextFlags - - thumb_func_start FUN_02002BE4 -FUN_02002BE4: ; 0x02002BE4 - ldr r1, _02002BF0 ; =gTextFlags - mov r0, #0x40 - ldrb r2, [r1, #0x0] - bic r2, r0 - strb r2, [r1, #0x0] - bx lr - .balign 4 -_02002BF0: .word gTextFlags - - thumb_func_start FUN_02002BF4 -FUN_02002BF4: ; 0x02002BF4 - ldr r0, _02002C00 ; =gTextFlags - ldrb r0, [r0, #0x0] - lsl r0, r0, #0x18 - lsr r0, r0, #0x1f - bx lr - nop -_02002C00: .word gTextFlags - - thumb_func_start FUN_02002C04 -FUN_02002C04: ; 0x02002C04 - ldr r1, _02002C10 ; =gTextFlags - mov r0, #0x80 - ldrb r2, [r1, #0x0] - bic r2, r0 - strb r2, [r1, #0x0] - bx lr - .balign 4 -_02002C10: .word gTextFlags diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index ea77f3ae..d6d06005 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -331,7 +331,7 @@ FUN_020054A8: ; 0x020054A8 push {r4-r6, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_020054C8 + bl PlaySE add r6, r0, #0x0 ldr r1, _020054C4 ; =0x0000FFFF add r0, r5, #0x0 @@ -342,8 +342,8 @@ FUN_020054A8: ; 0x020054A8 nop _020054C4: .word 0x0000FFFF - thumb_func_start FUN_020054C8 -FUN_020054C8: ; 0x020054C8 + thumb_func_start PlaySE +PlaySE: ; 0x020054C8 push {r4-r6, lr} add r5, r0, #0x0 bl FUN_020048D0 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index 201e2a14..42aad43e 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -424,7 +424,7 @@ FUN_02014878: ; 0x02014878 add r2, #0x9a strb r0, [r2, #0x0] ldr r0, _020148A4 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE _020148A2: pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index ad2eaa0e..f2ef44dc 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -215,7 +215,7 @@ FUN_020351A0: ; 0x020351A0 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, _0203524C ; =0x000005FD - bl FUN_020054C8 + bl PlaySE bl FUN_02035254 add r4, r0, #0x0 mov r0, #0x71 diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index 43942b2f..5e124ff5 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -138,7 +138,7 @@ _02046118: mov r2, #0x11 bl FUN_0204C1B4 ldr r0, _0204620C ; =0x00000679 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] @@ -167,7 +167,7 @@ _02046160: mov r2, #0x10 bl FUN_0204C1B4 ldr r0, _0204620C ; =0x00000679 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 7e896527..97e67111 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -183,7 +183,7 @@ _020485F6: cmp r0, #0x0 beq _02048688 ldr r0, _02048690 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE mov r0, #0x12 str r0, [r5, #0x38] ldr r0, [r4, #0x0] diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 501432c0..597444e9 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -930,7 +930,7 @@ _0204905C: ; jump table (using 16-bit offset) .short _020490AE - _0204905C - 2; case 3 _02049064: ldr r0, _020490BC ; =0x00000603 - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x4] add r0, r6, #0x0 bl FUN_0204AD60 @@ -2806,7 +2806,7 @@ _02049F34: ; jump table (using 16-bit offset) .short _02049F86 - _02049F34 - 2; case 3 _02049F3C: ldr r0, _02049F94 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x4] add r0, r6, #0x0 bl FUN_0204AD60 diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s index c7a18f3f..d330a96d 100644 --- a/arm9/asm/unk_0204C1B4.s +++ b/arm9/asm/unk_0204C1B4.s @@ -375,7 +375,7 @@ FUN_0204C468: ; 0x0204C468 b _0204C49C _0204C484: ldr r0, _0204C4A0 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x0 bl FUN_0204AFC8 ldr r0, [r4, #0x4] @@ -577,7 +577,7 @@ _0204C5FE: b _0204C63C _0204C61C: ldr r0, _0204C640 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r0, #0x0 bl MOD05_021D7CA4 ldr r0, [r4, #0x4] diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 88d8bf23..87fb50fc 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -5212,7 +5212,7 @@ _0204F2AA: str r3, [sp, #0x4] bl FUN_02004DCC ldr r0, _0204F2D4 ; =0x000005F6 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 pop {r4-r6, pc} nop @@ -5356,7 +5356,7 @@ _0204F3AC: mov r2, #0x1 bl MOD18_0224DCB8 ldr r0, _0204F5F0 ; =0x00000625 - bl FUN_020054C8 + bl PlaySE b _0204F410 _0204F3FC: bl FUN_02031190 @@ -5401,7 +5401,7 @@ _0204F41A: ldr r0, _0204F5F8 ; =0x00000425 bl FUN_0200521C ldr r0, _0204F5F0 ; =0x00000625 - bl FUN_020054C8 + bl PlaySE b _0204F480 _0204F46C: bl FUN_02031190 @@ -5504,7 +5504,7 @@ _0204F4D2: _0204F54A: bl FUN_0204F7E4 ldr r0, _0204F60C ; =0x0000062B - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_020269A0 add r1, sp, #0x8 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 7a921b4a..ae7380b7 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1946,7 +1946,7 @@ _02051DA2: tst r1, r0 beq _02051DC8 ldr r0, _02051E20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x81 ldrsb r1, [r4, r0] add r4, #0x80 @@ -1966,7 +1966,7 @@ _02051DC8: tst r0, r1 beq _02051DDA ldr r0, _02051E20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x2 pop {r4, pc} @@ -1976,7 +1976,7 @@ _02051DDA: pop {r4, pc} _02051DE0: ldr r0, _02051E20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x7c] mov r1, #0x10 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 6ecb7e68..c17a3187 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -646,7 +646,7 @@ FUN_0205339C: ; 0x0205339C beq _0205343C _020533CC: ldr r0, _02053440 ; =0x0000064F - bl FUN_020054C8 + bl PlaySE ldrb r1, [r5, #0x8] add r0, r4, #0x0 bl FUN_02057634 diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index d20950c3..18959ed6 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -329,7 +329,7 @@ _02053912: add r3, r0, #0x0 bl FUN_0200E1D0 ldr r0, _020539F0 ; =0x0000062F - bl FUN_020054C8 + bl PlaySE mov r0, #0x5f mov r1, #0x1 lsl r0, r0, #0x2 @@ -354,7 +354,7 @@ _0205396E: cmp r0, #0x0 beq _020539EA ldr r0, _020539F4 ; =0x00000631 - bl FUN_020054C8 + bl PlaySE mov r0, #0x6 lsl r0, r0, #0x6 ldr r1, [r4, r0] @@ -464,7 +464,7 @@ _02053A4E: bl FUN_02053F38 mov r0, #0x63 lsl r0, r0, #0x4 - bl FUN_020054C8 + bl PlaySE mov r0, #0x5f mov r1, #0x1 lsl r0, r0, #0x2 @@ -660,7 +660,7 @@ _02053BD6: cmp r0, #0x0 beq _02053C8C ldr r0, _02053C94 ; =0x00000632 - bl FUN_020054C8 + bl PlaySE mov r0, #0x6 lsl r0, r0, #0x6 ldr r1, [r4, r0] diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s index 539dc91b..b3bd5347 100644 --- a/arm9/asm/unk_020557F4.s +++ b/arm9/asm/unk_020557F4.s @@ -236,21 +236,21 @@ _020559A6: cmp r0, #0x1 bne _020559B8 ldr r0, _02055A24 ; =0x0000061F - bl FUN_020054C8 + bl PlaySE _020559B8: add r0, r5, #0x0 bl FUN_02054AF0 cmp r0, #0x1 bne _020559C8 ldr r0, _02055A28 ; =0x00000641 - bl FUN_020054C8 + bl PlaySE _020559C8: add r0, r5, #0x0 bl FUN_0205483C cmp r0, #0x1 bne _020559D8 ldr r0, _02055A2C ; =0x00000642 - bl FUN_020054C8 + bl PlaySE _020559D8: add r0, r5, #0x0 bl FUN_02054830 @@ -263,7 +263,7 @@ _020559D8: cmp r0, #0x1 beq _020559F8 ldr r0, _02055A30 ; =0x00000655 - bl FUN_020054C8 + bl PlaySE _020559F8: add r0, r4, #0x0 bl FUN_020586F0 @@ -280,7 +280,7 @@ _020559F8: bne _02055A20 _02055A1A: ldr r0, _02055A34 ; =0x00000653 - bl FUN_020054C8 + bl PlaySE _02055A20: pop {r4-r6, pc} nop @@ -723,7 +723,7 @@ FUN_02055DAC: ; 0x02055DAC bl FUN_020584D4 add r4, r0, #0x0 ldr r0, _02055EF4 ; =0x00000654 - bl FUN_020054C8 + bl PlaySE cmp r4, #0x0 bne _02055E62 add r0, r5, #0x0 @@ -868,7 +868,7 @@ FUN_02055EF8: ; 0x02055EF8 cmp r0, #0x1 bne _02055F22 ldr r0, _02055F40 ; =0x00000656 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x0 add r1, r4, #0x0 mov r2, #0x5f @@ -903,7 +903,7 @@ FUN_02055F44: ; 0x02055F44 cmp r0, #0x1 bne _02055F6E ldr r0, _02055F8C ; =0x00000656 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x0 add r1, r4, #0x0 mov r2, #0x5e @@ -1356,7 +1356,7 @@ _020562CA: tst r0, r4 bne _020562DC ldr r0, _02056380 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _020562DC: ldr r1, [sp, #0x0] add r0, r6, #0x0 @@ -1417,7 +1417,7 @@ _02056356: tst r0, r4 bne _02056364 ldr r0, _02056380 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _02056364: ldr r1, [sp, #0x0] add r0, r6, #0x0 @@ -1513,11 +1513,11 @@ _02056412: cmp r4, #0x0 bne _02056426 ldr r0, _02056430 ; =0x0000061C - bl FUN_020054C8 + bl PlaySE pop {r3-r5, pc} _02056426: ldr r0, _02056434 ; =0x00000619 - bl FUN_020054C8 + bl PlaySE _0205642C: pop {r3-r5, pc} nop @@ -1841,7 +1841,7 @@ _02056680: tst r0, r4 bne _020566A0 ldr r0, _02056700 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _020566A0: ldr r1, [sp, #0x0] add r0, r6, #0x0 @@ -1961,7 +1961,7 @@ _0205678C: tst r0, r4 bne _020567AA ldr r0, _020567E0 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _020567AA: add r0, r7, #0x0 add r1, r6, #0x0 @@ -2220,7 +2220,7 @@ _02056994: tst r0, r4 bne _020569AA ldr r0, _02056A78 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _020569AA: add r0, r6, #0x0 add r1, r7, #0x0 @@ -2266,7 +2266,7 @@ _020569EC: tst r0, r4 bne _02056A14 ldr r0, _02056A78 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _02056A14: add r0, r6, #0x0 add r1, r7, #0x0 @@ -2388,7 +2388,7 @@ _02056B04: tst r0, r4 bne _02056B22 ldr r0, _02056B58 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE _02056B22: add r0, r7, #0x0 add r1, r6, #0x0 @@ -3280,7 +3280,7 @@ _020571E8: tst r0, r1 bne _02057244 ldr r0, _02057250 ; =0x00000601 - bl FUN_020054C8 + bl PlaySE b _02057244 _020571FC: cmp r6, #0x5 diff --git a/arm9/asm/unk_0205AD98.s b/arm9/asm/unk_0205AD98.s index ddcbaf43..1a853e6c 100644 --- a/arm9/asm/unk_0205AD98.s +++ b/arm9/asm/unk_0205AD98.s @@ -1229,7 +1229,7 @@ _0205B5EA: add r0, r5, #0x0 bl FUN_02058700 ldr r0, _0205B618 ; =0x0000060B - bl FUN_020054C8 + bl PlaySE pop {r3-r7, pc} nop _0205B614: .word 0x00010004 @@ -1334,7 +1334,7 @@ _0205B6B8: add r0, r5, #0x0 bl FUN_02058700 ldr r0, _0205B700 ; =0x00000647 - bl FUN_020054C8 + bl PlaySE mov r0, #0x1 add sp, #0x18 pop {r3-r5, pc} diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s index 92be6430..d3382d8c 100644 --- a/arm9/asm/unk_020607D4.s +++ b/arm9/asm/unk_020607D4.s @@ -146,7 +146,7 @@ _020608EC: strb r0, [r4, #0x0] _020608F0: ldr r0, _0206091C ; =0x000006DD - bl FUN_020054C8 + bl PlaySE b _0206090A _020608F8: bl GF_AssertFail @@ -298,7 +298,7 @@ _020609EC: mov r2, #0x0 bl MOD05_021DA4EC ldr r0, _02060B08 ; =0x000006DE - bl FUN_020054C8 + bl PlaySE b _02060B00 _02060A2C: ldr r0, [r5, #0x50] diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index eddad586..8f0d664f 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -519,7 +519,7 @@ _02064B2E: mov r1, #0x1 bl FUN_0205557C ldr r0, _02064B6C ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -636,7 +636,7 @@ _02064C24: mov r1, #0x1 bl FUN_0205557C ldr r0, _02064C60 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -661,11 +661,11 @@ FUN_02064C64: ; 0x02064C64 cmp r0, #0x0 bne _02064C72 ldr r0, _02064C7C ; =0x00000611 - bl FUN_020054C8 + bl PlaySE pop {r3, pc} _02064C72: ldr r0, _02064C80 ; =0x00000614 - bl FUN_020054C8 + bl PlaySE pop {r3, pc} nop _02064C7C: .word 0x00000611 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index cfddf2f5..8fa3df67 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -165,14 +165,14 @@ _020654EE: add r0, r5, #0x0 bl FUN_02065FE4 ldr r0, _02065550 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3-r5, pc} _0206550A: mov r0, #0x1 tst r0, r1 beq _02065542 ldr r0, _02065550 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #0x1 mvn r1, r1 cmp r4, r1 @@ -268,14 +268,14 @@ FUN_020655B0: ; 0x020655B0 add r0, r4, #0x0 bl FUN_02065FE4 ldr r0, _02065644 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r4-r6, pc} _020655DE: mov r1, #0x1 tst r0, r1 beq _02065634 ldr r0, _02065644 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x2 cmp r0, #0x5 bhi _0206562C @@ -1225,7 +1225,7 @@ FUN_02065D4C: ; 0x02065D4C cmp r6, #0x0 bne _02065D7E ldr r0, _02065DD4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02065D7E: add r0, sp, #0x0 ldrh r0, [r0, #0x2] @@ -1401,7 +1401,7 @@ FUN_02065EE4: ; 0x02065EE4 cmp r2, #0x0 bne _02065EF0 ldr r0, _02065EF4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02065EF0: pop {r3, pc} nop @@ -2068,7 +2068,7 @@ _02066426: add r3, r2, #0x0 bl FillWindowPixelRect mov r0, #0x1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0x0 bl FUN_02002B7C cmp r4, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index e7ebe1cf..e742f202 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -238,7 +238,7 @@ FUN_0206C700: ; 0x0206C700 mov r2, #0x0 bl FUN_0200CA44 mov r0, #0x1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint bl FUN_02033E74 add r0, r4, #0x0 add sp, #0x24 @@ -335,7 +335,7 @@ FUN_0206C92C: ; 0x0206C92C add r0, r4, #0x0 bl FreeToHeap mov r0, #0x0 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint pop {r4, pc} thumb_func_start FUN_0206C9C0 @@ -746,7 +746,7 @@ _0206CCCE: bl GF_AssertFail _0206CD16: ldr r0, _0206CE24 ; =0x000005F9 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 mov r1, #0x28 add r0, #0x66 @@ -811,7 +811,7 @@ _0206CD5A: mov r1, #0xb bl FUN_0206E0AC ldr r0, _0206CE28 ; =0x000005FA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 mov r1, #0x10 add r0, #0x70 @@ -892,7 +892,7 @@ _0206CE2C: add r2, #0xf3 bl FUN_02007558 ldr r0, _0206D1C8 ; =0x000005FB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 mov r1, #0x0 add r0, #0x70 @@ -968,7 +968,7 @@ _0206CEB0: mov r3, #0x3 bl FUN_02007E98 ldr r0, _0206D1D4 ; =0x000005FC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 add r0, #0x64 ldrb r0, [r0, #0x0] @@ -2723,7 +2723,7 @@ _0206DDE4: b _0206DDFA _0206DDEC: ldr r0, _0206DE04 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _0206DDFA _0206DDF4: ldr r0, _0206DE08 ; =0x00000483 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 66967f99..c504af1a 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -837,7 +837,7 @@ FUN_0206F9A4: ; 0x0206F9A4 tst r0, r1 beq _0206F9BA ldr r0, _0206F9C4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x1b pop {r3, pc} _0206F9BA: @@ -3138,7 +3138,7 @@ _02070C6E: mov r2, #0x1 bl FUN_020713EC ldr r0, _02070CD8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0x6 bhs _02070CA6 add r0, r5, #0x0 @@ -3338,7 +3338,7 @@ _02070DCC: add r0, r0, #0x1 strb r1, [r5, r0] ldr r0, _02070E58 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE cmp r4, #0x6 beq _02070E3C cmp r4, #0x7 @@ -3525,7 +3525,7 @@ _02070FAE: cmp r1, #0x7 bne _02070FC6 ldr r0, _020710B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _020710B8 ; =0x00000B23 ldrb r0, [r4, r0] lsl r0, r0, #0x18 @@ -3544,7 +3544,7 @@ _02070FC6: bne _02070FE0 _02070FD6: ldr r0, _020710B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x0 pop {r4, pc} _02070FE0: @@ -3562,12 +3562,12 @@ _02070FE8: cmp r0, #0x0 bne _02071002 ldr r0, _020710B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x0 pop {r4, pc} _02071002: ldr r0, _020710C0 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE mov r0, #0x5 pop {r4, pc} _0207100C: @@ -3582,19 +3582,19 @@ _0207100C: cmp r1, #0x0 bne _02071030 add r0, #0x38 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_020710C4 mov r0, #0x0 pop {r4, pc} _02071030: add r0, #0x4e - bl FUN_020054C8 + bl PlaySE mov r0, #0x5 pop {r4, pc} _0207103A: add r0, #0x38 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_020710C4 mov r0, #0x0 @@ -3611,7 +3611,7 @@ _0207104A: lsr r0, r0, #0x1f bne _0207106E ldr r0, _020710B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _020710B0 ; =0x00000B25 mov r1, #0x7 strb r1, [r4, r0] @@ -3645,7 +3645,7 @@ _0207108E: cmp r1, #0x0 beq _020710AA ldr r0, _020710C0 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE mov r0, #0x5 _020710AA: pop {r4, pc} @@ -4210,7 +4210,7 @@ FUN_020714D0: ; 0x020714D0 tst r1, r2 beq _0207150C ldr r0, _02071554 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071558 ; =0x00000B25 ldrb r1, [r4, r0] cmp r1, #0x6 @@ -4236,7 +4236,7 @@ _0207150C: tst r1, r2 beq _02071522 ldr r0, _02071554 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_02074538 mov r0, #0x3 @@ -4348,7 +4348,7 @@ _020715EA: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4419,7 +4419,7 @@ _02071630: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4432,7 +4432,7 @@ _02071692: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4445,7 +4445,7 @@ _020716AE: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4474,7 +4474,7 @@ _020716EA: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4487,7 +4487,7 @@ _02071706: mov r1, #0x13 strb r1, [r4, r0] ldr r0, _02071740 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x14 pop {r3-r5, pc} @@ -4498,7 +4498,7 @@ _02071722: add r0, #0x38 add r1, #0x23 strb r2, [r1, #0x0] - bl FUN_020054C8 + bl PlaySE mov r0, #0x1b add sp, #0x8 pop {r3-r5, pc} @@ -4831,7 +4831,7 @@ _02071994: cmp r1, #0x6 blo _020719B8 ldr r0, _02071C20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_02074538 add sp, #0x8 @@ -4848,7 +4848,7 @@ _020719B8: b _02071A26 _020719CA: ldr r0, _02071C24 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071C28 ; =0x000005C8 mov r1, #0x1 ldr r0, [r4, r0] @@ -4879,7 +4879,7 @@ _020719FA: b _02071A26 _02071A08: ldr r0, _02071C20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071C18 ; =0x00000B2A mov r1, #0x1 strh r1, [r4, r0] @@ -4888,7 +4888,7 @@ _02071A08: pop {r4-r6, pc} _02071A1A: ldr r0, _02071C34 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x1a pop {r4-r6, pc} @@ -4899,7 +4899,7 @@ _02071A26: tst r0, r1 beq _02071A42 ldr r0, _02071C20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_02074538 add sp, #0x8 @@ -4936,7 +4936,7 @@ _02071A7A: b _02071C12 _02071A7C: ldr r0, _02071C24 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071C28 ; =0x000005C8 mov r1, #0x1 ldr r0, [r4, r0] @@ -4974,7 +4974,7 @@ _02071ABA: pop {r4-r6, pc} _02071AC6: ldr r0, _02071C34 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #0x8 mov r0, #0x1a pop {r4-r6, pc} @@ -4987,7 +4987,7 @@ _02071AD2: b _02071C12 _02071ADE: ldr r0, _02071C20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x89 lsl r0, r0, #0x2 add r0, r4, r0 @@ -5016,7 +5016,7 @@ _02071B0C: cmp r0, #0x1 bne _02071C12 ldr r0, _02071C24 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071C18 ; =0x00000B2A mov r1, #0x3 strh r1, [r4, r0] @@ -5107,7 +5107,7 @@ _02071BE0: tst r0, r1 beq _02071C12 ldr r0, _02071C20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x89 lsl r0, r0, #0x2 add r0, r4, r0 @@ -5284,7 +5284,7 @@ FUN_02071D48: ; 0x02071D48 lsr r0, r0, #0x1f bne _02071D92 ldr r0, _02071DE8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x3 pop {r4, pc} _02071D72: @@ -5297,12 +5297,12 @@ _02071D72: cmp r0, #0x0 bne _02071D8C ldr r0, _02071DE8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x0 pop {r4, pc} _02071D8C: ldr r0, _02071DEC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _02071D92: mov r0, #0x5 pop {r4, pc} @@ -5316,7 +5316,7 @@ _02071D96: lsr r0, r0, #0x1f bne _02071DB6 ldr r0, _02071DE8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02071DE4 ; =0x00000B25 mov r1, #0x7 strb r1, [r4, r0] @@ -5340,7 +5340,7 @@ _02071DBA: cmp r1, #0x0 beq _02071DDE ldr r0, _02071DEC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE mov r0, #0x5 _02071DDE: pop {r4, pc} diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 0ac5ab20..92121142 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -1658,7 +1658,7 @@ FUN_0207322C: ; 0x0207322C sub sp, #0xc add r4, r0, #0x0 mov r0, #0x1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0x0 bl FUN_02002B7C ldr r0, _0207326C ; =0x000005A4 @@ -1713,7 +1713,7 @@ _020732A0: pop {r3, pc} _020732A6: ldr r0, _020732C4 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _020732BE _020732AE: ldr r0, _020732C8 ; =0x00000483 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 44777340..8a959bef 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1127,7 +1127,7 @@ _020746F2: ; jump table (using 16-bit offset) _020746FC: mov r0, #0x6a lsl r0, r0, #0x4 - bl FUN_020054C8 + bl PlaySE ldr r0, _0207482C ; =0x00000305 mov r1, #0x1 strb r1, [r4, r0] @@ -1171,7 +1171,7 @@ _0207475C: bl FUN_02074AF4 mov r0, #0x6a lsl r0, r0, #0x4 - bl FUN_020054C8 + bl PlaySE ldr r0, _0207482C ; =0x00000305 mov r1, #0x3 strb r1, [r4, r0] diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 956538f3..ee3ba62f 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -1020,7 +1020,7 @@ FUN_02075D20: ; 0x02075D20 mov r2, #0x1 bl FUN_020731E8 ldr r0, _02075DB4 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r1, _02075DB8 ; =FUN_02075CE4 ldr r0, _02075DBC ; =0x00000B14 str r1, [r5, r0] @@ -1349,7 +1349,7 @@ _02076062: ldr r0, _02076098 ; =0x00000B14 str r1, [r5, r0] ldr r0, _0207609C ; =0x000005EC - bl FUN_020054C8 + bl PlaySE mov r0, #0x5 add sp, #0xc pop {r4-r7, pc} @@ -1634,7 +1634,7 @@ _02076212: mov r2, #0x1 bl FUN_02073CB4 ldr r0, _020763FC ; =0x000005EC - bl FUN_020054C8 + bl PlaySE sub r0, r7, #0x3 ldrb r1, [r4, r0] add r1, r1, #0x1 @@ -1712,7 +1712,7 @@ _02076360: tst r0, r1 beq _020763D6 ldr r0, _02076408 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _020763E0 ; =0x00000B25 ldrb r5, [r4, r0] add r0, r4, #0x0 @@ -2011,7 +2011,7 @@ _02076612: tst r0, r1 beq _020766A8 ldr r0, _02076874 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_020734C0 ldr r0, _0207686C ; =0x00000B27 @@ -2025,7 +2025,7 @@ _0207663C: tst r0, r1 beq _020766A8 ldr r0, _02076874 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207363C ldr r0, _0207686C ; =0x00000B27 @@ -2039,7 +2039,7 @@ _0207665A: tst r0, r1 beq _020766A8 ldr r0, _02076874 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_020736F4 ldr r0, _0207686C ; =0x00000B27 @@ -2180,7 +2180,7 @@ _02076780: tst r0, r1 beq _02076868 ldr r0, _02076874 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0207686C ; =0x00000B27 mov r1, #0x3 strb r1, [r4, r0] @@ -3394,7 +3394,7 @@ _0207716A: ldrh r1, [r1, #0x24] bl Bag_TakeItem ldr r0, _0207723C ; =0x000005EC - bl FUN_020054C8 + bl PlaySE b _02077204 _020771F6: ldr r2, _02077240 ; =0x0000069C diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index adf8cadd..cdf9258d 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1050,7 +1050,7 @@ _020775E0: cmp r0, #0x0 bne _02077636 ldr r0, _020776B8 ; =0x000005E2 - bl FUN_020054C8 + bl PlaySE ldr r1, _020776BC ; =0x000004A8 mov r2, #0x0 ldr r0, [r4, r1] @@ -1191,7 +1191,7 @@ _020776F8: add r0, #0x3a bl FUN_0207916C ldr r0, _020777C4 ; =0x0000069E - bl FUN_020054C8 + bl PlaySE _0207771E: mov r2, #0x49 lsl r2, r2, #0x4 @@ -1209,7 +1209,7 @@ _0207771E: add r0, #0x3a bl FUN_0207916C ldr r0, _020777C4 ; =0x0000069E - bl FUN_020054C8 + bl PlaySE b _020777B8 _02077746: mov r2, #0x1 @@ -3308,7 +3308,7 @@ _02078820: ldr r0, [sp, #0x10] bl FUN_02078B88 ldr r0, _02078890 ; =0x0000069B - bl FUN_020054C8 + bl PlaySE _0207887E: add sp, #0x28 pop {r3-r7, pc} @@ -3829,7 +3829,7 @@ FUN_02078C98: ; 0x02078C98 tst r0, r1 beq _02078CC0 ldr r0, _02078D74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -3844,7 +3844,7 @@ _02078CC0: tst r0, r1 beq _02078CE0 ldr r0, _02078D74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -3859,7 +3859,7 @@ _02078CE0: tst r0, r1 beq _02078D00 ldr r0, _02078D74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -3874,7 +3874,7 @@ _02078D00: tst r0, r1 beq _02078D20 ldr r0, _02078D74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -3889,7 +3889,7 @@ _02078D20: tst r0, r1 beq _02078D46 ldr r0, _02078D74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -4579,7 +4579,7 @@ _0207924A: str r2, [sp, #0xc] bl FUN_02078E7C ldr r0, _02079544 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE b _02079526 _0207927C: add r0, r4, #0x0 @@ -4615,7 +4615,7 @@ _0207927C: str r2, [sp, #0xc] bl FUN_02078E7C ldr r0, _02079544 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE b _02079526 _020792CA: mov r3, #0x56 @@ -4653,7 +4653,7 @@ _020792CA: add r1, r1, #0x1 str r1, [r4, r0] ldr r0, _02079544 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE b _02079526 _0207931C: mov r2, #0x46 @@ -4679,7 +4679,7 @@ _0207931C: add r0, r0, #0x1 str r0, [r2, r1] ldr r0, _02079548 ; =0x0000069E - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -4765,7 +4765,7 @@ _020793BC: add r1, r1, #0x1 str r1, [r4, r0] ldr r0, _02079558 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -4785,7 +4785,7 @@ _0207940E: cmp r0, #0x0 bne _02079454 ldr r0, _02079560 ; =0x000005E2 - bl FUN_020054C8 + bl PlaySE ldr r0, _02079564 ; =0x000004A8 ldr r1, [r4, r0] add r1, r1, #0x1 @@ -4862,7 +4862,7 @@ _02079470: add r0, r4, r0 bl FUN_02079710 ldr r0, _02079544 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE mov r0, #0xd3 lsl r0, r0, #0x2 ldr r0, [r4, r0] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index f69ef230..3bbacdab 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -864,7 +864,7 @@ _0207A376: beq _0207A394 sub r3, #0xb2 add r0, r3, #0x0 - bl FUN_020054C8 + bl PlaySE mov r0, #0x93 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -888,7 +888,7 @@ _0207A394: bne _0207A3BE sub r3, #0xb2 add r0, r3, #0x0 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207C23C pop {r4-r6, pc} @@ -898,7 +898,7 @@ _0207A3BE: cmp r1, #0x3 bne _0207A3D6 add r0, #0x10 - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A444 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -908,7 +908,7 @@ _0207A3D6: cmp r1, #0x5 bne _0207A3EA add r0, #0x10 - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A444 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -923,7 +923,7 @@ _0207A3EA: cmp r1, #0x0 beq _0207A420 sub r0, #0xaf - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A444 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -933,7 +933,7 @@ _0207A408: cmp r1, #0x7 bne _0207A420 sub r0, #0xaf - bl FUN_020054C8 + bl PlaySE mov r0, #0x93 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1027,7 +1027,7 @@ FUN_0207A498: ; 0x0207A498 cmp r0, #0x1 bne _0207A4BE ldr r0, _0207A56C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A4BE: @@ -1042,7 +1042,7 @@ _0207A4C2: cmp r0, #0x1 bne _0207A4DE ldr r0, _0207A56C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A4DE: @@ -1059,7 +1059,7 @@ _0207A4E2: cmp r1, #0x4 bne _0207A510 add r0, #0xf - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A574 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -1080,7 +1080,7 @@ _0207A510: cmp r1, #0x1 beq _0207A542 sub r0, #0xb0 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207CBE8 ldr r2, _0207A570 ; =0x0000068D @@ -1101,7 +1101,7 @@ _0207A542: tst r0, r2 beq _0207A564 ldr r0, _0207A578 ; =0x0000069C - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A574 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -1139,7 +1139,7 @@ FUN_0207A57C: ; 0x0207A57C cmp r0, #0x1 bne _0207A5A2 ldr r0, _0207A648 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A5A2: @@ -1154,7 +1154,7 @@ _0207A5A6: cmp r0, #0x1 bne _0207A5C2 ldr r0, _0207A648 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A5C2: @@ -1180,7 +1180,7 @@ _0207A5C6: cmp r2, r1 beq _0207A618 sub r0, #0xb0 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B9C0 ldr r1, _0207A64C ; =0x0000068D @@ -1198,7 +1198,7 @@ _0207A5C6: b _0207A61E _0207A618: ldr r0, _0207A650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _0207A61E: mov r0, #0x7 pop {r4, pc} @@ -1207,7 +1207,7 @@ _0207A622: tst r0, r2 beq _0207A63E ldr r0, _0207A650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x43 lsl r0, r0, #0x4 ldr r0, [r4, r0] @@ -1256,7 +1256,7 @@ _0207A67E: cmp r0, #0x1 bne _0207A69C ldr r0, _0207A754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A69C: @@ -1271,7 +1271,7 @@ _0207A6A0: cmp r0, #0x1 bne _0207A6BC ldr r0, _0207A754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0x0 bl FUN_0207B8D8 _0207A6BC: @@ -1282,7 +1282,7 @@ _0207A6C0: tst r0, r2 beq _0207A72C ldr r0, _0207A758 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A75C ; =0x0000068D ldrb r0, [r4, r0] lsl r0, r0, #0x1c @@ -1333,7 +1333,7 @@ _0207A72C: tst r0, r2 beq _0207A74C ldr r0, _0207A758 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x93 lsl r0, r0, #0x2 ldr r1, [r4, r0] @@ -1441,7 +1441,7 @@ _0207A7F0: tst r0, r1 beq _0207A808 ldr r0, _0207A810 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _0207A814 ; =0x0000068E mov r1, #0x0 strb r1, [r4, r0] @@ -2679,7 +2679,7 @@ _0207B1D0: cmp r4, r0 beq _0207B1F4 ldr r0, _0207B1FC ; =0x000005E1 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x0 bl FUN_0207FA38 add r0, r5, #0x0 @@ -4611,7 +4611,7 @@ _0207C14A: beq _0207C160 _0207C15A: ldr r0, _0207C1D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0207C160: ldr r1, _0207C1D0 ; =0x00000697 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0207F95C.s b/arm9/asm/unk_0207F95C.s index 6c0cc9bf..4934c2fb 100644 --- a/arm9/asm/unk_0207F95C.s +++ b/arm9/asm/unk_0207F95C.s @@ -318,7 +318,7 @@ FUN_0207FB28: ; 0x0207FB28 _0207FB4A: sub r1, #0xab add r0, r1, #0x0 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0x0 bl FUN_0207FA38 ldr r1, _0207FBFC ; =0x00000696 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index b8693e4a..4f43b41e 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -3394,7 +3394,7 @@ FUN_0208251C: ; 0x0208251C mov r3, #0x3f bl FUN_0200A208 ldr r0, _0208259C ; =0x000005F8 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xa] add r0, r0, #0x1 strb r0, [r4, #0xa] diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 4e216093..74c231ea 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -1641,7 +1641,7 @@ FUN_020833D4: ; 0x020833D4 cmp r0, #0x0 bne _020833EE mov r0, #0x1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0x3 bl FUN_02002B7C mov r0, #0x1 @@ -1651,7 +1651,7 @@ _020833EE: mov r0, #0x1 bl FUN_02002B7C mov r0, #0x0 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0x0 bl FUN_02002BB8 pop {r3, pc} @@ -1661,7 +1661,7 @@ _020833EE: FUN_02083404: ; 0x02083404 push {r3, lr} mov r0, #0x0 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0x0 bl FUN_02002B7C mov r0, #0x0 diff --git a/arm9/asm/unk_02084098.s b/arm9/asm/unk_02084098.s index 20023b86..bb06cec2 100644 --- a/arm9/asm/unk_02084098.s +++ b/arm9/asm/unk_02084098.s @@ -175,7 +175,7 @@ FUN_020840CC: ; 0x020840CC add r1, r0, #0x0 bl FUN_020334E8 ldr r0, _02084110 ; =0x00000658 - bl FUN_020054C8 + bl PlaySE pop {r3-r5, pc} .balign 4 _0208410C: .word 0x00004A34 diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index 85a3ea7f..17c66660 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -644,7 +644,7 @@ _020874BC: cmp r0, #0x19 blt _020874DC ldr r0, _020874E0 ; =0x00000714 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x64] add r0, r0, #0x1 str r0, [r4, #0x64] @@ -688,7 +688,7 @@ _0208750E: cmp r0, #0x2 bne _0208754C ldr r0, _02087550 ; =0x00000714 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x6c] mov r1, #0x2 bl FUN_0200C61C @@ -737,7 +737,7 @@ _0208756A: cmp r5, #0x1 bne _0208758C ldr r0, _020875A8 ; =0x00000714 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x6c] mov r1, #0x3 bl FUN_0200C61C @@ -790,7 +790,7 @@ _020875CE: cmp r5, #0x1 bne _020875F0 ldr r0, _0208760C ; =0x00000714 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x6c] mov r1, #0x4 bl FUN_0200C61C @@ -865,7 +865,7 @@ _02087658: mov r1, #0x5 bl FUN_0200C61C ldr r0, _02087818 ; =0x00000707 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x40] mov r1, #0x2 bl FUN_02086B70 @@ -1121,15 +1121,15 @@ _02087874: b _0208789A _02087884: ldr r0, _02087A0C ; =0x00000806 - bl FUN_020054C8 + bl PlaySE b _0208789A _0208788C: ldr r0, _02087A10 ; =0x000007AA - bl FUN_020054C8 + bl PlaySE b _0208789A _02087894: ldr r0, _02087A14 ; =0x00000815 - bl FUN_020054C8 + bl PlaySE _0208789A: ldr r0, [r4, #0x60] add r0, r0, #0x1 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 3df63ca5..7cd4ef75 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -742,7 +742,7 @@ _0208A928: tst r1, r0 beq _0208A93A ldr r0, _0208A994 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #0x8 ldr r0, [r4, #0x5c] pop {r4, pc} @@ -751,7 +751,7 @@ _0208A93A: tst r0, r1 beq _0208A94E ldr r0, _0208A994 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x60] add sp, #0x8 sub r0, r0, #0x1 @@ -781,7 +781,7 @@ _0208A954: ldr r0, [r4, #0x68] bl CopyWindowPixelsToVram_TextMode ldr r0, _0208A994 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x0 mvn r0, r0 add sp, #0x8 |