Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-07-28 00:29:15 +00:00
Code Issues Projects Releases Wiki Activity

riven: straighted out disk41 nonsense

Browse Source
This commit is contained in:
Vince Weaver 2024-06-24 22:29:44 -04:00
parent 2a20694579
commit b834b3043f
14 changed files with 142 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/riven_hgr/Makefile
View File

@ -84,8 +84,8 @@ riven_disk41.dsk: QBOOT QLOAD TITLE_41 \
$(DOS33_RAW) riven_disk41.dsk 2 0 disk41_files/LEVEL_TUNNEL 0 0
$(DOS33_RAW) riven_disk41.dsk 10 0 disk41_files/LEVEL_STAIRS 0 0
$(DOS33_RAW) riven_disk41.dsk 17 0 disk41_files/LEVEL_COVE 0 0
$(DOS33_RAW) riven_disk41.dsk 25 0 disk41_files/LEVEL_STAIRS2 0 0
$(DOS33_RAW) riven_disk41.dsk 32 0 disk41_files/MOVIE_COVE 0 0
$(DOS33_RAW) riven_disk41.dsk 24 0 disk41_files/LEVEL_STAIRS2 0 0
$(DOS33_RAW) riven_disk41.dsk 31 0 disk41_files/MOVIE_COVE 0 0
riven_disk43.dsk: QBOOT QLOAD TITLE_43 \
disk43_files/DISK43 \

16
games/riven_hgr/NOTES
View File

@ -70,17 +70,11 @@ Disk41 Map (disk has 35 tracks, each 4k in size)
T 0 = Qboot
T 1 = QLOAD 1762 bytes 8S = 0T8S (2048) 300B free
T 1.5 = TITLE 1531 bytes 8S = 0T8S (2048) 500B free
T 2 = TUNNEL 30609 bytes = 8T (32768) 2k free
T 10 = STAIRS 25533 100S= 6T4S (28672) 3k free
T 17 = COVE 18337 = 5T (20480) 2k free
T 25 = STAIRS2 24965 = 7T (28672)
T 32 = MOVIE_COVE 1272 = 2T (8192)
3400 4300
3600 5200 = 16500
3500 4500 = 17900
4800 5100
T 2 = TUNNEL 30669 bytes = 8T (32768) 2k free
T 10 = STAIRS 25624 = 7T (28672) 3k free
T 17 = COVE 26422 = 7T (28672) 2k free
T 24 = STAIRS2 27139 = 7T (28672) 1k free
T 31 = MOVIE_COVE 8299 = 3T (12288) 4k free
Disk43 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5
games/riven_hgr/disk41_files/graphics_cove/Makefile
View File

@ -6,9 +6,12 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: cove_graphics.inc
cove_graphics.inc: \
stairs_down1_e.hgr.zx02 stairs_down1_w.hgr.zx02 \
stairs_down2_e.hgr.zx02 stairs_down2_w.hgr.zx02 \
cove_e.hgr.zx02 cove_w.hgr.zx02
echo "stairs_down2_e_zx02: .incbin \"stairs_down2_e.hgr.zx02\"" > cove_graphics.inc
echo "stairs_down1_e_zx02: .incbin \"stairs_down1_e.hgr.zx02\"" > cove_graphics.inc
echo "stairs_down1_w_zx02: .incbin \"stairs_down1_w.hgr.zx02\"" >> cove_graphics.inc
echo "stairs_down2_e_zx02: .incbin \"stairs_down2_e.hgr.zx02\"" >> cove_graphics.inc
echo "stairs_down2_w_zx02: .incbin \"stairs_down2_w.hgr.zx02\"" >> cove_graphics.inc
echo "cove_e_zx02: .incbin \"cove_e.hgr.zx02\"" >> cove_graphics.inc
echo "cove_w_zx02: .incbin \"cove_w.hgr.zx02\"" >> cove_graphics.inc

0
games/riven_hgr/disk41_files/graphics_stairs/stairs_down1_e.png → games/riven_hgr/disk41_files/graphics_cove/stairs_down1_e.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
games/riven_hgr/disk41_files/graphics_stairs/stairs_down1_w.png → games/riven_hgr/disk41_files/graphics_cove/stairs_down1_w.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

7
games/riven_hgr/disk41_files/graphics_stairs/Makefile
View File

@ -8,13 +8,14 @@ all: stairs_graphics.inc
stairs_graphics.inc: \
stairs_s.hgr.zx02 stairs_n.hgr.zx02 \
stairs_e.hgr.zx02 stairs_w.hgr.zx02 \
stairs_down1_e.hgr.zx02 stairs_down1_w.hgr.zx02
stairs_up1_e.hgr.zx02 stairs_up1_w.hgr.zx02
echo "stairs_s_zx02: .incbin \"stairs_s.hgr.zx02\"" > stairs_graphics.inc
echo "stairs_n_zx02: .incbin \"stairs_n.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_e_zx02: .incbin \"stairs_e.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_w_zx02: .incbin \"stairs_w.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_down1_e_zx02: .incbin \"stairs_down1_e.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_down1_w_zx02: .incbin \"stairs_down1_w.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_up1_e_zx02: .incbin \"stairs_up1_e.hgr.zx02\"" >> stairs_graphics.inc
echo "stairs_up1_w_zx02: .incbin \"stairs_up1_w.hgr.zx02\"" >> stairs_graphics.inc
####

0
games/riven_hgr/disk41_files/graphics_stairs2/stairs_up1_e.png → games/riven_hgr/disk41_files/graphics_stairs/stairs_up1_e.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

0
games/riven_hgr/disk41_files/graphics_stairs2/stairs_up1_w.png → games/riven_hgr/disk41_files/graphics_stairs/stairs_up1_w.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

9
games/riven_hgr/disk41_files/graphics_stairs2/Makefile
View File

@ -6,18 +6,15 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: stairs2_graphics.inc
stairs2_graphics.inc: \
stairs_up1_e.hgr.zx02 stairs_up1_w.hgr.zx02 \
stairs_up2_e.hgr.zx02 stairs_up2_w.hgr.zx02 \
stairs_up3_e.hgr.zx02 stairs_up3_w.hgr.zx02 \
stairs_up4_e.hgr.zx02 stairs_up4_w.hgr.zx02
echo "stairs_up1_e_zx02: .incbin \"stairs_up1_e.hgr.zx02\"" > stairs2_graphics.inc
echo "stairs_up1_w_zx02: .incbin \"stairs_up1_w.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up2_e_zx02: .incbin \"stairs_up2_e.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up2_e_zx02: .incbin \"stairs_up2_e.hgr.zx02\"" > stairs2_graphics.inc
echo "stairs_up2_w_zx02: .incbin \"stairs_up2_w.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up3_e_zx02: .incbin \"stairs_up3_e.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up3_w_zx02: .incbin \"stairs_up3_w.hgr.zx02\"" >> stairs2_graphics.inc
# echo "stairs_up4_e_zx02: .incbin \"stairs_up4_e.hgr.zx02\"" >> stairs2_graphics.inc
# echo "stairs_up4_w_zx02: .incbin \"stairs_up4_w.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up4_e_zx02: .incbin \"stairs_up4_e.hgr.zx02\"" >> stairs2_graphics.inc
echo "stairs_up4_w_zx02: .incbin \"stairs_up4_w.hgr.zx02\"" >> stairs2_graphics.inc
####

2
games/riven_hgr/disk41_files/level_cove.s
View File

@ -32,7 +32,7 @@ riven_jungle_cove:
beq no_beach_patch
lda #RIVEN_COVE
sta location0+2
sta location1+2
no_beach_patch:

25
games/riven_hgr/disk41_files/leveldata_cove.inc
View File

@ -3,10 +3,28 @@
;===============================================
locations:
.word location0,location1
.word location0,location1,location2
; RIVEN_DOWN1 -- down one flight of stairs
location0:
.byte $ff ; north exit
.byte $ff ; south exit
.byte RIVEN_DOWN2 ; east exit
.byte LOAD_STAIRS<<4|RIVEN_STAIRS ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word stairs_down1_e_zx02 ; east bg
.word stairs_down1_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_DOWN2 -- down two flights of stairs
location0:
location1:
.byte $ff ; north exit
.byte $ff ; south exit
.byte LOAD_MOVIE_COVE<<4
@ -24,7 +42,7 @@ location0:
.byte $ff ; special exit
; RIVEN_COVE -- down by the cove
location1:
location2:
.byte $ff ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
@ -39,4 +57,3 @@ location1:
.word cove_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit

19
games/riven_hgr/disk41_files/leveldata_stairs.inc
View File

@ -9,8 +9,8 @@ locations:
location0:
.byte LOAD_TUNNEL2<<4|RIVEN_TUNNEL8; north exit
.byte $FF ; south exit
.byte RIVEN_DOWN1 ; east exit
.byte LOAD_STAIRS2<<4|RIVEN_UP1 ; west exit
.byte LOAD_COVE<<4|RIVEN_DOWN1 ; east exit
.byte RIVEN_UP1 ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
@ -22,20 +22,21 @@ location0:
.byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_DOWN1 -- down one flight of stairs
; RIVEN_UP1 -- going up
location1:
.byte $ff ; north exit
.byte $ff ; south exit
; .byte LOAD_MOVIE_COVE<<4
.byte LOAD_COVE<<4|RIVEN_DOWN2 ; east exit
.byte RIVEN_STAIRS ; west exit
.byte $FF ; south exit
.byte RIVEN_STAIRS ; east exit
.byte LOAD_STAIRS2<<4|RIVEN_UP2 ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word stairs_down1_e_zx02 ; east bg
.word stairs_down1_w_zx02 ; west bg
.word stairs_up1_e_zx02 ; east bg
.word stairs_up1_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit

43
games/riven_hgr/disk41_files/leveldata_stairs2.inc
View File

@ -5,28 +5,11 @@
locations:
.word location0,location1,location2
; RIVEN_UP1 -- going up
; RIVEN_UP2 -- going up
location0:
.byte $ff ; north exit
.byte $FF ; south exit
.byte LOAD_STAIRS<<4|RIVEN_STAIRS ; east exit
.byte RIVEN_UP2 ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word stairs_up1_e_zx02 ; east bg
.word stairs_up1_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_UP2 -- going up
location1:
.byte $ff ; north exit
.byte $FF ; south exit
.byte RIVEN_UP1 ; east exit
.byte LOAD_STAIRS<<4|RIVEN_UP1 ; east exit
.byte RIVEN_UP3 ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
@ -40,11 +23,11 @@ location1:
.byte $ff ; special exit
; RIVEN_UP3 -- going up
location2:
location1:
.byte $ff ; north exit
.byte $FF ; south exit
.byte RIVEN_UP2 ; east exit
.byte $FF ; west exit
.byte RIVEN_UP4 ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
@ -56,3 +39,21 @@ location2:
.byte BG_EAST|BG_WEST
.byte $ff ; special exit
; RIVEN_UP4 -- going up
location2:
.byte $ff ; north exit
.byte $FF ; south exit
.byte RIVEN_UP3 ; east exit
.byte $FF ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word stairs_up4_e_zx02 ; east bg
.word stairs_up4_w_zx02 ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit

75
games/riven_hgr/disk41_files/movie_cove.s
View File

@ -23,9 +23,11 @@ movie_cove_start:
bit SET_GR
bit LORES
bit FULLGR
bit PAGE1
jsr GR
bit FULLGR
lda #0
sta SCENE_COUNT
@ -34,6 +36,43 @@ movie_cove_start:
bit KEYRESET
;===============================
; load audio
;===============================
; we do this fist as our program is long enough the audio
; data loads up past $4000 and will get over-written
; by the graphics data loaded later
lda SOUND_STATUS
and #SOUND_IN_LC
beq do_not_load_audio
; load sounds into LC
; read ram, write ram, use $d000 bank1
bit $C08B
bit $C08B
lda #<audio_data_zx02
sta ZX0_src
lda #>audio_data_zx02
sta ZX0_src+1
lda #$D0 ; decompress to $D000
jsr full_decomp
; read rom, nowrite, use $d000 bank1
bit $C08A
do_not_load_audio:
;===============================
;===============================
; set up graphics
@ -47,7 +86,7 @@ movie_cove_start:
lda #<movie_data_zx02
sta ZX0_src
lda #>movie_data_zx02
sta ZX0_src+1
sta ZX0_src+1
lda #$40
@ -73,11 +112,35 @@ movie_cove_start:
;===============================
; TODO: play audio
; play audio
;===============================
lda SOUND_STATUS
and #SOUND_IN_LC
beq do_not_play_audio
; load sounds into LC
; read ram, write ram, use $d000 bank1
bit $C08B
bit $C08B
; call the btc player
lda #$00
sta BTC_L
lda #$D0
sta BTC_H
ldx #45 ; length
jsr play_audio
; read rom, nowrite, use $d000 bank1
bit $C08A
do_not_play_audio:
;===============================
@ -205,11 +268,13 @@ done_pageflip:
rts
.include "../audio.s"
;===================================
movie_data_zx02:
.incbin "movie_cove/combined_cove.zx02"
audio_data_zx02:
.incbin "audio/cove.btc.zx02"