diff --git a/games/mist_hgr/Makefile b/games/mist_hgr/Makefile index adb0e62e..8cd95de4 100644 --- a/games/mist_hgr/Makefile +++ b/games/mist_hgr/Makefile @@ -180,7 +180,7 @@ MIST_TITLE: mist_title.o mist_title.o: mist_title.s zp.inc hardware.inc common_defines.inc \ common_routines.inc \ graphics_title_hgr/mist_title.lzsa graphics_title/title_graphics.inc \ - gr_offsets.s \ + gr_offsets.s end_level.s \ draw_pointer.s text_print.s gr_fast_clear.s decompress_fast_v2.s \ keyboard.s audio.s \ init_state.s wait_a_bit.s \ diff --git a/games/mist_hgr/end_level.s b/games/mist_hgr/end_level.s new file mode 100644 index 00000000..d4857739 --- /dev/null +++ b/games/mist_hgr/end_level.s @@ -0,0 +1,22 @@ + + +end_level: + + ; set WHICH_LOAD first + + bit TEXTGR + jsr clear_bottom + + lda #loading_message + sta OUTH + + jsr move_and_print + + ; exit back to loader + + rts + +loading_message: +.byte 0,20,"LOADING...",0 diff --git a/games/mist_hgr/graphics_title/Makefile b/games/mist_hgr/graphics_title/Makefile index 2a1cee5d..1087c432 100644 --- a/games/mist_hgr/graphics_title/Makefile +++ b/games/mist_hgr/graphics_title/Makefile @@ -12,7 +12,8 @@ all: title_graphics.inc title_graphics.inc: \ cyan1.lzsa cyan2.lzsa \ m_title_m.lzsa m_title_y.lzsa m_title_s.lzsa m_title_t.lzsa \ - fissure_stars.lzsa + fissure_stars.lzsa fissure_crescent.lzsa fissure.lzsa fissure2.lzsa \ + fissure_book_small.lzsa fissure_book_big.lzsa echo "cyan1_lzsa: .incbin \"cyan1.lzsa\"" > title_graphics.inc echo "cyan2_lzsa: .incbin \"cyan2.lzsa\"" >> title_graphics.inc echo "m_link_book_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc @@ -20,9 +21,12 @@ title_graphics.inc: \ echo "m_title_y_lzsa: .incbin \"m_title_y.lzsa\"" >> title_graphics.inc echo "m_title_s_lzsa: .incbin \"m_title_s.lzsa\"" >> title_graphics.inc echo "m_title_t_lzsa: .incbin \"m_title_t.lzsa\"" >> title_graphics.inc - echo "fissure_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc - echo "fissure_book_small_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc - echo "fissure_book_big_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc + echo "fissure_stars_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc + echo "fissure_crescent_lzsa: .incbin \"fissure_crescent.lzsa\"" >> title_graphics.inc + echo "fissure_lzsa: .incbin \"fissure.lzsa\"" >> title_graphics.inc + echo "fissure2_lzsa: .incbin \"fissure2.lzsa\"" >> title_graphics.inc + echo "fissure_book_small_lzsa: .incbin \"fissure_book_small.lzsa\"" >> title_graphics.inc + echo "fissure_book_big_lzsa: .incbin \"fissure_book_big.lzsa\"" >> title_graphics.inc echo "falling_right_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc echo "falling_left_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc echo "book_air_lzsa: .incbin \"fissure_stars.lzsa\"" >> title_graphics.inc diff --git a/games/mist_hgr/graphics_title/fissure.vgi b/games/mist_hgr/graphics_title/fissure.vgi new file mode 100644 index 00000000..eaf5a07a --- /dev/null +++ b/games/mist_hgr/graphics_title/fissure.vgi @@ -0,0 +1,26 @@ +; Fissure +VTRI 6 142 8 134 140 26 ; top +RECT 6 6 134 26 140 43 ; top next +HTRI 6 133 43 45 52 154 ; top next +HTRI 6 133 43 53 69 156 ; +HTRI 6 156 68 44 59 131 ; top next +HTRI 6 158 70 56 74 128 ; top next +VTRI 6 143 185 135 140 171 ; bottom +VTRI 6 150 150 137 143 172 ; bottom next +RECT 6 6 127 124 145 160 ; bottom next +HTRI 6 121 130 124 141 127 ; bottom left +VTRI 6 160 110 137 154 131 ; bottom right +RECT 7 7 128 73 147 124 ; center +VTRI 7 147 123 147 160 111 ; center right +VTRI 7 147 79 146 166 112 ; center right +VTRI 7 154 89 148 161 78 ; center right +VTRI 7 153 87 146 161 78 ; center right +RECT 7 7 146 71 157 78 ; center top +RECT 7 7 118 83 128 101 ; center left +VTRI 7 129 73 119 128 83 ; center left +RECT 4 4 120 91 125 96 ; person +LINE 4 118 92 125 92 ; person +LINETO 126 94 +LINETO 125 96 +LINETO 118 96 +END diff --git a/games/mist_hgr/graphics_title/fissure2.vgi b/games/mist_hgr/graphics_title/fissure2.vgi new file mode 100644 index 00000000..7636f56e --- /dev/null +++ b/games/mist_hgr/graphics_title/fissure2.vgi @@ -0,0 +1,10 @@ +; Fissure with falling guy +RECT 7 7 118 90 129 98 ; erase old guy +LINE 4 132 90 137 95 ; left leg +LINE 4 135 88 138 92 ; right leg +RECT 4 4 137 92 143 96 ; body +LINE 4 144 96 147 102 ; left arm +LINE 4 146 100 147 102 ; book +LINE 4 143 93 150 97 ; spine/head +LINE 4 142 92 149 98 ; spine/head +END diff --git a/games/mist_hgr/graphics_title/fissure_book_big.vgi b/games/mist_hgr/graphics_title/fissure_book_big.vgi new file mode 100644 index 00000000..adcb78bc --- /dev/null +++ b/games/mist_hgr/graphics_title/fissure_book_big.vgi @@ -0,0 +1,4 @@ +; Fissure with large small book +RECT 4 4 129 78 157 116 ; big book +HTRI 4 130 78 73 78 153 ; part open +END diff --git a/games/mist_hgr/graphics_title/fissure_book_small.vgi b/games/mist_hgr/graphics_title/fissure_book_small.vgi new file mode 100644 index 00000000..43d925e0 --- /dev/null +++ b/games/mist_hgr/graphics_title/fissure_book_small.vgi @@ -0,0 +1,4 @@ +; Fissure with falling small book +RECT 7 7 129 85 152 104 ; erase old guy +RECT 4 4 141 94 146 98 ; tiny book +END diff --git a/games/mist_hgr/graphics_title/fissure_crescent.vgi b/games/mist_hgr/graphics_title/fissure_crescent.vgi new file mode 100644 index 00000000..0a9df519 --- /dev/null +++ b/games/mist_hgr/graphics_title/fissure_crescent.vgi @@ -0,0 +1,4 @@ +; Fissure Crescent +FCIRC 7 149 96 14 ; white +FCIRC 4 152 96 14 ; black +END diff --git a/games/mist_hgr/graphics_title/fissure_stars.vgi b/games/mist_hgr/graphics_title/fissure_stars.vgi index 8c0a7960..1f014f71 100644 --- a/games/mist_hgr/graphics_title/fissure_stars.vgi +++ b/games/mist_hgr/graphics_title/fissure_stars.vgi @@ -2,16 +2,37 @@ CLS 128 ; black2 background ; left POINT 7 7 5 +POINT 7 48 5 +POINT 7 36 26 POINT 7 50 42 +POINT 7 67 58 POINT 7 18 72 POINT 7 73 90 +POINT 7 11 91 +POINT 7 8 109 +POINT 7 55 111 +POINT 7 38 123 +POINT 7 73 127 +POINT 7 60 132 POINT 7 24 143 +POINT 7 57 150 POINT 7 70 178 ; right +POINT 7 226 11 POINT 7 257 28 +POINT 7 245 29 POINT 7 229 41 +POINT 7 210 57 +POINT 7 260 58 POINT 7 220 63 +POINT 7 231 85 POINT 7 261 86 +POINT 7 272 106 +POINT 7 232 115 +POINT 7 254 120 +POINT 7 274 131 +POINT 7 213 144 POINT 7 256 155 +POINT 7 214 173 POINT 7 206 178 END diff --git a/games/mist_hgr/mist_title.s b/games/mist_hgr/mist_title.s index 697a5646..48c8016a 100644 --- a/games/mist_hgr/mist_title.s +++ b/games/mist_hgr/mist_title.s @@ -320,6 +320,16 @@ reload_everything: ;=================================== ; touch linking book as fissure pulses + ldx #fissure_stars_lzsa + lda #10 + jsr draw_and_wait + + ldx #fissure_crescent_lzsa + lda #10 + jsr draw_and_wait + bit TEXTGR ; split text/gr jsr clear_bottom @@ -336,6 +346,11 @@ reload_everything: lda #50 jsr draw_and_wait + ldx #fissure2_lzsa + lda #50 + jsr draw_and_wait + ;=================================== ; FISSURE_BOOK_SMALL: starry expanse... diff --git a/games/mist_hgr/qload.s b/games/mist_hgr/qload.s index aa351842..a162b50e 100644 --- a/games/mist_hgr/qload.s +++ b/games/mist_hgr/qload.s @@ -225,7 +225,7 @@ length_array: .include "linking_noise.s" .include "decompress_fast_v2.s" .include "draw_pointer.s" -; .include "end_level.s" + .include "end_level.s" ; .include "gr_copy.s" .include "gr_fast_clear.s" .include "gr_offsets.s"