From 450384e09c26ecdd2600cd4686ee60a55a0e610e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 3 Jul 2020 23:06:11 -0400 Subject: [PATCH] mist: make catherine letter a background like other letters in the game this actually makes the code about 100 bytes smaller should make it possible to grab from other direction but that gets complicated with the dentist door code --- mist/NOTES | 7 ++++ mist/books/cat_letter.book | 49 +++++++++++++++++++++++++++ mist/common_defines.inc | 4 +-- mist/graphics_mist/Makefile | 2 ++ mist/graphics_mist/cat_letter.png | Bin 0 -> 933 bytes mist/graphics_mist/mist_graphics.inc | 1 + mist/leveldata_mist.inc | 20 +++++------ mist/mist.s | 42 ++++++++++------------- 8 files changed, 88 insertions(+), 37 deletions(-) create mode 100644 mist/books/cat_letter.book create mode 100644 mist/graphics_mist/cat_letter.png diff --git a/mist/NOTES b/mist/NOTES index cf6a334b..ba9c3af9 100644 --- a/mist/NOTES +++ b/mist/NOTES @@ -1,3 +1,10 @@ +; cat letter transition +; before: MIST = 32255 +; after: 32106 (now is a location with compressed background) + + + + Stoneship: + Never have to draw a wooden ship again it would be too soon diff --git a/mist/books/cat_letter.book b/mist/books/cat_letter.book new file mode 100644 index 00000000..8406dbd5 --- /dev/null +++ b/mist/books/cat_letter.book @@ -0,0 +1,49 @@ +#0 1 2 3 +#12345678901234567890123457890123456789 + CATHERINE, + + I'VE LEFT A MESSAGE + + OF UTMOST IMPORTANCE + + IN OUR FORE-CHAMBER + + BESIDE THE DOCK. + + ENTER THE NUMBER OF + + MARKER SWITCHES ON + + THIS ISLAND INTO THE + + IMAGER. + + YOURS, + + ATRUS + +# Catherine, +# I've left for you a message +# of utmost importance in +# our fore-chamber beside +# the dock. Enter the number +# of Marker Switches on +# this island into the imager +# to retrieve the message. +# Yours, +# Atrus + +#sarcastic_letter: +# 01234567890123456789 +#.byte 9,1," CATHERINE, ",0 +#.byte 9,3," I THINK SOME WEIRD ",0 +#.byte 9,5," GUY IS OUT ROAMING ",0 +#.byte 9,7," AROUND OUR ISLAND! ",0 +#.byte 9,9," MAYBE HE CAN SOLVE ",0 +#.byte 9,11," ALL OF OUR DEEP ",0 +#.byte 9,13," FAMILY PROBLEMS ",0 +#.byte 9,15," WHILE I MESS ",0 +#.byte 9,17," WITH MY BOOKS. ",0 +#.byte 9,19," YOURS, ",0 +#.byte 9,21," ATRUS ",0 + diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 57d96b84..e645a8c1 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -79,7 +79,7 @@ MIST_TREE_CORRIDOR_2 = 13 MIST_TREE_CORRIDOR_5 = 14 MIST_GEAR = 15 MIST_GEAR_BASE = 16 -;MIST_DENTIST_DOOR = 17 +MIST_CAT_LETTER = 17 MIST_SPACESHIP_SWITCH = 18 MIST_TREE_CORRIDOR_4 = 19 MIST_UNUSED = 20 @@ -103,7 +103,7 @@ MIST_TOWER1_TRAIL2 = 37 MIST_TOWER1_BOTTOM = 38 MIST_TOWER1_TOP = 39 MIST_VIEWER_DOOR = 40 -; re-use 17,20,25 +; re-use 20,25 ; Mist Octagon Building diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index bb727a76..ff408e6e 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -13,6 +13,7 @@ mist_graphics.inc: \ dock_n.lzsa dock_s.lzsa dock_e.lzsa dock_w.lzsa dock_w_open.lzsa \ dock_switch_n.lzsa dock_switch_s.lzsa \ dock_steps_w.lzsa \ + cat_letter.lzsa \ above_dock_e.lzsa above_dock_n.lzsa above_dock_s.lzsa \ step_base_s.lzsa step_base_n.lzsa \ step_land1_w.lzsa step_land1_e.lzsa \ @@ -54,6 +55,7 @@ mist_graphics.inc: \ echo "dock_switch_n_lzsa: .incbin \"dock_switch_n.lzsa\"" >> mist_graphics.inc echo "dock_switch_s_lzsa: .incbin \"dock_switch_s.lzsa\"" >> mist_graphics.inc echo "dock_steps_w_lzsa: .incbin \"dock_steps_w.lzsa\"" >> mist_graphics.inc + echo "cat_letter_lzsa: .incbin \"cat_letter.lzsa\"" >> mist_graphics.inc echo "above_dock_e_lzsa: .incbin \"above_dock_e.lzsa\"" >> mist_graphics.inc echo "above_dock_s_lzsa: .incbin \"above_dock_s.lzsa\"" >> mist_graphics.inc echo "above_dock_n_lzsa: .incbin \"above_dock_n.lzsa\"" >> mist_graphics.inc diff --git a/mist/graphics_mist/cat_letter.png b/mist/graphics_mist/cat_letter.png new file mode 100644 index 0000000000000000000000000000000000000000..fce8e784d42b87005f6d3e72125375e82f25855b GIT binary patch literal 933 zcmV;W16urvP)EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtKg$WWau_))}Bt5Adrp;lq2l^-JVZ$W;L& z$2>NmL3aJ%fAG6ot2jB~C54kf_lx6v3mpj0~lOdb3D+Or^#Uk*2M&FbNBDX;As@GdoSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jm9?0|F5ygG5>Y000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003{NklfF`iwj1HV*#G+BpAdP^yeuLiIp2Gs3}dup51Oo8J@l6qtzjmk?f5zxO@dc8=2# zem}!KQ|r-i@{$PqJI$Wxv