From 9ad08b1b9dae3f84c3f36540132d181f758416cc Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 7 Jul 2018 16:24:06 -0400
Subject: [PATCH] tfv: hookup credits

---
 gr-sim/gr-sim.c          |   4 ++
 gr-sim/gr-sim.h          |   1 +
 gr-sim/tfv/KATC.BIN      | Bin 0 -> 8192 bytes
 gr-sim/tfv/tfv.c         |   2 +-
 gr-sim/tfv/tfv_credits.c | 123 +++++++++++++--------------------------
 5 files changed, 47 insertions(+), 83 deletions(-)
 create mode 100644 gr-sim/tfv/KATC.BIN

diff --git a/gr-sim/gr-sim.c b/gr-sim/gr-sim.c
index 144f46e5..61f74589 100644
--- a/gr-sim/gr-sim.c
+++ b/gr-sim/gr-sim.c
@@ -71,6 +71,10 @@ void set_plaid(void) {
 	plaid_mode=1;
 }
 
+void clear_plaid(void) {
+	plaid_mode=0;
+}
+
 void soft_switch(unsigned short address) {
 
 	switch(address) {
diff --git a/gr-sim/gr-sim.h b/gr-sim/gr-sim.h
index 170c8c3c..d3aa9324 100644
--- a/gr-sim/gr-sim.h
+++ b/gr-sim/gr-sim.h
@@ -35,6 +35,7 @@ int vlin(int y1, int y2, int at);
 int collision(int xx, int yy, int ground_color);
 
 void set_plaid(void);
+void clear_plaid(void);
 
 //void clear_top_a(void);
 //void clear_top(int page);
diff --git a/gr-sim/tfv/KATC.BIN b/gr-sim/tfv/KATC.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..d0cf6985a19492c09b49568d8f03c11d49027558
GIT binary patch
literal 8192
zcmdU!e`p)m9l+PJ453kIN^dM3gP@Xe`N~s<MxZFgrNIZqA)~kI8=+Ax`^QbEK+9m7
zH<zR#%Z8))k0|kZQ^p{<wwd;HRl=!m!P=6pwZ<yRSw!{DXhu#L(Rr2YWHiJcO&#rf
zYU)mj73+%h$8<>V-p|i_cklb-eRbeK`yV5`;9Js>1+Ru)ADDS-$8^3jQF(#8XXY#O
z+}r**R?9El{<Pam{B~KdYGtM*4W0L(m$R{aJXy^RFs=(}Dw)6>2jgJ7<JskV0-_)a
zE__G^^hquhC3wK`YHhMKa!P%T{dN0jK7It!Pifuag8&G!6GgvE*gFUz*!4V$f>Q$7
zO>^-ftoPww0fcVxU&1hYacFnAPV+#BY_Wa?haa8<{I_*aDWj5Z@y){W`|<RcyR4%+
z%0{82mJ*|C(J4EMOlH|Af}e4QiEi=R9k<<ftL(qGkG>asb*X;o#ia|C7nDbj9d385
zFVb!m{#wK6{7tSKwQ`O#W4^q&yH*9oJ=?ROFSD^sCHaT7`Zv|v<--(7J|h{|t6=8J
zEU0mvatsRtEXYjwTDq#y223?U?vb&}52H&63!4MKMfZb%Vn9U4dcZ?6JSdJEBM-?x
zICktE_$uV@fo!U>%eS<SFXRq+BEA6l;TN99eEQKNTbckQN=XYm-!=II3=fi&e|kM_
zNjnG$-pD^qzw4~;`Gf3%rbXT(V|V>#A)Z9w{pg4R7mI2(D!GbLNt}#kH;%eS)yZLL
zc)i-^x(BkU$}YdDa|bea@lP68FI^kFS+Bo*?tEtO!eEN0Uh4p-)ev{_TQ&Tw{Ny4i
z$>79z5;cYFZe?PI?6ARZ{Nsj4*n;^Rf8xhKYuZj~m+#wzjOS<uz<ZQrwxEDX^Qjif
zqyb11kUwBRJgv;P!?xPk<&(_~xX>ZH`Wky4ed|C1bod|fgXDOZB=Q|V&y$es7Jsuq
zTq3&AiEcjx;U{6ihvLI-$xR-CPjX9-4Ge{R*e(A4z)(ZV??-3p^hKJ>eeB)(ZnF2K
z{iF&0^&dC>=xF@C`q^&rNz*e!d-zeAakWpCoW+DJD(YxdQROI46d?<ouA<m!{z$t6
z+H7~{{yUo7b1txdu3o>naB0cIQ*YG=CuVGpX{Y&}{5AWYMIc$zEbDJc8(t@SOtNUQ
zP`XN<_nf<2v*WPX<pZA5O%1)uj-YCcAS-!M+oc+yq)n*O%uG$$K|7@FQ;1#uOJw;(
z+=ySHwBd_W>XF5W)6xVoP#PvX=qaxG9B((U%ZC8qcO(e8h(tW{`+fNHkVkkiVrc?O
zu}A2|p-|WOwBB&x<oH2u-a2vfcNb5jpLpH;GE1Ac%tP$@mg9+qYag104S(+zKbx3L
zRGGw-D0u;Flp!cl(g7s*k|;+pQBwOHu_!Y8{9m@)rK9bd-~ZcM=;~ta_h)85UhZAG
z7VynwX1_OgJ)(CM*)&))zo}~V3?unU8A)VS^1iFy@_B>-JxHhT>V%Q1GMuQS##isT
zYN=g52;vlHCfR_jR?Nj;i61Gt*1NM>3AjE+zCZ5|Lb+!{*X*y$59ITUWPc&(3OFex
zYj5d-5S3UK8QmoRuxZuBu2N`w{V0-@L%<mV|27OqKpG155?PFFLmxgKaHE$rL~qyZ
zKb`UekY1cFpFc5fmOl988_$$=vrsR@)A3|oGqmOOSo(@Lo?d0Cs}|W^KX;;2iSj5y
zjL9N*W^+a0PCjf&epZ}xHSE6{`#<&nD?`g4qGn{4JoTBup@lSl67dbDrZe}g`s_MU
zX!rSFoF~1jSIGl6G_LKkJOQ0_aJ~_b^KreL=WO~&`!lo4C;wOK*NLhcxl@{w%R<~s
z(Fk?Jcj;V6Q3105mLJl##<a^9ks<)khDib+Ye=0_u%zE3ul!1|m8^2t&fgS&4D<$I
zw|k$5xEtw9F+b8i5CO9KR7Po?O4@w`cGsVvu^$<)75@1Cj|=gg$owo8l~_#0;o@-2
zvc0#z-QpJ$oE1R<nW2-jQi6+|Whnq5Gf5;Hz|f&kRFHoG`+wJr&zjnA?kenbLDTb3
z@T8HcT;)Dxes*EspN-mLZR@t_i81$Fr?D&JHSt$UTi?Xf!8fa<0W9C2o;IBWl;l{x
z%&drfRj0^Ys_Nwv?fX)8`4I4JI<)y)ld<SOHE}B5_w^~qE2mj3&;OS7KG$QCEhzV+
z7Vnz<Ct3U1r>Ad{a`FV60XhZH{{VFI7pU$TN-<0tp!E}MuCcp*(mvRO+XL{!Myw5;
z#G{ipTH3(U1dVt+l{8aY=j`%tk*2%+{rFC^@Z1}<!imG#lUDrQ@B9l)((*a!1B%Zu
zgx1978oPXJ*R^vsQ(EWl<bS?%%bDrS4O_9S)|A#YP5j#IN1+_%zPWcczjS6Uv&8Vi
z^!0`G;JL+ag&z(y@mo)GrAF20?UKv~K}nkQubZJ+{s2-GzRV0d6IjuJvetgY(k|aR
zeY@~5UfCWVhD`_Y)KQS*X@jD|hE`Gq{YoO6cq+%$l?ktLW0&uf$mWu-Pv?E9A6-9n
zqPQ*`vE+|5!A_7#4rLI+Ti3v@RNLk6rTC*ra!%LF?tPZDH~w`ayYHrZ>m)#0KoGko
z|EG^9ww|8);EmJd^=C&UR}9GhJAb7rs-PaaKc;4fv*ZIz4zDb5jT^h`Z>-!}{TkOA
z*p=#5{L3HL>-)CNrJ7<{zh3Fqv77(pUrzC4HMQq))Te!wCoY{)GG%Q~ayHCA!d%ll
KI!6CI{{3I++SOJ7

literal 0
HcmV?d00001

diff --git a/gr-sim/tfv/tfv.c b/gr-sim/tfv/tfv.c
index 7db4cdd3..32fa30d1 100644
--- a/gr-sim/tfv/tfv.c
+++ b/gr-sim/tfv/tfv.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
 title_loop:
 	result=title();
 	if (result==0) goto play_game;
-	if (result==1) credits();
+	if (result==2) credits();
 	goto title_loop;
 
 
diff --git a/gr-sim/tfv/tfv_credits.c b/gr-sim/tfv/tfv_credits.c
index 4bd7a97d..48a3a831 100644
--- a/gr-sim/tfv/tfv_credits.c
+++ b/gr-sim/tfv/tfv_credits.c
@@ -9,72 +9,65 @@
 
 #include "gr-sim.h"
 
-static int letter_index=0,letter_x=39,letter_y=2,destination=16,which_string=0;
+static int letter_index=0,letter_x=39,letter_y=1,destination=15;
 
 
-static char strings[12][32]= {
-	"T A L B O T",
-	"F A N T A S Y",
-	"S E V E N",
-	"",
-	"BY",
-	"VINCE WEAVER",
-	"",
-	"MUSIC BY",
-	"HIROKAZU TANAKA",
-	"",
-	"CYCLE COUNTING IS HARD",
-	"",
-};
-
-static int destinations[12]={
-	15,14,16,255,
-	19,14,255,
-	16,12,255,
-	9,0,
-};
-
-static int ys[12]={
-	2,3,4,255,
-	2,3,255,
-	2,3,255,
-	2,0,
+static unsigned char string[]= {
+			"T A L B O T" 		"\x80"
+	"\x2\xE"	"F A N T A S Y" 	"\x80"
+	"\x3\x10"	"S E V E N"		"\x80"
+	"\x1\xF"	" "			"\x80"
+	"\x2\xE"	" "			"\x80"
+	"\x3\x10"	" "			"\x80"
+	"\x1\x13"	"BY"			"\x80"
+	"\x3\xE"	"VINCE WEAVER"		"\x80"
+	"\x1\x13"	" "			"\x80"
+	"\x3\xE"	" "			"\x80"
+	"\x1\x10"	"MUSIC BY"		"\x80"
+	"\x3\xC"	"HIROKAZU TANAKA"	"\x80"
+	"\x1\x10"	" "			"\x80"
+	"\x3\xC"	" "			"\x80"
+	"\x2\xD"	"CYCLE COUNTING"	"\x80"
+	"\x3\x10"	"IS HARD!"		"\xff"
 };
 
 static void letter_slide(void) {
 
 
 	char out[BUFSIZ];
-	char ch;
+	unsigned char ch;
 
-	if (destinations[which_string]==0) return;		// at end
+	ch=string[letter_index];
+	if (ch==0xff) return;
 
-	ch=strings[which_string][letter_index];
-	if (ch==0) {
-		which_string++;
-		letter_index=0;
-		destination=destinations[which_string];
-		letter_x=39;
-		letter_y=ys[which_string];
+	if (ch==0x80) {
+		letter_index++;
+		letter_y=string[letter_index];
+		letter_index++;
+		destination=string[letter_index];
+		letter_index++;
 		return;
 	}
 
-	vtab(letter_y);
-	htab(letter_x);
+	vtab(letter_y+1);
+	htab(letter_x+1);
+	move_cursor();
+	out[0]=' '; out[1]=0;
+	print(out);
+
+	letter_x--;
+	vtab(letter_y+1);
+	htab(letter_x+1);
 	move_cursor();
 	out[0]=ch; out[1]=0;
 	print(out);
 
-	letter_x--;
-	if (letter_x<destination) {
+	if (letter_x==destination) {
 		letter_index++;
 		destination++;
 		letter_x=39;
 	}
 
-	out[0]=' '; out[1]=0;
-	print(out);
-
 }
 
 int credits(void) {
@@ -93,11 +86,11 @@ int credits(void) {
 	vtab(1); htab(1); move_cursor();
 	print("   *                            .      ");
 	vtab(2); htab(1); move_cursor();
-	print("  *    .       T A L B O T          .  ");
+	print("  *    .                            .  ");
 	vtab(3); htab(1); move_cursor();
-	print("  *           F A N T A S Y            ");
+	print("  *                                    ");
 	vtab(4); htab(1); move_cursor();
-	print("   *            S E V E N              ");
+	print("   *                                   ");
 	vtab(5); htab(1); move_cursor();
 	print(" .                          .    .     ");
 	vtab(6); htab(1); move_cursor();
@@ -110,16 +103,6 @@ int credits(void) {
 	vtab(4); htab(4); move_cursor(); print_inverse(" ");
 
 
-	while(1) {
-		grsim_update();
-
-		ch=grsim_input();
-
-		if (ch!=0) break;
-
-		usleep(100000);
-	}
-
 	/* gr part */
 	soft_switch(LORES);     // LDA SW.LORES
 	soft_switch(TXTCLR);    // LDA  TXTCLR
@@ -130,21 +113,8 @@ int credits(void) {
 		basic_hlin(0,39,i);
 	}
 
-	while(1) {
-		grsim_update();
-
-		ch=grsim_input();
-
-		if (ch!=0) break;
-
-		usleep(100000);
-	}
-
-
-
 	hgr();
 
-
 	/* Put horizontal lines on screen */
 	for(yy=64;yy<128;yy++) {
 		hcolor_equals(1);
@@ -160,17 +130,6 @@ int credits(void) {
 	read(fd,&ram[0x2000],0x2000);
 	close(fd);
 
-	while(1) {
-		grsim_update();
-
-		ch=grsim_input();
-
-		if (ch) break;
-
-		usleep(100000);
-
-	}
-
 	set_plaid();
 
 	int frame=0;
@@ -228,7 +187,7 @@ int credits(void) {
 
 	}
 
-
+	clear_plaid();
 
 	return 0;
 }