diff --git a/028.bs/Makefile b/028.bs/Makefile index 30cdcfd..880ab0b 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -297,16 +297,25 @@ out/main.o: $(IMAGEDATA) \ out/panelFade.s out/jump.raw out/falling.raw out/chaching.raw out/whoosh.raw out/yay.raw -bin/main.exe: $(ALL_OBJS) +bin/BlockySkies: $(ALL_OBJS) vlink -hunkattr DATA=2 -hunkattr CODE=2 -hunkattr .text=2 -hunkattr .code=2 -hunkattr .data=2 -hunkattr .noload=2 -hunkattr .bss=2 $(ALL_OBJS) -o $@ cp $@ ~/A1200 cp $@ ~/A4000 + ls -lh bin/BlockySkies + -mkdir BlockySkies + cp assets/BlockySkiesDrawer.info BlockySkies.info + cp bin/BlockySkies BlockySkies + cp assets/BlockySkies.info BlockySkies + lha -c bin/BlockySkies.lha BlockySkies BlockySkies.info + -@rm BlockySkies.info + -@rm -rf BlockySkies + ls -lh bin/BlockySkies.lha .PHONY: wipe wipe: clean mkdir bin mkdir out - make TRACKLOADER=0 bin/main.exe + make TRACKLOADER=0 bin/BlockySkies .PHONY: wb -wb: wipe bin/main.exe +wb: wipe bin/BlockySkies diff --git a/028.bs/assets/BlockySkies.info b/028.bs/assets/BlockySkies.info new file mode 100644 index 0000000..602d2c6 Binary files /dev/null and b/028.bs/assets/BlockySkies.info differ diff --git a/028.bs/assets/BlockySkiesDrawer.info b/028.bs/assets/BlockySkiesDrawer.info new file mode 100644 index 0000000..2ecb82d Binary files /dev/null and b/028.bs/assets/BlockySkiesDrawer.info differ diff --git a/028.bs/game1.s b/028.bs/game1.s index fdb5d23..540d864 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -339,6 +339,7 @@ GameOver: jmp ShowHighScore TutorialOver: + add.l #8,sp ; dirty hack - unwind the call stack move.l #levelInstallers,nextLevelInstaller move.l #"0001",levelCounter lea tutorialOverMessage,a1 @@ -871,11 +872,11 @@ BlitCountdown: ;; palette Level 91,"STAY ON THE PATHWAYS!",100,2*2,12,10,"WELL DONE!",A,21,0 Level 92,"COLLECT COINS!",100,2*2,12,10,"NEXT COLLECT AN ARROW...",A,21,0 - Level 93,"PRESS FIRE TO ACTIVE THE ARROW",100,2*2,12,10,"WHOOHOO",A,21,0 + Level 93,"PRESS FIRE TO ACTIVATEE THE ARROW",100,2*2,12,10,"WHOOHOO",A,21,0 Level 94,"WATCH OUT FOR BEES!",100,2*2,12,10,"LOL - BEES",A,21,0 Level 95,"REMEMBER THE PATHWAYS BEFORE THEY FADE!",75,2*2,12,10,"CLOCKS WILL STOP THE BOARD MOVING",A,21,0 - Level 96,"PRESS FIRE TO ACTIVE THE CLOCK",200,2*2,12,10,"EYES WILL UNHIDE THE BOARD",A,21,0 - Level 97,"PRESS FIRE TO ACTIVE THE EYE",100,2*2,12,10,"LEVEL 7",A,21,0 + Level 96,"PRESS FIRE TO ACTIVATE THE CLOCK",200,2*2,12,10,"EYES WILL UNHIDE THE BOARD",A,21,0 + Level 97,"PRESS FIRE TO ACTIVATE THE EYE",100,2*2,12,10,"LEVEL 7",A,21,0 Level 1,"LET'S TRY A LONGER LEVEL!",75,2*2,12,10,"PHEW!, LEVEL 1 COMPLETE!",B,98,2 Level 2,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 2",B,98,2 diff --git a/028.bs/menu.s b/028.bs/menu.s index 675ecb5..0806fd3 100644 --- a/028.bs/menu.s +++ b/028.bs/menu.s @@ -382,8 +382,8 @@ creditsTopColor: dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR dc.w PLAY_COPPER_WORD+$5000,$fffe - dc.w COLOR31 if TRACKLOADER=0 + dc.w COLOR31 quitTopColor: dc.w MENU_TEXT_COLOR dc.w $ffdf,$fffe