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 disk10

Browse Source
This commit is contained in:
Vince Weaver
2024-08-03 18:47:41 -04:00
parent e22d1cfd42
commit 55655c1124
10 changed files with 343 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
games/riven_hgr/Makefile
View File

@@ -13,6 +13,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_disk05.dsk \
riven_disk10.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
@@ -141,7 +142,18 @@ riven_disk05.dsk: QBOOT QLOAD TITLE_05 \
$(DOS33_RAW) riven_disk05.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk05.dsk 2 0 disk05_files/LEVEL_CHAIR 0 0
###
riven_disk10.dsk: QBOOT QLOAD TITLE_10 \
disk10_files/LEVEL_INSIDE
cp $(EMPTY_DISK)/empty.dsk riven_disk10.dsk
$(DOS33_RAW) riven_disk10.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk10.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk10.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk10.dsk 0 1 disk10_files/DISK10 0 0
$(DOS33_RAW) riven_disk10.dsk 0 8 TITLE_10 0 0
$(DOS33_RAW) riven_disk10.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk10.dsk 2 0 disk10_files/LEVEL_INSIDE 0 0
###
@@ -375,6 +387,18 @@ title_05.o: title.s zp.inc hardware.inc \
graphics_title/riven_title.hgr.zx02
ca65 -o title_05.o title.s -DDISK=05 -l title_05.lst
####
TITLE_10: title_10.o
ld65 -o TITLE_10 title_10.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_10.o: title.s zp.inc hardware.inc \
qload.inc \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_10.o title.s -DDISK=10 -l title_10.lst
@@ -481,6 +505,9 @@ disk04_files/DISK04:
disk05_files/DISK05:
cd disk05_files && make
disk10_files/DISK10:
cd disk10_files && make
disk38_files/DISK38:
cd disk38_files && make
@@ -569,6 +596,11 @@ disk05_files/LEVEL_CHAIR:
####
disk10_files/LEVEL_INSIDE:
cd disk10_files && make
####
disk38_files/LEVEL_PROJECTOR:
cd disk38_files && make
@@ -634,6 +666,7 @@ clean:
rm -f *~ *.o *.lst dts_block generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_02 TITLE_03 TITLE_04 TITLE_05 \
TITLE_10 \
TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
cd disk00_files && make clean
@@ -642,6 +675,7 @@ clean:
cd disk03_files && make clean
cd disk04_files && make clean
cd disk05_files && make clean
cd disk10_files && make clean
cd disk38_files && make clean
cd disk39_files && make clean
cd disk40_files && make clean
@@ -656,6 +690,7 @@ distclean:
rm -f *~ *.o *.lst generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_02 TITLE_03 TITLE_04 TITLE_05 \
TITLE_10 \
TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
cd graphics_title && make clean
@@ -666,6 +701,7 @@ distclean:
cd disk03_files && make distclean
cd disk04_files && make distclean
cd disk05_files && make distclean
cd disk10_files && make distclean
cd disk38_files && make distclean
cd disk39_files && make distclean
cd disk40_files && make distclean
@@ -703,6 +739,7 @@ qload.inc: generate_common QLOAD
submit: riven_disk00.dsk riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
riven_disk04.dsk riven_disk05.dsk \
riven_disk10.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
@@ -710,6 +747,7 @@ submit: riven_disk00.dsk riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
zip riven_hgr.zip riven_disk00.dsk riven_disk01.dsk \
riven_disk02.dsk riven_disk03.dsk riven_disk04.dsk \
riven_disk05.dsk \
riven_disk10.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk \
riven_disk44.dsk \
@@ -758,6 +796,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk04_files/LEVEL_TUNNEL3 \
disk05_files/DISK05 \
disk05_files/LEVEL_CHAIR \
disk10_files/DISK10 \
disk10_files/LEVEL_INSIDE \
disk38_files/DISK38 \
disk38_files/LEVEL_PROJECTOR \
disk39_files/DISK39 \
@@ -825,6 +865,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 4 17 0` disk04_files/LEVEL_TUNNEL3 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 0 2` disk05_files/DISK05 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 2 0` disk05_files/LEVEL_CHAIR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 10 0 2` disk10_files/DISK10 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 10 2 0` disk10_files/LEVEL_INSIDE 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

45
games/riven_hgr/disk10_files/Makefile Normal file
View File

@@ -0,0 +1,45 @@
include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK10 LEVEL_INSIDE
####
DISK10: disk10.o
ld65 -o DISK10 disk10.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
disk10.o: disk10.s ../zp.inc
ca65 -o disk10.o disk10.s -l disk10.lst
####
LEVEL_INSIDE: level_inside.o
ld65 -o LEVEL_INSIDE level_inside.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_inside.o: level_inside.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk10_defines.inc \
leveldata_inside.inc \
graphics_inside/inside_graphics.inc
ca65 -o level_inside.o level_inside.s -l level_inside.lst
####
graphics_inside/inside_graphics.inc:
cd graphics_inside && make
####
clean:
rm -f *~ *.o *.lst DISK10 \
LEVEL_INSIDE
####
distclean:
rm -f *~ *.o *.lst DISK10 \
LEVEL_INSIDE
cd graphics_inside && make clean

69
games/riven_hgr/disk10_files/disk10.s Normal file
View File

@@ -0,0 +1,69 @@
.include "../zp.inc"
.include "../disk02_files/disk02_defines.inc"
.include "../disk05_files/disk05_defines.inc"
.include "../disk38_files/disk38_defines.inc"
.include "../disk00_files/disk00_defines.inc"
which_disk_bcd:
.byte $04 ; BCD
which_disk_bin:
.byte 4
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1
.byte $40,$40,$40,$40 ; TUNNEL3
track_array:
.byte 0, 2, 7,12 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1
.byte 17,22,27,0 ; TUNNEL3
sector_array:
.byte 8, 0, 0, 0 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1
.byte 0,0,0,0 ; TUNNEL3
length_array:
.byte 8, 80,80,80 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1
.byte 80,80,80,0 ; TUNNEL3
disk_exit_disk: ; note: not BCD anymore
.byte 2
.byte 38
.byte 5
.byte 0
disk_exit_disk_bcd:
.byte $02
.byte $38
.byte $05
.byte 0
disk_exit_dni_h:
.byte 0
.byte 1 ; 1*25 + 2*5 + 3*1
.byte 0
.byte 0
disk_exit_dni_l:
.byte $02
.byte $23
.byte $10
.byte 0
;
disk_exit_load:
.byte LOAD_BRIDGE
.byte LOAD_PROJECTOR
.byte LOAD_CHAIR
.byte LOAD_CYAN
disk_exit_level:
.byte RIVEN_BRIDGE
.byte RIVEN_PROJECTOR
.byte RIVEN_CHAIR
.byte 0
disk_exit_direction:
.byte DIRECTION_W
.byte DIRECTION_W
.byte DIRECTION_N
.byte 0

8
games/riven_hgr/disk10_files/disk10_defines.inc Normal file
View File

@@ -0,0 +1,8 @@
LOAD_TITLE_10 = 0
LOAD_INSIDE = 1
;================================
; Level definitions
; INSIDE
RIVEN_INSIDE = 0

25
games/riven_hgr/disk10_files/graphics_inside/Makefile Normal file
View File

@@ -0,0 +1,25 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: inside_graphics.inc
inside_graphics.inc: \
entrance_w.hgr.zx02 entrance_e.hgr.zx02
echo "entrance_w_zx02: .incbin \"entrance_w.hgr.zx02\"" > inside_graphics.inc
echo "entrance_e_zx02: .incbin \"entrance_e.hgr.zx02\"" >> inside_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr inside_graphics.inc

0
games/riven_hgr/disk10_files/graphics_entrance/entrance_e.png → games/riven_hgr/disk10_files/graphics_inside/entrance_e.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
games/riven_hgr/disk10_files/graphics_entrance/entrance_w.png → games/riven_hgr/disk10_files/graphics_inside/entrance_w.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

113
games/riven_hgr/disk10_files/level_inside.s Normal file
View File

@@ -0,0 +1,113 @@
; Riven -- Inside Rotate room
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "../zp.inc"
.include "../hardware.inc"
.include "../common_defines.inc"
.include "../qload.inc"
.include "disk10_defines.inc"
bridge1_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_L
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_inside/inside_graphics.inc"
.include "leveldata_inside.inc"

25
games/riven_hgr/disk10_files/leveldata_inside.inc Normal file
View File

@@ -0,0 +1,25 @@
;===============================================
; level data for inside the room
;===============================================
locations:
.word location0
; RIVEN_INSIDE -- part way across the bridge
location0:
.byte $ff ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $FF ; north exit_dir
.byte $FF ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word entrance_e_zx02 ; east bg
.word entrance_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit

16
games/riven_hgr/title.s
View File

@@ -32,6 +32,10 @@
.include "disk05_files/disk05_defines.inc"
.endif
.if DISK=10
.include "disk10_files/disk10_defines.inc"
.endif
.if DISK=38
.include "disk38_files/disk38_defines.inc"
.endif
@@ -468,6 +472,18 @@ game_continue:
sta DIRECTION
.endif
.if DISK=10
lda #LOAD_INSIDE
sta WHICH_LOAD
lda #RIVEN_INSIDE
sta LOCATION
lda #DIRECTION_W
sta DIRECTION
.endif
.if DISK=38
lda #LOAD_PROJECTOR