Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Content/Data/Scripts/ilex/shrine.dat

@@ -352,7 +352,7 @@ version=2
 				:endif
 				
 				@level.wait(30)
-				@sound.play(success_small)
+				@sound.play(success_small,1)
 				@npc.warp(10,10,-2,25)
 				@text.show(<player.name> caught~Celebi inside the GS Ball.)
 				@pokemon.rename(last)
@@ -370,6 +370,7 @@ version=2
 				@npc.warp(9,2,-2,23)
 				@level.wait(30)
 				@camera.reset
+				@player.achieveemblem(time)
 				
 			:when:No
 				:end

P3D/Content/Data/Scripts/ilex/spiky.dat

@@ -58,7 +58,7 @@ version=2
 	@pokemon.addattack(<pokemon.count>-1,344)
 	@pokemon.addattack(<pokemon.count>-1,220)
 	@pokemon.reloadall
-	@sound.play(success_small)
+	@sound.play(success_small,1)
 	@text.show(Spiky-Eared Pichu has~joined your party!)
 	@pokemon.rename(last)
 	@npc.warp(25,11,-2,24)

P3D/Content/Data/Scripts/kolben/maid.dat

@@ -20,7 +20,7 @@ version=2
 			@pokemon.addattack(<pokemon.count>-1,19)
 			@pokemon.addattack(<pokemon.count>-1,231)
 			
-			@sound.play(success_small)
+			@sound.play(success_small,1)
 			@text.show(<player.name> received~Pichu!)
 			@pokemon.rename(last)
 			

P3D/Content/Data/Scripts/kolben/omega.dat

@@ -31,7 +31,7 @@ version=2
 									@pokemon.addattack(<pokemon.count>-1,57)
 									@pokemon.addattack(<pokemon.count>-1,19)
 									@pokemon.addattack(<pokemon.count>-1,231)
-									@sound.play(success_small)
+									@sound.play(success_small,1)
 									@text.show(<player.name> received~Pichu!)
 									@pokemon.setot(<pokemon.count>-1,42069)
 									@pokemon.rename(last)
@@ -66,7 +66,7 @@ version=2
 			@pokemon.addattack(<pokemon.count>-1,57)
 			@pokemon.addattack(<pokemon.count>-1,19)
 			@pokemon.addattack(<pokemon.count>-1,231)
-			@sound.play(success_small)
+			@sound.play(success_small,1)
 			@text.show(<player.name> received~Pichu!)
 			@pokemon.setot(<pokemon.count>-1,42069)
 			@pokemon.rename(last)

P3D/Content/Data/Scripts/league/entere4.dat

@@ -14,11 +14,13 @@
 :endwhen
 
 @entity.setvisible(3,1)
+@entity.setcollision(1,0)
 
 :if:<register.registered(defeat<level.filename>)>=True
 :then
 @entity.remove(2)
 @entity.setvisible(1,0)
+@entity.setcollision(1,1)
 :endif
 
 @sound.play(shutter)

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(10,21,3,21)
-	@npc.warp(11,19,3,23)
+	@npc.warp(11,19,3,22)
-	@npc.warp(12,20,3,23)
+	@npc.warp(12,20,3,22)
-	@npc.warp(13,22,3,23)
+	@npc.warp(13,22,3,22)
-	@npc.warp(14,23,3,23)
+	@npc.warp(14,23,3,22)
 	@camera.set(0,1,1.5,3.14,-0.46)
 	@player.move(0)
 	@level.update

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)

P3D/Content/Data/Scripts/liberty/victini.dat

@@ -4,4 +4,5 @@ version=2
 @register.register(battlevictini)
 @npc.register(liberty\room.dat|0|remove|0)
 @npc.remove(0)
+@player.achieveemblem(victorious)
 :end

P3D/Content/Data/maps/fortune/water.dat

@@ -502,21 +502,21 @@ House:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[5,1,13]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,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[fortune\2.dat,2,0.1,7,0]}}{"Rotation"{int[0]}}]}}
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[11,1,19]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,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[fortune\1.dat,2,0.1,7,0]}}{"Rotation"{int[0]}}]}}
 Town:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,48]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/town.dat,24,1.1,3,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,48]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\town.dat,24,1.1,3,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,52]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/town.dat,24,1.1,7,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,52]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\town.dat,24,1.1,7,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,53]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/town.dat,24,1.1,8,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,53]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\town.dat,24,1.1,8,0]}}{"Rotation"{int[0]}}]}}
 Valley:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,89]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/valley.dat,48,0.1,9,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,89]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\valley.dat,48,0.1,9,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,90]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/valley.dat,48,0.1,10,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,90]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\valley.dat,48,0.1,10,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,91]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/valley.dat,48,0.1,11,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,0,91]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\valley.dat,48,0.1,11,0]}}{"Rotation"{int[0]}}]}}
 Green:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,6]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,6,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,6]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,6,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,9]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,9,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,9]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,9,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,10]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,10,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,10]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,10,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,11]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,11,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,11]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,11,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,12]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,12,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,12]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,12,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,13]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,13,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,13]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,13,0]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,14]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune/green.dat,72,1.1,14,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[-1,1,14]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\green.dat,72,1.1,14,0]}}{"Rotation"{int[0]}}]}}
 
 Items:
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,-0.375,87]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,151]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}

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]}}]}}

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,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,9,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[]}}]}}

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[]}}]}}

P3D/Content/Data/maps/quest/sevault.dat

@@ -884,9 +884,14 @@ Tanoby:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[16,0,80]}}{"Visible"{bool[0]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[32,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[quest\tanoby\main.dat,64,0.1,-1,0]}}{"Rotation"{int[0]}}]}}
 
 Backdrops:
