Merge branch 'beta' into main

Glazelf · Jul 17, 2021 · 84871a8 · 84871a8
2 parents b7bb4b5 + 7fcb705
commit 84871a8
Show file tree

Hide file tree

Showing 9 changed files with 970 additions and 239 deletions.
diff --git a/MonstieHuntieHax.Core/MonstieHuntieHax.Core.csproj b/MonstieHuntieHax.Core/MonstieHuntieHax.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <!--<TargetFrameworks>net47;net5.0-windows</TargetFrameworks-->
   </PropertyGroup>
 

diff --git a/MonstieHuntieHax.Core/Structures/RAM/DataOffsets.cs b/MonstieHuntieHax.Core/Structures/RAM/DataOffsets.cs
@@ -3,14 +3,57 @@
     public static class DataOffsets
     {
         /// <summary>
-        /// Main game pointers for game version 1.0.3
+        /// Pointers for game version 1.0.3
         /// </summary>
         public const string PointerZeni = "[heap+40732670]"; // u32
-        public const string PointerBottleCaps = "[heap+407335FE]"; //u16
+        public const string PointerBottleCaps = "[heap+407335FE]"; // u16
 
         /// <summary>
-        /// Distances
+        /// Pointers that should really be optimized out as to not need this many pointers (mostly items).
+        /// All items are u16, max 999
         /// </summary>
+        // Other Items
+        public const string PointerDustOfLife = "[heap+407326A6]";
+        public const string PointerAncientPotion = "[heap+407326B6]";
+        public const string PointerHeartChurro = "[heap+407354E6]";
+        public const string PointerSurrogateGem = "[heap+407328EE]";
+        public const string PointerPowerPaintball = "[heap+40732B0E]";
+        public const string PointerSuperWhetstone = "[heap+407327EE]";
+        public const string PointerMegaBarrelBomb = "[heap+40732B16]";
+        public const string PointerWeaponSphereL = "[heap+4073550E]";
+        public const string PointerArmorSphereL = "[heap+407354F6]";
+
+        /// <summary>
+        /// Distances between offsets
+        /// </summary>
+        public const int DifferenceCharmGathering = 0x10;
+        public const int DifferenceCharms = 0x8;
+
+        /// <summary>
+        /// Altering Pointers
+        /// </summary>
+        // Charms
+        private static readonly int OffsetCharmTraining = 0x407333FE;
+        private static readonly int OffsetCharmGathering = OffsetCharmTraining + DifferenceCharmGathering;
+        private static readonly int OffsetCharmLucky = OffsetCharmGathering + DifferenceCharms * 1;
+        private static readonly int OffsetCharmFinding = OffsetCharmGathering + DifferenceCharms * 2;
+        private static readonly int OffsetCharmMounting = OffsetCharmGathering + DifferenceCharms * 3;
+        private static readonly int OffsetCharmSelling = OffsetCharmGathering + DifferenceCharms * 4;
+        private static readonly int OffsetCharmBuying = OffsetCharmGathering + DifferenceCharms * 5;
+        private static readonly int OffsetCharmAdamant = OffsetCharmGathering + DifferenceCharms * 6;
+        private static readonly int OffsetCharmMight = OffsetCharmGathering + DifferenceCharms * 7;
+        private static readonly int OffsetCharmRecovery = OffsetCharmGathering + DifferenceCharms * 8;
+
+        public static string PointerCharmTraining = $"[heap+{OffsetCharmTraining:X}]";
+        public static string PointerCharmGathering = $"[heap+{OffsetCharmGathering:X}]";
+        public static string PointerCharmLucky = $"[heap+{OffsetCharmLucky:X}]";
+        public static string PointerCharmFinding = $"[heap+{OffsetCharmFinding:X}]";
+        public static string PointerCharmMounting = $"[heap+{OffsetCharmMounting:X}]";
+        public static string PointerCharmSelling = $"[heap+{OffsetCharmSelling:X}]";
+        public static string PointerCharmBuying = $"[heap+{OffsetCharmBuying:X}]";
+        public static string PointerCharmAdamant = $"[heap+{OffsetCharmAdamant:X}]";
+        public static string PointerCharmMight = $"[heap+{OffsetCharmMight:X}]";
+        public static string PointerCharmRecovery = $"[heap+{OffsetCharmRecovery:X}]";
 
 
         /// <summary>

diff --git a/MonstieHuntieHax.Injection/MonstieHuntieHax.Injection.csproj b/MonstieHuntieHax.Injection/MonstieHuntieHax.Injection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <!--<TargetFrameworks>net47;net5.0-windows</TargetFrameworks-->
   </PropertyGroup>
 
@@ -18,37 +18,10 @@
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
     <PackageReference Include="System.Configuration.ConfigurationManager">
       <Version>5.0.0</Version>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/MonstieHuntieHax.Injection/Properties/Resources.Designer.cs b/MonstieHuntieHax.Injection/Properties/Resources.Designer.cs
diff --git a/MonstieHuntieHax.Injection/Properties/Resources.resx b/MonstieHuntieHax.Injection/Properties/Resources.resx
diff --git a/MonstieHuntieHax.Injection/Properties/Settings.Designer.cs b/MonstieHuntieHax.Injection/Properties/Settings.Designer.cs
diff --git a/MonstieHuntieHax.Injection/Properties/Settings.settings b/MonstieHuntieHax.Injection/Properties/Settings.settings