From 31433a8f99f22a248eee5bbb09e553a0be67af65 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Wed, 18 May 2016 10:52:39 +1000 Subject: [PATCH] bee updates --- 028.bs/Makefile | 11 +++++++++- 028.bs/P6112-Options.i | 2 +- 028.bs/assets/assets.png | Bin 11322 -> 11650 bytes 028.bs/assets/bee.pal | 4 ++++ 028.bs/credits.s | 2 +- 028.bs/items.s | 45 +++++++++++++++++++-------------------- 6 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 028.bs/assets/bee.pal diff --git a/028.bs/Makefile b/028.bs/Makefile index e34e0c6..3a3ded6 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -66,6 +66,8 @@ IMAGES=foreground.png \ sprite_fallingTank-2.png \ sprite_fallingTank-3.png \ sprite_fallingTank-4.png \ + sprite_bee-0.png\ + sprite_bee-1.png\ font8x8.png\ font8x85.png\ splash.png\ @@ -73,7 +75,7 @@ IMAGES=foreground.png \ IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) -VASM_EXTRA_ARGS=-DTIMING_TEST=0 -DSFX=1 +VASM_EXTRA_ARGS=-DTIMING_TEST=0 -DSFX=0 LINKER_OPTIONS=-T link.script.x @@ -138,6 +140,9 @@ 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_bee%.bin: out/sprite_bee%.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_bee$* --palette-offset 24 --use-palette=assets/bee.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 @@ -173,6 +178,10 @@ 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 +.SECONDARY: +out/sprite_bee%.png: assets/assets.png + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_bee --width=16 --height=15 --rows=1 --cols=2 --dx=16 --dy=16 --x=192 --y=96 + .SECONDARY: 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 diff --git a/028.bs/P6112-Options.i b/028.bs/P6112-Options.i index 0a81abd..e65ded3 100644 --- a/028.bs/P6112-Options.i +++ b/028.bs/P6112-Options.i @@ -5,7 +5,7 @@ P61mode =2 ;Try other modes ONLY IF there are no Fxx commands >= 20. ;; --- options common to all P61modes --- -usecode=$8000 ;CHANGE! to the USE hexcode from P61con for a big +usecode=-1;$8000 ;CHANGE! to the USE hexcode from P61con for a big ;CPU-time gain! (See module usecodes at end of source) ;Multiple songs, single playroutine? Just "OR" the ;usecodes together! diff --git a/028.bs/assets/assets.png b/028.bs/assets/assets.png index cd62c6b77e5d3d057cac50d38ab0c7f89521f7f8..9f98a51122176d5d119dc769ea063a61ca75d15a 100644 GIT binary patch delta 10657 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 z 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 diff --git a/028.bs/assets/bee.pal b/028.bs/assets/bee.pal new file mode 100644 index 0000000..52031f7 --- /dev/null +++ b/028.bs/assets/bee.pal @@ -0,0 +1,4 @@ +000 000 000 255 +248 093 013 255 +255 255 016 255 +041 034 055 255 diff --git a/028.bs/credits.s b/028.bs/credits.s index e464fd5..22d0ae3 100644 --- a/028.bs/credits.s +++ b/028.bs/credits.s @@ -127,7 +127,7 @@ credits: dc.b 0 dc.b "TRACKLOADER - PHOTON/SCOOPEX" dc.b 0 - dc.b " " + dc.b "P61 PLAYER - GURU,PHOTON" dc.b 0 dc.b " " dc.b 0 diff --git a/028.bs/items.s b/028.bs/items.s index 2b79bae..dd0954b 100644 --- a/028.bs/items.s +++ b/028.bs/items.s @@ -320,11 +320,20 @@ _SetupItemSpriteData: .beeSprite: move.l a0,sprite5Pointer cmp.w #0,ITEM_X(a1) - beq .done - bsr InstallBeePalette - bra .done + beq .dontAnimate + bsr InstallBeePalette + bra .dontAnimate -.done: +.dontAnimate: + cmp.w #1,beeMovingDown + beq .setBeeDown +.setBeeUp: + move.w #1<<3,ITEM_INDEX(a1) + bra .spriteIsNotEnabled +.setBeeDown: + move.w #0,ITEM_INDEX(a1) + bra .spriteIsNotEnabled +.done: add.w #1,ITEM_INDEX(a1) .spriteIsNotEnabled: move.l (sp)+,d0 @@ -375,7 +384,7 @@ EnableItemSprites: InstallBeePalette: - include "bee-palette.s" + include "out/sprite_bee-0-palette.s" rts @@ -464,25 +473,15 @@ beeMovingDown: ItemSprite spriteArrow7,sprite_arrow-1.bin ItemSprite spriteArrow8,sprite_arrow-1.bin - ItemSprite spriteBee1,sprite_arrow-1.bin - ItemSprite spriteBee2,sprite_arrow-2.bin - ItemSprite spriteBee3,sprite_arrow-3.bin - ItemSprite spriteBee4,sprite_arrow-1.bin - ItemSprite spriteBee5,sprite_arrow-2.bin - ItemSprite spriteBee6,sprite_arrow-3.bin - ItemSprite spriteBee7,sprite_arrow-1.bin - ItemSprite spriteBee8,sprite_arrow-2.bin + ItemSprite spriteBee1,sprite_bee-1.bin + ItemSprite spriteBee2,sprite_bee-0.bin + ItemSprite spriteBee3,sprite_bee-1.bin + ItemSprite spriteBee4,sprite_bee-0.bin + ItemSprite spriteBee5,sprite_bee-1.bin + ItemSprite spriteBee6,sprite_bee-0.bin + ItemSprite spriteBee7,sprite_bee-1.bin + ItemSprite spriteBee8,sprite_bee-0.bin - ItemSprite spriteBat1,sprite_arrow-1.bin - ItemSprite spriteBat2,sprite_arrow-2.bin - ItemSprite spriteBat3,sprite_arrow-3.bin - ItemSprite spriteBat4,sprite_arrow-1.bin - ItemSprite spriteBat5,sprite_arrow-2.bin - ItemSprite spriteBat6,sprite_arrow-3.bin - ItemSprite spriteBat7,sprite_arrow-1.bin - ItemSprite spriteBat8,sprite_arrow-2.bin - - nextSpriteSlot: dc.w 0