Mostly comment revision for the Screens folder

Also includes Security folder. Some strings were also modified to make more sense/match the main games.

Updated credits with the correct year, etc.

2.5DHero/2.5DHero/Screens/Battle/BattleCatchScreen.vb

@@ -169,9 +169,9 @@
                             Case 9
                                 AnimationIndex = 10
                                 Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, p))
-                            Case 10 'After Catch
+                            Case 10 ' After Catch
                                 If p.CatchBall.ID = 186 Then
-                                    p.FullRestore() 'Heal Ball
+                                    p.FullRestore() ' Heal Ball
                                 End If
 
                                 PlayerStatistics.Track("Caught Pokemon", 1)
@@ -181,7 +181,7 @@
                                 Core.SetScreen(Me.PreScreen)
                                 BattleSystem.Battle.Won = True
                                 CType(Core.CurrentScreen, BattleSystem.BattleScreen).EndBattle(False)
-                            Case 20 'Failed
+                            Case 20 ' Failed
                                 If Core.Player.Pokemons.Count < 6 Then
                                     Dim p As Pokemon = BattleScreen.OppPokemon
                                     p.SetCatchInfos(Me.Ball, "Illegally caught!")
@@ -190,7 +190,7 @@
                                 End If
                                 ResetVisibility()
                                 Core.SetScreen(Me.PreScreen)
-                            Case 21 'After Break
+                            Case 21 ' After Break
                                 ResetVisibility()
                                 Core.SetScreen(Me.PreScreen)
                                 CType(Core.CurrentScreen, BattleSystem.BattleScreen).Battle.InitializeRound(CType(Core.CurrentScreen, BattleSystem.BattleScreen), New BattleSystem.Battle.RoundConst() With {.StepType = BattleSystem.Battle.RoundConst.StepTypes.Text, .Argument = "It broke free!"})
@@ -282,7 +282,7 @@
                 Animations.Add(New BARotation(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), New Vector3(0, 0, 0.05F), New Vector3(0, 0, 1.0F), 0.0F, 4.0F, False, False, True, True))
             Case 4, 6
                 Animations.Add(New BARotation(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), New Vector3(0, 0, -0.05F), New Vector3(0, 0, -1.0F), 0.0F, 4.0F, False, False, True, True))
-            Case 7 'Catch Animation
+            Case 7 ' Catch Animation
                 For i = 0 To 2
                     Dim v As Vector3 = New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z)
 
@@ -291,7 +291,7 @@
                 Animations.Add(New BAMove(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), 0.02F, 0.0F, 6.0F))
             Case 8
                 Animations.Add(New BAOpacity(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), 0.01F, False, 0.0F, 0.0F, 0.0F))
-            Case 21 'Break Animation
+            Case 21 ' Break Animation
 
         End Select
     End Sub

2.5DHero/2.5DHero/Screens/Battle/BlackOutScreen.vb

@@ -142,7 +142,7 @@
 
     Public Overrides Sub ChangeTo()
         MusicManager.PlayMusic("nomusic", False)
-        Core.Player.Inventory.RemoveItem(177) 'Remove all Park Balls.
+        Core.Player.Inventory.RemoveItem(177) ' Remove all Park Balls (happens regardless of whether or not the player was currently in the Bug-Catching Contest).
         PlayerStatistics.Track("Blackouts", 1)
     End Sub
 

2.5DHero/2.5DHero/Screens/Credits/CreditsScreen.vb

@@ -2,7 +2,7 @@ Public Class CreditsScreen
 
     Inherits Screen
 
-    Private Const COPYRIGHTYEAR As String = "2015"
+    Private Const COPYRIGHTYEAR As String = "2017"
 
     Dim CreditsPages As New List(Of CreditsPage)
     Dim CurrentPageIndex As Integer = 0
@@ -53,13 +53,13 @@ Public Class CreditsScreen
         CreditsPages.Add(New CreditsPage("Pokémon3D Staff", Color.White, Color.Black))
         CreditsPages.Add(New CreditsPage("Pokémon", Color.White, Color.Black, {"made by", "Nintendo", "Game Freak", "The Pokémon Company"}.ToList()))
         If GameModeManager.ActiveGameMode.IsDefaultGamemode = True Then
-            CreditsPages.Add(New CreditsPage("Pokémon3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games"}.ToList()))
+            CreditsPages.Add(New CreditsPage("Pokémon 3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games"}.ToList()))
         Else
-            CreditsPages.Add(New CreditsPage("Pokémon3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games", "", "GameMode made by", GameModeManager.ActiveGameMode.Author}.ToList()))
+            CreditsPages.Add(New CreditsPage("Pokémon 3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games", "", "GameMode made by", GameModeManager.ActiveGameMode.Author}.ToList()))
         End If
         CreditsPages.Add(New CreditsPage("Team Kolben", Color.White, Color.Black, {"Nils Drescher", "Andrew Leach", "Marc Boisvert-Dupras", "Grant Garrett", "Jason Houston", "Daniel Billing", "Benjamin Smith", "Hunter Graves"}.ToList()))
         CreditsPages.Add(New CreditsPage("Director", Color.White, Color.Black, {"Nils Drescher"}.ToList()))
