From 84c7985e67b0838fce04e49a0916aa5a873131b3 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 19:30:57 -0500 Subject: Fix sound effect channel numbering mostly so that sound effects that only use the noise channel are labelled 'Ch7' instead of 'Ch1' --- audio.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 6df4cfbc..5842b87c 100644 --- a/audio.asm +++ b/audio.asm @@ -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" -- cgit v1.3.1-sl0p