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

riven: hookup placeholder for return maglev flip

Browse Source
This commit is contained in:
Vince Weaver
2024-07-17 14:34:40 -04:00
parent d219019ee4
commit 13ac3dc867
7 changed files with 122 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
games/riven_hgr/Makefile
View File

@@ -85,7 +85,8 @@ riven_disk40.dsk: QBOOT QLOAD TITLE_40 \
disk40_files/LEVEL_MAGLEV \
disk40_files/LEVEL_OUTSIDE \
disk40_files/LEVEL_ORB \
disk40_files/LEVEL_TUNNEL
disk40_files/LEVEL_TUNNEL \
disk40_files/MOVIE_MAGLEV_FLIP
cp $(EMPTY_DISK)/empty.dsk riven_disk40.dsk
$(DOS33_RAW) riven_disk40.dsk 0 0 QBOOT 0 1
$(DOS33_RAW) riven_disk40.dsk 0 2 QBOOT 1 1
@@ -97,6 +98,7 @@ riven_disk40.dsk: QBOOT QLOAD TITLE_40 \
$(DOS33_RAW) riven_disk40.dsk 10 0 disk40_files/LEVEL_OUTSIDE 0 0
$(DOS33_RAW) riven_disk40.dsk 15 0 disk40_files/LEVEL_TUNNEL 0 0
$(DOS33_RAW) riven_disk40.dsk 21 0 disk40_files/LEVEL_ORB 0 0
$(DOS33_RAW) riven_disk40.dsk 25 0 disk40_files/MOVIE_MAGLEV_FLIP 0 0
riven_disk41.dsk: QBOOT QLOAD TITLE_41 \
disk41_files/DISK41 \
@@ -408,6 +410,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
disk40_files/LEVEL_OUTSIDE \
disk40_files/LEVEL_ORB \
disk40_files/LEVEL_TUNNEL \
disk40_files/MOVIE_MAGLEV_FLIP \
disk41_files/DISK41 \
disk41_files/LEVEL_TUNNEL \
disk41_files/LEVEL_STAIRS \
@@ -444,6 +447,7 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 40 10 0` disk40_files/LEVEL_OUTSIDE 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 40 15 0` disk40_files/LEVEL_TUNNEL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 40 21 0` disk40_files/LEVEL_ORB 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 40 25 0` disk40_files/MOVIE_MAGLEV_FLIP 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 41 0 2` disk41_files/DISK41 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 41 2 0` disk41_files/LEVEL_TUNNEL 0 0
$(PRODOS_RAW) riven_hgr.2mg `./dts_block 41 10 0` disk41_files/LEVEL_STAIRS 0 0

17
games/riven_hgr/disk40_files/Makefile
View File

@@ -3,7 +3,8 @@ include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK40 LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB LEVEL_TUNNEL
all: DISK40 LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB LEVEL_TUNNEL \
MOVIE_MAGLEV_FLIP
###
@@ -63,6 +64,20 @@ level_tunnel.o: level_tunnel.s \
ca65 -o level_tunnel.o level_tunnel.s -l level_tunnel.lst
####
MOVIE_MAGLEV_FLIP: movie_maglev_flip.o
ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
movie_maglev_flip.o: movie_maglev_flip.s \
flip_pages.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk40_defines.inc \
movie_maglev_flip/movie_maglev_flip.inc \
../disk39_files/movie_maglev_flip/overlays/combined_overlays.zx02
ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst
####
####

26
games/riven_hgr/disk40_files/disk40.s
View File

@@ -8,59 +8,59 @@ which_disk_bin:
load_address_array:
.byte $40,$40,$40,$40 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte $40,$00,$00,$00 ; ORB
.byte $40,$40,$40,$00 ; ORB, MOVIE_FLIP, MOVIE_MAGLEV
track_array:
.byte 0, 2,10,15 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte 21, 0, 0, 0 ; ORB
.byte 0, 2, 10,15 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte 21, 25, 27, 0 ; ORB, MOVIE_FLIP, MOVIE_MAGLEV
sector_array:
.byte 8, 0, 0, 0 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte 0,0,0,0 ; ORB
.byte 0, 0, 0, 0 ; ORB, MOVIE_FLIP, MOVIE_MAGLEV
length_array:
.byte 8, 128, 80, 96 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte 64,0,0,0 ; ORB
.byte 8, 127, 80, 96 ; TITLE, MAGLEV, OUTSIDE, TUNNEL
.byte 64, 32,127, 0 ; ORB, MOVIE_FLIP, MOVIE_MAGLEV
disk_exit_disk: ; note: not BCD anymore
.byte 41 ; Tunnel (DISK41)
.byte $00
.byte 39 ; Temple Maglev (DISK39)
.byte $00
.byte $00
disk_exit_disk_bcd:
.byte $41 ; Tunnel (DISK41)
.byte $00
.byte $39 ; Temple Maglev (DISK39)
.byte $00
.byte $00
disk_exit_dni_h:
.byte $01 ; 41 = 1*25 + 3*5 + 1
.byte $00
.byte $01 ; 38 = 1*25 + 2*5 + 3
.byte $00
.byte $00
disk_exit_dni_l:
.byte $31
.byte $00
.byte $23
.byte $00
.byte $00
; load_tunnel / tunnel5 / s
disk_exit_load:
.byte 1 ; LOAD_TUNNEL
.byte 0
.byte 4 ; LOAD_MAGLEV
.byte 0
.byte 0
disk_exit_level:
.byte $00 ; Tunnel 5
.byte $00
.byte 2 ; RIVEN_INSEAT
.byte $00
.byte $00
disk_exit_direction:
.byte DIRECTION_S ; facing south
.byte $00
.byte DIRECTION_W ; facing west
.byte $00
.byte $00

17
games/riven_hgr/disk40_files/flip_pages.s Normal file
View File

@@ -0,0 +1,17 @@
;============================
; flip pages
;============================
flip_pages:
lda DRAW_PAGE ; 3
beq was_page1 ; 2/3
was_page2:
bit PAGE2 ; 4
lda #$0 ; 2
beq done_pageflip ; 2/3
was_page1:
bit PAGE1 ; 4
lda #$4 ; 2
done_pageflip:
sta DRAW_PAGE ; 3
rts

8
games/riven_hgr/disk40_files/level_maglev.s
View File

@@ -105,7 +105,7 @@ really_exit:
handle1_clicked:
bit SPEAKER
.if 0
lda #0
sta MAGLEV_FLIP_DIRECTION
@@ -114,7 +114,7 @@ handle1_clicked:
lda #1
sta LEVEL_OVER
.endif
bit SPEAKER
rts
@@ -127,7 +127,7 @@ handle1_clicked:
handle2_clicked:
bit SPEAKER
.if 0
lda CURSOR_X
cmp #27
bcc go_for_maglev
@@ -146,7 +146,7 @@ common_handle2:
lda #1
sta LEVEL_OVER
.endif
bit SPEAKER
rts

67
games/riven_hgr/disk40_files/movie_maglev_flip/Makefile Normal file
View File

@@ -0,0 +1,67 @@
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02
PNG2GR = ../../../../utils/gr-utils/png2gr
all: movie_maglev_flip.inc
movie_maglev_flip.inc: \
img025_bg.gr.zx02
# img055_bg.gr.zx02 img056_bg.gr.zx02 img057_bg.gr.zx02 \
# img058_bg.gr.zx02 img059_bg.gr.zx02 img060_bg.gr.zx02 \
# img061_bg.gr.zx02 img062_bg.gr.zx02 img063_bg.gr.zx02 \
# img064_bg.gr.zx02 img065_bg.gr.zx02 img066_bg.gr.zx02 \
# img067_bg.gr.zx02 img068_bg.gr.zx02 img069_bg.gr.zx02 \
# img070_bg.gr.zx02 img071_bg.gr.zx02 img072_bg.gr.zx02 \
# img073_bg.gr.zx02 img074_bg.gr.zx02 img075_bg.gr.zx02 \
# img076_bg.gr.zx02 img077_bg.gr.zx02 img078_bg.gr.zx02 \
# img079_bg.gr.zx02 img080_bg.gr.zx02 img081_bg.gr.zx02 \
# img082_bg.gr.zx02 img083_bg.gr.zx02 img084_bg.gr.zx02
echo "img025_bg_zx02: .incbin \"img025_bg.gr.zx02\"" > movie_maglev_flip.inc
# echo "img055_bg_zx02: .incbin \"img055_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img056_bg_zx02: .incbin \"img056_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img057_bg_zx02: .incbin \"img057_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img058_bg_zx02: .incbin \"img058_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img059_bg_zx02: .incbin \"img059_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img060_bg_zx02: .incbin \"img060_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img061_bg_zx02: .incbin \"img061_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img062_bg_zx02: .incbin \"img062_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img063_bg_zx02: .incbin \"img063_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img064_bg_zx02: .incbin \"img064_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img065_bg_zx02: .incbin \"img065_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img066_bg_zx02: .incbin \"img066_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img067_bg_zx02: .incbin \"img067_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img068_bg_zx02: .incbin \"img068_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img069_bg_zx02: .incbin \"img069_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img070_bg_zx02: .incbin \"img070_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img071_bg_zx02: .incbin \"img071_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img072_bg_zx02: .incbin \"img072_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img073_bg_zx02: .incbin \"img073_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img074_bg_zx02: .incbin \"img074_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img075_bg_zx02: .incbin \"img075_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img076_bg_zx02: .incbin \"img076_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img077_bg_zx02: .incbin \"img077_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img078_bg_zx02: .incbin \"img078_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img079_bg_zx02: .incbin \"img079_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img080_bg_zx02: .incbin \"img080_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img081_bg_zx02: .incbin \"img081_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img082_bg_zx02: .incbin \"img082_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img083_bg_zx02: .incbin \"img083_bg.gr.zx02\"" >> movie_maglev_flip.inc
# echo "img084_bg_zx02: .incbin \"img084_bg.gr.zx02\"" >> movie_maglev_flip.inc
####
%.gr: %.png
$(PNG2GR) $< $@
%.gr.zx02: %.gr
$(ZX02) -f $< $@
####
clean:
rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_flip.inc
distclean:
rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_flip.inc
cd overlays && make clean

BIN
games/riven_hgr/disk40_files/movie_maglev_flip/img025_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB