From ce9c121e483b4e134e8a59922fafc4296a01aa2a Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 26 May 2020 12:40:12 -0400 Subject: [PATCH] Reorder IVs in SWSH Flatbuffer Schemas (#75) Properly reflects results in-game. Also document Field_0C in EncounterStatic8 (unused for now, might be used in DLC). --- .../Encounter/Gen8/FlatGift/GiftEncounter8.cs | 4 ++-- .../Encounter/Gen8/FlatStatic/EncounterStatic8.cs | 10 +++++----- .../Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs | 4 ++-- .../Resources/Flatbuffers/EncounterGift8Archive.fbs | 4 ++-- .../Resources/Flatbuffers/EncounterStatic8Archive.fbs | 10 +++++----- .../Resources/Flatbuffers/EncounterTrade8Archive.fbs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs b/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs index 15a8bc0c..580fcbac 100644 --- a/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs +++ b/pkNX.Structures/Encounter/Gen8/FlatGift/GiftEncounter8.cs @@ -22,12 +22,12 @@ public class EncounterGift8 public int ShinyLock { get; set; } public int Nature { get; set; } public int Gender { get; set; } - public int IV_Hp { get; set; } + public int IV_Spe { get; set; } public int IV_Atk { get; set; } public int IV_Def { get; set; } + public int IV_Hp { get; set; } public int IV_SpAtk { get; set; } public int IV_SpDef { get; set; } - public int IV_Spe { get; set; } public int Ability { get; set; } public int SpecialMove { get; set; } } diff --git a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs index c62ee85a..5fe63a0c 100644 --- a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs +++ b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs @@ -4,17 +4,17 @@ public class EncounterStatic8 { public ulong Hash1 { get; set; } public ulong Hash2 { get; set; } - public int EV_Hp { get; set; } + public int EV_Spe { get; set; } public int EV_Atk { get; set; } public int EV_Def { get; set; } + public int EV_Hp { get; set; } public int EV_SpAtk { get; set; } public int EV_SpDef { get; set; } - public int EV_Spe { get; set; } public int AltForm { get; set; } public int DynamaxLevel { get; set; } public int Field_0A { get; set; } public ulong Hash3 { get; set; } - public int Field_0C { get; set; } + public bool CanGigantamax { get; set; } public int HeldItem { get; set; } public int Level { get; set; } public int Field_0F { get; set; } @@ -22,12 +22,12 @@ public class EncounterStatic8 public int ShinyLock { get; set; } public int Nature { get; set; } public int Gender { get; set; } - public int IV_Hp { get; set; } + public int IV_Spe { get; set; } public int IV_Atk { get; set; } public int IV_Def { get; set; } + public int IV_Hp { get; set; } public int IV_SpAtk { get; set; } public int IV_SpDef { get; set; } - public int IV_Spe { get; set; } public int Ability { get; set; } public int Move0 { get; set; } public int Move1 { get; set; } diff --git a/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs b/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs index 53240fd3..49e0f2c6 100644 --- a/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs +++ b/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs @@ -33,12 +33,12 @@ public class EncounterTrade8 public int ShinyLock { get; set; } public int Nature { get; set; } public int Gender { get; set; } - public int IV_Hp { get; set; } + public int IV_Spe { get; set; } public int IV_Atk { get; set; } public int IV_Def { get; set; } + public int IV_Hp { get; set; } public int IV_SpAtk { get; set; } public int IV_SpDef { get; set; } - public int IV_Spe { get; set; } public int Ability { get; set; } public int Relearn1 { get; set; } public int Relearn2 { get; set; } diff --git a/pkNX.WinForms/Resources/Flatbuffers/EncounterGift8Archive.fbs b/pkNX.WinForms/Resources/Flatbuffers/EncounterGift8Archive.fbs index 197cbe07..2313b2f2 100644 --- a/pkNX.WinForms/Resources/Flatbuffers/EncounterGift8Archive.fbs +++ b/pkNX.WinForms/Resources/Flatbuffers/EncounterGift8Archive.fbs @@ -30,12 +30,12 @@ table EncounterGift8 { Nature:uint; Gender:byte; - IV_Hp:byte; + IV_Spe:byte; IV_Atk:byte; IV_Def:byte; + IV_Hp:byte; IV_SpAtk:byte; IV_SpDef:byte; - IV_Spe:byte; Ability:uint; SpecialMove:uint; diff --git a/pkNX.WinForms/Resources/Flatbuffers/EncounterStatic8Archive.fbs b/pkNX.WinForms/Resources/Flatbuffers/EncounterStatic8Archive.fbs index 2fd3a011..933e05a2 100644 --- a/pkNX.WinForms/Resources/Flatbuffers/EncounterStatic8Archive.fbs +++ b/pkNX.WinForms/Resources/Flatbuffers/EncounterStatic8Archive.fbs @@ -8,19 +8,19 @@ table EncounterStatic8 { Hash1:ulong; Hash2:ulong; - EV_Hp:ubyte; + EV_Spe:ubyte; EV_Atk:ubyte; EV_Def:ubyte; + EV_Hp:ubyte; EV_SpAtk:ubyte; EV_SpDef:ubyte; - EV_Spe:ubyte; AltForm:byte; DynamaxLevel:byte; Field_0A:byte; Hash3:ulong; - Field_0C:byte; + CanGigantamax:bool; HeldItem:uint; @@ -30,12 +30,12 @@ table EncounterStatic8 { ShinyLock:uint; Nature:uint; Gender:byte; - IV_Hp:byte; + IV_Spe:byte; IV_Atk:byte; IV_Def:byte; + IV_Hp:byte; IV_SpAtk:byte; IV_SpDef:byte; - IV_Spe:byte; Ability:uint; diff --git a/pkNX.WinForms/Resources/Flatbuffers/EncounterTrade8Archive.fbs b/pkNX.WinForms/Resources/Flatbuffers/EncounterTrade8Archive.fbs index b28716d8..e6fa12c5 100644 --- a/pkNX.WinForms/Resources/Flatbuffers/EncounterTrade8Archive.fbs +++ b/pkNX.WinForms/Resources/Flatbuffers/EncounterTrade8Archive.fbs @@ -33,12 +33,12 @@ table EncounterTrade8 { Nature:uint; Gender:byte; - IV_Hp:byte; + IV_Spe:byte; IV_Atk:byte; IV_Def:byte; + IV_Hp:byte; IV_SpAtk:byte; IV_SpDef:byte; - IV_Spe:byte; Ability:byte; Relearn1:ushort;