riven: straighten out the leveldata

This commit is contained in:
Vince Weaver 2024-06-21 14:31:03 -04:00
parent a18dad0692
commit f9d5992e62
5 changed files with 32 additions and 67 deletions

View File

@ -16,7 +16,7 @@ sector_array:
.byte 0,0,0,0
length_array:
.byte 8, 96,96, 64 ; TITLE, MAGLEV, OUTSIDE
.byte 8, 96,112, 64 ; TITLE, MAGLEV, OUTSIDE
.byte 0,0,0,0
disk_exit_disk: ; note: BCD (yes I'm lazy)

View File

@ -18,3 +18,5 @@ RIVEN_OUTSIDE = 3
RIVEN_OUTSIDE_PATH = 0
RIVEN_OUTSIDE_PLAZA = 1
RIVEN_CAVE_ENTRANCE = 2

View File

@ -7,14 +7,16 @@ all: outside_graphics.inc
outside_graphics.inc: \
out_path_e.hgr.zx02 out_path_w.hgr.zx02 \
out_plaza_n.hgr.zx02 out_plaza_s.hgr.zx02 out_plaza_e.hgr.zx02 out_plaza_w.hgr.zx02
out_plaza_n.hgr.zx02 out_plaza_s.hgr.zx02 out_plaza_e.hgr.zx02 out_plaza_w.hgr.zx02 \
cave_s.hgr.zx02 cave_n.hgr.zx02
echo "out_path_e_zx02: .incbin \"out_path_e.hgr.zx02\"" > outside_graphics.inc
echo "out_path_w_zx02: .incbin \"out_path_w.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_n_zx02: .incbin \"out_plaza_n.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_s_zx02: .incbin \"out_plaza_s.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_e_zx02: .incbin \"out_plaza_e.hgr.zx02\"" >> outside_graphics.inc
echo "out_plaza_w_zx02: .incbin \"out_plaza_w.hgr.zx02\"" >> outside_graphics.inc
echo "cave_s_zx02: .incbin \"cave_s.hgr.zx02\"" >> outside_graphics.inc
echo "cave_n_zx02: .incbin \"cave_n.hgr.zx02\"" >> outside_graphics.inc
####

View File

@ -96,63 +96,6 @@ really_exit:
rts
;=====================================
; handle clicked facing west
;=====================================
; all we can do here is flip
; flip us to the east
; go lores and play the movie
handle1_clicked:
bit SPEAKER
.if 0
lda #0
sta MAGLEV_FLIP_DIRECTION
lda #LOAD_MOVIE1
sta WHICH_LOAD
lda #1
sta LEVEL_OVER
.endif
bit SPEAKER
rts
;=====================================
; handle clicked facing east
;=====================================
; if x<27, go for maglev ride
; else, flip back west
handle2_clicked:
bit SPEAKER
.if 0
lda CURSOR_X
cmp #27
bcc go_for_maglev
lda #1
sta MAGLEV_FLIP_DIRECTION
lda #LOAD_MOVIE1
jmp common_handle2
go_for_maglev:
lda #LOAD_MOVIE2
common_handle2:
sta WHICH_LOAD
lda #1
sta LEVEL_OVER
.endif
bit SPEAKER
rts
;==========================
; includes

View File

@ -3,7 +3,7 @@
;===============================================
locations:
.word location0,location1
.word location0,location1,location2
; RIVEN_OUTSIDE_PATH -- path away from maglev
@ -25,13 +25,13 @@ location0:
; RIVEN_OUTSIDE_PLAZA -- plaza near maglev
location1:
.byte $FF ; north exit
.byte $E0|0 ; change disk, exit 0 ; south exit
.byte $FF ; east exit
.byte $ff ; TODO: ball ; north exit
.byte RIVEN_CAVE_ENTRANCE ; south exit
.byte RIVEN_OUTSIDE_PATH ; east exit
.byte $FF ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte $ff ; west exit_dir
.word out_plaza_n_zx02 ; north bg
.word out_plaza_s_zx02 ; south bg
@ -40,3 +40,21 @@ location1:
.byte BG_WEST|BG_NORTH|BG_SOUTH|BG_EAST
.byte $ff ; special exit
; RIVEN_CAVE_ENTRANCE -- plaza near maglev
location2:
.byte RIVEN_OUTSIDE_PLAZA ; north exit
.byte $E0|0 ; change disk, exit 0 ; south exit
.byte $FF ; east exit
.byte $FF ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word cave_n_zx02 ; north bg
.word cave_s_zx02 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit