diff --git a/monkey/hello.bas b/monkey/hello.bas index 429fc31b..a5153453 100644 --- a/monkey/hello.bas +++ b/monkey/hello.bas @@ -1,5 +1,5 @@ 5 HOME -10 PRINT "LOADING MONKEY V0.06" +10 PRINT "LOADING MONKEY V0.07" 20 PRINT:PRINT 40 PRINT "CONTROLS: " 42 PRINT " MOVE CURSOR : ARROWS OR WASD" diff --git a/monkey/keyboard.s b/monkey/keyboard.s index 2b480993..1fffdf47 100644 --- a/monkey/keyboard.s +++ b/monkey/keyboard.s @@ -417,7 +417,9 @@ destination_tiny_x_is_positive: lda CURSOR_Y bpl destination_tiny_y_is_positive - lda #0 + cmp #$Fc + bcs destination_tiny_y_is_positive + lda #$Fc destination_tiny_y_is_positive: clc adc #6 diff --git a/monkey/monkey.dsk b/monkey/monkey.dsk index 0ea1eef6..7a319b88 100644 Binary files a/monkey/monkey.dsk and b/monkey/monkey.dsk differ diff --git a/monkey/monkey_map.s b/monkey/monkey_map.s index 8182c1eb..dbf5d9e3 100644 --- a/monkey/monkey_map.s +++ b/monkey/monkey_map.s @@ -8,6 +8,9 @@ map_check_exit: beq check_lookout cmp #10 beq check_poster + + cmp #24 + beq check_zipline cmp #25 beq check_zipline @@ -16,10 +19,17 @@ map_check_exit: check_lookout: lda GUYBRUSH_Y cmp #22 - bne map_no_exit + beq map_to_lookout + cmp #24 + beq map_to_lookout + jmp map_no_exit map_to_lookout: lda #MONKEY_LOOKOUT sta LOCATION + + lda #GUYBRUSH_BIG + sta GUYBRUSH_SIZE + lda #30 sta GUYBRUSH_X sta DESTINATION_X @@ -34,15 +44,25 @@ map_to_lookout: check_poster: lda GUYBRUSH_Y cmp #24 - bne map_no_exit + beq map_to_poster + cmp #26 + beq map_to_poster + jmp map_no_exit map_to_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 lda #DIR_DOWN sta GUYBRUSH_DIRECTION @@ -51,10 +71,17 @@ map_to_poster: check_zipline: lda GUYBRUSH_Y cmp #4 - bne map_no_exit + beq map_to_zipline + cmp #6 + beq map_to_zipline + jmp map_no_exit map_to_zipline: lda #MONKEY_ZIPLINE sta LOCATION + + lda #GUYBRUSH_BIG + sta GUYBRUSH_SIZE + lda #4 sta GUYBRUSH_X sta DESTINATION_X diff --git a/monkey/monkey_zipline.s b/monkey/monkey_zipline.s index 322da350..5389576c 100644 --- a/monkey/monkey_zipline.s +++ b/monkey/monkey_zipline.s @@ -12,6 +12,10 @@ zipline_check_exit: zipline_to_map: lda #MONKEY_MAP sta LOCATION + + lda #GUYBRUSH_TINY + sta GUYBRUSH_SIZE + lda #23 sta GUYBRUSH_X sta DESTINATION_X