-{"Backdrop"{BAC[{"Position"{sngArr[-100.5,-0.8,-100.5]}}{"Size"{intArr[240,280]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[-100.5,-0.8,-100.5]}}{"Size"{intArr[240,80]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[-100.5,-0.8,-20.5]}}{"Size"{intArr[65,100]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[-100.5,-0.8,79.5]}}{"Size"{intArr[52,20]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[-100.5,-0.8,99.5]}}{"Size"{intArr[240,80]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[37.5,-0.8,-20.5]}}{"Size"{intArr[102,100]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
+{"Backdrop"{BAC[{"Position"{sngArr[81.5,-0.8,79.5]}}{"Size"{intArr[58,20]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[Water]}}{"TexturePath"{str[Village]}}{"Texture"{rec[32,48,16,16]}}]}}
 
-{"OffsetMap"{MAP[{"Offset"{intArr[-24,-40]}}{"Map"{str[quest\main.dat]}}]}}
+{"OffsetMap"{MAP[{"Offset"{intArr[-24,-40]}}{"Map"{str[quest\town.dat]}}]}}
 {"OffsetMap"{MAP[{"Offset"{intArr[-24,-20]}}{"Map"{str[quest\canyonent.dat]}}]}}
 {"OffsetMap"{MAP[{"Offset"{intArr[-48,80]}}{"Map"{str[quest\tanoby\main.dat]}}]}}
 {"OffsetMap"{MAP[{"Offset"{intArr[-24,20]}}{"Map"{str[quest\offset\west.dat]}}]}}

P3D/Content/Data/maps/quest/tanoby/dilford.dat

@@ -49,9 +49,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[18,0.25,2]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[18,0.25,11]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,44,0.1,10,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/liptoo.dat

@@ -58,9 +58,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,5]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,8]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,103,0.1,9,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/monean.dat

@@ -62,8 +62,5 @@ Ball stuff:
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"ID"{int[3]}}{"Position"{sngArr[10,-1.375,8]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,115]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
 {"Entity"{ENT[{"Position"{sngArr[10,0,5]}}{"EntityID"{str[ScriptBlock]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[96,128,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"Visible"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[quest\tanoby\ballget]}}{"Rotation"{int[0]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,120,2.1,10,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/rixy.dat

@@ -56,9 +56,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,5]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,8]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,12,0.1,14,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/scufib.dat

@@ -56,9 +56,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,5]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,8]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,32,0.1,8,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/viapois.dat

@@ -56,9 +56,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,5]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,8]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,11,0.1,5,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/quest/tanoby/weepth.dat

@@ -58,9 +58,5 @@ Corners:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,5]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1.5,1]}}{"Position"{sngArr[16,0.25,8]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[48,168,16,24][80,160,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
 
-NPCs:
-{"NPC"{NPC[{"Position"{sngArr[6,0,6]}}{"TextureID"{str[OldLady]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[This place has a~mystical quality~to it.*It feels sort of~ethereal even.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,0,18]}}{"TextureID"{str[2]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[I've seen an old man~walking down this way~yesterday.*He is still in this~cave.*Maybe he needs help.]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-
 Warp:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[10,0,14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[80,176,16,16][176,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[quest\tanoby\main.dat,88,0.1,7,0]}}{"Rotation"{int[0]}}]}}

P3D/Content/Data/maps/underwatercave/manaphy.dat

@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Cave]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"OverworldPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"MapScript"{str[underwatercave\deepseaemblemcheck]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}]}}
 Floor:
 	Normal Floor:
 		{"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}}

P3D/Network/Profiles/Emblem.vb

@@ -286,9 +286,9 @@
 
         Public Shared Function GetEmblemFontColor(ByVal emblemName As String) As Color
             Select Case emblemName.ToLower()
-                Case "alph", "genetics", "legendary", "stars", "champion", "overkill", "cyber", "glowing", "material", "fog", "mineral", "storm", "eggsplosion", "missingno", "thunder", "rainbow", "marsh", "volcano", "earth", "shooting star"
+                Case "alph", "genetics", "legendary", "stars", "champion", "overkill", "cyber", "glowing", "material", "fog", "mineral", "storm", "eggsplosion", "missingno", "thunder", "rainbow", "marsh", "volcano", "earth", "shooting star", "victorious", "mega", "time", "deep sea"
                     Return Color.White
-                Case "eevee", "pokedex", "snow", "trainer", "kanto", "glacier", "hive", "plain", "zephyr", "rising", "mailman", "cascade", "boulder", "unodostres", "silver ability", "gold ability", "silver knowledge", "gold knowledge", "johto"
+                Case "eevee", "pokedex", "snow", "trainer", "kanto", "glacier", "hive", "plain", "zephyr", "rising", "mailman", "cascade", "boulder", "unodostres", "silver ability", "gold ability", "silver knowledge", "gold knowledge", "johto", "eruption", "ancestor"
                     Return Color.Black
             End Select
             Return Color.White
@@ -754,6 +754,22 @@
                     Return 17001
                 Case "shooting star"
                     Return 17559
+
+                    'Requires GameJolt side support
+
+                    'Case "victorious"
+                    '    Return ???
+                    'Case "deep sea"
+                    '    Return ???
+                    'Case "eruption"
+                    '    Return ???
+                    'Case "ancestor"
+                    '    Return ???
+                    'Case "time"
+                    '    Return ???
+                    'Case "mega"
+                    '    Return ???
+
                 Case Else
                     Return 0
             End Select
@@ -837,6 +853,22 @@
                     Return "earth"
                 Case 17559
                     Return "shooting star"
+
+                    'Requires GameJolt side support
+
+                    'Case ???
+                    '    Return "victorious"
+                    'Case ???
+                    '    Return "deep sea"
+                    'Case ???
+                    '    Return "eruption"
+                    'Case ???
+                    '    Return "ancestor"
+                    'Case ???
+                    '    Return "time"
+                    'Case ???
+                    '    Return "mega"
+
                 Case Else
                     Return "fail"
             End Select
@@ -848,27 +880,35 @@
         End Sub
 
         Private Shared Sub AddAchievedEmblems(ByVal result As String)
-            Dim list As List(Of API.JoltValue) = API.HandleData(result)
+            'Dim list As List(Of API.JoltValue) = API.HandleData(result)
 
-            If CBool(list(0).Value) = True Then
+            'If CBool(list(0).Value) = True Then
-                Dim currentTrophyID As Integer = 0
+            '    Dim currentTrophyID As Integer = 0
 
-                For i = 0 To list.Count - 1
+            '    For i = 0 To list.Count - 1
-                    Select Case list(i).Name
+            '        Select Case list(i).Name
-                        Case "id"
+            '            Case "id"
-                            currentTrophyID = CInt(list(i).Value)
+            '                currentTrophyID = CInt(list(i).Value)
-                        Case "achieved"
+            '            Case "achieved"
-                            If list(i).Value <> "false" Then
+            '                If list(i).Value <> "false" Then
-                                Dim newEmblem As String = TrophyIDToEmblem(currentTrophyID)
+            '                    Dim newEmblem As String = TrophyIDToEmblem(currentTrophyID)
-                                If newEmblem <> "fail" Then
+            '                    If newEmblem <> "fail" Then
-                                    If Core.GameJoltSave.AchievedEmblems.Contains(newEmblem) = False Then
+            '                        If Core.GameJoltSave.AchievedEmblems.Contains(newEmblem) = False Then
-                                        Core.GameJoltSave.AchievedEmblems.Add(newEmblem)
+            '                            Core.GameJoltSave.AchievedEmblems.Add(newEmblem)
-                                    End If
+            '                        End If
-                                End If
+            '                    End If
-                            End If
+            '                End If
-                    End Select
+            '        End Select
-                Next
+            '    Next
-            End If
+            'End If
+
+            'Temporary workaround till Emblems get GJ support back again
+
+            For Each newEmblem In Core.Player.EarnedAchievements
+                If Not Core.GameJoltSave.AchievedEmblems.Contains(newEmblem) Then
+                    Core.GameJoltSave.AchievedEmblems.Add(newEmblem)
+                End If
+            Next
 
             If Core.GameJoltSave.AchievedEmblems.Contains("trainer") = False Then
                 Core.GameJoltSave.AchievedEmblems.Add("trainer")
@@ -876,17 +916,30 @@
         End Sub
 
         Public Shared Sub AchieveEmblem(ByVal emblem As String)
-            If Core.Player.IsGameJoltSave = True Then
+            'If Core.Player.IsGameJoltSave = True Then
-                If Core.GameJoltSave.AchievedEmblems.Contains(emblem.ToLower()) = False Then
+            '    If Core.GameJoltSave.AchievedEmblems.Contains(emblem.ToLower()) = False Then
-                    Dim trophy_id As Integer = EmblemToTrophyID(emblem)
+            '        Dim trophy_id As Integer = EmblemToTrophyID(emblem)
 
-                    Dim APICall As New APICall(AddressOf AddedAchievement)
+            '        Dim APICall As New APICall(AddressOf AddedAchievement)
-                    APICall.TrophyAchieved(trophy_id)
+            '        APICall.TrophyAchieved(trophy_id)
 
-                    Dim APICallShow As New APICall(AddressOf ShowAchievedEmblem)
+            '        Dim APICallShow As New APICall(AddressOf ShowAchievedEmblem)
-                    APICallShow.FetchTrophy(trophy_id)
+            '        APICallShow.FetchTrophy(trophy_id)
-                End If
+            '    End If
+            'End If
+
+            'Temporary, remove when GameJolt side support is brought back
+            If Not Core.GameJoltSave.AchievedEmblems.Contains(emblem) Then
+                Core.GameJoltSave.AchievedEmblems.Add(emblem)
+                Dim emblemTexture As Texture2D = TextureManager.GetTexture("Textures\Emblem\Square\" & emblem)
+                achieved_emblem_Texture = emblemTexture
+                achieved_emblem_title = GetEmblemTitle(emblem)
+                achieved_emblem_description = GetEmblemDescription(emblem)
+                achieved_emblem_difficulty = GetEmblemDifficulty(emblem)
+                displayEmblemDelay = 35.0F
             End If
+            'End Temporary
+
             If Core.Player.EarnedAchievements.Contains(emblem.ToLower()) = False Then
                 If ConnectScreen.Connected = True Then
                     Core.ServersManager.ServerConnection.SendGameStateMessage("achieved the emblem """ & emblem.ToUpper() & """!")
@@ -895,6 +948,217 @@
             End If
         End Sub
 
+        Private Shared Function GetEmblemTitle(ByVal emblem As String) As String
+            Select Case emblem
+                Case "alph"
+                    Return "Alph"
+                Case "material"
+                    Return "Material"
+                Case "cyber"
+                    Return "Cyber"
+                Case "johto"
+                    Return "Johto"
+                Case "kanto"
+                    Return "Kanto"
+                Case "legendary"
+                    Return "Legendary"
+                Case "genetics"
+                    Return "Genetics"
+                Case "unodostres"
+                    Return "UnoDosTres"
+                Case "champion"
+                    Return "Champion"
+                Case "snow"
+                    Return "Snow"
+                Case "eevee"
+                    Return "Eevee"
+                Case "stars"
+                    Return "Stars"
+                Case "glowing"
+                    Return "Glowing"
+                Case "overkill"
+                    Return "Overkill"
+                Case "pokedex"
+                    Return "Pokédex"
+                Case "zephyr"
+                    Return "Zephyr"
+                Case "hive"
+                    Return "Hive"
+                Case "plain"
+                    Return "Plain"
+                Case "fog"
+                    Return "Fog"
+                Case "storm"
+                    Return "Storm"
+                Case "mineral"
+                    Return "Mineral"
+                Case "glacier"
+                    Return "Glacier"
+                Case "rising"
+                    Return "Rising"
+                Case "eggsplosion"
+                    Return "Eggsplosion"
+                Case "mailman"
+                    Return "Mailman"
+                Case "silver ability"
+                    Return "Silver Ability"
+                Case "silver knowledge"
+                    Return "Silver Knowledge"
+                Case "gold ability"
+                    Return "Gold Ability"
+                Case "gold knowledge"
+                    Return "Gold Knowledge"
+                Case "boulder"
+                    Return "Boulder"
+                Case "cascade"
+                    Return "Cascade"
+                Case "thunder"
+                    Return "Thunder"
+                Case "rainbow"
+                    Return "Rainbow"
+                Case "marsh"
+                    Return "Marsh"
+                Case "soul"
+                    Return "Soul"
+                Case "volcano"
+                    Return "Volcano"
+                Case "earth"
+                    Return "Earth"
+                Case "shooting star"
+                    Return "Shooting Star"
+                Case "victorious"
+                    Return "Victorious"
+                Case "deep sea"
+                    Return "Deep Sea"
+                Case "eruption"
+                    Return "Eruption"
+                Case "ancestor"
+                    Return "Ancestor"
+                Case "time"
+                    Return "Time"
+                Case "mega"
+                    Return "Mega"
+                Case "beast"
+                    Return "Beast"
+                Case Else
+                    Return "???"
+            End Select
+        End Function
+
+        Private Shared Function GetEmblemDescription(ByVal emblem As String) As String
+            Select Case emblem
+                Case "alph"
+                    Return "Solve the Ruins of Alph puzzles."
+                Case "material"
+                    Return "Battle and defeat or catch the Red Gyarados in the Lake of Rage to obtain the Red Scale."
+                Case "cyber"
+                    Return "Trade on the GTS."
+                Case "johto"
+                    Return "Get all the badges from the Johto region."
+                Case "kanto"
+                    Return "Get all the badges from the Kanto region."
+                Case "legendary"
+                    Return "Have Ho-oh, Lugia and Suicune in your party."
+                Case "genetics"
+                    Return "Have a legendary encounter."
+                Case "unodostres"
+                    Return "Have Articuno, Zapdos, and Moltres in your party."
+                Case "champion"
+                    Return "Defeat Lance to become the Champion."
+                Case "snow"
+                    Return "Defeat Red on Mt. Silver."
+                Case "eevee"
+                    Return "Get the 8 eevolutions (Vaporeon, Flareon, Jolteon, Umbreon, Espeon, Leafeon, Glaceon and Sylveon)."
+                Case "stars"
+                    Return "Catch a shiny Pokémon (except a shiny Gyarados)."
+                Case "glowing"
+                    Return "???"
+                Case "overkill"
+                    Return "Get a full party of level 100 Pokemon."
+                Case "pokedex"
+                    Return "Complete the Johto Pokédex!"
+                Case "zephyr"
+                    Return "Get the Zephyr-Badge from Falkner."
+                Case "hive"
+                    Return "Get the Hive-Badge from Bugsy."
+                Case "plain"
+                    Return "Get the Plain-Badge from Whitney."
+                Case "fog"
+                    Return "Get the Fog-Badge from Morty."
+                Case "storm"
+                    Return "Get the Plain-Badge from Whitney."
+                Case "mineral"
+                    Return "Get the Mineral-Badge from Jasmine."
+                Case "glacier"
+                    Return "Get the Glacier-Badge from Pryce."
+                Case "rising"
+                    Return "Get the Rising-Badge from Clair."
+                Case "eggsplosion"
+                    Return "Breed a Pokémon and pass down an egg move."
+                Case "mailman"
+                    Return "Get all the available mail items in the game."
+                Case "silver ability"
+                    Return "Defeat 21 trainers in a row in Battle Tower Challenge Mode."
+                Case "silver knowledge"
+                    Return "Defeat 21 trainers in a row in Battle Factory Challenge Mode."
+                Case "gold ability"
+                    Return "Defeat the Battle Tower Brain once."
+                Case "gold knowledge"
+                    Return "Defeat the Battle Factory Brain once."
+                Case "boulder"
+                    Return "Get the Boulder-Badge from Brock."
+                Case "cascade"
+                    Return "Get the Cascade-Badge from Misty."
+                Case "thunder"
+                    Return "Get the Thunder-Badge from Lt.Surge."
+                Case "rainbow"
+                    Return "Get the Rainbow-Badge from Erika."
+                Case "marsh"
+                    Return "Get the Marsh-Badge from Sabrina."
+                Case "soul"
+                    Return "Get the Soul-Badge from Jasmine."
+                Case "volcano"
+                    Return "Get the Volcano-Badge from Blaine."
+                Case "earth"
+                    Return "Get the Earth-Badge from Blue."
+                Case "shooting star"
+                    Return "Have a stellar encounter."
+                Case "victorious"
+                    Return "Have a victorious encounter."
+                Case "deep sea"
+                    Return "Find a mysterious egg at the bottom of the sea."
+                Case "eruption"
+                    Return "Have an explosive enounter."
+                Case "ancestor"
+                    Return "Have a mythical encounter."
+                Case "time"
+                    Return "Have an adventure through time."
+                Case "mega"
+                    Return "Receive the Mega Bracelet from Professor Oak."
+                Case "beast"
+                    Return "Have Raikou, Entei, and Suicune in your party."
+                Case Else
+                    Return "Unknown emblem."
+            End Select
+        End Function
+
+        Private Shared Function GetEmblemDifficulty(ByVal emblem As String) As String
+            Select Case emblem
+                Case "alph", "material", "cyber", "mega", "zephyr", "hive", "plain", "fog", "storm", "mineral", "glacier", "rising", "boulder",
+                     "cascade", "thunder", "rainbow", "marsh", "soul", "volcano", "earth"
+                    Return "Bronze"
+                Case "johto", "kanto", "legendary", "shooting star", "genetics", "eggsplosion", "mailman", "silver ability", "silver knowledge",
+                     "deep sea", "eruption", "victorious"
+                    Return "Silver"
+                Case "champion", "snow", "eevee", "stars", "unodostres", "gold ability", "gold knowledge", "time", "ancestor", "beast"
+                    Return "Gold"
+                Case "overkill", "pokedex"
+                    Return "Platinum"
+                Case Else
+                    Return "Unknown emblem."
+            End Select
+        End Function
+
         Private Shared Sub AddedAchievement(ByVal result As String)
             Dim APICall As New APICall(AddressOf AddAchievedEmblems)
             APICall.FetchAllAchievedTrophies()

P3D/Network/Profiles/GamejoltSave.vb

@@ -345,9 +345,9 @@ Namespace GameJolt
             Dim APIPrivateCall As New APICall(AddressOf GotPrivateKeys)
             APIPrivateCall.GetKeys(True, "saveStorageV" & GameJolt.GamejoltSave.VERSION & "|" & GameJoltID & "|*")
 
-            If MainSave = True Then
+            'If MainSave = True Then
-                GameJolt.Emblem.GetAchievedEmblems()
+            '    GameJolt.Emblem.GetAchievedEmblems()
-            End If
+            'End If
 
             Dim APIFriendsCall As New APICall(AddressOf SaveFriends)
             APIFriendsCall.FetchFriendList(GameJoltID)

P3D/P3D.vbproj

@@ -13468,6 +13468,9 @@
     <Content Include="Content\Textures\Emblem\ancestor.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\Emblem\beast.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Emblem\deep sea.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -13480,6 +13483,138 @@
     <Content Include="Content\Textures\Emblem\mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\Emblem\Square\alph.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\ancestor.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\beast.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\boulder.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\cascade.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\champion.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\cyber.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\deep sea.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\earth.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\eevee.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\eggsplosion.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\eruption.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\fog.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\genetics.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\glacier.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\gold ability.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\gold knowledge.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\hive.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\johto.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\kanto.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\legendary.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\mailman.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\marsh.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\material.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\mega.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\mineral.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\overkill.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\plain.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\pokedex.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\rainbow.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\rising.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\shooting star.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\silver ability.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\silver knowledge.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\snow.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\soul.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\stars.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\storm.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\thunder.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\time.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\unodostres.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\victorious.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\volcano.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\Square\zephyr.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Emblem\time.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -25661,6 +25796,9 @@
     <None Include="Content\Data\maps\poke\routes\route28.poke">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\ilex\spiky.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -25733,6 +25871,9 @@
     <None Include="Content\Data\Scripts\liberty\victini.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\mtember\eruptionemblemcheck.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\trainer\kolben\Segis.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -25808,6 +25949,9 @@
     <None Include="Content\Data\Scripts\trainer\liberty\inside\Petrel.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\underwatercave\deepseaemblemcheck.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Pokemon\Data\172_spiky-eared.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

P3D/Pokemon/Items/Medicine/RareCandy.vb

@@ -34,7 +34,7 @@ Namespace Items.Medicine
 
                 Dim s As String =
                     "version=2" & Environment.NewLine &
-                    "@sound.play(success_small)" & Environment.NewLine &
+                    "@sound.play(success_small,1)" & Environment.NewLine &
                     "@text.show(" & Pokemon.GetDisplayName() & " reached~level " & Pokemon.Level & "!)" & Environment.NewLine
 
                 Dim removedItem As Boolean = False
@@ -52,7 +52,7 @@ Namespace Items.Medicine
                         Else
                             Pokemon.Attacks.Add(Pokemon.AttackLearns(Pokemon.Level))
 
-                            s &= "@sound.play(success_small)" & Environment.NewLine &
+                            s &= "@sound.play(success_small,1)" & Environment.NewLine &
                                  "@text.show(" & Pokemon.GetDisplayName() & " learned~" & Pokemon.AttackLearns(Pokemon.Level).Name & "!*" & Me.RemoveItem() & ")" & Environment.NewLine
                             removedItem = True
                             PlayerStatistics.Track("Moves learned", 1)

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)

P3D/Screens/Credits/CreditsScreen.vb

@@ -2,7 +2,7 @@ Public Class CreditsScreen
 
     Inherits Screen
 
-    Private Const COPYRIGHTYEAR As String = "2018"
+    Private Const COPYRIGHTYEAR As String = "2019"
 
     Dim CreditsPages As New List(Of CreditsPage)
     Dim CurrentPageIndex As Integer = 0
@@ -70,7 +70,7 @@ Public Class CreditsScreen
         CreditsPages.Add(New CreditsPage("Pokéditor Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "Hunter Graves"}.ToList()))
         CreditsPages.Add(New CreditsPage("Website Host/Server Maintenance", Color.White, Color.Black, {"Daniel Billing", "Daniel Laube"}.ToList()))
         CreditsPages.Add(New CreditsPage("GameJolt Service/API Programming", Color.White, Color.Black, {"David DeCarmine", "Nils Drescher"}.ToList()))
-        CreditsPages.Add(New CreditsPage("Debug Testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo""", "Conner Joseph Brewster"}.ToList()))
+        CreditsPages.Add(New CreditsPage("Debug Testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo""", "Conner Joseph Brewster", """Sanio"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"""MunchingOrange""", """TheFlamingSpade""", """SlyFoxHound""", """ArsenioDev""", """TrUShade""", """Isaaking6"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"Davey Van Raaij", "Diego López", "The GameJolt Team", "The AppSharp Team", "The Smogon University Team"}.ToList()))
         CreditsPages.Add(New CreditsPage("", Color.White, Color.Black, {"And probably a lot more.", "Especially all the awesome people from", "the pokemon3d.net community.", "Thanks for helping and playing this great game."}.ToList()))