diff --git a/pk3DS.Core/Structures/Gen7/Gen7SlotDumper.cs b/pk3DS.Core/Structures/Gen7/Gen7SlotDumper.cs index 189b154..5117c77 100644 --- a/pk3DS.Core/Structures/Gen7/Gen7SlotDumper.cs +++ b/pk3DS.Core/Structures/Gen7/Gen7SlotDumper.cs @@ -39,7 +39,7 @@ public static byte[][] GetSOSBinary(Area7[] areas, PersonalTable personal, bool var t = area.Tables[index]; if (ignore.Contains((index >> 1) + 1)) // not zero indexed; bias +1 { - Console.WriteLine($"Skipped MapID-{loc},Table-{zoneIndex}"); + Console.WriteLine($"Skipped MapID-{loc},Table-{index} ({(index >> 1) + 1})"); continue; } @@ -49,7 +49,7 @@ public static byte[][] GetSOSBinary(Area7[] areas, PersonalTable personal, bool var first = t.Encounter7s[0]; if (first.All(sz => sz.Species == 731)) { - Console.WriteLine($"Skipped MapID-{loc},Table-{zoneIndex}: Pikipek Table"); + Console.WriteLine($"Skipped MapID-{loc},Table-{index} ({(index >> 1) + 1}): Pikipek Table"); continue; } @@ -84,13 +84,12 @@ public static byte[][] GetSOSBinary(Area7[] areas, PersonalTable personal, bool var z = area.Zones[zoneIndex]; int loc = z.ParentMap; - var ignore = ignored.TryGetValue(areaIndex, out var skip) ? skip : Array.Empty(); - var table = dict[loc]; + var ignore = ignored.TryGetValue(loc, out var skip) ? skip : Array.Empty(); for (var index = 0; index < area.Tables.Count; index++) { if (ignore.Contains((index >> 1) + 1)) // not zero indexed; bias +1 { - Console.WriteLine($"Skipped MapID-{loc},Table-{zoneIndex}"); + Console.WriteLine($"Skipped MapID-{loc},Table-{index} ({(index >> 1) + 1})"); continue; } if (!dict.ContainsKey(loc)) @@ -100,9 +99,10 @@ public static byte[][] GetSOSBinary(Area7[] areas, PersonalTable personal, bool var first = t.Encounter7s[0]; if (first.All(sz => sz.Species == 731)) { - Console.WriteLine($"Skipped MapID-{loc},Table-{zoneIndex}: Pikipek Table"); + Console.WriteLine($"Skipped MapID-{loc},Table-{index} ({(index >> 1) + 1}): Pikipek Table"); continue; } + var table = dict[loc]; foreach (var wild in first) table.Add(wild.Dump(t)); }