diff --git a/monkey/graphics/bar_inside2.png b/monkey/graphics/bar_inside2.png index 946abf7c..2173a063 100644 Binary files a/monkey/graphics/bar_inside2.png and b/monkey/graphics/bar_inside2.png differ diff --git a/monkey/monkey.s b/monkey/monkey.s index fe6b7754..f8a57b47 100644 --- a/monkey/monkey.s +++ b/monkey/monkey.s @@ -109,6 +109,8 @@ game_loop: beq do_draw_sign cmp #MONKEY_VOODOO2 beq do_draw_smoke + cmp #MONKEY_BAR_INSIDE2 + beq do_draw_bar2 cmp #MONKEY_BAR_INSIDE3 beq do_draw_meat @@ -130,6 +132,10 @@ do_draw_smoke: jsr draw_smoke jmp nothing_special +do_draw_bar2: + jsr bar_inside2_animate + jmp nothing_special + do_draw_meat: jsr draw_meat jmp nothing_special diff --git a/monkey/monkey_bar_inside2.s b/monkey/monkey_bar_inside2.s index 58fa9c5b..25e65ce1 100644 --- a/monkey/monkey_bar_inside2.s +++ b/monkey/monkey_bar_inside2.s @@ -9,8 +9,7 @@ bar_inside2_check_exit: bcc bar_inside2_to_bar_inside1 cmp #33 bcs bar_inside2_to_bar_inside3 - bcs bar_inside2_no_exit - + bcc bar_inside2_no_exit bar_inside2_to_bar_inside1: lda GUYBRUSH_DIRECTION @@ -81,23 +80,85 @@ bar_inside2_check_bounds: rts -;draw_house: -; lda #wall_sprite -; sta INH + ;================================ + ;================================ + ; bar inside animations + ;================================ + ;================================ -; lda #18 -; sta XPOS -; lda #22 -; sta YPOS +bar_inside2_animate: -; jsr put_sprite_crop + lda FRAMEL + and #$10 + beq bar2_other_fire -; rts + lda #bar2_fire1_sprite + jmp bar2_draw_fire +bar2_other_fire: + lda #bar2_fire2_sprite +bar2_draw_fire: + sta INH + + lda #25 + sta XPOS + lda #22 + sta YPOS + + jsr put_sprite_crop + + + lda FRAMEL + and #$30 + beq bar2_other_arm + + lda #bar2_pirate_mug1_sprite + jmp bar2_draw_arm +bar2_other_arm: + lda #bar2_pirate_mug2_sprite +bar2_draw_arm: + sta INH + + lda #7 + sta XPOS + lda #26 + sta YPOS + + jsr put_sprite_crop + + + rts + +bar2_fire1_sprite: + .byte 2,2 + .byte $dA,$AA + .byte $d1,$dd + +bar2_fire2_sprite: + .byte 2,2 + .byte $AA,$dA + .byte $1d,$dd + +bar2_pirate_mug1_sprite: + .byte 3,3 + .byte $25,$00,$05 + .byte $22,$82,$74 + .byte $d2,$8b,$77 + +bar2_pirate_mug2_sprite: + .byte 3,3 + .byte $25,$b7,$75 + .byte $62,$26,$84 + .byte $d2,$88,$88 -;house_sprite: ;===================================