diff --git a/028.bs/Makefile b/028.bs/Makefile
index 70211a6..e8ac6b1 100644
--- a/028.bs/Makefile
+++ b/028.bs/Makefile
@@ -1,3 +1,4 @@
+TEST_VERSION=1
TRACKLOADER=1
EXAMPLE_NAME=game1
BACKGROUND_COLOR=09e
@@ -96,7 +97,7 @@ IMAGES=foreground.png \
IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin))
-VASM_EXTRA_ARGS=-DSFX=1 -DMAX_P61_SIZE=$(MAX_P61_SIZE) -allmp -DTRACKLOADER=$(TRACKLOADER)
+VASM_EXTRA_ARGS=-DSFX=1 -DMAX_P61_SIZE=$(MAX_P61_SIZE) -allmp -DTRACKLOADER=$(TRACKLOADER) -DTEST_VERSION=$(TEST_VERSION)
LINKER_OPTIONS=-T link.script.x
diff --git a/028.bs/game1.s b/028.bs/game1.s
index e0cd8bb..d4b3162 100644
--- a/028.bs/game1.s
+++ b/028.bs/game1.s
@@ -81,7 +81,7 @@ Entry2:
jsr StartMusic
jsr ShowSplash
MainMenu:
- jmp ShowMenu
+a jmp ShowMenu
StartGame:
jsr BlueFill
jsr InitialiseBackground
@@ -904,12 +904,14 @@ BlitCountdown:
Level 96,"PRESS FIRE TO ACTIVATE THE CLOCK",200,2*2,12,10,"EYES WILL UNHIDE THE BOARD",A,21,0,1,pig,1,1
Level 97,"PRESS FIRE TO ACTIVATE THE EYE",100,2*2,12,10,"YOU DID IT!",A,21,0,1,pig,1,1
- Level 1,"WELCOME TO BLOCKY SKIES!",75,2*2,12,10,"PHEW!, LEVEL 1 COMPLETE!",A,99,0,1,pig,1,1
+ Level 1,"WELCOME TO BLOCKY SKIES!",70,2*2,12,10,"PHEW!, LEVEL 1 COMPLETE!",A,99,0,1,pig,1,1
Level 2,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 2",B,98,2,0,robot,1,1
+ if TEST_VERSION=0
Level 3,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 3 COMPLETE!",C,98,2,0,pig,1,1
Level 4,"MOO!",75,4*2,8,6,"ALRIGHT! LEVEL 4 COMPLETE!!",E,99,2,0,cow,2,3
Level 5,"KABOOM?!",75,4*2,8,6,"PHEW!!! LEVEL 5 COMPLETE!",D,99,1,0,tank,1,1
Level 6,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 6 COMPLETE!",A,98,1,0,cow,2,2
+ endif
Palette A
@@ -1040,11 +1042,13 @@ panelGreyPalette:
include "out/panel-grey-table.s"
levelInstallers:
dc.l InstallLevel1
+ if TEST_VERSION=0
dc.l InstallLevel2
dc.l InstallLevel3
dc.l InstallLevel4
dc.l InstallLevel5
- dc.l InstallLevel6
+ dc.l InstallLevel6
+ endif
dc.l 0
nextLevelInstaller:
dc.l levelInstallers
diff --git a/028.bs/highscore.s b/028.bs/highscore.s
index e2eab8a..dd9444f 100644
--- a/028.bs/highscore.s
+++ b/028.bs/highscore.s
@@ -90,6 +90,9 @@ RenderHighScore:
jsr DrawMaskedText85
cmp.l #endHighScores,a2
bne .loop
+
+ RenderVersion
+
rts
AddHighScore:
@@ -233,5 +236,10 @@ fifthTopColor:
fifthBottoMColor:
dc.w MENU_TEXT_BOTTOM_COLOR
+ dc.w $22df,$fffe
+ dc.w COLOR31,$bbb
+ dc.w $26df,$fffe
+ dc.w COLOR31,$999
+
dc.l $fffffffe
diff --git a/028.bs/levelA_foreground.tmx b/028.bs/levelA_foreground.tmx
deleted file mode 100644
index 02e8c52..0000000
--- a/028.bs/levelA_foreground.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
diff --git a/028.bs/levels/level1_foreground.tmx b/028.bs/levels/level1_foreground.tmx
index 8ef9722..1457808 100644
--- a/028.bs/levels/level1_foreground.tmx
+++ b/028.bs/levels/level1_foreground.tmx
@@ -8,17 +8,17 @@
- eJxjZ2BgsGLEjtlH5egmB5O3A2ImIBbDQlMitxWPXCUN7BvqciDaEhgnWnjkB5vcbjL11Q8BP4hB44OSuB5N5/TPH8vJTAf0zgPkyuHzH758RW13UiN/jMpRr9xAzh/0zgP0TueDyZ2E8oc0A+72Fy3kBlMbczDJweQBQHRaZw==
+ eJxjZ2BgsGLEjtlH5egmB5O3A2ImIBbDQlMitxWPXCUN7KO3H6htH4i2BMaJFh75wSa3m0x99UPAD2LQ+KAkrodKOh8KcsTmj+VkpgN65wFy5fD5D1++orY7qZE/RuWoV24g5w965wF6p/PBlB8J5Q9pBtztL1rIDaY25mCSg8kDAH7IW78=
- eJztVTkOwjAQtJGo3COlygtS5f8PSMULUuUFqdIiC48yGnzFIIFEplmwd2dnD4MxJ/4F27cFHMBk3td7/4SQwLM23DF8PaM1ZrD72RzONN7Zndv7ax+0NxN9btVS8u/tU29KCzjXxJ2318p8pRo8j0tw4Y5rHCO+qXiPRTRAt1rmQm/Qq5o8KZ9cn5RfZ+K50IOLcENnb197mNtj9HMj30F4c5pT8+I+l3ZjoZwuYYEufEetqgW1cs381mLz1V3OgeNRu7e3oEl1or4uEhcDz1DzlWJRT6rfmEnN3rIe7lvtO0c+XzesE47YDHHGNvbGAebk93EEiMOexPJhR1UvNPPvkf4PxGKYtzuolzn57RzFXHZp5tTZ16I17sTv4QF/blMw
+ eJztVTEOwjAMTJA6ZUdi6guY+P8DOvUFnfoCJlZklVNPh52ULgjRW1zh2L5zLiKlA/+CxxdmDjvnRnW3nNI1r7GGcWfOO3vfkWthSosOrS957W0adQ+6m4G+W1ysd9fYm8L693nhG3GxqFo4ZzGaazovlGtpsD4l6IUc+MArn2AWDuCtESi0G+yKczWwlpF+i6D99U5wvxZPMh88+/y+Q/axp489B1/qzC0aGbxnvi9FtFONALwErcoFWlkzvllLR/3VyxHUy9Bu8fzipDwNc1CHHO+F75B5erUeaveFWT29Ie8Mvw94MOJTA3QjFurBXmYPQD/H6I1zTnt+AtTB+9FesLuIh/ff5fnUg/qgluOetboWJvnmvW8Fa2btevc424JXd+A38QRwn19Z
- eJztld0KgzAMhe2jbf5Mp9sKsl3p+7+GChZiaZofO/HC70bQk5P0BGqWXZyJu5HX3Jg11sh6ON1zfQ6K2TDPo0jRb8k3lnFutlqNP/RoCI9255nyBJloPTh1PaFxGXOyhrsrEH2HvMf0PtS+tGBzcRm9es55tFnU8/dyzRreE9arg/uwgj06SoYW9uToX4Tme/CdJWE5nz//j7ErSGgnEiqiRuOZov878J6aNUbIT+sp/U9IM3xE9P/ex14+J5/vIh0TY2cTIw==
+ eJztVV0PwiAMHD9tIjqHHzz5YPT//w1HssWmoS2tLDFm90ICd1euHVnXbfgl7Jxe01dqktPVWHjjvD4Nd3sgjSXfyGisfhpd7i/XYz+dRffhapE1HuhOgkc01IDwX+qjs3tQOk2mXtFrOLs9wT8T+xQfQ5rX2qDu/0L78P1y2Up+Ui+G6TzMvYZ1EtLBeSTDmwmAi/OVaoYK70vj+bX2W3Av+OZ8uF6JBzFUzCTjWpnjIPDwN9AaUn2YQ+LW+mjql6D9T+Qe3hSaI8Ndex4SuBzcvTf8H97X9hbY
diff --git a/028.bs/macros.i b/028.bs/macros.i
index e645997..8d8311d 100644
--- a/028.bs/macros.i
+++ b/028.bs/macros.i
@@ -241,4 +241,14 @@ RenderSkippedFramesCounter: macro
jsr RenderCounterAtY
.noSkippedFrames:
endif
+endm
+
+RenderVersion: macro
+ movem.l d0-a6,-(sp)
+ lea versionText,a1
+ lea splash,a0
+ move.w #(320)-(15*8)+4,d0
+ move.w #256-10,d1
+ jsr DrawMaskedText85
+ movem.l (sp)+,d0-a6
endm
\ No newline at end of file
diff --git a/028.bs/menu.s b/028.bs/menu.s
index 7ccd285..cf1ec5d 100644
--- a/028.bs/menu.s
+++ b/028.bs/menu.s
@@ -84,6 +84,8 @@ RenderMenu:
move.l a0,BLTAPTH(a6) ;source graphic top left corner
move.l a2,BLTDPTH(a6) ;destination top left corner
move.w #((32*5)<<6)|(96/16),BLTSIZE(a6)
+
+ RenderVersion
lea menu,a1
lea splash,a0
@@ -380,7 +382,16 @@ quitTopColor:
dc.w $ffdf,$fffe
dc.w $06df,$fffe
dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR
+ else
+ dc.w $ffdf,$fffe
+ dc.w $06df,$fffe
endif
+
+ dc.w $22df,$fffe
+ dc.w COLOR31,$bbb
+ dc.w $26df,$fffe
+ dc.w COLOR31,$999
+
dc.l $fffffffe
selectedPtr:
diff --git a/028.bs/splash.s b/028.bs/splash.s
index b26211e..30f75a3 100644
--- a/028.bs/splash.s
+++ b/028.bs/splash.s
@@ -5,6 +5,7 @@
xdef RestoreSplashMenuSection
xdef splash
xdef splashInvalid
+ xdef versionText
SPLASH_COLOR_DEPTH equ 5
SPLASH_SCREEN_WIDTH_BYTES equ 40
@@ -46,7 +47,7 @@ ReloadSplashScreen:
move.l a0,BLTAPTH(a6) ;source graphic top left corner
move.l backgroundOffscreen,BLTDPTH(a6) ;destination top left corner
move.w #((112*5)<<6)|(96/16),BLTSIZE(a6)
-
+
.skip:
rts
@@ -94,6 +95,8 @@ ShowSplash:
move.w #(DMAF_BLITTER|DMAF_SETCLR!DMAF_COPPER!DMAF_RASTER!DMAF_MASTER),DMACON(a6)
move.w #(INTF_SETCLR|INTF_VERTB|INTF_INTEN),INTENA(a6)
+ RenderVersion
+
.wait:
jsr WaitVerticalBlank
jsr WaitForJoystick
@@ -114,10 +117,20 @@ splashCopperListBplPtr:
dc.w BPL5PTH,0
dc.w BPL6PTL,0
dc.w BPL6PTH,0
- dc.l $fffffffe
+ dc.w $ffdf,$fffe
+ dc.w $22df,$fffe
+ dc.w COLOR31,$ddd
+ dc.w $26df,$fffe
+ dc.w COLOR31,$ccc
+ dc.l $fffffffe
splashInvalid:
dc.w 1
+ align 4
+versionText:
+ dc.b "TEST VERSION 1"
+ dc.b 0
+ align 4
section .bss
splash: