7 files changed, 42 insertions, 31 deletions

diff --git a/db/item_noequip.txt b/db/item_noequip.txt
index 661ae1ea3..e73c7089d 100644
--- a/db/item_noequip.txt
+++ b/db/item_noequip.txt
@@ -33,6 +33,11 @@
 //Zone 2 - Jail
 601,8 //Fly Wing - not really needed here but ...
 602,8 //Butterfly Wing - also not needed
+12212,8 //Giant Fly Wing
+14582,8
+14583,8
+14584,8
+14585,8
 
 //Zone 3 - Izlude Battle Arena
 601,16 //Fly Wing
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 548e36877..4a7329d0b 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -53,7 +53,6 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "[La Ed]";
 	mes "Let's do it~ !!";
 	emotion e_gg;
-	emotion e_gg;
 	next;
 	mes "[Haith]";
 	mes "................";
@@ -1024,7 +1023,7 @@ OnTouch:
 	case 3:
 		//if (rand(1,2) == 2) {
 		//	percentheal -99,0;
-		//	warp "warp "nif_in",69,15;
+		//	warp "nif_in",69,15;
 		//}
 		end;
 	}
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 0dba23f60..c61f13b4f 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -75,20 +75,27 @@ function	script	F_CashReset	{
 //   due to lack of information.
 // - No arguments.
 function	script	F_CashDungeon	{
-	switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower")) {
-	case 1: warp "mag_dun01",0,0; end;
-	case 2: warp "mjolnir_02",0,0; end;
-	case 3: warp "um_dun01",0,0; end;
-	case 4: warp "ein_dun01",0,0; end;
-	case 5: warp "pay_dun00",0,0; end;
-	case 6: warp "xmas_dun01",0,0; end;
-	case 7: warp "gl_prison",0,0; end;
-	case 8: warp "lou_dun01",0,0; end;
-	case 9: warp "gon_dun02",0,0; end;
-	case 10: warp "iz_dun00",0,0; end;
-	case 11: warp "tur_dun02",0,0; end;
-	case 12: warp "alde_dun03",0,0; end;
-	case 13: warp "c_tower1",0,0; end;
+	switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Payon Caves:Toy Factory:Glast Heim Prison:Louyang Dungeon:Kunlun Dungeon:Izlude Undersea Tunnel:Turtle Island:Clocktower 3F:Clocktower B3F:Glast Heim Sewers 2F:Sphinx Dungeon 4F:Pyramid Dungeon 4F:Prontera Culverts 3F:Amatsu Dungeon 1F:Somatology Laboratory 1F:Ayotaya Dungeon 2F"))
+	{
+	case 1: warp "mag_dun01",0,0; end; // Nogg Road
+	case 2: warp "mjo_dun01",0,0; end; // Mjolnir Dead Pit
+	case 3: warp "um_dun01",0,0; end; // Umbala Dungeon
+	case 4: warp "pay_dun00",0,0; end; // Payon Caves
+	case 5: warp "xmas_dun01",0,0; end; // Toy Factory
+	case 6: warp "gl_prison",0,0; end; // Glast Heim Prison
+	case 7: warp "lou_dun01",0,0; end; // Louyang Dungeon
+	case 8: warp "gon_dun01",0,0; end; // Kunlun Dungeon
+	case 9: warp "iz_dun00",0,0; end; // Izlude Undersea Tunnel
+	case 10: warp "tur_dun01",0,0; end; // Turtle Island
+	case 11: warp "c_tower3",0,0; end; // Clocktower 3F
+	case 12: warp "alde_dun03",0,0; end; // Clocktower B3F
+	case 13: warp "gl_sew02",0,0; end; // Glast Heim Sewers 2F
+	case 14: warp "in_sphinx4",0,0; end; // Sphinx Dungeon 4F
+	case 15: warp "moc_pryd04",0,0; end; // Pyramid Dungeon 4F
+	case 16: warp "prt_sewb3",0,0; end; // Prontera Culverts 3F
+	case 17: warp "ama_dun01",0,0; end; // Amatsu Dungeon 1F
+	case 18: warp "lhz_dun01",0,0; end; // Somatology Laboratory 1F
+	case 19: warp "ayo_dun02",0,0; end; // Ayotaya Dungeon 2F
 	}
 	return;
 }
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index e23e1f50f..9770a8537 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -33,7 +33,7 @@ sec_in02,79,180,3	script	#arenacontrol	81,{
 DLGTEMP:
 	input @input_arena;
 	if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP;	//CHECK
-	if (@input == 0)
+	if (@input_arena == 0)
 	{
 		mes "Error!";
 		close;
diff --git a/src/map/mail.c b/src/map/mail.c
index 733fce646..6fa605bb8 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -76,7 +76,7 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount)
 			amount = 0;
 
 		sd->mail.zeny = amount;
-		clif_updatestatus(sd, SP_ZENY);
+		// clif_updatestatus(sd, SP_ZENY);
 		return 0;
 	}
 	else
diff --git a/src/map/pc.c b/src/map/pc.c
index 5d0c1a914..c98016418 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6743,7 +6743,7 @@ int pc_divorce(struct map_session_data *sd)
 	struct map_session_data *p_sd;
 	int i;
 
-	if (sd == NULL || !pc_ismarried(sd))
+	if( sd == NULL || !pc_ismarried(sd) )
 		return -1;
 
 	if( !sd->status.partner_id )
@@ -6758,23 +6758,23 @@ int pc_divorce(struct map_session_data *sd)
 		return 0;
 #else
 		ShowError("pc_divorce: p_sd nullpo\n");
-			return -1;
+		return -1;
 #endif
-		}
+	}
 
 	// Both players online, lets do the divorce manually
-		sd->status.partner_id = 0;
-		p_sd->status.partner_id = 0;
+	sd->status.partner_id = 0;
+	p_sd->status.partner_id = 0;
 	for( i = 0; i < MAX_INVENTORY; i++ )
 	{
-			if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F)
-				pc_delitem(sd, i, 1, 0);
-			if (p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F)
-				pc_delitem(p_sd, i, 1, 0);
-		}
+		if( sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F )
+			pc_delitem(sd, i, 1, 0);
+		if( p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F )
+			pc_delitem(p_sd, i, 1, 0);
+	}
 
-		clif_divorced(sd, p_sd->status.name);
-		clif_divorced(p_sd, sd->status.name);
+	clif_divorced(sd, p_sd->status.name);
+	clif_divorced(p_sd, sd->status.name);
 
 	return 0;
 }
diff --git a/src/map/script.c b/src/map/script.c
index d9671516e..01d3470d5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3385,7 +3385,7 @@ static int script_load_mapreg(void)
 			int s = add_str(varname);
 			int i = index;
 			int v = atoi(value);
-			idb_put(mapreg_db, (i<<24)|s, (void *)v);			
+			idb_put(mapreg_db, (i<<24)|s, (void *)v);
 		}
 	}