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

riven: update disk44

Browse Source
This commit is contained in:
Vince Weaver
2024-07-29 12:02:19 -04:00
parent 2850b4d414
commit b51168af74
13 changed files with 214 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
games/riven_hgr/Makefile
View File

@@ -232,6 +232,7 @@ riven_disk43.dsk: QBOOT QLOAD TITLE_43 \
riven_disk44.dsk: QBOOT QLOAD TITLE_44 \
disk44_files/DISK44 \
disk44_files/LEVEL_PATH \
disk44_files/LEVEL_FISH
cp $(EMPTY_DISK)/empty.dsk riven_disk44.dsk
$(DOS33_RAW) riven_disk44.dsk 0 0 QBOOT 0 1
@@ -241,6 +242,7 @@ riven_disk44.dsk: QBOOT QLOAD TITLE_44 \
$(DOS33_RAW) riven_disk44.dsk 0 8 TITLE_44 0 0
$(DOS33_RAW) riven_disk44.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk44.dsk 2 0 disk44_files/LEVEL_FISH 0 0
$(DOS33_RAW) riven_disk44.dsk 8 0 disk44_files/LEVEL_PATH 0 0
riven_disk50.dsk: QBOOT QLOAD TITLE_50 \
disk50_files/DISK50 \
@@ -573,6 +575,9 @@ disk43_files/LEVEL_CART:
####
disk44_files/LEVEL_PATH:
cd disk44_files && make
disk44_files/LEVEL_FISH:
cd disk44_files && make
@@ -744,6 +749,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk43_files/LEVEL_LOGGED2 \
disk43_files/MOVIE_CART_RIDE \
disk44_files/DISK44 \
disk44_files/LEVEL_PATH \
disk44_files/LEVEL_FISH \
disk50_files/DISK50 \
disk50_files/LEVEL_CHIPPER
@@ -805,6 +811,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 27 0` disk43_files/MOVIE_CART_RIDE 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 44 0 2` disk44_files/DISK44 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 44 2 0` disk44_files/LEVEL_FISH 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 44 8 0` disk44_files/LEVEL_PATH 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 0 2` disk50_files/DISK50 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 2 0` disk50_files/LEVEL_CHIPPER 0 0

3
games/riven_hgr/NOTES
View File

@@ -177,7 +177,8 @@ Disk44 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 8S = 0T8S (2048) 300B free
T 2 = FISH 4891 bytes = 7T0S (28672) 5k free
T 2 = FISH 4891 bytes = 6T0S (24576) 5k free
T 8 = PATH 18000 bytes = 6T0S (24576) 6k free
Disk50 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

23
games/riven_hgr/disk44_files/Makefile
View File

@@ -3,7 +3,7 @@ include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK44 LEVEL_FISH
all: DISK44 LEVEL_PATH LEVEL_FISH
####
@@ -27,20 +27,37 @@ level_fish.o: level_fish.s \
####
LEVEL_PATH: level_path.o
ld65 -o LEVEL_PATH level_path.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_path.o: level_path.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk44_defines.inc \
leveldata_path.inc \
graphics_path/path_graphics.inc
ca65 -o level_path.o level_path.s -l level_path.lst
####
graphics_fish/fish_graphics.inc:
cd graphics_fish && make
graphics_path/path_graphics.inc:
cd graphics_path && make
####
clean:
rm -f *~ *.o *.lst \
LEVEL_FISH
LEVEL_PATH LEVEL_FISH
####
distclean:
rm -f *~ *.o *.lst \
LEVEL_FISH
LEVEL_PATH LEVEL_FISH
cd graphics_path && make clean
cd graphics_fish && make clean

22
games/riven_hgr/disk44_files/disk44.s
View File

