From ee864ec385b6da164f17d25b44c1b1ca893eb78d Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Thu, 5 May 2016 16:11:11 +1000 Subject: [PATCH] prep for multiple items and background scroll in --- 028.bs/Makefile | 11 ++++++++++ 028.bs/assets/arrow.pal | 4 ++++ 028.bs/assets/assets.png | Bin 12368 -> 12362 bytes 028.bs/background.tmx | 2 +- 028.bs/constants.i | 7 +++--- 028.bs/foreground.tmx | 2 +- 028.bs/game1.s | 13 ++++++++++- 028.bs/image.s | 8 +++++-- 028.bs/items.s | 46 ++++++++++++++++++++++++++------------- 028.bs/macros.i | 14 ++++++------ 10 files changed, 76 insertions(+), 31 deletions(-) create mode 100644 028.bs/assets/arrow.pal diff --git a/028.bs/Makefile b/028.bs/Makefile index 93df0ff..6214fba 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -43,6 +43,10 @@ IMAGES=foreground.png \ sprite_coin-1.png \ sprite_coin-2.png \ sprite_coin-3.png\ + sprite_arrow-0.png \ + sprite_arrow-1.png \ + sprite_arrow-2.png \ + sprite_arrow-3.png\ sprite_fallingPig-0.png \ sprite_fallingPig-1.png \ sprite_fallingPig-2.png \ @@ -110,6 +114,10 @@ out/sprite_fallingTank-%.bin: out/sprite_fallingTank-%.png out/sprite_coin%.bin: out/sprite_coin%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 4 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/sprite_coin$* --palette-offset 20 --use-palette=assets/coin.pal +out/sprite_arrow%.bin: out/sprite_arrow%.png + $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 4 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/sprite_arrow$* --palette-offset 24 --use-palette=assets/arrow.pal + + out/sprite_pig%.png: assets/assets.png ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_pig --width=16 --height=16 --rows=1 --cols=8 --dx=16 --dy=16 --x=192 --y=112 @@ -131,6 +139,9 @@ out/sprite_fallingTank%.png: assets/assets.png out/sprite_coin%.png: assets/assets.png ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_coin --width=16 --height=15 --rows=1 --cols=4 --dx=16 --dy=16 --x=192 --y=144 +out/sprite_arrow%.png: assets/assets.png + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_arrow --width=16 --height=15 --rows=1 --cols=4 --dx=16 --dy=16 --x=192 --y=160 + out/font%.bin: assets/font%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/font$* --colors=16 --use-palette assets/mpanel.pal --full-color-palette-file --output-mask --transparent-color=0,0,0 --output-png diff --git a/028.bs/assets/arrow.pal b/028.bs/assets/arrow.pal new file mode 100644 index 0000000..7304216 --- /dev/null +++ b/028.bs/assets/arrow.pal @@ -0,0 +1,4 @@ +000 000 000 255 +004 050 117 255 +020 155 173 255 +030 236 255 255 diff --git a/028.bs/assets/assets.png b/028.bs/assets/assets.png index 0c052b264071a7f75aa6891410962e491db96440..ddb2d3674f072b21866aec35a6a859b8ef300386 100644 GIT binary patch delta 11165 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 delta 11132 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 RI1cuwqNu6xL(U@b{{gcIQ2hV^ diff --git a/028.bs/background.tmx b/028.bs/background.tmx index 82a87e7..ab2ef99 100644 --- a/028.bs/background.tmx +++ b/028.bs/background.tmx @@ -5,7 +5,7 @@ - eJztmssNwjAMQLsANxYA8VsAym8FPgvADrD/AfeAhKKS2olLi/oO74CUhuRZTWI326Ioxh/Mgt/f2CrbVcyFhbAUVsr+bsK9YWyWMaTMCRe4aKJ06GMn7IWDcFQ+8xCeTmN++9PEAxe4yJ1XxUSYKtuehLNwEa5O//+reOBi2C5S35e1sOlwThXW9z4WjxIXuKhx4bl2eKLZv73XQFzgIqTLfS0X7/0ZF7iwUlcvGCq4wEVITr3gk1EP5oILXPwT2jzKUhOJ4dUPLnChJacOrs2jLDWR2HrUdm0FF7jwpC/17z6AC1z0CfJLXFhcpJzB2vgu3xbh/hrLL3GBi7BdyhnM+h3GOw9qKw64wIUH1nNiTh5Ul1/F4qC9b4oLXOSSWouw3DNOuZPcFIfQhcc9aFwMy8ULfVgzRw== + eJztmssNwjAMhrsA4sICIF4LQMtjBR4LwA6w/wH3gFRFJbEdhwbyH74DUhqSz2oSu2mqqpp0mDu/P9Ew27UsiCWxItbM/m7EPTA2yRg0c4ILuAhRG/SxI/bEgTgyn3kQT6Mxv/1x4gEXcBE7r5YpMWO2PRFn4kJcjf7/W/GAi7JdjJV9bojtgHNqkb73vnjUzD7goiwX2vcjNZz923oNtFxH4eI/XAy5r8VivT/DBVxI6asXlApcwIVLTL2gyyiDucAFXPwS3DxKUhPxYdUPXMAFl5g6ODePktREfOtR6toKXMCFJbnUv3MALuAiJ5BfwoXEheYMluK7fCrc/dWXX8IFXLjtNGcw6XcY6zwoVRzgAi4skJ4TY/KgvvzKFwfufVO4gItYtLUIyT1jzZ3kUBxcFxb3oOGiLBcv7ZMzAQ== diff --git a/028.bs/constants.i b/028.bs/constants.i index 7e6ce13..5297cfd 100644 --- a/028.bs/constants.i +++ b/028.bs/constants.i @@ -34,7 +34,7 @@ ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 6 ITEM_SPRITE_VERTICAL_BYTES equ ((ITEM_SPRITE_HEIGHT*4)+4) ITEM_SPRITE_BYTES equ (ITEM_SPRITE_NUM_VERTICAL_SPRITES*ITEM_SPRITE_VERTICAL_BYTES)+4 ITEM_SPRITE_VSTART equ 149 -ITEM_NUM_SLOTS equ 8 +ITEM_NUM_SLOTS equ 16 ITEM_SPRITE_HORIZONTAL_START_PIXELS equ 32 ITEM_SPRITE_Y_COLLISION_OFFSET equ 1 @@ -43,9 +43,8 @@ ITEM_X equ 0 ITEM_LAGX equ 2 ITEM_Y equ 4 ITEM_SPRITE equ 6 -ITEM_YEND equ 8 -ITEM_LAGYEND equ 10 -ITEM_INDEX equ 12 +ITEM_INDEX equ 8 +ITEM_SPRITE_ADDRESS equ 12 ITEM_STRUCT_SIZE equ 16 ITEM_STRUCT_MULU_SHIFT equ 4 ITEM_NUM_COIN_ANIMS equ 7 diff --git a/028.bs/foreground.tmx b/028.bs/foreground.tmx index 438ea62..45fbe03 100644 --- a/028.bs/foreground.tmx +++ b/028.bs/foreground.tmx @@ -18,7 +18,7 @@ - eJxjYBgFgw04MuLnE1JPCDgRqZ5YdcMdgMKX2DBGV+dKhD6QHucREtbUSFOwMMYVJy6MqGpJzR/YzBkFhIErI+G4QY8PUuOHmPxEKhjK5RzI7cgYBMipP2Bq3MgIC3L0UBOQEn+DJa5JLZPcqaie3PJwFIwCagMAfEgLSw== + eJxjYBgFgxk4MTIwODLiV0NIHpuZ1FQ33IEjgThwZkRVS475ziMkrKmRpmBhTExYI8edC4l2k6p+pANXRsJxg56XCOUtbHZQGwzlcg7kdmQMAujhSUz9AVPjRkZYkKOHmoCU+BsscU1qPeFORfXk1FGjYBTQAgAAcsgLSg== diff --git a/028.bs/game1.s b/028.bs/game1.s index b09ec9b..2029d24 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -129,7 +129,17 @@ SetupBoardLoop: move.l foregroundScrollX,d0 move.w #1,moving bsr Update - bsr RenderNextForegroundFrame + + jsr RenderNextForegroundFrame + + move.w #15,d5 + sub.l #BACKGROUND_SCROLL_PIXELS,backgroundScrollX +.renderNextBackgroundFrameLoop: + add.l #BACKGROUND_SCROLL_PIXELS,backgroundScrollX + jsr RenderNextBackgroundFrame + jsr SwitchBackgroundBuffers + dbra d5,.renderNextBackgroundFrameLoop + cmp.l #FOREGROUND_PLAYAREA_WIDTH_WORDS,frameCount bge .gotoGameLoop bra SetupBoardLoop @@ -1149,6 +1159,7 @@ playAreaCopperPalettePtr4_MP: InstallSpriteColorPalette: jsr InstallPlayerColorPalette include "out/sprite_coin-1-palette.s" + include "out/sprite_arrow-1-palette.s" rts InstallColorPalette: diff --git a/028.bs/image.s b/028.bs/image.s index 9a63254..34d66a1 100644 --- a/028.bs/image.s +++ b/028.bs/image.s @@ -1,7 +1,10 @@ include "includes.i" xdef SwitchBuffers + xdef SwitchBackgroundBuffers xdef PokePanelBitplanePointers + + SwitchBuffers: ;; offscreen - bitplane address @@ -23,8 +26,9 @@ SwitchBuffers: add.l #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*(96-1),d0 lea copperListBpl1Ptr2_MP,a0 - bsr.s PokeBitplanePointers + bsr.s PokeBitplanePointers +SwitchBackgroundBuffers: move.l backgroundScrollX,d0 lsr.w #BACKGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels @@ -41,7 +45,7 @@ SwitchBuffers: lea copperListBpl2Ptr_MP,a0 bsr.s PokeBitplanePointers - add.l #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*(96-48+16),d0 + add.l #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*(96-1),d0 lea copperListBpl2Ptr2_MP,a0 bsr.s PokeBitplanePointers diff --git a/028.bs/items.s b/028.bs/items.s index 0fb5d85..3726f25 100644 --- a/028.bs/items.s +++ b/028.bs/items.s @@ -93,6 +93,7 @@ ResetItems: rts ClearItemSpriteData: + rts ;; move.w #ITEM_SPRITE_NUM_VERTICAL_SPRITES-1,d4 ;; sub.w d2,d4 ; this is because of the upside board at the moment ;; move.w d4,d2 @@ -125,7 +126,7 @@ SetupItemSpriteData: move.w ITEM_Y(a1),d2 ;; move.l #5,d2 - move.l currentItemSprite,a0 + move.l ITEM_SPRITE_ADDRESS(a1),a0 cmp.w #(ITEM_NUM_COIN_ANIMS-1)<<3,ITEM_INDEX(a1) ble .dontResetIndex @@ -194,7 +195,7 @@ GetSpriteSlot: lea item1,a1 add.l d0,a1 - move.l #deadSprite,currentItemSprite + ;; move.l #deadSprite,ITEM_SPRITE_ADDRESS(a1) move.w #336<