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

riven_hgr: add more graphcis

Browse Source
This commit is contained in:
Vince Weaver 2024-07-23 00:59:26 -04:00
parent 76cdccf1a4
commit 50c3b55650
18 changed files with 255 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
games/riven_hgr/Makefile
View File

@ -47,7 +47,8 @@ riven_disk01.dsk: QBOOT QLOAD TITLE_01 \
disk01_files/LEVEL_ARRIVAL \
disk01_files/LEVEL_ARRIVAL2 \
disk01_files/LEVEL_TELESCOPE \
disk01_files/LEVEL_ARRIVAL3
disk01_files/LEVEL_ARRIVAL3 \
disk01_files/LEVEL_PATH
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
@ -58,7 +59,9 @@ riven_disk01.dsk: QBOOT QLOAD TITLE_01 \
$(DOS33_RAW) riven_disk01.dsk 2 0 disk01_files/LEVEL_ARRIVAL 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
$(DOS33_RAW) riven_disk01.dsk 20 0 disk01_files/LEVEL_ARRIVAL3 0 0
$(DOS33_RAW) riven_disk01.dsk 19 0 disk01_files/LEVEL_ARRIVAL3 0 0
$(DOS33_RAW) riven_disk01.dsk 27 0 disk01_files/LEVEL_PATH 0 0
@ -317,6 +320,9 @@ disk01_files/LEVEL_ARRIVAL2:
disk01_files/LEVEL_ARRIVAL3:
cd disk01_files && make
disk01_files/LEVEL_PATH:
cd disk01_files && make
####
disk00_files/DISK00:
cd disk00_files && make
@ -487,6 +493,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk01_files/LEVEL_ARRIVAL2 \
disk01_files/LEVEL_TELESCOPE \
disk01_files/LEVEL_ARRIVAL3 \
disk01_files/LEVEL_PATH \
disk38_files/DISK38 \
disk38_files/LEVEL_PROJECTOR \
disk39_files/DISK39 \
@ -531,7 +538,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 2 0` disk01_files/LEVEL_ARRIVAL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 9 0` disk01_files/LEVEL_ARRIVAL2 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 1 20 0` disk01_files/LEVEL_ARRIVAL3 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 19 0` disk01_files/LEVEL_ARRIVAL3 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 1 27 0` disk01_files/LEVEL_PATH 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

5
games/riven_hgr/NOTES
View File

@ -76,8 +76,9 @@ T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free
T 1 = QLOAD 2393 bytes 16S= 1T0S (4096) 2k free
T 2 = ARRIVAL 27040 bytes = 7T0S (28672) 1k free
T 9 = ARRIVAL2 15920 bytes = 4T0S (16384) 400B free
T 13 = TELESCOPE 19484 bytes = 7T0S (28672) 9k free
T 20 = ARRIVAL3 30786 bytes = 7T15S (32512) 2k free
T 13 = TELESCOPE 19484 bytes = 6T0S (24576) 5k free
T 19 = ARRIVAL3 30786 bytes = 7T15S (32512) 2k free
T 27 = STEPS 29647 bytes = 7T15S (32512) 3k free
Disk38 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

28
games/riven_hgr/disk01_files/Makefile
View File

@ -3,7 +3,8 @@ include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE LEVEL_ARRIVAL3
all: DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE LEVEL_ARRIVAL3 \
LEVEL_PATH
####
@ -53,7 +54,6 @@ level_telescope.o: level_telescope.s \
####
LEVEL_ARRIVAL3: level_arrival3.o
ld65 -o LEVEL_ARRIVAL3 level_arrival3.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
@ -66,6 +66,19 @@ level_arrival3.o: level_arrival3.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 disk01_defines.inc \
leveldata_path.inc \
graphics_path/path_graphics.inc
ca65 -o level_path.o level_path.s -l level_path.lst
####
graphics_arrival/arrival_graphics.inc:
cd graphics_arrival && make
@ -78,19 +91,24 @@ graphics_telescope/telescope_graphics.inc:
graphics_arrival3/arrival3_graphics.inc:
cd graphics_arrival3 && make
graphics_path/path_graphics.inc:
cd graphics_path && make
####
clean:
rm -f *~ *.o *.lst \
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE LEVEL_ARRIVAL3
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE \
LEVEL_ARRIVAL3 LEVEL_PATH
####
distclean:
rm -f *~ *.o *.lst \
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE LEVEL_ARRIVAL3
DISK01 LEVEL_ARRIVAL LEVEL_ARRIVAL2 LEVEL_TELESCOPE \
LEVEL_ARRIVAL3 LEVEL_PATH
cd graphics_arrival && make clean
cd graphics_arrival2 && make clean
cd graphics_telescope && make clean
cd graphics_arrival3 && make clean
cd graphcis_path && make clean

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

@ -10,18 +10,18 @@ which_disk_bin:
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte $40,$00,$00,$00 ; ARRIVAL3
.byte $40,$40,$00,$00 ; ARRIVAL3, PATH
track_array:
.byte 0, 2, 9,13 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 20,0,0,0 ; ARRIVAL3
.byte 19,27,0,0 ; ARRIVAL3, PATH
sector_array:
.byte 8, 0, 0, 0 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 0,0,0,0 ; ARRIVAL3
.byte 0,0,0,0 ; ARRIVAL3, PATH
length_array:
.byte 8, 112,64, 112 ; TITLE, ARRIVAL, ARRIVAL2, TELESCOPE
.byte 127,0,0,0 ; ARRIVAL3
.byte 127,127,0,0 ; ARRIVAL3, PATH
disk_exit_disk: ; note: not BCD anymore

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

@ -3,6 +3,7 @@ LOAD_ARRIVAL = 1
LOAD_ARRIVAL2 = 2
LOAD_TELESCOPE = 3
LOAD_ARRIVAL3 = 4
LOAD_PATH = 5
;================================
; Level definitions
@ -27,3 +28,8 @@ RIVEN_ARRIVAL3 = 0
RIVEN_ARRIVAL4 = 1
RIVEN_ARRIVAL5 = 2
; Path
RIVEN_PATH = 0
RIVEN_STEPS_BASE = 1
RIVEN_CLIFF_BASE = 2

33
games/riven_hgr/disk01_files/graphics_path/Makefile Normal file
View File

@ -0,0 +1,33 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: path_graphics.inc
path_graphics.inc: \
step_path_n.hgr.zx02 step_path_e.hgr.zx02 step_path_w.hgr.zx02 \
steps_base_n.hgr.zx02 steps_base_e.hgr.zx02 steps_base_w.hgr.zx02 \
cliff_base_e.hgr.zx02
echo "step_path_n_zx02: .incbin \"step_path_n.hgr.zx02\"" > path_graphics.inc
echo "step_path_e_zx02: .incbin \"step_path_e.hgr.zx02\"" >> path_graphics.inc
echo "step_path_w_zx02: .incbin \"step_path_w.hgr.zx02\"" >> path_graphics.inc
echo "steps_base_n_zx02: .incbin \"steps_base_n.hgr.zx02\"" >> path_graphics.inc
echo "steps_base_e_zx02: .incbin \"steps_base_e.hgr.zx02\"" >> path_graphics.inc
echo "steps_base_w_zx02: .incbin \"steps_base_w.hgr.zx02\"" >> path_graphics.inc
echo "cliff_base_e_zx02: .incbin \"cliff_base_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/disk01_files/graphics_path/cliff_base_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/step_path_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/step_path_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/step_path_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/steps_base_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/steps_base_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
games/riven_hgr/disk01_files/graphics_path/steps_base_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

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

@ -0,0 +1,112 @@
; Riven -- Dome Island -- Path to rest of game
; 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_path:
;===================
; 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_path/path_graphics.inc"
.include "leveldata_path.inc"

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

@ -27,11 +27,11 @@ location0:
location1:
.byte LOAD_ARRIVAL2<<4|RIVEN_ARRIVAL2 ; north exit
.byte RIVEN_ARRIVAL ; south exit
.byte $E0 ; leave to disk39 ; east exit
.byte LOAD_PATH<<4|RIVEN_PATH ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_N ; south exit_dir
.byte DIRECTION_W ; east exit_dir
.byte DIRECTION_E ; east exit_dir
.byte $ff ; west exit_dir
.word arrival_near_n_zx02 ; north bg
.word arrival_near_s_zx02 ; south bg

58
games/riven_hgr/disk01_files/leveldata_path.inc Normal file
View File

@ -0,0 +1,58 @@
;===============================================
; level data for Dome Island level -- path to rest
;===============================================
locations:
.word location0,location1,location2
; RIVEN_PATH
location0:
.byte RIVEN_STEPS_BASE ; north exit
.byte $FF ; south exit
.byte RIVEN_STEPS_BASE ; east exit
.byte LOAD_ARRIVAL<<4|RIVEN_ARRIVAL_NEAR ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word step_path_n_zx02 ; north bg
.word $0000 ; south bg
.word step_path_e_zx02 ; east bg
.word step_path_w_zx02 ; west bg
.byte BG_NORTH|BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_STEPS_BASE
location1:
.byte $E0 ; disk1 ; north exit
.byte $ff ; south exit
.byte RIVEN_CLIFF_BASE ; east exit
.byte RIVEN_PATH ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word steps_base_n_zx02 ; north bg
.word $0000 ; south bg
.word steps_base_e_zx02 ; east bg
.word steps_base_w_zx02 ; west bg
.byte BG_NORTH|BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_CLIFF_BASE
location2:
.byte $FF ; north exit
.byte $FF ; south exit
.byte RIVEN_STEPS_BASE ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte $ff ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word cliff_base_e_zx02 ; east bg
.word $0000 ; west bg
.byte BG_EAST
.byte $ff ; special exit

2
games/riven_hgr/disk50_files/Makefile
View File

@ -27,7 +27,7 @@ level_chipper.o: level_chipper.s \
####
graphics_chipper/start_graphics.inc:
graphics_chipper/chipper_graphics.inc:
cd graphics_chipper && make
####

4
games/riven_hgr/title.s
View File

@ -506,10 +506,10 @@ game_continue:
.endif
.if DISK=50
lda #LOAD_START
lda #LOAD_CHIPPER
sta WHICH_LOAD
lda #RIVEN_START_LOCATION
lda #RIVEN_CHIPPER
sta LOCATION
lda #DIRECTION_N