diff --git a/028.bs/Makefile b/028.bs/Makefile index 47fa3fb..33c26c5 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -47,14 +47,14 @@ IMAGES=foreground.png \ sprite_tank-5.png \ sprite_tank-6.png \ sprite_tank-7.png \ - sprite_car-0.png \ - sprite_car-1.png \ - sprite_car-2.png \ - sprite_car-3.png \ - sprite_car-4.png \ - sprite_car-5.png \ - sprite_car-6.png \ - sprite_car-7.png \ + sprite_cow-0.png \ + sprite_cow-1.png \ + sprite_cow-2.png \ + sprite_cow-3.png \ + sprite_cow-4.png \ + sprite_cow-5.png \ + sprite_cow-6.png \ + sprite_cow-7.png \ sprite_coin-0.png \ sprite_coin-1.png \ sprite_coin-2.png \ @@ -68,11 +68,11 @@ IMAGES=foreground.png \ sprite_fallingPig-2.png \ sprite_fallingPig-3.png \ sprite_fallingPig-4.png \ - sprite_fallingCar-0.png \ - sprite_fallingCar-1.png \ - sprite_fallingCar-2.png \ - sprite_fallingCar-3.png \ - sprite_fallingCar-4.png \ + sprite_fallingCow-0.png \ + sprite_fallingCow-1.png \ + sprite_fallingCow-2.png \ + sprite_fallingCow-3.png \ + sprite_fallingCow-4.png \ sprite_fallingRobot-0.png \ sprite_fallingRobot-1.png \ sprite_fallingRobot-2.png \ @@ -143,8 +143,8 @@ out/mpanel.bin: assets/mpanel.png out/sprite_pig-%.bin: out/sprite_pig-%.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_pig-$* --palette-offset 16 --use-palette=assets/pig.pal -out/sprite_car-%.bin: out/sprite_car-%.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_car-$* --palette-offset 16 --use-palette=assets/car.pal +out/sprite_cow-%.bin: out/sprite_cow-%.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_cow-$* --palette-offset 16 --use-palette=assets/cow.pal out/sprite_robot-%.bin: out/sprite_robot-%.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_robot-$* --palette-offset 16 --use-palette=assets/robot.pal @@ -156,8 +156,8 @@ out/sprite_tank-%.bin: out/sprite_tank-%.png out/sprite_fallingPig-%.bin: out/sprite_fallingPig-%.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_fallingPig-$* --palette-offset 16 --use-palette=assets/pig.pal -out/sprite_fallingCar-%.bin: out/sprite_fallingCar-%.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_fallingCar-$* --palette-offset 16 --use-palette=assets/car.pal +out/sprite_fallingCow-%.bin: out/sprite_fallingCow-%.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_fallingCow-$* --palette-offset 16 --use-palette=assets/cow.pal out/sprite_fallingRobot-%.bin: out/sprite_fallingRobot-%.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_fallingRobot-$* --palette-offset 16 --use-palette=assets/robot.pal @@ -186,8 +186,8 @@ 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 .SECONDARY: -out/sprite_car%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_car --width=16 --height=16 --rows=1 --cols=8 --dx=16 --dy=16 --x=192 --y=0 +out/sprite_cow%.png: assets/assets.png + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_cow --width=16 --height=16 --rows=1 --cols=8 --dx=16 --dy=16 --x=192 --y=48 out/mpanelOrig.png: assets/mpanel.png ../tools/croppa/out/croppa --input=assets/mpanel.png --output=out/mpanelOrig.png --width=320 --height=16 --rows=1 --cols=1 --dx=0 --dy=0 --x=0 --y=8 @@ -205,8 +205,8 @@ out/sprite_fallingPig%.png: assets/assets.png ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_fallingPig --width=16 --height=16 --rows=1 --cols=5 --dx=16 --dy=16 --x=192 --y=128 .SECONDARY: -out/sprite_fallingCar%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_fallingCar --width=16 --height=16 --rows=1 --cols=5 --dx=16 --dy=16 --x=192 --y=32 +out/sprite_fallingCow%.png: assets/assets.png + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_fallingCow --width=16 --height=16 --rows=1 --cols=5 --dx=16 --dy=16 --x=192 --y=64 .SECONDARY: out/sprite_fallingRobot%.png: assets/assets.png @@ -226,11 +226,11 @@ out/sprite_bee%.png: assets/assets.png .SECONDARY: out/sprite_eye%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_eye-0.png --width=16 --height=15 --rows=1 --cols=1 --dx=16 --dy=16 --x=192 --y=64 + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_eye-0.png --width=16 --height=15 --rows=1 --cols=1 --dx=16 --dy=16 --x=224 --y=96 .SECONDARY: out/sprite_clock%.png: assets/assets.png - ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_clock-0.png --width=16 --height=15 --rows=1 --cols=1 --dx=16 --dy=16 --x=192 --y=80 + ../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_clock-0.png --width=16 --height=15 --rows=1 --cols=1 --dx=16 --dy=16 --x=240 --y=96 .SECONDARY: out/sprite_arrow%.png: assets/assets.png diff --git a/028.bs/assets/assets.png b/028.bs/assets/assets.png index 25f9e94..a1a2fd9 100644 Binary files a/028.bs/assets/assets.png and b/028.bs/assets/assets.png differ diff --git a/028.bs/assets/cow.pal b/028.bs/assets/cow.pal new file mode 100644 index 0000000..a6268bd --- /dev/null +++ b/028.bs/assets/cow.pal @@ -0,0 +1,4 @@ +000 000 000 255 +255 255 255 255 +046 044 029 255 +225 159 082 255 diff --git a/028.bs/game1.s b/028.bs/game1.s index 4c445d0..8e395b9 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -903,8 +903,8 @@ BlitCountdown: Level 2,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 2",B,98,2,0,robot Level 3,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 3 COMPLETE!",C,98,2,0,pig Level 4,"LETS GO?",25,4*2,8,6,"LEVEL 4 COMPLETE",C,98,2,0,robot - Level 5,"KABOOM?!",75,4*2,8,6,"PHEW!!! LEVEL 5 COMPLETE!",D,99,1,0,tank - Level 6,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 6 COMPLETE!",A,98,1,0,car + Level 5,"KABOOM?!",200,4*2,8,6,"PHEW!!! LEVEL 5 COMPLETE!",D,99,1,0,tank + Level 6,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 6 COMPLETE!",A,98,1,0,cow Palette A diff --git a/028.bs/player.s b/028.bs/player.s index 8cec4ae..44b9112 100644 --- a/028.bs/player.s +++ b/028.bs/player.s @@ -26,7 +26,7 @@ xdef playerLevelMissPixels xdef pigPlayerSpriteConfig - xdef carPlayerSpriteConfig + xdef cowPlayerSpriteConfig xdef robotPlayerSpriteConfig xdef tankPlayerSpriteConfig xdef playerSpriteConfig @@ -300,8 +300,8 @@ InstallPigColorPalette: include "out/sprite_pig-0-palette.s" rts -InstallCarColorPalette: - include "out/sprite_car-0-palette.s" +InstallCowColorPalette: + include "out/sprite_cow-0-palette.s" rts InstallRobotColorPalette: @@ -625,10 +625,10 @@ pigPlayerSpriteConfig: dc.l spritePig dc.l spriteFalling1 -carPlayerSpriteConfig: - dc.l InstallCarColorPalette - dc.l spriteCar - dc.l spriteFallingCar1 +cowPlayerSpriteConfig: + dc.l InstallCowColorPalette + dc.l spriteCow + dc.l spriteFallingCow1 robotPlayerSpriteConfig: dc.l InstallRobotColorPalette diff --git a/028.bs/sprite_data.i b/028.bs/sprite_data.i index 0129d91..1a354e2 100644 --- a/028.bs/sprite_data.i +++ b/028.bs/sprite_data.i @@ -125,46 +125,46 @@ spriteTankRightJump: incbin "out/sprite_tank-2.bin" ; 7, right jump dc.l 0 -spriteCar: -spriteCarUp: +spriteCow: +spriteCowUp: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-1.bin" ; 0, up + incbin "out/sprite_cow-1.bin" ; 0, up dc.l 0 -spriteCarUpJump: +spriteCowUpJump: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-0.bin" ; 1, up jump + incbin "out/sprite_cow-0.bin" ; 1, up jump dc.l 0 -spriteCarDown: +spriteCowDown: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-5.bin" ; 2, down + incbin "out/sprite_cow-5.bin" ; 2, down dc.l 0 -spriteCarDownJump: +spriteCowDownJump: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-4.bin" ; 3, down jump + incbin "out/sprite_cow-4.bin" ; 3, down jump dc.l 0 -spriteCarLeft: +spriteCowLeft: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-7.bin" ; 4, left + incbin "out/sprite_cow-7.bin" ; 4, left dc.l 0 -spriteCarLeftJump: +spriteCowLeftJump: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-6.bin" ; 5, left jump + incbin "out/sprite_cow-6.bin" ; 5, left jump dc.l 0 -spriteCarRight: +spriteCowRight: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-3.bin" ; 6, right + incbin "out/sprite_cow-3.bin" ; 6, right dc.l 0 -spriteCarRightJump: +spriteCowRightJump: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_car-2.bin" ; 7, right jump + incbin "out/sprite_cow-2.bin" ; 7, right jump dc.l 0 spriteFalling0: @@ -248,28 +248,28 @@ spriteFallingTank4: dc.l 0 -spriteFallingCar0: +spriteFallingCow0: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_fallingCar-0.bin" + incbin "out/sprite_fallingCow-0.bin" dc.l 0 -spriteFallingCar1: +spriteFallingCow1: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_fallingCar-1.bin" + incbin "out/sprite_fallingCow-1.bin" dc.l 0 -spriteFallingCar2: +spriteFallingCow2: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_fallingCar-2.bin" + incbin "out/sprite_fallingCow-2.bin" dc.l 0 -spriteFallingCar3: +spriteFallingCow3: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_fallingCar-3.bin" + incbin "out/sprite_fallingCow-3.bin" dc.l 0 -spriteFallingCar4: +spriteFallingCow4: dc.w 0,0 dc.w 0,0 - incbin "out/sprite_fallingCar-4.bin" + incbin "out/sprite_fallingCow-4.bin" dc.l 0 \ No newline at end of file