From c0c0918c16c58ef269d0a71e88f2b66ccdddf34d Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 11 Aug 2020 00:57:59 -0400 Subject: [PATCH] mist: meche: add rest of the blue secret room also electric jolt, which could be a lot better --- mist/Makefile | 6 +- mist/README | 4 +- mist/graphics_meche/Makefile | 11 ++-- mist/graphics_meche/blue_secret_room_e.png | Bin 0 -> 935 bytes .../blue_secret_room_jolt_n.png | Bin 0 -> 833 bytes mist/graphics_meche/blue_secret_room_n.png | Bin 0 -> 905 bytes mist/graphics_meche/blue_secret_room_s.png | Bin 0 -> 882 bytes mist/leveldata_meche.inc | 22 +++---- mist/loader.s | 2 +- mist/meche.s | 54 ++++++++++++++++++ mist/playthrough_save.inc | 4 +- 11 files changed, 80 insertions(+), 23 deletions(-) create mode 100644 mist/graphics_meche/blue_secret_room_e.png create mode 100644 mist/graphics_meche/blue_secret_room_jolt_n.png create mode 100644 mist/graphics_meche/blue_secret_room_n.png create mode 100644 mist/graphics_meche/blue_secret_room_s.png diff --git a/mist/Makefile b/mist/Makefile index 4529f1f6..ec33d984 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -26,23 +26,23 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON VIEWER \ $(DOS33) -y mist.dsk BSAVE -a 0x2000 SHIP # $(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC -mist_side2.dsk: HELLO_DISK2 CHANNEL ARBOR NIBEL CABIN +mist_side2.dsk: HELLO_DISK2 CHANNEL ARBOR NIBEL CABIN GENERATOR cp 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 $(DOS33) -y mist_side2.dsk BSAVE -a 0x2000 NIBEL $(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 GENERATOR SUB +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 $(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 GENERATOR $(DOS33) -y mist_side3.dsk BSAVE -a 0x2000 SUB diff --git a/mist/README b/mist/README index e9a41f26..63177755 100644 --- a/mist/README +++ b/mist/README @@ -47,13 +47,13 @@ Sizes: ARBOR 31591 -> 31744 -> 124 8 NIBEL 15467 -> 15616 -> 61 4 CABIN 15398 -> 15616 -> 61 4 + GENERATOR 8434 -> 8448 -> 33 3 ======== === - 381+4= 385 = 98k 25 + 414+5= 419 = 104k 28 disk3: MECHE 28857 -> 28928 -> 113 8 SELENA 36912 -> 37120 -> 145 10 STONEY 40195 -> 40448 -> 158 10 - GENERATOR 8434 -> 8448 -> 33 3 SUB 13786 -> 13824 -> 54 4 ======== ==== 503+5=508 = 127k 35 diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index 429c6df7..97ff4e82 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -55,7 +55,9 @@ meche_graphics.inc: \ book_stairs_n.lzsa book_stairs_s.lzsa \ book_room_n.lzsa \ book_open_n.lzsa book_closed_n.lzsa \ - blue_secret_door_w.lzsa blue_secret_room_w.lzsa \ + blue_secret_door_w.lzsa \ + blue_secret_room_n.lzsa blue_secret_room_s.lzsa blue_secret_room_e.lzsa blue_secret_room_w.lzsa \ + blue_secret_room_jolt_n.lzsa \ red_secret_door_s.lzsa red_secret_room_s.lzsa echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc @@ -148,12 +150,13 @@ meche_graphics.inc: \ echo "book_closed_n_lzsa: .incbin \"book_closed_n.lzsa\"" >> meche_graphics.inc echo "blue_secret_door_w_lzsa: .incbin \"blue_secret_door_w.lzsa\"" >> meche_graphics.inc echo "blue_secret_room_w_lzsa: .incbin \"blue_secret_room_w.lzsa\"" >> meche_graphics.inc + echo "blue_secret_room_jolt_n_lzsa: .incbin \"blue_secret_room_jolt_n.lzsa\"" >> meche_graphics.inc + echo "blue_secret_room_e_lzsa: .incbin \"blue_secret_room_e.lzsa\"" >> meche_graphics.inc + echo "blue_secret_room_n_lzsa: .incbin \"blue_secret_room_n.lzsa\"" >> meche_graphics.inc + echo "blue_secret_room_s_lzsa: .incbin \"blue_secret_room_s.lzsa\"" >> meche_graphics.inc echo "red_secret_door_s_lzsa: .incbin \"red_secret_door_s.lzsa\"" >> meche_graphics.inc echo "red_secret_room_s_lzsa: .incbin \"red_secret_room_s.lzsa\"" >> meche_graphics.inc - - - %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/blue_secret_room_e.png b/mist/graphics_meche/blue_secret_room_e.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a478d4618d55eeabfdd4b3c6b6279f491ea11f GIT binary patch literal 935 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 + sta location39+1,Y ; MECHE_BLUE_SECRET_ROOM + + jsr change_direction + +not_done_jolt: + + rts + +actually_draw_blue_page: lda BLUE_PAGES_TAKEN and #MECHE_PAGE @@ -265,6 +298,27 @@ meche_take_red_page: jmp take_red_page meche_take_blue_page: + lda DIRECTION + cmp #DIRECTION_W + beq actually_take_blue_page + + ; if not, jolt time + lda #1 + sta ANIMATE_FRAME + lda #0 + sta FRAMEL + + ldy #LOCATION_NORTH_BG + lda #blue_secret_room_jolt_n_lzsa + sta location39+1,Y ; MECHE_BLUE_SECRET_ROOM + + jmp change_direction + + +actually_take_blue_page: + lda #MECHE_PAGE jmp take_blue_page diff --git a/mist/playthrough_save.inc b/mist/playthrough_save.inc index a78b0ba0..1c31afc5 100644 --- a/mist/playthrough_save.inc +++ b/mist/playthrough_save.inc @@ -53,9 +53,9 @@ .byte $00 ; MECHE_LOCK4 = $A8 .byte $00 ; HOLDING_PAGE = $A9 -.byte $3 +.byte $4 ; RED_PAGE_COUNT = $AA -.byte $3 +.byte $4 ; BLUE_PAGE_COUNT = $AB