Merge branch 'master' into AS

sonicretro · Apr 14, 2015 · 89c3ff7 · 89c3ff7
2 parents db6b6b0 + b09563e
commit 89c3ff7
Show file tree

Hide file tree

Showing 3 changed files with 115 additions and 541 deletions.
diff --git a/Constants.asm b/Constants.asm
@@ -33,34 +33,34 @@ ym2612_d1: 		equ $A04003
 security_addr:		equ $A14000
 
 ; Sound driver constants
-zTrackPlaybackControl:	equ 0
-zTrackVoiceControl:	equ 1
-zTrackTempoDivider:	equ 2
-zTrackDataPointer:	equ 4		; & 5,6,7
-zTrackKeyOffset:	equ 8
-zTrackVolume:		equ 9
-zTrackAMSFMSPan:	equ $A
-zTrackVoiceIndex:	equ $B
-zTrackVolFlutter:	equ $C
-zTrackStackPointer:	equ $D
-zTrackDurationTimeout:	equ $E
-zTrackSavedDuration:	equ $F
-zTrackSavedDAC:		equ $10
-zTrackFreq:		equ $10		; & $11
-zTrackNoteFillTimeout:	equ $12
-zTrackNoteFillMaster:	equ $13
-zTrackModulationPtr:	equ $14		; & $15,$16,$17
-zTrackModulationWait:	equ $18
-zTrackModulationSpeed:	equ $19
-zTrackModulationDelta:	equ $1A
-zTrackModulationSteps:	equ $1B
-zTrackModulationVal:	equ $1C		; & $1D
-zTrackFreqDisplacement:	equ $1E
-zTrackPSGNoise:		equ $1F
-zTrackFeedbackAlgo:	equ $1F
-zTrackVoicePtr:		equ $20		; & $21,$22,$23
-zTrackLoopCounters:	equ $24		; multiple bytes
-zTrackGoSubStack:	equ zTrackSz	; multiple bytes. This equate won't get to be used because of an optimisation that just uses zTrackSz
+zTrackPlaybackControl:	equ 0		; All tracks
+zTrackVoiceControl:	equ 1		; All tracks
+zTrackTempoDivider:	equ 2		; All tracks
+zTrackDataPointer:	equ 4		; All tracks (4 bytes)
+zTrackKeyOffset:	equ 8		; FM/PSG only (sometimes written to as a word, to include zTrackVolume)
+zTrackVolume:		equ 9		; FM/PSG only
+zTrackAMSFMSPan:	equ $A		; FM/DAC only
+zTrackVoiceIndex:	equ $B		; FM/PSG only
+zTrackVolFlutter:	equ $C		; PSG only
+zTrackStackPointer:	equ $D		; All tracks
+zTrackDurationTimeout:	equ $E		; All tracks
+zTrackSavedDuration:	equ $F		; All tracks
+zTrackSavedDAC:		equ $10		; DAC only
+zTrackFreq:		equ $10		; FM/PSG only (2 bytes)
+zTrackNoteFillTimeout:	equ $12		; FM/PSG only
+zTrackNoteFillMaster:	equ $13		; FM/PSG only
+zTrackModulationPtr:	equ $14		; FM/PSG only (4 bytes)
+zTrackModulationWait:	equ $18		; FM/PSG only
+zTrackModulationSpeed:	equ $19		; FM/PSG only
+zTrackModulationDelta:	equ $1A		; FM/PSG only
+zTrackModulationSteps:	equ $1B		; FM/PSG only
+zTrackModulationVal:	equ $1C		; FM/PSG only (2 bytes)
+zTrackFreqDisplacement:	equ $1E		; FM/PSG only
+zTrackPSGNoise:		equ $1F		; PSG only
+zTrackFeedbackAlgo:	equ $1F		; FM only
+zTrackVoicePtr:		equ $20		; FM SFX only (4 bytes)
+zTrackLoopCounters:	equ $24		; All tracks (multiple bytes)
+zTrackGoSubStack:	equ zTrackSz	; All tracks (multiple bytes. This constant won't get to be used because of an optimisation that just uses zTrackSz)
 
 zTrackSz:	equ $30