diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-27 19:30:57 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-27 19:30:57 -0500 |
| commit | 84c7985e67b0838fce04e49a0916aa5a873131b3 (patch) | |
| tree | 491367de9c6a0039cf73ad359bb58b640e509084 /audio.asm | |
| parent | 70dde9d96b0e3025c72ae29783e94c56fa5cbe1c (diff) | |
Fix sound effect channel numbering
mostly so that sound effects that only use the noise channel are
labelled 'Ch7' instead of 'Ch1'
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -162,7 +162,7 @@ INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch6.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -543,11 +543,11 @@ Music_PokeFluteInBattle:: call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 + ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 + ld de, SFX_08_PokeFlute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 + ld de, SFX_08_PokeFlute_Ch6 Audio2_OverwriteChannelPointer: ld a, e @@ -632,7 +632,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" |