diff options
97 files changed, 801 insertions, 801 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 564644388..44d0b245f 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1361,7 +1361,7 @@ _0800E148: bl PrintLinkBattleWinLossTie _0800E154: movs r0, 0x78 - bl PlaySoundEffect + bl PlaySE mov r0, r9 bl DestroyTask ldr r4, _0800E224 @ =gSprites diff --git a/asm/battle_10.s b/asm/battle_10.s index fc32aa7c7..f7844a25a 100644 --- a/asm/battle_10.s +++ b/asm/battle_10.s @@ -3005,7 +3005,7 @@ _080399A8: strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r2, _080399EC @ =gSprites ldr r1, _080399F0 @ =gUnknown_02024BE0 ldrb r0, [r5] @@ -3953,7 +3953,7 @@ _0803A0E8: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning bl dp01_tbl4_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_2.s b/asm/battle_2.s index dbd4cc15f..cff6efe06 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -5326,7 +5326,7 @@ bs8_exit_by_flight: @ 8014F80 ldrb r0, [r0] strb r0, [r2] movs r0, 0x11 - bl PlaySoundEffect + bl PlaySE ldr r0, _08014FB4 @ =gUnknown_02024A68 ldrb r0, [r0] strb r0, [r4] diff --git a/asm/battle_4.s b/asm/battle_4.s index b1e0d342e..0581d1e7d 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -15788,7 +15788,7 @@ _08023B74: cmp r0, 0 beq _08023B9A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0 strb r0, [r4, 0x1] @@ -15805,7 +15805,7 @@ _08023B9A: cmp r0, 0 bne _08023BC0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0x1 strb r0, [r4, 0x1] @@ -15818,7 +15818,7 @@ _08023BC0: cmp r0, 0 beq _08023C0C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08023C00 @ =gUnknown_02024D1E ldrb r4, [r0, 0x1] cmp r4, 0 @@ -15850,7 +15850,7 @@ _08023C0C: b _08023E5C _08023C16: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _08023C1C: ldr r0, _08023C28 @ =0x02000000 ldr r1, _08023C2C @ =0x0001601a @@ -16162,7 +16162,7 @@ _08023EA8: cmp r0, 0 beq _08023ECE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0 strb r0, [r4, 0x1] @@ -16179,7 +16179,7 @@ _08023ECE: cmp r0, 0 bne _08023EF4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0x1 strb r0, [r4, 0x1] @@ -16192,7 +16192,7 @@ _08023EF4: cmp r0, 0 beq _08023F4C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08023F30 @ =gUnknown_02024D1E ldrb r0, [r0, 0x1] cmp r0, 0 @@ -16231,7 +16231,7 @@ _08023F4C: cmp r0, 0 beq _08023F78 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r3, _08023F80 @ =gUnknown_02024C10 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -17094,7 +17094,7 @@ _08024616: cmp r0, 0 beq _0802463A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0 strb r0, [r5, 0x1] @@ -17111,7 +17111,7 @@ _0802463A: cmp r0, 0 bne _08024660 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0x1 strb r0, [r4, 0x1] @@ -17137,7 +17137,7 @@ _0802467C: beq _08024696 _08024684: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8023AD8 ldr r1, _0802469C @ =gUnknown_02024C10 ldr r0, [r1] @@ -17695,7 +17695,7 @@ _08024AF4: b _08024C38 _08024AFE: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08024B98 @ =gStringVar4 ldr r1, _08024B9C @ =gUnknown_08400D9F bl StringCopy @@ -17818,7 +17818,7 @@ _08024C04: cmp r0, 0 beq _08024C38 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 str r0, [sp] movs r0, 0xB @@ -32047,7 +32047,7 @@ _0802BCEC: cmp r0, 0 beq _0802BD10 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0 strb r0, [r4, 0x1] @@ -32064,7 +32064,7 @@ _0802BD10: cmp r0, 0 bne _0802BD36 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0x1 strb r0, [r4, 0x1] @@ -32077,7 +32077,7 @@ _0802BD36: cmp r0, 0 beq _0802BD68 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802BD64 @ =gUnknown_02024D1E ldrb r0, [r1, 0x1] cmp r0, 0 @@ -32099,7 +32099,7 @@ _0802BD68: b _0802BEDA _0802BD72: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802BD80 @ =gUnknown_02024D1E _0802BD7A: movs r0, 0x4 diff --git a/asm/battle_5.s b/asm/battle_5.s index 66e1412ce..01541c120 100644 --- a/asm/battle_5.s +++ b/asm/battle_5.s @@ -189,7 +189,7 @@ sub_802C098: @ 802C098 cmp r0, 0 beq _0802C13E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_814A7FC ldr r1, _0802C108 @ =gUnknown_02024E60 ldrb r0, [r4] @@ -252,7 +252,7 @@ _0802C13E: b _0802C2AC _0802C158: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -280,7 +280,7 @@ _0802C178: b _0802C2AC _0802C192: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -324,7 +324,7 @@ _0802C1D0: bne _0802C2AC _0802C1E8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -392,7 +392,7 @@ _0802C218: bl AddBagItem _0802C278: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 movs r1, 0xC movs r2, 0 @@ -486,7 +486,7 @@ _0802C32E: beq _0802C3A8 bl sub_814A7FC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0802C394 @ =gSprites ldr r1, _0802C398 @ =gUnknown_02024BE0 ldr r4, _0802C388 @ =gUnknown_03004344 @@ -532,7 +532,7 @@ _0802C3A8: cmp r0, 0 beq _0802C41C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0802C400 @ =gSprites ldr r1, _0802C404 @ =gUnknown_02024BE0 ldr r5, _0802C408 @ =gUnknown_03004344 @@ -583,7 +583,7 @@ _0802C41C: b _0802C540 _0802C426: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0802C458 @ =gSprites ldr r1, _0802C45C @ =gUnknown_02024BE0 ldr r3, _0802C460 @ =gUnknown_03004344 @@ -724,7 +724,7 @@ _0802C540: b _0802C658 _0802C54A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0802C57C @ =gSprites ldr r1, _0802C580 @ =gUnknown_02024BE0 ldr r3, _0802C584 @ =gUnknown_03004344 @@ -902,7 +902,7 @@ sub_802C68C: @ 802C68C b _0802C864 _0802C6B2: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802C6F0 @ =gUnknown_02024E64 ldrb r0, [r7] adds r0, r1 @@ -1114,7 +1114,7 @@ _0802C864: beq _0802C8A4 bl sub_814A7FC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0802C898 @ =gUnknown_030042A4 strh r4, [r0] ldr r1, _0802C89C @ =gUnknown_030042A0 @@ -1242,7 +1242,7 @@ _0802C944: _0802C976: strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r7] adds r0, r4 ldrb r0, [r0] @@ -1361,7 +1361,7 @@ sub_802CA60: @ 802CA60 b _0802CE78 _0802CA7A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0802CDF0 @ =gUnknown_02024E64 mov r10, r0 ldr r1, _0802CDF4 @ =gUnknown_02024A60 @@ -1867,7 +1867,7 @@ _0802CE78: cmp r0, 0 beq _0802CEF0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0802CF34 @ =gUnknown_03004344 ldrb r0, [r0] bl nullsub_7 @@ -1955,7 +1955,7 @@ _0802CF4E: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802CF7C @ =gUnknown_02024E64 ldr r0, _0802CF80 @ =gUnknown_02024A60 ldrb r0, [r0] @@ -2022,7 +2022,7 @@ _0802CFE2: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802D010 @ =gUnknown_02024E64 ldr r0, _0802D014 @ =gUnknown_02024A60 ldrb r0, [r0] @@ -2082,7 +2082,7 @@ _0802D066: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802D094 @ =gUnknown_02024E64 ldr r0, _0802D098 @ =gUnknown_02024A60 ldrb r0, [r0] @@ -2149,7 +2149,7 @@ _0802D0FA: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0802D128 @ =gUnknown_02024E64 ldr r0, _0802D12C @ =gUnknown_02024A60 ldrb r0, [r0] @@ -3395,7 +3395,7 @@ sub_802DA9C: @ 802DA9C mov r0, r10 bl sub_8043D84 movs r0, 0x21 - bl PlaySoundEffect + bl PlaySE ldr r0, _0802DB68 @ =sub_802DB6C mov r1, r8 str r0, [r1] diff --git a/asm/battle_6.s b/asm/battle_6.s index dd25250ce..f277fb7f2 100644 --- a/asm/battle_6.s +++ b/asm/battle_6.s @@ -3111,7 +3111,7 @@ _0802FEC8: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r2, _0802FF4C @ =gSprites ldr r3, _0802FF50 @ =gUnknown_02024BE0 ldrb r0, [r5] @@ -4628,7 +4628,7 @@ _08030BEC: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning bl dp01_tbl1_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_7.s b/asm/battle_7.s index 31d994160..593a5bbb1 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -2302,7 +2302,7 @@ sub_80324F8: @ 80324F8 cmp r0, 0 bne _0803255A movs r0, 0x5A - bl PlaySoundEffect + bl PlaySE _0803255A: ldrb r0, [r4] orrs r0, r5 diff --git a/asm/battle_8.s b/asm/battle_8.s index fc16eee0c..0e4925dfb 100644 --- a/asm/battle_8.s +++ b/asm/battle_8.s @@ -3272,7 +3272,7 @@ _0803507C: strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r2, _080350C0 @ =gSprites ldr r1, _080350C4 @ =gUnknown_02024BE0 ldrb r0, [r5] @@ -4513,7 +4513,7 @@ _08035A34: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning bl sub_80334EC pop {r4} pop {r0} diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s index 82c466918..4190b2400 100644 --- a/asm/battle_811DA74.s +++ b/asm/battle_811DA74.s @@ -1985,7 +1985,7 @@ _0811FD34: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r2, _0811FDB8 @ =gSprites ldr r3, _0811FDBC @ =gUnknown_02024BE0 ldrb r0, [r5] @@ -2952,7 +2952,7 @@ _081204B4: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning bl dp01_tbl3_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index 915236790..be80cc44f 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -2686,7 +2686,7 @@ _080CBB8A: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080CBBBE: adds r0, r4, 0 bl sub_80CB814 @@ -2704,7 +2704,7 @@ _080CBBBE: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080CBBE6: pop {r4,r5} pop {r0} @@ -5930,7 +5930,7 @@ _080CD438: lsls r1, 24 asrs r1, 24 movs r0, 0xD2 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080CD49E: ldrh r0, [r5, 0x38] movs r1, 0x1 @@ -6141,7 +6141,7 @@ _080CD5D8: lsls r1, 24 asrs r1, 24 movs r0, 0xC0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning b _080CD648 .align 2, 0 _080CD634: .4byte 0x00007fff @@ -7501,7 +7501,7 @@ sub_80CE000: @ 80CE000 lsls r1, 24 asrs r1, 24 movs r0, 0xC2 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080CE052: movs r1, 0 strh r1, [r4, 0x2E] @@ -10996,7 +10996,7 @@ _080CFAA4: lsls r1, 24 asrs r1, 24 movs r0, 0x9A - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x2 @@ -11667,7 +11667,7 @@ sub_80D0030: @ 80D0030 lsls r1, 24 asrs r1, 24 movs r0, 0xA6 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -13601,7 +13601,7 @@ _080D0EF0: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080D0F36: ldrh r0, [r4, 0x34] ldrh r2, [r4, 0x36] @@ -23646,7 +23646,7 @@ _080D5C92: movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x90 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning b _080D5CBA .align 2, 0 _080D5CB0: .4byte gUnknown_0202F7D2 @@ -26822,7 +26822,7 @@ _080D74DC: lsls r1, 24 asrs r1, 24 movs r0, 0x76 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080D74FE: movs r0, 0x12 ldrsh r3, [r4, r0] @@ -37516,7 +37516,7 @@ _080DC778: lsls r1, 24 asrs r1, 24 movs r0, 0xCB - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning adds r0, r5, 0 movs r1, 0x1 bl ChangeSpriteAffineAnim @@ -39402,7 +39402,7 @@ _080DD694: lsls r1, 24 asrs r1, 24 movs r0, 0xA2 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning b _080DD76C .align 2, 0 _080DD6A4: .4byte gSprites @@ -39488,7 +39488,7 @@ _080DD70C: lsls r1, 24 asrs r1, 24 movs r0, 0xAF - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080DD74A: ldrh r0, [r4, 0x18] subs r0, 0x1 @@ -40138,7 +40138,7 @@ _080DDC30: movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0xC4 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080DDC42: pop {r4} pop {r0} @@ -40186,7 +40186,7 @@ _080DDC92: cmp r0, 0 ble _080DDC9E movs r0, 0xC4 - bl PlaySoundEffect + bl PlaySE _080DDC9E: movs r1, 0x3A ldrsh r0, [r4, r1] @@ -51751,7 +51751,7 @@ _080E3692: lsls r1, 24 asrs r1, 24 movs r0, 0xEF - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning b _080E36F4 .align 2, 0 _080E36D8: .4byte gUnknown_02024BE0 @@ -51764,7 +51764,7 @@ _080E36E0: lsls r1, 24 asrs r1, 24 movs r0, 0xF5 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _080E36F4: add sp, 0x24 pop {r3-r5} diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index ad54d6680..86abad6f3 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -24,7 +24,7 @@ unref_sub_812AECC: @ 812AECC b _0812AF08 _0812AEEA: movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 b _0812AF0A _0812AEF4: @@ -32,7 +32,7 @@ _0812AEF4: b _0812AF08 _0812AEFA: movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE bl sub_812AF10 movs r0, 0x1 b _0812AF0A @@ -152,7 +152,7 @@ _0812AFD0: ldrh r0, [r4, 0x8] lsls r1, r5, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _0812AFEA: lsls r1, r6, 24 asrs r1, 24 @@ -194,7 +194,7 @@ sub_812B004: @ 812B004 ldrh r0, [r4, 0xA] lsls r1, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -321,7 +321,7 @@ sub_812B108: @ 812B108 ldrh r0, [r4, 0x8] movs r1, 0x1E ldrsb r1, [r4, r1] - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldrh r0, [r4, 0x10] subs r0, 0x1 strh r0, [r4, 0x10] @@ -573,7 +573,7 @@ sub_812B30C: @ 812B30C lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl PlaySoundEffect1WithPanning + bl PlaySE1WithPanning adds r0, r4, 0 bl DestroyAnimVisualTask pop {r4,r5} @@ -599,7 +599,7 @@ sub_812B340: @ 812B340 lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl PlaySoundEffect2WithPanning + bl PlaySE2WithPanning adds r0, r4, 0 bl DestroyAnimVisualTask pop {r4,r5} @@ -801,7 +801,7 @@ bx_battle_menu_t6_2: @ 812B4D4 cmp r0, 0 beq _0812B546 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_814A7FC ldr r1, _0812B50C @ =gUnknown_02024E60 ldr r0, _0812B510 @ =gUnknown_02024A60 @@ -863,7 +863,7 @@ _0812B546: cmp r0, 0 beq _0812B64E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -891,7 +891,7 @@ _0812B584: cmp r0, 0 bne _0812B64E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -919,7 +919,7 @@ _0812B5C0: cmp r0, 0 beq _0812B64E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -955,7 +955,7 @@ _0812B60C: cmp r0, 0 bne _0812B64E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1857,7 +1857,7 @@ _0812BD94: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning bl dp01_tbl6_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 76d855b1c..28f6f9ada 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -1418,7 +1418,7 @@ sub_812CBB4: @ 812CBB4 lsls r1, 24 asrs r1, 24 movs r0, 0xDE - bl PlaySoundEffect1WithPanning + bl PlaySE1WithPanning b _0812CC12 _0812CBF2: ldrh r0, [r4, 0x24] @@ -2087,7 +2087,7 @@ _0812D0D4: lsls r1, 24 asrs r1, 24 movs r0, 0xBA - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning cmp r4, 0x40 beq _0812D138 ldr r5, _0812D16C @ =gSprites @@ -3738,7 +3738,7 @@ _0812DDD2: lsls r1, 24 asrs r1, 24 movs r0, 0xE4 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning b _0812DE80 _0812DDEA: mov r0, sp @@ -10844,7 +10844,7 @@ _081314A6: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r1, _081314D4 @ =0xfffff800 adds r0, r1, 0 ldrh r2, [r4, 0x1C] @@ -10917,7 +10917,7 @@ _08131538: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning adds r0, r6, 0 bl DestroyAnimVisualTask _0813155A: @@ -11014,7 +11014,7 @@ _081315F8: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning movs r0, 0 strh r0, [r4, 0x26] b _081316B0 @@ -11043,7 +11043,7 @@ _0813161C: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning strh r5, [r4, 0x30] strh r5, [r4, 0x26] b _081316B0 @@ -11087,7 +11087,7 @@ _0813168C: lsls r1, 24 asrs r1, 24 movs r0, 0xC0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning movs r0, 0 strh r0, [r4, 0x30] _081316B0: @@ -12123,7 +12123,7 @@ _08131ECA: lsls r1, 24 asrs r1, 24 movs r0, 0x7A - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r0, _08131F54 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] movs r1, 0x1 diff --git a/asm/battle_anim_8137220.s b/asm/battle_anim_8137220.s index aebf29c5b..134e18e6f 100644 --- a/asm/battle_anim_8137220.s +++ b/asm/battle_anim_8137220.s @@ -135,7 +135,7 @@ _0813730E: cmp r4, 0 bne _08137410 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -158,7 +158,7 @@ _08137344: cmp r4, 0 bne _08137410 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 movs r1, 0 b _0813737E @@ -206,7 +206,7 @@ _081373AC: cmp r0, 0 bne _08137410 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl nullsub_8 movs r0, 0x1 @@ -233,7 +233,7 @@ _081373E8: cmp r0, 0 bne _08137410 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_814A7FC movs r0, 0x1 movs r1, 0x1 @@ -4063,7 +4063,7 @@ _081393B2: bne _081393DE bl sub_814A7FC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0x80 lsls r2, 1 movs r0, 0x1 @@ -4447,7 +4447,7 @@ sub_8139680: @ 8139680 ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - bl PlaySoundEffect + bl PlaySE bl dp01_tbl5_exec_completed pop {r0} bx r0 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index 3b821c13a..25ac4470e 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -1479,7 +1479,7 @@ sub_813FCBC: @ 813FCBC bne _0813FD16 movs r0, 0x3D movs r1, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r0, _0813FD24 @ =gTasks lsls r4, r5, 2 adds r4, r5 @@ -1737,7 +1737,7 @@ sub_813FEC8: @ 813FEC8 cmp r0, 0xB bne _0813FEFA movs r0, 0x3C - bl PlaySoundEffect + bl PlaySE _0813FEFA: movs r1, 0x8 ldrsh r0, [r5, r1] @@ -1970,19 +1970,19 @@ _081400BC: b _081400DA _081400C2: movs r0, 0x38 - bl PlaySoundEffect + bl PlaySE b _0814010E _081400CA: movs r0, 0x39 - bl PlaySoundEffect + bl PlaySE b _0814010E _081400D2: movs r0, 0x3A - bl PlaySoundEffect + bl PlaySE b _0814010E _081400DA: movs r0, 0x3B - bl PlaySoundEffect + bl PlaySE b _0814010E _081400E2: movs r2, 0x38 @@ -2071,7 +2071,7 @@ sub_8140158: @ 8140158 ldr r0, _0814019C @ =sub_81401A0 str r0, [r4, 0x1C] movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _08140190: pop {r4,r5} pop {r0} @@ -2399,7 +2399,7 @@ _081403FC: bl StartSpriteAffineAnim _08140404: movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _0814040A: pop {r4,r5} pop {r0} @@ -2468,7 +2468,7 @@ sub_8140454: @ 8140454 bl sub_8043EB4 bl m4aMPlayAllStop ldr r0, _0814048C @ =0x00000173 - bl PlaySoundEffect + bl PlaySE b _081404CC .align 2, 0 _08140484: .4byte gBattleAnimEnemyMonIndex @@ -3032,7 +3032,7 @@ _081408B6: strh r7, [r0, 0x10] strh r5, [r0, 0x26] movs r0, 0xF - bl PlaySoundEffect + bl PlaySE ldr r0, _08140924 @ =gMain ldr r1, _08140928 @ =0x0000043d adds r0, r1 @@ -5258,7 +5258,7 @@ _08141A82: lsls r1, 24 asrs r1, 24 movs r0, 0x66 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning _08141A8C: ldr r1, _08141AC4 @ =gSprites adds r0, r4, r5 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 44c38b70f..a4b4d1666 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -3269,7 +3269,7 @@ _0811C39E: ldrsh r0, [r4, r1] bl sub_811CA28 movs r0, 0x68 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r5] adds r0, 0x1 ldrb r1, [r5] diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 9e2ef88ba..666882c04 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -584,7 +584,7 @@ sub_804E738: @ 804E738 b _0804E786 _0804E780: movs r0, 0x74 - bl PlaySoundEffect + bl PlaySE _0804E786: ldrh r0, [r4, 0x30] strh r0, [r4, 0x20] @@ -2343,7 +2343,7 @@ _0804F636: strb r1, [r0] bl sub_804F238 movs r0, 0x2B - bl PlaySoundEffect + bl PlaySE mov r2, r8 ldr r0, [r2] b _0804F710 @@ -2411,7 +2411,7 @@ _0804F650: movs r0, 0 str r0, [r1] movs r0, 0x34 - bl PlaySoundEffect + bl PlaySE bl BuyMenuDrawFieldObjects _0804F6D6: mov r1, r8 @@ -2543,7 +2543,7 @@ _0804F7D6: adds r0, r4, 0 bl PlayBGM movs r0, 0x35 - bl PlaySoundEffect + bl PlaySE bl sub_804E290 _0804F7E6: bl RunTasks @@ -3152,7 +3152,7 @@ sub_804FC48: @ 804FC48 ldr r0, _0804FCD0 @ =sub_8051684 str r0, [r4] movs r0, 0x28 - bl PlaySoundEffect + bl PlaySE b _0804FD18 .align 2, 0 _0804FCBC: .4byte gSpriteTemplate_821645C @@ -3173,7 +3173,7 @@ _0804FCD4: movs r1, 0 bl StartSpriteAnim movs r0, 0x1F - bl PlaySoundEffect + bl PlaySE b _0804FD18 .align 2, 0 _0804FCF4: .4byte 0x00005432 @@ -3190,7 +3190,7 @@ _0804FCFC: movs r1, 0x1 bl StartSpriteAnim movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE _0804FD18: bl sub_805156C pop {r3} @@ -5059,7 +5059,7 @@ _08050B58: cmp r0, 0 beq _08050B76 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _08050B76: movs r0, 0 bl sub_80508D4 @@ -5079,7 +5079,7 @@ _08050B88: cmp r0, 0x1 beq _08050BD4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE b _08050BD4 .align 2, 0 _08050BA4: .4byte gUnknown_03004854 @@ -5089,7 +5089,7 @@ _08050BA8: cmp r0, 0 beq _08050BB8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE b _08050C82 _08050BB8: movs r0, 0x2 @@ -5099,7 +5099,7 @@ _08050BB8: b _08050CB6 _08050BC2: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08050BDC @ =gUnknown_03004854 ldr r1, [r0] adds r1, 0x6F @@ -5625,7 +5625,7 @@ _08051004: cmp r0, 0 beq _080510C4 movs r0, 0x37 - bl PlaySoundEffect + bl PlaySE ldr r0, _0805101C @ =gUnknown_03004854 ldr r1, [r0] b _080510AC @@ -6680,7 +6680,7 @@ _08051838: adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0x38 - bl PlaySoundEffect + bl PlaySE b _080518BE _08051858: ldrh r0, [r4, 0x32] @@ -6773,7 +6773,7 @@ _080518E8: adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE b _0805193C _08051908: ldrh r0, [r4, 0x32] @@ -8239,7 +8239,7 @@ _0805247E: cmp r0, 0 beq _080524AE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080524A0 @ =gUnknown_03004854 ldr r1, [r0] _08052494: diff --git a/asm/cable_club.s b/asm/cable_club.s index 2fde06252..7e5d19c24 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -399,7 +399,7 @@ sub_8082F68: @ 8082F68 cmp r0, 0x1 bne _08082FCC movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE ldr r0, _08082FC4 @ =gUnknown_081A4932 bl ShowFieldAutoScrollMessage ldr r0, _08082FC8 @ =sub_8082FEC @@ -410,7 +410,7 @@ _08082FC4: .4byte gUnknown_081A4932 _08082FC8: .4byte sub_8082FEC _08082FCC: movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE ldr r0, _08082FE4 @ =gUnknown_081A49B6 bl ShowFieldAutoScrollMessage ldr r0, _08082FE8 @ =sub_80831F8 diff --git a/asm/choose_party.s b/asm/choose_party.s index 1b8dfca6e..25122e4ef 100644 --- a/asm/choose_party.s +++ b/asm/choose_party.s @@ -630,7 +630,7 @@ sub_81222B0: @ 81222B0 _081222DC: .4byte gPaletteFade _081222E0: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_806CA38 ldr r1, _08122320 @ =gLastFieldPokeMenuOpened @@ -679,7 +679,7 @@ _0812234C: .4byte gTasks _08122350: .4byte sub_81224A8 _08122354: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8121E58 movs r0, 0x1 negs r0, r0 @@ -729,7 +729,7 @@ sub_812238C: @ 812238C cmp r0, 0 beq _0812244A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -748,7 +748,7 @@ _081223D0: cmp r0, 0x3 beq _0812244A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _0812244A @@ -759,7 +759,7 @@ _081223F2: cmp r0, 0 beq _0812243C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08122430 @ =gTasks lsls r0, r7, 2 adds r0, r7 @@ -893,7 +893,7 @@ _081224FC: .4byte gTasks _08122500: .4byte sub_8122450 _08122504: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0xE movs r1, 0 bl sub_806D538 @@ -1125,7 +1125,7 @@ _081226DC: cmp r4, 0x2 bls _081226A0 movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0x14 movs r1, 0xA movs r2, 0x1D @@ -1302,7 +1302,7 @@ sub_8122838: @ 8122838 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_81227FC pop {r4} @@ -1643,7 +1643,7 @@ sub_8122AB8: @ 8122AB8 movs r1, 0x2 strb r1, [r0] movs r0, 0x78 - bl PlaySoundEffect + bl PlaySE _08122AF4: pop {r4} pop {r0} @@ -2058,7 +2058,7 @@ sub_8122E0C: @ 8122E0C _08122E34: .4byte gPaletteFade _08122E38: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_806CA38 ldr r1, _08122E70 @ =gLastFieldPokeMenuOpened @@ -2088,7 +2088,7 @@ _08122E7C: .4byte gTasks _08122E80: .4byte sub_8122EAC _08122E84: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08122EA4 @ =gLastFieldPokeMenuOpened movs r0, 0xFF strb r0, [r1] @@ -2130,7 +2130,7 @@ sub_8122EAC: @ 8122EAC cmp r0, 0 beq _08122F6A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -2149,7 +2149,7 @@ _08122EF0: cmp r0, 0x3 beq _08122F6A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _08122F6A @@ -2160,7 +2160,7 @@ _08122F12: cmp r0, 0 beq _08122F5C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08122F50 @ =gTasks lsls r0, r7, 2 adds r0, r7 @@ -2389,7 +2389,7 @@ sub_81230F4: @ 81230F4 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x14 movs r1, 0xA movs r2, 0x1D diff --git a/asm/contest.s b/asm/contest.s index 3e46e2ee1..214935952 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1000,7 +1000,7 @@ _080AB9E0: strh r0, [r4, 0xA] movs r0, 0x61 movs r1, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -1300,7 +1300,7 @@ sub_80ABC70: @ 80ABC70 bne _080ABCCE _080ABC88: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080ABCB4 @ =gContestPlayerMonIndex ldrb r0, [r0] bl sub_80AF59C @@ -1579,7 +1579,7 @@ _080ABEC6: beq _080ABF08 bl sub_814A7FC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080ABF00 @ =gTasks lsls r1, r7, 2 adds r1, r7 @@ -1616,7 +1616,7 @@ _080ABF24: _080ABF26: bl sub_814A904 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_80AFFE0 ldr r0, _080ABF64 @ =gUnknown_03004210 @@ -1727,7 +1727,7 @@ _080AC006: cmp r6, 0x1 bls _080AC098 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE b _080AC098 .align 2, 0 _080AC03C: .4byte 0x02019204 @@ -1769,7 +1769,7 @@ _080AC068: cmp r6, 0x1 bls _080AC098 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _080AC098: add sp, 0x8 pop {r4-r7} @@ -2946,7 +2946,7 @@ _080ACAAE: cmp r0, 0 beq _080ACAC0 movs r0, 0x63 - bl PlaySoundEffect + bl PlaySE _080ACAC0: ldr r0, _080ACAD4 @ =gTasks mov r3, r8 @@ -3291,13 +3291,13 @@ _080ACD5E: cmp r0, 0 beq _080ACD7C movs r0, 0x63 - bl PlaySoundEffect + bl PlaySE b _080ACD82 .align 2, 0 _080ACD78: .4byte gUnknown_02038696 _080ACD7C: movs r0, 0x64 - bl PlaySoundEffect + bl PlaySE _080ACD82: lsls r0, r6, 3 subs r0, r6 @@ -4099,7 +4099,7 @@ _080AD420: _080AD42C: bl sub_80B1DDC movs r0, 0xDF - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_80B1CBC b _080AD4CC @@ -5396,7 +5396,7 @@ sub_80ADE54: @ 80ADE54 strh r0, [r1] movs r0, 0x62 movs r1, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r1, _080ADEA4 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -7539,7 +7539,7 @@ _080AEF0A: beq _080AEF3A movs r0, 0x26 _080AEF2C: - bl PlaySoundEffect + bl PlaySE ldrb r1, [r5, 0x10] movs r0, 0x31 negs r0, r0 @@ -8982,7 +8982,7 @@ _080AF990: adds r0, r3, 0x1 strh r0, [r2, 0xA] movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE b _080AF9D0 _080AF9BC: ldrh r0, [r2, 0x8] @@ -8993,7 +8993,7 @@ _080AF9BC: subs r0, r3, 0x1 strh r0, [r2, 0xA] movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE _080AF9D0: ldr r3, _080AFA00 @ =gTasks lsls r0, r4, 2 @@ -9517,7 +9517,7 @@ _080AFDA2: cmp r2, 0 ble _080AFDFC movs r0, 0x60 - bl PlaySoundEffect + bl PlaySE ldr r4, _080AFDF4 @ =gMPlay_SE1 adds r0, r4, 0 bl m4aMPlayImmInit @@ -9536,7 +9536,7 @@ _080AFDF4: .4byte gMPlay_SE1 _080AFDF8: .4byte 0x0000ffff _080AFDFC: movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE _080AFE02: cmp r5, 0 bne _080AFE1C @@ -10199,7 +10199,7 @@ sub_80B02A8: @ 80B02A8 ldr r0, _080B02F0 @ =sub_80B02F4 str r0, [r4, 0x1C] movs r0, 0x18 - bl PlaySoundEffect + bl PlaySE pop {r4} pop {r0} bx r0 @@ -11431,7 +11431,7 @@ sub_80B0BC4: @ 80B0BC4 cmp r1, 0 bne _080B0C48 movs r0, 0x65 - bl PlaySoundEffect + bl PlaySE b _080B0C4E .align 2, 0 _080B0C38: .4byte gSprites @@ -11440,7 +11440,7 @@ _080B0C40: .4byte sub_80B0C5C _080B0C44: .4byte SpriteCallbackDummy _080B0C48: movs r0, 0x2 - bl PlaySoundEffect + bl PlaySE _080B0C4E: pop {r3,r4} mov r8, r3 @@ -12927,7 +12927,7 @@ _080B1758: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B177C: .4byte gSprites @@ -12950,7 +12950,7 @@ _080B1788: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x1F - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B17B0: .4byte gSprites @@ -12973,7 +12973,7 @@ _080B17BC: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x1F - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B17E4: .4byte gSprites @@ -12996,7 +12996,7 @@ _080B17F0: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B1818: .4byte gSprites @@ -13019,7 +13019,7 @@ _080B1824: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B184C: .4byte gSprites @@ -13042,7 +13042,7 @@ _080B1858: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B1880: .4byte gSprites @@ -13065,7 +13065,7 @@ _080B188C: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0xC3 - bl PlaySoundEffect + bl PlaySE b _080B18E4 .align 2, 0 _080B18B4: .4byte gSprites @@ -13088,7 +13088,7 @@ _080B18C0: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE _080B18E4: adds r2, r4, 0 ldr r4, _080B1914 @ =gSprites @@ -14175,7 +14175,7 @@ _080B20CA: adds r0, 0x11 strh r0, [r4] movs r0, 0x63 - bl PlaySoundEffect + bl PlaySE _080B2126: adds r6, 0x1 cmp r6, 0x3 @@ -14481,7 +14481,7 @@ sub_80B237C: @ 80B237C strh r0, [r1] movs r0, 0x62 movs r1, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r1, _080B23B4 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -14774,7 +14774,7 @@ _080B25C8: strh r0, [r4, 0xC] movs r0, 0x61 movs r1, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning ldr r0, _080B25E0 @ =sub_80B2508 str r0, [r4] _080B25D8: diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 90d21610f..672eb4c1a 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -3361,7 +3361,7 @@ _080C3A94: adds r0, r4, 0 bl DestroyTask movs r0, 0x18 - bl PlaySoundEffect + bl PlaySE _080C3B12: pop {r4} pop {r0} @@ -4341,13 +4341,13 @@ _080C4292: cmp r0, 0 beq _080C429E movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE _080C429E: mov r1, r10 cmp r1, 0 beq _080C42AA movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE _080C42AA: add sp, 0x8 pop {r3-r5} diff --git a/asm/daycare.s b/asm/daycare.s index 4e856516a..2944f7565 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -2270,7 +2270,7 @@ _08042768: _0804278A: bl MoveMenuCursor movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE b _08042816 .align 2, 0 _08042798: .4byte gTasks @@ -2281,7 +2281,7 @@ _0804279C: beq _080427E8 bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r3, _080427DC @ =gLastFieldPokeMenuOpened ldr r2, _080427E0 @ =gScriptResult ldr r1, _080427E4 @ =gTasks diff --git a/asm/decoration.s b/asm/decoration.s index e71a45f08..221c749c5 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -168,7 +168,7 @@ Task_DecorationPCProcessMenuInput: @ 80FE2EC cmp r0, 0 beq _080FE324 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -182,7 +182,7 @@ _080FE324: cmp r0, 0 beq _080FE342 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor ldr r1, _080FE370 @ =gUnknown_020388D4 @@ -195,7 +195,7 @@ _080FE342: cmp r0, 0 beq _080FE378 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080FE374 @ =gUnknown_083EC604 ldr r0, _080FE370 @ =gUnknown_020388D4 ldrb r0, [r0] @@ -217,7 +217,7 @@ _080FE378: cmp r0, 0 beq _080FE38C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r7, 0 bl gpu_pal_decompress_alloc_tag_and_upload _080FE38C: @@ -554,7 +554,7 @@ _080FE61C: cmp r0, 0 beq _080FE640 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -568,7 +568,7 @@ _080FE640: cmp r0, 0 beq _080FE656 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _080FE720 @@ -579,7 +579,7 @@ _080FE656: cmp r0, 0 beq _080FE70C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl GetMenuCursorPos ldr r4, _080FE6C0 @ =gUnknown_020388F6 strb r0, [r4] @@ -652,7 +652,7 @@ _080FE70C: cmp r0, 0 beq _080FE720 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80FE728 _080FE720: @@ -819,7 +819,7 @@ sub_80FE894: @ 80FE894 mov r10, r1 _080FE8C8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE lsls r0, r5, 24 asrs r0, 24 cmp r0, 0 @@ -967,7 +967,7 @@ _080FE9EE: beq _080FEA7C bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _080FEA44 @ =gUnknown_020388F5 ldr r1, _080FEA48 @ =gUnknown_020388F2 ldr r0, _080FEA38 @ =gUnknown_020388F4 @@ -1027,7 +1027,7 @@ _080FEA7C: beq _080FEAAC bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080FEAB4 @ =gUnknown_083EC634 ldr r2, _080FEAB8 @ =gTasks lsls r0, r4, 2 @@ -3846,7 +3846,7 @@ _08100078: .4byte gSecretBaseText_PlaceItHere _0810007C: .4byte sub_81000A0 _08100080: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE ldr r1, _08100098 @ =gSecretBaseText_CantBePlacedHere ldr r2, _0810009C @ =sub_81006A8 adds r0, r4, 0 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 888a13e3d..466d371a1 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1283,7 +1283,7 @@ sub_80E6AE4: @ 80E6AE4 cmp r0, 0 beq _080E6AFE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _080E6AFE: ldr r2, _080E6B48 @ =gMain ldrh r1, [r2, 0x2E] @@ -1293,7 +1293,7 @@ _080E6AFE: cmp r0, 0 beq _080E6BA4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r1, r4, 0 adds r1, 0x86 adds r0, r4, 0 @@ -1910,7 +1910,7 @@ sub_80E6FC8: @ 80E6FC8 cmp r0, 0 beq _080E700C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r1, 0xE2 lsls r1, 1 adds r0, r4, r1 @@ -1928,7 +1928,7 @@ _080E700C: cmp r0, 0 beq _080E7018 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _080E7018: ldr r0, _080E7054 @ =gMain ldrh r1, [r0, 0x2E] @@ -1944,7 +1944,7 @@ _080E7018: cmp r0, 0 beq _080E7090 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r1, 0xD4 lsls r1, 1 adds r0, r4, r1 @@ -2017,7 +2017,7 @@ _080E7090: beq _080E710A _080E70CA: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80E7AD4 ldr r0, _080E70E4 @ =sub_80E7218 bl sub_80E682C @@ -2255,7 +2255,7 @@ sub_80E7294: @ 80E7294 cmp r0, 0 beq _080E72DC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r1, 0xE2 lsls r1, 1 adds r0, r4, r1 @@ -2274,7 +2274,7 @@ _080E72DC: cmp r0, 0 beq _080E72E8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _080E72E8: ldr r0, _080E7304 @ =gMain ldrh r1, [r0, 0x2E] @@ -2283,7 +2283,7 @@ _080E72E8: cmp r0, 0 beq _080E730C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080E7308 @ =sub_80E7324 bl sub_80E682C b _080E731A @@ -4295,7 +4295,7 @@ _080E81F8: .4byte 0x00009c7e sub_80E81FC: @ 80E81FC push {lr} movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80E95A4 movs r0, 0 movs r1, 0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index b2bcc1088..2f11d4111 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -1084,7 +1084,7 @@ _08043304: cmp r0, 0xF bne _08043334 movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 movs r1, 0x1 bl StartSpriteAnim @@ -1137,7 +1137,7 @@ _0804336C: cmp r0, 0xF bne _08043398 movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1220,7 +1220,7 @@ _08043418: cmp r0, 0xF bne _0804344C movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1232,7 +1232,7 @@ _0804344C: cmp r0, 0x1E bne _0804345A movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _0804345A: pop {r4-r6} pop {r0} @@ -1306,7 +1306,7 @@ _080434C0: cmp r4, 0 bne _080434EE movs r0, 0x71 - bl PlaySoundEffect + bl PlaySE adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 07cff013c..1130e085e 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -642,7 +642,7 @@ sub_81499A0: @ 81499A0 ldr r0, _081499EC @ =sub_81499F0 str r0, [r5] movs r0, 0x8C - bl PlaySoundEffect + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -774,7 +774,7 @@ sub_8149AA8: @ 8149AA8 ldr r1, _08149AD8 @ =sub_8149ADC str r1, [r0] movs r0, 0xB7 - bl PlaySoundEffect + bl PlaySE pop {r4} pop {r0} bx r0 @@ -873,7 +873,7 @@ sub_8149B5C: @ 8149B5C ldr r1, _08149B8C @ =sub_8149B90 str r1, [r0] movs r0, 0x66 - bl PlaySoundEffect + bl PlaySE pop {r4} pop {r0} bx r0 @@ -1016,7 +1016,7 @@ sub_8149C50: @ 8149C50 ldr r0, _08149CAC @ =sub_8149CB0 str r0, [r5] movs r0, 0xCA - bl PlaySoundEffect + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -1177,7 +1177,7 @@ sub_8149D8C: @ 8149D8C ldr r0, _08149DE8 @ =sub_8149DEC str r0, [r5] movs r0, 0xCA - bl PlaySoundEffect + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index d6d81080a..404270195 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1455,7 +1455,7 @@ _08112594: _081125A2: movs r0, 0xBC lsls r0, 1 - bl PlaySoundEffect + bl PlaySE ldr r0, _081125B8 @ =gTasks mov r2, r8 adds r1, r2, r7 @@ -1647,7 +1647,7 @@ _08112728: bl _08112FD0 _0811273E: movs r0, 0x21 - bl PlaySoundEffect + bl PlaySE mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2210,7 +2210,7 @@ _08112C0C: cmp r0, 0 beq _08112C32 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0 strb r0, [r4, 0x1] @@ -2227,7 +2227,7 @@ _08112C32: cmp r0, 0 bne _08112C58 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_6 movs r0, 0x1 strb r0, [r4, 0x1] @@ -2254,7 +2254,7 @@ _08112C58: movs r3, 0x2 bl sub_8002EB0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08112CA8 @ =gUnknown_02024D1E ldrb r2, [r0, 0x1] cmp r2, 0 @@ -2317,7 +2317,7 @@ _08112CF0: movs r3, 0x2 bl sub_8002EB0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08112D28 @ =gTasks mov r2, r8 adds r0, r2, r7 @@ -2753,7 +2753,7 @@ _081130EA: bl m4aSongNumStop movs r0, 0xBC lsls r0, 1 - bl PlaySoundEffect + bl PlaySE ldr r1, _08113108 @ =gTasks lsls r0, r7, 2 adds r0, r7 @@ -2944,7 +2944,7 @@ _08113274: bl _08113B3A _0811328A: movs r0, 0x21 - bl PlaySoundEffect + bl PlaySE _08113290: lsls r0, r7, 2 adds r0, r7 @@ -3479,7 +3479,7 @@ _0811371C: cmp r0, 0 beq _08113742 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl HBlankCB_TradeEvolutionScene movs r0, 0 strb r0, [r4, 0x1] @@ -3496,7 +3496,7 @@ _08113742: cmp r0, 0 bne _08113768 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl HBlankCB_TradeEvolutionScene movs r0, 0x1 strb r0, [r4, 0x1] @@ -3534,7 +3534,7 @@ _08113768: movs r3, 0x2 bl sub_8002EB0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _081137D0 @ =gUnknown_02024D1E ldrb r2, [r0, 0x1] cmp r2, 0 @@ -3608,7 +3608,7 @@ _08113818: movs r3, 0x2 bl sub_8002EB0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08113868 @ =gTasks mov r2, r9 adds r0, r2, r7 diff --git a/asm/field_effect.s b/asm/field_effect.s index a35d25142..2dfa491dc 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -969,7 +969,7 @@ _080860D4: subs r0, 0x1 strh r0, [r4, 0x3A] movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _08086130: movs r1, 0x3A ldrsh r0, [r4, r1] @@ -1943,7 +1943,7 @@ sub_8086870: @ 8086870 ands r0, r2 strb r0, [r1, 0x1] movs r0, 0x2B - bl PlaySoundEffect + bl PlaySE ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -2031,7 +2031,7 @@ _08086964: cmp r0, 0 blt _08086988 movs r0, 0xD6 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r6] movs r1, 0x8 orrs r0, r1 @@ -2253,7 +2253,7 @@ _08086AEA: strh r0, [r5, 0x8] _08086B18: movs r0, 0x50 - bl PlaySoundEffect + bl PlaySE _08086B1E: movs r0, 0 pop {r4,r5} @@ -3273,7 +3273,7 @@ sub_8087298: @ 8087298 movs r0, 0x32 bl FieldEffectStart movs r0, 0xB2 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -3625,7 +3625,7 @@ sub_8087548: @ 8087548 strb r0, [r4, 0x1] bl CameraObjectReset1 movs r0, 0xAF - bl PlaySoundEffect + bl PlaySE movs r0, 0x4 bl sub_80608A4 adds r1, r0, 0 @@ -3875,7 +3875,7 @@ _0808774C: adds r0, r4, 0 bl FieldObjectSetSpecialAnim movs r0, 0x27 - bl PlaySoundEffect + bl PlaySE _0808776C: movs r0, 0 pop {r4-r6} @@ -4528,7 +4528,7 @@ _08087C60: movs r0, 0x1 strh r0, [r4, 0xE] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE _08087C8E: add sp, 0x8 pop {r4,r5} @@ -4799,7 +4799,7 @@ sub_8087E4C: @ 8087E4C lsrs r0, 24 strh r0, [r6, 0x26] movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE _08087EC2: pop {r4-r6} pop {r0} @@ -6461,7 +6461,7 @@ FldEff_NPCFlyOut: @ 8088B68 ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x9E - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 pop {r4} pop {r1} @@ -6774,7 +6774,7 @@ _08088DFE: adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x9E - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0xA] bl sub_8088FC0 _08088E1C: diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index ff48d64f7..9df9dfd8d 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -1890,7 +1890,7 @@ FldEff_Splash: @ 8127610 subs r0, 0x4 strh r0, [r3, 0x26] movs r0, 0x46 - bl PlaySoundEffect + bl PlaySE _0812769A: movs r0, 0 pop {r4-r6} @@ -2248,7 +2248,7 @@ _08127920: cmp r0, 0 bne _0812796A movs r0, 0x46 - bl PlaySoundEffect + bl PlaySE _0812796A: add sp, 0x4 pop {r4,r5} diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index ae4ec3b38..798285a45 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -226,7 +226,7 @@ sub_8080B78: @ 8080B78 bl sub_8053E90 bl pal_fill_for_map_transition movs r0, 0x2E - bl PlaySoundEffect + bl PlaySE ldr r0, _08080B98 @ =task_map_chg_seq_0807E2CC movs r1, 0xA bl CreateTask @@ -616,7 +616,7 @@ sub_8080E88: @ 8080E88 bl fade_8080918 bl PlayRainSoundEffect movs r0, 0x9 - bl PlaySoundEffect + bl PlaySE ldr r0, _08080EB4 @ =gUnknown_0300485C ldr r1, _08080EB8 @ =mapldr_default str r1, [r0] @@ -726,7 +726,7 @@ sub_8080F68: @ 8080F68 bl sub_8053FF8 bl fade_8080918 movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE ldr r0, _08080F90 @ =task0A_fade_n_map_maybe movs r1, 0xA bl CreateTask @@ -822,7 +822,7 @@ sub_808102C: @ 808102C bl sub_8053FF8 bl fade_8080918 movs r0, 0x9 - bl PlaySoundEffect + bl PlaySE ldr r0, _0808104C @ =sub_8080FC4 movs r1, 0xA bl CreateTask @@ -864,7 +864,7 @@ _0808107E: bl fade_screen bl sub_8053FF8 movs r0, 0x9 - bl PlaySoundEffect + bl PlaySE b _080810AC _08081096: bl sub_8080E64 @@ -1016,7 +1016,7 @@ _080811A8: bl sub_8058790 lsls r0, 16 lsrs r0, 16 - bl PlaySoundEffect + bl PlaySE movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0 @@ -1203,7 +1203,7 @@ sub_8081334: @ 8081334 bl fade_8080918 bl PlayRainSoundEffect movs r0, 0x9 - bl PlaySoundEffect + bl PlaySE ldr r0, _08081360 @ =gUnknown_0300485C ldr r1, _08081364 @ =sub_8080B60 str r1, [r0] diff --git a/asm/field_specials.s b/asm/field_specials.s index 906a6bf7c..63677b6a0 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -861,7 +861,7 @@ PetalburgGymSpecial1: @ 810E070 ldr r0, _0810E094 @ =gUnknown_02039259 strb r1, [r0] movs r0, 0x2C - bl PlaySoundEffect + bl PlaySE ldr r0, _0810E098 @ =Task_PetalburgGym movs r1, 0x8 bl CreateTask @@ -2159,7 +2159,7 @@ _0810E9E8: movs r0, 0 strh r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 movs r1, 0 movs r2, 0x1D @@ -2205,7 +2205,7 @@ _0810EA94: ldr r0, _0810EAC4 @ =gScriptResult strh r1, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_810EEDC movs r0, 0 movs r1, 0 @@ -2402,7 +2402,7 @@ sub_810EBEC: @ 810EBEC bl SetCameraPanningCallback bl sub_810ECFC movs r0, 0x59 - bl PlaySoundEffect + bl PlaySE pop {r0} bx r0 .align 2, 0 @@ -2450,7 +2450,7 @@ sub_810EC34: @ 810EC34 cmp r0, 0x17 bne _0810EC92 movs r0, 0x49 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 bl sub_810EC9C bl InstallCameraPanAheadCallback @@ -3092,7 +3092,7 @@ _0810F17A: ldrb r1, [r1] strh r1, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_810EEDC movs r0, 0 movs r1, 0 @@ -3112,7 +3112,7 @@ _0810F1AE: movs r0, 0x7F strh r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_810EEDC movs r0, 0 movs r1, 0 @@ -3896,7 +3896,7 @@ sub_810F758: @ 810F758 movs r0, 0 bl SetCameraPanningCallback movs r0, 0xD6 - bl PlaySoundEffect + bl PlaySE pop {r0} bx r0 .align 2, 0 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 7bb447c62..5f3e3a03f 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -716,7 +716,7 @@ _0806995E: cmp r0, 0 beq _080699CE movs r0, 0x46 - bl PlaySoundEffect + bl PlaySE b _080699CE _0806998C: ldrh r0, [r4, 0xC] @@ -999,7 +999,7 @@ _08069BA4: bne _08069BB8 _08069BB2: movs r0, 0x47 - bl PlaySoundEffect + bl PlaySE _08069BB8: cmp r7, 0 beq _08069BF4 @@ -1409,7 +1409,7 @@ _08069EB6: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x2A - bl PlaySoundEffect + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -1455,7 +1455,7 @@ _08069F20: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x29 - bl PlaySoundEffect + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] diff --git a/asm/field_weather.s b/asm/field_weather.s index a533f9a31..92d2ffab2 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -1978,7 +1978,7 @@ _0807DDA0: _0807DDA6: strb r0, [r1] adds r0, r2, 0 - bl PlaySoundEffect + bl PlaySE _0807DDAE: pop {r0} bx r0 @@ -2004,18 +2004,18 @@ PlayRainSoundEffect: @ 807DDB8 cmp r0, 0 bne _0807DDF0 movs r0, 0x56 - bl PlaySoundEffect + bl PlaySE b _0807DDF6 .align 2, 0 _0807DDE0: .4byte gUnknown_0202F7E8 _0807DDE4: .4byte 0x000006dd _0807DDE8: movs r0, 0x54 - bl PlaySoundEffect + bl PlaySE b _0807DDF6 _0807DDF0: movs r0, 0x52 - bl PlaySoundEffect + bl PlaySE _0807DDF6: pop {r0} bx r0 @@ -4930,14 +4930,14 @@ sub_807F434: @ 807F434 cmp r4, 0 beq _0807F474 movs r0, 0x57 - bl PlaySoundEffect + bl PlaySE b _0807F47A .align 2, 0 _0807F46C: .4byte gUnknown_08396FC4 _0807F470: .4byte 0x000006ed _0807F474: movs r0, 0x58 - bl PlaySoundEffect + bl PlaySE _0807F47A: ldr r0, _0807F488 @ =gUnknown_08396FC4 ldr r0, [r0] diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s index 733455e53..25ede5738 100644 --- a/asm/fldeff_80C5CD4.s +++ b/asm/fldeff_80C5CD4.s @@ -971,7 +971,7 @@ sub_80C644C: @ 80C644C push {r4,lr} adds r4, r0, 0 movs r0, 0x83 - bl PlaySoundEffect + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] ldr r0, _080C6464 @ =sub_80C6468 @@ -1148,7 +1148,7 @@ sub_80C6598: @ 80C6598 push {r4,lr} adds r4, r0, 0 movs r0, 0x9B - bl PlaySoundEffect + bl PlaySE ldr r0, _080C65BC @ =gUnknown_0202FF84 ldr r1, [r0, 0x1C] adds r2, r4, 0 @@ -1303,7 +1303,7 @@ sub_80C66BC: @ 80C66BC push {r4,lr} adds r4, r0, 0 movs r0, 0xA9 - bl PlaySoundEffect + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] ldr r0, _080C66D4 @ =sub_80C66D8 @@ -1495,7 +1495,7 @@ sub_80C683C: @ 80C683C adds r1, r4, 0 bl GetXYCoordsOneStepInFrontOfPlayer movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE ldr r0, _080C6874 @ =0x00004054 bl VarGet lsls r0, 16 @@ -1666,19 +1666,19 @@ _080C6988: b _080C69B6 _080C6998: movs r0, 0x4A - bl PlaySoundEffect + bl PlaySE b _080C69B6 _080C69A0: movs r0, 0x4B - bl PlaySoundEffect + bl PlaySE b _080C69B6 _080C69A8: movs r0, 0x4C - bl PlaySoundEffect + bl PlaySE b _080C69B6 _080C69B0: movs r0, 0x4E - bl PlaySoundEffect + bl PlaySE _080C69B6: pop {r0} bx r0 @@ -1706,7 +1706,7 @@ sub_80C69C4: @ 80C69C4 lsls r4, 16 lsrs r4, 16 movs r0, 0x4D - bl PlaySoundEffect + bl PlaySE lsls r5, 16 asrs r5, 16 lsls r4, 16 @@ -1914,35 +1914,35 @@ _080C6AF0: .4byte _080C6C18 _080C6BE0: movs r0, 0x3E - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6BE8: movs r0, 0x3F - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6BF0: movs r0, 0x40 - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6BF8: movs r0, 0x41 - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6C00: movs r0, 0x42 - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6C08: movs r0, 0x43 - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6C10: movs r0, 0x44 - bl PlaySoundEffect + bl PlaySE b _080C6C1E _080C6C18: movs r0, 0x45 - bl PlaySoundEffect + bl PlaySE _080C6C1E: adds r0, r4, 0 bl DestroyTask @@ -1995,7 +1995,7 @@ SpriteCB_YellowCave4Sparkle: @ 80C6C64 cmp r0, 0x8 bne _080C6C7C movs r0, 0xC3 - bl PlaySoundEffect + bl PlaySE _080C6C7C: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -2239,7 +2239,7 @@ SpriteCB_SandPillar_0: @ 80C6E64 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x83 - bl PlaySoundEffect + bl PlaySE ldr r4, _080C6E90 @ =gUnknown_0202FF84 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -2500,7 +2500,7 @@ _080C7070: .4byte REG_MOSAIC DoFieldPoisonEffect: @ 80C7074 push {lr} movs r0, 0x4F - bl PlaySoundEffect + bl PlaySE ldr r0, _080C7088 @ =Task_FieldPoisonEffect movs r1, 0x50 bl CreateTask diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index b20cdec81..c14e9057d 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -72,7 +72,7 @@ _0810CC30: .4byte sub_810CC34 sub_810CC34: @ 810CC34 push {lr} movs r0, 0xCF - bl PlaySoundEffect + bl PlaySE ldr r0, _0810CC4C @ =0x00000828 bl FlagSet ldr r0, _0810CC50 @ =gUnknown_081B694A diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 844e6e8c4..3ad85d7cf 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -545,7 +545,7 @@ sub_8142274: @ 8142274 movs r0, 0x3 bl TrySavingData movs r0, 0x37 - bl PlaySoundEffect + bl PlaySE ldr r1, _081422B0 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -972,7 +972,7 @@ _081425C0: movs r1, 0xF bl sub_8143068 movs r0, 0x69 - bl PlaySoundEffect + bl PlaySE ldr r1, _08142610 @ =gTasks mov r2, r8 adds r0, r2, r4 diff --git a/asm/item_menu.s b/asm/item_menu.s index 6e1a307f6..7463663d8 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -1709,7 +1709,7 @@ sub_80A3E90: @ 80A3E90 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_16 ldr r0, _080A3EE8 @ =gTasks lsls r5, r4, 2 @@ -1753,7 +1753,7 @@ sub_80A3EF4: @ 80A3EF4 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl nullsub_16 ldr r0, _080A3F44 @ =gTasks lsls r1, r4, 2 @@ -3318,7 +3318,7 @@ sub_80A4ADC: @ 80A4ADC bl sub_80A7528 _080A4AFA: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080A4B10 @ =gUnknown_0203855C movs r0, 0x1 strb r0, [r1] @@ -3770,7 +3770,7 @@ sub_80A4E8C: @ 80A4E8C lsls r6, 24 lsrs r6, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 movs r1, 0x1 bl sub_80F979C @@ -4099,7 +4099,7 @@ _080A50F6: b _080A526A _080A5138: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80A3F50 b _080A526A @@ -4123,7 +4123,7 @@ _080A5160: cmp r1, r0 beq _080A5188 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80A3E90 b _080A526A @@ -4183,7 +4183,7 @@ _080A51F0: cmp r0, 0 bne _080A5264 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _080A5250 @ =gUnknown_02038560 movs r1, 0 ldrsb r1, [r6, r1] @@ -4489,7 +4489,7 @@ _080A5440: b _080A5552 _080A5452: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080A54EE @@ -4514,7 +4514,7 @@ _080A546C: cmp r0, 0x8 beq _080A5552 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 b _080A54EE .align 2, 0 @@ -4536,7 +4536,7 @@ _080A549C: cmp r0, 0x8 beq _080A5552 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x2 negs r0, r0 b _080A54EE @@ -4558,7 +4558,7 @@ _080A54CC: cmp r0, 0x8 beq _080A5552 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x2 _080A54EE: bl MoveMenuCursor3 @@ -4713,7 +4713,7 @@ _080A561E: b _080A5736 _080A5630: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080A56D2 @@ -4740,7 +4740,7 @@ _080A5648: cmp r0, 0x8 beq _080A5736 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 b _080A56D2 .align 2, 0 @@ -4763,7 +4763,7 @@ _080A5680: cmp r0, 0x8 beq _080A5736 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x3 negs r0, r0 b _080A56D2 @@ -4785,7 +4785,7 @@ _080A56B0: cmp r0, 0x8 beq _080A5736 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x3 _080A56D2: bl MoveMenuCursor3 @@ -5008,7 +5008,7 @@ sub_80A5888: @ 80A5888 cmp r0, 0 beq _080A5988 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080A58E2 @@ -5030,7 +5030,7 @@ _080A58C0: cmp r1, r0 beq _080A5988 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _080A58E2: bl MoveMenuCursor @@ -5279,7 +5279,7 @@ sub_80A5AE4: @ 80A5AE4 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80A5AAC pop {r4} @@ -5361,7 +5361,7 @@ sub_80A5B78: @ 80A5B78 cmp r0, 0 beq _080A5BF2 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl CalculatePlayerPartyCount lsls r0, 24 cmp r0, 0 @@ -5774,7 +5774,7 @@ sub_80A5EA0: @ 80A5EA0 cmp r0, 0 beq _080A5EF8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080A5EEC @ =gScriptItemId ldrh r0, [r0] ldr r2, _080A5EF0 @ =gTasks @@ -5799,7 +5799,7 @@ _080A5EF8: cmp r0, 0 beq _080A5F0C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 bl sub_80A5D38 _080A5F0C: @@ -5815,7 +5815,7 @@ sub_80A5F14: @ 80A5F14 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080A5F58 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -5868,7 +5868,7 @@ sub_80A5F80: @ 80A5F80 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_80A7528 adds r0, r4, 0 @@ -5887,7 +5887,7 @@ sub_80A5FAC: @ 80A5FAC lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080A5FD0 @ =gSaveBlock1 ldr r1, _080A5FD4 @ =0x00000496 adds r4, r0, r1 @@ -6021,7 +6021,7 @@ ItemMenu_Give: @ 80A60C8 lsrs r4, r0, 24 adds r6, r4, 0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r5, _080A60FC @ =gScriptItemId ldrh r0, [r5] bl sub_80F931C @@ -6548,7 +6548,7 @@ sub_80A6520: @ 80A6520 cmp r0, 0 beq _080A653E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl BuyMenuPrintItemQuantityAndPrice _080A653E: @@ -6589,7 +6589,7 @@ sub_80A6574: @ 80A6574 lsls r5, 24 lsrs r5, 24 movs r0, 0x5F - bl PlaySoundEffect + bl PlaySE ldr r0, _080A65A0 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080A65A4 @ =gTasks @@ -6742,7 +6742,7 @@ _080A66B4: cmp r0, 0 beq _080A6744 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 movs r1, 0xA movs r2, 0xD @@ -6798,7 +6798,7 @@ _080A6744: cmp r0, 0 beq _080A6758 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl BuyMenuPrintItemQuantityAndPrice _080A6758: @@ -7313,7 +7313,7 @@ _080A6B1A: adds r1, r2, 0 bl sub_80A48E8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80A5D38 _080A6B4C: @@ -7408,7 +7408,7 @@ sub_80A6BE0: @ 80A6BE0 cmp r2, 0 beq _080A6C20 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080A6C1C @ =gBGTilemapBuffers + 0x800 bl sub_80A4DA4 adds r0, r4, 0 @@ -7440,7 +7440,7 @@ _080A6C20: adds r1, r2, 0 bl sub_80A48E8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 bl sub_80A5D38 _080A6C58: @@ -7485,7 +7485,7 @@ sub_80A6C6C: @ 80A6C6C bl sub_80A48E8 bl sub_80A73FC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80A7590 movs r0, 0 ldrsb r0, [r6, r0] @@ -7750,7 +7750,7 @@ sub_80A6EB8: @ 80A6EB8 cmp r0, 0x1 bne _080A6FC0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080A6F02 @@ -7768,7 +7768,7 @@ _080A6EE8: cmp r0, r1 bge _080A6FC0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _080A6F02: bl MoveMenuCursor @@ -7993,7 +7993,7 @@ sub_80A70D8: @ 80A70D8 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80A7094 pop {r4} @@ -8012,7 +8012,7 @@ ItemMenu_UseInBattle: @ 80A70F4 cmp r0, 0 beq _080A711A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] bl ItemId_GetBattleFunc adds r1, r0, 0 @@ -8033,7 +8033,7 @@ sub_80A7124: @ 80A7124 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_80A7528 adds r0, r4, 0 @@ -8184,14 +8184,14 @@ _080A7260: b _080A7358 _080A726A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 movs r1, 0x2 bl sub_80A4E8C b _080A7358 _080A727A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x2 bl sub_80F98A4 movs r0, 0x3 @@ -8240,7 +8240,7 @@ _080A72EC: .4byte gUnknown_02038559 _080A72F0: .4byte gBGTilemapBuffers + 0x800 _080A72F4: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080A7344 @ =gBGTilemapBuffers + 0x800 bl sub_80A4DA4 ldr r4, _080A7348 @ =gSaveBlock1 + 0x560 diff --git a/asm/learn_move.s b/asm/learn_move.s index 1beeef7d7..84d244fe8 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1083,7 +1083,7 @@ _08132FBC: cmp r0, 0 beq _08132FD6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _08132FCE: ldr r0, _08132FE8 @ =gUnknown_030007B0 ldr r1, [r0] @@ -1254,7 +1254,7 @@ _0813310C: cmp r4, 0 beq _0813312A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0813313C @ =gUnknown_030007B0 ldr r1, [r2] movs r0, 0x5 @@ -1432,7 +1432,7 @@ _0813326C: cmp r4, 0 beq _0813328A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0813329C @ =gUnknown_030007B0 ldr r1, [r2] movs r3, 0 @@ -1923,7 +1923,7 @@ sub_813362C: @ 813362C b _08133796 _08133646: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, [r4] ldrb r0, [r1, 0x1B] subs r0, 0x1 @@ -1968,7 +1968,7 @@ _08133688: b _08133796 _081336A0: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, [r4] ldrb r0, [r1, 0x1B] adds r0, 0x1 @@ -2009,7 +2009,7 @@ _081336E8: cmp r0, 0 beq _0813376C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r5, _08133738 @ =gUnknown_030007B0 ldr r2, [r5] ldrb r1, [r2, 0x1B] @@ -2065,7 +2065,7 @@ _0813376C: cmp r0, 0 beq _08133796 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _081337D4 @ =gUnknown_030007B0 ldr r1, [r0] movs r0, 0xC diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 9dbaa0359..f10070110 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -138,7 +138,7 @@ _080F9114: b _080F9140 _080F911A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080F912C @ =gUnknown_020388C4 ldr r1, [r0] adds r0, r4, 0 @@ -148,7 +148,7 @@ _080F911A: _080F912C: .4byte gUnknown_020388C4 _080F9130: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080F9148 @ =gUnknown_020388C4 ldr r1, [r0, 0x4] adds r0, r4, 0 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index c49967360..28bc116a9 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -387,7 +387,7 @@ _080F7558: cmp r0, 0 beq _080F758C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, [r4] ldrb r0, [r1, 0x5] subs r0, 0x1 @@ -409,7 +409,7 @@ _080F758C: cmp r0, 0 beq _080F75B0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, [r4] ldrb r0, [r1, 0x5] adds r0, 0x1 @@ -427,7 +427,7 @@ _080F75B0: cmp r0, 0 beq _080F7602 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, [r4] movs r1, 0x5 ldrsb r1, [r0, r1] @@ -472,7 +472,7 @@ _080F7602: cmp r0, 0 beq _080F75FE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _080F7610: movs r0, 0 _080F7612: diff --git a/asm/party_menu.s b/asm/party_menu.s index 1eae399ab..534d4aaa4 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -2442,7 +2442,7 @@ _0806C1A4: cmp r5, r0 beq _0806C1C8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C1C8: pop {r3,r4} mov r8, r3 @@ -3327,7 +3327,7 @@ _0806C84A: cmp r6, r0 beq _0806C878 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C878: pop {r3} mov r8, r3 @@ -3402,7 +3402,7 @@ _0806C8E2: movs r1, 0x2 strb r1, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C914: pop {r4-r6} pop {r0} @@ -3776,7 +3776,7 @@ _0806CBDA: cmp r0, 0 beq _0806CC10 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0806CC0C @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -3798,7 +3798,7 @@ _0806CC10: cmp r0, 0x2 bne _0806CC24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_806CD44 _0806CC24: @@ -7776,7 +7776,7 @@ _0806EB80: cmp r1, r0 bne _0806EB8E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EB8E: movs r0, 0x17 movs r1, 0x8 @@ -8159,7 +8159,7 @@ _0806EEBC: cmp r1, r0 bne _0806EECA movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EECA: movs r0, 0x17 movs r1, 0x8 @@ -8277,7 +8277,7 @@ _0806EFA8: cmp r1, r0 bne _0806EFB6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EFB6: movs r0, 0x17 movs r1, 0x8 @@ -8389,7 +8389,7 @@ TeachMonTMMove: @ 806F06C lsls r5, 16 lsrs r5, 16 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0806F0A8 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -8800,7 +8800,7 @@ _0806F3E0: cmp r1, r0 bne _0806F3EE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806F3EE: adds r0, r5, 0 bl StopTryingToTeachMove_806F614 @@ -9191,7 +9191,7 @@ _0806F73C: cmp r1, r0 bne _0806F74A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806F74A: movs r0, 0x17 movs r1, 0x8 @@ -9553,7 +9553,7 @@ sub_806FA18: @ 806FA18 cmp r0, r1 bne _0806FAE4 movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE movs r0, 0x80 lsls r0, 5 adds r4, r6, r0 @@ -10112,7 +10112,7 @@ _0806FEE6: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0806FF0C @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -10134,13 +10134,13 @@ _0806FF14: cmp r0, 0 bne _0806FF34 movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE b _0806FF3A .align 2, 0 _0806FF30: .4byte gUnknown_0202E8F4 _0806FF34: movs r0, 0x75 - bl PlaySoundEffect + bl PlaySE _0806FF3A: ldr r4, _0806FF88 @ =0x0201c000 ldr r0, [r4] @@ -10514,7 +10514,7 @@ Task_HandleItemUseMoveMenuInput: @ 8070374 cmp r0, 0 beq _0807039C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -10527,7 +10527,7 @@ _0807039C: cmp r0, 0 beq _080703B2 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _080703E4 @@ -10549,7 +10549,7 @@ _080703CC: cmp r0, 0 beq _080703E4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080703EC @ =gUnknown_08376B54 ldr r1, [r0, 0x4] adds r0, r4, 0 @@ -10625,7 +10625,7 @@ _08070468: .4byte gTasks _0807046C: .4byte TaskDummy _08070470: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xA movs r1, 0x3 bl sub_806D538 @@ -10766,7 +10766,7 @@ DoRecoverPP: @ 8070570 ldr r0, _080705B0 @ =gUnknown_0202E8F4 strb r5, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080705B4 @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -10781,7 +10781,7 @@ _080705B8: movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r6, 0x6] movs r1, 0x1 bl RemoveBagItem @@ -10839,7 +10839,7 @@ DoPPUpItemEffect: @ 8070624 str r4, [r3] bl sub_806E8D0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xB movs r1, 0x3 bl sub_806D538 @@ -10925,7 +10925,7 @@ _080706F6: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0807071C @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -11013,7 +11013,7 @@ Task_RareCandy1: @ 80707A0 beq _080707E8 _080707CE: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_8070848 ldr r0, _080707F8 @ =gTasks @@ -11051,7 +11051,7 @@ Task_RareCandy2: @ 8070800 beq _08070834 _0807081A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_8070968 ldr r0, _08070840 @ =gTasks @@ -11584,7 +11584,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC lsls r1, 16 lsrs r6, r1, 16 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08070E18 @ =gTasks lsls r0, r4, 2 adds r0, r4 diff --git a/asm/player_pc.s b/asm/player_pc.s index 7e1333b1c..5e2adb775 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -554,7 +554,7 @@ sub_813B174: @ 813B174 cmp r0, 0 beq _0813B1B8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _0813B1E6 @@ -567,7 +567,7 @@ _0813B1B8: cmp r0, 0 beq _0813B274 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0x2] subs r0, 0x1 b _0813B208 @@ -583,7 +583,7 @@ _0813B1CA: cmp r1, r0 beq _0813B1F4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _0813B1E6: bl MoveMenuCursor @@ -598,7 +598,7 @@ _0813B1F4: cmp r0, r1 beq _0813B274 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0x2] adds r0, 0x1 _0813B208: @@ -614,7 +614,7 @@ _0813B212: beq _0813B25C bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0813B23C @ =0x0201fe00 ldrb r1, [r0, 0x2] ldrb r2, [r0] @@ -647,7 +647,7 @@ _0813B25C: beq _0813B274 bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_813B320 _0813B274: @@ -811,7 +811,7 @@ sub_813B3A0: @ 813B3A0 cmp r0, 0 beq _0813B3C8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -824,7 +824,7 @@ _0813B3C8: cmp r0, 0 beq _0813B3DE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _0813B420 @@ -835,7 +835,7 @@ _0813B3DE: cmp r0, 0 beq _0813B40C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _0813B408 @ =gUnknown_084062F8 bl GetMenuCursorPos lsls r0, 24 @@ -854,7 +854,7 @@ _0813B40C: cmp r0, 0 beq _0813B420 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl Mailbox_Cancel _0813B420: diff --git a/asm/pokeball.s b/asm/pokeball.s index 6b906288e..9abeed00d 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -256,7 +256,7 @@ _080465CC: ldr r1, _08046630 @ =TaskDummy str r1, [r0] movs r0, 0x3D - bl PlaySoundEffect + bl PlaySE _08046616: add sp, 0x4 pop {r3-r5} @@ -435,7 +435,7 @@ sub_8046760: @ 8046760 cmp r0, 0xB bne _08046778 movs r0, 0x3C - bl PlaySoundEffect + bl PlaySE _08046778: ldr r6, _080467C4 @ =gSprites ldr r5, _080467C8 @ =gUnknown_02024BE0 @@ -604,19 +604,19 @@ _080468B0: b _080468CE _080468B6: movs r0, 0x38 - bl PlaySoundEffect + bl PlaySE b _08046902 _080468BE: movs r0, 0x39 - bl PlaySoundEffect + bl PlaySE b _08046902 _080468C6: movs r0, 0x3A - bl PlaySoundEffect + bl PlaySE b _08046902 _080468CE: movs r0, 0x3B - bl PlaySoundEffect + bl PlaySE b _08046902 _080468D6: movs r2, 0x38 @@ -701,7 +701,7 @@ sub_8046944: @ 8046944 ldr r0, _08046980 @ =sub_8046984 str r0, [r4, 0x1C] movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _08046978: pop {r4} pop {r0} @@ -875,7 +875,7 @@ _08046ABC: bl StartSpriteAffineAnim _08046AC4: movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _08046ACA: pop {r4} pop {r0} @@ -1494,7 +1494,7 @@ sub_8046FBC: @ 8046FBC strb r1, [r0] bl m4aMPlayAllStop ldr r0, _08046FF0 @ =0x00000173 - bl PlaySoundEffect + bl PlaySE b _08047056 .align 2, 0 _08046FEC: .4byte gUnknown_02024E6D @@ -2404,7 +2404,7 @@ sub_80476E0: @ 80476E0 cmp r0, 0xB bne _080476F8 movs r0, 0x3C - bl PlaySoundEffect + bl PlaySE _080476F8: ldrh r1, [r5, 0x2E] lsls r1, 24 diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 5c507bf62..44ac16b7e 100644 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -1079,7 +1079,7 @@ sub_810BF38: @ 810BF38 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _0810BF6C @ =gSprites ldr r0, _0810BF70 @ =0x02000000 ldr r1, _0810BF74 @ =0x0001fffe @@ -1195,7 +1195,7 @@ _0810C012: cmp r0, r1 beq _0810C0B8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_810BDAC ldr r1, _0810C054 @ =gTasks @@ -1220,7 +1220,7 @@ _0810C05C: cmp r0, 0 beq _0810C09C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0810C088 @ =gUnknown_02039248 ldrb r1, [r0, 0x1] ldrb r2, [r0] @@ -1249,7 +1249,7 @@ _0810C09C: cmp r0, 0 beq _0810C0B8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0810C0C0 @ =gScriptResult ldr r2, _0810C0C4 @ =0x0000ffff adds r0, r2, 0 @@ -1354,7 +1354,7 @@ _0810C168: beq _0810C190 _0810C17A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 movs r1, 0 bl sub_810C1C8 @@ -1367,7 +1367,7 @@ _0810C190: cmp r0, 0 beq _0810C1BA movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 movs r1, 0 bl sub_810C1C8 @@ -1692,7 +1692,7 @@ sub_810C40C: @ 810C40C cmp r0, 0 beq _0810C4BC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -1713,7 +1713,7 @@ _0810C440: cmp r0, r1 beq _0810C4BC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _0810C4BC @@ -1726,7 +1726,7 @@ _0810C46C: cmp r0, 0 beq _0810C4A8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _0810C4A0 @ =gUnknown_083F7EF4 bl GetMenuCursorPos lsls r0, 24 @@ -1751,7 +1751,7 @@ _0810C4A8: cmp r0, 0 beq _0810C4BC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_810C748 _0810C4BC: diff --git a/asm/pokedex.s b/asm/pokedex.s index 2206c15d8..8fd971840 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -426,7 +426,7 @@ _08090AA4: mov r0, r8 strh r0, [r5, 0x10] movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE b _08090B44 .align 2, 0 _08090B00: .4byte gTasks @@ -653,7 +653,7 @@ sub_8090C68: @ 8090C68 adds r0, 0x1 strh r0, [r1] movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE b _08090D2A .align 2, 0 _08090CD0: .4byte gUnknown_0202FFBC @@ -693,7 +693,7 @@ _08090CE4: subs r0, 0x1 strh r0, [r1] movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE _08090D2A: pop {r4,r5} pop {r0} @@ -3220,7 +3220,7 @@ sub_809207C: @ 809207C cmp r0, 0 beq _080920B0 movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE ldr r0, _080920A8 @ =gTasks lsls r1, r5, 2 adds r1, r5 @@ -3260,12 +3260,12 @@ _080920D8: b _0809216C _080920DE: movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE strh r4, [r5, 0xA] b _080920F2 _080920E8: movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE movs r0, 0x4 strh r0, [r5, 0xA] _080920F2: @@ -3276,7 +3276,7 @@ _080920F2: _080920F8: .4byte sub_809217C _080920FC: movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE ldr r0, _08092108 @ =sub_80927B8 str r0, [r5] b _0809216C @@ -3297,7 +3297,7 @@ _0809210C: cmp r0, 0 ble _0809213A movs r0, 0x6D - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] @@ -3321,7 +3321,7 @@ _0809213A: cmp r0, 0x1 bgt _0809216C movs r0, 0x6D - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -3403,7 +3403,7 @@ _080921F0: cmp r3, 0 beq _08092230 movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 bl sub_8092EB0 ldr r0, _08092228 @ =gTasks @@ -3480,7 +3480,7 @@ _08092288: adds r0, r2 strh r1, [r0] movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE ldr r0, _080922D0 @ =sub_80927B8 str r0, [r6] b _080923EC @@ -3499,14 +3499,14 @@ _080922D4: ldr r0, _080922EC @ =sub_80923FC str r0, [r6] movs r0, 0x70 - bl PlaySoundEffect + bl PlaySE b _080923EC .align 2, 0 _080922E8: .4byte gDexText_Searching _080922EC: .4byte sub_80923FC _080922F0: movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE ldr r0, _080922FC @ =sub_80925CC str r0, [r6] b _080923EC @@ -3530,7 +3530,7 @@ _08092300: cmp r0, 0xFF beq _08092338 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -3559,7 +3559,7 @@ _08092338: cmp r0, 0xFF beq _08092374 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -3588,7 +3588,7 @@ _08092374: cmp r0, 0xFF beq _080923B0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -3617,7 +3617,7 @@ _080923B0: cmp r0, 0xFF beq _080923EC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -3731,7 +3731,7 @@ sub_80924A4: @ 80924A4 cmp r0, 0 beq _080924DC movs r0, 0x1F - bl PlaySoundEffect + bl PlaySE ldr r0, _080924D8 @ =gDexText_SearchComplete bl sub_8091E20 b _080924E8 @@ -3741,7 +3741,7 @@ _080924D4: .4byte 0x0000060c _080924D8: .4byte gDexText_SearchComplete _080924DC: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE ldr r0, _080924FC @ =gDexText_NoMatching bl sub_8091E20 _080924E8: @@ -3811,7 +3811,7 @@ sub_8092508: @ 8092508 ldr r1, _0809258C @ =sub_80927B8 str r1, [r0] movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE b _080925A4 .align 2, 0 _08092570: .4byte gMain @@ -3831,7 +3831,7 @@ _08092590: ldr r0, _080925B0 @ =sub_809217C str r0, [r1] movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE _080925A4: pop {r4,r5} pop {r0} @@ -3951,7 +3951,7 @@ sub_8092644: @ 8092644 beq _080926B4 bl sub_814ADC8 movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE movs r0, 0x12 movs r1, 0x1 movs r2, 0x1C @@ -3971,7 +3971,7 @@ _080926B4: beq _080926EC bl sub_814ADC8 movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE movs r0, 0x12 movs r1, 0x1 movs r2, 0x1C @@ -4026,7 +4026,7 @@ _08092730: beq _080927AE _08092734: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] ldrh r1, [r5] adds r0, r1 @@ -4074,7 +4074,7 @@ _08092794: beq _080927AE _08092798: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] ldrh r1, [r5] adds r0, r1 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 8649d2c6b..bd8db8a2c 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -2009,7 +2009,7 @@ _081115B4: beq _081115D0 strh r1, [r5, 0xA] movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE b _0811163C .align 2, 0 _081115CC: .4byte gMain @@ -2030,7 +2030,7 @@ _081115D0: _081115EA: strh r3, [r5, 0xA] movs r0, 0x6D - bl PlaySoundEffect + bl PlaySE b _0811163C .align 2, 0 _081115F4: .4byte gSaveBlock2 diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s index 30a973107..57bcd4904 100644 --- a/asm/pokemon_menu.s +++ b/asm/pokemon_menu.s @@ -333,7 +333,7 @@ sub_8089CD4: @ 8089CD4 _08089D00: .4byte gPaletteFade _08089D04: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_806CA38 ldr r1, _08089D48 @ =gLastFieldPokeMenuOpened @@ -369,7 +369,7 @@ _08089D58: .4byte gTasks _08089D5C: .4byte sub_8089D94 _08089D60: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -413,7 +413,7 @@ sub_8089D94: @ 8089D94 cmp r1, 0x40 bne _08089DD4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -428,7 +428,7 @@ _08089DD4: cmp r1, 0x80 bne _08089DF0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor ldr r1, _08089DEC @ =gUnknown_0202FFA8 @@ -443,7 +443,7 @@ _08089DF0: cmp r0, 0 beq _08089E30 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08089E24 @ =gPokemonMenuActions ldr r2, _08089E28 @ =gUnknown_0202FFAA ldr r0, _08089E2C @ =gUnknown_0202FFA8 @@ -755,7 +755,7 @@ sub_808A060: @ 808A060 bl MoveMenuCursor strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0808A086: ldr r0, _0808A0D0 @ =gMain ldrh r0, [r0, 0x2E] @@ -769,7 +769,7 @@ _0808A086: bl MoveMenuCursor strb r0, [r4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0808A0A4: ldr r0, _0808A0D0 @ =gMain ldrh r1, [r0, 0x2E] @@ -778,7 +778,7 @@ _0808A0A4: cmp r0, 0 beq _0808A0E0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0808A0D8 @ =gUnknown_0839F578 ldr r2, _0808A0DC @ =gPokemonMenuActions ldr r0, _0808A0D4 @ =gUnknown_0202FFA8 @@ -1585,7 +1585,7 @@ sub_808A73C: @ 808A73C cmp r0, 0x40 bne _0808A77A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _0808A768 @ =gUnknown_0202FFA8 ldrb r0, [r4] cmp r0, 0 @@ -1612,7 +1612,7 @@ _0808A77A: cmp r0, 0x80 bne _0808A7B4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _0808A7A4 @ =gUnknown_0202FFA8 ldrb r0, [r4] ldr r1, _0808A7A8 @ =gUnknown_0839F584 @@ -1642,7 +1642,7 @@ _0808A7B4: cmp r0, 0 beq _0808A7F0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0808A7E4 @ =gUnknown_0839F584 ldr r2, _0808A7E8 @ =gPokemonMenuActions ldr r0, _0808A7EC @ =gUnknown_0202FFA8 @@ -1814,7 +1814,7 @@ PokemonMenu_Cancel: @ 808A918 lsrs r4, 24 bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_808A8D4 pop {r4} @@ -1830,7 +1830,7 @@ PokemonMenu_CancelSubmenu: @ 808A938 lsrs r4, 24 bl sub_8072DEC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x13 movs r1, 0 movs r2, 0x1D @@ -2808,7 +2808,7 @@ _0808B0F0: cmp r0, 0 beq _0808B120 movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE b _0808B1CE .align 2, 0 _0808B118: .4byte gLastFieldPokeMenuOpened @@ -2831,7 +2831,7 @@ _0808B13C: cmp r0, 0x1 bne _0808B154 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0808B174 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0808B17C @ =sub_808B2EC @@ -2842,7 +2842,7 @@ _0808B154: cmp r0, 0x3 bne _0808B1CE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0808B180 @ =sub_808B2B4 adds r0, r4, 0 bl PartyMenuTryGiveMonMail @@ -2860,7 +2860,7 @@ _0808B184: ldr r1, _0808B1D8 @ =gLastFieldPokeMenuOpened strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 str r5, [sp] diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 27a600b45..176a42124 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1397,7 +1397,7 @@ sub_8096368: @ 8096368 cmp r0, 0 beq _08096384 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xC9 b _080963CC .align 2, 0 @@ -1408,7 +1408,7 @@ _08096384: cmp r0, 0 beq _080963A4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080963A0 @ =gUnknown_02038478 ldr r0, [r0] movs r1, 0x8F @@ -1424,7 +1424,7 @@ _080963A4: cmp r0, 0 beq _080963B8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_809662C b _080963CA _080963B8: @@ -1433,7 +1433,7 @@ _080963B8: cmp r0, 0 beq _080963CA movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80965F8 _080963CA: movs r0, 0xC8 @@ -2464,7 +2464,7 @@ _08096C0E: b _08096C38 _08096C16: movs r0, 0x2 - bl PlaySoundEffect + bl PlaySE movs r1, 0 movs r0, 0xE strh r0, [r4, 0xC] @@ -2580,7 +2580,7 @@ _08096CE0: .4byte _08096DA0 _08096D20: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08096D30 @ =0x02000000 movs r0, 0x1 strb r0, [r1, 0x4] @@ -2646,7 +2646,7 @@ _08096DA0: _08096DA8: .4byte sub_8097CC0 _08096DAC: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096DBC @ =sub_809789C bl sub_8096BE0 b _08096FBA @@ -2654,7 +2654,7 @@ _08096DAC: _08096DBC: .4byte sub_809789C _08096DC0: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096DD0 @ =sub_8097078 bl sub_8096BE0 b _08096FBA @@ -2662,7 +2662,7 @@ _08096DC0: _08096DD0: .4byte sub_8097078 _08096DD4: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _08096DF0 @ =0x02000000 ldr r0, _08096DF4 @ =gPokemonStorage ldrb r0, [r0] @@ -2680,7 +2680,7 @@ _08096DF4: .4byte gPokemonStorage _08096DF8: .4byte 0x000008b2 _08096DFC: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _08096E24 @ =0x02000000 ldr r0, _08096E28 @ =gPokemonStorage ldrb r0, [r0] @@ -2725,7 +2725,7 @@ _08096E54: .4byte 0x02000000 _08096E58: .4byte 0x000011f2 _08096E5C: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096E6C @ =sub_809746C bl sub_8096BE0 b _08096FBA @@ -2737,7 +2737,7 @@ _08096E70: cmp r0, 0 bne _08096E96 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096E88 @ =sub_80972A8 bl sub_8096BE0 b _08096FBA @@ -2757,7 +2757,7 @@ _08096E96: _08096EA0: .4byte 0x02000000 _08096EA4: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096EB4 @ =c3_0808DC50 bl sub_8096BE0 b _08096FBA @@ -2765,7 +2765,7 @@ _08096EA4: _08096EB4: .4byte c3_0808DC50 _08096EB8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096EC8 @ =sub_8097390 bl sub_8096BE0 b _08096FBA @@ -2773,7 +2773,7 @@ _08096EB8: _08096EC8: .4byte sub_8097390 _08096ECC: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08096EDC @ =sub_80972FC bl sub_8096BE0 b _08096FBA @@ -2852,12 +2852,12 @@ _08096F78: .4byte gMain _08096F7C: .4byte 0x02000000 _08096F80: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0xD b _08096F92 _08096F8A: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0x16 _08096F92: bl sub_8098898 @@ -2939,7 +2939,7 @@ _0809701C: b _0809706A _08097022: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl add_to_c3_somehow b _08097044 _0809702E: @@ -3055,7 +3055,7 @@ _08097120: cmp r0, 0 bne _080971D6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _0809713C @ =sub_80972A8 bl sub_8096BE0 @@ -3064,7 +3064,7 @@ _08097120: _0809713C: .4byte sub_80972A8 _08097140: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _08097154 @ =sub_80972FC bl sub_8096BE0 @@ -3077,7 +3077,7 @@ _08097158: cmp r0, 0 beq _080971D6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _08097174 @ =c3_0808DC50 bl sub_8096BE0 @@ -3086,7 +3086,7 @@ _08097158: _08097174: .4byte c3_0808DC50 _08097178: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _0809718C @ =sub_8097390 bl sub_8096BE0 @@ -3107,7 +3107,7 @@ _08097190: cmp r0, 0 bne _08097210 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _080971C8 @ =sub_809746C bl sub_8096BE0 @@ -3157,7 +3157,7 @@ _08097210: _08097218: .4byte 0x000011f2 _0809721C: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0809722C @ =sub_8097594 bl sub_8096BE0 b _0809729A @@ -3165,7 +3165,7 @@ _0809721C: _0809722C: .4byte sub_8097594 _08097230: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08097240 @ =sub_8097788 bl sub_8096BE0 b _0809729A @@ -3173,7 +3173,7 @@ _08097230: _08097240: .4byte sub_8097788 _08097244: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08097254 @ =sub_80977E4 bl sub_8096BE0 b _0809729A @@ -3181,17 +3181,17 @@ _08097244: _08097254: .4byte sub_80977E4 _08097258: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0xD b _08097274 _08097262: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0x11 b _08097274 _0809726C: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0x16 _08097274: bl sub_8098898 @@ -4005,7 +4005,7 @@ _08097914: _08097928: .4byte sub_8096C84 _0809792C: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0809793C @ =sub_8097B44 bl sub_8096BE0 b _08097968 @@ -4013,7 +4013,7 @@ _0809792C: _0809793C: .4byte sub_8097B44 _08097940: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _08097954 @ =sub_8097974 bl sub_8096BE0 @@ -4022,7 +4022,7 @@ _08097940: _08097954: .4byte sub_8097974 _08097958: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r0, _08097970 @ =sub_8097A64 bl sub_8096BE0 @@ -4087,7 +4087,7 @@ _080979D4: cmp r0, 0xC blt _08097A5A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] subs r0, 0xC strh r0, [r4] @@ -4118,7 +4118,7 @@ _080979FC: b _08097A5A _08097A24: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldrh r0, [r4] subs r0, 0x10 @@ -4329,7 +4329,7 @@ _08097BD4: cmp r0, 0 beq _08097BF8 movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0xF bl sub_8098898 ldr r1, _08097BF4 @ =0x02000000 @@ -4340,7 +4340,7 @@ _08097BD4: _08097BF4: .4byte 0x02000000 _08097BF8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_8098898 movs r0, 0 @@ -4386,7 +4386,7 @@ _08097C4A: _08097C58: .4byte sub_8096C84 _08097C5C: movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r1, _08097C70 @ =0x02000000 ldrb r0, [r1, 0x4] @@ -4463,7 +4463,7 @@ _08097CF4: cmp r0, 0 beq _08097D18 movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0xF bl sub_8098898 ldr r1, _08097D14 @ =0x02000000 @@ -4474,7 +4474,7 @@ _08097CF4: _08097D14: .4byte 0x02000000 _08097D18: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x12 bl sub_8098898 movs r0, 0 @@ -4521,7 +4521,7 @@ _08097D6C: _08097D78: .4byte sub_8096C84 _08097D7C: movs r0, 0x3 - bl PlaySoundEffect + bl PlaySE bl sub_8098A5C ldr r1, _08097D90 @ =0x02000000 ldrb r0, [r1, 0x4] @@ -5825,7 +5825,7 @@ sub_809880C: @ 809880C movs r1, 0 strb r1, [r0] movs r0, 0x6 - bl PlaySoundEffect + bl PlaySE bl sub_80984E8 pop {r0} bx r0 @@ -14796,7 +14796,7 @@ sub_809CF30: @ 809CF30 cmp r0, 0 beq _0809CF52 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r5, 0x1 _0809CF52: ldrh r1, [r4, 0x2E] @@ -14805,7 +14805,7 @@ _0809CF52: cmp r0, 0 beq _0809CF70 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -14818,7 +14818,7 @@ _0809CF70: cmp r0, 0 beq _0809CF8E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _0809CF8E diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index a2d142c4c..20231a0bb 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1043,7 +1043,7 @@ SummaryScreenExit: @ 809E0FC lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -1386,7 +1386,7 @@ _0809E3BC: .4byte 0x02018000 _0809E3C0: .4byte gSpecialVar_0x8005 _0809E3C4: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE ldrb r1, [r5] adds r0, r4, 0 bl sub_809F9D0 @@ -1492,13 +1492,13 @@ _0809E474: cmp r0, 0 bne _0809E4AC movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE b _0809E502 .align 2, 0 _0809E4A8: .4byte 0x02018000 _0809E4AC: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r1, [r6] adds r0, r4, 0 adds r0, 0x7A @@ -1520,7 +1520,7 @@ _0809E4D8: .4byte gTasks _0809E4DC: .4byte sub_809E534 _0809E4E0: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r7, 0 bl sub_809EAC8 b _0809E502 @@ -1530,7 +1530,7 @@ _0809E4EE: cmp r0, 0 beq _0809E502 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r7, 0 bl sub_809EAC8 _0809E502: @@ -1946,7 +1946,7 @@ sub_809E83C: @ 809E83C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x13 bl sub_80A1B1C movs r0, 0 @@ -2041,7 +2041,7 @@ sub_809E8F0: @ 809E8F0 movs r0, 0x1 str r0, [sp] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE mov r1, r9 ldrb r6, [r1] ldr r1, _0809E944 @ =gTasks @@ -2206,7 +2206,7 @@ SummaryScreenHandleAButton: @ 809EA50 lsls r0, 24 lsrs r5, r0, 24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _0809EABC @ =0x02018000 adds r1, r4, 0 adds r1, 0x79 @@ -3122,7 +3122,7 @@ _0809F17C: cmp r0, 0xFF bne _0809F1A6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r6, 0 adds r1, r5, 0 bl sub_809F0D0 @@ -3204,7 +3204,7 @@ _0809F22C: cmp r0, r1 beq _0809F270 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r5, _0809F278 @ =0x02018010 adds r0, r5, 0 bl GetMonStatusAndPokerus diff --git a/asm/pokenav.s b/asm/pokenav.s index 8ce66e75f..757a2a5a2 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -152,7 +152,7 @@ _080EBBA0: movs r1, 0x1 strb r1, [r0] movs r0, 0x6E - bl PlaySoundEffect + bl PlaySE ldr r0, _080EBBD8 @ =sub_80EBD90 bl SetMainCallback2 ldr r0, _080EBBDC @ =sub_80EBD18 @@ -1019,7 +1019,7 @@ _080EC2AE: cmp r0, 0 beq _080EC2D4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080EC2D0 @ =0x00006dad adds r0, r4, r1 ldrb r1, [r0] @@ -1073,7 +1073,7 @@ _080EC31C: .4byte _080EC358 _080EC330: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC340 @ =sub_80EC4A0 bl sub_80EBDBC b _080EC492 @@ -1081,7 +1081,7 @@ _080EC330: _080EC340: .4byte sub_80EC4A0 _080EC344: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC354 @ =sub_80EC81C bl sub_80EBDBC b _080EC492 @@ -1165,7 +1165,7 @@ _080EC3DC: cmp r0, 0 beq _080EC408 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC404 @ =sub_80EDB88 bl sub_80EBDBC b _080EC492 @@ -1174,7 +1174,7 @@ _080EC400: .4byte 0x00008fe8 _080EC404: .4byte sub_80EDB88 _080EC408: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0 movs r1, 0x5 b _080EC442 @@ -1186,7 +1186,7 @@ _080EC414: cmp r0, 0 beq _080EC438 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC434 @ =sub_80EE3D8 bl sub_80EBDBC b _080EC492 @@ -1195,7 +1195,7 @@ _080EC430: .4byte 0x0000d158 _080EC434: .4byte sub_80EE3D8 _080EC438: movs r0, 0x20 - bl PlaySoundEffect + bl PlaySE movs r0, 0 movs r1, 0x6 _080EC442: @@ -1210,7 +1210,7 @@ _080EC44C: cmp r5, 0 beq _080EC478 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080EC474 @ =0x00006dad adds r0, r4, r1 ldrb r1, [r0] @@ -1522,7 +1522,7 @@ _080EC6E2: b _080EC800 _080EC6E8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC6FC @ =0x02000000 movs r1, 0xC1 lsls r1, 2 @@ -1534,7 +1534,7 @@ _080EC6E8: _080EC6FC: .4byte 0x02000000 _080EC700: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EC714 @ =0x02000000 movs r2, 0xC1 lsls r2, 2 @@ -1730,7 +1730,7 @@ _080EC888: cmp r0, 0 beq _080EC8B0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080EC8AC @ =0x00006dad adds r0, r4, r1 ldrb r1, [r0] @@ -1748,7 +1748,7 @@ _080EC8B0: cmp r0, 0 beq _080EC918 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _080EC8E8 @ =0x00006dad adds r0, r4, r2 ldrb r1, [r0] @@ -1797,7 +1797,7 @@ _080EC918: cmp r0, 0 beq _080EC954 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080EC93C @ =0x00006df0 adds r0, r4, r1 strb r6, [r0] @@ -2172,7 +2172,7 @@ _080ECC24: cmp r0, 0 beq _080ECC4C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080ECC48 @ =0x00006dad adds r0, r4, r1 ldrb r1, [r0] @@ -2192,7 +2192,7 @@ _080ECC4C: b _080ECD40 _080ECC5A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _080ECC7C @ =0x00006dad adds r0, r4, r2 ldrb r0, [r0] @@ -2300,7 +2300,7 @@ _080ECD40: cmp r0, 0 beq _080ECD74 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r2, _080ECD60 @ =0x00006dad adds r1, r4, r2 movs r0, 0x5 @@ -3036,7 +3036,7 @@ _080ED342: cmp r0, 0 beq _080ED38C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080ED370 @ =sub_80ED4D8 bl sub_80EBDBC b _080ED3CA @@ -3045,12 +3045,12 @@ _080ED36C: .4byte gMain _080ED370: .4byte sub_80ED4D8 _080ED374: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl ShowMapNamePopUpWindow b _080ED3CA _080ED380: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] adds r0, 0x1 b _080ED3C8 @@ -3060,7 +3060,7 @@ _080ED38C: cmp r0, 0 beq _080ED3CA movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080ED3A4 @ =sub_80ECD80 bl sub_80EBDBC b _080ED3CA @@ -3739,7 +3739,7 @@ _080ED91A: beq _080ED970 _080ED948: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_80F5060 bl move_anim_execute @@ -3780,7 +3780,7 @@ _080ED970: bge _080ED9CC _080ED9A2: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_80F5060 bl move_anim_execute @@ -3802,7 +3802,7 @@ _080ED9CC: cmp r0, 0 beq _080ED9F8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80F4FDC bl move_anim_execute ldr r0, _080ED9F4 @ =0x02000000 @@ -3841,7 +3841,7 @@ _080EDA02: b _080EDB7A _080EDA26: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xC1 lsls r0, 2 adds r1, r4, r0 @@ -3861,7 +3861,7 @@ _080EDA44: b _080EDB7A _080EDA50: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r2, 0xC1 lsls r2, 2 adds r1, r5, r2 @@ -4297,7 +4297,7 @@ _080EDDE2: cmp r0, 0 beq _080EDE2C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EDE10 @ =sub_80EDEE4 bl sub_80EBDBC b _080EDE6A @@ -4306,12 +4306,12 @@ _080EDE0C: .4byte gMain _080EDE10: .4byte sub_80EDEE4 _080EDE14: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl ShowMapNamePopUpWindow b _080EDE6A _080EDE20: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] adds r0, 0x1 b _080EDE68 @@ -4321,7 +4321,7 @@ _080EDE2C: cmp r0, 0 beq _080EDE6A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EDE44 @ =sub_80EDE70 bl sub_80EBDBC b _080EDE6A @@ -4653,7 +4653,7 @@ _080EE0CC: cmp r0, 0 beq _080EE104 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl sub_80F6A4C @@ -4681,7 +4681,7 @@ _080EE104: cmp r2, r0 bge _080EE140 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_80F6A4C movs r0, 0xC1 @@ -4698,7 +4698,7 @@ _080EE140: cmp r0, 0 beq _080EE164 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xB bl sub_80EEFBC ldr r0, _080EE160 @ =0x02000000 @@ -4716,7 +4716,7 @@ _080EE164: b _080EE288 _080EE16E: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EE17C @ =sub_80EE294 bl sub_80EBDBC b _080EE288 @@ -4788,7 +4788,7 @@ _080EE1F8: cmp r0, 0x1 bne _080EE224 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80F3B94 ldr r0, _080EE220 @ =0x02000000 movs r5, 0xC1 @@ -4807,7 +4807,7 @@ _080EE224: cmp r0, 0 beq _080EE288 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80F3B94 ldr r0, _080EE24C @ =0x02000000 movs r1, 0xC1 @@ -5241,7 +5241,7 @@ _080EE5B2: cmp r0, 0 beq _080EE608 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EE5E0 @ =sub_80EE658 bl sub_80EBDBC b _080EE652 @@ -5250,7 +5250,7 @@ _080EE5DC: .4byte gMain _080EE5E0: .4byte sub_80EE658 _080EE5E4: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _080EE5F8 @ =0x0000876e adds r0, r5, r1 ldrb r0, [r0] @@ -5260,7 +5260,7 @@ _080EE5E4: _080EE5F8: .4byte 0x0000876e _080EE5FC: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4] adds r0, 0x1 b _080EE650 @@ -5270,7 +5270,7 @@ _080EE608: cmp r0, 0 beq _080EE652 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080EE620 @ =sub_80EE8F4 bl sub_80EBDBC b _080EE652 @@ -5446,7 +5446,7 @@ _080EE780: cmp r0, 0 beq _080EE7B8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl sub_80F708C @@ -5474,7 +5474,7 @@ _080EE7B8: cmp r2, r0 bge _080EE7F8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_80F708C movs r0, 0xC1 @@ -5494,7 +5494,7 @@ _080EE7F8: cmp r0, 0 beq _080EE8E8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_80F4394 bl sub_80F0EC0 ldr r1, _080EE81C @ =0x02000000 @@ -5682,7 +5682,7 @@ sub_80EE96C: @ 80EE96C cmp r4, 0 bne _080EE9A0 movs r0, 0x6F - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 str r4, [sp] @@ -12295,7 +12295,7 @@ _080F1E22: blt _080F1E0E _080F1E38: movs r0, 0x6 - bl PlaySoundEffect + bl PlaySE pop {r4-r6} pop {r0} bx r0 diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index ca860d401..2fbc559c8 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -699,7 +699,7 @@ _0806A9BA: _0806A9CC: strh r0, [r5, 0x4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE b _0806AA58 _0806A9D6: cmp r4, 0x5 @@ -721,7 +721,7 @@ _0806A9D6: ldrh r0, [r5, 0xC] strb r0, [r1, 0x4] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0806AA1C @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -751,7 +751,7 @@ _0806AA24: cmp r0, 0 beq _0806AA58 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r2, [r5, 0x6] ldrb r3, [r5, 0x8] ldrb r0, [r5, 0xA] @@ -1046,7 +1046,7 @@ _0806ACB0: cmp r0, 0 beq _0806ACC4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 bl DestroyTask _0806ACC4: @@ -1246,7 +1246,7 @@ _0806AE5C: ldr r0, _0806AE78 @ =gSystemText_SaveCompleted bl ResetRtcScreen_ShowMessage movs r0, 0x49 - bl PlaySoundEffect + bl PlaySE b _0806AE88 .align 2, 0 _0806AE78: .4byte gSystemText_SaveCompleted @@ -1254,7 +1254,7 @@ _0806AE7C: ldr r0, _0806AECC @ =gSystemText_SaveFailed bl ResetRtcScreen_ShowMessage movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE _0806AE88: movs r0, 0x5 strh r0, [r5] diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index 306eeabc0..a553802e8 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -439,7 +439,7 @@ sub_80C7C94: @ 80C7C94 lsrs r4, r0, 24 _080C7CCA: movs r0, 0x30 - bl PlaySoundEffect + bl PlaySE adds r0, r6, 0 adds r1, r4, 0 bl StartSpriteAffineAnim @@ -462,7 +462,7 @@ _080C7CDA: lsrs r4, r0, 24 _080C7CFA: movs r0, 0x30 - bl PlaySoundEffect + bl PlaySE adds r0, r6, 0 adds r1, r4, 0 bl StartSpriteAffineAnim diff --git a/asm/roulette.s b/asm/roulette.s index e23b87f0d..6382ecf0b 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1332,7 +1332,7 @@ _08115C0C: mov r1, r8 strh r1, [r4, 0xA] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r5, _08115D3C @ =0x020190b8 ldr r1, _08115D40 @ =0x0000ffff adds r0, r5, 0 @@ -1650,7 +1650,7 @@ _08115E6E: cmp r1, 0 beq _08115EB8 movs r0, 0x16 - bl PlaySoundEffect + bl PlaySE b _08115EC2 .align 2, 0 _08115EA8: .4byte gTasks @@ -3302,7 +3302,7 @@ _08116BE4: cmp r0, 0 beq _08116C06 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _08116C06: movs r0, 0 str r0, [r5] diff --git a/asm/secret_base.s b/asm/secret_base.s index bae3befa4..8f2df8396 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -511,7 +511,7 @@ sub_80BC824: @ 80BC824 cmp r0, 0 beq _080BC860 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080BC8B6 @@ -524,7 +524,7 @@ _080BC860: cmp r0, 0 beq _080BC940 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4, 0x4] subs r0, 0x1 b _080BC8A4 @@ -549,7 +549,7 @@ _080BC874: cmp r0, r1 beq _080BC940 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r4, 0x4] adds r0, 0x1 _080BC8A4: @@ -559,7 +559,7 @@ _080BC8A4: b _080BC940 _080BC8AE: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _080BC8B6: bl MoveMenuCursor @@ -574,7 +574,7 @@ _080BC8C2: cmp r0, 0 beq _080BC91C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r1, 0x2 ldrsh r0, [r4, r1] movs r2, 0x4 @@ -613,7 +613,7 @@ _080BC91C: cmp r0, 0 beq _080BC940 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8072DEC movs r0, 0 movs r1, 0 @@ -727,7 +727,7 @@ sub_80BC9E4: @ 80BC9E4 cmp r0, 0 beq _080BCA7C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -745,7 +745,7 @@ _080BCA18: cmp r0, 0x1 beq _080BCA7C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _080BCA7C @@ -756,7 +756,7 @@ _080BCA3A: cmp r0, 0 beq _080BCA68 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _080BCA64 @ =gUnknown_083D13D4 bl GetMenuCursorPos lsls r0, 24 @@ -775,7 +775,7 @@ _080BCA68: cmp r0, 0 beq _080BCA7C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_80BCBF8 _080BCA7C: diff --git a/asm/shop.s b/asm/shop.s index 61144b220..1d0863469 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -953,7 +953,7 @@ _080B3B06: movs r2, 0 bl sub_80B39D0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0xB] ldrb r1, [r4, 0x9] adds r0, r1 @@ -1015,7 +1015,7 @@ sub_80B3B80: @ 80B3B80 adds r0, r5, 0 bl sub_80B79E0 movs r0, 0x5F - bl PlaySoundEffect + bl PlaySE ldr r0, [r5] movs r1, 0 movs r2, 0 @@ -1684,7 +1684,7 @@ _080B4102: b _080B436C _080B411E: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0xB] subs r0, 0x1 strb r0, [r4, 0xB] @@ -1698,7 +1698,7 @@ _080B4138: .4byte gMain _080B413C: .4byte gUnknown_03000708 _080B4140: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _080B41A0 @@ -1718,7 +1718,7 @@ _080B414C: b _080B436C _080B4166: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0xB] adds r0, 0x1 strb r0, [r4, 0xB] @@ -1740,7 +1740,7 @@ _080B4190: b _080B436C _080B4198: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _080B41A0: bl MoveMenuCursor @@ -1756,7 +1756,7 @@ _080B41AC: b _080B4358 _080B41B8: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r6, _080B426C @ =gUnknown_03000708 ldrb r0, [r6, 0xB] ldrb r1, [r6, 0x9] @@ -1935,7 +1935,7 @@ _080B4358: cmp r0, 0 beq _080B436C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE mov r0, r8 bl sub_80B43F0 _080B436C: diff --git a/asm/slot_machine.s b/asm/slot_machine.s index c0439e84b..46af5bc0f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -794,7 +794,7 @@ _08101E9C: movs r0, 0x9 strb r0, [r1] movs r0, 0x5F - bl PlaySoundEffect + bl PlaySE b _08101F1A .align 2, 0 _08101EB8: .4byte 0x02000000 @@ -813,7 +813,7 @@ _08101EC2: cmp r0, 0 beq _08101EEC movs r0, 0x5F - bl PlaySoundEffect + bl PlaySE ldrb r0, [r4, 0x12] bl sub_8103D50 ldrh r0, [r4, 0xC] @@ -1032,7 +1032,7 @@ sub_8102058: @ 8102058 cmp r0, 0 beq _0810207E movs r0, 0x18 - bl PlaySoundEffect + bl PlaySE ldr r4, _0810208C @ =0x02000000 ldrb r0, [r4, 0x18] bl sub_8102E1C @@ -2460,7 +2460,7 @@ sub_8102AD0: @ 8102AD0 cmp r0, 0 beq _08102AF6 movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE _08102AF6: ldr r2, _08102B70 @ =0x02000000 ldrh r0, [r2, 0xE] @@ -2497,7 +2497,7 @@ _08102B22: cmp r0, 0 beq _08102B58 movs r0, 0x15 - bl PlaySoundEffect + bl PlaySE ldr r1, _08102B70 @ =0x02000000 ldrh r0, [r1, 0xE] ldrh r2, [r1, 0xC] @@ -6583,7 +6583,7 @@ sub_81048CC: @ 81048CC ldr r0, _0810493C @ =0x00000187 bl PlayFanfare movs r0, 0xB2 - bl PlaySoundEffect + bl PlaySE pop {r4,r5} pop {r0} bx r0 diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s index c34945bcc..b47229d2b 100644 --- a/asm/sound_check_menu.s +++ b/asm/sound_check_menu.s @@ -2012,7 +2012,7 @@ _080BB104: movs r4, 0x40 negs r4, r4 adds r1, r4, 0 - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning str r4, [r5, 0x1C] b _080BB14C .align 2, 0 @@ -2021,7 +2021,7 @@ _080BB13C: .4byte gUnknown_020387B4 _080BB140: ldrh r0, [r5] movs r1, 0x3F - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning movs r0, 0x3F str r0, [r5, 0x1C] _080BB14C: @@ -2031,7 +2031,7 @@ _080BB14C: b _080BB1C8 _080BB154: ldrh r0, [r5] - bl PlaySoundEffect12WithPanning + bl PlaySE12WithPanning str r4, [r5, 0x18] b _080BB1C8 _080BB15E: diff --git a/asm/trade.s b/asm/trade.s index f13822004..756423ee7 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3021,7 +3021,7 @@ _08049600: cmp r0, r6 beq _0804960C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0804960C: strb r6, [r7] pop {r4-r7} @@ -3143,7 +3143,7 @@ _080496F4: cmp r0, 0 beq _080497B6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r4, _08049750 @ =gUnknown_03004824 ldr r0, [r4] adds r1, r0, 0 @@ -3317,7 +3317,7 @@ sub_8049860: @ 8049860 cmp r0, 0 beq _08049880 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _08049890 @@ -3329,7 +3329,7 @@ _08049880: cmp r0, 0 beq _0804989C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _08049890: bl MoveMenuCursor @@ -3345,7 +3345,7 @@ _0804989C: cmp r0, 0 beq _08049938 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl GetMenuCursorPos lsls r0, 24 lsrs r1, r0, 24 @@ -3415,7 +3415,7 @@ _08049938: cmp r0, 0 beq _0804994A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8049804 _0804994A: add sp, 0x4 @@ -3439,7 +3439,7 @@ sub_8049954: @ 8049954 beq _08049974 _0804996A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8049804 _08049974: pop {r0} @@ -3627,7 +3627,7 @@ sub_8049AC0: @ 8049AC0 cmp r0, 0 beq _08049AE0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _08049AF0 @@ -3639,7 +3639,7 @@ _08049AE0: cmp r0, 0 beq _08049AFC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _08049AF0: bl MoveMenuCursor @@ -3655,7 +3655,7 @@ _08049AFC: cmp r0, 0 beq _08049B64 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl GetMenuCursorPos lsls r0, 24 cmp r0, 0 @@ -3747,7 +3747,7 @@ sub_8049BC0: @ 8049BC0 cmp r0, 0 beq _08049BE0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 b _08049BF0 @@ -3759,7 +3759,7 @@ _08049BE0: cmp r0, 0 beq _08049BFC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 _08049BF0: bl MoveMenuCursor @@ -3775,7 +3775,7 @@ _08049BFC: cmp r0, 0 beq _08049C72 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl GetMenuCursorPos lsls r0, 24 lsrs r5, r0, 24 @@ -3826,7 +3826,7 @@ _08049C72: cmp r0, 0 beq _08049C84 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE bl sub_8049804 _08049C84: pop {r4,r5} @@ -3941,7 +3941,7 @@ sub_8049D44: @ 8049D44 cmp r0, 0 beq _08049D8A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_804A840 movs r0, 0x1 @@ -6388,7 +6388,7 @@ sub_804B058: @ 804B058 cmp r0, 0xA bne _0804B074 movs r0, 0x17 - bl PlaySoundEffect + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0804B074: @@ -6487,7 +6487,7 @@ sub_804B104: @ 804B104 cmp r0, 0xF bne _0804B120 movs r0, 0xCC - bl PlaySoundEffect + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0804B120: @@ -9417,7 +9417,7 @@ _0804CB70: cmp r0, 0 bne _0804CB8E movs r0, 0x2E - bl PlaySoundEffect + bl PlaySE ldr r0, _0804CBC4 @ =gUnknown_03004828 ldr r1, [r0] adds r1, 0xC4 @@ -9700,7 +9700,7 @@ _0804CD94: cmp r0, 0x2 bhi _0804CDDC movs r0, 0x2D - bl PlaySoundEffect + bl PlaySE _0804CDDC: ldr r2, [r6] adds r3, r2, 0 @@ -10120,7 +10120,7 @@ _0804D11A: adds r0, 0x1 strh r0, [r1] movs r0, 0x9F - bl PlaySoundEffect + bl PlaySE b _0804D570 .align 2, 0 _0804D138: .4byte gSprites @@ -10893,7 +10893,7 @@ sub_804D738: @ 804D738 cmp r0, 0x16 bne _0804D760 movs r0, 0x38 - bl PlaySoundEffect + bl PlaySE _0804D760: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -10903,7 +10903,7 @@ _0804D760: cmp r0, 0x2C bne _0804D796 movs r0, 0x8C - bl PlaySoundEffect + bl PlaySE ldr r0, _0804D7A4 @ =sub_804D7AC str r0, [r4, 0x1C] movs r0, 0 @@ -11005,7 +11005,7 @@ sub_804D80C: @ 804D80C movs r0, 0x16 strh r0, [r4, 0x2E] movs r0, 0x38 - bl PlaySoundEffect + bl PlaySE b _0804D88C _0804D83C: movs r1, 0x2E @@ -11013,21 +11013,21 @@ _0804D83C: cmp r0, 0x42 bne _0804D84A movs r0, 0x39 - bl PlaySoundEffect + bl PlaySE _0804D84A: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5C bne _0804D858 movs r0, 0x3A - bl PlaySoundEffect + bl PlaySE _0804D858: movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0x6B bne _0804D866 movs r0, 0x3B - bl PlaySoundEffect + bl PlaySE _0804D866: ldr r1, _0804D894 @ =gTradeBallVerticalVelocityTable movs r2, 0x2E diff --git a/asm/trader.s b/asm/trader.s index 1051ef178..be3627e90 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -320,7 +320,7 @@ sub_8109B7C: @ 8109B7C cmp r0, 0 beq _08109BAC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -334,7 +334,7 @@ _08109BAC: cmp r0, 0 beq _08109BC2 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _08109C3E @@ -344,7 +344,7 @@ _08109BC2: cmp r0, 0 beq _08109C28 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r5, _08109BFC @ =gSpecialVar_0x8005 bl GetMenuCursorPos lsls r0, 24 @@ -389,7 +389,7 @@ _08109C28: cmp r0, 0 beq _08109C3E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r5, 0 movs r1, 0 bl sub_8109B34 diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 90b1b6a8b..a9913b6d0 100644 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -635,7 +635,7 @@ _0813667C: cmp r0, 0 beq _081366AC movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl sub_80F5060 bl move_anim_execute @@ -653,7 +653,7 @@ _081366AC: cmp r0, 0 beq _081366D4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0 bl sub_80F5060 bl move_anim_execute @@ -671,7 +671,7 @@ _081366D4: cmp r0, 0 beq _081366F4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _081366F0 @ =gUnknown_02039304 ldr r0, [r0] adds r0, 0x50 @@ -687,7 +687,7 @@ _081366F4: b _081367FA _081366FE: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _08136728 @ =gUnknown_083DFEC4 ldr r0, [r0] ldr r2, _0813672C @ =0x000087dc diff --git a/include/sound.h b/include/sound.h index a720c82b1..283b2b1f9 100644 --- a/include/sound.h +++ b/include/sound.h @@ -34,10 +34,10 @@ void StopCry(void); bool8 IsCryPlayingOrClearCrySongs(void); bool8 IsCryPlaying(void); void PlayBGM(u16 songNum); -void PlaySoundEffect(u16 songNum); -void PlaySoundEffect12WithPanning(u16 songNum, s8 pan); -void PlaySoundEffect1WithPanning(u16 songNum, s8 pan); -void PlaySoundEffect2WithPanning(u16 songNum, s8 pan); +void PlaySE(u16 songNum); +void PlaySE12WithPanning(u16 songNum, s8 pan); +void PlaySE1WithPanning(u16 songNum, s8 pan); +void PlaySE2WithPanning(u16 songNum, s8 pan); void SE12PanpotControl(s8 pan); bool8 IsSEPlaying(void); bool8 IsBGMPlaying(void); diff --git a/src/battle_anim.c b/src/battle_anim.c index 8ca66f745..bdb34365f 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -673,7 +673,7 @@ static void ScriptCmd_end(void) static void ScriptCmd_playse(void) { gBattleAnimScriptPtr++; - PlaySoundEffect(SCRIPT_READ_16(gBattleAnimScriptPtr)); + PlaySE(SCRIPT_READ_16(gBattleAnimScriptPtr)); gBattleAnimScriptPtr += 2; } @@ -1715,7 +1715,7 @@ static void ScriptCmd_panse_19(void) gBattleAnimScriptPtr++; r4 = SCRIPT_READ_16(gBattleAnimScriptPtr); r0 = SCRIPT_READ_8(gBattleAnimScriptPtr + 2); - PlaySoundEffect12WithPanning(r4, sub_8076F98(r0)); + PlaySE12WithPanning(r4, sub_8076F98(r0)); gBattleAnimScriptPtr += 3; } @@ -1755,7 +1755,7 @@ static void ScriptCmd_panse_1B(void) gTasks[taskId].data[2] = r4; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = panning; - PlaySoundEffect12WithPanning(songNum, panning); + PlaySE12WithPanning(songNum, panning); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1917,7 +1917,7 @@ static void ScriptCmd_panse_26(void) gTasks[taskId].data[2] = r6; gTasks[taskId].data[3] = r10; gTasks[taskId].data[4] = r4; - PlaySoundEffect12WithPanning(r8, r4); + PlaySE12WithPanning(r8, r4); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1949,7 +1949,7 @@ static void ScriptCmd_panse_27(void) gTasks[taskId].data[2] = r4_2; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = r6; - PlaySoundEffect12WithPanning(r9, r6); + PlaySE12WithPanning(r9, r6); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1996,7 +1996,7 @@ static void sub_80774FC(u8 taskId) r1 = gTasks[taskId].data[1]; gTasks[taskId].data[3]--; r4 = gTasks[taskId].data[3]; - PlaySoundEffect12WithPanning(r0, r1); + PlaySE12WithPanning(r0, r1); if (r4 == 0) { DestroyTask(taskId); @@ -2034,7 +2034,7 @@ static void sub_80775CC(u8 taskId) gTasks[taskId].data[2]--; if (r0 <= 0) { - PlaySoundEffect12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); + PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); DestroyTask(taskId); gAnimSoundTaskCount--; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 827ed4ffc..9938c4b54 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1589,7 +1589,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d) for (i = 0; i < 6; i++) gTasks[taskId].data[3 + i] = sp[i]; gTasks[taskId].data[10] = d; - PlaySoundEffect12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_TB_START, 0); return taskId; } #else @@ -2169,7 +2169,7 @@ _08044C62:\n\ strh r6, [r0, 0x1C]\n\ movs r0, 0x72\n\ movs r1, 0\n\ - bl PlaySoundEffect12WithPanning\n\ + bl PlaySE12WithPanning\n\ adds r0, r4, 0\n\ add sp, 0x28\n\ pop {r3-r5}\n\ @@ -2356,9 +2356,9 @@ void sub_804507C(struct Sprite *sprite) if (r3 != 0) pan = -64; if (sprite->data7 != 0) - PlaySoundEffect2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_TB_KARA, pan); else - PlaySoundEffect1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_TB_KON, pan); sprite->callback = SpriteCallbackDummy; } } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 4ee55f0e2..820d16465 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -230,7 +230,7 @@ void SetUpBattlePokemonMenu(u8 a) if (gUnknown_02038473 == 3) { if (GetMonData(&gPlayerParty[sub_806CA38(a)], MON_DATA_IS_EGG)) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { sub_806D5A4(); @@ -239,7 +239,7 @@ void SetUpBattlePokemonMenu(u8 a) } else { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); GetMonNickname(&gPlayerParty[sub_806CA38(a)], gStringVar1); sub_8095050(a, sub_806CA38(a)); SetTaskFuncWithFollowupFunc(a, Task_HandlePopupMenuInput, SetUpBattlePokemonMenu); @@ -247,10 +247,10 @@ void SetUpBattlePokemonMenu(u8 a) break; case 2: if (gUnknown_02038473 == 1) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gUnknown_02038473 == 3) { gUnknown_0202E8F4 = 0; @@ -336,19 +336,19 @@ static void Task_HandlePopupMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(-1); return; } if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(1); return; } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, sBattlePartyMenuActions, @@ -358,7 +358,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); Task_BattlePartyMenuCancel(taskId); return; } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 94f9c5941..511b88c5a 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -245,7 +245,7 @@ static void sub_814640C(u8 taskId) static void sub_8146440(u8 taskId) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_814640C; } @@ -379,7 +379,7 @@ _08146718:\n\ bgt _0814678C\n\ _08146728:\n\ movs r0, 0x5\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ mov r2, r8\n\ ldrb r3, [r2, 0x1]\n\ ldrb r4, [r4, 0xC]\n\ diff --git a/src/bike.c b/src/bike.c index 0c154de9c..d7175b5e0 100644 --- a/src/bike.c +++ b/src/bike.c @@ -617,7 +617,7 @@ static void AcroBikeTransition_80E5920(u8 direction) } } playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); playerMapObj->mapobj_bit_9 = 1; PlayerSetAnimId(sub_80608A4(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 7c6a22547..220e8420c 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -46,7 +46,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, 563); MapGridSetMetatileIdAt(18, 9, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -88,7 +88,7 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } @@ -134,7 +134,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_FLY); ScriptContext2_Disable(); } @@ -159,7 +159,7 @@ void Task_BrailleWait(u8 taskId) if (BrailleWait_CheckButtonPress() != FALSE) { MenuZeroFillScreen(); - PlaySoundEffect(5); + PlaySE(5); data[0] = 2; } else diff --git a/src/cable_club.c b/src/cable_club.c index 1f2c6376a..45fb347f3 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -89,7 +89,7 @@ static void sub_80830E4(u8 taskId) { if (gMain.heldKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); gTasks[(u32) taskId].func = sub_8083188; } @@ -153,7 +153,7 @@ _08083158:\n\ cmp r0, 0\n\ beq _08083178\n\ movs r0, 0x5\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ bl sub_8007F4C\n\ ldr r0, _08083180 @ =gTasks\n\ lsls r1, r6, 2\n\ diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index 301e169ce..21cd643ef 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -59,13 +59,13 @@ static void Task_ProcessMenuInput(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8071F40(gSystemText_ClearingData); gTasks[taskId].func = Task_ClearSaveData; break; case -1: case 1: - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); DestroyTask(taskId); SetMainCallback2(CB2_SoftReset); break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e51ae24b6..c5f2c08e7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -214,7 +214,7 @@ int sub_8068024(struct FieldInput *input) return TRUE; if (input->pressedStartButton) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); sub_8071310(); return TRUE; } @@ -261,7 +261,7 @@ static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) && script != gUnknown_0815F36C && script != gUnknown_0815F43A && script != gUnknown_081A0009) - PlaySoundEffect(5); + PlaySE(5); ScriptContext1_SetupScript(script); return TRUE; @@ -828,7 +828,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySoundEffect(SE_W291); + PlaySE(SE_W291); return TRUE; } } @@ -838,7 +838,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySoundEffect(SE_W291); + PlaySE(SE_W291); return TRUE; } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index c0a71fcf4..6a0fe1dce 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -871,7 +871,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySoundEffect(SE_DANSA); + PlaySE(SE_DANSA); PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8); } @@ -902,31 +902,31 @@ void sub_8059534(u8 a) void sub_805954C(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A5C(a), 1); } void sub_8059570(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A88(a), 2); } void sub_8059594(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060AB4(a), 8); } void sub_80595B8(u8 direction) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060878(direction), 1); } void sub_80595DC(u8 direction) { - PlaySoundEffect(SE_WALL_HIT); + PlaySE(SE_WALL_HIT); PlayerSetAnimId(sub_8060AE0(direction), 2); } @@ -959,7 +959,7 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y))) return; } - PlaySoundEffect(SE_WALL_HIT); + PlaySE(SE_WALL_HIT); } } @@ -1292,7 +1292,7 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) gUnknown_0202FF84[2] = c->elevation; gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority; FieldEffectStart(10); - PlaySoundEffect(SE_W070); + PlaySE(SE_W070); task->data[0]++; } return 0; @@ -1334,7 +1334,7 @@ u8 sub_805A000(struct Task *task, struct MapObject *mapObject) gPlayerAvatar.unk6 = 1; if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) { - PlaySoundEffect(SE_DANSA); + PlaySE(SE_DANSA); FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->mapobj_unk_18)); task->data[1]++; if (task->data[1] > 1) @@ -1370,7 +1370,7 @@ u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject) task->data[1] = mapObject->placeholder18; gPlayerAvatar.unk6 = 1; ScriptContext2_Enable(); - PlaySoundEffect(SE_TK_WARPIN); + PlaySE(SE_TK_WARPIN); return 1; } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 6282ea813..59280b743 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -157,7 +157,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1] = 0; // reset the timer. data[2] = CreateTask(Task_Truck1, 0xA); data[0] = 1; // run the next case. - PlaySoundEffect(SE_TRACK_MOVE); + PlaySE(SE_TRACK_MOVE); } break; case 1: @@ -177,7 +177,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySoundEffect(SE_TRACK_STOP); + PlaySE(SE_TRACK_STOP); } break; case 3: @@ -192,7 +192,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySoundEffect(SE_TRACK_HAIK); + PlaySE(SE_TRACK_HAIK); data[1] = 0; data[0] = 5; } @@ -205,7 +205,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, 528); MapGridSetMetatileIdAt(11, 10, 536); DrawWholeMapView(); - PlaySoundEffect(SE_TRACK_DOOR); + PlaySE(SE_TRACK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 39e438620..77c8752d1 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -122,7 +122,7 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i, j; // not in for loop? - for(i = 0, PlaySoundEffect(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) + for(i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) { y = i - 1 + gUnknown_0203923C.y; for(j = 0; j < 3; j++) @@ -294,7 +294,7 @@ void sub_80A2AB8(void) void sub_80A2B00(void) { - PlaySoundEffect(0x80); + PlaySE(0x80); FieldEffectActiveListRemove(2); EnableBothScriptContexts(); } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index f5372b53b..d0ee712af 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -122,7 +122,7 @@ static void sub_8133D50(u8 taskId) { return; } - PlaySoundEffect(SE_KAIFUKU); + PlaySE(SE_KAIFUKU); EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 8d23a41cb..4e8214b07 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -49,7 +49,7 @@ static void sub_812C01C(void) { u8 taskId; - PlaySoundEffect(0xEC); + PlaySE(0xEC); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); taskId = CreateTask(sub_812C084, 0); gTasks[taskId].data[0] = 0; diff --git a/src/intro.c b/src/intro.c index 00c9894cf..ea6edba3d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1419,7 +1419,7 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[spriteId].invisible = 1; } if (gIntroFrameCounter == 800) - PlaySoundEffect(SE_OP_BASYU); + PlaySE(SE_OP_BASYU); if (gIntroFrameCounter == 850) BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF); if (gIntroFrameCounter == 946) diff --git a/src/item_use.c b/src/item_use.c index 5d0282844..4047ade5c 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -362,7 +362,7 @@ void RunItemfinderResults(u8 taskId) } return; } - PlaySoundEffect(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. + PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; } data[3] = (data[3] + 1) & 0x1F; @@ -943,7 +943,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) void sub_80C9EE4(u8 taskId) { - PlaySoundEffect(2); + PlaySE(2); gTasks[taskId].func = sub_80C9F10; } @@ -1002,7 +1002,7 @@ void sub_80CA098(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySoundEffect(0x75); + PlaySE(0x75); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } } @@ -1095,7 +1095,7 @@ void sub_80CA2BC(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySoundEffect(1); + PlaySE(1); RemoveBagItem(gScriptItemId, 1); DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1); } diff --git a/src/link.c b/src/link.c index d06e71c03..224c0ae1c 100644 --- a/src/link.c +++ b/src/link.c @@ -1262,10 +1262,10 @@ static void CB2_PrintErrorMessage(void) break; case 30: case 60: - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); break; case 90: - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); break; } diff --git a/src/main_menu.c b/src/main_menu.c index c1e43e1a8..50fefc471 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -446,13 +446,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000); gTasks[taskId].func = Task_MainMenuPressedA; } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); REG_WIN0H = WIN_RANGE(0, 240); REG_WIN0V = WIN_RANGE(0, 160); @@ -966,14 +966,14 @@ static void Task_NewGameSpeech16(u8 taskId) { case MALE: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gSaveBlock2.playerGender = MALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; case FEMALE: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gSaveBlock2.playerGender = FEMALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; @@ -1069,19 +1069,19 @@ static void Task_NewGameSpeech21(u8 taskId) case 3: case 4: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); SetPresetPlayerName(selection); gTasks[taskId].func = Task_NewGameSpeech23; break; case 0: //NEW NAME - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 16, 0); gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; @@ -1122,7 +1122,7 @@ static void Task_NewGameSpeech25(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeOut(taskId, 2); @@ -1131,7 +1131,7 @@ static void Task_NewGameSpeech25(u8 taskId) break; case -1: //B button case 1: //NO - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; diff --git a/src/menu.c b/src/menu.c index 84093b9b7..ba98ff057 100644 --- a/src/menu.c +++ b/src/menu.c @@ -52,7 +52,7 @@ const struct MenuAction gMenuYesNoItems[] = void CloseMenu(void) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillScreen(); sub_8064E2C(); ScriptContext2_Disable(); @@ -270,7 +270,7 @@ s8 ProcessMenuInput(void) { if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -285,13 +285,13 @@ s8 ProcessMenuInput(void) if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(-1); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(1); return -2; } @@ -305,7 +305,7 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -321,13 +321,13 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & DPAD_UP) { if (cursorPos != MoveMenuCursorNoWrap(-1)) - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return -2; } else if (gMain.newKeys & DPAD_DOWN) { if (cursorPos != MoveMenuCursorNoWrap(1)) - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return -2; } @@ -520,7 +520,7 @@ s8 sub_80727CC(void) { if (gMenu.menu_field_7) sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return GetMenuCursorPos(); } @@ -533,25 +533,25 @@ s8 sub_80727CC(void) if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-gMenu.width); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(gMenu.width); return -2; } else if (gMain.newKeys & DPAD_LEFT) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-1); return -2; } else if (gMain.newKeys & DPAD_RIGHT) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(1); return -2; } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index c257e7573..97deb348c 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -113,13 +113,13 @@ static void CB2_MysteryEventMenu(void) case 3: if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4) { - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); sub_8072044(gSystemText_LoadEventPressA); gMain.state++; } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -139,7 +139,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -147,7 +147,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -185,7 +185,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -199,7 +199,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -207,7 +207,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -313,7 +313,7 @@ static void CB2_MysteryEventMenu(void) case 14: if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gMain.state++; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 531d12bdd..b14c690e2 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -453,7 +453,7 @@ static bool8 MainState_StartPageSwap(struct Task *task) StartPageSwapAnim(); sub_80B6888(1); sub_80B6460(0, 0, 1); - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); namingScreenData.state = MAIN_STATE_WAIT_PAGE_SWAP; return FALSE; } @@ -607,7 +607,7 @@ static bool8 KeyboardKeyHandler_OK(u8 event) sub_80B6460(2, 1, 0); if (event == KBEVENT_PRESSED_A) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); namingScreenData.state = MAIN_STATE_6; return TRUE; } @@ -1370,7 +1370,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == 0 || var2 == 2) sub_80B6460(1, 0, 1); - PlaySoundEffect(SE_BOWA); + PlaySE(SE_BOWA); } static bool8 sub_80B7004(void) @@ -1391,7 +1391,7 @@ static bool8 sub_80B7004(void) else AddTextCharacter(ch); sub_80B7960(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (r4) { if (GetPreviousTextCaretPosition() == namingScreenData.template->maxChars - 1) @@ -1422,7 +1422,7 @@ static void sub_80B7090(void) // DoInput? sub_80B72A4(r4, r5); } sub_80B7960(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } static bool8 sub_80B7104(void) diff --git a/src/party_menu.c b/src/party_menu.c index aebfd3307..d473eae6d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -109,7 +109,7 @@ void sub_8070088(u8 taskId) gUnknown_0202E8F4 = 1; MenuZeroFillWindowRect(3, 14, 26, 19); - PlaySoundEffect(SE_KAIFUKU); + PlaySE(SE_KAIFUKU); PartyMenuUpdateLevelOrStatus(unk_201C000.pokemon, unk_201C000.var05); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle()][unk_201C000.var05], 9); @@ -214,7 +214,7 @@ _08070134:\n\ movs r3, 0x13\n\ bl MenuZeroFillWindowRect\n\ movs r0, 0x1\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ ldr r0, [r4]\n\ ldrb r1, [r4, 0x5]\n\ bl PartyMenuUpdateLevelOrStatus\n\ diff --git a/src/player_pc.c b/src/player_pc.c index a31ce0803..f0f0709b1 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -129,24 +129,24 @@ void PlayerPCProcessMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(-1); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(1); } else if (gMain.newKeys & 0x1) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId); } } @@ -222,25 +222,25 @@ void ItemStorageMenuProcessInput(u8 var) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(-1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newKeys & 0x1) { - PlaySoundEffect(5); + PlaySE(5); gUnknown_084062C0[GetMenuCursorPos()].func(var); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_084062C0[3].func(var); } } @@ -353,7 +353,7 @@ void sub_813A280(u8 taskId) { if(data[0]) { - PlaySoundEffect(5); + PlaySE(5); data[0] = MoveMenuCursor(-1); var = data[1] + data[0]; if (!data[9]) @@ -372,7 +372,7 @@ void sub_813A280(u8 taskId) { if (!data[1]) return; - PlaySoundEffect(5); + PlaySE(5); data[1]--; sub_813AE0C(taskId); // probably further down @@ -384,7 +384,7 @@ void sub_813A280(u8 taskId) { if(data[0] != data[4] - 1) { - PlaySoundEffect(5); + PlaySE(5); data[0] = MoveMenuCursor(1); var = data[1] + data[0]; @@ -398,7 +398,7 @@ void sub_813A280(u8 taskId) } else if(data[1] + data[0] != data[2]) { - PlaySoundEffect(5); + PlaySE(5); data[1]++; sub_813AE0C(taskId); @@ -412,7 +412,7 @@ void sub_813A280(u8 taskId) { if (data[0] + data[1] != data[2]) { - PlaySoundEffect(5); + PlaySE(5); data[9] = 1; data[8] = data[1] + data[0]; sub_813AD58(0xFFF7); @@ -422,14 +422,14 @@ void sub_813A280(u8 taskId) } else // _0813A3E8 { - PlaySoundEffect(5); // merging? + PlaySE(5); // merging? sub_813AA30(taskId, 0); sub_813AE0C(taskId); } } else if(gMain.newKeys & A_BUTTON) { - PlaySoundEffect(5); + PlaySE(5); if(!data[9]) { if(data[1] + data[0] != data[2]) @@ -449,7 +449,7 @@ void sub_813A280(u8 taskId) } else if(gMain.newKeys & B_BUTTON) { - PlaySoundEffect(5); + PlaySE(5); if(!data[9]) { sub_8072DEC(); @@ -554,7 +554,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & A_BUTTON) // confirm quantity. { - PlaySoundEffect(5); + PlaySE(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); if(!data[6]) @@ -564,7 +564,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & B_BUTTON) // cancel quantity. { - PlaySoundEffect(5); + PlaySE(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); sub_80F98DC(0); sub_80F98DC(1); diff --git a/src/pokedex.c b/src/pokedex.c index 688cae9e9..5ea1f9938 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -361,7 +361,7 @@ void Task_PokedexMainScreen(u8 taskId) 0, 0, 0x10, 0); gSprites[gPokedexView->unk626].callback = sub_808EDB8; gTasks[taskId].func = sub_808CA64; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -370,11 +370,11 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexMainScreenMenu; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; @@ -383,13 +383,13 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->unk614 = gPokedexView->dexMode; gPokedexView->unk618 = gPokedexView->dexOrder; gTasks[taskId].func = sub_808CB8C; - PlaySoundEffect(SE_PC_LOGON); + PlaySE(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else { @@ -444,7 +444,7 @@ void Task_PokedexMainScreenMenu(u8 taskId) case 3: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); break; } } @@ -454,17 +454,17 @@ void Task_PokedexMainScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexMainScreen; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0) { gPokedexView->menuCursorPos--; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2) { gPokedexView->menuCursorPos++; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } } } @@ -562,7 +562,7 @@ void Task_PokedexResultsScreen(u8 taskId) gSprites[gPokedexView->unk626].callback = sub_808EDB8; BeginNormalPaletteFade(~a, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808D118; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -570,7 +570,7 @@ void Task_PokedexResultsScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexResultsScreenMenu; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { @@ -578,13 +578,13 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; - PlaySoundEffect(SE_PC_LOGON); + PlaySE(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else { @@ -635,12 +635,12 @@ void Task_PokedexResultsScreenMenu(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySoundEffect(SE_TRACK_DOOR); + PlaySE(SE_TRACK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); break; } } @@ -650,17 +650,17 @@ void Task_PokedexResultsScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexResultsScreen; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos) { gPokedexView->menuCursorPos--; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3) { gPokedexView->menuCursorPos++; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } } } @@ -1371,7 +1371,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); goto _0808E5A2; } //_0808E53C @@ -1387,7 +1387,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); goto _0808E5A2; _0808E5A2: @@ -1402,7 +1402,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(2, a); //goto _0808E60E sub_808DBE8(2, a, b); - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } //_0808E5E4 else @@ -1412,7 +1412,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(1, a); //_0808E60E sub_808DBE8(1, a, b); - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } //_0808E60E goto _0808E5A2; @@ -1511,7 +1511,7 @@ _0808E4E0:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E52C: .4byte gMain\n\ @@ -1566,7 +1566,7 @@ _0808E55A:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ _0808E5A2:\n\ mov r0, r10\n\ cmp r0, 0\n\ @@ -1623,7 +1623,7 @@ _0808E60E:\n\ adds r2, r4, 0\n\ bl sub_808DBE8\n\ movs r0, 0x6C\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E620: .4byte gPokedexView\n\ @@ -2335,13 +2335,13 @@ void Task_PageScreenProcessInput(u8 taskId) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808F888; - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePageScreen; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else if (gMain.newKeys & A_BUTTON) { @@ -2353,21 +2353,21 @@ void Task_PageScreenProcessInput(u8 taskId) case AREA_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitAreaScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); break; case CRY_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitCryScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); break; case SIZE_SCREEN: if (!gUnknown_0202FFBC->owned) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitSizeScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } break; } @@ -2378,7 +2378,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen--; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } else if (((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2386,7 +2386,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen++; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } @@ -2581,7 +2581,7 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2590,20 +2590,20 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } else if ((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { if (!gUnknown_0202FFBC->owned) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } } @@ -2737,7 +2737,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_8090498; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } //_08090430 else if ((gMain.newKeys & DPAD_LEFT) @@ -2746,7 +2746,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } diff --git a/src/record_mixing.c b/src/record_mixing.c index f8c684161..58722010f 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -94,7 +94,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId) gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 50) { - PlaySoundEffect(SE_W213); + PlaySE(SE_W213); gTasks[taskId].data[0] = 0; } } @@ -128,7 +128,7 @@ void Task_RecordMixing_Main(u8 taskId) case 2: taskData[10] = CreateTask(sub_80BA00C, 10); taskData[TD_STATE] = 3; - PlaySoundEffect(SE_W226); + PlaySE(SE_W226); break; case 3: // wait for sub_80BA00C if (!gTasks[taskData[10]].isActive) @@ -187,14 +187,14 @@ void sub_80B95F0(u8 taskId) { if (players == sub_800820C()) { - PlaySoundEffect(0x15); + PlaySE(0x15); task->data[TD_STATE] = 201; task->data[12] = 0; } } else { - PlaySoundEffect(0x16); + PlaySE(0x16); task->data[TD_STATE] = 301; } break; diff --git a/src/rom4.c b/src/rom4.c index 9ed08aa7f..79ac6d769 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -2203,28 +2203,28 @@ void sub_80557E8(void) void sub_80557F4(void) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); sub_8071310(); ScriptContext2_Enable(); } void sub_8055808(u8 *script) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } void sub_8055824(void) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink); ScriptContext2_Enable(); } void sub_8055840(u8 *script) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } diff --git a/src/rom6.c b/src/rom6.c index a8c489e70..a2b52c9aa 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -150,7 +150,7 @@ int FldEff_RockSmash(void) static void sub_810B58C(void) { - PlaySoundEffect(SE_W088); + PlaySE(SE_W088); FieldEffectActiveListRemove(0x25); EnableBothScriptContexts(); } diff --git a/src/scrcmd.c b/src/scrcmd.c index fa3467d22..136181bd3 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -807,7 +807,7 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx) bool8 ScrCmd_playsfx(struct ScriptContext *ctx) { - PlaySoundEffect(ScriptReadHalfword(ctx)); + PlaySE(ScriptReadHalfword(ctx)); return FALSE; } @@ -1787,7 +1787,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); x += 7; y += 7; - PlaySoundEffect(sub_8058790(x, y)); + PlaySE(sub_8058790(x, y)); FieldAnimateDoorOpen(x, y); return FALSE; } diff --git a/src/script_menu.c b/src/script_menu.c index 38f7f0af5..eba438397 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -672,7 +672,7 @@ void sub_80B52B4(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 127; } else @@ -770,7 +770,7 @@ void task_yes_no_maybe(u8 taskId) return; case -1: case 1: - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 0; break; case 0: @@ -835,7 +835,7 @@ void sub_80B5684(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 127; } else diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 2efc0e2c6..ce62f2abb 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -169,13 +169,13 @@ void sub_80F9C6C(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySoundEffect(5); + PlaySE(5); gUnknown_02038694 = sub_806CA38(var); gSpecialVar_0x8004 = gUnknown_02038694; sub_8123138(var); break; case 2: - PlaySoundEffect(5); + PlaySE(5); gUnknown_02038694 = 0xFF; gSpecialVar_0x8004 = 0xFF; sub_8123138(var); @@ -268,13 +268,13 @@ void sub_80F9E64(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySoundEffect(5); + PlaySE(5); gSpecialVar_0x8004 = sub_806CA38(var); gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]); sub_8123138(var); break; case 2: - PlaySoundEffect(5); + PlaySE(5); gSpecialVar_0x8004 = 0xFF; sub_8123138(var); } diff --git a/src/shop.c b/src/shop.c index 27aa5b335..780dff02a 100644 --- a/src/shop.c +++ b/src/shop.c @@ -106,7 +106,7 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9) { - PlaySoundEffect(0x5); + PlaySE(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(-1); } } @@ -114,13 +114,13 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9 != gUnknown_03000708.unkA) { - PlaySoundEffect(0x5); + PlaySE(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(1); } } else if (gMain.newKeys & 1) { - PlaySoundEffect(0x5); + PlaySE(0x5); if(!gUnknown_03000708.unkC) { gUnknown_083CC6D0[gUnknown_083CC6E8[gUnknown_03000708.unk9]].func(local); @@ -132,7 +132,7 @@ void sub_80B2E38(u8 var) } else if(gMain.newKeys & 2) { - PlaySoundEffect(0x5); + PlaySE(0x5); HandleShopMenuQuit(local); } } diff --git a/src/sound.c b/src/sound.c index 897b13ddf..ed69ca01d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -521,12 +521,12 @@ void PlayBGM(u16 songNum) m4aSongNumStart(songNum); } -void PlaySoundEffect(u16 songNum) +void PlaySE(u16 songNum) { m4aSongNumStart(songNum); } -void PlaySoundEffect12WithPanning(u16 songNum, s8 pan) +void PlaySE12WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); @@ -535,14 +535,14 @@ void PlaySoundEffect12WithPanning(u16 songNum, s8 pan) m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); } -void PlaySoundEffect1WithPanning(u16 songNum, s8 pan) +void PlaySE1WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); } -void PlaySoundEffect2WithPanning(u16 songNum, s8 pan) +void PlaySE2WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE2); diff --git a/src/start_menu.c b/src/start_menu.c index 4c3a0b6e1..37d361c0b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -315,17 +315,17 @@ static u8 StartMenu_InputProcessCallback(void) { if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { if (GetNationalPokedexCount(0) == 0) @@ -566,7 +566,7 @@ static bool8 SaveDialogCheckForTimeoutOrKeypress(void) saveDialogTimer--; if (gMain.heldKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return TRUE; } else if (saveDialogTimer == 0) @@ -702,7 +702,7 @@ static u8 SaveDialogCB_SaveSuccess(void) { if (MenuUpdateWindowText()) { - PlaySoundEffect(SE_SAVE); + PlaySE(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; } return SAVE_IN_PROGRESS; @@ -723,7 +723,7 @@ static u8 SaveDialogCB_SaveError(void) { if (MenuUpdateWindowText()) { - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; } return SAVE_IN_PROGRESS; diff --git a/src/starter_choose.c b/src/starter_choose.c index e133c6212..6ef410d21 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -455,7 +455,7 @@ static void Task_StarterChoose5(u8 taskId) break; case 1: // NO case -1: // B button - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(21, 7, 27, 12); spriteId = gTasks[taskId].tPkmnSpriteId; diff --git a/src/text.c b/src/text.c index ee5089c4d..7be72833a 100644 --- a/src/text.c +++ b/src/text.c @@ -136,7 +136,7 @@ static u8 ExtCtrlCode_Escape(struct Window *); static u8 ExtCtrlCode_Nop2(struct Window *); static u8 ExtCtrlCode_SetCursorY(struct Window *); static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *); -static u8 ExtCtrlCode_PlaySoundEffect(struct Window *); +static u8 ExtCtrlCode_PlaySE(struct Window *); static u8 ExtCtrlCode_Skip(struct Window *); static u8 ExtCtrlCode_SetCursorX(struct Window *); static u8 ExtCtrlCode_SkipTo(struct Window *); @@ -380,7 +380,7 @@ static const ExtCtrlCodeFunc sExtCtrlCodeFuncs[] = ExtCtrlCode_Nop2, ExtCtrlCode_SetCursorY, ExtCtrlCode_ClearWindowTextLines, - ExtCtrlCode_PlaySoundEffect, + ExtCtrlCode_PlaySE, ExtCtrlCode_Skip, ExtCtrlCode_SetCursorX, ExtCtrlCode_SkipTo, @@ -2197,11 +2197,11 @@ static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *win) return 2; } -static u8 ExtCtrlCode_PlaySoundEffect(struct Window *win) +static u8 ExtCtrlCode_PlaySE(struct Window *win) { u16 loByte = win->text[win->textIndex++]; u16 hiByte = win->text[win->textIndex++] << 8; - PlaySoundEffect(loByte | hiByte); + PlaySE(loByte | hiByte); return 2; } @@ -2377,7 +2377,7 @@ static u8 UpdateWindowText(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else { @@ -3187,7 +3187,7 @@ static u8 WaitWithDownArrow(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); TryEraseDownArrow(win); } else diff --git a/src/trainer_card.c b/src/trainer_card.c index 945d469e3..e6ed79c15 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -662,7 +662,7 @@ bool8 sub_80938CC(struct Task *task) bool8 sub_8093918(struct Task *task) { sub_8093A28(); - PlaySoundEffect(SE_CARD); + PlaySE(SE_CARD); ewram0.var_0 += 1; diff --git a/src/wallclock.c b/src/wallclock.c index f8c3fdeea..0f3665c65 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -429,13 +429,13 @@ static void Task_SetClock4(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gTasks[taskId].func = Task_SetClock5; //Move on return; case -1: //B button case 1: //NO sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(23, 8, 29, 13); MenuZeroFillWindowRect(2, 16, 27, 19); gTasks[taskId].func = Task_SetClock2; //Go back and let player adjust clock |