riven: start working on tunnel

This commit is contained in:
Vince Weaver 2024-06-22 01:06:39 -04:00
parent 755bc7b075
commit 7a02f912eb
10 changed files with 187 additions and 7 deletions

View File

@ -52,7 +52,8 @@ riven_disk40.dsk: QBOOT QLOAD TITLE_40 \
disk40_files/DISK40 \
disk40_files/LEVEL_MAGLEV \
disk40_files/LEVEL_OUTSIDE \
disk40_files/LEVEL_ORB
disk40_files/LEVEL_ORB \
disk40_files/LEVEL_TUNNEL
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
@ -62,7 +63,7 @@ riven_disk40.dsk: QBOOT QLOAD TITLE_40 \
$(DOS33_RAW) riven_disk40.dsk 1 9 TITLE_40 0 0
$(DOS33_RAW) riven_disk40.dsk 2 0 disk40_files/LEVEL_MAGLEV 0 0
$(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 15 0 disk40_files/LEVEL_TUNNEL 0 0
$(DOS33_RAW) riven_disk40.dsk 21 0 disk40_files/LEVEL_ORB 0 0
riven_disk43.dsk: QBOOT QLOAD TITLE_43 \

View File

@ -77,7 +77,7 @@ T 27 = MOVIE_CART32275 bytes 128S = 8T0S (32768)500B free
disk40: 80/67 in tunnel
Disk notes:

View File

@ -3,7 +3,7 @@ include ../../../Makefile.inc
LINKER_SCRIPTS = ../../../linker_scripts/
all: DISK40 LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB
all: DISK40 LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB LEVEL_TUNNEL
###
@ -50,6 +50,19 @@ level_orb.o: level_orb.s \
graphics_orb1/orb1_graphics.inc
ca65 -o level_orb.o level_orb.s -l level_orb.lst
####
LEVEL_TUNNEL: level_tunnel.o
ld65 -o LEVEL_TUNNEL level_tunnel.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
level_tunnel.o: level_tunnel.s \
../zp.inc ../hardware.inc ../qload.inc \
../common_defines.inc disk40_defines.inc \
leveldata_tunnel.inc \
graphics_tunnel/tunnel_graphics.inc
ca65 -o level_tunnel.o level_tunnel.s -l level_tunnel.lst
####
@ -62,11 +75,14 @@ graphics_outside/outside_graphics.inc:
graphics_orb1/orb1_graphics.inc:
cd graphics_orb1 && make
graphics_tunnel/tunnel_graphics.inc:
cd graphics_tunnel && make
####
clean:
rm -f *~ *.o *.lst \
LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB
LEVEL_MAGLEV LEVEL_OUTSIDE LEVEL_ORB LEVEL_TUNNEL
####

View File

@ -26,3 +26,10 @@ RIVEN_CAVE_ENTRANCE = 1
RIVEN_ORB1 = 0
; TUNNEL
RIVEN_TUNNEL1 = 0
RIVEN_TUNNEL2 = 1
RIVEN_TUNNEL3 = 2
RIVEN_TUNNEL4 = 3
RIVEN_TUNNEL5 = 4

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1,107 @@
; Riven -- Jungle Island -- Tunnels
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
.include "../zp.inc"
.include "../hardware.inc"
.include "../common_defines.inc"
.include "../qload.inc"
.include "disk40_defines.inc"
riven_jungle_tunnel:
;===================
; 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_tunnel/tunnel_graphics.inc"
.include "leveldata_tunnel.inc"

View File

@ -25,11 +25,11 @@ location0:
; RIVEN_CAVE_ENTRANCE -- plaza near maglev
location1:
.byte RIVEN_OUTSIDE_PLAZA ; north exit
.byte $E0|0 ; change disk, exit 0 ; south exit
.byte LOAD_TUNNEL<<4|RIVEN_TUNNEL1 ; south exit
.byte $FF ; east exit
.byte $FF ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word cave_n_zx02 ; north bg

View File

@ -0,0 +1,23 @@
;===============================================
; level data for Jungle Tunnel
;===============================================
locations:
.word location0
; RIVEN_TUNNEL1 -- start of tunnel
location0:
.byte LOAD_OUTSIDE<<4|RIVEN_CAVE_ENTRANCE ; 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 tunnel1_n_zx02 ; north bg
.word tunnel1_s_zx02 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit