riven: more outside locations

This commit is contained in:
Vince Weaver 2024-06-21 00:04:04 -04:00
parent 962d16e409
commit 578909f8ff
12 changed files with 70 additions and 29 deletions

View File

@ -9,7 +9,7 @@ $0800-$0bff = lores graphics page2
$800-$8ff = (qboot initial sector)
$1000-$11ff = qboot_stage2 (disk code)
$1200-$12ff = QLOAD tables
$1300-$16FF = HGR lookup tables
$1300-$16FF = HGR lookup tables (NOTE! we probably don't need div7/mod7)
$1700-$1FFF = QLOAD = loader code (2k?)
$2000-$3FFF = HGR Page1, lores movie overlays
$4000-$BFFF = our code (up to 32k in theory)

View File

@ -12,8 +12,9 @@ LOAD_MOVIE2 = 4
RIVEN_LOOKIN = 0
RIVEN_INSEAT = 1
RIVEN_READYTOGO = 2
RIVEN_OUTSIDE = 3
; Outside
RIVEN_OUTSIDE = 0
RIVEN_OUTSIDE_PATH = 0
RIVEN_OUTSIDE_PLAZA = 1

View File

@ -7,12 +7,14 @@ all: maglev_graphics.inc
maglev_graphics.inc: \
inseat_s.hgr.zx02 inseat_w.hgr.zx02 inseat_e.hgr.zx02 \
lookin_w.hgr.zx02
lookin_w.hgr.zx02 \
outside_w.hgr.zx02 outside_n.hgr.zx02
echo "inseat_s_zx02: .incbin \"inseat_s.hgr.zx02\"" > maglev_graphics.inc
echo "inseat_w_zx02: .incbin \"inseat_w.hgr.zx02\"" >> maglev_graphics.inc
echo "inseat_e_zx02: .incbin \"inseat_e.hgr.zx02\"" >> maglev_graphics.inc
echo "lookin_w_zx02: .incbin \"lookin_w.hgr.zx02\"" >> maglev_graphics.inc
echo "outside_w_zx02: .incbin \"outside_w.hgr.zx02\"" >> maglev_graphics.inc
echo "outside_n_zx02: .incbin \"outside_n.hgr.zx02\"" >> maglev_graphics.inc
####

View File

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -6,12 +6,15 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: outside_graphics.inc
outside_graphics.inc: \
outside_w.hgr.zx02 outside_n.hgr.zx02 \
out_path_e.hgr.zx02 out_path_w.hgr.zx02
echo "outside_w_zx02: .incbin \"outside_w.hgr.zx02\"" > outside_graphics.inc
echo "outside_n_zx02: .incbin \"outside_n.hgr.zx02\"" >> outside_graphics.inc
echo "out_path_e_zx02: .incbin \"out_path_e.hgr.zx02\"" >> outside_graphics.inc
out_path_e.hgr.zx02 out_path_w.hgr.zx02 \
out_plaza_n.hgr.zx02 out_plaza_s.hgr.zx02 out_plaza_e.hgr.zx02 out_plaza_w.hgr.zx02
echo "out_path_e_zx02: .incbin \"out_path_e.hgr.zx02\"" > outside_graphics.inc
echo "out_path_w_zx02: .incbin \"out_path_w.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_n_zx02: .incbin \"out_plaza_n.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_s_zx02: .incbin \"out_plaza_s.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_e_zx02: .incbin \"out_plaza_e.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_w_zx02: .incbin \"out_plaza_w.hgr.zx02\"" >> outside_graphics.inc
####

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -3,14 +3,14 @@
;===============================================
locations:
.word location0,location1,location2
.word location0,location1,location2,location3
; RIVEN_LOOKIN -- looking into the maglev
location0:
.byte $FF ; north exit
.byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE ; south exit
.byte $ff ; east exit
.byte $FF ; north exit
.byte RIVEN_OUTSIDE ; south exit
.byte $ff ; east exit
.byte RIVEN_INSEAT ; west exit
.byte $FF ; north exit_dir
.byte DIRECTION_W ; south exit_dir
@ -26,7 +26,7 @@ location0:
; RIVEN_INSEAT -- when sitting in seat
location1:
.byte $FF ; north exit
.byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE ; south exit
.byte RIVEN_OUTSIDE ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $FF ; north exit_dir
@ -46,10 +46,10 @@ location1:
; RIVEN_READY2GO -- ready for maglev ride
location2:
.byte $FF ; north exit
.byte $FF ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $FF ; north exit
.byte $FF ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $FF ; north exit_dir
.byte $FF ; south exit_dir
.byte $ff ; east exit_dir
@ -64,3 +64,20 @@ location2:
.byte 127,168 ; special y
.word handle2_clicked-1 ; special function
; RIVEN_JUNGLE_OUTSIDE -- just outside the maglev
location3:
.byte RIVEN_LOOKIN ; north exit
.byte $FF ; south exit
.byte $FF ; east exit
.byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE_PATH ; west exit
.byte DIRECTION_W ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word outside_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word outside_w_zx02 ; west bg
.byte BG_WEST|BG_NORTH
.byte $ff ; special exit

View File

@ -3,22 +3,40 @@
;===============================================
locations:
.word location0
.word location0,location1
; RIVEN_JUNGLE_OUTSIDE -- just outside the maglev
; RIVEN_OUTSIDE_PATH -- path away from maglev
location0:
.byte LOAD_MAGLEV<<4|RIVEN_LOOKIN ; north exit
.byte $FF ; north exit
.byte $FF ; south exit
.byte LOAD_MAGLEV<<4|RIVEN_OUTSIDE ; east exit
.byte RIVEN_OUTSIDE_PLAZA ; west exit
.byte $FF ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_N ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word out_path_e_zx02 ; east bg
.word out_path_w_zx02 ; west bg
.byte BG_WEST|BG_EAST
.byte $ff ; special exit
; RIVEN_OUTSIDE_PLAZA -- plaza near maglev
location1:
.byte $FF ; north exit
.byte $E0|0 ; change disk, exit 0 ; south exit
.byte $FF ; east exit
.byte $E0|0 ; change disk, exit 0 ; west exit
.byte DIRECTION_W ; north exit_dir
.byte $FF ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word outside_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word outside_w_zx02 ; west bg
.byte BG_WEST|BG_NORTH
.word out_plaza_n_zx02 ; north bg
.word out_plaza_s_zx02 ; south bg
.word out_plaza_e_zx02 ; east bg
.word out_plaza_w_zx02 ; west bg
.byte BG_WEST|BG_NORTH|BG_SOUTH|BG_EAST
.byte $ff ; special exit