Ran java Converter after the clone rebase, thanks to o11c.

Fixed all the warps to be precise and avoid some unecessary messages when we walk in front of the battle caves.
Made some improvements into rossy script too.

9 files changed, 25 insertions, 376 deletions

diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 95a96670..0cf34040 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -129,7 +129,7 @@ L_Donet:
   
 L_RG:
   menu
-    "Your mother asked me to bring you these flowers.", -;
+    "Your mother asked me to bring you these flowers because you succesfully passed your exam.", -;
   mes "[Rossy]";
   set Rossy_Quest, 11;
   mes "\"Let me see...\"";
@@ -149,13 +149,13 @@ L_Allergic:
   
 L_Sorry:
   menu
-    "Your mother is really sorry about the roses. Here are some beautiful red tulips instead.", L_See;
+    "Your mother is sorry about the roses. Here are some beautiful red tulips instead.", L_See;
     
 L_See:
   mes "[Rossy]";
   set Rossy_Quest, 13;
   delitem "redtulip", 15;
-  mes "\"How nice, thank you "+ strcharinfo(0) +"! Tell my mother that she is the nicest mother in the world. You are the best gentleman I've ever met!\"";
+  mes "\"How nice, thank you "+ strcharinfo(0) +"! Go and tell my mother that she is the nicest mother in the world. Then come back and see me afterwards.\"";
   getexp 2500, 0;
   close;
   
@@ -165,11 +165,13 @@ L_Best:
   mes "\"Thank you "+ strcharinfo(0) +", you helped me so much! I now need to find my sister before my mum gets worried...\"";
   next;
   mes "\"Please find her.\"";
+  next;
+  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Please save her!\"";
   close;
 
 L_Julia:
   mes "[Rossy]";
-  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Please save her now!\"";
+  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Please go and save her now!\"";
   close;
 
 L_End:
diff --git a/npc/025-3/_import.txt b/npc/025-3/_import.txt
index bb6cdec0..285e674e 100644
--- a/npc/025-3/_import.txt
+++ b/npc/025-3/_import.txt
@@ -1,3 +1,4 @@
+// Map 025-3: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 025-3.gat
 npc: npc/025-3/_mobs.txt
diff --git a/npc/025-3/_mobs.txt b/npc/025-3/_mobs.txt
index 03c831fb..9ce0508c 100644
--- a/npc/025-3/_mobs.txt
+++ b/npc/025-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-3 mobs
+//  mobs
 
 025-3.gat,0,0,0,0	monster	CaveMaggot	1056,100,0,100,Mob025-3::On1056
 025-3.gat,0,0,0,0	monster	Archant	1060,20,0,100,Mob025-3::On1060
diff --git a/npc/025-3/_warps.txt b/npc/025-3/_warps.txt
index d6ee0fad..c64903e0 100644
--- a/npc/025-3/_warps.txt
+++ b/npc/025-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-3 warps
+//  warps
 
 025-3.gat,112,98	warp	ToOutside	1,-1,025-1.gat,42,81
 025-3.gat,105,86	warp	ToHelper	-1,-1,025-4.gat,28,36
diff --git a/npc/025-3/barrier.txt b/npc/025-3/barrier.txt
deleted file mode 100644
index e3c35be4..00000000
--- a/npc/025-3/barrier.txt
+++ /dev/null
@@ -1,354 +0,0 @@
-// -----------------------------------------------Warp to Cave 1--------------------------------------------------------------
-
-025-3.gat,78,128,0	script	#WarpBattleCave1	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE1) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave1, 1;
-    warp "025-4.gat", 41, 94;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave1fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-}
-
-// -----------------------------------------------Warp to Cave 2--------------------------------------------------------------
-
-025-3.gat,53,108,0	script	#WarpBattleCave2	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE2) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave2, 1;
-    warp "025-4.gat", 110, 94;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave2fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 3-------------------------------------------------------------
-
-025-3.gat,71,84,0	script	#WarpBattleCave3	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE3) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave3, 1;
-    warp "025-4.gat", 168, 115;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave3fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 4-------------------------------------------------------------
-
-025-3.gat,80,84,0	script	#WarpBattleCave4	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE4) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave4, 1;
-    warp "025-4.gat", 32, 154;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave4fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 5-------------------------------------------------------------
-
-025-3.gat,71,31,0	script	#WarpBattleCave5	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE5) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave5, 1;
-    warp "025-4.gat", 100, 158;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave5fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 6-------------------------------------------------------------
-
-025-3.gat,128,36,0	script	#WarpBattleCave6	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE6) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave6, 1;
-    warp "025-4.gat", 159, 172;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave6fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-
-}
-
-// -----------------------------------------------Warp to Cave 7-------------------------------------------------------------
-
-025-3.gat,70,58,0	script	#WarpBattleCave7	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave7, 1;
-    warp "025-4.gat", 42, 217;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave7fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
-
-025-3.gat,138,93,0	script	#WarpBattleCave8	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE8) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave8, 1;
-    warp "025-4.gat", 105, 214;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave8fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Cave 9-------------------------------------------------------------
-
-025-3.gat,138,159,0	script	#WarpBattleCave9	127,1,1,{
-
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1) goto L_SomeoneInside;
-// Check if you already done this fight
-    if (cavefights & BATTLE_CAVE9) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
-
-L_StartFight:
-    set @battlecave9, 1;
-    warp "025-4.gat", 157, 224;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave9fighter$ + " is already inside.";
-    end;
-
-L_AlreadyDone:
-    message strcharinfo(0), "I already defeated the monsters in this cave.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-
-L_Block:
-    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
-    end;
-
-}
-
-// -----------------------------------------------Warp to Boss Cave----------------------------------------------------------
-
-025-3.gat,77,169,0	script	#WarpBossCave	127,1,1,{
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-
-//Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
-    if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1) goto L_SomeoneInside;
-
-//Check if you can enter this cave
-    if (cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9) goto L_StartFight;
-
-    message strcharinfo(0), "It feels like something terrible is lurking inside this cave... But you can't enter before you defeat the monsters in the other caves.";
-    end;
-
-L_StartFight:
-    set @battlebosscave, 1;
-    warp "025-4.gat", 157, 46;
-    end;
-
-L_SomeoneInside:
-    message strcharinfo(0), $@cave10fighter$ + " is already inside.";
-    end;
-
-L_AlreadyHelped:
-    if (@juliadone == 1) end;
-    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
-    set @juliadone, 1;
-    end;
-}
-
diff --git a/npc/025-3/barriers.txt b/npc/025-3/barriers.txt
index e3c35be4..89c13b84 100644
--- a/npc/025-3/barriers.txt
+++ b/npc/025-3/barriers.txt
@@ -1,6 +1,6 @@
 // -----------------------------------------------Warp to Cave 1--------------------------------------------------------------
 
