diff --git a/mist/Makefile b/mist/Makefile index 6dc6152a..76d1c307 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -81,11 +81,9 @@ mist_side3.dsk: WBOOT3 MECHE SELENA STONEY SUB cp extra_empty.dsk mist_side3.dsk $(DOS33_RAW) mist_side3.dsk 0 0 WBOOT3 0 1 $(DOS33_RAW) mist_side3.dsk 1 0 MECHE 0 157 - $(DOS33_RAW) mist_side3.dsk 11 0 SELENA 0 145 - $(DOS33_RAW) mist_side3.dsk 21 0 STONEY 0 158 - $(DOS33_RAW) mist_side3.dsk 31 0 SUB 0 54 - - + $(DOS33_RAW) mist_side3.dsk 11 0 STONEY 0 158 + $(DOS33_RAW) mist_side3.dsk 21 0 SELENA 0 145 + $(DOS33_RAW) mist_side3.dsk 30 1 SUB 0 78 ### diff --git a/mist/README b/mist/README index 5cf3f110..b28a94d1 100644 --- a/mist/README +++ b/mist/README @@ -70,9 +70,9 @@ New disk1: MECHE 40064 -> 40192 -> 157 10 SELENA 36912 -> 37120 -> 145 10 STONEY 40195 -> 40448 -> 158 10 - SUB 13786 -> 13824 -> 54 4 + SUB 19774 -> 19968 -> 78 5 ======== ==== - 503+5=508 = 127k 34 + 503+5=508 = 127k 35 @@ -103,9 +103,9 @@ NEW: disk3: MECHE 40064 157 (9T13S) 1_0 10_12 157 - SELENA 36912 145 (9T1S) 11_0 20_0 145 - STONEY 40195 158 (9T14S) 21_0 30_13 158 - SUB 13786 54 (3T6S) 31_0 34_5 54 + STONEY 40195 158 (9T14S) 11_0 20_14 158 + SELENA 36912 145 (9T1S) 21_0 30_1 145 + SUB 19776 78 (4T14S) 30_1 34_15 78 diff --git a/mist/TODO b/mist/TODO index bc8aacab..4f375ccc 100644 --- a/mist/TODO +++ b/mist/TODO @@ -3,8 +3,6 @@ For release 1.0 + QLOAD + LOADER - -- save game - -- joystick support + MIST -- open door to clock puzzle? @@ -43,7 +41,7 @@ For release 1.0 -- make rotation more similar to actual game? + SUB - -- can walk around outside of sub + Done: + CABIN diff --git a/mist/graphics_sub/Makefile b/mist/graphics_sub/Makefile index e7d61656..f83bc53d 100644 --- a/mist/graphics_sub/Makefile +++ b/mist/graphics_sub/Makefile @@ -71,9 +71,6 @@ sub_graphics.inc: \ echo "bottom_stairs_e_lzsa: .incbin \"bottom_stairs_e.lzsa\"" >> sub_graphics.inc echo "bottom_stairs_w_lzsa: .incbin \"bottom_stairs_w.lzsa\"" >> sub_graphics.inc - - - %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/qload.s b/mist/qload.s index 90567fcd..462afe0d 100644 --- a/mist/qload.s +++ b/mist/qload.s @@ -195,10 +195,10 @@ load_address_array: .byte $0C ; FIRST_SECTOR track_array: - .byte 2, 8, 1,11 ; MIST_TITLE,MIST,MECHE,SELENA - .byte 18,31,21, 1 ; OCTAGON,VIEWER,STONEY,CHANNEL + .byte 2, 8, 1,21 ; MIST_TITLE,MIST,MECHE,SELENA + .byte 18,31,11, 1 ; OCTAGON,VIEWER,STONEY,CHANNEL .byte 27,26,10,20 ; CABIN,DENTIST,ARBOR,NIBEL - .byte 30,32,28,31 ; SHIP,GENERATOR,D'NI,SUB + .byte 30,32,28,30 ; SHIP,GENERATOR,D'NI,SUB .byte 0 ; TEXT_TITLE .byte 0, 0, 0, 0, 0 ; SAVE1,SAVE2,SAVE3,SAVE4,SAVE5 .byte 0 ; FIRST_SECTOR @@ -207,7 +207,7 @@ sector_array: .byte 0, 0, 0, 0 ; MIST_TITLE,MIST,MECHE,SELENA .byte 0, 8, 0, 0 ; OCTAGON,VIEWER,STONEY,CHANNEL .byte 0, 0, 0, 0 ; CABIN,DENTIST,ARBOR,NIBEL - .byte 0,12, 0, 0 ; SHIP,GENERATOR,D'NI,SUB + .byte 0,12, 0, 1 ; SHIP,GENERATOR,D'NI,SUB .byte 6 ; TEXT_TITLE .byte 11,12,13,14,15 ; SAVE1,SAVE2,SAVE3,SAVE4,SAVE5 .byte 0 ; FIRST_SECTOR @@ -216,7 +216,7 @@ length_array: .byte 83,159,157,145 ; MIST_TITLE,MIST,MECHE,SELENA .byte 128, 19,158,135 ; OCTAGON,VIEWER,STONEY,CHANNEL .byte 61, 31,159,109 ; CABIN,DENTIST,ARBOR,NIBEL - .byte 20, 33, 27, 54 ; SHIP,GENERATOR,D'NI,SUB + .byte 20, 33, 27, 78 ; SHIP,GENERATOR,D'NI,SUB .byte 3 ; TEXT_TITLE .byte 1,1,1,1,1 ; SAVE1,SAVE2,SAVE3,SAVE4,SAVE5 .byte 1 ; FIRST_SECTOR diff --git a/mist/save3.s b/mist/save3.s index 66ad7e8f..dc8326a3 100644 --- a/mist/save3.s +++ b/mist/save3.s @@ -6,6 +6,11 @@ .byte DIRECTION_N ; DIRECTION = $81 .byte SELENA_WALKWAY1 ; LOCATION = $82 +;.byte LOAD_SUB ; WHICH_LOAD = $80 +;.byte DIRECTION_E ; DIRECTION = $81 +;.byte SUB_BUNKER_ENTRY ; LOCATION = $82 + + .byte $00 ; RED_PAGES_TAKEN = $83 .byte $00 ; BLUE_PAGES_TAKEN = $84 .byte $00 ; CLOCK_BRIDGE = $85