From 64041dcd32be5b64239f44555913397e9d23ba8a Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 9 Apr 2022 01:05:11 -0400
Subject: [PATCH] lemm: add animation to level6

---
 games/lemm/Makefile                      |   2 +-
 games/lemm/graphics/Makefile             |  15 +++-
 games/lemm/graphics/level_animations.png | Bin 0 -> 917 bytes
 games/lemm/level6.s                      |  85 +++++++++++++++++++++++
 4 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 games/lemm/graphics/level_animations.png

diff --git a/games/lemm/Makefile b/games/lemm/Makefile
index 2aaea662..f8fb3152 100644
--- a/games/lemm/Makefile
+++ b/games/lemm/Makefile
@@ -230,7 +230,7 @@ LEVEL6:	level6.o
 
 level6.o:	level6.s zp.inc hardware.inc qload.inc lemm.inc \
 		release_lemming.s \
-		graphics/graphics_level6.inc
+		graphics/graphics_level6.inc graphics/l6_animation.inc
 	ca65 -o level6.o level6.s -l level6.lst
 
 
diff --git a/games/lemm/graphics/Makefile b/games/lemm/graphics/Makefile
index abc2a9f5..185e00ff 100644
--- a/games/lemm/graphics/Makefile
+++ b/games/lemm/graphics/Makefile
@@ -16,7 +16,8 @@ all:	graphics_test.inc \
 	graphics_level8.inc \
 	graphics_level9.inc \
 	graphics_level10.inc \
-	sprites.inc
+	sprites.inc \
+	l6_animation.inc
 
 
 
@@ -92,6 +93,18 @@ graphics_level10.inc:	\
 	echo "level10_preview_lzsa: .incbin \"level10_preview.lzsa\"" >> graphics_level10.inc
 
 
+###
+
+l6_animation.inc:	level_animations.png
+	$(HGR_SPRITE) -s -l flame0_sprite level_animations.png  42   3  62 11 > l6_animation.inc
+	$(HGR_SPRITE) -s -l flame1_sprite level_animations.png  28  14  62 23 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame2_sprite level_animations.png  21  25  62 38 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame3_sprite level_animations.png  21  42  62 52 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame4_sprite level_animations.png  14  56  41 63 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame5_sprite level_animations.png  14  68  34 77 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame6_sprite level_animations.png   0  85  27 93 >> l6_animation.inc
+	$(HGR_SPRITE) -s -l flame7_sprite level_animations.png  28  86  34 87 >> l6_animation.inc
+
 
 
 ###
diff --git a/games/lemm/graphics/level_animations.png b/games/lemm/graphics/level_animations.png
new file mode 100644
index 0000000000000000000000000000000000000000..5884a3f15b7a4b0dd91e2a9aa2e7714a660d9171
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq009^P006)Q0{{R3ExKVz0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ$;Bi2djuUWT;LSL`5963Pq?8YK2xEOkVm2O&XFE
z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#1@OU5R-E(;FK0v6KnPzp21DbA|
zsYG1NWLL$mR|GJCeuNN^nPtpLQWC!Pbx++?cQKyj-}h(rs5y%P0g-r?8KzCVK|H-_
z8=UuvBdjQ^#OK6gCS8#Dk?V@bZ=4G*3p_Jorc?985n{2>#!4HrqNx#25l2-`r+gvf
zvC4UivsSLM<~{if!#RCrnd`KMk-#FBAVGwJDoQBBMvQiy6bmUjkNfzCT)#vvg<K^t
zax9<%4YKP8|AXJNweph_UQ##?biO#w#|Y513p8qu^L^|%jT0dF3|#3gf29u0e3D*k
zY0)E~cN@64ZfVLMaJd5vJ{htpyHb#rkk13}XY@^3pzjt4t$A~6p5ycZNYkv6H^9Lm
zFj}DOb)R>4x6ke0p62|10Ql{4b^~g}Bme*a5>QN3MF0Q*8_NOYH2(kp|IJ$g8=C%+
zpF<e{000SaNLh0L02oXF02p)upQu0}00007bV*G`2j&C`1QRkUa09yl000?uMObu0
zZ*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004CNkl<Zc-rmROKJl#5Jl03Xh+ox
z5OnQ-P0`Pe33wLJZRZ|5@$6Chl;}DReS(q+$x(Y2N|>x)=XEl&Txa`Tfhfxr(bFVk
zm9qBoP)<_q`-XJ3Nnv!0Zcsr{IQzG>D{p^k<_*(T!16SsGwn{ZlC;j$oqL}UbA7I8
zj|aq-c_d<Nn)S@91=S|?7UVrn409NUSdMwsz5Ll8CRU2vTcm8wafR7_ka|@j<0sAD
zKr0DjBfnOJa<0?cPWqf}+pic_%ci{a^3e(suxc@zHe#)MVInAB=tq)>MC6G)e(f5@
z`+=})o+0eox|>qh3}ycZt1^d6Jx(Efi5|1J%2*}L*Ue`bMs3CjWeg1}<v1NqC8a;<
z2Ne~^Fz=R$5@)u9%2_1Ph<_9Y(kEwGNHbFBwUYjeBn`AFpYmv7^2mg(5^4v_x=4~F
rNs=T<k|arzBuSDaNs=T<lJ4dkAz4`VvS8Fr00000NkvXXu0mjf{d<kx

literal 0
HcmV?d00001

diff --git a/games/lemm/level6.s b/games/lemm/level6.s
index d5c17ca6..24d9a026 100644
--- a/games/lemm/level6.s
+++ b/games/lemm/level6.s
@@ -228,9 +228,21 @@ l6_door_is_open:
 
 	jsr	draw_flames
 
+	;=====================
+	; draw level animation
+	;=====================
+
+	jsr	flame_thrower
+
+	;====================
+	; update timer
+	;====================
+
 	jsr	update_timer
 
+	;====================
 	; main drawing loop
+	;====================
 
 	jsr	erase_lemming
 
@@ -304,3 +316,76 @@ level6_intro_text:
 .byte 13,18,"TIME 5 MINUTES",0
 .byte 15,20,"RATING FUN",0
 .byte  8,23,"PRESS RETURN TO CONTINUE",0
+
+
+.include "graphics/l6_animation.inc"
+
+	;======================
+	; flame thrower
+	;======================
+flame_thrower:
+
+	; erase old
+
+	; X a->x, savey1->savey2
+
+	lda	#21
+	sta	SAVED_Y1
+	lda	#36
+	sta	SAVED_Y2
+
+	lda	#11
+	ldx	#19
+
+	jsr	hgr_partial_restore
+
+	; draw new
+
+	lda	FRAMEL
+	and	#$7
+	tay
+
+	lda	flame_sprites_l,Y
+	sta	INL
+	lda	flame_sprites_h,Y
+	sta	INH
+
+	lda	flame_sprites_x,Y
+	sta	XPOS
+
+	lda	flame_sprites_y,Y
+	sta	YPOS
+
+        jsr	hgr_draw_sprite
+
+	rts
+
+flame_sprites_l:
+	.byte <flame0_sprite,<flame1_sprite
+	.byte <flame2_sprite,<flame3_sprite
+	.byte <flame4_sprite,<flame5_sprite
+	.byte <flame6_sprite,<flame7_sprite
+
+flame_sprites_h:
+	.byte >flame0_sprite,>flame1_sprite
+	.byte >flame2_sprite,>flame3_sprite
+	.byte >flame4_sprite,>flame5_sprite
+	.byte >flame6_sprite,>flame7_sprite
+
+flame_sprites_x:
+;	.byte 15,13
+;	.byte 12,12
+;	.byte 11,11
+;	.byte 11,11
+	.byte 16,14
+	.byte 13,13
+	.byte 12,12
+	.byte 10,12
+
+flame_sprites_y:
+	.byte 27,26
+	.byte 24,25
+	.byte 26,23
+	.byte 21,21
+
+