Fix bugs with PPups and party whitescreening.

SciresM · Apr 30, 2016 · 377e143 · 377e143
1 parent 4e63ec0
commit 377e143
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Rhydon/MainForm.cs b/Rhydon/MainForm.cs
@@ -685,7 +685,7 @@ private void updateMovesPPs(object sender, EventArgs e)
             else
             {
                 int ind = Math.Max(Array.IndexOf(moveBoxs, sender as ComboBox), Array.IndexOf(PPus, sender as ComboBox));
-                int PP = Tables.getMovePP((int)moveBoxs[ind].SelectedValue, PPus[ind].SelectedIndex);
+                int PP = Tables.getMovePP(pk1.Moves[ind], pk1.PPUPs[ind]);
 
                 PPs[ind].Text = PP.ToString();
                 pk1.setPP(ind, (byte)PP);

diff --git a/Rhydon/PK1.cs b/Rhydon/PK1.cs
@@ -182,7 +182,7 @@ public byte PP_1
         public byte PPUP_1
         {
             get { return (byte)((Data[0x1D] & 0xC0) >> 6); }
-            set { Data[0x1D] = (byte)((Data[0x1D] & 0x3F) | ((value & 0x3) >> 6)); }
+            set { Data[0x1D] = (byte)((Data[0x1D] & 0x3F) | ((value & 0x3) << 6)); }
         }
 
         public byte PP_2
@@ -194,7 +194,7 @@ public byte PP_2
         public byte PPUP_2
         {
             get { return (byte)((Data[0x1E] & 0xC0) >> 6); }
-            set { Data[0x1E] = (byte)((Data[0x1E] & 0x3F) | ((value & 0x3) >> 6)); }
+            set { Data[0x1E] = (byte)((Data[0x1E] & 0x3F) | ((value & 0x3) << 6)); }
         }
 
         public byte PP_3
@@ -206,7 +206,7 @@ public byte PP_3
         public byte PPUP_3
         {
             get { return (byte)((Data[0x1F] & 0xC0) >> 6); }
-            set { Data[0x1F] = (byte)((Data[0x1F] & 0x3F) | ((value & 0x3) >> 6)); }
+            set { Data[0x1F] = (byte)((Data[0x1F] & 0x3F) | ((value & 0x3) << 6)); }
         }
 
         public byte PP_4
@@ -218,7 +218,7 @@ public byte PP_4
         public byte PPUP_4
         {
             get { return (byte)((Data[0x20] & 0xC0) >> 6); }
-            set { Data[0x20] = (byte)((Data[0x20] & 0x3F) | ((value & 0x3) >> 6)); }
+            set { Data[0x20] = (byte)((Data[0x20] & 0x3F) | ((value & 0x3) << 6)); }
         }
 
         // Party Only
@@ -322,10 +322,10 @@ public byte[] PPUPs
             set
             {
                 if (value == null || value.Length != 4) return;
-                PPUP_1 = Math.Max(value[0], (byte)3);
-                PPUP_2 = Math.Max(value[1], (byte)3);
-                PPUP_3 = Math.Max(value[2], (byte)3);
-                PPUP_4 = Math.Max(value[3], (byte)3);
+                PPUP_1 = Math.Min(value[0], (byte)3);
+                PPUP_2 = Math.Min(value[1], (byte)3);
+                PPUP_3 = Math.Min(value[2], (byte)3);
+                PPUP_4 = Math.Min(value[3], (byte)3);
             }
         }
 

diff --git a/Rhydon/PokemonList.cs b/Rhydon/PokemonList.cs
@@ -111,6 +111,7 @@ private void Update()
                 Array.Copy(Pokemon[i].OT_Name, 0, Data, 2 + Capacity + Capacity * Entry_Size + 0xB * i, 0xB);
                 Array.Copy(Pokemon[i].Nickname, 0, Data, 2 + Capacity + Capacity * Entry_Size + 0xB * Capacity + 0xB * i, 0xB);
             }
+            Data[1 + Count] = byte.MaxValue;
         }
 
         public byte[] GetBytes()