summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-19 03:46:12 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-19 03:46:12 -0500
commitea9cc86949cecc3508aeac06b807372b6b0134d8 (patch)
treeaafb7371315334ecaba9a964fd91565f245b10bb /engine/battle/core.asm
parent340230e997b32fd44f1d99aecbab083ffb89a921 (diff)
Name sound effects
Diffstat (limited to 'engine/battle/core.asm')
-rwxr-xr-xengine/battle/core.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 5deeb4dc..30b62dea 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -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