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

engine/battle/animations.asm

@@ -204,7 +204,7 @@ PlayAnimation:
 	push hl
 	push de
 	call GetMoveSound
-	call PlaySound
+	call nc, PlayBattleSound
 	pop de
 	pop hl
 .skipPlayingSound
@@ -577,7 +577,7 @@ PlaySubanimation:
 	cp NO_MOVE - 1
 	jr z, .skipPlayingSound
 	call GetMoveSound
-	call PlaySound
+	call nc, PlayBattleSound
 .skipPlayingSound
 	ld hl, wShadowOAM
 	ld a, l
@@ -2211,25 +2211,44 @@ GetMoveSound:
 .next
 	ld a, [wEnemyMonSpecies]
 .Continue
-	push hl
-	call GetCryData
-	ld b, a
-	pop hl
-	ld a, [wFrequencyModifier]
-	add [hl]
-	ld [wFrequencyModifier], a
-	inc hl
-	ld a, [wTempoModifier]
-	add [hl]
-	ld [wTempoModifier], a
-	jr .done
-.NotCryMove
-	ld a, [hli]
-	ld [wFrequencyModifier], a
-	ld a, [hli]
-	ld [wTempoModifier], a
-.done
+
+	push af
+	ld a, 1
+	ld [wSFXDontWait], a
+	pop af
+	call PlayCry
+	xor a
+	ld [wSFXDontWait], a
 	ld a, b
+	scf
+	ret
+;	push hl
+;	call GetCryData
+;	ld b, a
+;	pop hl
+;	ld a, [wFrequencyModifier]
+;	add [hl]
+;	ld [wFrequencyModifier], a
+;	inc hl
+;	ld a, [wTempoModifier]
+;	add [hl]
+;	ld [wTempoModifier], a
+;	jr .done
+
+.NotCryMove
+	push bc
+	ld a, [hli]
+	ld c, a
+	ld b, 0
+	ld a, [hli]
+	add $80
+	ld e, a
+	ld a, 0
+	adc 0
+	ld d, a
+	pop af
+.done
+	and a
 	ret
 
 IsCryMove:
@@ -2640,20 +2659,20 @@ PlayApplyingAttackSound:
 	and $7f
 	ret z
 	cp 10
-	ld a, $20
-	ld b, $30
-	ld c, SFX_DAMAGE
+	ld bc, $20
+	ld de, $30 + $80
+	ld a, SFX_DAMAGE
 	jr z, .playSound
-	ld a, $e0
-	ld b, $ff
-	ld c, SFX_SUPER_EFFECTIVE
+	ld bc, $e0
+	ld de, $ff + $80
+	ld a, SFX_SUPER_EFFECTIVE
 	jr nc, .playSound
-	ld a, $50
-	ld b, $1
-	ld c, SFX_NOT_VERY_EFFECTIVE
+	ld bc, $50
+	ld de, $1 + $80
+	ld a, SFX_NOT_VERY_EFFECTIVE
 .playSound
-	ld [wFrequencyModifier], a
-	ld a, b
-	ld [wTempoModifier], a
-	ld a, c
-	jp PlaySound
+;	ld [wFrequencyModifier], a
+;	ld a, b
+;	ld [wTempoModifier], a
+;	ld a, c
+	jp PlayBattleSound

engine/battle/common_text.asm

@@ -60,10 +60,10 @@ PrintBeginningBattleText:
 	call PrintText
 
 .playSFX
-	xor a
-	ld [wFrequencyModifier], a
-	ld a, $80
-	ld [wTempoModifier], a
+;	xor a
+;	ld [wFrequencyModifier], a
+;	ld a, $80
+;	ld [wTempoModifier], a
 	ld a, SFX_SILPH_SCOPE
 	call PlaySound
 	jp WaitForSoundToFinish

engine/battle/core.asm

@@ -787,15 +787,24 @@ FaintEnemyPokemon:
 	ld a, [wIsInBattle]
 	dec a
 	jr z, .wild_win
-	xor a
-	ld [wFrequencyModifier], a
-	ld [wTempoModifier], a
+
+	call WaitForSoundToFinish
+	ld bc, $00
+	ld de, $80
 	ld a, SFX_FAINT_FALL
-	call PlaySoundWaitForCurrent
-.sfxwait
-	ld a, [wChannelSoundIDs + CHAN5]
-	cp SFX_FAINT_FALL
-	jr z, .sfxwait
+	call PlayBattleSound
+;	xor a
+;	ld [wFrequencyModifier], a
+;	ld [wTempoModifier], a
+;	ld a, SFX_FAINT_FALL
+;	call PlaySoundWaitForCurrent
+
+	call WaitForSoundToFinish
+;.sfxwait
+;	ld a, [wChannelSoundIDs + CHAN5]
+;	cp SFX_FAINT_FALL
+;	jr z, .sfxwait
+
 	ld a, SFX_FAINT_THUD
 	call PlaySound
 	call WaitForSoundToFinish
@@ -878,7 +887,7 @@ EndLowHealthAlarm:
 ; the low health alarm and prevents it from reactivating until the next battle.
 	xor a
 	ld [wLowHealthAlarm], a ; turn off low health alarm
-	ld [wChannelSoundIDs + CHAN5], a
+;	ld [wChannelSoundIDs + CHAN5], a
 	inc a
 	ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating
 	ret
@@ -977,9 +986,9 @@ TrainerDefeatedText:
 PlayBattleVictoryMusic:
 	push af
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySoundWaitForCurrent
-	ld c, BANK(Music_DefeatedTrainer)
+	ld c, 0 ; BANK(Music_DefeatedTrainer)
 	pop af
 	call PlayMusic
 	jp Delay3
@@ -1884,7 +1893,7 @@ DrawPlayerHUDAndHPBar:
 	ld [hl], $0
 	ret z
 	xor a
-	ld [wChannelSoundIDs + CHAN5], a
+;	ld [wChannelSoundIDs + CHAN5], a
 	ret
 .setLowHealthAlarm
 	ld hl, wLowHealthAlarm
@@ -6973,8 +6982,8 @@ _LoadTrainerPic:
 ; unreferenced
 ResetCryModifiers:
 	xor a
-	ld [wFrequencyModifier], a
-	ld [wTempoModifier], a
+;	ld [wFrequencyModifier], a
+;	ld [wTempoModifier], a
 	jp PlaySound
 
 ; animates the mon "growing" out of the pokeball

engine/battle/end_of_battle.asm

@@ -46,7 +46,7 @@ EndOfBattle:
 .resetVariables
 	xor a
 	ld [wLowHealthAlarm], a ;disable low health alarm
-	ld [wChannelSoundIDs + CHAN5], a
+;	ld [wChannelSoundIDs + CHAN5], a
 	ld [wIsInBattle], a
 	ld [wBattleType], a
 	ld [wMoveMissed], a