From 2d744631e9dc527d322236c5b76c3342a700fbf1 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 12 Aug 2020 16:15:22 -0400 Subject: [PATCH] mist: nibel: add another location --- mist/common_defines.inc | 1 + mist/graphics_nibel/Makefile | 3 +++ mist/graphics_nibel/blue_path_2p5_n.png | Bin 0 -> 1085 bytes mist/graphics_nibel/blue_path_2p5_s.png | Bin 0 -> 1041 bytes mist/leveldata_nibel.inc | 23 +++++++++++++++++++++-- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 mist/graphics_nibel/blue_path_2p5_n.png create mode 100644 mist/graphics_nibel/blue_path_2p5_s.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index f276d7dc..65645f7e 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -470,6 +470,7 @@ NIBEL_RED_BED_OPEN = 16 NIBEL_HALF_LETTER = 17 NIBEL_BLUE_PATH_0P5 = 18 NIBEL_BLUE_PATH_2P25 = 19 +NIBEL_BLUE_PATH_2P5 = 20 DENTIST_OUTSIDE = 0 DENTIST_OUTSIDE_OPEN = 1 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 32c4851a..344dc0d9 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -15,6 +15,7 @@ nibel_graphics.inc: \ 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_path_2p5_n.lzsa blue_path_2p5_s.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 \ @@ -38,6 +39,8 @@ 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_path_2p5_n_lzsa: .incbin \"blue_path_2p5_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p5_s_lzsa: .incbin \"blue_path_2p5_s.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_2p5_n.png b/mist/graphics_nibel/blue_path_2p5_n.png new file mode 100644 index 0000000000000000000000000000000000000000..0b3906948a14cf4d7568918b69cd2df069463edb GIT binary patch literal 1085 zcmV-D1j74?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{00HSqL_t(Y$HmuSkAol#24H72!Uw|t|F^gD+O@O@=q-07chQ+WzEDKA z9HoVK+jsmwj{V)1vxPu^XmaL1{~R;Njlp$&2olf&g}V(Bf>wk4HQlB_X;&bwZd(h~ zJ-7ftT5#L`4@4KaI5;{E4fcvc*Vi=!`ZEbNSSK8T!cBHrYCQtqC){BT5;>D_+xYm) zpp0Ruppe%fu3aaTTQ-W~Cw2%lX(mC*_Z(C;M#A>uPF&?OYGt|-sG z8f3INZ7jHyC6^O2SdXCv(dF|S9@Jf)1FJsu!FHAZ2t3CyMuKvtqZsL%2z?kXWx2rV7XR5DKQe9vj=gr{uq{P^ktl;1hNIvje7IYfcuU@aLQIf zx@~`At1b&kD2*j0(jfZbQ#L>()MQH3=~2QC$Yjo%W9?*iGo7*iE~D*wqd|pXO0Qyjyf4o6aX}j-i0GCcBs7;&&56kd}81 zK1=v|opY7maT>IHo7sdP5I-W2@+%2FX!p}|3Ar~v{{>L(^Vy?*00000NkvXXu0mjf D@|NS2 literal 0 HcmV?d00001 diff --git a/mist/graphics_nibel/blue_path_2p5_s.png b/mist/graphics_nibel/blue_path_2p5_s.png new file mode 100644 index 0000000000000000000000000000000000000000..e65ada0518d6f596661ca4ef7e1aec8e35a2180a GIT binary patch literal 1041 zcmV+s1n&EZP)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{00F&8L_t(Y$JN){u7e;D1yIspkO$-c|Lt+Rna+Tq0_UZZlv-Mr!$q`i zJ;FIH@s1;@LxkX5j7tjdL+~j=!11!+xA^Y(d zKu!uWoC1}U47aTX%Dle>CBt)ZUzX+oD6=deHnb*ao43IIj2QQw^)YHma8L0Q;F~f0 z1+bi3yX+spd{kwbXogxh0TRPL!)$SV@K{dK4U!{FZr`!xq8!SQBy%PGPawAgex3kX zue%Kx1V(TIv^C}CPzCj_QeTI*`^b)2Qs@NN)#fOTi4K8zOoQv1XP9^UA2Q?){u2Cr zO3-G<=R|#`xdnNvzk;^gB`6O{jSOpGx&G{ki{TOP) z;S8_yJOSFjLai>BC%S;;KY*tUA3-~YwQXw>tY36pU~LTZxCj3LnTcCUo2|_;00000 LNkvXXu0mjfoAuA( literal 0 HcmV?d00001 diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index 7ac841ef..dc41b0b2 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -8,6 +8,7 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 + .word location20 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -126,7 +127,7 @@ location5: ; NIBEL_BLUE_PATH3 -- path 3 to blue house location6: - .byte NIBEL_BLUE_PATH_2P25 ; north exit + .byte NIBEL_BLUE_PATH_2P5 ; north exit .byte NIBEL_BLUE_ROOM ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -364,7 +365,7 @@ location18: ; 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 NIBEL_BLUE_PATH_2P5 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -378,3 +379,21 @@ location19: .byte BG_NORTH|BG_SOUTH|BG_EAST .byte $ff +; NIBEL_BLUE_PATH_2P5 -- path 2.5 along the wall +location20: + .byte NIBEL_BLUE_PATH_2P25 ; 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_2p5_n_lzsa ; north bg + .word blue_path_2p5_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +