diff options
| author | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
| commit | 20c4116788d4d29b14c85ffce77e65faf89716b7 (patch) | |
| tree | 7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /engine/items/items.asm | |
| parent | 36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (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 'engine/items/items.asm')
| -rwxr-xr-x | engine/items/items.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 38e8a704..ec51a0d4 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -990,7 +990,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a push hl push de ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1777,7 +1777,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch6] + ld a, [wChannelSoundIDs + Ch7] and a ; music off? jr nz, .musicWaitLoop .skipMusic @@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch2] + ld a, [wChannelSoundIDs + Ch3] cp SFX_POKEFLUTE jr z, .musicWaitLoop call PlayDefaultMusic ; start playing normal music again |