From 2c276a6d4eff0922133feccc81676f293ffdfd79 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 11 Aug 2017 00:23:18 -0400
Subject: [PATCH] tfv: add desert

---
 gr-sim/tfv.c         |  13 +++++++++----
 gr-sim/tfv_sprites.h |  12 ++++++++++++
 tfv/map.png          | Bin 521 -> 532 bytes
 tfv/sprites.png      | Bin 912 -> 919 bytes
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/gr-sim/tfv.c b/gr-sim/tfv.c
index 64a166dc..8987b373 100644
--- a/gr-sim/tfv.c
+++ b/gr-sim/tfv.c
@@ -772,11 +772,11 @@ static int do_battle(void) {
 1     BEACH     LANDING   GRASS      FOREST
       PINETREE            MOUNTAIN
 
-2     BEACH     GRASS     COLLEGE    FOREST
-      PALMTREE
+2     BEACH     GRASS     GRASS       FOREST
+      PALMTREE            MOUNTAIN
 
-3     BEACH     BEACH     BEACH      BEACH
-                          MOUNTAIN
+3     BEACH     DESERT    COLLEGE      BEACH
+                CACTUS   PARK
 */
 
 /* Walk through bushes, beach water */
@@ -796,6 +796,7 @@ static int load_map_bg(void) {
 		grsim_unrle(landing_rle,0x800);
 		return 0;
 	}
+
 	if (map_x==14) {
 		grsim_unrle(collegep_rle,0x800);
 		return 0;
@@ -809,6 +810,7 @@ static int load_map_bg(void) {
 	}
 
 	if (map_x<4) ground_color=COLOR_WHITE;
+	else if (map_x==13) ground_color=COLOR_ORANGE;
 	else ground_color=COLOR_LIGHTGREEN;
 
 	/* grassland/sloped left beach */
@@ -1002,6 +1004,8 @@ static int world_map(void) {
 		if (map_x==4) if (tfv_y>=15) grsim_put_sprite(0,pine_tree,25,15);
 		if (map_x==8) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,10,20);
 		if (map_x==12) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,20,20);
+		if (map_x==13) if (tfv_y>=15) grsim_put_sprite(0,cactus,25,15);
+
 
 		if ((map_x==7) || (map_x==11)) {
 			for(i=10;i<tfv_y+8;i+=2) {
@@ -1024,6 +1028,7 @@ static int world_map(void) {
 		if (map_x==4) if (tfv_y<15) grsim_put_sprite(0,pine_tree,25,15);
 		if (map_x==8) if (tfv_y<22) grsim_put_sprite(0,palm_tree,10,20);
 		if (map_x==12) if (tfv_y<22) grsim_put_sprite(0,palm_tree,20,20);
+		if (map_x==13) if (tfv_y<15) grsim_put_sprite(0,cactus,25,15);
 
 		if ((map_x==7) || (map_x==11)) {
 			for(i=tfv_y+8;i<36;i+=2) {
diff --git a/gr-sim/tfv_sprites.h b/gr-sim/tfv_sprites.h
index 22220cae..9bdfd9a4 100644
--- a/gr-sim/tfv_sprites.h
+++ b/gr-sim/tfv_sprites.h
@@ -140,6 +140,18 @@ static unsigned char snowy_tree[]={
 	0x00,0x00,0x00,0x88,0x00,0x00,0x00,
 };
 
+/* Cactus */
+static unsigned char cactus[]={
+	0x05,0x06,
+	0x00,0x00,0x44,0x00,0x00,
+	0x44,0x00,0x44,0x00,0x40,
+	0x44,0x00,0x44,0x00,0x44,
+	0x04,0x04,0x44,0x04,0x04,
+	0x00,0x00,0x44,0x00,0x00,
+	0x00,0x00,0x44,0x00,0x00,
+};
+
+
 /* Mountain */
 static unsigned char mountain[]={
 	0x0d,0x07,
diff --git a/tfv/map.png b/tfv/map.png
index c4abd815eea7e1116d85919e01b8c85104eb2d3a..4c85198dffee41c4666b5ad6b11bafcc568a3d9e 100644
GIT binary patch
delta 415
zcmV;Q0bu@#1e64je}4!I1PnHkyW9={00DGKL_t(Y$F<gru7e;924Em{VB*2|f7_+!
zPXVETw>5Dl+x*rG=*;KkFz+x##@qnC-*=tkD8OYIF)@~4OA=iInF9%~CHI{_Nnni2
zf8;!__pizD`AD+ZfPa^wB~8ukg9rg<pQ0wGAW_M2fHMY%fPXQ?5X7&xnR<^wmKk<-
zN}Zt;sTX_$Yzyx7unTUN;v(q%@$wLGrW748?-GDS8i=Axt^?-XdIX(A$DBLnIR)#I
z@zoZTf=`rO_Yjvl$8%(mNhw%9$1wm=^lMX=K1#{@<)^1ymQ0j;RdXk&T!Ur%wP-=P
z<MVkilzG7!1b^8DM+Iv=WJrzyxTe@PYw;e=^|F!tPJl!LGKJT6*-U$gqL|BIKBntX
z+sj-KKql*wHPG70-6n*x<k?QKc3nZLAR1qTA@D;;2QfSa>_3;WY+}@(%S@({F>YC$
zccTD}kwtko(4KV-A!Yb9ze9%a!~;<O<98b@x4{qpv>5*o`~pO8V--EotDFD;002ov
JPDHLkV1k92!yo_v

delta 404
zcmV;F0c-x01c?NYe}4xb0S_9`u6Eo200C)9L_t(Y$F<h&j)Wi#1yCTkV6uzv|F)aX
zP5Ej;QKyOHj~UOjw5aCi<uLCs-WziR4B<F*j-mp$ZN{WjgOc=q2_z0AI7uD{eUrhI
zwojBi*4IyD_`D@W6yV=dNYeD&F^L#)4mo=A6!gC4D8LzmgMY!4V+!J5Wu_sZk#&ZH
zoziE>Md}6L0A<0WH5`J!OR)%s&|V%R&OXNgEV~4t_Zo<zYi<CR-P(fAVa1$l^E?In
zlJQdsa={l$?$;2PI!ApZkVr0=zsE5FQS@tF=5^$f^~*1Jxh~oJvQ|BJvCBPJFTWNN
z<U2l{CrvpoxPO2khv2MWZ4C+H<05EneeTDG^IHOm!lxXY(>0W%1FmE`okMLe_ibrQ
z)<A1d?l$w$=|OAv9i$5CqZ1=NgmiHKgaVGA%NU!K^ye~>xn#7Phx2Y!pfNm@cOyoW
y9AnP#X?{(H@5BR8fAPBw*4yBVFYR9h{{bJBWEt?7Hx2Rt0000<MNUMnLSTZ>;J|PI

diff --git a/tfv/sprites.png b/tfv/sprites.png
index c00b9208cd3e31d9de21e7274acb99515d916915..0d4a32f3cd53c50dc3b6e8657525c17cd5765696 100644
GIT binary patch
delta 808
zcmV+@1K0eJ2bTwse18ZF1Qs7)B)+)-00R0+L_t(o!|m9=tJ6Rn0Pv#(nunNB|AKNL
z4h|ijtB~P@P9lQh<e0(fA;`VW3>D8eIKTV{Zxq++{~$O@q=UnoUdvm$dFFoh(kAU)
za>Xb18<HLrKKb&^<&tjzIK&|iabu$>_D4_mU~0NprGL99zJIa3Bb_TzjClH-{_$1Q
zSCyE#Wep&dSx={u{{B$Y0_&gfp9r|pbiE)()|~F+H&3kTf`uHZtRX-4hGIA9K6asj
zrkQQfJqU+vH|g*_KFu5oqG_OMc-%mfGBSr+>pP_&WR>-;&-XvE-Jp-o$>h-mvu){o
zebiKIo;2}8SAPo<emEy&GCq5eb)?}&t;>2aoV>fptm%Ah#7iD#V$-xN2QNwFb)lIZ
zv5Y5UmNoh4mA)*i!Rt}R*-O7!16>jO%V<mU2%RRMT~rs<e}(=pVr%WJpMUieDqgZ@
zUA!<SQ{?<?t)Hv$62Bf%MMJ8Vd1_4M_B4LGC^?ETrhgQAq(OW=x*jr)VhSmiG~_4g
zNcZkOy?4Sn3ZFqmV}25EG%#q&tKN|Yz0p$AKo<myvvj3FtZ8;F8I3uOz0!cC9nmr%
zJIw6wuZA@^UaZ#Nvcy;GOSFtRmGQgvjUIWSYomrnipDpW-dvu1(KWF@8X+WTj8Hqe
zv2XN1Pk$R_X3v?-Y!|w=Z>-B2IcHtlH&&A_@i`WQHd$Bu#zDEMAZmsX*BMgVHyUzF
zx}k3z3~IA>TSFT9#=*eprNzE)tW>)DHw&|GJoa)I=ekQ$BM3b$5V>yd)CdA!_D0|6
zlV0l^iI{ASGej@5p8KRAiLB_z<#l%^<lr%bcYo93%H>A6x6uJY34eB?-MAZFW;~uG
zwsZ>8@<$vuBP8ba{FQ)Uobg)Q(9%pB{tro3DM%7#fY(|)cXrV^$}Q<20ikN5cVEUG
z32e~Jwxm<}bV{uX0$k|rS&Od-d!jSYo=)XvNr%?oLLww@S|f=&51yaC`toy8d!swi
m2q9Q43C?u8cjLeKz2Xm=H&gt|%qGPE0000<MNUMnLSTX@_l<u5

delta 801
zcmV++1K#|X2apGle18WR1SSOa`z{6m00Q$#L_t(o!|m8VixWW<0PrCMvWK`!`~+b@
zEG$x-t+2%isYC?D$})x3A;?_k77@oQtZ%=;m0}zH4uYkuq_DW^60S+-IRADso9u=+
zn+cwnx9nyh@Y~1R+1Y)I&>;?Sh#MP4u|Imc2h-BUD*f9<@qbP3JJNY6>XAxc(LcUg
z`l=E$zpN3)ChO_c(BB_gT4TKv^%Emsny(kc$y(7p`sN9kE@YTdnKf3&&Oq-D-J?D<
zvb3}vx`XjR?k*j@r>B`mK`f0djgK2>CL;5wwY^gc##UM1`h5SB+#UMpoJ}5GNE=G$
z>!YSxtE5>Nx_?@b=)*Z<lhN6WY)2Yz)LPU-;_Tf;2B!11kt%tV>CMun9I7O7(1m7p
zBr~3jWY+9sQ2J6-L)AmX*~_q5BU=&pWrWfyBCp8@i|V5Kuh9QRY^@#m`By)olBIms
zB@1^l#oo`>`nj4c>FXgcY0S%Io;y>yJx$*(1ji|*oPXnhG)k_A*8|CM$}y*g#_A+H
z(w)0c@0}=)<7c>}sX9q88aXsqRo{_Do#E2Z$QFd^v+PQv#M1IwN}4K~2BncqJLV#=
zJj~$tSHl{dELQ8UDDl<$5^ZA6P5f?sqsKw$+NhyPNz<E4Z!S-v=$hCcO$gC6C8QnQ
z*f$2Cr+<yIwC7Tmwhvv~H`ZlMytA(D8>>kRd`|VCP1e=Eu`jkVSUE$O?+mH!8y&eN
z-OxAo`?Xp7tsxD4W54h9(gN=rE0x~;n}ypq9tXLLbK51ABa8zr5V>vc$`MAP?2W!L
zB)!%*GCkQEXGr)rX8mC3rmz+%_Icf%X}S9tMt|!ompkR&Mt2EGp^cp%EixWWQYbw}
zWAUSpn-MYhdj3jLca(u^ZOn1Q{}Ib71xcd}L2E70oa8{do1zHZM922Q2c)G9t+jbN
zjX?!LKJ@mi^;d*F(HUw_kIe?8JuV}W?{mbw)akhM;Q8sRFFzNxH@X*1kkLVF2%K*B
fZW{a-zgPSLA?Hot|Hfd`00000NkvXXu0mjfQYMx4