riven: move more files into own directory

games/riven_hgr/Makefile

@@ -10,20 +10,24 @@ LINKER_SCRIPTS = ../../linker_scripts/
 all:	riven_disk39.dsk
 
 riven_disk39.dsk:	QBOOT QLOAD TITLE \
-	LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
-	MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+	disk39_files/LEVEL_MAGSTEPS \
+	disk39_files/LEVEL_MAGLEV \
+	disk39_files/LEVEL_OUTSIDE \
+	disk39_files/LEVEL_PROJECTOR \
+	disk39_files/MOVIE_MAGLEV_FLIP \
+	disk39_files/MOVIE_MAGLEV_RIDE
 	cp $(EMPTY_DISK)/empty.dsk riven_disk39.dsk
 	$(DOS33_RAW) riven_disk39.dsk  0  0 QBOOT                0   1
 	$(DOS33_RAW) riven_disk39.dsk  0  2 QBOOT                1   1
 	$(DOS33_RAW) riven_disk39.dsk  0  4 QBOOT                2   1
 	$(DOS33_RAW) riven_disk39.dsk  1  0 QLOAD                0   0
 	$(DOS33_RAW) riven_disk39.dsk  1  8 TITLE		      0   0
-	$(DOS33_RAW) riven_disk39.dsk  2  0 LEVEL_PROJECTOR      0   0
-	$(DOS33_RAW) riven_disk39.dsk  9  0 LEVEL_OUTSIDE        0   0
-	$(DOS33_RAW) riven_disk39.dsk  17 0 LEVEL_MAGSTEPS       0   0
-	$(DOS33_RAW) riven_disk39.dsk  21 0 LEVEL_MAGLEV         0   0
-	$(DOS33_RAW) riven_disk39.dsk  25 0 MOVIE_MAGLEV_FLIP               0   0
-	$(DOS33_RAW) riven_disk39.dsk  27 0 MOVIE_MAGLEV_RIDE               0   0
+	$(DOS33_RAW) riven_disk39.dsk  2  0 disk39_files/LEVEL_PROJECTOR      0   0
+	$(DOS33_RAW) riven_disk39.dsk  9  0 disk39_files/LEVEL_OUTSIDE        0   0
+	$(DOS33_RAW) riven_disk39.dsk  17 0 disk39_files/LEVEL_MAGSTEPS       0   0
+	$(DOS33_RAW) riven_disk39.dsk  21 0 disk39_files/LEVEL_MAGLEV         0   0
+	$(DOS33_RAW) riven_disk39.dsk  25 0 disk39_files/MOVIE_MAGLEV_FLIP               0   0
+	$(DOS33_RAW) riven_disk39.dsk  27 0 disk39_files/MOVIE_MAGLEV_RIDE               0   0
 
 
 ###
@@ -49,12 +53,6 @@ qload.o:	qload.s qboot.inc \
 		keyboard.s
 	ca65 -o qload.o qload.s -l qload.lst
 
-
-###
-
-HELLO:	hello.bas
-	$(TOKENIZE) < hello.bas > HELLO
-
 ####
 
 TITLE:	title.o
@@ -68,70 +66,88 @@ title.o:	title.s zp.inc hardware.inc \
 
 ####
 
-LEVEL_OUTSIDE:	level_outside.o
-	ld65 -o LEVEL_OUTSIDE level_outside.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+disk39_files/LEVEL_OUTSIDE:	
+	cd disk39_files && make
 
-level_outside.o:	level_outside.s zp.inc hardware.inc \
-		qload.inc \
-		disk39_files/leveldata_outside.inc \
-		graphics_outside/outside_graphics.inc
-	ca65 -o level_outside.o level_outside.s -l level_outside.lst
+disk39_files/LEVEL_PROJECTOR:	
+	cd disk39_files && make
+
+disk39_files/LEVEL_MAGLEV:	
+	cd disk39_files && make
+
+disk39_files/LEVEL_MAGSTEPS:	
+	cd disk39_files && make
+
+disk39_files/MOVIE_MAGLEV_FLIP:
+	cd disk39_files && make
+
+disk39_files/MOVIE_MAGLEV_RIDE:
+	cd disk39_files && make
+
+#LEVEL_OUTSIDE:	level_outside.o
+#	ld65 -o LEVEL_OUTSIDE level_outside.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+#level_outside.o:	level_outside.s zp.inc hardware.inc \
+#		qload.inc \
+#		disk39_files/leveldata_outside.inc \
+#		graphics_outside/outside_graphics.inc
+#	ca65 -o level_outside.o level_outside.s -l level_outside.lst
 
 ####
 
