diff --git a/mist/graphics_title/Makefile b/mist/graphics_title/Makefile index c185df46..747ea160 100644 --- a/mist/graphics_title/Makefile +++ b/mist/graphics_title/Makefile @@ -14,7 +14,8 @@ title_graphics.inc: m_link_book.lzsa \ fissure.lzsa fissure_book_small.lzsa fissure_book_big.lzsa \ falling_right.lzsa falling_left.lzsa \ book_air.lzsa book_sparks.lzsa book_glow.lzsa \ - book_ground.lzsa book_ground_n.lzsa + book_ground.lzsa book_ground_n.lzsa \ + book_closed_n.lzsa echo "m_link_book_lzsa: .incbin \"m_link_book.lzsa\"" > title_graphics.inc echo "m_title_m_lzsa: .incbin \"m_title_m.lzsa\"" >> title_graphics.inc echo "m_title_y_lzsa: .incbin \"m_title_y.lzsa\"" >> title_graphics.inc @@ -30,6 +31,8 @@ title_graphics.inc: m_link_book.lzsa \ echo "book_glow_lzsa: .incbin \"book_glow.lzsa\"" >> title_graphics.inc echo "book_ground_lzsa: .incbin \"book_ground.lzsa\"" >> title_graphics.inc echo "book_ground_n_lzsa: .incbin \"book_ground_n.lzsa\"" >> title_graphics.inc + echo "book_closed_n_lzsa: .incbin \"book_closed_n.lzsa\"" >> title_graphics.inc + diff --git a/mist/leveldata_title.inc b/mist/leveldata_title.inc index f15884dc..7d19f010 100644 --- a/mist/leveldata_title.inc +++ b/mist/leveldata_title.inc @@ -27,23 +27,21 @@ location0: ; TITLE_BOOK_CLOSED -- myst linking book closed location1: - .byte $ff ; north exit + .byte TITLE_BOOK_OPEN ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word m_link_book_lzsa ; north bg + .word book_closed_n_lzsa ; north bg .word $0000 ; south bg .word $0000 ; east bg .word $0000 ; west bg .byte BG_NORTH ; only north bg - .byte DIRECTION_N ; special exit - .byte 21,31 ; special x - .byte 10,24 ; special y - .word mist_link_book-1 ; special function + .byte $ff ; special exit + ; TITLE_BOOK_OPEN -- myst linking book location2: @@ -61,6 +59,6 @@ location2: .word $0000 ; west bg .byte BG_NORTH ; only north bg .byte DIRECTION_N ; special exit - .byte 21,31 ; special x - .byte 10,24 ; special y + .byte 22,33 ; special x + .byte 12,26 ; special y .word mist_link_book-1 ; special function diff --git a/mist/mist_title.s b/mist/mist_title.s index 7ee81cf1..035e6d11 100644 --- a/mist/mist_title.s +++ b/mist/mist_title.s @@ -225,22 +225,10 @@ no_language_card: ldx #book_ground_lzsa - lda #15 + lda #50 jsr draw_and_wait - ;=================== - ; init screen -; jsr TEXT -; jsr HOME -; bit KEYRESET - -; bit SET_GR -; bit PAGE0 -; bit LORES - bit FULLGR - -; lda #0 -; sta DRAW_PAGE + ; restore to full screen (no text) bit FULLGR @@ -267,9 +255,6 @@ no_language_card: lda #DIRECTION_N sta DIRECTION -; lda #LOAD_MIST ; load mist -; sta WHICH_LOAD - jsr change_location lda #1