diff --git a/mist/common_routines.inc b/mist/common_routines.inc index d7cc67af..6574d09a 100644 --- a/mist/common_routines.inc +++ b/mist/common_routines.inc @@ -2,54 +2,54 @@ ; external routines ; loader.s -opendir_filename =$1039 +opendir_filename =$1042 ; audio.c -play_audio =$134e +play_audio =$1369 ; decompress_fast_v2.s -decompress_lzsa2_fast =$145f -getsrc_smc =$1555 +decompress_lzsa2_fast =$147a +getsrc_smc =$1570 ; draw_pointer.s -draw_pointer =$1562 +draw_pointer =$157d ; end_level.s -end_level =$16ca +end_level =$16e9 ; gr_copy.s -gr_copy_to_current =$16ec +gr_copy_to_current =$170b ; gr_fast_clear.s -clear_bottom =$1812 -clear_all =$1850 -clear_all_color =$1875 +clear_bottom =$1831 +clear_all =$186f +clear_all_color =$1894 ; gr_offsets.s -gr_offsets =$1893 +gr_offsets =$18b2 ; gr_page_flip.s -page_flip =$18c3 +page_flip =$18e2 ; gr_putsprite_crop.s -put_sprite_crop =$18dd -psc_smc1 =$1900 -psc_smc2 =$1998 +put_sprite_crop =$18fc +psc_smc1 =$191f +psc_smc2 =$19b7 ; keyboard.s -handle_keypress =$1a19 -change_location =$1afa +handle_keypress =$1a38 +change_location =$1b19 ; text_print.s -move_and_print =$1b92 -ps_smc1 =$1bbf +move_and_print =$1bb1 +ps_smc1 =$1bde ; page_sprites.inc -blue_page_sprite =$1ca7 -red_page_sprite =$1cbd -white_page_sprite =$1cd3 -blue_page_small_sprite =$1ce9 -red_page_small_sprite =$1cf1 +blue_page_sprite =$1cc6 +red_page_sprite =$1cdc +white_page_sprite =$1cf2 +blue_page_small_sprite =$1d08 +red_page_small_sprite =$1d10 ; audio files linking_noise = $9000 diff --git a/mist/loader.s b/mist/loader.s index e0dd8f01..c6d74688 100644 --- a/mist/loader.s +++ b/mist/loader.s @@ -62,6 +62,13 @@ loader_start: ;=================================================== which_load_loop: + lda WHICH_LOAD + + ; update the which-file error message + tay + lda which_disk,Y + sta error_string+19 + lda WHICH_LOAD asl @@ -147,6 +154,23 @@ filenames: .word dentist_filename,arbor_filename,nibel_filename,ship_filename .word generator_filename,dni_filename +which_disk: + .byte '1' ; MIST_TITLE + .byte '1' ; MIST + .byte '3' ; MECHE + .byte '3' ; SELENA + .byte '1' ; OCTAGON + .byte '2' ; VIEWER + .byte '3' ; STONEY + .byte '2' ; CHANNEL + .byte '1' ; CABIN + .byte '1' ; DENTIST + .byte '2' ; ARBOR + .byte '2' ; NIBEL + .byte '3' ; SHIP + .byte '1' ; GENERATOR + .byte '1' ; D'NI + intro_filename: .byte "MIST_TITLE",0 mist_filename: @@ -272,9 +296,9 @@ mlsmc07:lda $c0e8 ; turn off drive motor? ldy #0 - lda #disk_string + lda #>error_string sta OUTH quick_print: @@ -296,8 +320,9 @@ fnf_keypress: jmp which_load_loop -disk_string: -.byte "INSERT OTHER DISK, PRESS RETURN",0 +; offset for disk number is 19 +error_string: +.byte "PLEASE INSERT DISK 1, PRESS RETURN",0