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 /home | |
| 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 'home')
| -rw-r--r-- | home/audio.asm | 8 | ||||
| -rw-r--r-- | home/overworld.asm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/home/audio.asm b/home/audio.asm index 7c0c5238..c982d9d6 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 + Ch4], a + ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + Ch6], a + ld [wChannelSoundIDs + Ch7], 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 f71bb68a..fe763b43 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 + Ch4] 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 + Ch4] cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION |