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

riven: add more locations to disk01

Browse Source
This commit is contained in:
Vince Weaver 2024-07-18 00:00:14 -04:00
parent da75612fa6
commit 09251216b0
15 changed files with 205 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
games/riven_hgr/Makefile
View File

@ -44,6 +44,7 @@ riven_disk00.dsk: QBOOT QLOAD TITLE_00 \
riven_disk01.dsk: QBOOT QLOAD TITLE_01 \
disk01_files/DISK01 \
disk01_files/LEVEL_ARRIVAL \
disk01_files/LEVEL_ARRIVAL2 \
disk01_files/LEVEL_TELESCOPE
cp $(EMPTY_DISK)/empty.dsk riven_disk01.dsk
$(DOS33_RAW) riven_disk01.dsk 0 0 QBOOT 0 1
@ -53,7 +54,8 @@ riven_disk01.dsk: QBOOT QLOAD TITLE_01 \
$(DOS33_RAW) riven_disk01.dsk 0 8 TITLE_01 0 0
$(DOS33_RAW) riven_disk01.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk01.dsk 2 0 disk01_files/LEVEL_ARRIVAL 0 0
$(DOS33_RAW) riven_disk01.dsk 16 0 disk01_files/LEVEL_TELESCOPE 0 0
$(DOS33_RAW) riven_disk01.dsk 9 0 disk01_files/LEVEL_ARRIVAL2 0 0
$(DOS33_RAW) riven_disk01.dsk 13 0 disk01_files/LEVEL_TELESCOPE 0 0
###
@ -281,6 +283,9 @@ title_43.o: title.s zp.inc hardware.inc \
disk01_files/LEVEL_ARRIVAL:
cd disk01_files && make
disk01_files/LEVEL_ARRIVAL2:
cd disk01_files && make
####
disk00_files/DISK00:
cd disk00_files && make
@ -409,11 +414,12 @@ 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_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
zip riven_hgr.2mg.zip riven_hgr.2mg
###
@ -435,6 +441,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk00_files/LEVEL_START \
disk01_files/DISK01 \
disk01_files/LEVEL_ARRIVAL \
disk01_files/LEVEL_ARRIVAL2 \
disk01_files/LEVEL_TELESCOPE \
disk38_files/DISK38 \
disk38_files/LEVEL_PROJECTOR \
@ -475,7 +482,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 0 31 0` disk00_files/LEVEL_START 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 0 2` disk01_files/DISK01 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 2 0` disk01_files/LEVEL_ARRIVAL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 16 0` disk01_files/LEVEL_TELESCOPE 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 9 0` disk01_files/LEVEL_ARRIVAL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 13 0` disk01_files/LEVEL_TELESCOPE 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

4
games/riven_hgr/NOTES
View File

@ -108,8 +108,8 @@ T 0 = Qboot
T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free
T 1 = QLOAD 2393 bytes 16S= 1T0S (4096) 2k free
T 2 = ARRIVAL 25512 bytes = 7T0S (28672) 3k free
T 9 = ARRIVAL2 ? bytes = 7T0S (28672) ?k free
T 16 = TELESCOPE 19484 bytes = 7T0S (28672) 9k free
T 9 = ARRIVAL2 15920 bytes = 4T0S (16384) 400B free
T 13 = TELESCOPE 19484 bytes = 7T0S (28672) 9k free
Disk38 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

23
games/riven_hgr/disk01_files/Makefile
View File

@ -3,7 +3,7 @@ include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK01 LEVEL_ARRIVAL LEVEL_TELESCOPE
all: DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE
####
@ -27,6 +27,19 @@ level_arrival.o: level_arrival.s \
####
LEVEL_ARRIVAL2: level_arrival2.o
ld65 -o LEVEL_ARRIVAL2 level_arrival2.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_arrival2.o: level_arrival2.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk01_defines.inc \
leveldata_arrival2.inc \
graphics_arrival2/arrival2_graphics.inc
ca65 -o level_arrival2.o level_arrival2.s -l level_arrival2.lst
####
LEVEL_TELESCOPE: level_telescope.o
ld65 -o LEVEL_TELESCOPE level_telescope.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
@ -43,6 +56,9 @@ level_telescope.o: level_telescope.s \
graphics_arrival/arrival_graphics.inc:
cd graphics_arrival && make
graphics_arrival2/arrival2_graphics.inc:
cd graphics_arrival2 && make
graphics_telescope/telescope_graphics.inc:
cd graphics_telescope && make
@ -50,13 +66,14 @@ graphics_telescope/telescope_graphics.inc:
clean:
rm -f *~ *.o *.lst \
DISK01 LEVEL_ARRIVAL LEVEL_TELESCOPE
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE
####
distclean:
rm -f *~ *.o *.lst \
DISK01 LEVEL_ARRIVAL LEVEL_TELESCOPE
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE
cd graphics_arrival && make clean
cd graphics_arrival2 && make clean
cd graphics_telescope && make clean

4
games/riven_hgr/disk01_files/disk01.s
View File

@ -13,14 +13,14 @@ load_address_array:
.byte $00,$00,$00,$00
track_array:
.byte 0, 2, 9,16 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 0, 2, 9,13 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 0,0,0,0
sector_array:
.byte 8, 0, 0, 0 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 0,0,0,0
length_array:
.byte 8, 112,112, 112 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 8, 112,64, 112 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 0,0,0,0

3
games/riven_hgr/disk01_files/disk01_defines.inc
View File

@ -12,6 +12,9 @@ RIVEN_ARRIVAL = 0
RIVEN_ARRIVAL_NEAR = 1
RIVEN_ARRIVAL_HANDLE = 2
; Arrival2
RIVEN_ARRIVAL2 = 0
; Telescope

27
games/riven_hgr/disk01_files/graphics_arrival2/Makefile Normal file
View File

@ -0,0 +1,27 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: arrival2_graphics.inc
arrival2_graphics.inc: \
arrival2_n.hgr.zx02 arrival2_s.hgr.zx02 arrival2_e.hgr.zx02 arrival2_w.hgr.zx02
echo "arrival2_n_zx02: .incbin \"arrival2_n.hgr.zx02\"" > arrival2_graphics.inc
echo "arrival2_s_zx02: .incbin \"arrival2_s.hgr.zx02\"" >> arrival2_graphics.inc
echo "arrival2_e_zx02: .incbin \"arrival2_e.hgr.zx02\"" >> arrival2_graphics.inc
echo "arrival2_w_zx02: .incbin \"arrival2_w.hgr.zx02\"" >> arrival2_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr arrival2_graphics.inc

BIN
games/riven_hgr/disk01_files/graphics_arrival2/arrival2_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
games/riven_hgr/disk01_files/graphics_arrival2/arrival2_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
games/riven_hgr/disk01_files/graphics_arrival2/arrival2_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
games/riven_hgr/disk01_files/graphics_arrival2/arrival2_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

112
games/riven_hgr/disk01_files/level_arrival2.s Normal file
View File

@ -0,0 +1,112 @@
; Riven -- Dome Island -- Arrival2
; 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_arrival2:
;===================
; init screen
;===================
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_arrival2/arrival2_graphics.inc"
.include "leveldata_arrival2.inc"

2
games/riven_hgr/disk01_files/leveldata_arrival.inc
View File

@ -25,7 +25,7 @@ location0:
; RIVEN_ARRIVAL_NEAR -- just outside the cage
location1:
.byte LOAD_TELESCOPE<<4|RIVEN_TELESCOPE ; north exit
.byte LOAD_ARRIVAL2<<4|RIVEN_ARRIVAL2 ; north exit
.byte RIVEN_ARRIVAL ; south exit
.byte $E0 ; leave to disk39 ; east exit
.byte $ff ; west exit

24
games/riven_hgr/disk01_files/leveldata_arrival2.inc Normal file
View File

@ -0,0 +1,24 @@
;===============================================
; level data for Dome Island level -- arrival2
;===============================================
locations:
.word location0
; RIVEN_ARRIVAL2 - second arrival
location0:
.byte LOAD_TELESCOPE<<4|RIVEN_TELESCOPE ; north exit
.byte LOAD_ARRIVAL<<4|RIVEN_ARRIVAL_NEAR ; south exit
.byte $FF ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word arrival2_n_zx02 ; north bg
.word arrival2_s_zx02 ; south bg
.word arrival2_e_zx02 ; east bg
.word arrival2_w_zx02 ; west bg
.byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
.byte $ff ; special exit

2
games/riven_hgr/disk01_files/leveldata_telescope.inc
View File

@ -8,7 +8,7 @@ locations:
; RIVEN_TELESCOPE -- near telescope
location0:
.byte $ff ; north exit
.byte LOAD_ARRIVAL<<4|RIVEN_ARRIVAL_NEAR ; south exit
.byte LOAD_ARRIVAL2<<4|RIVEN_ARRIVAL2 ; south exit
.byte $FF ; east exit
.byte RIVEN_MANHOLE ; west exit
.byte DIRECTION_N ; north exit_dir

2
games/riven_hgr/title.s
View File

@ -525,7 +525,7 @@ riven_title_image:
;01234567890123456789012345678901234567890
title_text:
.byte 0, 0,"LOADING RIVEN SUBSET DISK 00 V0.06",0
.byte 0, 0,"LOADING RIVEN SUBSET DISK 00 V0.07",0
;
;