Name sound effects

This commit is contained in:
dannye 2015-07-19 03:46:12 -05:00
parent 340230e997
commit ea9cc86949
56 changed files with 487 additions and 311 deletions

View file

@ -355,7 +355,7 @@ EnemyRan: ; 3c202 (f:4202)
ld hl, EnemyRanText
.printText
call PrintText
ld a, (SFX_08_44 - SFX_Headers_08) / 3
ld a, SFX_BATTLE_04
call PlaySoundWaitForCurrent
xor a
ld [H_WHOSETURN], a
@ -864,13 +864,13 @@ FaintEnemyPokemon: ; 0x3c567
xor a
ld [wc0f1], a
ld [wc0f2], a
ld a, (SFX_08_48 - SFX_Headers_08) / 3 ; SFX_FALL?
ld a, SFX_BATTLE_08 ; SFX_FALL?
call PlaySoundWaitForCurrent
.sfxwait
ld a, [wc02a]
cp (SFX_08_48 - SFX_Headers_08) / 3
cp SFX_BATTLE_08
jr z, .sfxwait
ld a, (SFX_08_43 - SFX_Headers_08) / 3 ; SFX_DROP
ld a, SFX_BATTLE_03 ; SFX_DROP
call PlaySound
call WaitForSoundToFinish
jr .sfxplayed
@ -1678,7 +1678,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9)
dec a
.playSound
ld [wBattleResult], a
ld a, (SFX_08_44 - SFX_Headers_08) / 3
ld a, SFX_BATTLE_04
call PlaySoundWaitForCurrent
ld hl, GotAwayText
call PrintText