summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
committerdannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
commit20c4116788d4d29b14c85ffce77e65faf89716b7 (patch)
tree7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /audio.asm
parent36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (diff)
Update audio macro names
change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/audio.asm b/audio.asm
index ff7b721d..4305657c 100644
--- a/audio.asm
+++ b/audio.asm
@@ -155,7 +155,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_ch6.asm"
+INCLUDE "audio/sfx/pokeflute_ch7.asm"
INCLUDE "audio/sfx/peck.asm"
INCLUDE "audio/sfx/faint_fall.asm"
INCLUDE "audio/sfx/battle_09.asm"
@@ -470,7 +470,7 @@ Music_DoLowHealthAlarm::
.asm_2138a
ld a, $86
- ld [wChannelSoundIDs + Ch4], a ;disable sound channel?
+ ld [wChannelSoundIDs + Ch5], a ;disable sound channel?
ld a, [wLowHealthAlarm]
and $7f ;decrement alarm timer.
dec a
@@ -484,7 +484,7 @@ Music_DoLowHealthAlarm::
.disableAlarm
xor a
ld [wLowHealthAlarm], a ;disable alarm
- ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel?
+ ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel?
ld de, .toneDataSilence
jr .playTone
@@ -535,12 +535,12 @@ Music_PokeFluteInBattle::
ld a, SFX_CAUGHT_MON
call PlaySoundWaitForCurrent
; then immediately overwrite the channel pointers
- ld hl, wChannelCommandPointers + Ch4 * 2
- ld de, SFX_08_PokeFlute_Ch4
+ ld hl, wChannelCommandPointers + Ch5 * 2
+ ld de, SFX_Pokeflute_Ch5
call Audio2_OverwriteChannelPointer
- ld de, SFX_08_PokeFlute_Ch5
+ ld de, SFX_Pokeflute_Ch6
call Audio2_OverwriteChannelPointer
- ld de, SFX_08_PokeFlute_Ch6
+ ld de, SFX_Pokeflute_Ch7
Audio2_OverwriteChannelPointer:
ld a, e
@@ -625,7 +625,7 @@ INCLUDE "audio/music/pokecenter.asm"
SECTION "Music 2", ROMX ; BANK $08
-INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm"
+INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm"
INCLUDE "audio/sfx/unused2_2.asm"
INCLUDE "audio/music/gymleaderbattle.asm"
INCLUDE "audio/music/trainerbattle.asm"