From 5209a6e7687c6d9ba18e3c7bd5c334368ed81c65 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Thu, 15 Sep 2022 21:11:13 +0200
Subject: [PATCH] =?UTF-8?q?Fixes=20to=20scale=20and=20positioning=20of=20P?=
 =?UTF-8?q?ok=C3=A9mon=20sprites?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 P3D/Content/Pokemon/Sprites/155.png   | Bin 4857 -> 3743 bytes
 P3D/Dialogues/PokemonImageView.vb     |   2 +-
 P3D/Screens/NewGameScreen.vb          |  10 +++++-----
 P3D/Screens/PC/StorageSystemScreen.vb |   2 +-
 P3D/Screens/Pokedex/PokedexScreen.vb  |  14 +++++++-------
 P3D/Screens/Pokemon/SummaryScreen.vb  |  26 ++++++++++++--------------
 6 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/P3D/Content/Pokemon/Sprites/155.png b/P3D/Content/Pokemon/Sprites/155.png
index 2d943dd509c0cda40cbb3b356c41fbd48b64202e..55b103894ab788e945bca23e8985e9d07b49987f 100644
GIT binary patch
literal 3743
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

literal 4857
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

diff --git a/P3D/Dialogues/PokemonImageView.vb b/P3D/Dialogues/PokemonImageView.vb
index a674e1572..1a105f403 100644
--- a/P3D/Dialogues/PokemonImageView.vb
+++ b/P3D/Dialogues/PokemonImageView.vb
@@ -56,7 +56,7 @@
 
             Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 2, New Rectangle(CInt(p.X), CInt(p.Y), 320, 320))
 
-            Core.SpriteBatch.Draw(Me.Texture, New Rectangle(CInt(p.X + 48), CInt(p.Y + 48), 256, 256), Color.White)
+            Core.SpriteBatch.Draw(Me.Texture, New Rectangle(CInt(p.X + 160 + 16 - MathHelper.Min(Me.Texture.Width * 3, 288) / 2), CInt(p.Y + 160 + 16 - MathHelper.Min(Me.Texture.Height * 3, 288) / 2), MathHelper.Min(Me.Texture.Width * 3, 288), MathHelper.Min(Me.Texture.Height * 3, 288)), Color.White)
 
             If Me.Delay = 0.0F Then
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Overworld\TextBox"), New Rectangle(CInt(p.X) + 144 + 160, CInt(p.Y) + 144 + 160 + 32, 16, 16), New Rectangle(0, 48, 16, 16), Color.White)
diff --git a/P3D/Screens/NewGameScreen.vb b/P3D/Screens/NewGameScreen.vb
index e150c68ef..5a27961cb 100644
--- a/P3D/Screens/NewGameScreen.vb
+++ b/P3D/Screens/NewGameScreen.vb
@@ -26,7 +26,7 @@
         Dim ballPosition As Vector2
         Dim ballIndex As Vector2 = New Vector2(0, 0)
         Dim ballAnimationDelay As Single = 0.2F
-        Dim ballVelocity As Single = -4.0F
+        Dim ballVelocity As Single = -7.0F
         Dim pokePosition As Vector2
         Dim pokeID As Integer = 0
 
@@ -232,10 +232,10 @@
                 Case 1
                     Core.SpriteBatch.Draw(mainTexture, New Rectangle(CInt(ballPosition.X), CInt(ballPosition.Y), 22, 22), New Rectangle(62 + CInt(ballIndex.X * 22), 48 + CInt(ballIndex.Y * 22), 22, 22), Color.White)
                 Case 2
-                    Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(pokePosition.X) - 100, CInt(pokePosition.Y) - 218, 256, 256), Color.White)
+                    Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(pokePosition.X) - MathHelper.Min(CInt(pokeTexture.Width), 128), CInt(pokePosition.Y) - MathHelper.Min(CInt(pokeTexture.Height), 128), MathHelper.Min(CInt(pokeTexture.Width * 2), 256), MathHelper.Min(CInt(pokeTexture.Height * 2), 256)), Color.White)
                 Case 3
                     If Index < 6 Then
