diff options
Diffstat (limited to 'constants/audio_constants.asm')
| -rw-r--r-- | constants/audio_constants.asm | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 1d092edf5..f5895dd98 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,7 +1,6 @@ ; pitch ; FrequencyTable indexes (see audio/notes.asm) - const_def - const __ ; 0 + const_def 1 const C_ ; 1 const C# ; 2 const D_ ; 3 @@ -14,7 +13,6 @@ const A_ ; a const A# ; b const B_ ; c - const CC ; d (used for pitchoffset) ; channel ; ChannelPointers indexes (see audio/engine.asm) @@ -42,26 +40,26 @@ CHANNEL_LAST_MUSIC_ADDRESS EQUS "(wChannel1LastMusicAddress - wChannel1 CHANNEL_NOTE_FLAGS EQUS "(wChannel1NoteFlags - wChannel1)" CHANNEL_CONDITION EQUS "(wChannel1Condition - wChannel1)" CHANNEL_DUTY_CYCLE EQUS "(wChannel1DutyCycle - wChannel1)" -CHANNEL_INTENSITY EQUS "(wChannel1Intensity - wChannel1)" +CHANNEL_VOLUME_ENVELOPE EQUS "(wChannel1VolumeEnvelope - wChannel1)" CHANNEL_FREQUENCY EQUS "(wChannel1Frequency - wChannel1)" CHANNEL_PITCH EQUS "(wChannel1Pitch - wChannel1)" CHANNEL_OCTAVE EQUS "(wChannel1Octave - wChannel1)" -CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" +CHANNEL_TRANSPOSITION EQUS "(wChannel1Transposition - wChannel1)" CHANNEL_NOTE_DURATION EQUS "(wChannel1NoteDuration - wChannel1)" CHANNEL_FIELD16 EQUS "(wChannel1Field16 - wChannel1)" CHANNEL_LOOP_COUNT EQUS "(wChannel1LoopCount - wChannel1)" CHANNEL_TEMPO EQUS "(wChannel1Tempo - wChannel1)" CHANNEL_TRACKS EQUS "(wChannel1Tracks - wChannel1)" -CHANNEL_SFX_DUTY_LOOP EQUS "(wChannel1SFXDutyLoop - wChannel1)" +CHANNEL_DUTY_CYCLE_PATTERN EQUS "(wChannel1DutyCyclePattern - wChannel1)" CHANNEL_VIBRATO_DELAY_COUNT EQUS "(wChannel1VibratoDelayCount - wChannel1)" CHANNEL_VIBRATO_DELAY EQUS "(wChannel1VibratoDelay - wChannel1)" CHANNEL_VIBRATO_EXTENT EQUS "(wChannel1VibratoExtent - wChannel1)" CHANNEL_VIBRATO_RATE EQUS "(wChannel1VibratoRate - wChannel1)" -CHANNEL_PITCH_WHEEL_TARGET EQUS "(wChannel1PitchWheelTarget - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT EQUS "(wChannel1PitchWheelAmount - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)" +CHANNEL_PITCH_SLIDE_TARGET EQUS "(wChannel1PitchSlideTarget - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT EQUS "(wChannel1PitchSlideAmount - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION EQUS "(wChannel1PitchSlideAmountFraction - wChannel1)" CHANNEL_FIELD25 EQUS "(wChannel1Field25 - wChannel1)" -CHANNEL_CRY_PITCH EQUS "(wChannel1CryPitch - wChannel1)" +CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" CHANNEL_FIELD29 EQUS "(wChannel1Field29 - wChannel1)" CHANNEL_FIELD2A EQUS "(wChannel1Field2a - wChannel1)" CHANNEL_FIELD2C EQUS "(wChannel1Field2c - wChannel1)" @@ -84,26 +82,26 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 ; Flags2 const_def - const SOUND_VIBRATO ; 0 - const SOUND_PITCH_WHEEL ; 1 - const SOUND_DUTY ; 2 - const SOUND_UNKN_0B ; 3 - const SOUND_CRY_PITCH ; 4 - const SOUND_UNKN_0D ; 5 - const SOUND_UNKN_0E ; 6 - const SOUND_UNKN_0F ; 7 + const SOUND_VIBRATO ; 0 + const SOUND_PITCH_SLIDE ; 1 + const SOUND_DUTY_LOOP ; 2 + const SOUND_UNKN_0B ; 3 + const SOUND_PITCH_OFFSET ; 4 + const SOUND_UNKN_0D ; 5 + const SOUND_UNKN_0E ; 6 + const SOUND_UNKN_0F ; 7 ; Flags3 const_def const SOUND_VIBRATO_DIR ; 0 - const SOUND_PITCH_WHEEL_DIR ; 1 + const SOUND_PITCH_SLIDE_DIR ; 1 ; NoteFlags const_def const NOTE_DUTY_OVERRIDE ; 0 const NOTE_FREQ_OVERRIDE ; 1 const NOTE_UNUSED ; 2 - const NOTE_UNKN_3 ; 3 + const NOTE_PITCH_SWEEP ; 3 const NOTE_NOISE_SAMPLING ; 4 const NOTE_REST ; 5 const NOTE_VIBRATO_OVERRIDE ; 6 |