diff --git a/asm/battle_4.s b/asm/battle_4.s index 74251a6cd..32156cb5f 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -14815,7 +14815,7 @@ _0804E0BC: cmp r0, 0 beq _0804E0E4 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 @@ -14833,7 +14833,7 @@ _0804E0E4: cmp r0, 0 bne _0804E10C movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -14848,7 +14848,7 @@ _0804E10C: cmp r0, 0 beq _0804E150 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gBattleCommunication ldrb r4, [r0, 0x1] cmp r4, 0 @@ -14876,7 +14876,7 @@ _0804E150: b _0804E3B8 _0804E15A: movs r0, 0x5 - bl audio_play + bl PlaySE b _0804E20A _0804E162: ldr r0, =gPaletteFade @@ -15178,7 +15178,7 @@ _0804E410: cmp r0, 0 beq _0804E438 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 @@ -15196,7 +15196,7 @@ _0804E438: cmp r0, 0 bne _0804E460 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -15211,7 +15211,7 @@ _0804E460: cmp r0, 0 beq _0804E4C4 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gBattleCommunication ldrb r0, [r0, 0x1] cmp r0, 0 @@ -15252,7 +15252,7 @@ _0804E4C4: cmp r0, 0 beq _0804E4FA movs r0, 0x5 - bl audio_play + bl PlaySE ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -16100,7 +16100,7 @@ _0804EC04: cmp r0, 0 beq _0804EC2A movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r5, 0x1] bl sub_8056BAC movs r0, 0 @@ -16118,7 +16118,7 @@ _0804EC2A: cmp r0, 0 bne _0804EC52 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -16144,7 +16144,7 @@ _0804EC70: beq _0804EC96 _0804EC7A: movs r0, 0x5 - bl audio_play + bl PlaySE str r4, [sp] movs r0, 0x18 movs r1, 0x8 @@ -16560,7 +16560,7 @@ _0804F02C: cmp r0, 0 beq _0804F0F2 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_804F144 movs r0, 0xD movs r1, 0x2 @@ -16573,7 +16573,7 @@ _0804F04C: cmp r0, 0 beq _0804F0F2 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x81 str r0, [sp] movs r0, 0x12 @@ -17934,7 +17934,7 @@ _0804FC60: lsls r0, 16 b _0804FD24 _0804FC6A: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0804FC76 @@ -30854,7 +30854,7 @@ _08056C60: cmp r0, 0 beq _08056C86 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 @@ -30872,7 +30872,7 @@ _08056C86: cmp r0, 0 bne _08056CAE movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -30886,7 +30886,7 @@ _08056CAE: cmp r0, 0 beq _08056CE0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gBattleCommunication ldrb r0, [r1, 0x1] cmp r0, 0 @@ -30906,7 +30906,7 @@ _08056CE0: b _08056E62 _08056CEA: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gBattleCommunication _08056CF2: movs r0, 0x4 diff --git a/asm/battle_7.s b/asm/battle_7.s index 31a4423a7..5f8656664 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -1270,7 +1270,7 @@ mplay_80342A4: @ 805DB90 lsls r0, 24 lsrs r4, r0, 24 movs r5, 0 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0805DBD8 @@ -2884,7 +2884,7 @@ sub_805E990: @ 805E990 cmp r0, 0 bne _0805E9F6 movs r0, 0x5A - bl audio_play + bl PlaySE _0805E9F6: ldr r0, [r7] ldr r1, [r0] diff --git a/asm/battle_814AEAC.s b/asm/battle_814AEAC.s index 76bf73212..fac3e25e8 100644 --- a/asm/battle_814AEAC.s +++ b/asm/battle_814AEAC.s @@ -231,7 +231,7 @@ _0814B05C: _0814B092: movs r6, 0x1 _0814B094: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 beq _0814B0A0 @@ -3929,7 +3929,7 @@ _0814D1F0: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r3, =gBankSpriteIds ldrb r0, [r5] @@ -4854,7 +4854,7 @@ _0814D9A8: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl dp01_tbl4_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_anim.s b/asm/battle_anim.s index fe48b22df..8e9e06cd8 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -785,7 +785,7 @@ _080A3FEC: b _080A401E .pool _080A4004: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _080A403C @@ -877,7 +877,7 @@ ma09_play_sound: @ 80A40CC ldrb r1, [r1, 0x1] lsls r1, 8 orrs r0, r1 - bl audio_play + bl PlaySE ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -3115,7 +3115,7 @@ ma19_08073BC8: @ 80A5354 lsls r1, 24 asrs r1, 24 adds r0, r4, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r0, [r5] adds r0, 0x3 str r0, [r5] @@ -3137,7 +3137,7 @@ ma1A_8073C00: @ 80A538C bl sub_80A5178 lsls r0, 24 asrs r0, 24 - bl sub_80A3870 + bl SE12PanpotControl ldr r0, [r4] adds r0, 0x1 str r0, [r4] @@ -3216,7 +3216,7 @@ ma1B_8073C2C: @ 80A53B8 strh r5, [r1, 0x10] mov r0, r9 adds r1, r5, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =gUnknown_020383FF ldrb r0, [r1] adds r0, 0x1 @@ -3303,7 +3303,7 @@ _080A54E4: _080A54F4: lsls r0, r4, 24 asrs r0, 24 - bl sub_80A3870 + bl SE12PanpotControl _080A54FC: pop {r4-r7} pop {r0} @@ -3360,7 +3360,7 @@ sub_80A5508: @ 80A5508 strh r4, [r1, 0x10] mov r0, r8 adds r1, r4, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =gUnknown_020383FF ldrb r0, [r1] adds r0, 0x1 @@ -3448,7 +3448,7 @@ sub_80A559C: @ 80A559C strh r6, [r1, 0x10] mov r0, r9 adds r1, r6, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =gUnknown_020383FF ldrb r0, [r1] adds r0, 0x1 @@ -3559,7 +3559,7 @@ sub_80A56E4: @ 80A56E4 lsrs r4, 24 lsls r1, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning cmp r4, 0 bne _080A5732 adds r0, r5, 0 @@ -3646,7 +3646,7 @@ sub_80A57B4: @ 80A57B4 ldrh r0, [r2, 0x8] movs r1, 0xA ldrsb r1, [r2, r1] - bl audio_play_and_stuff + bl PlaySE12WithPanning adds r0, r4, 0 bl DestroyTask ldr r1, =gUnknown_020383FF @@ -3724,7 +3724,7 @@ ma20_wait_for_something: @ 80A586C ldrb r5, [r0] cmp r5, 0 bne _080A58B4 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index aa46ce2ee..289452c0d 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -2645,7 +2645,7 @@ _080FFD56: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl audio_play_and_stuff + bl PlaySE12WithPanning _080FFD8A: adds r0, r4, 0 bl sub_80FF9E0 @@ -2663,7 +2663,7 @@ _080FFD8A: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl audio_play_and_stuff + bl PlaySE12WithPanning _080FFDB2: pop {r4,r5} pop {r0} @@ -5783,7 +5783,7 @@ _08101604: lsls r1, 24 asrs r1, 24 movs r0, 0xD2 - bl audio_play_and_stuff + bl PlaySE12WithPanning _0810166A: ldrh r0, [r5, 0x38] movs r1, 0x1 @@ -5980,7 +5980,7 @@ _081017A4: lsls r1, 24 asrs r1, 24 movs r0, 0xC0 - bl audio_play_and_stuff + bl PlaySE12WithPanning b _08101814 .pool _0810180C: @@ -7266,7 +7266,7 @@ sub_81021CC: @ 81021CC lsls r1, 24 asrs r1, 24 movs r0, 0xC2 - bl audio_play_and_stuff + bl PlaySE12WithPanning _0810221E: movs r1, 0 strh r1, [r4, 0x2E] @@ -10609,7 +10609,7 @@ _08103C90: lsls r1, 24 asrs r1, 24 movs r0, 0x9A - bl audio_play_and_stuff + bl PlaySE12WithPanning movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x2 @@ -11240,7 +11240,7 @@ sub_810421C: @ 810421C lsls r1, 24 asrs r1, 24 movs r0, 0xA6 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -13086,7 +13086,7 @@ _081050DC: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl audio_play_and_stuff + bl PlaySE12WithPanning _08105122: ldrh r0, [r4, 0x34] ldrh r2, [r4, 0x36] @@ -22421,7 +22421,7 @@ _08109C82: movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x90 - bl audio_play_and_stuff + bl PlaySE12WithPanning b _08109CAA .pool _08109CA4: @@ -25433,7 +25433,7 @@ _0810B49C: lsls r1, 24 asrs r1, 24 movs r0, 0x76 - bl audio_play_and_stuff + bl PlaySE12WithPanning _0810B4BE: movs r0, 0x12 ldrsh r3, [r4, r0] @@ -35115,7 +35115,7 @@ _081102B8: lsls r1, 24 asrs r1, 24 movs r0, 0xCB - bl audio_play_and_stuff + bl PlaySE12WithPanning adds r0, r5, 0 movs r1, 0x1 bl ChangeSpriteAffineAnim @@ -36823,7 +36823,7 @@ _08111134: lsls r1, 24 asrs r1, 24 movs r0, 0xA2 - bl audio_play_and_stuff + bl PlaySE12WithPanning b _0811120C .pool _08111148: @@ -36907,7 +36907,7 @@ _081111AC: lsls r1, 24 asrs r1, 24 movs r0, 0xAF - bl audio_play_and_stuff + bl PlaySE12WithPanning _081111EA: ldrh r0, [r4, 0x18] subs r0, 0x1 @@ -37526,7 +37526,7 @@ _081116CC: movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0xC4 - bl audio_play_and_stuff + bl PlaySE12WithPanning _081116DE: pop {r4} pop {r0} @@ -37573,7 +37573,7 @@ _0811172E: cmp r0, 0 ble _0811173A movs r0, 0xC4 - bl audio_play + bl PlaySE _0811173A: movs r1, 0x3A ldrsh r0, [r4, r1] @@ -48619,7 +48619,7 @@ _08117280: lsls r1, 24 asrs r1, 24 movs r0, 0xEF - bl audio_play_and_stuff + bl PlaySE12WithPanning b _081172E0 .pool _081172CC: @@ -48630,7 +48630,7 @@ _081172CC: lsls r1, 24 asrs r1, 24 movs r0, 0xF5 - bl audio_play_and_stuff + bl PlaySE12WithPanning _081172E0: add sp, 0x10 pop {r3} diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index f76bcd98a..e6c6af6cb 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -1387,7 +1387,7 @@ sub_8171030: @ 8171030 bne _0817108A movs r0, 0x3D movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r0, =gTasks lsls r4, r5, 2 adds r4, r5 @@ -1627,7 +1627,7 @@ sub_8171240: @ 8171240 cmp r0, 0xB bne _08171272 movs r0, 0x3C - bl audio_play + bl PlaySE _08171272: movs r1, 0x8 ldrsh r0, [r5, r1] @@ -1846,19 +1846,19 @@ _08171434: b _08171452 _0817143A: movs r0, 0x38 - bl audio_play + bl PlaySE b _08171486 _08171442: movs r0, 0x39 - bl audio_play + bl PlaySE b _08171486 _0817144A: movs r0, 0x3A - bl audio_play + bl PlaySE b _08171486 _08171452: movs r0, 0x3B - bl audio_play + bl PlaySE b _08171486 _0817145A: movs r2, 0x38 @@ -1947,7 +1947,7 @@ sub_81714D4: @ 81714D4 ldr r0, =sub_8171520 str r0, [r4, 0x1C] movs r0, 0x17 - bl audio_play + bl PlaySE _08171510: pop {r4,r5} pop {r0} @@ -2280,7 +2280,7 @@ _081717A0: bl StartSpriteAffineAnim _081717A8: movs r0, 0x17 - bl audio_play + bl PlaySE _081717AE: pop {r4-r6} pop {r0} @@ -2344,7 +2344,7 @@ sub_81717F8: @ 81717F8 cmp r1, 0x28 bne _0817183C movs r0, 0xFE - bl audio_play + bl PlaySE ldrb r1, [r6, 0x5] lsrs r1, 4 movs r0, 0x80 @@ -2382,7 +2382,7 @@ _0817185A: bl sub_8072A88 bl m4aMPlayAllStop ldr r0, =0x00000213 - bl audio_play + bl PlaySE b _081718BC .pool _08171880: @@ -3060,7 +3060,7 @@ sub_8171D98: @ 8171D98 strh r1, [r0, 0x10] strh r5, [r0, 0x26] movs r0, 0xF - bl audio_play + bl PlaySE adds r0, r4, 0 pop {r3-r5} mov r8, r3 @@ -5357,7 +5357,7 @@ _08173156: lsls r1, 24 asrs r1, 24 movs r0, 0x66 - bl audio_play_and_stuff + bl PlaySE12WithPanning _08173160: ldr r1, =gSprites adds r0, r4, r5 diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index 89d217b0d..cad82d91f 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -632,7 +632,7 @@ _08064898: ands r0, r1 cmp r0, 0 bne _0806495A - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _0806495A @@ -1212,7 +1212,7 @@ sub_8064DD0: @ 8064DD0 ands r0, r1 cmp r0, 0 bne _08064E2A - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08064E2A @@ -4637,7 +4637,7 @@ _08066C94: strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r1, =gBankSpriteIds ldrb r0, [r5] @@ -5545,7 +5545,7 @@ _0806740C: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl sub_8065068 pop {r4} pop {r0} diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index 707b09c82..f394feb6a 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -683,7 +683,7 @@ _0805F6D0: ands r0, r1 cmp r0, 0 bne _0805F792 - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _0805F792 @@ -1306,7 +1306,7 @@ bx_803AEDC: @ 805FC80 ands r0, r1 cmp r0, 0 bne _0805FCDA - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _0805FCDA @@ -4789,7 +4789,7 @@ _08061BF0: strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r1, =gBankSpriteIds ldrb r0, [r5] @@ -5995,7 +5995,7 @@ _08062600: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl dp01_tbl7_exec_completed pop {r4} pop {r0} diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 729cca18b..d2f90b4bf 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -190,7 +190,7 @@ _080575F0: cmp r0, 0 beq _08057658 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020244AC ldr r0, =gActiveBank ldrb r0, [r0] @@ -245,7 +245,7 @@ _08057658: b _080577E8 _08057674: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -273,7 +273,7 @@ _08057698: b _080577E8 _080576B4: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -317,7 +317,7 @@ _08057700: bne _080577E8 _0805771A: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -388,7 +388,7 @@ _0805775A: bl bag_add_item _080577B2: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 movs r1, 0xC _080577BC: @@ -494,7 +494,7 @@ _080578A0: cmp r0, 0 beq _08057910 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r1, =gBankSpriteIds ldr r4, =gUnknown_03005D74 @@ -535,7 +535,7 @@ _08057910: bls _0805798C _0805791E: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r1, =gBankSpriteIds ldr r5, =gUnknown_03005D74 @@ -579,7 +579,7 @@ _0805798C: b _08057AB0 _08057996: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r1, =gBankSpriteIds ldr r3, =gUnknown_03005D74 @@ -707,7 +707,7 @@ _08057AB0: b _08057BC8 _08057ABA: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r1, =gBankSpriteIds ldr r3, =gUnknown_03005D74 @@ -889,7 +889,7 @@ _08057C48: b _08057E04 _08057C58: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020244B0 ldr r0, =gActiveBank ldrb r0, [r0] @@ -1081,7 +1081,7 @@ _08057E04: bls _08057E30 _08057E14: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =0x0000ffff _08057E1C: movs r0, 0x1 @@ -1197,7 +1197,7 @@ _08057ED4: _08057F08: strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r7] adds r0, r4 ldrb r0, [r0] @@ -1277,7 +1277,7 @@ sub_8057FBC: @ 8057FBC cmp r0, 0 beq _08057FD6 movs r0, 0x5 - bl audio_play + bl PlaySE movs r7, 0x1 _08057FD6: ldrh r1, [r4, 0x2E] @@ -1286,7 +1286,7 @@ _08057FD6: cmp r0, 0 beq _08057FF8 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_02022E14 movs r0, 0 strh r0, [r1] @@ -1320,7 +1320,7 @@ _08057FF8: eors r0, r2 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1357,7 +1357,7 @@ _08058038: eors r0, r6 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1388,7 +1388,7 @@ _08058086: eors r0, r2 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1425,7 +1425,7 @@ _080580C8: eors r0, r6 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1456,7 +1456,7 @@ sub_8058138: @ 8058138 b _08058500 _08058152: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020244B0 mov r10, r0 ldr r1, =gActiveBank @@ -1911,7 +1911,7 @@ _08058500: cmp r0, 0 beq _08058554 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03005D74 ldrb r0, [r0] bl battle_menu_cursor_related @@ -2033,7 +2033,7 @@ _0805862C: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020244B0 ldr r0, =gActiveBank ldrb r0, [r0] @@ -2086,7 +2086,7 @@ _080586AA: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020244B0 ldr r0, =gActiveBank ldrb r0, [r0] @@ -2768,7 +2768,7 @@ _08058C82: ands r0, r1 cmp r0, 0 bne _08058D32 - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08058D32 @@ -3112,7 +3112,7 @@ sub_8058FC0: @ 8058FC0 ands r0, r1 cmp r0, 0 bne _0805900E - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _0805900E @@ -3232,7 +3232,7 @@ c3_0802FDF4: @ 8059100 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08059122 @@ -3559,7 +3559,7 @@ sub_8059330: @ 8059330 mov r0, r10 bl sub_807294C movs r0, 0x21 - bl audio_play + bl PlaySE ldr r0, =sub_8059400 mov r1, r8 str r0, [r1] @@ -4242,7 +4242,7 @@ sub_80599D4: @ 80599D4 cmp r0, 0 beq _08059A02 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] bl sub_8056BAC movs r0, 0 @@ -4261,7 +4261,7 @@ _08059A02: cmp r0, 0 bne _08059A2C movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] bl sub_8056BAC movs r0, 0x1 @@ -4283,7 +4283,7 @@ _08059A2C: movs r3, 0xD bl sub_8056A3C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03005D74 ldrb r0, [r0] cmp r0, 0 @@ -4316,7 +4316,7 @@ _08059A7A: movs r3, 0xD bl sub_8056A3C movs r0, 0x5 - bl audio_play + bl PlaySE bl PlayerBufferExecCompleted _08059AA0: add sp, 0x4 @@ -7949,7 +7949,7 @@ _0805BB0C: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r3, =gBankSpriteIds ldrb r0, [r5] @@ -9575,7 +9575,7 @@ _0805C980: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl PlayerBufferExecCompleted pop {r4} pop {r0} diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 5ead5d0ac..b6b0e3bf5 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -3806,7 +3806,7 @@ _08147DE4: ldrsh r0, [r4, r1] bl sub_814849C movs r0, 0x68 - bl audio_play + bl PlaySE ldr r1, [r5] ldrb r0, [r1] adds r0, 0x1 diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 83a0b477a..e7c47bb9d 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -655,7 +655,7 @@ sub_807FD08: @ 807FD08 b _0807FD56 _0807FD50: movs r0, 0x74 - bl audio_play + bl PlaySE _0807FD56: ldrh r0, [r4, 0x30] strh r0, [r4, 0x20] @@ -1413,7 +1413,7 @@ _080803E0: adds r0, r2 bl sub_8082CB4 movs r0, 0x2B - bl audio_play + bl PlaySE movs r0, 0x2 bl ShowBg b _08080546 @@ -1477,7 +1477,7 @@ _08080408: movs r0, 0 str r0, [r1] movs r0, 0x34 - bl audio_play + bl PlaySE bl sub_808074C bl sub_80807BC _0808048C: @@ -2325,7 +2325,7 @@ _08080BB0: strb r0, [r1] bl sub_808074C movs r0, 0x2B - bl audio_play + bl PlaySE ldr r0, [r4] movs r5, 0xA0 lsls r5, 1 @@ -2394,7 +2394,7 @@ _08080BDC: movs r1, 0 str r1, [r0] movs r0, 0x34 - bl audio_play + bl PlaySE bl sub_80807BC _08080C5C: ldr r0, [r4] @@ -2540,7 +2540,7 @@ _08080D9E: adds r0, r4, 0 bl PlayBGM movs r0, 0x35 - bl audio_play + bl PlaySE bl sub_807F738 _08080DAE: ldr r0, =gUnknown_020322A4 @@ -3139,7 +3139,7 @@ sub_8081288: @ 8081288 ldr r0, =sub_8082F9C str r0, [r4] movs r0, 0x28 - bl audio_play + bl PlaySE b _08081358 .pool _08081314: @@ -3154,7 +3154,7 @@ _08081314: movs r1, 0 bl StartSpriteAnim movs r0, 0x1F - bl audio_play + bl PlaySE b _08081358 .pool _0808133C: @@ -3169,7 +3169,7 @@ _0808133C: movs r1, 0x1 bl StartSpriteAnim movs r0, 0x20 - bl audio_play + bl PlaySE _08081358: bl sub_8082E84 pop {r3} @@ -5664,7 +5664,7 @@ _080827FC: cmp r0, 0 beq _080828DC movs r0, 0x37 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020322A4 ldr r1, [r0] b _080828BC @@ -6634,7 +6634,7 @@ _0808302C: adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0x38 - bl audio_play + bl PlaySE b _080830B2 _0808304C: ldrh r0, [r4, 0x32] @@ -6725,7 +6725,7 @@ _080830DC: adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0x15 - bl audio_play + bl PlaySE b _08083130 _080830FC: ldrh r0, [r4, 0x32] @@ -8303,7 +8303,7 @@ _08083DE2: cmp r0, 0 beq _08083E12 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020322A4 ldr r1, [r0] _08083DF8: diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 3c5bd2a97..e9c4da4cb 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -1102,7 +1102,7 @@ sub_81785D0: @ 81785D0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -1238,7 +1238,7 @@ _081786F6: movs r0, 0 strh r0, [r4] movs r0, 0x5 - bl audio_play + bl PlaySE lsls r0, r7, 24 asrs r0, 24 bl sub_8178728 diff --git a/asm/bike.s b/asm/bike.s index 9c64bcf4e..8a064bcf2 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -1164,7 +1164,7 @@ _08119A58: ldr r0, =gUnknown_02037350 adds r4, r0 movs r0, 0x22 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] movs r1, 0x2 orrs r0, r1 diff --git a/asm/braille_puzzles.s b/asm/braille_puzzles.s index c83572471..c35251674 100644 --- a/asm/braille_puzzles.s +++ b/asm/braille_puzzles.s @@ -70,7 +70,7 @@ sub_817963C: @ 817963C bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x14 - bl audio_play + bl PlaySE ldr r0, =0x000008af bl FlagSet bl script_env_2_disable @@ -322,7 +322,7 @@ sub_8179860: @ 8179860 bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x14 - bl audio_play + bl PlaySE movs r0, 0x8B lsls r0, 4 bl FlagSet @@ -418,7 +418,7 @@ sub_8179944: @ 8179944 bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x14 - bl audio_play + bl PlaySE ldr r0, =0x000008b2 bl FlagSet bl script_env_2_disable diff --git a/asm/cable_club.s b/asm/cable_club.s index e374d858b..df254cfe0 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -432,7 +432,7 @@ sub_80B2688: @ 80B2688 cmp r0, 0x1 bne _080B26EC movs r0, 0x15 - bl audio_play + bl PlaySE ldr r0, =gUnknown_082780B3 bl box_related_two__3 ldr r0, =sub_80B270C @@ -440,7 +440,7 @@ sub_80B2688: @ 80B2688 .pool _080B26EC: movs r0, 0x16 - bl audio_play + bl PlaySE ldr r0, =gUnknown_08278131 bl box_related_two__3 ldr r0, =sub_80B2918 @@ -614,7 +614,7 @@ _080B2878: cmp r0, 0 beq _080B2898 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_800A620 ldr r0, =gTasks lsls r1, r6, 2 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 35daffe4c..ab0d54a03 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -107,7 +107,7 @@ _0817AD68: .pool _0817ADA0: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl DestroyTask ldr r0, =sub_817AFD4 diff --git a/asm/contest.s b/asm/contest.s index b0e92a716..4fffaf316 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1184,7 +1184,7 @@ _080D814C: strh r0, [r4, 0xA] movs r0, 0x61 movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -1473,7 +1473,7 @@ sub_80D8424: @ 80D8424 bne _080D8482 _080D843C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039F25 ldrb r0, [r0] bl sub_80DBCA8 @@ -1703,7 +1703,7 @@ _080D8634: cmp r5, 0 beq _080D8670 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gTasks lsls r1, r7, 2 adds r1, r7 @@ -1734,7 +1734,7 @@ _080D868C: b _080D87FA _080D868E: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_80DC490 ldr r0, =gStringVar1 @@ -1827,7 +1827,7 @@ _080D8756: cmp r6, 0x1 bls _080D87FA movs r0, 0x5 - bl audio_play + bl PlaySE b _080D87FA .pool _080D879C: @@ -1874,7 +1874,7 @@ _080D87C4: cmp r6, 0x1 bls _080D87FA movs r0, 0x5 - bl audio_play + bl PlaySE _080D87FA: pop {r4-r7} pop {r0} @@ -3135,7 +3135,7 @@ _080D935C: cmp r0, 0 beq _080D936E movs r0, 0x63 - bl audio_play + bl PlaySE _080D936E: ldr r0, =gTasks mov r2, r8 @@ -3481,12 +3481,12 @@ _080D961E: cmp r0, 0 beq _080D963C movs r0, 0x63 - bl audio_play + bl PlaySE b _080D9642 .pool _080D963C: movs r0, 0x64 - bl audio_play + bl PlaySE _080D9642: ldr r5, =gUnknown_02039F34 ldr r0, [r5] @@ -4235,7 +4235,7 @@ _080D9CB0: _080D9CC2: bl sub_80DDE0C movs r0, 0xDF - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_80DDCDC b _080D9D6C @@ -5411,7 +5411,7 @@ sub_80DA6B4: @ 80DA6B4 strh r0, [r1] movs r0, 0x62 movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 @@ -7314,7 +7314,7 @@ _080DB648: beq _080DB688 movs r0, 0x26 _080DB672: - bl audio_play + bl PlaySE mov r1, r9 ldr r0, [r1] ldr r1, [r0, 0x4] @@ -8890,7 +8890,7 @@ _080DC226: cmp r3, 0 ble _080DC284 movs r0, 0x60 - bl audio_play + bl PlaySE ldr r4, =gMPlay_SE1 adds r0, r4, 0 bl m4aMPlayImmInit @@ -8904,7 +8904,7 @@ _080DC226: .pool _080DC284: movs r0, 0x16 - bl audio_play + bl PlaySE _080DC28A: mov r2, r10 cmp r2, 0 @@ -10124,12 +10124,12 @@ sub_80DCBE8: @ 80DCBE8 cmp r3, 0 bne _080DCC70 movs r0, 0x65 - bl audio_play + bl PlaySE b _080DCC76 .pool _080DCC70: movs r0, 0x2 - bl audio_play + bl PlaySE _080DCC76: pop {r3,r4} mov r8, r3 @@ -11542,7 +11542,7 @@ _080DD76C: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x20 - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD79C: @@ -11562,7 +11562,7 @@ _080DD79C: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x1F - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD7D0: @@ -11582,7 +11582,7 @@ _080DD7D0: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x1F - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD804: @@ -11602,7 +11602,7 @@ _080DD804: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD838: @@ -11622,7 +11622,7 @@ _080DD838: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD86C: @@ -11642,7 +11642,7 @@ _080DD86C: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD8A0: @@ -11662,7 +11662,7 @@ _080DD8A0: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0xC3 - bl audio_play + bl PlaySE b _080DD8F8 .pool _080DD8D4: @@ -11682,7 +11682,7 @@ _080DD8D4: orrs r0, r2 strh r0, [r1, 0x4] movs r0, 0x2D - bl audio_play + bl PlaySE _080DD8F8: adds r2, r4, 0 ldr r4, =gSprites @@ -12768,7 +12768,7 @@ _080DE146: adds r3, r5, 0 bl sub_80DECB8 movs r0, 0x63 - bl audio_play + bl PlaySE _080DE1CA: adds r7, 0x1 cmp r7, 0x3 @@ -13059,7 +13059,7 @@ sub_80DE424: @ 80DE424 strh r0, [r1] movs r0, 0x62 movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -13336,7 +13336,7 @@ _080DE680: strh r0, [r4, 0xC] movs r0, 0x61 movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r0, =sub_80DE5C0 str r0, [r4] _080DE690: diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 9d23a072a..c8040485d 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -3303,7 +3303,7 @@ _080F741C: mov r0, r8 bl DestroyTask movs r0, 0x18 - bl audio_play + bl PlaySE _080F74A4: add sp, 0x10 pop {r3,r4} @@ -4288,13 +4288,13 @@ _080F7C7E: cmp r1, 0 beq _080F7C8A movs r0, 0x16 - bl audio_play + bl PlaySE _080F7C8A: ldr r3, [sp, 0x8] cmp r3, 0 beq _080F7C96 movs r0, 0x15 - bl audio_play + bl PlaySE _080F7C96: add sp, 0x14 pop {r3-r5} diff --git a/asm/decoration.s b/asm/decoration.s index 69391fb67..7b8a2ca84 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -260,7 +260,7 @@ sub_8126B80: @ 8126B80 cmp r1, r0 beq _08126BF4 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_085A6B48 ldr r0, =gUnknown_0203A150 ldrb r0, [r0] @@ -286,7 +286,7 @@ _08126BD8: .pool _08126BF4: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_8126D6C _08126C00: @@ -849,13 +849,13 @@ _081270BC: bne _081270CE _081270C0: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_812719C b _081270DE _081270CE: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203A173 strb r4, [r0] adds r0, r5, 0 @@ -1284,7 +1284,7 @@ sub_8127480: @ 8127480 cmp r1, 0x1 beq _08127492 movs r0, 0x5 - bl audio_play + bl PlaySE _08127492: adds r0, r4, 0 bl sub_8127744 @@ -1527,7 +1527,7 @@ sub_812764C: @ 812764C .pool _081276A4: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085A6B78 movs r2, 0x16 ldrsh r1, [r5, r2] @@ -1541,7 +1541,7 @@ _081276A4: .pool _081276C4: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203A172 strb r4, [r0] bl sub_8127554 @@ -3846,7 +3846,7 @@ sub_8128950: @ 8128950 .pool _081289A4: movs r0, 0x20 - bl audio_play + bl PlaySE ldr r4, =gStringVar4 ldr r1, =gUnknown_085EA8A6 adds r0, r4, 0 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 0cc2eba1d..1911741fb 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -209,7 +209,7 @@ _0811A3B6: cmp r6, 0 beq _0811A41C movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl sub_811C158 ldrh r0, [r5] @@ -2189,7 +2189,7 @@ sub_811B368: @ 811B368 .pool _0811B388: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0 _0811B390: pop {r1} @@ -2211,7 +2211,7 @@ sub_811B394: @ 811B394 cmp r5, 0 beq _0811B3BC movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0 b _0811B3DC _0811B3BC: diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 9bf95de13..322b20c9d 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -1212,7 +1212,7 @@ _08071E54: cmp r0, 0xF bne _08071E84 movs r0, 0x17 - bl audio_play + bl PlaySE adds r0, r4, 0 movs r1, 0x1 bl StartSpriteAnim @@ -1264,7 +1264,7 @@ _08071EBC: cmp r0, 0xF bne _08071EE8 movs r0, 0x17 - bl audio_play + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1337,7 +1337,7 @@ _08071F5C: cmp r0, 0xF bne _08071F90 movs r0, 0x17 - bl audio_play + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1349,7 +1349,7 @@ _08071F90: cmp r0, 0x1E bne _08071F9E movs r0, 0x17 - bl audio_play + bl PlaySE _08071F9E: pop {r4,r5} pop {r0} @@ -1422,7 +1422,7 @@ _08072004: cmp r4, 0 bne _08072032 movs r0, 0x71 - bl audio_play + 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 28c823e76..df64857c7 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -624,7 +624,7 @@ sub_817BEC4: @ 817BEC4 ldr r0, =sub_817BF14 str r0, [r5] movs r0, 0x8C - bl audio_play + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -749,7 +749,7 @@ sub_817BFCC: @ 817BFCC ldr r1, =sub_817C000 str r1, [r0] movs r0, 0xB7 - bl audio_play + bl PlaySE pop {r4} pop {r0} bx r0 @@ -843,7 +843,7 @@ sub_817C080: @ 817C080 ldr r1, =sub_817C0B4 str r1, [r0] movs r0, 0x66 - bl audio_play + bl PlaySE pop {r4} pop {r0} bx r0 @@ -980,7 +980,7 @@ sub_817C174: @ 817C174 ldr r0, =sub_817C1D4 str r0, [r5] movs r0, 0xCA - bl audio_play + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -1127,7 +1127,7 @@ sub_817C2B0: @ 817C2B0 ldr r0, =sub_817C310 str r0, [r5] movs r0, 0xCA - bl audio_play + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 85d346cb7..fb2ba7262 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1375,7 +1375,7 @@ _0813E740: _0813E752: movs r0, 0xBC lsls r0, 1 - bl audio_play + bl PlaySE ldr r0, =gTasks mov r2, r8 adds r1, r2, r7 @@ -1384,7 +1384,7 @@ _0813E752: b _0813EC52 .pool _0813E770: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -1558,7 +1558,7 @@ _0813E8EC: bl _0813F1A4 _0813E902: movs r0, 0x21 - bl audio_play + bl PlaySE mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1566,7 +1566,7 @@ _0813E902: b _0813EC52 .pool _0813E918: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813E926 @@ -1614,7 +1614,7 @@ _0813E974: b _0813EB92 .pool _0813E990: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0813E99E @@ -1886,7 +1886,7 @@ _0813EC10: beq _0813EC1E b _0813F1A4 _0813EC1E: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813EC2A @@ -1922,7 +1922,7 @@ _0813EC6C: beq _0813EC7A b _0813F1A4 _0813EC7A: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813EC86 @@ -1985,7 +1985,7 @@ _0813ECFC: beq _0813ED0A b _0813F1A4 _0813ED0A: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813ED16 @@ -2015,7 +2015,7 @@ _0813ED48: beq _0813ED56 b _0813F1A4 _0813ED56: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813ED62 @@ -2042,7 +2042,7 @@ _0813ED90: lsls r0, 16 cmp r0, 0 bne _0813EDCE - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813EDCE @@ -2072,7 +2072,7 @@ _0813EDCE: beq _0813EDDC b _0813F1A4 _0813EDDC: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -2115,7 +2115,7 @@ _0813EE34: cmp r0, 0 beq _0813EE5C movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 @@ -2133,7 +2133,7 @@ _0813EE5C: cmp r0, 0 bne _0813EE84 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -2154,7 +2154,7 @@ _0813EE84: movs r3, 0xD bl sub_8056A3C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gBattleCommunication ldrb r2, [r0, 0x1] cmp r2, 0 @@ -2204,7 +2204,7 @@ _0813EF00: movs r3, 0xD bl sub_8056A3C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gTasks mov r2, r8 adds r0, r2, r7 @@ -2359,7 +2359,7 @@ _0813F090: beq _0813F09E b _0813F1A4 _0813F09E: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813F0AA @@ -2386,7 +2386,7 @@ _0813F0D8: lsls r0, 16 cmp r0, 0 bne _0813F1A4 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813F1A4 @@ -2451,7 +2451,7 @@ _0813F180: lsls r0, 16 cmp r0, 0 bne _0813F1A4 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813F1A4 @@ -2566,7 +2566,7 @@ _0813F294: b _0813F6F2 .pool _0813F2AC: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0813F2BA @@ -2576,7 +2576,7 @@ _0813F2BA: bl m4aSongNumStop movs r0, 0xBC lsls r0, 1 - bl audio_play + bl PlaySE ldr r1, =gTasks lsls r0, r7, 2 adds r0, r7 @@ -2585,7 +2585,7 @@ _0813F2BA: b _0813F6B4 .pool _0813F2DC: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -2766,11 +2766,11 @@ _0813F474: bl _0813FCC4 _0813F48A: movs r0, 0x21 - bl audio_play + bl PlaySE b _0813F6AC .pool _0813F498: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813F4A6 @@ -2797,7 +2797,7 @@ _0813F4A6: b _0813F6F2 .pool _0813F4E4: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0813F4F2 @@ -3053,7 +3053,7 @@ _0813F748: beq _0813F756 b _0813FCC4 _0813F756: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813F762 @@ -3154,7 +3154,7 @@ _0813F838: beq _0813F846 b _0813FCC4 _0813F846: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813F852 @@ -3185,7 +3185,7 @@ _0813F884: beq _0813F892 b _0813FCC4 _0813F892: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813F89E @@ -3213,7 +3213,7 @@ _0813F8CC: lsls r0, 16 cmp r0, 0 bne _0813F90C - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813F90C @@ -3244,7 +3244,7 @@ _0813F90C: beq _0813F91A b _0813FCC4 _0813F91A: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -3503,7 +3503,7 @@ _0813FBA4: beq _0813FBB2 b _0813FCC4 _0813FBB2: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0813FBBE @@ -3531,7 +3531,7 @@ _0813FBEC: lsls r0, 16 cmp r0, 0 bne _0813FCC4 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813FCC4 @@ -3599,7 +3599,7 @@ _0813FCA0: lsls r0, 16 cmp r0, 0 bne _0813FCC4 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _0813FCC4 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 5a50ed284..89e77d5d1 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -325,7 +325,7 @@ _0809C13A: cmp r0, 0 beq _0809C15C movs r0, 0x6 - bl audio_play + bl PlaySE bl sub_809FA9C _0809C14E: movs r0, 0x1 @@ -453,7 +453,7 @@ _0809C214: cmp r4, r0 beq _0809C244 movs r0, 0x5 - bl audio_play + bl PlaySE _0809C244: adds r0, r4, 0 bl script_env_1_execute_new_script @@ -2361,7 +2361,7 @@ _0809D1C8: bl walkrun_find_lowest_active_bit_in_bitfield bl sp13E_warp_to_last_warp movs r0, 0xE9 - bl audio_play + bl PlaySE movs r0, 0x1 b _0809D1E2 _0809D1E0: diff --git a/asm/field_effect.s b/asm/field_effect.s index c06f6da69..08efc480b 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1368,7 +1368,7 @@ _080B64F4: subs r0, 0x1 strh r0, [r4, 0x3A] movs r0, 0x17 - bl audio_play + bl PlaySE _080B6550: movs r1, 0x3A ldrsh r0, [r4, r1] @@ -2294,7 +2294,7 @@ sub_80B6C90: @ 80B6C90 ands r0, r2 strb r0, [r1, 0x1] movs r0, 0x2B - bl audio_play + bl PlaySE ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -2378,7 +2378,7 @@ _080B6D84: cmp r0, 0 blt _080B6DA8 movs r0, 0xD6 - bl audio_play + bl PlaySE ldrb r0, [r6] movs r1, 0x8 orrs r0, r1 @@ -2591,7 +2591,7 @@ _080B6F0A: strh r0, [r5, 0x8] _080B6F38: movs r0, 0x50 - bl audio_play + bl PlaySE _080B6F3E: movs r0, 0 pop {r4,r5} @@ -3555,7 +3555,7 @@ sub_80B76B8: @ 80B76B8 movs r0, 0x32 bl FieldEffectStart movs r0, 0xB2 - bl audio_play + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -3891,7 +3891,7 @@ sub_80B7968: @ 80B7968 strb r0, [r4, 0x1] bl CameraObjectReset1 movs r0, 0xAF - bl audio_play + bl PlaySE movs r0, 0x4 bl sub_8093514 adds r1, r0, 0 @@ -4127,7 +4127,7 @@ _080B7B6C: adds r0, r4, 0 bl FieldObjectSetSpecialAnim movs r0, 0x27 - bl audio_play + bl PlaySE _080B7B8C: movs r0, 0 pop {r4-r6} @@ -4747,7 +4747,7 @@ _080B8080: movs r0, 0x1 strh r0, [r4, 0xE] movs r0, 0x2D - bl audio_play + bl PlaySE _080B80AE: add sp, 0x8 pop {r4,r5} @@ -5010,7 +5010,7 @@ sub_80B8280: @ 80B8280 lsrs r0, 24 strh r0, [r6, 0x26] movs r0, 0x2D - bl audio_play + bl PlaySE _080B82F6: pop {r4-r6} pop {r0} @@ -6708,7 +6708,7 @@ sub_80B90CC: @ 80B90CC ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x9E - bl audio_play + bl PlaySE adds r0, r4, 0 pop {r4} pop {r1} @@ -7002,7 +7002,7 @@ _080B9362: adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x9E - bl audio_play + bl PlaySE ldrb r0, [r4, 0xA] bl sub_80B9524 _080B9380: @@ -8096,7 +8096,7 @@ sub_80B9C28: @ 80B9C28 lsls r4, 24 lsrs r4, 24 movs r0, 0x58 - bl audio_play + bl PlaySE strh r4, [r5, 0xA] ldrh r0, [r5, 0x2] adds r0, 0x1 @@ -8151,7 +8151,7 @@ sub_80B9C54: @ 80B9C54 adds r0, r4, 0 bl sub_80B9D24 movs r0, 0x57 - bl audio_play + bl PlaySE ldrb r0, [r7, 0xA] bl sub_80B9BD0 movs r0, 0 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index c4047b7e8..fc2a8682a 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -1840,7 +1840,7 @@ sub_8154CEC: @ 8154CEC subs r0, 0x4 strh r0, [r3, 0x26] movs r0, 0x46 - bl audio_play + bl PlaySE _08154D76: movs r0, 0 pop {r4-r6} @@ -2179,7 +2179,7 @@ _08154FFC: cmp r0, 0 bne _08155046 movs r0, 0x46 - bl audio_play + bl PlaySE _08155046: add sp, 0x4 pop {r4,r5} diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 3f0dfb676..7706be947 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -1987,7 +1987,7 @@ PlayerJumpLedge: @ 808B840 lsls r4, 24 lsrs r4, 24 movs r0, 0xA - bl audio_play + bl PlaySE adds r0, r4, 0 bl GetJumpLedgeAnimId lsls r0, 24 @@ -2082,7 +2082,7 @@ sub_808B8F0: @ 808B8F0 lsls r4, 24 lsrs r4, 24 movs r0, 0x22 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_80936CC lsls r0, 24 @@ -2101,7 +2101,7 @@ sub_808B914: @ 808B914 lsls r4, 24 lsrs r4, 24 movs r0, 0x22 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_80936F8 lsls r0, 24 @@ -2120,7 +2120,7 @@ sub_808B938: @ 808B938 lsls r4, 24 lsrs r4, 24 movs r0, 0x22 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_8093724 lsls r0, 24 @@ -2139,7 +2139,7 @@ sub_808B95C: @ 808B95C lsls r4, 24 lsrs r4, 24 movs r0, 0x22 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_80934E8 lsls r0, 24 @@ -2158,7 +2158,7 @@ sub_808B980: @ 808B980 lsls r4, 24 lsrs r4, 24 movs r0, 0x7 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_8093750 lsls r0, 24 @@ -2261,7 +2261,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC bne _0808BA54 _0808BA4E: movs r0, 0x7 - bl audio_play + bl PlaySE _0808BA54: add sp, 0x4 pop {r4} @@ -3540,7 +3540,7 @@ _0808C3F0: movs r0, 0xA bl FieldEffectStart movs r0, 0xD6 - bl audio_play + bl PlaySE ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] @@ -3653,7 +3653,7 @@ sub_808C544: @ 808C544 cmp r0, 0 beq _0808C5A0 movs r0, 0xA - bl audio_play + bl PlaySE ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -3754,7 +3754,7 @@ sub_808C61C: @ 808C61C strb r0, [r1, 0x6] bl script_env_2_enable movs r0, 0x2D - bl audio_play + bl PlaySE movs r0, 0x1 pop {r1} bx r1 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 7368eed85..0425a504d 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -697,7 +697,7 @@ _0809DDAE: cmp r0, 0 beq _0809DE1E movs r0, 0x46 - bl audio_play + bl PlaySE b _0809DE1E _0809DDDC: ldrh r0, [r4, 0xC] @@ -973,7 +973,7 @@ _0809DFF4: bne _0809E008 _0809E002: movs r0, 0x47 - bl audio_play + bl PlaySE _0809E008: cmp r7, 0 beq _0809E044 @@ -1373,7 +1373,7 @@ _0809E306: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x2A - bl audio_play + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -1418,7 +1418,7 @@ _0809E370: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x29 - bl audio_play + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 85c3c1d05..7038c8b76 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -725,7 +725,7 @@ sub_80FA18C: @ 80FA18C push {r4,lr} adds r4, r0, 0 movs r0, 0x83 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =sub_80FA1A8 @@ -890,7 +890,7 @@ sub_80FA2D8: @ 80FA2D8 push {r4,lr} adds r4, r0, 0 movs r0, 0x9B - bl audio_play + bl PlaySE ldr r0, =gUnknown_02038C08 ldr r1, [r0, 0x1C] adds r2, r4, 0 @@ -1033,7 +1033,7 @@ sub_80FA3FC: @ 80FA3FC push {r4,lr} adds r4, r0, 0 movs r0, 0xA9 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =sub_80FA418 @@ -1219,7 +1219,7 @@ sub_80FA57C: @ 80FA57C adds r1, r4, 0 bl GetXYCoordsOneStepInFrontOfPlayer movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =0x00004054 bl VarGet lsls r0, 16 @@ -1385,19 +1385,19 @@ _080FA6C8: b _080FA6F6 _080FA6D8: movs r0, 0x4A - bl audio_play + bl PlaySE b _080FA6F6 _080FA6E0: movs r0, 0x4B - bl audio_play + bl PlaySE b _080FA6F6 _080FA6E8: movs r0, 0x4C - bl audio_play + bl PlaySE b _080FA6F6 _080FA6F0: movs r0, 0x4E - bl audio_play + bl PlaySE _080FA6F6: pop {r0} bx r0 @@ -1425,7 +1425,7 @@ sub_80FA704: @ 80FA704 lsls r4, 16 lsrs r4, 16 movs r0, 0x4D - bl audio_play + bl PlaySE lsls r5, 16 asrs r5, 16 lsls r4, 16 @@ -1625,35 +1625,35 @@ _080FA830: .4byte _080FA958 _080FA920: movs r0, 0x3E - bl audio_play + bl PlaySE b _080FA95E _080FA928: movs r0, 0x3F - bl audio_play + bl PlaySE b _080FA95E _080FA930: movs r0, 0x40 - bl audio_play + bl PlaySE b _080FA95E _080FA938: movs r0, 0x41 - bl audio_play + bl PlaySE b _080FA95E _080FA940: movs r0, 0x42 - bl audio_play + bl PlaySE b _080FA95E _080FA948: movs r0, 0x43 - bl audio_play + bl PlaySE b _080FA95E _080FA950: movs r0, 0x44 - bl audio_play + bl PlaySE b _080FA95E _080FA958: movs r0, 0x45 - bl audio_play + bl PlaySE _080FA95E: adds r0, r4, 0 bl DestroyTask @@ -1704,7 +1704,7 @@ sub_80FA9A4: @ 80FA9A4 cmp r0, 0x8 bne _080FA9BC movs r0, 0xC3 - bl audio_play + bl PlaySE _080FA9BC: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -1929,7 +1929,7 @@ door_restore_tilemap: @ 80FABA4 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x83 - bl audio_play + bl PlaySE ldr r4, =gUnknown_02038C08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -2266,7 +2266,7 @@ _080FAEA2: overworld_posion_effect: @ 80FAEA8 push {lr} movs r0, 0x4F - bl audio_play + bl PlaySE ldr r0, =task50_overworld_posion_effect movs r1, 0x50 bl CreateTask diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index f89858fd1..40b3f6608 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -559,7 +559,7 @@ _08173A16: .pool _08173A34: movs r0, 0x37 - bl audio_play + bl PlaySE ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -961,7 +961,7 @@ _08173D74: movs r1, 0xF bl sub_8174A38 movs r0, 0x69 - bl audio_play + bl PlaySE ldr r1, =gTasks mov r2, r8 adds r0, r2, r4 @@ -2015,7 +2015,7 @@ _0817466C: lsls r1, 1 cmp r0, r1 beq _081746E6 - bl sub_80A369C + bl StopCryAndClearCrySongs ldrh r0, [r4, 0x8] lsls r0, 23 lsrs r0, 23 @@ -2109,11 +2109,11 @@ _081747A4: b _08174884 .pool _081747B8: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 beq _081747D2 - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gMPlay_BGM ldr r1, =0x0000ffff movs r2, 0x80 @@ -2129,11 +2129,11 @@ _081747E4: ands r0, r2 cmp r0, 0 beq _08174828 - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 beq _08174806 - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gMPlay_BGM ldr r1, =0x0000ffff movs r2, 0x80 diff --git a/asm/intro.s b/asm/intro.s index b1387911d..71b97da03 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -4104,7 +4104,7 @@ _0816EFB6: lsls r4, 24 lsrs r4, 24 movs r0, 0x67 - bl audio_play + bl PlaySE ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 diff --git a/asm/item_use.s b/asm/item_use.s index 22a9204da..cd4d097ed 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -659,7 +659,7 @@ _080FD584: .pool _080FD5AC: movs r0, 0x48 - bl audio_play + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -1919,7 +1919,7 @@ sub_80FDF90: @ 80FDF90 lsls r4, 24 lsrs r4, 24 movs r0, 0x2 - bl audio_play + bl PlaySE ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -2101,7 +2101,7 @@ sub_80FE124: @ 80FE124 movs r0, 0 strh r0, [r1, 0x10] movs r0, 0x2F - bl audio_play + bl PlaySE adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 @@ -2120,7 +2120,7 @@ sub_80FE164: @ 80FE164 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _080FE1C2 @@ -2176,7 +2176,7 @@ sub_80FE1D0: @ 80FE1D0 cmp r0, 0x7 ble _080FE226 movs r0, 0x75 - bl audio_play + bl PlaySE bl InBattlePyramid lsls r0, 24 cmp r0, 0 @@ -2449,7 +2449,7 @@ sub_80FE440: @ 80FE440 cmp r0, 0x7 ble _080FE4AC movs r0, 0x1 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CE7C ldrh r0, [r4] movs r1, 0x1 diff --git a/asm/link.s b/asm/link.s index 1ff4d46f8..d43b048d2 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3612,7 +3612,7 @@ _0800B1F2: .pool _0800B20C: movs r0, 0x16 - bl audio_play + bl PlaySE b _0800B260 _0800B214: ldr r0, =gLinkVSyncDisabled @@ -3663,7 +3663,7 @@ _0800B260: cmp r2, 0 beq _0800B2C2 movs r0, 0x15 - bl audio_play + bl PlaySE movs r0, 0 strb r0, [r4] ldr r1, =gUnknown_02022B00 @@ -19218,7 +19218,7 @@ sub_801320C: @ 801320C b _08013270 _08013228: movs r0, 0x2 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x12] bl sub_81AE70C ldr r0, =gStringVar2 @@ -19765,7 +19765,7 @@ _080136D8: b _08013A72 _080136EA: movs r0, 0x2 - bl audio_play + bl PlaySE b _08013A72 _080136F2: ldrb r0, [r6, 0xE] @@ -19817,12 +19817,12 @@ _08013744: _08013756: strb r0, [r6, 0x8] movs r0, 0x6E - bl audio_play + bl PlaySE b _08013B82 .pool _08013768: movs r0, 0x7 - bl audio_play + bl PlaySE b _08013B82 _08013770: ldr r0, =gMain @@ -20435,7 +20435,7 @@ _08013D28: cmp r0, 0x1 bne _08013D3A movs r0, 0x2 - bl audio_play + bl PlaySE _08013D3A: ldr r0, =gTasks lsls r1, r5, 2 @@ -22542,7 +22542,7 @@ _080150B8: cmp r2, 0x1 bne _080150CE movs r0, 0x2 - bl audio_play + bl PlaySE _080150CE: ldrb r0, [r7, 0xE] bl sub_81AE70C @@ -22600,14 +22600,14 @@ _080150D6: adds r0, r4, 0 bl sub_8011FC8 movs r0, 0x6E - bl audio_play + bl PlaySE movs r0, 0x4 strb r0, [r7, 0x8] b _080152A0 .pool _08015160: movs r0, 0x7 - bl audio_play + bl PlaySE b _080152A0 _08015168: ldr r0, =gMain @@ -22905,7 +22905,7 @@ _08015420: cmp r0, 0x1 bne _08015436 movs r0, 0x2 - bl audio_play + bl PlaySE _08015436: ldrb r0, [r5, 0x13] cmp r0, 0 @@ -22961,13 +22961,13 @@ _08015452: adds r0, r4, 0 bl sub_8011FC8 movs r0, 0x6E - bl audio_play + bl PlaySE movs r0, 0x4 strb r0, [r5, 0x8] b _080154D4 _080154B4: movs r0, 0x16 - bl audio_play + bl PlaySE movs r0, 0xA strb r0, [r5, 0x8] b _080154D4 @@ -23497,7 +23497,7 @@ _080159A6: movs r2, 0x1 bl sub_8011090 movs r0, 0x2 - bl audio_play + bl PlaySE ldr r0, =gStringVar1 ldr r1, =gSaveBlock2Ptr ldr r1, [r1] @@ -23551,7 +23551,7 @@ _08015A1A: cmp r0, 0 beq _08015A4C movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80181CC movs r0, 0x18 bl _08016876 @@ -23565,7 +23565,7 @@ _08015A4C: movs r2, 0x1 bl sub_8011090 movs r0, 0x2 - bl audio_play + bl PlaySE bl sub_80181CC ldr r0, =gStringVar1 ldr r1, =gSaveBlock2Ptr @@ -23591,7 +23591,7 @@ _08015A96: b _08015AD0 _08015A9C: movs r0, 0x2 - bl audio_play + bl PlaySE _08015AA2: adds r0, r6, 0 bl sub_801A274 @@ -24223,7 +24223,7 @@ _0801609E: .pool _080160AC: movs r0, 0x49 - bl audio_play + bl PlaySE bl sub_800EF7C movs r0, 0 movs r1, 0xC @@ -26464,7 +26464,7 @@ _08017368: b _080173A0 _08017396: movs r0, 0x7 - bl audio_play + bl PlaySE _0801739C: movs r0, 0x1 negs r0, r0 @@ -32991,7 +32991,7 @@ _0801A7F8: beq _0801A836 _0801A80C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gTasks ldr r0, =gUnknown_03000DAC ldr r0, [r0] @@ -40158,7 +40158,7 @@ _0801E1B4: cmp r0, 0 beq _0801E23A movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _0801E23A @@ -41276,7 +41276,7 @@ _0801EB40: cmp r0, 0 bne _0801EBC2 movs r0, 0x37 - bl audio_play + bl PlaySE bl sav2_gender2_inplace_and_xFE ldr r0, =gUnknown_02022C84 ldr r1, [r0] @@ -46941,11 +46941,11 @@ _080218A6: cmp r3, 0x1 bne _080218B4 movs r0, 0x4E - bl audio_play + bl PlaySE b _080218BA _080218B4: movs r0, 0x4D - bl audio_play + bl PlaySE _080218BA: ldr r4, [sp, 0xC] ldrb r0, [r4] @@ -49907,7 +49907,7 @@ _080230E8: ands r0, r2 strb r0, [r1] movs r0, 0x3D - bl audio_play + bl PlaySE b _080231A8 .pool _08023120: @@ -49964,7 +49964,7 @@ _08023184: cmp r0, 0 beq _080231AE movs r0, 0x2B - bl audio_play + bl PlaySE movs r0, 0xB movs r1, 0x1 movs r2, 0 @@ -50034,7 +50034,7 @@ _080231E4: adds r1, r4, r2 strb r0, [r1] movs r0, 0xD6 - bl audio_play + bl PlaySE b _080232DC .pool _0802321C: @@ -51113,7 +51113,7 @@ _08023A64: movs r0, 0x8 strh r0, [r4, 0x12] movs r0, 0xD6 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 ldr r2, =0x000003ff @@ -51296,7 +51296,7 @@ _08023BE2: movs r0, 0x9 strh r0, [r5, 0x12] movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0x8 @@ -51907,7 +51907,7 @@ _080240AE: cmp r0, 0 beq _0802412A movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_802222C b _08024124 @@ -55685,7 +55685,7 @@ sub_8025F48: @ 8025F48 ldrb r0, [r0] cmp r0, 0 bne _08025F88 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -55712,7 +55712,7 @@ _08025F88: movs r0, 0x1F bl m4aSongNumStop movs r0, 0x1F - bl audio_play + bl PlaySE ldr r0, [r6] movs r2, 0xA2 lsls r2, 1 @@ -55731,12 +55731,12 @@ _08025FB8: ldrb r0, [r0] cmp r0, 0 bne _08025FEA - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _08025FEA movs r0, 0x16 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_80284CC ldr r0, [r6] @@ -55843,7 +55843,7 @@ _0802609C: movs r0, 0x1F bl m4aSongNumStop movs r0, 0x1F - bl audio_play + bl PlaySE ldr r0, [r6] movs r3, 0xA2 lsls r3, 1 @@ -55862,12 +55862,12 @@ _080260CC: ldrb r0, [r0] cmp r0, 0 bne _080260FE - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _080260FE movs r0, 0x16 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_80284CC ldr r0, [r6] @@ -55907,7 +55907,7 @@ _08026106: adds r0, r1, r4 ldrb r0, [r0] adds r0, 0x4A - bl audio_play + bl PlaySE ldr r0, [r5] movs r1, 0xA4 lsls r1, 1 @@ -56736,7 +56736,7 @@ _08026762: adds r0, r5 ldrb r0, [r0] adds r0, 0x4A - bl audio_play + bl PlaySE _080267AC: mov r0, r8 ldr r1, [r0] @@ -58567,7 +58567,7 @@ _080275CA: movs r1, 0x6 strb r1, [r0] movs r0, 0xD4 - bl audio_play + bl PlaySE b _08027600 .pool _080275E8: @@ -60655,7 +60655,7 @@ _080285CC: cmp r4, 0 beq _080285F0 movs r0, 0xD4 - bl audio_play + bl PlaySE _080285F0: movs r1, 0x30 ldrsh r0, [r5, r1] @@ -61004,7 +61004,7 @@ _08028870: strh r1, [r0] movs r0, 0x24 str r3, [sp] - bl audio_play + bl PlaySE ldr r3, [sp] _08028896: mov r7, r9 @@ -63305,7 +63305,7 @@ _08029BDE: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_8028C30 b _08029F88 @@ -63421,7 +63421,7 @@ _08029D06: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8027748 ldr r1, =0x00000bb7 cmp r0, r1 @@ -63655,7 +63655,7 @@ _08029F5C: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl audio_play + bl PlaySE _08029F88: ldr r1, [r4] _08029F8A: @@ -63967,7 +63967,7 @@ _0802A1DC: cmp r2, 0 beq _0802A294 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r7] ldr r3, =0x00003020 adds r1, r0, r3 @@ -63983,7 +63983,7 @@ _0802A294: cmp r0, 0 beq _0802A2CC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r7] ldr r2, =0x00003020 adds r1, r0, r2 @@ -64013,7 +64013,7 @@ _0802A2CC: cmp r0, 0 beq _0802A35E movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r7] ldr r3, =0x00003020 adds r0, r3 @@ -67891,7 +67891,7 @@ sub_802C1DC: @ 802C1DC lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl audio_play + bl PlaySE ldr r0, [r4] adds r0, 0x4D strb r5, [r0] @@ -68066,7 +68066,7 @@ _0802C360: beq _0802C378 movs r0, 0x83 lsls r0, 1 - bl audio_play + bl PlaySE b _0802C386 .pool _0802C378: @@ -68075,7 +68075,7 @@ _0802C378: cmp r6, 0 beq _0802C386 movs r0, 0xA - bl audio_play + bl PlaySE _0802C386: add sp, 0x4 pop {r3-r5} @@ -69458,7 +69458,7 @@ sub_802CDD4: @ 802CDD4 b _0802CE3C _0802CDE6: movs r0, 0x22 - bl audio_play + bl PlaySE strh r4, [r5, 0x30] ldrh r0, [r5, 0x2E] adds r0, 0x1 @@ -72942,7 +72942,7 @@ _0802E998: strb r0, [r2] _0802E9A6: movs r0, 0x38 - bl audio_play + bl PlaySE ldrh r1, [r6, 0x32] lsls r1, 24 lsrs r1, 24 @@ -72951,7 +72951,7 @@ _0802E9A6: b _0802EA44 _0802E9BA: movs r0, 0x15 - bl audio_play + bl PlaySE ldrh r1, [r6, 0x32] lsls r1, 24 lsrs r1, 24 @@ -73036,7 +73036,7 @@ sub_802EA50: @ 802EA50 ldr r5, =gTasks + 0x8 adds r6, r4, r5 movs r0, 0x38 - bl audio_play + bl PlaySE ldr r2, =gSprites movs r0, 0x1A ldrsh r1, [r6, r0] @@ -73351,7 +73351,7 @@ _0802ECF6: cmp r0, 0 bne _0802ED04 movs r0, 0x39 - bl audio_play + bl PlaySE _0802ED04: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -73582,7 +73582,7 @@ _0802EEA0: cmp r0, 0 blt _0802EF46 movs r0, 0x39 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r5, 0x26] ldrh r0, [r4] @@ -73598,7 +73598,7 @@ _0802EEC8: cmp r0, 0x7F ble _0802EEE6 movs r0, 0x39 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2] ldrh r0, [r4] @@ -73624,7 +73624,7 @@ _0802EEFC: cmp r0, 0x7F ble _0802EF1A movs r0, 0x39 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2] ldrh r0, [r4] diff --git a/asm/main_menu.s b/asm/main_menu.s index b90b1b45e..71030bc9d 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -1085,7 +1085,7 @@ HandleMainMenuInput: @ 80300E0 cmp r0, 0 beq _08030130 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80093CC movs r0, 0x1 negs r0, r0 @@ -1109,7 +1109,7 @@ _08030130: cmp r6, 0 beq _08030178 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -1720,7 +1720,7 @@ _08030664: cmp r1, 0 beq _08030688 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -2638,7 +2638,7 @@ task_new_game_prof_birch_speech_13: @ 8030E38 b _08030E76 _08030E52: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gSaveBlock2Ptr ldr r0, [r0] strb r4, [r0, 0x8] @@ -3043,7 +3043,7 @@ _080311A8: b _08031210 _080311AE: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r0, =gTasks lsls r4, r5, 2 @@ -3075,7 +3075,7 @@ _080311AE: .pool _080311FC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gTasks lsls r1, r5, 2 adds r1, r5 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 68ecd4776..f01fc8569 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -295,7 +295,7 @@ _08121FFC: b _08122028 _08122002: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203A138 ldr r1, [r0] adds r0, r4, 0 @@ -304,7 +304,7 @@ _08122002: .pool _08122018: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203A138 ldr r1, [r0, 0x4] adds r0, r4, 0 @@ -395,7 +395,7 @@ _081220B6: cmp r1, r0 beq _081220C6 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 b _081220C8 _081220C6: diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 115b8883a..7c927399f 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -346,7 +346,7 @@ sub_811FBA4: @ 811FBA4 cmp r5, 0 beq _0811FBDC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203A124 ldr r1, [r2] ldrb r0, [r1, 0x5] @@ -368,7 +368,7 @@ _0811FBDC: cmp r4, 0 beq _0811FC0C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203A124 ldr r1, [r2] ldrb r0, [r1, 0x5] @@ -388,7 +388,7 @@ _0811FC0C: cmp r0, 0 beq _0811FC68 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203A124 ldr r0, [r2] movs r1, 0x5 @@ -436,7 +436,7 @@ _0811FC68: cmp r0, 0 beq _0811FC64 movs r0, 0x5 - bl audio_play + bl PlaySE _0811FC76: movs r0, 0 _0811FC78: diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 746af20d8..125f9c71b 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -255,7 +255,7 @@ _08178B8E: b _08178D00 _08178B98: movs r0, 0x15 - bl audio_play + bl PlaySE ldr r1, =gUnknown_085EE788 movs r0, 0x1 str r0, [sp] @@ -294,7 +294,7 @@ _08178BDC: cmp r0, 0 beq _08178C38 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_800A620 movs r0, 0x1 movs r1, 0x1 @@ -326,7 +326,7 @@ _08178C38: b _08178E58 _08178C42: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80097E8 movs r0, 0x87 lsls r0, 3 @@ -415,7 +415,7 @@ _08178D00: b _08178E58 _08178D0E: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80097E8 movs r2, 0x87 lsls r2, 3 @@ -526,7 +526,7 @@ _08178E0C: cmp r0, 0 beq _08178E58 movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 59ad02869..b385fc444 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -972,7 +972,7 @@ sub_80E3640: @ 80E3640 movs r2, 0x1 bl sub_80E3948 movs r0, 0x6 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039F94 ldr r0, [r0] ldr r1, =0x00001e10 @@ -2877,7 +2877,7 @@ sub_80E45A4: @ 80E45A4 b _080E45D2 _080E45BE: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039F94 ldr r0, [r0] ldr r1, =0x00001e10 @@ -3577,7 +3577,7 @@ _080E4B38: bl sub_80E3948 _080E4B42: movs r0, 0x17 - bl audio_play + bl PlaySE pop {r4-r6} pop {r0} bx r0 @@ -3606,7 +3606,7 @@ sub_80E4B54: @ 80E4B54 movs r0, 0x3 bl CopyBgTilemapBufferToVram movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80E4AB4 lsls r0, 24 lsrs r0, 24 diff --git a/asm/player_pc.s b/asm/player_pc.s index 57340cbfc..10c8e6e6a 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -210,7 +210,7 @@ _0816AFC4: cmp r5, r0 bne _0816B014 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x8] movs r1, 0 bl sub_8198070 @@ -504,7 +504,7 @@ sub_816B248: @ 816B248 cmp r4, r0 beq _0816B2B4 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085DFEDC lsls r1, r4, 3 adds r0, 0x4 @@ -529,7 +529,7 @@ _0816B298: .pool _0816B2B4: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl sub_816B4A4 _0816B2C0: @@ -1033,7 +1033,7 @@ sub_816B674: @ 816B674 .pool _0816B6D4: movs r0, 0x5 - bl audio_play + bl PlaySE mov r1, r8 ldrb r0, [r1, 0x9] bl RemoveScrollIndicatorArrowPair @@ -1042,7 +1042,7 @@ _0816B6D4: b _0816B71E _0816B6EA: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81D1D04 movs r0, 0x1 @@ -1192,13 +1192,13 @@ sub_816B82C: @ 816B82C cmp r4, r0 bne _0816B858 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_816BBD4 b _0816B86E _0816B858: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085DFF04 lsls r1, r4, 3 adds r0, 0x4 @@ -1398,7 +1398,7 @@ _0816B9FC: b _0816BA10 _0816BA04: movs r0, 0x5 - bl audio_play + bl PlaySE _0816BA0A: adds r0, r4, 0 bl sub_816BAAC @@ -1864,7 +1864,7 @@ sub_816BDDC: @ 816BDDC cmp r1, 0x1 beq _0816BDEE movs r0, 0x5 - bl audio_play + bl PlaySE _0816BDEE: ldr r0, =gUnknown_0203BCC4 ldr r0, [r0] @@ -2485,7 +2485,7 @@ sub_816C30C: @ 816C30C cmp r1, r0 beq _0816C39E movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_816C450 b _0816C39E @@ -2509,13 +2509,13 @@ _0816C35C: .pool _0816C384: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_816C400 b _0816C39E _0816C392: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_816C71C _0816C39E: @@ -2771,7 +2771,7 @@ sub_816C5A0: @ 816C5A0 lsls r0, 16 lsrs r6, r0, 16 movs r0, 0x5 - bl audio_play + bl PlaySE mov r2, r8 ldrb r0, [r2, 0xA] adds r1, r4, 0x2 @@ -3073,7 +3073,7 @@ _0816C888: cmp r0, 0 beq _0816C8BC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x4 bl sub_816BCC4 movs r3, 0x6 @@ -3094,7 +3094,7 @@ _0816C8BC: cmp r0, 0 beq _0816C8EC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x4 bl sub_816BCC4 mov r1, r8 diff --git a/asm/pokedex.s b/asm/pokedex.s index 5f3ff8b0d..134966f54 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -673,7 +673,7 @@ _080BB8A4: ldr r1, =sub_80BBA78 str r1, [r0] movs r0, 0x5 - bl audio_play + bl PlaySE b _080BBA06 .pool _080BB8FC: @@ -684,7 +684,7 @@ _080BB8FC: cmp r1, 0 beq _080BB9A0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 str r4, [sp] @@ -736,7 +736,7 @@ _080BB8FC: str r0, [r3] movs r0, 0x2 _080BB976: - bl audio_play + bl PlaySE bl sub_80BC890 b _080BBA06 .pool @@ -760,7 +760,7 @@ _080BB9A0: ldr r1, =sub_80BBDE8 str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE b _080BBA06 .pool _080BB9D8: @@ -931,7 +931,7 @@ _080BBB34: ldr r1, =sub_80BBDE8 str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE _080BBB58: ldr r2, =gMain ldrh r1, [r2, 0x2E] @@ -972,7 +972,7 @@ _080BBB98: strh r0, [r1] _080BBBB6: movs r0, 0x5 - bl audio_play + bl PlaySE b _080BBBE8 .pool _080BBBC4: @@ -992,7 +992,7 @@ _080BBBC4: adds r0, 0x1 strh r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE _080BBBE8: add sp, 0x4 pop {r4-r7} @@ -1399,7 +1399,7 @@ _080BBF70: ldr r1, =sub_80BC0F8 str r1, [r0] movs r0, 0x5 - bl audio_play + bl PlaySE b _080BC08A .pool _080BBFC8: @@ -1435,7 +1435,7 @@ _080BBFC8: str r0, [r1] movs r0, 0x2 _080BC00A: - bl audio_play + bl PlaySE bl sub_80BC890 b _080BC08A .pool @@ -1459,7 +1459,7 @@ _080BC024: ldr r1, =sub_80BC3DC str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE b _080BC08A .pool _080BC05C: @@ -1640,7 +1640,7 @@ _080BC1E4: ldr r1, =sub_80BC3DC str r1, [r0] movs r0, 0x34 - bl audio_play + bl PlaySE b _080BC238 .pool _080BC214: @@ -1659,7 +1659,7 @@ _080BC214: ldr r1, =sub_80BC47C str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE _080BC238: ldr r2, =gMain ldrh r1, [r2, 0x2E] @@ -1700,7 +1700,7 @@ _080BC278: strh r0, [r1] _080BC296: movs r0, 0x5 - bl audio_play + bl PlaySE b _080BC2C8 .pool _080BC2A4: @@ -1720,7 +1720,7 @@ _080BC2A4: adds r0, 0x1 strh r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE _080BC2C8: add sp, 0x4 pop {r4-r6} @@ -4079,7 +4079,7 @@ _080BD734: adds r2, r4, 0 bl sub_80BCE84 movs r0, 0x6C - bl audio_play + bl PlaySE b _080BD81A .pool _080BD74C: @@ -4124,7 +4124,7 @@ _080BD75E: movs r1, 0xE bl sub_80BD2B4 movs r0, 0x6D - bl audio_play + bl PlaySE b _080BD81A .pool _080BD7B4: @@ -4175,7 +4175,7 @@ _080BD7D2: movs r1, 0xE bl sub_80BD2B4 movs r0, 0x6D - bl audio_play + bl PlaySE _080BD81A: mov r0, r10 cmp r0, 0 @@ -6603,7 +6603,7 @@ _080BED04: ldrsh r0, [r0, r1] cmp r0, 0 bne _080BED58 - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gUnknown_02039B54 ldr r0, [r0] ldrh r0, [r0] @@ -6621,7 +6621,7 @@ _080BED58: strb r0, [r2] b _080BEDA0 _080BED5E: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _080BEDA0 @@ -6720,7 +6720,7 @@ sub_80BEDF4: @ 80BEDF4 ldr r0, =sub_80BF038 str r0, [r4] movs r0, 0x6C - bl audio_play + bl PlaySE b _080BEFBA .pool _080BEE34: @@ -6797,7 +6797,7 @@ _080BEEC0: cmp r1, 0 bne _080BEED8 movs r0, 0x20 - bl audio_play + bl PlaySE b _080BEFBA .pool _080BEED8: @@ -6817,7 +6817,7 @@ _080BEEF0: ldr r0, =sub_80BEFD0 str r0, [r4] movs r0, 0x15 - bl audio_play + bl PlaySE b _080BEFBA .pool _080BEF08: @@ -6832,7 +6832,7 @@ _080BEF0E: ldr r0, =sub_80BF070 str r0, [r4] movs r0, 0x3 - bl audio_play + bl PlaySE b _080BEFBA .pool _080BEF28: @@ -6866,7 +6866,7 @@ _080BEF44: movs r1, 0xD bl sub_80BFD0C movs r0, 0x6D - bl audio_play + bl PlaySE b _080BEFBA .pool _080BEF78: @@ -6901,7 +6901,7 @@ _080BEF96: movs r1, 0xD bl sub_80BFD0C movs r0, 0x6D - bl audio_play + bl PlaySE _080BEFBA: add sp, 0x4 pop {r4,r5} @@ -7539,7 +7539,7 @@ sub_80BF5CC: @ 80BF5CC lsrs r4, r0, 24 movs r0, 0x2 bl sub_814545C - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 cmp r0, 0 beq _080BF5EC @@ -7608,7 +7608,7 @@ _080BF636: ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE b _080BF772 .pool _080BF694: @@ -7650,7 +7650,7 @@ _080BF6B0: ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x6D - bl audio_play + bl PlaySE b _080BF772 .pool _080BF700: @@ -7678,7 +7678,7 @@ _080BF71E: cmp r0, 0 bne _080BF73C movs r0, 0x20 - bl audio_play + bl PlaySE b _080BF772 .pool _080BF73C: @@ -7705,7 +7705,7 @@ _080BF73C: ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x6D - bl audio_play + bl PlaySE _080BF772: add sp, 0x4 pop {r4,r5} @@ -8185,7 +8185,7 @@ sub_80BFBB0: @ 80BFBB0 ldr r1, =sub_80BFC78 str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE b _080BFC5C .pool _080BFC10: @@ -8225,7 +8225,7 @@ _080BFC2C: ldr r1, =sub_80BFC78 str r1, [r0] movs r0, 0x6D - bl audio_play + bl PlaySE _080BFC5C: add sp, 0x4 pop {r4,r5} @@ -11358,7 +11358,7 @@ sub_80C15B0: @ 80C15B0 cmp r0, 0 beq _080C15E4 movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =gTasks lsls r1, r5, 2 adds r1, r5 @@ -11394,12 +11394,12 @@ _080C160C: b _080C16BC _080C1612: movs r0, 0x15 - bl audio_play + bl PlaySE strh r4, [r5, 0xA] b _080C1626 _080C161C: movs r0, 0x15 - bl audio_play + bl PlaySE movs r0, 0x4 strh r0, [r5, 0xA] _080C1626: @@ -11409,7 +11409,7 @@ _080C1626: .pool _080C1630: movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =sub_80C1D38 str r0, [r5] b _080C16BC @@ -11429,7 +11429,7 @@ _080C1640: cmp r0, 0 ble _080C167C movs r0, 0x6D - bl audio_play + bl PlaySE ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] @@ -11458,7 +11458,7 @@ _080C167C: cmp r0, 0x1 bgt _080C16BC movs r0, 0x6D - bl audio_play + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -11543,7 +11543,7 @@ _080C174C: cmp r3, 0 beq _080C178C movs r0, 0x17 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_80C23B8 ldr r0, =gTasks @@ -11620,7 +11620,7 @@ _080C17E8: adds r0, r2 strh r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =sub_80C1D38 str r0, [r6] b _080C1994 @@ -11631,7 +11631,7 @@ _080C183C: ldr r0, =sub_80C19A4 str r0, [r6] movs r0, 0x70 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -11639,7 +11639,7 @@ _080C183C: .pool _080C1860: movs r0, 0x15 - bl audio_play + bl PlaySE ldr r0, =sub_80C1B64 str r0, [r6] b _080C1994 @@ -11662,7 +11662,7 @@ _080C1870: cmp r0, 0xFF beq _080C18B6 movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -11696,7 +11696,7 @@ _080C18B6: cmp r0, 0xFF beq _080C1900 movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -11730,7 +11730,7 @@ _080C1900: cmp r0, 0xFF beq _080C194A movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -11764,7 +11764,7 @@ _080C194A: cmp r0, 0xFF beq _080C1994 movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -11867,7 +11867,7 @@ sub_80C1A4C: @ 80C1A4C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _080C1AA6 @@ -11879,14 +11879,14 @@ sub_80C1A4C: @ 80C1A4C cmp r0, 0 beq _080C1A84 movs r0, 0x1F - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E8773 bl sub_80C2618 b _080C1A90 .pool _080C1A84: movs r0, 0x20 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E8785 bl sub_80C2618 _080C1A90: @@ -11956,7 +11956,7 @@ sub_80C1AB8: @ 80C1AB8 ldr r1, =sub_80C1D38 str r1, [r0] movs r0, 0x3 - bl audio_play + bl PlaySE b _080C1B54 .pool _080C1B40: @@ -11968,7 +11968,7 @@ _080C1B40: ldr r0, =sub_80C16CC str r0, [r1] movs r0, 0x17 - bl audio_play + bl PlaySE _080C1B54: pop {r4,r5} pop {r0} @@ -12060,7 +12060,7 @@ sub_80C1BCC: @ 80C1BCC cmp r0, 0 beq _080C1C30 movs r0, 0x15 - bl audio_play + bl PlaySE bl sub_80C267C movs r0, 0x1 bl sub_80C21D4 @@ -12072,7 +12072,7 @@ _080C1C30: cmp r0, 0 beq _080C1C68 movs r0, 0x17 - bl audio_play + bl PlaySE bl sub_80C267C movs r0, 0x1 bl sub_80C21D4 @@ -12124,7 +12124,7 @@ _080C1CA6: beq _080C1D2E _080C1CAA: movs r0, 0x5 - bl audio_play + bl PlaySE ldrh r0, [r4] ldrh r1, [r6] adds r0, r1 @@ -12172,7 +12172,7 @@ _080C1D0C: beq _080C1D2E _080C1D10: movs r0, 0x5 - bl audio_play + bl PlaySE ldrh r0, [r4] ldrh r1, [r6] adds r0, r1 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 849b55663..7cb1f37c9 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1460,7 +1460,7 @@ _0813D5F8: beq _0813D614 strh r1, [r6, 0xA] movs r0, 0x3 - bl audio_play + bl PlaySE b _0813D698 .pool _0813D614: @@ -1481,7 +1481,7 @@ _0813D614: _0813D630: strh r3, [r6, 0xA] movs r0, 0x6D - bl audio_play + bl PlaySE b _0813D698 .pool _0813D640: diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index 4aee3b019..f6d5ec271 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -179,7 +179,7 @@ _081454B8: _081454C2: cmp r0, 0x8 bls _081454E6 - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -253,12 +253,12 @@ sub_8145534: @ 8145534 bne _08145582 movs r0, 0x4 strb r0, [r1, 0x1B] - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0814557C - bl sub_80A36B4 + bl StopCry ldr r1, [r6] strh r4, [r1, 0x18] movs r0, 0x2 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 43ccb6971..730797f9a 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -2945,8 +2945,8 @@ _0806D50A: bx r1 thumb_func_end HoennToNationalOrder - thumb_func_start speciesid_conv -speciesid_conv: @ 806D510 + thumb_func_start SpeciesToCryId +SpeciesToCryId: @ 806D510 push {lr} lsls r0, 16 lsrs r0, 16 @@ -2969,7 +2969,7 @@ _0806D53C: _0806D53E: pop {r1} bx r1 - thumb_func_end speciesid_conv + thumb_func_end SpeciesToCryId thumb_func_start sub_806D544 sub_806D544: @ 806D544 diff --git a/asm/record_mixing.s b/asm/record_mixing.s index b5da0864f..bccaa070e 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -498,7 +498,7 @@ sub_80E7128: @ 80E7128 cmp r0, 0x32 bne _080E7150 movs r0, 0xE2 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x8] _080E7150: @@ -605,7 +605,7 @@ _080E724C: movs r0, 0x3 strh r0, [r5] movs r0, 0xE0 - bl audio_play + bl PlaySE b _080E730A .pool _080E726C: @@ -781,7 +781,7 @@ _080E73B8: b _080E7566 _080E73DA: movs r0, 0x15 - bl audio_play + bl PlaySE movs r1, 0 movs r0, 0xC9 strh r0, [r5, 0x8] @@ -789,7 +789,7 @@ _080E73DA: b _080E7566 _080E73EA: movs r0, 0x16 - bl audio_play + bl PlaySE ldr r0, =0x0000012d b _080E7564 .pool diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index f145e7a86..429666e61 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -695,7 +695,7 @@ _0809EE4A: _0809EE5C: strh r0, [r5, 0x4] movs r0, 0x5 - bl audio_play + bl PlaySE b _0809EEF4 _0809EE66: cmp r4, 0x5 @@ -717,7 +717,7 @@ _0809EE66: ldrh r0, [r5, 0xC] strb r0, [r1, 0x4] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gTasks lsls r0, r6, 2 adds r0, r6 @@ -744,7 +744,7 @@ _0809EEB4: cmp r0, 0 beq _0809EEF4 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r5, 0x10] ldrh r3, [r5, 0x6] ldrb r1, [r5, 0x8] @@ -1090,7 +1090,7 @@ _0809F1E4: cmp r0, 0 beq _0809F1F8 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r7, 0 bl DestroyTask _0809F1F8: @@ -1277,14 +1277,14 @@ _0809F398: ldr r0, =gUnknown_085ECA8A bl sub_809F0C0 movs r0, 0x49 - bl audio_play + bl PlaySE b _0809F3C4 .pool _0809F3B8: ldr r0, =gUnknown_085ECA9A bl sub_809F0C0 movs r0, 0x16 - bl audio_play + bl PlaySE _0809F3C4: movs r0, 0x5 strh r0, [r5] diff --git a/asm/rom4.s b/asm/rom4.s index 9b8b40348..e51da0170 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -5760,7 +5760,7 @@ sub_8087510: @ 8087510 sub_808751C: @ 808751C push {lr} movs r0, 0x6 - bl audio_play + bl PlaySE bl sub_809FA9C bl script_env_2_enable pop {r0} @@ -5772,7 +5772,7 @@ sub_8087530: @ 8087530 push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl script_env_1_execute_new_script bl script_env_2_enable @@ -5785,7 +5785,7 @@ sub_8087530: @ 8087530 sub_808754C: @ 808754C push {lr} movs r0, 0x6 - bl audio_play + bl PlaySE ldr r0, =gUnknown_082774EF bl script_env_1_execute_new_script bl script_env_2_enable @@ -5799,7 +5799,7 @@ sub_8087568: @ 8087568 push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl script_env_1_execute_new_script bl script_env_2_enable diff --git a/asm/rom6.s b/asm/rom6.s index 09c398adf..cbb7b1bc1 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -341,7 +341,7 @@ oei_rocksmash: @ 81356E4 sub_8135714: @ 8135714 push {lr} movs r0, 0x83 - bl audio_play + bl PlaySE movs r0, 0x25 bl FieldEffectActiveListRemove bl script_env_2_enable_and_set_ctx_running @@ -1249,7 +1249,7 @@ sub_8135F70: @ 8135F70 cmp r1, 0x1 beq _08135F9C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gSprites ldr r0, =gUnknown_0203AB50 ldr r0, [r0] @@ -2083,7 +2083,7 @@ _08136602: cmp r1, r0 beq _08136708 movs r0, 0x5 - bl audio_play + bl PlaySE ldrh r0, [r4, 0x4] ldr r1, =0x00002005 bl sub_8136110 @@ -2135,7 +2135,7 @@ _081366B6: .pool _081366D0: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020375F0 ldr r2, =0x0000ffff adds r1, r2, 0 @@ -2149,7 +2149,7 @@ _081366D0: .pool _081366F8: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CE7C strh r4, [r0] adds r0, r7, 0 @@ -2193,7 +2193,7 @@ _08136742: cmp r0, 0 beq _0813676C movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r7] ldr r1, =gUnknown_0203AB4E subs r2, r1, 0x2 @@ -2274,7 +2274,7 @@ _081367CA: .pool _08136810: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 @@ -2294,7 +2294,7 @@ _08136830: b _08136848 _0813683A: movs r0, 0x5 - bl audio_play + bl PlaySE mov r0, r8 movs r1, 0 bl sub_8136854 @@ -2491,13 +2491,13 @@ sub_81369E0: @ 81369E0 cmp r4, r0 bne _08136A18 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_8136DE8 b _08136A3C _08136A18: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_085B2668 ldr r0, =gUnknown_0203AB50 ldr r0, [r0] @@ -2693,7 +2693,7 @@ sub_8136BC0: @ 8136BC0 ldrb r0, [r0] bl sub_8136F68 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203AB4E subs r6, r5, 0x2 lsls r4, r7, 2 @@ -3404,7 +3404,7 @@ hm2_flash: @ 8137178 sub_81371B4: @ 81371B4 push {lr} movs r0, 0xCF - bl audio_play + bl PlaySE ldr r0, =0x00000888 bl FlagSet ldr r0, =gUnknown_082926F8 @@ -6151,7 +6151,7 @@ sub_81388E4: @ 81388E4 ldr r0, =gUnknown_0203AB5D strb r1, [r0] movs r0, 0x2C - bl audio_play + bl PlaySE ldr r0, =sub_8138910 movs r1, 0x8 bl CreateTask @@ -7768,7 +7768,7 @@ sub_8139560: @ 8139560 movs r0, 0 bl SetCameraPanningCallback movs r0, 0xD6 - bl audio_play + bl PlaySE pop {r0} bx r0 .pool @@ -8439,7 +8439,7 @@ _08139ACE: adds r0, r5, 0 bl sub_8139C2C movs r0, 0x59 - bl audio_play + bl PlaySE pop {r4-r6} pop {r0} bx r0 @@ -8485,7 +8485,7 @@ sub_8139AF4: @ 8139AF4 cmp r1, r0 bne _08139B54 movs r0, 0x49 - bl audio_play + bl PlaySE adds r0, r5, 0 bl DestroyTask bl script_env_2_enable_and_set_ctx_running @@ -9574,7 +9574,7 @@ sub_813A46C: @ 813A46C push {r4,r5,lr} sub sp, 0x4 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_813A4EC bl FindTaskIdByFunc lsls r0, 24 @@ -9653,14 +9653,14 @@ _0813A51C: movs r0, 0x7F strh r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE b _0813A54C .pool _0813A530: ldr r0, =gUnknown_020375F0 strh r4, [r0] movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x14 ldrsh r0, [r6, r1] cmp r0, 0 @@ -11028,13 +11028,13 @@ sub_813B0B4: @ 813B0B4 cmp r4, 0 bne _0813B0F0 movs r0, 0xC4 - bl audio_play + bl PlaySE b _0813B0F8 .pool _0813B0F0: movs r0, 0x82 lsls r0, 1 - bl audio_play + bl PlaySE _0813B0F8: ldr r0, =sub_813B160 movs r1, 0x8 @@ -11874,7 +11874,7 @@ sub_813B80C: @ 813B80C movs r1, 0x8 bl CreateTask movs r0, 0x9D - bl audio_play + bl PlaySE pop {r0} bx r0 .pool @@ -11906,7 +11906,7 @@ sub_813B824: @ 813B824 movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x9D - bl audio_play + bl PlaySE _0813B858: movs r0, 0 ldrsh r1, [r4, r0] diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index b30897103..ed98a8a3c 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -2356,7 +2356,7 @@ _08036070: bl sub_8035C4C _0803607C: movs r0, 0x78 - bl audio_play + bl PlaySE adds r0, r7, 0 bl DestroyTask ldr r4, =gSprites @@ -7102,7 +7102,7 @@ sub_8038B74: @ 8038B74 ldr r0, =sub_8038B04 str r0, [r4, 0x1C] movs r0, 0x68 - bl audio_play + bl PlaySE pop {r4} pop {r0} bx r0 @@ -8096,7 +8096,7 @@ _080394D8: b _0803975E _080394EC: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 @@ -8113,7 +8113,7 @@ _08039500: b _0803975E _08039510: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 @@ -8128,7 +8128,7 @@ _08039526: cmp r0, 0 beq _08039560 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 @@ -8155,7 +8155,7 @@ _08039560: b _0803975E _0803956A: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 @@ -8268,7 +8268,7 @@ _08039678: cmp r0, 0x1 bne _080396A0 movs r0, 0x37 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085CD2CB _08039686: bl get_battle_strings_ @@ -12361,7 +12361,7 @@ _0803B866: ands r0, r1 cmp r0, 0 beq _0803B8B2 - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gUnknown_082DB8BE bl b_call_bc_move_exec _0803B8B2: @@ -18507,7 +18507,7 @@ bs8_exit_by_flight: @ 803F1F0 ldrb r0, [r0] strb r0, [r2] movs r0, 0x11 - bl audio_play + bl PlaySE ldr r0, =gNoOfAllBanks ldrb r0, [r0] strb r0, [r4] diff --git a/asm/rom_8072304.s b/asm/rom_8072304.s index 15b372a11..16d2acf99 100644 --- a/asm/rom_8072304.s +++ b/asm/rom_8072304.s @@ -3006,7 +3006,7 @@ _08073BC6: _08073C0A: movs r0, 0x72 movs r1, 0 - bl audio_play_and_stuff + bl PlaySE12WithPanning adds r0, r4, 0 add sp, 0x24 pop {r3-r5} @@ -3656,13 +3656,13 @@ _0807412C: lsls r1, 24 asrs r1, 24 movs r0, 0x74 - bl sub_80A383C + bl PlaySE2WithPanning b _0807414A _08074140: lsls r1, 24 asrs r1, 24 movs r0, 0x73 - bl sub_80A3808 + bl PlaySE1WithPanning _0807414A: ldr r0, =SpriteCallbackDummy str r0, [r4, 0x1C] @@ -6171,7 +6171,7 @@ _080755B8: ldr r1, =TaskDummy str r1, [r0] movs r0, 0x3D - bl audio_play + bl PlaySE _08075602: add sp, 0x4 pop {r3-r5} @@ -6341,7 +6341,7 @@ sub_807574C: @ 807574C cmp r0, 0xB bne _08075764 movs r0, 0x3C - bl audio_play + bl PlaySE _08075764: ldr r6, =gSprites ldr r5, =gBankSpriteIds @@ -6505,19 +6505,19 @@ _0807589C: b _080758BA _080758A2: movs r0, 0x38 - bl audio_play + bl PlaySE b _080758EE _080758AA: movs r0, 0x39 - bl audio_play + bl PlaySE b _080758EE _080758B2: movs r0, 0x3A - bl audio_play + bl PlaySE b _080758EE _080758BA: movs r0, 0x3B - bl audio_play + bl PlaySE b _080758EE _080758C2: movs r2, 0x38 @@ -6599,7 +6599,7 @@ sub_8075930: @ 8075930 ldr r0, =sub_8075970 str r0, [r4, 0x1C] movs r0, 0x17 - bl audio_play + bl PlaySE _08075964: pop {r4} pop {r0} @@ -6768,7 +6768,7 @@ _08075AA8: bl StartSpriteAffineAnim _08075AB0: movs r0, 0x17 - bl audio_play + bl PlaySE _08075AB6: pop {r4} pop {r0} @@ -6885,7 +6885,7 @@ _08075BCC: bl PlayCry3 b _08075C2E _08075BDA: - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -6965,11 +6965,11 @@ _08075C66: adds r0, 0x1 strh r0, [r1, 0x26] _08075C7E: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08075D04 - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gTasks lsls r1, r4, 2 adds r1, r4 @@ -7161,7 +7161,7 @@ _08075E00: ands r0, r1 cmp r0, 0x42 bne _08075E4C - bl sub_80A38E4 + bl IsBGMPlaying lsls r0, 24 cmp r0, 0 beq _08075E56 @@ -7511,7 +7511,7 @@ sub_80760F8: @ 80760F8 strb r1, [r0] bl m4aMPlayAllStop ldr r0, =0x00000173 - bl audio_play + bl PlaySE b _08076196 .pool _08076130: @@ -8434,7 +8434,7 @@ sub_807687C: @ 807687C cmp r0, 0xB bne _08076894 movs r0, 0x3C - bl audio_play + bl PlaySE _08076894: ldrh r1, [r5, 0x2E] lsls r1, 24 diff --git a/asm/rom_80AEFFC.s b/asm/rom_80AEFFC.s index 8e7538a91..661a8f8f0 100644 --- a/asm/rom_80AEFFC.s +++ b/asm/rom_80AEFFC.s @@ -508,7 +508,7 @@ sub_80AF3E8: @ 80AF3E8 bl sub_8085784 bl pal_fill_for_maplights movs r0, 0x2E - bl audio_play + bl PlaySE ldr r0, =task0A_mpl_807E31C movs r1, 0xA bl CreateTask @@ -524,7 +524,7 @@ sub_80AF40C: @ 80AF40C bl sub_8085784 bl pal_fill_for_maplights movs r0, 0x2E - bl audio_play + bl PlaySE ldr r0, =task_map_chg_seq_0807E2CC movs r1, 0xA bl CreateTask @@ -913,7 +913,7 @@ sub_80AF734: @ 80AF734 bl sub_80AF0B4 bl play_some_sound movs r0, 0x9 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03005DAC ldr r1, =mapldr_default str r1, [r0] @@ -1032,7 +1032,7 @@ sub_80AF848: @ 80AF848 bl music_something bl sub_80AF0B4 movs r0, 0x2D - bl audio_play + bl PlaySE ldr r0, =sub_80AFA0C movs r1, 0xA bl CreateTask @@ -1054,7 +1054,7 @@ sub_80AF87C: @ 80AF87C bl music_something bl sub_80AF0B4 movs r0, 0x2D - bl audio_play + bl PlaySE ldr r0, =sub_80AFA0C movs r1, 0xA bl CreateTask @@ -1142,7 +1142,7 @@ sub_80AF948: @ 80AF948 bl music_something bl sub_80AF0B4 movs r0, 0x9 - bl audio_play + bl PlaySE ldr r0, =sub_80AF8E0 movs r1, 0xA bl CreateTask @@ -1182,7 +1182,7 @@ _080AF99A: bl fade_screen bl music_something movs r0, 0x9 - bl audio_play + bl PlaySE b _080AF9C8 _080AF9B2: bl sub_80AF710 @@ -1334,7 +1334,7 @@ _080AFAD4: bl cur_mapdata_get_door_sound_at lsls r0, 16 lsrs r0, 16 - bl audio_play + bl PlaySE movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0 @@ -1516,7 +1516,7 @@ sub_80AFC60: @ 80AFC60 bl sub_80AF0B4 bl play_some_sound movs r0, 0x9 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03005DAC ldr r1, =sub_80AF3C8 str r1, [r0] @@ -2225,7 +2225,7 @@ _080B01EE: bl player_bitmagic bl script_env_2_enable movs r0, 0x2D - bl audio_play + bl PlaySE bl sub_808D1C8 b _080B0222 _080B0202: diff --git a/asm/rom_80C6FA0.s b/asm/rom_80C6FA0.s index e70105bc4..502b1f33c 100644 --- a/asm/rom_80C6FA0.s +++ b/asm/rom_80C6FA0.s @@ -1190,7 +1190,7 @@ sub_80C78F0: @ 80C78F0 cmp r0, 0 beq _080C790C movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0xC9 b _080C7954 .pool @@ -1200,7 +1200,7 @@ _080C790C: cmp r0, 0 beq _080C792C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039D04 ldr r0, [r0] movs r1, 0x91 @@ -1215,7 +1215,7 @@ _080C792C: cmp r0, 0 beq _080C7940 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80C7BB4 b _080C7952 _080C7940: @@ -1224,7 +1224,7 @@ _080C7940: cmp r0, 0 beq _080C7952 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80C7B80 _080C7952: movs r0, 0xC8 @@ -2189,7 +2189,7 @@ sub_80C81AC: @ 80C81AC .pool _080C81C4: movs r0, 0x2 - bl audio_play + bl PlaySE movs r0, 0x14 movs r1, 0 movs r2, 0x1 @@ -2374,7 +2374,7 @@ _080C831C: .4byte _080C85F8 _080C8384: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039D08 ldr r1, [r0] movs r0, 0x1 @@ -2446,7 +2446,7 @@ _080C8420: .pool _080C842C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =box_related bl add_to_c3_somehow b _080C879E @@ -2458,7 +2458,7 @@ _080C8440: .pool _080C844C: movs r0, 0x5 - bl audio_play + bl PlaySE bl get_preferred_box ldr r4, =gUnknown_02039D08 ldr r1, [r4] @@ -2482,7 +2482,7 @@ _080C846E: .pool _080C8484: movs r0, 0x5 - bl audio_play + bl PlaySE bl get_preferred_box ldr r4, =gUnknown_02039D08 ldr r1, [r4] @@ -2532,7 +2532,7 @@ _080C84E6: .pool _080C84F8: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C8D78 bl add_to_c3_somehow b _080C879E @@ -2543,7 +2543,7 @@ _080C850C: cmp r0, 0 bne _080C8528 movs r0, 0x5 - bl audio_play + bl PlaySE b _080C872C _080C851E: bl sub_80CEA6C @@ -2559,49 +2559,49 @@ _080C8528: .pool _080C8538: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =c3_0808DC50 bl add_to_c3_somehow b _080C879E .pool _080C854C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C8C90 bl add_to_c3_somehow b _080C879E .pool _080C8560: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C8BEC bl add_to_c3_somehow b _080C879E .pool _080C8574: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C9128 bl add_to_c3_somehow b _080C879E .pool _080C8588: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C91DC bl add_to_c3_somehow b _080C879E .pool _080C859C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C93B0 bl add_to_c3_somehow b _080C879E .pool _080C85B0: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 b _080C8600 _080C85BA: @@ -2615,7 +2615,7 @@ _080C85BA: .pool _080C85D0: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x2 b _080C85E6 _080C85DA: @@ -2623,7 +2623,7 @@ _080C85DA: b _080C8600 _080C85DE: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x4 _080C85E6: bl sub_80D01D0 @@ -2635,7 +2635,7 @@ _080C85E6: .pool _080C85F8: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x5 _080C8600: bl sub_80D01D0 @@ -2647,7 +2647,7 @@ _080C8600: .pool _080C8614: movs r0, 0x20 - bl audio_play + bl PlaySE b _080C879E _080C861C: bl sub_80CD554 @@ -2729,12 +2729,12 @@ _080C86C8: .pool _080C86D8: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0xD b _080C86EA _080C86E2: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0x16 _080C86EA: bl sub_80CAC58 @@ -2875,7 +2875,7 @@ _080C8804: b _080C8856 _080C880A: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CA888 b _080C882C _080C8816: @@ -2948,7 +2948,7 @@ _080C88A0: b _080C8B82 _080C88AC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_02039D08 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -3046,7 +3046,7 @@ _080C899C: cmp r0, 0 bne _080C8A52 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C8B90 bl add_to_c3_somehow @@ -3054,7 +3054,7 @@ _080C899C: .pool _080C89BC: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C8BEC bl add_to_c3_somehow @@ -3066,7 +3066,7 @@ _080C89D4: cmp r0, 0 beq _080C8A52 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =c3_0808DC50 bl add_to_c3_somehow @@ -3074,7 +3074,7 @@ _080C89D4: .pool _080C89F4: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C8C90 bl add_to_c3_somehow @@ -3095,7 +3095,7 @@ _080C8A0C: cmp r0, 0 bne _080C8A8C movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C8D78 bl add_to_c3_somehow @@ -3141,35 +3141,35 @@ _080C8A8C: .pool _080C8A98: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C8EB4 bl add_to_c3_somehow b _080C8B82 .pool _080C8AAC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C9B28 bl add_to_c3_somehow b _080C8B82 .pool _080C8AC0: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C90A4 bl add_to_c3_somehow b _080C8B82 .pool _080C8AD4: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C9128 bl add_to_c3_somehow b _080C8B82 .pool _080C8AE8: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C91DC bl add_to_c3_somehow b _080C8B82 @@ -3181,14 +3181,14 @@ _080C8AFC: .pool _080C8B08: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C93B0 bl add_to_c3_somehow b _080C8B82 .pool _080C8B1C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C9B88 bl add_to_c3_somehow b _080C8B82 @@ -3200,17 +3200,17 @@ _080C8B30: .pool _080C8B3C: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0xD b _080C8B58 _080C8B46: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0x11 b _080C8B58 _080C8B50: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0x16 _080C8B58: bl sub_80CAC58 @@ -4050,7 +4050,7 @@ _080C92D0: cmp r0, 0 bne _080C92FC movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0x1A bl sub_80CAC58 ldr r1, [r5] @@ -4060,7 +4060,7 @@ _080C92D0: .pool _080C92FC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039D0C ldrb r0, [r0] negs r4, r0 @@ -4263,7 +4263,7 @@ _080C94DA: cmp r0, 0 bne _080C9544 movs r0, 0x6 - bl audio_play + bl PlaySE bl sub_80D17B4 bl sub_80D1818 b _080C9522 @@ -4281,7 +4281,7 @@ _080C9500: cmp r0, 0 beq _080C9544 movs r0, 0x6 - bl audio_play + bl PlaySE b _080C9522 .pool _080C9518: @@ -4337,7 +4337,7 @@ _080C956C: .4byte _080C9654 _080C9584: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1B bl sub_80CAC58 movs r0, 0 @@ -4608,14 +4608,14 @@ _080C97C4: .pool _080C97DC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_80C9AC8 bl add_to_c3_somehow b _080C9818 .pool _080C97F0: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C9824 bl add_to_c3_somehow @@ -4623,7 +4623,7 @@ _080C97F0: .pool _080C9808: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r0, =sub_80C99D8 bl add_to_c3_somehow @@ -4712,7 +4712,7 @@ _080C98C6: b _080C99A0 _080C98D2: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80D013C ldr r1, [r4] adds r2, r1, r5 @@ -4724,7 +4724,7 @@ _080C98D2: b _080C99CA _080C98EC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r4] movs r1, 0xF2 lsls r1, 3 @@ -4778,7 +4778,7 @@ _080C993C: .pool _080C996C: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80CADC4 ldr r1, [r4] adds r1, r5 @@ -5102,7 +5102,7 @@ _080C9C1C: cmp r0, 0 beq _080C9C40 movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0xF bl sub_80CAC58 ldr r0, =gUnknown_02039D08 @@ -5122,7 +5122,7 @@ _080C9C40: .pool _080C9C58: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_80CAC58 movs r0, 0 @@ -5166,7 +5166,7 @@ _080C9CAA: .pool _080C9CBC: movs r0, 0x3 - bl audio_play + bl PlaySE bl sub_80CADC4 b _080C9CD2 _080C9CC8: @@ -5233,7 +5233,7 @@ _080C9D50: cmp r0, 0 beq _080C9D74 movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0xF bl sub_80CAC58 ldr r0, =gUnknown_02039D08 @@ -5253,7 +5253,7 @@ _080C9D74: .pool _080C9D8C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x12 bl sub_80CAC58 movs r0, 0 @@ -5298,7 +5298,7 @@ _080C9DE0: .pool _080C9DF0: movs r0, 0x3 - bl audio_play + bl PlaySE bl sub_80CADC4 b _080C9E06 _080C9DFC: @@ -6826,7 +6826,7 @@ sub_80CAB4C: @ 80CAB4C movs r1, 0 strb r1, [r0] movs r0, 0x6 - bl audio_play + bl PlaySE bl sub_80CA7D4 pop {r0} bx r0 @@ -16996,7 +16996,7 @@ sub_80D00AC: @ 80D00AC cmp r0, 0 beq _080D00CE movs r0, 0x5 - bl audio_play + bl PlaySE adds r5, 0x1 _080D00CE: ldrh r1, [r4, 0x2E] @@ -17005,7 +17005,7 @@ _080D00CE: cmp r0, 0 beq _080D00EC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -17017,7 +17017,7 @@ _080D00EC: cmp r0, 0 beq _080D010A movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _080D010A @@ -24530,7 +24530,7 @@ sub_80D3B00: @ 80D3B00 push {r4-r7,lr} movs r6, 0 movs r0, 0x80 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203AB40 adds r1, r4, 0x2 adds r0, r4, 0 @@ -25534,7 +25534,7 @@ _080D434A: sub_80D4354: @ 80D4354 push {lr} movs r0, 0x80 - bl audio_play + bl PlaySE movs r0, 0x2 bl FieldEffectActiveListRemove bl script_env_2_enable_and_set_ctx_running diff --git a/asm/rom_813C5BC.s b/asm/rom_813C5BC.s index 4a06a9d38..eeb6c57fe 100644 --- a/asm/rom_813C5BC.s +++ b/asm/rom_813C5BC.s @@ -51,7 +51,7 @@ sub_813C5EC: @ 813C5EC beq _0813C61A _0813C610: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =sub_813C62C str r0, [r4] _0813C61A: diff --git a/asm/rom_8158B30.s b/asm/rom_8158B30.s index a1ceb2370..2c244b379 100644 --- a/asm/rom_8158B30.s +++ b/asm/rom_8158B30.s @@ -91,7 +91,7 @@ _08158BD0: ldrh r0, [r4, 0x8] lsls r1, r5, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning _08158BEA: lsls r1, r6, 24 asrs r1, 24 @@ -133,7 +133,7 @@ sub_8158C04: @ 8158C04 ldrh r0, [r4, 0xA] lsls r1, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -256,7 +256,7 @@ sub_8158D08: @ 8158D08 ldrh r0, [r4, 0x8] movs r1, 0x1E ldrsb r1, [r4, r1] - bl audio_play_and_stuff + bl PlaySE12WithPanning ldrh r0, [r4, 0x10] subs r0, 0x1 strh r0, [r4, 0x10] @@ -610,7 +610,7 @@ _08159028: ldrsh r0, [r1, r2] cmp r0, 0xFF bne _0815904E - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 cmp r0, 0 bne _0815906A @@ -623,7 +623,7 @@ _08159028: bl move_anim_task_del b _0815906A _0815904E: - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 cmp r0, 0 bne _0815906A @@ -664,7 +664,7 @@ sub_8159078: @ 8159078 b _081590B0 .pool _081590A0: - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 cmp r0, 0 bne _081590B0 @@ -794,12 +794,12 @@ _081591B0: strh r1, [r0, 0x1A] b _08159204 _081591B8: - bl sub_80A36EC + bl IsCryPlaying lsls r0, 24 cmp r0, 0 bne _08159204 _081591C2: - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gTasks lsls r1, r4, 2 adds r1, r4 @@ -854,7 +854,7 @@ sub_8159210: @ 8159210 lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl sub_80A3808 + bl PlaySE1WithPanning adds r0, r4, 0 bl move_anim_task_del pop {r4,r5} @@ -879,7 +879,7 @@ sub_8159244: @ 8159244 lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl sub_80A383C + bl PlaySE2WithPanning adds r0, r4, 0 bl move_anim_task_del pop {r4,r5} @@ -1067,7 +1067,7 @@ bx_battle_menu_t6_2: @ 81593D8 cmp r0, 0 beq _08159446 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020244AC ldr r0, =gActiveBank ldrb r0, [r0] @@ -1125,7 +1125,7 @@ _08159446: cmp r0, 0 beq _0815954E movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1151,7 +1151,7 @@ _08159484: cmp r0, 0 bne _0815954E movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1177,7 +1177,7 @@ _081594C0: cmp r0, 0 beq _0815954E movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1211,7 +1211,7 @@ _0815950C: cmp r0, 0 bne _0815954E movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -2138,7 +2138,7 @@ _08159C94: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl dp01_tbl6_exec_completed pop {r4} pop {r0} @@ -2460,7 +2460,7 @@ sub_8159F5C: @ 8159F5C push {r4,r5,lr} sub sp, 0x4 movs r0, 0xEC - bl audio_play + bl PlaySE ldr r5, =gPlttBufferUnfaded ldr r1, =sPaletteDecompressionBuffer movs r4, 0x80 @@ -3965,7 +3965,7 @@ sub_815AB5C: @ 815AB5C lsls r1, 24 asrs r1, 24 movs r0, 0xDE - bl sub_80A3808 + bl PlaySE1WithPanning b _0815ABBA _0815AB9A: ldrh r0, [r4, 0x24] @@ -4620,7 +4620,7 @@ _0815B0BC: lsls r1, 24 asrs r1, 24 movs r0, 0xBA - bl audio_play_and_stuff + bl PlaySE12WithPanning cmp r4, 0x40 beq _0815B120 ldr r5, =gSprites @@ -6167,7 +6167,7 @@ _0815BD8E: lsls r1, 24 asrs r1, 24 movs r0, 0xE4 - bl audio_play_and_stuff + bl PlaySE12WithPanning b _0815BDF2 _0815BDA6: mov r0, sp @@ -12887,7 +12887,7 @@ _0815F3CE: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r1, =0xfffff800 adds r0, r1, 0 ldrh r2, [r4, 0x1C] @@ -12957,7 +12957,7 @@ _0815F460: lsls r1, 24 asrs r1, 24 movs r0, 0x7D - bl audio_play_and_stuff + bl PlaySE12WithPanning adds r0, r6, 0 bl move_anim_task_del _0815F482: @@ -13047,7 +13047,7 @@ _0815F520: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl audio_play_and_stuff + bl PlaySE12WithPanning movs r0, 0 strh r0, [r4, 0x26] b _0815F5D8 @@ -13076,7 +13076,7 @@ _0815F544: lsls r1, 24 asrs r1, 24 movs r0, 0xCD - bl audio_play_and_stuff + bl PlaySE12WithPanning strh r5, [r4, 0x30] strh r5, [r4, 0x26] b _0815F5D8 @@ -13118,7 +13118,7 @@ _0815F5B4: lsls r1, 24 asrs r1, 24 movs r0, 0xC0 - bl audio_play_and_stuff + bl PlaySE12WithPanning movs r0, 0 strh r0, [r4, 0x30] _0815F5D8: @@ -14173,7 +14173,7 @@ _0815FE92: lsls r1, 24 asrs r1, 24 movs r0, 0x7A - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r0, =gUnknown_02038437 ldrb r0, [r0] movs r1, 0x1 @@ -15965,7 +15965,7 @@ _08160E70: cmp r0, 0 beq _08160E8A movs r0, 0x5 - bl audio_play + bl PlaySE _08160E82: ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -16099,7 +16099,7 @@ sub_8160F50: @ 8160F50 beq _0816103E _08160F9C: movs r0, 0x5 - bl audio_play + bl PlaySE cmp r7, 0 bne _08160FC4 movs r0, 0x1 @@ -16127,7 +16127,7 @@ _08160FD4: b _0816103E _08160FE4: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8161234 ldr r1, [r6] movs r0, 0xC @@ -16142,7 +16142,7 @@ _08160FE4: .pool _08161010: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8161234 ldr r1, [r6] movs r0, 0x8 @@ -16867,7 +16867,7 @@ _0816161A: .pool _08161628: movs r0, 0x1 - bl audio_play + bl PlaySE mov r1, r10 mov r0, r8 muls r0, r1 @@ -16906,7 +16906,7 @@ sub_816166C: @ 816166C lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203CEC8 movs r1, 0x9 ldrsb r1, [r5, r1] @@ -17046,7 +17046,7 @@ sub_81617B8: @ 81617B8 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E9712 movs r1, 0 bl sub_81B1B5C @@ -26266,7 +26266,7 @@ _08166678: cmp r0, 0 beq _081666B8 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_8167CA0 ldr r0, =gUnknown_0203BCAC @@ -26286,7 +26286,7 @@ _081666B8: cmp r0, 0 beq _081666F0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_8167CA0 ldr r0, =gUnknown_0203BCAC @@ -26307,7 +26307,7 @@ _081666F0: cmp r0, 0 beq _08166710 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203BC90 ldr r0, [r0] adds r0, 0x50 @@ -26322,7 +26322,7 @@ _08166710: b _0816680E _0816671A: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203BCAC ldr r0, [r0] ldr r2, =0x00008041 @@ -27056,7 +27056,7 @@ _08166E02: bne _08166E18 _08166E06: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x2 bl rbox_fill_rectangle movs r0, 0x2 @@ -29680,7 +29680,7 @@ _08168492: cmp r5, 0 bne _08168564 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 movs r1, 0 b _081684E4 @@ -29695,7 +29695,7 @@ _081684B0: cmp r5, 0 bne _08168564 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 movs r1, 0 b _081684E4 @@ -29738,7 +29738,7 @@ _08168508: cmp r0, 0 bne _08168564 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_8059CF8 movs r0, 0x1 @@ -29764,7 +29764,7 @@ _08168540: cmp r0, 0 bne _08168564 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 movs r1, 0x1 movs r2, 0 @@ -33332,7 +33332,7 @@ _0816A550: cmp r0, 0 bne _0816A574 movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0x80 lsls r2, 1 movs r0, 0x1 @@ -33691,7 +33691,7 @@ sub_816A810: @ 816A810 ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - bl audio_play + bl PlaySE bl dp01_tbl5_exec_completed pop {r0} bx r0 diff --git a/asm/rom_8184DA4.s b/asm/rom_8184DA4.s index 75567243a..e881eb24e 100644 --- a/asm/rom_8184DA4.s +++ b/asm/rom_8184DA4.s @@ -3341,7 +3341,7 @@ _081869AE: ands r0, r1 cmp r0, 0 bne _08186A6A - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08186A6A @@ -3934,7 +3934,7 @@ sub_8186F14: @ 8186F14 ands r0, r1 cmp r0, 0 bne _08186F6E - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08186F6E @@ -7067,7 +7067,7 @@ _08188B4C: strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r1, =gBankSpriteIds ldrb r0, [r5] @@ -8025,7 +8025,7 @@ _0818933C: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl sub_81871AC pop {r4} pop {r0} @@ -9128,7 +9128,7 @@ _08189CB0: _08189CE4: movs r6, 0x1 _08189CE6: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 beq _08189CF2 @@ -9363,7 +9363,7 @@ _08189EA2: ands r0, r1 cmp r0, 0 bne _08189F62 - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 bne _08189F62 @@ -13110,7 +13110,7 @@ _0818C0B8: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r3, =gBankSpriteIds ldrb r0, [r5] @@ -14136,7 +14136,7 @@ _0818C964: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl sub_818A514 pop {r4} pop {r0} @@ -24872,7 +24872,7 @@ _081924A0: cmp r7, 0x9 beq _081924CC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gTasks lsls r0, r6, 2 adds r0, r6 @@ -27625,7 +27625,7 @@ sub_8193BDC: @ 8193BDC bne _08193C3C _08193C20: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 mov r9, r0 b _08193CDE @@ -27634,13 +27634,13 @@ _08193C3C: cmp r5, 0xF bgt _08193C4C movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x2 mov r9, r1 b _08193CDE _08193C4C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x3 mov r9, r0 b _08193CDE @@ -27717,7 +27717,7 @@ _08193CDE: cmp r1, 0x4 beq _08193D26 movs r0, 0x5 - bl audio_play + bl PlaySE lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -31921,7 +31921,7 @@ task_prev_quest: @ 81960A8 bl sub_808BCF4 _081960C2: ldr r0, =0x00000107 - bl audio_play + bl PlaySE ldr r0, =sub_81960E0 movs r1, 0x1 bl CreateTask @@ -32215,7 +32215,7 @@ sub_8196330: @ 8196330 bl sub_8196648 cmp r0, 0 bne _08196388 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _08196388 @@ -32233,7 +32233,7 @@ sub_8196330: @ 8196330 bl CopyWindowToVram movs r0, 0x84 lsls r0, 1 - bl audio_play + bl PlaySE movs r0, 0x1 b _0819638A .pool @@ -32298,7 +32298,7 @@ sub_81963F0: @ 81963F0 lsls r0, 24 cmp r0, 0 bne _08196454 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _08196454 @@ -36580,7 +36580,7 @@ ProcessMenuInput: @ 819856C cmp r0, 0 bne _08198588 movs r0, 0x5 - bl audio_play + bl PlaySE _08198588: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -36600,7 +36600,7 @@ _081985A6: cmp r0, 0 beq _081985BA movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _081985CA @@ -36610,7 +36610,7 @@ _081985BA: cmp r0, 0 beq _081985CE movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _081985CA: bl MoveMenuCursor @@ -36640,7 +36640,7 @@ ProcessMenuInputNoWrapAround: @ 81985D8 cmp r0, 0 bne _081985F8 movs r0, 0x5 - bl audio_play + bl PlaySE _081985F8: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -36680,7 +36680,7 @@ _08198630: beq _0819864C _08198646: movs r0, 0x5 - bl audio_play + bl PlaySE _0819864C: movs r0, 0x2 negs r0, r0 @@ -36704,7 +36704,7 @@ ProcessMenuInput_other: @ 8198658 cmp r0, 0 bne _08198674 movs r0, 0x5 - bl audio_play + bl PlaySE _08198674: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -36725,7 +36725,7 @@ _08198692: cmp r1, 0x40 bne _081986A8 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _081986B4 @@ -36733,7 +36733,7 @@ _081986A8: cmp r1, 0x80 bne _081986B8 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _081986B4: bl MoveMenuCursor @@ -36762,7 +36762,7 @@ ProcessMenuInputNoWrapAround_other: @ 81986C4 cmp r0, 0 bne _081986E4 movs r0, 0x5 - bl audio_play + bl PlaySE _081986E4: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -36801,7 +36801,7 @@ _0819871E: beq _08198736 _08198730: movs r0, 0x5 - bl audio_play + bl PlaySE _08198736: movs r0, 0x2 negs r0, r0 @@ -38287,7 +38287,7 @@ sub_8199284: @ 8199284 cmp r0, 0 beq _081992AC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CD90 ldrb r0, [r0, 0x2] lsls r0, 24 @@ -38308,7 +38308,7 @@ _081992BA: cmp r0, 0 beq _081992D0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -38319,7 +38319,7 @@ _081992D0: cmp r0, 0 beq _081992E4 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0x1 b _08199324 @@ -38335,7 +38335,7 @@ _081992E4: bne _08199304 _081992F8: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _08199322 @@ -38352,7 +38352,7 @@ _08199304: bne _08199328 _0819931A: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _08199322: movs r1, 0 @@ -38379,7 +38379,7 @@ sub_8199334: @ 8199334 cmp r0, 0 beq _0819935C movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x2 ldrsb r0, [r5, r0] b _081993D2 @@ -38445,7 +38445,7 @@ _081993BC: cmp r4, r0 beq _081993CE movs r0, 0x5 - bl audio_play + bl PlaySE _081993CE: movs r0, 0x2 negs r0, r0 @@ -38465,7 +38465,7 @@ sub_81993D8: @ 81993D8 cmp r0, 0 beq _08199400 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CD90 ldrb r0, [r0, 0x2] lsls r0, 24 @@ -38488,7 +38488,7 @@ _0819940E: cmp r1, 0x40 bne _08199428 movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -38497,7 +38497,7 @@ _08199428: cmp r1, 0x80 bne _08199438 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0x1 b _08199474 @@ -38511,7 +38511,7 @@ _08199438: bne _08199454 _08199448: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _08199472 @@ -38528,7 +38528,7 @@ _08199454: bne _08199478 _0819946A: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _08199472: movs r1, 0 @@ -38555,7 +38555,7 @@ sub_8199484: @ 8199484 cmp r0, 0 beq _081994AC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x2 ldrsb r0, [r6, r0] b _0819951E @@ -38619,7 +38619,7 @@ _08199508: cmp r4, r0 beq _0819951A movs r0, 0x5 - bl audio_play + bl PlaySE _0819951A: movs r0, 0x2 negs r0, r0 @@ -42024,7 +42024,7 @@ _0819B084: cmp r0, 0 beq _0819B0B8 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r7] ldrb r4, [r0, 0x7] cmp r4, 0 @@ -42041,7 +42041,7 @@ _0819B0B8: cmp r0, 0 beq _0819B0EC movs r0, 0x5 - bl audio_play + bl PlaySE _0819B0C6: movs r0, 0x4 bl sub_819B958 @@ -42063,7 +42063,7 @@ _0819B0EC: cmp r0, 0 beq _0819B106 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 bl sub_819AC78 @@ -42074,7 +42074,7 @@ _0819B106: cmp r0, 0 beq _0819B11A movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_819AC78 _0819B11A: @@ -42178,7 +42178,7 @@ _0819B1EC: cmp r0, 0 beq _0819B27C movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_819BC04 lsls r0, 24 lsrs r0, 24 @@ -42235,7 +42235,7 @@ _0819B27C: cmp r0, 0 beq _0819B2D0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0300127C ldr r1, [r4] movs r2, 0xA6 @@ -42271,7 +42271,7 @@ _0819B2D0: cmp r0, 0 beq _0819B2EA movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 bl sub_819AC10 @@ -42282,7 +42282,7 @@ _0819B2EA: cmp r0, 0 beq _0819B36E movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_819AC10 b _0819B36E @@ -42398,7 +42398,7 @@ _0819B3DC: cmp r1, 0 beq _0819B40C movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r5] ldr r1, =0x000002a2 adds r0, r1 @@ -42417,7 +42417,7 @@ _0819B40C: cmp r0, 0 beq _0819B422 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _0819B432 @@ -42427,7 +42427,7 @@ _0819B422: cmp r0, 0 beq _0819B476 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _0819B432: bl sub_819ABA8 @@ -42443,7 +42443,7 @@ _0819B440: cmp r0, 0 beq _0819B476 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, [r5] movs r2, 0xA6 lsls r2, 2 @@ -45179,7 +45179,7 @@ _0819CB5A: cmp r5, 0 beq _0819CB86 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r7] ldrb r0, [r0, 0x16] cmp r0, 0 @@ -45197,7 +45197,7 @@ _0819CB86: cmp r0, 0 beq _0819CBA8 movs r0, 0x5 - bl audio_play + bl PlaySE strh r5, [r4, 0xA] _0819CB96: movs r0, 0x4 @@ -45216,7 +45216,7 @@ _0819CBA8: cmp r0, 0 beq _0819CBC2 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 bl sub_819E758 @@ -45227,7 +45227,7 @@ _0819CBC2: cmp r0, 0 beq _0819CBD6 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl sub_819E758 _0819CBD6: @@ -45463,7 +45463,7 @@ _0819CDA4: cmp r4, 0 beq _0819CDD8 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl sub_819F0A0 b _0819CE36 @@ -45474,7 +45474,7 @@ _0819CDD8: cmp r0, 0 beq _0819CE14 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, [r7] ldr r0, [r1, 0x2C] adds r1, 0x30 @@ -45559,7 +45559,7 @@ _0819CE88: cmp r5, 0 beq _0819CEBC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03001284 ldr r0, [r0] adds r0, 0x22 @@ -45577,7 +45577,7 @@ _0819CEBC: cmp r0, 0 beq _0819CEF8 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03001284 ldr r0, [r0] adds r0, 0x22 @@ -48375,7 +48375,7 @@ sub_819E694: @ 819E694 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE lsls r4, 24 cmp r4, 0 ble _0819E6C0 @@ -48419,7 +48419,7 @@ sub_819E6E8: @ 819E6E8 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE lsls r4, 24 cmp r4, 0 ble _0819E728 @@ -48536,7 +48536,7 @@ sub_819E7C0: @ 819E7C0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE lsls r4, 24 cmp r4, 0 ble _0819E7EC @@ -50125,7 +50125,7 @@ _0819F4F8: beq _0819F58A _0819F50C: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_03001284 ldr r1, [r0] ldr r0, [r1, 0x2C] @@ -52431,7 +52431,7 @@ _081A0734: cmp r0, 0 bne _081A0778 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020375F0 movs r0, 0x7F strh r0, [r1] @@ -61348,7 +61348,7 @@ _081A53CE: .pool _081A540C: ldr r0, =0x00000109 - bl audio_play + bl PlaySE movs r0, 0x50 movs r1, 0x28 movs r2, 0 @@ -61361,7 +61361,7 @@ _081A540C: .pool _081A542C: ldr r0, =0x00000109 - bl audio_play + bl PlaySE movs r0, 0x50 movs r1, 0x38 movs r2, 0x1 @@ -61374,7 +61374,7 @@ _081A542C: .pool _081A544C: ldr r0, =0x00000109 - bl audio_play + bl PlaySE movs r0, 0x50 movs r1, 0x48 movs r2, 0x2 @@ -61400,7 +61400,7 @@ _081A5464: _081A5490: movs r0, 0x85 lsls r0, 1 - bl audio_play + bl PlaySE ldr r0, =gBattleTextBuff1 ldr r1, =gBattleTextBuff2 ldrb r2, [r0] @@ -69475,7 +69475,7 @@ _081A96B4: _081A96F4: ldr r0, =gUnknown_020375E6 ldrh r0, [r0] - bl audio_play + bl PlaySE _081A96FC: ldr r1, =gUnknown_020375F0 ldrh r0, [r1] @@ -73045,7 +73045,7 @@ bag_menu_change_item_callback: @ 81AB450 cmp r1, 0x1 beq _081AB466 movs r0, 0x5 - bl audio_play + bl PlaySE bl ShakeBagVisual _081AB466: ldr r4, =gUnknown_0203CE54 @@ -74180,7 +74180,7 @@ _081ABDCC: cmp r2, r0 beq _081ABEB2 movs r0, 0x5 - bl audio_play + bl PlaySE mov r0, r9 bl bag_menu_swap_items b _081ABEB2 @@ -74206,11 +74206,11 @@ _081ABE32: cmp r0, 0x5 bne _081ABE40 movs r0, 0x20 - bl audio_play + bl PlaySE b _081ABEB2 _081ABE40: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CE7C mov r1, r10 strh r1, [r0] @@ -74224,7 +74224,7 @@ _081ABE40: .pool _081ABE68: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_81AB824 ldrb r0, [r6] movs r1, 0x2 @@ -74320,7 +74320,7 @@ GetSwitchBagPocketDirection: @ 81ABF10 bne _081ABF54 _081ABF3C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 b _081ABF6C .pool @@ -74333,7 +74333,7 @@ _081ABF54: bne _081ABF6A _081ABF60: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x2 b _081ABF6C _081ABF6A: @@ -74867,7 +74867,7 @@ sub_81AC3C0: @ 81AC3C0 cmp r0, 0 beq _081AC418 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] ldr r3, =gUnknown_0203CE58 ldrb r2, [r3, 0x5] @@ -74913,7 +74913,7 @@ _081AC418: .pool _081AC460: movs r0, 0x5 - bl audio_play + bl PlaySE mov r0, r8 ldrh r1, [r0, 0x2E] movs r0, 0x1 @@ -74930,7 +74930,7 @@ _081AC47A: b _081AC48E _081AC482: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl sub_81AC498 _081AC48E: @@ -75730,7 +75730,7 @@ Task_HandleInBattleItemMenuInput: @ 81ACC04 cmp r4, r0 bne _081ACC44 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_08613FB4 ldr r1, [r0, 0x24] adds r0, r5, 0 @@ -75739,7 +75739,7 @@ Task_HandleInBattleItemMenuInput: @ 81ACC04 .pool _081ACC44: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_08613FB4 ldr r0, =gUnknown_0203CE54 ldr r0, [r0] @@ -75799,7 +75799,7 @@ _081ACCAA: b _081ACDF0 _081ACCBC: movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -75831,7 +75831,7 @@ _081ACCF2: cmp r0, 0 beq _081ACDF0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0x1 bl sub_8199134 @@ -75862,7 +75862,7 @@ _081ACD30: cmp r0, 0 beq _081ACDF0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _081ACD92 @@ -75892,7 +75892,7 @@ _081ACD6E: cmp r0, 0 beq _081ACDF0 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _081ACD92: movs r1, 0 @@ -75905,7 +75905,7 @@ _081ACD9A: cmp r0, 0 beq _081ACDD8 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_08613FB4 ldr r0, =gUnknown_0203CE54 ldr r0, [r0] @@ -75931,7 +75931,7 @@ _081ACDD8: cmp r0, 0 beq _081ACDF0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_08613FB4 ldr r1, [r0, 0x24] adds r0, r6, 0 @@ -76237,7 +76237,7 @@ _081AD088: cmp r0, 0 beq _081AD0AC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 bl bag_menu_remove_window adds r0, r5, 0 @@ -76250,7 +76250,7 @@ _081AD0AC: cmp r0, 0 beq _081AD0C6 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 bl bag_menu_remove_window adds r0, r6, 0 @@ -76341,7 +76341,7 @@ Task_ActuallyToss: @ 81AD150 cmp r0, 0 beq _081AD1CE movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] ldrh r1, [r5, 0x10] @@ -76537,7 +76537,7 @@ sub_81AD350: @ 81AD350 cmp r0, 0 beq _081AD36E movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl bag_menu_inits_lists_menu _081AD36E: @@ -77048,7 +77048,7 @@ _081AD7F4: cmp r0, 0 beq _081AD818 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x8 bl bag_menu_remove_window adds r0, r4, 0 @@ -77061,7 +77061,7 @@ _081AD818: cmp r0, 0 beq _081AD844 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r6] movs r1, 0 bl bag_menu_print_cursor_ @@ -77151,7 +77151,7 @@ sub_81AD8C8: @ 81AD8C8 adds r0, 0x8 adds r5, r0 movs r0, 0x5F - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203CE7C mov r8, r2 ldrh r0, [r2] @@ -77238,7 +77238,7 @@ sub_81AD9C0: @ 81AD9C0 cmp r0, 0 beq _081AD9E2 movs r0, 0x5 - bl audio_play + bl PlaySE bl bag_menu_remove_money_window adds r0, r4, 0 bl bag_menu_inits_lists_menu @@ -77346,7 +77346,7 @@ _081ADAC0: cmp r0, 0 beq _081ADAE4 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 bl bag_menu_remove_window adds r0, r4, 0 @@ -77359,7 +77359,7 @@ _081ADAE4: cmp r0, 0 beq _081ADB0E movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x2 ldrsh r0, [r5, r1] bl bag_menu_print_description_box_text @@ -77498,7 +77498,7 @@ sub_81ADC0C: @ 81ADC0C cmp r0, 0 beq _081ADC44 movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x2 ldrsh r0, [r5, r1] bl bag_menu_print_description_box_text @@ -77708,7 +77708,7 @@ _081ADDD0: b _081ADE2C _081ADDDA: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 movs r1, 0x1 movs r2, 0 @@ -77716,7 +77716,7 @@ _081ADDDA: b _081ADE2C _081ADDEC: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -77729,7 +77729,7 @@ _081ADDEC: .pool _081ADE0C: movs r0, 0x5 - bl audio_play + bl PlaySE bl bag_menu_remove_some_window ldrb r0, [r4] movs r1, 0 @@ -80108,7 +80108,7 @@ sub_81AF078: @ 81AF078 cmp r1, 0 bne _081AF086 movs r0, 0x5 - bl audio_play + bl PlaySE _081AF086: pop {r0} bx r0 @@ -84472,7 +84472,7 @@ _081B13CA: cmp r0, 0 beq _081B13E0 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_81B4F88 _081B13E0: pop {r4-r6} @@ -84596,7 +84596,7 @@ _081B14E8: cmp r0, 0 beq _081B159E movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r0, [r0] adds r0, 0xD @@ -84612,7 +84612,7 @@ _081B1510: cmp r0, 0 beq _081B159E movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r0, [r0] adds r0, 0xD @@ -84628,7 +84628,7 @@ _081B1538: cmp r0, 0 beq _081B159E movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r0, [r0] adds r0, 0xD @@ -84639,13 +84639,13 @@ _081B1538: .pool _081B1560: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81B3938 b _081B159E _081B156E: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81B12C0 b _081B159E @@ -84661,7 +84661,7 @@ _081B157C: b _081B159E _081B1592: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81B36FC _081B159E: @@ -84687,7 +84687,7 @@ sub_81B15A4: @ 81B15A4 .pool _081B15C4: movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0 _081B15CC: pop {r1} @@ -84718,23 +84718,23 @@ _081B15F0: b _081B161E _081B15FA: movs r0, 0x20 - bl audio_play + bl PlaySE b _081B1652 _081B1602: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B407C b _081B1652 _081B1610: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B2210 b _081B1652 _081B161E: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B1660 lsls r0, 24 @@ -84874,7 +84874,7 @@ _081B172E: .pool _081B174C: movs r0, 0x5 - bl audio_play + bl PlaySE _081B1752: adds r0, r4, 0 bl sub_81B1C1C @@ -85005,7 +85005,7 @@ _081B182A: cmp r1, r0 beq _081B184C movs r0, 0x5 - bl audio_play + bl PlaySE lsrs r0, r4, 24 movs r1, 0 bl sub_81B0FCC @@ -86218,7 +86218,7 @@ sub_81B21AC: @ 81B21AC cmp r0, 0x1 bne _081B21DC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020375E0 strh r5, [r0] adds r0, r4, 0 @@ -86227,7 +86227,7 @@ sub_81B21AC: @ 81B21AC .pool _081B21DC: movs r0, 0x20 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085EA0EE movs r1, 0 bl sub_81B1B5C @@ -86327,7 +86327,7 @@ _081B22A2: .pool _081B22B4: movs r0, 0x5 - bl audio_play + bl PlaySE _081B22BA: ldr r0, =gTasks lsls r1, r4, 2 @@ -88819,7 +88819,7 @@ _081B3778: cmp r5, r0 bne _081B37CC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xE @@ -88867,7 +88867,7 @@ sub_81B37FC: @ 81B37FC lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r1, [r0] ldr r0, =sub_81B3828 @@ -88963,7 +88963,7 @@ brm_switch: @ 81B38DC lsls r6, 24 lsrs r6, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203CEC8 movs r0, 0x8 strb r0, [r5, 0xB] @@ -89907,7 +89907,7 @@ brm_cancel_1: @ 81B40D4 lsls r0, 24 lsrs r5, r0, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -89949,7 +89949,7 @@ sub_81B4134: @ 81B4134 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -89988,7 +89988,7 @@ sub_81B4198: @ 81B4198 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r1, [r0] ldr r0, =sub_81B41C4 @@ -90337,7 +90337,7 @@ _081B4498: .pool _081B44D8: movs r0, 0x5 - bl audio_play + bl PlaySE _081B44DE: ldr r0, =gTasks lsls r1, r4, 2 @@ -90612,7 +90612,7 @@ sub_81B4724: @ 81B4724 lsls r0, 16 lsrs r6, r0, 16 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -90686,7 +90686,7 @@ sub_81B47E0: @ 81B47E0 lsls r0, 16 lsrs r5, r0, 16 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -90819,7 +90819,7 @@ _081B491A: .pool _081B4964: movs r0, 0x5 - bl audio_play + bl PlaySE _081B496A: ldr r0, =gTasks lsls r1, r5, 2 @@ -90898,7 +90898,7 @@ sub_81B4A08: @ 81B4A08 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -90937,7 +90937,7 @@ sub_81B4A6C: @ 81B4A6C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC4 ldr r1, [r0] ldr r0, =sub_81B4A98 @@ -91014,7 +91014,7 @@ brm_take_2: @ 81B4B20 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203CEC4 ldr r0, [r5] adds r0, 0xD @@ -91122,7 +91122,7 @@ _081B4C0C: .pool _081B4C30: movs r0, 0x5 - bl audio_play + bl PlaySE _081B4C36: ldr r0, =gUnknown_085E98B4 movs r1, 0x1 @@ -91246,7 +91246,7 @@ _081B4D24: .pool _081B4D50: movs r0, 0x5 - bl audio_play + bl PlaySE _081B4D56: ldr r0, =gTasks lsls r1, r5, 2 @@ -91280,7 +91280,7 @@ sub_81B4D78: @ 81B4D78 ldr r6, =gPlayerParty adds r7, r0, r6 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -91345,7 +91345,7 @@ brm_shift_sendout: @ 81B4E2C lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203CEC4 ldr r0, [r5] adds r0, 0xC @@ -91416,7 +91416,7 @@ _081B4EC6: bne _081B4F2C movs r0, 0x5 str r2, [sp] - bl audio_play + bl PlaySE ldr r2, [sp] ldrb r0, [r2, 0x9] adds r0, 0x1 @@ -91462,7 +91462,7 @@ _081B4F36: adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x20 - bl audio_play + bl PlaySE adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C @@ -91509,7 +91509,7 @@ sub_81B4FA8: @ 81B4FA8 lsrs r0, 24 mov r8, r0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -91627,7 +91627,7 @@ sub_81B50AC: @ 81B50AC lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B12C0 pop {r4} @@ -91695,7 +91695,7 @@ sub_81B50C8: @ 81B50C8 cmp r0, 0x2 beq _081B5170 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r7, 0 bl sub_81B12C0 b _081B51B0 @@ -91712,7 +91712,7 @@ _081B5170: bl StringExpandPlaceholders _081B5178: movs r0, 0x20 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -91813,7 +91813,7 @@ brm_trade_1: @ 81B51D4 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x20 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEC4 ldr r0, [r4] adds r0, 0xC @@ -91838,7 +91838,7 @@ brm_trade_1: @ 81B51D4 .pool _081B52C8: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r7, 0 bl sub_81B12C0 _081B52D4: @@ -91903,7 +91903,7 @@ _081B5354: .pool _081B5368: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CEC8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -91930,7 +91930,7 @@ _081B5368: .pool _081B53C0: movs r0, 0x20 - bl audio_play + bl PlaySE ldr r4, =gStringVar4 ldr r1, =gUnknown_085EA1CA adds r0, r4, 0 @@ -92004,7 +92004,7 @@ _081B5456: b _081B546A _081B545E: movs r0, 0x5 - bl audio_play + bl PlaySE _081B5464: adds r0, r4, 0 bl sub_81B1C1C @@ -92031,7 +92031,7 @@ sub_81B5470: @ 81B5470 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_08615D9C lsls r0, r4, 3 adds r7, r0, r1 @@ -92302,7 +92302,7 @@ _081B56FE: .pool _081B5714: movs r0, 0x5 - bl audio_play + bl PlaySE _081B571A: ldr r0, =gUnknown_03005DB0 movs r1, 0 @@ -94120,7 +94120,7 @@ _081B6600: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E96F6 b _081B66F4 .pool @@ -94134,7 +94134,7 @@ _081B6624: cmp r0, 0 bne _081B6650 movs r0, 0x1 - bl audio_play + bl PlaySE ldrb r0, [r4, 0xB] cmp r0, 0xE beq _081B6656 @@ -94145,7 +94145,7 @@ _081B6624: .pool _081B6650: movs r0, 0x75 - bl audio_play + bl PlaySE _081B6656: ldr r4, =gUnknown_0203CEDC ldr r7, =gUnknown_0203CEC8 @@ -94373,7 +94373,7 @@ _081B6850: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E96F6 b _081B68E2 .pool @@ -94382,7 +94382,7 @@ _081B6874: movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - bl audio_play + bl PlaySE adds r0, r6, 0 movs r1, 0x1 bl remove_item @@ -94659,7 +94659,7 @@ ether_effect_related_3: @ 81B6AB4 cmp r1, r0 bne _081B6AE0 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B6BB4 b _081B6AF0 @@ -94714,7 +94714,7 @@ _081B6B2A: .pool _081B6B4C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x16 bl display_pokemon_menu_message ldr r0, =gUnknown_0203CEC8 @@ -94807,7 +94807,7 @@ ether_effect_related: @ 81B6BEC ldr r0, =gUnknown_0203CEE8 strb r4, [r0] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_085E96F6 b _081B6C7E .pool @@ -94824,7 +94824,7 @@ _081B6C34: ldr r0, =gPlayerParty adds r4, r0 movs r0, 0x1 - bl audio_play + bl PlaySE adds r0, r5, 0 movs r1, 0x1 bl remove_item @@ -94871,7 +94871,7 @@ dp05_pp_up: @ 81B6CC0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x17 bl display_pokemon_menu_message ldr r0, =gUnknown_0203CEC8 @@ -95009,7 +95009,7 @@ sub_81B6DC4: @ 81B6DC4 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r7, =gUnknown_0203CEC8 movs r1, 0x9 ldrsb r1, [r7, r1] @@ -95292,7 +95292,7 @@ _081B704E: .pool _081B7074: movs r0, 0x5 - bl audio_play + bl PlaySE _081B707A: adds r0, r4, 0 bl sub_81B7230 @@ -95629,7 +95629,7 @@ _081B7370: .pool _081B738C: movs r0, 0x5 - bl audio_play + bl PlaySE _081B7392: ldr r1, =gStringVar1 adds r0, r4, 0 @@ -95729,7 +95729,7 @@ _081B7478: movs r4, 0x1 _081B747A: movs r0, 0x5 - bl audio_play + bl PlaySE cmp r4, 0 beq _081B74B4 ldr r1, =gUnknown_0203CEE8 @@ -95889,7 +95889,7 @@ sub_81B75D4: @ 81B75D4 beq _081B7620 _081B7606: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B767C ldr r0, =gTasks @@ -95923,7 +95923,7 @@ sub_81B7634: @ 81B7634 beq _081B7668 _081B764E: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81B76C8 ldr r0, =gTasks @@ -96394,7 +96394,7 @@ _081B7A6E: .pool _081B7A94: movs r0, 0x1 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203CEDC movs r0, 0x9 ldrsb r0, [r6, r0] @@ -96597,7 +96597,7 @@ sub_81B7C74: @ 81B7C74 lsls r0, 24 lsrs r5, r0, 24 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_030061E8 ldr r1, =gUnknown_0203CEC8 ldr r0, [r1] @@ -97421,7 +97421,7 @@ _081B8378: .pool _081B8394: movs r0, 0x5 - bl audio_play + bl PlaySE _081B839A: ldr r0, =gTasks lsls r1, r5, 2 @@ -97924,7 +97924,7 @@ sub_81B879C: @ 81B879C cmp r4, 0xFF beq _081B87D4 movs r0, 0x20 - bl audio_play + bl PlaySE adds r0, r4, 0 bl display_pokemon_menu_message ldr r0, =gTasks @@ -97938,7 +97938,7 @@ sub_81B879C: @ 81B879C .pool _081B87D4: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81B12C0 _081B87E0: @@ -97964,7 +97964,7 @@ sub_81B87E8: @ 81B87E8 beq _081B881C _081B8802: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl display_pokemon_menu_message ldr r0, =gTasks @@ -99223,7 +99223,7 @@ _081B9204: cmp r4, 0x5 bls _081B91E8 movs r0, 0x78 - bl audio_play + bl PlaySE ldr r0, =gTasks adds r1, r6, r5 lsls r1, 3 @@ -101631,7 +101631,7 @@ _081BA638: strb r2, [r6, 0x1C] b _081BA50E _081BA63C: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r0, 24 cmp r0, 0 diff --git a/asm/rom_81BAD84.s b/asm/rom_81BAD84.s index 047a3a889..f57840d13 100644 --- a/asm/rom_81BAD84.s +++ b/asm/rom_81BAD84.s @@ -279,7 +279,7 @@ _081BAFA0: _081BAFD6: movs r6, 0x1 _081BAFD8: - bl sub_80A36C8 + bl IsCryPlayingOrClearCrySongs lsls r0, 24 cmp r0, 0 beq _081BAFE4 @@ -838,7 +838,7 @@ sub_81BB414: @ 81BB414 mov r0, r10 bl sub_807294C movs r0, 0x21 - bl audio_play + bl PlaySE ldr r0, =sub_81BB4E4 mov r1, r8 str r0, [r1] @@ -4600,7 +4600,7 @@ _081BD6C8: movs r1, 0x40 negs r1, r1 movs r0, 0x10 - bl audio_play_and_stuff + bl PlaySE12WithPanning ldr r2, =gSprites ldr r3, =gBankSpriteIds ldrb r0, [r5] @@ -5688,7 +5688,7 @@ _081BE00C: orrs r0, r1 lsls r1, r3, 24 asrs r1, 24 - bl audio_play_and_stuff + bl PlaySE12WithPanning bl dp01_tbl3_exec_completed pop {r4} pop {r0} @@ -6698,7 +6698,7 @@ sp136_strengh_sound: @ 81BE89C movs r0, 0 bl SetCameraPanningCallback movs r0, 0xD6 - bl audio_play + bl PlaySE pop {r3} mov r8, r3 pop {r4-r6} @@ -9826,7 +9826,7 @@ sub_81C0484: @ 81C0484 bl sub_81C4898 bl ResetSpriteData bl FreeAllSpritePalettes - bl sub_80A369C + bl StopCryAndClearCrySongs ldr r0, =gMPlay_BGM ldr r1, =0x0000ffff movs r2, 0x80 @@ -9936,14 +9936,14 @@ _081C05A2: bne _081C05D8 bl sub_81C48F0 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C044C b _081C05FE .pool _081C05D8: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C0E48 b _081C05FE @@ -9954,7 +9954,7 @@ _081C05E6: beq _081C05FE bl sub_81C48F0 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C044C _081C05FE: @@ -10041,7 +10041,7 @@ _081C0696: cmp r0, r1 beq _081C06EE movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203CF1C ldr r0, [r5] adds r0, 0x77 @@ -10117,7 +10117,7 @@ _081C0730: .4byte _081C0878 .4byte _081C0894 _081C0764: - bl sub_80A369C + bl StopCryAndClearCrySongs b _081C08EC _081C076A: bl sub_81C4898 @@ -10546,7 +10546,7 @@ _081C0AE0: beq _081C0B6E _081C0AF4: movs r0, 0x5 - bl audio_play + bl PlaySE mov r1, r8 ldr r0, [r1] ldr r4, =0x000040c0 @@ -11075,7 +11075,7 @@ _081C0FC0: bne _081C1004 _081C0FE8: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81C11F4 b _081C103A @@ -11087,13 +11087,13 @@ _081C1004: cmp r0, 0x1 bne _081C101E movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81C129C b _081C103A _081C101E: movs r0, 0x20 - bl audio_play + bl PlaySE b _081C103A _081C1026: movs r0, 0x2 @@ -11101,7 +11101,7 @@ _081C1026: cmp r0, 0 beq _081C103A movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl sub_81C11F4 _081C103A: @@ -11151,7 +11151,7 @@ sub_81C1070: @ 81C1070 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE mov r0, r8 ldrb r6, [r0] movs r2, 0 @@ -11513,7 +11513,7 @@ sub_81C13B0: @ 81C13B0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C4C84 movs r0, 0x12 @@ -12037,7 +12037,7 @@ _081C181C: bne _081C1868 bl sub_81C48F0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203CF21 ldr r0, =gUnknown_0203CF1C ldr r0, [r0] @@ -12054,7 +12054,7 @@ _081C181C: .pool _081C1868: movs r0, 0x20 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81C18F4 b _081C189A @@ -12065,7 +12065,7 @@ _081C1876: beq _081C189A bl sub_81C48F0 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_0203CF21 movs r0, 0x4 strb r0, [r1] @@ -19002,7 +19002,7 @@ sub_81C5460: @ 81C5460 cmp r1, 0x1 beq _081C5476 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_81C6F20 _081C5476: ldr r5, =gUnknown_0203CF2C @@ -19932,7 +19932,7 @@ _081C5C12: cmp r1, r0 beq _081C5D16 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81C67CC b _081C5D16 @@ -19958,7 +19958,7 @@ _081C5C5C: .pool _081C5C88: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CE7C strh r4, [r0] adds r0, r5, 0 @@ -19967,7 +19967,7 @@ _081C5C88: .pool _081C5CA0: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0203CE7C mov r12, r2 ldr r0, =gSaveBlock2Ptr @@ -20287,7 +20287,7 @@ sub_81C5F68: @ 81C5F68 cmp r4, r0 bne _081C5FA8 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0861F2D8 ldr r1, [r0, 0x1C] adds r0, r5, 0 @@ -20296,7 +20296,7 @@ sub_81C5F68: @ 81C5F68 .pool _081C5FA8: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_0861F2D8 ldr r0, =gUnknown_0203CF2C ldr r0, [r0] @@ -20357,7 +20357,7 @@ _081C6016: b _081C6160 _081C6028: movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -20390,7 +20390,7 @@ _081C6060: cmp r0, 0 beq _081C6160 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0x1 bl sub_8199134 @@ -20421,7 +20421,7 @@ _081C6098: cmp r0, 0 beq _081C6160 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 b _081C60FA @@ -20451,7 +20451,7 @@ _081C60D6: cmp r0, 0 beq _081C6160 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 _081C60FA: movs r1, 0 @@ -20464,7 +20464,7 @@ _081C6102: cmp r0, 0 beq _081C6148 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r2, =gUnknown_0861F2D8 ldr r0, =gUnknown_0203CF2C ldr r0, [r0] @@ -20491,7 +20491,7 @@ _081C6148: cmp r0, 0 beq _081C6160 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0861F2D8 ldr r1, [r0, 0x1C] adds r0, r6, 0 @@ -20906,7 +20906,7 @@ _081C64E8: cmp r0, 0 beq _081C651C movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x3 movs r1, 0 bl sub_8198070 @@ -20924,7 +20924,7 @@ _081C651C: cmp r0, 0 beq _081C6544 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x3 movs r1, 0 bl sub_8198070 @@ -21008,7 +21008,7 @@ sub_81C65CC: @ 81C65CC cmp r0, 0 beq _081C662E movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] ldrh r1, [r4, 0x10] @@ -21117,7 +21117,7 @@ sub_81C66EC: @ 81C66EC cmp r0, 0 beq _081C670A movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C6714 _081C670A: @@ -21323,7 +21323,7 @@ sub_81C68B0: @ 81C68B0 cmp r0, 0 beq _081C68F8 movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4] ldr r1, =gUnknown_0203CF38 subs r2, r1, 0x2 @@ -21355,7 +21355,7 @@ _081C68F8: .pool _081C6930: movs r0, 0x5 - bl audio_play + bl PlaySE ldrh r1, [r7, 0x2E] movs r0, 0x1 ands r0, r1 @@ -21371,7 +21371,7 @@ _081C6948: b _081C695C _081C6950: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81C6964 _081C695C: @@ -23052,7 +23052,7 @@ sub_81C7710: @ 81C7710 push {lr} sub sp, 0x4 movs r0, 0x6F - bl audio_play + bl PlaySE bl sub_81CAADC movs r1, 0x1 negs r1, r1 @@ -27000,7 +27000,7 @@ _081C9570: beq _081C957E _081C9578: movs r0, 0x20 - bl audio_play + bl PlaySE _081C957E: movs r0, 0 _081C9580: @@ -27040,7 +27040,7 @@ _081C9598: cmp r0, 0x4 beq _081C95F4 movs r0, 0x20 - bl audio_play + bl PlaySE movs r0, 0 b _081C95F8 .pool @@ -27181,7 +27181,7 @@ _081C96B8: .pool _081C96E4: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C97C0 movs r0, 0x3 @@ -27253,7 +27253,7 @@ _081C9754: .pool _081C9780: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81C97F8 movs r0, 0x5 @@ -27793,7 +27793,7 @@ _081C9BC0: b _081C9BEC _081C9BE0: movs r0, 0x6E - bl audio_play + bl PlaySE movs r0, 0x3 bl sub_81C7AC0 _081C9BEC: @@ -27872,7 +27872,7 @@ _081C9C78: bl sub_81CA278 bl sub_81CA714 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 b _081C9CA4 _081C9C8E: @@ -27915,7 +27915,7 @@ _081C9CC2: movs r1, 0 bl sub_81C7FC4 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 b _081C9D3E _081C9CDC: @@ -28056,7 +28056,7 @@ _081C9DF2: bl sub_81CA9C8 bl sub_81CA2DC movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 b _081C9E52 _081C9E04: @@ -28167,7 +28167,7 @@ sub_81C9EC8: @ 81C9EC8 b _081C9EF0 _081C9ED4: movs r0, 0x20 - bl audio_play + bl PlaySE bl sub_81CA770 movs r0, 0 b _081C9EF2 @@ -28195,7 +28195,7 @@ sub_81C9EF8: @ 81C9EF8 b _081C9F20 _081C9F04: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_81CA714 movs r0, 0 b _081C9F22 @@ -28262,7 +28262,7 @@ _081C9F84: bl sub_81C7FC4 _081C9F8C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 b _081C9FBE _081C9F96: @@ -29852,7 +29852,7 @@ _081CABD0: .pool _081CABEC: movs r0, 0x20 - bl audio_play + bl PlaySE _081CABF2: movs r0, 0 _081CABF4: @@ -31073,12 +31073,12 @@ _081CB546: b _081CB56E _081CB54C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CB582 _081CB556: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CB56E _081CB55E: bl sub_81C8630 @@ -31142,12 +31142,12 @@ _081CB5BE: b _081CB5E6 _081CB5C4: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CB5FA _081CB5CE: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CB5E6 _081CB5D6: bl sub_81C8630 @@ -31211,12 +31211,12 @@ _081CB636: b _081CB65E _081CB63C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CB672 _081CB646: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CB65E _081CB64E: bl sub_81C8630 @@ -31280,12 +31280,12 @@ _081CB6AE: b _081CB6D6 _081CB6B4: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CB6EA _081CB6BE: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CB6D6 _081CB6C6: bl sub_81C8630 @@ -31328,7 +31328,7 @@ sub_81CB6F0: @ 81CB6F0 b _081CB72A _081CB706: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81CBF60 movs r0, 0x7 @@ -31354,7 +31354,7 @@ _081CB72C: sub_81CB734: @ 81CB734 push {r4,lr} movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x6 bl sub_81C763C adds r4, r0, 0 @@ -31384,7 +31384,7 @@ sub_81CB75C: @ 81CB75C b _081CB796 _081CB772: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81CBFF0 movs r0, 0x6 @@ -31442,7 +31442,7 @@ _081CB7D4: adds r0, r5, 0 bl sub_81CC0E0 ldr r0, =0x00000107 - bl audio_play + bl PlaySE strb r4, [r5, 0xE] movs r0, 0 b _081CB81C @@ -31492,7 +31492,7 @@ _081CB83E: b _081CB880 _081CB844: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81CC09C movs r0, 0x1 @@ -31557,10 +31557,10 @@ _081CB8C4: bne _081CB8D2 movs r0, 0x84 lsls r0, 1 - bl audio_play + bl PlaySE _081CB8D2: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CB934 _081CB8DA: adds r0, r4, 0 @@ -31636,7 +31636,7 @@ _081CB956: b _081CB9BE _081CB960: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_81C877C adds r0, r5, 0 bl sub_81CC014 @@ -31712,7 +31712,7 @@ _081CB9FC: cmp r5, 0 beq _081CBA60 movs r0, 0x5 - bl audio_play + bl PlaySE strh r5, [r4, 0x16] adds r0, r4, 0 bl sub_81CC420 @@ -31779,7 +31779,7 @@ _081CBA82: b _081CBACC _081CBA88: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81CC420 bl sub_81C87F0 @@ -31844,7 +31844,7 @@ _081CBB08: cmp r5, 0 beq _081CBB6C movs r0, 0x5 - bl audio_play + bl PlaySE strh r5, [r4, 0x16] adds r0, r4, 0 bl sub_81CC420 @@ -31901,7 +31901,7 @@ sub_81CBB74: @ 81CBB74 b _081CBBB2 _081CBB80: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81CBC38 movs r0, 0 @@ -33559,7 +33559,7 @@ _081CC888: b _081CC8D0 _081CC88E: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81CCC5C bl sub_8123418 @@ -33616,7 +33616,7 @@ _081CC8F2: b _081CC952 _081CC8FC: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81CCB0C movs r0, 0 @@ -33677,7 +33677,7 @@ _081CC96C: b _081CC9B8 _081CC972: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 movs r0, 0 @@ -34583,7 +34583,7 @@ sub_81CD08C: @ 81CD08C bne _081CD100 _081CD0D0: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =0x00006304 adds r1, r4, r0 ldr r0, =sub_81CD19C @@ -34593,7 +34593,7 @@ _081CD0D0: .pool _081CD0F0: movs r0, 0x5 - bl audio_play + bl PlaySE movs r2, 0x5 ldr r0, =0x00006304 adds r1, r4, r0 @@ -34736,7 +34736,7 @@ sub_81CD1E4: @ 81CD1E4 beq _081CD24E _081CD210: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 b _081CD246 .pool @@ -34758,7 +34758,7 @@ _081CD220: bge _081CD24E _081CD23E: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 _081CD246: bl sub_81CD258 @@ -39053,12 +39053,12 @@ _081CF5AE: b _081CF5D4 _081CF5B4: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CF5E8 _081CF5BE: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CF5D4 _081CF5C6: bl sub_81C8630 @@ -39121,12 +39121,12 @@ _081CF626: b _081CF64C _081CF62C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CF660 _081CF636: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CF64C _081CF63E: bl sub_81C8630 @@ -39189,12 +39189,12 @@ _081CF69E: b _081CF6C4 _081CF6A4: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CF6D8 _081CF6AE: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CF6C4 _081CF6B6: bl sub_81C8630 @@ -39257,12 +39257,12 @@ _081CF716: b _081CF73C _081CF71C: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081CF750 _081CF726: movs r0, 0x5 - bl audio_play + bl PlaySE b _081CF73C _081CF72E: bl sub_81C8630 @@ -39300,7 +39300,7 @@ sub_81CF758: @ 81CF758 b _081CF790 _081CF764: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 bl sub_81C78A0 @@ -39335,7 +39335,7 @@ sub_81CF798: @ 81CF798 b _081CF7C0 _081CF7A4: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 movs r0, 0 @@ -40427,12 +40427,12 @@ _081D0032: b _081D0058 _081D0038: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081D006C _081D0042: movs r0, 0x5 - bl audio_play + bl PlaySE b _081D0058 _081D004A: bl sub_81C8630 @@ -40495,12 +40495,12 @@ _081D00AA: b _081D00D0 _081D00B0: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081D00E4 _081D00BA: movs r0, 0x5 - bl audio_play + bl PlaySE b _081D00D0 _081D00C2: bl sub_81C8630 @@ -40563,12 +40563,12 @@ _081D0122: b _081D0148 _081D0128: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081D015C _081D0132: movs r0, 0x5 - bl audio_play + bl PlaySE b _081D0148 _081D013A: bl sub_81C8630 @@ -40631,12 +40631,12 @@ _081D019A: b _081D01C0 _081D01A0: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x7 b _081D01D4 _081D01AA: movs r0, 0x5 - bl audio_play + bl PlaySE b _081D01C0 _081D01B2: bl sub_81C8630 @@ -40674,7 +40674,7 @@ sub_81D01DC: @ 81D01DC b _081D0214 _081D01E8: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 bl sub_81C78A0 @@ -40709,7 +40709,7 @@ sub_81D021C: @ 81D021C b _081D0244 _081D0228: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 movs r0, 0 @@ -42001,7 +42001,7 @@ sub_81D0C54: @ 81D0C54 b _081D0C7C _081D0C60: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl sub_81C7AC0 movs r0, 0 @@ -42045,7 +42045,7 @@ _081D0CA4: .4byte _081D0D16 _081D0CC0: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl sub_81D11D8 movs r0, 0 @@ -42119,7 +42119,7 @@ _081D0D46: b _081D0D84 _081D0D4C: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81D1448 movs r0, 0 @@ -42173,7 +42173,7 @@ _081D0DA6: b _081D0DF6 _081D0DB0: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81D1500 movs r0, 0 @@ -42232,7 +42232,7 @@ _081D0E1A: b _081D0E58 _081D0E20: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_81D1500 movs r0, 0 @@ -44447,7 +44447,7 @@ sub_81D1E7C: @ 81D1E7C cmp r1, 0x1 beq _081D1E8C movs r0, 0x5 - bl audio_play + bl PlaySE _081D1E8C: pop {r0} bx r0 @@ -46171,7 +46171,7 @@ sub_81D2BD0: @ 81D2BD0 cmp r1, 0x1 beq _081D2BE2 movs r0, 0x5 - bl audio_play + bl PlaySE _081D2BE2: adds r0, r4, 0 bl sub_81D28FC @@ -50662,7 +50662,7 @@ _081D4F6C: cmp r0, 0x2 bne _081D4F88 movs r0, 0x49 - bl audio_play + bl PlaySE bl sub_800A620 movs r0, 0 strh r0, [r5] @@ -50932,7 +50932,7 @@ _081D51BC: adds r0, r4, 0 bl sub_81D505C movs r0, 0x5 - bl audio_play + bl PlaySE b _081D535A .pool _081D51D0: @@ -50943,7 +50943,7 @@ _081D51D0: cmp r0, 0 beq _081D51F4 movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80097E8 adds r0, r4, 0 bl sub_81D505C @@ -50966,7 +50966,7 @@ _081D5210: cmp r0, 0 beq _081D522E movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80097E8 adds r0, r4, 0 bl sub_81D505C @@ -51097,7 +51097,7 @@ _081D5340: .pool _081D5350: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80097E8 _081D535A: movs r0, 0x17 @@ -54748,7 +54748,7 @@ _081D71EE: ldr r0, =sub_81D6FD0 bl SetVBlankCallback movs r0, 0x53 - bl audio_play + bl PlaySE add sp, 0x8 pop {r4-r7} pop {r0} @@ -55029,7 +55029,7 @@ sub_81D7438: @ 81D7438 push {r4,lr} sub sp, 0xC movs r0, 0x57 - bl audio_play + bl PlaySE ldr r0, =0x00007fff ldr r1, =0x0000ffff str r1, [sp] @@ -55061,7 +55061,7 @@ sub_81D7480: @ 81D7480 push {r4,lr} sub sp, 0xC movs r0, 0x57 - bl audio_play + bl PlaySE ldr r0, =0x00007fff ldr r1, =0x0000ffff str r1, [sp] @@ -55212,7 +55212,7 @@ sub_81D75B4: @ 81D75B4 lsls r4, 24 lsrs r4, 24 movs r0, 0x54 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 lsls r4, 24 @@ -57571,7 +57571,7 @@ sub_81D89E0: @ 81D89E0 cmp r0, 0x59 bgt _081D8A16 movs r0, 0x67 - bl audio_play + bl PlaySE _081D8A16: ldrh r0, [r4, 0x6] adds r0, 0x1 @@ -58987,7 +58987,7 @@ _081D95FC: cmp r0, 0 bne _081D960C movs r0, 0xA5 - bl audio_play + bl PlaySE _081D960C: ldrh r0, [r7, 0x36] adds r0, 0x1 @@ -59063,7 +59063,7 @@ _081D968C: cmp r0, 0 bne _081D96A4 movs r0, 0x68 - bl audio_play + bl PlaySE _081D96A4: movs r0, 0x36 ldrsh r1, [r4, r0] @@ -59372,7 +59372,7 @@ _081D990C: cmp r0, 0x8 bne _081D991A movs r0, 0x12 - bl audio_play + bl PlaySE _081D991A: movs r3, 0x4 ldrsh r0, [r4, r3] diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index 86571dc2d..5b7671bf8 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -421,7 +421,7 @@ sub_80FBAE4: @ 80FBAE4 lsrs r4, r0, 24 _080FBB1A: movs r0, 0x30 - bl audio_play + bl PlaySE adds r0, r6, 0 adds r1, r4, 0 bl StartSpriteAffineAnim @@ -444,7 +444,7 @@ _080FBB2A: lsrs r4, r0, 24 _080FBB4A: movs r0, 0x30 - bl audio_play + bl PlaySE adds r0, r6, 0 adds r1, r4, 0 bl StartSpriteAffineAnim diff --git a/asm/roulette.s b/asm/roulette.s index 821a55e91..b3558913a 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1352,7 +1352,7 @@ _08140E20: mov r1, r9 strh r1, [r4, 0xA] movs r0, 0x5 - bl audio_play + bl PlaySE ldr r5, =gUnknown_0203AB88 ldr r0, [r5] adds r0, 0xB8 @@ -1668,7 +1668,7 @@ _0814109A: cmp r1, 0 beq _081410E8 movs r0, 0x16 - bl audio_play + bl PlaySE b _081410F2 .pool _081410E8: @@ -2580,7 +2580,7 @@ _08141848: b _08141888 .pool _08141864: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 @@ -3324,7 +3324,7 @@ _08141F1E: cmp r0, 0 beq _08141F40 movs r0, 0x5 - bl audio_play + bl PlaySE _08141F40: ldr r2, [r5] adds r0, r2, 0 @@ -6837,7 +6837,7 @@ _08143BEA: muls r0, r1 asrs r0, 12 strh r0, [r7, 0x26] - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _08143C74 @@ -9373,7 +9373,7 @@ sub_81450D8: @ 81450D8 ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _08145208 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 4e4fc7880..e1fc891b7 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -2359,7 +2359,7 @@ s2F_music_play: @ 809A4B4 bl script_read_halfword lsls r0, 16 lsrs r0, 16 - bl audio_play + bl PlaySE movs r0, 0 pop {r1} bx r1 @@ -2368,7 +2368,7 @@ s2F_music_play: @ 809A4B4 thumb_func_start s30_music_check_asm s30_music_check_asm: @ 809A4C8 push {lr} - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _0809A4D8 @@ -4983,7 +4983,7 @@ sA1_play_cry: @ 809B8A4 thumb_func_start sub_809B8DC sub_809B8DC: @ 809B8DC push {lr} - ldr r1, =sub_80A3678 + ldr r1, =IsCryFinished bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -5080,7 +5080,7 @@ sAC_open_door: @ 809B970 bl cur_mapdata_get_door_sound_at lsls r0, 16 lsrs r0, 16 - bl audio_play + bl PlaySE adds r0, r5, 0 adds r1, r4, 0 bl task_overworld_door_add_if_role_69_for_opening_door_at diff --git a/asm/script_menu.s b/asm/script_menu.s index 55f9364c7..e4dc93922 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -357,7 +357,7 @@ _080E20B8: cmp r0, 0 bne _080E20FC movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020375F0 movs r0, 0x7F strh r0, [r1] @@ -464,7 +464,7 @@ _080E219C: bne _080E21BA _080E21A4: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020375F0 movs r0, 0 b _080E21B8 @@ -654,7 +654,7 @@ sub_80E2308: @ 80E2308 cmp r0, 0 bne _080E2360 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_020375F0 movs r0, 0x7F strh r0, [r1] diff --git a/asm/secret_base.s b/asm/secret_base.s index 03a33beb5..b976f8421 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -2319,7 +2319,7 @@ sub_80E9DEC: @ 80E9DEC cmp r1, 0x1 beq _080E9DFC movs r0, 0x5 - bl audio_play + bl PlaySE _080E9DFC: pop {r0} bx r0 @@ -2421,7 +2421,7 @@ sub_80E9E90: @ 80E9E90 .pool _080E9EC8: movs r0, 0x5 - bl audio_play + bl PlaySE ldrb r0, [r4, 0xA] movs r1, 0 movs r2, 0 @@ -2446,7 +2446,7 @@ _080E9EC8: .pool _080E9F0C: movs r0, 0x5 - bl audio_play + bl PlaySE strh r5, [r4, 0x8] adds r0, r6, 0 bl sub_80E9F20 @@ -2533,13 +2533,13 @@ sub_80E9FB0: @ 80E9FB0 cmp r4, r0 bne _080E9FDC movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r5, 0 bl sub_80EA18C b _080E9FF2 _080E9FDC: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_0858D048 lsls r1, r4, 3 adds r0, 0x4 diff --git a/asm/shop.s b/asm/shop.s index e293c9bd5..2f3f42fe9 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -148,7 +148,7 @@ Task_ShopMenu: @ 80DFB88 cmp r2, r0 bne _080DFBB4 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl HandleShopMenuQuit b _080DFBC4 @@ -683,7 +683,7 @@ BuyMenuPrintItemDescriptionAndShowItemIcon: @ 80E003C cmp r1, 0x1 beq _080E0054 movs r0, 0x5 - bl audio_play + bl PlaySE _080E0054: movs r0, 0x2 negs r0, r0 @@ -1997,13 +1997,13 @@ _080E0AEA: .pool _080E0B24: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r6, 0 bl ExitBuyMenu b _080E0C8E _080E0B32: movs r0, 0x5 - bl audio_play + bl PlaySE strh r5, [r4, 0xA] movs r0, 0x2 bl ClearWindowTilemap @@ -2288,7 +2288,7 @@ _080E0DF0: cmp r0, 0 beq _080E0E74 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x4 movs r1, 0 bl sub_8198070 @@ -2331,7 +2331,7 @@ _080E0E74: cmp r0, 0 beq _080E0EA4 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x4 movs r1, 0 bl sub_8198070 @@ -2467,7 +2467,7 @@ BuyMenuSubtractMoney: @ 80E0F88 ldr r1, [r1] bl subtract_money movs r0, 0x5F - bl audio_play + bl PlaySE ldr r0, [r5] adds r0, r4 bl DecryptMoney @@ -2520,7 +2520,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C cmp r0, 0 beq _080E1072 movs r0, 0x5 - bl audio_play + bl PlaySE movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0x4 @@ -2564,7 +2564,7 @@ Task_ReturnToItemListAfterDecorationPurchase: @ 80E1078 cmp r0, 0 beq _080E1096 movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r4, 0 bl BuyMenuReturnToItemList _080E1096: diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 96af62dd3..5e263d0fa 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -902,7 +902,7 @@ _0812AC5A: movs r0, 0x9 strb r0, [r1] movs r0, 0x5F - bl audio_play + bl PlaySE b _0812ACE4 .pool _0812AC7C: @@ -921,7 +921,7 @@ _0812AC82: cmp r0, 0 beq _0812ACB2 movs r0, 0x5F - bl audio_play + bl PlaySE ldr r0, [r4] ldrb r0, [r0, 0x12] bl sub_812CE7C @@ -1149,7 +1149,7 @@ sub_812AE4C: @ 812AE4C cmp r0, 0 beq _0812AE78 movs r0, 0x18 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203AB34 ldr r0, [r4] ldrb r0, [r0, 0x18] @@ -2769,7 +2769,7 @@ sub_812BB68: @ 812BB68 cmp r0, 0 beq _0812BB8E movs r0, 0x15 - bl audio_play + bl PlaySE _0812BB8E: ldr r0, =gUnknown_0203AB34 ldr r2, [r0] @@ -2807,7 +2807,7 @@ _0812BBBC: cmp r0, 0 beq _0812BBF6 movs r0, 0x15 - bl audio_play + bl PlaySE ldr r1, =gUnknown_0203AB34 ldr r2, [r1] ldrh r0, [r2, 0xE] @@ -6882,7 +6882,7 @@ sub_812DA90: @ 812DA90 ldr r0, =0x00000187 bl PlayFanfare movs r0, 0xB2 - bl audio_play + bl PlaySE pop {r4,r5} pop {r0} bx r0 diff --git a/asm/sound.s b/asm/sound.s deleted file mode 100644 index 672765327..000000000 --- a/asm/sound.s +++ /dev/null @@ -1,614 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - - thumb_func_start PlayCryInternal -PlayCryInternal: @ 80A344C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - ldr r4, [sp, 0x24] - lsls r0, 16 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp] - lsls r4, 24 - lsrs r1, r4, 24 - ldr r3, =0xffff0000 - adds r0, r3 - lsrs r7, r0, 16 - movs r6, 0x8C - movs r0, 0 - mov r9, r0 - movs r5, 0 - movs r4, 0xF0 - lsls r4, 6 - mov r8, r5 - cmp r1, 0xC - bhi _080A3562 - lsls r0, r1, 2 - ldr r1, =_080A349C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080A349C: - .4byte _080A3562 - .4byte _080A34D0 - .4byte _080A34D6 - .4byte _080A34E4 - .4byte _080A34F8 - .4byte _080A3510 - .4byte _080A351C - .4byte _080A352C - .4byte _080A3536 - .4byte _080A3540 - .4byte _080A3550 - .4byte _080A3560 - .4byte _080A355C -_080A34D0: - movs r6, 0x14 - movs r5, 0xE1 - b _080A3562 -_080A34D6: - movs r5, 0xE1 - ldr r4, =0x00003cf0 - movs r1, 0x14 - b _080A3504 - .pool -_080A34E4: - movs r6, 0x32 - movs r5, 0xC8 - ldr r4, =0x00003db8 - movs r3, 0x14 - mov r8, r3 - movs r2, 0x5A - b _080A3562 - .pool -_080A34F8: - movs r6, 0x19 - movs r0, 0x1 - mov r9, r0 - movs r5, 0x64 - ldr r4, =0x00003cf0 - movs r1, 0xC0 -_080A3504: - mov r8, r1 - movs r2, 0x5A - b _080A3562 - .pool -_080A3510: - movs r5, 0xC8 - ldr r4, =0x00003868 - b _080A3562 - .pool -_080A351C: - movs r5, 0xDC - ldr r4, =0x00003cc3 - movs r3, 0xC0 - mov r8, r3 - movs r2, 0x46 - b _080A3562 - .pool -_080A352C: - movs r6, 0xA - movs r5, 0x64 - movs r4, 0xE8 - lsls r4, 6 - b _080A3562 -_080A3536: - movs r6, 0x3C - movs r5, 0xE1 - movs r4, 0xF4 - lsls r4, 6 - b _080A3562 -_080A3540: - movs r6, 0xF - movs r0, 0x1 - mov r9, r0 - movs r5, 0x7D - ldr r4, =0x00003b60 - b _080A3562 - .pool -_080A3550: - movs r6, 0x64 - movs r5, 0xE1 - ldr r4, =0x00003b60 - b _080A3562 - .pool -_080A355C: - movs r6, 0x14 - movs r5, 0xE1 -_080A3560: - ldr r4, =0x00003a98 -_080A3562: - adds r0, r2, 0 - bl SetPokemonCryVolume - mov r1, r10 - lsls r0, r1, 24 - asrs r0, 24 - bl SetPokemonCryPanpot - adds r0, r4, 0 - bl SetPokemonCryPitch - adds r0, r6, 0 - bl SetPokemonCryLength - movs r0, 0 - bl SetPokemonCryProgress - adds r0, r5, 0 - bl SetPokemonCryRelease - mov r3, r8 - lsls r0, r3, 24 - asrs r0, 24 - bl SetPokemonCryChorus - ldr r0, [sp] - bl SetPokemonCryPriority - adds r0, r7, 0 - bl speciesid_conv - adds r7, r0, 0 - movs r1, 0x7F - ands r1, r7 - lsrs r0, r7, 7 - lsls r0, 24 - lsrs r0, 24 - adds r2, r0, 0 - cmp r0, 0x1 - beq _080A35F0 - cmp r0, 0x1 - bgt _080A35C0 - cmp r0, 0 - beq _080A35CA - b _080A365E - .pool -_080A35C0: - cmp r2, 0x2 - beq _080A3614 - cmp r2, 0x3 - beq _080A3638 - b _080A365E -_080A35CA: - mov r0, r9 - cmp r0, 0 - beq _080A35E0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869EF24 - b _080A3654 - .pool -_080A35E0: - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869DCF4 - b _080A3654 - .pool -_080A35F0: - mov r3, r9 - cmp r3, 0 - beq _080A3604 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869F524 - b _080A3654 - .pool -_080A3604: - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869E2F4 - b _080A3654 - .pool -_080A3614: - mov r0, r9 - cmp r0, 0 - beq _080A3628 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869FB24 - b _080A3654 - .pool -_080A3628: - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869E8F4 - b _080A3654 - .pool -_080A3638: - mov r3, r9 - cmp r3, 0 - beq _080A364C - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_086A0124 - b _080A3654 - .pool -_080A364C: - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, =gUnknown_0869EEF4 -_080A3654: - adds r0, r1 - bl SetPokemonCryTone - ldr r1, =gUnknown_020383E8 - str r0, [r1] -_080A365E: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end PlayCryInternal - - thumb_func_start sub_80A3678 -sub_80A3678: @ 80A3678 - push {lr} - ldr r0, =sub_80A370C - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080A3694 - bl ClearPokemonCrySongs - movs r0, 0x1 - b _080A3696 - .pool -_080A3694: - movs r0, 0 -_080A3696: - pop {r1} - bx r1 - thumb_func_end sub_80A3678 - - thumb_func_start sub_80A369C -sub_80A369C: @ 80A369C - push {lr} - ldr r0, =gUnknown_020383E8 - ldr r0, [r0] - bl m4aMPlayStop - bl ClearPokemonCrySongs - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A369C - - thumb_func_start sub_80A36B4 -sub_80A36B4: @ 80A36B4 - push {lr} - ldr r0, =gUnknown_020383E8 - ldr r0, [r0] - bl m4aMPlayStop - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A36B4 - - thumb_func_start sub_80A36C8 -sub_80A36C8: @ 80A36C8 - push {lr} - ldr r0, =gUnknown_020383E8 - ldr r0, [r0] - bl IsPokemonCryPlaying - cmp r0, 0 - bne _080A36E4 - bl ClearPokemonCrySongs - movs r0, 0 - b _080A36E6 - .pool -_080A36E4: - movs r0, 0x1 -_080A36E6: - pop {r1} - bx r1 - thumb_func_end sub_80A36C8 - - thumb_func_start sub_80A36EC -sub_80A36EC: @ 80A36EC - push {lr} - ldr r0, =gUnknown_020383E8 - ldr r0, [r0] - bl IsPokemonCryPlaying - cmp r0, 0 - bne _080A3704 - movs r0, 0 - b _080A3706 - .pool -_080A3704: - movs r0, 0x1 -_080A3706: - pop {r1} - bx r1 - thumb_func_end sub_80A36EC - - thumb_func_start sub_80A370C -sub_80A370C: @ 80A370C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gPokemonCryBGMDuckingCounter - ldrb r0, [r1] - cmp r0, 0 - beq _080A3724 - subs r0, 0x1 - strb r0, [r1] - b _080A3742 - .pool -_080A3724: - ldr r0, =gUnknown_020383E8 - ldr r0, [r0] - bl IsPokemonCryPlaying - cmp r0, 0 - bne _080A3742 - ldr r0, =gMPlay_BGM - ldr r1, =0x0000ffff - movs r2, 0x80 - lsls r2, 1 - bl m4aMPlayVolumeControl - adds r0, r4, 0 - bl DestroyTask -_080A3742: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A370C - - thumb_func_start RestoreBGMVolumeAfterPokemonCry -RestoreBGMVolumeAfterPokemonCry: @ 80A3754 - push {r4,lr} - ldr r4, =sub_80A370C - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080A376E - adds r0, r4, 0 - movs r1, 0x50 - bl CreateTask -_080A376E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end RestoreBGMVolumeAfterPokemonCry - - thumb_func_start PlayBGM -PlayBGM: @ 80A3778 - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - ldr r0, =gDisableMusic - ldrb r0, [r0] - cmp r0, 0 - beq _080A3788 - movs r1, 0 -_080A3788: - ldr r0, =0x0000ffff - cmp r1, r0 - bne _080A3790 - movs r1, 0 -_080A3790: - adds r0, r1, 0 - bl m4aSongNumStart - pop {r0} - bx r0 - .pool - thumb_func_end PlayBGM - - thumb_func_start audio_play -audio_play: @ 80A37A4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl m4aSongNumStart - pop {r0} - bx r0 - thumb_func_end audio_play - - thumb_func_start audio_play_and_stuff -audio_play_and_stuff: @ 80A37B4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - lsls r4, 24 - lsrs r4, 24 - bl m4aSongNumStart - ldr r6, =gMPlay_SE1 - adds r0, r6, 0 - bl m4aMPlayImmInit - ldr r0, =gMPlay_SE2 - mov r8, r0 - bl m4aMPlayImmInit - ldr r5, =0x0000ffff - lsls r4, 24 - asrs r4, 24 - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - mov r0, r8 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end audio_play_and_stuff - - thumb_func_start sub_80A3808 -sub_80A3808: @ 80A3808 - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - lsls r4, 24 - lsrs r4, 24 - bl m4aSongNumStart - ldr r5, =gMPlay_SE1 - adds r0, r5, 0 - bl m4aMPlayImmInit - ldr r1, =0x0000ffff - lsls r4, 24 - asrs r4, 24 - adds r0, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3808 - - thumb_func_start sub_80A383C -sub_80A383C: @ 80A383C - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - lsls r4, 24 - lsrs r4, 24 - bl m4aSongNumStart - ldr r5, =gMPlay_SE2 - adds r0, r5, 0 - bl m4aMPlayImmInit - ldr r1, =0x0000ffff - lsls r4, 24 - asrs r4, 24 - adds r0, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A383C - - thumb_func_start sub_80A3870 -sub_80A3870: @ 80A3870 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, =gMPlay_SE1 - ldr r5, =0x0000ffff - lsls r4, 24 - asrs r4, 24 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - ldr r0, =gMPlay_SE2 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3870 - - thumb_func_start mplay_has_finished_maybe -mplay_has_finished_maybe: @ 80A38A0 - push {lr} - ldr r0, =gMPlay_SE1 - ldr r1, [r0, 0x4] - movs r2, 0x80 - lsls r2, 24 - adds r3, r0, 0 - cmp r1, 0 - bge _080A38BA - ldr r0, =gMPlay_SE2 - ldr r0, [r0, 0x4] - ands r0, r2 - cmp r0, 0 - bne _080A38CC -_080A38BA: - ldr r1, =0x0000ffff - ldrh r0, [r3, 0x4] - cmp r0, 0 - bne _080A38DC - ldr r0, =gMPlay_SE2 - ldr r0, [r0, 0x4] - ands r0, r1 - cmp r0, 0 - bne _080A38DC -_080A38CC: - movs r0, 0 - b _080A38DE - .pool -_080A38DC: - movs r0, 0x1 -_080A38DE: - pop {r1} - bx r1 - thumb_func_end mplay_has_finished_maybe - - thumb_func_start sub_80A38E4 -sub_80A38E4: @ 80A38E4 - push {lr} - ldr r0, =gMPlay_BGM - ldr r1, [r0, 0x4] - cmp r1, 0 - blt _080A3904 - ldr r0, =0x0000ffff - ands r1, r0 - cmp r1, 0 - beq _080A3904 - movs r0, 0x1 - b _080A3906 - .pool -_080A3904: - movs r0, 0 -_080A3906: - pop {r1} - bx r1 - thumb_func_end sub_80A38E4 - - thumb_func_start sub_80A390C -sub_80A390C: @ 80A390C - push {lr} - ldr r0, =gMPlay_SE3 - ldr r1, [r0, 0x4] - cmp r1, 0 - blt _080A392C - ldr r0, =0x0000ffff - ands r1, r0 - cmp r1, 0 - beq _080A392C - movs r0, 0x1 - b _080A392E - .pool -_080A392C: - movs r0, 0 -_080A392E: - pop {r1} - bx r1 - thumb_func_end sub_80A390C - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/start_menu.s b/asm/start_menu.s index 298ebced5..a4bbef93c 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -758,7 +758,7 @@ HandleStartMenuInput: @ 809FAC4 cmp r0, 0 beq _0809FAE4 movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -771,7 +771,7 @@ _0809FAE4: cmp r0, 0 beq _0809FAFE movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0x1 bl MoveMenuCursor ldr r1, =gUnknown_0203760E @@ -783,7 +783,7 @@ _0809FAFE: cmp r0, 0 beq _0809FB98 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r1, =gUnknown_08510540 ldr r2, =gUnknown_02037610 ldr r0, =gUnknown_0203760E @@ -1421,7 +1421,7 @@ sub_80A003C: @ 80A003C .pool _080A0064: movs r0, 0x5 - bl audio_play + bl PlaySE _080A006A: movs r0, 0x1 _080A006C: @@ -1705,7 +1705,7 @@ sub_80A02B0: @ 80A02B0 cmp r0, 0 bne _080A02CA movs r0, 0x37 - bl audio_play + bl PlaySE ldr r1, =gUnknown_0203761C ldr r0, =sub_80A02D8 str r0, [r1] @@ -1719,7 +1719,7 @@ _080A02CA: thumb_func_start sub_80A02D8 sub_80A02D8: @ 80A02D8 push {lr} - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _080A02F6 @@ -1746,7 +1746,7 @@ sub_80A02FC: @ 80A02FC cmp r0, 0 bne _080A0316 movs r0, 0x16 - bl audio_play + bl PlaySE ldr r1, =gUnknown_0203761C ldr r0, =sub_80A0324 str r0, [r1] @@ -2461,7 +2461,7 @@ sub_80A0914: @ 80A0914 sub_80A0934: @ 80A0934 push {lr} movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_80A0914 pop {r0} bx r0 diff --git a/asm/starter_choose.s b/asm/starter_choose.s index 5d08ff225..aa56bf0e0 100644 --- a/asm/starter_choose.s +++ b/asm/starter_choose.s @@ -571,7 +571,7 @@ _08134426: .pool _08134450: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gTasks lsls r5, r4, 2 adds r5, r4 diff --git a/asm/trade.s b/asm/trade.s index 3d82146f3..3a8e22d08 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3127,7 +3127,7 @@ _08078D58: cmp r0, r6 beq _08078D64 movs r0, 0x5 - bl audio_play + bl PlaySE _08078D64: strb r6, [r7] pop {r4-r7} @@ -3228,7 +3228,7 @@ _08078E30: cmp r0, 0 beq _08078EE4 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r4, =gUnknown_0203229C ldr r0, [r4] adds r0, 0x35 @@ -3364,7 +3364,7 @@ sub_8078F50: @ 8078F50 b _0807902A _08078F72: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8078EF8 b _0807902A _08078F7E: @@ -3463,7 +3463,7 @@ sub_8079034: @ 8079034 beq _08079054 _0807904A: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8078EF8 _08079054: pop {r0} @@ -3841,7 +3841,7 @@ _08079306: .pool _0807934C: movs r0, 0x5 - bl audio_play + bl PlaySE bl sub_8078EF8 _08079356: pop {r0} @@ -3944,7 +3944,7 @@ sub_8079408: @ 8079408 cmp r0, 0 beq _0807947C movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 bl rbox_fill_rectangle movs r0, 0x1 @@ -6704,7 +6704,7 @@ sub_807AA28: @ 807AA28 cmp r0, 0xA bne _0807AA44 movs r0, 0x17 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0807AA44: @@ -6733,7 +6733,7 @@ sub_807AA4C: @ 807AA4C cmp r0, 0xA bne _0807AA76 movs r0, 0xC2 - bl audio_play + bl PlaySE strh r5, [r4, 0x2E] _0807AA76: pop {r4,r5} @@ -6830,7 +6830,7 @@ sub_807AB04: @ 807AB04 cmp r0, 0xF bne _0807AB20 movs r0, 0xCC - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0807AB20: @@ -9483,7 +9483,7 @@ _0807C574: cmp r0, 0 bne _0807C592 movs r0, 0x2E - bl audio_play + bl PlaySE ldr r0, =gUnknown_020322A0 ldr r1, [r0] adds r1, 0x94 @@ -9751,7 +9751,7 @@ _0807C794: cmp r0, 0x2 bhi _0807C7DC movs r0, 0x2D - bl audio_play + bl PlaySE _0807C7DC: ldr r2, [r7] adds r3, r2, 0 @@ -10153,7 +10153,7 @@ _0807CB0E: adds r0, 0x1 strh r0, [r1] movs r0, 0x9F - bl audio_play + bl PlaySE b _0807CFB4 .pool _0807CB30: @@ -10507,7 +10507,7 @@ _0807CE26: b _0807CFB4 .pool _0807CE38: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0807CE44 @@ -11552,7 +11552,7 @@ _0807D970: cmp r0, 0 bne _0807D98E movs r0, 0x2E - bl audio_play + bl PlaySE ldr r0, =gUnknown_020322A0 ldr r1, [r0] adds r1, 0x94 @@ -11825,7 +11825,7 @@ _0807DB9C: cmp r0, 0x2 bhi _0807DBE4 movs r0, 0x2D - bl audio_play + bl PlaySE _0807DBE4: ldr r2, [r7] adds r3, r2, 0 @@ -12258,7 +12258,7 @@ _0807DF5A: adds r0, 0x1 strh r0, [r1] movs r0, 0x9F - bl audio_play + bl PlaySE b _0807E400 .pool _0807DF7C: @@ -12612,7 +12612,7 @@ _0807E272: b _0807E400 .pool _0807E284: - bl sub_80A3678 + bl IsCryFinished lsls r0, 24 cmp r0, 0 bne _0807E290 @@ -13017,7 +13017,7 @@ sub_807E5D8: @ 807E5D8 cmp r0, 0x16 bne _0807E600 movs r0, 0x38 - bl audio_play + bl PlaySE _0807E600: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -13027,7 +13027,7 @@ _0807E600: cmp r0, 0x2C bne _0807E636 movs r0, 0x8C - bl audio_play + bl PlaySE ldr r0, =sub_807E64C str r0, [r4, 0x1C] movs r0, 0 @@ -13124,7 +13124,7 @@ sub_807E6AC: @ 807E6AC movs r0, 0x16 strh r0, [r4, 0x2E] movs r0, 0x38 - bl audio_play + bl PlaySE b _0807E72C _0807E6DC: movs r1, 0x2E @@ -13132,21 +13132,21 @@ _0807E6DC: cmp r0, 0x42 bne _0807E6EA movs r0, 0x39 - bl audio_play + bl PlaySE _0807E6EA: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5C bne _0807E6F8 movs r0, 0x3A - bl audio_play + bl PlaySE _0807E6F8: movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0x6B bne _0807E706 movs r0, 0x3B - bl audio_play + bl PlaySE _0807E706: ldr r1, =gUnknown_08339024 movs r2, 0x2E @@ -14370,7 +14370,7 @@ _0807F27A: cmp r0, 0 bne _0807F298 movs r0, 0xC3 - bl audio_play + bl PlaySE _0807F298: movs r0, 0x2 ldrsh r2, [r4, r0] diff --git a/asm/trader.s b/asm/trader.s index a85f13b3d..bd3c23cf9 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -293,14 +293,14 @@ _08133C7C: bne _08133C90 _08133C80: movs r0, 0x5 - bl audio_play + bl PlaySE adds r0, r7, 0 movs r1, 0 bl sub_8133BE4 b _08133CCA _08133C90: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gUnknown_020375E2 lsls r4, 24 asrs r4, 24 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 3bbcda08e..e03c36fb0 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -238,7 +238,7 @@ _080C28A8: b _080C2ACA _080C28B4: movs r0, 0xFB - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039CE8 ldr r1, [r0] movs r0, 0xA @@ -246,7 +246,7 @@ _080C28B4: b _080C2ACA .pool _080C28C8: - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 beq _080C28D4 @@ -287,7 +287,7 @@ _080C290A: beq _080C293C bl sub_80C4918 movs r0, 0xF9 - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039CE8 ldr r1, [r0] movs r0, 0xC @@ -332,7 +332,7 @@ _080C297C: b _080C2ACA _080C2986: movs r0, 0xFB - bl audio_play + bl PlaySE ldr r0, =gUnknown_02039CE8 ldr r1, [r0] movs r0, 0xB @@ -374,7 +374,7 @@ _080C29DC: movs r0, 0xD strb r0, [r1] movs r0, 0xF9 - bl audio_play + bl PlaySE b _080C2ACA .pool _080C29F4: @@ -472,7 +472,7 @@ _080C2AAA: movs r0, 0xA strb r0, [r1] movs r0, 0xFB - bl audio_play + bl PlaySE _080C2ACA: add sp, 0xC pop {r4-r6} @@ -4319,7 +4319,7 @@ _080C4C50: movs r0, 0x1 strb r0, [r1, 0x9] movs r0, 0xFA - bl audio_play + bl PlaySE movs r0, 0 pop {r4,r5} pop {r1} @@ -6037,7 +6037,7 @@ _080C5B0A: cmp r3, 0x3 bhi _080C5B48 movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, [r4] ldrb r1, [r0, 0xC] adds r0, r6, 0 @@ -6050,7 +6050,7 @@ _080C5B48: cmp r3, 0x4 bne _080C5B5E movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =sub_80C5470 bl SetMainCallback2 adds r0, r6, 0 @@ -6063,7 +6063,7 @@ _080C5B5E: cmp r0, 0 beq _080C5BCA movs r0, 0x3 - bl audio_play + bl PlaySE ldr r0, =sub_80C5470 bl SetMainCallback2 adds r0, r6, 0 @@ -7509,7 +7509,7 @@ _080C6806: cmp r0, 0 beq _080C6824 movs r0, 0x3 - bl audio_play + bl PlaySE movs r0, 0x4 b _080C68DE .pool @@ -8162,7 +8162,7 @@ _080C6D4A: movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x6C - bl audio_play + bl PlaySE add sp, 0xC pop {r3} mov r8, r3 diff --git a/asm/truck_scene.s b/asm/truck_scene.s index 7271ba2e4..b9e9f1b35 100644 --- a/asm/truck_scene.s +++ b/asm/truck_scene.s @@ -394,7 +394,7 @@ _080FB3C0: movs r0, 0x1 strh r0, [r4] movs r0, 0x31 - bl audio_play + bl PlaySE b _080FB4D8 .pool _080FB3E8: @@ -440,7 +440,7 @@ _080FB404: movs r0, 0x3 strh r0, [r4] movs r0, 0x32 - bl audio_play + bl PlaySE b _080FB4D8 .pool _080FB450: @@ -469,7 +469,7 @@ _080FB474: cmp r0, 0x5A bne _080FB4D8 movs r0, 0x33 - bl audio_play + bl PlaySE movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x5 @@ -500,7 +500,7 @@ _080FB492: bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x34 - bl audio_play + bl PlaySE adds r0, r5, 0 bl DestroyTask bl script_env_2_disable diff --git a/asm/wallclock.s b/asm/wallclock.s index 9dbddc805..742ef21fc 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -738,7 +738,7 @@ _08134E50: b _08134E96 _08134E56: movs r0, 0x5 - bl audio_play + bl PlaySE ldr r0, =gTasks lsls r1, r4, 2 adds r1, r4 @@ -749,7 +749,7 @@ _08134E56: .pool _08134E74: movs r0, 0x5 - bl audio_play + bl PlaySE movs r0, 0 movs r1, 0 bl sub_8198070 diff --git a/asm/weather.s b/asm/weather.s index 990792c72..802a5bc96 100644 --- a/asm/weather.s +++ b/asm/weather.s @@ -2432,7 +2432,7 @@ _080AC360: _080AC366: strb r0, [r1] adds r0, r2, 0 - bl audio_play + bl PlaySE _080AC36E: pop {r0} bx r0 @@ -2442,7 +2442,7 @@ _080AC36E: thumb_func_start play_some_sound play_some_sound: @ 80AC378 push {lr} - bl sub_80A390C + bl IsSpecialSEPlaying lsls r0, 24 cmp r0, 0 beq _080AC3B6 @@ -2457,16 +2457,16 @@ play_some_sound: @ 80AC378 cmp r0, 0 bne _080AC3B0 movs r0, 0x56 - bl audio_play + bl PlaySE b _080AC3B6 .pool _080AC3A8: movs r0, 0x54 - bl audio_play + bl PlaySE b _080AC3B6 _080AC3B0: movs r0, 0x52 - bl audio_play + bl PlaySE _080AC3B6: pop {r0} bx r0 @@ -5134,7 +5134,7 @@ sub_80AD9F8: @ 80AD9F8 ldrh r0, [r1] cmp r0, 0 bne _080ADA54 - bl mplay_has_finished_maybe + bl IsSEPlaying lsls r0, 24 cmp r0, 0 bne _080ADA58 @@ -5143,12 +5143,12 @@ sub_80AD9F8: @ 80AD9F8 cmp r4, 0 beq _080ADA38 movs r0, 0x57 - bl audio_play + bl PlaySE b _080ADA3E .pool _080ADA38: movs r0, 0x58 - bl audio_play + bl PlaySE _080ADA3E: ldr r0, =gUnknown_0854C14C ldr r0, [r0] diff --git a/data/sound_data.s b/data/sound_data.s index 61b6abc04..a25081360 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -3,26 +3,11 @@ voicegroup_pokemon_cry:: @ 8675D04 .incbin "baserom.gba", 0x675D04, 0x27FF0 -gUnknown_0869DCF4:: @ 869DCF4 - .incbin "baserom.gba", 0x69dcf4, 0x600 +gCryTable:: @ 869DCF4 + .incbin "baserom.gba", 0x69dcf4, 0x1230 -gUnknown_0869E2F4:: @ 869E2F4 - .incbin "baserom.gba", 0x69e2f4, 0x600 - -gUnknown_0869E8F4:: @ 869E8F4 - .incbin "baserom.gba", 0x69e8f4, 0x600 - -gUnknown_0869EEF4:: @ 869EEF4 - .incbin "baserom.gba", 0x69eef4, 0x30 - -gUnknown_0869EF24:: @ 869EF24 - .incbin "baserom.gba", 0x69ef24, 0x600 - -gUnknown_0869F524:: @ 869F524 - .incbin "baserom.gba", 0x69f524, 0x600 - -gUnknown_0869FB24:: @ 869FB24 - .incbin "baserom.gba", 0x69fb24, 0x600 +gCryTable2:: @ 869EF24 + .incbin "baserom.gba", 0x69ef24, 0x1200 gUnknown_086A0124:: @ 86A0124 .incbin "baserom.gba", 0x6a0124, 0x1489c diff --git a/ld_script.txt b/ld_script.txt index 5a6440f1c..7986c7105 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -105,7 +105,6 @@ SECTIONS { asm/tileset.o(.text); src/palette.o(.text); src/sound.o(.text); - asm/sound.o(.text); asm/battle_anim.o(.text); asm/rom_80A5C6C.o(.text); src/task.o(.text); diff --git a/src/sound.c b/src/sound.c index 31e97b132..7b94a8027 100644 --- a/src/sound.c +++ b/src/sound.c @@ -8,6 +8,8 @@ #include "songs.h" #include "task.h" +extern u16 SpeciesToCryId(u16); + struct Fanfare { u16 songNum; @@ -32,15 +34,8 @@ extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_SE3; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_8453790[]; - -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_84549C0[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; extern const struct Fanfare sFanfares[]; @@ -48,7 +43,7 @@ static void Task_Fanfare(u8 taskId); static void CreateFanfareTask(void); void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode); static void Task_DuckBGMForPokemonCry(u8 taskId); -void RestoreBGMVolumeAfterPokemonCry(void); +static void RestoreBGMVolumeAfterPokemonCry(void); #define CRY_VOLUME 120 // was 125 in R/S @@ -356,3 +351,262 @@ void PlayCry5(u16 species, u8 mode) gPokemonCryBGMDuckingCounter = 2; RestoreBGMVolumeAfterPokemonCry(); } + +void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) +{ + bool32 v0; + u32 release; + u32 length; + u32 pitch; + u32 chorus; + u32 index; + u8 table; + + species--; + length = 140; + v0 = FALSE; + release = 0; + pitch = 15360; + chorus = 0; + + switch (mode) + { + case 0: + break; + case 1: + length = 20; + release = 225; + break; + case 2: + release = 225; + pitch = 15600; + chorus = 20; + volume = 90; + break; + case 3: + length = 50; + release = 200; + pitch = 15800; + chorus = 20; + volume = 90; + break; + case 4: + length = 25; + v0 = TRUE; + release = 100; + pitch = 15600; + chorus = 192; + volume = 90; + break; + case 5: + release = 200; + pitch = 14440; + break; + case 6: + release = 220; + pitch = 15555; + chorus = 192; + volume = 70; + break; + case 7: + length = 10; + release = 100; + pitch = 14848; + break; + case 8: + length = 60; + release = 225; + pitch = 15616; + break; + case 9: + length = 15; + v0 = TRUE; + release = 125; + pitch = 15200; + break; + case 10: + length = 100; + release = 225; + pitch = 15200; + break; + case 12: + length = 20; + release = 225; + case 11: + pitch = 15000; + break; + } + + SetPokemonCryVolume(volume); + SetPokemonCryPanpot(pan); + SetPokemonCryPitch(pitch); + SetPokemonCryLength(length); + SetPokemonCryProgress(0); + SetPokemonCryRelease(release); + SetPokemonCryChorus(chorus); + SetPokemonCryPriority(priority); + + // This is a fancy way to get a cry of a pokemon. + // It creates 4 sets of 128 mini cry tables. + // If you wish to expand pokemon, you need to + // append new cases to the switch. + species = SpeciesToCryId(species); + index = species & 0x7F; + table = species / 128; + + switch (table) + { + case 0: + gMPlay_PokemonCry = SetPokemonCryTone( + v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]); + break; + case 1: + gMPlay_PokemonCry = SetPokemonCryTone( + v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]); + break; + case 2: + gMPlay_PokemonCry = SetPokemonCryTone( + v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]); + break; + case 3: + gMPlay_PokemonCry = SetPokemonCryTone( + v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]); + break; + } +} + +bool8 IsCryFinished(void) +{ + if (FuncIsActiveTask(Task_DuckBGMForPokemonCry) == TRUE) + { + return FALSE; + } + else + { + ClearPokemonCrySongs(); + return TRUE; + } +} + +void StopCryAndClearCrySongs(void) +{ + m4aMPlayStop(gMPlay_PokemonCry); + ClearPokemonCrySongs(); +} + +void StopCry(void) +{ + m4aMPlayStop(gMPlay_PokemonCry); +} + +bool8 IsCryPlayingOrClearCrySongs(void) +{ + if (IsPokemonCryPlaying(gMPlay_PokemonCry)) + { + return TRUE; + } + else + { + ClearPokemonCrySongs(); + return FALSE; + } +} + +bool8 IsCryPlaying(void) +{ + if (IsPokemonCryPlaying(gMPlay_PokemonCry)) + return TRUE; + else + return FALSE; +} + +static void Task_DuckBGMForPokemonCry(u8 taskId) +{ + if (gPokemonCryBGMDuckingCounter) + { + gPokemonCryBGMDuckingCounter--; + return; + } + + if (!IsPokemonCryPlaying(gMPlay_PokemonCry)) + { + m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); + DestroyTask(taskId); + } +} + +static void RestoreBGMVolumeAfterPokemonCry(void) +{ + if (FuncIsActiveTask(Task_DuckBGMForPokemonCry) != TRUE) + CreateTask(Task_DuckBGMForPokemonCry, 80); +} + +void PlayBGM(u16 songNum) +{ + if (gDisableMusic) + songNum = 0; + if (songNum == 0xFFFF) + songNum = 0; + m4aSongNumStart(songNum); +} + +void PlaySE(u16 songNum) +{ + m4aSongNumStart(songNum); +} + +void PlaySE12WithPanning(u16 songNum, s8 pan) +{ + m4aSongNumStart(songNum); + m4aMPlayImmInit(&gMPlay_SE1); + m4aMPlayImmInit(&gMPlay_SE2); + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); +} + +void PlaySE1WithPanning(u16 songNum, s8 pan) +{ + m4aSongNumStart(songNum); + m4aMPlayImmInit(&gMPlay_SE1); + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); +} + +void PlaySE2WithPanning(u16 songNum, s8 pan) +{ + m4aSongNumStart(songNum); + m4aMPlayImmInit(&gMPlay_SE2); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); +} + +void SE12PanpotControl(s8 pan) +{ + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); +} + +bool8 IsSEPlaying(void) +{ + if ((gMPlay_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlay_SE2.status & MUSICPLAYER_STATUS_PAUSE)) + return FALSE; + if (!(gMPlay_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlay_SE2.status & MUSICPLAYER_STATUS_TRACK)) + return FALSE; + return TRUE; +} + +bool8 IsBGMPlaying(void) +{ + if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE) + return FALSE; + if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK)) + return FALSE; + return TRUE; +} + +bool8 IsSpecialSEPlaying(void) +{ + if (gMPlay_SE3.status & MUSICPLAYER_STATUS_PAUSE) + return FALSE; + if (!(gMPlay_SE3.status & MUSICPLAYER_STATUS_TRACK)) + return FALSE; + return TRUE; +} diff --git a/src/text.c b/src/text.c index 2bf882a56..6754e1a42 100644 --- a/src/text.c +++ b/src/text.c @@ -12,7 +12,7 @@ extern u8 GetKeypadIconWidth(u8 keypadIconId); extern void CopyWindowToVram(u8 windowId, u8 mode); extern u16 Font6Func(struct TextPrinter *textPrinter); extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); -extern void audio_play(u16 songNum); +extern void PlaySE(u16 songNum); extern u8* sub_81AFC74(u8 a1); EWRAM_DATA struct TextPrinter gTempTextPrinter = {0}; @@ -1986,7 +1986,7 @@ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { result = TRUE; - audio_play(5); + PlaySE(5); } } return result; @@ -2004,7 +2004,7 @@ bool8 TextPrinterWait(struct TextPrinter *textPrinter) if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { result = TRUE; - audio_play(5); + PlaySE(5); } } return result; @@ -2394,7 +2394,7 @@ _08005A76:\n\ add r1, #0x1\n\ str r1, [r6]\n\ add r0, r3, #0\n\ - bl audio_play\n\ + bl PlaySE\n\ b _08005A0A\n\ _08005A90:\n\ ldr r1, [r6]\n\ @@ -2751,7 +2751,7 @@ _08005D44:\n\ strb r0, [r6, #0x1C]\n\ b _08005B56\n\ _08005D48:\n\ - bl mplay_has_finished_maybe\n\ + bl IsSEPlaying\n\ lsl r0, #24\n\ lsr r0, #24\n\ cmp r0, #0\n\ diff --git a/sym_ewram.txt b/sym_ewram.txt index 2f2e81d1f..03de17e8f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -887,7 +887,7 @@ gUnknown_02037624: @ 2037624 .include "src/palette.o" .align 0x2 -gUnknown_020383E8: @ 20383E8 +gMPlay_PokemonCry: @ 20383E8 .space 0x4 gPokemonCryBGMDuckingCounter: @ 20383EC