diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-02-05 17:59:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 17:59:01 -0600 |
| commit | 5048f24816e95fc38a708b967648deb86c62a689 (patch) | |
| tree | c6b15116aefe09c91c3047d506fc7bbf677f8001 /home | |
| parent | New Discord invite link (diff) | |
| parent | Rename dnote to drum_note and dspeed to drum_speed (diff) | |
| download | pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.gz pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.xz pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.zip | |
Merge pull request #223 from pret/audio-macros
Audio macros
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/home/audio.asm b/home/audio.asm index c982d9d6..242f038b 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -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? diff --git a/home/overworld.asm b/home/overworld.asm index 9404a713..b96efcb4 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -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 |