Finished reworking emblems, added new ones. Adjusted all @sound.play(success) instances and such.

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)

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/Network/Profiles/Emblem.vb

@@ -931,7 +931,14 @@
             '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
@@ -941,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 "Battle Mewtwo."
+                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 "Battle Jirachi."
+                Case "victorious"
+                    Return "Battle Victini."
+                Case "deep sea"
+                    Return "Find a mysterious egg at the bottom of the sea."
+                Case "eruption"
+                    Return "Battle Volcanion."
+                Case "ancestor"
+                    Return "Battle Mew."
+                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/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>

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/Screens/Credits/CreditsScreen.vb

@@ -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()))

P3D/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 45951523
-        Const METAHASH As String = "OTBEOUM0RTgwQjFFNkJEQTVFNkIxQjM1OUJGM0ZDRkU="
+        Const EXPECTEDSIZE As Integer = 45996308
+        Const METAHASH As String = "MEQ3QkVCOThGODU4MzE1M0NBM0NFODRCRkEzREZFRjE="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get

P3D/credits.txt

@@ -123,6 +123,7 @@ Pokémon 3D
 		Torben Carrington
 		Conner Joseph Brewster
 		"Fanta"
+		"Sanio"
 
 	Special Thanks
 		"MunchingOrange"