-                        Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(Core.windowSize.Width / 2) - 300, CInt(Core.windowSize.Height / 2) - 218, 256, 256), New Color(255, 255, 255, ProfAlpha))
+                        Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(pokePosition.X) - MathHelper.Min(CInt(pokeTexture.Width), 128), CInt(Core.windowSize.Height / 2) - MathHelper.Min(CInt(pokeTexture.Height), 128), MathHelper.Min(CInt(pokeTexture.Width * 2), 256), MathHelper.Min(CInt(pokeTexture.Height * 2), 256)), New Color(255, 255, 255, ProfAlpha))
                     End If
             End Select
 
@@ -245,11 +245,11 @@
             Select Case pokeIndex
                 Case 0
                     ballPosition = New Vector2(CInt(Core.windowSize.Width / 2) - 40, CInt(Core.windowSize.Height / 2) - 110)
-                    pokePosition = New Vector2(CInt(Core.windowSize.Width / 2) - 200, CInt(Core.windowSize.Height / 2) - 110)
+                    pokePosition = New Vector2(CInt(Core.windowSize.Width / 2) - MathHelper.Min(CInt(pokeTexture.Width * 2), 256), CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(pokeTexture.Height * 2), 256)))
                     pokeIndex = 1
                     AnimateBall()
                 Case 1
-                    If ballPosition.X > CInt(Core.windowSize.Width / 2) - 200 Then
+                    If ballPosition.X > CInt(Core.windowSize.Width / 2) - MathHelper.Min(CInt(pokeTexture.Width * 2), 256) Then
                         ballPosition.X -= 3
                         ballPosition.Y += ballVelocity
                         ballVelocity += 0.2F
diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb
index 168d2eb5d..28011a61f 100644
--- a/P3D/Screens/PC/StorageSystemScreen.vb
+++ b/P3D/Screens/PC/StorageSystemScreen.vb
@@ -1333,7 +1333,7 @@ Public Class StorageSystemScreen
                     Draw3DModel(p, "Models\Pokemon\" & modelName & "\" & shinyString)
                 Else
                     GetYOffset(p)
-                    Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(660, 200 - yOffset, 256, 256), Color.White)
+                    Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(792 - CInt(MathHelper.Min(p.GetTexture(True).Width * 3, 288) / 2), 192 - yOffset, MathHelper.Min(p.GetTexture(True).Width * 3, 288), MathHelper.Min(p.GetTexture(True).Height * 3, 288)), Color.White)
                 End If
 
                 Canvas.DrawRectangle(New Rectangle(660, 472, 320, 240), c)
diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb
index 17d024010..bc36cf08a 100644
--- a/P3D/Screens/Pokedex/PokedexScreen.vb
+++ b/P3D/Screens/Pokedex/PokedexScreen.vb
@@ -645,10 +645,10 @@ Public Class PokedexScreen
         End While
 
         If entryType = 0 Then
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "???" & Environment.NewLine & Environment.NewLine & "No. " & no, New Vector2(830, 200), Color.White)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "???" & Environment.NewLine & Environment.NewLine & "No. " & no, New Vector2(864, 200), Color.White)
         Else
-            Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetName() & Environment.NewLine & Environment.NewLine & "No. " & no, New Vector2(830, 200), Color.White)
-            Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(670, 140, 128, 128), Color.White)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetName() & Environment.NewLine & Environment.NewLine & "No. " & no, New Vector2(864, 200), Color.White)
+            Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(CInt(680 - p.GetTexture(True).Width / 4), CInt(140 - p.GetTexture(True).Height / 4), MathHelper.Min(CInt(p.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(p.GetTexture(True).Height * 2), 256)), Color.White)
 
             Core.SpriteBatch.DrawString(FontManager.MainFont, "SPECIES", New Vector2(680, 310), Color.Black)
             Core.SpriteBatch.DrawString(FontManager.MainFont, "TYPE", New Vector2(680, 350), Color.Black)
@@ -685,14 +685,14 @@ Public Class PokedexScreen
 
                 Core.SpriteBatch.DrawString(FontManager.MainFont, p.PokedexEntry.Text.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black)
 
-                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(928, 242, 20, 20), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(992, 242, 20, 20), Color.White)
             Else
                 Core.SpriteBatch.DrawString(FontManager.MainFont, "??? Pokémon", New Vector2(850, 310), Color.Black)
                 Core.SpriteBatch.DrawString(FontManager.MainFont, "???", New Vector2(850, 350), Color.Black)
                 Core.SpriteBatch.DrawString(FontManager.MainFont, "??? m", New Vector2(850, 390), Color.Black)
                 Core.SpriteBatch.DrawString(FontManager.MainFont, "??? kg", New Vector2(850, 430), Color.Black)
 
-                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 170, 10, 10), ""), New Rectangle(928, 242, 20, 20), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 170, 10, 10), ""), New Rectangle(992, 242, 20, 20), Color.White)
             End If
         End If
     End Sub
@@ -1449,8 +1449,8 @@ Public Class PokedexViewScreen
     Dim playedCry As Boolean = False
 
     Private Sub DrawPage1()
-        Dim v As Vector2 = Core.GetMiddlePosition(New Size(512, 512))
-        Core.SpriteBatch.Draw(Pokemon.GetTexture(Me.FrontView), New Rectangle(CInt(v.X), CInt(v.Y) - yOffset * 2, 512, 512), New Color(255, 255, 255, fadeMainImage))
+        Dim v As Vector2 = Core.GetMiddlePosition(New Size(MathHelper.Min(Pokemon.GetTexture(True).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(True).Height * 4, 512)))
+        Core.SpriteBatch.Draw(Pokemon.GetTexture(Me.FrontView), New Rectangle(CInt(v.X), CInt(v.Y) - yOffset * 2 + 32, MathHelper.Min(Pokemon.GetTexture(True).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(True).Height * 4, 512)), New Color(255, 255, 255, fadeMainImage))
 
         If fadeMainImage = 255 Then
             Dim mV As Vector2 = Core.GetMiddlePosition(New Size(0, 0))
diff --git a/P3D/Screens/Pokemon/SummaryScreen.vb b/P3D/Screens/Pokemon/SummaryScreen.vb
index e23a3c692..640895ee6 100644
--- a/P3D/Screens/Pokemon/SummaryScreen.vb
+++ b/P3D/Screens/Pokemon/SummaryScreen.vb
@@ -114,11 +114,11 @@
     End Sub
 
     Public Overrides Sub Render()
-
+        Dim PokemonTexture = GetPokemon().GetTexture(True)
         _pixelFade = 1  'Remove when pixel fading effect is properly implemented.
 
-        Dim pixelSize As Integer = CInt(256 * _pixelFade).Clamp(16, 256)
-        If pixelSize = 256 Or Core.GraphicsManager.IsFullScreen = True Then
+        Dim pixelSize As Integer = CInt(MathHelper.Min(PokemonTexture.Width * 3, 288) * _pixelFade).Clamp(16, MathHelper.Min(PokemonTexture.Width * 3, 288))
+        If pixelSize = MathHelper.Min(PokemonTexture.Width * 3, 288) Or Core.GraphicsManager.IsFullScreen = True Then
             pixeledPokemonTexture = GetPokemon().GetTexture(True)
         Else
             Dim pixeled As New RenderTarget2D(GraphicsDevice, pixelSize, pixelSize, False, SurfaceFormat.Color, DepthFormat.None, 0, RenderTargetUsage.PreserveContents)
@@ -126,15 +126,15 @@
             GraphicsDevice.Clear(Color.Transparent)
             Dim s As New SpriteBatch(GraphicsDevice)
             s.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise)
-            s.Draw(GetPokemon().GetTexture(True), New Rectangle(0, 0, pixelSize, pixelSize), Color.White)
+            s.Draw(PokemonTexture, New Rectangle(0, 0, pixelSize, pixelSize), Color.White)
             s.End()
 
-            Dim dePixeled As New RenderTarget2D(GraphicsDevice, 256, 256, False, SurfaceFormat.Color, DepthFormat.None, 0, RenderTargetUsage.PreserveContents)
+            Dim dePixeled As New RenderTarget2D(GraphicsDevice, MathHelper.Min(PokemonTexture.Width * 3, 288), MathHelper.Min(PokemonTexture.Height * 3, 288), False, SurfaceFormat.Color, DepthFormat.None, 0, RenderTargetUsage.PreserveContents)
             GraphicsDevice.SetRenderTarget(dePixeled)
             GraphicsDevice.Clear(Color.Transparent)
             s = New SpriteBatch(GraphicsDevice)
             s.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.Default, RasterizerState.CullCounterClockwise)
-            s.Draw(pixeled, New Rectangle(0, 0, 256, 256), Color.White)
+            s.Draw(pixeled, New Rectangle(0, 0, MathHelper.Min(PokemonTexture.Width * 3, 288), MathHelper.Min(PokemonTexture.Height * 3, 288)), Color.White)
             s.End()
             pixeledPokemonTexture = dePixeled
 
@@ -201,17 +201,15 @@
 
         'Draw Pokémon preview:
         If _enrollY >= 160 Then
-            Dim height As Integer = CInt(_enrollY - 160).Clamp(0, 256)
             Dim pokemonTexture = GetPokemon().GetTexture(_isFront)
-            Dim textureHeight As Integer = CInt(pokemonTexture.Height * (height / 256))
+            Dim height As Integer = CInt(_enrollY - 160).Clamp(0, MathHelper.Min(pokemonTexture.Height * 3, 288))
 
-            Dim pokemonTextureOffset As Integer = 0 + 8
-            If GetPokemon().IsEgg() = True Then
-                pokemonTextureOffset = 32 + 8 + 8
-            End If
+            Dim textureHeight As Integer = CInt(pokemonTexture.Height * (height / MathHelper.Min(pokemonTexture.Height * 3, 288)))
 
-            SpriteBatch.Draw(pokemonTexture, New Rectangle(DeltaX + 20 + 10, DeltaY + 64 - _yOffset + pokemonTextureOffset + 10, 256, height), New Rectangle(0, 0, pokemonTexture.Width, textureHeight), New Color(0, 0, 0, 150))
-            SpriteBatch.Draw(pokemonTexture, New Rectangle(DeltaX + 20, DeltaY + 64 - _yOffset + pokemonTextureOffset, 256, height), New Rectangle(0, 0, pokemonTexture.Width, textureHeight), Color.White)
+            Dim pokemonTextureOffset As Integer = CInt(MathHelper.Min(pokemonTexture.Height * 3, 288) / 2)
+
+            SpriteBatch.Draw(pokemonTexture, New Rectangle(DeltaX + 144 - CInt(MathHelper.Min(pokemonTexture.Width * 3, 288) / 2) + 10, DeltaY + 208 - _yOffset - pokemonTextureOffset + 10, MathHelper.Min(pokemonTexture.Width * 3, 288), height), New Rectangle(0, 0, pokemonTexture.Width, textureHeight), New Color(0, 0, 0, 150))
+            SpriteBatch.Draw(pokemonTexture, New Rectangle(DeltaX + 144 - CInt(MathHelper.Min(pokemonTexture.Width * 3, 288) / 2), DeltaY + 208 - _yOffset - pokemonTextureOffset, MathHelper.Min(pokemonTexture.Width * 3, 288), height), New Rectangle(0, 0, pokemonTexture.Width, textureHeight), Color.White)
         End If
 
         'Draw main infos: