Fixed exomiser unpacker to start at exact address instead of 1 byte b…

…efore
bitshifters · Jul 6, 2016 · d176445 · d176445
1 parent ad54d57
commit d176445
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/beebtrk.6502 b/beebtrk.6502
@@ -118,8 +118,8 @@ INCLUDE "lib/beebtracker.s.6502"
 	\\ Initialize compressed data stream
 	\\ the title screen is an included binary at the VGM_stream_data memory address
 	\\ (later overwritten by loaded VGMs)
-	LDX #LO(VGM_stream_data-1)
-	LDY #HI(VGM_stream_data-1)
+	LDX #LO(VGM_stream_data)
+	LDY #HI(VGM_stream_data)
 	JSR exo_init_decruncher
 
 	\\ unpack to screen

diff --git a/beebtrk.ssd b/beebtrk.ssd
diff --git a/lib/beebtracker.s.6502 b/lib/beebtracker.s.6502
@@ -473,8 +473,8 @@
 
 	\\ Initialise music player - pass in VGM_stream_data address
 	\\ parses header from stream
-	LDX #LO(VGM_stream_data - 1)
-	LDY #HI(VGM_stream_data - 1)
+	LDX #LO(VGM_stream_data)
+	LDY #HI(VGM_stream_data)
 	JSR	vgm_init_stream
 
 	\\ Copy meta data to screen

diff --git a/lib/exomiser.s.6502 b/lib/exomiser.s.6502
@@ -32,23 +32,26 @@
 ; flag will just mess things up.
 .exo_get_crunched_byte
 {
-	INC _byte_lo
-	bne _byte_skip_hi
-	INC _byte_hi			; forward decrunch
-._byte_skip_hi:
 
 ._byte
 	lda &ffff ; EXO data stream address	; **SELF-MODIFIED CODE**
 _byte_lo = _byte + 1
 _byte_hi = _byte + 2
+
+	\\ advance input stream memory address
+	INC _byte_lo
+	bne _byte_skip_hi
+	INC _byte_hi			; forward decrunch
+._byte_skip_hi:
+
 	rts						; decrunch_file is called.
 }
 
 ; -------------------------------------------------------------------
 
 
-EXO_crunch_byte_lo = exo_get_crunched_byte + 9
-EXO_crunch_byte_hi = exo_get_crunched_byte + 10
+EXO_crunch_byte_lo = exo_get_crunched_byte + 1
+EXO_crunch_byte_hi = exo_get_crunched_byte + 2