mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-10 06:34:19 +00:00
Rename Gen3 Champ ribbon to be more accurate
been like this since mid 2016 this ribbon can be obtained in either Hoenn or Kanto within Gen3 https://bulbapedia.bulbagarden.net/wiki/List_of_Ribbons_in_the_games#League_Ribbons
This commit is contained in:
parent
cfcefca14f
commit
aaa69eac15
26 changed files with 35 additions and 35 deletions
|
@ -170,8 +170,8 @@ namespace PKHeX.Core
|
|||
}
|
||||
if (pkm is IRibbonSetCommon3 s3)
|
||||
{
|
||||
if (s3.RibbonChampionG3Hoenn && gen != 3)
|
||||
yield return new RibbonResult(nameof(s3.RibbonChampionG3Hoenn)); // RSE HoF
|
||||
if (s3.RibbonChampionG3 && gen != 3)
|
||||
yield return new RibbonResult(nameof(s3.RibbonChampionG3)); // RSE HoF
|
||||
if (s3.RibbonArtist && gen != 3)
|
||||
yield return new RibbonResult(nameof(s3.RibbonArtist)); // RSE Master Rank Portrait
|
||||
if (s3.RibbonEffort && gen == 5 && pkm.Format == 5) // unobtainable in Gen 5
|
||||
|
|
|
@ -667,7 +667,7 @@ namespace PKHeX.Core
|
|||
public bool RibbonWorld { get => this.GetRibbonIndex(World); set => this.SetRibbonIndex(World, value); }
|
||||
public bool RibbonChampionWorld { get => this.GetRibbonIndex(ChampionWorld); set => this.SetRibbonIndex(ChampionWorld, value); }
|
||||
public bool RibbonSouvenir { get => this.GetRibbonIndex(Souvenir); set => this.SetRibbonIndex(Souvenir, value); }
|
||||
public bool RibbonChampionG3Hoenn { get => this.GetRibbonIndex(ChampionG3Hoenn); set => this.SetRibbonIndex(ChampionG3Hoenn, value); }
|
||||
public bool RibbonChampionG3 { get => this.GetRibbonIndex(ChampionG3); set => this.SetRibbonIndex(ChampionG3, value); }
|
||||
public bool RibbonArtist { get => this.GetRibbonIndex(Artist); set => this.SetRibbonIndex(Artist, value); }
|
||||
public bool RibbonEffort { get => this.GetRibbonIndex(Effort); set => this.SetRibbonIndex(Effort, value); }
|
||||
public bool RibbonChampionSinnoh { get => this.GetRibbonIndex(ChampionSinnoh); set => this.SetRibbonIndex(ChampionSinnoh, value); }
|
||||
|
|
|
@ -168,7 +168,7 @@ namespace PKHeX.Core
|
|||
public override bool RibbonG3ToughSuper { get => (RIB6 & (1 << 1)) == 1 << 1; set => RIB6 = (byte)((RIB6 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public override bool RibbonG3ToughHyper { get => (RIB6 & (1 << 2)) == 1 << 2; set => RIB6 = (byte)((RIB6 & ~(1 << 2)) | (value ? 1 << 2 : 0)); }
|
||||
public override bool RibbonG3ToughMaster { get => (RIB6 & (1 << 3)) == 1 << 3; set => RIB6 = (byte)((RIB6 & ~(1 << 3)) | (value ? 1 << 3 : 0)); }
|
||||
public override bool RibbonChampionG3Hoenn { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public override bool RibbonChampionG3 { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public override bool RibbonWinning { get => (RIB6 & (1 << 5)) == 1 << 5; set => RIB6 = (byte)((RIB6 & ~(1 << 5)) | (value ? 1 << 5 : 0)); }
|
||||
public override bool RibbonVictory { get => (RIB6 & (1 << 6)) == 1 << 6; set => RIB6 = (byte)((RIB6 & ~(1 << 6)) | (value ? 1 << 6 : 0)); }
|
||||
public override bool RibbonArtist { get => (RIB6 & (1 << 7)) == 1 << 7; set => RIB6 = (byte)((RIB6 & ~(1 << 7)) | (value ? 1 << 7 : 0)); }
|
||||
|
|
|
@ -155,7 +155,7 @@ namespace PKHeX.Core
|
|||
public override byte CNT_Sheen { get => Data[0xBC]; set => Data[0xBC] = value; }
|
||||
|
||||
// Ribbons
|
||||
public override bool RibbonChampionG3Hoenn { get => Data[0xBD] == 1; set => Data[0xBD] = value ? (byte)1 : (byte)0; }
|
||||
public override bool RibbonChampionG3 { get => Data[0xBD] == 1; set => Data[0xBD] = value ? (byte)1 : (byte)0; }
|
||||
public override bool RibbonWinning { get => Data[0xBE] == 1; set => Data[0xBE] = value ? (byte)1 : (byte)0; }
|
||||
public override bool RibbonVictory { get => Data[0xBF] == 1; set => Data[0xBF] = value ? (byte)1 : (byte)0; }
|
||||
public override bool RibbonArtist { get => Data[0xC0] == 1; set => Data[0xC0] = value ? (byte)1 : (byte)0; }
|
||||
|
|
|
@ -157,7 +157,7 @@ namespace PKHeX.Core
|
|||
public override int RibbonCountG3Cute { get => (int)(RIB0 >> 06) & 7; set => RIB0 = ((RIB0 & ~(7u << 06)) | (uint)(value & 7) << 06); }
|
||||
public override int RibbonCountG3Smart { get => (int)(RIB0 >> 09) & 7; set => RIB0 = ((RIB0 & ~(7u << 09)) | (uint)(value & 7) << 09); }
|
||||
public override int RibbonCountG3Tough { get => (int)(RIB0 >> 12) & 7; set => RIB0 = ((RIB0 & ~(7u << 12)) | (uint)(value & 7) << 12); }
|
||||
public override bool RibbonChampionG3Hoenn { get => (RIB0 & (1 << 15)) == 1 << 15; set => RIB0 = ((RIB0 & ~(1u << 15)) | (value ? 1u << 15 : 0u)); }
|
||||
public override bool RibbonChampionG3 { get => (RIB0 & (1 << 15)) == 1 << 15; set => RIB0 = ((RIB0 & ~(1u << 15)) | (value ? 1u << 15 : 0u)); }
|
||||
public override bool RibbonWinning { get => (RIB0 & (1 << 16)) == 1 << 16; set => RIB0 = ((RIB0 & ~(1u << 16)) | (value ? 1u << 16 : 0u)); }
|
||||
public override bool RibbonVictory { get => (RIB0 & (1 << 17)) == 1 << 17; set => RIB0 = ((RIB0 & ~(1u << 17)) | (value ? 1u << 17 : 0u)); }
|
||||
public override bool RibbonArtist { get => (RIB0 & (1 << 18)) == 1 << 18; set => RIB0 = ((RIB0 & ~(1u << 18)) | (value ? 1u << 18 : 0u)); }
|
||||
|
@ -254,7 +254,7 @@ namespace PKHeX.Core
|
|||
Met_Level = CurrentLevel,
|
||||
Met_Location = Locations.Transfer3, // Pal Park
|
||||
|
||||
RibbonChampionG3Hoenn = RibbonChampionG3Hoenn,
|
||||
RibbonChampionG3 = RibbonChampionG3,
|
||||
RibbonWinning = RibbonWinning,
|
||||
RibbonVictory = RibbonVictory,
|
||||
RibbonArtist = RibbonArtist,
|
||||
|
|
|
@ -147,7 +147,7 @@ namespace PKHeX.Core
|
|||
public override bool RibbonG3ToughSuper { get => (RIB6 & (1 << 1)) == 1 << 1; set => RIB6 = (byte)((RIB6 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public override bool RibbonG3ToughHyper { get => (RIB6 & (1 << 2)) == 1 << 2; set => RIB6 = (byte)((RIB6 & ~(1 << 2)) | (value ? 1 << 2 : 0)); }
|
||||
public override bool RibbonG3ToughMaster { get => (RIB6 & (1 << 3)) == 1 << 3; set => RIB6 = (byte)((RIB6 & ~(1 << 3)) | (value ? 1 << 3 : 0)); }
|
||||
public override bool RibbonChampionG3Hoenn { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public override bool RibbonChampionG3 { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public override bool RibbonWinning { get => (RIB6 & (1 << 5)) == 1 << 5; set => RIB6 = (byte)((RIB6 & ~(1 << 5)) | (value ? 1 << 5 : 0)); }
|
||||
public override bool RibbonVictory { get => (RIB6 & (1 << 6)) == 1 << 6; set => RIB6 = (byte)((RIB6 & ~(1 << 6)) | (value ? 1 << 6 : 0)); }
|
||||
public override bool RibbonArtist { get => (RIB6 & (1 << 7)) == 1 << 7; set => RIB6 = (byte)((RIB6 & ~(1 << 7)) | (value ? 1 << 7 : 0)); }
|
||||
|
|
|
@ -161,7 +161,7 @@ namespace PKHeX.Core
|
|||
public bool RibbonG3ToughSuper { get => (RIB6 & (1 << 1)) == 1 << 1; set => RIB6 = (byte)((RIB6 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public bool RibbonG3ToughHyper { get => (RIB6 & (1 << 2)) == 1 << 2; set => RIB6 = (byte)((RIB6 & ~(1 << 2)) | (value ? 1 << 2 : 0)); }
|
||||
public bool RibbonG3ToughMaster { get => (RIB6 & (1 << 3)) == 1 << 3; set => RIB6 = (byte)((RIB6 & ~(1 << 3)) | (value ? 1 << 3 : 0)); }
|
||||
public bool RibbonChampionG3Hoenn { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public bool RibbonChampionG3 { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
public bool RibbonWinning { get => (RIB6 & (1 << 5)) == 1 << 5; set => RIB6 = (byte)((RIB6 & ~(1 << 5)) | (value ? 1 << 5 : 0)); }
|
||||
public bool RibbonVictory { get => (RIB6 & (1 << 6)) == 1 << 6; set => RIB6 = (byte)((RIB6 & ~(1 << 6)) | (value ? 1 << 6 : 0)); }
|
||||
public bool RibbonArtist { get => (RIB6 & (1 << 7)) == 1 << 7; set => RIB6 = (byte)((RIB6 & ~(1 << 7)) | (value ? 1 << 7 : 0)); }
|
||||
|
@ -401,7 +401,7 @@ namespace PKHeX.Core
|
|||
RibbonCountMemoryBattle = CountBattleRibbons(),
|
||||
|
||||
// Copy Ribbons to their new locations.
|
||||
RibbonChampionG3Hoenn = RibbonChampionG3Hoenn,
|
||||
RibbonChampionG3 = RibbonChampionG3,
|
||||
RibbonChampionSinnoh = RibbonChampionSinnoh,
|
||||
RibbonEffort = RibbonEffort,
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ namespace PKHeX.Core
|
|||
private byte RIB4 { get => Data[0x34]; set => Data[0x34] = value; }
|
||||
private byte RIB5 { get => Data[0x35]; set => Data[0x35] = value; }
|
||||
public bool RibbonChampionKalos { get => (RIB0 & (1 << 0)) == 1 << 0; set => RIB0 = (byte)((RIB0 & ~(1 << 0)) | (value ? 1 << 0 : 0)); }
|
||||
public bool RibbonChampionG3Hoenn { get => (RIB0 & (1 << 1)) == 1 << 1; set => RIB0 = (byte)((RIB0 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public bool RibbonChampionG3 { get => (RIB0 & (1 << 1)) == 1 << 1; set => RIB0 = (byte)((RIB0 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public bool RibbonChampionSinnoh { get => (RIB0 & (1 << 2)) == 1 << 2; set => RIB0 = (byte)((RIB0 & ~(1 << 2)) | (value ? 1 << 2 : 0)); }
|
||||
public bool RibbonBestFriends { get => (RIB0 & (1 << 3)) == 1 << 3; set => RIB0 = (byte)((RIB0 & ~(1 << 3)) | (value ? 1 << 3 : 0)); }
|
||||
public bool RibbonTraining { get => (RIB0 & (1 << 4)) == 1 << 4; set => RIB0 = (byte)((RIB0 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
|
|
|
@ -159,7 +159,7 @@ namespace PKHeX.Core
|
|||
private byte RIB6 { get => Data[0x36]; set => Data[0x36] = value; }
|
||||
//private byte RIB7 { get => Data[0x37]; set => Data[0x37] = value; } // Unused
|
||||
public bool RibbonChampionKalos { get => (RIB0 & (1 << 0)) == 1 << 0; set => RIB0 = (byte)((RIB0 & ~(1 << 0)) | (value ? 1 << 0 : 0)); }
|
||||
public bool RibbonChampionG3Hoenn { get => (RIB0 & (1 << 1)) == 1 << 1; set => RIB0 = (byte)((RIB0 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public bool RibbonChampionG3 { get => (RIB0 & (1 << 1)) == 1 << 1; set => RIB0 = (byte)((RIB0 & ~(1 << 1)) | (value ? 1 << 1 : 0)); }
|
||||
public bool RibbonChampionSinnoh { get => (RIB0 & (1 << 2)) == 1 << 2; set => RIB0 = (byte)((RIB0 & ~(1 << 2)) | (value ? 1 << 2 : 0)); }
|
||||
public bool RibbonBestFriends { get => (RIB0 & (1 << 3)) == 1 << 3; set => RIB0 = (byte)((RIB0 & ~(1 << 3)) | (value ? 1 << 3 : 0)); }
|
||||
public bool RibbonTraining { get => (RIB0 & (1 << 4)) == 1 << 4; set => RIB0 = (byte)((RIB0 & ~(1 << 4)) | (value ? 1 << 4 : 0)); }
|
||||
|
@ -578,7 +578,7 @@ namespace PKHeX.Core
|
|||
CNT_Tough = CNT_Tough,
|
||||
CNT_Sheen = CNT_Sheen,
|
||||
|
||||
RibbonChampionG3Hoenn = RibbonChampionG3Hoenn,
|
||||
RibbonChampionG3 = RibbonChampionG3,
|
||||
RibbonChampionSinnoh = RibbonChampionSinnoh,
|
||||
RibbonEffort = RibbonEffort,
|
||||
RibbonAlert = RibbonAlert,
|
||||
|
|
|
@ -196,7 +196,7 @@ namespace PKHeX.Core
|
|||
|
||||
// ribbon u32
|
||||
public bool RibbonChampionKalos { get => FlagUtil.GetFlag(Data, 0x34, 0); set => FlagUtil.SetFlag(Data, 0x34, 0, value); }
|
||||
public bool RibbonChampionG3Hoenn { get => FlagUtil.GetFlag(Data, 0x34, 1); set => FlagUtil.SetFlag(Data, 0x34, 1, value); }
|
||||
public bool RibbonChampionG3 { get => FlagUtil.GetFlag(Data, 0x34, 1); set => FlagUtil.SetFlag(Data, 0x34, 1, value); }
|
||||
public bool RibbonChampionSinnoh { get => FlagUtil.GetFlag(Data, 0x34, 2); set => FlagUtil.SetFlag(Data, 0x34, 2, value); }
|
||||
public bool RibbonBestFriends { get => FlagUtil.GetFlag(Data, 0x34, 3); set => FlagUtil.SetFlag(Data, 0x34, 3, value); }
|
||||
public bool RibbonTraining { get => FlagUtil.GetFlag(Data, 0x34, 4); set => FlagUtil.SetFlag(Data, 0x34, 4, value); }
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
public abstract bool RibbonChampionBattle { get; set; }
|
||||
public abstract bool RibbonChampionRegional { get; set; }
|
||||
public abstract bool RibbonChampionNational { get; set; }
|
||||
public abstract bool RibbonChampionG3Hoenn { get; set; }
|
||||
public abstract bool RibbonChampionG3 { get; set; }
|
||||
public abstract bool RibbonArtist { get; set; }
|
||||
public abstract bool RibbonEffort { get; set; }
|
||||
public abstract bool RibbonWinning { get; set; }
|
||||
|
@ -167,7 +167,7 @@
|
|||
RibbonCountG3Cute = RibbonCountG3Cute,
|
||||
RibbonCountG3Smart = RibbonCountG3Smart,
|
||||
RibbonCountG3Tough = RibbonCountG3Tough,
|
||||
RibbonChampionG3Hoenn = RibbonChampionG3Hoenn,
|
||||
RibbonChampionG3 = RibbonChampionG3,
|
||||
RibbonWinning = RibbonWinning,
|
||||
RibbonVictory = RibbonVictory,
|
||||
RibbonArtist = RibbonArtist,
|
||||
|
|
|
@ -118,7 +118,7 @@
|
|||
public abstract bool RibbonG4ToughGreat { get; set; }
|
||||
public abstract bool RibbonG4ToughUltra { get; set; }
|
||||
public abstract bool RibbonG4ToughMaster { get; set; }
|
||||
public abstract bool RibbonChampionG3Hoenn { get; set; }
|
||||
public abstract bool RibbonChampionG3 { get; set; }
|
||||
public abstract bool RibbonArtist { get; set; }
|
||||
public abstract bool RibbonEffort { get; set; }
|
||||
public abstract bool RibbonChampionSinnoh { get; set; }
|
||||
|
@ -282,7 +282,7 @@
|
|||
RibbonG3ToughSuper = RibbonG3ToughSuper,
|
||||
RibbonG3ToughHyper = RibbonG3ToughHyper,
|
||||
RibbonG3ToughMaster = RibbonG3ToughMaster,
|
||||
RibbonChampionG3Hoenn = RibbonChampionG3Hoenn,
|
||||
RibbonChampionG3 = RibbonChampionG3,
|
||||
RibbonWinning = RibbonWinning,
|
||||
RibbonVictory = RibbonVictory,
|
||||
RibbonArtist = RibbonArtist,
|
||||
|
|
|
@ -97,7 +97,7 @@ namespace PKHeX.Core
|
|||
public string NicknameCopy { get => GetString(0x64, 20); set => SetString(value, 10).CopyTo(Data, 0x64); } // +2 terminator
|
||||
// 0x7A-0x7B Unknown
|
||||
private ushort RIB0 { get => BigEndian.ToUInt16(Data, 0x7C); set => BigEndian.GetBytes(value).CopyTo(Data, 0x7C); }
|
||||
public override bool RibbonChampionG3Hoenn { get => (RIB0 & (1 << 15)) == 1 << 15; set => RIB0 = (ushort)((RIB0 & ~(1 << 15)) | (value ? 1 << 15 : 0)); }
|
||||
public override bool RibbonChampionG3 { get => (RIB0 & (1 << 15)) == 1 << 15; set => RIB0 = (ushort)((RIB0 & ~(1 << 15)) | (value ? 1 << 15 : 0)); }
|
||||
public override bool RibbonWinning { get => (RIB0 & (1 << 14)) == 1 << 14; set => RIB0 = (ushort)((RIB0 & ~(1 << 14)) | (value ? 1 << 14 : 0)); }
|
||||
public override bool RibbonVictory { get => (RIB0 & (1 << 13)) == 1 << 13; set => RIB0 = (ushort)((RIB0 & ~(1 << 13)) | (value ? 1 << 13 : 0)); }
|
||||
public override bool RibbonArtist { get => (RIB0 & (1 << 12)) == 1 << 12; set => RIB0 = (ushort)((RIB0 & ~(1 << 12)) | (value ? 1 << 12 : 0)); }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos Kalos Champion
|
||||
RibbonChampionG3Hoenn Hoenn Champion (RSE)
|
||||
RibbonChampionG3 Champion (Gen3)
|
||||
RibbonChampionSinnoh Sinnoh Champion
|
||||
RibbonBestFriends Beste Freunde
|
||||
RibbonTraining Training
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos Kalos Champion
|
||||
RibbonChampionG3Hoenn Hoenn Champion (RSE)
|
||||
RibbonChampionG3 Champion (Gen3)
|
||||
RibbonChampionSinnoh Sinnoh Champion
|
||||
RibbonBestFriends Best Friends
|
||||
RibbonTraining Training
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos Campeón de Kalos
|
||||
RibbonChampionG3Hoenn Campeón de Hoenn (RSE)
|
||||
RibbonChampionG3 Campeón (Gen3)
|
||||
RibbonChampionSinnoh Campeón de Sinnoh
|
||||
RibbonBestFriends Afecto
|
||||
RibbonTraining Ejercicio
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos Maître Kalos
|
||||
RibbonChampionG3Hoenn Maître Hoenn (RSE)
|
||||
RibbonChampionG3 Maître (Gen3)
|
||||
RibbonChampionSinnoh Maître Sinnoh
|
||||
RibbonBestFriends Affection
|
||||
RibbonTraining Perfectionnement
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos Kalos Champion
|
||||
RibbonChampionG3Hoenn Hoenn Champion (RSE)
|
||||
RibbonChampionG3 Champion (Gen3)
|
||||
RibbonChampionSinnoh Sinnoh Champion
|
||||
RibbonBestFriends Best Friends
|
||||
RibbonTraining Training
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos カロス チャンプ
|
||||
RibbonChampionG3Hoenn ホウエン チャンプ (RSE)
|
||||
RibbonChampionG3 チャンプ (Gen3)
|
||||
RibbonChampionSinnoh シンオウ チャンプ
|
||||
RibbonBestFriends なかよし
|
||||
RibbonTraining しゅぎょう
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos 칼로스챔피언리본
|
||||
RibbonChampionG3Hoenn 호연챔피언리본 (RSE)
|
||||
RibbonChampionG3 챔피언리본 (Gen3)
|
||||
RibbonChampionSinnoh 신오챔피언리본
|
||||
RibbonBestFriends 절친리본
|
||||
RibbonTraining 수행리본
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
RibbonChampionKalos 卡洛斯冠军
|
||||
RibbonChampionG3Hoenn 冠军 (3代)
|
||||
RibbonChampionG3 冠军 (3代)
|
||||
RibbonChampionSinnoh 神奥冠军
|
||||
RibbonBestFriends 好友
|
||||
RibbonTraining 修行
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
/// <summary> Common Ribbons introduced in Generation 3 </summary>
|
||||
public interface IRibbonSetCommon3
|
||||
{
|
||||
bool RibbonChampionG3Hoenn { get; set; }
|
||||
bool RibbonChampionG3 { get; set; }
|
||||
bool RibbonArtist { get; set; }
|
||||
bool RibbonEffort { get; set; }
|
||||
}
|
||||
|
@ -12,14 +12,14 @@
|
|||
{
|
||||
private static readonly string[] RibbonSetNamesCommon3 =
|
||||
{
|
||||
nameof(IRibbonSetCommon3.RibbonChampionG3Hoenn), nameof(IRibbonSetCommon3.RibbonArtist), nameof(IRibbonSetCommon3.RibbonEffort)
|
||||
nameof(IRibbonSetCommon3.RibbonChampionG3), nameof(IRibbonSetCommon3.RibbonArtist), nameof(IRibbonSetCommon3.RibbonEffort)
|
||||
};
|
||||
|
||||
internal static bool[] RibbonBits(this IRibbonSetCommon3 set)
|
||||
{
|
||||
return new[]
|
||||
{
|
||||
set.RibbonChampionG3Hoenn,
|
||||
set.RibbonChampionG3,
|
||||
set.RibbonArtist,
|
||||
set.RibbonEffort,
|
||||
};
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
public enum RibbonIndex
|
||||
{
|
||||
ChampionKalos,
|
||||
ChampionG3Hoenn,
|
||||
ChampionG3,
|
||||
ChampionSinnoh,
|
||||
BestFriends,
|
||||
Training,
|
||||
|
|
4
PKHeX.Drawing/Properties/Resources.Designer.cs
generated
4
PKHeX.Drawing/Properties/Resources.Designer.cs
generated
|
@ -34293,9 +34293,9 @@ namespace PKHeX.Drawing.Properties {
|
|||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap ribbonchampiong3hoenn {
|
||||
public static System.Drawing.Bitmap ribbonchampiong3 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("ribbonchampiong3hoenn", resourceCulture);
|
||||
object obj = ResourceManager.GetObject("ribbonchampiong3", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1813,8 +1813,8 @@
|
|||
<data name="ribbonchampionbattle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\ribbons\ribbonchampionbattle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ribbonchampiong3hoenn" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\ribbons\ribbonchampiong3hoenn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ribbonchampiong3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\ribbons\ribbonchampiong3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ribbonchampiong6hoenn" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\ribbons\ribbonchampiong6hoenn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Loading…
Reference in a new issue