From 21fdb06068b0c1deb2bfb636403735ff6dfad78a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 28 Jul 2024 01:19:47 -0400 Subject: [PATCH] riven: hook up some more locations --- games/riven_hgr/Makefile | 11 +- games/riven_hgr/NOTES | 8 +- .../disk02_files/graphics_steps1/Makefile | 2 + .../disk02_files/graphics_steps1/steps1_e.png | Bin 0 -> 4336 bytes .../disk02_files/leveldata_steps1.inc | 4 +- games/riven_hgr/disk03_files/Makefile | 23 +++- games/riven_hgr/disk03_files/disk03.s | 10 +- .../riven_hgr/disk03_files/disk03_defines.inc | 6 +- .../disk03_files/graphics_downsteps3/Makefile | 29 +++++ .../graphics_downsteps3/downsteps3_n.png | Bin 0 -> 4750 bytes .../graphics_downsteps3/downsteps3_s.png | Bin 0 -> 6299 bytes .../riven_hgr/disk03_files/level_downsteps3.s | 113 ++++++++++++++++++ .../disk03_files/leveldata_downsteps.inc | 4 +- .../disk03_files/leveldata_downsteps3.inc | 24 ++++ .../disk03_files/leveldata_outside.inc | 2 +- games/riven_hgr/title.s | 2 +- 16 files changed, 217 insertions(+), 21 deletions(-) create mode 100644 games/riven_hgr/disk02_files/graphics_steps1/steps1_e.png create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps3/Makefile create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_n.png create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_s.png create mode 100644 games/riven_hgr/disk03_files/level_downsteps3.s create mode 100644 games/riven_hgr/disk03_files/leveldata_downsteps3.inc diff --git a/games/riven_hgr/Makefile b/games/riven_hgr/Makefile index 3de5327d..6d5fe091 100644 --- a/games/riven_hgr/Makefile +++ b/games/riven_hgr/Makefile @@ -86,6 +86,7 @@ riven_disk02.dsk: QBOOT QLOAD TITLE_02 \ riven_disk03.dsk: QBOOT QLOAD TITLE_03 \ disk03_files/DISK03 \ disk03_files/LEVEL_DOWNSTEPS \ + disk03_files/LEVEL_DOWNSTEPS3 \ disk03_files/LEVEL_OUTSIDE cp $(EMPTY_DISK)/empty.dsk riven_disk03.dsk $(DOS33_RAW) riven_disk03.dsk 0 0 QBOOT 0 1 @@ -95,7 +96,8 @@ 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 16 0 disk03_files/LEVEL_OUTSIDE 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 ### @@ -515,6 +517,9 @@ disk02_files/LEVEL_TOP: disk03_files/LEVEL_DOWNSTEPS: cd disk03_files && make +disk03_files/LEVEL_DOWNSTEPS3: + cd disk03_files && make + disk03_files/LEVEL_OUTSIDE: cd disk03_files && make @@ -704,6 +709,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ disk02_files/LEVEL_TOP \ disk03_files/DISK03 \ disk03_files/LEVEL_DOWNSTEPS \ + disk03_files/LEVEL_DOWNSTEPS3 \ disk03_files/LEVEL_OUTSIDE \ disk04_files/DISK04 \ disk04_files/LEVEL_TUNNEL3 \ @@ -763,7 +769,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) riven_hgr.2mg `./dts_block 2 14 0` disk02_files/LEVEL_TOP 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 16 0` disk03_files/LEVEL_OUTSIDE 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 4 0 2` disk04_files/DISK04 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 27 0` disk04_files/LEVEL_TUNNEL3 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 0 2` disk05_files/DISK05 0 0 diff --git a/games/riven_hgr/NOTES b/games/riven_hgr/NOTES index 3245e3bf..2c7cd553 100644 --- a/games/riven_hgr/NOTES +++ b/games/riven_hgr/NOTES @@ -85,8 +85,8 @@ Disk02 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 = STEPS1 17611 bytes = 6T0S (24576) 7k free -T 8 = STEPS3 ???? bytes = 6T0S (24576) ?? free +T 2 = STEPS1 21647 bytes = 6T0S (24576) 3k free +T 8 = STEPS3 15872 bytes = 6T0S (24576) 9k free T 14 = TOP 15658 bytes = 6T0S (24576) 9k free Disk03 Map (disk has 35 tracks, each 4k in size) @@ -95,8 +95,8 @@ 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 18318 bytes = 6T0S (24576) 6k free -T 9 = STEPS3 ???? bytes = 6T0S (24576) ?? free -T 16 = OUTSIDE 9582 bytes = 6T0S (24576) ?? free +T 8 = DOWNSTEPS3 9993 bytes = 6T0S (24576) 15k free +T 14 = OUTSIDE 9582 bytes = 6T0S (24576) 15k free Disk04 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/games/riven_hgr/disk02_files/graphics_steps1/Makefile b/games/riven_hgr/disk02_files/graphics_steps1/Makefile index 35235335..aedacebd 100644 --- a/games/riven_hgr/disk02_files/graphics_steps1/Makefile +++ b/games/riven_hgr/disk02_files/graphics_steps1/Makefile @@ -7,9 +7,11 @@ all: steps1_graphics.inc steps1_graphics.inc: \ steps1_n.hgr.zx02 steps1_s.hgr.zx02 \ + steps1_e.hgr.zx02 \ steps2_n.hgr.zx02 steps2_s.hgr.zx02 echo "steps1_n_zx02: .incbin \"steps1_n.hgr.zx02\"" > steps1_graphics.inc echo "steps1_s_zx02: .incbin \"steps1_s.hgr.zx02\"" >> steps1_graphics.inc + echo "steps1_e_zx02: .incbin \"steps1_e.hgr.zx02\"" >> steps1_graphics.inc echo "steps2_n_zx02: .incbin \"steps2_n.hgr.zx02\"" >> steps1_graphics.inc echo "steps2_s_zx02: .incbin \"steps2_s.hgr.zx02\"" >> steps1_graphics.inc diff --git a/games/riven_hgr/disk02_files/graphics_steps1/steps1_e.png b/games/riven_hgr/disk02_files/graphics_steps1/steps1_e.png new file mode 100644 index 0000000000000000000000000000000000000000..e943f8cdb59583c49f53b4de3b157345f5e6c630 GIT binary patch literal 4336 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 e|Bio$$o~KpTQn3^P@72r0000 downsteps3_graphics.inc + echo "downsteps3_s_zx02: .incbin \"downsteps3_s.hgr.zx02\"" >> downsteps3_graphics.inc + + + + + +#### + +%.hgr: %.png + $(PNG_TO_HGR) $< > $@ + +%.hgr.zx02: %.hgr + $(ZX02) -f $< $@ + +#### + +clean: + rm -f *~ *.o *.lst *.zx02 *.hgr downsteps_graphics.inc + diff --git a/games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_n.png b/games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_n.png new file mode 100644 index 0000000000000000000000000000000000000000..e76add9add14aa65ea1f28715e51fa8c4b6e4435 GIT binary patch literal 4750 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 literal 0 HcmV?d00001 diff --git a/games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_s.png b/games/riven_hgr/disk03_files/graphics_downsteps3/downsteps3_s.png new file mode 100644 index 0000000000000000000000000000000000000000..52dd2bbccab0348643e61bb44a27655d8e764e69 GIT binary patch literal 6299 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

