From 11544b0eb4b8879f3a54b78105c71e7f2c1e3c77 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 11 Oct 2020 10:35:06 -0400 Subject: [PATCH] monkey: add another room --- monkey/common_defines.inc | 2 +- monkey/graphics/Makefile | 4 +- monkey/graphics/bar_inside3.png | Bin 0 -> 13086 bytes monkey/leveldata_monkey.inc | 17 ++- monkey/monkey.s | 1 + monkey/monkey_bar_inside2.s | 29 ++++- monkey/monkey_bar_inside3.s | 204 ++++++++++++++++++++++++++++++++ 7 files changed, 248 insertions(+), 9 deletions(-) create mode 100644 monkey/graphics/bar_inside3.png create mode 100644 monkey/monkey_bar_inside3.s diff --git a/monkey/common_defines.inc b/monkey/common_defines.inc index e37b0d74..7004a5d5 100644 --- a/monkey/common_defines.inc +++ b/monkey/common_defines.inc @@ -52,4 +52,4 @@ MONKEY_MANSION = 10 MONKEY_ZIPLINE = 11 MONKEY_VOODOO1 = 12 MONKEY_VOODOO2 = 13 - +MONKEY_BAR_INSIDE3 = 14 diff --git a/monkey/graphics/Makefile b/monkey/graphics/Makefile index 5145432d..9ff2f752 100644 --- a/monkey/graphics/Makefile +++ b/monkey/graphics/Makefile @@ -10,7 +10,8 @@ all: graphics.inc graphics.inc: \ lookout.lzsa poster.lzsa dock.lzsa bar.lzsa town.lzsa map.lzsa \ - bar_inside1.lzsa bar_inside2.lzsa zipline.lzsa \ + bar_inside1.lzsa bar_inside2.lzsa bar_inside3.lzsa \ + zipline.lzsa \ church.lzsa mansion.lzsa mansion_path.lzsa \ voodoo1.lzsa voodoo2.lzsa \ part1.lzsa lechuck_ship.lzsa lechuck_cabin.lzsa @@ -22,6 +23,7 @@ graphics.inc: \ echo "map_lzsa: .incbin \"map.lzsa\"" >> graphics.inc echo "bar_inside1_lzsa: .incbin \"bar_inside1.lzsa\"" >> graphics.inc echo "bar_inside2_lzsa: .incbin \"bar_inside2.lzsa\"" >> graphics.inc + echo "bar_inside3_lzsa: .incbin \"bar_inside3.lzsa\"" >> graphics.inc echo "zipline_lzsa: .incbin \"zipline.lzsa\"" >> graphics.inc echo "church_lzsa: .incbin \"church.lzsa\"" >> graphics.inc echo "mansion_lzsa: .incbin \"mansion.lzsa\"" >> graphics.inc diff --git a/monkey/graphics/bar_inside3.png b/monkey/graphics/bar_inside3.png new file mode 100644 index 0000000000000000000000000000000000000000..c7671d8eb4b27082e79c52e708ebf433c7b324dd GIT binary patch literal 13086 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 literal 0 HcmV?d00001 diff --git a/monkey/leveldata_monkey.inc b/monkey/leveldata_monkey.inc index 497c70c1..138d0015 100644 --- a/monkey/leveldata_monkey.inc +++ b/monkey/leveldata_monkey.inc @@ -6,7 +6,7 @@ locations: .word location0,location1,location2,location3 .word location4,location5,location6,location7 .word location8,location9,location10,location11 - .word location12,location13 + .word location12,location13,location14 ; MONKEY_LOOKOUT -- lookout tower location0: @@ -383,6 +383,21 @@ location13: .word voodoo_lady_string ; name .word voodoo_lady_action-1 ; action + +; MONKEY_BAR_INSIDE3 -- kitchen +location14: + .word bar_inside3_lzsa ; background + .word bar_inside3_adjust_destination ; destination + .word bar_inside3_check_exit ; exit + .word bar_inside3_check_bounds ; bounds check + .byte GUYBRUSH_BIG ; size + .byte 1 ; num areas + + .byte 0,3 ; x + .byte 12,34 ; y + .word curtain_string ; name + .word curtain_action-1 ; action + ; common strings door_string: .byte 20,20,"DOOR",0 diff --git a/monkey/monkey.s b/monkey/monkey.s index d8dffb26..3515b9e0 100644 --- a/monkey/monkey.s +++ b/monkey/monkey.s @@ -356,6 +356,7 @@ really_exit: .include "monkey_mansion_path.s" .include "monkey_bar_inside1.s" .include "monkey_bar_inside2.s" + .include "monkey_bar_inside3.s" .include "monkey_voodoo1.s" .include "monkey_voodoo2.s" diff --git a/monkey/monkey_bar_inside2.s b/monkey/monkey_bar_inside2.s index 390459b6..58fa9c5b 100644 --- a/monkey/monkey_bar_inside2.s +++ b/monkey/monkey_bar_inside2.s @@ -7,8 +7,8 @@ bar_inside2_check_exit: lda GUYBRUSH_X cmp #4 bcc bar_inside2_to_bar_inside1 -; cmp #35 -; bcs bar_inside2_to_bar + cmp #33 + bcs bar_inside2_to_bar_inside3 bcs bar_inside2_no_exit @@ -28,6 +28,23 @@ bar_inside2_to_bar_inside1: jsr change_location jmp bar_inside2_no_exit +bar_inside2_to_bar_inside3: + lda GUYBRUSH_DIRECTION + cmp #DIR_RIGHT + bne bar_inside2_no_exit + + lda #MONKEY_BAR_INSIDE3 + sta LOCATION + lda #5 + sta GUYBRUSH_X + sta DESTINATION_X + lda #24 + sta GUYBRUSH_Y + sta DESTINATION_Y + jsr change_location + jmp bar_inside2_no_exit + + bar_inside2_no_exit: rts @@ -42,12 +59,12 @@ bar_inside2_adjust_destination: lda #24 sta DESTINATION_Y - lda DESTINATION_X - cmp #33 +; lda DESTINATION_X +; cmp #33 bcc done_mb2_adjust - lda #33 - sta DESTINATION_X +; lda #33 +; sta DESTINATION_X done_mb2_adjust: diff --git a/monkey/monkey_bar_inside3.s b/monkey/monkey_bar_inside3.s new file mode 100644 index 00000000..e0c93a5f --- /dev/null +++ b/monkey/monkey_bar_inside3.s @@ -0,0 +1,204 @@ +; stuff regarding 3d room of scumm bar + + ; if x<4 goto MONKEY_BAR_INSIDE2 at 34,24 + +bar_inside3_check_exit: + + lda GUYBRUSH_X + cmp #4 + bcc bar_inside3_to_bar_inside2 +; cmp #35 +; bcs bar_inside3_to_bar + bcs bar_inside3_no_exit + + +bar_inside3_to_bar_inside2: + lda GUYBRUSH_DIRECTION + cmp #DIR_LEFT + bne bar_inside3_no_exit + + lda #MONKEY_BAR_INSIDE2 + sta LOCATION + lda #34 + sta GUYBRUSH_X + sta DESTINATION_X + lda #24 + sta GUYBRUSH_Y + sta DESTINATION_Y + jsr change_location + jmp bar_inside3_no_exit + +bar_inside3_no_exit: + rts + + ;================================ + ;================================ + ; bar_inside3 adjust destination + ;================================ + ;================================ +bar_inside3_adjust_destination: + ; just make Y always 24 + + lda #24 + sta DESTINATION_Y + + lda DESTINATION_X + cmp #33 + bcc done_mb3_adjust + + lda #33 + sta DESTINATION_X + + +done_mb3_adjust: + rts + + + ;================================ + ;================================ + ; bar_inside3 check bounds + ;================================ + ;================================ +bar_inside3_check_bounds: + ; just make Y always 20 + + rts + +;draw_house: + +; lda #wall_sprite +; sta INH + +; lda #18 +; sta XPOS +; lda #22 +; sta YPOS + +; jsr put_sprite_crop + +; rts + +;house_sprite: + + + ;=================================== + ;=================================== + ; actions + ;=================================== + ;=================================== + + +;============================= +bar3_door_action: +bar3_door_nothing: + lda #VERB_WALK + sta CURRENT_VERB + rts + +.if 0 + ;============================= +fireplace_action: + lda CURRENT_VERB + asl + tay + + lda fireplace_actions,Y + cmp #$ff + beq fireplace_nothing + + sta MESSAGE_L + lda fireplace_actions+1,Y + sta MESSAGE_H + + jmp do_display_message + +fireplace_nothing: + lda #VERB_WALK + sta CURRENT_VERB + rts + +fireplace_actions: + .word $FFFF ; give + .word doesnt_open ; open + .word doesnt_work ; close + .word cant_pick_up ; pick_up + .word fireplace_look ; look_at + .word $FFFF ; talk_to + .word for_what ; use + .word icant_move ; push + .word icant_move ; pull + +fireplace_look: +.byte 18,21,"COZY.",0 + + +;============================= +impt_pirate_action: + lda CURRENT_VERB + asl + tay + + lda impt_pirate_actions,Y + cmp #$ff + beq impt_pirate_nothing + + sta MESSAGE_L + lda impt_pirate_actions+1,Y + sta MESSAGE_H + + jmp do_display_message + +impt_pirate_nothing: + lda #VERB_WALK + sta CURRENT_VERB + rts + +impt_pirate_actions: + .word $FFFF ; give + .word $FFFF ; open + .word $FFFF ; close + .word $FFFF ; pick_up + .word impt_pirate_look ; look_at + .word impt_pirate_look ; talk_to + .word $FFFF ; use + .word $FFFF ; push + .word $FFFF ; pull + +impt_pirate_look: +.byte 8,21,"WHAT BE YE WANTIN' BOY?",0 + + ;============================= +curtain_action: + lda CURRENT_VERB + asl + tay + + lda curtain_actions,Y + cmp #$ff + beq curtain_nothing + + sta MESSAGE_L + lda curtain_actions+1,Y + sta MESSAGE_H + + jmp do_display_message + +curtain_nothing: + lda #VERB_WALK + sta CURRENT_VERB + rts + +curtain_actions: + .word $FFFF ; give + .word doesnt_open ; open + .word doesnt_work ; close + .word cant_pick_up ; pick_up + .word not_special ; look_at + .word $FFFF ; talk_to + .word for_what ; use + .word icant_move ; push + .word icant_move ; pull + +.endif