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

selena: can walk to tunnel now

Browse Source 
can also pick up red page
This commit is contained in:
Vince Weaver 2020-05-28 17:13:16 -04:00
parent 07dd842e44
commit b038fdf685
11 changed files with 79 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mist/common_defines.inc
View File

@ -223,6 +223,9 @@ SELENA_CRYSTAL_PATH = 23
SELENA_CRYSTALS = 24
SELENA_CRYSTAL_CLOSE = 25
SELENA_SPACESHIP_PATH = 26
SELENA_BEFORE_CRYSTALS = 27
SELENA_TUNNEL_STEPS = 28
SELENA_TUNNEL_PATH = 29
; Viewer Room

12
mist/graphics_selena/Makefile
View File

@ -36,7 +36,10 @@ selena_graphics.inc: \
crystal_path_n.lzsa \
crystals_s.lzsa crystals_n.lzsa \
crystals_note_e.lzsa \
spaceship_path_n.lzsa spaceship_path_s.lzsa
spaceship_path_n.lzsa spaceship_path_s.lzsa \
before_crystals_w.lzsa before_crystals_e.lzsa \
tunnel_steps_e.lzsa tunnel_steps_w.lzsa \
tunnel_path_s.lzsa tunnel_path_n.lzsa tunnel_path_w.lzsa
echo "controls_e_lzsa: .incbin \"controls_e.lzsa\"" > selena_graphics.inc
echo "organ_w_lzsa: .incbin \"organ_w.lzsa\"" >> selena_graphics.inc
echo "spaceship_inside_w_lzsa: .incbin \"spaceship_inside_w.lzsa\"" >> selena_graphics.inc
@ -92,6 +95,13 @@ selena_graphics.inc: \
echo "crystals_note_e_lzsa: .incbin \"crystals_note_e.lzsa\"" >> selena_graphics.inc
echo "spaceship_path_n_lzsa: .incbin \"spaceship_path_n.lzsa\"" >> selena_graphics.inc
echo "spaceship_path_s_lzsa: .incbin \"spaceship_path_s.lzsa\"" >> selena_graphics.inc
echo "before_crystals_w_lzsa: .incbin \"before_crystals_w.lzsa\"" >> selena_graphics.inc
echo "before_crystals_e_lzsa: .incbin \"before_crystals_e.lzsa\"" >> selena_graphics.inc
echo "tunnel_steps_e_lzsa: .incbin \"tunnel_steps_e.lzsa\"" >> selena_graphics.inc
echo "tunnel_steps_w_lzsa: .incbin \"tunnel_steps_w.lzsa\"" >> selena_graphics.inc
echo "tunnel_path_n_lzsa: .incbin \"tunnel_path_n.lzsa\"" >> selena_graphics.inc
echo "tunnel_path_s_lzsa: .incbin \"tunnel_path_s.lzsa\"" >> selena_graphics.inc
echo "tunnel_path_w_lzsa: .incbin \"tunnel_path_w.lzsa\"" >> selena_graphics.inc
%.gr: %.png
$(PNG2GR) $< $@

BIN
mist/graphics_selena/before_crystals_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 805 B

BIN
mist/graphics_selena/before_crystals_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 818 B

BIN
mist/graphics_selena/tunnel_path_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
mist/graphics_selena/tunnel_path_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 802 B

BIN
mist/graphics_selena/tunnel_path_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 896 B

BIN
mist/graphics_selena/tunnel_steps_e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 919 B

BIN
mist/graphics_selena/tunnel_steps_w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 870 B

61
mist/leveldata_selena.inc
View File

@ -10,8 +10,8 @@ locations:
.word location12,location13,location14,location15
.word location16,location17,location18,location19
.word location20,location21,location22,location23
.word location24,location25,location26
.word location24,location25,location26,location27
.word location28,location29
; SELENA_INSIDE_SHIP -- Inside Ship
location0:
@ -391,7 +391,7 @@ location20:
location21:
.byte $ff ; north exit
.byte SELENA_CRYSTAL_STEPS ; south exit
.byte $ff ; east exit
.byte SELENA_BEFORE_CRYSTALS ; east exit
.byte SELENA_CLOCK_BEFORE ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_S ; south exit_dir
@ -470,7 +470,11 @@ location25:
.word crystals_note_e_lzsa ; east bg
.word $0000 ; west bg
.byte BG_EAST
.byte $ff
.byte DIRECTION_E ; special exit
.byte 22,29 ; special x
.byte 0,10 ; special y
.word selena_take_red_page-1 ; special function
; SELENA_SPACESHIP_PATH -- spaceship path/ walkway3?
location26:
@ -489,4 +493,53 @@ location26:
.byte BG_NORTH|BG_SOUTH
.byte $ff
; SELENA_BEFORE_CRYSTALS -- before crystals, if coming from tunnel
location27:
.byte $ff ; north exit
.byte $ff ; south exit
.byte SELENA_TUNNEL_STEPS ; east exit
.byte SELENA_CRYSTAL_TURN ; 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 before_crystals_e_lzsa ; east bg
.word before_crystals_w_lzsa ; west bg
.byte BG_EAST|BG_WEST
.byte $ff
; SELENA_TUNNEL_STEPS -- steps on way to tunnel
location28:
.byte $ff ; north exit
.byte $ff ; south exit
.byte SELENA_TUNNEL_PATH ; east exit
.byte SELENA_BEFORE_CRYSTALS ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_N ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word tunnel_steps_e_lzsa ; east bg
.word tunnel_steps_w_lzsa ; west bg
.byte BG_EAST|BG_WEST
.byte $ff
; SELENA_TUNNEL_PATH -- path near tunnel
location29:
.byte $ff ; north exit
.byte SELENA_TUNNEL_STEPS ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_W ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word tunnel_path_n_lzsa ; north bg
.word tunnel_path_s_lzsa ; south bg
.word $0000 ; east bg
.word tunnel_path_w_lzsa ; west bg
.byte BG_NORTH|BG_SOUTH|BG_WEST
.byte $ff

10
mist/selena.s
View File

@ -110,6 +110,8 @@ game_loop:
beq mist_book_animation
cmp #SELENA_WATER
beq fg_draw_blue_page
cmp #SELENA_CRYSTAL_CLOSE
beq fg_draw_red_page
jmp nothing_special
@ -208,6 +210,10 @@ fg_draw_blue_page:
jsr draw_blue_page
jmp nothing_special
fg_draw_red_page:
jsr draw_red_page
jmp nothing_special
nothing_special:
;====================================
@ -296,9 +302,9 @@ draw_red_page:
and #SELENA_PAGE
bne no_draw_page
lda #14
lda #20
sta XPOS
lda #36
lda #2
sta YPOS
lda #<red_page_sprite