diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine_1.asm | 74 |
1 files changed, 58 insertions, 16 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 930c085e..0b3b34b3 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1558,18 +1558,34 @@ Audio1_CryRet: Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 + table_width 1 + db LOW(AUD1RAM) + db LOW(AUD2RAM) + db LOW(AUD3RAM) + db LOW(AUD4RAM) + db LOW(AUD1RAM) + db LOW(AUD2RAM) + db LOW(AUD3RAM) + db LOW(AUD4RAM) + assert_table_length NUM_CHANNELS Audio1_HWChannelDisableMasks: - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 + table_width 1 + db ~(AUDTERM_1_LEFT | AUDTERM_1_RIGHT) + db ~(AUDTERM_2_LEFT | AUDTERM_2_RIGHT) + db ~(AUDTERM_3_LEFT | AUDTERM_3_RIGHT) + db ~(AUDTERM_4_LEFT | AUDTERM_4_RIGHT) + db ~(AUDTERM_1_LEFT | AUDTERM_1_RIGHT) + db ~(AUDTERM_2_LEFT | AUDTERM_2_RIGHT) + db ~(AUDTERM_3_LEFT | AUDTERM_3_RIGHT) + db ~(AUDTERM_4_LEFT | AUDTERM_4_RIGHT) + assert_table_length NUM_CHANNELS Audio1_ApplyMonoStereo: push af push bc ld a, [wOptions] - and %110000 ; channel options + and SOUND_MASK srl a ld c, a ld b, 0 @@ -1580,21 +1596,47 @@ Audio1_ApplyMonoStereo: ret Audio1_HWChannelEnableMasks: + table_width 1 ; mono - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 - + db AUDTERM_1_LEFT | AUDTERM_1_RIGHT + db AUDTERM_2_LEFT | AUDTERM_2_RIGHT + db AUDTERM_3_LEFT | AUDTERM_3_RIGHT + db AUDTERM_4_LEFT | AUDTERM_4_RIGHT + db AUDTERM_1_LEFT | AUDTERM_1_RIGHT + db AUDTERM_2_LEFT | AUDTERM_2_RIGHT + db AUDTERM_3_LEFT | AUDTERM_3_RIGHT + db AUDTERM_4_LEFT | AUDTERM_4_RIGHT + assert_table_length NUM_CHANNELS ; earphone 1 - db HW_CH1_RIGHT_ENABLE_MASK, HW_CH2_LEFT_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 - + db AUDTERM_1_RIGHT + db AUDTERM_2_LEFT + db AUDTERM_3_LEFT | AUDTERM_3_RIGHT + db AUDTERM_4_LEFT | AUDTERM_4_RIGHT + db AUDTERM_1_LEFT | AUDTERM_1_RIGHT + db AUDTERM_2_LEFT | AUDTERM_2_RIGHT + db AUDTERM_3_LEFT | AUDTERM_3_RIGHT + db AUDTERM_4_LEFT | AUDTERM_4_RIGHT + assert_table_length NUM_CHANNELS * 2 ; earphone 2 - db HW_CH1_RIGHT_ENABLE_MASK, HW_CH2_LEFT_ENABLE_MASK, HW_CH3_RIGHT_ENABLE_MASK, HW_CH4_LEFT_ENABLE_MASK ; channels 0-3 - db HW_CH1_RIGHT_ENABLE_MASK, HW_CH2_LEFT_ENABLE_MASK, HW_CH3_RIGHT_ENABLE_MASK, HW_CH4_LEFT_ENABLE_MASK ; channels 4-7 - + db AUDTERM_1_RIGHT + db AUDTERM_2_LEFT + db AUDTERM_3_RIGHT + db AUDTERM_4_LEFT + db AUDTERM_1_RIGHT + db AUDTERM_2_LEFT + db AUDTERM_3_RIGHT + db AUDTERM_4_LEFT + assert_table_length NUM_CHANNELS * 3 ; earphone 3 - db HW_CH1_RIGHT_ENABLE_MASK, HW_CH2_RIGHT_ENABLE_MASK, HW_CH3_LEFT_ENABLE_MASK, HW_CH4_LEFT_ENABLE_MASK ; channels 0-3 - db HW_CH1_RIGHT_ENABLE_MASK, HW_CH2_RIGHT_ENABLE_MASK, HW_CH3_LEFT_ENABLE_MASK, HW_CH4_LEFT_ENABLE_MASK ; channels 4-7 + db AUDTERM_1_RIGHT + db AUDTERM_2_RIGHT + db AUDTERM_3_LEFT + db AUDTERM_4_LEFT + db AUDTERM_1_RIGHT + db AUDTERM_2_RIGHT + db AUDTERM_3_LEFT + db AUDTERM_4_LEFT + assert_table_length NUM_CHANNELS * 4 Audio1_Pitches: INCLUDE "audio/notes.asm" |