diff --git a/028.bs/Makefile b/028.bs/Makefile index ad558c1..6283d84 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -76,7 +76,6 @@ IMAGES=foreground.png \ font8x8.png\ font8x85.png\ splash.png\ - splashSave.png\ backgroundMask-mask.png\ countdown.png @@ -219,10 +218,6 @@ out/font%.bin: assets/font%.png out/font8x85.bin: assets/font8x8.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/font8x85 --colors=32 --use-palette assets/font8x85.pal --full-color-palette-file --output-mask --transparent-color=0,0,0 --output-png -out/splashSave.bin: assets/splash.png out/splash.bin - ../tools/croppa/out/croppa --input=assets/splash.png --output=out/splashSave.png --width=96 --height=64 --rows=1 --cols=1 --dx=0 --dy=0 --x=112 --y=150 - $(IMAGECON) --input out/splashSave.png $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/splashSave --colors=32 --output-copperlist --full-color-palette-file --use-palette=out/splash.pal - out/backgroundMask-mask.bin: assets/background.png $(IMAGECON) --input assets/background.png $(IMAGECON_ARGS) --output-mask --output out/backgroundMask --output-png --colors=8 --transparent-color=0,0,14 --output-png --palette-offset=8 @@ -281,18 +276,18 @@ out/credits_copperlist.i: credits_copper.c out/credits.o: out/credits_copperlist.i out/main.o: $(IMAGEDATA) \ + out/level91_foreground-map.s\ + out/level92_foreground-map.s\ + out/level93_foreground-map.s\ + out/level94_foreground-map.s\ + out/level95_foreground-map.s\ + out/level96_foreground-map.s\ + out/level97_foreground-map.s\ out/level1_foreground-map.s\ out/level2_foreground-map.s\ out/level3_foreground-map.s\ out/level4_foreground-map.s\ out/level5_foreground-map.s\ - out/level6_foreground-map.s\ - out/level7_foreground-map.s\ - out/level8_foreground-map.s\ - out/level9_foreground-map.s\ - out/level10_foreground-map.s\ - out/level11_foreground-map.s\ - out/level12_foreground-map.s\ out/background-map.s Makefile link.script.x\ out/menu-palette.s\ out/paletteA_playarea_fade.s out/paletteA_flags_fade.s out/paletteA_foreground-palette-table.s out/paletteA_tileFade.s\ diff --git a/028.bs/game1.s b/028.bs/game1.s index e3cb59d..a2595a7 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -34,6 +34,7 @@ xdef nextLevelInstaller xdef levelInstallers + xdef tutorialLevelInstallers byteMap: dc.l Entry @@ -313,6 +314,8 @@ GameOver: InstallNextLevel: move.l nextLevelInstaller,a0 + cmp.l #endTutorialLevelInstaller,a0 + beq GameOver cmp.l #0,(a0) bne .dontResetLevelInstaller move.l #levelInstallers,nextLevelInstaller @@ -829,21 +832,21 @@ BlitCountdown: ;; frames after jump before player miss is checked ;; level complete name ;; palette - Level 1,"STAY ON THE PATHWAYS!",100,2*2,12,10,"LEVEL 1",A,21,0 - Level 2,"COLLECT COINS!",100,2*2,12,10,"LEVEL 2",A,21,0 - Level 3,"ARROWS COST 500 POINTS!",100,2*2,12,10,"LEVEL 3",A,21,0 - Level 4,"WATCH OUT FOR BEES!",100,2*2,12,10,"LEVEL 4",A,21,0 - Level 5,"REMEMBER THE PATHWAYS BEFORE THEY FADE!",75,2*2,12,10,"LEVEL 5",A,21,0 - Level 6,"CLOCKS FREEZE THE BOARD",200,2*2,12,10,"LEVEL 6",A,21,0 - Level 7,"EYES SHOW THE BOARD",100,2*2,12,10,"LEVEL 7",A,21,0 + 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 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 8,"LET'S TRY A LONGER LEVEL!",75,2*2,12,10,"PHEW!, LEVEL 8",B,98,2 - Level 9,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 9",B,98,2 + 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 - Level 10,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 10",C,98,2 - Level 11,"LETS GO?",25,4*2,8,6,"LEVEL 11",C,98,2 + Level 3,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 3 COMPLETE!",C,98,2 + Level 4,"LETS GO?",25,4*2,8,6,"LEVEL 4 COMPLETE",C,98,2 - Level 12,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 10",A,98,1 + Level 5,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 5 COMPLETE!",A,98,1 Palette A Palette B @@ -967,21 +970,21 @@ levelInstallers: dc.l InstallLevel2 dc.l InstallLevel3 dc.l InstallLevel4 - dc.l InstallLevel5 - dc.l InstallLevel6 - dc.l InstallLevel7 - - dc.l InstallLevel8 - dc.l InstallLevel9 - - dc.l InstallLevel10 - dc.l InstallLevel11 - - dc.l InstallLevel12 - + dc.l InstallLevel5 dc.l 0 nextLevelInstaller: - dc.l levelInstallers + dc.l levelInstallers + +tutorialLevelInstallers: + dc.l InstallLevel91 + dc.l InstallLevel92 + dc.l InstallLevel93 + dc.l InstallLevel94 + dc.l InstallLevel95 + dc.l InstallLevel96 + dc.l InstallLevel97 +endTutorialLevelInstaller: + dc.l 0 panelFade: include "out/panelFade.s" diff --git a/028.bs/level.i b/028.bs/level.i index 80d7c7a..34ee3f8 100644 --- a/028.bs/level.i +++ b/028.bs/level.i @@ -47,7 +47,6 @@ level\1StartMessage: level\1CompleteMessage: dc.b \7 - dc.b " COMPLETE!" dc.b 0 align 4 diff --git a/028.bs/levels/level12_foreground.tmx b/028.bs/levels/level12_foreground.tmx deleted file mode 100644 index 605a6ee..0000000 --- a/028.bs/levels/level12_foreground.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNSG4rmXLkmolPXyWZ+mghR45bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEOmH3DwwnN1JbP4YDnK40uRgcidy/lhIx3QwKjd88sfyYewWWHxIM+Bug9FCbjC2MQeTHAC1RFwJ - - - - - eJztVLsOwjAMTJA6dUdi6hcw9f8/gIkvYOoXMLESqz3peo1NqJhQT4qK4tf57JDSgX/Cq5zb8q3Z9uZsgVf3W9zLeQa2a/5Nnb0AhxZ0xa8v55G2nGt3hnM5J6oz5nU9i7M7TyODzWLIc33DlGb/SNtPPXg2y3kJ9NC90FzKCTxrvSu0die+Vnukuz77nKM+jL+nO7ia3loPHGAbyDYt9TxtkYv3/ZHWc1UMtGu196h7YcBv+PO84e/tqgHzq+lnPYK/9s/9QFvdc8SprZOZMiKbNwvlpL0+l1zgon3C5mnE/wMG3hnlOZGN9YHN01r5eDNDLHK1AnGepoDW7Z25tcyC6zLwjqGVvjno7b0TvL0aL/SgOT1orhqQr+bHux/p0JqTNcH3krdxXj2Nj/jyXcQdGiH3gQOGNxaubFI= - - - - - eJztVUkOwzAIdJ7WxY3bdDvlUuf/36iixhJCJoCx1Rwyl0gBDzBg7NyOrSN2v++xy9sPxP+EdO7N+P0bVH0UbsZ6JPFOlTSLQp453rVyn1INQ+P+W/g1OnPzjn01/iWw9uuOzk8bvKdnJqew2GetA/BNO8cD+4T2kbY/UB+fOVtjzz0Ijly8Ui7MK90RXC6cngHZ4R1p8UascY6CeM/CnC5K7o8yjoSfgnbmoYa9sUc1evwiOLQzLOG0wqrXjnb4Au6/EfY= - - - diff --git a/028.bs/levels/level1_foreground.tmx b/028.bs/levels/level1_foreground.tmx index 1ec39e6..78d7302 100644 --- a/028.bs/levels/level1_foreground.tmx +++ b/028.bs/levels/level1_foreground.tmx @@ -8,17 +8,17 @@ - eJyTZmBgsGLEjtlpIDeK8WM7YNgxAbEYFhokV4lHDpc+y0Hgr6GKtXCEKYgmV240PsjHhPIHOXlnND7Ix6B0vhtPHlg+mj/oignlga2j9QddMaE6Al/eGc0f1MfSeNqmtJAbxfgxAEtEpkk= + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB - + - eJztVTkOhDAMdIqteAEVL9iK/z9gK16wFS+gogVLWPJatmOCYCXISCgoB+MZMwpARUVFKcb1eSeAPv2O/8IU2POBa+rkPPOOcxENEU4+XgHkkbU3G/cAdi2NmHs59ZI+zaOvsyZ5PA7tHPJSDwdlT0kGMDtHeh2B5a3UT/2ZlTWun/vg8WhrxEFo2fsI8Txin7tka8nBy8fZPaF/lPNhDZ3RJ9Iqv4FzfJS5ojktc6W+IbwcW1pyyGVH3jF3w17fuB/tDf14EhZzXi92 + eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= - + - eJxjYBgFQx04Mg60C4gHTnR2KzXsA4UvsWEcPQTiwpkKbiTXDGL0BRNQA4sLYuKElLijBQgh025QOvKhsrtdiDAPl53E6AWBUDR1AWh85PgIICEeyQWuRJjtOwTyLC4A8h+6+wmFpwcRcTKUgBsON/thEcellhiAzTxKzSQVRA3B+CEV+I8AP44CCAAABPMMCg== + eJztld0KgzAMhe2jTefU/biC6JW+/2uoYCErTfNjJ1743Qj15CQ9Ac2yizORG3nNjVljjayH0z2356iYDfM8ihT91nxjGRfmV6vxhx4N4fHaeaciQSZaD05dR2hcxpys4e7uiP6NnGN6H2pfWrC5uExePec+2izq5X25ZV0DrfXq4D6sYI+OkqGFPTn6D6HpD/5mSVjv588/MHYFCe1EwoOo0Xim6N8GzqlZY4T8tJ7S/4Q0wyqi//c+9vI9+XwX6ZgB5+gTDw== diff --git a/028.bs/levels/level2_foreground.tmx b/028.bs/levels/level2_foreground.tmx index 1926cc2..a1e3a1e 100644 --- a/028.bs/levels/level2_foreground.tmx +++ b/028.bs/levels/level2_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirVwhCmIJlduND7Ix5Tkj8rR/EF1DErnu/HkgeWj+YOueLT+GFx4tP4YXFgaT9uUFnKjGD8GACo/pGY= + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= - eJxjYBgFo2AUEAPOA7EuIwPDdyxixoyYcqOAtoCVEZVGZ4PAXQZI3IwC2gJQ2peHhvNjKJ8QAKn7yICZh0bBwAFQnEiOxsEoGAWjgA4AAHrdCv0= + eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== - eJxjYBgFQx04Mg60C4Y3AIUvvjB2ZkRVOwpoC2BhTExYg9S4jMYJXYArlnwSgMZHzksBaPHoOxpPVAGE8oUHEXHiNhoXAwr8R8N/FIwAAABz8gaN + eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= diff --git a/028.bs/levels/level3_foreground.tmx b/028.bs/levels/level3_foreground.tmx index 7f3bc67..a1e3a1e 100644 --- a/028.bs/levels/level3_foreground.tmx +++ b/028.bs/levels/level3_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirVwhCmIJlduND7Ix5Tkj8rR/EF1DErnu/HkgeWj+YOueLT+GFyYUB2BL++M5g/qY2k8bVNayI1i/BgAGV2lCw== + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= - eJxjYBgFo2AUkAvOA/FHJHoUDCxgZWRg4GZE0CeBYsaMA+2q4Q90gWH8HYfcXSCWZ0TQMPCYAZF3QPpB8aQ7GldUA6DwxhUnuAAoTiRH44BmABQn6OkcOe2P5oFRMJIAALyTD/Y= + eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== - eJxjYBgFQx04Mg60C4Y3AIUvvjB2ZkRVOwpoC2BhjC2sQxgx1bqMxgldgCuWfBKAJT5gagLQ4tF3NJ6oAgiVQR5ExInbaFwMKPAfDf9RMAIAAAGOBuI= + eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= diff --git a/028.bs/levels/level4_foreground.tmx b/028.bs/levels/level4_foreground.tmx index 70c35a0..78d7302 100644 --- a/028.bs/levels/level4_foreground.tmx +++ b/028.bs/levels/level4_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirWA4bcbR9hq4QhvQnKj8UE+piR/VI7mD6pjQnlg+Wj+oCserT8GFya3jhjNH7TB0njaprSQG8X4MQAt/aRm + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB - eJxjYBgFo2AUEAK6jAwM3wfaEaMABdxlwIyTk1AxZNqYkc4OG8EAFCeg8NZlRBWTZ0TQMPAYiD8C8XkGiHp0faOA/gAUJ5KjcTAKRsEooAMAAJUwDuA= + eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= - eJxjYBgFQwHEMOKWc8QjNwooB6DwBWFvHOHsPBr+dAWw9E5MugepccGiLnY0zmgC0OMkgBFTHqYmAC0efUfjhCqAUL7wICJO3EbjYkCB/2j4j4IRAADc/AcM + eJztld0KgzAMhe2jTefU/biC6JW+/2uoYCErTfNjJ1743Qj15CQ9Ac2yizORG3nNjVljjayH0z2356iYDfM8ihT91nxjGRfmV6vxhx4N4fHaeaciQSZaD05dR2hcxpys4e7uiP6NnGN6H2pfWrC5uExePec+2izq5X25ZV0DrfXq4D6sYI+OkqGFPTn6D6HpD/5mSVjv588/MHYFCe1EwoOo0Xim6N8GzqlZY4T8tJ7S/4Q0wyqi//c+9vI9+XwX6ZgB5+gTDw== diff --git a/028.bs/levels/level5_foreground.tmx b/028.bs/levels/level5_foreground.tmx index f6591bb..605a6ee 100644 --- a/028.bs/levels/level5_foreground.tmx +++ b/028.bs/levels/level5_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirWA4bcbR9hq4QhvQnKj8UE+piR/VI7mD6pjQnlg+Wj+oCserT8GFya3jhjNH7TB0njaprSQG8X4MQAt/aRm + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNSG4rmXLkmolPXyWZ+mghR45bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEOmH3DwwnN1JbP4YDnK40uRgcidy/lhIx3QwKjd88sfyYewWWHxIM+Bug9FCbjC2MQeTHAC1RFwJ - eJxjYBgFQxGcBOLveOSMGRkYPtLRPcMdEApLbmB4szLilkOmRwHlABSW2PIATAwUFzA1xmjhDosnXPE1CkgHsPC+ywAJb12ksAWJyTMiaBh4zADJV6P5g/oAX3mED4DiRBKqDxRfuOqYUUAaQE/7lJgzCkbBcAEAhDYTZQ== + eJztVLsOwjAMTJA6dUdi6hcw9f8/gIkvYOoXMLESqz3peo1NqJhQT4qK4tf57JDSgX/Cq5zb8q3Z9uZsgVf3W9zLeQa2a/5Nnb0AhxZ0xa8v55G2nGt3hnM5J6oz5nU9i7M7TyODzWLIc33DlGb/SNtPPXg2y3kJ9NC90FzKCTxrvSu0die+Vnukuz77nKM+jL+nO7ia3loPHGAbyDYt9TxtkYv3/ZHWc1UMtGu196h7YcBv+PO84e/tqgHzq+lnPYK/9s/9QFvdc8SprZOZMiKbNwvlpL0+l1zgon3C5mnE/wMG3hnlOZGN9YHN01r5eDNDLHK1AnGepoDW7Z25tcyC6zLwjqGVvjno7b0TvL0aL/SgOT1orhqQr+bHux/p0JqTNcH3krdxXj2Nj/jyXcQdGiH3gQOGNxaubFI= - eJxjYBgFQx04Mg60C4Y3gIWvN45wdh4Nf7oCUtI7SK3LaPzQDaDHTQCWsIepgcnB+L6j8UQVQCh/eKDJg9Sjx4nbaFwMKPAfDf9RMAIAAC6NBYs= + eJztVUkOwzAIdJ7WxY3bdDvlUuf/36iixhJCJoCx1Rwyl0gBDzBg7NyOrSN2v++xy9sPxP+EdO7N+P0bVH0UbsZ6JPFOlTSLQp453rVyn1INQ+P+W/g1OnPzjn01/iWw9uuOzk8bvKdnJqew2GetA/BNO8cD+4T2kbY/UB+fOVtjzz0Ijly8Ui7MK90RXC6cngHZ4R1p8UascY6CeM/CnC5K7o8yjoSfgnbmoYa9sUc1evwiOLQzLOG0wqrXjnb4Au6/EfY= diff --git a/028.bs/levels/level91_foreground.tmx b/028.bs/levels/level91_foreground.tmx new file mode 100644 index 0000000..1ec39e6 --- /dev/null +++ b/028.bs/levels/level91_foreground.tmx @@ -0,0 +1,24 @@ + + + + + + + + + + + eJyTZmBgsGLEjtlpIDeK8WM7YNgxAbEYFhokV4lHDpc+y0Hgr6GKtXCEKYgmV240PsjHhPIHOXlnND7Ix6B0vhtPHlg+mj/oignlga2j9QddMaE6Al/eGc0f1MfSeNqmtJAbxfgxAEtEpkk= + + + + + eJztVTkOhDAMdIqteAEVL9iK/z9gK16wFS+gogVLWPJatmOCYCXISCgoB+MZMwpARUVFKcb1eSeAPv2O/8IU2POBa+rkPPOOcxENEU4+XgHkkbU3G/cAdi2NmHs59ZI+zaOvsyZ5PA7tHPJSDwdlT0kGMDtHeh2B5a3UT/2ZlTWun/vg8WhrxEFo2fsI8Txin7tka8nBy8fZPaF/lPNhDZ3RJ9Iqv4FzfJS5ojktc6W+IbwcW1pyyGVH3jF3w17fuB/tDf14EhZzXi92 + + + + + eJxjYBgFQx04Mg60C4gHTnR2KzXsA4UvsWEcPQTiwpkKbiTXDGL0BRNQA4sLYuKElLijBQgh025QOvKhsrtdiDAPl53E6AWBUDR1AWh85PgIICEeyQWuRJjtOwTyLC4A8h+6+wmFpwcRcTKUgBsON/thEcellhiAzTxKzSQVRA3B+CEV+I8AP44CCAAABPMMCg== + + + diff --git a/028.bs/levels/level10_foreground.tmx b/028.bs/levels/level92_foreground.tmx similarity index 54% rename from 028.bs/levels/level10_foreground.tmx rename to 028.bs/levels/level92_foreground.tmx index a1e3a1e..1926cc2 100644 --- a/028.bs/levels/level10_foreground.tmx +++ b/028.bs/levels/level92_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= + eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirVwhCmIJlduND7Ix5Tkj8rR/EF1DErnu/HkgeWj+YOueLT+GFx4tP4YXFgaT9uUFnKjGD8GACo/pGY= - eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== + eJxjYBgFo2AUEAPOA7EuIwPDdyxixoyYcqOAtoCVEZVGZ4PAXQZI3IwC2gJQ2peHhvNjKJ8QAKn7yICZh0bBwAFQnEiOxsEoGAWjgA4AAHrdCv0= - eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= + eJxjYBgFQx04Mg60C4Y3AIUvvjB2ZkRVOwpoC2BhTExYg9S4jMYJXYArlnwSgMZHzksBaPHoOxpPVAGE8oUHEXHiNhoXAwr8R8N/FIwAAABz8gaN diff --git a/028.bs/levels/level9_foreground.tmx b/028.bs/levels/level93_foreground.tmx similarity index 54% rename from 028.bs/levels/level9_foreground.tmx rename to 028.bs/levels/level93_foreground.tmx index a1e3a1e..7f3bc67 100644 --- a/028.bs/levels/level9_foreground.tmx +++ b/028.bs/levels/level93_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= + eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirVwhCmIJlduND7Ix5Tkj8rR/EF1DErnu/HkgeWj+YOueLT+GFyYUB2BL++M5g/qY2k8bVNayI1i/BgAGV2lCw== - eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== + eJxjYBgFo2AUkAvOA/FHJHoUDCxgZWRg4GZE0CeBYsaMA+2q4Q90gWH8HYfcXSCWZ0TQMPCYAZF3QPpB8aQ7GldUA6DwxhUnuAAoTiRH44BmABQn6OkcOe2P5oFRMJIAALyTD/Y= - eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= + eJxjYBgFQx04Mg60C4Y3AIUvvjB2ZkRVOwpoC2BhjC2sQxgx1bqMxgldgCuWfBKAJT5gagLQ4tF3NJ6oAgiVQR5ExInbaFwMKPAfDf9RMAIAAAGOBuI= diff --git a/028.bs/levels/level11_foreground.tmx b/028.bs/levels/level94_foreground.tmx similarity index 51% rename from 028.bs/levels/level11_foreground.tmx rename to 028.bs/levels/level94_foreground.tmx index 78d7302..70c35a0 100644 --- a/028.bs/levels/level11_foreground.tmx +++ b/028.bs/levels/level94_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB + eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirWA4bcbR9hq4QhvQnKj8UE+piR/VI7mD6pjQnlg+Wj+oCserT8GFya3jhjNH7TB0njaprSQG8X4MQAt/aRm - eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= + eJxjYBgFo2AUEAK6jAwM3wfaEaMABdxlwIyTk1AxZNqYkc4OG8EAFCeg8NZlRBWTZ0TQMPAYiD8C8XkGiHp0faOA/gAUJ5KjcTAKRsEooAMAAJUwDuA= - eJztld0KgzAMhe2jTefU/biC6JW+/2uoYCErTfNjJ1743Qj15CQ9Ac2yizORG3nNjVljjayH0z2356iYDfM8ihT91nxjGRfmV6vxhx4N4fHaeaciQSZaD05dR2hcxpys4e7uiP6NnGN6H2pfWrC5uExePec+2izq5X25ZV0DrfXq4D6sYI+OkqGFPTn6D6HpD/5mSVjv588/MHYFCe1EwoOo0Xim6N8GzqlZY4T8tJ7S/4Q0wyqi//c+9vI9+XwX6ZgB5+gTDw== + eJxjYBgFQwHEMOKWc8QjNwooB6DwBWFvHOHsPBr+dAWw9E5MugepccGiLnY0zmgC0OMkgBFTHqYmAC0efUfjhCqAUL7wICJO3EbjYkCB/2j4j4IRAADc/AcM diff --git a/028.bs/levels/level8_foreground.tmx b/028.bs/levels/level95_foreground.tmx similarity index 51% rename from 028.bs/levels/level8_foreground.tmx rename to 028.bs/levels/level95_foreground.tmx index 78d7302..f6591bb 100644 --- a/028.bs/levels/level8_foreground.tmx +++ b/028.bs/levels/level95_foreground.tmx @@ -8,17 +8,17 @@ - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB + eJxjZ2BgsGLEjtlpIDeK8WM7YNgxAbEYFppcOctB4K+hirWA4bcbR9hq4QhvQnKj8UE+piR/VI7mD6pjQnlg+Wj+oCserT8GFya3jhjNH7TB0njaprSQG8X4MQAt/aRm - eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= + eJxjYBgFQxGcBOLveOSMGRkYPtLRPcMdEApLbmB4szLilkOmRwHlABSW2PIATAwUFzA1xmjhDosnXPE1CkgHsPC+ywAJb12ksAWJyTMiaBh4zADJV6P5g/oAX3mED4DiRBKqDxRfuOqYUUAaQE/7lJgzCkbBcAEAhDYTZQ== - eJztld0KgzAMhe2jTefU/biC6JW+/2uoYCErTfNjJ1743Qj15CQ9Ac2yizORG3nNjVljjayH0z2356iYDfM8ihT91nxjGRfmV6vxhx4N4fHaeaciQSZaD05dR2hcxpys4e7uiP6NnGN6H2pfWrC5uExePec+2izq5X25ZV0DrfXq4D6sYI+OkqGFPTn6D6HpD/5mSVjv588/MHYFCe1EwoOo0Xim6N8GzqlZY4T8tJ7S/4Q0wyqi//c+9vI9+XwX6ZgB5+gTDw== + eJxjYBgFQx04Mg60C4Y3gIWvN45wdh4Nf7oCUtI7SK3LaPzQDaDHTQCWsIepgcnB+L6j8UQVQCh/eKDJg9Sjx4nbaFwMKPAfDf9RMAIAAC6NBYs= diff --git a/028.bs/levels/level6_foreground.tmx b/028.bs/levels/level96_foreground.tmx similarity index 100% rename from 028.bs/levels/level6_foreground.tmx rename to 028.bs/levels/level96_foreground.tmx diff --git a/028.bs/levels/level7_foreground.tmx b/028.bs/levels/level97_foreground.tmx similarity index 100% rename from 028.bs/levels/level7_foreground.tmx rename to 028.bs/levels/level97_foreground.tmx diff --git a/028.bs/menu.s b/028.bs/menu.s index f31c4eb..1ef23f2 100644 --- a/028.bs/menu.s +++ b/028.bs/menu.s @@ -6,21 +6,35 @@ SPLASH_COLOR_DEPTH equ 5 SPLASH_SCREEN_WIDTH_BYTES equ 40 -PLAY_COPPER_WORD equ $bad1 +PLAY_COPPER_WORD equ $aad1 MENU_SELECTED_TOP_COLOR equ $be0 ;$e71 MENU_SELECTED_BOTTOM_COLOR equ $9d4 ;$fe7 MENU_TEXT_COLOR equ $7ef MENU_TEXT_BOTTOM_COLOR equ $5cd -MENU_OFFSET equ levelTopColor-playTopColor +MENU_OFFSET equ tutorialTopColor-playTopColor MENU_BOTTOM_OFFSET equ (playBottomColor-playTopColor) ShowMenu: lea CUSTOM,a6 jsr ReloadSplashScreen - + + lea splash,a0 + add.l #(150*40*5)+((320-96)/16),a0 + + WaitBlitter + move.w #(BC0F_SRCA|BC0F_DEST|$f0),BLTCON0(A6) + move.w #0,BLTCON1(a6) + move.l #$ffffffff,BLTAFWM(a6) ;no masking of first/last word + move.w #(320-96)/8,BLTAMOD(a6) ;A modulo + move.w #0,BLTDMOD(a6) ;D modulo + move.l a0,BLTAPTH(a6) ;source graphic top left corner + move.l backgroundOffscreen,BLTDPTH(a6) ;destination top left corner + move.w #((64*5)<<6)|(96/16),BLTSIZE(a6) + +ReShowMenu: jsr WaitVerticalBlank ;; set up default palette include "out/menu-palette.s" @@ -68,7 +82,7 @@ ShowMenu: RenderMenu: - lea splashSave,a0 + move.l backgroundOffscreen,a0 lea splash,a2 add.l #(150*40*5)+((320-96)/16),a2 @@ -85,7 +99,11 @@ RenderMenu: lea menu,a1 lea splash,a0 move.w #(320/2)-(6*8)+4,d0 - move.w #150,d1 + move.w #150-16,d1 + jsr DrawMaskedText85 + lea tutorial,a1 + move.w #(320/2)-(6*8),d0 + add.w #16,d1 jsr DrawMaskedText85 lea difficulty,a1 move.w #(320/2)-(6*8),d0 @@ -178,6 +196,8 @@ ButtonPressed: beq .difficultyButton cmp.l #creditsTopColor,selectedPtr beq .creditsButton + cmp.l #tutorialTopColor,selectedPtr + beq .tutorialButton bra .done .difficultyButton: bsr ToggleDifficulty @@ -188,11 +208,14 @@ ButtonPressed: .creditsButton: PlaySound Jump jsr Credits - bra ShowMenu + bra ReShowMenu .done: bra _ProcessJoystick .playButton: rts +.tutorialButton: + move.l #tutorialLevelInstallers,nextLevelInstaller + rts WaitForButtonRelease: .joystickPressed: @@ -263,6 +286,9 @@ menu: difficulty: dc.b "LEVEL - " dc.b 0 +tutorial: + dc.b " TUTORIAL " + dc.b 0 music: dc.b "MUSIC - ON " dc.b 0 @@ -308,28 +334,33 @@ playBottomColor: dc.w PLAY_COPPER_WORD+$1000,$fffe dc.w COLOR31 -levelTopColor: +tutorialTopColor: dc.w MENU_TEXT_COLOR dc.w PLAY_COPPER_WORD+$1000+(($1000/4)*3),$fffe dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR dc.w PLAY_COPPER_WORD+$2000,$fffe - dc.w COLOR31 -musicTopColor: + dc.w COLOR31 +levelTopColor: dc.w MENU_TEXT_COLOR dc.w PLAY_COPPER_WORD+$2000+(($1000/4)*3),$fffe dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR dc.w PLAY_COPPER_WORD+$3000,$fffe dc.w COLOR31 -creditsTopColor: +musicTopColor: dc.w MENU_TEXT_COLOR dc.w PLAY_COPPER_WORD+$3000+(($1000/4)*3),$fffe + dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR + + dc.w PLAY_COPPER_WORD+$4000,$fffe + dc.w COLOR31 +creditsTopColor: + dc.w MENU_TEXT_COLOR + dc.w PLAY_COPPER_WORD+$4000+(($1000/4)*3),$fffe dc.w COLOR31,MENU_TEXT_BOTTOM_COLOR dc.l $fffffffe selectedPtr: dc.l playTopColor -splashSave: - incbin "out/splashSave.bin"