From 6964d48adb652b4a13826a61d9ec00fe39388f7e Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 11 Jun 2023 11:12:34 -0700 Subject: [PATCH] Move location/capture to Encount Shared for both roamers https://projectpokemon.org/home/forums/topic/63405-suggestionbug-gen-5-roamers-block-data-only-shows-info-on-roaming-thundurus/?do=findComment&comment=283912 --- .../Saves/Substructures/Gen5/Encount5.cs | 9 ++++-- .../Saves/Substructures/Gen5/Roamer5.cs | 31 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/PKHeX.Core/Saves/Substructures/Gen5/Encount5.cs b/PKHeX.Core/Saves/Substructures/Gen5/Encount5.cs index 91b036c13..1cfe842b2 100644 --- a/PKHeX.Core/Saves/Substructures/Gen5/Encount5.cs +++ b/PKHeX.Core/Saves/Substructures/Gen5/Encount5.cs @@ -1,11 +1,16 @@ +using System; +using static System.Buffers.Binary.BinaryPrimitives; + namespace PKHeX.Core; public abstract class Encount5 : SaveBlock { protected Encount5(SAV5 SAV, int offset) : base(SAV) => Offset = offset; + public ushort LastLocation { get => ReadUInt16LittleEndian(Data); set => WriteUInt16LittleEndian(Data, value); } + public ushort CaptureUnknown { get => ReadUInt16LittleEndian(Data.AsSpan()[0x02..]); set => WriteUInt16LittleEndian(Data.AsSpan()[0x02..], value); } - public Roamer5 Roamer1 => new(Data, Offset); - public Roamer5 Roamer2 => new(Data, Offset + Roamer5.SIZE); + public Roamer5 Roamer1 => new(Data, Offset + 4); + public Roamer5 Roamer2 => new(Data, Offset + 4 + Roamer5.SIZE); public abstract byte SwarmSeed { get; set; } public abstract uint SwarmMaxCountModulo { get; } diff --git a/PKHeX.Core/Saves/Substructures/Gen5/Roamer5.cs b/PKHeX.Core/Saves/Substructures/Gen5/Roamer5.cs index c253032bb..3bd32b962 100644 --- a/PKHeX.Core/Saves/Substructures/Gen5/Roamer5.cs +++ b/PKHeX.Core/Saves/Substructures/Gen5/Roamer5.cs @@ -11,25 +11,22 @@ namespace PKHeX.Core; [TypeConverter(typeof(ExpandableObjectConverter))] public sealed class Roamer5 { - public const int SIZE = 0x18; - public readonly byte[] Raw; - private readonly int Offset; + public const int SIZE = 0x14; + private readonly Memory Raw; - public Roamer5(byte[] raw, int offset) => (Raw, Offset) = (raw, offset); - private Span Data => Raw.AsSpan(Offset, SIZE); + public Roamer5(byte[] raw, int offset) => Raw = raw.AsMemory(offset, SIZE); + private Span Data => Raw.Span; - public ushort LastLocation { get => ReadUInt16LittleEndian(Data); set => WriteUInt16LittleEndian(Data, value); } - public ushort CaptureUnknown { get => ReadUInt16LittleEndian(Data[0x02..]); set => WriteUInt16LittleEndian(Data[0x02..], value); } - public ushort Location { get => ReadUInt16LittleEndian(Data[0x04..]); set => WriteUInt16LittleEndian(Data[0x04..], value); } - public ushort Nature { get => ReadUInt16LittleEndian(Data[0x06..]); set => WriteUInt16LittleEndian(Data[0x06..], value); } - public uint IV32 { get => ReadUInt32LittleEndian(Data[0x08..]); set => WriteUInt32LittleEndian(Data[0x08..], value); } - public uint PID { get => ReadUInt32LittleEndian(Data[0x0C..]); set => WriteUInt32LittleEndian(Data[0x0C..], value); } - public ushort Species { get => ReadUInt16LittleEndian(Data[0x10..]); set => WriteUInt16LittleEndian(Data[0x10..], value); } - public ushort Stat_HPCurrent { get => ReadUInt16LittleEndian(Data[0x12..]); set => WriteUInt16LittleEndian(Data[0x12..], value); } - public byte Level { get => Data[0x14]; set => Data[0x14] = value; } - public byte Status { get => Data[0x15]; set => Data[0x15] = value; } - public bool Active { get => Data[0x16] != 0; set => Data[0x16] = (byte)(value ? 1 : 0); } - public byte Unk17 { get => Data[0x17]; set => Data[0x17] = value; } + public ushort Location { get => ReadUInt16LittleEndian(Data); set => WriteUInt16LittleEndian(Data , value); } + public ushort Nature { get => ReadUInt16LittleEndian(Data[0x02..]); set => WriteUInt16LittleEndian(Data[0x02..], value); } + public uint IV32 { get => ReadUInt32LittleEndian(Data[0x04..]); set => WriteUInt32LittleEndian(Data[0x04..], value); } + public uint PID { get => ReadUInt32LittleEndian(Data[0x08..]); set => WriteUInt32LittleEndian(Data[0x08..], value); } + public ushort Species { get => ReadUInt16LittleEndian(Data[0x0C..]); set => WriteUInt16LittleEndian(Data[0x0C..], value); } + public ushort Stat_HPCurrent { get => ReadUInt16LittleEndian(Data[0x0E..]); set => WriteUInt16LittleEndian(Data[0x0E..], value); } + public byte Level { get => Data[0x10]; set => Data[0x10] = value; } + public byte Status { get => Data[0x11]; set => Data[0x11] = value; } + public bool Active { get => Data[0x12] != 0; set => Data[0x12] = (byte)(value ? 1 : 0); } + public byte Unk13 { get => Data[0x13]; set => Data[0x13] = value; } // likely just alignment // Derived Properties private int IV_HP { get => (int)(IV32 >> 00) & 0x1F; set => IV32 = (uint)((IV32 & ~(0x1F << 00)) | (uint)((value > 31 ? 31 : value) << 00)); }