Merge pull request #548 from unfoldingdev/tarc2

landing scripts modified for tutorial

Author: DizzyEggg

data/maps/MansionFloor1RoomLanding/scripts.inc

@@ -27,6 +27,22 @@ MansionFloor1RoomLanding_EventScript_Abra::
 	checkitem UNIQUE_ITEM_INKWELL_EMPTY_BOTTLE_3, 1
 	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstTimeVials
 
+	
+	@fulls?
+	checkitem ITEM_LATIOSITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+	checkitem ITEM_LOPUNNITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+	checkitem ITEM_GARCHOMPITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_1, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_2, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_3, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_FirstFullVials
+
+
 	@player didn't pick up any vials, even the free one
 
 	msgbox_portrait MansionFloor1RoomLanding_Text_FirstTime5NoVial, FIELD_PIC_ABRA_CONCERNED
@@ -37,6 +53,23 @@ MansionFloor1RoomLanding_EventScript_Abra::
 	end
 
 
+
+MansionFloor1RoomLanding_EventScript_FirstFullVials::
+	msgbox_portrait MansionFloor1RoomLanding_Text_FirstFullVials, FIELD_PIC_ABRA_JOY
+	closemessage
+	setflag FLAG_VISITED_LANDING_1
+	setflag FLAG_ABRATALK_LANDING_1
+	clearflag FLAG_ABRA_IN_PARTY_2
+	releaseall
+	end
+
+MansionFloor1RoomLanding_Text_FirstFullVials:
+	.string "Oh wait, you made it through\n"
+	.string "without using vials! Nice$"
+
+
+
+
 MansionFloor1RoomLanding_EventScript_FirstTimeVials::
 	msgbox_portrait MansionFloor1RoomLanding_Text_FirstTime5Vial, FIELD_PIC_ABRA_SERIOUS
 	msgbox_portrait MansionFloor1RoomLanding_Text_FirstTime6, FIELD_PIC_ABRA_JOY
@@ -225,11 +258,20 @@ MansionFloor1RoomLanding_EventScript_TalkAgain::
 	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_3, 1
 	goto_if_eq VAR_RESULT, YES, MansionFloor1RoomLanding_EventScript_TalkAgainFullVials
 
+
 	msgbox_portrait MansionFloor1RoomLanding_Text_TalkAgainNoVials, FIELD_PIC_ABRA_CONCERNED
+	closemessage
 	clearflag FLAG_ABRA_IN_PARTY_2
 	release
 	end
 
+
+
+
+
+
+
+
 MansionFloor1RoomLanding_EventScript_TalkAgainVials::
 	msgbox_portrait MansionFloor1RoomLanding_Text_TalkAgainVials, FIELD_PIC_ABRA_HAPPY
 	goto MansionFloor1RoomLanding_EventScript_FillUpVials
@@ -341,6 +383,7 @@ MansionFloor1RoomLanding_EventScript_VialsFilled::
 	closemessage
 	setflag FLAG_VISITED_LANDING_1
 	setflag FLAG_ABRATALK_LANDING_1
+	setflag FLAG_EXPLAINED_VIALS
 	clearflag FLAG_ABRA_IN_PARTY_2
 	releaseall
 	end

data/maps/MansionFloor2RoomLanding/scripts.inc

@@ -27,16 +27,47 @@ MansionFloor2RoomLanding_EventScript_Abra::
 	checkitem UNIQUE_ITEM_INKWELL_EMPTY_BOTTLE_3, 1
 	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstTimeVials
 
+	@fulls?
+	checkitem ITEM_LATIOSITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+	checkitem ITEM_LOPUNNITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+	checkitem ITEM_GARCHOMPITE, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_1, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_2, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+	checkitem UNIQUE_ITEM_INKWELL_FULL_BOTTLE_3, 1
+	goto_if_eq VAR_RESULT, YES, MansionFloor2RoomLanding_EventScript_FirstFullVials
+
+
+
 	@player didn't pick up any vials, even the free one
 
 	msgbox_portrait MansionFloor2RoomLanding_Text_FirstTime5NoVial, FIELD_PIC_ABRA_CONCERNED
+	closemessage
 	setflag FLAG_VISITED_LANDING_2
 	setflag FLAG_ABRATALK_LANDING_2
 	clearflag FLAG_ABRA_IN_PARTY_2
 	releaseall
 	end
 
 
+MansionFloor2RoomLanding_EventScript_FirstFullVials::
+	msgbox_portrait MansionFloor2RoomLanding_Text_FirstFullVials, FIELD_PIC_ABRA_JOY
+	closemessage
+	setflag FLAG_VISITED_LANDING_2
+	setflag FLAG_ABRATALK_LANDING_2
+	clearflag FLAG_ABRA_IN_PARTY_2
+	releaseall
+	end
+
+MansionFloor2RoomLanding_Text_FirstFullVials:
+	.string "Oh wait, you made it through\n"
+	.string "without using vials! Nice$"
+
+
 MansionFloor2RoomLanding_EventScript_FirstTimeVials::
 	msgbox_portrait MansionFloor2RoomLanding_Text_FirstTime6, FIELD_PIC_ABRA_JOY
 	closemessage
@@ -326,6 +357,7 @@ MansionFloor2RoomLanding_EventScript_VialsFilled::
 	closemessage
 	setflag FLAG_VISITED_LANDING_2
 	setflag FLAG_ABRATALK_LANDING_2
+	setflag FLAG_EXPLAINED_VIALS
 	clearflag FLAG_ABRA_IN_PARTY_2
 	releaseall
 	end