diff options
author | NieDzejkob <niedzejkob@gmail.com> | 2017-05-21 19:46:04 +0200 |
---|---|---|
committer | NieDzejkob <niedzejkob@gmail.com> | 2017-05-21 20:21:00 +0200 |
commit | 619da0f339c4d529de919d0b73b747fa16127d37 (patch) | |
tree | 579962dc4e894db2f8e27e0a98f82c65f2baacee /asm/party_menu.s | |
parent | 5847cceee4656ca5ffd08eb57d90e2cccdaaea60 (diff) |
PlaySE renaming after rebase
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r-- | asm/party_menu.s | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 1eae399ab..534d4aaa4 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -2442,7 +2442,7 @@ _0806C1A4: cmp r5, r0 beq _0806C1C8 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C1C8: pop {r3,r4} mov r8, r3 @@ -3327,7 +3327,7 @@ _0806C84A: cmp r6, r0 beq _0806C878 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C878: pop {r3} mov r8, r3 @@ -3402,7 +3402,7 @@ _0806C8E2: movs r1, 0x2 strb r1, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806C914: pop {r4-r6} pop {r0} @@ -3776,7 +3776,7 @@ _0806CBDA: cmp r0, 0 beq _0806CC10 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0806CC0C @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -3798,7 +3798,7 @@ _0806CC10: cmp r0, 0x2 bne _0806CC24 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_806CD44 _0806CC24: @@ -7776,7 +7776,7 @@ _0806EB80: cmp r1, r0 bne _0806EB8E movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EB8E: movs r0, 0x17 movs r1, 0x8 @@ -8159,7 +8159,7 @@ _0806EEBC: cmp r1, r0 bne _0806EECA movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EECA: movs r0, 0x17 movs r1, 0x8 @@ -8277,7 +8277,7 @@ _0806EFA8: cmp r1, r0 bne _0806EFB6 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806EFB6: movs r0, 0x17 movs r1, 0x8 @@ -8389,7 +8389,7 @@ TeachMonTMMove: @ 806F06C lsls r5, 16 lsrs r5, 16 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _0806F0A8 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -8800,7 +8800,7 @@ _0806F3E0: cmp r1, r0 bne _0806F3EE movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806F3EE: adds r0, r5, 0 bl StopTryingToTeachMove_806F614 @@ -9191,7 +9191,7 @@ _0806F73C: cmp r1, r0 bne _0806F74A movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE _0806F74A: movs r0, 0x17 movs r1, 0x8 @@ -9553,7 +9553,7 @@ sub_806FA18: @ 806FA18 cmp r0, r1 bne _0806FAE4 movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE movs r0, 0x80 lsls r0, 5 adds r4, r6, r0 @@ -10112,7 +10112,7 @@ _0806FEE6: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0806FF0C @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -10134,13 +10134,13 @@ _0806FF14: cmp r0, 0 bne _0806FF34 movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE b _0806FF3A .align 2, 0 _0806FF30: .4byte gUnknown_0202E8F4 _0806FF34: movs r0, 0x75 - bl PlaySoundEffect + bl PlaySE _0806FF3A: ldr r4, _0806FF88 @ =0x0201c000 ldr r0, [r4] @@ -10514,7 +10514,7 @@ Task_HandleItemUseMoveMenuInput: @ 8070374 cmp r0, 0 beq _0807039C movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -10527,7 +10527,7 @@ _0807039C: cmp r0, 0 beq _080703B2 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _080703E4 @@ -10549,7 +10549,7 @@ _080703CC: cmp r0, 0 beq _080703E4 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080703EC @ =gUnknown_08376B54 ldr r1, [r0, 0x4] adds r0, r4, 0 @@ -10625,7 +10625,7 @@ _08070468: .4byte gTasks _0807046C: .4byte TaskDummy _08070470: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xA movs r1, 0x3 bl sub_806D538 @@ -10766,7 +10766,7 @@ DoRecoverPP: @ 8070570 ldr r0, _080705B0 @ =gUnknown_0202E8F4 strb r5, [r0] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _080705B4 @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -10781,7 +10781,7 @@ _080705B8: movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - bl PlaySoundEffect + bl PlaySE ldrh r0, [r6, 0x6] movs r1, 0x1 bl RemoveBagItem @@ -10839,7 +10839,7 @@ DoPPUpItemEffect: @ 8070624 str r4, [r3] bl sub_806E8D0 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE movs r0, 0xB movs r1, 0x3 bl sub_806D538 @@ -10925,7 +10925,7 @@ _080706F6: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r0, _0807071C @ =gOtherText_WontHaveAnyEffect movs r1, 0x1 bl sub_806E834 @@ -11013,7 +11013,7 @@ Task_RareCandy1: @ 80707A0 beq _080707E8 _080707CE: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_8070848 ldr r0, _080707F8 @ =gTasks @@ -11051,7 +11051,7 @@ Task_RareCandy2: @ 8070800 beq _08070834 _0807081A: movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE adds r0, r4, 0 bl sub_8070968 ldr r0, _08070840 @ =gTasks @@ -11584,7 +11584,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC lsls r1, 16 lsrs r6, r1, 16 movs r0, 0x5 - bl PlaySoundEffect + bl PlaySE ldr r1, _08070E18 @ =gTasks lsls r0, r4, 2 adds r0, r4 |