Removed some of the leftover calls to menu() in custom scripts

Signed-off-by: Haru <haru@dotalux.com>

4 files changed, 248 insertions, 256 deletions

diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt
index 3045c2330..7ecfdb817 100644
--- a/npc/custom/events/hallow06.txt
+++ b/npc/custom/events/hallow06.txt
@@ -31,28 +31,27 @@ prontera,151,190,5	script	Hallows' Eve Event	1_M_SIGNMCNT,{
 	mes "[Hallows' Eve Event]";
 	mes "Trick or treat, which do you prefer?";
 	next;
-	menu "Trick",-, "Treat",L_Treat;
+	if (select("Trick", "Treat") == 1) {
+		mes "[Hallows' Eve Event]";
+		if(EVENT_HALWN06&2){
+			mes "I'm sorry but you have already had a trick. Why don't you go pick a treat now.";
+			emotion e_sry;
+			close;
+		}
+		mes "Give me a min...";
+		next;
+		set BaseExp,BaseExp+BaseLevel*1000;
+		set EVENT_HALWN06,EVENT_HALWN06|2;
 
-	mes "[Hallows' Eve Event]";
-	if(EVENT_HALWN06&2){
-		mes "I'm sorry but you have already had a trick. Why don't you go pick a treat now.";
-		emotion e_sry;
+		mes "[Hallows' Eve Event]";
+		mes "Here is your treat. Your Base EXP has been slightly increased.";
+		next;
+		mes "[Hallows' Eve Event]";
+		mes "I hope you enjoy your trick and Happy Halloween!";
 		close;
 	}
-	mes "Give me a min...";
-	next;
-	set BaseExp,BaseExp+BaseLevel*1000;
-	set EVENT_HALWN06,EVENT_HALWN06|2;
 
 	mes "[Hallows' Eve Event]";
-	mes "Here is your treat. Your Base EXP has been slightly increased.";
-	next;
-	mes "[Hallows' Eve Event]";
-	mes "I hope you enjoy your trick and Happy Halloween!";
-	close;
-
-L_Treat:
-	mes "[Hallows' Eve Event]";
 	if(EVENT_HALWN06&1){
 		mes "I'm sorry but you have already had a treat. Why don't you go pick a trick now.";
 		emotion e_sry;
@@ -84,39 +83,39 @@ L_Treat:
 	}
 	mes "Did you get the items I requested or do you need to see the list again?";
 	next;
-	menu "Got'em",-, "Don't Have",L_Dont_Have, "See List",L_List;
-
-	mes "[Hallows' Eve Event]";
-	if((countitem(Hat) < 1) || (countitem(Pumpkin) < 30) || (countitem(Piece_Of_Black_Cloth) < 20)){
-		mes "You don't have enough items. Come back when you do.";
-		emotion e_sry;
+	switch (select("Got'em", "Don't Have", "See List")) {
+	case 1:
+		mes "[Hallows' Eve Event]";
+		if((countitem(Hat) < 1) || (countitem(Pumpkin) < 30) || (countitem(Piece_Of_Black_Cloth) < 20)){
+			mes "You don't have enough items. Come back when you do.";
+			emotion e_sry;
+			close;
+		}
+		delitem 2220,1;
+		delitem 535,30;
+		delitem 7205,20;
+		getitem 5134,1;
+		set EVENT_HALWN06,EVENT_HALWN06|1;
+		mes "Good job! I hope you are happy with your item.";
+		emotion e_grat;
+		next;
+		mes "[Hallows' Eve Event]";
+		mes "Enjoy the rest of your halloween.";
+		emotion e_scissors,1;
+		close;
+	case 2:
+		mes "[Hallows' Eve Event]";
+		mes "Go back out and search for them. Would you like to view the list?";
+		next;
+		if (select("No", "Yes") == 1)
+			close;
+		// Fall through
+	case 3:
+		mes "[Hallows' Eve Event]";
+		mes "I require the following items:";
+		mes "1 Hat,";
+		mes "30 Pumpkin, and";
+		mes "20 Black Piece of Cloth.";
 		close;
 	}
-	delitem 2220,1;
-	delitem 535,30;
-	delitem 7205,20;
-	getitem 5134,1;
-	set EVENT_HALWN06,EVENT_HALWN06|1;
-	mes "Good job! I hope you are happy with your item.";
-	emotion e_grat;
-	next;
-	mes "[Hallows' Eve Event]";
-	mes "Enjoy the rest of your halloween.";
-	emotion e_scissors,1;
-	close;
-
-L_Dont_Have:
-	mes "[Hallows' Eve Event]";
-	mes "Go back out and search for them. Would you like to view the list?";
-	next;
-	menu "No",-, "Yes",L_List;
-	close;
-
-L_List:
-	mes "[Hallows' Eve Event]";
-	mes "I require the following items:";
-	mes "1 Hat,";
-	mes "30 Pumpkin, and";
-	mes "20 Black Piece of Cloth.";
-	close;
 }
diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index 7027dacbf..72ae51fc2 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -82,51 +82,52 @@ L_Undead_Walk:
 	mes "To calm down the restless cemetery, we should pour all these graves with the Holy Water. But our sisters and broters have run out of it.";
 	mes "Could you supply us with Holy Water?";
 	next;
-	menu "Yes, have all my Holy Water!",-, "Nope, I need it.",M_NO, "I don't have any.",M_DONT_HAVE;
+	switch (select("Yes, have all my Holy Water!", "Nope, I need it.", "I don't have any.")) {
+	case 1:
+		if (countitem(Holy_Water) < 1)
+			break; // Not enough
+		set $UNEASY_BL,$UNEASY_BL-countitem(Holy_Water);
+		delitem 523,countitem(Holy_Water);
 
-	if ( countitem(Holy_Water)<1 ) goto M_DONT_HAVE;
-	set $UNEASY_BL,$UNEASY_BL-countitem(Holy_Water);
-	delitem 523,countitem(Holy_Water);
-
-	if ( $UNEASY_BL > 0 ) goto L_NEED_MORE;
-//set quiet days!!! no more undead for this period!
-	set $UNEASY_DL,5+((0-$UNEASY_BL)/30);
-	set $UNEASY_H$,strcharinfo(0);
-	mes "[Mother Mathana]";
-	mes "Thank you, "+$UNEASY_H$+"! Now we've got enough Holy Water!";
-	next;
-	mes "[Mother Mathana]";
-	mes "Upon pouring the cemetery with that water we'll get " + $UNEASY_DL + " safe nights!";
-	next;
-	killmonster "prontera", "Uneasy_Check::OnZombieDead"; //kills any left monsters
-	mes "[Mother Mathana]";
-	mes "See, "+ $UNEASY_H$ +"? They all are gone now!";
-	next;
-	mes "[Mother Mathana]";
-	mes "Our Church is going to thank you personally...";
-	next;
-	if (Sex == SEX_MALE)
-		mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
-	else
-		mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
-	mes "[Mother Mathana]";
-	mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
-	getitem Blue_Potion,1;
-	set JobExp,JobExp+100;
-	set BaseExp,BaseExp+50;
-	close;
-
-L_NEED_MORE:
-	mes "[Mother Mathana]";
-	mes "Thank you, good "+strcharinfo(0)+", but we still need " + $UNEASY_BL + " more Holy Water bottles.";
-	close;
-
-M_NO:
-	mes "[Mother Mathana]";
-	mes "I'm afraid the old cemetery is going out of control soon... Please, get us all the Holy Water you can get.";
-	close;
-
-M_DONT_HAVE:
+		if ($UNEASY_BL > 0) {
+			mes "[Mother Mathana]";
+			mes "Thank you, good "+strcharinfo(0)+", but we still need " + $UNEASY_BL + " more Holy Water bottles.";
+			close;
+		}
+		//set quiet days!!! no more undead for this period!
+		set $UNEASY_DL,5+((0-$UNEASY_BL)/30);
+		set $UNEASY_H$,strcharinfo(0);
+		mes "[Mother Mathana]";
+		mes "Thank you, "+$UNEASY_H$+"! Now we've got enough Holy Water!";
+		next;
+		mes "[Mother Mathana]";
+		mes "Upon pouring the cemetery with that water we'll get " + $UNEASY_DL + " safe nights!";
+		next;
+		killmonster "prontera", "Uneasy_Check::OnZombieDead"; //kills any left monsters
+		mes "[Mother Mathana]";
+		mes "See, "+ $UNEASY_H$ +"? They all are gone now!";
+		next;
+		mes "[Mother Mathana]";
+		mes "Our Church is going to thank you personally...";
+		next;
+		if (Sex == SEX_MALE)
+			mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
+		else
+			mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
+		mes "[Mother Mathana]";
+		mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
+		getitem Blue_Potion,1;
+		set JobExp,JobExp+100;
+		set BaseExp,BaseExp+50;
+		close;
+	case 2:
+		mes "[Mother Mathana]";
+		mes "I'm afraid the old cemetery is going out of control soon... Please, get us all the Holy Water you can get.";
+		close;
+	case 3:
+		break; // Not enough
+	}
+	// Not enough
 	mes "[Mother Mathana]";
 	mes "Alas! We still need " + $UNEASY_BL + " more bottles of Holy Water...  Why don't you go and ask other people for some extra Holy Water?";
 	mes "The old cemetery is going out of control soon...";
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index ccb66bde6..5119a119f 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -30,17 +30,15 @@ prontera,156,172,4	script	Tine	1_M_MERCHANT,{
 	mes "Some married chocolate lovers almost double their experience at trainings!";
 	mes "But everything isn't so simply...";
 	next;
-	menu "Wow! Tell me more!",M_INFO,"Marri... what?",-;
-
-	mes "[Tine]";
-	mes "Are you a single?";
-	mes "Today is a great date to ask your beloved half for marriage!";
-	next;
-	mes "[Tine]";
-	mes "The Marriage fee is ridiculous low these days!";
-	close;
-
-M_INFO:
+	if (select("Wow! Tell me more!", "Marri... what?") == 2) {
+		mes "[Tine]";
+		mes "Are you a single?";
+		mes "Today is a great date to ask your beloved half for marriage!";
+		next;
+		mes "[Tine]";
+		mes "The Marriage fee is ridiculous low these days!";
+		close;
+	}
 	mes "[Tine]";
 	mes "The magic effect posesses only handmade chocolate from grand-grand-grand-whoever recipes!";
 	next;
@@ -82,16 +80,14 @@ alberta,26,243,4	script	Stephen#val1	1_M_MERCHANT,{
 	mes "That's right, don't you love chocolate.... I do.";
 	mes "And you are in luck, because I'm selling them for only 5,000 zeny a piece!";
 	next;
-	menu "I want some chocolate!",M_CHOCO,"No thanks.",-;
-
-	mes "[Stephen]";
-	mes "You don't want any chocolate?";
-	mes "I'm telling you! You'll regret it!";
-	mes "You better get some now... you won't come across Chocolate like this ever again!";
-	mes "Think it over and visit me again sometime.";
-	close;
-
-M_CHOCO:
+	if (select("I want some chocolate!", "No thanks.") != 1) {
+		mes "[Stephen]";
+		mes "You don't want any chocolate?";
+		mes "I'm telling you! You'll regret it!";
+		mes "You better get some now... you won't come across Chocolate like this ever again!";
+		mes "Think it over and visit me again sometime.";
+		close;
+	}
 	mes "[Stephen]";
 	mes "Hah!";
 	mes "I knew it!";
@@ -147,14 +143,12 @@ alberta,29,243,4	script	Jainie#val1	1_M_INNKEEPER,{
 	mes "It would be great if you bought some too...";
 	mes "I will be making white chocolates for a while so...";
 	next;
-	menu "I want some white chocolate!",M_CHOCO,"No thanks.",-;
-
-	mes "[Jainie]";
-	mes "You don't like white chocolate?";
-	mes "Then buy some Stephen's black one!";
-	close;
-
-M_CHOCO:
+	if (select("I want some white chocolate!", "No thanks.") != 1) {
+		mes "[Jainie]";
+		mes "You don't like white chocolate?";
+		mes "Then buy some Stephen's black one!";
+		close;
+	}
 	mes "[Jainie]";
 	mes "I can't sell you more then 5 at once....but, if you really need more....";
 	mes "you can come back again.";
@@ -199,85 +193,84 @@ prt_castle,54,34,4	script	Carl Orleans#val1	1_M_01,{
 	mes "[Carl Orleans]";
 	mes "Yes? What can I cook for you?";
 	next;
-	menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_End;
-
-	mes "[Carl Orleans]";
-	mes "Well, I just might be able to fulfill your needs...";
-	next;
-	if (countitem(Chocolate)<3) {
+	switch (select("Black handmade Chocolate, please", "I want a White handmade Chocolate...", "I'm lost, sorry to bother you.")) {
+	case 1:
+		mes "[Carl Orleans]";
+		mes "Well, I just might be able to fulfill your needs...";
+		next;
+		if (countitem(Chocolate)<3) {
+			mes "[Carl Orleans]";
+			mes "I'm sorry you do not have enough Chocolate Bars to do this.";
+			if(rand(2))mes "They say Stephen from Alberta used to sell good Chocolate.";
+			close;
+		}
+		delitem 558,3;
+		mes "[Carl Orleans]";
+		mes "You got 3 pieces of pure chocolate I see.";
+		mes "Give them to me...";
+		next;
+		mes "[Carl Orleans]";
+		mes "Ok, now I will only create my special handmade chocolates if you promise to use it wisely.";
+		next;
 		mes "[Carl Orleans]";
-		mes "I'm sorry you do not have enough Chocolate Bars to do this.";
-		if(rand(2))mes "They say Stephen from Alberta used to sell good Chocolate.";
+		mes "....Hmmmmmm.....";
+		mes "Well...";
+		next;
+		getitem 559,1;
+		mes "[Carl Orleans]";
+		mes "Here.";
+		if(rand(2))close;
+		mes "I hope you give it to someone special, because its a special chocolate.";
+		mes "As you know... only I can create this.";
+		next;
+		mes "[Carl Orleans]";
+		mes "Enjoy.";
 		close;
-	}
-	delitem 558,3;
-	mes "[Carl Orleans]";
-	mes "You got 3 pieces of pure chocolate I see.";
-	mes "Give them to me...";
-	next;
-	mes "[Carl Orleans]";
-	mes "Ok, now I will only create my special handmade chocolates if you promise to use it wisely.";
-	next;
-	mes "[Carl Orleans]";
-	mes "....Hmmmmmm.....";
-	mes "Well...";
-	next;
-	getitem 559,1;
-	mes "[Carl Orleans]";
-	mes "Here.";
-	if(rand(2))close;
-	mes "I hope you give it to someone special, because its a special chocolate.";
-	mes "As you know... only I can create this.";
-	next;
-	mes "[Carl Orleans]";
-	mes "Enjoy.";
-	close;
-
-M_WHITE:
-	mes "[Carl Orleans]";
-	mes "Well, I just might be able to fulfill your needs...";
-	next;
-	if (countitem(White_Chocolate)<3) {
+	case 2:
+		mes "[Carl Orleans]";
+		mes "Well, I just might be able to fulfill your needs...";
+		next;
+		if (countitem(White_Chocolate)<3) {
+			mes "[Carl Orleans]";
+			mes "I'm sorry you do not have enough White Chocolate Bars to do this.";
+			if(rand(2))mes "They say Jainie from Alberta used to sell good White Chocolate.";
+			close;
+		}
+		delitem 561,3;
+		mes "[Carl Orleans]";
+		mes "You got 3 pieces of pure white chocolate I see.";
+		mes "Give them to me...";
+		next;
+		mes "[Carl Orleans]";
+		mes "Ok, now I will only create my special handmade chocolates if you promise to use it wisely.";
+		next;
+		mes "[Carl Orleans]";
+		mes "....Hmmmmmm.....";
+		mes "Well...";
+		next;
+		getitem 560,1;
+		mes "[Carl Orleans]";
+		mes "Here.";
+		if(rand(2))close;
+		mes "I hope you give it to someone special, because its a special chocolate.";
+		mes "As you know... only I can create this.";
+		next;
+		mes "[Carl Orleans]";
+		mes "Enjoy.";
+		close;
+	case 3:
+		mes "[Carl Orleans]";
+		mes "Oh.. well, if you want me to make some of my special handmade Chocolate....";
+		mes "You will need to give me at least ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
+		if(rand(2))close;
+		next;
+		mes "[Carl Orleans]";
+		mes "That's right, only ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
+		mes "Bring them to me and you'll get what you came for.";
+		if(rand(2))close;
+		next;
 		mes "[Carl Orleans]";
-		mes "I'm sorry you do not have enough White Chocolate Bars to do this.";
-		if(rand(2))mes "They say Jainie from Alberta used to sell good White Chocolate.";
+		mes "See You.";
 		close;
 	}
-	delitem 561,3;
-	mes "[Carl Orleans]";
-	mes "You got 3 pieces of pure white chocolate I see.";
-	mes "Give them to me...";
-	next;
-	mes "[Carl Orleans]";
-	mes "Ok, now I will only create my special handmade chocolates if you promise to use it wisely.";
-	next;
-	mes "[Carl Orleans]";
-	mes "....Hmmmmmm.....";
-	mes "Well...";
-	next;
-	getitem 560,1;
-	mes "[Carl Orleans]";
-	mes "Here.";
-	if(rand(2))close;
-	mes "I hope you give it to someone special, because its a special chocolate.";
-	mes "As you know... only I can create this.";
-	next;
-	mes "[Carl Orleans]";
-	mes "Enjoy.";
-	close;
-
-M_End:
-	mes "[Carl Orleans]";
-	mes "Oh.. well, if you want me to make some of my special handmade Chocolate....";
-	mes "You will need to give me at least ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
-	if(rand(2))close;
-	next;
-	mes "[Carl Orleans]";
-	mes "That's right, only ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
-	mes "Bring them to me and you'll get what you came for.";
-	if(rand(2))close;
-	next;
-	mes "[Carl Orleans]";
-	mes "See You.";
-	close;
 }
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index a1b8918d9..d76c0a784 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -36,52 +36,54 @@ prontera,156,174,4	script	Snower	4_M_06,{
 	}
 	emotion e_sob;
 	next;
-	menu "Where are your sisters?",-, "What holidays?",M_PR,"What gifts?",M_WRAP,"May I help you?",M_QUEST;
-
-	mes "[Snower]";
-	mes "My younger sis Sneewy's left to some faraway land to prepare gifts for their poor children... I don't know where. You should ask my elder sis and her birdies.";
-	next;
-	mes "[Snower]";
-	mes "My elder sis? Her name's Snoowy. She's sailed to some green island... She's talking about some gifts for dolphins or something...";
-	close;
-
-M_PR:
-	mes "[Snower]";
-	mes "The whole three holidays? Well they come one after another!";
-	mes "^000080The Christmas^000000, ^FF0000Karachun^000000 and ^008000New Year Eve^000000!";
-	next;
-	mes "[Snower]";
-	mes "^FF0000Karachun^000000? Heh... This is an old pagans festival. They used to celebrate it before the appearance of HNY and XMas, you know.";
-	next;
-	goto M_QUEST;
-
-M_WRAP:
-	mes "[Snower]";
-	mes "My sisters say that all the gifts should look the same way. Or else some children might fight for fancy ones!";
-	next;
-	mes "[Snower]";
-	mes "Would you like me to wrap your fancy gift boxes with a gray paper?";
-	next;
-	menu "Wrap them, please!",-, "No, thanks.",M_QUEST;
-
-	set @prizes, countitem(Gift_Box_1)+countitem(Gift_Box_2)+countitem(Gift_Box_3)+countitem(Gift_Box_4);
-	if( @prizes == 0){
+	switch (select("Where are your sisters?", "What holidays?", "What gifts?", "May I help you?")) {
+	case 1:
+		mes "[Snower]";
+		mes "My younger sis Sneewy's left to some faraway land to prepare gifts for their poor children... I don't know where. You should ask my elder sis and her birdies.";
+		next;
 		mes "[Snower]";
-		mes "I don't see any gifts in fancy boxes on you...";
-		if(countitem(Gift_Box))mes "You've got only gray boxes.";
+		mes "My elder sis? Her name's Snoowy. She's sailed to some green island... She's talking about some gifts for dolphins or something...";
 		close;
-	}
-	delitem 664,countitem(Gift_Box_1);
-	delitem 665,countitem(Gift_Box_2);
-	delitem 666,countitem(Gift_Box_3);
-	delitem 667,countitem(Gift_Box_4);
-	getitem 644,@prizes;
+	case 2:
+		mes "[Snower]";
+		mes "The whole three holidays? Well they come one after another!";
+		mes "^000080The Christmas^000000, ^FF0000Karachun^000000 and ^008000New Year Eve^000000!";
+		next;
+		mes "[Snower]";
+		mes "^FF0000Karachun^000000? Heh... This is an old pagans festival. They used to celebrate it before the appearance of HNY and XMas, you know.";
+		next;
+		break; // Quest
+	case 3:
+		mes "[Snower]";
+		mes "My sisters say that all the gifts should look the same way. Or else some children might fight for fancy ones!";
+		next;
+		mes "[Snower]";
+		mes "Would you like me to wrap your fancy gift boxes with a gray paper?";
+		next;
+		if (select("Wrap them, please!", "No, thanks.") != 1)
+			break; // Quest
+		set @prizes, countitem(Gift_Box_1)+countitem(Gift_Box_2)+countitem(Gift_Box_3)+countitem(Gift_Box_4);
+		if( @prizes == 0){
+			mes "[Snower]";
+			mes "I don't see any gifts in fancy boxes on you...";
+			if(countitem(Gift_Box))mes "You've got only gray boxes.";
+			close;
+		}
+		delitem 664,countitem(Gift_Box_1);
+		delitem 665,countitem(Gift_Box_2);
+		delitem 666,countitem(Gift_Box_3);
+		delitem 667,countitem(Gift_Box_4);
+		getitem 644,@prizes;
 
-	mes "[Snower]";
-	mes "*shuffle* Here you go.";
-	next;
+		mes "[Snower]";
+		mes "*shuffle* Here you go.";
+		next;
+		break;
+	case 4:
+		break; // Quest
+	}
 
-M_QUEST:
+	// Quest
 	mes "[Snower]";
 	mes "I wish you find my sisters ASAP... They need help.";
 	if(Q_XMSRINGS==0) set Q_XMSRINGS,1;
@@ -111,7 +113,12 @@ louyang,224,249,4	script	Sneewy	4_F_KID3,{
 		mes "[Sneewy]";
 		mes "Oh, hello. Has my brother Snower told you everything?";
 		next;
-		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_End;
+		if (select("Here are your 4 Gift Boxes", "I don't know any Snowhatevers...") != 1) {
+			mes "[Sneewy]";
+			mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
+			emotion e_swt;
+			close;
+		}
 
 		mes "[Sneewy]";
 		if(countitem(Gift_Box)<4){
@@ -132,12 +139,6 @@ louyang,224,249,4	script	Sneewy	4_F_KID3,{
 	emotion e_thx;
 	mes "Thanks again! No children will meet the holidays without the gifts!";
 	close;
-
-M_End:
-	mes "[Sneewy]";
-	mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
-	emotion e_swt;
-	close;
 }
 
 izlu2dun,133,160,2	script	Snoowy	4_F_06,{
@@ -163,8 +164,12 @@ izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 		mes "[Snoowy]";
 		mes "But I too need 3 more gifts for my marine folk friends...";
 		next;
-		menu "Have these gifts!",-, "I need a li'l something in return",M_End;
-
+		if (select("Have these gifts!", "I need a li'l something in return") != 1) {
+			mes "[Snoowy]";
+			mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
+			emotion e_swt;
+			close;
+		}
 		mes "[Snoowy]";
 		if(countitem(Gift_Box)<3){
 			mes "Oops!! You haven't got 3 gray gift boxes on you.";
@@ -182,10 +187,4 @@ izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 	mes "Oh... the whole marine folk send you their thanks! They love presents so much!!!";
 	if(rand(2))mes "Didn't you know that Santa's Hat reveals the real power of the rings?";
 	close;
-
-M_End:
-	mes "[Snoowy]";
-	mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
-	emotion e_swt;
-	close;
 }