From 3caea7713f37c3949754cec7cfdea16da31dd061 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 10 Aug 2020 17:14:11 -0400 Subject: [PATCH] mist: mess with the path flow to make walking around main island easier prob shouldn't be messing with this so late in the game --- mist/clock_bridge_puzzle.s | 2 ++ mist/hello.bas | 2 +- mist/leveldata_mist.inc | 16 ++++++++-------- mist/leveldata_stoney.inc | 2 +- mist/mist_puzzles.s | 5 ++++- mist/playthrough_save.inc | 6 +++--- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/mist/clock_bridge_puzzle.s b/mist/clock_bridge_puzzle.s index 9817a923..c24251c1 100644 --- a/mist/clock_bridge_puzzle.s +++ b/mist/clock_bridge_puzzle.s @@ -483,6 +483,8 @@ check_gear_delete: beq gear_look2 cmp #MIST_BASE_STEPS beq gear_look3 + cmp #MIST_STEPS_1ST_LANDING + beq gear_look3 bne done_gear_delete gear_look1: diff --git a/mist/hello.bas b/mist/hello.bas index 4d84b3d1..3296caec 100644 --- a/mist/hello.bas +++ b/mist/hello.bas @@ -1,5 +1,5 @@ 5 HOME -10 PRINT "LOADING MIST V0.98.1" +10 PRINT "LOADING MIST V0.99" 20 PRINT:PRINT 40 PRINT "CONTROLS: " 42 PRINT " MOVE CURSOR : ARROWS OR WASD" diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index c4ed81b2..9339f8cf 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -109,19 +109,19 @@ location4: ; MIST_STEPS_1ST_LANDING -- steps 1st landing location5: - .byte $ff ; north exit + .byte MIST_ABOVE_DOCK ; north exit .byte $ff ; south exit .byte MIST_BASE_STEPS ; east exit .byte MIST_STEPS_2ND_LANDING ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; 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 step_base_n_lzsa ; north bg .word $0000 ; south bg .word step_land1_e_lzsa ; east bg .word step_land1_w_lzsa ; west bg - .byte BG_WEST | BG_EAST + .byte BG_WEST | BG_EAST | BG_NORTH .byte $ff ; special exit ; MIST_STEPS_2ND_LANDING -- steps 2nd landing @@ -326,18 +326,18 @@ location15: ; MIST_GEAR_BASE -- gear base location16: .byte MIST_GEAR ; north exit - .byte $ff ; south exit + .byte MIST_BASE_STEPS ; south exit .byte MIST_DOCK_SWITCH ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte DIRECTION_S ; east exit_dir .byte $ff ; west exit_dir .word gear_base_n_lzsa ; north bg - .word $0000 ; south bg + .word above_dock_s_lzsa ; south bg .word above_dock_e_lzsa ; east bg .word $0000 ; west bg - .byte BG_NORTH | BG_EAST + .byte BG_NORTH | BG_EAST | BG_SOUTH .byte $ff ; special exit ; MIST_CAT_LETTER -- catherine letter diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index b2a5f482..2d8c944e 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -753,7 +753,7 @@ location40: .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte DIRECTION_W .byte 17,24 ; special x - .byte 34,44 ; special y + .byte 30,40 ; special y .word stoney_take_blue_page-1 ; special function ; STONEY_BLUE_MAPCASE -- blue room mapcase diff --git a/mist/mist_puzzles.s b/mist/mist_puzzles.s index 884227b2..06389106 100644 --- a/mist/mist_puzzles.s +++ b/mist/mist_puzzles.s @@ -30,9 +30,10 @@ make_ship_up: lda #above_dock_shipup_s_lzsa sta location3+1,Y ; MIST_ABOVE_DOCK - + sta location16+1,Y ; MIST_GEAR_BASE ; update backgrounds north @@ -120,8 +121,10 @@ make_ship_down: lda #above_dock_s_lzsa sta location3+1,Y ; MIST_ABOVE_DOCK + sta location16+1,Y ; MIST_GEAR_BASE ; update backgrounds north diff --git a/mist/playthrough_save.inc b/mist/playthrough_save.inc index 3776d7d2..a78b0ba0 100644 --- a/mist/playthrough_save.inc +++ b/mist/playthrough_save.inc @@ -4,15 +4,15 @@ .byte DIRECTION_S ; DIRECTION = $81 .byte OCTAGON_TEMPLE_CENTER ; LOCATION = $82 -.byte (OCTAGON_PAGE|MECHE_PAGE|CHANNEL_PAGE) +.byte (OCTAGON_PAGE|MECHE_PAGE|SELENA_PAGE|CHANNEL_PAGE) ; RED_PAGES_TAKEN = $83 -.byte (OCTAGON_PAGE|MECHE_PAGE|CHANNEL_PAGE) +.byte (OCTAGON_PAGE|MECHE_PAGE|SELENA_PAGE|CHANNEL_PAGE) ; BLUE_PAGES_TAKEN = $84 .byte $1 ; CLOCK_BRIDGE = $85 .byte $1 ; GEAR_OPEN = $86 -.byte (MARKER_DOCK|MARKER_GEARS|MARKER_SPACESHIP|MARKER_CLOCK|MARKER_POOL|MARKER_TREE) +.byte (MARKER_DOCK|MARKER_GEARS|MARKER_SPACESHIP|MARKER_GENERATOR|MARKER_CLOCK|MARKER_POOL|MARKER_TREE) ; MARKER_SWITCHES = $87 .byte $2 ; CLOCK_HOUR = $88