diff --git a/mist/Makefile b/mist/Makefile index cb37104b..1ce9b099 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -97,7 +97,7 @@ qboot_sector.o: qboot_sector.s qboot_stage2.s TEXT_TITLE: text_title.o ld65 -o TEXT_TITLE text_title.o -C ../linker_scripts/apple2_800.inc -text_title.o: text_title.s +text_title.o: text_title.s text_print.s wait_a_bit.s ca65 -o text_title.o text_title.s -l text_title.lst @@ -198,7 +198,7 @@ mist_title.o: mist_title.s zp.inc hardware.inc common_defines.inc \ gr_copy.s gr_offsets.s gr_pageflip.s gr_putsprite_crop.s \ text_print.s gr_fast_clear.s decompress_fast_v2.s \ keyboard.s draw_pointer.s end_level.s audio.s \ - init_state.s \ + init_state.s wait_a_bit.s \ link_book_mist_dock.s common_sprites.inc leveldata_title.inc \ pt3_lib_core.s pt3_lib_init.s pt3_lib_mockingboard_detect.s \ pt3_lib_mockingboard_setup.s pt3_lib_irq_handler.s interrupt_handler.s diff --git a/mist/mist_title.s b/mist/mist_title.s index 3e05dbf0..45785b11 100644 --- a/mist/mist_title.s +++ b/mist/mist_title.s @@ -504,6 +504,8 @@ really_exit: .include "pt3_lib_mockingboard_setup.s" + .include "wait_a_bit.s" + file: .incbin "graphics_title_hgr/mist_title.lzsa" @@ -533,46 +535,6 @@ draw_and_wait: jsr wait_a_bit rts - ;==================================== - ; wait for keypress or a few seconds - ;==================================== - -wait_a_bit: - - bit KEYRESET - tax - -keyloop: - lda #200 ; delay a bit - jsr WAIT - - lda KEYPRESS - bmi done_keyloop - -; bmi keypress_exit - - dex - bne keyloop - -done_keyloop: - - bit KEYRESET - - rts - - ; just skip whole intro, not just current scene - -;keypress_exit: - -; bit KEYRESET - -; pla ; pop two addresses off the stack -; pla -; pla -; pla -; jmp done_intro - - get_mist_book: diff --git a/mist/qboot_sector.s b/mist/qboot_sector.s index 9736ec5c..384848af 100644 --- a/mist/qboot_sector.s +++ b/mist/qboot_sector.s @@ -1,7 +1,7 @@ ; fast seek/multi-read ; copyright (c) Peter Ferrie 2015-16 - sectors = 12 ; user-defined + sectors = 13 ; user-defined firsttrk = 1 ; user-defined, first track to read firstsec = 0 ; user-defined, first sector to read address = $12 ; user-defined diff --git a/mist/text_title.s b/mist/text_title.s index e3b8fc91..c3c2cfe1 100644 --- a/mist/text_title.s +++ b/mist/text_title.s @@ -29,6 +29,10 @@ text_loop: dex bne text_loop + + lda #40 + jsr wait_a_bit + rts @@ -51,3 +55,4 @@ boot_message: .include "text_print.s" .include "gr_offsets.s" +.include "wait_a_bit.s" diff --git a/mist/wait_a_bit.s b/mist/wait_a_bit.s new file mode 100644 index 00000000..f71370ad --- /dev/null +++ b/mist/wait_a_bit.s @@ -0,0 +1,27 @@ + ;==================================== + ; wait for keypress or a few seconds + ;==================================== + +wait_a_bit: + + bit KEYRESET + tax + +keyloop: + lda #200 ; delay a bit + jsr WAIT + + lda KEYPRESS + bmi done_keyloop + +; bmi keypress_exit + + dex + bne keyloop + +done_keyloop: + + bit KEYRESET + + rts +