Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-07 01:06:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add configsave to accessor

Browse Source 
xy battle background makes up the other 5 bits; good to know!

reorder enum to match comments in properties (switch=0)
This commit is contained in:
Kurt
2020-04-26 15:17:58 -07:00
parent a55b4da05c
commit 6cce57d505
8 changed files with 131 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PKHeX.Core/Saves/Access/ISaveBlock6Main.cs
View File

@@ -4,6 +4,7 @@ public interface ISaveBlock6Main : ISaveBlock6Core, IPokePuff, IOPower, ILink
{
BoxLayout6 BoxLayout { get; }
BattleBox6 BattleBox { get; }
ConfigSave6 Config { get; }
MysteryBlock6 MysteryGift { get; }
SuperTrainBlock SuperTrain { get; }
MaisonBlock Maison { get; }

2
PKHeX.Core/Saves/Access/SaveBlockAccessor6AO.cs
View File

@@ -89,6 +89,7 @@ public class SaveBlockAccessor6AO : ISaveBlockAccessor<BlockInfo6>, ISaveBlock6M
public SuperTrainBlock SuperTrain { get; }
public MaisonBlock Maison { get; }
public SubEventLog6 SUBE { get; }
public ConfigSave6 Config { get; }
public SaveBlockAccessor6AO(SAV6AO sav)
{
@@ -103,6 +104,7 @@ public SaveBlockAccessor6AO(SAV6AO sav)
BattleBox = new BattleBox6(sav, 0x04A00);
Status = new MyStatus6(sav, 0x14000);
Zukan = new Zukan6AO(sav, 0x15000, 0x400);
Config = new ConfigSave6(sav, 0x16C00);
OPower = new OPower6(sav, 0x17400);
Maison = new MaisonBlock(sav, 0x1BA00);
MysteryGift = new MysteryBlock6(sav, 0x1CC00);

2
PKHeX.Core/Saves/Access/SaveBlockAccessor6XY.cs
View File

@@ -74,6 +74,7 @@ public class SaveBlockAccessor6XY : ISaveBlockAccessor<BlockInfo6>, ISaveBlock6X
public MyStatus6 Status { get; }
public RecordBlock6 Records { get; }
public SubEventLog6 SUBE { get; }
public ConfigSave6 Config { get; }
public SaveBlockAccessor6XY(SAV6XY sav)
{
@@ -89,6 +90,7 @@ public SaveBlockAccessor6XY(SAV6XY sav)
BattleBox = new BattleBox6(sav, 0x04A00);
Status = new MyStatus6XY(sav, 0x14000);
Zukan = new Zukan6XY(sav, 0x15000, 0x3C8);
Config = new ConfigSave6(sav, 0x16200);
OPower = new OPower6(sav, 0x16A00);
MysteryGift = new MysteryBlock6(sav, 0x1BC00);
SUBE = new SubEventLog6XY(sav, 0x1D800);

1
PKHeX.Core/Saves/SAV6AO.cs
View File

@@ -83,6 +83,7 @@ private void Initialize()
public SuperTrainBlock SuperTrain => Blocks.SuperTrain;
public MaisonBlock Maison => Blocks.Maison;
public SubEventLog6 SUBE => Blocks.SUBE;
public ConfigSave6 Config => Blocks.Config;
public Misc6AO Misc => Blocks.Misc;
public Zukan6AO Zukan => Blocks.Zukan;

1
PKHeX.Core/Saves/SAV6XY.cs
View File

@@ -80,6 +80,7 @@ private void Initialize()
public Misc6XY Misc => Blocks.Misc;
public Fashion6XY Fashion => Blocks.Fashion;
public SubEventLog6 SUBE => Blocks.SUBE;
public ConfigSave6 Config => Blocks.Config;
#endregion
protected override void SetDex(PKM pkm) => Blocks.Zukan.SetDex(pkm);

115
PKHeX.Core/Saves/Substructures/Gen7/ConfigSave6.cs Normal file
View File

@@ -0,0 +1,115 @@
using System;
namespace PKHeX.Core
{
public sealed class ConfigSave6 : SaveBlock
{
/* ===32 bits===
* talkSpeed:2 0,1
* battleAnim:1 2
* battleStyle:1 3
* unknown:4 4..7
* battleBG:5 8..12
* buttonMode:2 13,14
* forcedSave:1 15
* flag1:1 16
* enablePSS:1 17
* enablePR:1 18
* unknown:14 19..31
*/
public ConfigSave6(SAV6XY sav, int offset) : base(sav) => Offset = offset;
public ConfigSave6(SAV6AO sav, int offset) : base(sav) => Offset = offset;
public int ConfigValue
{
get => BitConverter.ToInt32(Data, Offset);
set => BitConverter.GetBytes(value).CopyTo(Data, Offset);
}
public int TalkingSpeed
{
get => ConfigValue & 3;
set => ConfigValue = (ConfigValue & ~3) | (value & 3);
}
public BattleAnimationSetting BattleAnimation
{
// Effects OFF = 1, Effects ON = 0
get => (BattleAnimationSetting)((ConfigValue >> 2) & 1);
set => ConfigValue = (ConfigValue & ~(1 << 2)) | ((byte)value << 2);
}
public BattleStyleSetting BattleStyle
{
// SET = 1, SWITCH = 0
get => (BattleStyleSetting)((ConfigValue >> 3) & 1);
set => ConfigValue = (ConfigValue & ~(1 << 3)) | ((byte)value << 3);
}
// UNKNOWN?
public int BattleBackground
{
// Only values 0-14 are used.
get => (ConfigValue >> 8) & 0x1F;
set => ConfigValue = (ConfigValue & ~(0x1F << 8)) | (value << 8);
}
public int ButtonMode
{
get => (ConfigValue >> 13) & 3;
set => ConfigValue = (ConfigValue & ~(1 << 13)) | (value << 13);
}
public int ForceSaveBeforeOnline
{
get => (ConfigValue >> 15) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 15)) | (value << 15);
}
public int EnableFlag1
{
get => (ConfigValue >> 16) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 16)) | (value << 16);
}
public int EnablePSSFlag
{
get => (ConfigValue >> 17) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 17)) | (value << 17);
}
public int EnableTrainerPRFlag
{
get => (ConfigValue >> 18) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 18)) | (value << 18);
}
// NOTE: BELOW COMES FROM LGPE. MAYBE THIS IS WHAT THEY USE THE FLAGS FOR?
/// <summary>
/// <see cref="LanguageID"/> for messages, stored with <see cref="LanguageID.UNUSED_6"/> skipped in the enumeration.
/// </summary>
public int Language
{
get => GetLanguageID((ConfigValue >> 4) & 0xF);
set => ConfigValue = ((ConfigValue & ~0xF0) | SetLanguageID(value) << 4);
}
private static int GetLanguageID(int i) => i >= (int)LanguageID.UNUSED_6 ? i + 1 : i; // sets langBank to LanguageID
private static int SetLanguageID(int i) => i > (int)LanguageID.UNUSED_6 ? i - 1 : i; // sets LanguageID to langBank
public enum BattleAnimationSetting
{
EffectsON,
EffectsOFF,
}
public enum BattleStyleSetting
{
SWITCH,
SET,
}
}
}

16
PKHeX.Core/Saves/Substructures/Gen7/ConfigSave7.cs
View File

@@ -29,18 +29,18 @@ public int TalkingSpeed
set => ConfigValue = (ConfigValue & ~3) | (value & 3);
}
public int BattleAnimation
public BattleAnimationSetting BattleAnimation
{
// Effects OFF = 1, Effects ON = 0
get => (ConfigValue >> 2) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 2)) | (value << 2);
get => (BattleAnimationSetting)((ConfigValue >> 2) & 1);
set => ConfigValue = (ConfigValue & ~(1 << 2)) | ((byte)value << 2);
}
public int BattleStyle
public BattleStyleSetting BattleStyle
{
// SET = 1, SWITCH = 0
get => (ConfigValue >> 3) & 1;
set => ConfigValue = (ConfigValue & ~(1 << 3)) | (value << 3);
get => (BattleStyleSetting)((ConfigValue >> 3) & 1);
set => ConfigValue = (ConfigValue & ~(1 << 3)) | ((byte)value << 3);
}
// UNKNOWN?
@@ -80,8 +80,8 @@ public enum BattleAnimationSetting
public enum BattleStyleSetting
{
SET,
SWITCH,
SET,
}
}
}
}

2
PKHeX.Core/Saves/Substructures/Gen7/ConfigSave7b.cs
View File

@@ -61,8 +61,8 @@ public enum BattleAnimationSetting
public enum BattleStyleSetting
{
SET,
SWITCH,
SET,
}
}
}