From fbcbc7e6b6791ad8b49e8c0c5a26df429587b98c Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Fri, 25 Jun 2021 16:52:36 -0400
Subject: [PATCH] vgi: final doom version

---
 graphics/hgr/vgi/Makefile                     | 41 ++++++++++---------
 graphics/hgr/vgi/doom_vgi.s                   | 21 +++++++---
 .../vgi/{make_boxes_asm.c => make_vgi_asm.c}  |  0
 3 files changed, 37 insertions(+), 25 deletions(-)
 rename graphics/hgr/vgi/{make_boxes_asm.c => make_vgi_asm.c} (100%)

diff --git a/graphics/hgr/vgi/Makefile b/graphics/hgr/vgi/Makefile
index 3f3b8e53..03badc6d 100644
--- a/graphics/hgr/vgi/Makefile
+++ b/graphics/hgr/vgi/Makefile
@@ -4,8 +4,9 @@ DOS33 = ../../../utils/dos33fs-utils/dos33
 TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
 LINKERSCRIPTS = ../../../linker_scripts
 EMPTYDISK = ../../../empty_disk/empty.dsk
+MAKEVGI	= ./make_vgi_asm
 
-all:	vgi_myst.dsk make_boxes_asm
+all:	vgi_myst.dsk make_vgi_asm
 
 vgi_myst.dsk:	HELLO VGI-MYST VGI-DOOM
 	cp $(EMPTYDISK) vgi_myst.dsk
@@ -44,57 +45,57 @@ doom_vgi.o: doom.data \
 
 ###
 
-doom.data:	make_boxes_asm doom.vgi
+doom.data:	make_vgi_asm doom.vgi
 	echo "doom_data:" > doom.data
-	./make_boxes_asm < doom.vgi >> doom.data
+	./make_vgi_asm < doom.vgi >> doom.data
 
 ###
 
-clock.data:	make_boxes_asm clock.vgi
+clock.data:	make_vgi_asm clock.vgi
 	echo "clock_data:" > clock.data
-	./make_boxes_asm < clock.vgi >> clock.data
+	./make_vgi_asm < clock.vgi >> clock.data
 
 ###
 
-path.data:	make_boxes_asm path.vgi
+path.data:	make_vgi_asm path.vgi
 	echo "path_data:" > path.data
-	./make_boxes_asm < path.vgi >> path.data
+	./make_vgi_asm < path.vgi >> path.data
 
 ###
 
-rocket.data:	make_boxes_asm rocket.vgi
+rocket.data:	make_vgi_asm rocket.vgi
 	echo "rocket_data:" > rocket.data
-	./make_boxes_asm < rocket.vgi >> rocket.data
+	./make_vgi_asm < rocket.vgi >> rocket.data
 
 ###
 
-rocket_door.data:	make_boxes_asm rocket_door.vgi
+rocket_door.data:	make_vgi_asm rocket_door.vgi
 	echo "rocket_door_data:" > rocket_door.data
-	./make_boxes_asm < rocket_door.vgi >> rocket_door.data
+	./make_vgi_asm < rocket_door.vgi >> rocket_door.data
 
 
 ###
 
-red_book.data:	make_boxes_asm red_book.vgi
+red_book.data:	make_vgi_asm red_book.vgi
 	echo "red_book_data:" > red_book.data
-	./make_boxes_asm < red_book.vgi >> red_book.data
+	./make_vgi_asm < red_book.vgi >> red_book.data
 
 ###
 
-fireplace.data:	make_boxes_asm fireplace.vgi
+fireplace.data:	make_vgi_asm fireplace.vgi
 	echo "fireplace_data:" > fireplace.data
-	./make_boxes_asm < fireplace.vgi >> fireplace.data
+	./make_vgi_asm < fireplace.vgi >> fireplace.data
 
 
 ###
 
-make_boxes_asm:	make_boxes_asm.o
-	$(CC) -o make_boxes_asm make_boxes_asm.o $(LFLAGS)
+make_vgi_asm:	make_vgi_asm.o
+	$(CC) -o make_vgi_asm make_vgi_asm.o $(LFLAGS)
 
-make_boxes_asm.o:	make_boxes_asm.c
-	$(CC) $(CFLAGS) -c make_boxes_asm.c
+make_vgi_asm.o:	make_vgi_asm.c
+	$(CC) $(CFLAGS) -c make_vgi_asm.c
 
 ###
 
 clean:	
-	rm -f *~ *.o *.lst HELLO VGI-MYST VGI-DOOM make_boxes_asm *.data
+	rm -f *~ *.o *.lst HELLO VGI-MYST VGI-DOOM make_vgi_asm *.data
diff --git a/graphics/hgr/vgi/doom_vgi.s b/graphics/hgr/vgi/doom_vgi.s
index 88c39943..58b2c12e 100644
--- a/graphics/hgr/vgi/doom_vgi.s
+++ b/graphics/hgr/vgi/doom_vgi.s
@@ -113,7 +113,7 @@ start_interrupts:
 
 	jsr	play_vgi
 
-	jsr	wait_until_keypress
+;	jsr	wait_until_keypress
 
 
 
@@ -126,6 +126,10 @@ loopy:
 	sta	OUTH
 
 	jsr	fake_input
+
+;	lda	#21
+;	sta	$22
+
 	jsr	fake_input
 	jsr	fake_input
 
@@ -207,12 +211,19 @@ all_done:
 ;
 
 string1:
-.byte "YOU SEE A CLOCK TOWER READING 12:00",13
-.byte "     LEFT/RIGHT/FORWARD",13,0
+;      01234567890123456789012345678901234567890
+.byte "  ====> AMMO: 50  HEALTH: 100% <====",13,0
 
-; SWIM TO TOWER
+string99:
+.byte "  ====> AMMO: 50  HEALTH: 100% <====",13
+.byte "YOU ARE SOME SORT OF SPACE MARINE",13
+.byte "YOU HEAR SOME ROCKING CHIPTUNES",0
+
+; FORWARD
 string2:
-.byte "YOU DON'T KNOW HOW TO ",34,"SWIM",34,13,0
+.byte "  ====> AMMO: 50  HEALTH: 100% <====",13
+.byte "ARE YOU SURE YOU WANT TO MOVE?",13
+.byte "IT TOOK A BIT TO RENDER THAT LAST FRAME",13,0
 
 ; WADE TO TOWER
 string3:
diff --git a/graphics/hgr/vgi/make_boxes_asm.c b/graphics/hgr/vgi/make_vgi_asm.c
similarity index 100%
rename from graphics/hgr/vgi/make_boxes_asm.c
rename to graphics/hgr/vgi/make_vgi_asm.c