Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-08-10 06:25:04 +00:00
Code Issues Projects Releases Wiki Activity

riven: hook up disk4

Browse Source
This commit is contained in:
Vince Weaver
2024-07-24 00:43:57 -04:00
parent a94d6fdcc8
commit f3a5b19643
6 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
games/riven_hgr/Makefile
View File

@@ -12,6 +12,7 @@ PRODOS_RAW = ../../utils/prodos-utils/prodos_raw
all: riven_disk00.dsk \
riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
riven_disk04.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
@@ -94,6 +95,21 @@ riven_disk03.dsk: QBOOT QLOAD TITLE_03 \
###
riven_disk04.dsk: QBOOT QLOAD TITLE_04 \
disk04_files/DISK04 \
disk04_files/LEVEL_TUNNEL3
cp $(EMPTY_DISK)/empty.dsk riven_disk04.dsk
$(DOS33_RAW) riven_disk04.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk04.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk04.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk04.dsk 0 1 disk04_files/DISK04 0 0
$(DOS33_RAW) riven_disk04.dsk 0 8 TITLE_04 0 0
$(DOS33_RAW) riven_disk04.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk04.dsk 27 0 disk04_files/LEVEL_TUNNEL3 0 0
###
riven_disk38.dsk: QBOOT QLOAD TITLE_38 \
disk38_files/DISK38 \
disk38_files/LEVEL_PROJECTOR
@@ -300,6 +316,18 @@ title_03.o: title.s zp.inc hardware.inc \
graphics_title/riven_title.hgr.zx02
ca65 -o title_03.o title.s -DDISK=03 -l title_03.lst
####
TITLE_04: title_04.o
ld65 -o TITLE_04 title_04.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_04.o: title.s zp.inc hardware.inc \
qload.inc \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_04.o title.s -DDISK=04 -l title_04.lst
####
@@ -399,6 +427,9 @@ disk02_files/DISK02:
disk03_files/DISK03:
cd disk03_files && make
disk04_files/DISK04:
cd disk04_files && make
disk38_files/DISK38:
cd disk38_files && make
@@ -450,6 +481,11 @@ disk03_files/LEVEL_OUTSIDE:
####
disk04_files/LEVEL_TUNNEL3:
cd disk04_files && make
####
disk38_files/LEVEL_PROJECTOR:
cd disk38_files && make
@@ -518,6 +554,7 @@ clean:
cd disk01_files && make clean
cd disk02_files && make clean
cd disk03_files && make clean
cd disk04_files && make clean
cd disk38_files && make clean
cd disk39_files && make clean
cd disk40_files && make clean
@@ -540,6 +577,7 @@ distclean:
cd disk01_files && make distclean
cd disk02_files && make distclean
cd disk03_files && make distclean
cd disk04_files && make distclean
cd disk38_files && make distclean
cd disk39_files && make distclean
cd disk40_files && make distclean
@@ -576,12 +614,13 @@ qload.inc: generate_common QLOAD
./generate_common -a 0x1600 -s clear_gr_all qload.lst >> qload.inc
submit: riven_disk00.dsk riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
riven_disk04.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk
riven_hgr.2mg
zip riven_hgr.zip riven_disk00.dsk riven_disk01.dsk \
riven_disk02.dsk riven_disk03.dsk \
riven_disk02.dsk riven_disk03.dsk riven_disk04.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk \
riven_disk44.dsk \
@@ -617,6 +656,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk02_files/LEVEL_TOP \
disk03_files/DISK03 \
disk03_files/LEVEL_OUTSIDE \
disk04_files/DISK04 \
disk04_files/LEVEL_TUNNEL3 \
disk38_files/DISK38 \
disk38_files/LEVEL_PROJECTOR \
disk39_files/DISK39 \
@@ -670,6 +711,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(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 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
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 38 0 2` disk38_files/DISK38 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 38 2 0` disk38_files/LEVEL_PROJECTOR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 39 0 2` disk39_files/DISK39 0 0

8
games/riven_hgr/disk02_files/disk02.s
View File

@@ -1,7 +1,7 @@
.include "../zp.inc"
.include "../disk01_files/disk01_defines.inc"
.include "../disk03_files/disk03_defines.inc"
;.include "../disk04_files/disk04_defines.inc"
.include "../disk04_files/disk04_defines.inc"
.include "../disk00_files/disk00_defines.inc"
which_disk_bcd:
@@ -56,15 +56,15 @@ disk_exit_dni_l:
disk_exit_load:
.byte LOAD_PATH
.byte LOAD_OUTSIDE
.byte 0
.byte LOAD_TUNNEL3
.byte LOAD_CYAN
disk_exit_level:
.byte RIVEN_STEPS_BASE
.byte RIVEN_OUTSIDE
.byte 0
.byte RIVEN_TUNNEL3
.byte 0
disk_exit_direction:
.byte DIRECTION_W
.byte DIRECTION_N
.byte 0
.byte DIRECTION_E
.byte 0

4
games/riven_hgr/disk02_files/leveldata_top.inc
View File

@@ -9,11 +9,11 @@ locations:
location0:
.byte $E1 ; north exit
.byte LOAD_STEPS1<<4|RIVEN_STEPS1 ; south exit
.byte $ff ; east exit
.byte $E2 ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_E ; east exit_dir
.byte $ff ; west exit_dir
.word top_n_zx02 ; north bg
.word top_s_zx02 ; south bg

28
games/riven_hgr/disk04_files/graphics_tunnel3/Makefile Normal file
View File

@@ -0,0 +1,28 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: tunnel3_graphics.inc
tunnel3_graphics.inc: \
tunnel3_n.hgr.zx02 tunnel3_w.hgr.zx02 tunnel3_e.hgr.zx02 \
tunnel3_open_n.hgr.zx02
echo "tunnel3_n_zx02: .incbin \"tunnel3_n.hgr.zx02\"" > tunnel3_graphics.inc
echo "tunnel3_w_zx02: .incbin \"tunnel3_w.hgr.zx02\"" >> tunnel3_graphics.inc
echo "tunnel3_e_zx02: .incbin \"tunnel3_e.hgr.zx02\"" >> tunnel3_graphics.inc
echo "tunnel3_open_n_zx02: .incbin \"tunnel3_open_n.hgr.zx02\"" >> tunnel3_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr tunnel3_graphics.inc

13
games/riven_hgr/disk38_files/disk38.s
View File

@@ -1,5 +1,5 @@
.include "../zp.inc"
.include "../disk01_files/disk01_defines.inc"
.include "../disk04_files/disk04_defines.inc"
.include "../disk39_files/disk39_defines.inc"
.include "../disk00_files/disk00_defines.inc"
@@ -27,13 +27,13 @@ length_array:
disk_exit_disk: ; note: not BCD anymore
.byte 39 ; outside maglev
.byte 1 ; hallways
.byte 4 ; hallways
.byte 0
.byte 0
disk_exit_disk_bcd:
.byte $39
.byte $01
.byte $04
.byte 0
.byte 0
@@ -44,20 +44,19 @@ disk_exit_dni_h:
.byte 0
disk_exit_dni_l:
.byte $24
.byte $01
.byte $04
.byte 0
.byte 0
disk_exit_load: ; disk39, LOAD_PROJECTOR, PROJ_DOOR, N
; disk01, LOAD_ARRIVAL, ARRIVAL_NEAR, W
.byte LOAD_PROJECTOR ; LOAD_PROJECTOR
.byte LOAD_ARRIVAL ; LOAD_ARRIVAL
.byte LOAD_TUNNEL3 ;
.byte 0
.byte LOAD_CYAN
disk_exit_level:
.byte RIVEN_PROJ_DOOR ; riven PROJ_DOOR
.byte RIVEN_ARRIVAL_NEAR ; riven_ARRIVAL_NEAR
.byte RIVEN_TUNNEL3 ;
.byte 0
.byte 0
disk_exit_direction:

15
games/riven_hgr/title.s
View File

@@ -24,6 +24,10 @@
.include "disk03_files/disk03_defines.inc"
.endif
.if DISK=04
.include "disk04_files/disk04_defines.inc"
.endif
.if DISK=38
.include "disk38_files/disk38_defines.inc"
.endif
@@ -483,6 +487,17 @@ game_continue:
sta DIRECTION
.endif
.if DISK=04
lda #LOAD_TUNNEL3
sta WHICH_LOAD
lda #RIVEN_TUNNEL3
sta LOCATION
lda #DIRECTION_E
sta DIRECTION
.endif
.if DISK=38
lda #LOAD_PROJECTOR