From 34e211881578166aabdb85b792beea389ebf008b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 12 Aug 2020 15:08:14 -0400 Subject: [PATCH] mist: nibel: add another location --- mist/common_defines.inc | 1 + mist/graphics_nibel/Makefile | 4 ++++ mist/graphics_nibel/blue_path_2p25_e.png | Bin 0 -> 861 bytes mist/graphics_nibel/blue_path_2p25_n.png | Bin 0 -> 1179 bytes mist/graphics_nibel/blue_path_2p25_s.png | Bin 0 -> 907 bytes mist/leveldata_nibel.inc | 24 ++++++++++++++++++++--- 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 mist/graphics_nibel/blue_path_2p25_e.png create mode 100644 mist/graphics_nibel/blue_path_2p25_n.png create mode 100644 mist/graphics_nibel/blue_path_2p25_s.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 2cb075d1..f276d7dc 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -469,6 +469,7 @@ NIBEL_RED_BED = 15 NIBEL_RED_BED_OPEN = 16 NIBEL_HALF_LETTER = 17 NIBEL_BLUE_PATH_0P5 = 18 +NIBEL_BLUE_PATH_2P25 = 19 DENTIST_OUTSIDE = 0 DENTIST_OUTSIDE_OPEN = 1 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 070b320e..32c4851a 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -14,6 +14,7 @@ nibel_graphics.inc: \ blue_path_0p5_n.lzsa blue_path_0p5_s.lzsa \ blue_path1_n.lzsa blue_path1_s.lzsa \ blue_path2_n.lzsa blue_path2_s.lzsa \ + blue_path_2p25_n.lzsa blue_path_2p25_s.lzsa blue_path_2p25_e.lzsa \ blue_path3_n.lzsa blue_path3_s.lzsa \ blue_house_n.lzsa blue_house_s.lzsa blue_house_e.lzsa blue_house_w.lzsa \ projector_e.lzsa \ @@ -34,6 +35,9 @@ nibel_graphics.inc: \ echo "blue_path1_s_lzsa: .incbin \"blue_path1_s.lzsa\"" >> nibel_graphics.inc echo "blue_path2_n_lzsa: .incbin \"blue_path2_n.lzsa\"" >> nibel_graphics.inc echo "blue_path2_s_lzsa: .incbin \"blue_path2_s.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p25_n_lzsa: .incbin \"blue_path_2p25_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p25_s_lzsa: .incbin \"blue_path_2p25_s.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p25_e_lzsa: .incbin \"blue_path_2p25_e.lzsa\"" >> nibel_graphics.inc echo "blue_path3_n_lzsa: .incbin \"blue_path3_n.lzsa\"" >> nibel_graphics.inc echo "blue_path3_s_lzsa: .incbin \"blue_path3_s.lzsa\"" >> nibel_graphics.inc echo "blue_house_n_lzsa: .incbin \"blue_house_n.lzsa\"" >> nibel_graphics.inc diff --git a/mist/graphics_nibel/blue_path_2p25_e.png b/mist/graphics_nibel/blue_path_2p25_e.png new file mode 100644 index 0000000000000000000000000000000000000000..b2dc7e07f1841818ff90da1e22ecefa21fc544ec GIT binary patch literal 861 zcmV-j1ETziP)EX>4Tx04R}tkv&MmKpe$iQ^g{c4t5Z6$WWauh!%0wDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbCNG^=L<&~)3( zq>^GTzbf{oiA@!XlO+L4<-jDyYInoK~F_3mMu^`uK-kzeFyDToo{K zET9Grvg-%`gWug+#i>azDVzj)UmWLS6zJOpS`EkfK6aee2@re+uJn$-)&yogNpEzt z*bxxf1}?5Unz9F6?f^qihHT2N6r?E>i@^ICeN!G7yaoE#yx!XTIDG)J)K&ThI5-5x zN|e3s^X^c0Z~vZY_xA%sUUHN`{L7yJ001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNlirueSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{009X}L_t(Y$L-e94uc>J1yDjlfG7U{Zzog*25kZBVzxDLlBg%W3nI!G zm&#f=D;1CUJ5p+|JW@EQ$jW!#4+8l^ptV4?ph0RG?03e3vyndnR`>qFi{N(k;h?o& z18OY}9wa+$;;O=dTHgW!$wpoQ<3WJjdZ>$<0G$h=1oK%}MS~%nk!8T`$|z`zaEEce z3WD&x6N#Mr1Cj#M^AQBAong0cStP`FgkbKD`34I z*1-kAA~GysJlJ2cJCOnOejR*^Oo1gygH2=(#J+kta(dpU$}9%rA9^%01yWm)qr)aL n299mot5@$jI2C!cLm0gP>yEX>4Tx04R}tkv&MmKpe$iQ^g{c4t5Z6$WWauh!%0wDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbCNG^=L<&~)3( zq>^GTzbf{oiA@!XlO+L4<-jDyYInoK~F_3mMu^`uK-kzeFyDToo{K zET9Grvg-%`gWug+#i>azDVzj)UmWLS6zJOpS`EkfK6aee2@re+uJn$-)&yogNpEzt z*bxxf1}?5Unz9F6?f^qihHT2N6r?E>i@^ICeN!G7yaoE#yx!XTIDG)J)K&ThI5-5x zN|e3s^X^c0Z~vZY_xA%sUUHN`{L7yJ001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNlirueSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{00KuzL_t(Y$E}vzj)O1^MDsudtQ7J8f4d!~Q`@;f%C4ofkdo7hZzQGD zwwK|%6uUOtKE}J0^2?SbXU*rluFGj@1jIu%)_+d|?OMQmT8nLgn7IV5s{tcaz-2KY zo$wWqDyT}!1%%pV!S4YA5B9e#AeM}Q_?!k(ohf7p3`qM|AmZ#iO< z07~ft>1@+ERv2>O4#*LKmWR^!r9vjJ6zN*PDqH7(xa$L(^#2>MQ%`d~997B?=<|^C z9_aHh0;#p*P~z)qw0iRbuzsSAWYf57oS;fb7uMK((()pm(}2J=-$3>-u2} z1j;LvS=u}VV$ld#C-x1H9lHeE_c1WMr24>pr$SaqDXNr|+R{4?&Qw7EUM6sVTPZn1 zAA!Kf(gUzj7)x*40Muro(tw9G>8F?#v+|k)|-Ve?cAq z`wErVn0ufQ8U-}0yoT6%AjXYCXuJZ-5Fm_8puE@zN>5Z+$`EK?90N_^#Fo7mYioh} zs~eyan&UV)7|C|au=keDV?Bj(xd*}#OcVisKJG|%a;||`4llMqAR`d>w?JHLF`=wz z&7t?`jeNg{1egQLETo#bhLbm__002ovPDHLkV1l&L5sm-= literal 0 HcmV?d00001 diff --git a/mist/graphics_nibel/blue_path_2p25_s.png b/mist/graphics_nibel/blue_path_2p25_s.png new file mode 100644 index 0000000000000000000000000000000000000000..fdccdd4a64e6a9d69d368df070f8a4cba82b5f9e GIT binary patch literal 907 zcmV;619bd}P)EX>4Tx04R}tkv&MmKpe$iQ^g{c4t5Z6$WWauh!%0wDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbCNG^=L<&~)3( zq>^GTzbf{oiA@!XlO+L4<-jDyYInoK~F_3mMu^`uK-kzeFyDToo{K zET9Grvg-%`gWug+#i>azDVzj)UmWLS6zJOpS`EkfK6aee2@re+uJn$-)&yogNpEzt z*bxxf1}?5Unz9F6?f^qihHT2N6r?E>i@^ICeN!G7yaoE#yx!XTIDG)J)K&ThI5-5x zN|e3s^X^c0Z~vZY_xA%sUUHN`{L7yJ001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNlirueSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{00B2iL_t(Y$Hmrx3WOjG0MHSLbrAjk-`=gUwmGj%7Y(8)d(4?8%tyd4 zYG=H{BPF~}Dd)5YK+d);$SeOqzVaYG3j;AM$ZbwRA?e7OKq3Layx)`|lQu){Fy6Th z>MT8odENqT!D|`nw;KmV>M0;skg8hr<{Gpa${6bm-vwzbxr2{_oi$`|Ss3)A+y$;{ z30`EVZ?}VP67+yl!^*6B9o+VyCwx8uc}CViYV#;)=TcyXkAP4v;WcoY!a*eM)Efq; ziNS62pk3r{f<8n2Z#)6zt9l76$QMCBC=Y^)?E`6v?E>Y)4gvjNZwM?G2RvxSrv1$z z$jd(c0zyFjPYD2zJD)Jnwyf?O?$;1zyP+S<5bGBTa`^ACX)f16+1(6+I%2@cE|(Di h&Zgl2sAohA_yxi9MLh#pJ#PR2002ovPDHLkV1k2vh|>T7 literal 0 HcmV?d00001 diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index 8cb8b550..7ac841ef 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -7,7 +7,7 @@ locations: .word location4, location5, location6, location7 .word location8, location9, location10,location11 .word location12,location13,location14,location15 - .word location16,location17,location18 + .word location16,location17,location18,location19 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -110,7 +110,7 @@ location4: ; NIBEL_BLUE_PATH2 -- path 2 to blue house location5: .byte NIBEL_BLUE_PATH1 ; north exit - .byte NIBEL_BLUE_PATH3 ; south exit + .byte NIBEL_BLUE_PATH_2P25 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -126,7 +126,7 @@ location5: ; NIBEL_BLUE_PATH3 -- path 3 to blue house location6: - .byte NIBEL_BLUE_PATH2 ; north exit + .byte NIBEL_BLUE_PATH_2P25 ; north exit .byte NIBEL_BLUE_ROOM ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -360,3 +360,21 @@ location18: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; NIBEL_BLUE_PATH_2P25 -- path 2.25 with the door to conference room +location19: + .byte NIBEL_BLUE_PATH2 ; north exit + .byte NIBEL_BLUE_PATH3 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word blue_path_2p25_n_lzsa ; north bg + .word blue_path_2p25_s_lzsa ; south bg + .word blue_path_2p25_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST + .byte $ff +