diff --git a/monkey/graphics/bar_inside1.png b/monkey/graphics/bar_inside1.png index 21e4d15c..49c043d6 100644 Binary files a/monkey/graphics/bar_inside1.png and b/monkey/graphics/bar_inside1.png differ diff --git a/monkey/monkey.s b/monkey/monkey.s index f8a57b47..20f23c27 100644 --- a/monkey/monkey.s +++ b/monkey/monkey.s @@ -274,6 +274,8 @@ really_draw_guybrush: beq do_draw_house cmp #MONKEY_BAR beq do_draw_building + cmp #MONKEY_BAR_INSIDE1 + beq do_draw_bar1 cmp #MONKEY_VOODOO1 beq do_draw_voodoo1 cmp #MONKEY_CHURCH @@ -293,6 +295,10 @@ do_draw_building: jsr draw_bar_fg_building jmp nothing_foreground +do_draw_bar1: + jsr bar_inside1_foreground + jmp nothing_foreground + do_draw_voodoo1: jsr voodoo1_draw_foreground jmp nothing_foreground diff --git a/monkey/monkey_bar_inside1.s b/monkey/monkey_bar_inside1.s index ac93b966..7b5630a2 100644 --- a/monkey/monkey_bar_inside1.s +++ b/monkey/monkey_bar_inside1.s @@ -65,24 +65,70 @@ done_mb1_adjust: + ;================================= + ;================================= + ; bar_inside1 draw foreground + ;================================= + ;================================= -;draw_house: +bar_inside1_foreground: -; lda #wall_sprite -; sta INH + lda GUYBRUSH_X + cmp #12 + bcs bar_inside_rightside -; lda #18 -; sta XPOS -; lda #22 -; sta YPOS +bar_inside_leftside: -; jsr put_sprite_crop + lda #bar1_table_sprite + sta INH -; rts + lda #4 + sta XPOS + lda #32 + sta YPOS -;house_sprite: + jsr put_sprite_crop + + jmp bar_animate_ceiling + +bar_inside_rightside: + + lda #bar1_table2_sprite + sta INH + + lda #20 + sta XPOS + lda #26 + sta YPOS + + jsr put_sprite_crop + + ; I can't spell chandelier +bar_animate_ceiling: + +bar_inside_done: + rts + + + +bar1_table_sprite: + .byte 6,3 + .byte $8A,$8A,$1A,$8A,$AA,$AA + .byte $b8,$00,$0b,$b8,$88,$88 + .byte $88,$90,$00,$88,$8b,$A8 + +bar1_table2_sprite: + .byte 11,6 + .byte $AA,$AA,$0A,$0A,$AA,$AA,$9A,$9A,$AA,$AA,$AA + .byte $AA,$00,$0b,$AA,$AA,$AA,$99,$bb,$AA,$b2,$0A + .byte $AA,$0A,$6b,$0A,$7A,$5A,$b2,$62,$AA,$9b,$00 + .byte $8A,$00,$b5,$20,$67,$dd,$db,$7b,$db,$d0,$A0 + .byte $A8,$88,$26,$66,$db,$d2,$db,$d7,$8d,$8b,$AA + .byte $AA,$88,$22,$26,$2b,$88,$A8,$08,$00,$88,$AA ;=================================== diff --git a/monkey/monkey_bar_inside2.s b/monkey/monkey_bar_inside2.s index 25e65ce1..2a4f5c39 100644 --- a/monkey/monkey_bar_inside2.s +++ b/monkey/monkey_bar_inside2.s @@ -113,7 +113,7 @@ bar2_draw_fire: lda FRAMEL - and #$30 + and #$60 beq bar2_other_arm lda #