From 9da5263a52f39874c89e0e24831a81b42b2435aa Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 30 Jun 2020 23:00:48 -0500 Subject: [PATCH] Handle DLC1 records Accessible in block editor, not as the usual trainer records. Closes #2913 , ty @CanoeHope! Co-Authored-By: canoehope --- PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs | 3 +++ PKHeX.Core/Saves/Substructures/Records.cs | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs b/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs index a2c815ced..1ee1e2a09 100644 --- a/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs +++ b/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs @@ -137,6 +137,9 @@ namespace PKHeX.Core public const uint KVolumeSoundEffects = 0x62F05895; // U32 0-10 public const uint KVolumePokémonCries = 0x1D482A63; // U32 0-10 + public const uint KRecordCramorantRobo = 0xB9C0ECFC; // cormorant_robo (Cram-o-matic uses) + public const uint KRecordBattleVersion = 0xBB1DE8EF; // battle_rom_mark (Past-gen Pokémon reset for battling in Ranked) + public const uint KOptionTextSpeed = 0x92EB0306; // U32 TextSpeedOption public const uint KOptionBattleEffects = 0xCCC153CD; // U32 OptOut (Show effects by default) public const uint KOptionBattleStyle = 0x765468C3; // U32 OptOut (Allow Switch by default) diff --git a/PKHeX.Core/Saves/Substructures/Records.cs b/PKHeX.Core/Saves/Substructures/Records.cs index 1f6839730..390c7d57b 100644 --- a/PKHeX.Core/Saves/Substructures/Records.cs +++ b/PKHeX.Core/Saves/Substructures/Records.cs @@ -161,7 +161,6 @@ namespace PKHeX.Core 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, }; public static readonly Dictionary RecordList_6 = new Dictionary @@ -584,9 +583,12 @@ namespace PKHeX.Core /* 48 */ {G8BattleTowerDoubleWin, "battle_tower_double_win"}, {49, "now_money"}, + // The Records Block only stores 50 entries. + // Record IDs for future expansion content is instead handled separately. + // DLC - {50, "cormorant_robo"}, - {51, "battle_rom_mark"}, + {50, "cormorant_robo"}, // saved in B9C0ECFC + {51, "battle_rom_mark"}, // saved in BB1DE8EF }; public const int G8BattleTowerSingleWin = 47;