From 7844a43608db391edbc254ca6285e27aff61f4b1 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 21 Oct 2017 23:48:21 -0400
Subject: [PATCH] tfv: add bird sprites

---
 gr-sim/tfv_sprites.c  |  90 ++++++++++++++++++++++++++++++++++++++++++
 gr-sim/tfv_sprites.h  |  10 +++++
 gr-sim/tfv_worldmap.c |  30 ++++++++------
 tfv/NOTES             |   2 +
 tfv/sprites.png       | Bin 1355 -> 1369 bytes
 5 files changed, 121 insertions(+), 11 deletions(-)

diff --git a/gr-sim/tfv_sprites.c b/gr-sim/tfv_sprites.c
index 9d42f356..87ea997e 100644
--- a/gr-sim/tfv_sprites.c
+++ b/gr-sim/tfv_sprites.c
@@ -48,6 +48,96 @@ unsigned char tfv_led_sword[]={
 
 
 /* Bird Sprites */
+unsigned char bird_stand_right[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0xdd,0x90,
+	0x00,0x00,0x00,0x00,0xdd,0x00,
+	0x0d,0xdd,0xdd,0xdd,0xdd,0x00,
+	0x00,0x00,0x0d,0xdd,0x0d,0x00,
+	0x00,0x00,0x00,0x99,0x00,0x00,
+	0x00,0x00,0x00,0x99,0x90,0x00,
+};
+
+unsigned char bird_stand_left[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0x00,0x00,0x00,
+	0x90,0xdd,0x00,0x00,0x00,0x00,
+	0x00,0xdd,0x00,0x00,0x00,0x00,
+	0x00,0xdd,0xdd,0xdd,0xdd,0x0d,
+	0x00,0x0d,0xdd,0x0d,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x00,0x00,
+	0x00,0x90,0x99,0x00,0x00,0x00,
+};
+
+unsigned char bird_walk_right[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0xdd,0x90,
+	0x00,0x00,0x00,0x00,0xdd,0x00,
+	0x0d,0xdd,0xdd,0xdd,0xdd,0x00,
+	0x00,0x00,0x0d,0xdd,0x0d,0x00,
+	0x00,0x00,0x00,0x99,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x99,0x00,
+};
+
+
+unsigned char bird_walk_left[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0x00,0x00,0x00,
+	0x90,0xdd,0x00,0x00,0x00,0x00,
+	0x00,0xdd,0x00,0x00,0x00,0x00,
+	0x00,0xdd,0xdd,0xdd,0xdd,0x0d,
+	0x00,0x0d,0xdd,0x0d,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x00,0x00,
+	0x00,0x99,0x00,0x99,0x00,0x00,
+};
+
+/* with rider */
+
+unsigned char bird_rider_stand_right[] = {
+	0x6,0x7,
+	0x00,0xdd,0xbd,0x00,0x00,0x00,
+	0x00,0xdd,0xdb,0x00,0xdd,0x90,
+	0x00,0x00,0x22,0x02,0xdd,0x00,
+	0x0d,0xdd,0xd2,0x22,0xdd,0x00,
+	0x00,0x00,0x0d,0x82,0x8d,0x00,
+	0x00,0x00,0x00,0x99,0x00,0x00,
+	0x00,0x00,0x00,0x99,0x90,0x00,
+};
+
+unsigned char bird_rider_walk_right[] = {
+	0x6,0x7,
+	0x00,0xdd,0xbd,0x00,0x00,0x00,
+	0x00,0xdd,0xdb,0x00,0xdd,0x90,
+	0x00,0x00,0x22,0x02,0xdd,0x00,
+	0x0d,0xdd,0xd2,0x22,0xdd,0x00,
+	0x00,0x00,0x0d,0x82,0x8d,0x00,
+	0x00,0x00,0x00,0x99,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x99,0x00,
+};
+
+unsigned char bird_rider_stand_left[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0xbd,0xdd,0x00,
+	0x90,0xdd,0x00,0xdb,0xdd,0x00,
+	0x00,0xdd,0x02,0x22,0x00,0x00,
+	0x00,0xdd,0x22,0xd2,0xdd,0x0d,
+	0x00,0x8d,0x82,0x0d,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x00,0x00,
+	0x00,0x90,0x99,0x00,0x00,0x00,
+};
+
+unsigned char bird_rider_walk_left[] = {
+	0x6,0x7,
+	0x00,0x00,0x00,0xbd,0xdd,0x00,
+	0x90,0xdd,0x00,0xdb,0xdd,0x00,
+	0x00,0xdd,0x02,0x22,0x00,0x00,
+	0x00,0xdd,0x22,0xd2,0xdd,0x0d,
+	0x00,0x8d,0x82,0x0d,0x00,0x00,
+	0x00,0x00,0x99,0x00,0x00,0x00,
+	0x00,0x99,0x00,0x99,0x00,0x00,
+};
 
 
 
diff --git a/gr-sim/tfv_sprites.h b/gr-sim/tfv_sprites.h
index 9f96bddc..6e9a955c 100644
--- a/gr-sim/tfv_sprites.h
+++ b/gr-sim/tfv_sprites.h
@@ -4,6 +4,16 @@ extern unsigned char tfv_stand_left[];
 extern unsigned char tfv_walk_left[];
 extern unsigned char tfv_led_sword[];
 
+extern unsigned char bird_stand_right[];
+extern unsigned char bird_walk_right[];
+extern unsigned char bird_stand_left[];
+extern unsigned char bird_walk_left[];
+
+extern unsigned char bird_rider_stand_right[];
+extern unsigned char bird_rider_walk_right[];
+extern unsigned char bird_rider_stand_left[];
+extern unsigned char bird_rider_walk_left[];
+
 extern unsigned char ship_forward[];
 extern unsigned char ship_right[];
 extern unsigned char ship_left[];
diff --git a/gr-sim/tfv_worldmap.c b/gr-sim/tfv_worldmap.c
index f3cc7fb6..31178777 100644
--- a/gr-sim/tfv_worldmap.c
+++ b/gr-sim/tfv_worldmap.c
@@ -187,6 +187,7 @@ int world_map(void) {
 	direction=1;
 	int odd=0;
 	int refresh=1;
+	int on_bird=1;
 
 	while(1) {
 		moved=0;
@@ -304,18 +305,25 @@ int world_map(void) {
 			}
 		}
 
-
-
-
-
-
-		if (direction==-1) {
-			if (odd) grsim_put_sprite(tfv_walk_left,tfv_x,tfv_y);
-			else grsim_put_sprite(tfv_stand_left,tfv_x,tfv_y);
+		if (on_bird) {
+			if (direction==-1) {
+				if (odd) grsim_put_sprite(bird_rider_walk_left,tfv_x,tfv_y);
+				else grsim_put_sprite(bird_rider_stand_left,tfv_x,tfv_y);
+			}
+			if (direction==1) {
+				if (odd) grsim_put_sprite(bird_rider_walk_right,tfv_x,tfv_y);
+				else grsim_put_sprite(bird_rider_stand_right,tfv_x,tfv_y);
+			}
 		}
-		if (direction==1) {
-			if (odd) grsim_put_sprite(tfv_walk_right,tfv_x,tfv_y);
-			else grsim_put_sprite(tfv_stand_right,tfv_x,tfv_y);
+		else {
+			if (direction==-1) {
+				if (odd) grsim_put_sprite(tfv_walk_left,tfv_x,tfv_y);
+				else grsim_put_sprite(tfv_stand_left,tfv_x,tfv_y);
+			}
+			if (direction==1) {
+				if (odd) grsim_put_sprite(tfv_walk_right,tfv_x,tfv_y);
+				else grsim_put_sprite(tfv_stand_right,tfv_x,tfv_y);
+			}
 		}
 
 		/* Draw Below Ground Scatter */
diff --git a/tfv/NOTES b/tfv/NOTES
index 7775d738..d92f4a12 100644
--- a/tfv/NOTES
+++ b/tfv/NOTES
@@ -1,3 +1,5 @@
+Add horizontal-flipped sprite mode to save sprite table space?
+
 Could make VLIN faster by writing in chunks of two
 
 6502 assembly woes:
diff --git a/tfv/sprites.png b/tfv/sprites.png
index 9a06693e43b852ee3dd2922a9f075a6ae9acab6a..79be4ccf85386be15434b5dcdc2edc936b8086b7 100644
GIT binary patch
delta 1246
zcmV<41R?v&3fT&fa0&rpOGiWihy@);k!>G;3Kjz|Bm!3ufB*mlpGibPRA}Dq+KF=G
zAPfM|I`{zFHT?hAZWKjEoB?B}o0(`PbxOPKi&hp8`qO<-{7`(+U-TFKMSszsi{9?>
zf#`Mp0JNJ~MDsD0`)$Kd==zuFdG?8XjOE^<*ENFHxv<~%8;Q0|cb&M0o9T6ZvMsuQ
z?_+5GiIk}?A#)s+Iul(`9`Q_bvXtYPMgtk57QOA^0{u+GiwHh(1_POtc{Gug+P2zE
zhiGCa(BcvHnnEiDXr-<|$J;=N7NYMf(G*vp!-|Fx{@a{Pud5JnPtrAxo@e+0!!R!P
z2c3)N?Jho6UDL{m{|22a52Y~EkZYxXmJ!*0_i)KqqD4tfBbnezL6OAzG$+@iL$*7{
zDjc5hM~GI@h@snN#PdQ^o~bw}(@M3Y^GkyUG!=%WV=SYO9-dKw?mA=a+Q1lZ+0c;b
zSb@aX9@UvfD$H6!7;`S#y&2*yuMsUJkk3LFtxQ|cz=k|y>#9SGNR*?GZ2~lZ{pxWP
z0&Dvq8eX$VbnUiSmJdS%IE98^PF>^>dYX)xrYkZ{<QUqvK3#mPy#<}i^lNndo?^wZ
z7f8A1_f_O>L_4*3XrTD5cOU5p4Nd-b!)qm)Z)quDtbQ7|jhp&l4vjO@JkzsEG_jY3
z$gj{Q5>zYrU%t=r+UA~IfTn+cwQcmQ8oey=fS^THbdGt6#`(tfL5qeLLt|7PTEkuv
zuhp4GETQouLr1zt8tpc3i^lwiXm+hfBiBAZj^@pq&``6^JjBR5y9T{1A^K6>htYIP
z5*lwbM8oI_XbZK$GK~Y3Xtvze`;E5WeAGQG+IEkkrIO9G8%J-%pndCqm#b#?YvB)$
zqwyU<#M1M2bXs^STFO%N@y$qlXc&AnPEi>&1)$5y<ImCdMzrWxlS|_c>bgw#VO;jU
z$00Oidwm4;>N`5zTwH|4H!wI_N*KwYDc8oVt1){;A4b<7TOCGY(}Is4nr|*HIY%7!
zAT*M9woYsUpq}wK3F;bu$I8(a=ZJ-wX5=&)*!Uep{_Xm3N7R0fn8`E3HOuo8uCv=M
zWB4ws4|hb(=ZLo(KKx)uE6?;QmF*s>tzjSTh}zE)qvUFII{I)&)O3z`dqiobvulqG
zI@}R8o+BdqgbB0&ZLbaIi0OJhHTrOK(QuCVJpAnb6SRL!G|%pTG0_F@cxBQ4j;Ijr
zj^PR1yU<0eJf9f8kawa@AHG*#fwp6bBg5kE5iVcL(9;Afkjs{)$z9E3UO$FLGAx=b
z`kG@z7Y)i`(DrE=8sBq)Sqb0{nwLeqL>kb}vX7%*!Of$4;JYkR;^Oo@Xw<<mb1hn6
zc>oz!dAK-b=xOSII(R_v=S891$;UyX3(%~l>(DSC<0{WXyUZ#wv2*1?4QH=uzPm}E
zK3O!Z@)GEI9tJ3kQ_(03j+YB=M8R7gR<?&Oef<Z~#6H}ov5$B)?QWDRbDb}blhFQ*
z*p_LfJ{0|Wayf*~Ets@zbkz;73?2JBkK(vb<9d27i5Z$n+9_oqo`;+0hjEf>TGro9
zo0@673Eg#)%s!f+r7MH(jp%OQdR)KCJM#~^-iE#)em*(=0nW0ygjo{^v;Y7A07*qo
IM6N<$f==OY8vp<R

delta 1234
zcmV;@1TFj73d;(RaFKl+e+U*7A35E=tUmw%1fEGmK~!ko?b-`>s~`*j;8}d3R`~zF
zc1_brcnYH3dQNjrXUlfCZ@Do**-!I9@k8-Nf6-s`7yU(lE_!{$2cnnd1JHJ65zWU~
z?$;Gx(Dg6T)8rEQ7|XpuFG~QeQenRA9*DY3H;s6No#|zHu?@Oye?w^gVjN?iLT2Af
zc_v!x-SP-$nv=(|@8f77LzJS|Eo`8hX(1Z_g*E8O#xad1vXtvunrR<R><C&s!(3x%
zDFH3z73gpq@X<oFZ6TWC3bbF*Fv5SDmFZ;>0`5t=hSAdm-=ORI*?gmO(Y)P-$BJuO
zTJdktsq&B#GYz?xe{$}T?RF2Fd?i}s)HIR_E+rI6s84fpIofC2W30mA34i!#8H^CR
zZbm#W6y=$UgEB2;JvzNKs6bO;7&^w>yXfu}1?Z;H+N=$<c9snlnGO|5c<oV~X{5re
z1q+RH(e}*{Zh4jHaRl;N=&Y4#4I0>xXKY<%Xc35f^s!BVf1)4V_d;N8A4J3NEFxXI
zF6Q~e&;X91alK!G9tN$4;fhQXIfOQ?Pi5a~Z$YOry^jvxQ>-|)0?GH>_ab#8nyJM>
z1I2B<+ekxbX!5rkUJKEDOG^P`<<q!n+|&nCXq=g*iJldri9OFm-b3p^P_5v9`8LNZ
zlY4Rjn*P<gf6}vJ^gP1@f)-W5Ic67)^Ns0)1`WRqjZt|h1$#-n7H1l<gvO5y9q1l$
zwB5W78uRa?*|i*vT=V=mnm2DkL(N+A5F>Bw67)R#=x22wM$;`xXuQ!74WlQZ4b%k7
zG!7J^*>YQLH`;ddQTH%t(>=15N+#2G9K8{}_N{hTf6eyi{BIma<2!<grRVkNxbRf;
zIOd{{Z$`pHUFV{4ib|j<0G(GJe~vacqCxLXE|oi|>oVQ?aoPJGhtQDi<r&ngA83Db
zaS<Bdz~Ja{gpmZAa;^2UXuVbRVRZSi)nPO?E%@l5`R3x1bHr{7LL+%&tH>q*>KTud
zpssN&e;-|Nj+mKgMvkL_jbB0Jd(-+mqWW{hM4l0@Se{>SmE3M=&39R?zay$XN4(we
z;RZWed8Jp%WcP?|4O@RlRDX^bBp0LO(fT{0s&mBKGjcPXTze$Y{*I{f91+ncOrRNP
zbFDZ>jMww2(fXT<igU!*;b-#?(9`4}6S-p-f4t+BM7ukp0NOv2bI0%m?p^52Ro>n?
z;ycm0_1~*MbdDG~GR*EC{_-^sJq)k{xol|~-PJtj^<!ux!=lNcuQ^7v(V*-)WuE4t
z@jVxql>ly``Rx|E9jnmRvX7(p;QHA;@LiU1#Kq}*(5QoB=2Eo4@&Gcd@^Ep=(8JI)
zfAE0d&$B|>laGZ)7ob^9m!V-k##Nq!wwXm_VyDW38qQYJe0LK+eKKfR<welb)OAo8
zr=n5j9WQ6xh=R8~tZWCJ`}-e66Z>$V#y;ZIw7pR(%yqgvPC~mgVqK=C{804%<Z=j|
zS}-Zo=!zR&9y;`Q9@+7j#?|mz5;HWlNK?u{I1e|`cKtBQVP5X5(k0V)6}o9gGP`Jk
w=B^ByH=>(u>v8=m@612wdK>zJ`1$1c1&F@6<SG65JOBUy07*qoM6N<$f@s@!5C8xG