riven: re-arrange disk39 to fit more graphics

This commit is contained in:
Vince Weaver 2024-07-17 17:07:51 -04:00
parent 371d3530c5
commit da75612fa6
11 changed files with 46 additions and 68 deletions

View File

@ -88,7 +88,7 @@ riven_disk39.dsk: QBOOT QLOAD TITLE_39 \
$(DOS33_RAW) riven_disk39.dsk 0 8 TITLE_39 0 0
$(DOS33_RAW) riven_disk39.dsk 1 0 QLOAD 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 8 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
@ -288,7 +288,7 @@ disk00_files/DISK00:
disk01_files/DISK01:
cd disk01_files && make
disk38_files/DISK39:
disk38_files/DISK38:
cd disk38_files && make
disk39_files/DISK39:
@ -480,7 +480,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 38 2 0` disk38_files/LEVEL_PROJECTOR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 0 2` disk39_files/DISK39 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 2 0` disk39_files/LEVEL_PROJECTOR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 9 0` disk39_files/LEVEL_OUTSIDE 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 8 0` disk39_files/LEVEL_OUTSIDE 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 17 0` disk39_files/LEVEL_MAGSTEPS 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 21 0` disk39_files/LEVEL_MAGLEV 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 25 0` disk39_files/MOVIE_MAGLEV_FLIP 0 0

View File

@ -125,8 +125,8 @@ Disk39 Map (disk has 35 tracks, each 4k in size)
T 0 = Qboot
T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free
T 1 = QLOAD 2393 bytes 16S = 1T0S (4096) 2k free
T 2 = PROJECTOR 15895 bytes 112S = 7T0S (28672) 13k free
T 9 = OUTSIDE 29349 bytes 127S = 7T15S (32512) 3k free
T 2 = PROJECTOR 23707 bytes 96S = 6T0S (24576) 1k free
T 8 = OUTSIDE 26029 bytes 124S = 7T15S (32512) 6k free
T 17 = MAGSTEPS 11537 bytes 64S = 4T0S (16384) 5k free
T 21 = MAGLEV 13881 bytes 64S = 4T0S (16384) 3k free
T 25 = MOVIE_FLIP 7790 bytes 32S = 2T0S (8192) 500B free

View File

@ -10,19 +10,19 @@ which_disk_bin:
.byte 39
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS
.byte $40,$40,$40,$40 ; TITLE, PROJECTOR, OUTSIDE, MAGSTEPS
.byte $40,$40,$40,$00 ; MAGLEV, MOVIE1, MOVIE2
track_array:
.byte 0, 9, 2,17 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS
.byte 0, 2, 8,17 ; TITLE, PROJECTOR, OUTSIDE, MAGSTEPS
.byte 21,25,27,0 ; MAGLEV, MOVIE1, MOVIE2
sector_array:
.byte 8, 0, 0, 0 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS
.byte 8, 0, 0, 0 ; TITLE, PROJECTOR, OUTSIDE, MAGSTEPS
.byte 0, 0, 0, 0 ; MAGLEV, MOVIE1, MOVIE2
length_array:
.byte 8, 123,123, 64 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS
.byte 8, 96, 124, 64 ; TITLE, PROJECTOR, OUTSIDE, MAGSTEPS
.byte 64, 32, 127, 0 ; MAGLEV, MOVIE1, MOVIE2
disk_exit_disk: ; note: not BCD anymore

View File

@ -1,6 +1,6 @@
LOAD_TITLE_39 = 0
LOAD_OUTSIDE = 1
LOAD_PROJECTOR = 2
LOAD_PROJECTOR = 1
LOAD_OUTSIDE = 2
LOAD_MAGSTEPS = 3
LOAD_MAGLEV = 4
LOAD_MOVIE1 = 5
@ -9,16 +9,16 @@ LOAD_MOVIE2 = 6
;================================
; Level definitions
; Outside
RIVEN_MAGLEV1 = 0
RIVEN_MAGPATH = 1
RIVEN_OVERLOOK = 2
; Projector
RIVEN_PROJ_DOOR = 0
RIVEN_PROJ_STEPS= 1
RIVEN_MAGPATH = 2
; Outside
RIVEN_MAGLEV1 = 0
RIVEN_OVERLOOK = 1
; Magsteps

View File

@ -9,16 +9,15 @@ all: outside_graphics.inc
outside_graphics.inc: \
maglev1_n.hgr.zx02 maglev1_s.hgr.zx02 maglev1_e.hgr.zx02 maglev1_w.hgr.zx02 \
magpath_n.hgr.zx02 magpath_s.hgr.zx02 \
overlook_n.hgr.zx02 overlook_s.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
echo "magpath_n_zx02: .incbin \"magpath_n.hgr.zx02\"" >> outside_graphics.inc
echo "magpath_s_zx02: .incbin \"magpath_s.hgr.zx02\"" >> outside_graphics.inc
# echo "magpath_n_zx02: .incbin \"magpath_n.hgr.zx02\"" >> outside_graphics.inc
# echo "magpath_s_zx02: .incbin \"magpath_s.hgr.zx02\"" >> outside_graphics.inc
echo "overlook_n_zx02: .incbin \"overlook_n.hgr.zx02\"" >> outside_graphics.inc
# echo "overlook_s_zx02: .incbin \"overlook_n.hgr.zx02\"" >> outside_graphics.inc
echo "overlook_s_zx02: .incbin \"overlook_s.hgr.zx02\"" >> outside_graphics.inc

View File

@ -7,11 +7,14 @@ all: projector_graphics.inc
projector_graphics.inc: \
doorway_n.hgr.zx02 doorway_s.hgr.zx02 \
steps_n.hgr.zx02 steps_s.hgr.zx02
steps_n.hgr.zx02 steps_s.hgr.zx02 \
magpath_n.hgr.zx02 magpath_s.hgr.zx02
echo "doorway_n_zx02: .incbin \"doorway_n.hgr.zx02\"" > projector_graphics.inc
echo "doorway_s_zx02: .incbin \"doorway_s.hgr.zx02\"" >> projector_graphics.inc
echo "steps_n_zx02: .incbin \"steps_n.hgr.zx02\"" >> projector_graphics.inc
echo "steps_s_zx02: .incbin \"steps_s.hgr.zx02\"" >> projector_graphics.inc
echo "magpath_n_zx02: .incbin \"magpath_n.hgr.zx02\"" >> projector_graphics.inc
echo "magpath_s_zx02: .incbin \"magpath_s.hgr.zx02\"" >> projector_graphics.inc
####

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -3,12 +3,12 @@
;===============================================
locations:
.word location0,location1,location2
.word location0,location1
; RIVEN_MAGLEV1 -- maglev steps
location0:
.byte LOAD_MAGSTEPS<<4|RIVEN_MAGSTEPS2 ; north exit
.byte RIVEN_MAGPATH ; south exit
.byte LOAD_PROJECTOR<<4|RIVEN_MAGPATH ; south exit
.byte RIVEN_OVERLOOK ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
@ -22,46 +22,8 @@ location0:
.byte BG_EAST|BG_NORTH|BG_SOUTH|BG_WEST ; all bgs
.byte $ff ; special exit
; RIVEN_MAGPATH -- path to maglev
; RIVEN_OVERLOOK - scenic overlook
location1:
.byte RIVEN_MAGLEV1 ; north exit
.byte LOAD_PROJECTOR<<4|RIVEN_PROJ_STEPS ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word magpath_n_zx02 ; north bg
.word magpath_s_zx02 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit
; RIVEN_OVERLOOK - scenic overlook
location2:
.byte RIVEN_MAGLEV1 ; north exit
.byte $ff ; south exit
.byte $FF ; east exit
.byte $ff ; west exit
.byte DIRECTION_E ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word overlook_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH
.byte $ff ; special exit
.if 0
; if we can free up 1k more to hold the s location
; RIVEN_OVERLOOK - scenic overlook
location2:
.byte $FF ; north exit
.byte RIVEN_MAGLEV1 ; south exit
.byte $FF ; east exit
@ -77,4 +39,4 @@ location2:
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit
.endif

View File

@ -3,7 +3,7 @@
;===============================================
locations:
.word location0,location1
.word location0,location1, location2
; RIVEN_PROJ_DOOR -- doorway to projector room
location0:
@ -24,7 +24,7 @@ location0:
; RIVEN_PROJ_STEPS -- steps to projector room
location1:
.byte LOAD_OUTSIDE<<4 | RIVEN_MAGPATH ; north exit
.byte RIVEN_MAGPATH ; north exit
.byte RIVEN_PROJ_DOOR ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
@ -39,5 +39,19 @@ location1:
.byte BG_NORTH|BG_SOUTH
.byte $FF ; special exit
; RIVEN_MAGPATH -- path to maglev
location2:
.byte LOAD_OUTSIDE<<4|RIVEN_MAGLEV1 ; north exit
.byte RIVEN_PROJ_STEPS ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word magpath_n_zx02 ; north bg
.word magpath_s_zx02 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit