Merge branch 'master' of https://github.com/dannye/pokered-crysaudio

engine/pokemon/bills_pc.asm

@@ -225,8 +225,11 @@ BillsPCDeposit:
 	call DisplayDepositWithdrawMenu
 	jp nc, BillsPCMenu
 	ld a, [wcf91]
-	call GetCryData
-	call PlaySoundWaitForCurrent
+
+	call PlayCry
+;	call GetCryData
+;	call PlaySoundWaitForCurrent
+
 	ld a, PARTY_TO_BOX
 	ld [wMoveMonType], a
 	call MoveMon
@@ -277,8 +280,11 @@ BillsPCWithdraw:
 	ld hl, wBoxMonNicks
 	call GetPartyMonName
 	ld a, [wcf91]
-	call GetCryData
-	call PlaySoundWaitForCurrent
+
+	call PlayCry
+;	call GetCryData
+;	call PlaySoundWaitForCurrent
+
 	xor a ; BOX_TO_PARTY
 	ld [wMoveMonType], a
 	call MoveMon

engine/pokemon/learn_move.asm

@@ -205,38 +205,12 @@ TryingToLearnText:
 	text_far _TryingToLearnText
 	text_end
 
-OneTwoAndText: ; uses the fixed move swap sound - PvK
+OneTwoAndText:
 	text_far _OneTwoAndText
 	text_pause
 	text_asm
-	text_far _OneTwoAndText
-	text_pause
-	text_asm
-	push af
-	push bc
-	push de
-	push hl
-	ld a, $1
-	ld [wMuteAudioAndPauseMusic], a
-	call DelayFrame
-	ld a, [wAudioROMBank]
-	push af
-	ld a, BANK(SFX_Swap_1)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
-	call WaitForSoundToFinish
 	ld a, SFX_SWAP
-	call PlaySound
-	call WaitForSoundToFinish
-	pop af
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
-	xor a
-	ld [wMuteAudioAndPauseMusic], a
-	pop hl
-	pop de
-	pop bc
-	pop af
+	call PlaySoundWaitForCurrent
 	ld hl, PoofText
 	ret