diff --git a/P3D/Content/Data/Scripts/liberty/garden.dat b/P3D/Content/Data/Scripts/liberty/garden.dat
index 20c41cab2..3a7705531 100644
--- a/P3D/Content/Data/Scripts/liberty/garden.dat
+++ b/P3D/Content/Data/Scripts/liberty/garden.dat
@@ -1,10 +1,10 @@
 version=2
 :if:<register.registered(petrelliberty)>=true <and> <register.registered(lookerliberty)>=false
-	@npc.warp(10,21,3,22)
-	@npc.warp(11,19,3,23)
-	@npc.warp(12,20,3,23)
-	@npc.warp(13,22,3,23)
-	@npc.warp(14,23,3,23)
+	@npc.warp(10,21,3,21)
+	@npc.warp(11,19,3,22)
+	@npc.warp(12,20,3,22)
+	@npc.warp(13,22,3,22)
+	@npc.warp(14,23,3,22)
 	@camera.set(0,1,1.5,3.14,-0.46)
 	@player.move(0)
 	@level.update
diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat
index b3045ae5c..abb4c60b4 100644
--- a/P3D/Content/Data/Scripts/liberty/room.dat
+++ b/P3D/Content/Data/Scripts/liberty/room.dat
@@ -7,7 +7,7 @@ version=2
 @npc.turn(6,2)
 @entity.showmessagebulb(1|4|1|5)
 @level.wait(30)
-@npc.move(6,1)
+@npc.move(6,2)
 @battle.starttrainer(liberty\inside\Petrel)
 @text.show(Petrel: Ok, I give up!*I might have underestimated~your persistence.)
 @npc.turn(6,0)
diff --git a/P3D/Content/Data/maps/fortune/town.dat b/P3D/Content/Data/maps/fortune/town.dat
index 318ab9065..6b69bc95c 100644
Binary files a/P3D/Content/Data/maps/fortune/town.dat and b/P3D/Content/Data/maps/fortune/town.dat differ
diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat
index ed7a478c4..5b40f86ed 100644
--- a/P3D/Content/Data/maps/liberty/garden.dat
+++ b/P3D/Content/Data/maps/liberty/garden.dat
@@ -258,7 +258,7 @@ Lighthouse:
 {"Entity"{ENT[{"Scale"{sngArr[0.2,1.3,0.2]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[24,9.9,16.5]}}{"TexturePath"{str[olivine]}}{"Textures"{recArr[[48,16,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 Warp:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[21,3,19]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\interior.dat,4,0.1,14,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[21,3,19]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\interior.dat,4,0.1,15,0]}}{"Rotation"{int[0]}}]}}
 
 Benchs:
 {"Entity"{ENT[{"EntityID"{str[Cube]}}{"Scale"{sngArr[2,0.4,1]}}{"Position"{sngArr[16.5,1.9,28.725]}}{"TexturePath"{str[Park]}}{"Textures"{recArr[[16,32,32,8]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/liberty/interior.dat b/P3D/Content/Data/maps/liberty/interior.dat
index 6d2b47708..14f551773 100644
--- a/P3D/Content/Data/maps/liberty/interior.dat
+++ b/P3D/Content/Data/maps/liberty/interior.dat
@@ -63,8 +63,8 @@ Hole:
 {"Entity"{ENT[{"Scale"{sngArr[2.3,0.3,0.3]}}{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[4,-1,0.55]}}{"TexturePath"{str[Park]}}{"Textures"{recArr[[16,80,1,1]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 Warps:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,0,15]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[0,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\garden.dat,21,3.1,20,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,-2,0]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\room.dat,4,0.1,9,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,0,15]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[0,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\garden.dat,21,3.1,19,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,-2,0]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\room.dat,4,0.1,10,0]}}{"Rotation"{int[0]}}]}}
 
 NPC:
 {"NPC"{NPC[{"Position"{sngArr[2,0,13]}}{"TextureID"{str[95]}}{"ID"{int[1]}}{"Name"{str[Officer]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\heal]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/liberty/room.dat b/P3D/Content/Data/maps/liberty/room.dat
index 6fe443444..a984a4b34 100644
--- a/P3D/Content/Data/maps/liberty/room.dat
+++ b/P3D/Content/Data/maps/liberty/room.dat
@@ -81,7 +81,7 @@ Hole:
 {"Entity"{ENT[{"Scale"{sngArr[2.3,0.3,0.3]}}{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[4,1,9.55]}}{"TexturePath"{str[Park]}}{"Textures"{recArr[[16,80,1,1]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 Warps:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,0,10]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\interior.dat,4,-1.9,1,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,0,10]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\interior.dat,4,-1.9,0,0]}}{"Rotation"{int[0]}}]}}
 
 NPC:
 {"NPC"{NPC[{"Position"{sngArr[4,0,3]}}{"TextureID"{str[[POKEMON|N]494]}}{"AnimateIdle"{bool[1]}}{"ID"{int[0]}}{"Name"{str[Rival]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty/victini]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Pokemon/Items/Medicine/RevivalHerb.vb b/P3D/Pokemon/Items/Medicine/RevivalHerb.vb
index bccb87018..4de5f083f 100644
--- a/P3D/Pokemon/Items/Medicine/RevivalHerb.vb
+++ b/P3D/Pokemon/Items/Medicine/RevivalHerb.vb
@@ -29,7 +29,7 @@ Namespace Items.Medicine
 
             If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then
                 Pokemon.Status = P3D.Pokemon.StatusProblems.None
-                Pokemon.HP = CInt(Math.Floor(Pokemon.MaxHP / 2))
+                Pokemon.HP = CInt(Math.Floor(Pokemon.MaxHP))
                 Pokemon.ChangeFriendShip(Pokemon.FriendShipCauses.RevivalHerb)
 
                 SoundManager.PlaySound("single_heal", False)