diff --git a/mist/clock_bridge_puzzle.s b/mist/clock_bridge_puzzle.s index 6fc01643..a800aaf3 100644 --- a/mist/clock_bridge_puzzle.s +++ b/mist/clock_bridge_puzzle.s @@ -423,8 +423,8 @@ clock_puzzle_done: gear_block_sprite1: .byte 4,3 .byte $ff,$ff,$ff,$ff - .byte $ff,$ff,$ff,$ff - .byte $ff,$ff,$ff,$0f + .byte $df,$df,$df,$df + .byte $ff,$dd,$ff,$0f ; put at 9,6 on screen 20 N gear_block_sprite2: diff --git a/mist/common_routines.inc b/mist/common_routines.inc index 3dc09d77..7182d345 100644 --- a/mist/common_routines.inc +++ b/mist/common_routines.inc @@ -15,40 +15,40 @@ getsrc_smc =$158c draw_pointer =$1599 ; end_level.s -end_level =$1705 +end_level =$1707 ; gr_copy.s -gr_copy_to_current =$1727 +gr_copy_to_current =$1729 ; gr_fast_clear.s -clear_bottom =$184d -clear_all =$188b -clear_all_color =$18b0 +clear_bottom =$184f +clear_all =$188d +clear_all_color =$18b2 ; gr_offsets.s -gr_offsets =$18ce +gr_offsets =$18d0 ; gr_page_flip.s -page_flip =$18fe +page_flip =$1900 ; gr_putsprite_crop.s -put_sprite_crop =$1918 -psc_smc1 =$193b -psc_smc2 =$19d3 +put_sprite_crop =$191a +psc_smc1 =$193d +psc_smc2 =$19d5 ; keyboard.s -handle_keypress =$1a54 -change_direction =$1b16 -change_location =$1b4f +handle_keypress =$1a56 +change_direction =$1b18 +change_location =$1b51 ; text_print.s -move_and_print =$1be7 -ps_smc1 =$1c14 +move_and_print =$1be9 +ps_smc1 =$1c16 ; page_sprites.inc -blue_page_sprite =$1cfc -red_page_sprite =$1d12 -white_page_sprite =$1d28 -blue_page_small_sprite =$1d3e -red_page_small_sprite =$1d46 +blue_page_sprite =$1cfe +red_page_sprite =$1d14 +white_page_sprite =$1d2a +blue_page_small_sprite =$1d40 +red_page_small_sprite =$1d48 diff --git a/mist/draw_pointer.s b/mist/draw_pointer.s index 79260001..35438d17 100644 --- a/mist/draw_pointer.s +++ b/mist/draw_pointer.s @@ -106,6 +106,7 @@ finger_point: beq key_finger lda HOLDING_PAGE + and #$c0 beq real_finger_point cmp #HOLDING_BLUE_PAGE beq blue_finger diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index e3eb9ad6..f98ad7e4 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -736,7 +736,7 @@ location39: .byte DIRECTION_W .byte 14,18 ; special x .byte 32,40 ; special y - .word take_blue_page-1 ; special function + .word meche_take_blue_page-1 ; special function ; MECHE_RED_SECRET_DOOR -- red room secret door location40: @@ -773,5 +773,5 @@ location41: .byte DIRECTION_S .byte 22,29 ; special x .byte 14,24 ; special y - .word take_red_page-1 ; special function + .word meche_take_red_page-1 ; special function diff --git a/mist/meche.s b/mist/meche.s index 55f5e0d5..856b35f7 100644 --- a/mist/meche.s +++ b/mist/meche.s @@ -260,7 +260,13 @@ draw_blue_page: no_draw_page: rts +meche_take_red_page: + lda #MECHE_PAGE + jmp take_red_page +meche_take_blue_page: + lda #MECHE_PAGE + jmp take_blue_page ;========================== ; includes