myst_hgr: rename dome

games/riven_hgr/Makefile

@@ -2,9 +2,6 @@ include ../../Makefile.inc
 
 DOS33 = ../../utils/dos33fs-utils/dos33
 DOS33_RAW = ../../utils/dos33fs-utils/dos33_raw
-#B2D = ../../utils/bmp2dhr/b2d
-#PNG2GR = ../../utils/gr-utils/png2gr
-#LZSA = ~/research/lzsa/lzsa/lzsa
 TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 EMPTY_DISK = ../../empty_disk/empty.dsk
 LINKER_SCRIPTS = ../../linker_scripts/
@@ -13,7 +10,7 @@ LINKER_SCRIPTS = ../../linker_scripts/
 all:	riven_hgr.dsk
 
 riven_hgr.dsk:	HELLO LOADER TITLE \
-		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV DOME MOVIE1
+		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE MOVIE1
 	cp $(EMPTY_DISK) riven_hgr.dsk
 	$(DOS33) -y riven_hgr.dsk SAVE A HELLO
 	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x1000 LOADER
@@ -21,7 +18,7 @@ riven_hgr.dsk:	HELLO LOADER TITLE \
 	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_PROJECTOR
 	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_MAGSTEPS
 	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_MAGLEV
-	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 DOME
+	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_OUTSIDE
 	$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 MOVIE1
 
 ###
@@ -50,18 +47,18 @@ title.o:	title.s zp.inc hardware.inc \
 
 ####
 
-DOME:	dome.o
-	ld65 -o DOME dome.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+LEVEL_OUTSIDE:	level_outside.o
+	ld65 -o LEVEL_OUTSIDE level_outside.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
 
-dome.o:	dome.s zp.inc hardware.inc \
+level_outside.o:	level_outside.s zp.inc hardware.inc \
 		zx02_optim.s \
 		hgr_sprite.s hgr_tables.s \
 		keyboard.s \
 		hgr_14x14_sprite.s \
-		leveldata_dome.inc \
+		leveldata_outside.inc \
 		graphics_sprites/pointer_sprites.inc \
-		graphics_dome/dome_graphics.inc
-	ca65 -o dome.o dome.s -l dome.lst
+		graphics_outside/outside_graphics.inc
+	ca65 -o level_outside.o level_outside.s -l level_outside.lst
 
 ####
 
@@ -126,7 +123,7 @@ movie1.o:	movie1.s \
 
 clean:		
 	rm -f *~ *.o *.lst HELLO LOADER TITLE \
-		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV DOME
+		LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE
 #	cd graphics && make clean
 #	cd maps && make clean
 #	cd title && make clean

games/riven_hgr/common_defines.inc

@@ -1,8 +1,10 @@
 LOAD_TITLE      =       0
-LOAD_DOME	=	1
+LOAD_OUTSIDE	=	1
 LOAD_PROJECTOR	=	2
 LOAD_MAGSTEPS	=	3
 LOAD_MAGLEV	=	4
+LOAD_MOVIE1	=	5
+LOAD_MOVIE2	=	6
 
 div7_table     = $BC00
 mod7_table     = $BD00
@@ -48,7 +50,7 @@ LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
 ;================================
 ; Level definitions
 
-; Dome
+; Outside
 
 RIVEN_MAGLEV1	=	0
 

games/riven_hgr/graphics_dome/Makefile

@@ -1,37 +0,0 @@
-include ../../../Makefile.inc
-
-ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
-LINKER_SCRIPTS = ../../../linker_scripts
-DOS33 = ../../../utils/dos33fs-utils/dos33
-EMPTY_DISK = ../../../empty_disk/empty.dsk
-TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
-PNG2GR = ../../../utils/gr-utils/png2gr
-PNG2SPRITES = ../../../utils/gr-utils/png2sprites
-HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
-
-all:	dome_graphics.inc
-
-dome_graphics.inc:	\
-	maglev1_n.hgr.zx02 maglev1_s.hgr.zx02 maglev1_e.hgr.zx02 maglev1_w.hgr.zx02
-	echo "maglev1_n_zx02: .incbin \"maglev1_n.hgr.zx02\"" > dome_graphics.inc
-	echo "maglev1_s_zx02: .incbin \"maglev1_s.hgr.zx02\"" >> dome_graphics.inc
-	echo "maglev1_e_zx02: .incbin \"maglev1_e.hgr.zx02\"" >> dome_graphics.inc
-	echo "maglev1_w_zx02: .incbin \"maglev1_w.hgr.zx02\"" >> dome_graphics.inc
-#	echo "maglev2_n_zx02: .incbin \"maglev2_n.hgr.zx02\"" >> dome_graphics.inc
-#	echo "maglev3_n_zx02: .incbin \"maglev3_n.hgr.zx02\"" >> dome_graphics.inc
-
-
-####
-
-%.hgr: %.png
-	$(PNG_TO_HGR) $< > $@
-
-%.hgr.zx02: %.hgr
-	$(ZX02) -f $< $@
-
-####
-
-clean:
-	rm -f *~ *.o *.lst  *.zx02 *.hgr dome_graphics.inc
-

games/riven_hgr/graphics_outside/Makefile

@@ -0,0 +1,30 @@
+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
+
+all:	outside_graphics.inc
+
+outside_graphics.inc:	\
+	maglev1_n.hgr.zx02 maglev1_s.hgr.zx02 maglev1_e.hgr.zx02 maglev1_w.hgr.zx02
+	echo "maglev1_n_zx02: .incbin \"maglev1_n.hgr.zx02\"" > outside_graphics.inc
+	echo "maglev1_s_zx02: .incbin \"maglev1_s.hgr.zx02\"" >> outside_graphics.inc
+	echo "maglev1_e_zx02: .incbin \"maglev1_e.hgr.zx02\"" >> outside_graphics.inc
+	echo "maglev1_w_zx02: .incbin \"maglev1_w.hgr.zx02\"" >> outside_graphics.inc
+
+
+####
+
+%.hgr: %.png
+	$(PNG_TO_HGR) $< > $@
+
+%.hgr.zx02: %.hgr
+	$(ZX02) -f $< $@
+
+####
+
+clean:
+	rm -f *~ *.o *.lst  *.zx02 *.hgr outside_graphics.inc
+

games/riven_hgr/level_outside.s

@@ -1,4 +1,4 @@
-; Riven -- Dome Island
+; Riven -- Dome Island -- Outside in the Quad
 
 ; by deater (Vince Weaver) <vince@deater.net>
 
@@ -7,7 +7,7 @@
 	.include "hardware.inc"
 	.include "common_defines.inc"
 
-riven_dome:
+riven_outside:
 
 	;===================
 	; init screen
@@ -114,10 +114,10 @@ really_exit:
 
 	.include	"log_table.s"
 
-.include "graphics_dome/dome_graphics.inc"
+.include "graphics_outside/outside_graphics.inc"
 
 ;.include "common_sprites.inc"
 
 .include "graphics_sprites/pointer_sprites.inc"
 
-.include "leveldata_dome.inc"
+.include "leveldata_outside.inc"

games/riven_hgr/leveldata_magsteps.inc

@@ -8,7 +8,7 @@ locations:
 ; RIVEN_MAGSTEPS2	-- meglev steps middle
 location0:
 	.byte	RIVEN_MAGSTEPS3		; north exit
-	.byte	LOAD_DOME<<4|RIVEN_MAGLEV1	; south exit
+	.byte	LOAD_OUTSIDE<<4|RIVEN_MAGLEV1	; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir

games/riven_hgr/leveldata_projector.inc

@@ -24,7 +24,7 @@ location0:
 
 ; RIVEN_PROJ_DOOR	-- doorway to projector room
 location1:
-	.byte	LOAD_DOME<<4 | RIVEN_MAGLEV1	; north exit
+	.byte	LOAD_OUTSIDE<<4 | RIVEN_MAGLEV1	; north exit
 	.byte	RIVEN_PROJECTOR		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit

games/riven_hgr/loader.s

@@ -194,21 +194,27 @@ copy_filename_done:
 
 filenames:
 	.word title_filename
-	.word dome_filename
+	.word outside_filename
 	.word projector_filename
 	.word magsteps_filename
 	.word maglev_filename
+	.word movie1_filename
+	.word movie2_filename
 
 title_filename:
 	.byte "TITLE",0
-dome_filename:
-	.byte "DOME",0
+outside_filename:
+	.byte "LEVEL_OUTSIDE",0
 projector_filename:
 	.byte "LEVEL_PROJECTOR",0
 magsteps_filename:
 	.byte "LEVEL_MAGSTEPS",0
 maglev_filename:
 	.byte "LEVEL_MAGLEV",0
+movie1_filename:
+	.byte "MOVIE1",0
+movie2_filename:
+	.byte "MOVIE2",0
 
 	;===================================================
 	;===================================================

games/riven_hgr/title.s

@@ -184,15 +184,16 @@ done_setup_sound:
 	lda	#100
 	jsr	wait_a_bit
 
-;	lda	#LOAD_DOME
-;	sta	WHICH_LOAD		; assume new game (dome island)
+	lda	#LOAD_OUTSIDE
+	sta	WHICH_LOAD		; assume new game (dome island)
 
-;	lda	#RIVEN_MAGLEV1
-;	sta	LOCATION
+	lda	#RIVEN_MAGLEV1
+	sta	LOCATION
 
-;	lda	#DIRECTION_N
-;	sta	DIRECTION
+	lda	#DIRECTION_N
+	sta	DIRECTION
 
+.if 0
 	lda	#LOAD_PROJECTOR
 	sta	WHICH_LOAD		; assume new game (dome island)
 
@@ -201,7 +202,7 @@ done_setup_sound:
 
 	lda	#DIRECTION_S
 	sta	DIRECTION
-
+.endif
 
 
 	rts