1
0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-02-16 18:30:27 +00:00

riven: add another disk

This commit is contained in:
Vince Weaver 2024-07-23 14:11:59 -04:00
parent f5ea368c3a
commit 347b37b89a
9 changed files with 352 additions and 6 deletions

@ -13,7 +13,7 @@ PRODOS_RAW = ../../utils/prodos-utils/prodos_raw
all: riven_disk00.dsk \
riven_disk01.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
riven_hgr.2mg
@ -166,6 +166,18 @@ riven_disk43.dsk: QBOOT QLOAD TITLE_43 \
$(DOS33_RAW) riven_disk43.dsk 22 0 disk43_files/LEVEL_LOGGED2 0 0
$(DOS33_RAW) riven_disk43.dsk 27 0 disk43_files/MOVIE_CART_RIDE 0 0
riven_disk44.dsk: QBOOT QLOAD TITLE_44 \
disk44_files/DISK44 \
disk44_files/LEVEL_FISH
cp $(EMPTY_DISK)/empty.dsk riven_disk44.dsk
$(DOS33_RAW) riven_disk44.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk44.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk44.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk44.dsk 0 1 disk44_files/DISK44 0 0
$(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
riven_disk50.dsk: QBOOT QLOAD TITLE_50 \
disk50_files/DISK50 \
disk50_files/LEVEL_CHIPPER
@ -298,6 +310,18 @@ title_43.o: title.s zp.inc hardware.inc \
####
TITLE_44: title_44.o
ld65 -o TITLE_44 title_44.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_44.o: title.s zp.inc hardware.inc \
qload.inc \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_44.o title.s -DDISK=44 -l title_44.lst
####
TITLE_50: title_50.o
ld65 -o TITLE_50 title_50.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
@ -345,6 +369,9 @@ disk41_files/DISK41:
disk43_files/DISK43:
cd disk43_files && make
disk44_files/DISK44:
cd disk44_files && make
disk50_files/DISK50:
cd disk50_files && make
@ -388,6 +415,12 @@ disk43_files/LEVEL_CART:
####
disk44_files/LEVEL_FISH:
cd disk44_files && make
####
disk50_files/LEVEL_CHIPPER:
cd disk50_files && make
@ -405,7 +438,8 @@ graphics_title/riven_title.hgr.zx02:
clean:
rm -f *~ *.o *.lst dts_block generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_38 TITLE_39 TITLE_40 TITLE_41 TITLE_43 TITLE_50
TITLE_00 TITLE_01 TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
cd disk00_files && make clean
cd disk01_files && make clean
cd disk38_files && make clean
@ -413,6 +447,7 @@ clean:
cd disk40_files && make clean
cd disk41_files && make clean
cd disk43_files && make clean
cd disk44_files && make clean
cd disk50_files && make clean
####
@ -420,7 +455,8 @@ clean:
distclean:
rm -f *~ *.o *.lst generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_38 TITLE_39 TITLE_40 TITLE_41 TITLE_43 TITLE_50
TITLE_00 TITLE_01 TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
cd graphics_title && make clean
cd graphics_sprites && make clean
cd disk00_files && make distclean
@ -430,6 +466,7 @@ distclean:
cd disk40_files && make distclean
cd disk41_files && make distclean
cd disk43_files && make distclean
cd disk44_files && make distclean
cd disk50_files && make distclean
###
@ -461,12 +498,13 @@ qload.inc: generate_common QLOAD
submit: riven_disk00.dsk riven_disk01.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.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_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk \
riven_disk44.dsk \
riven_disk50.dsk
zip riven_hgr.2mg.zip riven_hgr.2mg
@ -522,6 +560,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk43_files/LEVEL_LOGGED \
disk43_files/LEVEL_LOGGED2 \
disk43_files/MOVIE_CART_RIDE \
disk44_files/DISK44 \
disk44_files/LEVEL_FISH \
disk50_files/DISK50 \
disk50_files/LEVEL_CHIPPER
$(PRODOSDIR)/mkprodosfs riven_hgr.2mg -n Riven -b 65535 -2
@ -568,6 +608,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 16 0` disk43_files/LEVEL_LOGGED 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 22 0` disk43_files/LEVEL_LOGGED2 0 0
$(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 50 0 2` disk50_files/DISK50 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 2 0` disk50_files/LEVEL_CHIPPER 0 0

@ -0,0 +1,47 @@
include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK44 LEVEL_FISH
####
DISK44: disk44.o
ld65 -o DISK44 disk44.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
disk44.o: disk44.s ../zp.inc
ca65 -o disk44.o disk44.s -l disk44.lst
####
LEVEL_FISH: level_fish.o
ld65 -o LEVEL_FISH level_fish.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_fish.o: level_fish.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk44_defines.inc \
leveldata_fish.inc \
graphics_fish/fish_graphics.inc
ca65 -o level_fish.o level_fish.s -l level_fish.lst
####
graphics_fish/fish_graphics.inc:
cd graphics_fish && make
####
clean:
rm -f *~ *.o *.lst \
LEVEL_FISH
####
distclean:
rm -f *~ *.o *.lst \
LEVEL_FISH
cd graphics_fish && make clean

@ -0,0 +1,68 @@
.include "../zp.inc"
.include "../disk43_files/disk43_defines.inc"
.include "../disk00_files/disk00_defines.inc"
which_disk_bcd:
.byte $44 ; BCD
which_disk_bin:
.byte 44
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, FISH
.byte $40,$00,$00,$00 ;
track_array:
.byte 0, 2, 9,16 ; TITLE, FISH
.byte 22,0,0,0 ;
sector_array:
.byte 8, 0, 0, 0 ; TITLE, FISH
.byte 0,0,0,0 ;
length_array:
.byte 8, 96,84, 96 ; TITLE, FISH
.byte 80,0,0,0
; disk 44
disk_exit_disk: ; note: not BCD anymore
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_disk_bcd:
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_dni_h:
.byte $01 ; 43 = 1*25 + 3*5 + 3
.byte 0
.byte 0
.byte 0
disk_exit_dni_l:
.byte $33
.byte 0
.byte 0
.byte 0
;
disk_exit_load:
.byte 0
.byte 0
.byte 0
.byte LOAD_CYAN
disk_exit_level:
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_direction:
.byte 0
.byte 0
.byte 0
.byte 0

@ -0,0 +1,10 @@
LOAD_TITLE_50 = 0
LOAD_FISH = 1
;================================
; Level definitions
; FISH
RIVEN_FISH = 0

@ -0,0 +1,29 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: fish_graphics.inc
fish_graphics.inc: \
fish_n.hgr.zx02 fish_s.hgr.zx02
# fish_e.hgr.zx02 fish_s.hgr.zx02
echo "fish_n_zx02: .incbin \"fish_n.hgr.zx02\"" > fish_graphics.inc
echo "fish_s_zx02: .incbin \"fish_s.hgr.zx02\"" >> fish_graphics.inc
# echo "fish_w_zx02: .incbin \"fish_w.hgr.zx02\"" >> fish_graphics.inc
# echo "fish_e_zx02: .incbin \"fish_e.hgr.zx02\"" >> fish_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr fish_graphics.inc

@ -0,0 +1,113 @@
; Riven -- Jungle Island, big fish
; 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"
fish_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_fish/fish_graphics.inc"
.include "leveldata_fish.inc"

@ -0,0 +1,23 @@
;===============================================
; level data for Fish level
;===============================================
locations:
.word location0
; RIVEN_RISH -- arrived at big fish
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 $ff ; east exit_dir
.byte $ff ; west exit_dir
.word fish_n_zx02 ; north bg
.word fish_s_zx02 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit

@ -32,7 +32,7 @@ disk_exit_disk: ; note: not BCD anymore
.byte 0
.byte 0
disk_exit_disk_bcd: ; note: not BCD anymore
disk_exit_disk_bcd:
.byte 0
.byte 0
.byte 0

@ -36,6 +36,10 @@
.include "disk43_files/disk43_defines.inc"
.endif
.if DISK=44
.include "disk44_files/disk44_defines.inc"
.endif
.if DISK=50
.include "disk50_files/disk50_defines.inc"
.endif
@ -493,7 +497,6 @@ game_continue:
sta DIRECTION
.endif
.if DISK=43
lda #LOAD_CART
sta WHICH_LOAD
@ -505,6 +508,17 @@ game_continue:
sta DIRECTION
.endif
.if DISK=44
lda #LOAD_FISH
sta WHICH_LOAD
lda #RIVEN_FISH
sta LOCATION
lda #DIRECTION_N
sta DIRECTION
.endif
.if DISK=50
lda #LOAD_CHIPPER
sta WHICH_LOAD