riven: add new disk01

This commit is contained in:
Vince Weaver 2024-06-18 01:46:16 -04:00
parent 1d6e90d63f
commit 258eb510af
15 changed files with 349 additions and 1 deletions

View File

@ -7,7 +7,22 @@ EMPTY_DISK = ../../empty_disk/
LINKER_SCRIPTS = ../../linker_scripts/
all: riven_disk39.dsk riven_disk40.dsk riven_disk43.dsk
all: riven_disk01.dsk \
riven_disk39.dsk riven_disk40.dsk riven_disk43.dsk
###
riven_disk01.dsk: QBOOT QLOAD_01 TITLE_01 \
disk01_files/LEVEL_ARRIVAL
cp $(EMPTY_DISK)/empty.dsk riven_disk01.dsk
$(DOS33_RAW) riven_disk01.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk01.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk01.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk01.dsk 1 0 QLOAD_01 0 0
$(DOS33_RAW) riven_disk01.dsk 1 8 TITLE_01 0 0
$(DOS33_RAW) riven_disk01.dsk 2 0 disk01_files/LEVEL_ARRIVAL 0 0
###
riven_disk39.dsk: QBOOT QLOAD_39 TITLE_39 \
disk39_files/LEVEL_MAGSTEPS \
@ -59,6 +74,21 @@ qboot_sector.o: qboot_sector.s qboot_stage2.s
###
QLOAD_01: qload_01.o
ld65 -o QLOAD_01 qload_01.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
qload_01.o: qload.s qboot.inc \
zx02_optim.s wait.s \
draw_pointer.s log_table.s \
disk01_files/disk01_qload.inc \
disk01_files/disk01_defines.inc \
graphics_sprites/pointer_sprites.inc \
hgr_14x14_sprite.s \
keyboard.s
ca65 -o qload_01.o qload.s -DDISK=01 -l qload_01.lst
###
QLOAD_39: qload_39.o
ld65 -o QLOAD_39 qload_39.o -C $(LINKER_SCRIPTS)/apple2_1800.inc
@ -105,6 +135,17 @@ qload_43.o: qload.s qboot.inc \
####
TITLE_01: title_01.o
ld65 -o TITLE_01 title_01.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_01.o: title.s zp.inc hardware.inc \
qload.inc wait_a_bit.s \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_01.o title.s -DDISK=01 -l title_01.lst
####
TITLE_39: title_39.o
ld65 -o TITLE_39 title_39.o -C $(LINKER_SCRIPTS)/apple2_4000.inc

View File

@ -0,0 +1,36 @@
include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: LEVEL_ARRIVAL
LEVEL_ARRIVAL: level_arrival.o
ld65 -o LEVEL_ARRIVAL level_arrival.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_arrival.o: level_arrival.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk01_defines.inc \
leveldata_arrival.inc \
graphics_arrival/arrival_graphics.inc
ca65 -o level_arrival.o level_arrival.s -l level_arrival.lst
####
graphics_arrival/arrival_graphics.inc:
cd graphics_arrival && make
####
clean:
rm -f *~ *.o *.lst \
LEVEL_ARRIVAL
####
distclean:
rm -f *~ *.o *.lst \
LEVEL_ARRIVAL
cd graphics_arrival && make clean

View File

@ -0,0 +1,11 @@
LOAD_TITLE = 0
LOAD_ARRIVAL = 1
;================================
; Level definitions
; Arrival
RIVEN_ARRIVAL = 0
RIVEN_ARRIVAL_NEAR = 1
RIVEN_ARRIVAL_HANDLE = 2

View File

@ -0,0 +1,14 @@
which_disk_array:
.byte 1,1,1,1 ; TITLE, ARRIVAL
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, ARRIVAL
track_array:
.byte 1, 2, 2,17 ; TITLE, ARRIVAL
sector_array:
.byte 8, 0, 0, 0 ; TITLE, ARRIVAL
length_array:
.byte 16, 128,123, 64 ; TITLE, ARRIVAL

View File

@ -0,0 +1,34 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: arrival_graphics.inc
arrival_graphics.inc: \
arrival_near_n.hgr.zx02 arrival_near_s.hgr.zx02 arrival_near_e.hgr.zx02 arrival_near_w.hgr.zx02 \
arrival_n.hgr.zx02 \
arrival_handle_n.hgr.zx02
echo "arrival_near_n_zx02: .incbin \"arrival_near_n.hgr.zx02\"" > arrival_graphics.inc
echo "arrival_near_s_zx02: .incbin \"arrival_near_s.hgr.zx02\"" >> arrival_graphics.inc
echo "arrival_near_e_zx02: .incbin \"arrival_near_e.hgr.zx02\"" >> arrival_graphics.inc
echo "arrival_near_w_zx02: .incbin \"arrival_near_w.hgr.zx02\"" >> arrival_graphics.inc
echo "arrival_n_zx02: .incbin \"arrival_n.hgr.zx02\"" >> arrival_graphics.inc
echo "arrival_handle_n_zx02: .incbin \"arrival_handle_n.hgr.zx02\"" >> arrival_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr arrival_graphics.inc

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

@ -0,0 +1,129 @@
; Riven -- Dome Island -- Arrival
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "../zp.inc"
.include "../hardware.inc"
.include "../common_defines.inc"
.include "../qload.inc"
.include "disk01_defines.inc"
riven_arrival:
;===================
; 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
;==================================
; big handle clicked
;==================================
handle_clicked:
; bit SPEAKER
lda #DIRECTION_N
sta DIRECTION
lda #RIVEN_ARRIVAL_HANDLE
sta LOCATION
jsr change_location
rts
;==========================
; includes
;==========================
.include "graphics_arrival/arrival_graphics.inc"
.include "leveldata_arrival.inc"

View File

@ -0,0 +1,61 @@
;===============================================
; level data for Dome Island level
;===============================================
locations:
.word location0,location1,location2
; RIVEN_ARRIVAL - first arrival
location0:
.byte RIVEN_ARRIVAL_NEAR ; north exit
.byte $ff ; south exit
.byte $FF ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word arrival_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH
.byte $ff ; special exit
; RIVEN_ARRIVAL_NEAR -- just outside the cage
location1:
.byte $ff ; north exit
.byte RIVEN_ARRIVAL ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_N ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word arrival_near_n_zx02 ; north bg
.word arrival_near_s_zx02 ; south bg
.word arrival_near_e_zx02 ; east bg
.word arrival_near_w_zx02 ; west bg
.byte BG_EAST|BG_NORTH|BG_SOUTH|BG_WEST ; all bgs
.byte DIRECTION_E ; special exit
.byte 12,16 ; special x
.byte 100,161 ; special y
.word handle_clicked-1
; RIVEN_HANDLE - big handle
location2:
.byte RIVEN_ARRIVAL_NEAR ; north exit
.byte $ff ; south exit
.byte $FF ; east exit
.byte $ff ; west exit
.byte DIRECTION_E ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word arrival_handle_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH
.byte $ff ; special exit

View File

@ -8,6 +8,9 @@
.include "qboot.inc"
.if DISK=01
.include "disk01_files/disk01_defines.inc"
.endif
.if DISK=39
.include "disk39_files/disk39_defines.inc"
.endif
@ -267,6 +270,10 @@ insert_disk_string:
.include "hgr_14x14_sprite.s"
.include "keyboard.s"
.if DISK=01
.include "disk01_files/disk01_qload.inc"
.endif
.if DISK=39
.include "disk39_files/disk39_qload.inc"
.endif

View File

@ -8,6 +8,10 @@
.include "common_defines.inc"
.include "qload.inc"
.if DISK=01
.include "disk01_files/disk01_defines.inc"
.endif
.if DISK=39
.include "disk39_files/disk39_defines.inc"
.endif
@ -297,6 +301,17 @@ clear_loop:
lda #100
jsr wait_a_bit
.if DISK=01
lda #LOAD_ARRIVAL
sta WHICH_LOAD ; assume new game (dome island)
lda #RIVEN_ARRIVAL
sta LOCATION
lda #DIRECTION_N
sta DIRECTION
.endif
.if DISK=39
lda #LOAD_OUTSIDE
sta WHICH_LOAD ; assume new game (dome island)