-        CreditsPages.Add(New CreditsPage("Open Source Development Team", Color.White, Color.Black, {"Benjamin Smith", "Yong Jian Ming", """Aragas""", """oXFantaXo""", "Jorge Luis Espinoza"}.ToList()))
+        CreditsPages.Add(New CreditsPage("Open Source Development Team", Color.White, Color.Black, {"Benjamin Smith", "Yong Jian Ming", """Aragas""", """oXFantaXo""", "Jorge Luis Espinoza", "Conner Joseph Brewster"}.ToList()))
         CreditsPages.Add(New CreditsPage("Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "William Lang", "Benjamin Smith", "Yong Jian Ming", "Jorge Luis Espinoza", """Aragas"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Graphic Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", """Godeken""", "Caleb Coleman", "Robert Nobbmann", "Manuel Lampe", "Miguel Nunez", "Grant Garrett", """Anvil555"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Map Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Manuel Lampe", "Robert Nobbmann", "Maximilian Schröder", "Jan Mika Eine", "Jason Houston", """oXFantaXo"""}.ToList()))

2.5DHero/2.5DHero/Screens/GUI/Canvas.vb

@@ -152,7 +152,7 @@
 
     Private Structure GradientConfiguration
 
-        Private Texture As Texture2D 'Stores the generated texture 
+        Private Texture As Texture2D ' Stores the generated texture
 
         Private Width As Integer
         Private Height As Integer
@@ -213,7 +213,7 @@
                     cA = 255 + cA
                 End If
 
-                If Horizontal = True Then 'left to right gradient
+                If Horizontal = True Then ' Left to right gradiant.
                     Dim c As Color = New Color(cR, cG, cB, cA)
 
                     Dim length As Integer = CInt(Math.Ceiling(stepSize))
@@ -258,7 +258,7 @@
     Shared gradientConfigs As New List(Of GradientConfiguration)
 
     Public Shared Sub DrawGradient(ByVal Rectangle As Rectangle, ByVal fromColor As Color, ByVal toColor As Color, ByVal Horizontal As Boolean, ByVal Steps As Integer)
-        Horizontal = Not Horizontal 'because fuck you.
+        Horizontal = Not Horizontal
 
         Dim gConfig As GradientConfiguration = Nothing
         Dim foundConfig As Boolean = False

2.5DHero/2.5DHero/Screens/HistoryScreen.vb

@@ -34,7 +34,7 @@
                 dateString = day & "-" & month & "-" & year & "_" & hour & "." & minute & "." & second
             End With
 
-            'Date|IsScriptOrigin|Name|Data|ShowOnTimeline
+            ' Date|IsScriptOrigin|Name|Data|ShowOnTimeline
             Core.Player.HistoryData &= dateString & "|" & IsScriptOrigin.ToNumberString() & "|" & Name & "|" & Data & "|" & ShowOnTimeline.ToNumberString()
         End Sub
 

2.5DHero/2.5DHero/Screens/Inventory/ChoosePokemonScreen.vb

@@ -190,7 +190,7 @@
         Core.SpriteBatch.Draw(Item.Texture, New Rectangle(78, 124, 48, 48), Color.White)
 
         If Me.canExit = True Then
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "PRESS E TO GO BACK", New Vector2(710, 580), Color.DarkGray)
+            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Press the E key to go back.", New Vector2(710, 580), Color.DarkGray)
         End If
 
         For i = 0 To Me.PokemonList.Count - 1
@@ -330,7 +330,7 @@
             If LearnType > 0 Then
                 AttackLable = "Unable!"
                 Select Case LearnType
-                    Case 1 'TM/HM
+                    Case 1 ' Technical/Hidden Machine
                         If CType(moveLearnArg, Items.TechMachine).CanTeach(Pokemon) = "" Then
                             AttackLable = "Able!"
                         End If

2.5DHero/2.5DHero/Screens/Inventory/PokegearScreen.vb

@@ -4,8 +4,8 @@
 
         Inherits Screen
 
-        Public Shared TradeRequestData As Integer = -1 'This data gets set to the network ID of the user that requests a trade.
+        Public Shared TradeRequestData As Integer = -1 ' This data gets set to the network ID of the user that requests a trade.
-        Public Shared BattleRequestData As Integer = -1 'This data gets set to the network ID of the user that requests a battle.
+        Public Shared BattleRequestData As Integer = -1 ' This data gets set to the network ID of the user that requests a battle.
 
         Enum MenuScreens As Integer
             Main = 0
@@ -94,7 +94,7 @@
         End Sub
 
         Private Sub InitializeUserView(ByVal Data() As Object)
-            'Data: NetworkID, GameJoltID, Name, Sprite
+            ' Data: NetworkID, GameJoltID, Name, Sprite
 
             UserEmblem = Nothing
             UserSprite = CType(Data(3), Texture2D)
@@ -107,7 +107,7 @@
         End Sub
 
         Private Sub InitializeTradeRequest(ByVal Data() As Object)
-            'Data: NetworkID of the requester, GameJoltID
+            ' Data: NetworkID of the requester, GameJoltID
 
             menuIndex = MenuScreens.TradeRequest
             Me.TradeRequestNetworkID = CInt(Data(0))
@@ -117,7 +117,7 @@
         End Sub
 
         Private Sub InitializeBattleRequest(ByVal Data() As Object)
-            'Data: NetworkID of the requester, GameJoltID
+            ' Data: NetworkID of the requester, GameJoltID
 
             menuIndex = MenuScreens.BattleRequest
             Me.BattleRequestNetworkID = CInt(Data(0))
@@ -428,7 +428,7 @@
             Core.SpriteBatch.DrawString(FontManager.MiniFont, "PSS Ranklist", New Vector2(CInt(startPos.X + 50), CInt(startPos.Y + 45)), Color.Black)
 
             If Core.Player.IsGamejoltSave = True Then
-                'Draw own information:
+                ' Draw own information:
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220), CInt(startPos.Y + 40), 16, 32), New Rectangle(96, 112, 8, 16), Color.White)
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220 + 16), CInt(startPos.Y + 40), 304, 32), New Rectangle(102, 112, 4, 16), Color.White)
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220 + 16 + 304), CInt(startPos.Y + 40), 16, 32), New Rectangle(104, 112, 8, 16), Color.White)
@@ -622,7 +622,7 @@
             Core.SpriteBatch.DrawString(FontManager.MiniFont, "PSS Friendlist", New Vector2(CInt(startPos.X + 50), CInt(startPos.Y + 45)), Color.Black)
 
             If Core.Player.IsGamejoltSave = True Then
-                'Draw own information:
+                ' Draw own information:
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220), CInt(startPos.Y + 40), 16, 32), New Rectangle(96, 112, 8, 16), Color.White)
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220 + 16), CInt(startPos.Y + 40), 304, 32), New Rectangle(102, 112, 4, 16), Color.White)
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokegear"), New Rectangle(CInt(startPos.X + 220 + 16 + 304), CInt(startPos.Y + 40), 16, 32), New Rectangle(104, 112, 8, 16), Color.White)
@@ -1464,11 +1464,11 @@
                 Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Gold Ability", .Description = "You defeated the Frontier Brain of" & vbNewLine & "Battle Tower a second time and you've" & vbNewLine & "your real strength when it comes to battles.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(50, 200, 50, 50), "")})
             Else
                 If ActionScript.IsRegistered("silver ability") = True Then
-                    Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Silver Ability", .Description = "You defeated the Frontier Brain of" & vbNewLine & "Battle Tower and showed him how" & vbNewLine & "you and your POKéMON really are.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(0, 200, 50, 50), "")})
+                    Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Silver Ability", .Description = "You defeated the Frontier Brain of" & vbNewLine & "Battle Tower and showed him how" & vbNewLine & "you and your Pokémon really are.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(0, 200, 50, 50), "")})
                 End If
             End If
             If ActionScript.IsRegistered("gold knowledge") = True Then
-                Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Gold Knowledge", .Description = "This Emblem displays how great you can" & vbNewLine & "interact with POKéMON and how well" & vbNewLine & "you can adapt your strategy to a new situation.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(150, 200, 50, 50), "")})
+                Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Gold Knowledge", .Description = "This Emblem displays how great you can" & vbNewLine & "interact with Pokémon and how well" & vbNewLine & "you can adapt your strategy to a new situation.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(150, 200, 50, 50), "")})
             Else
                 If ActionScript.IsRegistered("silver knowledge") = True Then
                     Me.FrontierList.Add(New FrontierSymbol() With {.Name = "Silver Knowledge", .Description = "Only few trainers achieved this emblem" & vbNewLine & "which shows what strength lies" & vbNewLine & "inside them.", .Texture = TextureManager.GetTexture("GUI\Badges", New Rectangle(100, 200, 50, 50), "")})
@@ -1582,7 +1582,7 @@
             End Sub
 
             Public Function CanListen() As Boolean
-                'Need to check: Daytime, Region, Expansion Card, Activation
+                ' Need to check: Daytime, Region, Expansion Card, Activation
 
                 If Me.DayTimes.Contains(World.GetTime) = False Then
                     Return False
@@ -1602,12 +1602,12 @@
                 Next
 
                 Select Case Activation
-                    Case "1" 'needs register in the level channels (only works when minChannel = maxChannel)
+                    Case "1" ' Needs register in the level channels (only works when minChannel = maxChannel)
                         If Screen.Level.AllowedRadioChannels.Contains(Me.ChannelMin) = False Then
                             Return False
                         End If
                     Case "0"
-                        'Channel is always available.
+                        ' Channel is always available.
                 End Select
 
                 If Me.ActivationRegister <> "0" Then
@@ -1667,7 +1667,7 @@
                         If chosenID > -1 Then
                             Dim p As Pokemon = Pokemon.GetPokemonByID(chosenID)
 
-                            output = "Welcome to the POKéDEX Show! Today, we are going to look at the entry of " & p.GetName() & "! Its entry reads:~""" & p.PokedexEntry.Text & """~Wow, that is interesting! Also, " & p.GetName() & " is " & p.PokedexEntry.Height & "m high and weights " & p.PokedexEntry.Weight & "kg.~Isn't that amazing?~" & p.GetName() & " is part of the " & p.PokedexEntry.Species & " species.~That's all the information we have. Tune in next time!"
+                            output = "Welcome to the Pokédex Show! Today, we are going to look at the entry of " & p.GetName() & "! Its entry reads:~""" & p.PokedexEntry.Text & """~Wow, that is interesting! Also, " & p.GetName() & " is " & p.PokedexEntry.Height & "m high and weights " & p.PokedexEntry.Weight & "kg.~Isn't that amazing?~" & p.GetName() & " is part of the " & p.PokedexEntry.Species & " species.~That's all the information we have. Tune in next time!"
                         End If
                     Case "[randompokemon]"
                         Dim levels() As String = {"route29.dat", "route30.dat", "route31.dat", "route32.dat", "route33.dat", "route36.dat", "route37.dat", "route38.dat", "route39.dat", "routes\route34.dat", "routes\route35.dat", "routes\route42.dat", "routes\route43.dat", "routes\route44.dat", "routes\route45.dat", "routes\route46.dat"}
@@ -1683,7 +1683,7 @@
                         levelName = levelName.Substring(0, 5) & " " & levelName.Remove(0, 5)
 
                         If Not p Is Nothing Then
-                            output = "Professor Oak's POKéMON Talk! With Mary!~~Professor Oak: " & p.GetName() & " has been spotted on " & levelName & ".~Mary: " & p.GetName() & "! How smart! How inspiring!"
+                            output = "Professor Oak's Pokémon Talk! With Mary!~~Professor Oak: " & p.GetName() & " has been spotted on " & levelName & ".~Mary: " & p.GetName() & "! How smart! How inspiring!"
                         End If
                     Case "[unown]"
                         Dim words() As String = {"doom", "dark", "help", "join us", "stay", "lost", "vanish", "always there", "no eyes"}

2.5DHero/2.5DHero/Screens/MainMenu/IntroScreen.vb

@@ -40,8 +40,8 @@
                 Me.Update3DMoveIn()
         End Select
 
-        'In the end, do this:
+        ' In the end, do this:
-        ' Core.SetScreen(New MainMenuScreen())
+        'Core.SetScreen(New MainMenuScreen())
     End Sub
 
     Private Sub UpdateRevealPokemon()

2.5DHero/2.5DHero/Screens/MainMenu/JoinServerScreen.vb

@@ -93,7 +93,7 @@ Public Class JoinServerScreen
             Canvas.DrawScrollBar(New Vector2(CSng(Core.ScreenSize.Width / 2 + 266), 100), Me.ServerList.Count, 1, selectIndex, New Size(8, Core.ScreenSize.Height - 300), False, Color.Black, Color.Gray, True)
         End If
 
-        'Draw default first:
+        ' Draw default first:
         For i = 0 To endX
             Dim index As Integer = i + scrollIndex
 
@@ -154,7 +154,7 @@ Public Class JoinServerScreen
         Dim vS As String = "Protocol version: " & Servers.ServersManager.PROTOCOLVERSION
         Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, vS, New Vector2(Core.ScreenSize.Width - FontManager.MiniFont.MeasureString(vS).X - 4, Core.ScreenSize.Height - FontManager.MiniFont.MeasureString(vS).Y - 1), Color.White)
 
-        'Draw player list tooltip after everything else:
+        ' Draw player list tooltip after everything else:
         For i = 0 To endX
             Dim index As Integer = i + scrollIndex
 
@@ -408,9 +408,9 @@ Public Class JoinServerScreen
             Dim sw As New Stopwatch()
             sw.Start()
 
-            'TTL: 10000 ticks, usually at 60 Hz => 10000/60 seconds
+            ' TTL: 10000 ticks, usually at 60 Hz => 10000/60 seconds
             While sw.ElapsedMilliseconds < 10000 And Me.Pinged = False
-                'wait for server connection in main thread.
+                'Wait for server connection in the main thread.
                 Threading.Thread.Sleep(1)
             End While
 
@@ -568,7 +568,7 @@ Public Class JoinServerScreen
                     Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Me.CurrentPlayersOnline & "/" & Me.MaxPlayersOnline, New Vector2(CInt(startPos.X) + width - 36 - FontManager.MiniFont.MeasureString(Me.CurrentPlayersOnline & "/" & Me.MaxPlayersOnline).X, CInt(startPos.Y) + 7), Color.LightGray)
                     Core.SpriteBatch.DrawInterface(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(80 + 14 * (4 - GetPingLevel()), 238, 14, 14), ""), New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28), Color.White)
 
-                    'Ping result tool tip:
+                    ' Ping result tool tip:
                     If New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28).Contains(MouseHandler.MousePosition) = True Then
                         Canvas.DrawRectangle(New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Black)
                         Canvas.DrawBorder(3, New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Gray)

2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb

@@ -57,8 +57,8 @@
         SkyDome = New SkyDome()
         Camera = New MainMenuCamera()
 
-        'renderTarget = New RenderTarget2D(Core.GraphicsDevice, Core.windowSize.Width, Core.windowSize.Height, False, Core.GraphicsDevice.PresentationParameters.BackBufferFormat, DepthFormat.Depth24)
+        ' renderTarget = New RenderTarget2D(Core.GraphicsDevice, Core.windowSize.Width, Core.windowSize.Height, False, Core.GraphicsDevice.PresentationParameters.BackBufferFormat, DepthFormat.Depth24)
-        'blurEffect = Core.Content.Load(Of Effect)("Effects\BlurEffect")
+        ' blurEffect = Core.Content.Load(Of Effect)("Effects\BlurEffect")
 
         Core.Player.Skin = "Hilbert"
         Level = New Level()
@@ -810,7 +810,7 @@
                 Dim downloadProgress As Integer = Core.GameJoltSave.DownloadProgress
                 Dim total As Integer = Core.GameJoltSave.TotalDownloadItems
 
-                Dim downloadtext As String = "Downloading profile"
+                Dim downloadtext As String = "Downloading profile..."
                 Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, downloadtext & LoadingDots.Dots, New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(downloadtext).X / 2) + 2, 322), Color.Black)
                 Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, downloadtext & LoadingDots.Dots, New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(downloadtext).X / 2), 320), Color.White)
 
@@ -824,7 +824,7 @@
         End If
 
         If ControllerHandler.IsConnected() = False Then
-            Dim text As String = "Right-Click to quit to the main menu"
+            Dim text As String = "Right-Click to quit to the main menu."
             Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, text, New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(text).X / 2) + 2, 502), Color.Black)
             Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, text, New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(text).X / 2), 500), Color.White)
         End If
@@ -1178,15 +1178,15 @@
 
                     If MouseHandler.ButtonPressed(MouseHandler.MouseButtons.LeftButton) = True Then
                         Select Case packsMenuIndex(1)
-                            Case 2 'up
+                            Case 2 ' Up
                                 Me.ButtonUp()
-                            Case 3 'down
+                            Case 3 ' Down
                                 Me.ButtonDown()
-                            Case 4 'toggle
+                            Case 4 ' Toggle
                                 If PackNames.Count > 0 Then
                                     Me.ButtonToggle(PackNames(packsMenuIndex(0)))
                                 End If
-                            Case 5 'packinformation
+                            Case 5 ' ContentPack information
                                 Me.ButtonPackInformation()
                         End Select
                     End If

2.5DHero/2.5DHero/Screens/MainMenu/OfflineGameWarningScreen.vb

@@ -24,7 +24,7 @@
 
         Core.SpriteBatch.DrawString(FontManager.InGameFont, "Start a new offline game", New Vector2(CSng(Core.windowSize.Width / 2 - 280), 130), Color.White)
 
-        Dim t As String = "If you start a game in ""Offline Mode"" by pressing the ""New Game"" button, you cannot access online features of Pokémon3D such as Trading and Trainer Customization. Click on the GameJolt button in the lower right corner in order to start a game in ""Online Mode""."
+        Dim t As String = "If you start a game in ""Offline Mode"" by pressing the ""New Game"" button, you cannot access the online features of Pokémon 3D such as trading and trainer customization. Click on the GameJolt button in the lower right corner in order to start a game in ""Online Mode""."
         t = t.CropStringToWidth(FontManager.MainFont, 450)
 
         Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - 310) + 50, 240), Color.White)

2.5DHero/2.5DHero/Screens/MainMenu/SplashScreen.vb

@@ -63,7 +63,7 @@ Friend Class SplashScreen
                 Else
                     Core.SetScreen(New MainMenuScreen())
                 End If
-                'Core.SetScreen(New TransitionScreen(Me, New IntroScreen(), Color.Black, False))
+                ' Core.SetScreen(New TransitionScreen(Me, New IntroScreen(), Color.Black, False))
             End If
         End If
 

2.5DHero/2.5DHero/Screens/MapScreen.vb

@@ -233,7 +233,7 @@
                 If Not String.IsNullOrWhiteSpace(Core.Player.RoamingPokemonData) Then
                     If Core.Player.RoamingPokemonData.Length > 0 AndAlso Core.Player.RoamingPokemonData.Contains("|") Then
                         For Each Pokes As String In Core.Player.RoamingPokemonData.SplitAtNewline
-                            'PokémonID,Level,regionID,startLevelFile,MusicLoop,PokemonData
+                            ' PokémonID,Level,regionID,startLevelFile,MusicLoop,PokemonData
                             Dim TempData() As String = Pokes.Split("|")
                             Dim MapFiles() As String = Tags("mapfiles").Split(",")
                             Dim PokeCurrentLocation As String = TempData(3)
@@ -373,7 +373,7 @@
             regionPointer = 0
         End If
 
-        'regionPointer = regionPointer.Clamp(0, Me.regions.Count - 1)
+        ' regionPointer = regionPointer.Clamp(0, Me.regions.Count - 1)
 
         If regionPointer <> cPointer Then
             Me.currentRegion = regions(regionPointer)
@@ -480,7 +480,7 @@
 
         Dim regionString As String = Localization.GetString(Me.currentRegion(0).ToString().ToUpper() & Me.currentRegion.Remove(0, 1))
         If Me.regions.Count > 1 Then
-            regionString &= " (Press Shift/Shoulder Buttons to switch between regions)"
+            regionString &= " (Press the Shift/Shoulder Buttons to switch between regions.)"
         End If
 
         Core.SpriteBatch.DrawString(FontManager.InGameFont, regionString, New Vector2(MapScreen.mapOffsetX + 3, MapScreen.mapOffsetY - 30), Color.Black)
@@ -491,7 +491,7 @@
     End Sub
 
     Private Sub DrawSwitch()
-        'Cities:
+        ' Cities:
         Dim r As New Rectangle(104, 0, 12, 12)
         If drawObjects(0) = False Then
             r = New Rectangle(116, 0, 12, 12)
@@ -499,7 +499,7 @@
         Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 100, 24, 24), r, New Color(255, 255, 255, 220))
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 137, 103), Color.Black)
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 140, 100), Color.White)
-        'Routes:
+        ' Routes:
         r = New Rectangle(104, 12, 12, 12)
         If drawObjects(1) = False Then
             r = New Rectangle(116, 12, 12, 12)
@@ -507,7 +507,7 @@
         Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 130, 24, 24), r, New Color(255, 255, 255, 220))
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 137, 133), Color.Black)
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 140, 130), Color.White)
-        'Places:
+        ' Places:
         r = New Rectangle(104, 24, 12, 12)
         If drawObjects(2) = False Then
             r = New Rectangle(116, 24, 12, 12)
@@ -515,7 +515,7 @@
         Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 160, 24, 24), r, New Color(255, 255, 255, 220))
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 137, 163), Color.Black)
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 140, 160), Color.White)
-        'Roaming:
+        ' Roaming:
         r = New Rectangle(111, 64, 17, 16)
         If drawObjects(3) = False Then
             r = New Rectangle(111, 80, 17, 16)

2.5DHero/2.5DHero/Screens/NewGameScreen.vb

@@ -16,7 +16,7 @@
     Dim SkinIndex As Integer = 0
     Dim skinTexture As Texture2D
     Dim enterCorrectName As Boolean = False
-    Dim nameMessage As String = "This name is too short"
+    Dim nameMessage As String = "This name is too short."
 
     Dim mainTexture As Texture2D
     Dim pokeTexture As Texture2D

2.5DHero/2.5DHero/Screens/OptionScreen.vb

@@ -110,7 +110,7 @@
         YScroll = 0
 
         Select Case Me.ScreenIndex
-            Case 0
+            Case 0 ' Main Options menu.
                 Me.ControlList.Add(New CommandButton(New Vector2(100, 200), 6, "Game", AddressOf SwitchToGame))
                 Me.ControlList.Add(New CommandButton(New Vector2(340, 200), 6, "Graphics", AddressOf SwitchToGraphics))
                 Me.ControlList.Add(New CommandButton(New Vector2(580, 200), 6, "Battle", AddressOf SwitchToBattle))
@@ -119,14 +119,14 @@
 
                 Me.ControlList.Add(New CommandButton(New Vector2(120, 480), 6, "Apply", AddressOf Apply))
                 Me.ControlList.Add(New CommandButton(New Vector2(630, 480), 6, "Close", AddressOf Close))
-            Case 1
+            Case 1 ' "Game" from the Options menu.
-                Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Textspeed", Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed))
+                Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Text Speed", Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed))
 
                 If CBool(GameModeManager.GetGameRuleValue("LockDifficulty", "0")) = False Then
                     Dim d As New Dictionary(Of Integer, String)
                     d.Add(0, "Easy")
                     d.Add(1, "Hard")
-                    d.Add(2, "S-Hard")
+                    d.Add(2, "Super Hard")
 
                     Me.ControlList.Add(New ScrollBar(New Vector2(100, 250), 400, "Difficulty", Me.Difficulty, 0, 2, AddressOf ChangeDifficulty, d))
                 End If
@@ -134,7 +134,7 @@
                 Me.ControlList.Add(New ToggleButton(New Vector2(100, 300), 8, "View Bobbing", Me.ViewBobbing, AddressOf ToggleBobbing, {"Off", "On"}.ToList()))
 
                 Me.ControlList.Add(New CommandButton(New Vector2(364, 480), 6, "Back", AddressOf SwitchToMain))
-            Case 2
+            Case 2 ' "Graphics" from the Options menu.
                 Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Field of View", CInt(Me.FOV), 45, 120, AddressOf ChangeFOV))
 
                 Dim d As New Dictionary(Of Integer, String)
@@ -143,23 +143,23 @@
                 d.Add(2, "Normal")
                 d.Add(3, "Far")
                 d.Add(4, "Extreme")
-                Me.ControlList.Add(New ScrollBar(New Vector2(100, 250), 400, "Renderdistance", Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d))
+                Me.ControlList.Add(New ScrollBar(New Vector2(100, 250), 400, "Render Distance", Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d))
 
                 Dim d1 As New Dictionary(Of Integer, String)
                 d1.Add(0, "Off")
-                Me.ControlList.Add(New ScrollBar(New Vector2(100, 300), 400, "Offset map quality", Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1))
+                Me.ControlList.Add(New ScrollBar(New Vector2(100, 300), 400, "Offset Map Quality", Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1))
 
                 Me.ControlList.Add(New ToggleButton(New Vector2(100, 350), 8, "Graphics", CBool(Me.GraphicStyle), AddressOf ToggleGraphicsStyle, {"Fast", "Fancy"}.ToList()))
                 Me.ControlList.Add(New ToggleButton(New Vector2(400, 350), 8, "Multi Sampling", Me.PreferMultiSampling, AddressOf ToggleMultiSampling, {"Off", "On"}.ToList()))
 
                 Me.ControlList.Add(New CommandButton(New Vector2(364, 480), 6, "Back", AddressOf SwitchToMain))
-            Case 3
+            Case 3 ' "Battle" from the Options menu.
                 Me.ControlList.Add(New ToggleButton(New Vector2(100, 200), 8, "3D Models", CBool(ShowModels), AddressOf ToggleShowModels, {"Off", "On"}.ToList()))
                 Me.ControlList.Add(New ToggleButton(New Vector2(400, 200), 8, "Animations", CBool(Me.ShowBattleAnimations), AddressOf ToggleAnimations, {"Off", "On"}.ToList()))
                 Me.ControlList.Add(New ToggleButton(New Vector2(100, 320), 8, "Battle Style", CBool(Me.BattleStyle), AddressOf ToggleBattleStyle, {"Shift", "Set"}.ToList()))
 
                 Me.ControlList.Add(New CommandButton(New Vector2(364, 480), 6, "Back", AddressOf SwitchToMain))
-            Case 4
+            Case 4 ' "Controls" from the Options menu.
                 Dim d As New Dictionary(Of Integer, String)
                 d.Add(1, "...Slow...")
                 d.Add(12, "Standard")
@@ -167,12 +167,12 @@
                 d.Add(50, "SPEED OF LIGHT!")
                 Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Mouse Speed", Me.MouseSpeed, 1, 50, AddressOf ChangeMouseSpeed, d))
                 Me.ControlList.Add(New CommandButton(New Vector2(100, 250), 9, "Reset Key Bindings", AddressOf ResetKeyBindings))
-                Me.ControlList.Add(New ToggleButton(New Vector2(100, 370), 12, "XBOX 360 gamepad", Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {"Disabled", "Enabled"}.ToList()))
+                Me.ControlList.Add(New ToggleButton(New Vector2(100, 370), 12, "Xbox 360 Gamepad", Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {"Disabled", "Enabled"}.ToList()))
 
                 Me.ControlList.Add(New CommandButton(New Vector2(364, 480), 6, "Back", AddressOf SwitchToMain))
-            Case 5
+            Case 5 ' "Volume" from the Options menu.
-                Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Music volume", Me.Music, 0, 100, AddressOf ChangeMusicVolume))
+                Me.ControlList.Add(New ScrollBar(New Vector2(100, 200), 400, "Music Volume", Me.Music, 0, 100, AddressOf ChangeMusicVolume))
-                Me.ControlList.Add(New ScrollBar(New Vector2(100, 250), 400, "Sound volume", Me.Sound, 0, 100, AddressOf ChangeSoundVolume))
+                Me.ControlList.Add(New ScrollBar(New Vector2(100, 250), 400, "Sound Volume", Me.Sound, 0, 100, AddressOf ChangeSoundVolume))
                 Me.ControlList.Add(New ToggleButton(New Vector2(100, 300), 8, "Muted", CBool(Me.Muted), AddressOf ToggleMute, {"No", "Yes"}.ToList()))
 
                 Me.ControlList.Add(New CommandButton(New Vector2(364, 480), 6, "Back", AddressOf SwitchToMain))

2.5DHero/2.5DHero/Screens/PC/HallOfFameScreen.vb

@@ -267,9 +267,9 @@
         Level.Update()
 
         Select Case menuState
-            Case 0 'Menu updates
+            Case 0 ' Menu updates.
                 Me.UpdateMenu()
-            Case 1 'Menu fade/appear
+            Case 1 ' Menu fade/appear.
                 Me.alpha += (3 * Me.alphaFade)
                 If Me.alpha >= 255 Then
                     Me.alpha = 255
@@ -278,7 +278,7 @@
                     Me.alpha = 0
                     Me.menuState = 2
                 End If
-            Case 2 'Level updates
+            Case 2 ' Level updates.
                 Me.UpdateCamera()
         End Select
 

2.5DHero/2.5DHero/Screens/PC/MailSystemScreen.vb

@@ -332,7 +332,7 @@
         Select Case ID
             Case 0
                 T.Name = "Won a GTS competition."
-                T.Description = "You are the winner of a competition that took place at the GTS. It might has been an important competition."
+                T.Description = "You are the winner of a competition that took place at the GTS. It must have been an important competition."
                 TexturePosition = New Vector2(0, 0)
             Case 1
                 T.Name = "Won a GTS competition."

2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb

@@ -318,15 +318,15 @@ Public Class StorageSystemScreen
                         If Me.BoxChooseMode = True Then
                             Me.BoxChooseMode = False
                         Else
-                            Dim e As New MenuEntry(3, "CHOOSE BOX", False, AddressOf Me.ChooseBox)
+                            Dim e As New MenuEntry(3, "Choose Box", False, AddressOf Me.ChooseBox)
-                            Dim e1 As New MenuEntry(4, "CHANGE MODE", False, AddressOf Me.ChangemodeMenu)
+                            Dim e1 As New MenuEntry(4, "Change Mode", False, AddressOf Me.ChangemodeMenu)
                             If GetBox(CurrentBox).IsBattleBox = True Then
-                                Dim e4 As New MenuEntry(5, "CANCEL", True, Nothing)
+                                Dim e4 As New MenuEntry(5, "Cancel", True, Nothing)
                                 Me.SetupMenu({e, e1, e4}, "What do you want to do?")
                             Else
-                                Dim e2 As New MenuEntry(5, "WALLPAPER", False, AddressOf WallpaperMain)
+                                Dim e2 As New MenuEntry(5, "Wallpaper", False, AddressOf WallpaperMain)
-                                Dim e3 As New MenuEntry(6, "NAME", False, AddressOf SelectNameBox)
+                                Dim e3 As New MenuEntry(6, "Name", False, AddressOf SelectNameBox)
-                                Dim e4 As New MenuEntry(7, "CANCEL", True, Nothing)
+                                Dim e4 As New MenuEntry(7, "Cancel", True, Nothing)
                                 Me.SetupMenu({e, e1, e2, e3, e4}, "What do you want to do?")
                             End If
                         End If
@@ -355,11 +355,11 @@ Public Class StorageSystemScreen
 #Region "ChangeMode"
 
     Private Sub ChangemodeMenu()
-        Dim e As New MenuEntry(3, "WITHDRAW", False, AddressOf SelectWithdraw)
+        Dim e As New MenuEntry(3, "Withdraw", False, AddressOf SelectWithdraw)
-        Dim e1 As New MenuEntry(4, "DEPOSIT", False, AddressOf SelectDeposit)
+        Dim e1 As New MenuEntry(4, "Deposit", False, AddressOf SelectDeposit)
-        Dim e2 As New MenuEntry(5, "SINGLE MOVE", False, AddressOf Me.SelectSingleMove)
+        Dim e2 As New MenuEntry(5, "Single Move", False, AddressOf Me.SelectSingleMove)
-        Dim e3 As New MenuEntry(6, "EASY MOVE", False, AddressOf Me.SelectEasyMove)
+        Dim e3 As New MenuEntry(6, "Easy Move", False, AddressOf Me.SelectEasyMove)
-        Dim e4 As New MenuEntry(7, "CANCEL", True, AddressOf Me.ChooseObject)
+        Dim e4 As New MenuEntry(7, "Cancel", True, AddressOf Me.ChooseObject)
         Me.SetupMenu({e, e1, e2, e3, e4}, "Choose a mode to use.")
     End Sub
 
@@ -404,71 +404,71 @@ Public Class StorageSystemScreen
 
         Select Case badges
             Case 0, 1
-                Dim e As New MenuEntry(3, "PACKAGE 1", False, AddressOf WallpaperPackage1)
+                Dim e As New MenuEntry(3, "Package 1", False, AddressOf WallpaperPackage1)
-                Dim e4 As New MenuEntry(4, "CANCEL", True, AddressOf ChooseObject)
+                Dim e4 As New MenuEntry(4, "Cancel", True, AddressOf ChooseObject)
                 SetupMenu({e, e4}, "Please pick a theme.")
             Case 2, 3, 4
-                Dim e As New MenuEntry(3, "PACKAGE 1", False, AddressOf WallpaperPackage1)
+                Dim e As New MenuEntry(3, "Package 1", False, AddressOf WallpaperPackage1)
-                Dim e1 As New MenuEntry(4, "PACKAGE 2", False, AddressOf WallpaperPackage2)
+                Dim e1 As New MenuEntry(4, "Package 2", False, AddressOf WallpaperPackage2)
-                Dim e4 As New MenuEntry(5, "CANCEL", True, AddressOf ChooseObject)
+                Dim e4 As New MenuEntry(5, "Cancel", True, AddressOf ChooseObject)
                 SetupMenu({e, e1, e4}, "Please pick a theme.")
             Case 5, 6, 7
-                Dim e As New MenuEntry(3, "PACKAGE 1", False, AddressOf WallpaperPackage1)
+                Dim e As New MenuEntry(3, "Package 1", False, AddressOf WallpaperPackage1)
-                Dim e1 As New MenuEntry(4, "PACKAGE 2", False, AddressOf WallpaperPackage2)
+                Dim e1 As New MenuEntry(4, "Package 2", False, AddressOf WallpaperPackage2)
-                Dim e2 As New MenuEntry(5, "PACKAGE 3", False, AddressOf WallpaperPackage3)
+                Dim e2 As New MenuEntry(5, "Package 3", False, AddressOf WallpaperPackage3)
-                Dim e4 As New MenuEntry(6, "CANCEL", True, AddressOf ChooseObject)
+                Dim e4 As New MenuEntry(6, "Cancel", True, AddressOf ChooseObject)
                 SetupMenu({e, e1, e2, e4}, "Please pick a theme.")
             Case Else
-                Dim e As New MenuEntry(3, "PACKAGE 1", False, AddressOf WallpaperPackage1)
+                Dim e As New MenuEntry(3, "Package 1", False, AddressOf WallpaperPackage1)
-                Dim e1 As New MenuEntry(4, "PACKAGE 2", False, AddressOf WallpaperPackage2)
+                Dim e1 As New MenuEntry(4, "Package 2", False, AddressOf WallpaperPackage2)
-                Dim e2 As New MenuEntry(5, "PACKAGE 3", False, AddressOf WallpaperPackage3)
+                Dim e2 As New MenuEntry(5, "Package 3", False, AddressOf WallpaperPackage3)
-                Dim e3 As New MenuEntry(6, "PACKAGE 4", False, AddressOf WallpaperPackage4)
+                Dim e3 As New MenuEntry(6, "Package 4", False, AddressOf WallpaperPackage4)
-                Dim e4 As New MenuEntry(7, "CANCEL", True, AddressOf ChooseObject)
+                Dim e4 As New MenuEntry(7, "Cancel", True, AddressOf ChooseObject)
                 SetupMenu({e, e1, e2, e3, e4}, "Please pick a theme.")
         End Select
     End Sub
 
     Private Sub WallpaperPackage1()
-        Dim e As New MenuEntry(3, "FOREST", False, AddressOf PickWallpaper, 0)
+        Dim e As New MenuEntry(3, "Forest", False, AddressOf PickWallpaper, 0)
-        Dim e1 As New MenuEntry(4, "CITY", False, AddressOf PickWallpaper, 1)
+        Dim e1 As New MenuEntry(4, "City", False, AddressOf PickWallpaper, 1)
-        Dim e2 As New MenuEntry(5, "DESERT", False, AddressOf PickWallpaper, 2)
+        Dim e2 As New MenuEntry(5, "Desert", False, AddressOf PickWallpaper, 2)
-        Dim e3 As New MenuEntry(6, "SAVANNA", False, AddressOf PickWallpaper, 3)
+        Dim e3 As New MenuEntry(6, "Savanna", False, AddressOf PickWallpaper, 3)
-        Dim e4 As New MenuEntry(7, "CAVE", False, AddressOf PickWallpaper, 8)
+        Dim e4 As New MenuEntry(7, "Cave", False, AddressOf PickWallpaper, 8)
-        Dim e5 As New MenuEntry(8, "RIVER", False, AddressOf PickWallpaper, 11)
+        Dim e5 As New MenuEntry(8, "River", False, AddressOf PickWallpaper, 11)
-        Dim e6 As New MenuEntry(9, "CANCEL", True, AddressOf WallpaperMain)
+        Dim e6 As New MenuEntry(9, "Cancel", True, AddressOf WallpaperMain)
         SetupMenu({e, e1, e2, e3, e4, e5, e6}, "Pick the wallpaper.")
     End Sub
 
     Private Sub WallpaperPackage2()
-        Dim e As New MenuEntry(3, "VOLCANO", False, AddressOf PickWallpaper, 5)
+        Dim e As New MenuEntry(3, "Volcano", False, AddressOf PickWallpaper, 5)
-        Dim e1 As New MenuEntry(4, "SNOW", False, AddressOf PickWallpaper, 6)
+        Dim e1 As New MenuEntry(4, "Snow", False, AddressOf PickWallpaper, 6)
-        Dim e2 As New MenuEntry(5, "BEACH", False, AddressOf PickWallpaper, 9)
+        Dim e2 As New MenuEntry(5, "Beach", False, AddressOf PickWallpaper, 9)
-        Dim e3 As New MenuEntry(6, "SEAFLOOR", False, AddressOf PickWallpaper, 10)
+        Dim e3 As New MenuEntry(6, "Seafloor", False, AddressOf PickWallpaper, 10)
-        Dim e4 As New MenuEntry(7, "CRAG", False, AddressOf PickWallpaper, 4)
+        Dim e4 As New MenuEntry(7, "Crag", False, AddressOf PickWallpaper, 4)
-        Dim e5 As New MenuEntry(8, "STEEL", False, AddressOf PickWallpaper, 7)
+        Dim e5 As New MenuEntry(8, "Steel", False, AddressOf PickWallpaper, 7)
-        Dim e6 As New MenuEntry(9, "CANCEL", True, AddressOf WallpaperMain)
+        Dim e6 As New MenuEntry(9, "Cancel", True, AddressOf WallpaperMain)
         SetupMenu({e, e1, e2, e3, e4, e5, e6}, "Pick the wallpaper.")
     End Sub
 
     Private Sub WallpaperPackage3()
-        Dim e As New MenuEntry(3, "VOLCANO 2", False, AddressOf PickWallpaper, 14)
+        Dim e As New MenuEntry(3, "Volcano 2", False, AddressOf PickWallpaper, 14)
-        Dim e1 As New MenuEntry(4, "CITY 2", False, AddressOf PickWallpaper, 15)
+        Dim e1 As New MenuEntry(4, "City 2", False, AddressOf PickWallpaper, 15)
-        Dim e2 As New MenuEntry(5, "SNOW 2", False, AddressOf PickWallpaper, 16)
+        Dim e2 As New MenuEntry(5, "Snow 2", False, AddressOf PickWallpaper, 16)
-        Dim e3 As New MenuEntry(6, "DESERT 2", False, AddressOf PickWallpaper, 17)
+        Dim e3 As New MenuEntry(6, "Desert 2", False, AddressOf PickWallpaper, 17)
-        Dim e4 As New MenuEntry(7, "SAVANNA 2", False, AddressOf PickWallpaper, 18)
+        Dim e4 As New MenuEntry(7, "Savanna 2", False, AddressOf PickWallpaper, 18)
-        Dim e5 As New MenuEntry(8, "STEEL 2", False, AddressOf PickWallpaper, 19)
+        Dim e5 As New MenuEntry(8, "Steel 2", False, AddressOf PickWallpaper, 19)
-        Dim e6 As New MenuEntry(9, "CANCEL", True, AddressOf WallpaperMain)
+        Dim e6 As New MenuEntry(9, "Cancel", True, AddressOf WallpaperMain)
         SetupMenu({e, e1, e2, e3, e4, e5, e6}, "Pick the wallpaper.")
     End Sub
 
     Private Sub WallpaperPackage4()
-        Dim e As New MenuEntry(3, "SYSTEM", False, AddressOf PickWallpaper, 22)
+        Dim e As New MenuEntry(3, "System", False, AddressOf PickWallpaper, 22)
-        Dim e1 As New MenuEntry(4, "SIMPLE", False, AddressOf PickWallpaper, 13)
+        Dim e1 As New MenuEntry(4, "Simple", False, AddressOf PickWallpaper, 13)
-        Dim e2 As New MenuEntry(5, "CHECKS", False, AddressOf PickWallpaper, 12)
+        Dim e2 As New MenuEntry(5, "Checks", False, AddressOf PickWallpaper, 12)
-        Dim e3 As New MenuEntry(6, "SEASONS", False, AddressOf PickWallpaper, 23)
+        Dim e3 As New MenuEntry(6, "Seasons", False, AddressOf PickWallpaper, 23)
-        Dim e4 As New MenuEntry(7, "RETRO 1", False, AddressOf PickWallpaper, 20)
+        Dim e4 As New MenuEntry(7, "Retro 1", False, AddressOf PickWallpaper, 20)
-        Dim e5 As New MenuEntry(8, "RETRO 2", False, AddressOf PickWallpaper, 21)
+        Dim e5 As New MenuEntry(8, "Retro 2", False, AddressOf PickWallpaper, 21)
-        Dim e6 As New MenuEntry(9, "CANCEL", True, AddressOf WallpaperMain)
+        Dim e6 As New MenuEntry(9, "Cancel", True, AddressOf WallpaperMain)
         SetupMenu({e, e1, e2, e3, e4, e5, e6}, "Pick the wallpaper.")
     End Sub
 
@@ -663,7 +663,7 @@ Public Class StorageSystemScreen
                     If GetBox(PickupBox).IsBattleBox = True Then
                         GetBox(PickupBox).Pokemon.Add(GetBox(PickupBox).Pokemon.Count, New PokemonWrapper(Me.MovingPokemon)) ' Me.MovingPokemon))
                     Else
-                        GetBox(PickupBox).Pokemon.Add(id, New PokemonWrapper(Me.MovingPokemon)) 'Me.MovingPokemon)
+                        GetBox(PickupBox).Pokemon.Add(id, New PokemonWrapper(Me.MovingPokemon)) ' Me.MovingPokemon)
                     End If
 
                     CurrentBox = PickupBox
@@ -834,16 +834,16 @@ Public Class StorageSystemScreen
 
                         Select Case Me.SelectionMode
                             Case SelectionModes.Withdraw
-                                e = New MenuEntry(3, "WITHDRAW", False, AddressOf WithdrawPokemon)
+                                e = New MenuEntry(3, "Withdraw", False, AddressOf WithdrawPokemon)
                             Case SelectionModes.Deposit
-                                e = New MenuEntry(3, "DEPOSIT", False, AddressOf DepositPokemon)
+                                e = New MenuEntry(3, "Deposit", False, AddressOf DepositPokemon)
                             Case Else
-                                e = New MenuEntry(3, "MOVE", False, AddressOf PickupPokemon)
+                                e = New MenuEntry(3, "Move", False, AddressOf PickupPokemon)
                         End Select
 
-                        Dim e1 As New MenuEntry(4, "SUMMARY", False, AddressOf SummaryPokemon)
+                        Dim e1 As New MenuEntry(4, "Summary", False, AddressOf SummaryPokemon)
-                        Dim e2 As New MenuEntry(5, "RELEASE", False, AddressOf ReleasePokemon)
+                        Dim e2 As New MenuEntry(5, "Release", False, AddressOf ReleasePokemon)
-                        Dim e3 As New MenuEntry(6, "CANCEL", True, Nothing)
+                        Dim e3 As New MenuEntry(6, "Cancel", True, Nothing)
                         SetupMenu({e, e1, e2, e3}, p.GetDisplayName() & " is selected.")
                     End If
                 Else
@@ -931,7 +931,7 @@ Public Class StorageSystemScreen
                 Else
                     Me.MovingPokemon.FullRestore()
                     Dim sPokemon As Pokemon = GetBox(CurrentBox).Pokemon(id).GetPokemon()
-                    GetBox(CurrentBox).Pokemon(id) = New PokemonWrapper(Me.MovingPokemon) 'Me.MovingPokemon
+                    GetBox(CurrentBox).Pokemon(id) = New PokemonWrapper(Me.MovingPokemon) ' Me.MovingPokemon
                     Me.MovingPokemon = sPokemon
                 End If
             Else
@@ -939,9 +939,9 @@ Public Class StorageSystemScreen
                     Me.MovingPokemon.FullRestore()
 
                     If GetBox(CurrentBox).IsBattleBox = True Then
-                        GetBox(CurrentBox).Pokemon.Add(GetBox(CurrentBox).Pokemon.Count, New PokemonWrapper(Me.MovingPokemon)) 'Me.MovingPokemon)
+                        GetBox(CurrentBox).Pokemon.Add(GetBox(CurrentBox).Pokemon.Count, New PokemonWrapper(Me.MovingPokemon)) ' Me.MovingPokemon)
                     Else
-                        GetBox(CurrentBox).Pokemon.Add(id, New PokemonWrapper(Me.MovingPokemon)) 'Me.MovingPokemon)
+                        GetBox(CurrentBox).Pokemon.Add(id, New PokemonWrapper(Me.MovingPokemon)) ' Me.MovingPokemon)
                     End If
 
                     Me.MovingPokemon = Nothing
@@ -992,7 +992,7 @@ Public Class StorageSystemScreen
                         nextIndex += 1
                     End While
                     Core.Player.Pokemons(CInt(Me.CursorPosition.Y)).FullRestore()
-                    GetBox(CurrentBox).Pokemon.Add(nextIndex, New PokemonWrapper(Core.Player.Pokemons(CInt(Me.CursorPosition.Y)))) 'Core.Player.Pokemons(CInt(Me.CursorPosition.Y)))
+                    GetBox(CurrentBox).Pokemon.Add(nextIndex, New PokemonWrapper(Core.Player.Pokemons(CInt(Me.CursorPosition.Y)))) ' Core.Player.Pokemons(CInt(Me.CursorPosition.Y)))
                     Core.Player.Pokemons.RemoveAt(CInt(Me.CursorPosition.Y))
                 Else
                     Dim e As New MenuEntry(3, "OK", True, Nothing)
@@ -1048,11 +1048,11 @@ Public Class StorageSystemScreen
             End If
 
             If p.IsEgg() = False Then
-                Dim e1 As New MenuEntry(3, "NO", True, AddressOf SelectPokemon)
+                Dim e1 As New MenuEntry(3, "No", True, AddressOf SelectPokemon)
-                Dim e As New MenuEntry(4, "YES", False, AddressOf ConfirmRelease)
+                Dim e As New MenuEntry(4, "Yes", False, AddressOf ConfirmRelease)
                 Me.SetupMenu({e1, e}, "Release " & p.GetDisplayName() & "?")
             Else
-                Me.SetupMenu({New MenuEntry(3, "OK", True, Nothing)}, "Cannot release an egg.")
+                Me.SetupMenu({New MenuEntry(3, "OK", True, Nothing)}, "Cannot release an Egg.")
             End If
         Else
             Me.SetupMenu({New MenuEntry(3, "OK", True, Nothing)}, "Cannot release the last Pokémon.")
@@ -1074,7 +1074,7 @@ Public Class StorageSystemScreen
             b.Pokemon.Clear()
 
             For i = 0 To p.Count - 1
-                b.Pokemon.Add(i, New PokemonWrapper(p(i))) 'p(i))
+                b.Pokemon.Add(i, New PokemonWrapper(p(i))) ' p(i))
             Next
         End If
     End Sub
@@ -1084,7 +1084,7 @@ Public Class StorageSystemScreen
 #Region "Draw"
 
     Public Overrides Sub Draw()
-        'Draw3DModel()
+        ' Draw3DModel()
         DrawMainWindow()
         DrawPokemonStatus()
 
@@ -1270,7 +1270,7 @@ Public Class StorageSystemScreen
                     maxPokemon = 6
                 End If
 
-                Dim t As String = "BOX:  " & box.Name & vbNewLine & "POKéMON:  " & box.Pokemon.Count & " / " & maxPokemon & vbNewLine & "LEVEL:  " & levelString
+                Dim t As String = "Box:  " & box.Name & vbNewLine & "Pokémon:  " & box.Pokemon.Count & " / " & maxPokemon & vbNewLine & "Level:  " & levelString
 
                 Core.SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(667, 417), Color.Black)
                 Core.SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(665, 415), Color.White)
@@ -1329,8 +1329,8 @@ Public Class StorageSystemScreen
                 Canvas.DrawRectangle(New Rectangle(660, 410, 200, 210), c)
 
                 If p.IsEgg() = True Then
-                    Core.SpriteBatch.DrawString(FontManager.MiniFont, "EGG", New Vector2(667, 417), Color.Black)
+                    Core.SpriteBatch.DrawString(FontManager.MiniFont, "Egg", New Vector2(667, 417), Color.Black)
-                    Core.SpriteBatch.DrawString(FontManager.MiniFont, "EGG", New Vector2(665, 415), Color.White)
+                    Core.SpriteBatch.DrawString(FontManager.MiniFont, "Egg", New Vector2(665, 415), Color.White)
                 Else
                     Dim itemString As String = "None"
                     If Not p.Item Is Nothing Then
@@ -1508,7 +1508,7 @@ Public Class StorageSystemScreen
     End Function
 
     ''' <summary>
-    ''' Adds a pokemon to the next free spot and returns the index of that box
+    ''' Adds a Pokémon to the next free spot and returns the index of that box.
     ''' </summary>
     Public Shared Function DepositPokemon(ByVal p As Pokemon, Optional ByVal BoxIndex As Integer = -1) As Integer
         p.FullRestore()
@@ -1523,7 +1523,7 @@ Public Class StorageSystemScreen
             If GetBox(i, Boxes).Pokemon.Count < 30 Then
                 For l = 0 To 29
                     If GetBox(i, Boxes).Pokemon.Keys.Contains(l) = False Then
-                        GetBox(i, Boxes).Pokemon.Add(l, New PokemonWrapper(p)) 'p)
+                        GetBox(i, Boxes).Pokemon.Add(l, New PokemonWrapper(p)) ' p)
                         Exit For
                     End If
                 Next
@@ -1537,7 +1537,7 @@ Public Class StorageSystemScreen
                 If GetBox(i, Boxes).Pokemon.Count < 30 Then
                     For l = 0 To 29
                         If GetBox(i, Boxes).Pokemon.Keys.Contains(l) = False Then
-                            GetBox(i, Boxes).Pokemon.Add(l, New PokemonWrapper(p)) 'p)
+                            GetBox(i, Boxes).Pokemon.Add(l, New PokemonWrapper(p)) ' p)
                             Exit For
                         End If
                     Next
@@ -1798,7 +1798,7 @@ Public Class StorageSystemScreen
             End If
         Next
 
-        'Prevent more than 6 pokemon:
+        ' Prevent more than six Pokémon:
         While PokemonList.Count > 6
             PokemonList.RemoveAt(PokemonList.Count - 1)
         End While
@@ -2153,7 +2153,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectPokemonLetter(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Pokémon Then
@@ -2223,7 +2223,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectType1Type(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'Go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Type1 Then
@@ -2270,7 +2270,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectType2Type(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'Go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Type2 Then
@@ -2319,7 +2319,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectMoveLetter(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Move Then
@@ -2391,7 +2391,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectAbilityLetter(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Ability Then
@@ -2461,7 +2461,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectNatureType(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'Go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Nature Then
@@ -2508,7 +2508,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectGenderType(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'Go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.Gender Then
@@ -2546,7 +2546,7 @@ Public Class StorageSystemFilterScreen
     Private Sub SelectHeldItemType(ByVal s As SelectMenu)
         Select Case s.SelectedItem
             Case "Back"
-                'Go back
+                ' Go back.
             Case "Clear"
                 For Each Filter As StorageSystemScreen.Filter In Me.Filters
                     If Filter.FilterType = StorageSystemScreen.FilterTypes.HeldItem Then

2.5DHero/2.5DHero/Screens/Pokedex/PokedexScreen.vb

@@ -26,7 +26,7 @@
     End Sub
 
     Private Sub AchievePokedexEmblems()
-        'Eevee:
+        ' Eevee:
         Dim eevee() As Integer = {134, 135, 136, 196, 197, 470, 471}
         Dim hasEevee As Boolean = True
         For Each e As Integer In eevee
@@ -39,7 +39,7 @@
             GameJolt.Emblem.AchieveEmblem("eevee")
         End If
 
-        'Pokedex:
+        ' Pokédex:
         If Core.Player.IsGameJoltSave = True Then
             If Me.Profiles(0).Pokedex.Obtained >= Me.Profiles(0).Pokedex.Count Then
                 GameJolt.Emblem.AchieveEmblem("pokedex")
@@ -394,7 +394,7 @@ Public Class PokedexScreen
         Dim pokeSearchList As New List(Of Integer)
 
         If CHabitat Is Nothing Then
-            'Add any external Pokémon if specified to do so:
+            ' Add any external Pokémon if specified to do so:
             If Profile.Pokedex.IncludeExternalPokemon = True Then
                 For i = 1 To Pokedex.POKEMONCOUNT
                     If Me.Profile.Pokedex.HasPokemon(i, False) = False Then
@@ -1049,7 +1049,7 @@ Public Class PokedexScreen
             Public Daytimes() As Integer
         End Structure
 
-        Dim MergeData() As String = {} 'Temp data storage if needs to merge.
+        Dim MergeData() As String = {} ' Temporary data storage if needs to merge.
 
         Public File As String = ""
         Public Name As String = ""
@@ -1625,18 +1625,18 @@ Public Class PokedexViewScreen
             Return 0
         End If
         If count Mod 2 = 1 Then
-            'count = 7, c = 7
+            ' count = 7, c = 7
             Dim middle As Integer = CInt(Math.Ceiling(count / 2))
-            'middle = 4
+            ' middle = 4
             Dim stat As Integer = c - middle
-            'stat = 3
+            ' stat = 3
             Return stat
         Else
-            'count = 4, c = 1 
+            ' count = 4, c = 1 
             Dim middle As Double = count / 2
-            'middle = 2
+            ' middle = 2
             Dim stat As Double = c - middle - 0.5D
-            'stat = -1.5
+            ' stat = -1.5
             Return stat
         End If
     End Function

2.5DHero/2.5DHero/Screens/Pokemon/Daycare.vb

@@ -32,10 +32,10 @@
             p.SetCatchInfos(Item.GetItemByID(5), "obtained at")
             p.CatchBall = Item.GetItemByID(GetEggPokeballID({parent1, parent2}.ToList()))
 
-            'adding egg moves:
+            ' Adding Egg Moves:
             Dim EggMoves As New List(Of BattleSystem.Attack)
 
-            'Level-Up moves:
+            ' Level-Up moves:
             If DittoAsParent = 0 Then
                 For Each m1 As BattleSystem.Attack In parent1.Attacks
                     For Each m2 As BattleSystem.Attack In parent2.Attacks
@@ -47,7 +47,7 @@
                 Next
             End If
 
-            'TM-HM Moves:
+            ' Technical/Hidden Machine moves:
             Dim male As Integer = -1
             If parent1.Gender = net.Pokemon3D.Game.Pokemon.Genders.Male Then
                 male = 0
@@ -73,7 +73,7 @@
                 Next
             End If
 
-            'Egg Moves:
+            ' Egg Moves:
             male = -1
             If parent1.Gender = net.Pokemon3D.Game.Pokemon.Genders.Male Then
                 male = 0
@@ -100,7 +100,7 @@
                     Next
                 Next
             End If
-            'Volt Tackle on Pikachu
+            ' Volt Tackle for Pikachu:
             If (parent1.Item IsNot Nothing AndAlso parent1.Item.Name.ToLower = "light ball") OrElse (parent2.Item IsNot Nothing AndAlso parent2.Item.Name.ToLower = "light ball") Then
                 Dim newAttack As BattleSystem.Attack = BattleSystem.Attack.GetAttackByID(344)
                 EggMoves.Add(newAttack)
@@ -132,7 +132,7 @@
                 End If
             Next
 
-            'Inherit stats:
+            ' Inherit stats:
             Dim IV1 As New List(Of String)
             Dim IV2 As New List(Of String)
 
@@ -249,7 +249,7 @@
                 End Select
             Next
 
-            'Natures:
+            ' Natures:
             Dim EStone1 As Boolean = False
             Dim EStone2 As Boolean = False
 
@@ -276,7 +276,7 @@
                 End If
             End If
 
-            'Abilities:
+            ' Abilities:
             If DittoAsParent = 0 Then
                 Dim female As Pokemon = parent1
                 If parent2.Gender = net.Pokemon3D.Game.Pokemon.Genders.Female Then
@@ -288,7 +288,7 @@
                 End If
             End If
 
-            'Hidden Ability'
+            ' Hidden Ability:
             If DittoAsParent <> 0 Then
                 If DittoAsParent = 1 Then
                     If parent2.IsUsingHiddenAbility = True And p.HasHiddenAbility = True And Core.Random.Next(0, 100) < 80 Then
@@ -310,7 +310,7 @@
                 End If
             End If
 
-            'Shiny:
+            ' Shiny:
             Dim Shiny1 As Boolean = parent1.IsShiny
             Dim Shiny2 As Boolean = parent2.IsShiny
 
@@ -469,39 +469,39 @@
             Dim p1 As Pokemon = Pokemon(0)
             Dim p2 As Pokemon = Pokemon(1)
 
-            'First Pokémon is Ditto.
+            ' First Pokémon is Ditto:
             If p1.EggGroup1 = net.Pokemon3D.Game.Pokemon.EggGroups.Ditto Or p1.EggGroup2 = net.Pokemon3D.Game.Pokemon.EggGroups.Ditto Then
-                'If first Pokémon is  Ditto, then the other Pokémon must be female to inherit the ball.
+                ' If the first Pokémon is Ditto, then the other Pokémon must be female to inherit the Poké Ball.
                 If p2.Gender = net.Pokemon3D.Game.Pokemon.Genders.Female Then
                     ballID = p2.CatchBall.ID
                 End If
             End If
             'Second Pokémon is Ditto.
             If p2.EggGroup1 = net.Pokemon3D.Game.Pokemon.EggGroups.Ditto Or p2.EggGroup2 = net.Pokemon3D.Game.Pokemon.EggGroups.Ditto Then
-                'If second Pokémon is  Ditto, then the other Pokémon must be female to inherit the ball.
+                'If the second Pokémon is Ditto, then the other Pokémon must be female to inherit the Poké Ball.
                 If p1.Gender = net.Pokemon3D.Game.Pokemon.Genders.Female Then
                     ballID = p1.CatchBall.ID
                 End If
             End If
-            'No Pokémon is Ditto:
+            ' No Pokémon is Ditto:
             If p1.EggGroup1 <> net.Pokemon3D.Game.Pokemon.EggGroups.Ditto And p1.EggGroup2 <> net.Pokemon3D.Game.Pokemon.EggGroups.Ditto And p2.EggGroup1 <> net.Pokemon3D.Game.Pokemon.EggGroups.Ditto And p2.EggGroup2 <> net.Pokemon3D.Game.Pokemon.EggGroups.Ditto Then
-                'First Pokémon is female:
+                ' First Pokémon is female:
                 If p1.Gender = net.Pokemon3D.Game.Pokemon.Genders.Female Then
                     ballID = p1.CatchBall.ID
                 End If
-                'Second Pokémon is female:
+                ' Second Pokémon is female:
                 If p2.Gender = net.Pokemon3D.Game.Pokemon.Genders.Female Then
                     ballID = p2.CatchBall.ID
                 End If
             End If
 
-            'Check for: Masterball, Cherish Ball: Set to Pokéball
+            ' Check for: Master Ball, Cherish Ball: Set to Poké Ball
             If ballID = 1 Or ballID = 45 Then
                 ballID = 5
             End If
         End If
 
-        'Return BallID (Standard is 5 for Pokéball)
+        ' Return BallID (Standard is 5 for Pokéball):
         Return ballID
     End Function
 

2.5DHero/2.5DHero/Screens/Pokemon/EvolutionScreen.vb

@@ -2,6 +2,8 @@
 
     Inherits Screen
 
+    ' Old Evolution System:
+
     'Private FromBattle As Boolean = False
     'Private EvolutionArgument As String = ""
     'Private EvolutionTrigger As EvolutionCondition.EvolutionTrigger
@@ -222,7 +224,7 @@
                             Sparks.Clear()
                             evolutionReady = True
                             brokeEvolution = True
-                            TextBox.Show("Your " & currentPokemon.GetDisplayName() & "~didn't evolve.", {}, False, False)
+                            TextBox.Show("Huh? " & currentPokemon.GetDisplayName() & "~stopped evolving!", {}, False, False)
                         End If
                     End If
                 Else
@@ -285,7 +287,7 @@
 
     Private Sub Endscene()
         If brokeEvolution = False Then
-            'Nincada's evolution to Shedinja if Pokéball is in Inventory and free space in party:
+            ' Nincada's evolution to Shedinja if a Poké Ball is in the player's Bag and free space is available in the player's party:
             If Shedinja.CanEvolveInto(Me.evolvedPokemon, Me.EvolutionTrigger) = True Then
                 Core.Player.Pokemons.Add(Shedinja.GenerateNew(evolvedPokemon))
                 Core.Player.Inventory.RemoveItem(5, 1)

2.5DHero/2.5DHero/Screens/Pokemon/LearnAttackScreen.vb

@@ -175,7 +175,7 @@
             Else
                 drawText = "Forget """ & Pokemon.Attacks(AttackIndex).Name & """ to learn """ & newAttack.Name & """?"
                 If canForget = False Then
-                    drawText = "Cannot forget the move " & Pokemon.Attacks(AttackIndex).Name & " because" & vbNewLine & "it's an HM move."
+                    drawText = "Cannot forget the move " & Pokemon.Attacks(AttackIndex).Name & " because" & vbNewLine & "it's a Hidden Machine move."
                 End If
             End If
 
@@ -270,7 +270,7 @@
 
             If AttackIndex <> 4 Then
                 TeachMovesScreen.LearnedMove = True
-                Text = "1...2...3...and*Poof!*" & Pokemon.GetDisplayName() & " forgot~" & Pokemon.Attacks(AttackIndex).Name & "! And..."
+                Text = "1...2...3...and*Ta-da!*" & Pokemon.GetDisplayName() & " forgot~" & Pokemon.Attacks(AttackIndex).Name & "! And..."
                 Pokemon.Attacks.RemoveAt(AttackIndex)
                 Pokemon.Attacks.Insert(AttackIndex, newAttack)
 

2.5DHero/2.5DHero/Screens/Pokemon/NameObjectScreen.vb

@@ -6,17 +6,17 @@ Public Class NameObjectScreen
 
     Inherits Screen
 
-    Private _pokemon As Pokemon 'Temporarly stores the Pokémon to rename.
+    Private _pokemon As Pokemon ' Temporarly stores the Pokémon to rename.
-    Private _currentText As String = "" 'The current Text in the textbox.
+    Private _currentText As String = "" ' The current Text in the textbox.
-    Private _mainTexture As Texture2D 'The temporary texture. Loads "GUI\Menus\Menu"
+    Private _mainTexture As Texture2D ' The temporary texture. Loads "GUI\Menus\Menu".
 
-    Private _index As Integer = 0 'the button index (0 or 1)
+    Private _index As Integer = 0 ' The button index (0 or 1).
-    Private _askedRename As Boolean = False 'If the question to rename is answered or not.
+    Private _askedRename As Boolean = False ' If the question to rename is answered or not.
-    Private _renamePokemon As Boolean = False 'If a Pokémon is getting renamed.
+    Private _renamePokemon As Boolean = False ' If a Pokémon is getting renamed.
 
-    Private _canChooseNo As Boolean = True 'if the player can choose to not rename the object.
+    Private _canChooseNo As Boolean = True ' If the player can choose to not rename the object.
-    Private _defaultName As String = "Name" 'The default name (that also gets mentioned in the question).
+    Private _defaultName As String = "Name" ' The default name (that also gets mentioned in the question).
-    Private _delay As Single = 0.0F 'The delay until the question can be answered.
+    Private _delay As Single = 0.0F ' The delay until the question can be answered.
 
     ''' <summary>
     ''' Handles the NameAccept event which fires if the object gets renamed.
@@ -32,7 +32,7 @@ Public Class NameObjectScreen
     ''' <param name="CurrentScreen">The currently active screen.</param>
     ''' <param name="Pokemon">The Pokémon reference to rename.</param>
     Public Sub New(ByVal CurrentScreen As Screen, ByVal Pokemon As Pokemon)
-        'Set default values:
+        ' Set default values:
         Me.Identification = Identifications.NameObjectScreen
         Me.PreScreen = CurrentScreen
         Me.MouseVisible = True
@@ -44,10 +44,10 @@ Public Class NameObjectScreen
         Me._defaultName = Pokemon.GetDisplayName()
         Me._renamePokemon = True
 
-        'Load texture:
+        ' Load texture:
         Me._mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
 
-        'Show the Pokémon image:
+        ' Show the Pokémon image:
         Screen.PokemonImageView.Show(Pokemon, True)
     End Sub
 
@@ -232,20 +232,20 @@ Public Class NameObjectScreen
     ''' <param name="text">The name string.</param>
     ''' <remarks>Only numbers and alphabetic characters are allowed (0-9, a-z, A-Z)</remarks>
     Private Function ReplaceInvalidChars(ByVal text As String) As String
-        'Creating the char array.
+        ' Creating the char array:
         Dim chars() As Char = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray()
 
-        'Create a new string to store the "purified" text in. YOU SHALL NOT PASS, EXTENDED LATIN
+        ' Create a new string to store the "purified" text in. YOU SHALL NOT PASS, EXTENDED LATIN.
         Dim newText As String = ""
 
-        'Loop through all of the original text and only put in the allowed ones.
+        ' Loop through all of the original text and only put in the allowed ones.
         For i = 0 To text.Length - 1
             If chars.Contains(text(i)) = True Then
                 newText &= text(i).ToString()
             End If
         Next
 
-        'Return the newly created string.
+        ' Return the newly created string.
         Return newText
     End Function
 

2.5DHero/2.5DHero/Screens/Pokemon/PokemonScreen.vb

@@ -503,7 +503,7 @@
                 Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New MapScreen(Core.CurrentScreen, startRegion, {"Fly", Core.Player.Pokemons(index)}), Color.White, False))
             End If
         Else
-            TextBox.Show("You cannot fly~from here!", {}, True, False)
+            TextBox.Show("You cannot Fly~from here!", {}, True, False)
         End If
     End Sub
 
@@ -523,7 +523,7 @@
                 Screen.Level.Entities.Remove(e)
             Next
         Else
-            TextBox.Show("There is no grass~to be cut!", {}, True, False)
+            TextBox.Show("There is nothing~to be Cut!", {}, True, False)
         End If
     End Sub
 
@@ -572,7 +572,7 @@
                     MusicManager.PlayMusic("ride", True)
                 End If
             Else
-                TextBox.Show("You cannot ride here!", {}, True, False)
+                TextBox.Show("You cannot Ride here!", {}, True, False)
             End If
         End If
     End Sub
@@ -666,7 +666,7 @@
     End Sub
 
     Private Sub CheckForLegendaryEmblem()
-        'This sub checks if Ho-Oh, Lugia and Suicune are in the player's party.
+        ' This sub checks if Ho-Oh, Lugia and Suicune are in the player's party.
         Dim hasHoOh As Boolean = False
         Dim hasLugia As Boolean = False
         Dim hasSuicune As Boolean = False

2.5DHero/2.5DHero/Screens/Pokemon/PokemonScreenV2.vb

@@ -26,7 +26,7 @@
         MyBase.Draw()
 
         If FadedIn = True Then
-            'Draw first Pokémon:
+            ' Draw first Pokémon:
             DrawFirstPokemon()
         End If
     End Sub
@@ -36,10 +36,10 @@
 
         Dim topLeft As Vector2 = Me.GetPositionInWindowTopLeft(0, 0)
 
-        'Shadow:
+        ' Shadow:
         Canvas.DrawRectangle(Me.OffsetRectangle(New Rectangle(topLeft.X.ToInteger() + 43, topLeft.Y.ToInteger() + 123, 80 * 3, 32 * 3)), New Color(0, 0, 0, 90))
 
-        'Box:
+        ' Box:
         Core.SpriteBatch.Draw(Me.texture,
                               Me.OffsetRectangle(New Rectangle(topLeft.X.ToInteger() + 40, topLeft.Y.ToInteger() + 120, 80 * 3, 32 * 3)),
                               New Rectangle(48, 16, 80, 32),
@@ -47,24 +47,24 @@
 
         Dim pTexture As Texture2D = poke.GetMenuTexture()
 
-        'Pokemon:
+        ' Pokémon:
         Core.SpriteBatch.Draw(pTexture, Me.OffsetRectangle(New Rectangle(topLeft.X.ToInteger() + 40, topLeft.Y.ToInteger() + 120, pTexture.Width * 2, pTexture.Height * 2)), Color.White)
-        'Name:
+        ' Name:
         Core.SpriteBatch.DrawString(FontManager.MiniFont, poke.GetDisplayName(), Me.OffsetVector(New Vector2(topLeft.X + 108, topLeft.Y + 134)), Color.White, 0.0F, Vector2.Zero, 1.2F, SpriteEffects.None, 0.0F)
-        'Level:
+        ' Level:
         Core.SpriteBatch.DrawString(FontManager.MiniFont, "Lv. " & poke.Level.ToString(), Me.OffsetVector(New Vector2(topLeft.X + 44, topLeft.Y + 188)), Color.White)
 
-        'Item:
+        ' Item:
         If poke.Item IsNot Nothing Then
             Core.SpriteBatch.Draw(poke.Item.Texture, Me.OffsetRectangle(New Rectangle(topLeft.X.ToInteger() + 80, topLeft.Y.ToInteger() + 160, 24, 24)), Color.White)
         End If
 
-        '"HP":
+        ' Hit Points:
         Core.SpriteBatch.Draw(Me.battleTexture,
                               Me.OffsetRectangle(New Rectangle(topLeft.X.ToInteger() + 108, topLeft.Y.ToInteger() + 170, 13 * 2, 6 * 2)),
                               New Rectangle(6, 37, 13, 6),
                               Color.White)
-        'HP bar:
+        ' Hit Points bar:
         Dim HPpercentage As Single = (100.0F / poke.MaxHP) * poke.HP
         Dim HPlength As Integer = CInt(Math.Ceiling(140 / 100 * HPpercentage.Clamp(1, 999)))
 
@@ -100,10 +100,10 @@
             Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + HPlength - 2, CInt(pos.Y), 2, 12), New Rectangle(cX, 37, 1, 6), Color.White)
         End If
 
-        'HP text:
+        ' Hit Points text:
         Core.SpriteBatch.DrawString(FontManager.MiniFont, poke.HP & " / " & poke.MaxHP, Me.OffsetVector(New Vector2(topLeft.X + 140, topLeft.Y + 188)), Color.White)
 
-        'Status:
+        ' Status:
         Dim StatusTexture As Texture2D = BattleStats.GetStatImage(poke.Status)
         If Not StatusTexture Is Nothing Then
             Core.SpriteBatch.Draw(StatusTexture, Me.OffsetRectangle(New Rectangle(CInt(topLeft.X + 235), CInt(topLeft.Y + 192), 38, 12)), Color.White)

2.5DHero/2.5DHero/Screens/Pokemon/PokemonStatusScreen.vb

@@ -195,7 +195,7 @@
     Private Sub DrawHeader()
         Dim CanvasTexture As Texture2D = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), "")
 
-        'EVColors:
+        ' Effort Value colors:
         With Me.Pokemon
             Dim AllEVs As Integer = .EVHP + .EVAttack + .EVDefense + .EVSpAttack + .EVSpDefense + .EVSpeed
 
@@ -241,7 +241,7 @@
             Core.SpriteBatch.Draw(Pokemon.Item.Texture, New Rectangle(118, 150, 28, 28), Color.White)
         End If
 
-        'Portray
+        ' Portray:
         Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(60, 196, 128, 128))
         Core.SpriteBatch.Draw(Pokemon.GetTexture(FrontView), New Rectangle(74, 208, 124, 124), Color.White)
         Core.SpriteBatch.Draw(Pokemon.CatchBall.Texture, New Rectangle(74, 318, 24, 24), Color.White)
@@ -249,7 +249,7 @@
             Core.SpriteBatch.Draw(MainTexture, New Rectangle(78, 218, 18, 18), New Rectangle(118, 4, 9, 9), Color.White)
         End If
 
-        'Other:
+        ' Other:
         If Me.Pokemon.EggSteps = 0 Then
             Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(60, 356, 128, 224))
             Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\Types"), New Rectangle(76, 380, 48, 16), Me.Pokemon.Type1.GetElementImage(), Color.White)
@@ -285,7 +285,7 @@
         Dim p As Vector2 = New Vector2(140, 180)
 
         With Core.SpriteBatch
-            'Stats:
+            ' Stats:
             Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(220, 196, 320, 256))
             Dim barX As Integer = CInt((Pokemon.HP / Pokemon.MaxHP) * 150)
             Dim barRectangle As Rectangle
@@ -353,7 +353,7 @@
             .DrawString(FontManager.MiniFont, blueText, New Vector2(CInt(p.X + 100), CInt(p.Y + 68)), Color.Blue)
             .DrawString(FontManager.MiniFont, Pokemon.HP & " / " & Pokemon.MaxHP & vbNewLine & vbNewLine & Pokemon.Attack & vbNewLine & vbNewLine & Pokemon.Defense & vbNewLine & vbNewLine & Pokemon.SpAttack & vbNewLine & vbNewLine & Pokemon.SpDefense & vbNewLine & vbNewLine & Pokemon.Speed, New Vector2(CInt(p.X + 280), CInt(p.Y + 68)), Color.Black)
 
-            'Experience:
+            ' Experience Points:
             If Pokemon.Level < CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) Then
                 Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(220, 484, 320, 96))
 
@@ -404,13 +404,13 @@
         Dim CanvasTexture As Texture2D = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), "")
         Dim p As Vector2 = New Vector2(140, 180)
 
-        'Catchinfos
+        ' Capture Information: 
         Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(220, 196, 320, 96))
         With Core.SpriteBatch
             .DrawString(FontManager.MiniFont, Localization.GetString("poke_status_screen_OT") & ": " & Pokemon.OT & " /" & Pokemon.CatchTrainerName & vbNewLine & vbNewLine & Pokemon.CatchMethod & vbNewLine & Pokemon.CatchLocation, New Vector2(238, 214), Color.DarkBlue)
         End With
 
-        'Item:
+        ' Item:
         Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(220, 324, 320, 128))
         If Me.Pokemon.EggSteps = 0 Then
             If Not Pokemon.Item Is Nothing Then
@@ -422,7 +422,7 @@
             End If
         End If
 
-        'Ability:
+        ' Ability:
         Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(220, 484, 320, 96))
         If Me.Pokemon.EggSteps = 0 Then
             With Core.SpriteBatch

2.5DHero/2.5DHero/Screens/Screen.vb

@@ -99,7 +99,7 @@ Public MustInherit Class Screen
     Private Shared _globalPokemonImageView As New PokemonImageView
 
     ''' <summary>
-    ''' A global camera instance, that carries over screen instances.
+    ''' A global camera instance that carries over screen instances.
     ''' </summary>
     Public Shared Property Camera() As Camera
         Get
@@ -111,7 +111,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global level instance, that carries over screen instances.
+    ''' A global level instance that carries over screen instances.
     ''' </summary>
     Public Shared Property Level() As Level
         Get
@@ -123,7 +123,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global BasicEffect instance, that carries over screen instances.
+    ''' A global BasicEffect instance that carries over screen instances.
     ''' </summary>
     Public Shared Property Effect() As BasicEffect
         Get
@@ -135,7 +135,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global SkyDome instance, that carries over screen instances.
+    ''' A global SkyDome instance that carries over screen instances.
     ''' </summary>
     Public Shared Property SkyDome() As SkyDome
         Get
@@ -147,7 +147,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global TextBox instance, that carries over screen instances.
+    ''' A global TextBox instance that carries over screen instances.
     ''' </summary>
     Public Shared Property TextBox() As TextBox
         Get
@@ -159,7 +159,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global ChooseBox instance, that carries over screen instances.
+    ''' A global ChooseBox instance that carries over screen instances.
     ''' </summary>
     Public Shared Property ChooseBox() As ChooseBox
         Get
@@ -171,7 +171,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' A global PokemonImageView instance, that carries over screen instances.
+    ''' A global PokemonImageView instance that carries over screen instances.
     ''' </summary>
     Public Shared Property PokemonImageView() As PokemonImageView
         Get
@@ -187,7 +187,7 @@ Public MustInherit Class Screen
 #Region "Fields"
 
     Private _preScreen As Screen = Nothing
-    Private _identification As Identifications = Identifications.MainMenuScreen 'Some default value I guess...
+    Private _identification As Identifications = Identifications.MainMenuScreen ' Some default value I guess...
 
     Private _mouseVisible As Boolean = False
     Private _canBePaused As Boolean = True
@@ -222,7 +222,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the mouse is visible on the screen.
+    ''' Whether the mouse cursor is visible on the screen.
     ''' </summary>
     ''' <remarks>The default value is "False".</remarks>
     Public Property MouseVisible() As Boolean
@@ -235,7 +235,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the game can be paused when pressing Escape.
+    ''' Whether the game can be paused when pressing the Escape key.
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanBePaused() As Boolean
@@ -248,7 +248,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the game can be muted by pressing M (default).
+    ''' Whether the game can be muted by pressing the M key (default).
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanMuteMusic() As Boolean
@@ -261,7 +261,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the ChatScreen can be opened by pressing T (default).
+    ''' Whether the ChatScreen can be opened by pressing the T key (default).
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanChat() As Boolean
@@ -274,7 +274,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether a screenshot can be taken by pressing F2 (default).
+    ''' Whether a screenshot can be taken by pressing the F2 key (default).
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanTakeScreenshot() As Boolean
@@ -287,7 +287,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the debug information can be drawn on the screen.
+    ''' Whether the debug information can be drawn on the screen.
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanDrawDebug() As Boolean
@@ -300,7 +300,7 @@ Public MustInherit Class Screen
     End Property
 
     ''' <summary>
-    ''' Wether the game can switch its fullscreen state by pressing F11 (default).
+    ''' Whether the game can switch its fullscreen state by pressing the F11 key (default).
     ''' </summary>
     ''' <remarks>The default value is "True".</remarks>
     Public Property CanGoFullscreen() As Boolean
@@ -312,8 +312,8 @@ Public MustInherit Class Screen
         End Set
     End Property
 
-    Public UpdateFadeOut As Boolean = False 'Sets if the screen gets updated during its set as a FadeOut screen on the TransitionScreen.
+    Public UpdateFadeOut As Boolean = False ' Sets if the screen gets updated during its set as a FadeOut screen on the TransitionScreen.
-    Public UpdateFadeIn As Boolean = False 'Sets if the screen gets updated during its set as a FadeIn screen on the TransitionScreen.
+    Public UpdateFadeIn As Boolean = False ' Sets if the screen gets updated during its set as a FadeIn screen on the TransitionScreen.
 
 #End Region
 
@@ -321,13 +321,13 @@ Public MustInherit Class Screen
     ''' Sets all default fields of the screen instance.
     ''' </summary>
     ''' <param name="Identification">The ID of the screen.</param>
-    ''' <param name="MouseVisible">Sets if the mouse is visible on the screen.</param>
+    ''' <param name="MouseVisible">Sets if the mouse cursor is visible on the screen.</param>
-    ''' <param name="CanBePaused">Sets if the PauseScreen can be opened by pressing Escape.</param>
+    ''' <param name="CanBePaused">Sets if the PauseScreen can be opened by pressing the Escape key.</param>
-    ''' <param name="CanMuteMusic">Sets if the M button (default) can mute the music.</param>
+    ''' <param name="CanMuteMusic">Sets if the M key (default) can mute the music.</param>
-    ''' <param name="CanChat">Sets if the T button (default) can open the chat screen.</param>
+    ''' <param name="CanChat">Sets if the T key (default) can open the chat screen.</param>
-    ''' <param name="CanTakeScreenshot">Sets if the F2 button (default) can take a screenshot.</param>
+    ''' <param name="CanTakeScreenshot">Sets if the F2 key (default) can take a screenshot.</param>
     ''' <param name="CanDrawDebug">Sets if the debug information can be drawn on this screen.</param>
-    ''' <param name="CanGoFullscreen">Sets if the F11 button (default) can sets the game to fullscreen (or back).</param>
+    ''' <param name="CanGoFullscreen">Sets if the F11 key (default) can sets the game to fullscreen (or back).</param>
     Private Sub Setup(ByVal Identification As Identifications, ByVal MouseVisible As Boolean, ByVal CanBePaused As Boolean, ByVal CanMuteMusic As Boolean, ByVal CanChat As Boolean, ByVal CanTakeScreenshot As Boolean, ByVal CanDrawDebug As Boolean, ByVal CanGoFullscreen As Boolean)
         Me.Identification = Identification
         Me.MouseVisible = MouseVisible
@@ -382,7 +382,7 @@ Public MustInherit Class Screen
     ''' Returns if this screen instance is the currently active screen (set in the global Basic.CurrentScreen).
     ''' </summary>
     Public Function IsCurrentScreen() As Boolean
-        If Core.CurrentScreen.Identification = Me.Identification Then 'If the screen stored in the CurrentScreen field has the same ID as this screen, return true.
+        If Core.CurrentScreen.Identification = Me.Identification Then ' If the screen stored in the CurrentScreen field has the same ID as this screen, return true.
             Return True
         Else
             Return False
@@ -409,21 +409,21 @@ Public MustInherit Class Screen
     ''' An event that is getting raised when the Escape button is getting pressed. The PauseScreen is getting brought up if the CanBePaused field is set to true.
     ''' </summary>
     Public Overridable Sub EscapePressed()
-        'If the game can be paused on this screen, open the PauseScreen.
+        ' If the game can be paused on this screen, open the PauseScreen.
         If Core.CurrentScreen.CanBePaused = True Then
             Core.SetScreen(New PauseScreen(Core.CurrentScreen))
         End If
     End Sub
 
     ''' <summary>
-    ''' Draws XBOX controls on the bottom right of the screen.
+    ''' Draws Xbox controls on the bottom right of the screen.
     ''' </summary>
     ''' <param name="Descriptions">The button types and descriptions.</param>
     ''' <remarks>Calculates the position and calls DrawGamePadControls(Descriptions,Position)</remarks>
     Friend Sub DrawGamePadControls(ByVal Descriptions As Dictionary(Of Microsoft.Xna.Framework.Input.Buttons, String))
-        Dim x As Integer = Core.windowSize.Width 'Store the x position of the start of the controls render.
+        Dim x As Integer = Core.windowSize.Width ' Store the X position at the start of the controls render.
 
-        'Loop through the buttons and add to the x location.
+        ' Loop through the buttons and add to the X location:
         For i = 0 To Descriptions.Count - 1
             Select Case Descriptions.Keys(i)
                 Case Buttons.A, Buttons.B, Buttons.X, Buttons.Y, Buttons.Start, Buttons.LeftStick, Buttons.RightStick, Buttons.LeftTrigger, Buttons.RightTrigger
@@ -432,33 +432,33 @@ Public MustInherit Class Screen
                     x -= 64 + 4
             End Select
 
-            'Add to the x location for the length of the string and a separator.
+            ' Add to the X location for the length of the string and a separator:
             x -= CInt(FontManager.MainFont.MeasureString(Descriptions.Values(i)).X) + 16
         Next
 
-        'Finally, render the buttons:
+        ' Finally, render the buttons:
         DrawGamePadControls(Descriptions, New Vector2(x, Core.windowSize.Height - 40))
     End Sub
 
     ''' <summary>
-    ''' Generic void to render XBOX Gamepad controls on the screen.
+    ''' Generic void to render Xbox Gamepad controls on the screen.
     ''' </summary>
     ''' <param name="Descriptions">The button types and descriptions.</param>
     ''' <param name="Position">The position to draw the buttons.</param>
     Friend Sub DrawGamePadControls(ByVal Descriptions As Dictionary(Of Microsoft.Xna.Framework.Input.Buttons, String), ByVal Position As Vector2)
-        'Only if a Gamepad is connected and the screen is active, render the buttons:
+        ' Only if a Gamepad is connected and the screen is active, render the buttons:
         If GamePad.GetState(PlayerIndex.One).IsConnected = True And Core.GameOptions.GamePadEnabled = True And Me.IsCurrentScreen() = True Then
-            'Transform the position to integers and store the current drawing position:
+            ' Transform the position to integers and store the current drawing position:
             Dim x As Integer = CInt(Position.X)
             Dim y As Integer = CInt(Position.Y)
 
-            'Loop through the button list:
+            ' Loop through the button list:
             For i = 0 To Descriptions.Count - 1
-                Dim t As String = "GUI\GamePad\xboxController" 'Store the texture path.
+                Dim t As String = "GUI\GamePad\xboxController" ' Store the texture path.
-                Dim width As Integer = 32 'Store the width of the image.
+                Dim width As Integer = 32 ' Store the width of the image.
-                Dim height As Integer = 32 'Store the height of the image.
+                Dim height As Integer = 32 ' Store the height of the image.
 
-                'Get the correct button image and size (currently, all buttons use the same size of 32x32 pixels).
+                ' Get the correct button image and size (currently, all buttons use the same size of 32x32 pixels).
                 Select Case Descriptions.Keys(i)
                     Case Buttons.A
                         t &= "ButtonA"
@@ -484,18 +484,18 @@ Public MustInherit Class Screen
                         t &= "Start"
                 End Select
 
-                'Draw the buttons (first, the "shadow" with a black color, then the real button).
+                ' Draw the buttons (first, the "shadow" with a black color, then the real button):
                 Core.SpriteBatch.Draw(TextureManager.GetTexture(t), New Rectangle(x + 2, y + 2, width, height), Color.Black)
                 Core.SpriteBatch.Draw(TextureManager.GetTexture(t), New Rectangle(x, y, width, height), Color.White)
 
-                'Add the button width and a little offset to the drawing position:
+                ' Add the button width and a little offset to the drawing position:
                 x += width + 4
 
-                'Draw the button description (again, with a shadow):
+                ' Draw the button description (again, with a shadow):
                 Core.SpriteBatch.DrawString(FontManager.MainFont, Descriptions.Values(i), New Vector2(x + 3, y + 7), Color.Black)
                 Core.SpriteBatch.DrawString(FontManager.MainFont, Descriptions.Values(i), New Vector2(x, y + 4), Color.White)
 
-                'Add the text width and the offset for the next button description to the drawing position:
+                ' Add the text width and the offset for the next button description to the drawing position:
                 x += CInt(FontManager.MainFont.MeasureString(Descriptions.Values(i)).X) + 16
             Next
         End If
@@ -505,7 +505,7 @@ Public MustInherit Class Screen
     ''' Returns the screen status of the current screen. Override this function to return a screen state.
     ''' </summary>
     Public Overridable Function GetScreenStatus() As String
-        '// Return the generic "not implemented" message:
+        ' // Return the generic "not implemented" message:
         Return "Screen state not implemented for screen class: " & Me.Identification.ToString()
     End Function
 
@@ -514,7 +514,7 @@ Public MustInherit Class Screen
     ''' </summary>
     ''' <remarks>The default size is 800x620 pixels.</remarks>
     Public Overridable Function GetScreenScaleMinimum() As Size
-        '// Default size: 800x620 pixels.
+        ' // Default size: 800x620 pixels.
         Return New Size(800, 620)
     End Function
 

2.5DHero/2.5DHero/Screens/TradeScreen.vb

@@ -550,21 +550,21 @@ Public Class TradeScreen
                 End If
             Next
 
-            'Item Description:
+            ' Item description:
             If New Rectangle(736, 160, 256, 256).Contains(MouseHandler.MousePosition) = True Then
                 Me.BuyItemsShowDescription = Not Me.BuyItemsShowDescription
             End If
 
-            '- button:
+            ' - button:
             If New Rectangle(664, 484, 64, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonBuyItemsMinus()
             End If
-            '+ button:
+            ' + button:
             If New Rectangle(856, 484, 64, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonBuyItemsPlus()
             End If
 
-            'Buy button:
+            ' Buy button:
             If New Rectangle(664 + 64, 484 + 64 + 22, 64 * 3, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonBuyItemsBuy()
             End If
@@ -628,12 +628,12 @@ Public Class TradeScreen
             Me.ChangeCurrencyAmount(-(tradeItem.Price * Me.BuyItemsAmount))
             Core.Player.Inventory.AddItem(tradeItem.ItemID, Me.BuyItemsAmount)
 
-            'add a Premier Ball (ID=3) if the player bought 10 or more Poké Balls (ID=5):
+            ' Add a Premier Ball (ID=3) if the player bought 10 or more Poké Balls (ID=5):
             If tradeItem.ItemID = 5 And Me.BuyItemsAmount >= 10 Then
                 Core.Player.Inventory.AddItem(3, 1)
             End If
 
-            'Remove trade item from seller's side if the rest amount is smaller than 0:
+            ' Remove trade item from seller's side if the rest amount is smaller than 0:
             If tradeItem.Amount > -1 Then
                 For i = 0 To Me.TradeItems.Count - 1
                     If Me.TradeItems(i).ItemID = tradeItem.ItemID And tradeItem.Amount = Me.TradeItems(i).Amount Then
@@ -679,7 +679,7 @@ Public Class TradeScreen
     End Function
 
     Private Sub DrawBuyItems()
-        'Item selection menu:
+        ' Item selection menu:
         For i = Scroll To Scroll + 5
             If i <= Me.BuyItemsList.Count - 1 Then
                 Dim p As Integer = i - Scroll
@@ -691,7 +691,7 @@ Public Class TradeScreen
         If Me.BuyItemsList.Count > 0 Then
             Dim selectedItem As TradeItem = Me.BuyItemsList(Scroll + Cursor)
 
-            'Item Preview:
+            ' Item preview:
             Core.SpriteBatch.EndBatch()
             Core.SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise)
             Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Box\Sparkle"), New Rectangle(736 + 128, 160 + 128, 256, 256), Nothing, Color.White, BuySellSparkleRotation, New Vector2(128, 128), SpriteEffects.None, 0.0F)
@@ -707,7 +707,7 @@ Public Class TradeScreen
                 SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(736 + 30, 160 + 30), Color.White)
             End If
 
-            'Amount of item in bag:
+            ' Amount of the selected item in the player's Bag:
             Dim amount As String = Core.Player.Inventory.GetItemAmount(selectedItem.ItemID).ToString()
             While amount.Length < 3
                 amount = "0" & amount
@@ -718,11 +718,11 @@ Public Class TradeScreen
             End If
             Me.DrawBanner(New Vector2(665, 430), 30, "In Inventory: " & amount & bannerText, FontManager.MiniFont, 400)
 
-            '- button:
+            ' - button:
             Core.SpriteBatch.Draw(texture, New Rectangle(664, 484, 64, 64), New Rectangle(16, 32, 16, 16), Color.White)
             Core.SpriteBatch.DrawString(FontManager.MainFont, "-", New Vector2(664 + 23, 484 + 2), Color.Black, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
 
-            'amount field:
+            ' Amount field:
             Canvas.DrawRectangle(New Rectangle(740, 492, 104, 48), New Color(77, 147, 198))
             Canvas.DrawRectangle(New Rectangle(744, 496, 96, 40), New Color(232, 240, 248))
             Dim amountString As String = Me.BuyItemsAmount.ToString()
@@ -732,14 +732,14 @@ Public Class TradeScreen
             amountString = "x" & amountString
             Core.SpriteBatch.DrawString(FontManager.MainFont, amountString, New Vector2(792 - FontManager.MainFont.MeasureString(amountString).X / 2.0F, 504), Color.Black)
 
-            '+ button:
+            ' + button:
             Core.SpriteBatch.Draw(texture, New Rectangle(856, 484, 64, 64), New Rectangle(16, 32, 16, 16), Color.White)
             Core.SpriteBatch.DrawString(FontManager.MainFont, "+", New Vector2(856 + 19, 484 + 6), Color.Black, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
 
             Core.SpriteBatch.DrawString(FontManager.MainFont, "Per Item: " & selectedItem.Price.ToString() & GetCurrencyShort() & vbNewLine &
                                                        "Total: " & (BuyItemsAmount * selectedItem.Price).ToString() & GetCurrencyShort(), New Vector2(930, 490), Color.White)
 
-            'Buy button:
+            ' Buy button:
             If Me.BuyItemsAmount > 0 Then
                 If ControllerHandler.IsConnected() = True Then
                     Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(664 + 12, 484 + 64 + 34, 40, 40), Color.White)
@@ -749,10 +749,10 @@ Public Class TradeScreen
             End If
         End If
 
-        'Current balance:
+        ' Current balance:
         Me.DrawBanner(New Vector2(665, 110), 30, "Current balance: " & GetCurrencyDisplay(), FontManager.MiniFont, 400)
 
-        'Cursor draw:
+        ' Cursor draw:
         Me.DrawMainCursor()
     End Sub
 
@@ -919,21 +919,21 @@ Public Class TradeScreen
                 End If
             Next
 
-            'Item Description:
+            ' Item description:
             If New Rectangle(736, 160, 256, 256).Contains(MouseHandler.MousePosition) = True Then
                 Me.SellItemsShowDescription = Not Me.SellItemsShowDescription
             End If
 
-            '- button:
+            ' - button:
             If New Rectangle(664, 484, 64, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonSellItemsMinus()
             End If
-            '+ button:
+            ' + button:
             If New Rectangle(856, 484, 64, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonSellItemsPlus()
             End If
 
-            'Buy button:
+            ' Buy button:
             If New Rectangle(664 + 64, 484 + 64 + 22, 64 * 3, 64).Contains(MouseHandler.MousePosition) = True Then
                 Me.ButtonSellItemsSell()
             End If
@@ -1020,7 +1020,7 @@ Public Class TradeScreen
     End Sub
 
     Private Sub DrawSellItems()
-        'Item selection menu:
+        ' Item selection menu:
         For i = Scroll To Scroll + 5
             If i <= Me.SellItemsList.Count - 1 Then
                 Dim p As Integer = i - Scroll
@@ -1032,7 +1032,7 @@ Public Class TradeScreen
         If Me.SellItemsList.Count > 0 Then
             Dim selectedItem As TradeItem = Me.SellItemsList(Scroll + Cursor)
 
-            'Item Preview:
+            ' Item preview:
             Core.SpriteBatch.EndBatch()
             Core.SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise)
             Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Box\Sparkle"), New Rectangle(736 + 128, 160 + 128, 256, 256), Nothing, Color.White, BuySellSparkleRotation, New Vector2(128, 128), SpriteEffects.None, 0.0F)
@@ -1048,18 +1048,18 @@ Public Class TradeScreen
                 SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(736 + 30, 160 + 30), Color.White)
             End If
 
-            'Amount of item in bag:
+            ' Amount of the selected item in the player's Bag:
             Dim amount As String = Core.Player.Inventory.GetItemAmount(selectedItem.ItemID).ToString()
             While amount.Length < 3
                 amount = "0" & amount
             End While
-            Me.DrawBanner(New Vector2(665, 430), 30, "In Inventory: " & amount, FontManager.MiniFont, 400)
+            Me.DrawBanner(New Vector2(665, 430), 30, "In Bag " & amount, FontManager.MiniFont, 400)
 
-            '- button:
+            ' - button:
             Core.SpriteBatch.Draw(texture, New Rectangle(664, 484, 64, 64), New Rectangle(16, 32, 16, 16), Color.White)
             Core.SpriteBatch.DrawString(FontManager.MainFont, "-", New Vector2(664 + 23, 484 + 2), Color.Black, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
 
-            'amount field:
+            ' Amount field:
             Canvas.DrawRectangle(New Rectangle(740, 492, 104, 48), New Color(77, 147, 198))
             Canvas.DrawRectangle(New Rectangle(744, 496, 96, 40), New Color(232, 240, 248))
             Dim amountString As String = Me.SellItemsAmount.ToString()
@@ -1069,14 +1069,14 @@ Public Class TradeScreen
             amountString = "x" & amountString
             Core.SpriteBatch.DrawString(FontManager.MainFont, amountString, New Vector2(792 - FontManager.MainFont.MeasureString(amountString).X / 2.0F, 504), Color.Black)
 
-            '+ button:
+            ' + button:
             Core.SpriteBatch.Draw(texture, New Rectangle(856, 484, 64, 64), New Rectangle(16, 32, 16, 16), Color.White)
             Core.SpriteBatch.DrawString(FontManager.MainFont, "+", New Vector2(856 + 19, 484 + 6), Color.Black, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
 
             Core.SpriteBatch.DrawString(FontManager.MainFont, "Per Item: " & selectedItem.SellPrice().ToString() & GetCurrencyShort() & vbNewLine &
                                                        "Total: " & (SellItemsAmount * selectedItem.SellPrice()).ToString() & GetCurrencyShort(), New Vector2(930, 490), Color.White)
 
-            'Sell button:
+            ' Sell button:
             If Me.SellItemsAmount > 0 Then
                 If ControllerHandler.IsConnected() = True Then
                     Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(664 + 12, 484 + 64 + 34, 40, 40), Color.White)
@@ -1086,10 +1086,10 @@ Public Class TradeScreen
             End If
         End If
 
-        'Current balance:
+        ' Current balance:
         Me.DrawBanner(New Vector2(665, 110), 30, "Current balance: " & GetCurrencyDisplay(), FontManager.MiniFont, 400)
 
-        'Cursor draw:
+        ' Cursor draw:
         Me.DrawMainCursor()
     End Sub
 
@@ -1153,7 +1153,7 @@ Public Class TradeScreen
         DrawButton(New Vector2(Core.windowSize.Width / 2.0F - 192, Core.windowSize.Height / 2.0F - 60), 4, "Sell", 16, Nothing)
         DrawButton(New Vector2(Core.windowSize.Width / 2.0F - 192, Core.windowSize.Height / 2.0F + 36), 4, "Cancel", 16, Nothing)
 
-        'Cursor:
+        ' Cursor:
         Dim cPosition As Vector2 = New Vector2(Core.windowSize.Width / 2.0F - 192 + 280, Core.windowSize.Height / 2.0F - 60 + Me.sellItemsConfirmationCursor * 96 - 42)
 
         Dim t As Texture2D = TextureManager.GetTexture("GUI\Menus\General", New Rectangle(0, 0, 16, 16), "")
@@ -1259,7 +1259,7 @@ Public Class TradeScreen
             Case Currencies.BattlePoints
                 Return GetCurrencyAmount().ToString() & " Battle Points"
             Case Currencies.Pokédollar
-                Return GetCurrencyAmount().ToString() & " Pokédollar"
+                Return GetCurrencyAmount().ToString() & " Pokémon Dollars"
         End Select
         Return ""
     End Function

2.5DHero/2.5DHero/Screens/WindowScreen.vb

@@ -5,7 +5,7 @@ Public MustInherit Class WindowScreen
 
     Inherits Screen
 
-    'Shared controller to check if any other window screen is drawing a gradient already. If so, don't draw another gradient on top.
+    ' Shared controller to check if any other window screen is drawing a gradient already. If so, don't draw another gradient on top:
     Public Shared IsDrawingGradients As Boolean = False
 
     Const STARTWINDOWSINK As Integer = -35
@@ -16,10 +16,10 @@ Public MustInherit Class WindowScreen
     Private _isCentered As Boolean = False
     Private _texture As Texture2D
     Private _windowElementsX As Integer = 8
-    Private _windowElementsY As Integer = 7 'includes title bar
+    Private _windowElementsY As Integer = 7 ' Includes the title bar.
     Private _textureScale As Single = 5.0F
     Private _title As String = "{WindowTitle}"
-    Private _drawingGradient As Boolean = False 'Checks if this window screen is drawing the gradient.
+    Private _drawingGradient As Boolean = False ' Checks if this window screen is drawing the gradient.
     Private _closing As Boolean = False
 
     Public Sub New(ByVal PreScreen As Screen, ByVal Identification As Identifications, ByVal Title As String)
@@ -66,55 +66,55 @@ Public MustInherit Class WindowScreen
                 startPosition = New Vector2(CSng(Core.windowSize.Width / 2 - windowWidth / 2), CSng(Core.windowSize.Height / 2 - windowHeight / 2))
             End If
 
-            'Frame:
+            ' Frame:
             For x = 0 To _windowElementsX - 1
                 For y = 0 To _windowElementsY - 1
 
-                    'Grab texture and sprite effect:
+                    ' Grab texture and sprite effect:
                     Dim r As New Vector2(0, 64)
                     Dim e As SpriteEffects = SpriteEffects.None
 
-                    If x = 0 And y = 0 Then 'Title, left
+                    If x = 0 And y = 0 Then ' Title, left
                         r = New Vector2(0, 64)
-                    ElseIf x = 1 And y = 0 Then 'Title, left2
+                    ElseIf x = 1 And y = 0 Then ' Title, left2
                         r = New Vector2(16, 64)
-                    ElseIf x > 1 And x < _windowElementsX - 2 And y = 0 Then 'Title, center
+                    ElseIf x > 1 And x < _windowElementsX - 2 And y = 0 Then ' Title, center
                         r = New Vector2(32, 64)
-                    ElseIf x = _windowElementsX - 2 And y = 0 Then 'Title right2
+                    ElseIf x = _windowElementsX - 2 And y = 0 Then ' Title right2
                         r = New Vector2(16, 64)
                         e = SpriteEffects.FlipHorizontally
-                    ElseIf x = _windowElementsX - 1 And y = 0 Then 'Title, right
+                    ElseIf x = _windowElementsX - 1 And y = 0 Then ' Title, right
                         r = New Vector2(0, 64)
                         e = SpriteEffects.FlipHorizontally
-                    ElseIf x = 0 And y = 1 Then 'Window, up left
+                    ElseIf x = 0 And y = 1 Then ' Window, up left
                         r = New Vector2(0, 80)
-                    ElseIf x = _windowElementsX - 1 And y = 1 Then 'Window, up right
+                    ElseIf x = _windowElementsX - 1 And y = 1 Then ' Window, up right
                         r = New Vector2(32, 80)
-                    ElseIf x = 0 And y = _windowElementsY - 1 Then 'Window, down left
+                    ElseIf x = 0 And y = _windowElementsY - 1 Then ' Window, down left
                         r = New Vector2(0, 112)
-                    ElseIf x = _windowElementsX - 1 And y = _windowElementsY - 1 Then 'Window, down right
+                    ElseIf x = _windowElementsX - 1 And y = _windowElementsY - 1 Then ' Window, down right
                         r = New Vector2(32, 112)
-                    ElseIf x > 0 And x < _windowElementsX - 1 And y = 1 Then 'Window, up
+                    ElseIf x > 0 And x < _windowElementsX - 1 And y = 1 Then ' Window, up
                         r = New Vector2(16, 80)
-                    ElseIf x = 0 And y > 1 And y < _windowElementsY - 1 Then 'Window, left
+                    ElseIf x = 0 And y > 1 And y < _windowElementsY - 1 Then ' Window, left
                         r = New Vector2(0, 96)
-                    ElseIf x = _windowElementsX - 1 And y > 1 And y < _windowElementsY - 1 Then 'Window, right
+                    ElseIf x = _windowElementsX - 1 And y > 1 And y < _windowElementsY - 1 Then ' Window, right
                         r = New Vector2(32, 96)
-                    ElseIf x > 0 And x < _windowElementsX - 1 And y = _windowElementsY - 1 Then 'Window, down
+                    ElseIf x > 0 And x < _windowElementsX - 1 And y = _windowElementsY - 1 Then ' Window, down
                         r = New Vector2(16, 112)
-                    Else 'Window, center
+                    Else ' Window, center
                         r = New Vector2(16, 96)
                     End If
 
-                    'Render:
+                    ' Render:
                     Core.SpriteBatch.Draw(Me._texture, New Rectangle(CInt(startPosition.X + x * GetWindowElementSize()), CInt(startPosition.Y + y * GetWindowElementSize()) + _windowSink, GetWindowElementSize(), GetWindowElementSize()), New Rectangle(CInt(r.X), CInt(r.Y), 16, 16), Color.White, 0.0F, Vector2.Zero, e, 0.0F)
                 Next
             Next
 
-            'Title:
+            ' Title:
-            Dim titleStartX As Integer = CInt(32 * _textureScale + startPosition.X) 'Skip first two panels
+            Dim titleStartX As Integer = CInt(32 * _textureScale + startPosition.X) ' Skip the first two panels
             Dim titleStartY As Integer = CInt(startPosition.Y)
-            Dim titleAreaWidth As Integer = CInt((_windowElementsX - 4) * GetWindowElementSize()) 'Width of the window minus two panels on each side.
+            Dim titleAreaWidth As Integer = CInt((_windowElementsX - 4) * GetWindowElementSize()) ' Width of the window minus the two panels on each side.
             Dim titleAreaHeight As Integer = GetWindowElementSize()
             Dim FontSize As Vector2 = FontManager.MainFont.MeasureString(_title)
 

2.5DHero/2.5DHero/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 42308840
+        Const EXPECTEDSIZE As Integer = 42308847
-        Const METAHASH As String = "MzJEODhGNkEwNzY0MzJCMTNERTlFMDM4REE3MDA5RjI="
+        Const METAHASH As String = "ODU1QkIwNDI1Q0U0Q0QwNkRCNUU4MzM2QTQ2Q0M3QTc="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get

2.5DHero/2.5DHero/Security/HackerAlerts.vb

@@ -14,16 +14,16 @@
 
         Private Shared Sub TimerTick()
             t.Stop()
-            Dim text As String = "Hey, we have detected that you attempted to hack the game. Please don't do that. We are trying to create an online experience where everyone is set equal, where everyone can play the game and achieve about the same things by playing the same amount of time.
+            Dim text As String = "Hello. We have detected that you attempted to hack the game. Please don't do that. We are trying to create an online experience where everyone is set equal, where everyone can play the game and achieve about the same things by playing the same amount of time.
-So please reconsider utilizing certain RAM editing tools in Pokémon3D.
+So please reconsider utilizing certain RAM editing tools in Pokémon 3D.
 Of course, you are free to use those whenever you want in Offline Mode, since that is essentially a Sandbox for you to play around in.
-To remove these messages and the reverse texture effects, contact a staff member on the forums here: 
+To remove these messages and the reverse texture effects, consider following this link: 
 
-http://www.pokemon3d.net/forum/
+http://pokemon3d.net/forum/faq/44/
 
 Thank you for your cooperation."
 
-            MsgBox(text, MsgBoxStyle.OkOnly, "Pokémon3D Injection Shield")
+            MsgBox(text, MsgBoxStyle.OkOnly, "Pokémon 3D Injection Shield")
 
             t.Start()
         End Sub

2.5DHero/2.5DHero/credits.txt

@@ -1,8 +1,8 @@
 Pokémon created by Nintendo, Game Freak and The Pokémon Company / Creatures Inc.
 
-Pokémon3D staff
+Pokémon 3D staff
 created by Kolben Games
-Trademark (TM) 2012 - 2015
+Trademark (TM) 2012 - 2017
 	Team Kolben
 		Nils Drescher
 		Andrew Leach
@@ -22,6 +22,7 @@ Trademark (TM) 2012 - 2015
 		"Aragas"
 		"oXFantaXo" 
 		Jorge Luis Espinoza
+		Conner Joseph Brewster
 
 	Programming
 		Nils Drescher