-LEVEL_PROJECTOR:	level_projector.o
-	ld65 -o LEVEL_PROJECTOR level_projector.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+#LEVEL_PROJECTOR:	level_projector.o
+#	ld65 -o LEVEL_PROJECTOR level_projector.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-level_projector.o:	level_projector.s zp.inc hardware.inc \
-		qload.inc \
-		disk39_files/leveldata_projector.inc \
-		graphics_projector/projector_graphics.inc
-	ca65 -o level_projector.o level_projector.s -l level_projector.lst
+#level_projector.o:	level_projector.s zp.inc hardware.inc \
+#		qload.inc \
+#		disk39_files/leveldata_projector.inc \
+#		graphics_projector/projector_graphics.inc
+#	ca65 -o level_projector.o level_projector.s -l level_projector.lst
 
 ####
 
-LEVEL_MAGSTEPS:	level_magsteps.o
-	ld65 -o LEVEL_MAGSTEPS level_magsteps.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+#LEVEL_MAGSTEPS:	level_magsteps.o
+#	ld65 -o LEVEL_MAGSTEPS level_magsteps.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-level_magsteps.o:	level_magsteps.s zp.inc hardware.inc \
-		qload.inc \
-		disk39_files/leveldata_magsteps.inc \
-		graphics_magsteps/magsteps_graphics.inc
-	ca65 -o level_magsteps.o level_magsteps.s -l level_magsteps.lst
+#level_magsteps.o:	level_magsteps.s zp.inc hardware.inc \
+#		qload.inc \
+#		disk39_files/leveldata_magsteps.inc \
+#		graphics_magsteps/magsteps_graphics.inc
+#	ca65 -o level_magsteps.o level_magsteps.s -l level_magsteps.lst
 
 ####
 
-LEVEL_MAGLEV:	level_maglev.o
-	ld65 -o LEVEL_MAGLEV level_maglev.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+#LEVEL_MAGLEV:	level_maglev.o
+#	ld65 -o LEVEL_MAGLEV level_maglev.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-level_maglev.o:	level_maglev.s zp.inc hardware.inc \
-		qload.inc \
-		disk39_files/leveldata_maglev.inc \
-		graphics_maglev/maglev_graphics.inc
-	ca65 -o level_maglev.o level_maglev.s -l level_maglev.lst
+#level_maglev.o:	level_maglev.s zp.inc hardware.inc \
+#		qload.inc \
+#		disk39_files/leveldata_maglev.inc \
+#		graphics_maglev/maglev_graphics.inc
+#	ca65 -o level_maglev.o level_maglev.s -l level_maglev.lst
 
 ####
 
-MOVIE_MAGLEV_FLIP:	movie_maglev_flip.o
-	ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+#MOVIE_MAGLEV_FLIP:	movie_maglev_flip.o
+#	ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-movie_maglev_flip.o:	movie_maglev_flip.s \
-	zp.inc hardware.inc \
-	qload.inc \
-	movie_maglev_flip/movie_maglev_flip.inc
-	ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst
+#movie_maglev_flip.o:	movie_maglev_flip.s \
+#	zp.inc hardware.inc \
+#	qload.inc \
+#	movie_maglev_flip/movie_maglev_flip.inc
+#	ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst
 
 ####
 
