diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-27 22:08:13 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-27 22:08:13 -0500 |
| commit | 5207a14af34f9b84a9e40cc1d4988a0858a4a4e6 (patch) | |
| tree | 1178fa1ba93fa2734141abb854a58126dabd9899 /audio.asm | |
| parent | Add warnings about music/sfx macro usage (diff) | |
| download | pokeyellow-5207a14af34f9b84a9e40cc1d4988a0858a4a4e6.tar.gz pokeyellow-5207a14af34f9b84a9e40cc1d4988a0858a4a4e6.tar.xz pokeyellow-5207a14af34f9b84a9e40cc1d4988a0858a4a4e6.zip | |
Redo audio header macro
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 - ld [wChannelSoundIDs + CH4], a ;disable sound channel? + ld [wChannelSoundIDs + Ch4], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -491,7 +491,7 @@ Music_DoLowHealthAlarm:: .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? + ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -542,7 +542,7 @@ Music_PokeFluteInBattle:: ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + CH4 * 2 + ld hl, wChannelCommandPointers + Ch4 * 2 ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch5 |