diff --git a/028.bs/Makefile b/028.bs/Makefile index 9562aca..ab7f9a2 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -256,7 +256,11 @@ out/main.o: $(IMAGEDATA) \ out/level3_foreground-map.s\ out/level4_foreground-map.s\ out/level5_foreground-map.s\ - out/levelA_foreground-map.s out/levelB_foreground-map.s out/levelC_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/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 7da51b9..00e6a4f 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -292,6 +292,7 @@ InitialiseNewGame: GameOver: move.l #levelInstallers,nextLevelInstaller + move.l #"0001",levelCounter lea gameOverMessage,a1 jsr Message jsr WaitForJoystick @@ -798,8 +799,16 @@ InstallFlagGreyPalette: Level 3,"ARROWS ARE YOUR FRIEND!",100,2*2,12,10,"LEVEL 3",A Level 4,"WATCH OUT FOR BEES!",100,2*2,12,10,"LEVEL 4",A Level 5,"REMEMBER THE PATHWAYS BEFORE THEY FADE!",75,2*2,12,10,"LEVEL 5",A - Level B,"LEVEL 2",100,2*2,12,10,"2",B - Level C,"LEVEL 3",50,4*2,8,6,"3",C + + Level 6,"LET'S TRY A LONGER LEVEL!",75,2*2,12,10,"PHEW!, LEVEL 6",B + Level 7,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 7",B + + Level 8,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 8",C + Level 9,"LETS GO?",25,4*2,8,6,"LEVEL 9",C + + Level 10,"WHAT? WHAT?!",15,4*2,8,6,"YOU'RE GOOD, LEVEL 10",C + + ;; Level 7,"LEVEL 3",50,4*2,8,6,"3",C Palette A Palette B Palette C @@ -923,8 +932,14 @@ levelInstallers: dc.l InstallLevel3 dc.l InstallLevel4 dc.l InstallLevel5 - dc.l InstallLevelB - dc.l InstallLevelC + + dc.l InstallLevel6 + dc.l InstallLevel7 + + dc.l InstallLevel8 + dc.l InstallLevel9 + + dc.l InstallLevel10 dc.l 0 nextLevelInstaller: dc.l levelInstallers diff --git a/028.bs/levels/level10_foreground.tmx b/028.bs/levels/level10_foreground.tmx new file mode 100644 index 0000000..acf7406 --- /dev/null +++ b/028.bs/levels/level10_foreground.tmx @@ -0,0 +1,24 @@ + + + + + + + + + + + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= + + + + + eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== + + + + + eJztlc8OgCAIh/PR+mPZrbO+/3s0V26M6ZRA7eB3cQsE/EE6TYO/Y9WzLipunxPfA2HflfHrTep8PfOtQjXZwjg+3ymsg9QZpODWk5t37Evx/wKlX67At3RWWrJlajKv3WttgG+4czSwO3QfUfsDNdSRvfiek9Qzlk8qLrXOVC05PQ2yw3+kxhvR693ZGXNVIz6EOvNQw4OpZ81+UDVsAVevQT1uASEPPg== + + + diff --git a/028.bs/levels/levelB_foreground.tmx b/028.bs/levels/level6_foreground.tmx similarity index 58% rename from 028.bs/levels/levelB_foreground.tmx rename to 028.bs/levels/level6_foreground.tmx index 3ebca71..6c842b8 100644 --- a/028.bs/levels/levelB_foreground.tmx +++ b/028.bs/levels/level6_foreground.tmx @@ -13,12 +13,12 @@ - eJztVDEOwjAQS5AyZUfq1Bcw9f8PYOIFnXhBp64QCavGOInoghB4uZLkfHZyRwh//ArWTwt4A+fwqtettXDZmed4FhODfLdQNEwxhFPc1lL0+TnWucta4WA/Z/req6V3fryfncNz3Uxr4Fwkb6WY4paXGrV7HkouODjyHteeTK1cWSv5V9GQiFv34J/vYSRuV6enpXU3ys9vgm/cwUG48V6juTP1pfp4hi5m370J++HaANd0nlljOYt+zZUIDI/fWg+ctTnGXKkW7afef4nzXuLxoUl1wt9AXhfjC+A31HpaU+cDfmo91qpdy+O+c3pagG/ELBzuDbHG0c046wYnz7j+j7aAPPSJqwdO1VvTrHs1cG84Tgfe49l5F3P/yG5OfnvcqfOp0J7543txA2baaMw= + eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= - + - eJztlVsOgyAQRWVpPotalaS2+1+KmpRkSoB5QI0fnk+8c2e4k2BR3FyJSvFrSmKNUbweVjcIZsI8zyJHvyPfWMa1+tVK/KFHj3iMiXeqM2Qi9aDUvRCNzZiSNdxdE9A/A+chvUtsX2tC1qG5pFDuI81C79/bb9YaaI1TB/dhGHu0tAQt7EnRT4jmffKbxeG4nzv/h7AriG8nHDqkRuKZo//sOcdmjeHzk3py/xPcDB8R/b/3kcpy8flu8rEBFKASqQ== + eJztlUsOgzAMRMnRKIVCyycSahfc/yCARCQTxfGHFLHgbZBgPHbGArLs5ko8jLwmZ9ZYI+vhdO/tOilmwzzPIkW/Nd9YxoXZazX+0KMhPD4Hz1QkyETrwakbCY3LmJM13N0T0bfIfUzvQ+1LCzYXF/995ZxHm0W9PC+3rGugtV4d3IcV7NFRMrSwJ0ffEZrvyd8sCev5/Pl/jF1BQjuRUBE1Gs8U/fvAfWrWGCE/raf0PyHN8BXR/3sfRxkuPt9NOma/VBMK diff --git a/028.bs/levels/level7_foreground.tmx b/028.bs/levels/level7_foreground.tmx new file mode 100644 index 0000000..a1e3a1e --- /dev/null +++ b/028.bs/levels/level7_foreground.tmx @@ -0,0 +1,24 @@ + + + + + + + + + + + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= + + + + + eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== + + + + + eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= + + + diff --git a/028.bs/levels/level8_foreground.tmx b/028.bs/levels/level8_foreground.tmx new file mode 100644 index 0000000..a1e3a1e --- /dev/null +++ b/028.bs/levels/level8_foreground.tmx @@ -0,0 +1,24 @@ + + + + + + + + + + + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAs9EHJbydRXOYj8QI5bLKHxooVDHkSD5OrxyOHTN1Tk6O2/3TjkYPExEGmZXH1DJa+SI0ds/hgq6Y6cNDmY8ipy/lhIx3QwKjcw+YMWcsuHsVtg8SHNgLsNRgu5wdjGHExyAIlbW78= + + + + + eJztVbsOgzAMDJWY2Ct16hd06v9/ABNfwMQXdGItVnPS9eSYIKHSgZMiRHK2z49ASidOxJgref2yns32sy0YlvVo6jX9E6B9DddlXYLzNvtATV8FXkexpvThDfnZ7dAL1tIG/kwn90tjQxNQymeLHo7NczfT3s3RrFrZzqBaDagt8pocn14849me2Xn187SMKe75Pfsxn559nzkcj+dpzu9d882PZs2rSU858n3V3nMsD6Xa8Nwh1xo7T4PCanwXDvprPr18S/VmvcYZ8zu+BdwvYKIzaBnpDFrQmyhHjcM5RjOpYD40qJ1qVnvdi+7hGtAL6NU7h3qXZkDzVB7yrQHf49J/rlTvvYD6HwWvvwzu0690rmk6cTzeGchSEw== + + + + + eJxjYBgFQwU4MWIXd8Qhjq4vgIC6gQa4/DeQ9jnT2U0g+zwJ2BlMopvo7QdCgFL3EErv6GpJUU8OIBRfwwG4EPCjB1QeFNYeSGphZY4rkrwjWnlESfy4YtFLy3IOm30DZS4uPYTC0wNNHlucUBMMVL3jRmN7KTGf1DSPHIbuFPprsLcDqA0oDa9RQDsAAFEDDEE= + + + diff --git a/028.bs/levels/level9_foreground.tmx b/028.bs/levels/level9_foreground.tmx new file mode 100644 index 0000000..6c842b8 --- /dev/null +++ b/028.bs/levels/level9_foreground.tmx @@ -0,0 +1,24 @@ + + + + + + + + + + + eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB + + + + + eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= + + + + + eJztlUsOgzAMRMnRKIVCyycSahfc/yCARCQTxfGHFLHgbZBgPHbGArLs5ko8jLwmZ9ZYI+vhdO/tOilmwzzPIkW/Nd9YxoXZazX+0KMhPD4Hz1QkyETrwakbCY3LmJM13N0T0bfIfUzvQ+1LCzYXF/995ZxHm0W9PC+3rGugtV4d3IcV7NFRMrSwJ0ffEZrvyd8sCev5/Pl/jF1BQjuRUBE1Gs8U/fvAfWrWGCE/raf0PyHN8BXR/3sfRxkuPt9NOma/VBMK + + + diff --git a/028.bs/menu.s b/028.bs/menu.s index 3fcd990..9ca351e 100644 --- a/028.bs/menu.s +++ b/028.bs/menu.s @@ -1,7 +1,8 @@ include "includes.i" xdef ShowMenu - + xdef levelCounter + SPLASH_COLOR_DEPTH equ 5 SPLASH_SCREEN_WIDTH_BYTES equ 40 @@ -88,6 +89,10 @@ RenderMenu: move.w #(320/2)-(6*8),d0 add.w #16,d1 jsr DrawMaskedText85 + lea levelCounter,a1 + move.w #(320/2)-(6*8)+(8*8),d0 + jsr DrawMaskedText85 + move.w #(320/2)-(6*8),d0 lea music,a1 add.w #16,d1 jsr DrawMaskedText85 @@ -151,31 +156,14 @@ ToggleMusic: ToggleDifficulty: PlaySound Jump - add.l #4*5,nextLevelInstaller - cmp.l #levelInstallers+(4*8),nextLevelInstaller + add.l #4,nextLevelInstaller + lea levelCounter,a0 + jsr IncrementCounter + cmp.l #nextLevelInstaller-8,nextLevelInstaller ble RefreshDifficulty move.l #levelInstallers,nextLevelInstaller + move.l #"0001",levelCounter RefreshDifficulty: - cmp.l #levelInstallers,nextLevelInstaller - beq .easy - cmp.l #levelInstallers+4,nextLevelInstaller - beq .medium -.hard: - lea difficultyHard,a0 - lea difficulty,a1 - bsr StrCpy - bra .done -.medium: - lea difficultyMedium,a0 - lea difficulty,a1 - bsr StrCpy - bra .done -.easy: - lea difficultyEasy,a0 - lea difficulty,a1 - bsr StrCpy - bra .done -.done: bsr RenderMenu rts @@ -260,13 +248,18 @@ StrCpy: .done: rts +levelCounter: + dc.b "0001" + dc.b 0 + + align 2 musicOnFlag: dc.w 1 menu: dc.b " PLAY NOW! " dc.b 0 difficulty: - dc.b "LEVEL - EASY" + dc.b "LEVEL - " dc.b 0 music: dc.b "MUSIC - ON " @@ -277,17 +270,6 @@ credits: align 4 -difficultyEasy: - dc.b "LEVEL - EASY" - dc.b 0 - align 2 -difficultyMedium: - dc.b "LEVEL - MED " - dc.b 0 - align 2 -difficultyHard: - dc.b "LEVEL - HARD" - dc.b 0 align 2 musicOn: dc.b "MUSIC - ON "