From df7b4fb5d7e9b04a8db1ff4c762e6621e99eecb7 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 19 Sep 2017 00:26:38 -0400
Subject: [PATCH] tfv: start converting text generation

---
 gr-sim/tfv_battle.c | 82 ++++++++++++++++++++++++++-------------------
 gr-sim/tfv_info.c   | 35 ++++++++++---------
 gr-sim/tfv_opener.c |  1 -
 gr-sim/tfv_utils.c  |  4 +--
 4 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/gr-sim/tfv_battle.c b/gr-sim/tfv_battle.c
index 8b46a555..5acca997 100644
--- a/gr-sim/tfv_battle.c
+++ b/gr-sim/tfv_battle.c
@@ -61,50 +61,64 @@ int do_battle(void) {
 
 	int tfv_x=34;
 
-	home();
-	gr();
+//	home();
+//	gr();
 
-	basic_htab(1);
-	basic_vtab(22);
-	basic_normal();
-	basic_print("KILLER CRAB");
 
-	basic_htab(27);
-	basic_vtab(21);
-	basic_print("HP");
+	vtab(22);
+	htab(1);
+	move_cursor();
+	print("KILLER CRAB");
 
-	basic_htab(34);
-	basic_vtab(21);
-	basic_print("LIMIT");
+	vtab(21);
+	htab(27);
+	move_cursor();
+	print("HP");
 
-	basic_htab(15);
-	basic_vtab(22);
-	basic_print("DEATER");
+	vtab(21);
+	htab(34);
+	move_cursor();
+	print("LIMIT");
 
-	basic_htab(24);
-	basic_vtab(22);
+	vtab(22);
+	htab(15);
+	move_cursor();
+	print("DEATER");
+
+	vtab(22);
+	htab(24);
+	move_cursor();
 	print_byte(hp);
-	basic_print("/");
+	print("/");
 	print_byte(max_hp);
 
-	basic_htab(34);
-	basic_vtab(22);
-	basic_inverse();
-	for(i=0;i<limit;i++) {
-		basic_print(" ");
-	}
-	basic_normal();
-	for(i=limit;i<5;i++) {
-		basic_print(" ");
-	}
+	ram[COLOR]=0x20;
+	hlin_double(ram[DRAW_PAGE],33,33+limit,42);
 
-	basic_inverse();
-	for(i=21;i<25;i++) {
-		basic_vtab(i);
-		basic_htab(13);
-		basic_print(" ");
+//	basic_htab(34);
+//	basic_vtab(22);
+//	basic_inverse();
+//	for(i=0;i<limit;i++) {
+//		basic_print(" ");
+//	}
+//	basic_normal();
+//	for(i=limit;i<5;i++) {
+//		basic_print(" ");
+//	}
+
+	ram[COLOR]=0xa0;
+	hlin_double_continue(5-limit);
+
+	ram[COLOR]=0x20;
+
+//	basic_inverse();
+	for(i=40;i<50;i+=2) {
+		hlin_double(ram[DRAW_PAGE],12,12,i);
+//		basic_vtab(i);
+//		basic_htab(13);
+//		basic_print(" ");
 	}
-	basic_normal();
+	//basic_normal();
 
 
 	while(1) {
diff --git a/gr-sim/tfv_info.c b/gr-sim/tfv_info.c
index 0217c130..0c508eb8 100644
--- a/gr-sim/tfv_info.c
+++ b/gr-sim/tfv_info.c
@@ -16,13 +16,14 @@ void game_over(void) {
 
 	/* Make a box around it? */
 
-	basic_htab(15);
-	basic_vtab(12);
-	basic_print("GAME OVER");
+	vtab(12);
+	htab(15);
+	move_cursor();
+	print("GAME OVER");
 
 	/* play the GROAN sound? */
 
-	grsim_update();
+	page_flip();
 
 	repeat_until_keypressed();
 }
@@ -31,15 +32,17 @@ void print_help(void) {
 	text();
 	home();
 
-	basic_htab(1);
-	basic_vtab(1);
+	htab(1);
+	vtab(1);
+	move_cursor();
 
-	basic_print("ARROW KEYS AND WASD MOVE\n");
-	basic_print("SPACE BAR ACTION\n");
-	basic_print("I INVENTORY\n");
-	basic_print("M MAP\n");
-	basic_print("Q QUITS\n");
-	grsim_update();
+	print("ARROW KEYS AND WASD MOVE\n");
+	print("SPACE BAR ACTION\n");
+	print("I INVENTORY\n");
+	print("M MAP\n");
+	print("Q QUITS\n");
+
+	page_flip();
 
 	repeat_until_keypressed();
 
@@ -49,15 +52,15 @@ void print_help(void) {
 void show_map(void) {
 
 	gr();
-	home();
 
-	grsim_unrle(map_rle,0x800);
-	gr_copy(0x800,0x400);
+	grsim_unrle(map_rle,((int)ram[DRAW_PAGE]+0x4)<<8);
+	//gr_copy(0x800,0x400);
 
 	color_equals(COLOR_RED);
 	basic_plot(8+((map_x&0x3)*6)+(tfv_x/6),8+(((map_x&0xc)>>2)*6)+(tfv_y/6));
 
-	grsim_update();
+	page_flip();
+
 	repeat_until_keypressed();
 }
 
diff --git a/gr-sim/tfv_opener.c b/gr-sim/tfv_opener.c
index be0797b6..8506eb39 100644
--- a/gr-sim/tfv_opener.c
+++ b/gr-sim/tfv_opener.c
@@ -68,4 +68,3 @@ int opening(void) {
 
 	return 0;
 }
-
diff --git a/gr-sim/tfv_utils.c b/gr-sim/tfv_utils.c
index ec73e2fa..3ecdaec1 100644
--- a/gr-sim/tfv_utils.c
+++ b/gr-sim/tfv_utils.c
@@ -76,7 +76,7 @@ void print_u8(unsigned char value) {
 
 	sprintf(temp,"%d",value);
 
-	basic_print(temp);
+	print(temp);
 
 }
 
@@ -84,7 +84,7 @@ void print_byte(unsigned char value) {
 	char temp[4];
 	sprintf(temp,"%3d",value);
 	temp[3]=0;
-	basic_print(temp);
+	print(temp);
 }
 
 void page_flip(void) {