diff --git a/monkey/cutscene_lechuck.s b/monkey/cutscene_lechuck.s index c5d1b1d5..02b8c928 100644 --- a/monkey/cutscene_lechuck.s +++ b/monkey/cutscene_lechuck.s @@ -9,7 +9,13 @@ ; ship lies anchored in a river ; of lava. -; Captain LeChuck... sir... I... sir - +; S: Captain LeChuck... sir... I... sir +; L: Ah... +; L: There's nothing like... +; S: No sir... +; S: Nothing like it... +; S: Ah... Sir... I... +; L: It's days like this... +; lechuck_cutscene: rts diff --git a/monkey/graphics/v_sprites.png b/monkey/graphics/v_sprites.png new file mode 100644 index 00000000..f39fa354 Binary files /dev/null and b/monkey/graphics/v_sprites.png differ diff --git a/monkey/graphics/voodoo2.png b/monkey/graphics/voodoo2.png index a33e4278..230776da 100644 Binary files a/monkey/graphics/voodoo2.png and b/monkey/graphics/voodoo2.png differ diff --git a/monkey/monkey.s b/monkey/monkey.s index 3515b9e0..2cd489a7 100644 --- a/monkey/monkey.s +++ b/monkey/monkey.s @@ -97,6 +97,8 @@ game_loop: beq do_draw_bar_door cmp #MONKEY_ZIPLINE beq do_draw_sign + cmp #MONKEY_VOODOO2 + beq do_draw_smoke jmp nothing_special @@ -112,6 +114,10 @@ do_draw_sign: jsr draw_sign jmp nothing_special +do_draw_smoke: + jsr draw_smoke + jmp nothing_special + nothing_special: diff --git a/monkey/monkey_voodoo2.s b/monkey/monkey_voodoo2.s index 498cef08..742d97c2 100644 --- a/monkey/monkey_voodoo2.s +++ b/monkey/monkey_voodoo2.s @@ -47,24 +47,67 @@ done_v2_adjust: +draw_smoke: -;draw_house: + lda FRAMEL + and #$10 + beq smoke2 -; lda #wall_sprite -; sta INH +smoke1: + lda #smoke_sprite1 + jmp actually_draw_smoke +smoke2: + lda #smoke_sprite2 +actually_draw_smoke: + sta INH -; lda #18 -; sta XPOS -; lda #22 -; sta YPOS + lda #18 + sta XPOS + lda #0 + sta YPOS + + jmp put_sprite_crop + +smoke_sprite1: + .byte 4,14 + .byte $ff,$cc,$AA,$AA + .byte $AA,$ff,$cA,$AA + .byte $AA,$ff,$cc,$AA + .byte $AA,$ff,$AA,$cc + .byte $AA,$ff,$cA,$AA + .byte $AA,$ff,$Ac,$AA + .byte $AA,$ff,$AA,$AA + .byte $cc,$Af,$fA,$AA + .byte $cc,$AA,$Af,$fA + .byte $AA,$Ac,$cc,$ff + .byte $AA,$AA,$cc,$ff + .byte $AA,$cc,$fA,$ff + .byte $AA,$cc,$ff,$AA + .byte $AA,$cc,$ff,$AA + +smoke_sprite2: + .byte 4,14 + .byte $AA,$ff,$cA,$AA + .byte $ff,$aa,$cc,$AA + .byte $ff,$cc,$AA,$AA + .byte $ff,$cc,$AA,$AA + .byte $ff,$ac,$cA,$AA + .byte $AA,$ff,$cc,$AA + .byte $AA,$ff,$AA,$cc + .byte $AA,$ff,$AA,$cc + .byte $AA,$ff,$fc,$AA + .byte $AA,$cc,$ff,$AA + .byte $cc,$AA,$ff,$AA + .byte $Ac,$cA,$ff,$AA + .byte $AA,$fc,$cf,$AA + .byte $7A,$ff,$cc,$A7 -; jsr put_sprite_crop -; rts -;house_sprite: voodoo2_check_bounds: rts