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 cd62c6b..9f98a51 100644 Binary files a/028.bs/assets/assets.png and b/028.bs/assets/assets.png differ 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