diff --git a/monkey/monkey.s b/monkey/monkey.s index e811935a..0cbe60a4 100644 --- a/monkey/monkey.s +++ b/monkey/monkey.s @@ -60,8 +60,8 @@ monkey_start: ; set up initial location - lda #MONKEY_BAR -; lda #MONKEY_LOOKOUT +; lda #MONKEY_BAR + lda #MONKEY_LOOKOUT ; lda #MONKEY_VOODOO1 sta LOCATION diff --git a/monkey/monkey_lookout.s b/monkey/monkey_lookout.s index c26bd348..c0c061fc 100644 --- a/monkey/monkey_lookout.s +++ b/monkey/monkey_lookout.s @@ -33,11 +33,18 @@ lookout_to_poster: not_first_poster: lda #MONKEY_POSTER sta LOCATION - lda #4 + + lda #2 sta GUYBRUSH_X sta DESTINATION_X + lda #20 sta GUYBRUSH_Y + + lda #GUYBRUSH_TINY + sta GUYBRUSH_SIZE + + lda #34 sta DESTINATION_Y jsr change_location jmp lookout_no_exit diff --git a/monkey/monkey_poster.s b/monkey/monkey_poster.s index ab5ce655..80944b22 100644 --- a/monkey/monkey_poster.s +++ b/monkey/monkey_poster.s @@ -3,13 +3,22 @@ poster_check_exit: lda GUYBRUSH_X - cmp #3 + cmp #4 bcc poster_to_lookout cmp #35 bcs poster_to_dock bcc poster_no_exit poster_to_lookout: + + ; check y position + lda GUYBRUSH_FEET + cmp #22 + bcs poster_no_exit + + lda #GUYBRUSH_BIG + sta GUYBRUSH_SIZE + lda #MONKEY_LOOKOUT sta LOCATION lda #28 @@ -39,23 +48,20 @@ poster_to_dock: poster_no_exit: rts + + ;=============================== + ;=============================== + ; adjust destination + ;=============================== + ;=============================== poster_adjust_destination: -ps_check_x: - ; can be any X - -ps_check_y: - ; if x>5 Y should be 20 - - lda #20 - sta DESTINATION_Y - -done_ps_adjust: rts + draw_house: lda #=$22 (34) then big + bcs poster_big + cmp #28 ; >= $1E, (28) then medium + bcs poster_medium + cmp #22 ; >= $1A (22), small + bcs poster_small + ; else, tiny +poster_tiny: + lda #GUYBRUSH_TINY + jmp poster_done_set_height +poster_big: + lda #GUYBRUSH_BIG + jmp poster_done_set_height +poster_medium: + lda #GUYBRUSH_MEDIUM + jmp poster_done_set_height +poster_small: + lda #GUYBRUSH_SMALL +poster_done_set_height: + jmp set_height +