diff --git a/monkey/common_defines.inc b/monkey/common_defines.inc index 6247459e..219e0074 100644 --- a/monkey/common_defines.inc +++ b/monkey/common_defines.inc @@ -1,6 +1,19 @@ ;============================= ; common stuff +VERB_GIVE = 0 +VERB_OPEN = 1 +VERB_CLOSE = 2 +VERB_PICK_UP = 3 +VERB_LOOK_AT = 4 +VERB_TALK_TO = 5 +VERB_USE = 6 +VERB_PUSH = 7 +VERB_PULL = 8 +VERB_WALK = 9 + + + ;=============================================== ; level data structure definitions ;=============================================== diff --git a/monkey/graphics/Makefile b/monkey/graphics/Makefile index 271dafdf..043b0808 100644 --- a/monkey/graphics/Makefile +++ b/monkey/graphics/Makefile @@ -9,8 +9,11 @@ all: graphics.inc #### graphics.inc: \ - lookout.lzsa + lookout.lzsa poster.lzsa dock.lzsa bar.lzsa echo "lookout_lzsa: .incbin \"lookout.lzsa\"" > graphics.inc + echo "poster_lzsa: .incbin \"poster.lzsa\"" >> graphics.inc + echo "dock_lzsa: .incbin \"dock.lzsa\"" >> graphics.inc + echo "bar_lzsa: .incbin \"bar.lzsa\"" >> graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/monkey/leveldata_monkey.inc b/monkey/leveldata_monkey.inc index 93890051..b05c6089 100644 --- a/monkey/leveldata_monkey.inc +++ b/monkey/leveldata_monkey.inc @@ -30,7 +30,7 @@ location0: ; MONKEY_POSTER -- house with poster location1: - .word lookout_lzsa ; background + .word poster_lzsa ; background .byte 18,40 ; walking range X .byte 16,48 ; walking range Y .byte 4 ; num areas @@ -53,7 +53,7 @@ location1: ; MONKEY_DOCK -- dock location2: - .word lookout_lzsa ; background + .word dock_lzsa ; background .byte 18,40 ; walking range X .byte 16,48 ; walking range Y .byte 4 ; num areas @@ -76,7 +76,7 @@ location2: ; MONKEY_BAR -- scumm bar location3: - .word lookout_lzsa ; background + .word bar_lzsa ; background .byte 18,40 ; walking range X .byte 16,48 ; walking range Y .byte 4 ; num areas diff --git a/monkey/zp.inc b/monkey/zp.inc index 06180752..2d6f346a 100644 --- a/monkey/zp.inc +++ b/monkey/zp.inc @@ -76,6 +76,7 @@ LOCATION = $81 ; location on the map GUYBRUSH_X = $82 ; location of protagonist GUYBRUSH_Y = $83 +CURRENT_VERB = $84 ; done game puzzle state