-025-3.gat,78,128,0	script	#WarpBattleCave1	127,1,1,{
+025-3.gat,78,127,0	script	#WarpBattleCave1	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -11,7 +11,7 @@
 
 L_StartFight:
     set @battlecave1, 1;
-    warp "025-4.gat", 41, 94;
+    warp "025-4.gat", 41, 95;
     end;
 
 L_SomeoneInside:
@@ -35,7 +35,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 2--------------------------------------------------------------
 
-025-3.gat,53,108,0	script	#WarpBattleCave2	127,1,1,{
+025-3.gat,53,107,0	script	#WarpBattleCave2	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -71,7 +71,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 3-------------------------------------------------------------
 
-025-3.gat,71,84,0	script	#WarpBattleCave3	127,1,1,{
+025-3.gat,71,83,0	script	#WarpBattleCave3	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -107,7 +107,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 4-------------------------------------------------------------
 
-025-3.gat,80,84,0	script	#WarpBattleCave4	127,1,1,{
+025-3.gat,80,83,0	script	#WarpBattleCave4	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -143,7 +143,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 5-------------------------------------------------------------
 
-025-3.gat,71,31,0	script	#WarpBattleCave5	127,1,1,{
+025-3.gat,71,30,0	script	#WarpBattleCave5	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -179,7 +179,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 6-------------------------------------------------------------
 
-025-3.gat,128,36,0	script	#WarpBattleCave6	127,1,1,{
+025-3.gat,128,35,0	script	#WarpBattleCave6	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -216,7 +216,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 7-------------------------------------------------------------
 
-025-3.gat,70,58,0	script	#WarpBattleCave7	127,1,1,{
+025-3.gat,70,57,0	script	#WarpBattleCave7	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -252,7 +252,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
 
-025-3.gat,138,93,0	script	#WarpBattleCave8	127,1,1,{
+025-3.gat,138,92,0	script	#WarpBattleCave8	127,1,1,{
 
   if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
@@ -288,9 +288,9 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 9-------------------------------------------------------------
 
-025-3.gat,138,159,0	script	#WarpBattleCave9	127,1,1,{
+025-3.gat,138,160,0	script	#WarpBattleCave9	127,1,1,{
 
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 // Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
     if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1) goto L_SomeoneInside;
 // Check if you already done this fight
@@ -324,12 +324,11 @@ L_Block:
 
 // -----------------------------------------------Warp to Boss Cave----------------------------------------------------------
 
-025-3.gat,77,169,0	script	#WarpBossCave	127,1,1,{
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+025-3.gat,77,170,0	script	#WarpBossCave	127,1,1,{
 
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
 //Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
     if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1) goto L_SomeoneInside;
-
 //Check if you can enter this cave
     if (cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9) goto L_StartFight;
 
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index 0d36f56e..ac773656 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -1,3 +1,4 @@
+// Map 025-4: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 025-4.gat
 npc: npc/025-4/Battlecaves.txt
diff --git a/npc/025-4/_mobs.txt b/npc/025-4/_mobs.txt
index bcd9cdaf..ca9a8f35 100644
--- a/npc/025-4/_mobs.txt
+++ b/npc/025-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-4 mobs
+//  mobs
 
 025-4.gat,29,29,20,15	monster	CaveMaggot	1056,3,0,0,Mob025-4::On1056
 025-4.gat,94,23,20,18	monster	CaveMaggot	1056,5,0,0,Mob025-4::On1056
diff --git a/npc/025-4/_warps.txt b/npc/025-4/_warps.txt
index 7ed92366..6787b071 100644
--- a/npc/025-4/_warps.txt
+++ b/npc/025-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-4 warps
+//  warps
 
 025-4.gat,28,37	warp	ToMainHall	-1,-1,025-3.gat,105,87
 025-4.gat,93,34	warp	ToMainHall	-1,-1,025-4.gat,157,26