From ffc92ceaf06d215ce0d19fe1b7e1dc500111a16f Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 26 Jul 2024 01:59:11 -0400 Subject: [PATCH] riven: add more locations --- games/riven_hgr/Makefile | 7 ++ games/riven_hgr/disk03_files/Makefile | 22 +++- games/riven_hgr/disk03_files/disk03.s | 9 +- .../riven_hgr/disk03_files/disk03_defines.inc | 9 +- .../disk03_files/graphics_downsteps/Makefile | 27 +++++ .../graphics_downsteps/down1_n.png | Bin 0 -> 3748 bytes .../graphics_downsteps/down1_s.png | Bin 0 -> 5401 bytes .../disk03_files/graphics_outside/Makefile | 5 +- .../graphics_outside/outside_e.png | Bin 0 -> 4343 bytes .../graphics_outside/outside_n.png | Bin 4343 -> 6213 bytes .../graphics_outside/outside_w.png | Bin 0 -> 5585 bytes .../riven_hgr/disk03_files/level_downsteps.s | 113 ++++++++++++++++++ .../disk03_files/leveldata_downsteps.inc | 23 ++++ .../disk03_files/leveldata_outside.inc | 8 +- games/riven_hgr/title.s | 4 +- 15 files changed, 210 insertions(+), 17 deletions(-) create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps/Makefile create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps/down1_n.png create mode 100644 games/riven_hgr/disk03_files/graphics_downsteps/down1_s.png create mode 100644 games/riven_hgr/disk03_files/graphics_outside/outside_e.png create mode 100644 games/riven_hgr/disk03_files/graphics_outside/outside_w.png create mode 100644 games/riven_hgr/disk03_files/level_downsteps.s create mode 100644 games/riven_hgr/disk03_files/leveldata_downsteps.inc diff --git a/games/riven_hgr/Makefile b/games/riven_hgr/Makefile index 00a259e6..42166dd9 100644 --- a/games/riven_hgr/Makefile +++ b/games/riven_hgr/Makefile @@ -83,6 +83,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_OUTSIDE cp $(EMPTY_DISK)/empty.dsk riven_disk03.dsk $(DOS33_RAW) riven_disk03.dsk 0 0 QBOOT 0 1 @@ -91,6 +92,7 @@ riven_disk03.dsk: QBOOT QLOAD TITLE_03 \ $(DOS33_RAW) riven_disk03.dsk 0 1 disk03_files/DISK03 0 0 $(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 ### @@ -505,6 +507,9 @@ disk02_files/LEVEL_TOP: #### +disk03_files/LEVEL_DOWNSTEPS: + cd disk03_files && make + disk03_files/LEVEL_OUTSIDE: cd disk03_files && make @@ -692,6 +697,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ disk02_files/LEVEL_STEPS1 \ disk02_files/LEVEL_TOP \ disk03_files/DISK03 \ + disk03_files/LEVEL_DOWNSTEPS \ disk03_files/LEVEL_OUTSIDE \ disk04_files/DISK04 \ disk04_files/LEVEL_TUNNEL3 \ @@ -749,6 +755,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) riven_hgr.2mg `./dts_block 2 2 0` disk02_files/LEVEL_STEPS1 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 2 22 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 4 0 2` disk04_files/DISK04 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 27 0` disk04_files/LEVEL_TUNNEL3 0 0 diff --git a/games/riven_hgr/disk03_files/Makefile b/games/riven_hgr/disk03_files/Makefile index 81a0b09d..a6c323d4 100644 --- a/games/riven_hgr/disk03_files/Makefile +++ b/games/riven_hgr/disk03_files/Makefile @@ -3,7 +3,7 @@ include ../../../Makefile.inc LINKER_SCRIPTS = ../../../linker_scripts/ -all: DISK03 LEVEL_OUTSIDE +all: DISK03 LEVEL_DOWNSTEPS LEVEL_OUTSIDE #### @@ -27,21 +27,37 @@ level_outside.o: level_outside.s \ #### +LEVEL_DOWNSTEPS: level_downsteps.o + ld65 -o LEVEL_DOWNSTEPS level_downsteps.o -C $(LINKER_SCRIPTS)/apple2_4000.inc + +level_downsteps.o: level_downsteps.s \ + ../zp.inc ../hardware.inc ../qload.inc \ + ../common_defines.inc disk03_defines.inc \ + leveldata_downsteps.inc \ + graphics_downsteps/downsteps_graphics.inc + ca65 -o level_downsteps.o level_downsteps.s -l level_downsteps.lst + +#### + graphics_outside/outside_graphics.inc: cd graphics_outside && make +graphics_downsteps/downsteps_graphics.inc: + cd graphics_downsteps && make + #### clean: rm -f *~ *.o *.lst DISK03 \ - LEVEL_OUTSIDE + LEVEL_OUTSIDE LEVEL_DOWNSTEPS #### distclean: rm -f *~ *.o *.lst DISK03 \ - LEVEL_OUTSIDE + LEVEL_OUTSIDE LEVEL_DOWNSTEPS cd graphics_outside && make clean + cd graphics_downsteps && make clean diff --git a/games/riven_hgr/disk03_files/disk03.s b/games/riven_hgr/disk03_files/disk03.s index b434be25..87bf8cef 100644 --- a/games/riven_hgr/disk03_files/disk03.s +++ b/games/riven_hgr/disk03_files/disk03.s @@ -1,6 +1,5 @@ .include "../zp.inc" .include "../disk02_files/disk02_defines.inc" -;.include "../disk04_files/disk04_defines.inc" .include "../disk00_files/disk00_defines.inc" which_disk_bcd: @@ -10,19 +9,19 @@ which_disk_bin: .byte 3 load_address_array: - .byte $40,$40,$40,$40 ; TITLE, STEPS1,STEPS3,OUTSIDE + .byte $40,$40,$40,$40 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte $40,$00,$00,$00 ; track_array: - .byte 0, 2, 9,16 ; TITLE, STEPS1,STEPS3,OUTSIDE + .byte 0, 2, 9,16 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte 22,0,0,0 ; sector_array: - .byte 8, 0, 0, 0 ; TITLE, STEPS1,STEPS3,OUTSIDE + .byte 8, 0, 0, 0 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte 0,0,0,0 ; length_array: - .byte 8, 96,84, 96 ; TITLE, STEPS1,STEPS3,OUTSIDE + .byte 8, 96,84, 96 ; TITLE, DSTEPS1,DSTEPS3,OUTSIDE .byte 80,0,0,0 diff --git a/games/riven_hgr/disk03_files/disk03_defines.inc b/games/riven_hgr/disk03_files/disk03_defines.inc index 4ac74ad1..b709670f 100644 --- a/games/riven_hgr/disk03_files/disk03_defines.inc +++ b/games/riven_hgr/disk03_files/disk03_defines.inc @@ -1,11 +1,16 @@ LOAD_TITLE_03 = 0 -LOAD_STEPS1 = 1 -LOAD_STPES3 = 2 +LOAD_DSTEPS1 = 1 +LOAD_DSTPES3 = 2 LOAD_OUTSIDE = 3 ;================================ ; Level definitions +; DSTEPS1 + +RIVEN_DOWN1 = 0 +RIVEN_DOWN2 = 1 + ; OUTSIDE RIVEN_OUTSIDE = 0 diff --git a/games/riven_hgr/disk03_files/graphics_downsteps/Makefile b/games/riven_hgr/disk03_files/graphics_downsteps/Makefile new file mode 100644 index 00000000..e3d72f63 --- /dev/null +++ b/games/riven_hgr/disk03_files/graphics_downsteps/Makefile @@ -0,0 +1,27 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr + +all: downsteps_graphics.inc + +downsteps_graphics.inc: \ + down1_n.hgr.zx02 down1_s.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 + + + +#### + +%.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_downsteps/down1_n.png b/games/riven_hgr/disk03_files/graphics_downsteps/down1_n.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9d23aaf52923af31f7bc410890ed56ca018168 GIT binary patch literal 3748 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 DsS8`S literal 0 HcmV?d00001 diff --git a/games/riven_hgr/disk03_files/graphics_outside/Makefile b/games/riven_hgr/disk03_files/graphics_outside/Makefile index 87428ed5..0eb8fce0 100644 --- a/games/riven_hgr/disk03_files/graphics_outside/Makefile +++ b/games/riven_hgr/disk03_files/graphics_outside/Makefile @@ -6,9 +6,12 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr all: outside_graphics.inc outside_graphics.inc: \ - outside_n.hgr.zx02 outside_s.hgr.zx02 + outside_n.hgr.zx02 outside_s.hgr.zx02 outside_e.hgr.zx02 outside_w.hgr.zx02 echo "outside_n_zx02: .incbin \"outside_n.hgr.zx02\"" > outside_graphics.inc echo "outside_s_zx02: .incbin \"outside_s.hgr.zx02\"" >> outside_graphics.inc + echo "outside_e_zx02: .incbin \"outside_e.hgr.zx02\"" >> outside_graphics.inc + echo "outside_w_zx02: .incbin \"outside_w.hgr.zx02\"" >> outside_graphics.inc + #### diff --git a/games/riven_hgr/disk03_files/graphics_outside/outside_e.png b/games/riven_hgr/disk03_files/graphics_outside/outside_e.png new file mode 100644 index 0000000000000000000000000000000000000000..b6792f12cb332b374a83b9fbae667baca053021c GIT binary patch literal 4343 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 lAN(G_$M5lb{2u?c<9`9NBGm~71| literal 0 HcmV?d00001 diff --git a/games/riven_hgr/disk03_files/graphics_outside/outside_n.png b/games/riven_hgr/disk03_files/graphics_outside/outside_n.png index b6792f12cb332b374a83b9fbae667baca053021c..95d73653c7b8dcc9fc9e633c70126ddc1ee7b951 100644 GIT binary patch delta 5736 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 + +; Zero Page + .include "../zp.inc" + .include "../hardware.inc" + .include "../common_defines.inc" + .include "../qload.inc" + .include "disk03_defines.inc" + +downsteps_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_downsteps/downsteps_graphics.inc" + +.include "leveldata_downsteps.inc" diff --git a/games/riven_hgr/disk03_files/leveldata_downsteps.inc b/games/riven_hgr/disk03_files/leveldata_downsteps.inc new file mode 100644 index 00000000..49267574 --- /dev/null +++ b/games/riven_hgr/disk03_files/leveldata_downsteps.inc @@ -0,0 +1,23 @@ +;=============================================== +; level data for outside +;=============================================== + +locations: + .word location0 + +; RIVEN_DOWN1 -- outside the door +location0: + .byte LOAD_OUTSIDE<<4|RIVEN_OUTSIDE ; north exit + .byte $E0 ; 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 down1_n_zx02 ; north bg + .word down1_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 965a8229..b5bb7a20 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 $E0 ; south exit + .byte LOAD_DSTEPS1<<4|RIVEN_DOWN1 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte $FF ; north exit_dir @@ -17,7 +17,7 @@ location0: .byte $ff ; west exit_dir .word outside_n_zx02 ; north bg .word outside_s_zx02 ; south bg - .word $0000 ; east bg - .word $0000 ; west bg - .byte BG_NORTH|BG_SOUTH ; all bgs + .word outside_e_zx02 ; east bg + .word outside_w_zx02 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST ; all bgs .byte $ff ; special exit diff --git a/games/riven_hgr/title.s b/games/riven_hgr/title.s index c0d73f8a..f60c5922 100644 --- a/games/riven_hgr/title.s +++ b/games/riven_hgr/title.s @@ -435,10 +435,10 @@ game_continue: .endif .if DISK=03 - lda #LOAD_OUTSIDE + lda #LOAD_DSTEPS1 sta WHICH_LOAD - lda #RIVEN_OUTSIDE + lda #RIVEN_DOWN1 sta LOCATION lda #DIRECTION_N