-rRyTi?lJum!^LGADm?@Abn)w4KIy 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 + +; Zero Page + .include "../zp.inc" + .include "../hardware.inc" + .include "../common_defines.inc" + .include "../qload.inc" + .include "disk03_defines.inc" + +downsteps3_start: + + ;=================== + ; init screen + ;=================== + +; jsr TEXT +; jsr HOME + bit KEYRESET + + bit SET_GR + bit PAGE1 + bit HIRES + bit FULLGR + + ;======================== + ; set up location + ;======================== + + lda #locations + sta LOCATIONS_H + + lda #0 + sta DRAW_PAGE + sta LEVEL_OVER + + lda #0 + sta JOYSTICK_ENABLED + sta UPDATE_POINTER + + lda #1 + sta CURSOR_VISIBLE + + lda #20 + sta CURSOR_X + sta CURSOR_Y + + + + + ;=================================== + ; init + ;=================================== + +; done in title + +; lda #$20 +; sta HGR_PAGE +; jsr hgr_make_tables + + jsr change_location + + jsr save_bg_14x14 ; save old bg + +game_loop: + + ;=================================== + ; draw pointer + ;=================================== + + jsr draw_pointer + + ;=================================== + ; handle keypress/joystick + ;=================================== + + jsr handle_keypress + + ;=================================== + ; increment frame count + ;=================================== + + inc FRAMEL + bne frame_no_oflo + + inc FRAMEH +frame_no_oflo: + + ;==================================== + ; check level over + ;==================================== + + lda LEVEL_OVER + bne really_exit + + jmp game_loop + +really_exit: + + rts + + + ;========================== + ; includes + ;========================== + + +.include "graphics_downsteps3/downsteps3_graphics.inc" + +.include "leveldata_downsteps3.inc" diff --git a/games/riven_hgr/disk03_files/leveldata_downsteps.inc b/games/riven_hgr/disk03_files/leveldata_downsteps.inc index 197c86a7..fecd7b2e 100644 --- a/games/riven_hgr/disk03_files/leveldata_downsteps.inc +++ b/games/riven_hgr/disk03_files/leveldata_downsteps.inc @@ -24,11 +24,11 @@ location0: ; RIVEN_DOWN2 -- continuing down location1: - .byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE ; north exit + .byte LOAD_DSTEPS3<<4|RIVEN_DOWN3 ; north exit .byte RIVEN_DOWN1 ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte DIRECTION_E ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir diff --git a/games/riven_hgr/disk03_files/leveldata_downsteps3.inc b/games/riven_hgr/disk03_files/leveldata_downsteps3.inc new file mode 100644 index 00000000..cf4c2a5d --- /dev/null +++ b/games/riven_hgr/disk03_files/leveldata_downsteps3.inc @@ -0,0 +1,24 @@ +;=============================================== +; level data for going down steps again +;=============================================== + +locations: + .word location0 + +; RIVEN_DOWN3 -- starting down +location0: + .byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE ; north exit + .byte LOAD_DSTEPS1<<4|RIVEN_DOWN2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_E ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word downsteps3_n_zx02 ; north bg + .word downsteps3_s_zx02 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff ; special exit + diff --git a/games/riven_hgr/disk03_files/leveldata_outside.inc b/games/riven_hgr/disk03_files/leveldata_outside.inc index 78205c12..dd3910e0 100644 --- a/games/riven_hgr/disk03_files/leveldata_outside.inc +++ b/games/riven_hgr/disk03_files/leveldata_outside.inc @@ -8,7 +8,7 @@ locations: ; RIVEN_OUTSIDE -- outside the door location0: .byte $FF ; north exit - .byte LOAD_DSTEPS1<<4|RIVEN_DOWN2 ; south exit + .byte LOAD_DSTEPS3<<4|RIVEN_DOWN3 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte $FF ; north exit_dir diff --git a/games/riven_hgr/title.s b/games/riven_hgr/title.s index f60c5922..07a8950d 100644 --- a/games/riven_hgr/title.s +++ b/games/riven_hgr/title.s @@ -567,7 +567,7 @@ riven_title_image: ;01234567890123456789012345678901234567890 title_text: -.byte 0, 0,"LOADING RIVEN SUBSET DISK 00 V0.08",0 +.byte 0, 0,"LOADING RIVEN SUBSET DISK 00 V0.09",0 ; ;