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
This commit is contained in:
dannye 2019-07-27 23:21:39 -05:00
parent 36597a7917
commit 20c4116788
392 changed files with 21932 additions and 21963 deletions

View file

@ -148,10 +148,10 @@ PlaySound::
and a
jr z, .next
xor a
ld [wChannelSoundIDs + Ch4], a
ld [wChannelSoundIDs + Ch5], a
ld [wChannelSoundIDs + Ch6], a
ld [wChannelSoundIDs + Ch7], a
ld [wChannelSoundIDs + Ch8], a
.next
ld a, [wAudioFadeOutControl]
and a ; has a fade-out length been specified?

View file

@ -1244,7 +1244,7 @@ CollisionCheckOnLand::
call CheckTilePassable
jr nc, .noCollision
.collision
ld a, [wChannelSoundIDs + Ch4]
ld a, [wChannelSoundIDs + Ch5]
cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry
ld a, SFX_COLLISION
@ -1948,7 +1948,7 @@ CollisionCheckOnWater::
jr z, .stopSurfing ; stop surfing if the tile is passable
jr .loop
.collision
ld a, [wChannelSoundIDs + Ch4]
ld a, [wChannelSoundIDs + Ch5]
cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry
ld a, SFX_COLLISION