summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-21 20:58:19 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-21 21:04:21 -0500
commit4d88812f40c4165e4b893a0631fa658e72d17874 (patch)
treeaeb2841a1a0ab15ee9ecadcb44d337875f90b9e8 /audio.asm
parent13e28b0ece7c7888cba792cc6f7219b384213427 (diff)
Name some battle sound effects
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/audio.asm b/audio.asm
index 27570b93..563aee14 100644
--- a/audio.asm
+++ b/audio.asm
@@ -538,8 +538,10 @@ INCLUDE "audio/engine_2.asm"
Music_PokeFluteInBattle:: ; 22306 (8:6306)
- ld a, SFX_BATTLE_06 ; PokeFlute outside of battle
+ ; begin playing the "caught mon" sound effect
+ ld a, SFX_CAUGHT_MON
call PlaySoundWaitForCurrent
+ ; then immediately overwrtie the channel pointers
ld hl, wc00e
ld de, SFX_08_PokeFlute_Ch1
call Music8_OverwriteChannelPointer
@@ -586,7 +588,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162)
db SFX_DENIED, BANK(SFX_1f_51)
db SFX_POKEDEX_RATING, BANK(SFX_02_41)
db SFX_GET_ITEM_1, BANK(SFX_02_3a)
- db SFX_BATTLE_06, BANK(SFX_08_46)
+ db SFX_CAUGHT_MON, BANK(SFX_08_46)
db SFX_LEVEL_UP, BANK(SFX_08_3a)
db SFX_GET_KEY_ITEM, BANK(SFX_02_42)
db SFX_GET_ITEM_2, BANK(SFX_02_3b)