Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add fused calyrex block

Browse source
This commit is contained in:
Kurt 2020-11-01 17:55:52 -08:00
parent 64a6214b82
commit a2fb9c48eb
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
PKHeX.Core/Editing/Saves/Slots/Extensions.cs
View file

@ -162,7 +162,7 @@ namespace PKHeX.Core
{
var fused = sav.Fused;
var dc = sav.Daycare;
return new List<SlotInfoMisc>
var list = new List<SlotInfoMisc>
{
new SlotInfoMisc(fused.Data, 0, Fused8.GetFusedSlotOffset(0), true) {Type = StorageSlotType.Fused},
new SlotInfoMisc(fused.Data, 0, Fused8.GetFusedSlotOffset(1), true) {Type = StorageSlotType.Fused},
@ -173,6 +173,15 @@ namespace PKHeX.Core
new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(1, 0)) {Type = StorageSlotType.Daycare},
new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(1, 1)) {Type = StorageSlotType.Daycare},
};
if (sav is SAV8SWSH s8 && s8.SaveRevision >= 2)
{
var block = s8.Blocks.GetBlockSafe(SaveBlockAccessor8SWSH.KFusedCalyrex);
var c = new SlotInfoMisc(block.Data, 0, 0, true) {Type = StorageSlotType.Fused};
list.Insert(3, c);
}
return list;
}
}
}

1
PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs
View file

@ -78,6 +78,7 @@ namespace PKHeX.Core
private const uint KRaidSpawnListR1 = 0x158DA896; // Raid Data for DLC1
private const uint KRaidSpawnListR2 = 0x148DA703; // Raid Data for DLC2
private const uint KFused = 0xc0de5c5f; // Fused PKM (*3)
public const uint KFusedCalyrex = 0xC37F267B; // Fused Horse
private const uint KFashionUnlock = 0xd224f9ac; // Fashion unlock bool array (owned for (each apparel type) * 0x80, then another array for "new")
private const uint KTitleScreenTeam = 0xE9BE28BF; // Title Screen Team details
public const uint KEnteredHallOfFame = 0xE2F6E456; // U64 Unix Timestamp

6
PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs
View file

@ -1,7 +1,7 @@
namespace PKHeX.Core
{
/// <summary>
/// Storage for the species that was fused into <see cref="Species.Kyurem"/>, <see cref="Species.Necrozma"/>, <see cref="Species.Calyrex"/>.
/// Storage for the species that was fused into <see cref="Species.Kyurem"/> and <see cref="Species.Necrozma"/>.
/// </summary>
public sealed class Fused8 : SaveBlock
{
@ -20,13 +20,13 @@
set => value.EncryptedBoxData.CopyTo(Data, GetFusedSlotOffset(0));
}
public PK8 Necrozma
public PK8 NecrozmaSolgaleo
{
get => (PK8)SAV.GetStoredSlot(Data, GetFusedSlotOffset(1));
set => value.EncryptedBoxData.CopyTo(Data, GetFusedSlotOffset(1));
}
public PK8 Calyrex
public PK8 NecrozmaLunala
{
get => (PK8)SAV.GetStoredSlot(Data, GetFusedSlotOffset(2));
set => value.EncryptedBoxData.CopyTo(Data, GetFusedSlotOffset(2));