diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-21 20:58:19 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-21 21:04:21 -0500 |
| commit | 4d88812f40c4165e4b893a0631fa658e72d17874 (patch) | |
| tree | aeb2841a1a0ab15ee9ecadcb44d337875f90b9e8 /engine/battle/core.asm | |
| parent | Merge pull request #106 from YamaArashi/master (diff) | |
| download | pokeyellow-4d88812f40c4165e4b893a0631fa658e72d17874.tar.gz pokeyellow-4d88812f40c4165e4b893a0631fa658e72d17874.tar.xz pokeyellow-4d88812f40c4165e4b893a0631fa658e72d17874.zip | |
Name some battle sound effects
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a74e0a27..4c29e003 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -353,7 +353,7 @@ EnemyRan: ; 3c202 (f:4202) ld hl, EnemyRanText .printText call PrintText - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a @@ -860,13 +860,13 @@ FaintEnemyPokemon: ; 0x3c567 xor a ld [wc0f1], a ld [wc0f2], a - ld a, SFX_BATTLE_08 ; SFX_FALL? + ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait ld a, [wc02a] - cp SFX_BATTLE_08 + cp SFX_FAINT_FALL jr z, .sfxwait - ld a, SFX_BATTLE_03 ; SFX_DROP + ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish jr .sfxplayed @@ -1672,7 +1672,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) dec a .playSound ld [wBattleResult], a - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent ld hl, GotAwayText call PrintText |