Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-29 19:53:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add training bag effect party stat

Browse Source 
ty Anubis
rearrange some of the comments for clarity

Co-Authored-By: Lusamine <30205550+Lusamine@users.noreply.github.com>
This commit is contained in:
Kurt
2025-08-30 23:22:10 -05:00
parent 82fdbbb777
commit 5f5ec65c4a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PKHeX.Core/PKM/PK6.cs
View File

@@ -376,6 +376,7 @@ public override string OriginalTrainerName
public override byte Stat_Level { get => Data[0xEC]; set => Data[0xEC] = value; }
public byte FormArgumentRemain { get => Data[0xED]; set => Data[0xED] = value; }
public byte FormArgumentElapsed { get => Data[0xEE]; set => Data[0xEE] = value; }
public byte TrainingBagEffect { get => Data[0xEF]; set => Data[0xEF] = value; }
public override int Stat_HPCurrent { get => ReadUInt16LittleEndian(Data[0xF0..]); set => WriteUInt16LittleEndian(Data[0xF0..], (ushort)value); }
public override int Stat_HPMax { get => ReadUInt16LittleEndian(Data[0xF2..]); set => WriteUInt16LittleEndian(Data[0xF2..], (ushort)value); }
public override int Stat_ATK { get => ReadUInt16LittleEndian(Data[0xF4..]); set => WriteUInt16LittleEndian(Data[0xF4..], (ushort)value); }
@@ -484,9 +485,11 @@ public PK7 ConvertToPK7()
{
ResortEventStatus = 0, // Clears old Marking Value
MarkingValue = 0, // Clears old Super Training Bag & Hits Remaining
HyperTrainFlags = 0, // Clears old Gen4 Encounter Type byte
FormArgument = 0, // Clears old style Form Argument
DirtType = 0, // Clears old Form Argument byte
DirtLocation = 0, // Clears old Form Argument byte
DirtType = 0, // Clears old FormArgumentRemain byte
DirtLocation = 0, // Clears old FormArgumentElapsed byte
// clear Training Bag effect later since we don't have a Gen7 property at that offset
};
// Remap boolean markings to the dual-bit format -- set 1 if marked.
@@ -504,13 +507,12 @@ public PK7 ConvertToPK7()
pk7.SetTradeMemoryHT6(true); // oh no, memories on Gen7 pk
RecentTrainerCache.SetFirstCountryRegion(pk7);
// Bank-accurate data zeroing
var span = pk7.Data;
span[0x94..0x9E].Clear(); /* Geolocations. */
span[0xAA..0xB0].Clear(); /* Unused/Amie Fullness & Enjoyment. */
span[0xE4..0xE8].Clear(); /* Unused. */
pk7.Data[0x72] &= 0xFC; /* Clear lower two bits of Super training flags. */
pk7.Data[0xDE] = 0; /* Gen4 encounter type. */
span[0x94..0x9E].Clear(); // Geolocations
span[0xAA..0xB0].Clear(); // Unused/Amie Fullness & Enjoyment
span[0xE4..0xE8].Clear(); // Unused
pk7.Data[0x72] &= 0xFC; // Clear lower two bits of Super training flags
pk7.Data[0xEF] = 0; // Clears old Training Bag effect byte from Party Stats
// Copy Form Argument data for Furfrou and Hoopa, since we're nice.
pk7.FormArgumentRemain = FormArgumentRemain;