From 08c25629c9189467a662f6caf416a131159f64c4 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Tue, 31 May 2016 09:29:48 +1000 Subject: [PATCH] full size level support --- 028.bs/counter.s | 14 ++++++++++++++ 028.bs/game1.s | 6 +++--- 028.bs/levels/level1_foreground.tmx | 4 ++-- 028.bs/player.s | 7 +++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/028.bs/counter.s b/028.bs/counter.s index 69886e2..c660842 100644 --- a/028.bs/counter.s +++ b/028.bs/counter.s @@ -5,6 +5,7 @@ xdef DecrementCounter xdef RenderNumber5 xdef RenderNumber4 + xdef RenderNumber3 xdef RenderNumber2 xdef ToAscii @@ -50,6 +51,19 @@ RenderNumber2: jsr DrawText8 rts +RenderNumber3: + ;; d0.l number + ;; d1.w x position + move.l d1,d3 + move.l #3,d2 + bsr ToAscii + move.l a0,a1 + lea panel,a0 + move.w #20,d1 + move.w d3,d0 + jsr DrawText8 + rts + test: dc.b "HELLO" diff --git a/028.bs/game1.s b/028.bs/game1.s index 172dc7e..5c5c07f 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -888,7 +888,7 @@ BlitCountdown: 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 1,"LET'S TRY A LONGER LEVEL!",75,2*2,12,10,"PHEW!, LEVEL 1 COMPLETE!",B,99,2 Level 2,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 2",B,98,2 Level 3,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 3 COMPLETE!",C,98,2 @@ -932,7 +932,7 @@ panel: countdownImages: incbin "out/countdown.bin" itemsMapOffset: - dc.l level1ItemsMap-level1ForegroundMap + dc.l 0 itemsMapEndPtr: dc.l 0 foregroundScrollPixels: @@ -1029,13 +1029,13 @@ nextLevelInstaller: tutorialLevelInstallers: dc.l InstallLevel91 -endTutorialLevelInstaller: 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/levels/level1_foreground.tmx b/028.bs/levels/level1_foreground.tmx index 78d7302..2f08a9e 100644 --- a/028.bs/levels/level1_foreground.tmx +++ b/028.bs/levels/level1_foreground.tmx @@ -8,12 +8,12 @@ - eJxjZ2BgsGLEjtlH5eguZwekmYBYDAtNidxWPHKVNLBvqMtZQuNFC4c8iB5scrvJ1Fc/BPwAiw9K4no0ndM/fywnMx3QOw+QK4fPf/jyFbXdSY38MSpHvXIDOX/QOw/QO50PJncSyh/SDLjbYLSQG4xtzMEkBwB88FuB + eJxjZ2BgsGLEjtlH5egmB5O3A2ImIBbDQlMitxWPXCUN7BvqciDaEhgnWnjkB5vcbjL11Q8BP4hB44OSuB5N5/TPH8vJTAf0zgPkyuHzH758RW13UiN/jMpRr9xAzh/0zgP0TueDyZ2E8oc0A+72Fy3kBlMbczDJweQBQHRaZw== - eJztVTkOwjAQtJGo0iOlyguo8v8HpOIFqXhBqrRohUcZDT4DEkhkmgV7dzx7gXMH/gXrtwU0YHLv6719QkjgWXbcMSyf0Tt39dvZHM40vvMbt/lrHbQ2E33eq6XkP/in3pQWcC6JO7PnyvdKORhPl+DCHec4RnxT8Ya7aIButcyF2qBWNe+kfHJ1Un7tiXGhBifhhs7Bv9YwN8eo50q+ep/TnOoX17k0G+aLee0SFujDd+SqWpAr58y7FuuvznIOHI/czV6CJtWJ/PpIXAzcQ32vFIt8UvVGT2rmlvVw3Wr3HO9Z3rCdcMR6iDO2sR0HmJP3owWIw5zE3sOMql5o5t8j/R+IxTBv36iXOXl3WjGXXXZzau9rsTfuwO/hAV5wUwI= + eJztVTkOwjAQtJGo3COlygtS5f8PSMULUuUFqdIiC48yGnzFIIFEplmwd2dnD4MxJ/4F27cFHMBk3td7/4SQwLM23DF8PaM1ZrD72RzONN7Zndv7ax+0NxN9btVS8u/tU29KCzjXxJ2318p8pRo8j0tw4Y5rHCO+qXiPRTRAt1rmQm/Qq5o8KZ9cn5RfZ+K50IOLcENnb197mNtj9HMj30F4c5pT8+I+l3ZjoZwuYYEufEetqgW1cs381mLz1V3OgeNRu7e3oEl1or4uEhcDz1DzlWJRT6rfmEnN3rIe7lvtO0c+XzesE47YDHHGNvbGAebk93EEiMOexPJhR1UvNPPvkf4PxGKYtzuolzn57RzFXHZp5tTZ16I17sTv4QF/blMw diff --git a/028.bs/player.s b/028.bs/player.s index 7c2cda0..8281a48 100644 --- a/028.bs/player.s +++ b/028.bs/player.s @@ -592,8 +592,15 @@ UpdatePlayerScore: RenderPlayerScore: jsr RenderScore move.l playerXColumn,d0 + cmp.l #100,playerXColumn + bge .3 move.w #PANEL_COLUMNS_REMAINING_X+(8*3),d1 jsr RenderNumber2 + bra .done +.3: + move.w #PANEL_COLUMNS_REMAINING_X+(8*2),d1 + jsr RenderNumber3 +.done: rts PreRenderColumnsRemaining: