From 04ad8e1193c810f8d600eb19e709e237630e76e1 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed, 23 Aug 2017 13:09:52 -0400
Subject: [PATCH] tfv: rename files to have tfv_ in front

makes it easire to keep track of things
---
 tfv/Makefile                                 | 14 ++++++++++----
 tfv/tfv.s                                    | 17 +++++++----------
 tfv/{backgrounds.inc => tfv_backgrounds.inc} |  0
 tfv/{flying.s => tfv_flying.s}               |  0
 tfv/{opener.s => tfv_opener.s}               |  3 +++
 tfv/{textentry.s => tfv_textentry.s}         |  0
 tfv/{title.s => tfv_title.s}                 |  0
 tfv/{utils.s => tfv_utils.s}                 |  0
 tfv/{zp.inc => tfv_zp.inc}                   |  0
 9 files changed, 20 insertions(+), 14 deletions(-)
 rename tfv/{backgrounds.inc => tfv_backgrounds.inc} (100%)
 rename tfv/{flying.s => tfv_flying.s} (100%)
 rename tfv/{opener.s => tfv_opener.s} (97%)
 rename tfv/{textentry.s => tfv_textentry.s} (100%)
 rename tfv/{title.s => tfv_title.s} (100%)
 rename tfv/{utils.s => tfv_utils.s} (100%)
 rename tfv/{zp.inc => tfv_zp.inc} (100%)

diff --git a/tfv/Makefile b/tfv/Makefile
index 52058e7d..0d85d535 100644
--- a/tfv/Makefile
+++ b/tfv/Makefile
@@ -6,7 +6,13 @@ PNG2RLE = ../gr-utils/png2rle
 
 all:	tfv.dsk
 
-tfv.dsk:	TFV ED HIGHWIND.ED FIGHTING.ED
+$(PNG2RLE):	
+	cd ../gr-utils && make
+
+$(DOS33):	
+	cd ../dos33fs-utils && make
+
+tfv.dsk:	$(DOS33) TFV ED HIGHWIND.ED FIGHTING.ED
 	$(DOS33) -y tfv.dsk BSAVE -a 0x1000 TFV
 	$(DOS33) -y tfv.dsk BSAVE -a 0x900 ED
 	$(DOS33) -y tfv.dsk BSAVE -a 0x2000 HIGHWIND.ED
@@ -19,8 +25,8 @@ duet.o:	duet.s
 	ca65 -o duet.o duet.s -l duet.lst
 
 
-$(PNG2RLE):	
-	cd ../gr-utils && make
+
+
 
 backgrounds.inc:	$(PNG2RLE) \
 	title.png map.png \
@@ -48,7 +54,7 @@ backgrounds.inc:	$(PNG2RLE) \
 TFV:	tfv.o
 	ld65 -o TFV tfv.o -C ./apple2_1000.inc
 
-tfv.o:	tfv.s flying.s opener.s title.s textentry.s utils.s backgrounds.inc zp.inc
+tfv.o:	tfv.s tfv_flying.s tfv_opener.s tfv_title.s tfv_textentry.s tfv_utils.s tfv_backgrounds.inc tfv_zp.inc
 	ca65 -o tfv.o tfv.s -l tfv.lst
 
 
diff --git a/tfv/tfv.s b/tfv/tfv.s
index f6b41318..63bd7463 100644
--- a/tfv/tfv.s
+++ b/tfv/tfv.s
@@ -1,4 +1,4 @@
-.include "zp.inc"
+.include "tfv_zp.inc"
 
 	;================================
 	; Clear screen and setup graphics
@@ -79,19 +79,16 @@ exit:
 ; External modules
 ;===============================================
 
-.include "opener.s"
-.include "utils.s"
-.include "title.s"
-.include "textentry.s"
-.include "flying.s"
+.include "tfv_opener.s"
+.include "tfv_utils.s"
+.include "tfv_title.s"
+.include "tfv_textentry.s"
+.include "tfv_flying.s"
 
 ;===============================================
 ; Variables
 ;===============================================
 
-vmwsw_string:
-	.asciiz "A VMW SOFTWARE PRODUCTION"
-
 enter_name_string:
 	.asciiz	"PLEASE ENTER A NAME:"
 
@@ -114,4 +111,4 @@ tb1_sprite:
 	.byte $ff,$1f,$4f,$2f,$ff,$22,$20,$00
 	.byte $5f,$5f,$5f,$5f,$ff,$f2,$f2,$f2
 
-.include "backgrounds.inc"
+.include "tfv_backgrounds.inc"
diff --git a/tfv/backgrounds.inc b/tfv/tfv_backgrounds.inc
similarity index 100%
rename from tfv/backgrounds.inc
rename to tfv/tfv_backgrounds.inc
diff --git a/tfv/flying.s b/tfv/tfv_flying.s
similarity index 100%
rename from tfv/flying.s
rename to tfv/tfv_flying.s
diff --git a/tfv/opener.s b/tfv/tfv_opener.s
similarity index 97%
rename from tfv/opener.s
rename to tfv/tfv_opener.s
index 11617b5e..8debb462 100644
--- a/tfv/opener.s
+++ b/tfv/tfv_opener.s
@@ -157,3 +157,6 @@ draw_logo:
 
 	rts
 
+vmwsw_string:
+	.asciiz "A VMW SOFTWARE PRODUCTION"
+
diff --git a/tfv/textentry.s b/tfv/tfv_textentry.s
similarity index 100%
rename from tfv/textentry.s
rename to tfv/tfv_textentry.s
diff --git a/tfv/title.s b/tfv/tfv_title.s
similarity index 100%
rename from tfv/title.s
rename to tfv/tfv_title.s
diff --git a/tfv/utils.s b/tfv/tfv_utils.s
similarity index 100%
rename from tfv/utils.s
rename to tfv/tfv_utils.s
diff --git a/tfv/zp.inc b/tfv/tfv_zp.inc
similarity index 100%
rename from tfv/zp.inc
rename to tfv/tfv_zp.inc