From 125eb2c4862763df5eae1a0bdfc2b0447c0eb15a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 12 Aug 2020 23:22:10 -0400 Subject: [PATCH] mist: ending: center text and update wording slightly --- mist/TODO | 18 ++++++--------- mist/default_save.s | 6 ++--- mist/dni_ending.s | 17 ++++++++------ mist/leveldata_octagon.inc | 4 ++-- mist/octagon_fireplace.s | 45 ++++++++++++++++++++++---------------- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/mist/TODO b/mist/TODO index d521b73d..5ce230bc 100644 --- a/mist/TODO +++ b/mist/TODO @@ -6,12 +6,15 @@ For release 1.0 + MIST -- open door to clock puzzle? - -- only allow entering ship if it's up -- another stop on path to spaceship. Out of room though :( -- MIST_ROCKET_PATH_PAD probably missing ship-raised background + OCTAGON -- load "red page" sound into LC and play it? + -- show "burnt" books if click on non-avail book + -- adjust grabbing of actual books + -- longer speeches from brothers, most notably the + page 5 speeches and ending + SELENA -- load 1s clip of sounds (4k each) into language card? @@ -25,6 +28,7 @@ For release 1.0 + ARBOR -- rotate windmill if enabled? + -- missing treehouses + NIBEL -- turn on sprite crop in the viewer part @@ -33,10 +37,7 @@ For release 1.0 + MECHE -- animations for elevator -- way to turn around in basement - -- ability to look up at top of elevator - -- look around in the secret rooms - -- note from achenar - + -- more of paths to hints + SUB -- can walk around outside of sub @@ -53,12 +54,11 @@ Done: TODO Maybe future: MIST: -+ some sort of switch animation on circuit breakers? + look at catherine's letter from other side of path + Make clock puzzle more similar to actual game OCTAGON: -+ in tower could have extra window open/closed far backgrounds ++ in tower could have extra window open/closed far backgrounds(?) + turning when looking at hint loses the text mode + line drawing on map isn't optimal + should hints be black on white text? @@ -80,15 +80,11 @@ SELENA age: maybe not bother with aiming antennas, but sum button plays if switch been pushed filler sounds for others? -+ That whole rediculous underground sub sequence -+ light switch in tunnel + antenna compartment should open/close when you click on it + better colors Channelwood: + Windmill animation -+ Switch flip animation -+ Open faucet animation + Animation for bridge rising + Animation for pipe extending + Animation for book elevator diff --git a/mist/default_save.s b/mist/default_save.s index f31b469a..60d46cdf 100644 --- a/mist/default_save.s +++ b/mist/default_save.s @@ -2,7 +2,7 @@ .include "common_defines.inc" -.if 0 +.if 1 ; if doing playthrough .include "playthrough_save.inc" .endif @@ -58,7 +58,7 @@ .byte STONEY_ARRIVAL ; LOCATION = $82 .endif -.if 1 +.if 0 ; NIBEL .byte LOAD_NIBEL ; WHICH_LOAD = $80 .byte DIRECTION_E ; DIRECTION = $81 @@ -66,7 +66,7 @@ .endif -.if 1 +.if 0 .byte $00 ; RED_PAGES_TAKEN = $83 .byte $00 ; BLUE_PAGES_TAKEN = $84 .byte $00 ; CLOCK_BRIDGE = $85 diff --git a/mist/dni_ending.s b/mist/dni_ending.s index fda620b7..eeabef3d 100644 --- a/mist/dni_ending.s +++ b/mist/dni_ending.s @@ -300,20 +300,23 @@ atrus_sprite_book_down: ; at 15,6 ; ; ending, both ; + + ; 1 2 3 + ;0123456789012345678901234567890123456789 atrus_text_both: -.byte 0,20,"AH, MY FRIEND. YOU'VE RETURNED.",0 -.byte 0,21,"WE MEET FACE-TO-FACE.",0 -.byte 0,22,"AND THE PAGE, DID YOU BRING THE PAGE?",0 +.byte 5,20,"AH, MY FRIEND. YOU'VE RETURNED.",0 +.byte 10,21,"WE MEET FACE-TO-FACE.",0 +.byte 2,22,"AND THE PAGE, DID YOU BRING THE PAGE?",0 .byte 0,23," ",0 ; ending, no white page ; atrus_text_nopage1: -.byte 0,20,"YOU DIDN'T BRING THE PAGE.",0 -.byte 0,21,"YOU DIDN'T BRING THE PAGE!",0 -.byte 0,22,"WHAT KIND OF FOOL ARE YOU?!",0 -.byte 0,23,"DID YOU NOT TAKE MY WARNING SERIOUSLY?",0 +.byte 7,20,"YOU DIDN'T BRING THE PAGE.",0 +.byte 7,21,"YOU DIDN'T BRING THE PAGE!",0 +.byte 7,22,"WHAT KIND OF FOOL ARE YOU?!",0 +.byte 1,23,"DID YOU NOT TAKE MY WARNING SERIOUSLY?",0 atrus_text_nopage2: .byte 17,20,"*SIGH*",0 diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc index 1f733f76..c1dcbf69 100644 --- a/mist/leveldata_octagon.inc +++ b/mist/leveldata_octagon.inc @@ -632,8 +632,8 @@ location33: .word $0000 ; west bg .byte BG_NORTH .byte DIRECTION_N ; special exit - .byte 6,34 ; special x - .byte 5,35 ; special y + .byte 2,37 ; special x + .byte 5,40 ; special y .word turn_page-1 ; special function ; OCTAGON_IN_FIREPLACE_CLOSED -- in fireplace, closed diff --git a/mist/octagon_fireplace.s b/mist/octagon_fireplace.s index 891fc0b1..e3bd5410 100644 --- a/mist/octagon_fireplace.s +++ b/mist/octagon_fireplace.s @@ -442,29 +442,33 @@ no_speedup: ; 1 2 3 ; 0123456789012345678901234567890123456789 atrus_green_book1: -.byte 0,20,"WHO THE DEVIL ARE YOU?",0 -.byte 0,21,"D--DON'T COME HERE TO D'NI, NOT YET.",0 +.byte 9,20,"WHO THE DEVIL ARE YOU?",0 +.byte 2,21,"D--DON'T COME HERE TO D'NI, NOT YET.",0 .byte 0,22,"I HAVE MANY QUESTIONS FOR YOU, MY FRIEND",0 -.byte 0,23,"AS YOU, NO DOUBT, HAVE FOR ME.",0 +.byte 6,23,"AS YOU, NO DOUBT, HAVE FOR ME.",0 atrus_green_book2: -.byte 0,20,"PERHAPS MY STORY IS IN ORDER. I AM ATRUS",0 -.byte 0,21,"I FEAR YOU HAVE MET MY SONS,",0 -.byte 0,22,"SIRRUS & ACHENAR, TRAPPED IN MY LIBRARY",0 -.byte 0,23,"ON MYST ISLAND",0 +.byte 6,20,"PERHAPS MY STORY IS IN ORDER.",0 +.byte 0,21,"I AM ATRUS; I FEAR YOU HAVE MET MY SONS,",0 +.byte 11,22,"SIRRUS & ACHENAR,",0 +.byte 2,23,"TRAPPED IN MY LIBRARY ON MYST ISLAND.",0 + ; 1 2 3 + ; 0123456789012345678901234567890123456789 atrus_green_book3: -.byte 0,20,"IT CONTAINS MY WRITINGS, MY BOOKS",0 -.byte 0,21,"THAT LINK TO FANTASTIC PLACES, AN ART",0 -.byte 0,22,"I LEARNED FROM MY FATHER YEARS AGO.",0 -.byte 0,23," ",0 +.byte 4,20,"THAT LIBRARY CONTAINS MY WRITINGS,",0 +.byte 0,21,"MY BOOKS THAT LINK TO FANTASTIC PLACES,",0 +.byte 4,22,"AN ART I LEARNED FROM MY FATHER",0 +.byte 15,23,"YEARS AGO.",0 atrus_green_book4: -.byte 0,20,"THE RED & BLUE BOOKS ARE DIFFERENT",0 -.byte 0,21,"I WROTE THOSE TO ENTRAP OVER-GREEDY",0 -.byte 0,22,"EXPLORERS THAT MIGHT STUMBLE UPON MYST",0 -.byte 0,23,"I HAD NO IDEA I'D ENTRAP MY OWN SONS",0 +.byte 3,20,"THE RED & BLUE BOOKS ARE DIFFERENT",0 +.byte 3,21,"I WROTE THOSE TO ENTRAP OVER-GREEDY",0 +.byte 1,22,"EXPLORERS THAT MIGHT STUMBLE UPON MYST",0 +.byte 2,23,"I HAD NO IDEA I'D ENTRAP MY OWN SONS",0 + ; 1 2 3 + ; 0123456789012345678901234567890123456789 atrus_green_book5: .byte 0,20,"I HAD NO IDEA THE EXTENT OF THEIR GREED",0 .byte 0,21,"THEY USED THEIR OWN MOTHER, MY CATHERINE",0 @@ -474,13 +478,16 @@ atrus_green_book5: atrus_green_book6: .byte 0,20,"YOU, MY FRIEND, CAN BRING THE PAGE TO ME",0 .byte 0,21,"I PRAY YOU BELIEVE MY STORY AND NOT THE",0 -.byte 0,22,"LIES MY SONS HAVE TOLD. BRING THE PAGE",0 -.byte 0,23,"AND BRING JUSTICE TO MY SONS. HURRY.",0 +.byte 1,22,"LIES MY SONS HAVE TOLD. BRING THE PAGE",0 +.byte 2,23,"AND BRING JUSTICE TO MY SONS. HURRY.",0 + + ; 1 2 3 + ; 0123456789012345678901234567890123456789 ; book, 2nd time atrus_green_book9: -.byte 0,20,"HAVE YOU FOUND THE MISSING PAGE?",0 -.byte 0,21,"OH, COME, COME. COME ON THEN.",0 +.byte 4,20,"HAVE YOU FOUND THE MISSING PAGE?",0 +.byte 5,21,"OH, COME, COME. COME ON THEN.",0 .byte 0,22," ",0 .byte 0,23," ",0