diff --git a/games/riven_hgr/Makefile b/games/riven_hgr/Makefile index 74b06219..4c95407f 100644 --- a/games/riven_hgr/Makefile +++ b/games/riven_hgr/Makefile @@ -17,8 +17,8 @@ riven_hgr.dsk: QBOOT QLOAD TITLE \ $(DOS33_RAW) riven_hgr.dsk 0 2 QBOOT 1 1 $(DOS33_RAW) riven_hgr.dsk 0 4 QBOOT 2 1 $(DOS33_RAW) riven_hgr.dsk 1 0 QLOAD 0 0 - $(DOS33_RAW) riven_hgr.dsk 2 0 TITLE 0 0 - $(DOS33_RAW) riven_hgr.dsk 3 0 LEVEL_PROJECTOR 0 0 + $(DOS33_RAW) riven_hgr.dsk 1 8 TITLE 0 0 + $(DOS33_RAW) riven_hgr.dsk 2 0 LEVEL_PROJECTOR 0 0 $(DOS33_RAW) riven_hgr.dsk 9 0 LEVEL_OUTSIDE 0 0 $(DOS33_RAW) riven_hgr.dsk 17 0 LEVEL_MAGSTEPS 0 0 $(DOS33_RAW) riven_hgr.dsk 21 0 LEVEL_MAGLEV 0 0 diff --git a/games/riven_hgr/NOTES b/games/riven_hgr/NOTES index 984341c8..4cb219df 100644 --- a/games/riven_hgr/NOTES +++ b/games/riven_hgr/NOTES @@ -1,11 +1,12 @@ What would QBOOT look like: + Disk1 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot T 1 = QLOAD 255 bytes ??S = 1T0S 3k free -T 2 = TITLE 1315 bytes ??S = 1T0S 2k free -T 3 = PROJECTOR 23713 bytes 96S = 6T0S 1k free +T 1.5 = TITLE 1688 bytes ??S = 1T0S 2k free +T 2 = PROJECTOR 32000 bytes 128S = 6T0S 6k free T 9 = OUTSIDE 30825 bytes 128S = 8T0S 2k free T 17 = MAGSTEPS 13027 bytes 64S = 4T0S 3k free T 21 = MAGLEV 15349 bytes 64S = 4T0S 1k free @@ -21,7 +22,7 @@ $0300-$03ff = disk/interrupts $0400-$07ff = lores graphics page1 $0800-$08ff = lores graphics page2 (qboot initial sector) $1000-$11ff = qboot_stage2 (disk code) -$1200-$17FF = FREE????? +$1200-$17FF = HGR lookup tables $1800-$1FFF = QLOAD = loader code $2000-$3FFF = HGR Page1, lores movie overlays $4000-$B7FF = our code diff --git a/games/riven_hgr/common_defines.inc b/games/riven_hgr/common_defines.inc index 47f9e85b..45efd8fd 100644 --- a/games/riven_hgr/common_defines.inc +++ b/games/riven_hgr/common_defines.inc @@ -6,10 +6,10 @@ LOAD_MAGLEV = 4 LOAD_MOVIE1 = 5 LOAD_MOVIE2 = 6 -div7_table = $BC00 -mod7_table = $BD00 -hposn_high = $BE00 -hposn_low = $BF00 +div7_table = $1300 +mod7_table = $1400 +hposn_high = $1500 +hposn_low = $1600 ;============================= @@ -61,6 +61,7 @@ RIVEN_OVERLOOK = 2 RIVEN_PROJECTOR = 0 RIVEN_PROJ_DOOR = 1 RIVEN_PROJ_STEPS= 2 +RIVEN_WAHRK = 3 ; Magsteps diff --git a/games/riven_hgr/graphics_projector/Makefile b/games/riven_hgr/graphics_projector/Makefile index 1d7842bb..c3699beb 100644 --- a/games/riven_hgr/graphics_projector/Makefile +++ b/games/riven_hgr/graphics_projector/Makefile @@ -8,13 +8,18 @@ all: projector_graphics.inc projector_graphics.inc: \ doorway_n.hgr.zx02 doorway_s.hgr.zx02 \ steps_n.hgr.zx02 steps_s.hgr.zx02 \ - projector_n.hgr.zx02 projector_s.hgr.zx02 + projector_n.hgr.zx02 projector_s.hgr.zx02 \ + projector_w.hgr.zx02 projector_e.hgr.zx02 \ + wahrk_s.hgr.zx02 echo "projector_n_zx02: .incbin \"projector_n.hgr.zx02\"" > projector_graphics.inc echo "projector_s_zx02: .incbin \"projector_s.hgr.zx02\"" >> projector_graphics.inc + echo "projector_w_zx02: .incbin \"projector_w.hgr.zx02\"" >> projector_graphics.inc + echo "projector_e_zx02: .incbin \"projector_e.hgr.zx02\"" >> projector_graphics.inc 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 "wahrk_s_zx02: .incbin \"wahrk_s.hgr.zx02\"" >> projector_graphics.inc #### diff --git a/games/riven_hgr/graphics_projector/projector_e.png b/games/riven_hgr/graphics_projector/projector_e.png new file mode 100644 index 00000000..0205efc7 Binary files /dev/null and b/games/riven_hgr/graphics_projector/projector_e.png differ diff --git a/games/riven_hgr/graphics_projector/projector_w.png b/games/riven_hgr/graphics_projector/projector_w.png new file mode 100644 index 00000000..332b9d71 Binary files /dev/null and b/games/riven_hgr/graphics_projector/projector_w.png differ diff --git a/games/riven_hgr/graphics_projector/wahrk_s.png b/games/riven_hgr/graphics_projector/wahrk_s.png new file mode 100644 index 00000000..4a260ce2 Binary files /dev/null and b/games/riven_hgr/graphics_projector/wahrk_s.png differ diff --git a/games/riven_hgr/graphics_projector/wahrk_sb.png b/games/riven_hgr/graphics_projector/wahrk_sb.png new file mode 100644 index 00000000..98d6e8b9 Binary files /dev/null and b/games/riven_hgr/graphics_projector/wahrk_sb.png differ diff --git a/games/riven_hgr/leveldata_projector.inc b/games/riven_hgr/leveldata_projector.inc index d3e32a54..b75e4115 100644 --- a/games/riven_hgr/leveldata_projector.inc +++ b/games/riven_hgr/leveldata_projector.inc @@ -3,23 +3,23 @@ ;=============================================== locations: - .word location0,location1,location2 + .word location0,location1,location2,location3 ; RIVEN_PROJECTOR -- looking at projector location0: .byte RIVEN_PROJ_DOOR ; north exit - .byte $ff ; south exit + .byte RIVEN_WAHRK ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir .word projector_n_zx02 ; north bg .word projector_s_zx02 ; south bg - .word $0000 ; east bg - .word $0000 ; west bg - .byte BG_NORTH|BG_SOUTH + .word projector_e_zx02 ; east bg + .word projector_w_zx02 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte $FF ; special exit (none) ; RIVEN_PROJ_DOOR -- doorway to projector room @@ -56,4 +56,22 @@ location2: .byte BG_NORTH|BG_SOUTH .byte $FF ; special exit +; RIVEN_WAHRK -- big fish +location3: + .byte $ff ; north exit + .byte RIVEN_PROJECTOR ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word $ff ; north bg + .word wahrk_s_zx02 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH + .byte $FF ; special exit + + diff --git a/games/riven_hgr/movie2.s b/games/riven_hgr/movie2.s index 562f6ac4..b3eaf148 100644 --- a/games/riven_hgr/movie2.s +++ b/games/riven_hgr/movie2.s @@ -7,7 +7,7 @@ .include "zp.inc" .include "hardware.inc" -NUM_SCENES = 122 +NUM_SCENES = 137 overlays = $2000 @@ -452,6 +452,22 @@ frames_l: .byte img232_bg_zx02 .byte >img233_bg_zx02 .byte >img234_bg_zx02 + .byte >img235_bg_zx02 + .byte >img236_bg_zx02 + .byte >img237_bg_zx02 + .byte >img238_bg_zx02 + .byte >img239_bg_zx02 + .byte >img240_bg_zx02 + .byte >img241_bg_zx02 + .byte >img242_bg_zx02 + .byte >img243_bg_zx02 + .byte >img244_bg_zx02 + .byte >img245_bg_zx02 + .byte >img246_bg_zx02 + .byte >img247_bg_zx02 + .byte >img248_bg_zx02 + .byte >img249_bg_zx02 + overlay_mask_zx02: diff --git a/games/riven_hgr/movie2/Makefile b/games/riven_hgr/movie2/Makefile index 5e204b2e..31fd6709 100644 --- a/games/riven_hgr/movie2/Makefile +++ b/games/riven_hgr/movie2/Makefile @@ -47,7 +47,12 @@ movie2.inc: \ img225_bg.gr.zx02 img226_bg.gr.zx02 img227_bg.gr.zx02 \ img228_bg.gr.zx02 img229_bg.gr.zx02 img230_bg.gr.zx02 \ img231_bg.gr.zx02 img232_bg.gr.zx02 img233_bg.gr.zx02 \ - img234_bg.gr.zx02 + img234_bg.gr.zx02 img235_bg.gr.zx02 img236_bg.gr.zx02 \ + img237_bg.gr.zx02 img238_bg.gr.zx02 img239_bg.gr.zx02 \ + img240_bg.gr.zx02 img241_bg.gr.zx02 img242_bg.gr.zx02 \ + img243_bg.gr.zx02 img244_bg.gr.zx02 img245_bg.gr.zx02 \ + img246_bg.gr.zx02 img247_bg.gr.zx02 img248_bg.gr.zx02 \ + img249_bg.gr.zx02 echo "img096_bg_zx02: .incbin \"img096_bg.gr.zx02\"" > movie2.inc echo "img114_bg_zx02: .incbin \"img114_bg.gr.zx02\"" >> movie2.inc echo "img115_bg_zx02: .incbin \"img115_bg.gr.zx02\"" >> movie2.inc @@ -170,6 +175,21 @@ movie2.inc: \ echo "img232_bg_zx02: .incbin \"img232_bg.gr.zx02\"" >> movie2.inc echo "img233_bg_zx02: .incbin \"img233_bg.gr.zx02\"" >> movie2.inc echo "img234_bg_zx02: .incbin \"img234_bg.gr.zx02\"" >> movie2.inc + echo "img235_bg_zx02: .incbin \"img235_bg.gr.zx02\"" >> movie2.inc + echo "img236_bg_zx02: .incbin \"img236_bg.gr.zx02\"" >> movie2.inc + echo "img237_bg_zx02: .incbin \"img237_bg.gr.zx02\"" >> movie2.inc + echo "img238_bg_zx02: .incbin \"img238_bg.gr.zx02\"" >> movie2.inc + echo "img239_bg_zx02: .incbin \"img239_bg.gr.zx02\"" >> movie2.inc + echo "img240_bg_zx02: .incbin \"img240_bg.gr.zx02\"" >> movie2.inc + echo "img241_bg_zx02: .incbin \"img241_bg.gr.zx02\"" >> movie2.inc + echo "img242_bg_zx02: .incbin \"img242_bg.gr.zx02\"" >> movie2.inc + echo "img243_bg_zx02: .incbin \"img243_bg.gr.zx02\"" >> movie2.inc + echo "img244_bg_zx02: .incbin \"img244_bg.gr.zx02\"" >> movie2.inc + echo "img245_bg_zx02: .incbin \"img245_bg.gr.zx02\"" >> movie2.inc + echo "img246_bg_zx02: .incbin \"img246_bg.gr.zx02\"" >> movie2.inc + echo "img247_bg_zx02: .incbin \"img247_bg.gr.zx02\"" >> movie2.inc + echo "img248_bg_zx02: .incbin \"img248_bg.gr.zx02\"" >> movie2.inc + echo "img249_bg_zx02: .incbin \"img249_bg.gr.zx02\"" >> movie2.inc #### diff --git a/games/riven_hgr/movie2/img235_bg.png b/games/riven_hgr/movie2/img235_bg.png new file mode 100644 index 00000000..dbd19f9b Binary files /dev/null and b/games/riven_hgr/movie2/img235_bg.png differ diff --git a/games/riven_hgr/movie2/img236_bg.png b/games/riven_hgr/movie2/img236_bg.png new file mode 100644 index 00000000..cbf20144 Binary files /dev/null and b/games/riven_hgr/movie2/img236_bg.png differ diff --git a/games/riven_hgr/movie2/img237_bg.png b/games/riven_hgr/movie2/img237_bg.png new file mode 100644 index 00000000..36471eff Binary files /dev/null and b/games/riven_hgr/movie2/img237_bg.png differ diff --git a/games/riven_hgr/movie2/img238_bg.png b/games/riven_hgr/movie2/img238_bg.png new file mode 100644 index 00000000..aae727c2 Binary files /dev/null and b/games/riven_hgr/movie2/img238_bg.png differ diff --git a/games/riven_hgr/movie2/img239_bg.png b/games/riven_hgr/movie2/img239_bg.png new file mode 100644 index 00000000..92a9a19a Binary files /dev/null and b/games/riven_hgr/movie2/img239_bg.png differ diff --git a/games/riven_hgr/movie2/img240_bg.png b/games/riven_hgr/movie2/img240_bg.png new file mode 100644 index 00000000..91e60148 Binary files /dev/null and b/games/riven_hgr/movie2/img240_bg.png differ diff --git a/games/riven_hgr/movie2/img241_bg.png b/games/riven_hgr/movie2/img241_bg.png new file mode 100644 index 00000000..63cd4807 Binary files /dev/null and b/games/riven_hgr/movie2/img241_bg.png differ diff --git a/games/riven_hgr/movie2/img242_bg.png b/games/riven_hgr/movie2/img242_bg.png new file mode 100644 index 00000000..cfbe164e Binary files /dev/null and b/games/riven_hgr/movie2/img242_bg.png differ diff --git a/games/riven_hgr/movie2/img243_bg.png b/games/riven_hgr/movie2/img243_bg.png new file mode 100644 index 00000000..448c744f Binary files /dev/null and b/games/riven_hgr/movie2/img243_bg.png differ diff --git a/games/riven_hgr/movie2/img244_bg.png b/games/riven_hgr/movie2/img244_bg.png new file mode 100644 index 00000000..dc10aa23 Binary files /dev/null and b/games/riven_hgr/movie2/img244_bg.png differ diff --git a/games/riven_hgr/movie2/img245_bg.png b/games/riven_hgr/movie2/img245_bg.png new file mode 100644 index 00000000..fe3e4568 Binary files /dev/null and b/games/riven_hgr/movie2/img245_bg.png differ diff --git a/games/riven_hgr/movie2/img246_bg.png b/games/riven_hgr/movie2/img246_bg.png new file mode 100644 index 00000000..ba54817d Binary files /dev/null and b/games/riven_hgr/movie2/img246_bg.png differ diff --git a/games/riven_hgr/movie2/img247_bg.png b/games/riven_hgr/movie2/img247_bg.png new file mode 100644 index 00000000..b4a25d19 Binary files /dev/null and b/games/riven_hgr/movie2/img247_bg.png differ diff --git a/games/riven_hgr/movie2/img248_bg.png b/games/riven_hgr/movie2/img248_bg.png new file mode 100644 index 00000000..58723a06 Binary files /dev/null and b/games/riven_hgr/movie2/img248_bg.png differ diff --git a/games/riven_hgr/movie2/img249_bg.png b/games/riven_hgr/movie2/img249_bg.png new file mode 100644 index 00000000..0b8aebc3 Binary files /dev/null and b/games/riven_hgr/movie2/img249_bg.png differ diff --git a/games/riven_hgr/qload.s b/games/riven_hgr/qload.s index e23bb8a8..9049c780 100644 --- a/games/riven_hgr/qload.s +++ b/games/riven_hgr/qload.s @@ -257,15 +257,15 @@ load_address_array: .byte $40,$40,$40 ; MAGLEV, MOVIE1, MOVIE2 track_array: - .byte 2, 9, 3,17 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS + .byte 1, 9, 2,17 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS .byte 21,25,27 ; MAGLEV, MOVIE1, MOVIE2 sector_array: - .byte 0, 0, 0, 0 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS + .byte 8, 0, 0, 0 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS .byte 0, 0, 0 ; MAGLEV, MOVIE1, MOVIE2 length_array: - .byte 16, 123, 96, 64 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS + .byte 16, 123,123, 64 ; TITLE, OUTSIDE, PROJECTOR, MAGSTEPS .byte 64, 32, 128 ; MAGLEV, MOVIE1, MOVIE2 .if 0 diff --git a/games/riven_hgr/title.s b/games/riven_hgr/title.s index 75c9a1d1..7e725631 100644 --- a/games/riven_hgr/title.s +++ b/games/riven_hgr/title.s @@ -351,5 +351,5 @@ title_text: .byte 0, 9," ______",0 .byte 0,10," A \/\/\/ SOFTWARE PRODUCTION",0 ; -.byte 0,11," HTTP://WWW.DEATER.NET/WEAVE/VMWPROD",0 +.byte 0,12," HTTP://WWW.DEATER.NET/WEAVE/VMWPROD",0