diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-21 02:30:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 02:30:06 +0100 |
| commit | d192b6951f54d1397ded3db03b5e486ec679ac6f (patch) | |
| tree | ad606c5dd51de3e4df460887add66cd51566a4d7 | |
| parent | f87cb8749a8a41f7e207b151c7d5e7d3668a58cf (diff) | |
| parent | dc026c3c75898a9e3a0ea8533af4e02c5156ead6 (diff) | |
Merge pull request #409 from remicalixte/unk_020023C0
decompile unk_020023C0.s into render_text.c
95 files changed, 1638 insertions, 2223 deletions
diff --git a/.clang-format b/.clang-format index e78d3daf..6f287c3c 100644 --- a/.clang-format +++ b/.clang-format @@ -8,7 +8,7 @@ TabWidth: 4 AlignAfterOpenBracket: DontAlign Cpp11BracedListStyle: false BreakStringLiterals: false -IndentCaseLabels: false +IndentCaseLabels: true BinPackArguments: false BinPackParameters: false AlignTrailingComments: false diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 2e097910..19c29a3c 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -9,7 +9,7 @@ Static arm9 Object list_menu.o Object unk_02001B80.o Object string_util.o - Object unk_020023C0.o + Object render_text.o Object unk_02002C14.o Object unk_02002F08.o Object unk_020030E8.o 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 diff --git a/arm9/global.inc b/arm9/global.inc index 80e8756b..144d5c43 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -220,7 +220,7 @@ .extern FUN_02002218 .extern RenderText .extern FUN_02002840 -.extern FUN_02002B60 +.extern TextFlags_SetCanABSpeedUpPrint .extern FUN_02002B7C .extern FUN_02002BB8 .extern FUN_02002BD4 @@ -350,7 +350,7 @@ .extern FUN_0200541C .extern FUN_02005454 .extern FUN_020054A8 -.extern FUN_020054C8 +.extern PlaySE .extern FUN_020054F0 .extern FUN_02005508 .extern FUN_02005514 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index e228ee0a..bda94277 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -575,7 +575,7 @@ _021D856A: cmp r0, #1 bne _021D858E ldr r0, _021D8598 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #8 @@ -770,7 +770,7 @@ _021D8710: lsr r0, r0, #0x1f beq _021D8726 ldr r0, _021D8730 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_0203515C mov r0, #1 @@ -881,7 +881,7 @@ _021D87F4: lsr r0, r0, #0x1f beq _021D8816 ldr r0, _021D881C ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_02035118 mov r0, #4 @@ -1027,7 +1027,7 @@ _021D892C: lsr r0, r0, #0x1f beq _021D8946 ldr r0, _021D8950 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #4 diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index 4cd22924..442bfb26 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -1564,7 +1564,7 @@ _021DA526: beq _021DA542 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021DA542: add r0, r5, #0 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s index b4648ab3..eb8560b0 100644 --- a/arm9/modules/05/asm/mod05_021DA5B8.s +++ b/arm9/modules/05/asm/mod05_021DA5B8.s @@ -1489,7 +1489,7 @@ _021DB164: str r0, [r5, #8] strb r0, [r5, #4] ldr r0, _021DB1C8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -1552,7 +1552,7 @@ _021DB1F0: str r0, [r4, #8] strb r0, [r4, #4] ldr r0, _021DB24C ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r1, #0 str r1, [sp] mov r0, #6 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 7e1d3287..0e77cb4b 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -8960,13 +8960,13 @@ _021E060E: mov r0, #0x24 str r0, [r4, #8] ldr r0, _021E06F4 ; =0x0000063D - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0644: mov r0, #0xc8 str r0, [r4, #8] ldr r0, _021E06F8 ; =0x0000063C - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0650: ldr r0, [r4, #0x14] @@ -10156,7 +10156,7 @@ _021E0FB6: lsr r0, r0, #0x10 add r1, r1, #4 strh r0, [r5, r1] - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _021E0FCC: .word 0x00000F5C diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index 0e1a6b44..f3c8709a 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -118,7 +118,7 @@ _021E1442: _021E1456: mov r0, #0x62 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] mov r1, #0 bl FUN_0205F42C diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index dee569a9..79954077 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -531,7 +531,7 @@ MOD05_021E1ECC: ; 0x021E1ECC push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E1F30 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] @@ -1061,7 +1061,7 @@ _021E22B8: cmp r6, r0 beq _021E22EE ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021E22EE: ldr r0, _021E2360 ; =gMain mov r1, #0x40 @@ -1098,7 +1098,7 @@ _021E2320: cmp r0, #1 bne _021E235A ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r1, _021E2364 ; =0x0000FFFE @@ -1109,7 +1109,7 @@ _021E2320: pop {r4, r5, r6, pc} _021E2346: ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r0, [r0] @@ -1128,7 +1128,7 @@ MOD05_021E2368: ; 0x021E2368 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E23CC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x6d lsl r0, r0, #2 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s index 3b0d6a5f..eebf0d96 100644 --- a/arm9/modules/05/asm/mod05_021E5AB4.s +++ b/arm9/modules/05/asm/mod05_021E5AB4.s @@ -99,7 +99,7 @@ MOD05_021E5B30: ; 0x021E5B30 mov r3, #0 bl MOD05_021E4DC4 ldr r0, _021E5B7C ; =0x00000609 - bl FUN_020054C8 + bl PlaySE add sp, #0x1c pop {r4, r5, pc} nop diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s index f341dfd8..6064c13b 100644 --- a/arm9/modules/05/asm/mod05_021E5FD8.s +++ b/arm9/modules/05/asm/mod05_021E5FD8.s @@ -92,7 +92,7 @@ _021E6088: mov r1, #0 bl FUN_02055450 ldr r0, _021E6098 ; =0x00000618 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021E6098: .word 0x00000618 @@ -474,7 +474,7 @@ _021E636C: add r0, r6, #0 bl FUN_0205ADDC ldr r0, _021E63D0 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1011,7 +1011,7 @@ MOD05_021E67C0: ; 0x021E67C0 b _021E68C6 _021E67E4: ldr r0, _021E68CC ; =0x00000651 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1029,7 +1029,7 @@ _021E6804: cmp r0, #5 blt _021E6824 ldr r0, _021E68D0 ; =0x00000652 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] mov r1, #1 bl FUN_0205574C @@ -1177,7 +1177,7 @@ _021E6938: add r0, r4, #0 bl FUN_02057654 ldr r0, _021E6950 ; =0x0000065B - bl FUN_020054C8 + bl PlaySE mov r0, #0 pop {r4, pc} nop @@ -1352,7 +1352,7 @@ MOD05_021E6A58: ; 0x021E6A58 bl MOD06_0224F0BC str r0, [r5, #0x2c] ldr r0, _021E6AA8 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1631,7 +1631,7 @@ MOD05_021E6CA0: ; 0x021E6CA0 cmp r0, #1 bne _021E6CBA ldr r0, _021E6CC0 ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1862,7 +1862,7 @@ MOD05_021E6E6C: ; 0x021E6E6C cmp r0, #1 bne _021E6E86 ldr r0, _021E6E8C ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/arm9/modules/05/asm/mod05_021E7504.s b/arm9/modules/05/asm/mod05_021E7504.s index d7f960b2..dc029b32 100644 --- a/arm9/modules/05/asm/mod05_021E7504.s +++ b/arm9/modules/05/asm/mod05_021E7504.s @@ -65,7 +65,7 @@ _021E7564: mov r0, #1 str r0, [r5, #8] ldr r0, _021E760C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _021E756E: ldr r0, [r5, #0xc] lsr r2, r0, #0x1f @@ -192,7 +192,7 @@ _021E763C: add r0, r4, #0 bl MOD05_021F1D8C ldr r0, _021E774C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5, #8] _021E7694: diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s index 7c09387c..012dbb1d 100644 --- a/arm9/modules/05/asm/mod05_021E779C.s +++ b/arm9/modules/05/asm/mod05_021E779C.s @@ -340,7 +340,7 @@ MOD05_021E79A8: ; 0x021E79A8 cmp r0, #1 bne _021E79FC ldr r0, _021E7A04 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E79FC: mov r0, #1 add sp, #0xc @@ -523,7 +523,7 @@ MOD05_021E7B08: ; 0x021E7B08 cmp r0, #1 bne _021E7B6C ldr r0, _021E7B74 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E7B6C: mov r0, #1 add sp, #0xc diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 95a0e6ca..0157aedb 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -15311,7 +15311,7 @@ MOD05_021EFFC8: ; 0x021EFFC8 pop {r3, r4, r5, r6, r7, pc} _021EFFE6: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -15328,7 +15328,7 @@ _021EFFE6: b _021F0056 _021F000E: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x90 str r4, [r0] @@ -15695,7 +15695,7 @@ MOD05_021F0304: ; 0x021F0304 cmp r2, #0 bne _021F0310 ldr r0, _021F0314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021F0310: pop {r3, pc} nop @@ -24673,7 +24673,7 @@ _021F4732: str r0, [r4, #8] mov r0, #0x61 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021F47A4: .word MOD05_021F48CC @@ -26511,7 +26511,7 @@ MOD05_021F5518: ; 0x021F5518 mov r1, #1 bl GX_EngineAToggleLayers ldr r0, _021F5560 ; =0x00000648 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} .balign 4, 0 @@ -27686,7 +27686,7 @@ MOD05_021F5DF8: ; 0x021F5DF8 bne _021F5E0E mov r0, #0x65 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _021F5E0E: ldr r0, [r4, #0x10] cmp r0, #0x22 diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c index 73fddb7e..686dfdf9 100644 --- a/arm9/modules/05/src/mod05_021E72FC.c +++ b/arm9/modules/05/src/mod05_021E72FC.c @@ -3,7 +3,7 @@ #include "heap.h" -extern void FUN_020054C8(u32 param0); +extern void PlaySE(u32 param0); extern void FUN_020463CC(u32 param0, void *func, UnkStruct021E7358 *param2); extern u32 FUN_020553A0(u32 param0); extern u32 FUN_02058720(u32 param0); @@ -57,7 +57,7 @@ THUMB_FUNC void MOD05_021E7358(u32 param0, u32 param1, u32 param2) res->Unk0C = param0; res->Unk10 = param1; res->Unk00 = param2; - FUN_020054C8(1624); + PlaySE(1624); FUN_020463CC(param0, MOD05_021E73B4, res); } diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 6f2604e6..a73dd764 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -477,7 +477,7 @@ _02239A1E: add r0, r0, #1 str r0, [r4, #0xc] ldr r0, _02239AA8 ; =0x0000065C - bl FUN_020054C8 + bl PlaySE b _02239AA4 _02239A36: ldr r0, [r4] @@ -1907,7 +1907,7 @@ MOD06_0223A460: ; 0x0223A460 ldr r0, [sp, #0x28] str r0, [r5, #0x48] ldr r0, _0223A4DC ; =0x000006D5 - bl FUN_020054C8 + bl PlaySE add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -2183,7 +2183,7 @@ _0223A69A: bl FUN_0200CA98 str r0, [r5, #0x20] ldr r0, _0223A6D8 ; =0x000006D4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0223A6D0: .word 0x0400006C @@ -3517,7 +3517,7 @@ _0223B0B2: cmp r0, #0 bge _0223B162 ldr r0, _0223B164 ; =0x000006D2 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x48 add r0, #0xf0 @@ -3540,7 +3540,7 @@ _0223B0E0: cmp r0, #0 bge _0223B162 ldr r0, _0223B168 ; =0x000006D3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x4b lsl r1, r1, #2 @@ -3564,7 +3564,7 @@ _0223B110: cmp r0, #0 bge _0223B162 ldr r0, _0223B16C ; =0x000006D6 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x84 add r0, #0xf0 @@ -3587,7 +3587,7 @@ _0223B13E: cmp r0, #0 bge _0223B162 ldr r0, _0223B170 ; =0x000006D7 - bl FUN_020054C8 + bl PlaySE mov r0, #4 add r4, #0xf4 str r0, [r4] @@ -4684,7 +4684,7 @@ MOD06_0223B8EC: ; 0x0223B8EC mov r1, #1 bl MOD06_0223A408 ldr r0, _0223B920 ; =0x000006D8 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -9241,7 +9241,7 @@ MOD06_0223DCF0: ; 0x0223DCF0 cmp r6, #1 beq _0223DD0C ldr r0, _0223DE28 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE _0223DD0C: add r0, r4, #0 add r0, #0x18 @@ -9606,7 +9606,7 @@ _0223E006: mov r1, #1 bl BgClearTilemapBufferAndCommit ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xc pop {r3, r4, r5, pc} _0223E034: @@ -9702,7 +9702,7 @@ _0223E0FC: cmp r2, #1 bne _0223E112 ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_0223E384 pop {r3, r4, r5, pc} @@ -9753,7 +9753,7 @@ _0223E124: mov r1, #1 bl MOD06_0223EBF8 ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #5 pop {r3, r4, r5, pc} _0223E182: @@ -9900,7 +9900,7 @@ MOD06_0223E29C: ; 0x0223E29C cmp r0, #0 beq _0223E2C4 ldr r0, _0223E378 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD06_0223E4E8 @@ -9936,7 +9936,7 @@ _0223E2C4: mov r1, #0xf bl FillWindowPixelBuffer ldr r0, _0223E380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD06_0223E384 pop {r4, pc} @@ -9977,7 +9977,7 @@ _0223E314: add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, _0223E380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 pop {r4, pc} _0223E374: @@ -10443,7 +10443,7 @@ _0223E704: lsl r1, r1, #2 strb r0, [r5, r1] ldr r0, _0223E798 ; =0x00000644 - bl FUN_020054C8 + bl PlaySE mov r0, #9 pop {r3, r4, r5, pc} _0223E74A: @@ -11606,7 +11606,7 @@ MOD06_0223F0A8: ; 0x0223F0A8 cmp r2, #0 bne _0223F0BE ldr r0, _0223F0C4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0223F0BE: pop {r3, pc} .align 2, 0 @@ -12088,7 +12088,7 @@ _0223F4A4: pop {r3, r4, r5, pc} _0223F4BA: ldr r0, _0223F51C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0223F518 ; =0x02252420 mov r1, #1 ldr r0, [r0] @@ -12101,7 +12101,7 @@ _0223F4BA: pop {r3, r4, r5, pc} _0223F4D8: ldr r0, _0223F51C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 ldr r0, [r4, #0x5c] add r1, #0x8e @@ -13005,7 +13005,7 @@ _0223FC32: add r1, #0x95 strb r0, [r1] ldr r0, _0223FCF4 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE ldr r0, [sp, #4] ldr r1, [sp, #4] add r0, #0x95 @@ -14731,7 +14731,7 @@ MOD06_02240A64: ; 0x02240A64 cmp r6, r0 beq _02240A9C ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02240A9C: mov r0, #1 mvn r0, r0 @@ -14748,7 +14748,7 @@ _02240AB0: pop {r4, r5, r6, pc} _02240AB4: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] mov r1, #0 add r0, #0xac @@ -14759,7 +14759,7 @@ _02240AB4: pop {r4, r5, r6, pc} _02240ACC: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] mov r1, #0 add r0, #0xac @@ -14771,7 +14771,7 @@ _02240ACC: pop {r4, r5, r6, pc} _02240AE6: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] add r1, r4, #0 ldr r0, [r0, #0xc] @@ -14893,7 +14893,7 @@ MOD06_02240BB8: ; 0x02240BB8 cmp r6, r0 beq _02240BF0 ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02240BF0: mov r0, #1 mvn r0, r0 @@ -14906,13 +14906,13 @@ _02240BF0: pop {r4, r5, r6, pc} _02240C02: ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r4, #0 mvn r4, r4 b _02240C1A _02240C0E: ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_02240A28 _02240C1A: @@ -15320,7 +15320,7 @@ _02240F6A: pop {r4, pc} _02240F70: ldr r0, _02240FE8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r1, #0x78 ldrh r1, [r1] @@ -15345,7 +15345,7 @@ _02240F70: b _02240FE2 _02240FAA: ldr r0, _02240FE8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r1, #0x78 ldrh r1, [r1] @@ -16402,7 +16402,7 @@ _022417F4: add r0, r4, #0 bl MOD05_021DA0E0 ldr r0, _02241868 ; =0x0000065A - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _02241868: .word 0x0000065A @@ -16559,7 +16559,7 @@ _022419A2: mov r1, #0 bl FUN_02055560 ldr r0, _02241A38 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16610,7 +16610,7 @@ _02241A02: mov r1, #1 bl FUN_0205557C ldr r0, _02241A40 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16658,7 +16658,7 @@ _02241A72: mov r1, #0 bl FUN_02055560 ldr r0, _02241B04 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16706,7 +16706,7 @@ _02241ACE: mov r1, #1 bl FUN_0205557C ldr r0, _02241B0C ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17168,7 +17168,7 @@ _02241E8A: mov r1, #0 bl FUN_02055560 ldr r0, _02241F70 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17258,7 +17258,7 @@ _02241F48: mov r1, #1 bl FUN_0205557C ldr r0, _02241F78 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17317,7 +17317,7 @@ _02241FBA: mov r1, #0x49 bl FUN_0205ADDC ldr r0, _022420C4 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17417,7 +17417,7 @@ _02242092: add r0, r6, #0 bl FUN_0205AE50 ldr r0, _022420C8 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17477,7 +17477,7 @@ _02242112: mov r1, #0x49 bl FUN_0205ADDC ldr r0, _0224221C ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17580,7 +17580,7 @@ _022421E4: add r0, r5, #0 bl FUN_0205AE50 ldr r0, _02242220 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -18283,7 +18283,7 @@ _02242776: ; jump table .short _0224282E - _02242776 - 2 ; case 3 _0224277E: ldr r0, _02242840 ; =0x00000616 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x24] cmp r0, #4 bne _02242794 @@ -18725,7 +18725,7 @@ _02242ACE: str r0, [r6] strb r0, [r4, #0x13] ldr r0, _02242AE4 ; =0x0000063F - bl FUN_020054C8 + bl PlaySE ldr r0, [r7, #0x10] ldr r1, _02242AE8 ; =MOD06_02242AEC ldr r2, [sp] @@ -18878,7 +18878,7 @@ MOD06_02242BE0: ; 0x02242BE0 bl FUN_02046528 add r7, r0, #0 ldr r0, _02242C70 ; =0x0000067C - bl FUN_020054C8 + bl PlaySE mov r1, #0x11 mov r0, #4 lsl r1, r1, #4 @@ -19426,7 +19426,7 @@ MOD06_02243024: ; 0x02243024 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _0224307C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r0, #0x14 mov r1, #0 @@ -24074,7 +24074,7 @@ _022453F0: cmp r0, #4 bne _022453FC ldr r0, _02245474 ; =0x000006DB - bl FUN_020054C8 + bl PlaySE _022453FC: ldrb r0, [r4, #5] add r0, r0, #1 @@ -24179,7 +24179,7 @@ MOD06_02245478: ; 0x02245478 cmp r2, #0 bne _022454CC ldr r0, _02245540 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _022454CC: ldrb r0, [r5, #6] add r0, r0, #1 @@ -24220,7 +24220,7 @@ _022454D8: cmp r2, #0 bne _0224551C ldr r0, _02245540 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _0224551C: ldrb r0, [r5, #6] add r0, r0, #1 @@ -24294,7 +24294,7 @@ _02245578: cmp r0, #0 bne _022455B4 ldr r0, _0224564C ; =0x000006D9 - bl FUN_020054C8 + bl PlaySE _022455B4: ldrb r0, [r4, #6] add r0, r0, #1 @@ -24312,7 +24312,7 @@ _022455BC: cmp r0, #6 bne _022455D8 ldr r0, _02245650 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _022455D8: ldrb r0, [r4, #6] sub r0, r0, #1 @@ -24341,7 +24341,7 @@ _022455E0: cmp r0, #0 bne _02245616 ldr r0, _0224564C ; =0x000006D9 - bl FUN_020054C8 + bl PlaySE _02245616: ldrb r0, [r4, #6] add r0, r0, #1 @@ -24359,7 +24359,7 @@ _0224561E: cmp r0, #6 bne _0224563A ldr r0, _02245650 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _0224563A: ldrb r0, [r4, #6] sub r0, r0, #1 @@ -27300,7 +27300,7 @@ MOD06_02246C08: ; 0x02246C08 pop {r4, pc} _02246C18: ldr r0, _02246C34 ; =0x00000649 - bl FUN_020054C8 + bl PlaySE mov r0, #2 lsl r0, r0, #0xa str r0, [r4, #0x54] @@ -38707,7 +38707,7 @@ _0224C3C2: add r0, r0, r1 str r0, [sp, #0x34] ldr r0, _0224C518 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE add r0, sp, #0x20 str r0, [sp] ldr r0, [r5, #0x4c] @@ -38956,7 +38956,7 @@ _0224C604: mov r1, #1 bl MOD05_021DA4EC ldr r0, _0224C670 ; =0x00000612 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #2] add r0, r0, #1 strb r0, [r4, #2] @@ -38971,7 +38971,7 @@ _0224C61C: mov r1, #0 bl FUN_020054F0 ldr r0, _0224C674 ; =0x000005F1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x4c] ldr r1, [r5, #0x50] mov r2, #1 @@ -39151,15 +39151,15 @@ MOD06_0224C75C: ; 0x0224C75C b _0224C7AA _0224C794: ldr r0, _0224C7B8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE b _0224C7AA _0224C79C: ldr r0, _0224C7B8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE b _0224C7AA _0224C7A4: ldr r0, _0224C7BC ; =0x0000064E - bl FUN_020054C8 + bl PlaySE _0224C7AA: mov r0, #0 pop {r4, pc} @@ -41403,7 +41403,7 @@ _0224D8DC: mov r0, #5 str r0, [r4, #4] ldr r0, _0224DB64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0224DB9A _0224D942: mov r1, #1 @@ -41431,7 +41431,7 @@ _0224D94C: mov r0, #0xc str r0, [r4, #4] ldr r0, _0224DB64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0224DB9A _0224D97E: mov r0, #0xb9 @@ -42487,7 +42487,7 @@ MOD06_0224E1E4: ; 0x0224E1E4 ldr r2, [r5, r2] blx r2 ldr r0, _0224E248 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_0224E39C b _0224E242 @@ -43603,7 +43603,7 @@ MOD06_0224EA64: ; 0x0224EA64 add r1, r4, #0 bl MOD06_0224E8C4 ldr r0, _0224EAA8 ; =0x0000064B - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43717,7 +43717,7 @@ MOD06_0224EB30: ; 0x0224EB30 add r1, r4, #0 bl MOD06_0224E8C4 ldr r0, _0224EB74 ; =0x0000064A - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43752,7 +43752,7 @@ MOD06_0224EB78: ; 0x0224EB78 add r2, r4, #0 bl MOD06_0224E858 ldr r0, _0224EBC0 ; =0x0000064A - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43912,7 +43912,7 @@ _0224ECA8: add r0, #0xdc bl MOD05_021F54CC ldr r0, _0224ECF0 ; =0x0000064D - bl FUN_020054C8 + bl PlaySE mov r1, #0x72 ldr r0, [sp, #8] mov r2, #0 @@ -44074,7 +44074,7 @@ _0224EDF0: mov r1, #1 bl MOD05_021F54CC ldr r0, _0224EE14 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -46245,4 +46245,3 @@ MOD6_02252420: ; 0x02252420 .global MOD6_02252424 MOD6_02252424: ; 0x02252424 .space 0x1C - diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index efb8e257..234e29fe 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -655,11 +655,11 @@ _02212394: cmp r0, #1 bne _022123AE ldr r0, _02212578 ; =0x00000715 - bl FUN_020054C8 + bl PlaySE b _022123B4 _022123AE: ldr r0, _0221257C ; =0x00000852 - bl FUN_020054C8 + bl PlaySE _022123B4: ldr r0, _02212574 ; =0x00000B82 ldrb r1, [r5, r0] @@ -915,7 +915,7 @@ _022125D0: cmp r0, #0 bne _022125DE ldr r0, _022126B0 ; =0x00000719 - bl FUN_020054C8 + bl PlaySE _022125DE: ldr r0, [r4, #0xc] mov r1, #3 @@ -1173,7 +1173,7 @@ MOD07_02212720: ; 0x02212720 cmp r0, #0 bne _022127FA ldr r0, _02212820 ; =0x00000853 - bl FUN_020054C8 + bl PlaySE _022127FA: ldr r0, _02212814 ; =0x00000B82 ldrb r1, [r4, r0] @@ -1317,7 +1317,7 @@ MOD07_02212824: ; 0x02212824 cmp r0, #0 bne _0221292E ldr r0, _02212954 ; =0x00000853 - bl FUN_020054C8 + bl PlaySE _0221292E: ldr r0, _02212948 ; =0x00000B82 ldrb r1, [r4, r0] @@ -1429,7 +1429,7 @@ MOD07_022129FC: ; 0x022129FC push {r4, lr} add r4, r0, #0 ldr r0, _02212A34 ; =0x0000071A - bl FUN_020054C8 + bl PlaySE mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1459,7 +1459,7 @@ MOD07_02212A3C: ; 0x02212A3C push {r4, lr} add r4, r0, #0 ldr r0, _02212A5C ; =0x0000071A - bl FUN_020054C8 + bl PlaySE mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1535,7 +1535,7 @@ _02212AC6: bl FUN_02003210 _02212ADA: ldr r0, _02212AEC ; =0x0000071B - bl FUN_020054C8 + bl PlaySE ldr r0, _02212AF0 ; =0x00000B81 mov r1, #0x40 strb r1, [r4, r0] @@ -1555,7 +1555,7 @@ MOD07_02212AF4: ; 0x02212AF4 cmp r0, #0 bne _02212B06 ldr r0, _02212B44 ; =0x00000719 - bl FUN_020054C8 + bl PlaySE _02212B06: ldr r1, _02212B40 ; =0x00000B82 ldrb r0, [r4, r1] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index ed457683..4a0a6d1c 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -1139,7 +1139,7 @@ _02212638: sub r0, r0, #1 strb r0, [r5, #0x18] ldrh r0, [r5, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r5, #0x1a] ldr r1, _02212660 ; =0x0000FFFF ldr r2, [r5, #0x14] @@ -1165,7 +1165,7 @@ MOD08_02212664: ; 0x02212664 cmp r2, #0 bne _02212686 ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02212688 ; =0x0000FFFF ldr r2, [r4, #0x14] @@ -6040,7 +6040,7 @@ MOD08_02214B38: ; 0x02214B38 thumb_func_start MOD08_02214B3C MOD08_02214B3C: ; 0x02214B3C ldr r1, [r0, #0x18] - ldr r3, _02214B50 ; =FUN_020054C8 + ldr r3, _02214B50 ; =PlaySE add r1, r1, #4 str r1, [r0, #0x18] ldr r2, [r1] @@ -6050,7 +6050,7 @@ MOD08_02214B3C: ; 0x02214B3C lsr r0, r0, #0x10 bx r3 .align 2, 0 -_02214B50: .word FUN_020054C8 +_02214B50: .word PlaySE thumb_func_start MOD08_02214B54 MOD08_02214B54: ; 0x02214B54 @@ -6087,7 +6087,7 @@ MOD08_02214B70: ; 0x02214B70 bl MOD08_02215354 add r5, r0, #0 add r0, r4, #0 - bl FUN_020054C8 + bl PlaySE ldr r1, _02214BA4 ; =0x0000FFFF add r0, r4, #0 add r2, r5, #0 @@ -6174,7 +6174,7 @@ MOD08_02214BC4: ; 0x02214BC4 bl MOD08_0221540C str r0, [r4, #0x10] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214C60 ; =0x0000FFFF ldr r2, [r4, #8] @@ -6232,7 +6232,7 @@ MOD08_02214C64: ; 0x02214C64 add r0, r0, #4 str r0, [r5, #0x18] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214CD8 ; =0x0000FFFF ldr r2, [r4, #8] @@ -6308,7 +6308,7 @@ MOD08_02214CDC: ; 0x02214CDC bl MOD08_02215354 str r0, [r4, #0x10] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214D7C ; =0x0000FFFF ldr r2, [r4, #8] diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 050abbcc..07d0fa04 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -425,7 +425,7 @@ _022121B6: cmp r0, #1 beq _0221220E ldr r0, _02212214 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -433,7 +433,7 @@ _022121B6: pop {r4, pc} _022121E2: ldr r0, _02212214 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r4] add r0, r4, #0 ldrb r1, [r1, #0x11] @@ -642,7 +642,7 @@ _02212384: ; jump table .short _022123F6 - _02212384 - 2 ; case 3 _0221238C: ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #7 bl MOD09_022181C8 @@ -664,7 +664,7 @@ _022123B2: cmp r0, #1 beq _0221240E ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #8 bl MOD09_022181C8 @@ -679,7 +679,7 @@ _022123D4: cmp r0, #1 beq _0221240E ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xa bl MOD09_022181C8 @@ -690,7 +690,7 @@ _022123D4: pop {r4, pc} _022123F6: ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -736,7 +736,7 @@ _0221243C: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD09_022181C8 @@ -756,7 +756,7 @@ _0221246A: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD09_022181C8 @@ -767,7 +767,7 @@ _0221246A: pop {r4, pc} _02212496: ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xb bl MOD09_022181C8 @@ -778,7 +778,7 @@ _02212496: pop {r4, pc} _022124AE: ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -833,7 +833,7 @@ _02212506: cmp r0, #0 beq _022125CE ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xe lsl r1, r1, #0x18 @@ -860,7 +860,7 @@ _0221253E: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD09_022181C8 @@ -880,7 +880,7 @@ _0221256C: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD09_022181C8 @@ -891,7 +891,7 @@ _0221256C: pop {r3, r4, r5, pc} _02212598: ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #9 bl MOD09_022181C8 @@ -902,7 +902,7 @@ _02212598: pop {r3, r4, r5, pc} _022125B0: ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -960,7 +960,7 @@ _02212604: beq _0221264A _02212622: ldr r0, _02212650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, #0x34 strb r5, [r0] @@ -968,7 +968,7 @@ _02212622: pop {r3, r4, r5, pc} _02212632: ldr r0, _02212650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1034,7 +1034,7 @@ _022126A6: ldr r0, _0221273C ; =0x0000208D strb r1, [r4, r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r5, #0x17 lsl r1, r5, #0x18 add r0, r4, #0 @@ -1067,7 +1067,7 @@ _022126D0: add r0, #0x16 strb r5, [r4, r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x12 bl MOD09_022181C8 @@ -1082,7 +1082,7 @@ _02212710: add r0, #0x34 strb r1, [r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1136,7 +1136,7 @@ _0221277C: b _0221284A _0221278A: ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _0221285C ; =0x00002077 ldrb r0, [r5, r0] lsl r0, r0, #0x1c @@ -1187,7 +1187,7 @@ _022127E6: lsr r0, r0, #0x1c beq _0221284A ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0x12 bl MOD09_022181C8 @@ -1216,7 +1216,7 @@ _022127E6: pop {r3, r4, r5, pc} _0221282C: ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #6 bl MOD09_022181C8 @@ -1294,7 +1294,7 @@ _022128B6: add r0, #0x34 strb r5, [r0] ldr r0, _0221295C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0x13 lsl r1, r1, #0x18 @@ -1342,7 +1342,7 @@ _0221290E: pop {r3, r4, r5, r6, pc} _02212934: ldr r0, _0221295C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1694,7 +1694,7 @@ _02212BAA: strb r2, [r4, r0] _02212BC6: ldr r0, _02212C88 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE b _02212C78 _02212BCE: ldrb r1, [r5, #0x11] @@ -1854,7 +1854,7 @@ _02212CF4: add r0, r5, #0 bl MOD09_02216378 ldr r0, _02212DB0 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r0, _02212DAC ; =0x0000207C mov r1, #1 strb r1, [r5, r0] @@ -8288,7 +8288,7 @@ MOD09_0221633C: ; 0x0221633C sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint ldr r0, [r4] ldr r0, [r0, #8] bl MOD11_02230E54 @@ -12988,7 +12988,7 @@ _022189AA: ; jump table .short _02218A06 - _022189AA - 2 ; case 5 _022189B6: ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE lsl r0, r5, #0x18 lsr r1, r0, #0x18 ldr r0, _02218A30 ; =0x0000114D @@ -13007,7 +13007,7 @@ _022189D6: cmp r0, #0 beq _02218A24 ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] ldrb r1, [r0, #0x1f] ldr r0, _02218A30 ; =0x0000114D @@ -13025,7 +13025,7 @@ _022189D6: pop {r3, r4, r5, pc} _02218A06: ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] mov r2, #0 strh r2, [r0, #0x1c] @@ -13094,7 +13094,7 @@ _02218A84: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B3C ; =0x0000114D ldr r2, [r4] ldrb r1, [r4, r0] @@ -13121,7 +13121,7 @@ _02218ABA: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #7 strb r1, [r4, r0] @@ -13143,7 +13143,7 @@ _02218AE8: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #7 strb r1, [r4, r0] @@ -13158,7 +13158,7 @@ _02218AE8: pop {r3, r4, r5, pc} _02218B16: ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #4 strb r1, [r4, r0] @@ -13268,7 +13268,7 @@ _02218BEA: b _02218C44 _02218BF4: ldr r0, _02218C4C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, _02218C50 ; =0x0000114D ldr r2, [r5] ldrb r1, [r5, r1] @@ -13292,7 +13292,7 @@ _02218BF4: pop {r3, r4, r5, pc} _02218C2A: ldr r0, _02218C4C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218C54 ; =0x0000114B mov r1, #5 strb r1, [r5, r0] @@ -13744,7 +13744,7 @@ _02218FC2: cmp r0, #1 bne _02218FFA ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _022190C4 ; =0x0000114D mov r1, #2 strb r1, [r4, r0] @@ -13784,7 +13784,7 @@ _02219014: cmp r0, #1 bne _02219054 ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _022190C4 ; =0x0000114D ldr r3, [r4] ldrb r1, [r4, r0] @@ -13828,7 +13828,7 @@ _0221906E: cmp r0, #1 bne _022190AE ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, _022190C4 ; =0x0000114D ldr r2, [r4] ldrb r1, [r4, r1] @@ -15243,7 +15243,7 @@ MOD09_02219C08: ; 0x02219C08 sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint ldr r0, [r4] ldr r0, [r0] bl MOD11_02230E54 @@ -17391,7 +17391,7 @@ _0221ACA8: ldr r0, [r0] bl MOD11_0225D5DC ldr r0, _0221ACE0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0221ACD4: mov r0, #0 add sp, #4 @@ -17624,7 +17624,7 @@ _0221AE70: ldr r0, [r5] bl MOD11_0225D5DC ldr r0, _0221AEC0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0221AE8A: mov r0, #0 add sp, #0x14 @@ -17644,7 +17644,7 @@ _0221AEA2: tst r1, r0 beq _0221AEB6 ldr r0, _0221AEC4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0x14 mvn r0, r0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 2781e4f1..23f0a76c 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -1348,7 +1348,7 @@ _0222E194: bl MOD11_0222D840 _0222E1AC: mov r0, #0 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r0, #0 @@ -3302,7 +3302,7 @@ _0222F1D0: cmp r0, #0 bne _0222F1F6 ldr r0, _0222F250 ; =0x00000704 - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #1 bl MOD11_02231484 @@ -3338,7 +3338,7 @@ _0222F214: sub r1, r4, #1 bne _0222F244 ldr r0, _0222F250 ; =0x00000704 - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #4 bl MOD11_022314B0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 24037833..9b184cfc 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -1478,7 +1478,7 @@ _0222FEA6: mov r0, #3 bl FUN_02002B7C mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #1 bl FUN_02002BB8 pop {r3, pc} @@ -6262,7 +6262,7 @@ _0223223C: b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 @@ -24041,7 +24041,7 @@ _0223AE3C: beq _0223AEDC _0223AE4E: ldr r0, _0223AF70 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x28] add sp, #0xd4 add r0, r0, #1 @@ -24931,7 +24931,7 @@ _0223B57C: mov r0, #1 str r0, [r4, #0x28] ldr r0, _0223B7F8 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE ldr r2, [r4] ldr r0, _0223B7FC ; =0x0000241E ldrh r1, [r2, r0] @@ -24962,7 +24962,7 @@ _0223B5A4: mov r0, #1 str r0, [r4, #0x28] ldr r0, _0223B7F8 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE ldr r2, [r4] ldr r0, _0223B7FC ; =0x0000241E ldrh r1, [r2, r0] @@ -25410,7 +25410,7 @@ _0223B9AA: cmp r0, #0 beq _0223B9BC ldr r0, _0223BBE4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xe str r0, [r4, #0x28] _0223B9BC: @@ -68574,7 +68574,7 @@ _0225073C: cmp r0, #3 beq _022507E2 ldr r0, _022508A0 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE _022507E2: cmp r5, #4 bne _0225088A @@ -69325,7 +69325,7 @@ _02250DD0: mov r0, #0xa strb r0, [r4, #0xb] ldr r0, _02250E9C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #6 add sp, #0x4c strb r0, [r4, #0xa] @@ -69707,7 +69707,7 @@ _02251114: cmp r0, r1 beq _022511B6 ldr r0, _022511C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x20 ldrb r0, [r0] @@ -69990,7 +69990,7 @@ _02251366: cmp r0, r1 beq _02251418 ldr r0, _0225141C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xf] add sp, #0x2c add r0, r0, #1 @@ -72355,7 +72355,7 @@ _0225267E: cmp r0, r1 beq _0225270A ldr r0, _02252710 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #0x2c strb r0, [r4, #0xe] @@ -72853,7 +72853,7 @@ _02252A86: add r0, #0x4e strb r1, [r0] ldr r0, _02252B2C ; =0x0000070B - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x40] add r0, r4, #0 bl MOD11_022571B8 @@ -73522,7 +73522,7 @@ _02252FCE: add r1, #0xb bl MOD11_0225805C ldr r0, _02253004 ; =0x0000070C - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xa] add r0, r0, #1 strb r0, [r4, #0xa] @@ -73694,7 +73694,7 @@ _02253104: ldr r0, [r4, #8] bl MOD08_0222A1DC ldr r0, _022533E0 ; =0x0000084F - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x14] add sp, #0x18 add r0, r0, #1 @@ -73738,7 +73738,7 @@ _0225318C: bne _0225319A mov r0, #0x85 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _0225319A: ldrb r0, [r4, #0x15] cmp r0, #0x1c @@ -86080,7 +86080,7 @@ MOD11_0225916C: ; 0x0225916C bl _s32_div_f strh r0, [r4, #0xe] ldr r0, _0225925C ; =0x0000070E - bl FUN_020054C8 + bl PlaySE ldr r0, _02259260 ; =MOD11_0225B438 ldr r2, _02259264 ; =0x000004BA add r1, r4, #0 @@ -90888,7 +90888,7 @@ _0225B8EC: cmp r0, #0 bne _0225B8F6 ldr r0, _0225B920 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0225B8F6: mov r1, #1 ldr r0, _0225B924 ; =0x000006F4 @@ -91032,7 +91032,7 @@ _0225B9EC: mov r0, #1 strb r0, [r4, #1] ldr r0, _0225BAFC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r5, #0x20 b _0225BA34 _0225BA1E: @@ -91044,7 +91044,7 @@ _0225BA1E: mov r0, #1 strb r0, [r4, #1] ldr r0, _0225BAFC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r5, #0x10 _0225BA34: cmp r5, #0x20 @@ -92834,7 +92834,7 @@ _0225C738: beq _0225C754 _0225C74C: ldr r0, _0225C768 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0225C75E _0225C754: mov r0, #0xf0 @@ -93398,7 +93398,7 @@ _0225CB80: bl FUN_0200CA44 str r0, [r5, #4] ldr r0, _0225CBB8 ; =0x00000711 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0225CBA8: .word MOD11_0225FE48 @@ -93863,7 +93863,7 @@ _0225CF22: bgt _0225CF50 str r0, [r4, #0x1c] ldrh r0, [r4, #0x2a] - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x2c ldrb r0, [r0] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 68371f50..5cb61425 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -3378,7 +3378,7 @@ MOD12_0222EF04: ; 0x0222EF04 add r1, r5, #0 bl Main_SetVBlankIntrCB ldr r0, _0222F198 ; =0x00000605 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc pop {r4, r5, pc} @@ -3470,7 +3470,7 @@ _0222F1CA: mov r3, #6 bl FUN_02003210 ldr r0, _0222F308 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5] b _0222F2FA @@ -5240,7 +5240,7 @@ MOD12_0222FE4C: ; 0x0222FE4C sub r2, #0x3f bl G2x_SetBlendBrightness_ ldr r0, _02230120 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldr r0, _02230124 ; =MOD12_022303C0 add r1, r5, #0 bl Main_SetVBlankIntrCB @@ -8288,7 +8288,7 @@ MOD12_0223190C: ; 0x0223190C mov r3, #0x3f bl FUN_0200A208 ldr r0, _02231978 ; =0x000005F8 - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #8] ldrb r0, [r4, #0x11] @@ -11020,7 +11020,7 @@ _02232E54: cmp r0, #0 bne _02232E5E ldr r0, _02232E88 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232E5E: mov r1, #1 mov r0, #0xc7 @@ -11707,7 +11707,7 @@ _02233338: beq _02233354 _0223334C: ldr r0, _02233368 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223335E _02233354: mov r0, #0xf0 @@ -12862,19 +12862,19 @@ _02233C36: ; jump table .short _02233C56 - _02233C36 - 2 ; case 3 _02233C3E: ldr r0, _02233C68 ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C46: ldr r0, _02233C6C ; =0x000006DF - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C4E: ldr r0, _02233C70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C56: ldr r0, _02233C70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _02233C5C: pop {r4, r5, r6, pc} nop @@ -13533,7 +13533,7 @@ _02234170: cmp r4, r0 bgt _022340EE ldr r0, _02234194 ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE ldr r2, [sp, #8] ldr r0, _02234194 ; =0x000006E1 sub r2, r2, #1 @@ -14070,7 +14070,7 @@ _022345AC: bl FUN_0200C644 mov r0, #0x6e lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FreeToHeap add r0, r5, #0 @@ -15804,7 +15804,7 @@ _02235354: pop {r3, r4, r5, pc} _02235362: ldr r0, _02235468 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldr r0, _02235468 ; =0x000006E5 ldr r1, [r4, #4] bl FUN_0200488C @@ -16320,7 +16320,7 @@ _02235778: mov r1, #0 bl FUN_0200C644 ldr r0, _022357AC ; =0x000005E1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] bl MOD12_02233638 ldr r1, [r5, #0xc] @@ -16509,7 +16509,7 @@ _022358CE: lsl r0, r0, #8 str r0, [r5, #0x20] ldr r0, _02235A84 ; =0x000007F9 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0xe] add r0, r0, #1 strb r0, [r5, #0xe] @@ -16649,7 +16649,7 @@ _022359F6: str r0, [r5, #0x18] _02235A16: ldr r0, _02235A90 ; =0x000006EA - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0xe] add sp, #8 add r0, r0, #1 @@ -16689,7 +16689,7 @@ _02235A5E: mov r1, #0 bl FUN_0200C644 ldr r0, _02235A94 ; =0x000005E1 - bl FUN_020054C8 + bl PlaySE ldr r1, [r5, #8] ldrb r0, [r1] sub r0, r0, #1 @@ -17436,7 +17436,7 @@ _02235F98: bl MOD12_02234FB0 _02235FAA: ldr r0, _0223603C ; =0x000006F9 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #8 add r0, r0, #1 @@ -17665,7 +17665,7 @@ _02236162: cmp r2, r0 bne _02236176 ldr r0, _02236204 ; =0x000006F8 - bl FUN_020054C8 + bl PlaySE _02236176: ldrb r0, [r4, #0x14] add r0, r0, #1 @@ -18972,7 +18972,7 @@ _02236B70: cmp r0, #0 bne _02236BA0 ldr r0, _02236CEC ; =0x000006F6 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xe] add r0, r0, #1 strb r0, [r4, #0xe] @@ -19013,7 +19013,7 @@ _02236BD0: bl GetMonData strh r0, [r4, #0x10] ldr r0, _02236CF0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 @@ -19077,7 +19077,7 @@ _02236C52: beq _02236CE4 strh r0, [r4, #0x12] ldr r0, _02236CF0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 @@ -19591,7 +19591,7 @@ _0223700E: add r6, r6, #1 bl MOD12_02234628 ldr r0, _022370F8 ; =0x000006DF - bl FUN_020054C8 + bl PlaySE _02237036: add r5, r5, #1 cmp r5, #3 @@ -19664,7 +19664,7 @@ _022370A6: lsr r2, r2, #0x1e bl MOD12_02235200 ldr r0, _02237100 ; =0x000006E2 - bl FUN_020054C8 + bl PlaySE _022370BC: add r5, r5, #1 cmp r5, #4 @@ -20194,7 +20194,7 @@ _02237484: add r0, #0xc bl MOD12_02234628 ldr r0, _02237650 ; =0x000006DF - bl FUN_020054C8 + bl PlaySE _022374A6: ldrb r0, [r4, #0xc] add sp, #8 @@ -20754,27 +20754,27 @@ _022378B4: mov r0, #0x6f lsl r0, r0, #4 mov r6, #4 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378C6: cmp r0, #1 bne _022378D4 ldr r0, _02237A94 ; =0x000006EF mov r6, #5 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378D4: cmp r0, #2 bne _022378E2 ldr r0, _02237A98 ; =0x000006EE mov r6, #6 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378E2: mov r0, #3 strb r0, [r4, #0xc] ldr r0, _02237A9C ; =0x000006DF - bl FUN_020054C8 + bl PlaySE add sp, #8 pop {r3, r4, r5, r6, r7, pc} _022378F0: @@ -25300,7 +25300,7 @@ _0223993C: add r1, r4, #0 bl FUN_0200CA44 ldr r0, _0223997C ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0223996C: .word MOD12_02245F14 @@ -25931,7 +25931,7 @@ _02239E14: mov r1, #2 bl FUN_02003A64 ldr r0, _02239E94 ; =0x000006EC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -26255,7 +26255,7 @@ _0223A0D4: b _0223A248 _0223A0D6: ldr r0, _0223A264 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0xf strb r0, [r5, #0x11] ldrb r0, [r5, #0x10] @@ -26269,7 +26269,7 @@ _0223A0E6: mov r0, #0 strb r0, [r5, #0x11] ldr r0, _0223A264 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0x10] add sp, #8 add r0, r0, #1 @@ -27517,7 +27517,7 @@ _0223AA5C: cmp r0, #1 bne _0223AAA2 ldr r0, _0223AABC ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0x10] add sp, #0x10 add r0, r0, #1 @@ -28471,7 +28471,7 @@ _0223B1C6: cmp r0, #1 bne _0223B1DE ldr r0, _0223B350 ; =0x000006ED - bl FUN_020054C8 + bl PlaySE ldr r0, [sp] mov r1, #0 strb r1, [r0, #0x15] @@ -28711,7 +28711,7 @@ MOD12_0223B37C: ; 0x0223B37C ldr r0, [sp] str r6, [r4, #0xc] ldrh r0, [r0, #0x10] - bl FUN_020054C8 + bl PlaySE ldr r0, _0223B3C0 ; =MOD12_0223B3C8 ldr r2, _0223B3C4 ; =0x00007530 add r1, r4, #0 @@ -32903,11 +32903,11 @@ _0223D3F2: cmp r0, #1 bne _0223D404 ldr r0, _0223D4C4 ; =0x000006F5 - bl FUN_020054C8 + bl PlaySE b _0223D40A _0223D404: ldr r0, _0223D4C8 ; =0x000006F4 - bl FUN_020054C8 + bl PlaySE _0223D40A: ldr r0, _0223D4CC ; =0x00000ACC ldrb r0, [r5, r0] @@ -32944,7 +32944,7 @@ _0223D438: bne _0223D454 mov r0, #0x6f lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D454: @@ -32952,17 +32952,17 @@ _0223D454: cmp r0, r1 bne _0223D464 ldr r0, _0223D4D4 ; =0x000006EF - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D464: ldr r0, _0223D4D8 ; =0x000006EE - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D46E: ldr r0, _0223D4DC ; =0x000006F1 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D478: @@ -32972,12 +32972,12 @@ _0223D478: cmp r0, #1 bne _0223D48C ldr r0, _0223D4E0 ; =0x000006F2 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D48C: ldr r0, _0223D4E4 ; =0x000005F6 - bl FUN_020054C8 + bl PlaySE _0223D492: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -35629,7 +35629,7 @@ _0223E8D2: lsl r0, r0, #8 strh r0, [r4, #8] ldr r0, _0223E8E8 ; =0x000006F8 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0223E8E8: .word 0x000006F8 @@ -36006,7 +36006,7 @@ _0223EBAC: lsl r2, r2, #2 bl FUN_0200CA44 ldr r0, _0223EC24 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -36105,7 +36105,7 @@ _0223ECB4: cmp r4, #4 blt _0223EC9E ldr r0, _0223ECCC ; =0x000006EC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _0223ECC4: .word 0x00007FFF @@ -36982,7 +36982,7 @@ _0223F328: add r0, #0x14 bl MOD12_0223CC9C ldr r0, _0223F3AC ; =0x000006EC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -38606,7 +38606,7 @@ _0223FF86: bl MOD12_0223E488 _0223FF8C: ldr r0, _02240040 ; =0x000006F7 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add sp, #0x18 add r0, r0, #1 @@ -39582,7 +39582,7 @@ _02240734: ldr r0, _0224076C ; =0x0000046F bl FUN_0200521C ldr r0, _02240770 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x50 ldrb r0, [r0] @@ -41300,7 +41300,7 @@ MOD12_02241210: ; 0x02241210 bl FUN_0200CA60 str r0, [r5, #8] ldr r0, _0224148C ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc pop {r4, r5, pc} @@ -44728,7 +44728,7 @@ MOD12_02242FD0: ; 0x02242FD0 mov r1, #1 bl FUN_0200C644 ldr r0, _02242FF4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02242FF4: .word 0x000005DD @@ -47304,7 +47304,7 @@ _02244348: ldr r0, _02244430 ; =0x0000049E bl FUN_0200521C ldr r0, _02244434 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add sp, #0xc add r0, r0, #1 @@ -47535,7 +47535,7 @@ _02244510: ; jump table .short _022445E8 - _02244510 - 2 ; case 5 _0224451C: ldr r0, _02244604 ; =0x000006FA - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -47563,7 +47563,7 @@ _0224454A: cmp r1, #0 ble _02244558 ldr r0, _02244608 ; =0x000006FB - bl FUN_020054C8 + bl PlaySE b _02244560 _02244558: add r2, r2, #1 @@ -47629,7 +47629,7 @@ _022445C2: cmp r1, #0 ble _022445D0 ldr r0, _0224460C ; =0x000006F9 - bl FUN_020054C8 + bl PlaySE b _022445D8 _022445D0: add r3, r3, #1 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 5b8cf4c3..e1acb188 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -459,7 +459,7 @@ _021D7846: b _021D792E _021D785A: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D7862: mov r0, #0x61 @@ -482,7 +482,7 @@ _021D7876: cmp r0, #1 bne _021D78BC ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -503,7 +503,7 @@ _021D7876: b _021D7930 _021D78BC: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D78C4: add r0, r4, #0 @@ -515,7 +515,7 @@ _021D78C4: cmp r0, #1 bne _021D790A ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -536,11 +536,11 @@ _021D78C4: b _021D7930 _021D790A: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D7912: ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -774,7 +774,7 @@ _021D7ADC: b _021D7BC4 _021D7AF0: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7AF8: mov r0, #0x61 @@ -797,7 +797,7 @@ _021D7B0C: cmp r0, #1 bne _021D7B52 ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -818,7 +818,7 @@ _021D7B0C: b _021D7BC6 _021D7B52: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7B5A: add r0, r4, #0 @@ -830,7 +830,7 @@ _021D7B5A: cmp r0, #1 bne _021D7BA0 ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -851,11 +851,11 @@ _021D7B5A: b _021D7BC6 _021D7BA0: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7BA8: ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -913,7 +913,7 @@ _021D7C08: cmp r0, #0 beq _021D7C42 ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -1137,7 +1137,7 @@ _021D7DEA: b _021D7EE8 _021D7DFE: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7E06: mov r0, #0x61 @@ -1160,7 +1160,7 @@ _021D7E1A: cmp r0, #1 bne _021D7E5E ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1180,7 +1180,7 @@ _021D7E1A: b _021D7EE8 _021D7E5E: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7E66: add r0, r4, #0 @@ -1192,7 +1192,7 @@ _021D7E66: cmp r0, #1 bne _021D7EAA ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1212,11 +1212,11 @@ _021D7E66: b _021D7EE8 _021D7EAA: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7EB2: ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -1365,7 +1365,7 @@ _021D7FDC: b _021D80F2 _021D7FF0: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D7FF8: mov r0, #0x61 @@ -1388,7 +1388,7 @@ _021D800C: cmp r0, #1 bne _021D8050 ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1408,7 +1408,7 @@ _021D800C: b _021D80F2 _021D8050: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D8058: add r0, r4, #0 @@ -1420,7 +1420,7 @@ _021D8058: cmp r0, #1 bne _021D809C ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1440,11 +1440,11 @@ _021D8058: b _021D80F2 _021D809C: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D80A4: ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -1533,7 +1533,7 @@ _021D813E: b _021D83C4 _021D8166: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x12 bl MOD14_021DBA44 @@ -1635,7 +1635,7 @@ _021D822C: b _021D83C4 _021D8240: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D8248: mov r0, #0x61 @@ -1658,7 +1658,7 @@ _021D825C: cmp r0, #1 bne _021D82A0 ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1678,7 +1678,7 @@ _021D825C: b _021D83C4 _021D82A0: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D82A8: add r0, r4, #0 @@ -1690,7 +1690,7 @@ _021D82A8: cmp r0, #1 bne _021D82EC ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1710,11 +1710,11 @@ _021D82A8: b _021D83C4 _021D82EC: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D82F4: ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -2038,7 +2038,7 @@ _021D8590: cmp r0, #1 beq _021D85BA ldr r0, _021D86AC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 bl MOD14_021DBA44 @@ -2068,7 +2068,7 @@ _021D85CC: cmp r0, #0 beq _021D86A6 ldr r0, _021D86B0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xb bl MOD14_021DBA44 @@ -2112,7 +2112,7 @@ _021D862A: pop {r3, r4, r5, pc} _021D8638: ldr r0, _021D86B0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2199,7 +2199,7 @@ _021D86E2: cmp r0, #1 beq _021D870A ldr r0, _021D87F0 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 bl MOD14_021DBA44 @@ -2226,7 +2226,7 @@ _021D870A: pop {r3, r4, r5, pc} _021D8728: ldr r0, _021D87F8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD14_021DBA44 @@ -2375,7 +2375,7 @@ _021D8828: pop {r3, r4, r5, pc} _021D8864: ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2427,7 +2427,7 @@ _021D88C0: pop {r3, r4, r5, pc} _021D88CC: ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2572,7 +2572,7 @@ _021D89CA: mov r1, #6 bl MOD14_021DCB2C ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2676,7 +2676,7 @@ _021D8AD8: cmp r0, #0 beq _021D8B08 ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x22 bl MOD14_021DBA44 @@ -2703,7 +2703,7 @@ _021D8B08: pop {r3, r4, r5, pc} _021D8B24: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2755,7 +2755,7 @@ _021D8B80: pop {r3, r4, r5, pc} _021D8B8C: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2766,7 +2766,7 @@ _021D8B8C: pop {r3, r4, r5, pc} _021D8BA4: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 str r0, [r5] pop {r3, r4, r5, pc} @@ -2810,7 +2810,7 @@ _021D8BD4: mov r1, #0x14 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2827,7 +2827,7 @@ _021D8C12: cmp r0, #0 beq _021D8C42 ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -2856,7 +2856,7 @@ _021D8C42: mov r1, #0x13 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2872,7 +2872,7 @@ _021D8C7C: cmp r0, #0 beq _021D8CAC ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -2899,7 +2899,7 @@ _021D8CAC: mov r1, #0x15 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -3006,7 +3006,7 @@ _021D8D9A: cmp r0, #0 ldr r0, _021D8EB4 ; =0x000005DD beq _021D8DC8 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021E6220 mov r1, #0x6e @@ -3016,7 +3016,7 @@ _021D8D9A: str r0, [r5] pop {r3, r4, r5, pc} _021D8DC8: - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3610,7 +3610,7 @@ _021D9254: mov r1, #0x2c bl MOD14_021DCB2C ldr r0, _021D945C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5] pop {r3, r4, r5, pc} @@ -3640,7 +3640,7 @@ _021D9284: cmp r2, r0 bne _021D9342 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D92B6: add r0, r4, #0 @@ -3687,7 +3687,7 @@ _021D9306: mov r1, #0x2f bl MOD14_021DCB2C ldr r0, _021D9468 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] pop {r3, r4, r5, pc} @@ -3729,7 +3729,7 @@ _021D935A: cmp r2, r0 bne _021D9454 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D9372: mov r0, #0x45 @@ -3798,20 +3798,20 @@ _021D93E2: mov r1, #0xa bl MOD14_021DCB2C ldr r0, _021D946C ; =0x000005EA - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] pop {r3, r4, r5, pc} _021D9416: ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D941E: mov r0, #2 tst r0, r1 beq _021D9454 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D942C: mov r0, #0x45 @@ -3911,7 +3911,7 @@ _021D94DC: cmp r0, #0 bne _021D950E ldr r0, _021D95A8 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -3925,7 +3925,7 @@ _021D94DC: pop {r3, r4, r5, pc} _021D950E: ldr r0, _021D95AC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD14_021DBA44 @@ -3939,7 +3939,7 @@ _021D950E: pop {r3, r4, r5, pc} _021D952E: ldr r0, _021D95A8 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -4020,7 +4020,7 @@ _021D95CA: mov r1, #0xa bl MOD14_021DCB2C ldr r0, _021D9664 ; =0x000005EA - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD14_021DC3CC cmp r0, #1 @@ -4138,7 +4138,7 @@ _021D96C6: cmp r0, #0 beq _021D96F0 ldr r0, _021D9764 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r5, #0 bl MOD14_021DBA44 @@ -4155,7 +4155,7 @@ _021D96F0: add r1, r5, #0 bl MOD14_021DBD34 ldr r0, _021D9768 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -4260,7 +4260,7 @@ _021D979C: pop {r3, r4, r5, pc} _021D97D2: ldr r0, _021D992C ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -4450,7 +4450,7 @@ _021D995A: cmp r0, #1 bne _021D9998 ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD14_021DBA44 @@ -4474,7 +4474,7 @@ _021D9998: cmp r0, #0 beq _021D99D0 ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -4582,7 +4582,7 @@ _021D9A62: pop {r3, r4, r5, pc} _021D9A92: ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD14_021DBA44 @@ -4875,7 +4875,7 @@ _021D9CC4: pop {r3, r4, r5, pc} _021D9CF0: ldr r0, _021D9F78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -5969,7 +5969,7 @@ _021DA58E: tst r0, r1 beq _021DA5D6 ldr r0, _021DA5EC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6029,7 +6029,7 @@ _021DA614: cmp r0, #0 beq _021DA648 ldr r0, _021DA7B8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -6193,7 +6193,7 @@ _021DA76C: tst r0, r1 beq _021DA7B2 ldr r0, _021DA7C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6251,7 +6251,7 @@ _021DA7EA: cmp r0, #0 beq _021DA81E ldr r0, _021DA9C4 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -6441,7 +6441,7 @@ _021DA978: tst r0, r1 beq _021DA9BE ldr r0, _021DA9CC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6725,7 +6725,7 @@ _021DABB6: tst r1, r0 beq _021DABC6 ldr r0, _021DABE4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, pc} _021DABC6: @@ -6733,7 +6733,7 @@ _021DABC6: tst r0, r1 beq _021DABDC ldr r0, _021DABE4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 mvn r0, r0 strb r0, [r4, #5] @@ -6842,7 +6842,7 @@ _021DAC98: ; jump table .short _021DAF4A - _021DAC98 - 2 ; case 5 _021DACA4: ldr r0, _021DAF60 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD14_021DC350 @@ -6904,7 +6904,7 @@ _021DAD04: pop {r3, r4, r5, r6, r7, pc} _021DAD2C: ldr r0, _021DAF68 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _021DAD34: ldr r0, _021DAF6C ; =gMain @@ -6913,7 +6913,7 @@ _021DAD34: tst r0, r1 beq _021DAD6C ldr r0, _021DAF70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD14_021DC350 @@ -7052,7 +7052,7 @@ _021DAE4A: mov r1, #0x29 bl MOD14_021DCB2C ldr r0, _021DAF74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} @@ -7202,7 +7202,7 @@ _021DAF92: ; jump table .short _021DB19C - _021DAF92 - 2 ; case 3 _021DAF9A: ldr r0, _021DB1B4 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #2 bl MOD14_021DC350 @@ -7268,7 +7268,7 @@ _021DB01E: tst r0, r1 beq _021DB046 ldr r0, _021DB1C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD14_021DC350 @@ -7285,7 +7285,7 @@ _021DB046: cmp r0, #0 beq _021DB072 ldr r0, _021DB1C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -7371,7 +7371,7 @@ _021DB0DE: mov r1, #0x29 bl MOD14_021DCB2C ldr r0, _021DB1C4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 add sp, #8 str r0, [r6] @@ -11076,7 +11076,7 @@ MOD14_021DCCA0: ; 0x021DCCA0 pop {r3, r4, pc} _021DCCB4: ldr r0, _021DCCFC ; =0x0000060D - bl FUN_020054C8 + bl PlaySE mov r0, #0xa str r0, [sp] ldr r0, _021DCD00 ; =0x04000050 @@ -11262,7 +11262,7 @@ _021DCDF0: add r2, r7, #0 bl MOD14_021DE2E8 ldr r0, _021DCE64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #6] add r0, r0, #1 strh r0, [r4, #6] @@ -11306,7 +11306,7 @@ MOD14_021DCE68: ; 0x021DCE68 pop {r3, r4, r5, pc} _021DCE7A: ldr r0, _021DCEB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021DCEBC ; =0x00005DC0 add r0, r4, r0 bl MOD14_021DF484 @@ -12074,7 +12074,7 @@ MOD14_021DD460: ; 0x021DD460 lsl r0, r0, #4 ldr r5, [r4, r0] ldr r0, _021DD488 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD48C ; =0x000065F4 add r5, #0x74 add r0, r4, r0 @@ -12096,7 +12096,7 @@ MOD14_021DD490: ; 0x021DD490 lsl r0, r0, #4 ldr r5, [r4, r0] ldr r0, _021DD4B8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD4BC ; =0x000065F4 add r5, #0x74 add r0, r4, r0 @@ -12154,7 +12154,7 @@ MOD14_021DD4FC: ; 0x021DD4FC pop {r3, r4, r5, pc} _021DD50E: ldr r0, _021DD52C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD530 ; =0x0000662C add r0, r4, r0 bl MOD14_021E1FC0 @@ -12259,7 +12259,7 @@ _021DD5CA: ; jump table .short _021DD64C - _021DD5CA - 2 ; case 3 _021DD5D2: ldr r0, _021DD660 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD664 ; =0x00005DC0 add r0, r5, r0 bl MOD14_021DFBB8 @@ -12344,7 +12344,7 @@ MOD14_021DD66C: ; 0x021DD66C pop {r3, r4, r5, pc} _021DD67E: ldr r0, _021DD6B0 ; =0x00000633 - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD6B4 ; =0x00005DC0 add r0, r4, r0 bl MOD14_021DFF1C @@ -12407,7 +12407,7 @@ _021DD6EA: strh r0, [r4, #6] _021DD6FC: ldr r0, _021DD734 ; =0x00000634 - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD738 ; =0x0000B22C add r0, r5, r0 bl MOD14_021E2BB0 @@ -12800,7 +12800,7 @@ MOD14_021DD9E4: ; 0x021DD9E4 pop {r3, r4, pc} _021DD9F8: ldr r0, _021DDA34 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -30355,7 +30355,7 @@ _021E61D8: tst r0, r1 beq _021E61EA ldr r0, _021E620C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 mvn r0, r0 pop {r3, r4, r5, pc} @@ -30364,7 +30364,7 @@ _021E61EA: tst r1, r0 beq _021E6202 ldr r0, _021E620C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x20 ldrb r0, [r0] @@ -30719,4 +30719,3 @@ MOD14_021E6B94: ; 0x021E6B94 .global MOD14_021E6B98 MOD14_021E6B98: ; 0x021E6B98 .space 0x4 - diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 501b5379..173d4fd6 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -419,7 +419,7 @@ _021D77F6: tst r1, r0 beq _021D7818 ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4c @@ -435,7 +435,7 @@ _021D7818: tst r1, r0 beq _021D782E ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D7884 ; =MOD15_021D851C add r0, r5, #0 bl MOD15_021D83AC @@ -445,7 +445,7 @@ _021D782E: tst r0, r1 beq _021D7876 ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x50 @@ -528,7 +528,7 @@ _021D78D6: tst r1, r0 beq _021D78F8 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4c @@ -549,7 +549,7 @@ _021D78F8: cmp r0, #0 beq _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4e @@ -568,7 +568,7 @@ _021D7920: cmp r0, #0 bne _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #1 add r0, #0x4e @@ -582,7 +582,7 @@ _021D7948: tst r1, r0 beq _021D795E ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D79B4 ; =MOD15_021D851C add r0, r5, #0 bl MOD15_021D83AC @@ -592,7 +592,7 @@ _021D795E: tst r0, r1 beq _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x50 @@ -703,7 +703,7 @@ _021D7A3C: b _021D7BAE _021D7A3E: ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x4e ldrh r0, [r0] @@ -720,7 +720,7 @@ _021D7A5C: tst r0, r1 beq _021D7AAC ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x64 ldrb r2, [r0] @@ -770,7 +770,7 @@ _021D7AAC: bne _021D7AE2 _021D7AC6: ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4c @@ -787,7 +787,7 @@ _021D7AE2: tst r3, r0 beq _021D7B12 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4e @@ -808,7 +808,7 @@ _021D7B12: tst r0, r3 beq _021D7B40 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4e @@ -829,7 +829,7 @@ _021D7B40: tst r0, r1 beq _021D7B56 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D7BBC ; =MOD15_021D851C add r0, r4, #0 bl MOD15_021D83AC @@ -838,7 +838,7 @@ _021D7B56: cmp r2, #0 beq _021D7BAE ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x50 @@ -944,7 +944,7 @@ _021D7C28: tst r1, r0 beq _021D7C4E ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x4c ldrh r1, [r0] @@ -962,7 +962,7 @@ _021D7C4E: tst r1, r0 beq _021D7C6C ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4c @@ -976,7 +976,7 @@ _021D7C6C: tst r1, r0 beq _021D7C86 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #5 bl MOD15_021D8900 @@ -988,7 +988,7 @@ _021D7C86: tst r1, r0 beq _021D7CA6 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r4, #0x4c ldrh r0, [r4] cmp r0, #0 @@ -1005,7 +1005,7 @@ _021D7CA6: tst r0, r1 beq _021D7CE8 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] b _021D7CE8 @@ -1089,7 +1089,7 @@ _021D7D44: beq _021D7D78 _021D7D4C: ldr r0, _021D7E34 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x65 ldrb r1, [r0] @@ -1113,7 +1113,7 @@ _021D7D78: tst r1, r0 beq _021D7D96 ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #7 bl MOD15_021D8900 @@ -1132,7 +1132,7 @@ _021D7D96: cmp r0, #0xfe bne _021D7DBE ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #7 bl MOD15_021D8900 @@ -1147,7 +1147,7 @@ _021D7DBE: cmp r0, #0 beq _021D7DEA ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x54 add r1, r5, #0 @@ -1162,7 +1162,7 @@ _021D7DBE: b _021D7E30 _021D7DEA: ldr r0, _021D7E44 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D7E30 _021D7DF2: add r0, r5, #0 @@ -1170,7 +1170,7 @@ _021D7DF2: cmp r0, #0 beq _021D7E30 ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #0xe bl MOD15_021D8900 @@ -1533,7 +1533,7 @@ _021D8084: beq _021D80BC _021D808C: ldr r0, _021D81B8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x50 @@ -1583,7 +1583,7 @@ _021D80E2: b _021D812E _021D80F0: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0xf bl MOD15_021D8900 @@ -1591,7 +1591,7 @@ _021D80F0: pop {r3, r4, r5, pc} _021D8102: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x10 bl MOD15_021D8900 @@ -1601,7 +1601,7 @@ _021D8102: pop {r3, r4, r5, pc} _021D8118: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x10 bl MOD15_021D8900 @@ -1615,7 +1615,7 @@ _021D812E: tst r0, r1 beq _021D814E ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #9 bl MOD15_021D8900 @@ -1629,7 +1629,7 @@ _021D814E: tst r0, r1 beq _021D81B4 ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD15_021D8310 ldr r0, _021D81C4 ; =MOD15_021D779C @@ -2080,14 +2080,14 @@ _021D8488: ; jump table .short _021D84A2 - _021D8488 - 2 ; case 4 _021D8492: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x15 bl MOD15_021D8900 pop {r3, r4, r5, pc} _021D84A2: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x16 bl MOD15_021D8900 @@ -2096,7 +2096,7 @@ _021D84A2: pop {r3, r4, r5, pc} _021D84B6: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] cmp r0, #2 bne _021D84CA @@ -2193,14 +2193,14 @@ _021D8574: ; jump table .short _021D858E - _021D8574 - 2 ; case 4 _021D857E: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x15 bl MOD15_021D8900 pop {r3, r4, r5, pc} _021D858E: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x16 bl MOD15_021D8900 @@ -2209,7 +2209,7 @@ _021D858E: pop {r3, r4, r5, pc} _021D85A2: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D85CC ; =MOD15_021D8378 add r0, r4, #0 bl MOD15_021D7794 @@ -2368,7 +2368,7 @@ MOD15_021D8698: ; 0x021D8698 pop {r3, r4, r5, pc} _021D86AA: ldr r0, _021D86E0 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x65 ldrb r1, [r0] diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 66103b62..480aa929 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -11072,7 +11072,7 @@ MOD16_021DC598: ; 0x021DC598 beq _021DC5B4 bl MOD16_021DD9C8 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5B4: @@ -11082,7 +11082,7 @@ _021DC5B4: add r1, r4, #0 bl MOD16_021DDAB4 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5CA: @@ -11101,7 +11101,7 @@ _021DC5CA: add r1, r5, #0 bl MOD16_021DD9E0 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5F6: @@ -13026,7 +13026,7 @@ MOD16_021DD530: ; 0x021DD530 add r5, r2, #0 str r1, [sp, #0x18] add r4, r3, #0 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] cmp r0, #0 bne _021DD576 @@ -13688,7 +13688,7 @@ MOD16_021DD9F8: ; 0x021DD9F8 mov r1, #2 str r1, [r0, #0x20] ldr r0, _021DDA28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021DDA24: @@ -13731,7 +13731,7 @@ _021DDA54: add r1, r4, #0 bl MOD16_021D9CEC ldr r0, _021DDAB0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -13832,7 +13832,7 @@ MOD16_021DDB0C: ; 0x021DDB0C mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDB54 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDB3C: mov r0, #0 @@ -13873,7 +13873,7 @@ MOD16_021DDB58: ; 0x021DDB58 mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDC28 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDB8C: add r0, r4, #0 @@ -13898,7 +13898,7 @@ _021DDB9A: mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDC28 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDBC2: add r0, r4, #0 @@ -15502,7 +15502,7 @@ _021DE84C: lsl r1, r1, #6 str r1, [r0, #0xc] ldr r0, _021DE89C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE b _021DE860 _021DE85C: mov r0, #0 @@ -16364,7 +16364,7 @@ _021DEDF2: mov r0, #0x20 str r0, [r4, #0x34] ldr r0, _021DEEA0 ; =0x000005FF - bl FUN_020054C8 + bl PlaySE b _021DEE9A _021DEE10: ldr r0, [r4, #0x34] @@ -24474,7 +24474,7 @@ _021E28EA: mov r1, #0 bl MOD16_021DEC40 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E28FA: ldr r0, [r4, #8] @@ -24485,7 +24485,7 @@ _021E28FA: mov r1, #0 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E2914: ldr r0, [r4, #8] @@ -24496,7 +24496,7 @@ _021E2914: mov r1, #1 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E292E: ldr r0, [r4, #8] @@ -24507,7 +24507,7 @@ _021E292E: mov r1, #2 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x88 @@ -24522,7 +24522,7 @@ _021E2950: mov r1, #3 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E296A: add r0, r5, #0 @@ -24534,7 +24534,7 @@ _021E296A: mov r1, #1 bl MOD16_021DEC40 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2982: ldr r0, _021E2990 ; =0x0000FFFF add r5, #0x80 @@ -24593,7 +24593,7 @@ _021E29D2: cmp r4, r0 beq _021E29EE ldr r0, _021E29F8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEBC0 @@ -24671,7 +24671,7 @@ _021E2A56: cmp r4, r0 beq _021E2A72 ldr r0, _021E2A7C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEBDC @@ -24747,7 +24747,7 @@ _021E2ADE: mov r0, #1 str r0, [r5, #0x20] ldr r0, _021E2B00 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2AE8: cmp r4, #0x64 beq _021E2AF6 @@ -24823,7 +24823,7 @@ _021E2B5C: mov r0, #0 str r0, [r5, #0x20] ldr r0, _021E2B7C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2B66: cmp r4, #0x64 beq _021E2B74 @@ -24884,7 +24884,7 @@ MOD16_021E2B84: ; 0x021E2B84 add r0, r2, r1 str r0, [r5] ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E2BE4: mov r1, #0 @@ -24896,7 +24896,7 @@ _021E2BE4: mov r2, #0 bl MOD16_021DEBF8 ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2C1A _021E2C00: mov r1, #1 @@ -24908,7 +24908,7 @@ _021E2C00: mov r2, #1 bl MOD16_021DEBF8 ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2C1A: mov r0, #0 add r5, #0x88 @@ -25003,7 +25003,7 @@ _021E2C9C: cmp r4, r0 beq _021E2CB8 ldr r0, _021E2CC0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEC24 @@ -28792,7 +28792,7 @@ MOD16_021E4938: ; 0x021E4938 cmp r1, #0 bne _021E495C ldr r0, _021E4960 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r4, #0x20] ldr r0, _021E4964 ; =gMain + 0x40 @@ -31637,7 +31637,7 @@ _021E5E30: mov r0, #1 str r0, [r5, #4] ldr r0, _021E5ED0 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -36326,7 +36326,7 @@ _021E80FA: mov r3, #0 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E8112: ldr r1, [r4, #0x38] @@ -36355,7 +36355,7 @@ _021E8132: mov r3, #1 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E814A: ldr r1, [r4, #0x38] @@ -36381,7 +36381,7 @@ _021E8168: mov r3, #2 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E8180: ldr r1, [r4, #0x38] @@ -36407,7 +36407,7 @@ _021E819E: mov r3, #3 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E81B6: ldr r1, [r4, #0x38] @@ -36433,7 +36433,7 @@ _021E81D4: mov r3, #4 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E81EC: ldr r1, [r4, #0x38] @@ -36459,7 +36459,7 @@ _021E820A: mov r3, #5 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE _021E8220: pop {r3, r4, r5, pc} nop @@ -37558,7 +37558,7 @@ _021E8A9A: add r1, r4, #0 bl MOD16_021E8B7C ldr r0, _021E8AB8 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE _021E8AB6: pop {r3, r4, r5, pc} .align 2, 0 @@ -39650,7 +39650,7 @@ _021E9A12: add r0, r4, #0 bl MOD16_021E9014 ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A20: ldr r2, [r4, #8] @@ -39663,7 +39663,7 @@ _021E9A20: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A3E: ldr r2, [r4, #8] @@ -39676,7 +39676,7 @@ _021E9A3E: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A5C: ldr r2, [r4, #8] @@ -39689,7 +39689,7 @@ _021E9A5C: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A7A: ldr r2, [r4, #8] @@ -39704,7 +39704,7 @@ _021E9A7A: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A9C: ldr r0, [r5, #0x10] @@ -39714,7 +39714,7 @@ _021E9A9C: cmp r0, #2 beq _021E9AAE ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9AAE: mov r0, #1 str r0, [r5, #0x10] @@ -39732,7 +39732,7 @@ _021E9AB4: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9AD6: ldr r0, [r5, #0x10] @@ -39746,7 +39746,7 @@ _021E9AD6: cmp r0, #2 beq _021E9AF2 ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9AF2: mov r0, #0 str r0, [r5, #0x10] @@ -40205,7 +40205,7 @@ MOD16_021E9E34: ; 0x021E9E34 mov r0, #1 str r0, [r5, #0x2c] ldr r0, _021E9E60 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9E58: pop {r3, r4, r5, pc} nop @@ -40390,7 +40390,7 @@ _021E9FAC: mov r0, #2 str r0, [r4, #0xc] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FC6: ldr r2, [r5, #8] @@ -40402,7 +40402,7 @@ _021E9FC6: mov r0, #2 str r0, [r4, #0x10] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FE0: ldr r2, [r5, #8] @@ -40414,7 +40414,7 @@ _021E9FE0: mov r0, #2 str r0, [r4, #0x14] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FFA: ldr r2, [r5, #8] @@ -40428,14 +40428,14 @@ _021E9FFA: mov r0, #2 str r0, [r4, #0x18] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA018: ldr r0, [r5, #8] cmp r0, #2 beq _021EA066 ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA026: ldr r2, [r5, #8] @@ -40449,14 +40449,14 @@ _021EA026: mov r0, #2 str r0, [r4, #0x1c] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA044: ldr r0, [r5, #8] cmp r0, #2 beq _021EA066 ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA052: add r0, r5, #0 @@ -40466,7 +40466,7 @@ _021EA052: mov r0, #2 str r0, [r4, #0x20] ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021EA066: pop {r4, r5, r6, pc} .align 2, 0 @@ -43255,7 +43255,7 @@ _021EB4DC: eor r1, r2 bl MOD16_021EC060 ldr r0, _021EB4F4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021EB4F0: pop {r3, r4, r5, r6, r7, pc} nop @@ -43352,7 +43352,7 @@ _021EB57A: ldrh r0, [r1, #0x1c] str r0, [r4, #0x38] ldr r0, _021EB640 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021EB5A2: mov r0, #0xb @@ -43364,7 +43364,7 @@ _021EB5A2: ldrh r0, [r1, #0x1c] str r0, [r4, #0x38] ldr r0, _021EB640 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021EB5BA: ldr r0, [r4, #0x4c] @@ -44241,7 +44241,7 @@ MOD16_021EBC98: ; 0x021EBC98 cmp r1, r0 beq _021EBCBE ldr r0, _021EBCC0 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x5c] asr r0, r1, #1 lsr r0, r0, #0x1e @@ -46884,7 +46884,7 @@ _021ED006: cmp r0, #0 beq _021ED03C ldr r0, _021ED040 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #4] ldr r2, [r4] @@ -46898,7 +46898,7 @@ _021ED022: cmp r0, #1 beq _021ED03C ldr r0, _021ED040 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r4, #4] ldr r2, [r4] @@ -47524,7 +47524,7 @@ _021ED4EC: str r1, [r0, #0x14] _021ED4FA: ldr r0, _021ED508 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021ED500: pop {r3, pc} nop diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 6ef3cce7..7e32e1c9 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -2878,7 +2878,7 @@ _021D8B04: _021D8B0A: bl MOD17_021D9800 ldr r0, _021D8C7C ; =0x00000643 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2947,7 +2947,7 @@ _021D8B86: str r0, [r4] mov r0, #0x1a lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE _021D8B9E: ldr r0, _021D8C90 ; =0x0000048C add r0, r5, r0 @@ -2970,7 +2970,7 @@ _021D8BBC: str r0, [r4] mov r0, #0x1a lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE _021D8BD4: add r0, r5, #0 bl MOD17_021D9BE8 @@ -3009,7 +3009,7 @@ _021D8C04: add r3, r6, #0 bl FUN_0200E1D0 ldr r0, _021D8C94 ; =0x00000684 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -8146,7 +8146,7 @@ _021DB192: _021DB19A: lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD17_021DB680 _021DB1A8: @@ -8257,7 +8257,7 @@ _021DB220: ldrsh r0, [r4, r0] str r0, [sp, #8] ldr r0, _021DB394 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] ldr r2, _021DB398 ; =0x00000151 mov r1, #0x1a @@ -8283,7 +8283,7 @@ _021DB2AC: mov r0, #0 str r0, [r4, #0x30] ldr r0, _021DB39C ; =0x000005EA - bl FUN_020054C8 + bl PlaySE b _021DB388 _021DB2C2: ldr r0, [r4, #0x10] @@ -8340,7 +8340,7 @@ _021DB32C: str r0, [sp, #8] _021DB338: ldr r0, _021DB394 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE b _021DB350 _021DB340: ldr r0, [r4, #0x10] @@ -8348,7 +8348,7 @@ _021DB340: add r2, sp, #8 bl MOD17_021DBBB8 ldr r0, _021DB3A0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE _021DB350: add r0, r4, #0 add r0, #0x20 @@ -8431,7 +8431,7 @@ MOD17_021DB3D4: ; 0x021DB3D4 mov r0, #0 str r0, [r4, #0x30] ldr r0, _021DB400 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD17_021DB534 _021DB3FE: @@ -10466,7 +10466,7 @@ _021DC28C: add r0, r5, #0 bl MOD17_021DC2F8 ldr r0, _021DC2BC ; =0x0000067D - bl FUN_020054C8 + bl PlaySE b _021DC2B0 _021DC29E: cmp r6, #2 @@ -11241,7 +11241,7 @@ MOD17_021DC870: ; 0x021DC870 bne _021DC87E lsl r0, r1, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021DC87E: pop {r3, pc} thumb_func_end MOD17_021DC870 @@ -12495,7 +12495,7 @@ MOD17_021DD1DC: ; 0x021DD1DC add r1, #0x30 bl MOD17_021DD2E0 ldr r0, _021DD200 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE _021DD1FC: pop {r3, pc} nop diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 59f678ec..074ed1e0 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1627,7 +1627,7 @@ _0223A2EE: mov r1, #2 bl FUN_02020130 ldr r0, _0223A3C8 ; =0x000006A4 - bl FUN_020054C8 + bl PlaySE b _0223A33C _0223A30A: cmp r4, #0 @@ -1640,7 +1640,7 @@ _0223A30A: mov r1, #3 bl FUN_02020130 ldr r0, _0223A3CC ; =0x000006A2 - bl FUN_020054C8 + bl PlaySE b _0223A33C _0223A326: ldr r0, _0223A3C4 ; =0x02251380 @@ -1651,7 +1651,7 @@ _0223A326: mov r1, #4 bl FUN_02020130 ldr r0, _0223A3D0 ; =0x000006A3 - bl FUN_020054C8 + bl PlaySE _0223A33C: ldr r0, _0223A3C4 ; =0x02251380 ldr r1, [r0] @@ -2150,7 +2150,7 @@ _0223A780: mov r0, #0 str r0, [r4, #8] ldr r0, _0223AB00 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE mov r0, #8 add sp, #0xc str r0, [r4] @@ -2301,7 +2301,7 @@ _0223A8A2: lsl r1, r1, #4 str r0, [r2, r1] ldr r0, _0223AB10 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #0x3c str r0, [r4, #0x4c] mov r0, #0xf @@ -2586,7 +2586,7 @@ _0223AB28: mov r3, #0 bl FUN_0200E1D0 ldr r0, _0223AC18 ; =0x000006A1 - bl FUN_020054C8 + bl PlaySE mov r0, #0x18 add sp, #0xc str r0, [r4] @@ -3612,7 +3612,7 @@ _0223B2E6: cmp r0, #1 bne _0223B3DA ldr r0, _0223B440 ; =0x000006A7 - bl FUN_020054C8 + bl PlaySE mov r0, #0 mov r4, #0 str r4, [sp, #0x18] @@ -4617,7 +4617,7 @@ _0223BA52: mov r3, #0x36 bl MOD18_0223B948 ldr r0, _0223BB50 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223BA82 _0223BA74: cmp r4, #3 @@ -4670,7 +4670,7 @@ _0223BAC4: mov r3, #0x36 bl MOD18_0223B948 ldr r0, _0223BB50 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223BAF4 _0223BAE6: cmp r4, #3 @@ -5670,7 +5670,7 @@ _0223C29A: str r0, [r5, #0x14] bne _0223C2AC ldr r0, _0223C350 ; =0x000006A5 - bl FUN_020054C8 + bl PlaySE _0223C2AC: ldr r0, _0223C338 ; =0x02251380 ldr r2, _0223C340 ; =gMain + 0x40 @@ -6308,7 +6308,7 @@ MOD18_0223C7B0: ; 0x0223C7B0 cmp r1, #0x53 bls _0223C7CE add r0, #0x43 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223C7D0 ; =0x000005DE mov r1, #0 strh r1, [r4, r0] @@ -7254,7 +7254,7 @@ MOD18_0223CE68: ; 0x0223CE68 ldr r0, _0223CF24 ; =0x000004CC strb r2, [r1, r0] ldr r0, _0223CF28 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #4] ldrb r0, [r4, #5] mov r5, #0x63 @@ -7504,7 +7504,7 @@ _0223D07E: ldr r0, [sp] bl MOD18_02249E98 ldr r0, _0223D0E4 ; =0x00000631 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223D0DC ; =0x02251384 ldr r1, [r0] ldr r0, _0223D0E0 ; =0x000004C8 @@ -7812,7 +7812,7 @@ MOD18_0223D2EC: ; 0x0223D2EC cmp r0, #0x64 bls _0223D306 ldr r0, _0223D308 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE mov r0, #0 strh r0, [r4, #2] _0223D306: @@ -12090,7 +12090,7 @@ MOD18_0223F360: ; 0x0223F360 mov r2, #1 bl MOD18_0224DCB8 ldr r0, _0223F400 ; =0x00000623 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _0223F3A4: cmp r0, #4 @@ -12474,7 +12474,7 @@ _0223F662: strh r1, [r3, r0] _0223F674: ldr r0, _0223F6F4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE bl MOD18_0223D638 add r5, r0, #0 ldrb r0, [r4, #7] @@ -12821,7 +12821,7 @@ _0223F926: bl FUN_02026CB4 add r6, r0, #0 ldr r0, _0223FA64 ; =0x00000622 - bl FUN_020054C8 + bl PlaySE ldr r1, _0223FA60 ; =0x022513A0 add r0, r4, #0 ldr r2, [r1, #4] @@ -13338,7 +13338,7 @@ _0223FD12: mov r0, #0x10 bl FUN_0204F774 ldr r0, _0223FD50 ; =0x00000609 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223FD44 ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -13997,7 +13997,7 @@ _02240190: ldr r2, [r4, #0x18] bl FUN_0204E214 ldr r0, _0224020C ; =0x0000065F - bl FUN_020054C8 + bl PlaySE mov r0, #5 add sp, #8 str r0, [r4] @@ -14341,7 +14341,7 @@ _02240442: cmp r0, #0 bne _02240456 ldr r0, _0224045C ; =0x00000629 - bl FUN_020054C8 + bl PlaySE _02240456: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -14804,7 +14804,7 @@ _0224079E: mov r0, #0 str r0, [r4, #0x1c] ldr r0, _02240890 ; =0x00000661 - bl FUN_020054C8 + bl PlaySE add sp, #0x1c pop {r3, r4, pc} _022407DE: @@ -15289,7 +15289,7 @@ MOD18_02240B90: ; 0x02240B90 cmp r0, #0xa0 bls _02240BAE ldr r0, _02240BB4 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE ldr r0, _02240BB0 ; =0x000001E2 mov r1, #0 strh r1, [r4, r0] @@ -15879,7 +15879,7 @@ MOD18_02241008: ; 0x02241008 mov r0, #0xe str r0, [r1] ldr r0, _02241034 ; =0x0000060B - bl FUN_020054C8 + bl PlaySE _0224102C: pop {r4, pc} nop @@ -16069,7 +16069,7 @@ _0224118C: cmp r0, r5 beq _022411A6 ldr r0, _02241284 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE _022411A6: str r5, [r4, #0x18] mov r0, #0 @@ -17996,7 +17996,7 @@ _0224205A: str r1, [r4, r0] mov r0, #0x66 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add sp, #0x10 pop {r4, pc} _0224209A: @@ -18485,7 +18485,7 @@ _0224240A: cmp r1, r0 ble _022424B6 ldr r0, _0224258C ; =0x00000626 - bl FUN_020054C8 + bl PlaySE ldr r0, _02242590 ; =0x022513A0 lsl r4, r5, #2 ldr r0, [r0, #4] @@ -19226,7 +19226,7 @@ _02242A20: add r1, #0x11 strb r0, [r4, r1] ldr r0, _02242D6C ; =0x0000065E - bl FUN_020054C8 + bl PlaySE b _02242E6C _02242A68: sub r1, r0, #1 @@ -19282,7 +19282,7 @@ _02242A98: add r0, r1, #5 strb r2, [r4, r0] ldr r0, _02242D70 ; =0x0000065D - bl FUN_020054C8 + bl PlaySE ldr r0, _02242D68 ; =0x022513A0 ldr r1, [r0, #4] ldr r0, _02242D74 ; =0x00000B3B @@ -19373,7 +19373,7 @@ _02242B22: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02242D7C ; =0x00000627 - bl FUN_020054C8 + bl PlaySE mov r0, #0x46 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -19525,7 +19525,7 @@ _02242CAA: b _02242DD2 _02242CB4: ldr r0, _02242D80 ; =0x0000062A - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 add r0, #0xf8 @@ -20480,7 +20480,7 @@ _0224343A: add r0, r0, #1 str r0, [r5, #0x24] ldr r0, _02243538 ; =0x00000628 - bl FUN_020054C8 + bl PlaySE b _0224345C _02243454: add r0, r5, #0 @@ -21627,7 +21627,7 @@ _02243D2C: bl GXx_SetMasterBrightness_ bl FUN_0204F7E4 ldr r0, _02243E0C ; =0x00000621 - bl FUN_020054C8 + bl PlaySE ldr r1, _02243E10 ; =0x022513A0 mov r0, #0x20 ldr r1, [r1, #4] @@ -22188,7 +22188,7 @@ _0224418A: b _022442CA _0224418C: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0xc ldrh r1, [r0, #2] ldrh r0, [r0] @@ -22328,7 +22328,7 @@ _0224428C: tst r0, r1 beq _022442CA ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0xc ldrh r3, [r0, #2] ldrh r1, [r0] @@ -22366,7 +22366,7 @@ _022442CA: cmp r6, r0 beq _022442EA ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022442EA: mov r0, #1 mvn r0, r0 @@ -22378,11 +22378,11 @@ _022442EA: b _02244302 _022442FA: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02244308 _02244302: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02244308: add r0, r4, #0 add sp, #0x10 @@ -26866,7 +26866,7 @@ _02246580: ldr r0, [r5, #0x68] bl MOD18_0224484C ldr r0, _02246850 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] add r0, r0, #1 str r0, [r4, #0xc] @@ -27078,7 +27078,7 @@ _0224672E: add r3, r2, #0 bl MOD18_0224DCB8 ldr r0, _02246860 ; =0x00000604 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc str r0, [r4, #0xc] b _02246848 @@ -27260,7 +27260,7 @@ _022468CC: mov r1, #0x21 bl MOD18_0224DDE8 ldr r0, _02246AD0 ; =0x0000061E - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x38] bl FUN_020553A0 add r1, r7, #0 @@ -28575,7 +28575,7 @@ _0224735C: add r3, r2, #0 bl MOD18_0224DCB8 ldr r0, _0224740C ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc str r0, [r4] @@ -29508,7 +29508,7 @@ MOD18_02247A34: ; 0x02247A34 add r0, #0x28 strb r1, [r0] ldr r0, _02247A9C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD18_022479E4 @@ -29797,7 +29797,7 @@ _02247CDA: pop {r3, r4, r5, r6, pc} _02247CE0: ldr r0, _02247D18 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0 strb r4, [r0] ldrh r1, [r5, #0x30] @@ -29949,7 +29949,7 @@ _02247E18: pop {r3, r4, r5, r6, pc} _02247E1E: ldr r0, _02247E9C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r1, r5, #0 bl MOD18_02247FC0 @@ -30036,7 +30036,7 @@ MOD18_02247EA0: ; 0x02247EA0 ldrb r0, [r4] bl MOD18_022493A4 ldr r0, _02247EF4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02247EF4: .word 0x000005E3 @@ -30123,7 +30123,7 @@ _02247F7C: pop {r4, r5, r6, pc} _02247F8E: ldr r0, _02247FBC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_0224865C add r0, r6, #0 @@ -30132,7 +30132,7 @@ _02247F8E: b _02247FB6 _02247FA4: ldr r0, _02247FBC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 blx r4 add r0, r6, #0 @@ -31045,7 +31045,7 @@ MOD18_022486B8: ; 0x022486B8 bl FUN_02026CB4 bl FUN_02026B90 ldr r0, _0224873C ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x16 bl MOD18_022479BC @@ -31309,7 +31309,7 @@ MOD18_022488F0: ; 0x022488F0 cmp r6, r0 beq _02248916 ldr r0, _022489C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02248916: bl FUN_020311F0 cmp r0, #0 @@ -31330,7 +31330,7 @@ _02248934: mov r4, #0x33 _02248936: ldr r0, _022489C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r7, #0 add r1, r5, #0 bl MOD18_02248784 @@ -32218,7 +32218,7 @@ MOD18_02248FEC: ; 0x02248FEC cmp r4, r0 beq _02249008 ldr r0, _0224900C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02249008: pop {r3, r4, r5, pc} nop @@ -32867,7 +32867,7 @@ MOD18_022494C8: ; 0x022494C8 add r5, r0, #0 ldr r0, _02249534 ; =0x000005FD add r6, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #2 bl MOD18_0223E56C mov r1, #0x25 @@ -33971,7 +33971,7 @@ MOD18_02249DB8: ; 0x02249DB8 cmp r6, r0 beq _02249DE2 ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02249DE2: mov r0, #1 mvn r0, r0 @@ -33984,7 +33984,7 @@ _02249DE2: pop {r4, r5, r6, pc} _02249DF4: ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34007,7 +34007,7 @@ _02249E0E: lsr r0, r0, #0x18 bl MOD18_0223EF60 ldr r0, _02249E8C ; =0x00000631 - bl FUN_020054C8 + bl PlaySE ldr r0, _02249E84 ; =0x00000246 mov r1, #3 strb r1, [r5, r0] @@ -34016,7 +34016,7 @@ _02249E3A: cmp r4, #2 bne _02249E7C ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02249E88 ; =0x022513F8 ldr r0, [r0] ldrb r0, [r0, #5] @@ -34448,7 +34448,7 @@ MOD18_0224A1C0: ; 0x0224A1C0 cmp r6, r0 beq _0224A1EA ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224A1EA: mov r0, #1 mvn r0, r0 @@ -34461,7 +34461,7 @@ _0224A1EA: pop {r4, r5, r6, pc} _0224A1FC: ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34501,7 +34501,7 @@ _0224A25A: cmp r4, #2 bne _0224A28C ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224A2A8 ; =0x022513F8 ldr r0, [r0] ldrb r0, [r0, #5] @@ -34872,7 +34872,7 @@ MOD18_0224A550: ; 0x0224A550 cmp r6, r0 beq _0224A57A ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224A57A: mov r0, #1 mvn r0, r0 @@ -34885,7 +34885,7 @@ _0224A57A: pop {r4, r5, r6, pc} _0224A58C: ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34909,7 +34909,7 @@ _0224A5A6: bl Sav2_Bag_get add r6, r0, #0 ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE lsl r1, r4, #0x10 add r0, r6, #0 lsr r1, r1, #0x10 @@ -34967,7 +34967,7 @@ _0224A64A: cmp r4, #2 bne _0224A67E ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224A69C ; =0x022513F8 ldr r1, [r0] ldr r0, [r1] @@ -35745,7 +35745,7 @@ _0224AC78: pop {r3, r4, r5, pc} _0224AC8A: ldr r0, _0224ACF8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249AAC b _0224ACF2 @@ -35814,7 +35814,7 @@ MOD18_0224AD04: ; 0x0224AD04 cmp r6, r0 beq _0224AD2E ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224AD2E: mov r0, #1 mvn r0, r0 @@ -35827,7 +35827,7 @@ _0224AD2E: pop {r4, r5, r6, pc} _0224AD40: ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -35842,7 +35842,7 @@ _0224AD5A: cmp r4, #2 bne _0224AD94 ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224ADB0 ; =0x022513F8 ldr r1, [r0] ldr r0, [r1] @@ -36347,7 +36347,7 @@ MOD18_0224B128: ; 0x0224B128 cmp r1, r0 bne _0224B15C ldr r0, _0224B184 ; =0x0000060C - bl FUN_020054C8 + bl PlaySE bl FUN_0204F7E4 add r0, r4, #0 bl MOD18_0224BD54 @@ -36528,7 +36528,7 @@ _0224B29E: pop {r3, r4, r5, pc} _0224B2AA: ldr r0, _0224B344 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #2 strb r1, [r4, r0] @@ -36570,28 +36570,28 @@ _0224B2F2: b _0224B33E _0224B308: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #8 strb r1, [r4, r0] b _0224B33E _0224B316: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #6 strb r1, [r4, r0] b _0224B33E _0224B324: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #0x11 strb r1, [r4, r0] b _0224B33E _0224B332: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #0x14 strb r1, [r4, r0] @@ -36898,7 +36898,7 @@ _0224B5A6: pop {r3, r4, r5, pc} _0224B5B0: ldr r0, _0224B60C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B610 ; =0x00000246 mov r1, #0 strb r1, [r5, r0] @@ -37247,7 +37247,7 @@ _0224B874: ; jump table .short _0224B946 - _0224B874 - 2 ; case 5 _0224B880: ldr r0, _0224B978 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE mov r1, #0 mov r0, #6 str r0, [sp] @@ -37297,7 +37297,7 @@ _0224B8D8: b _0224B970 _0224B8EE: ldr r0, _0224B97C ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -38073,7 +38073,7 @@ MOD18_0224BF84: ; 0x0224BF84 cmp r4, r0 beq _0224BFA2 ldr r0, _0224BFA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224BFA2: pop {r3, r4, r5, pc} .align 2, 0 @@ -39702,7 +39702,7 @@ _0224CC8E: cmp r6, r0 beq _0224CCC8 ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224CCC8: mov r0, #1 mvn r0, r0 @@ -39717,7 +39717,7 @@ _0224CCD8: b _0224CCF2 _0224CCDA: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD18_0224C94C @@ -39746,14 +39746,14 @@ _0224CD0C: cmp r5, #0 ldr r0, _0224CF58 ; =0x000005DC bne _0224CD24 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #4 add sp, #8 strb r1, [r4, r0] pop {r4, r5, r6, pc} _0224CD24: - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #0xb add sp, #8 @@ -39798,7 +39798,7 @@ _0224CD48: cmp r6, r0 beq _0224CD8C ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224CD8C: mov r0, #1 mvn r0, r0 @@ -39823,7 +39823,7 @@ _0224CDA6: b _0224CDCE _0224CDB6: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD18_0224C94C @@ -39834,7 +39834,7 @@ _0224CDB6: pop {r4, r5, r6, pc} _0224CDCE: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #0x12 strb r1, [r4, r0] @@ -40051,7 +40051,7 @@ _0224CF92: mov r0, #6 bl MOD18_0224CA58 ldr r0, _0224D1D4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D1D8 ; =0x00000246 mov r1, #9 add sp, #8 @@ -40273,7 +40273,7 @@ _0224D14E: mov r0, #7 bl MOD18_0224CA58 ldr r0, _0224D1D4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D1D8 ; =0x00000246 mov r1, #9 add sp, #8 @@ -40374,7 +40374,7 @@ MOD18_0224D1F8: ; 0x0224D1F8 mov r1, #0 strb r1, [r6, r0] ldr r0, _0224D2E0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D2E4 ; =MOD18_0224CC04 ldr r2, _0224D2E8 ; =0x00002710 add r1, r6, #0 @@ -40849,7 +40849,7 @@ _0224D64A: add r0, #8 bl ScheduleWindowCopyToVram ldr r0, _0224D690 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D694 ; =MOD18_0224D5B4 add r1, r4, #0 mov r2, #0xa @@ -41343,7 +41343,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r1, r4, #0 bl MOD18_0224D814 ldr r0, _0224DAA4 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #8 bl ScheduleWindowCopyToVram @@ -42449,23 +42449,23 @@ _0224E22A: pop {r3, r4, r5, pc} _0224E23A: ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r4, [r5, #0x3c] mov r0, #2 add r5, #0x38 strb r0, [r5] ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _0224E250: ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r4, [r5, #0x3c] mov r0, #2 add r5, #0x38 strb r0, [r5] ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0224E268: .word 0x000005DC @@ -42673,7 +42673,7 @@ _0224E3CC: add r5, #0x42 strb r0, [r5] ldr r0, _0224E3EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _0224E3DC: str r4, [r5, #0x44] @@ -42681,7 +42681,7 @@ _0224E3DC: add r5, #0x42 strb r0, [r5] ldr r0, _0224E3EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _0224E3EC: .word 0x000005DC @@ -43085,7 +43085,7 @@ MOD18_0224E73C: ; 0x0224E73C cmp r4, r0 beq _0224E75C ldr r0, _0224E760 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224E75C: pop {r3, r4, r5, pc} nop @@ -43775,7 +43775,7 @@ _0224ECB6: add r2, r7, #0 bl FUN_02025EDC ldr r0, _0224EDD0 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x50] bl MOD18_02247138 mov r0, #0xb @@ -43797,7 +43797,7 @@ _0224ECB6: b _0224EDBA _0224ED26: ldr r0, _0224EDD8 ; =0x00000602 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc bl MOD18_02247118 str r0, [r4, #8] @@ -43973,7 +43973,7 @@ _0224EE52: beq _0224EEB4 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r6, r6, r0 @@ -43990,7 +43990,7 @@ _0224EEB4: beq _0224EED6 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r6, r6, r0 @@ -44007,7 +44007,7 @@ _0224EED6: beq _0224EEF8 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r5, r5, r0 @@ -44024,7 +44024,7 @@ _0224EEF8: beq _0224EF1A add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r5, r5, r0 @@ -44203,7 +44203,7 @@ _0224F04E: _0224F06E: mov r0, #0x19 lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE mov r0, #0xe bl MOD18_02247118 str r0, [r4, #8] @@ -44231,7 +44231,7 @@ _0224F09E: bl FUN_02026CC4 add r5, r0, #0 ldr r0, _0224F15C ; =0x000005EB - bl FUN_020054C8 + bl PlaySE ldr r1, [sp, #4] add r0, r5, #0 bl FUN_02025F30 @@ -44520,7 +44520,7 @@ _0224F2BE: beq _0224F320 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r6, r6, r0 @@ -44537,7 +44537,7 @@ _0224F320: beq _0224F342 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r6, r6, r0 @@ -44554,7 +44554,7 @@ _0224F342: beq _0224F364 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r4, r4, r0 @@ -44571,7 +44571,7 @@ _0224F364: beq _0224F386 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r4, r4, r0 @@ -44729,7 +44729,7 @@ _0224F4A2: add r1, #0x5c bl MOD18_0224F8CC ldr r0, _0224F524 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE ldr r0, _0224F51C ; =0x000004FC ldr r0, [r5, r0] bl MOD18_0224FBF8 @@ -44977,7 +44977,7 @@ _0224F692: add r2, #0x5c bl MOD18_0224F890 ldr r0, _0224F764 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE ldr r2, _0224F768 ; =0x000004FC ldr r0, [r4, #0x3c] ldr r1, [r4, #0x40] @@ -44996,7 +44996,7 @@ _0224F692: b _0224F750 _0224F6E0: ldr r0, _0224F76C ; =0x00000602 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc bl MOD18_02247118 str r0, [r4, #8] @@ -47317,4 +47317,3 @@ MOD18_022513F8: ; 0x022513F8 .global MOD18_022513FC MOD18_022513FC: ; 0x022513FC .space 0x4 - diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 60964f7e..c957045f 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -889,7 +889,7 @@ _02252A50: cmp r7, #1 bne _02252AEA ldr r0, _02252AEC ; =0x0000066E - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _02252A6A: mov r4, #0 @@ -1017,7 +1017,7 @@ MOD20_02252B28: ; 0x02252B28 bne _02252B46 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _02252B46: pop {r4, pc} thumb_func_end MOD20_02252B28 @@ -2070,7 +2070,7 @@ MOD20_022532F0: ; 0x022532F0 mov r1, #4 bl BgCommitTilemapBufferToVram ldr r0, _02253334 ; =0x00000671 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc @@ -2137,7 +2137,7 @@ MOD20_02253378: ; 0x02253378 mov r1, #4 bl BgCommitTilemapBufferToVram ldr r0, _022533BC ; =0x0000066F - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 3683eec3..3406537b 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -1088,7 +1088,7 @@ _022550D4: cmp r0, #0 beq _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0x9e lsl r0, r0, #2 ldrh r1, [r5, r0] @@ -1112,7 +1112,7 @@ _02255100: cmp r1, r0 bge _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0x9e lsl r0, r0, #2 ldrh r1, [r5, r0] @@ -1163,7 +1163,7 @@ _02255160: cmp r0, r1 bne _0225519C ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r1, #0x18 ldr r2, [r5, #4] mul r1, r4 @@ -1188,7 +1188,7 @@ _022551A4: cmp r1, r0 bne _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE ldr r1, [r5, #4] ldr r0, _022551E0 ; =0x000004BF mov r2, #1 @@ -1322,7 +1322,7 @@ MOD51_02255294: ; 0x02255294 sub r1, r1, #1 strh r1, [r4, r0] ldr r0, _022552F8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _022552C6: lsr r0, r1, #1 @@ -1343,7 +1343,7 @@ _022552C6: add r1, r2, #1 strh r1, [r4, r0] ldr r0, _022552F8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE _022552F0: pop {r4, pc} nop @@ -1946,4 +1946,3 @@ MOD51_022557C4: ; 0x022557C4 .global MOD51_02255800 MOD51_02255800: ; 0x02255800 .space 0x4 - diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 46740908..0bff7b6e 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -1577,7 +1577,7 @@ _021D8200: ldr r1, [sp, #8] bl MOD53_021D83DC ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D821A: mov r1, #0xc1 @@ -1597,7 +1597,7 @@ _021D821A: cmp r1, r0 beq _021D8246 ldr r0, _021D83B8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8246: bl FUN_02030F20 @@ -1621,7 +1621,7 @@ _021D8246: mov r0, #1 str r0, [sp, #4] ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8280: ldr r1, _021D83C0 ; =0x0000438B @@ -1630,7 +1630,7 @@ _021D8280: cmp r0, #2 bne _021D8292 ldr r0, _021D83B8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8292: mov r1, #1 @@ -1649,7 +1649,7 @@ _021D8292: mov r0, #1 str r0, [sp, #4] ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D82BE: ldr r0, [sp, #8] @@ -1695,7 +1695,7 @@ _021D82EE: ldr r0, [sp] strb r1, [r0, r2] ldr r0, _021D83C8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE _021D8316: ldr r0, _021D83CC ; =0x021D94F0 bl FUN_02020968 @@ -1904,7 +1904,7 @@ _021D84BE: mov r1, #2 bl MOD53_021D93E0 ldr r0, _021D84E4 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE mov r1, #0x1e add r2, r1, #0 ldr r0, _021D84E8 ; =0x04000050 @@ -2019,7 +2019,7 @@ MOD53_021D857C: ; 0x021D857C cmp r0, #0 beq _021D85B4 ldr r0, _021D86CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D85B4: add sp, #4 add r0, r4, #0 @@ -2616,7 +2616,7 @@ _021D8A6E: mov r1, #0x16 bl MOD53_021D93E0 ldr r0, _021D8AA8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE bl FUN_02031190 cmp r0, #0 bne _021D8A96 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 8d6e1767..6840cd32 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1318,7 +1318,7 @@ MOD54_021D7F70: ; 0x021D7F70 pop {r3, r4, pc} _021D7FCC: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D7FD6: @@ -1343,7 +1343,7 @@ _021D7FD6: pop {r3, r4, pc} _021D8002: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D800C: @@ -1378,7 +1378,7 @@ _021D800C: pop {r3, r4, pc} _021D8050: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D805A: @@ -1536,7 +1536,7 @@ MOD54_021D8150: ; 0x021D8150 tst r0, r1 beq _021D8178 ldr r0, _021D8274 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D8178: add r0, r5, #0 bl MOD54_021D80A0 @@ -1554,7 +1554,7 @@ _021D8184: tst r0, r1 beq _021D819C ldr r0, _021D8274 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D819C: add r0, r5, #0 bl MOD54_021D80A0 @@ -1803,7 +1803,7 @@ _021D838A: tst r0, r1 beq _021D839A ldr r0, _021D8418 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D839A: add r0, r5, #0 bl MOD54_021D80A0 @@ -2164,7 +2164,7 @@ _021D864A: tst r0, r1 beq _021D865A ldr r0, _021D86D8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D865A: add r0, r5, #0 bl MOD54_021D80A0 @@ -3221,7 +3221,7 @@ _021D8E3E: cmp r0, #0 beq _021D8E5C ldr r0, _021D8E60 ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _021D8E5C: add sp, #0x1c pop {r4, r5, r6, r7, pc} diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 61c1dbe7..ce354a55 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -1602,7 +1602,7 @@ _021D81EE: tst r1, r0 beq _021D824C ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -1652,7 +1652,7 @@ _021D824C: tst r0, r1 beq _021D8262 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x11 lsl r0, r0, #4 @@ -1669,7 +1669,7 @@ _021D8262: cmp r0, #0 beq _021D82B2 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -1688,7 +1688,7 @@ _021D828C: cmp r0, #3 bhs _021D82B2 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -3052,7 +3052,7 @@ _021D8D52: tst r1, r0 beq _021D8D88 ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D8E64 ; =0x000003CB ldrb r0, [r5, r1] cmp r0, #0 @@ -3077,7 +3077,7 @@ _021D8D88: tst r1, r3 beq _021D8D9E ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #6 lsl r0, r0, #4 @@ -3095,7 +3095,7 @@ _021D8D9E: sub r1, r1, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #0 add r0, r5, #0 mvn r1, r1 @@ -3112,7 +3112,7 @@ _021D8DC4: add r1, r1, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #1 bl MOD55_021D8CBC @@ -3131,7 +3131,7 @@ _021D8DE6: sub r0, r2, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #3 add r0, r5, #0 mvn r1, r1 @@ -3151,7 +3151,7 @@ _021D8E10: sub r0, r2, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #4 bl MOD55_021D8CBC @@ -3388,7 +3388,7 @@ _021D9002: cmp r7, r0 beq _021D902C ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D902C: mov r0, #1 mvn r0, r0 @@ -3402,7 +3402,7 @@ _021D902C: pop {r4, r5, r6, r7, pc} _021D9040: ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x2b lsl r0, r0, #4 ldr r0, [r5, r0] @@ -3420,7 +3420,7 @@ _021D9040: b _021D9098 _021D9068: ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0x14 bne _021D9092 ldr r0, [r5, #4] @@ -3518,7 +3518,7 @@ MOD55_021D90D8: ; 0x021D90D8 add r0, r6, #0 bl CopyPlayerName ldr r0, _021D9180 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r2, [sp, #4] add r0, r5, #0 add r1, r4, #0 @@ -4828,7 +4828,7 @@ _021D9C82: tst r0, r1 beq _021D9CB2 ldr r0, _021D9CC0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index c3892911..7e036d8c 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -3437,7 +3437,7 @@ MOD56_02213924: ; 0x02213924 cmp r2, #0 bne _02213930 ldr r0, _02213934 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02213930: pop {r3, pc} nop @@ -4020,7 +4020,7 @@ _02213DD2: bl MOD56_02215EA4 _02213DDC: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x14 lsl r0, r0, #4 @@ -4041,7 +4041,7 @@ _02213E00: cmp r0, #0 beq _02213E1C ldr r0, _02213F8C ; =0x00000624 - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x2f lsl r0, r0, #4 @@ -4153,7 +4153,7 @@ _02213EE8: pop {r4, r5, r6, pc} _02213EFA: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] ldrb r0, [r0, #0x1b] bl MOD56_02211E88 @@ -4181,7 +4181,7 @@ _02213F2E: pop {r4, r5, r6, pc} _02213F32: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] ldrb r0, [r0, #0x1b] bl MOD56_02211E88 @@ -5206,11 +5206,11 @@ _0221471A: add r0, r5, #0 bl MOD56_02216120 ldr r0, _02214804 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _022147CE _02214730: ldr r0, _02214804 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE cmp r4, #0xf bne _02214752 cmp r7, #2 @@ -5483,7 +5483,7 @@ _02214956: pop {r4, r5, r6, pc} _02214968: ldr r0, _022149D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x24 lsl r0, r0, #4 @@ -5491,7 +5491,7 @@ _02214968: b _02214994 _02214978: ldr r0, _022149D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r1, r4, #0 bl MOD56_0221617C @@ -5857,7 +5857,7 @@ _02214C36: pop {r3, r4, r5, r6, r7, pc} _02214C4A: ldr r0, _02214E20 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x13 lsl r0, r0, #4 @@ -5865,7 +5865,7 @@ _02214C4A: b _02214DE2 _02214C5A: ldr r0, _02214E20 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE cmp r5, #1 beq _02214C66 b _02214DD6 @@ -8281,7 +8281,7 @@ _02215F82: mov r3, #0xa bl FUN_0200D0BC mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r3, #0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 09469284..52ef15ff 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -68,7 +68,7 @@ MOD57_021D74E0: ; 0x021D74E0 add r0, r4, r0 bl MOD57_021D95A8 ldr r0, _021D76F8 ; =0x00000695 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D76FC ; =0x000030E4 add r0, r4, r0 bl MOD57_021D9184 @@ -404,7 +404,7 @@ _021D7832: cmp r6, #4 bne _021D7856 ldr r0, _021D7938 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -1272,7 +1272,7 @@ _021D7F46: add r2, #0x80 str r2, [r4, r0] ldr r0, _021D80E4 ; =0x00000696 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D80DC ; =0x0000331A ldrb r1, [r4, r0] add r1, r1, #1 @@ -2337,7 +2337,7 @@ MOD57_021D875C: ; 0x021D875C cmp r0, #0 bne _021D8782 ldr r0, _021D87D8 ; =0x00000692 - bl FUN_020054C8 + bl PlaySE _021D8782: mov r0, #0 ldrsb r1, [r4, r0] @@ -2367,7 +2367,7 @@ _021D879A: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D87BC: mov r0, #2 ldrsb r0, [r4, r0] @@ -2487,11 +2487,11 @@ _021D8864: thumb_func_start MOD57_021D8894 MOD57_021D8894: ; 0x021D8894 - ldr r3, _021D889C ; =FUN_020054C8 + ldr r3, _021D889C ; =PlaySE ldr r0, _021D88A0 ; =0x00000699 bx r3 nop -_021D889C: .word FUN_020054C8 +_021D889C: .word PlaySE _021D88A0: .word 0x00000699 thumb_func_end MOD57_021D8894 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 891c82da..1cdd6b43 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1330,7 +1330,7 @@ MOD58_021DA514: ; 0x021DA514 mov r1, #1 bl MOD58_021DA614 ldr r0, _021DA5E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021DA568 _021DA55A: ldr r0, _021DA5E4 ; =0x0000431A @@ -2435,7 +2435,7 @@ MOD58_021DAD3C: ; 0x021DAD3C cmp r0, #0 bne _021DAD60 ldr r0, _021DAD9C ; =0x0000069A - bl FUN_020054C8 + bl PlaySE _021DAD60: mov r0, #0 ldrsb r1, [r4, r0] @@ -2455,7 +2455,7 @@ _021DAD78: cmp r0, #0 bne _021DAD88 ldr r0, _021DAD9C ; =0x0000069A - bl FUN_020054C8 + bl PlaySE _021DAD88: mov r0, #2 ldrsb r0, [r4, r0] diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 4de36b62..27c05dd6 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -632,7 +632,7 @@ _021D7C5E: mov r3, #4 bl FUN_0200D0BC mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint add r0, r4, #0 bl FUN_02002B7C mov r0, #1 @@ -735,7 +735,7 @@ MOD59_021D7D68: ; 0x021D7D68 cmp r2, #0 bne _021D7D74 ldr r0, _021D7D78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D7D74: pop {r3, pc} nop @@ -878,7 +878,7 @@ _021D7E66: ldr r0, [r5, #0x44] bl ListMenuItems_dtor ldr r0, _021D7EC8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] mov r0, #1 @@ -1060,7 +1060,7 @@ _021D7FF6: bne _021D803C _021D800A: ldr r0, _021D8054 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r4, #0x54] b _021D803C @@ -3101,7 +3101,7 @@ _021D9078: cmp r1, r0 bne _021D90A2 ldr r0, _021D937C ; =0x00000706 - bl FUN_020054C8 + bl PlaySE mov r0, #0x32 str r0, [r4, #0xc] b _021D985C @@ -3450,7 +3450,7 @@ _021D935C: add r0, #0x84 str r1, [r0] ldr r0, _021D9380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D9368: add r0, r4, #0 bl MOD59_021D8504 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 52185a9c..bce93cc6 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -284,7 +284,7 @@ _021D7714: cmp r1, #6 bne _021D773C ldr r0, _021D77B0 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x10] mov r0, #3 bic r1, r0 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 5014385c..cbb58d60 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -120,7 +120,7 @@ MOD61_021D75AC: ; 0x021D75AC tst r0, r1 beq _021D75C2 ldr r0, _021D75CC ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D75C2: @@ -152,7 +152,7 @@ MOD61_021D75D0: ; 0x021D75D0 cmp r0, #0 beq _021D7604 ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #2 strb r0, [r4, #0xc] mov r0, #0 @@ -162,11 +162,11 @@ _021D7604: mov r1, #3 strh r1, [r0] ldr r0, _021D76E8 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE b _021D7620 _021D7612: ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 strb r0, [r4, #0xc] mov r0, #0 @@ -189,7 +189,7 @@ _021D762E: ldr r0, [r4, #0x1c] strb r1, [r0, #3] ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021D7644: mov r0, #1 pop {r3, r4, r5, pc} @@ -198,7 +198,7 @@ _021D7648: tst r0, r2 beq _021D765C ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 strb r0, [r4, #0xc] mov r0, #0 @@ -264,7 +264,7 @@ _021D76BE: pop {r3, r4, r5, pc} _021D76C6: ldr r0, _021D76EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #0x11] cmp r1, #3 bne _021D76DA diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 1d50728c..313e1dd9 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -5002,7 +5002,7 @@ _0222FBF0: add r0, r4, #0 bl MOD62_0222D654 ldr r0, _0222FD64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FC4C: ldr r0, _0222FD68 ; =gMain @@ -5033,7 +5033,7 @@ _0222FC4C: add r3, r4, #0 bl MOD62_0222E3C4 ldr r0, _0222FD64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FC8E: mov r0, #2 @@ -5043,7 +5043,7 @@ _0222FC8E: add r1, #0x10 str r0, [r4, r1] ldr r0, _0222FD6C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FCA2: mov r0, #0x1a @@ -5335,7 +5335,7 @@ _0222FEBA: add r0, r4, #0 bl MOD62_0222F0D4 ldr r0, _022300B0 ; =0x000006C5 - bl FUN_020054C8 + bl PlaySE _0222FEE6: ldr r0, _022300B4 ; =0x00000404 add r1, r6, #0 @@ -5368,7 +5368,7 @@ _0222FEF2: add r0, r4, #0 bl MOD62_0222F0D4 ldr r0, _022300B0 ; =0x000006C5 - bl FUN_020054C8 + bl PlaySE _0222FF34: ldr r0, _022300B8 ; =0x00000408 add r1, r6, #0 @@ -5386,7 +5386,7 @@ _0222FF40: mov r1, #5 str r1, [r4, r0] ldr r0, _022300BC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _0222FF58: ldr r0, _022300C0 ; =0x0000040C mov r1, #0 @@ -5412,7 +5412,7 @@ _0222FF6E: mov r1, #0 bl MOD62_022300DC ldr r0, _022300C4 ; =0x000005E2 - bl FUN_020054C8 + bl PlaySE _0222FF8E: mov r0, #0x41 mov r1, #0x8e @@ -5442,7 +5442,7 @@ _0222FFAC: mov r1, #0 bl MOD62_022300DC ldr r0, _022300BC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _0222FFCC: ldr r0, _022300C8 ; =0x00000414 mov r1, #0x8f @@ -5464,7 +5464,7 @@ _0222FFE6: cmp r0, #0 bne _02230006 ldr r0, _022300CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add r4, #0xec add r0, r4, #0 mov r1, #0xf @@ -5505,14 +5505,14 @@ _02230006: add r1, r5, #0 bl MOD62_0222F168 ldr r0, _022300D0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _0223005C: ldrb r0, [r6, r5] cmp r0, #0 beq _022300A8 ldr r0, _022300CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add r4, #0xec add r0, r4, #0 mov r1, #0x10 @@ -5537,7 +5537,7 @@ _02230074: add r0, r4, #0 bl MOD62_0222F208 ldr r0, _022300D0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _022300A4: bl GF_AssertFail @@ -6272,7 +6272,7 @@ _02230646: add r0, r4, #0 bl MOD62_0223026C ldr r0, _02230728 ; =0x000006C6 - bl FUN_020054C8 + bl PlaySE mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6979,7 +6979,7 @@ _02230C3E: bl MOD62_0222DB78 _02230C80: ldr r0, _02230CB8 ; =0x000005EA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xff add r0, #0xd4 @@ -7212,7 +7212,7 @@ _02230E46: mov r2, #0 bl MOD62_0222FA40 ldr r0, _02230F28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230E66: ldr r0, _02230F2C ; =gMain @@ -7240,7 +7240,7 @@ _02230E66: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02230F28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230EA4: mov r0, #2 @@ -7260,7 +7260,7 @@ _02230EA4: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02230F30 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230ED0: ldr r1, _02230F2C ; =gMain diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index d5ce1348..182b8d56 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -214,7 +214,7 @@ _021D768C: mov r1, #0x3c bl FUN_020053CC ldr r0, _021D77AC ; =0x000005F4 - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] b _021D779C diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index aecc5268..47d2195c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -1508,7 +1508,7 @@ _021D80D2: add r0, r4, #0 bl MOD64_021D83C4 ldr r0, _021D80FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D80F4 _021D80F0: mov r0, #1 @@ -1566,7 +1566,7 @@ _021D8146: mov r1, #1 bl MOD64_021D83C4 ldr r0, _021D81D0 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D815E: mov r0, #0x26 @@ -1867,7 +1867,7 @@ MOD64_021D8384: ; 0x021D8384 bmi _021D83A0 str r0, [r4, #0x54] ldr r0, _021D83C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D83A0: ldr r0, _021D83BC ; =gMain ldr r1, [r0, #0x48] @@ -1880,7 +1880,7 @@ _021D83A0: bge _021D83BA str r0, [r4, #0x54] ldr r0, _021D83C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D83BA: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 13d12cb8..4fc8d105 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -362,7 +362,7 @@ _021D77A2: tst r0, r1 beq _021D77BE ldr r0, _021D77FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xff strb r0, [r5, #0x1a] mov r0, #0 @@ -374,7 +374,7 @@ _021D77BE: tst r0, r1 beq _021D77F2 ldr r0, _021D77FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0xff beq _021D77DC mov r0, #1 @@ -433,7 +433,7 @@ MOD65_021D7818: ; 0x021D7818 tst r0, r1 beq _021D784A ldr r0, _021D78A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD65_021D86BC add r0, r5, #0 @@ -447,7 +447,7 @@ _021D784A: tst r0, r1 beq _021D789E ldr r0, _021D78A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 mvn r0, r0 cmp r4, r0 @@ -528,7 +528,7 @@ MOD65_021D78CC: ; 0x021D78CC b _021D7916 _021D78E8: ldr r0, _021D791C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD65_021D8764 mov r0, #5 @@ -537,7 +537,7 @@ _021D78E8: pop {r4, pc} _021D78FC: ldr r0, _021D791C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x42 lsl r0, r0, #2 add r0, r4, r0 @@ -1406,7 +1406,7 @@ _021D7FCA: add r3, r2, #0 bl FillWindowPixelRect mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r3, #0 @@ -1900,7 +1900,7 @@ MOD65_021D83A0: ; 0x021D83A0 add r4, r0, #0 ldr r0, _021D8470 ; =0x000005E4 add r5, r1, #0 - bl FUN_020054C8 + bl PlaySE ldrh r1, [r4, #0x14] ldr r0, _021D8474 ; =0x0000FFFF cmp r1, r0 @@ -2077,7 +2077,7 @@ MOD65_021D84F0: ; 0x021D84F0 cmp r6, #0 bne _021D850C ldr r0, _021D862C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D850C: add r1, sp, #0x10 add r0, r7, #0 @@ -2326,7 +2326,7 @@ MOD65_021D8704: ; 0x021D8704 cmp r2, #0 bne _021D8710 ldr r0, _021D8714 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D8710: pop {r3, pc} nop diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 46a8659a..95660bd2 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -1001,7 +1001,7 @@ MOD66_021D7CAC: ; 0x021D7CAC mov r1, #0x11 bl FUN_0200E1D0 ldr r0, _021D7CF0 ; =0x0000068F - bl FUN_020054C8 + bl PlaySE mov r0, #0 bl FUN_0200E394 mov r0, #1 @@ -1038,7 +1038,7 @@ MOD66_021D7CF8: ; 0x021D7CF8 bl FUN_0200E1D0 mov r0, #0x69 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE mov r0, #0 add sp, #0xc pop {pc} @@ -1061,7 +1061,7 @@ MOD66_021D7D24: ; 0x021D7D24 add r2, r1, #0 bl FUN_0200E1D0 ldr r0, _021D7D64 ; =0x0000068F - bl FUN_020054C8 + bl PlaySE mov r0, #0 bl FUN_0200E394 mov r1, #4 @@ -1096,7 +1096,7 @@ MOD66_021D7D6C: ; 0x021D7D6C bl FUN_0200E1D0 mov r0, #0x69 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE mov r0, #0 add sp, #0xc pop {pc} @@ -1115,7 +1115,7 @@ MOD66_021D7D98: ; 0x021D7D98 tst r1, r2 beq _021D7DB6 ldr r0, _021D7DD0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7DB6: @@ -1150,7 +1150,7 @@ MOD66_021D7DD4: ; 0x021D7DD4 cmp r0, #0 beq _021D7DFA ldr r0, _021D7E28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7DFA: @@ -1161,7 +1161,7 @@ _021D7DFE: tst r2, r3 beq _021D7E0E ldr r0, _021D7E28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7E0E: @@ -1189,7 +1189,7 @@ MOD66_021D7E2C: ; 0x021D7E2C tst r1, r3 beq _021D7E42 ldr r0, _021D7E50 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7E42: @@ -3336,7 +3336,7 @@ _021D8ED0: mov r1, #1 bl FUN_02020208 ldr r0, _021D9018 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add sp, #0x10 add r0, r0, #1 @@ -3507,7 +3507,7 @@ _021D903C: mov r2, #2 bl FUN_0200E1D0 ldr r0, _021D90EC ; =0x00000691 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add sp, #0x10 add r0, r0, #1 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 171acce3..c17a7105 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -587,7 +587,7 @@ _021D7970: mov r1, #1 strb r1, [r4, r0] ldr r0, _021D7A24 ; =0x00000691 - bl FUN_020054C8 + bl PlaySE b _021D7A12 _021D79AC: bl MOD67_021D7C30 @@ -678,7 +678,7 @@ _021D7A4A: mov r1, #1 strb r1, [r4, r0] ldr r0, _021D7AA0 ; =0x00000691 - bl FUN_020054C8 + bl PlaySE b _021D7A92 _021D7A72: bl MOD67_021D7CBC diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index ead9cb12..8dc21247 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -647,7 +647,7 @@ MOD70_021D79C0: ; 0x021D79C0 b _021D7A14 _021D79D4: ldr r0, _021D7A1C ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r1, #0 mov r0, #6 str r0, [sp] @@ -788,7 +788,7 @@ MOD70_021D7ADC: ; 0x021D7ADC push {r4, lr} add r4, r0, #0 ldr r0, _021D7AF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD70_021D7D98 mov r0, #1 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index eccd3758..5ece5081 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -3633,7 +3633,7 @@ MOD71_0222F3DC: ; 0x0222F3DC cmp r0, r6 beq _0222F416 ldr r0, _0222F428 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r6, [r4] mov r7, #1 _0222F416: @@ -4326,7 +4326,7 @@ MOD71_0222F954: ; 0x0222F954 pop {r4, r5, r6, pc} _0222F976: ldr r0, _0222FA10 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FA14 ; =0x0000366C ldr r0, [r5, r0] bl FUN_0202DFA4 @@ -4344,7 +4344,7 @@ _0222F976: b _0222F9E4 _0222F9A0: ldr r0, _0222FA10 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FA24 ; =0x00003670 str r4, [r5, r0] mov r0, #0x1a @@ -7143,7 +7143,7 @@ MOD71_02231098: ; 0x02231098 cmp r2, #0 bne _022310A4 ldr r0, _022310A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310A4: pop {r3, pc} nop diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index b91c0cfa..28b61540 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -588,11 +588,11 @@ _021D7966: cmp r7, #0xa bge _021D799C ldr r0, _021D79D8 ; =0x000006BD - bl FUN_020054C8 + bl PlaySE b _021D79A2 _021D799C: ldr r0, _021D79DC ; =0x000006BE - bl FUN_020054C8 + bl PlaySE _021D79A2: mov r0, #0xd6 lsl r0, r0, #2 @@ -777,7 +777,7 @@ _021D7AE2: mov r1, #0 bl FUN_020054F0 ldr r0, _021D7C88 ; =0x000006C2 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D7C8C ; =0x000005A4 mov r1, #0 add r0, r4, r0 @@ -1022,7 +1022,7 @@ _021D7D42: add r0, r4, r0 bl MOD73_021DA730 ldr r0, _021D7F4C ; =0x000006C3 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1042,7 +1042,7 @@ _021D7D66: add r0, r4, r0 bl MOD73_021DB260 ldr r0, _021D7F4C ; =0x000006C3 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1673,7 +1673,7 @@ _021D8292: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D82F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021D82C2: add r0, r0, #4 @@ -1693,7 +1693,7 @@ _021D82C2: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D82F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE _021D82EC: pop {r4, pc} nop @@ -1829,7 +1829,7 @@ MOD73_021D83D0: ; 0x021D83D0 ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D83FC: ldrb r0, [r4, #0x12] cmp r0, #1 @@ -1846,7 +1846,7 @@ _021D83FC: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE b _021D8434 _021D8422: cmp r0, #2 @@ -1896,7 +1896,7 @@ MOD73_021D8458: ; 0x021D8458 add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D84F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE mov r0, #0xb mov r1, #1 lsl r0, r0, #6 @@ -1911,7 +1911,7 @@ _021D8490: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D84F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE mov r0, #0xb mov r1, #2 lsl r0, r0, #6 @@ -1969,7 +1969,7 @@ MOD73_021D84FC: ; 0x021D84FC add r0, r0, r3 bl MOD73_021DB020 ldr r0, _021D8528 ; =0x000006BF - bl FUN_020054C8 + bl PlaySE _021D851C: pop {r3, pc} nop @@ -2108,7 +2108,7 @@ _021D860E: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D861E: ldrh r1, [r4, #8] mov r0, #0xd5 @@ -4642,7 +4642,7 @@ _021D9958: mov r1, #0 bl FUN_020200A0 ldr r0, _021D9A24 ; =0x000006BC - bl FUN_020054C8 + bl PlaySE mov r0, #0x73 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 79c74bf7..23d75c48 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -1637,15 +1637,15 @@ MOD75_021E7870: ; 0x021E7870 b _021E78A0 _021E7890: ldr r0, _021E7964 ; =0x000006CC - bl FUN_020054C8 + bl PlaySE b _021E78A6 _021E7898: ldr r0, _021E7968 ; =0x000006CD - bl FUN_020054C8 + bl PlaySE b _021E78A6 _021E78A0: ldr r0, _021E796C ; =0x000006CE - bl FUN_020054C8 + bl PlaySE _021E78A6: ldr r0, _021E7960 ; =0x00000482 mov r1, #3 @@ -2030,7 +2030,7 @@ MOD75_021E7B7C: ; 0x021E7B7C cmp r0, #1 bne _021E7BC0 ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #4 mov r0, #2 pop {r3, r4, r5, r6, pc} @@ -2130,7 +2130,7 @@ _021E7C6E: pop {r3, r4, r5, r6, pc} _021E7C82: ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -2150,7 +2150,7 @@ _021E7C82: pop {r3, r4, r5, r6, pc} _021E7CAC: ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] lsl r2, r6, #2 ldrh r1, [r0, r2] @@ -2220,7 +2220,7 @@ MOD75_021E7D14: ; 0x021E7D14 pop {r4, pc} _021E7D2E: ldr r0, _021E7E00 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -2274,7 +2274,7 @@ _021E7D88: pop {r4, pc} _021E7D9A: ldr r0, _021E7E00 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -2609,7 +2609,7 @@ MOD75_021E8020: ; 0x021E8020 pop {r3, r4, r5, pc} _021E803E: ldr r0, _021E8190 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xc4 ldr r3, [r1] @@ -2695,7 +2695,7 @@ _021E80D8: pop {r3, r4, r5, pc} _021E80EA: ldr r0, _021E8190 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xc4 ldr r3, [r1] @@ -3146,7 +3146,7 @@ _021E8460: cmp r0, #3 bne _021E84CA ldr r0, _021E84D8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #6] add r0, r5, #0 mov r2, #2 @@ -3360,7 +3360,7 @@ _021E85FA: mov r2, #0x50 bl MOD75_021EC380 ldr r0, _021E8678 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #2 bl MOD75_021E8574 @@ -3750,7 +3750,7 @@ _021E88D0: cmp r0, #1 bne _021E8912 ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 mov r1, #0x49 @@ -3766,7 +3766,7 @@ _021E8912: tst r0, r1 beq _021E892E ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 add sp, #4 @@ -3833,7 +3833,7 @@ _021E899A: b _021E89E0 _021E89AA: ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021E89EC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 @@ -3851,7 +3851,7 @@ _021E89C8: pop {r3, r4, r5, r6, pc} _021E89CE: ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 add sp, #4 @@ -4970,7 +4970,7 @@ _021E9286: strh r1, [r4, r0] mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5296,7 +5296,7 @@ _021E952C: add r0, r4, #0 bl MOD75_021EB504 ldr r0, _021E95B0 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #7 pop {r4, pc} _021E9544: @@ -5307,7 +5307,7 @@ _021E9544: add r0, r4, #0 bl MOD75_021EB504 ldr r0, _021E95B0 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #7 pop {r4, pc} _021E955E: @@ -5322,7 +5322,7 @@ _021E955E: mov r1, #0 bl MOD75_021EC298 ldr r0, _021E95B8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #8 pop {r4, pc} _021E9580: @@ -5338,7 +5338,7 @@ _021E9580: mov r1, #1 bl MOD75_021EC090 ldr r0, _021E95B8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} _021E95A6: @@ -6162,7 +6162,7 @@ _021E9C46: mov r1, #1 bl MOD75_021EB708 ldr r0, _021E9D5C ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x12 pop {r3, r4, r5, pc} @@ -6175,7 +6175,7 @@ _021E9C62: mov r1, #1 bl MOD75_021EB708 ldr r0, _021E9D5C ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x12 pop {r3, r4, r5, pc} @@ -6231,7 +6231,7 @@ _021E9C80: ldr r1, _021E9D58 ; =0x00000426 strb r0, [r4, r1] ldr r0, _021E9D64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x13 pop {r3, r4, r5, pc} @@ -6263,7 +6263,7 @@ _021E9D00: mov r1, #1 bl MOD75_021EC090 ldr r0, _021E9D64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x10 pop {r3, r4, r5, pc} @@ -6476,7 +6476,7 @@ MOD75_021E9EE4: ; 0x021E9EE4 pop {r4, pc} _021E9EF8: ldr r0, _021E9F68 ; =0x00000644 - bl FUN_020054C8 + bl PlaySE ldr r1, _021E9F6C ; =0x00000488 add r0, r4, #0 ldrsh r2, [r4, r1] @@ -7376,7 +7376,7 @@ _021EA5C2: cmp r1, r3 beq _021EA5F8 ldr r0, _021EA600 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021EA5D4: @@ -7396,7 +7396,7 @@ _021EA5E8: cmp r1, r3 beq _021EA5F8 ldr r0, _021EA600 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #1 _021EA5F8: pop {r3, r4, r5, r6, r7, pc} @@ -9441,7 +9441,7 @@ MOD75_021EB660: ; 0x021EB660 sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C add r0, r4, #0 @@ -9491,7 +9491,7 @@ _021EB6C2: pop {r3, pc} _021EB6C8: ldr r0, _021EB6DC ; =0x0000060D - bl FUN_020054C8 + bl PlaySE b _021EB6D8 _021EB6D0: ldr r0, _021EB6DC ; =0x0000060D diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 16cdc8de..ae83c7a7 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -580,7 +580,7 @@ MOD76_021D7974: ; 0x021D7974 tst r1, r0 beq _021D799C ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r2, [r5] mov r0, #1 ldrb r1, [r2, #0x14] @@ -640,7 +640,7 @@ _021D79EE: b _021D7A38 _021D7A04: ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r5] add r0, r5, #0 ldrh r1, [r1, #0x10] @@ -663,7 +663,7 @@ _021D7A04: pop {r3, r4, r5, pc} _021D7A38: ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r5] add r0, r5, #0 ldrh r1, [r1, #0x10] @@ -1385,7 +1385,7 @@ MOD76_021D7FD0: ; 0x021D7FD0 cmp r6, #1 beq _021D7FE8 ldr r0, _021D8004 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021D7FE8: ldr r0, [r4] ldrb r0, [r0, #0x14] @@ -2048,7 +2048,7 @@ MOD76_021D853C: ; 0x021D853C add r1, r5, #0 bl MOD76_021D8354 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C ldr r0, [r4] @@ -2101,7 +2101,7 @@ _021D85B8: pop {r3, pc} _021D85BE: ldr r0, _021D85DC ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 697ffe65..2d4f838a 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -250,7 +250,7 @@ _021D76FA: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #2 cmp r0, #4 bhi _021D7732 @@ -369,7 +369,7 @@ _021D77F0: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE sub r0, r7, #2 cmp r6, r0 beq _021D780A @@ -446,7 +446,7 @@ _021D7886: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE sub r0, r7, #2 cmp r6, r0 beq _021D78B6 @@ -646,7 +646,7 @@ _021D7A4E: add r0, r4, r0 bl FUN_0200CCF8 ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -692,7 +692,7 @@ _021D7A94: cmp r0, #1 bne _021D7B66 ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021D7B66 _021D7AC0: ldr r0, _021D7B9C ; =0x00000403 @@ -730,7 +730,7 @@ _021D7AFA: mov r0, #0x10 str r0, [r5] ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021D7B66 _021D7B0E: bl MOD77_021D8CF8 @@ -1748,7 +1748,7 @@ MOD77_021D835C: ; 0x021D835C cmp r2, #0 bne _021D8368 ldr r0, _021D836C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D8368: pop {r3, pc} nop diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 85167a84..4b4209f2 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -148,7 +148,7 @@ _021D75DE: b _021D7662 _021D7614: ldr r0, _021D76B4 ; =0x000006DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 878b206a..a1fe2ee3 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -3290,7 +3290,7 @@ _0222EF50: mov r0, #9 str r0, [r4, #0x2c] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EF6A: ldrh r1, [r4, #0x3a] @@ -3306,7 +3306,7 @@ _0222EF6A: ldr r0, _0222F094 ; =0x00000708 strh r0, [r4, #0x3a] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EF8C: ldr r0, _0222F08C ; =0x00000D5C @@ -3325,7 +3325,7 @@ _0222EF8C: mov r2, #5 bl MOD80_0222E6DC ldr r0, _0222F098 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F09C ; =0x00000FDC mov r1, #0 str r1, [r4, r0] @@ -3337,7 +3337,7 @@ _0222EFBE: mov r0, #9 str r0, [r4, #0x2c] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EFD2: bl MOD80_0222E7BC @@ -3357,7 +3357,7 @@ _0222EFD2: ldr r0, [r4, r0] bl FUN_020200BC ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222F002: mov r0, #0x40 @@ -3376,7 +3376,7 @@ _0222F002: add r0, #0xb4 strh r1, [r0] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xb4 ldrh r0, [r0] @@ -3406,7 +3406,7 @@ _0222F040: add r0, #0xb4 strh r1, [r0] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xb4 ldrh r0, [r0] @@ -4441,7 +4441,7 @@ MOD80_0222F86C: ; 0x0222F86C mov r2, #7 bl MOD80_0222E6DC ldr r0, _0222F8C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F8B8 _0222F8A2: mov r1, #2 @@ -4452,7 +4452,7 @@ _0222F8A2: mov r2, #0 bl MOD80_0222E7A8 ldr r0, _0222F8C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222F8B8: mov r0, #3 add sp, #8 @@ -5724,7 +5724,7 @@ MOD80_022302F8: ; 0x022302F8 mov r2, #4 bl MOD80_0222E6DC ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230326: mov r3, #2 @@ -5736,7 +5736,7 @@ _02230326: str r3, [r4, #0x2c] bl MOD80_0222E7A8 ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230340: mov r0, #0x10 @@ -5753,7 +5753,7 @@ _02230340: mov r0, #6 str r0, [r4, #0x2c] ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230362: mov r0, #0x20 @@ -5771,7 +5771,7 @@ _02230362: mov r0, #6 str r0, [r4, #0x2c] ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02230384: mov r0, #3 pop {r3, r4, r5, pc} @@ -6803,7 +6803,7 @@ _02230BC8: mov r0, #3 str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230BD4: ldr r0, _02230CBC ; =0x00000B22 @@ -6824,20 +6824,20 @@ _02230BD4: cmp r0, #0 beq _02230C04 ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #3 pop {r3, r4, r5, pc} _02230C04: mov r0, #8 str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C10: mov r0, #0xb str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C1C: mov r0, #0xe @@ -6856,7 +6856,7 @@ _02230C22: mov r2, #0x16 bl MOD80_0222E6DC ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C44: mov r0, #2 @@ -6873,7 +6873,7 @@ _02230C44: mov r2, #0x16 bl MOD80_0222E6DC ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C6A: add r0, r4, #0 @@ -6905,7 +6905,7 @@ _02230C6A: add r4, #0xc4 ldr r0, _02230CB8 ; =0x000005DC str r5, [r4] - bl FUN_020054C8 + bl PlaySE _02230CAE: mov r0, #3 pop {r3, r4, r5, pc} @@ -6937,7 +6937,7 @@ MOD80_02230CC8: ; 0x02230CC8 mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230D5C ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230D4C _02230CF6: add r0, r4, r1 @@ -6958,11 +6958,11 @@ _02230CF6: mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230D5C ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230D4C _02230D26: ldr r0, _02230D60 ; =0x000005FF - bl FUN_020054C8 + bl PlaySE ldr r0, _02230D58 ; =0x00000F0F mov r1, #0xd str r0, [sp] @@ -7172,7 +7172,7 @@ MOD80_02230E9C: ; 0x02230E9C mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230EF4 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230EE8 _02230ECC: str r1, [sp] @@ -7249,7 +7249,7 @@ MOD80_02230F3C: ; 0x02230F3C mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230F74 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7278,7 +7278,7 @@ MOD80_02230F78: ; 0x02230F78 mov r1, #0 str r1, [r4, r0] ldr r0, _02230FB0 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7308,7 +7308,7 @@ MOD80_02230FB4: ; 0x02230FB4 add r2, r1, #0 bl MOD80_0222E7A8 ldr r0, _02230FEC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7356,14 +7356,14 @@ MOD80_02231008: ; 0x02231008 sub r0, r0, #1 str r0, [r1, #0x28] ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022310D0 _02231036: ldr r0, [r1, #0x2c] cmp r0, #0 beq _02231042 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02231042: mov r0, #0xfe lsl r0, r0, #4 @@ -7387,14 +7387,14 @@ _0223104E: add r0, r0, #1 str r0, [r1, #0x28] ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022310D0 _02231072: ldr r0, [r1, #0x2c] cmp r0, #1 beq _0223107E ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0223107E: mov r0, #0xfe lsl r0, r0, #4 @@ -7413,7 +7413,7 @@ _0223108A: cmp r0, #1 beq _022310A2 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310A2: mov r0, #0xfe lsl r0, r0, #4 @@ -7432,7 +7432,7 @@ _022310AE: cmp r0, #0 beq _022310C6 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310C6: mov r0, #0xfe lsl r0, r0, #4 @@ -7631,7 +7631,7 @@ _02231240: ldr r0, [r4, r0] bl ListMenuItems_dtor ldr r0, _022312BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [r4, #0x2c] b _022312AE @@ -7662,7 +7662,7 @@ _02231266: add r0, r4, r0 bl RemoveWindow ldr r0, _022312BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #0x2c] _022312AE: @@ -7756,7 +7756,7 @@ _02231342: add r0, r4, r0 bl FUN_0200CCF8 ldr r0, _02231470 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r4, #0x2c] mov r0, #0xfe @@ -7803,7 +7803,7 @@ _0223138C: mov r0, #0 str r0, [r4, #0x2c] ldr r0, _02231470 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0223147C ; =0x00000F18 mov r1, #0 add r0, r4, r0 @@ -7996,7 +7996,7 @@ _0223154A: add r0, r5, r0 bl RemoveWindow ldr r0, _02231600 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _022315EA @@ -8017,7 +8017,7 @@ _0223158E: add r0, r5, r0 bl RemoveWindow ldr r0, _02231600 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02231604 ; =0x00000B24 add r1, r4, #1 strb r1, [r5, r0] @@ -8169,7 +8169,7 @@ _022316D0: add r0, r5, r0 bl RemoveWindow ldr r0, _0223177C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _02231766 @@ -8190,7 +8190,7 @@ _0223170C: add r0, r5, r0 bl RemoveWindow ldr r0, _0223177C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02231780 ; =0x00000B22 add r1, r4, #0 add r0, r5, r0 @@ -9434,13 +9434,13 @@ _02232168: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223218E: cmp r0, #0x1f beq _022321B6 ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r2, r5, #0 add r3, r5, #0 ldr r1, [r5] @@ -9542,7 +9542,7 @@ _02232250: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _02232274: mov r0, #1 @@ -9560,7 +9560,7 @@ _02232274: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223229A: cmp r3, #0x1f @@ -9636,7 +9636,7 @@ _022322BC: mov r2, #9 bl MOD80_0222E6DC ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223233C: ldr r0, _02232378 ; =0x00000F0F @@ -9654,11 +9654,11 @@ _0223233C: b _02232368 _0223235A: ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _02232362: ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232368: mov r0, #3 add sp, #8 @@ -9732,7 +9732,7 @@ _022323CE: add r0, r5, #0 bl MOD80_02232D7C ldr r0, _02232450 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022323FE _022323F6: add r0, r5, #0 @@ -9743,7 +9743,7 @@ _022323FE: cmp r4, #0 beq _02232420 ldr r0, _02232450 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xba ldrh r0, [r0] @@ -12267,7 +12267,7 @@ _022337FA: mov r0, #5 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02233872 _02233820: mov r0, #0xfe @@ -12302,7 +12302,7 @@ _02233820: mov r0, #2 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02233872: mov r0, #3 pop {r4, pc} @@ -12432,7 +12432,7 @@ _02233932: mov r0, #0 str r0, [r4, #0x2c] ldr r0, _02233A5C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xfe lsl r0, r0, #4 ldr r3, [r4, r0] @@ -12475,7 +12475,7 @@ _0223398C: ldr r0, _02233A60 ; =0x00000B1C strh r5, [r4, r0] ldr r0, _02233A5C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat @@ -12660,7 +12660,7 @@ _02233B26: add r0, r5, r0 bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _02233BC6 @@ -12681,7 +12681,7 @@ _02233B6A: add r0, r5, r0 bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r3, _02233BE0 ; =0x00000F08 ldr r2, _02233BE4 ; =0x00000B1E add r0, r4, #1 @@ -12832,7 +12832,7 @@ _02233CA4: add r0, r5, r0 bl RemoveWindow ldr r0, _02233D7C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #0xfe lsl r1, r1, #4 ldr r1, [r5, r1] @@ -12851,7 +12851,7 @@ _02233CF4: b _02233D66 _02233CFA: ldr r0, _02233D7C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02233D6C ; =0x00000FD4 mov r1, #0 ldr r0, [r5, r0] @@ -14103,7 +14103,7 @@ MOD80_02234698: ; 0x02234698 cmp r1, r0 beq _022346C4 ldr r0, _022346D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022346C4: add r0, sp, #0 ldrh r0, [r0] @@ -16555,7 +16555,7 @@ MOD80_02235900: ; 0x02235900 str r5, [r0, #0xc] bl MOD80_02235948 ldr r0, _02235944 ; =0x0000062F - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0223593C: .word MOD80_02235964 @@ -16655,7 +16655,7 @@ _022359DE: pop {r4, r5, r6, pc} _022359F2: ldr r0, _02235A08 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0xc] ldr r0, _02235A0C ; =0x00000FEC mov r2, #1 @@ -16692,7 +16692,7 @@ MOD80_02235A10: ; 0x02235A10 str r5, [r0, #0xc] bl MOD80_02235948 ldr r0, _02235A50 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02235A48: .word MOD80_02235A54 @@ -16754,7 +16754,7 @@ _02235A9E: str r0, [r4] mov r0, #0x63 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _02235AC2: mov r0, #0x13 @@ -16876,7 +16876,7 @@ MOD80_02235B90: ; 0x02235B90 cmp r0, #1 bne _02235BAA ldr r0, _02235C24 ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _02235BAA: ldr r4, [sp, #4] mov r0, #0xe @@ -19842,4 +19842,3 @@ MOD80_02237E1C: ; 0x02237E1C .global MOD80_02237E24 MOD80_02237E24: ; 0x02237E24 .space 0x1C - diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 07e7ce6f..09e12fdf 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -520,7 +520,7 @@ MOD81_02238248: ; 0x02238248 cmp r0, #0 bgt _02238284 ldr r0, _0223832C ; =0x000006AE - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x1e add r0, #0xf0 @@ -2601,7 +2601,7 @@ _0223920E: ; jump table .short _022392B6 - _0223920E - 2 ; case 4 _02239218: ldr r0, _022392D4 ; =0x000006A8 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 mov r2, #0x10 @@ -3143,7 +3143,7 @@ _0223962A: str r0, [r4, #0x24] _02239658: ldr r0, _022396E4 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x20] add r0, r0, #1 str r0, [r4, #0x20] @@ -3590,7 +3590,7 @@ _022399A0: bne _022399B6 mov r0, #0x6b lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _022399B6: mov r0, #0x16 lsl r0, r0, #4 @@ -5630,7 +5630,7 @@ _0223A9C8: cmp r0, #0xa ble _0223AA54 ldr r0, _0223AA5C ; =0x000006AC - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r0, r5, #0 add r1, #0x34 @@ -5649,7 +5649,7 @@ _0223A9F2: cmp r0, #0 beq _0223AA54 ldr r0, _0223AA60 ; =0x000006AD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x20] mov r1, #3 bl FUN_02020130 @@ -6645,7 +6645,7 @@ _0223B1C2: cmp r0, #0 beq _0223B1FC ldr r0, _0223B214 ; =0x000006A9 - bl FUN_020054C8 + bl PlaySE mov r0, #0x10 str r0, [sp] mov r0, #1 @@ -7157,7 +7157,7 @@ _0223B5FE: cmp r0, #0 bne _0223B662 ldr r0, _0223B668 ; =0x000006AB - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r0, r5, #0 add r1, #0x34 @@ -10287,7 +10287,7 @@ _0223CEDC: cmp r1, r0 bge _0223CF62 ldr r0, _0223CF68 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE mov r0, #0 ldr r1, [r4, #0x30] mvn r0, r0 @@ -10580,4 +10580,3 @@ MOD81_0223D448: ; 0x0223D448 .global MOD81_0223D450 MOD81_0223D450: ; 0x0223D450 .space 0x10 - diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index d67f1cb3..b7ad2955 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -2586,7 +2586,7 @@ _0222E9EC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA08: mov r1, #0x80 @@ -2610,7 +2610,7 @@ _0222EA1C: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA38: ldr r2, [r2, #0x48] @@ -2643,7 +2643,7 @@ _0222EA68: add r2, r1, #0 bl MOD82_0222F6D8 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA7C: mov r1, #2 @@ -2655,7 +2655,7 @@ _0222EA7C: mov r0, #0x13 str r0, [r4, #0x1c] ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222EA94: mov r0, #3 add sp, #0x1c @@ -3176,7 +3176,7 @@ _0222EE90: mov r3, #2 bl MOD82_0222F694 ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EEAA: mov r1, #0x80 @@ -3199,7 +3199,7 @@ _0222EEBE: mov r3, #2 bl MOD82_0222F694 ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EED8: ldr r2, [r2, #0x48] @@ -3214,7 +3214,7 @@ _0222EED8: mov r2, #0x1e bl MOD82_0222DF6C ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EEFA: mov r1, #2 @@ -3226,7 +3226,7 @@ _0222EEFA: mov r0, #0x15 str r0, [r4, #0x1c] ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222EF12: mov r0, #3 pop {r4, pc} @@ -3325,7 +3325,7 @@ _0222EFBC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222EFD8: mov r1, #0x80 @@ -3349,7 +3349,7 @@ _0222EFEC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222F008: ldr r2, [r2, #0x48] @@ -3362,7 +3362,7 @@ _0222F008: mov r0, #0x21 str r0, [r4, #0x1c] ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222F024: mov r1, #2 @@ -3374,7 +3374,7 @@ _0222F024: mov r0, #0x1b str r0, [r4, #0x1c] ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222F03C: mov r0, #3 pop {r4, pc} @@ -4580,4 +4580,3 @@ MOD82_0222FC03: ; 0x0222FC03 .global MOD82_0222FC0C MOD82_0222FC0C: ; 0x0222FC0C .space 0x14 - diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 3f6affe6..d58de0be 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -77,7 +77,7 @@ _0222D63C: tst r0, r1 beq _0222D662 ldr r0, _0222D678 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 @@ -495,7 +495,7 @@ _0222D94A: ldr r1, [r1, #0x48] str r1, [r4, r0] ldr r0, _0222D9BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222D994 _0222D974: mov r0, #1 @@ -1682,7 +1682,7 @@ _0222E2C6: cmp r3, #0 beq _0222E2B8 ldr r0, _0222E2E0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222E2DC: str r4, [r5, #0x54] pop {r3, r4, r5, r6, r7, pc} @@ -2129,7 +2129,7 @@ _0222E656: tst r0, r1 ldr r0, _0222E7A8 ; =0x000005DC beq _0222E69A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x54] lsl r0, r0, #2 add r0, r4, r0 @@ -2152,7 +2152,7 @@ _0222E692: bl FUN_02089F24 b _0222E6A8 _0222E69A: - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #0x58] mov r0, #1 @@ -3703,7 +3703,7 @@ _0222F35E: mov r1, #0 str r1, [r4, r0] ldr r0, _0222F5F0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x16 ldr r1, _0222F5E8 ; =0x00000708 lsl r0, r0, #4 @@ -3761,7 +3761,7 @@ _0222F3D6: mov r3, #0x13 bl MOD83_02238A38 ldr r0, _0222F5F0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F5E4 ; =0x000034D8 mov r1, #0 str r1, [r4, r0] @@ -4040,7 +4040,7 @@ _0222F62E: ldr r0, [r4, r0] bl FUN_0200DBFC ldr r0, _0222F744 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F740 ; =0x000034D8 mov r1, #0 str r1, [r4, r0] @@ -4919,7 +4919,7 @@ _0222FCBE: cmp r0, #1 bhi _0222FCD4 ldr r0, _0222FCDC ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FCE0 ; =0x0000298C mov r1, #0 str r1, [r4, r0] @@ -6104,7 +6104,7 @@ MOD83_02230604: ; 0x02230604 b _02230642 _02230628: ldr r0, _02230660 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r6, #0 beq _0223065E add r0, r7, #0 @@ -6117,7 +6117,7 @@ _02230628: pop {r3, r4, r5, r6, r7, pc} _02230642: ldr r0, _02230660 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0 beq _0223065E ldr r0, _02230664 ; =MOD83_0223B888 @@ -6275,7 +6275,7 @@ _02230776: mov r1, #0 bl BgClearTilemapBufferAndCommit ldr r0, _022307B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #0xc4 mov r2, #0 @@ -6823,7 +6823,7 @@ _02230C16: mvn r1, r1 bl MOD83_0222FB0C ldr r0, _02230D78 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7246,7 +7246,7 @@ _02230FCE: bl MOD83_0222F9DC bl FUN_02033ED0 ldr r0, _02231130 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE mov r1, #0 add r0, r4, #0 mvn r1, r1 @@ -7261,7 +7261,7 @@ _02230FCE: b _02231334 _0223100E: ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7279,7 +7279,7 @@ _02231030: mov r1, #0 bl MOD83_0222FA0C ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7301,7 +7301,7 @@ _02231062: b _02231334 _02231064: ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #0xc4 mov r2, #0 @@ -7453,7 +7453,7 @@ _02231198: mvn r1, r1 bl MOD83_0222FB0C ldr r0, _02231350 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7576,7 +7576,7 @@ _022312AA: cmp r0, #0 beq _02231334 ldr r0, _02231358 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xda ldrb r0, [r0] @@ -9541,7 +9541,7 @@ MOD83_02232208: ; 0x02232208 b _02232248 _0223222E: ldr r0, _02232274 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r6, #0 beq _0223226C add r0, r7, #0 @@ -9554,7 +9554,7 @@ _0223222E: pop {r3, r4, r5, r6, r7, pc} _02232248: ldr r0, _02232274 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0 beq _0223226C cmp r4, #0x1e @@ -10018,7 +10018,7 @@ MOD83_022325EC: ; 0x022325EC cmp r0, #1 bhi _02232606 ldr r0, _02232608 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r0, _0223260C ; =0x00003CE8 mov r1, #0 str r1, [r4, r0] @@ -10172,7 +10172,7 @@ _0223270E: cmp r4, #1 bne _02232746 ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xab bl FUN_02031588 mov r3, #0xa @@ -10197,7 +10197,7 @@ _02232746: cmp r4, #2 bne _0223275A ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r1, r7, #0 mov r2, #0x13 @@ -10206,7 +10206,7 @@ _0223275A: cmp r4, #3 bne _02232764 ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232764: pop {r3, r4, r5, r6, r7, pc} nop @@ -10406,7 +10406,7 @@ _0223290A: tst r0, r1 beq _02232924 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 mov r2, #0x1c @@ -10418,7 +10418,7 @@ _02232924: tst r0, r1 beq _02232934 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] _02232934: @@ -10430,7 +10430,7 @@ _02232934: _0223293E: mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE ldr r0, _02232B6C ; =0x00002B60 mov r1, #1 str r6, [r4, r0] @@ -10468,14 +10468,14 @@ _0223297E: tst r0, r1 beq _02232A54 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xb str r0, [r5] b _02232CF4 _0223299E: mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE mov r0, #0x10 mov r1, #0 bl GX_EngineAToggleLayers @@ -10520,7 +10520,7 @@ _022329FA: tst r1, r0 beq _02232A54 lsl r0, r0, #9 - bl FUN_020054C8 + bl PlaySE mov r1, #1 add r0, r4, #0 lsl r2, r1, #0xc @@ -18459,7 +18459,7 @@ MOD83_022366D0: ; 0x022366D0 mvn r0, r0 str r0, [r5, #8] ldr r0, _02236754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236750 _02236712: cmp r4, #0 @@ -18488,7 +18488,7 @@ _02236740: mov r0, #0 bl FUN_02002BB8 ldr r0, _02236754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, pc} _02236750: @@ -19023,7 +19023,7 @@ _02236BAC: add r0, r4, #0 bl MOD83_022354F0 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BBC: ldr r0, _02236DA0 ; =0x0000E884 @@ -19039,7 +19039,7 @@ _02236BCE: add r0, r4, #0 bl MOD83_022354F0 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BDC: add r0, r4, #0 @@ -19048,7 +19048,7 @@ _02236BDC: add r3, r5, #0 bl MOD83_02235E34 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BF0: add r0, r4, #0 @@ -19127,7 +19127,7 @@ _02236C76: add r0, r4, #0 bl MOD83_02236450 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x13 str r0, [r5] b _02236D90 @@ -19196,7 +19196,7 @@ _02236D12: ldr r0, [r4, r0] bl FUN_0200DBFC ldr r0, _02236DC0 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE cmp r6, #0xb bne _02236D34 .ifdef DIAMOND @@ -19237,7 +19237,7 @@ _02236D64: add r3, r5, #0 bl MOD83_02235E34 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236D78: bl FUN_0200E308 @@ -24459,7 +24459,7 @@ MOD83_02239414: ; 0x02239414 pop {r3, pc} _0223941E: ldr r0, _02239428 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, pc} nop _02239428: .word 0x000005DC @@ -27529,4 +27529,3 @@ MOD83_0223CADC: ; 0x0223CADC .global MOD83_0223CAEC MOD83_0223CAEC: ; 0x0223CAEC .space 0x6F4 - diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index eab7a6cf..042746c2 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -1727,7 +1727,7 @@ _021D82BC: mov r0, #2 str r0, [r4] ldr r0, _021D82F8 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -1861,7 +1861,7 @@ _021D8398: mov r0, #4 str r0, [r4] ldr r0, _021D83F8 ; =0x000005EE - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} nop @@ -1920,7 +1920,7 @@ _021D844A: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D84EA _021D8462: add r0, r4, #0 @@ -1951,7 +1951,7 @@ _021D848E: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D84EA _021D84A6: add r0, r4, #0 @@ -1983,7 +1983,7 @@ _021D84D4: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE _021D84EA: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -2587,7 +2587,7 @@ _021D8914: mov r0, #0x1b str r0, [r4] ldr r0, _021D8950 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -2703,7 +2703,7 @@ _021D89C4: mov r0, #0x1d str r0, [r4] ldr r0, _021D8A2C ; =0x000005EE - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} nop @@ -2762,7 +2762,7 @@ _021D8A7E: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D8B1E _021D8A96: add r0, r4, #0 @@ -2793,7 +2793,7 @@ _021D8AC2: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D8B1E _021D8ADA: add r0, r4, #0 @@ -2825,7 +2825,7 @@ _021D8B08: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE _021D8B1E: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -3262,7 +3262,7 @@ _021D8E3C: mov r0, #0x2d str r0, [r4] ldr r0, _021D8E60 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -3364,7 +3364,7 @@ MOD85_021D8E98: ; 0x021D8E98 mov r0, #0x2f str r0, [r4] ldr r0, _021D8F80 ; =0x000005EE - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x24] cmp r0, #0 bne _021D8F4C @@ -3477,7 +3477,7 @@ _021D8FE0: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE b _021D9084 _021D8FF8: add r0, r4, #0 @@ -3509,7 +3509,7 @@ _021D9026: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE b _021D9084 _021D903E: add r0, r4, #0 @@ -3542,7 +3542,7 @@ _021D906E: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE _021D9084: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -7597,7 +7597,7 @@ _021DADC0: bne _021DAE20 _021DADD2: ldr r0, _021DAE60 ; =0x0000062D - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x60] ldr r0, [r4, #0x64] add r1, r1, r0 @@ -7662,7 +7662,7 @@ _021DAE2E: str r0, [r4, #0x60] _021DAE4C: ldr r0, _021DAE60 ; =0x0000062D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] cmp r0, #1 bne _021DAE5E @@ -9517,7 +9517,7 @@ MOD85_021DBB54: ; 0x021DBB54 bl FUN_0200CA44 mov r0, #0x5f lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} .align 2, 0 _021DBB84: .word MOD85_021DBC48 @@ -11027,7 +11027,7 @@ MOD85_021DC5E0: ; 0x021DC5E0 mov r1, #0 bl FUN_02020208 ldr r0, _021DC644 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -11126,7 +11126,7 @@ MOD85_021DC6CC: ; 0x021DC6CC bl FUN_020200BC mov r0, #0x6d lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -12483,7 +12483,7 @@ MOD85_021DD0F0: ; 0x021DD0F0 mov r1, #0 bl FUN_020200BC ldr r0, _021DD154 ; =0x000006D1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] diff --git a/arm9/src/render_text.c b/arm9/src/render_text.c new file mode 100644 index 00000000..af0218c8 --- /dev/null +++ b/arm9/src/render_text.c @@ -0,0 +1,502 @@ +#include "global.h" +#include "render_text.h" +#include "game_init.h" +#include "string_util.h" +#include "text.h" +#include "unk_0201B8B8.h" + +u16 unk00; + +TextFlags gTextFlags; + +const u8 UNK_020ECB50[] = { 0, 1, 2, 1 }; + +extern const char *FUN_02002D94(u8, u16); +extern void PlaySE(u16); + +THUMB_FUNC u32 RenderText(struct TextPrinter *printer) +{ + + struct TextPrinterSubStruct *subStruct = + (struct TextPrinterSubStruct *)(&printer->subStructFields); + u16 currentChar; + + switch (printer->state) + { + case 0: + if (((gMain.heldKeys & 3) != 0 && subStruct->hasPrintBeenSpedUp != 0) || + (gMain.touchHeld != 0 && gTextFlags.unk0_4 != 0)) + { + printer->delayCounter = 0; + if (printer->textSpeedBottom != 0) + { + gTextFlags.unk0_6 = 1; + } + } + + if (printer->delayCounter && printer->textSpeedBottom) + { + printer->delayCounter--; + + if (gTextFlags.canABSpeedUpPrint != 0) + { + if ((gMain.newKeys & 3) || (gMain.touchNew != 0 && gTextFlags.unk0_4)) + { + subStruct->hasPrintBeenSpedUp = 1; + printer->delayCounter = 0; + } + } + + return 3; + } + + printer->delayCounter = printer->textSpeedBottom; + currentChar = *printer->printerTemplate.currentChar.raw; + printer->printerTemplate.currentChar.raw++; + + GF_ASSERT(currentChar != 0xF100); + + switch (currentChar) + { + case EOS: + return 1; + case 0xE000: + printer->printerTemplate.currentX = printer->printerTemplate.x; + s32 fontAttribute = GetFontAttribute(printer->printerTemplate.fontId, 1); + + printer->printerTemplate.currentY += + printer->printerTemplate.lineSpacing + fontAttribute; + + return 2; + + case 0xF0FD: + printer->printerTemplate.currentChar.raw++; + return 2; + case 0xFFFE: + printer->printerTemplate.currentChar.raw--; + switch ((u16)MsgArray_GetControlCode(printer->printerTemplate.currentChar.raw)) + { + case 0xFF00: + u16 field = (u16)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + if (field == 0xff) + { + u8 r2 = printer->printerTemplate.unk4; + printer->printerTemplate.unk4 = + (u8)((printer->printerTemplate.fgColor - 1) / 2 + 100); + + if (!(r2 >= 100 && r2 < 107)) + { + break; + } + + field = (u16)(r2 - 100); + } + else + { + if (field >= 0x64) + { + printer->printerTemplate.unk4 = (u8)field; + break; + } + } + + printer->printerTemplate.fgColor = (u8)(field * 2 + 1); + printer->printerTemplate.shadowColor = (u8)(field * 2 + 2); + + GenerateFontHalfRowLookupTable(printer->printerTemplate.fgColor, + printer->printerTemplate.bgColor, + printer->printerTemplate.shadowColor); + + break; + + case 0x200: + field = (u16)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + + FUN_0201C1EC(printer, + printer->printerTemplate.currentX, + printer->printerTemplate.currentY, + field); + if (printer->textSpeedTop != 0) + { + CopyWindowToVram(printer->printerTemplate.window); + } + + break; + case 0x201: + printer->delayCounter = (u8)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + printer->printerTemplate.currentChar.raw = + MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw); + printer->state = 6; + + return 3; + case 0x202: + printer->Unk2A = (u16)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + printer->printerTemplate.currentChar.raw = + MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw); + + return 3; + case 0x203: + printer->printerTemplate.currentX = (u8)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + break; + case 0x204: + printer->printerTemplate.currentY = (u8)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + break; + + case 0xFF01: + field = (u16)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + + switch (field) + { + case 100: + printer->printerTemplate.unk2 = 0; + printer->printerTemplate.unk3 = 0; + break; + case 200: + printer->printerTemplate.unk2 = 0xFFFC; + printer->printerTemplate.unk3 = 0; + break; + } + + break; + + case 0xFE06: + field = (u16)MsgArray_ControlCodeGetField( + printer->printerTemplate.currentChar.raw, 0); + if (field != 0xFE00) + { + if (field != 0xFE01) + { + break; + } + + printer->state = 2; + TextPrinterInitDownArrowCounters(printer); + printer->printerTemplate.currentChar.raw = MsgArray_SkipControlCode( + printer->printerTemplate.currentChar.raw); + + return 3; + } + + printer->state = 3; + TextPrinterInitDownArrowCounters(printer); + printer->printerTemplate.currentChar.raw = + MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw); + + return 3; + } + + printer->printerTemplate.currentChar.raw = + MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw); + return 2; + + case 0x25BC: + printer->state = 2; + TextPrinterInitDownArrowCounters(printer); + return 3; + + case 0x25BD: + printer->state = 3; + TextPrinterInitDownArrowCounters(printer); + return 3; + } + + const char *r5 = FUN_02002D94(subStruct->glyphId, currentChar); + CopyGlyphToWindow(printer->printerTemplate.window, + r5, + r5[0x80], + r5[0x81], + printer->printerTemplate.currentX, + printer->printerTemplate.currentY, + printer->printerTemplate.unk2); + + printer->printerTemplate.currentX += r5[0x80] + printer->printerTemplate.letterSpacing; + + return 0; + case 1: + if (TextPrinterWait(printer) != 0) + { + TextPrinterClearDownArrow(printer); + + printer->state = 0; + } + + return 3; + case 2: + if (TextPrinterWaitWithDownArrow(printer) != 0) + { + TextPrinterClearDownArrow(printer); + FillWindowPixelBuffer( + printer->printerTemplate.window, printer->printerTemplate.bgColor); + printer->printerTemplate.currentX = printer->printerTemplate.x; + printer->printerTemplate.currentY = printer->printerTemplate.y; + printer->state = 0; + } + + return 3; + case 3: + if (TextPrinterWaitWithDownArrow(printer) != 0) + { + TextPrinterClearDownArrow(printer); + printer->scrollDistance = + (u8)(GetFontAttribute(printer->printerTemplate.fontId, 1) + + printer->printerTemplate.lineSpacing); + printer->printerTemplate.currentX = printer->printerTemplate.x; + printer->state = 4; + } + + return 3; + case 4: + if (printer->scrollDistance != 0) + { + if ((int)printer->scrollDistance < 4) + { + ScrollWindow(printer->printerTemplate.window, + 0, + printer->scrollDistance, + (u8)(printer->printerTemplate.bgColor | + (printer->printerTemplate.bgColor << 4))); + printer->scrollDistance = 0; + } + else + { + ScrollWindow(printer->printerTemplate.window, + 0, + 4, + (u8)(printer->printerTemplate.bgColor | + (printer->printerTemplate.bgColor << 4))); + + printer->scrollDistance -= 4; + } + + CopyWindowToVram(printer->printerTemplate.window); + } + else + { + printer->state = 0; + } + + return 3; + case 5: + printer->state = 0; + return 3; + case 6: + if (printer->delayCounter != 0) + { + printer->delayCounter--; + } + else + { + printer->state = 0; + } + + return 3; + } + + return 1; +} + +THUMB_FUNC void FUN_02002840(u16 flag) +{ + unk00 = flag; +} + +THUMB_FUNC void TextPrinterInitDownArrowCounters(struct TextPrinter *printer) +{ + struct TextPrinterSubStruct *subStruct = + (struct TextPrinterSubStruct *)(&printer->subStructFields); + + if (gTextFlags.autoScroll) + { + subStruct->autoScrollDelay = 0; + return; + } + + subStruct->downArrowYPosIdx = 0; + subStruct->downArrowDelay = 0; +} + +THUMB_FUNC void TextPrinterDrawDownArrow(struct TextPrinter *printer) +{ + struct TextPrinterSubStruct *subStruct = + (struct TextPrinterSubStruct *)(&printer->subStructFields); + + if (gTextFlags.autoScroll) + { + return; + } + + if (subStruct->downArrowDelay != 0) + { + subStruct->downArrowDelay--; + return; + } + + u8 bg_id = GetWindowBgId(printer->printerTemplate.window); + u8 x = GetWindowX(printer->printerTemplate.window); + u8 y = GetWindowY(printer->printerTemplate.window); + u8 width = GetWindowWidth(printer->printerTemplate.window); + u16 r6 = unk00; + + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 18 + UNK_020ECB50[subStruct->downArrowYPosIdx] * 4), + (u8)(x + width + 1), + (u8)(y + 2), + 1, + 1, + 0x10); + + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 19 + UNK_020ECB50[subStruct->downArrowYPosIdx] * 4), + (u8)(x + width + 2), + (u8)(y + 2), + 1, + 1, + 0x10); + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 20 + UNK_020ECB50[subStruct->downArrowYPosIdx] * 4), + (u8)(x + width + 1), + (u8)(y + 3), + 1, + 1, + 0x10); + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 21 + UNK_020ECB50[subStruct->downArrowYPosIdx] * 4), + (u8)(x + width + 2), + (u8)(y + 3), + 1, + 1, + 0x10); + + BgCommitTilemapBufferToVram(printer->printerTemplate.window->bgConfig, bg_id); + subStruct->downArrowDelay = 8; + subStruct->downArrowYPosIdx++; +} + +THUMB_FUNC void TextPrinterClearDownArrow(struct TextPrinter *printer) +{ + u8 bg_id = GetWindowBgId(printer->printerTemplate.window); + u8 x = GetWindowX(printer->printerTemplate.window); + u8 y = GetWindowY(printer->printerTemplate.window); + u8 width = GetWindowWidth(printer->printerTemplate.window); + u16 r6 = unk00; + + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 10), + (u8)(x + width + 1), + (u8)(y + 2), + 1, + 2, + 0x10); + FillBgTilemapRect(printer->printerTemplate.window->bgConfig, + bg_id, + (u16)(r6 + 11), + (u8)(x + width + 2), + (u8)(y + 2), + 1, + 2, + 0x10); + BgCommitTilemapBufferToVram(printer->printerTemplate.window->bgConfig, bg_id); +} + +THUMB_FUNC BOOL TextPrinterContinue(struct TextPrinter *printer) +{ +#pragma unused(printer) + if ((gMain.newKeys & 3) != 0 || (gMain.touchNew != 0 && gTextFlags.unk0_4 != 0)) + { + PlaySE(0x5DC); + + gTextFlags.unk0_7 = 1; + + return TRUE; + } + + return FALSE; +} + +THUMB_FUNC BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer) +{ + struct TextPrinterSubStruct *subStruct = + (struct TextPrinterSubStruct *)(&printer->subStructFields); + + if (subStruct->autoScrollDelay == 100) + { + return TRUE; + } + + subStruct->autoScrollDelay++; + if (gTextFlags.unk0_5) + { + return TextPrinterContinue(printer); + } + + return FALSE; +} + +THUMB_FUNC BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer) +{ + if (gTextFlags.autoScroll) + { + return TextPrinterWaitAutoMode(printer); + } + TextPrinterDrawDownArrow(printer); + + return TextPrinterContinue(printer); +} + +THUMB_FUNC u8 TextPrinterWait(struct TextPrinter *printer) +{ + if (gTextFlags.autoScroll) + { + return (u8)TextPrinterWaitAutoMode(printer); + } + + return (u8)TextPrinterContinue(printer); +} + +THUMB_FUNC void TextFlags_SetCanABSpeedUpPrint(BOOL param0) +{ + gTextFlags.canABSpeedUpPrint = param0; +} + +THUMB_FUNC void FUN_02002B7C(s32 param0) +{ + gTextFlags.autoScroll = param0 & 1; + gTextFlags.unk0_5 = (param0 >> 1) & 1; +} + +THUMB_FUNC void FUN_02002BB8(u32 param0) +{ + gTextFlags.unk0_4 = param0; +} + +THUMB_FUNC u8 FUN_02002BD4() +{ + return gTextFlags.unk0_6; +} + +THUMB_FUNC void FUN_02002BE4() +{ + gTextFlags.unk0_6 = 0; +} + +THUMB_FUNC u8 FUN_02002BF4() +{ + return gTextFlags.unk0_7; +} + +THUMB_FUNC void FUN_02002C04() +{ + gTextFlags.unk0_7 = 0; +} diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c index ec5ab7f8..1251c612 100644 --- a/arm9/src/scrcmd_sound.c +++ b/arm9/src/scrcmd_sound.c @@ -18,7 +18,7 @@ extern void FUN_0200538C(u32, u16, u32); extern void FUN_020053CC(u16, u16); extern BOOL FUN_02005404(void); extern u16 FUN_02005410(u16); -extern void FUN_020054C8(u16); +extern void PlaySE(u16); extern void FUN_020054F0(u16, u32); extern void FUN_020047C8(u8, u8); extern void FUN_020040F4(u8); @@ -123,7 +123,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx) THUMB_FUNC BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx) { u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); - FUN_020054C8(unk); + PlaySE(unk); return FALSE; } @@ -263,4 +263,3 @@ THUMB_FUNC BOOL ScrCmd_SetVolume(struct ScriptContext* ctx) return FALSE; } - diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index d4984f78..f5527257 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -1,6 +1,7 @@ #include "text_02054590.h" #include "text.h" #include "bg_window.h" +#include "render_text.h" extern void FUN_0201BD5C(void); extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2); @@ -10,10 +11,6 @@ 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_02002B60(u8 param0); -extern void FUN_02002B7C(u32 param0); -extern void FUN_02002BB8(u32 param0); - extern void FUN_0200D300(struct BgConfig *param0, u32 param1, u32 param2, @@ -59,15 +56,15 @@ THUMB_FUNC void FUN_0205464C(struct Window *param0) THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3) { - FUN_02002B60(param3); + TextFlags_SetCanABSpeedUpPrint(param3); FUN_02002B7C(0); FUN_02002BB8(0); return AddTextPrinterParameterized(window, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL); } -THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5) +THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5) { - FUN_02002B60(a4); + TextFlags_SetCanABSpeedUpPrint(a4); FUN_02002B7C(a5); FUN_02002BB8(0); return AddTextPrinterParameterized(window, fontId, str, 0, 0, speed, NULL); diff --git a/arm9/src/unk_0201B8B8.c b/arm9/src/unk_0201B8B8.c index c7f77f87..b8e978f2 100644 --- a/arm9/src/unk_0201B8B8.c +++ b/arm9/src/unk_0201B8B8.c @@ -14,7 +14,7 @@ const u16 * MsgArray_SkipControlCode(const u16 * r4) return r4; } -u16 MsgArray_GetControlCode(const u16 * r4) +u32 MsgArray_GetControlCode(const u16 * r4) { GF_ASSERT(*r4 == 0xFFFE); return r4[1]; @@ -25,7 +25,7 @@ BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4) return (MsgArray_GetControlCode(r4) & 0xFF00) == 0x100; } -u16 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4) +u32 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4) { GF_ASSERT(*r5 == 0xFFFE); GF_ASSERT(r4 < r5[2]); diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index a217f52c..0bf3a15a 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -21,7 +21,7 @@ extern THUMB_FUNC void MOD06_02245190(u32); extern THUMB_FUNC void MOD06_02245198(u8, u32); extern THUMB_FUNC u32 MOD06_022451F0(u32); -extern THUMB_FUNC void FUN_020054C8(u32); +extern THUMB_FUNC void PlaySE(u32); extern THUMB_FUNC void FUN_02049160(struct UnkStruct_0204639C*, u32); extern THUMB_FUNC void FUN_0204AF84(struct UnkStruct_0204639C*); extern THUMB_FUNC void FUN_0204AF3C(struct UnkStruct_0204639C *); @@ -97,7 +97,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0) MOD06_02244DC4(unkStruct1->unk0, unkAddr); MOD06_02244EF8(unkStruct1->unk0); unkStruct1->unkE = 0; - FUN_020054C8(1657); + PlaySE(1657); FUN_0204C1B4(unkStruct0, 0x3, 0x11, 0x0000FFFF, 0, 6, 1, 0xb); unkStruct1->action = 5; } @@ -117,7 +117,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0) MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4); unkStruct1->unk8 = MOD06_022451F0(unkStruct1->unk4); - FUN_020054C8(1657); + PlaySE(1657); FUN_0204C1B4(unkStruct0, 0x3, 0x10, 0x0000FFFF, 0, 6, 1, 0xb); unkStruct1->action = 6; break; diff --git a/include/render_text.h b/include/render_text.h new file mode 100644 index 00000000..e3e0f4c8 --- /dev/null +++ b/include/render_text.h @@ -0,0 +1,48 @@ +#ifndef POKEDIAMOND_RENDER_TEXT_H +#define POKEDIAMOND_RENDER_TEXT_H + +#include "global.h" +#include "text.h" + +typedef struct +{ + u8 canABSpeedUpPrint : 1; + u8 useAlternateDownArrow : 1; + u8 autoScroll : 1; + u8 forceMidTextSpeed : 1; + u8 unk0_4 : 1; + u8 unk0_5 : 1; + u8 unk0_6 : 1; + u8 unk0_7 : 1; + u8 unk1; +} TextFlags; + +struct TextPrinterSubStruct +{ + u8 glyphId : 4; // 0x14 + u8 hasPrintBeenSpedUp : 1; + u8 unk : 3; + u8 downArrowDelay : 5; + u8 downArrowYPosIdx : 2; + u8 hasGlyphIdBeenSet : 1; + u8 autoScrollDelay : 8; +}; + +u32 RenderText(struct TextPrinter *printer); +void FUN_02002840(u16 flag); +void TextPrinterInitDownArrowCounters(struct TextPrinter *printer); +void TextPrinterDrawDownArrow(struct TextPrinter *printer); +void TextPrinterClearDownArrow(struct TextPrinter *printer); +BOOL TextPrinterContinue(struct TextPrinter *printer); +BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer); +BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer); +u8 TextPrinterWait(struct TextPrinter *printer); +void TextFlags_SetCanABSpeedUpPrint(BOOL param0); +void FUN_02002B7C(s32 param0); +void FUN_02002BB8(u32 param0); +u8 FUN_02002BD4(); +void FUN_02002BE4(); +u8 FUN_02002BF4(); +void FUN_02002C04(); + +#endif // POKEDIAMOND_RENDER_TEXT_H diff --git a/include/text_02054590.h b/include/text_02054590.h index b2f4898b..4d05260a 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -12,7 +12,7 @@ void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2); void FUN_02054608(struct Window *param0, struct Options *options); void FUN_0205464C(struct Window *param0); u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3); -u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5); +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); diff --git a/include/unk_0201B8B8.h b/include/unk_0201B8B8.h index 13bc217b..26dd8017 100644 --- a/include/unk_0201B8B8.h +++ b/include/unk_0201B8B8.h @@ -2,8 +2,8 @@ #define POKEDIAMOND_UNK_0201B8B88_H const u16 * MsgArray_SkipControlCode(const u16 * r4); -u16 MsgArray_GetControlCode(const u16 * r4); +u32 MsgArray_GetControlCode(const u16 * r4); BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4); -u16 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4); +u32 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4); #endif //POKEDIAMOND_UNK_0201B8B88_H |