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

riven: hook up journals and spires

Browse Source
This commit is contained in:
Vince Weaver
2024-08-25 20:35:28 -04:00
parent 6faba28f36
commit 89ce54f669
13 changed files with 542 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
games/peasant/Makefile
View File

@@ -782,4 +782,5 @@ clean:
rm -f *~ *.o *.lst HELLO VID_LOGO TITLE INTRO COPY_CHECK \
PEASANT1 PEASANT2 PEASANT3 PEASANT4 \
TROGDOR ENDING MUSIC GAME_OVER \
*.ZX02 dialog_peasant2
*.ZX02 dialog_peasant2 \
generate_common generate_all_symbols

109
games/riven_hgr/Makefile
View File

@@ -12,12 +12,13 @@ PRODOS_RAW = ../../utils/prodos-utils/prodos_raw
all: riven_disk00.dsk \
riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
riven_disk04.dsk riven_disk05.dsk \
riven_disk04.dsk riven_disk05.dsk riven_disk06.dsk \
riven_disk10.dsk \
riven_disk16.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
riven_disk60.dsk \
riven_hgr.2mg
@@ -153,6 +154,22 @@ riven_disk05.dsk: QBOOT QLOAD TITLE_05 \
$(DOS33_RAW) riven_disk05.dsk 8 0 disk05_files/LEVEL_CHAIR2 0 0
$(DOS33_RAW) riven_disk05.dsk 15 0 disk05_files/MOVIE_CHAIR 0 0
###
riven_disk06.dsk: QBOOT QLOAD TITLE_06 \
disk06_files/DISK06 \
disk06_files/ATRUS_JOURNAL
cp $(EMPTY_DISK)/empty.dsk riven_disk06.dsk
$(DOS33_RAW) riven_disk06.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk06.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk06.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk06.dsk 0 1 disk06_files/DISK06 0 0
$(DOS33_RAW) riven_disk06.dsk 0 8 TITLE_06 0 0
$(DOS33_RAW) riven_disk06.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk06.dsk 2 0 disk06_files/ATRUS_JOURNAL 0 0
###
@@ -331,6 +348,19 @@ riven_disk50.dsk: QBOOT QLOAD TITLE_50 \
$(DOS33_RAW) riven_disk50.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk50.dsk 2 0 disk50_files/LEVEL_CHIPPER 0 0
riven_disk60.dsk: QBOOT QLOAD TITLE_60 \
disk60_files/DISK60 \
disk60_files/LEVEL_SPIRES
cp $(EMPTY_DISK)/empty.dsk riven_disk60.dsk
$(DOS33_RAW) riven_disk60.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk60.dsk 0 2 QBOOT 1 1
$(DOS33_RAW) riven_disk60.dsk 0 4 QBOOT 2 1
$(DOS33_RAW) riven_disk60.dsk 0 1 disk60_files/DISK60 0 0
$(DOS33_RAW) riven_disk60.dsk 0 8 TITLE_60 0 0
$(DOS33_RAW) riven_disk60.dsk 1 0 QLOAD 0 0
$(DOS33_RAW) riven_disk60.dsk 2 0 disk60_files/LEVEL_SPIRES 0 0
###
QBOOT: qboot_sector.o
@@ -438,6 +468,18 @@ title_05.o: title.s zp.inc hardware.inc \
####
TITLE_06: title_06.o
ld65 -o TITLE_06 title_06.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_06.o: title.s zp.inc hardware.inc \
qload.inc \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_06.o title.s -DDISK=06 -l title_06.lst
####
TITLE_10: title_10.o
ld65 -o TITLE_10 title_10.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
@@ -541,6 +583,19 @@ title_50.o: title.s zp.inc hardware.inc \
ca65 -o title_50.o title.s -DDISK=50 -l title_50.lst
####
TITLE_60: title_60.o
ld65 -o TITLE_60 title_60.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
title_60.o: title.s zp.inc hardware.inc \
qload.inc \
hgr_tables.s \
graphics_title/riven_title.hgr.zx02
ca65 -o title_60.o title.s -DDISK=60 -l title_60.lst
####
@@ -563,6 +618,9 @@ disk04_files/DISK04:
disk05_files/DISK05:
cd disk05_files && make
disk06_files/DISK06:
cd disk06_files && make
disk10_files/DISK10:
cd disk10_files && make
@@ -590,6 +648,9 @@ disk44_files/DISK44:
disk50_files/DISK50:
cd disk50_files && make
disk60_files/DISK60:
cd disk60_files && make
####
@@ -672,6 +733,11 @@ disk05_files/MOVIE_CHAIR:
####
disk06_files/ATRUS_JOURNAL:
cd disk06_files && make
####
disk10_files/LEVEL_CENTER:
cd disk10_files && make
@@ -771,6 +837,11 @@ disk44_files/LEVEL_FISH:
disk50_files/LEVEL_CHIPPER:
cd disk50_files && make
####
disk60_files/LEVEL_SPIRES:
cd disk60_files && make
####
@@ -786,16 +857,18 @@ clean:
rm -f *~ *.o *.lst dts_block generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_02 TITLE_03 TITLE_04 TITLE_05 \
TITLE_10 \
TITLE_06 TITLE_10 \
TITLE_16 \
TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50 \
TITLE_60
cd disk00_files && make clean
cd disk01_files && make clean
cd disk02_files && make clean
cd disk03_files && make clean
cd disk04_files && make clean
cd disk05_files && make clean
cd disk06_files && make clean
cd disk10_files && make clean
cd disk16_files && make clean
cd disk38_files && make clean
@@ -805,6 +878,7 @@ clean:
cd disk43_files && make clean
cd disk44_files && make clean
cd disk50_files && make clean
cd disk60_files && make clean
####
@@ -812,10 +886,11 @@ distclean:
rm -f *~ *.o *.lst generate_common \
QBOOT QLOAD QLOAD_HD \
TITLE_00 TITLE_01 TITLE_02 TITLE_03 TITLE_04 TITLE_05 \
TITLE_10 \
TITLE_06 TITLE_10 \
TITLE_16 \
TITLE_38 TITLE_39 \
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50
TITLE_40 TITLE_41 TITLE_43 TITLE_44 TITLE_50 \
TITLE_60
cd graphics_title && make clean
cd graphics_sprites && make clean
cd disk00_files && make distclean
@@ -824,6 +899,7 @@ distclean:
cd disk03_files && make distclean
cd disk04_files && make distclean
cd disk05_files && make distclean
cd disk06_files && make distclean
cd disk10_files && make distclean
cd disk16_files && make distclean
cd disk38_files && make distclean
@@ -833,6 +909,7 @@ distclean:
cd disk43_files && make distclean
cd disk44_files && make distclean
cd disk50_files && make distclean
cd disk60_files && make distclean
###
@@ -860,24 +937,30 @@ qload.inc: generate_common QLOAD
./generate_common -a 0x1600 -s force_uppercase qload.lst >> qload.inc
./generate_common -a 0x1600 -s gr_offsets qload.lst >> qload.inc
./generate_common -a 0x1600 -s clear_gr_all qload.lst >> qload.inc
./generate_common -a 0x1600 -s clear_bottom_loop_outer qload.lst >> qload.inc
./generate_common -a 0x1600 -s clear_value_smc qload.lst >> qload.inc
./generate_common -a 0x1600 -s set_inverse qload.lst >> qload.inc
./generate_common -a 0x1600 -s ps_smc1 qload.lst >> qload.inc
submit: riven_disk00.dsk riven_disk01.dsk riven_disk02.dsk riven_disk03.dsk \
riven_disk04.dsk riven_disk05.dsk \
riven_disk04.dsk riven_disk05.dsk riven_disk06.dsk \
riven_disk10.dsk \
riven_disk16.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk riven_disk44.dsk \
riven_disk50.dsk \
riven_disk60.dsk \
riven_hgr.2mg
zip riven_hgr.zip riven_disk00.dsk riven_disk01.dsk \
riven_disk02.dsk riven_disk03.dsk riven_disk04.dsk \
riven_disk05.dsk \
riven_disk05.dsk riven_disk06.dsk \
riven_disk10.dsk \
riven_disk16.dsk \
riven_disk38.dsk riven_disk39.dsk \
riven_disk40.dsk riven_disk41.dsk riven_disk43.dsk \
riven_disk44.dsk \
riven_disk50.dsk
riven_disk50.dsk \
riven_disk60.dsk
zip riven_hgr.2mg.zip riven_hgr.2mg
###
@@ -927,6 +1010,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk05_files/LEVEL_CHAIR \
disk05_files/LEVEL_CHAIR2 \
disk05_files/MOVIE_CHAIR \
disk06_files/DISK06 \
disk06_files/ATRUS_JOURNAL \
disk10_files/DISK10 \
disk10_files/LEVEL_CENTER \
disk10_files/LEVEL_PILLARS \
@@ -974,7 +1059,9 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk44_files/LEVEL_PATH \
disk44_files/LEVEL_FISH \
disk50_files/DISK50 \
disk50_files/LEVEL_CHIPPER
disk50_files/LEVEL_CHIPPER \
disk60_files/DISK60 \
disk60_files/LEVEL_SPIRES
$(PRODOSDIR)/mkprodosfs riven_hgr.2mg -n Riven -b 65535 -2
$(PRODOS_RAW) riven_hgr.2mg 0 PROBOOTHD 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 0 1 0` QLOAD_HD 0 0
@@ -1014,6 +1101,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 2 0` disk05_files/LEVEL_CHAIR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 8 0` disk05_files/LEVEL_CHAIR2 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 5 15 0` disk05_files/MOVIE_CHAIR 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 6 0 2` disk06_files/DISK06 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 6 2 0` disk06_files/ATRUS_JOURNAL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 10 0 2` disk10_files/DISK10 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 10 2 0` disk10_files/LEVEL_CENTER 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 10 8 0` disk10_files/LEVEL_15 0 0
@@ -1062,6 +1151,8 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(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
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 60 0 2` disk60_files/DISK60 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 60 2 0` disk60_files/LEVEL_SPIRES 0 0
###

38
games/riven_hgr/disk06_files/Makefile Normal file
View File

@@ -0,0 +1,38 @@
include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK06 ATRUS_JOURNAL
####
DISK06: disk06.o
ld65 -o DISK06 disk06.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
disk06.o: disk06.s ../zp.inc
ca65 -o disk06.o disk06.s -l disk06.lst
####
ATRUS_JOURNAL: atrus_journal.o
ld65 -o ATRUS_JOURNAL atrus_journal.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
atrus_journal.o: atrus_journal.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk06_defines.inc
ca65 -o atrus_journal.o atrus_journal.s -l atrus_journal.lst
####
clean:
rm -f *~ *.o *.lst DISK06 \
ATRUS_JOURNAL
####
distclean:
rm -f *~ *.o *.lst DISK06 \
ATRUS_JOURNAL

81
games/riven_hgr/disk06_files/disk06.s Normal file
View File

@@ -0,0 +1,81 @@
.include "../zp.inc"
.include "../disk00_files/disk00_defines.inc"
which_disk_bcd:
.byte $06 ; BCD
which_disk_bin:
.byte 6
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, ATRUS,
.byte $40,$00,$00,$00 ;
track_array:
.byte 0, 2, 8,15 ; TITLE, ATRUS,
.byte 22,0,0,0 ;
sector_array:
.byte 8, 0, 0, 0 ; TITLE, ATRUS,
.byte 0,0,0,0 ;
length_array:
.byte 8, 96,112,80 ; TITLE, ATRUS,
.byte 80,0,0,0
disk_exit_disk: ; note: not BCD anymore
.byte 4
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_disk_bcd:
.byte $04
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_dni_h:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_dni_l:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
;
disk_exit_load:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte LOAD_CYAN
disk_exit_level:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_direction:
.byte DIRECTION_E
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0

4
games/riven_hgr/disk06_files/disk06_defines.inc Normal file
View File

@@ -0,0 +1,4 @@
LOAD_TITLE_06 = 0
LOAD_ATRUS_JOURNAL = 1
RIVEN_JOURNAL = 0

81
games/riven_hgr/disk60_files/disk60.s Normal file
View File

@@ -0,0 +1,81 @@
.include "../zp.inc"
.include "../disk00_files/disk00_defines.inc"
which_disk_bcd:
.byte $60 ; BCD
which_disk_bin:
.byte 60
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, SPIRES
.byte $40,$00,$00,$00 ;
track_array:
.byte 0, 2, 9,15 ; TITLE, SPIRES
.byte 21,0,0,0 ;
sector_array:
.byte 8, 0, 0, 0 ; TITLE, SPIRES
.byte 0,0,0,0 ;
length_array:
.byte 8,112,96,80 ; TITLE, SPIRES
.byte 80,0,0,0
disk_exit_disk: ; note: not BCD anymore
.byte 10
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_disk_bcd:
.byte $10
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_dni_h:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_dni_l:
.byte $20
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
;
disk_exit_load:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte LOAD_CYAN
disk_exit_level:
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
disk_exit_direction:
.byte DIRECTION_N
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0

9
games/riven_hgr/disk60_files/disk60_defines.inc Normal file
View File

@@ -0,0 +1,9 @@
LOAD_TITLE_60 = 0
LOAD_SPIRES = 1
;================================
; Level definitions
; SPIRES
RIVEN_SPIRES = 0

24
games/riven_hgr/disk60_files/graphics_spires/Makefile Normal file
View File

@@ -0,0 +1,24 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: spires_graphics.inc
spires_graphics.inc: \
spires_n.hgr.zx02
echo "spires_n_zx02: .incbin \"spires_n.hgr.zx02\"" > spires_graphics.inc
####
%.hgr: %.png
$(PNG_TO_HGR) $< > $@
%.hgr.zx02: %.hgr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.hgr spires_graphics.inc

BIN
games/riven_hgr/disk60_files/graphics_spires/spires_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

105
games/riven_hgr/disk60_files/level_spires.s Normal file
View File

@@ -0,0 +1,105 @@
; Riven -- Spires
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "../zp.inc"
.include "../hardware.inc"
.include "../common_defines.inc"
.include "../qload.inc"
.include "disk60_defines.inc"
spires_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
;===================================
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_spires/spires_graphics.inc"
.include "leveldata_spires.inc"

23
games/riven_hgr/disk60_files/leveldata_spires.inc Normal file
View File

@@ -0,0 +1,23 @@
;===============================================
; level data for spires
;===============================================
locations:
.word location0
; RIVEN_SPIRES -- spires
location0:
.byte $ff ; north exit
.byte $ff ; 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 spires_n_zx02 ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH
.byte $ff

39
games/riven_hgr/text_print.s
View File

@@ -45,16 +45,43 @@ print_string_loop:
beq done_print_string
; adjust for upper/lowercase
; $20..$80
; normal
; $20..$3F (symbols) = $A0-$BF (ora $80)
; $40..$5F (uppercase) = $C0-$DF (ora $80)
; $60..$7F (lowercase) = $E0-$FF (ora $80)
; inverse (need to set $C00F if lowercase, but
; that will make uppercase into mousechars :( )
; $20..$3F (symbols) = $20-$3F (and $7f)
; $40..$5F (uppercase) = $00-$1F (and $3f)
; $60..$7F (lowercase) = $60-$7F (and $7f)
cmp #$60
bcc not_lowercase
; here if lowercase
ps_smc2:
and #$ff
and #$ff ; $9f to force uppercase, $ff regular
not_lowercase:
; adjust for inverse/flash/normal
ps_smc1:
and #$3f ; make sure we are inverse
and #$7f ; this will be ORA $80 if normal
; this will be AND $3F if inverse
; we want to skip if inverse
; and not capital letters blah
cmp #$40
bcc not_inverse_uppercase
cmp #$60
bcs not_inverse_uppercase
and #$3f
not_inverse_uppercase:
sta (BASL),Y
iny
bne print_string_loop
@@ -91,6 +118,14 @@ set_normal:
rts
; restore inverse text
; urgh, inverse is $00..$??
; for lowercase though it's $60..$??
; and you have to set $c00f first?
; so $3f on Apple II
; so mask with #$7f instead on IIe+
set_inverse:
lda #$3f ;
sta ps_smc1+1

39
games/riven_hgr/title.s
View File

@@ -32,6 +32,10 @@
.include "disk05_files/disk05_defines.inc"
.endif
.if DISK=06
.include "disk06_files/disk06_defines.inc"
.endif
.if DISK=10
.include "disk10_files/disk10_defines.inc"
.endif
@@ -68,6 +72,10 @@
.include "disk50_files/disk50_defines.inc"
.endif
.if DISK=60
.include "disk60_files/disk60_defines.inc"
.endif
riven_title:
@@ -140,7 +148,13 @@ go_print:
cmp #'+'
beq patch_uppercase
cmp #' '
bne no_patch_uppercase
beq patch_uppercase
non_ii_or_iiplus:
sta $C00F ; ALTCHR, allow lowercase inverse
; lda #$7f
; sta set_inverse+1
jmp no_patch_uppercase
patch_uppercase:
jsr force_uppercase
@@ -479,6 +493,18 @@ game_continue:
sta DIRECTION
.endif
.if DISK=06
lda #LOAD_ATRUS_JOURNAL
sta WHICH_LOAD
lda #RIVEN_JOURNAL
sta LOCATION
lda #DIRECTION_N
sta DIRECTION
.endif
.if DISK=10
lda #LOAD_15
sta WHICH_LOAD
@@ -587,6 +613,17 @@ game_continue:
sta DIRECTION
.endif
.if DISK=60
lda #LOAD_SPIRES
sta WHICH_LOAD
lda #RIVEN_SPIRES
sta LOCATION
lda #DIRECTION_N
sta DIRECTION
.endif
rts