From 9ff6e94a1fc31d4d2ee093227c59acf6aa1c1190 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Wed, 22 Jun 2022 21:02:11 +0200
Subject: [PATCH] ContentPack fixes

* Fixed ContentPack menu crashing when trying to load more than 5 Content Packs
* Fixed Texture Replacements in exceptions.dat being ignored if not the same case
* Fixed minor visual bug in the Box screen where smaller textures would be scaled incorrectly
---
 P3D/Resources/ContentPackManager.vb   | 2 +-
 P3D/Screens/NewOptionScreen.vb        | 6 +++---
 P3D/Screens/PC/StorageSystemScreen.vb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/P3D/Resources/ContentPackManager.vb b/P3D/Resources/ContentPackManager.vb
index 13b992a9f..86df39752 100644
--- a/P3D/Resources/ContentPackManager.vb
+++ b/P3D/Resources/ContentPackManager.vb
@@ -136,7 +136,7 @@ Public Class TextureSource
     End Function
 
     Public Function IsEqual(ByVal TextureSource As TextureSource) As Boolean
-        If Me.TexturePath = TextureSource.TexturePath And Me.TextureRectangle = TextureSource.TextureRectangle Then
+        If Me.TexturePath.ToLower() = TextureSource.TexturePath.ToLower() And Me.TextureRectangle = TextureSource.TextureRectangle Then
             Return True
         End If
 
diff --git a/P3D/Screens/NewOptionScreen.vb b/P3D/Screens/NewOptionScreen.vb
index 275cc7ee9..f01fd62c6 100644
--- a/P3D/Screens/NewOptionScreen.vb
+++ b/P3D/Screens/NewOptionScreen.vb
@@ -470,14 +470,14 @@
 
     Private Sub PackEnabledToggle(ByVal c As ToggleButton)
         If PackNames.Count > 0 Then
-            If EnabledPackNames.Contains(PackNames(packsMenuIndex(0) + packsMenuIndex(2))) Then
+            If EnabledPackNames.Contains(PackNames(packsMenuIndex(0))) Then
                 isSelectedEnabled = False
                 c.Toggled = False
-                ButtonToggle(PackNames(packsMenuIndex(0) + packsMenuIndex(2)))
+                ButtonToggle(PackNames(packsMenuIndex(0)))
             Else
                 isSelectedEnabled = True
                 c.Toggled = True
-                ButtonToggle(PackNames(packsMenuIndex(0) + packsMenuIndex(2)))
+                ButtonToggle(PackNames(packsMenuIndex(0)))
             End If
         Else
             isSelectedEnabled = False
diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb
index f7c5499e9..cf13c0c67 100644
--- a/P3D/Screens/PC/StorageSystemScreen.vb
+++ b/P3D/Screens/PC/StorageSystemScreen.vb
@@ -1189,7 +1189,7 @@ Public Class StorageSystemScreen
                             c = New Color(65, 65, 65, 255)
                         End If
                         Dim pokeTexture = box.Pokemon(id).GetPokemon().GetMenuTexture()
-                        Core.SpriteBatch.Draw(pokeTexture, New Rectangle(50 + x * 100 - CInt(pokeTexture.Width - 32), 200 + y * 84, pokeTexture.Width * 2, 64), c)
+                        Core.SpriteBatch.Draw(pokeTexture, New Rectangle(50 + x * 100 - CInt(pokeTexture.Width - 32), 200 + y * 84, pokeTexture.Width * 2, pokeTexture.Height * 2), c)
                     End If
                 Next
             Else