5 files changed, 2 insertions, 53 deletions
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 3f90a1d8..e6688c6a 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -9,7 +9,6 @@ npc: npc/002-2/barber.txt
 npc: npc/002-2/bleacher.txt
 npc: npc/002-2/casino.txt
 npc: npc/002-2/dedication.txt
-npc: npc/002-2/eurni.txt
 npc: npc/002-2/hetchel.txt
 npc: npc/002-2/imec.txt
 npc: npc/002-2/inya.txt
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
index c1c72ce6..b3db1c6d 100644
--- a/world/map/npc/002-2/_warps.txt
+++ b/world/map/npc/002-2/_warps.txt
@@ -11,8 +11,6 @@
 002-2,37,20|warp|-1,-1,002-2,72,31
 002-2,72,32|warp|-1,-1,002-2,37,21
 002-2,79,70|warp|-1,-1,002-2,34,21
-002-2,40,20|warp|-1,-1,002-2,126,35
-002-2,126,36|warp|-1,-1,002-2,40,21
 002-2,75,101|warp|-1,-1,002-1,109,46
 002-2,83,101|warp|-1,-1,002-1,115,46
 002-2,78,132|warp|-1,-1,002-1,114,36
diff --git a/world/map/npc/002-2/barber.txt b/world/map/npc/002-2/barber.txt
index 0ed69626..3de89005 100644
--- a/world/map/npc/002-2/barber.txt
+++ b/world/map/npc/002-2/barber.txt
@@ -1,5 +1,5 @@
 // A barber (later we can make it so certain styles need to come from him, for a price)
-002-2,117,30,0|script|Issay|156
+002-2,22,77,0|script|Issay|156
 {
     mes "[Issay the Barber]";
     mes "\"Want to change your hairstyle?\"";
diff --git a/world/map/npc/002-2/eurni.txt b/world/map/npc/002-2/eurni.txt
deleted file mode 100644
index 7e7254ed..00000000
--- a/world/map/npc/002-2/eurni.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-
-002-2,22,77,0|script|Eurni|136
-{
-    set @halloween_npc_id, $@halloween_npc_eurni;
-    callfunc "TrickOrTreat";
-
-    mes "[Eurni the Surgeon]";
-    mes "\"Are you tired of who you are?\"";
-    next;
-    mes "\"Would you be interested in changing your sex?\"";
-    next;
-
-    menu
-        "Please do.", L_Change_Menu,
-        "Leave my family treasures alone!", L_Close;
-
-L_Change_Menu:
-    menu
-        "Female.", L_Female,
-        "Male.", L_Male,
-        "Non-binary.", L_NonBinary;
-
-L_Female:
-    set @sex, 0;
-    goto L_Change;
-
-L_Male:
-    set @sex, 1;
-    goto L_Change;
-
-L_NonBinary:
-    set @sex, 3;
-    goto L_Change;
-
-L_Change:
-    if (Sex == @sex)
-        goto L_Already_Change;
-    set Sex, @sex;
-    close;
-
-L_Already_Change:
-    mes "[Eurni the Surgeon]";
-    mes "\"Umm, you are that gender already.\"";
-    close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
index b33ced4f..8f0bef6b 100644
--- a/world/map/npc/002-2/mapflags.txt
+++ b/world/map/npc/002-2/mapflags.txt
@@ -1 +1,2 @@
 002-2|mapflag|resave|001-1,60,105
+002-2|mapflag|town