summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/re/017-2.mcachebin96 -> 99 bytes
-rw-r--r--maps/re/017-5.mcachebin112 -> 116 bytes
-rw-r--r--npc/014-3/_mobs.txt2
-rw-r--r--npc/017-1/_warps.txt2
-rw-r--r--npc/017-2-1/_warps.txt2
-rw-r--r--npc/017-2/_warps.txt4
6 files changed, 5 insertions, 5 deletions
diff --git a/maps/re/017-2.mcache b/maps/re/017-2.mcache
index c07eb65e4..fd555739a 100644
--- a/maps/re/017-2.mcache
+++ b/maps/re/017-2.mcache
Binary files differ
diff --git a/maps/re/017-5.mcache b/maps/re/017-5.mcache
index 1750a85f0..b57733be6 100644
--- a/maps/re/017-5.mcache
+++ b/maps/re/017-5.mcache
Binary files differ
diff --git a/npc/014-3/_mobs.txt b/npc/014-3/_mobs.txt
index 5309061fc..0fc7f4eeb 100644
--- a/npc/014-3/_mobs.txt
+++ b/npc/014-3/_mobs.txt
@@ -3,7 +3,7 @@
014-3,133,94,91,52 monster Mouboo 1023,30,30000,45000
014-3,146,131,70,21 monster Forest Mushroom 1060,9,60000,45000
014-3,122,121,90,35 monster Squirrel 1032,26,30000,42000
-014-3,62,101,37,32 monster Centaur 1139,4,60000,60000
+014-3,62,101,37,32 monster Centaur 1139,4,80000,90000
014-3,192,94,22,15 monster Pinkie 1132,6,30000,50000,Oscar::OnKillPinkie
014-3,113,84,49,25 monster Poison Spiky Mushroom 1043,11,45000,45000
014-3,146,131,70,21 monster Mauve Plant 1135,4,90000,90000
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index 88b6bdbbb..fd5afaa64 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -2,7 +2,7 @@
// Map 017-1: Land Of Fire Village warps
017-1,180,193,0 warp #017-1_180_193 0,0,018-2,63,105
017-1,152,224,0 warp #017-1_152_224 0,0,018-1,32,68
-017-1,119,60,0 warp #017-1_119_60 0,0,017-2,31,30
+017-1,119,60,0 warp #017-1_119_60 0,0,017-2,41,30
017-1,219,91,0 warp #017-1_219_91 0,0,014-4,95,33
017-1,55,143,0 warp #017-1_55_143 2,0,017-3,32,44
017-1,150,87,0 warp #017-1_150_87 0,0,017-4,27,41
diff --git a/npc/017-2-1/_warps.txt b/npc/017-2-1/_warps.txt
index 5bf0499a7..e93922726 100644
--- a/npc/017-2-1/_warps.txt
+++ b/npc/017-2-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 017-2-1: Jack's Basement warps
-017-2-1,121,115,0 warp #017-2-1_121_115 0,0,017-2,21,29
+017-2-1,121,115,0 warp #017-2-1_121_115 0,0,017-2,31,29
017-2-1,27,127,0 warp #017-2-1_27_127 0,0,018-3,114,24
diff --git a/npc/017-2/_warps.txt b/npc/017-2/_warps.txt
index 526c98f69..12b4bbafe 100644
--- a/npc/017-2/_warps.txt
+++ b/npc/017-2/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 017-2: Jack's House warps
-017-2,31,32,0 warp #017-2_31_32 0,0,017-1,119,61
-017-2,21,30,0 warp #017-2_21_30 0,0,017-2-1,121,116
+017-2,41,32,0 warp #017-2_41_32 0,0,017-1,119,61
+017-2,31,30,0 warp #017-2_31_30 0,0,017-2-1,121,116