From 7ea476dc872887651ef9404d038752c22a64ad14 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 29 Aug 2020 20:42:31 -0400 Subject: [PATCH] mist: meche: some more stuff in blue room --- mist/Makefile | 9 +++---- mist/README | 4 +-- mist/common_defines.inc | 1 + mist/extra_empty.dsk | Bin 0 -> 143360 bytes mist/graphics_meche/Makefile | 8 +++--- mist/graphics_meche/blue_room_south_e.png | Bin 0 -> 1040 bytes mist/graphics_meche/blue_room_south_n.png | Bin 0 -> 1348 bytes mist/graphics_meche/blue_room_south_s.png | Bin 0 -> 780 bytes mist/leveldata_meche.inc | 30 +++++++++++++++++----- mist/meche_rotation.s | 5 ++++ 10 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 mist/extra_empty.dsk create mode 100644 mist/graphics_meche/blue_room_south_e.png create mode 100644 mist/graphics_meche/blue_room_south_n.png create mode 100644 mist/graphics_meche/blue_room_south_s.png diff --git a/mist/Makefile b/mist/Makefile index 50e13d66..ee121e2d 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -26,7 +26,7 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON VIEWER \ $(DOS33) -y mist.dsk BSAVE -a 0x2000 SHIP mist_side2.dsk: HELLO_DISK2 CHANNEL ARBOR NIBEL CABIN GENERATOR - cp empty.dsk mist_side2.dsk + cp extra_empty.dsk mist_side2.dsk $(DOS33) -y mist_side2.dsk SAVE A HELLO_DISK2 HELLO $(DOS33) -y mist_side2.dsk BSAVE -a 0x2000 CHANNEL $(DOS33) -y mist_side2.dsk BSAVE -a 0x2000 ARBOR @@ -34,17 +34,16 @@ mist_side2.dsk: HELLO_DISK2 CHANNEL ARBOR NIBEL CABIN GENERATOR $(DOS33) -y mist_side2.dsk BSAVE -a 0x2000 CABIN $(DOS33) -y mist_side2.dsk BSAVE -a 0x2000 GENERATOR - - mist_side3.dsk: HELLO_DISK2 MECHE SELENA STONEY SUB - cp empty.dsk mist_side3.dsk - $(DOS33) -y mist_side3.dsk SAVE A HELLO_DISK2 HELLO + cp extra_empty.dsk mist_side3.dsk +# $(DOS33) -y mist_side3.dsk SAVE A HELLO_DISK2 HELLO $(DOS33) -y mist_side3.dsk BSAVE -a 0x2000 MECHE $(DOS33) -y mist_side3.dsk BSAVE -a 0x2000 SELENA $(DOS33) -y mist_side3.dsk BSAVE -a 0x2000 STONEY $(DOS33) -y mist_side3.dsk BSAVE -a 0x2000 SUB + ### LOADER: loader.o diff --git a/mist/README b/mist/README index 97c75570..ac817270 100644 --- a/mist/README +++ b/mist/README @@ -67,9 +67,9 @@ New disk1: ======== === 414+5= 419 = 104k 30 disk3: - MECHE 32004 -> 32256 -> 126 8 + MECHE 39629 -> 39629 -> 155 10 SELENA 36912 -> 37120 -> 145 10 STONEY 40195 -> 40448 -> 158 10 SUB 13786 -> 13824 -> 54 4 ======== ==== - 503+5=508 = 127k 32 + 503+5=508 = 127k 34 diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 8e95f5a1..e7471b2b 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -215,6 +215,7 @@ MECHE_TELESCOPE_SKELETON= 50 MECHE_TELESCOPE_PLAIN = 51 MECHE_BLUE_THRONE = 52 MECHE_BLUE_THRONE_OPEN = 53 +MECHE_BLUE_ROOM_SOUTH = 54 ; Selena Age diff --git a/mist/extra_empty.dsk b/mist/extra_empty.dsk new file mode 100644 index 0000000000000000000000000000000000000000..3ece4ae8eba11857fa96542bbb362330810d189b GIT binary patch literal 143360 zcmeIxF>cdP7zgl|QrZU665qfQBSWWNq9@=GoPfEJ+Dc4Z;E4f=g&S0gQ7k2j6i2Za zZoq=nr4uB<2HLely1n0DvZwET^8feb-sd+rm*ea6HvRD^`w~XO{A!bb+~lXf@{3LW z_V=f7b9QulkpEo&Sl;D>^}AvC&?R}$~7F9DXSO1O_i^=~r?Z9$X)^#l6y!_rRSe1WQ#2ADC0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C7okA)_a7wQ z|2XmfCu#TBo&W&?1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0tAu} F_ybySsn7rb literal 0 HcmV?d00001 diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index 789d0148..f5d7bbce 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -68,7 +68,8 @@ meche_graphics.inc: \ red_throne_s.lzsa \ red_room_east_e.lzsa red_room_east_n.lzsa red_room_east_w.lzsa \ red_skeleton.lzsa red_no_skeleton.lzsa \ - blue_throne_open_w.lzsa blue_throne_closed_w.lzsa + blue_throne_open_w.lzsa blue_throne_closed_w.lzsa \ + blue_room_south_s.lzsa blue_room_south_n.lzsa blue_room_south_e.lzsa echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc @@ -188,8 +189,9 @@ meche_graphics.inc: \ echo "red_no_skeleton_lzsa: .incbin \"red_no_skeleton.lzsa\"" >> meche_graphics.inc echo "blue_throne_open_w_lzsa: .incbin \"blue_throne_open_w.lzsa\"" >> meche_graphics.inc echo "blue_throne_closed_w_lzsa: .incbin \"blue_throne_closed_w.lzsa\"" >> meche_graphics.inc - - + echo "blue_room_south_n_lzsa: .incbin \"blue_room_south_n.lzsa\"" >> meche_graphics.inc + echo "blue_room_south_s_lzsa: .incbin \"blue_room_south_s.lzsa\"" >> meche_graphics.inc + echo "blue_room_south_e_lzsa: .incbin \"blue_room_south_e.lzsa\"" >> meche_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/blue_room_south_e.png b/mist/graphics_meche/blue_room_south_e.png new file mode 100644 index 0000000000000000000000000000000000000000..d7c18b82ddc851723acf4212c7e221917b8677b2 GIT binary patch literal 1040 zcmV+r1n>KaP)EX>4Tx04R}tkv&MmKpe$iTg4(32Mda*WT?7W5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0sdNvsbx5TMG%AN#VCd(X6kdIn1JW_x`&UicTt|@eeTcErDRP8_ypovrW+RV2J!T! zrE}gV4zq%!5T6r|8FWG7N3P2*zj4kx?B|(bBbA&d4igLc7M5F>6%3Vlia4UE8s+=b zE-Re3IIE=!YuuB+FqG9+mbp%I0C6m02_gi@sGx`vEJSJ5NHLM5{g{Wp-|>s&lF3yB zBgX>DP$4;f@IUz7t(lvgaFaqYp#8v9smRcqPCet0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbOx=BPqR7l6|m)nlRAPhtS$xC=Z`~QEtnR+doTL=y6zU)YC2;ftP zTc*yrltQELQ_h91h@3;a*0@tdQhEbOvc|XqZIBe8IAdqNZ1copMN{HVlw0$=48h%rjZdksbn|3F)U$0QLR>kh}Z?4N&*YCZKG`$3Qs> z{u+qWM#FKK>47!|;#lqi1;8Jkf;z+Aq!?grD@p)5))|(|hFgX}0pJ^51TCa@kuu_RkEv>r#DP9JDqSS64{Tcb1sVk!r~xz`#2eCH7Q2j!=R}^?@ zI9ugR#8zYzkSM=|>n5N)a65_at49`0000< KMNUMnLSTZ1)XHW6 literal 0 HcmV?d00001 diff --git a/mist/graphics_meche/blue_room_south_n.png b/mist/graphics_meche/blue_room_south_n.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e8cdc93bb60c02013cc9662ff1bb4a354cc3a4 GIT binary patch literal 1348 zcmV-K1-tr*P)EX>4Tx04R}tkv&MmKpe$iQ;S6^4t5YfAVPJrAS&XhRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRU;x7sGxfP-G6B!=bq^n3@1i`*``n+STgjOW@QK8;OgAjz4dUrd zOXs{#9A-sHAwDM_Gw6cEk6f2se&bwlSm2pqBb}Nj4ik%oHkR9%6%Cbmia4UE8s!Ta zmle)ioYiubHSft^7|LlY%Uq{9h&UFpgd{}BsG@{2EJSJ5NHLM3{g{Wp-|;8OC6lWJ zMvetkph9x|;D7MDTQfg7;U6D*P7c~b04Pv9TX=6i{anI0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbP?ny*JR7l6Am)Vl*APhuJ$_qSD{QuwH^t9U&0y3Gps&e8boU|4M z-nJimy$#-37q5TgA_h4%RS&=Yhc6?$R|?xJ~tuiN^c2#7nV1bmiq9CCR8GAX58SFPKYQqDxO5?Bp5 zpbEbrmO!{1fR-4-U?~x4g-z&j00n(ih_QpqR>=HkWgo~M2vzt7kTFEjOci=?1h(cC zDhLE3B}*VfZ$Kac1cr$N1mQqnI2oaEDE>K+8hap&QBH|K%kdw8a+x>+OJUk9$5Y@l z%{LEJQZVSc00iv1sBr2sFG|rgN3G3)K%q(jWehuoYFfMjg|(){V-1AC^+^mPaNmU^ zG6HMG6NH0vYRK{@g$jC9h-QM6V7`2z5TRxa$C<)GDX9)QQykD5zbPb8I0K@jm^$`Q zb)PQFBM@2c8yIG<0efQ%-8EMfJm7G)Sic&w9#=pwW&t$$((oCm<>LV|)W_i!M&R1z z1rW71Q;3>lH2(wW71~PjXP|Zwy~2L2`!Xp8WW$O;L#}|KYz(M&-X}!B*1lBeH%I-v z6cF9IHEsufRTwvQQK6ohqbs;LPRL=q3zjyf&oLH2@ho!mJL3=p8nk=_Jsaa3~xc=ZS&X zUNFlM}rrs6q{hl`H!~@mZdG5R1^!hxWh#T~LKbtw+KzHG83OJAPXq%26$g2Rv zio)9-6jj;`m$uEX>4Tx04R}tkv&MmKpe$iQ;S6^4t5YfAVPJrAS&XhRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRU;x7sGxfP-G6B!=bq^n3@1i`*``n+STgjOW@QK8;OgAjz4dUrd zOXs{#9A-sHAwDM_Gw6cEk6f2se&bwlSm2pqBb}Nj4ik%oHkR9%6%Cbmia4UE8s!Ta zmle)ioYiubHSft^7|LlY%Uq{9h&UFpgd{}BsG@{2EJSJ5NHLM3{g{Wp-|;8OC6lWJ zMvetkph9x|;D7MDTQfg7;U6D*P7c~b04Pv9S<=ly9vTm0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbNwn;=mR7l6|*3k-pFbD-u83gta{r}%Ki!~<&%iUnb?o0M^P%9SE z8Rk@l7`c}#^Ri4PRF`XTjRAon^af^9gB$|}iJC#d5-1e}%yEMA3y8LBVE9l3(pI>z<=> z?a*Sja(pXy9Rk3z!^b0AP$NK4r@tNME*n0*>(1QlYoHyq2HXHsgBS-y0*{jb0000< KMNUMnLSTXrLQJUu literal 0 HcmV?d00001 diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index 8bb97593..9342f528 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -17,7 +17,7 @@ locations: .word location40,location41,location42,location43 .word location44,location45,location46,location47 .word location48,location49,location50,location51 - .word location52,location53 + .word location52,location53,location54 ; MECHE_INSIDE_GEAR -- Inside gear on Mist location0: @@ -440,11 +440,11 @@ location22: ; MECHE_BLUE_ROOM_CENTER -- center of blue room location23: .byte MECHE_CENTER_HALL2 ; north exit - .byte MECHE_RIGHT_HALL_CORNER ; south exit + .byte MECHE_BLUE_ROOM_SOUTH ; south exit .byte $ff ; east exit .byte MECHE_BLUE_THRONE ; west exit .byte DIRECTION_N ; north exit_dir - .byte DIRECTION_W ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte DIRECTION_W ; west exit_dir .word blue_room_center_n_lzsa ; north bg @@ -462,7 +462,7 @@ location23: ; MECHE_CENTER_HALL2 -- center hall 2 location24: .byte MECHE_CENTER_HALL2 ; north exit - .byte MECHE_BLUE_ROOM_CENTER ; south exit + .byte MECHE_BLUE_ROOM_SOUTH ; south exit .byte $ff ; east exit .byte MECHE_RED_BUTTON ; west exit .byte DIRECTION_W ; north exit_dir @@ -1000,5 +1000,23 @@ location53: .byte 16,40 ; special y .word enter_blue_secret-1 ; special function - - +; MECHE_BLUE_ROOM_SOUTH -- south side of blue room +location54: + .byte MECHE_BLUE_ROOM_CENTER ; north exit + .byte MECHE_RIGHT_HALL_CORNER ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_W ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word blue_room_south_n_lzsa ; north bg + .word blue_room_south_s_lzsa ; south bg + .word blue_room_south_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST + .byte $ff + .byte DIRECTION_E + .byte 21,30 ; special x + .byte 34,46 ; special y + .word touch_blue_box-1 ; special function diff --git a/mist/meche_rotation.s b/mist/meche_rotation.s index 24d69f64..1adb6fc8 100644 --- a/mist/meche_rotation.s +++ b/mist/meche_rotation.s @@ -1,3 +1,8 @@ +touch_blue_box: + lda #1 + sta ANIMATE_FRAME + rts + ;=============================== ; draw hover crystals ;===============================