Merge pull request #10 from berichan/main

Merge Berichans Updated Pointers DLC 2 w/ My Edits
XieonCrypto · Apr 12, 2024 · 1a97372 · 1a97372
2 parents 573f093 + 8574a8d
commit 1a97372
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 43 deletions.
diff --git a/SysBot.Pokemon.ConsoleApp/SysBot.Pokemon.ConsoleApp.csproj b/SysBot.Pokemon.ConsoleApp/SysBot.Pokemon.ConsoleApp.csproj
@@ -1,29 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <Platforms>x64</Platforms>
     <StartupObject>SysBot.Pokemon.ConsoleApp.Program</StartupObject>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <ProjectReference Include="..\SysBot.Pokemon.Discord\SysBot.Pokemon.Discord.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon.Twitch\SysBot.Pokemon.Twitch.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon\SysBot.Pokemon.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon.Z3\SysBot.Pokemon.Z3.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon.Web\SysBot.Pokemon.Web.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(Configuration)' == 'Release' ">
     <PackageReference Include="Costura.Fody" Version="4.1.0" />
     <PackageReference Include="Fody" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/SysBot.Pokemon.Discord/SysBot.Pokemon.Discord.csproj b/SysBot.Pokemon.Discord/SysBot.Pokemon.Discord.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU</Platforms>
@@ -11,7 +11,7 @@
     <PackageReference Include="Discord.Net" Version="3.4.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <ProjectReference Include="..\SysBot.Base\SysBot.Base.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon\SysBot.Pokemon.csproj" />
     <Reference Include="PKHeX.Core.AutoMod">

diff --git a/SysBot.Pokemon.Twitch/SysBot.Pokemon.Twitch.csproj b/SysBot.Pokemon.Twitch/SysBot.Pokemon.Twitch.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <PackageReference Include="TwitchLib.Client" Version="3.2.3" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon.Twitter/SysBot.Pokemon.Twitter.csproj b/SysBot.Pokemon.Twitter/SysBot.Pokemon.Twitter.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <PackageReference Include="TweetinviAPI" Version="5.0.3" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon.Web/SysBot.Pokemon.Web.csproj b/SysBot.Pokemon.Web/SysBot.Pokemon.Web.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0" />
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj b/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <PackageId>SysBot.Pokemon.WinForms</PackageId>
     <Company>Project Pokémon</Company>
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon.WindowsService/SysBot.Pokemon.WindowsService.csproj b/SysBot.Pokemon.WindowsService/SysBot.Pokemon.WindowsService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <InvariantGlobalization>true</InvariantGlobalization>

diff --git a/SysBot.Pokemon.YouTube/SysBot.Pokemon.YouTube.csproj b/SysBot.Pokemon.YouTube/SysBot.Pokemon.YouTube.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Platforms>AnyCPU</Platforms>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
@@ -13,7 +13,7 @@
 		<PackageReference Include="Google.Apis.Core" Version="1.55.0" />
 		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.55.0.2449" />
 		<PackageReference Include="Google.Apis.YouTubePartner.v1" Version="1.35.1.1334" />
-		<PackageReference Include="PKHeX.Core" Version="23.9.25" />
+		<PackageReference Include="PKHeX.Core" Version="23.12.19" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/SysBot.Pokemon.Z3/SysBot.Pokemon.Z3.csproj b/SysBot.Pokemon.Z3/SysBot.Pokemon.Z3.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <Platforms>x64;AnyCPU</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <ProjectReference Include="..\SysBot.Pokemon\SysBot.Pokemon.csproj" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon/SV/Vision/PokeDataOffsetsSV.cs b/SysBot.Pokemon/SV/Vision/PokeDataOffsetsSV.cs
@@ -9,21 +9,21 @@ public static class PokeDataOffsetsSV
         public const string ScarletID = "0100A3D008C5C000";
         public const string VioletID = "01008F6008C5E000";
 
-        public static IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x46456F8, 0x1A0, 0x30, 0x9D0, 0x00 };
-        public static IReadOnlyList<long> MyStatusPointer { get; } = new long[] { 0x4623A30, 0x198, 0x00, 0x40 };
+        public static IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x4763BB8, 0x1A0, 0x30, 0x9D0, 0x00 };
+        public static IReadOnlyList<long> MyStatusPointer { get; } = new long[] { 0x4741FA0, 0x198, 0x00, 0x40 };
 
-        public static IReadOnlyList<long> LinkTradePartnerPokemonPointer { get; } = new long[] { 0x461BE58, 0x48, 0x58, 0x40, 0x148 };
-        public static IReadOnlyList<long> LinkTradePartnerNameSlot1Pointer { get; } = new long[] { 0x461BE58, 0x48, 0xB0, 0x00 };
-        public static IReadOnlyList<long> LinkTradePartnerNameSlot2Pointer { get; } = new long[] { 0x461BE58, 0x48, 0xE0, 0x00 };
-        public static IReadOnlyList<long> LinkTradePartnerNIDPointer { get; } = new long[] { 0x46404B8, 0xF8, 0x08 };
+        public static IReadOnlyList<long> LinkTradePartnerPokemonPointer { get; } = new long[] { 0x473A110, 0x48, 0x58, 0x40, 0x148 };
+        public static IReadOnlyList<long> LinkTradePartnerNameSlot1Pointer { get; } = new long[] { 0x473A110, 0x48, 0xB0, 0x00 };
+        public static IReadOnlyList<long> LinkTradePartnerNameSlot2Pointer { get; } = new long[] { 0x473A110, 0x48, 0xE0, 0x00 };
+        public static IReadOnlyList<long> LinkTradePartnerNIDPointer { get; } = new long[] { 0x475EA28, 0xF8, 0x08 };
 
-        public static IReadOnlyList<long> OverworldPointer { get; } = new long[] { 0x4691558, 0x00, 0x388, 0x3C0, 0x00, 0x71C };
-        public static IReadOnlyList<long> IsSearchingPointer { get; } = new long[] { 0x4645740, 0x58 }; // 0 no search, 1 search, 2 unknown (still searching) 
-        public static IReadOnlyList<long> ConnectionPointer { get; } = new long[] { 0x4645948, 0x10 }; // 0 not connected, 1 connected, 2 adhoc 
+        public static IReadOnlyList<long> OverworldPointer { get; } = new long[] { 0x47AFA18, 0x00, 0x388, 0x3C0, 0x00, 0x71C };
+        public static IReadOnlyList<long> IsSearchingPointer { get; } = new long[] { 0x4763C00, 0x58 }; // 0 no search, 1 search, 2 unknown (still searching) 
+        public static IReadOnlyList<long> ConnectionPointer { get; } = new long[] { 0x4763E08, 0x10 }; // 0 not connected, 1 connected, 2 adhoc 
 
-        public static IReadOnlyList<long> KeyboardBufferPointer { get; } = new long[] { 0x461D0A8, 0x30, 0x00 };
+        public static IReadOnlyList<long> KeyboardBufferPointer { get; } = new long[] { 0x473B3A8, 0x30, 0x00 };
 
-        public static IReadOnlyList<long> PokePortalPointer = new long[] { 0x4691558, 0x00, 0x3C0, 0x3C0, 0x598 };
+        public static IReadOnlyList<long> PokePortalPointer = new long[] { 0x47AFA18, 0x00, 0x3C0, 0x3C0, 0x598 };
 
         public const int BoxFormatSlotSize = 0x158;
         public const int TradeFormatSlotSize = 0x148;

diff --git a/SysBot.Pokemon/SysBot.Pokemon.csproj b/SysBot.Pokemon/SysBot.Pokemon.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="23.9.25" />
+    <PackageReference Include="PKHeX.Core" Version="23.12.19" />
     <ProjectReference Include="..\SysBot.Base\SysBot.Base.csproj" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="deps\" />
   </ItemGroup>
@@ -21,5 +18,4 @@
       <HintPath>deps\PKHeX.Core.AutoMod.dll</HintPath>
     </Reference>
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/SysBot.Pokemon/deps/PKHeX.Core.AutoMod.dll b/SysBot.Pokemon/deps/PKHeX.Core.AutoMod.dll
diff --git a/SysBot.Tests/SysBot.Tests.csproj b/SysBot.Tests/SysBot.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -39,6 +39,6 @@ steps:
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Artifact: SysBot-x64'
   inputs:
-    PathtoPublish: 'SysBot.Pokemon.WinForms\bin\x64\Release\net7.0-windows'
+    PathtoPublish: 'SysBot.Pokemon.WinForms\bin\x64\Release\net8.0-windows'
     ArtifactName: SysBot-x64
   condition: and(succeededOrFailed(), ne(variables['Build.Reason'], 'PullRequest'))