diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index adde420b..df8ba130 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -12,13 +12,15 @@ all: selena_graphics.inc selena_graphics.inc: \ controls_e.lzsa \ organ_w.lzsa \ - spaceship_inside_w.lzsa \ - spaceship_inside_selena_n.lzsa \ + spaceship_inside_w.lzsa spaceship_inside_e.lzsa \ + spaceship_inside_selena_n.lzsa spaceship_inside_mist_n.lzsa \ walkway1_n.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 + echo "spaceship_inside_e_lzsa: .incbin \"spaceship_inside_e.lzsa\"" >> selena_graphics.inc echo "spaceship_inside_selena_n_lzsa: .incbin \"spaceship_inside_selena_n.lzsa\"" >> selena_graphics.inc + echo "spaceship_inside_mist_n_lzsa: .incbin \"spaceship_inside_mist_n.lzsa\"" >> selena_graphics.inc echo "walkway1_n_lzsa: .incbin \"walkway1_n.lzsa\"" >> selena_graphics.inc diff --git a/mist/leveldata_island.inc b/mist/leveldata_island.inc index 32bfa10e..48a17dac 100644 --- a/mist/leveldata_island.inc +++ b/mist/leveldata_island.inc @@ -42,7 +42,7 @@ locations: .word location24,location25,location26,location27 .word location28,location29,location30,location31 .word location32,location33,location34,location35 - .word location36 + .word location36,location37 ; myst linking book location0: @@ -234,7 +234,7 @@ location10: .byte 11 ; north exit .byte 14 ; south exit .byte 9 ; east exit - .byte 16 ; west exit + .byte 37 ; west exit .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir @@ -339,7 +339,7 @@ location15: location16: .byte 22 ; north exit .byte $ff ; south exit - .byte 10 ; east exit + .byte 37 ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir @@ -715,6 +715,22 @@ location36: .byte 34,40 ; special y .word generator_button_press-1 ; special function +; pad on way to rocket +location37: + .byte 16 ; north exit + .byte $ff ; south exit + .byte 10 ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word pad_n_lzsa ; north bg + .word $0000 ; south bg + .word pad_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH | BG_EAST + .byte $ff diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index de07750a..c98fe818 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -46,11 +46,11 @@ location0: .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 $0000 ; east bg - .word spaceship_inside_w_lzsa ; west bg - .byte BG_WEST + .word spaceship_inside_mist_n_lzsa ; north bg + .word $0000 ; south bg + .word spaceship_inside_e_lzsa ; east bg + .word spaceship_inside_w_lzsa ; west bg + .byte BG_WEST | BG_EAST | BG_NORTH .byte $ff ; special exit diff --git a/mist/loader.s b/mist/loader.s index 45312a54..76202b8f 100644 --- a/mist/loader.s +++ b/mist/loader.s @@ -52,7 +52,7 @@ filbuf = $3D6 ; filbuf: .res 4 ; = bit2tbl+86 ;=================================================== loader_start: - lda #0 + lda #3 sta WHICH_LOAD jsr init ; unhook DOS, init nibble table @@ -136,7 +136,7 @@ entry_smc: filenames: .word intro_filename - .word mist_filename,meche_filename + .word mist_filename,meche_filename,selena_filename .word ending_filename intro_filename: @@ -145,6 +145,8 @@ mist_filename: .byte "MIST",0 meche_filename: .byte "MECHE",0 +selena_filename: + .byte "SELENA",0 ending_filename: .byte "ENDING",0 diff --git a/mist/zp.inc b/mist/zp.inc index bbe35fb2..00f8463e 100644 --- a/mist/zp.inc +++ b/mist/zp.inc @@ -81,6 +81,10 @@ SWITCH_TOP_ROW = $98 SWITCH_BOTTOM_ROW = $99 GENERATOR_VOLTS_DISP = $9A ROCKET_VOLTS_DISP = $9B +ROCKET_NOTE1 = $9C +ROCKET_NOTE2 = $9D +ROCKET_NOTE3 = $9E +ROCKET_NOTE4 = $9F DISP_PAGE = $ED ; ALL