From 5839898291eaa43385efa43abf33030dd3f391ba Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 3 Aug 2024 19:51:57 -0400 Subject: [PATCH] riven: hook up another graphic --- games/riven_hgr/Makefile | 16 ++++++++-------- games/riven_hgr/NOTES | 10 +++++----- games/riven_hgr/disk03_files/disk03.s | 8 ++++---- .../disk03_files/graphics_downsteps/Makefile | 3 ++- .../disk03_files/graphics_downsteps/down1_e.png | Bin 0 -> 4367 bytes 5 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps/down1_e.png 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 0000000000000000000000000000000000000000..c9460f1759ee1a915fcbc8733d8ce742ec62da30 GIT binary patch literal 4367 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