Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 13:47:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Emerald decorations (#2788)

Browse Source
This commit is contained in:
Kermalis
2020-03-18 03:25:02 -04:00
committed by GitHub
parent 429a3b1a08
commit face69d469
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PKHeX.Core/Saves/SAV3.cs
View File

@@ -156,6 +156,7 @@ private void Initialize()
OFS_PouchBerry = BlockOfs[1] + 0x0740;
EventFlag = BlockOfs[2] + 0x2A0;
EventConst = EventFlag + (EventFlagMax / 8);
OFS_Decorations = BlockOfs[3] + 0x7A0;
DaycareOffset = BlockOfs[4] + 0x11C;
break;
case GameVersion.E:
@@ -167,6 +168,7 @@ private void Initialize()
OFS_PouchBerry = BlockOfs[1] + 0x0790;
EventFlag = BlockOfs[2] + 0x2F0;
EventConst = EventFlag + (EventFlagMax / 8);
OFS_Decorations = BlockOfs[3] + 0x834;
DaycareOffset = BlockOfs[4] + 0x1B0;
break;
case GameVersion.FRLG:
@@ -618,7 +620,7 @@ public uint BerryPowder
private static ushort[] LegalTMHMs => Legal.Pouch_TMHM_RS;
private static ushort[] LegalBerries => Legal.Pouch_Berries_RS;
private int OFS_PCItem, OFS_PouchHeldItem, OFS_PouchKeyItem, OFS_PouchBalls, OFS_PouchTMHM, OFS_PouchBerry;
private int OFS_PCItem, OFS_PouchHeldItem, OFS_PouchKeyItem, OFS_PouchBalls, OFS_PouchTMHM, OFS_PouchBerry, OFS_Decorations;
public override InventoryPouch[] Inventory
{
@@ -1028,8 +1030,18 @@ public bool ResetPersonal(GameVersion g)
public DecorationInventory3 Decorations
{
get => Data.Slice(GetBlockOffset(3) + 0x7A0, DecorationInventory3.SIZE).ToStructure<DecorationInventory3>();
set => SetData(value.ToBytes(), GetBlockOffset(3) + 0x7A0);
get
{
if (Version == GameVersion.FRLG)
throw new Exception();
return Data.Slice(OFS_Decorations, DecorationInventory3.SIZE).ToStructure<DecorationInventory3>();
}
set
{
if (Version == GameVersion.FRLG)
throw new Exception();
SetData(value.ToBytes(), OFS_Decorations);
}
}
}
}