-MOVIE_MAGLEV_RIDE:	movie_maglev_ride.o
-	ld65 -o MOVIE_MAGLEV_RIDE movie_maglev_ride.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+#MOVIE_MAGLEV_RIDE:	movie_maglev_ride.o
+#	ld65 -o MOVIE_MAGLEV_RIDE movie_maglev_ride.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-movie_maglev_ride.o:	movie_maglev_ride.s \
-	zp.inc hardware.inc \
-	qload.inc \
-	end_message/end_message.gr.zx02 \
-	movie_maglev_ride/movie_maglev_ride.inc
-	ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst
+#movie_maglev_ride.o:	movie_maglev_ride.s \
+#	zp.inc hardware.inc \
+#	qload.inc \
+#	end_message/end_message.gr.zx02 \
+#	movie_maglev_ride/movie_maglev_ride.inc
+#	ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst
 
 
 
@@ -143,40 +159,17 @@ graphics_sprites/pointer_sprites.inc:
 graphics_title/riven_title.hgr.zx02:	
 	cd graphics_title && make
 
-graphics_maglev/maglev_graphics.inc:
-	cd graphics_maglev && make
-
-graphics_magsteps/magsteps_graphics.inc:
-	cd graphics_magsteps && make
-
-graphics_outside/outside_graphics.inc:
-	cd graphics_outside && make
-
-graphics_projector/projector_graphics.inc:
-	cd graphics_projector && make
-
-movie_maglev_flip/movie_maglev_flip.inc:	
-	cd movie_maglev_flip && make
-
 ####
 
 clean:		
-	rm -f *~ *.o *.lst HELLO LOADER TITLE \
-		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
-		MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+	rm -f *~ *.o *.lst QLOAD QBOOT TITLE
+	cd disk39_files && make clean
 
 ####
 
 distclean:
-	rm -f *~ *.o *.lst HELLO LOADER TITLE \
-		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
-		MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+	rm -f *~ *.o *.lst QLOAD QBOOT TITLE
 	cd graphics_title && make clean
-	cd graphics_projector && make clean
-	cd graphics_outside && make clean
-	cd graphics_magsteps && make clean
-	cd graphics_maglev && make clean
 	cd graphics_sprites && make clean
-	cd movie_maglev_flip && make clean
-#	cd movie_maglev_ride && make clean
+	cd disk39_files && make distclean
 

games/riven_hgr/TODO

@@ -1,9 +1,16 @@
-share code in QLOAD to free up room in levels
+
++ Keyboard handling
+	- still buggy, especially when clicking on something???
+	- Better keyboard handling on IIe
+	-> was actually one of the main reasons I started working on this
 
 
 disk39:
 	-> try to fit more locations
-		have one already done that didn't fit (overlook otherway)
+		+ outside/overlook_s is there but won't fit
+		+ projector_e also there, prob will fit
+		+ re-arrange disk so projector gets the extra 4k
+
 	-> try to fit last little bit of maglev sequence
 		+ do the handle animation at end?
 		+ sound effects?
@@ -11,6 +18,6 @@ disk39:
 			optionally load tail end
 			to language card on machines that have it?
 
-+ Better keyboard handling on IIe
-	-> was actually one of the main reasons I started working on this
+
+disk40:
 

games/riven_hgr/disk39_files/Makefile

@@ -0,0 +1,126 @@
+include ../../../Makefile.inc
+
+LINKER_SCRIPTS = ../../../linker_scripts/
+
+
+all:	LEVEL_OUTSIDE LEVEL_PROJECTOR \
+	LEVEL_MAGLEV LEVEL_MAGSTEPS \
+	MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+
+LEVEL_OUTSIDE:	level_outside.o
+	ld65 -o LEVEL_OUTSIDE level_outside.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+level_outside.o:	level_outside.s \
+		../zp.inc ../hardware.inc ../qload.inc \
+		../common_defines.inc \
+		leveldata_outside.inc \
+		graphics_outside/outside_graphics.inc
+	ca65 -o level_outside.o level_outside.s -l level_outside.lst
+
+####
+
+LEVEL_PROJECTOR:	level_projector.o
+	ld65 -o LEVEL_PROJECTOR level_projector.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+level_projector.o:	level_projector.s \
+		../zp.inc ../hardware.inc ../qload.inc \
+		../common_defines.inc \
+		leveldata_projector.inc \
+		graphics_projector/projector_graphics.inc
+	ca65 -o level_projector.o level_projector.s -l level_projector.lst
+
+####
+
+LEVEL_MAGSTEPS:	level_magsteps.o
+	ld65 -o LEVEL_MAGSTEPS level_magsteps.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+level_magsteps.o:	level_magsteps.s \
+		../zp.inc ../hardware.inc ../qload.inc \
+		../common_defines.inc \
+		leveldata_magsteps.inc \
+		graphics_magsteps/magsteps_graphics.inc
+	ca65 -o level_magsteps.o level_magsteps.s -l level_magsteps.lst
+
+####
+
+LEVEL_MAGLEV:	level_maglev.o
+	ld65 -o LEVEL_MAGLEV level_maglev.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+level_maglev.o:	level_maglev.s \
+		../zp.inc ../hardware.inc ../qload.inc \
+		../common_defines.inc \
+		leveldata_maglev.inc \
+		graphics_maglev/maglev_graphics.inc
+	ca65 -o level_maglev.o level_maglev.s -l level_maglev.lst
+
+####
+
+MOVIE_MAGLEV_FLIP:	movie_maglev_flip.o
+	ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+movie_maglev_flip.o:	movie_maglev_flip.s \
+	../zp.inc ../hardware.inc ../qload.inc \
+	../common_defines.inc \
+	movie_maglev_flip/movie_maglev_flip.inc
+	ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst
+
+####
+
+MOVIE_MAGLEV_RIDE:	movie_maglev_ride.o
+	ld65 -o MOVIE_MAGLEV_RIDE movie_maglev_ride.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+movie_maglev_ride.o:	movie_maglev_ride.s \
+	../zp.inc ../hardware.inc ../qload.inc \
+	../common_defines.inc \
+	end_message/end_message.gr.zx02 \
+	movie_maglev_ride/movie_maglev_ride.inc
+	ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst
+
+
+
+####
+
+graphics_sprites/pointer_sprites.inc:
+	cd graphics_sprites && make
+
+graphics_title/riven_title.hgr.zx02:	
+	cd graphics_title && make
+
+graphics_maglev/maglev_graphics.inc:
+	cd graphics_maglev && make
+
+graphics_magsteps/magsteps_graphics.inc:
+	cd graphics_magsteps && make
+
+graphics_outside/outside_graphics.inc:
+	cd graphics_outside && make
+
+graphics_projector/projector_graphics.inc:
+	cd graphics_projector && make
+
+movie_maglev_flip/movie_maglev_flip.inc:	
+	cd movie_maglev_flip && make
+
+movie_maglev_ride/movie_maglev_ride.inc:	
+	cd movie_maglev_ride && make
+
+####
+
+clean:		
+	rm -f *~ *.o *.lst \
+		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
+		MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+
+####
+
+distclean:
+	rm -f *~ *.o *.lst \
+		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
+		MOVIE_MAGLEV_FLIP MOVIE_MAGLEV_RIDE
+	cd graphics_projector && make clean
+	cd graphics_outside && make clean
+	cd graphics_magsteps && make clean
+	cd graphics_maglev && make clean
+	cd movie_maglev_flip && make clean
+	cd movie_maglev_ride && make clean
+

games/riven_hgr/disk39_files/disk39_defines.inc

@@ -0,0 +1,75 @@
+LOAD_TITLE      =       0
+LOAD_OUTSIDE	=	1
+LOAD_PROJECTOR	=	2
+LOAD_MAGSTEPS	=	3
+LOAD_MAGLEV	=	4
+LOAD_MOVIE1	=	5
+LOAD_MOVIE2	=	6
+
+div7_table     = $1300
+mod7_table     = $1400
+hposn_high     = $1500
+hposn_low      = $1600
+
+
+;=============================
+; common stuff
+
+;===============================================
+; level data structure definitions
+;===============================================
+; 24 bytes each location
+; we put special at end as it's ignored if not set
+
+LOCATION_NORTH_EXIT=0			; new room when heading north
+LOCATION_SOUTH_EXIT=1			; new room when heading south
+LOCATION_EAST_EXIT=2			; new room when heading east
+LOCATION_WEST_EXIT=3			; new room when heading west
+LOCATION_NORTH_EXIT_DIR=4		; direction faced in new room when N
+LOCATION_SOUTH_EXIT_DIR=5		; direction faced in new room when S
+LOCATION_EAST_EXIT_DIR=6		; direction faced in new room when E
+LOCATION_WEST_EXIT_DIR=7		; direction faced in new room when W
+LOCATION_NORTH_BG=8			; pointer to north background image
+LOCATION_SOUTH_BG=10			; pointer to south background image
+LOCATION_EAST_BG=12			; pointer to east background image
+LOCATION_WEST_BG=14			; pointer to west background image
+LOCATION_BGS	= 16			; bitmap saying which backgrounds valid
+	BG_NORTH = 1
+	BG_SOUTH = 2
+	BG_WEST = 4
+	BG_EAST = 8
+LOCATION_SPECIAL_EXIT=17		; if we have something clickable
+					; $FF if not, direction if so
+LOCATION_SPECIAL_X1=18			; collision box for the thing to click
+LOCATION_SPECIAL_X2=19
+LOCATION_SPECIAL_Y1=20
+LOCATION_SPECIAL_Y2=21
+LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
+
+
+;================================
+; Level definitions
+
+; Outside
+
+RIVEN_MAGLEV1	=	0
+RIVEN_MAGPATH	=	1
+RIVEN_OVERLOOK	=	2
+
+; Projector
+
+RIVEN_PROJECTOR	=	0
+RIVEN_PROJ_DOOR	=	1
+RIVEN_PROJ_STEPS=	2
+RIVEN_WAHRK	=	3
+
+; Magsteps
+
+RIVEN_MAGSTEPS2	=	0
+RIVEN_MAGSTEPS3	=	1
+
+; Maglev
+
+RIVEN_LOOKIN	=	0
+RIVEN_INSEAT	=	1
+RIVEN_READY2GO	=	2

games/riven_hgr/disk39_files/graphics_maglev/Makefile

@@ -1,7 +1,7 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 
 all:	maglev_graphics.inc
 

games/riven_hgr/disk39_files/graphics_magsteps/Makefile

@@ -1,7 +1,7 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 
 all:	magsteps_graphics.inc
 

games/riven_hgr/disk39_files/graphics_outside/Makefile

@@ -1,9 +1,9 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
-LINKER_SCRIPTS = ../../../linker_scripts
-HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+#LINKER_SCRIPTS = ../../../linker_scripts
+#HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
 
 all:	outside_graphics.inc
 

games/riven_hgr/disk39_files/graphics_projector/Makefile

@@ -1,7 +1,7 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 
 all:	projector_graphics.inc
 

games/riven_hgr/disk39_files/level_maglev.s

@@ -3,10 +3,10 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 ; Zero Page
-	.include "zp.inc"
-	.include "hardware.inc"
-	.include "common_defines.inc"
-	.include "qload.inc"
+	.include "../zp.inc"
+	.include "../hardware.inc"
+	.include "../common_defines.inc"
+	.include "../qload.inc"
 
 riven_maglev:
 
@@ -140,17 +140,6 @@ handle2_clicked:
 	; includes
 	;==========================
 
-;	.include	"zx02_optim.s"
-
-;	.include	"keyboard.s"
-
-;	.include	"hgr_14x14_sprite.s"
-;	.include	"draw_pointer.s"
-
-;	.include	"log_table.s"
-
 .include "graphics_maglev/maglev_graphics.inc"
 
-;.include "graphics_sprites/pointer_sprites.inc"
-
-.include "disk39_files/leveldata_maglev.inc"
+.include "leveldata_maglev.inc"

games/riven_hgr/disk39_files/level_magsteps.s

@@ -3,10 +3,10 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 ; Zero Page
-	.include "zp.inc"
-	.include "hardware.inc"
-	.include "common_defines.inc"
-	.include "qload.inc"
+	.include "../zp.inc"
+	.include "../hardware.inc"
+	.include "../common_defines.inc"
+	.include "../qload.inc"
 
 riven_magsteps:
 
@@ -100,17 +100,6 @@ really_exit:
 	; includes
 	;==========================
 
-;	.include	"zx02_optim.s"
-
-;	.include	"keyboard.s"
-
-;	.include	"hgr_14x14_sprite.s"
-;	.include	"draw_pointer.s"
-
-;	.include	"log_table.s"
-
 .include "graphics_magsteps/magsteps_graphics.inc"
 
-;.include "graphics_sprites/pointer_sprites.inc"
-
-.include "disk39_files/leveldata_magsteps.inc"
+.include "leveldata_magsteps.inc"

games/riven_hgr/disk39_files/level_outside.s

@@ -3,10 +3,10 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 ; Zero Page
-	.include "zp.inc"
-	.include "hardware.inc"
-	.include "common_defines.inc"
-	.include "qload.inc"
+	.include "../zp.inc"
+	.include "../hardware.inc"
+	.include "../common_defines.inc"
+	.include "../qload.inc"
 
 riven_outside:
 
@@ -115,17 +115,7 @@ call_button_clicked:
 	; includes
 	;==========================
 
-;	.include	"zx02_optim.s"
-
-;	.include	"keyboard.s"
-
-;	.include	"hgr_14x14_sprite.s"
-;	.include	"draw_pointer.s"
-
-;	.include	"log_table.s"
 
 .include "graphics_outside/outside_graphics.inc"
 
-;.include "graphics_sprites/pointer_sprites.inc"
-
-.include "disk39_files/leveldata_outside.inc"
+.include "leveldata_outside.inc"

games/riven_hgr/disk39_files/level_projector.s

@@ -3,10 +3,10 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 ; Zero Page
-	.include "zp.inc"
-	.include "hardware.inc"
-	.include "common_defines.inc"
-	.include "qload.inc"
+	.include "../zp.inc"
+	.include "../hardware.inc"
+	.include "../common_defines.inc"
+	.include "../qload.inc"
 
 riven_projector:
 
@@ -100,17 +100,6 @@ really_exit:
 	; includes
 	;==========================
 
-;	.include	"zx02_optim.s"
-
-;	.include	"keyboard.s"
-
-;	.include	"hgr_14x14_sprite.s"
-;	.include	"draw_pointer.s"
-
-;	.include	"log_table.s"
-
 .include "graphics_projector/projector_graphics.inc"
 
-;.include "graphics_sprites/pointer_sprites.inc"
-
-.include "disk39_files/leveldata_projector.inc"
+.include "leveldata_projector.inc"

games/riven_hgr/disk39_files/movie_maglev_flip.s

@@ -2,10 +2,10 @@
 
 ; by deater (Vince Weaver) <vince@deater.net>
 
-.include "zp.inc"
-.include "hardware.inc"
-.include "common_defines.inc"
-.include "qload.inc"
+.include "../zp.inc"
+.include "../hardware.inc"
+.include "../common_defines.inc"
+.include "../qload.inc"
 
 overlays	=	$2000
 
@@ -355,8 +355,6 @@ done_pageflip:
 
 ;	.include	"zx02_optim.s"
 
-
-
 	.include	"movie_maglev_flip/movie_maglev_flip.inc"
 
 ;	.include	"wait.s"

games/riven_hgr/disk39_files/movie_maglev_flip/Makefile

@@ -1,7 +1,7 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
-PNG2GR = ../../../utils/gr-utils/png2gr
+PNG2GR = ../../../../utils/gr-utils/png2gr
 
 all:	movie_maglev_flip.inc
 

games/riven_hgr/disk39_files/movie_maglev_ride.s

@@ -4,9 +4,9 @@
 
 ; by deater (Vince Weaver) <vince@deater.net>
 
-.include "zp.inc"
-.include "hardware.inc"
-.include "qload.inc"
+.include "../zp.inc"
+.include "../hardware.inc"
+.include "../qload.inc"
 
 NUM_SCENES	=	137
 

games/riven_hgr/disk39_files/movie_maglev_ride/Makefile

@@ -1,7 +1,7 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
-PNG2GR = ../../../utils/gr-utils/png2gr
+PNG2GR = ../../../../utils/gr-utils/png2gr
 
 all:	movie_maglev_ride.inc