Fix stad1 missing team types

off by 1 (8=>9, and EN has unused interstitial teams).
Fix last-viewed-slot indication color tracking
This commit is contained in:
Kurt 2020-10-03 19:48:56 -07:00
parent 7efaa5ab71
commit 262561d5d1
2 changed files with 4 additions and 4 deletions

View file

@ -135,8 +135,8 @@ namespace PKHeX.Core
private const int TeamCountU = 10;
private const int TeamCountJ = 12;
private const int TeamCountTypeU = 6;
private const int TeamCountTypeJ = 8;
private const int TeamCountTypeU = 9; // team-types 1 & 2 are unused
private const int TeamCountTypeJ = 9;
private int TeamCount => Japanese ? TeamCountJ * TeamCountTypeJ : TeamCountU * TeamCountTypeU;
private int TeamSize => Japanese ? TeamSizeJ : TeamSizeU;
private const int TeamSizeJ = 0x0C + (SIZE_PK1J * 6) + ListFooterSize; // 0x120

View file

@ -116,8 +116,8 @@ namespace PKHeX.WinForms
for (int i = 0; i < group.Slots.Length; i++)
Box.Entries[i].Image = group.Slots[i].Sprite(sav, -1, -1, true);
if (groupSelected == index && slotSelected != -1 && (uint)slotSelected < Box.Entries.Count)
Box.Entries[slotSelected].BackgroundImage = null;
if (slotSelected != -1 && (uint)slotSelected < Box.Entries.Count)
Box.Entries[slotSelected].BackgroundImage = groupSelected != index ? null : SpriteUtil.Spriter.View;
CurrentGroup = index;
}