@@ -9,31 +9,31 @@ which_disk_bin:
.byte 44
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, FISH
.byte $40,$40,$40,$40 ; TITLE, FISH, PATH
.byte $40,$00,$00,$00 ;
track_array:
.byte 0, 2, 9,16 ; TITLE, FISH
.byte 22,0,0,0 ;
.byte 0, 2, 8,14 ; TITLE, FISH, PATH
.byte 20,0,0,0 ;
sector_array:
.byte 8, 0, 0, 0 ; TITLE, FISH
.byte 8, 0, 0, 0 ; TITLE, FISH, PATH
.byte 0,0,0,0 ;
length_array:
.byte 8, 96,84, 96 ; TITLE, FISH
.byte 80,0,0,0
.byte 8, 96,96, 96 ; TITLE, FISH, PATH
.byte 96,0,0,0
; disk 44
disk_exit_disk: ; note: not BCD anymore
.byte 0
.byte 43
.byte 0
.byte 0
.byte 0
disk_exit_disk_bcd:
.byte 0
.byte $43
.byte 0
.byte 0
.byte 0
@@ -52,17 +52,17 @@ disk_exit_dni_l:
;
disk_exit_load:
.byte 0
.byte LOAD_LOGGED
.byte 0
.byte 0
.byte LOAD_CYAN
disk_exit_level:
.byte 0
.byte RIVEN_LOGGED
.byte 0
.byte 0
.byte 0
disk_exit_direction:
.byte 0
.byte DIRECTION_E
.byte 0
.byte 0
.byte 0

4
games/riven_hgr/disk44_files/disk44_defines.inc
View File

@@ -1,5 +1,6 @@
LOAD_TITLE_50 = 0
LOAD_FISH = 1
LOAD_PATH = 2
;================================
; Level definitions
@@ -8,3 +9,6 @@ LOAD_FISH = 1
RIVEN_FISH = 0
; PATH
RIVEN_PATH = 0

28
games/riven_hgr/disk44_files/graphics_path/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: path_graphics.inc
path_graphics.inc: \
path_n.hgr.zx02 path_s.hgr.zx02 path_e.hgr.zx02 path_w.hgr.zx02
echo "path_n_zx02: .incbin \"path_n.hgr.zx02\"" > path_graphics.inc
echo "path_s_zx02: .incbin \"path_s.hgr.zx02\"" >> path_graphics.inc
echo "path_w_zx02: .incbin \"path_w.hgr.zx02\"" >> path_graphics.inc
echo "path_e_zx02: .incbin \"path_e.hgr.zx02\"" >> path_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr path_graphics.inc

BIN
games/riven_hgr/disk44_files/graphics_path/path_e.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
games/riven_hgr/disk44_files/graphics_path/path_n.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
games/riven_hgr/disk44_files/graphics_path/path_s.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

113
games/riven_hgr/disk44_files/level_path.s Normal file
View File

@@ -0,0 +1,113 @@
; Riven -- Jungle Island, initial path
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "../zp.inc"
.include "../hardware.inc"
.include "../common_defines.inc"
.include "../qload.inc"
.include "disk44_defines.inc"
path_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_path/path_graphics.inc"
.include "leveldata_path.inc"

6
games/riven_hgr/disk44_files/leveldata_fish.inc
View File

@@ -8,11 +8,11 @@ locations:
; RIVEN_RISH -- arrived at big fish
location0:
.byte $FF ; north exit
.byte $ff ; south exit
.byte LOAD_PATH<<4|RIVEN_PATH ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $FF ; west exit
.byte $FF ; north exit_dir
.byte $FF ; south exit_dir
.byte DIRECTION_W ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word fish_n_zx02 ; north bg

23
games/riven_hgr/disk44_files/leveldata_path.inc Normal file
View File

@@ -0,0 +1,23 @@
;===============================================
; level data for initial path
;===============================================
locations:
.word location0
; RIVEN_PATH -- start of trail
location0:
.byte $FF ; north exit
.byte $ff ; south exit
.byte LOAD_FISH<<4|RIVEN_FISH ; east exit
.byte $E0 ; west exit
.byte $FF ; north exit_dir
.byte $FF ; south exit_dir
.byte DIRECTION_N ; east exit_dir
.byte $ff ; west exit_dir
.word path_n_zx02 ; north bg
.word path_s_zx02 ; south bg
.word path_e_zx02 ; east bg
.word path_w_zx02 ; west bg
.byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
.byte $ff ; special exit

6
games/riven_hgr/title.s
View File

@@ -524,13 +524,13 @@ game_continue:
.endif
.if DISK=44
lda #LOAD_FISH
lda #LOAD_PATH
sta WHICH_LOAD
lda #RIVEN_FISH
lda #RIVEN_PATH
sta LOCATION
lda #DIRECTION_N
lda #DIRECTION_E
sta DIRECTION
.endif