diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-15 12:26:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 12:26:16 -0400 |
| commit | e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch) | |
| tree | d8a157ae5aa323a00873efe79eb4693327b8bb70 /audio | |
| parent | Merge pull request #269 from Rangi42/master (diff) | |
| parent | Don't compare strings with ==; use STRCMP (diff) | |
| download | pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip | |
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine_1.asm | 4 | ||||
| -rw-r--r-- | audio/engine_2.asm | 4 | ||||
| -rw-r--r-- | audio/engine_3.asm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 8af8f707..a31572f3 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1346,12 +1346,12 @@ Audio1_PlaySound:: ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses call .FillMem ld hl, wChannelCommandPointers call .FillMem - ld d, $4 + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs call .FillMem ld hl, wChannelFlags1 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index aa2c7227..4954f8bc 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1409,12 +1409,12 @@ Audio2_PlaySound:: ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses call .FillMem ld hl, wChannelCommandPointers call .FillMem - ld d, $4 + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs call .FillMem ld hl, wChannelFlags1 diff --git a/audio/engine_3.asm b/audio/engine_3.asm index e8ee38c9..f86658a2 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1346,12 +1346,12 @@ Audio3_PlaySound:: ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses call .FillMem ld hl, wChannelCommandPointers call .FillMem - ld d, $4 + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs call .FillMem ld hl, wChannelFlags1 |