diff --git a/games/riven_hgr/Makefile b/games/riven_hgr/Makefile index 60c20d0e..41e687c2 100644 --- a/games/riven_hgr/Makefile +++ b/games/riven_hgr/Makefile @@ -102,10 +102,10 @@ riven_disk03.dsk: QBOOT QLOAD TITLE_03 \ $(DOS33_RAW) riven_disk03.dsk 0 8 TITLE_03 0 0 $(DOS33_RAW) riven_disk03.dsk 1 0 QLOAD 0 0 $(DOS33_RAW) riven_disk03.dsk 2 0 disk03_files/LEVEL_DOWNSTEPS 0 0 - $(DOS33_RAW) riven_disk03.dsk 8 0 disk03_files/LEVEL_DOWNSTEPS3 0 0 - $(DOS33_RAW) riven_disk03.dsk 14 0 disk03_files/LEVEL_OUTSIDE 0 0 - $(DOS33_RAW) riven_disk03.dsk 21 0 disk03_files/LEVEL_CAVE 0 0 - $(DOS33_RAW) riven_disk03.dsk 27 0 disk03_files/LEVEL_DOORWAY 0 0 + $(DOS33_RAW) riven_disk03.dsk 9 0 disk03_files/LEVEL_DOWNSTEPS3 0 0 + $(DOS33_RAW) riven_disk03.dsk 15 0 disk03_files/LEVEL_OUTSIDE 0 0 + $(DOS33_RAW) riven_disk03.dsk 22 0 disk03_files/LEVEL_CAVE 0 0 + $(DOS33_RAW) riven_disk03.dsk 28 0 disk03_files/LEVEL_DOORWAY 0 0 ### @@ -854,10 +854,10 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) riven_hgr.2mg `./dts_block 2 20 0` disk02_files/LEVEL_BRIDGE 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 0 2` disk03_files/DISK03 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 2 0` disk03_files/LEVEL_DOWNSTEPS 0 0 - $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 8 0` disk03_files/LEVEL_DOWNSTEPS3 0 0 - $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 14 0` disk03_files/LEVEL_OUTSIDE 0 0 - $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 21 0` disk03_files/LEVEL_CAVE 0 0 - $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 27 0` disk03_files/LEVEL_DOORWAY 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 9 0` disk03_files/LEVEL_DOWNSTEPS3 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 15 0` disk03_files/LEVEL_OUTSIDE 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 22 0` disk03_files/LEVEL_CAVE 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 3 28 0` disk03_files/LEVEL_DOORWAY 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 0 2` disk04_files/DISK04 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 2 0` disk04_files/LEVEL_BRIDGE1 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 7 0` disk04_files/LEVEL_BRIDGE2 0 0 diff --git a/games/riven_hgr/NOTES b/games/riven_hgr/NOTES index b5864c7c..23d82ef8 100644 --- a/games/riven_hgr/NOTES +++ b/games/riven_hgr/NOTES @@ -95,11 +95,11 @@ Disk03 Map (disk has 35 tracks, each 4k in size) T 0 = Qboot T 0.5 = TITLE 1805 bytes 8S = 0T8S (2048) 400B free T 1 = QLOAD 2314 bytes 16S= 1T0S (4096) 2k free -T 2 = DOWNSTEPS 21956 bytes = 6T0S (24576) 3k free -T 8 = DOWNSTEPS3 12448 bytes = 6T0S (24576) 12k free -T 14 = OUTSIDE 27100 bytes = 7T0S (28672) 1k free -T 21 = CAVE 20269 bytes = 6T0S (24576) 4k free -T 27 = DOORWAY 11802 bytes = 6T0S (24576) 12k free +T 2 = DOWNSTEPS 25875 bytes = 7T0S (28672) 3k free +T 9 = DOWNSTEPS3 12448 bytes = 6T0S (24576) 12k free +T 15 = OUTSIDE 27100 bytes = 7T0S (28672) 1k free +T 22 = CAVE 20269 bytes = 6T0S (24576) 4k free +T 28 = DOORWAY 11802 bytes = 6T0S (24576) 12k free Disk04 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/games/riven_hgr/disk03_files/disk03.s b/games/riven_hgr/disk03_files/disk03.s index d82d879f..0ba28396 100644 --- a/games/riven_hgr/disk03_files/disk03.s +++ b/games/riven_hgr/disk03_files/disk03.s @@ -10,18 +10,18 @@ which_disk_bin: load_address_array: .byte $40,$40,$40,$40 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE - .byte $40,$40,$00,$00 ; CAVE, DOORWAY + .byte $40,$40,$40,$40 ; CAVE, DOORWAY track_array: - .byte 0, 2, 8,14 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE - .byte 21,27,0,0 ; CAVE, DOORWAY + .byte 0, 2, 9,15 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE + .byte 22,28,0,0 ; CAVE, DOORWAY sector_array: .byte 8, 0, 0, 0 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte 0,0,0,0 ; CAVE, DOORWAY length_array: - .byte 8, 96,96,112 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE + .byte 8, 112,96,112 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte 96,96,0,0 ; CAVE, DOORWAY diff --git a/games/riven_hgr/disk03_files/graphics_downsteps/Makefile b/games/riven_hgr/disk03_files/graphics_downsteps/Makefile index 4485b814..bdd66ce9 100644 --- a/games/riven_hgr/disk03_files/graphics_downsteps/Makefile +++ b/games/riven_hgr/disk03_files/graphics_downsteps/Makefile @@ -6,10 +6,11 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr all: downsteps_graphics.inc downsteps_graphics.inc: \ - down1_n.hgr.zx02 down1_s.hgr.zx02 \ + down1_n.hgr.zx02 down1_s.hgr.zx02 down1_e.hgr.zx02 \ down2_n.hgr.zx02 down2_s.hgr.zx02 down2_e.hgr.zx02 echo "down1_n_zx02: .incbin \"down1_n.hgr.zx02\"" > downsteps_graphics.inc echo "down1_s_zx02: .incbin \"down1_s.hgr.zx02\"" >> downsteps_graphics.inc + echo "down1_e_zx02: .incbin \"down1_e.hgr.zx02\"" >> downsteps_graphics.inc echo "down2_n_zx02: .incbin \"down2_n.hgr.zx02\"" >> downsteps_graphics.inc echo "down2_s_zx02: .incbin \"down2_s.hgr.zx02\"" >> downsteps_graphics.inc echo "down2_e_zx02: .incbin \"down2_e.hgr.zx02\"" >> downsteps_graphics.inc diff --git a/games/riven_hgr/disk03_files/graphics_downsteps/down1_e.png b/games/riven_hgr/disk03_files/graphics_downsteps/down1_e.png new file mode 100644 index 00000000..c9460f17 Binary files /dev/null and b/games/riven_hgr/disk03_files/graphics_downsteps/down1_e.png differ