From 2ce79fca693f818ad6e99bee38eaf85779a8d531 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Sun, 29 May 2016 16:43:45 +1000 Subject: [PATCH] small bug in non wb mode, added .info files --- 028.bs/Makefile | 15 ++++++++++++--- 028.bs/assets/BlockySkies.info | Bin 0 -> 3706 bytes 028.bs/assets/BlockySkiesDrawer.info | Bin 0 -> 632 bytes 028.bs/game1.s | 7 ++++--- 028.bs/menu.s | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 028.bs/assets/BlockySkies.info create mode 100644 028.bs/assets/BlockySkiesDrawer.info 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 0000000000000000000000000000000000000000..602d2c69d83ea6063e8c9527f6540f4a09908e75 GIT binary patch literal 3706 zcmeH}u};G<5QhKYidJHPiK!^9)D5w*XXFu>5U;?3RHRDD#+cVY6(ci!1QrIyNEsrw zE=W}b7@vLDxK>eju%-C(Wd5#}|Y< za~xRPb|W{;FvI}8vq$Z074jbTloD#TnW;8y2{4muvOlo5AhtLqX#H^M`0Aj)g-F}^ zd_nnNw^uo_ZJ#%7_ESbTkIc7|i7xE@3*9Qce#&E}33lscdXY3#HQh(K=1h@Y%!GaC zuljWb9F`SSqxDN+5}UH#PWDqg#o6oqP6RDkLYY(u12+)Y=RcD8{^oL}! zF1r23FBTfhz9J0$e{p|dO+0@JwNPx)LSdj8Db-k~Rd!3)6k{85$4{X%eN9{e8Rf5T vhTF-0%IxOZsf8)Wixvw1!#mwrW7I_daYRj|x`>+S{i8-rjGEYKKhXODE2l@} literal 0 HcmV?d00001 diff --git a/028.bs/assets/BlockySkiesDrawer.info b/028.bs/assets/BlockySkiesDrawer.info new file mode 100644 index 0000000000000000000000000000000000000000..2ecb82d3ae9f05bb9e0ba3f29a39cd0ad6ed108e GIT binary patch literal 632 zcmZvYu}T9$5QhJ~oM!}4(MGI9BZ!qC8f?77%0>x-okb8IK=1)_=sRdD*l6lt?IYL- z=`8dCtl||R>&!oUNs60g=bM?GnPujC2@WdfIK?3rkccnm@doaBn=hrh7Q;p6xuYjB z&g34W_SzPjJfP)PaO=Ig5tcjHdb{G&=1I>|M7NQ75jat!aa4bg5Z(RO#vwHpHP!!M zp3xX}vLT%F>mWakbr@&;JL8(zkSwcb8RF1yXzr9wnO9(!u~qB^ze)Dd^aFf(a>w}R zjRjK1HL;I_P@l4{nEIi@3^U(Lgf-2_8cN(t2i(b>MlsxMUrQ-9i#3- xeU&7)`cWRSZ#PfbZ!+@+<1d)ue=Sz2D)T1PUFh5c*@aSfp)9X9uADu#rvHh^y;1-G literal 0 HcmV?d00001 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