Added title screen (but problem with decoder), *run !boot

beebtrk.6502

@@ -54,8 +54,10 @@ INCLUDE "lib/beebtracker.h.6502"
 \ *	Start address to be saved
 \ ******************************************************************
 
-ORG CODE_ORIGIN						; code origin - assume standard BBC Micro
-GUARD MODE7_base_addr				; ensure code size doesn't hit start of screen memory
+LARGEST_VGM_SIZE = 20837
+
+ORG CODE_ORIGIN								; code origin - assume standard BBC Micro
+GUARD MODE7_base_addr-LARGEST_VGM_SIZE		; ensure code size plus size of largest VGM file doesn't hit start of screen memory
 
 .start
 
@@ -92,6 +94,8 @@ INCLUDE "lib/beebtracker.s.6502"
 	CLI
 
 
+
+
 	JSR	tracker_main
 
 \\ ***** Exit app entirely ***** \\
@@ -119,15 +123,29 @@ INCLUDE "lib/beebtracker.s.6502"
 .data_start
 
 
-.menu_data_filename EQUS "BeebDat", 13
+.menu_data_filename 		EQUS "BeebDat", 13
+.loadscreen_data_filename 	EQUS "LSCREEN", 13
 
+\\ Need to put this macro last as I don't know how to undo the character map!
+\\ 
+SET_TELETEXT_FONT_CHAR_MAP
 
+\\ Scrolltext messages stored as font glyph byte offsets
+.scrolltext_start
 
-\ ******************************************************************
-\ *	End address to be saved
-\ ******************************************************************
+.demo_message
+EQUS "            Welcome to the Bitshifters Battle of the Bits BeebTracker Demo... Showcasing 27 awesome VGM chiptune music files that have been converted from other platforms to work on your 4Mhz BBC Micro and replayed on your SN76489 programmable sound chip! " ;You've never heard chip tunes like this before! This production was brought to you by Kieran and Scrubbly            ", 0
+
+.load_message
+EQUS "Loading... ", 0
+
+\\ ** ANY EQUS LINES AFTER THIS POINT WILL STILL CONTAIN REMAPPED CHARACTERS ** \\
+
+.scrolltext_end
+
+\\ Clear character mappings
+RESET_MAPCHAR
 
-.end
 
 
 
@@ -139,10 +157,16 @@ INCLUDE "lib/beebtracker.s.6502"
 
 .VGM_stream_data
 \\ Now loaded at run-time so don't know end of data!
+INCBIN "data/loader_volume1.bin.exo"
 
 
+\ ******************************************************************
+\ *	End address to be saved
+\ ******************************************************************
+
+.end
 
-ORG &0808
+ORG &0900
 GUARD &0CFF
 
 .menu_data_start
@@ -222,22 +246,7 @@ EQUS "Exit                            "
 ENDIF
 .menu_entries_end
 
-\\ Need to put this macro last as I don't know how to undo the character map!
-\\ 
-SET_TELETEXT_FONT_CHAR_MAP
-
-\\ Scrolltext messages stored as font glyph byte offsets
-.scrolltext_start
-
-.demo_message
-EQUS "BeebTracker scrolltext in the right place and now scrolled one pixel per frame. Looks pretty smooth! 0123456789?!. ", 0
-
-.load_message
-EQUS "Loading... ", 0
-
-\\ ** ANY EQUS LINES AFTER THIS POINT WILL STILL CONTAIN REMAPPED CHARACTERS ** \\
 
-.scrolltext_end
 
 .menu_data_end
 
@@ -282,7 +291,7 @@ PRINT "------------------------------------------------------------"
 \ ******************************************************************
 
 
-SAVE "BeebTrk", start, end, main
+SAVE "!Boot", start, end, main
 SAVE "BeebDat", menu_data_start, menu_data_end
 
 PUTFILE "vgm_botb/BotB 7832 MasterTracker.raw.exo", "V.0", 0
@@ -312,7 +321,7 @@ PUTFILE "vgm_botb/BotB 20609 Jredd - PSG Strut.raw.exo", "V.O", 0
 PUTFILE "vgm_botb/my_mission.raw.exo", "V.P", 0
 PUTFILE "vgm_botb/my_new_used_car.raw.exo", "V.Q", 0
 PUTFILE "vgm_botb/run_under_fire.raw.exo", "V.R", 0
-
+;PUTFILE "data/loader_volume1.bin", "LSCREEN", 0
 
 
 

data/loader_volume1.bin

@@ -0,0 +1 @@
+���ssss�ssss�ssss�ssss�ssss�ssss�ssss1  ���                                     ���  j0b(=`<j0b`v(=`lhp`<               ���  *&* %('*** % %"-* ('               ���                                     ���  s�s�s�s�s�s�ss                     ���                                     ���  `dhp`l`<`l`0(=`<                   ���  *!* "-('"-** %('                   ���                                     ���s�s�s�s�s�s�ssssssssssssssssssssss1  ���                                     ���                                     ���   `pppppppppppppppppp               ���  85�BEEB TRACKER                    ���  5bsssssssssssssssssssqpppppp       ���  95�VOLUME ONE                      ���  5bsssssssssssssssssssssspp         ���  95�BATTLE OF THE BITS              ���  5bssssssssssssssssssssssss#        ���  95�VGM MUSIC COMPILATION           ���  5bsssssssssssssssss3#######        ���  )5�MMXVI                           ���   "####################             ���                    �                

lib/beebtracker.s.6502

@@ -8,10 +8,14 @@
 
 .tracker_main
 {
+
 	\\ Debounce
 	LDA #&FF
 	STA menu_key_held
 
+	\\ Present intro screen
+	JSR show_intro
+
 	\\ Install the menu data
 	JSR load_menu_data
 
@@ -607,7 +611,6 @@
 	LDA #LO(menu_data_filename)
 	STA osfile_params + 0
 	LDA #HI(menu_data_filename)
-	ADC #0
 	STA osfile_params + 1
 
 	LDA #LO(menu_data_start)
@@ -626,6 +629,45 @@
 	RTS
 }
 
+\\ *** Show loading screen ***
+.show_intro
+{
+;	\\ Set osfile param block
+;	LDA #LO(loadscreen_data_filename)
+;	STA osfile_params + 0
+;	LDA #HI(loadscreen_data_filename)
+;	STA osfile_params + 1
+
+;	LDA #LO(VGM_stream_data)
+;	STA osfile_params + 2
+;	LDA #HI(VGM_stream_data)
+;	STA osfile_params + 3
+
+;	LDA #0
+;	STA osfile_params + 6
+
+;	\\ Issue osfile call
+;	LDX #LO(osfile_params)
+;	LDY #HI(osfile_params)
+;	LDA #&FF
+;	JSR osfile
+
+	\\ Initialize compressed data stream
+	LDX #LO(VGM_stream_data)
+	LDY #HI(VGM_stream_data)
+	JSR exo_init_decruncher
+
+	\\ unpack to screen
+	LDX #&00
+	LDY #&7c
+	JSR exo_unpack
+
+
+
+	JSR &FFE0
+	RTS
+}
+
 
 .load_file_from_table			; flle_no = index into our table
 {

make.bat

@@ -1,3 +1,3 @@
-..\..\Bin\beebasm.exe -i beebtrk.6502 -do beebtrk.ssd -boot BeebTrk -v
+..\..\Bin\beebasm.exe -i beebtrk.6502 -do beebtrk.ssd -opt 2 -v