riven: cart: fine-tune being in cart

This commit is contained in:
Vince Weaver 2024-06-17 00:19:08 -04:00
parent bce876b13c
commit 48518c8337
5 changed files with 20 additions and 18 deletions

View File

@ -11,4 +11,4 @@ sector_array:
.byte 8, 0, 0, 0 ; TITLE, CART
length_array:
.byte 16, 80,123, 64 ; TITLE, CART
.byte 16, 96,123, 64 ; TITLE, CART

View File

@ -1,18 +1,20 @@
include ../../../Makefile.inc
include ../../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
all: cart_graphics.inc
cart_graphics.inc: \
cart_n.hgr.zx02 cart_w.hgr.zx02 cart_e.hgr.zx02 cart_s.hgr.zx02 \
in_cart_e.hgr.zx02
in_cart_e.hgr.zx02 in_cart_w.hgr.zx02
echo "cart_n_zx02: .incbin \"cart_n.hgr.zx02\"" > cart_graphics.inc
echo "cart_w_zx02: .incbin \"cart_w.hgr.zx02\"" >> cart_graphics.inc
echo "cart_e_zx02: .incbin \"cart_e.hgr.zx02\"" >> cart_graphics.inc
echo "cart_s_zx02: .incbin \"cart_s.hgr.zx02\"" >> cart_graphics.inc
echo "in_cart_e_zx02: .incbin \"in_cart_e.hgr.zx02\"" >> cart_graphics.inc
echo "in_cart_w_zx02: .incbin \"in_cart_w.hgr.zx02\"" >> cart_graphics.inc
####

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -103,11 +103,11 @@ really_exit:
rts
;==================================
; call button clicked
; cart button clicked
;==================================
; just ignore this
; TODO: call cart code
call_button_clicked:
cart_button_clicked:
bit SPEAKER
rts

View File

@ -26,19 +26,19 @@ location0:
location1:
.byte $ff ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte RIVEN_OUTSIDE_CART ; east exit
.byte RIVEN_OUTSIDE_CART ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.byte DIRECTION_N ; east exit_dir
.byte DIRECTION_N ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word in_cart_e_zx02 ; east bg
.word $0000 ; west bg
.byte BG_EAST ; all bgs
.word in_cart_w_zx02 ; west bg
.byte BG_EAST|BG_WEST ; which bgs
.byte DIRECTION_E ; special exit
.byte 32,34 ; special x
.byte 136,154 ; special y
.word call_button_clicked-1
.byte 3,5 ; special x
.byte 107,130 ; special y
.word cart_button_clicked-1