v0.1.1 - Fixed combobox overload bug.

Sierraffinity · Dec 14, 2014 · fcec668 · fcec668
1 parent 761e4c6
commit fcec668
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 19 deletions.
diff --git a/GBAIntroManager.v12.suo b/GBAIntroManager.v12.suo
diff --git a/GBAIntroManager/GBAIntroManager.csproj b/GBAIntroManager/GBAIntroManager.csproj
@@ -24,7 +24,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.1.0.%2a</ApplicationVersion>
+    <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/GBAIntroManager/GBAIntroManager.ini b/GBAIntroManager/GBAIntroManager.ini
@@ -2,7 +2,7 @@
 GameName=Pokémon Ruby
 GameType=RS
 ItemData=0x3C5564
-NumberOfItems=349
+NumberOfItems=348
 PokemonNames=0x1F716C
 NumberOfPokemon=411
 PokemonImageTable=0x1E8354
@@ -31,7 +31,7 @@ UnlockedTester=0x52E23
 GameName=Pokémon Sapphire
 GameType=RS
 ItemData=0x3C55BC
-NumberOfItems=349
+NumberOfItems=348
 PokemonNames=0x1F70FC
 NumberOfPokemon=411
 PokemonImageTable=0x1E82E4
@@ -60,7 +60,7 @@ UnlockedTester=0x52E23
 GameName=Pokémon FireRed
 GameType=FR
 ItemData=0x3DB028
-NumberOfItems=375
+NumberOfItems=374
 PokemonNames=0x245EE0
 NumberOfPokemon=411
 PokemonImageTable=0x2350AC
@@ -87,7 +87,7 @@ RivalNamingRemove=0x1301D4
 GameName=Pokémon LeafGreen
 GameType=LG
 ItemData=0x3DAE64
-NumberOfItems=375
+NumberOfItems=374
 PokemonNames=0x245EBC
 NumberOfPokemon=411
 PokemonImageTable=0x235088
@@ -114,7 +114,7 @@ RivalNamingRemove=0x1301AC
 GameName=Pokémon Emerald
 GameType=E
 ItemData=0x5839A0
-NumberOfItems=377
+NumberOfItems=376
 PokemonNames=0x3185C8
 NumberOfPokemon=411
 StartingPosition=0x84454

diff --git a/GBAIntroManager/MainWindow.cs b/GBAIntroManager/MainWindow.cs
@@ -149,7 +149,11 @@ private void btnLoadROM_Click(object sender, EventArgs e)
                                 br.BaseStream.Seek(titlescreenCry, SeekOrigin.Begin);
                                 UInt16 cryNumber = br.ReadByte();
                                 br.BaseStream.Seek(titlescreenCry + 0x2, SeekOrigin.Begin);
-                                comboBoxCry.SelectedIndex = cryNumber + br.ReadByte();
+                                int cryTester = cryNumber + br.ReadByte();
+                                if (cryTester <= numberOfPokemon)
+                                    comboBoxCry.SelectedIndex = cryTester;
+                                else
+                                    comboBoxCry.SelectedIndex = numberOfPokemon;
 
                                 comboBoxIntroPKMN.Items.Clear();
                                 for (uint i = 0; i <= numberOfPokemon; i++)
@@ -169,7 +173,10 @@ private void btnLoadROM_Click(object sender, EventArgs e)
                                     tempSpace += 0xFF;
                                 else if (testCase == 0x40)
                                     tempSpace *= 2;
-                                textBoxTitleMusic.Text = Convert.ToString(tempSpace, 0x10);
+                                if (tempSpace <= 0x1FE)
+                                    textBoxTitleMusic.Text = Convert.ToString(tempSpace, 0x10);
+                                else
+                                    textBoxTitleMusic.Text = "1FE";
 
                                 br.BaseStream.Seek(titlescreenTime, SeekOrigin.Begin);
                                 textBoxSecsOnTitle.Text = Convert.ToString((br.ReadUInt32() + 1) / 60);
@@ -258,14 +265,22 @@ private void btnLoadROM_Click(object sender, EventArgs e)
                             }
 
                             br.BaseStream.Seek(startingPCItem, SeekOrigin.Begin);
-                            comboBoxPCItemID.SelectedIndex = br.ReadUInt16();
+                            int itemTester = br.ReadUInt16();
+                            if (itemTester <= numberOfItems)
+                                comboBoxPCItemID.SelectedIndex = itemTester;
+                            else
+                                comboBoxPCItemID.SelectedIndex = numberOfItems;
                             textBoxPCItemAmt.Text = Convert.ToString(br.ReadUInt16());
 
                             if (comboBoxPCItemID.SelectedIndex == 0)
                                 textBoxPCItemAmt.Text = "0";
 
                             br.BaseStream.Seek(startingMoney, SeekOrigin.Begin);
-                            textBoxMoney.Text = Convert.ToString(br.ReadUInt32());
+                            uint moneyTester = br.ReadUInt32();
+                            if (moneyTester <= 999999)
+                                textBoxMoney.Text = Convert.ToString(moneyTester);
+                            else
+                                textBoxMoney.Text = "999999";
 
                             br.BaseStream.Seek(professorMusic, SeekOrigin.Begin);
                             tempSpace = br.ReadByte();
@@ -275,7 +290,10 @@ private void btnLoadROM_Click(object sender, EventArgs e)
                                 tempSpace += 0xFF;
                             else if (testCase == 0x40)
                                 tempSpace *= 2;
-                            textBoxProfMusic.Text = Convert.ToString(tempSpace, 0x10);
+                            if (tempSpace <= 0x1FE)
+                                textBoxProfMusic.Text = Convert.ToString(tempSpace, 0x10);
+                            else
+                                textBoxProfMusic.Text = "1FE";
 
                             enableEverything();
                         }
@@ -1391,7 +1409,7 @@ private void buttonStartPosReset_Click(object sender, EventArgs e)
 
         private void btnAbout_Click(object sender, EventArgs e)
         {
-            MessageBox.Show("GBA Intro Manager v0.1.0\nCreated by Diegoisawesome.\n\nThanks to:\nJambo51\ncolcolstyles\nxGal", "About");
+            MessageBox.Show("GBA Intro Manager v0.1.1\nCreated by Diegoisawesome.\n\nThanks to:\nJambo51\ncolcolstyles\nxGal", "About");
         }
 
         private void btnReadme_Click(object sender, EventArgs e)

diff --git a/GBAIntroManager/obj/Release/GBA Intro Manager.application b/GBAIntroManager/obj/Release/GBA Intro Manager.application
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="GBA Intro Manager.application" version="0.1.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="GBA Intro Manager.application" version="0.1.1.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="GBA Intro Manager" asmv2:product="GBA Intro Manager" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="GBA Intro Manager.exe.manifest" size="4299">
-      <assemblyIdentity name="GBA Intro Manager.exe" version="0.1.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="GBA Intro Manager.exe" version="0.1.1.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>XdQJZnPjUzdh63iFh1ef3QpCjZM=</dsig:DigestValue>
+        <dsig:DigestValue>Yj2D3zUAjLInb87CHnHgghc3L3w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAIntroManager/obj/Release/GBA Intro Manager.exe b/GBAIntroManager/obj/Release/GBA Intro Manager.exe
diff --git a/GBAIntroManager/obj/Release/GBA Intro Manager.exe.manifest b/GBAIntroManager/obj/Release/GBA Intro Manager.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="GBA Intro Manager.exe" version="0.1.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="GBA Intro Manager.exe" version="0.1.1.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="box.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
@@ -50,7 +50,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>MOicKWgbWMSmfajHJMRFVRbOHr0=</dsig:DigestValue>
+        <dsig:DigestValue>HUCXyiaWuUxnLaWoZ8xyLtwDaZ0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -72,13 +72,13 @@
       <dsig:DigestValue>06MAsbgFUGlKhu1U3KJ4fh8CRLU=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="Readme.txt" size="3397">
+  <file name="Readme.txt" size="3863">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>Xbg+wYt5mhFyal6DBMQZSytKB1A=</dsig:DigestValue>
+      <dsig:DigestValue>8SUNKyLljHueTQNWz/ayVitVTlM=</dsig:DigestValue>
     </hash>
   </file>
 </asmv1:assembly>
diff --git a/GBAIntroManager/obj/Release/GBA Intro Manager.pdb b/GBAIntroManager/obj/Release/GBA Intro Manager.pdb
diff --git a/GBAIntroManager/obj/Release/GBAIntroManager.csproj.GenerateResource.Cache b/GBAIntroManager/obj/Release/GBAIntroManager.csproj.GenerateResource.Cache