From f96626577eb588f95709c9905758d8fa2339e1d0 Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Sun, 24 Apr 2016 12:43:42 +1000
Subject: [PATCH] robot falling animation

---
 028.bs/Makefile      | 11 +++++++++++
 028.bs/player.s      | 11 +++++++++--
 028.bs/sprite_data.i | 27 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/028.bs/Makefile b/028.bs/Makefile
index cb9586c..d3d5af8 100644
--- a/028.bs/Makefile
+++ b/028.bs/Makefile
@@ -42,6 +42,11 @@ IMAGES=foreground.png \
 	sprite_fallingPig-2.png \
 	sprite_fallingPig-3.png \
 	sprite_fallingPig-4.png \
+	sprite_fallingRobot-0.png \
+	sprite_fallingRobot-1.png \
+	sprite_fallingRobot-2.png \
+	sprite_fallingRobot-3.png \
+	sprite_fallingRobot-4.png \
 	font8x8.png\
 	splash.png
 
@@ -82,6 +87,9 @@ out/sprite_robot-%.bin: out/sprite_robot-%.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_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
+
 
 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
@@ -95,6 +103,9 @@ out/sprite_robot%.png: assets/assets.png
 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
 
+out/sprite_fallingRobot%.png: assets/assets.png
+	../tools/croppa/out/croppa --input=assets/assets.png --output=out/sprite_fallingRobot --width=16 --height=16 --rows=1 --cols=5 --dx=16 --dy=16 --x=192 --y=192
+
 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
 
diff --git a/028.bs/player.s b/028.bs/player.s
index 97a5c0a..e2259ef 100644
--- a/028.bs/player.s
+++ b/028.bs/player.s
@@ -16,6 +16,7 @@
 	
 PLAYER_INSTALL_COLOR_PALETTE	equ 0
 PLAYER_SPRITE_DATA		equ 4
+PLAYER_SPRITE_FALLING_DATA	equ 8	
 
 InitialisePlayer:
 	move.l	playerSpriteConfig,a0
@@ -45,7 +46,11 @@ UpdatePlayerFallingAnimation:
 	move.w	spritePlayerFallingAnimation,d0
 	lsr.w	#1,d0
 	mulu.w	#PLAYER_SPRITE_VERTICAL_BYTES,d0
-	move.l	#spriteFalling1,a0
+	;; move.l	#spriteFalling1,a0
+
+	move.l	playerSpriteConfig,a0
+	move.l	PLAYER_SPRITE_FALLING_DATA(a0),a0	
+	
 	add.l	d0,a0
 	move.l	a0,currentSprite
 	add.w	#1,spritePlayerFallingAnimation
@@ -219,10 +224,12 @@ SelectNextPlayerSprite:
 pigPlayerSpriteConfig:
 	dc.l	InstallPigColorPalette
 	dc.l	spritePig
+	dc.l	spriteFalling1
 
 robotPlayerSpriteConfig:
 	dc.l	InstallRobotColorPalette
-	dc.l	spriteRobot	
+	dc.l	spriteRobot
+	dc.l	spriteFallingRobot1
 
 playerSpriteConfig:
 	dc.l	pigPlayerSpriteConfig
diff --git a/028.bs/sprite_data.i b/028.bs/sprite_data.i
index 0024650..ab6480d 100644
--- a/028.bs/sprite_data.i
+++ b/028.bs/sprite_data.i
@@ -107,4 +107,31 @@ spriteFalling4:
 	dc.w	0,0
 	dc.w	0,0
 	incbin	"out/sprite_fallingPig-4.bin" 
+	dc.l	0
+
+
+spriteFallingRobot0:
+	dc.w	0,0
+	dc.w	0,0
+	incbin	"out/sprite_fallingRobot-0.bin" 
+	dc.l	0
+spriteFallingRobot1:
+	dc.w	0,0
+	dc.w	0,0
+	incbin	"out/sprite_fallingRobot-1.bin" 
+	dc.l	0
+spriteFallingRobot2:
+	dc.w	0,0
+	dc.w	0,0
+	incbin	"out/sprite_fallingRobot-2.bin" 
+	dc.l	0
+spriteFallingRobot3:
+	dc.w	0,0
+	dc.w	0,0
+	incbin	"out/sprite_fallingRobot-3.bin" 
+	dc.l	0
+spriteFallingRobot4:
+	dc.w	0,0
+	dc.w	0,0
+	incbin	"out/sprite_fallingRobot-4.bin" 
 	dc.l	0
\ No newline at end of file