Merge branch 'master' into AS

sonicretro · Apr 17, 2016 · f941a93 · f941a93
2 parents c9a079f + e478cb8
commit f941a93
Show file tree

Hide file tree

Showing 8 changed files with 239 additions and 134 deletions.
diff --git a/Constants.asm b/Constants.asm
@@ -37,7 +37,7 @@ 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)
+zTrackTranspose:	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
@@ -55,7 +55,7 @@ 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
+zTrackDetune:		equ $1E		; FM/PSG only
 zTrackPSGNoise:		equ $1F		; PSG only
 zTrackFeedbackAlgo:	equ $1F		; FM only
 zTrackVoicePtr:		equ $20		; FM SFX only (4 bytes)

diff --git a/PlaneEd Projects/Hidden Japanese Credits.txt b/PlaneEd Projects/Hidden Japanese Credits.txt
@@ -0,0 +1,9 @@
+Palette File: ../palette/Sega2.bin
+Mapping File: ../tilemaps/Hidden Japanese Credits.bin
+Art File: ../artnem/Hidden Japanese Credits.bin
+Mapping Compression: Enigma
+Art Compression: Nemesis
+x-Size: 0x28
+y-Size: 0x1C
+Palette Offset: 0x20
+Palette Length: 0x20
diff --git a/PlaneEd Projects/SS Background 1.txt b/PlaneEd Projects/SS Background 1.txt
@@ -0,0 +1,9 @@
+Palette File: ../palette/Special Stage.bin
+Mapping File: ../tilemaps/SS Background 1.bin
+Art File: ../artnem/Special Birds & Fish.bin
+Mapping Compression: Enigma
+Art Compression: Nemesis
+x-Size: 0x08
+y-Size: 0x08
+Palette Offset: 0x20
+Palette Length: 0x40
diff --git a/PlaneEd Projects/SS Background 2.txt b/PlaneEd Projects/SS Background 2.txt
@@ -0,0 +1,9 @@
+Palette File: ../palette/Special Stage.bin
+Mapping File: ../tilemaps/SS Background 2.bin
+Art File: ../artnem/Special Clouds.bin
+Mapping Compression: Enigma
+Art Compression: Nemesis
+x-Size: 0x40
+y-Size: 0x40
+Palette Offset: 0x40
+Palette Length: 0x20
diff --git a/PlaneEd Projects/Title Screen.txt b/PlaneEd Projects/Title Screen.txt
@@ -0,0 +1,10 @@
+Palette File: ../palette/Title Screen.bin
+Mapping File: ../tilemaps/Title Screen.bin
+Art File: ../artnem/Title Screen Foreground.bin
+Mapping Compression: Enigma
+Art Compression: Nemesis
+x-Size: 0x22
+y-Size: 0x16
+Palette Offset: 0x00
+Palette Length: 0x20
+Tile Offset: 0x200
diff --git a/PlaneEd Projects/readme.txt b/PlaneEd Projects/readme.txt
@@ -0,0 +1,3 @@
+These files are for use with PlaneEd. Simply drag and drop a file onto PlaneEd.exe to start it.
+
+You can find PlaneEd at http://info.sonicretro.org/PlaneED
diff --git a/Variables.asm b/Variables.asm
@@ -58,37 +58,47 @@ f_speedup:		= $02A	; flag indicating whether speed shoes tempo is on ($80) or of
 v_ring_speaker:		= $02B	; which speaker the "ring" sound is played in (00 = right; 01 = left)
 f_push_playing:		= $02C	; if set, prevents further push sounds from playing
 
-v_track_ram:		= $040	; Start of music RAM
-
-v_dac_track:		= v_track_ram+zTrackSz*0
-v_fm1_track:		= v_track_ram+zTrackSz*1
-v_fm2_track:		= v_track_ram+zTrackSz*2
-v_fm3_track:		= v_track_ram+zTrackSz*3
-v_fm4_track:		= v_track_ram+zTrackSz*4
-v_fm5_track:		= v_track_ram+zTrackSz*5
-v_fm6_track:		= v_track_ram+zTrackSz*6
-v_psg1_track:		= v_track_ram+zTrackSz*7
-v_psg2_track:		= v_track_ram+zTrackSz*8
-v_psg3_track:		= v_track_ram+zTrackSz*9
-v_track_ram_end:	= v_track_ram+zTrackSz*10
-
-v_sfx_track_ram:	= v_track_ram_end	; Start of sfx RAM, straight after the end of music RAM
-
-v_sfx_fm3_track:	= v_sfx_track_ram+zTrackSz*0
-v_sfx_fm4_track:	= v_sfx_track_ram+zTrackSz*1
-v_sfx_fm5_track:	= v_sfx_track_ram+zTrackSz*2
-v_sfx_psg1_track:	= v_sfx_track_ram+zTrackSz*3
-v_sfx_psg2_track:	= v_sfx_track_ram+zTrackSz*4
-v_sfx_psg3_track:	= v_sfx_track_ram+zTrackSz*5
-v_sfx_track_ram_end:	= v_sfx_track_ram+zTrackSz*6
-
-v_sfx2_track_ram:	= v_sfx_track_ram_end	; Start of special sfx RAM, straight after the end of sfx RAM
-
-v_sfx2_fm4_track:	= v_sfx2_track_ram+zTrackSz*0
-v_sfx2_psg3_track:	= v_sfx2_track_ram+zTrackSz*1
-v_sfx2_track_ram_end:	= v_sfx2_track_ram+zTrackSz*2
-
-v_1up_ram_copy:		= v_sfx2_track_ram_end
+v_music_track_ram:		= $040	; Start of music RAM
+
+v_music_fmdac_tracks:		= v_music_track_ram+zTrackSz*0
+v_music_dac_track:		= v_music_fmdac_tracks+zTrackSz*0
+v_music_fm_tracks:		= v_music_fmdac_tracks+zTrackSz*1
+v_music_fm1_track:		= v_music_fm_tracks+zTrackSz*0
+v_music_fm2_track:		= v_music_fm_tracks+zTrackSz*1
+v_music_fm3_track:		= v_music_fm_tracks+zTrackSz*2
+v_music_fm4_track:		= v_music_fm_tracks+zTrackSz*3
+v_music_fm5_track:		= v_music_fm_tracks+zTrackSz*4
+v_music_fm6_track:		= v_music_fm_tracks+zTrackSz*5
+v_music_fm_tracks_end:		= v_music_fm_tracks+zTrackSz*6
+v_music_fmdac_tracks_end:	= v_music_fm_tracks_end
+v_music_psg_tracks:		= v_music_fmdac_tracks_end
+v_music_psg1_track:		= v_music_psg_tracks+zTrackSz*0
+v_music_psg2_track:		= v_music_psg_tracks+zTrackSz*1
+v_music_psg3_track:		= v_music_psg_tracks+zTrackSz*2
+v_music_psg_tracks_end:		= v_music_psg_tracks+zTrackSz*3
+v_music_track_ram_end:		= v_music_psg_tracks_end
+
+v_sfx_track_ram:		= v_music_track_ram_end	; Start of SFX RAM, straight after the end of music RAM
+
+v_sfx_fm_tracks:		= v_sfx_track_ram+zTrackSz*0
+v_sfx_fm3_track:		= v_sfx_fm_tracks+zTrackSz*0
+v_sfx_fm4_track:		= v_sfx_fm_tracks+zTrackSz*1
+v_sfx_fm5_track:		= v_sfx_fm_tracks+zTrackSz*2
+v_sfx_fm_tracks_end:		= v_sfx_fm_tracks+zTrackSz*3
+v_sfx_psg_tracks:		= v_sfx_fm_tracks_end
+v_sfx_psg1_track:		= v_sfx_psg_tracks+zTrackSz*0
+v_sfx_psg2_track:		= v_sfx_psg_tracks+zTrackSz*1
+v_sfx_psg3_track:		= v_sfx_psg_tracks+zTrackSz*2
+v_sfx_psg_tracks_end:		= v_sfx_psg_tracks+zTrackSz*3
+v_sfx_track_ram_end:		= v_sfx_psg_tracks_end
+
+v_spcsfx_track_ram:		= v_sfx_track_ram_end	; Start of special SFX RAM, straight after the end of SFX RAM
+
+v_spcsfx_fm4_track:		= v_spcsfx_track_ram+zTrackSz*0
+v_spcsfx_psg3_track:		= v_spcsfx_track_ram+zTrackSz*1
+v_spcsfx_track_ram_end:		= v_spcsfx_track_ram+zTrackSz*2
+
+v_1up_ram_copy:			= v_spcsfx_track_ram_end
 
 ; =================================================================================
 ; From here on, no longer relative to sound driver RAM