monkey: adjust some of the rooms a bit

monkey/leveldata_monkey.inc

@@ -378,10 +378,10 @@ location13:
 	.byte	GUYBRUSH_BIG			; size
 	.byte	1				; num areas
 
-		.byte	30,36	; x
-		.byte	10,36	; y
-		.word	pole_string		; name
-		.word	pole_action-1		; action
+		.byte	21,27	; x
+		.byte	14,26	; y
+		.word	voodoo_lady_string	; name
+		.word	voodoo_lady_action-1	; action
 
 ; common strings
 
@@ -389,6 +389,9 @@ door_string:	.byte 20,20,"DOOR",0
 pirate_string:	.byte 20,20,"PIRATE",0
 pirates_string:	.byte 20,20,"PIRATES",0
 
+; voodoo2 strings
+voodoo_lady_string:	.byte 20,20,"VOODOO LADY",0
+
 ; church strings
 alley_string:	.byte 20,20,"ALLEY",0
 

monkey/monkey_voodoo1.s

@@ -17,10 +17,11 @@ voodoo1_check_exit:
 voodoo1_to_voodoo2:
 	lda	#MONKEY_VOODOO2
 	sta	LOCATION
-	lda	#10
+	lda	#8
 	sta	GUYBRUSH_X
+	lda	#12
 	sta	DESTINATION_X
-	lda	#20
+	lda	#18
 	sta	GUYBRUSH_Y
 	sta	DESTINATION_Y
 	jsr	change_location

monkey/monkey_voodoo2.s

@@ -1,11 +1,11 @@
 ; voodoo lady
 
-	; if x<10 goto MONKEY_VOODOO1
+	; if x<8 goto MONKEY_VOODOO1
 
 voodoo2_check_exit:
 
 	lda	GUYBRUSH_X
-	cmp	#10
+	cmp	#8
 	bcc	voodoo2_to_voodoo1
 	bcs	voodoo2_no_exit
 
@@ -68,3 +68,40 @@ done_v2_adjust:
 
 voodoo2_check_bounds:
 	rts
+
+
+;=============================
+voodoo_lady_action:
+	lda	CURRENT_VERB
+	asl
+	tay
+
+	lda	voodoo_lady_actions,Y
+	cmp	#$ff
+	beq	voodoo_lady_nothing
+
+	sta	MESSAGE_L
+	lda	voodoo_lady_actions+1,Y
+	sta	MESSAGE_H
+
+	jmp	do_display_message
+
+voodoo_lady_nothing:
+	lda	#VERB_WALK
+	sta	CURRENT_VERB
+	rts
+
+voodoo_lady_actions:
+	.word 	$FFFF		; give
+	.word	doesnt_open	; open
+	.word	doesnt_work	; close
+	.word	cant_pick_up	; pick_up
+	.word	$FFFF		; look_at
+	.word	voodoo_talk	; talk_to
+	.word	for_what	; use
+	.word	icant_move	; push
+	.word	icant_move	; pull
+
+voodoo_talk:
+.byte 6,21,"WHAT MAY I HELP YOU WITH SON?",0
+