diff --git a/Gen 7/CHS/2046 SM - Satoshi Greninja (CHS) (M).wc7 b/Gen 7/CHS/2046 SM - Satoshi Ash-Greninja (Inactive) (CHS) (M).wc7
similarity index 100%
rename from Gen 7/CHS/2046 SM - Satoshi Greninja (CHS) (M).wc7
rename to Gen 7/CHS/2046 SM - Satoshi Ash-Greninja (Inactive) (CHS) (M).wc7
diff --git a/Gen 7/CHT/2046 SM - Satoshi Greninja (CHT) (M).wc7 b/Gen 7/CHT/2046 SM - Satoshi Ash-Greninja (Inactive) (CHT) (M).wc7
similarity index 100%
rename from Gen 7/CHT/2046 SM - Satoshi Greninja (CHT) (M).wc7
rename to Gen 7/CHT/2046 SM - Satoshi Ash-Greninja (Inactive) (CHT) (M).wc7
diff --git a/Gen 7/ENG/0606 SM - Rocky Lycanroc HA (ENG).wc7full b/Gen 7/ENG/0606 SM - Rocky Lycanroc (Midnight) HA (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/0606 SM - Rocky Lycanroc HA (ENG).wc7full
rename to Gen 7/ENG/0606 SM - Rocky Lycanroc (Midnight) HA (ENG).wc7full
diff --git a/Gen 7/ENG/1601 SM -  Munchlax (ENG).wc7full b/Gen 7/ENG/1601 SM - (Trainer) Munchlax & Snorlium Z (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1601 SM -  Munchlax (ENG).wc7full
rename to Gen 7/ENG/1601 SM - (Trainer) Munchlax & Snorlium Z (ENG).wc7full
diff --git a/Gen 7/ENG/1604 SM - Item Rare Candy x5 (ENG).wc7full b/Gen 7/ENG/1604 SM - Item Rare Candy & Friend Ball (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1604 SM - Item Rare Candy x5 (ENG).wc7full
rename to Gen 7/ENG/1604 SM - Item Rare Candy & Friend Ball (ENG).wc7full
diff --git a/Gen 7/ENG/1605 SM - Item Mewtwonite X x1 (ENG).wc7full b/Gen 7/ENG/1605 SM - Item Mewtwonite X & Mewtwonite Y (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1605 SM - Item Mewtwonite X x1 (ENG).wc7full
rename to Gen 7/ENG/1605 SM - Item Mewtwonite X & Mewtwonite Y (ENG).wc7full
diff --git a/Gen 7/ENG/1606 SM - Item Mawilite x1 (ENG).wc7full b/Gen 7/ENG/1606 SM - Item Mawilite & Beedrillite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1606 SM - Item Mawilite x1 (ENG).wc7full
rename to Gen 7/ENG/1606 SM - Item Mawilite & Beedrillite (ENG).wc7full
diff --git a/Gen 7/ENG/1607 SM - Item Rare Candy x5 (ENG).wc7full b/Gen 7/ENG/1607 SM - Item Rare Candy & Heavy Ball (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1607 SM - Item Rare Candy x5 (ENG).wc7full
rename to Gen 7/ENG/1607 SM - Item Rare Candy & Heavy Ball (ENG).wc7full
diff --git a/Gen 7/ENG/1608 SM - Item Pidgeotite x1 (ENG).wc7full b/Gen 7/ENG/1608 SM - Item Pidgeotite & Steelixite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1608 SM - Item Pidgeotite x1 (ENG).wc7full
rename to Gen 7/ENG/1608 SM - Item Pidgeotite & Steelixite (ENG).wc7full
diff --git a/Gen 7/ENG/1609 SM - Item Mawilite x1 (ENG).wc7full b/Gen 7/ENG/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1609 SM - Item Mawilite x1 (ENG).wc7full
rename to Gen 7/ENG/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (ENG).wc7full
diff --git a/Gen 7/ENG/1610 SM - Item Rare Candy x5 (ENG).wc7full b/Gen 7/ENG/1610 SM - Item Rare Candy & Love Ball (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1610 SM - Item Rare Candy x5 (ENG).wc7full
rename to Gen 7/ENG/1610 SM - Item Rare Candy & Love Ball (ENG).wc7full
diff --git a/Gen 7/ENG/1611 SM - Item Pidgeotite x1 (ENG).wc7full b/Gen 7/ENG/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1611 SM - Item Pidgeotite x1 (ENG).wc7full
rename to Gen 7/ENG/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (ENG).wc7full
diff --git a/Gen 7/ENG/1612 SM - Item Rare Candy x5 (ENG).wc7full b/Gen 7/ENG/1612 SM - Item Rare Candy & Level Ball (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1612 SM - Item Rare Candy x5 (ENG).wc7full
rename to Gen 7/ENG/1612 SM - Item Rare Candy & Level Ball (ENG).wc7full
diff --git a/Gen 7/ENG/1613 SM - Item Sceptilite x1 (ENG).wc7full b/Gen 7/ENG/1613 SM - Item Sceptilite & Blazikenite & Swampertite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1613 SM - Item Sceptilite x1 (ENG).wc7full
rename to Gen 7/ENG/1613 SM - Item Sceptilite & Blazikenite & Swampertite (ENG).wc7full
diff --git a/Gen 7/ENG/1614 SM - Item Tyranitarite x1 (ENG).wc7full b/Gen 7/ENG/1614 SM - Item Tyranitarite & Abomasite & Manectite (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1614 SM - Item Tyranitarite x1 (ENG).wc7full
rename to Gen 7/ENG/1614 SM - Item Tyranitarite & Abomasite & Manectite (ENG).wc7full
diff --git a/Gen 7/ENG/1615 SM - Item Rare Candy x5 (ENG).wc7full b/Gen 7/ENG/1615 SM - Item Rare Candy & Lure Ball (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/1615 SM - Item Rare Candy x5 (ENG).wc7full
rename to Gen 7/ENG/1615 SM - Item Rare Candy & Lure Ball (ENG).wc7full
diff --git a/Gen 7/ENG/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ENG).wc7full b/Gen 7/ENG/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ENG).wc7full
new file mode 100644
index 00000000..3246e27b
Binary files /dev/null and b/Gen 7/ENG/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ENG).wc7full differ
diff --git a/Gen 7/ENG/2046 SM - Ash Greninja (ENG) (M).wc7 b/Gen 7/ENG/2046 SM - Ash Ash-Greninja (Inactive) (ENG) (M).wc7
similarity index 100%
rename from Gen 7/ENG/2046 SM - Ash Greninja (ENG) (M).wc7
rename to Gen 7/ENG/2046 SM - Ash Ash-Greninja (Inactive) (ENG) (M).wc7
diff --git a/Gen 7/ENG/2047 SM -  Battle Points x50 (ENG).wc7full b/Gen 7/ENG/2047 SM - Battle Points x50 (ENG).wc7full
similarity index 100%
rename from Gen 7/ENG/2047 SM -  Battle Points x50 (ENG).wc7full
rename to Gen 7/ENG/2047 SM - Battle Points x50 (ENG).wc7full
diff --git a/Gen 7/FRE/0606 SM - Rocky Lycanroc HA (EU) (FRE).wc7full b/Gen 7/FRE/0606 SM - Rocky Lycanroc (Midnight) HA (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/0606 SM - Rocky Lycanroc HA (EU) (FRE).wc7full
rename to Gen 7/FRE/0606 SM - Rocky Lycanroc (Midnight) HA (FRE).wc7full
diff --git a/Gen 7/FRE/1601 SM -  Munchlax (FRE).wc7full b/Gen 7/FRE/1601 SM - (Trainer) Munchlax & Snorlium Z (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1601 SM -  Munchlax (FRE).wc7full
rename to Gen 7/FRE/1601 SM - (Trainer) Munchlax & Snorlium Z (FRE).wc7full
diff --git a/Gen 7/FRE/1604 SM - Item Rare Candy x5 (FRE).wc7full b/Gen 7/FRE/1604 SM - Item Rare Candy & Friend Ball (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1604 SM - Item Rare Candy x5 (FRE).wc7full
rename to Gen 7/FRE/1604 SM - Item Rare Candy & Friend Ball (FRE).wc7full
diff --git a/Gen 7/FRE/1605 SM - Item Mewtwonite X x1 (FRE).wc7full b/Gen 7/FRE/1605 SM - Item Mewtwonite X & Mewtwonite Y (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1605 SM - Item Mewtwonite X x1 (FRE).wc7full
rename to Gen 7/FRE/1605 SM - Item Mewtwonite X & Mewtwonite Y (FRE).wc7full
diff --git a/Gen 7/FRE/1606 SM - Item Mawilite x1 (FRE).wc7full b/Gen 7/FRE/1606 SM - Item Mawilite & Beedrillite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1606 SM - Item Mawilite x1 (FRE).wc7full
rename to Gen 7/FRE/1606 SM - Item Mawilite & Beedrillite (FRE).wc7full
diff --git a/Gen 7/FRE/1607 SM - Item Rare Candy x5 (FRE).wc7full b/Gen 7/FRE/1607 SM - Item Rare Candy & Heavy Ball (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1607 SM - Item Rare Candy x5 (FRE).wc7full
rename to Gen 7/FRE/1607 SM - Item Rare Candy & Heavy Ball (FRE).wc7full
diff --git a/Gen 7/FRE/1608 SM - Item Pidgeotite x1 (FRE).wc7full b/Gen 7/FRE/1608 SM - Item Pidgeotite & Steelixite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1608 SM - Item Pidgeotite x1 (FRE).wc7full
rename to Gen 7/FRE/1608 SM - Item Pidgeotite & Steelixite (FRE).wc7full
diff --git a/Gen 7/FRE/1609 SM - Item Mawilite x1 (FRE).wc7full b/Gen 7/FRE/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1609 SM - Item Mawilite x1 (FRE).wc7full
rename to Gen 7/FRE/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (FRE).wc7full
diff --git a/Gen 7/FRE/1610 SM - Item Rare Candy x5 (FRE).wc7full b/Gen 7/FRE/1610 SM - Item Rare Candy & Love Ball (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1610 SM - Item Rare Candy x5 (FRE).wc7full
rename to Gen 7/FRE/1610 SM - Item Rare Candy & Love Ball (FRE).wc7full
diff --git a/Gen 7/FRE/1611 SM - Item Pidgeotite x1 (FRE).wc7full b/Gen 7/FRE/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1611 SM - Item Pidgeotite x1 (FRE).wc7full
rename to Gen 7/FRE/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (FRE).wc7full
diff --git a/Gen 7/FRE/1612 SM - Item Rare Candy x5 (FRE).wc7full b/Gen 7/FRE/1612 SM - Item Rare Candy & Level Ball (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1612 SM - Item Rare Candy x5 (FRE).wc7full
rename to Gen 7/FRE/1612 SM - Item Rare Candy & Level Ball (FRE).wc7full
diff --git a/Gen 7/FRE/1613 SM - Item Sceptilite x1 (FRE).wc7full b/Gen 7/FRE/1613 SM - Item Sceptilite & Blazikenite & Swampertite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1613 SM - Item Sceptilite x1 (FRE).wc7full
rename to Gen 7/FRE/1613 SM - Item Sceptilite & Blazikenite & Swampertite (FRE).wc7full
diff --git a/Gen 7/FRE/1614 SM - Item Tyranitarite x1 (FRE).wc7full b/Gen 7/FRE/1614 SM - Item Tyranitarite & Abomasite & Manectite (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1614 SM - Item Tyranitarite x1 (FRE).wc7full
rename to Gen 7/FRE/1614 SM - Item Tyranitarite & Abomasite & Manectite (FRE).wc7full
diff --git a/Gen 7/FRE/1615 SM - Item Rare Candy x5 (FRE).wc7full b/Gen 7/FRE/1615 SM - Item Rare Candy & Lure Ball (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/1615 SM - Item Rare Candy x5 (FRE).wc7full
rename to Gen 7/FRE/1615 SM - Item Rare Candy & Lure Ball (FRE).wc7full
diff --git a/Gen 7/FRE/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (FRE).wc7full b/Gen 7/FRE/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (FRE).wc7full
new file mode 100644
index 00000000..02a4296f
Binary files /dev/null and b/Gen 7/FRE/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (FRE).wc7full differ
diff --git a/Gen 7/FRE/2046 SM - Sacha Greninja (FRE) (M).wc7 b/Gen 7/FRE/2046 SM - Sacha Ash-Greninja (Inactive) (FRE) (M).wc7
similarity index 100%
rename from Gen 7/FRE/2046 SM - Sacha Greninja (FRE) (M).wc7
rename to Gen 7/FRE/2046 SM - Sacha Ash-Greninja (Inactive) (FRE) (M).wc7
diff --git a/Gen 7/FRE/2047 SM -  Battle Points x50 (FRE).wc7full b/Gen 7/FRE/2047 SM - Battle Points x50 (FRE).wc7full
similarity index 100%
rename from Gen 7/FRE/2047 SM -  Battle Points x50 (FRE).wc7full
rename to Gen 7/FRE/2047 SM - Battle Points x50 (FRE).wc7full
diff --git a/Gen 7/GER/0606 SM - Rocky Lycanroc HA (EU) (GER).wc7full b/Gen 7/GER/0606 SM - Rocky Lycanroc (Midnight) HA (GER).wc7full
similarity index 100%
rename from Gen 7/GER/0606 SM - Rocky Lycanroc HA (EU) (GER).wc7full
rename to Gen 7/GER/0606 SM - Rocky Lycanroc (Midnight) HA (GER).wc7full
diff --git a/Gen 7/GER/1601 SM -  Munchlax (GER).wc7full b/Gen 7/GER/1601 SM - (Trainer) Munchlax & Snorlium Z (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1601 SM -  Munchlax (GER).wc7full
rename to Gen 7/GER/1601 SM - (Trainer) Munchlax & Snorlium Z (GER).wc7full
diff --git a/Gen 7/GER/1604 SM - Item Rare Candy x5 (GER).wc7full b/Gen 7/GER/1604 SM - Item Rare Candy & Friend Ball (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1604 SM - Item Rare Candy x5 (GER).wc7full
rename to Gen 7/GER/1604 SM - Item Rare Candy & Friend Ball (GER).wc7full
diff --git a/Gen 7/GER/1605 SM - Item Mewtwonite X x1 (GER).wc7full b/Gen 7/GER/1605 SM - Item Mewtwonite X & Mewtwonite Y (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1605 SM - Item Mewtwonite X x1 (GER).wc7full
rename to Gen 7/GER/1605 SM - Item Mewtwonite X & Mewtwonite Y (GER).wc7full
diff --git a/Gen 7/GER/1606 SM - Item Mawilite x1 (GER).wc7full b/Gen 7/GER/1606 SM - Item Mawilite & Beedrillite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1606 SM - Item Mawilite x1 (GER).wc7full
rename to Gen 7/GER/1606 SM - Item Mawilite & Beedrillite (GER).wc7full
diff --git a/Gen 7/GER/1607 SM - Item Rare Candy x5 (GER).wc7full b/Gen 7/GER/1607 SM - Item Rare Candy & Heavy Ball (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1607 SM - Item Rare Candy x5 (GER).wc7full
rename to Gen 7/GER/1607 SM - Item Rare Candy & Heavy Ball (GER).wc7full
diff --git a/Gen 7/GER/1608 SM - Item Pidgeotite x1 (GER).wc7full b/Gen 7/GER/1608 SM - Item Pidgeotite & Steelixite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1608 SM - Item Pidgeotite x1 (GER).wc7full
rename to Gen 7/GER/1608 SM - Item Pidgeotite & Steelixite (GER).wc7full
diff --git a/Gen 7/GER/1609 SM - Item Mawilite x1 (GER).wc7full b/Gen 7/GER/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1609 SM - Item Mawilite x1 (GER).wc7full
rename to Gen 7/GER/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (GER).wc7full
diff --git a/Gen 7/GER/1610 SM - Item Rare Candy x5 (GER).wc7full b/Gen 7/GER/1610 SM - Item Rare Candy & Love Ball (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1610 SM - Item Rare Candy x5 (GER).wc7full
rename to Gen 7/GER/1610 SM - Item Rare Candy & Love Ball (GER).wc7full
diff --git a/Gen 7/GER/1611 SM - Item Pidgeotite x1 (GER).wc7full b/Gen 7/GER/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1611 SM - Item Pidgeotite x1 (GER).wc7full
rename to Gen 7/GER/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (GER).wc7full
diff --git a/Gen 7/GER/1612 SM - Item Rare Candy x5 (GER).wc7full b/Gen 7/GER/1612 SM - Item Rare Candy & Level Ball (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1612 SM - Item Rare Candy x5 (GER).wc7full
rename to Gen 7/GER/1612 SM - Item Rare Candy & Level Ball (GER).wc7full
diff --git a/Gen 7/GER/1613 SM - Item Sceptilite x1 (GER).wc7full b/Gen 7/GER/1613 SM - Item Sceptilite & Blazikenite & Swampertite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1613 SM - Item Sceptilite x1 (GER).wc7full
rename to Gen 7/GER/1613 SM - Item Sceptilite & Blazikenite & Swampertite (GER).wc7full
diff --git a/Gen 7/GER/1614 SM - Item Tyranitarite x1 (GER).wc7full b/Gen 7/GER/1614 SM - Item Tyranitarite & Abomasite & Manectite (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1614 SM - Item Tyranitarite x1 (GER).wc7full
rename to Gen 7/GER/1614 SM - Item Tyranitarite & Abomasite & Manectite (GER).wc7full
diff --git a/Gen 7/GER/1615 SM - Item Rare Candy x5 (GER).wc7full b/Gen 7/GER/1615 SM - Item Rare Candy & Lure Ball (GER).wc7full
similarity index 100%
rename from Gen 7/GER/1615 SM - Item Rare Candy x5 (GER).wc7full
rename to Gen 7/GER/1615 SM - Item Rare Candy & Lure Ball (GER).wc7full
diff --git a/Gen 7/GER/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (GER).wc7full b/Gen 7/GER/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (GER).wc7full
new file mode 100644
index 00000000..0bd7fd8d
Binary files /dev/null and b/Gen 7/GER/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (GER).wc7full differ
diff --git a/Gen 7/GER/2046 SM - Ash Greninja (GER) (M).wc7 b/Gen 7/GER/2046 SM - Ash Ash-Greninja (Inactive) (GER) (M).wc7
similarity index 100%
rename from Gen 7/GER/2046 SM - Ash Greninja (GER) (M).wc7
rename to Gen 7/GER/2046 SM - Ash Ash-Greninja (Inactive) (GER) (M).wc7
diff --git a/Gen 7/GER/2047 SM -  Battle Points x50 (GER).wc7full b/Gen 7/GER/2047 SM - Battle Points x50 (GER).wc7full
similarity index 100%
rename from Gen 7/GER/2047 SM -  Battle Points x50 (GER).wc7full
rename to Gen 7/GER/2047 SM - Battle Points x50 (GER).wc7full
diff --git a/Gen 7/ITA/0606 SM - Rocky Lycanroc HA (EU) (ITA).wc7full b/Gen 7/ITA/0606 SM - Rocky Lycanroc (Midnight) HA (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/0606 SM - Rocky Lycanroc HA (EU) (ITA).wc7full
rename to Gen 7/ITA/0606 SM - Rocky Lycanroc (Midnight) HA (ITA).wc7full
diff --git a/Gen 7/ITA/1601 SM -  Munchlax (ITA).wc7full b/Gen 7/ITA/1601 SM - (Trainer) Munchlax & Snorlium Z (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1601 SM -  Munchlax (ITA).wc7full
rename to Gen 7/ITA/1601 SM - (Trainer) Munchlax & Snorlium Z (ITA).wc7full
diff --git a/Gen 7/ITA/1604 SM - Item Rare Candy x5 (ITA).wc7full b/Gen 7/ITA/1604 SM - Item Rare Candy & Friend Ball (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1604 SM - Item Rare Candy x5 (ITA).wc7full
rename to Gen 7/ITA/1604 SM - Item Rare Candy & Friend Ball (ITA).wc7full
diff --git a/Gen 7/ITA/1605 SM - Item Mewtwonite X x1 (ITA).wc7full b/Gen 7/ITA/1605 SM - Item Mewtwonite X & Mewtwonite Y (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1605 SM - Item Mewtwonite X x1 (ITA).wc7full
rename to Gen 7/ITA/1605 SM - Item Mewtwonite X & Mewtwonite Y (ITA).wc7full
diff --git a/Gen 7/ITA/1606 SM - Item Mawilite x1 (ITA).wc7full b/Gen 7/ITA/1606 SM - Item Mawilite & Beedrillite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1606 SM - Item Mawilite x1 (ITA).wc7full
rename to Gen 7/ITA/1606 SM - Item Mawilite & Beedrillite (ITA).wc7full
diff --git a/Gen 7/ITA/1607 SM - Item Rare Candy x5 (ITA).wc7full b/Gen 7/ITA/1607 SM - Item Rare Candy & Heavy Ball (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1607 SM - Item Rare Candy x5 (ITA).wc7full
rename to Gen 7/ITA/1607 SM - Item Rare Candy & Heavy Ball (ITA).wc7full
diff --git a/Gen 7/ITA/1608 SM - Item Pidgeotite x1 (ITA).wc7full b/Gen 7/ITA/1608 SM - Item Pidgeotite & Steelixite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1608 SM - Item Pidgeotite x1 (ITA).wc7full
rename to Gen 7/ITA/1608 SM - Item Pidgeotite & Steelixite (ITA).wc7full
diff --git a/Gen 7/ITA/1609 SM - Item Mawilite x1 (ITA).wc7full b/Gen 7/ITA/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1609 SM - Item Mawilite x1 (ITA).wc7full
rename to Gen 7/ITA/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (ITA).wc7full
diff --git a/Gen 7/ITA/1610 SM - Item Rare Candy x5 (ITA).wc7full b/Gen 7/ITA/1610 SM - Item Rare Candy & Love Ball (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1610 SM - Item Rare Candy x5 (ITA).wc7full
rename to Gen 7/ITA/1610 SM - Item Rare Candy & Love Ball (ITA).wc7full
diff --git a/Gen 7/ITA/1611 SM - Item Pidgeotite x1 (ITA).wc7full b/Gen 7/ITA/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1611 SM - Item Pidgeotite x1 (ITA).wc7full
rename to Gen 7/ITA/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (ITA).wc7full
diff --git a/Gen 7/ITA/1612 SM - Item Rare Candy x5 (ITA).wc7full b/Gen 7/ITA/1612 SM - Item Rare Candy & Level Ball (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1612 SM - Item Rare Candy x5 (ITA).wc7full
rename to Gen 7/ITA/1612 SM - Item Rare Candy & Level Ball (ITA).wc7full
diff --git a/Gen 7/ITA/1613 SM - Item Sceptilite x1 (ITA).wc7full b/Gen 7/ITA/1613 SM - Item Sceptilite & Blazikenite & Swampertite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1613 SM - Item Sceptilite x1 (ITA).wc7full
rename to Gen 7/ITA/1613 SM - Item Sceptilite & Blazikenite & Swampertite (ITA).wc7full
diff --git a/Gen 7/ITA/1614 SM - Item Tyranitarite x1 (ITA).wc7full b/Gen 7/ITA/1614 SM - Item Tyranitarite & Abomasite & Manectite (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1614 SM - Item Tyranitarite x1 (ITA).wc7full
rename to Gen 7/ITA/1614 SM - Item Tyranitarite & Abomasite & Manectite (ITA).wc7full
diff --git a/Gen 7/ITA/1615 SM - Item Rare Candy x5 (ITA).wc7full b/Gen 7/ITA/1615 SM - Item Rare Candy & Lure Ball (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/1615 SM - Item Rare Candy x5 (ITA).wc7full
rename to Gen 7/ITA/1615 SM - Item Rare Candy & Lure Ball (ITA).wc7full
diff --git a/Gen 7/ITA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ITA).wc7full b/Gen 7/ITA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ITA).wc7full
new file mode 100644
index 00000000..0b7a44a5
Binary files /dev/null and b/Gen 7/ITA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (ITA).wc7full differ
diff --git a/Gen 7/ITA/2046 SM - Ash Greninja (ITA) (M).wc7 b/Gen 7/ITA/2046 SM - Ash Ash-Greninja (Inactive) (ITA) (M).wc7
similarity index 100%
rename from Gen 7/ITA/2046 SM - Ash Greninja (ITA) (M).wc7
rename to Gen 7/ITA/2046 SM - Ash Ash-Greninja (Inactive) (ITA) (M).wc7
diff --git a/Gen 7/ITA/2047 SM -  Battle Points x50 (ITA).wc7full b/Gen 7/ITA/2047 SM - Battle Points x50 (ITA).wc7full
similarity index 100%
rename from Gen 7/ITA/2047 SM -  Battle Points x50 (ITA).wc7full
rename to Gen 7/ITA/2047 SM - Battle Points x50 (ITA).wc7full
diff --git a/Gen 7/JPN/0203 SM - サッポロ Alolan Vulpix (JPN) (R).wc7 b/Gen 7/JPN/0203 SM - サッポロ Vulpix (Alola) (JPN) (R).wc7
similarity index 100%
rename from Gen 7/JPN/0203 SM - サッポロ Alolan Vulpix (JPN) (R).wc7
rename to Gen 7/JPN/0203 SM - サッポロ Vulpix (Alola) (JPN) (R).wc7
diff --git a/Gen 7/JPN/0205 M - Item Choice Scarf x1 (JPN).wc7full b/Gen 7/JPN/0205 M - Item Choice Scarf & Lucky Egg (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0205 M - Item Choice Scarf x1 (JPN).wc7full
rename to Gen 7/JPN/0205 M - Item Choice Scarf & Lucky Egg (JPN).wc7full
diff --git a/Gen 7/JPN/0205 S - Item Choice Band x1 (JPN).wc7full b/Gen 7/JPN/0205 S - Item Choice Band & Lucky Egg (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0205 S - Item Choice Band x1 (JPN).wc7full
rename to Gen 7/JPN/0205 S - Item Choice Band & Lucky Egg (JPN).wc7full
diff --git a/Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Hoenn Cap) (JPN) (M).wc7full b/Gen 7/JPN/0223 SM - サトシ Pikachu (Hoenn Cap) & Pikashunium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Hoenn Cap) (JPN) (M).wc7full
rename to Gen 7/JPN/0223 SM - サトシ Pikachu (Hoenn Cap) & Pikashunium Z (JPN).wc7full
diff --git a/Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Kalos Cap) (JPN) (M).wc7full b/Gen 7/JPN/0223 SM - サトシ Pikachu (Kalos Cap) & Pikashunium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Kalos Cap) (JPN) (M).wc7full
rename to Gen 7/JPN/0223 SM - サトシ Pikachu (Kalos Cap) & Pikashunium Z (JPN).wc7full
diff --git a/Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Original Cap) (JPN) (M).wc7full b/Gen 7/JPN/0223 SM - サトシ Pikachu (Original Cap) & Pikashunium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Original Cap) (JPN) (M).wc7full
rename to Gen 7/JPN/0223 SM - サトシ Pikachu (Original Cap) & Pikashunium Z (JPN).wc7full
diff --git a/Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Sinnoh Cap) (JPN) (M).wc7full b/Gen 7/JPN/0223 SM - サトシ Pikachu (Sinnoh Cap) & Pikashunium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Sinnoh Cap) (JPN) (M).wc7full
rename to Gen 7/JPN/0223 SM - サトシ Pikachu (Sinnoh Cap) & Pikashunium Z (JPN).wc7full
diff --git a/Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Unova Cap) (JPN) (M).wc7full b/Gen 7/JPN/0223 SM - サトシ Pikachu (Unova Cap) & Pikashunium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0223 SM - サトシ Ash Pikachu (Unova Cap) (JPN) (M).wc7full
rename to Gen 7/JPN/0223 SM - サトシ Pikachu (Unova Cap) & Pikashunium Z (JPN).wc7full
diff --git a/Gen 7/JPN/0236 SM - リーリエ Vulpix (JPN).wc7full b/Gen 7/JPN/0236 SM - リーリエ Vulpix (Alola) (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/0236 SM - リーリエ Vulpix (JPN).wc7full
rename to Gen 7/JPN/0236 SM - リーリエ Vulpix (Alola) (JPN).wc7full
diff --git a/Gen 7/JPN/1601 SM -  Munchlax (JPN).wc7full b/Gen 7/JPN/1601 SM - (Trainer) Munchlax & Snorlium Z (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1601 SM -  Munchlax (JPN).wc7full
rename to Gen 7/JPN/1601 SM - (Trainer) Munchlax & Snorlium Z (JPN).wc7full
diff --git a/Gen 7/JPN/1604 SM - Item Rare Candy x5 (JPN).wc7full b/Gen 7/JPN/1604 SM - Item Rare Candy & Friend Ball (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1604 SM - Item Rare Candy x5 (JPN).wc7full
rename to Gen 7/JPN/1604 SM - Item Rare Candy & Friend Ball (JPN).wc7full
diff --git a/Gen 7/JPN/1605 SM - Item Mewtwonite X x1 (JPN).wc7full b/Gen 7/JPN/1605 SM - Item Mewtwonite X & Mewtwonite Y (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1605 SM - Item Mewtwonite X x1 (JPN).wc7full
rename to Gen 7/JPN/1605 SM - Item Mewtwonite X & Mewtwonite Y (JPN).wc7full
diff --git a/Gen 7/JPN/1606 SM - Item Mawilite x1 (JPN).wc7full b/Gen 7/JPN/1606 SM - Item Mawilite & Beedrillite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1606 SM - Item Mawilite x1 (JPN).wc7full
rename to Gen 7/JPN/1606 SM - Item Mawilite & Beedrillite (JPN).wc7full
diff --git a/Gen 7/JPN/1607 SM - Item Rare Candy x5 (JPN).wc7full b/Gen 7/JPN/1607 SM - Item Rare Candy & Heavy Ball (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1607 SM - Item Rare Candy x5 (JPN).wc7full
rename to Gen 7/JPN/1607 SM - Item Rare Candy & Heavy Ball (JPN).wc7full
diff --git a/Gen 7/JPN/1608 SM - Item Pidgeotite x1 (JPN).wc7full b/Gen 7/JPN/1608 SM - Item Pidgeotite & Steelixite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1608 SM - Item Pidgeotite x1 (JPN).wc7full
rename to Gen 7/JPN/1608 SM - Item Pidgeotite & Steelixite (JPN).wc7full
diff --git a/Gen 7/JPN/1609 SM - Item Mawilite x1 (JPN).wc7full b/Gen 7/JPN/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1609 SM - Item Mawilite x1 (JPN).wc7full
rename to Gen 7/JPN/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (JPN).wc7full
diff --git a/Gen 7/JPN/1610 SM - Item Rare Candy x5 (JPN).wc7full b/Gen 7/JPN/1610 SM - Item Rare Candy & Love Ball (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1610 SM - Item Rare Candy x5 (JPN).wc7full
rename to Gen 7/JPN/1610 SM - Item Rare Candy & Love Ball (JPN).wc7full
diff --git a/Gen 7/JPN/1611 SM - Item Pidgeotite x1 (JPN).wc7full b/Gen 7/JPN/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1611 SM - Item Pidgeotite x1 (JPN).wc7full
rename to Gen 7/JPN/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (JPN).wc7full
diff --git a/Gen 7/JPN/1612 SM - Item Rare Candy x5 (JPN).wc7full b/Gen 7/JPN/1612 SM - Item Rare Candy & Level Ball (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1612 SM - Item Rare Candy x5 (JPN).wc7full
rename to Gen 7/JPN/1612 SM - Item Rare Candy & Level Ball (JPN).wc7full
diff --git a/Gen 7/JPN/1613 SM - Item Sceptilite x1 (JPN).wc7full b/Gen 7/JPN/1613 SM - Item Sceptilite & Blazikenite & Swampertite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1613 SM - Item Sceptilite x1 (JPN).wc7full
rename to Gen 7/JPN/1613 SM - Item Sceptilite & Blazikenite & Swampertite (JPN).wc7full
diff --git a/Gen 7/JPN/1614 SM - Item Tyranitarite x1 (JPN).wc7full b/Gen 7/JPN/1614 SM - Item Tyranitarite & Abomasite & Manectite (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1614 SM - Item Tyranitarite x1 (JPN).wc7full
rename to Gen 7/JPN/1614 SM - Item Tyranitarite & Abomasite & Manectite (JPN).wc7full
diff --git a/Gen 7/JPN/1615 SM - Item Rare Candy x5 (JPN).wc7full b/Gen 7/JPN/1615 SM - Item Rare Candy & Lure Ball (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/1615 SM - Item Rare Candy x5 (JPN).wc7full
rename to Gen 7/JPN/1615 SM - Item Rare Candy & Lure Ball (JPN).wc7full
diff --git a/Gen 7/JPN/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (JPN).wc7full b/Gen 7/JPN/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (JPN).wc7full
new file mode 100644
index 00000000..fe4997ef
Binary files /dev/null and b/Gen 7/JPN/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (JPN).wc7full differ
diff --git a/Gen 7/JPN/2046 SM - サトシ Greninja (JPN) (M).wc7 b/Gen 7/JPN/2046 SM - サトシ Ash-Greninja (Inactive) (JPN) (M).wc7
similarity index 100%
rename from Gen 7/JPN/2046 SM - サトシ Greninja (JPN) (M).wc7
rename to Gen 7/JPN/2046 SM - サトシ Ash-Greninja (Inactive) (JPN) (M).wc7
diff --git a/Gen 7/JPN/2047 SM -  Battle Points x50 (JPN).wc7full b/Gen 7/JPN/2047 SM - Battle Points x50 (JPN).wc7full
similarity index 100%
rename from Gen 7/JPN/2047 SM -  Battle Points x50 (JPN).wc7full
rename to Gen 7/JPN/2047 SM - Battle Points x50 (JPN).wc7full
diff --git a/Gen 7/KOR/1107 SM - 썬문 Alolan Vulpix (KOR).wc7full b/Gen 7/KOR/1107 SM - 썬문 Vulpix (Alola) (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1107 SM - 썬문 Alolan Vulpix (KOR).wc7full
rename to Gen 7/KOR/1107 SM - 썬문 Vulpix (Alola) (KOR).wc7full
diff --git a/Gen 7/KOR/1108 SM - 썬문 Alolan Sandshrew (KOR).wc7full b/Gen 7/KOR/1108 SM - 썬문 Sandshrew (Alola) (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1108 SM - 썬문 Alolan Sandshrew (KOR).wc7full
rename to Gen 7/KOR/1108 SM - 썬문 Sandshrew (Alola) (KOR).wc7full
diff --git a/Gen 7/KOR/1109 SM - 썬문 Alolan Diglett (KOR).wc7full b/Gen 7/KOR/1109 SM - 썬문 Diglett (Alola) (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1109 SM - 썬문 Alolan Diglett (KOR).wc7full
rename to Gen 7/KOR/1109 SM - 썬문 Diglett (Alola) (KOR).wc7full
diff --git a/Gen 7/KOR/1110 SM - 썬문 Alolan Grimer (KOR).wc7full b/Gen 7/KOR/1110 SM - 썬문 Grimer (Alola) (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1110 SM - 썬문 Alolan Grimer (KOR).wc7full
rename to Gen 7/KOR/1110 SM - 썬문 Grimer (Alola) (KOR).wc7full
diff --git a/Gen 7/KOR/1601 SM -  Munchlax (KOR).wc7full b/Gen 7/KOR/1601 SM - (Trainer) Munchlax & Snorlium Z (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1601 SM -  Munchlax (KOR).wc7full
rename to Gen 7/KOR/1601 SM - (Trainer) Munchlax & Snorlium Z (KOR).wc7full
diff --git a/Gen 7/KOR/1604 SM - Item Rare Candy x5 (KOR).wc7full b/Gen 7/KOR/1604 SM - Item Rare Candy & Friend Ball (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1604 SM - Item Rare Candy x5 (KOR).wc7full
rename to Gen 7/KOR/1604 SM - Item Rare Candy & Friend Ball (KOR).wc7full
diff --git a/Gen 7/KOR/1605 SM - Item Mewtwonite X x1 (KOR).wc7full b/Gen 7/KOR/1605 SM - Item Mewtwonite X & Mewtwonite Y (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1605 SM - Item Mewtwonite X x1 (KOR).wc7full
rename to Gen 7/KOR/1605 SM - Item Mewtwonite X & Mewtwonite Y (KOR).wc7full
diff --git a/Gen 7/KOR/1606 SM - Item Mawilite x1 (KOR).wc7full b/Gen 7/KOR/1606 SM - Item Mawilite & Beedrillite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1606 SM - Item Mawilite x1 (KOR).wc7full
rename to Gen 7/KOR/1606 SM - Item Mawilite & Beedrillite (KOR).wc7full
diff --git a/Gen 7/KOR/1607 SM - Item Rare Candy x5 (KOR).wc7full b/Gen 7/KOR/1607 SM - Item Rare Candy & Heavy Ball (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1607 SM - Item Rare Candy x5 (KOR).wc7full
rename to Gen 7/KOR/1607 SM - Item Rare Candy & Heavy Ball (KOR).wc7full
diff --git a/Gen 7/KOR/1608 SM - Item Pidgeotite x1 (KOR).wc7full b/Gen 7/KOR/1608 SM - Item Pidgeotite & Steelixite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1608 SM - Item Pidgeotite x1 (KOR).wc7full
rename to Gen 7/KOR/1608 SM - Item Pidgeotite & Steelixite (KOR).wc7full
diff --git a/Gen 7/KOR/1609 SM - Item Mawilite x1 (KOR).wc7full b/Gen 7/KOR/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1609 SM - Item Mawilite x1 (KOR).wc7full
rename to Gen 7/KOR/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (KOR).wc7full
diff --git a/Gen 7/KOR/1610 SM - Item Rare Candy x5 (KOR).wc7full b/Gen 7/KOR/1610 SM - Item Rare Candy & Love Ball (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1610 SM - Item Rare Candy x5 (KOR).wc7full
rename to Gen 7/KOR/1610 SM - Item Rare Candy & Love Ball (KOR).wc7full
diff --git a/Gen 7/KOR/1611 SM - Item Pidgeotite x1 (KOR).wc7full b/Gen 7/KOR/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1611 SM - Item Pidgeotite x1 (KOR).wc7full
rename to Gen 7/KOR/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (KOR).wc7full
diff --git a/Gen 7/KOR/1612 SM - Item Rare Candy x5 (KOR).wc7full b/Gen 7/KOR/1612 SM - Item Rare Candy & Level Ball (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1612 SM - Item Rare Candy x5 (KOR).wc7full
rename to Gen 7/KOR/1612 SM - Item Rare Candy & Level Ball (KOR).wc7full
diff --git a/Gen 7/KOR/1613 SM - Item Sceptilite x1 (KOR).wc7full b/Gen 7/KOR/1613 SM - Item Sceptilite & Blazikenite & Swampertite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1613 SM - Item Sceptilite x1 (KOR).wc7full
rename to Gen 7/KOR/1613 SM - Item Sceptilite & Blazikenite & Swampertite (KOR).wc7full
diff --git a/Gen 7/KOR/1614 SM - Item Tyranitarite x1 (KOR).wc7full b/Gen 7/KOR/1614 SM - Item Tyranitarite & Abomasite & Manectite (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1614 SM - Item Tyranitarite x1 (KOR).wc7full
rename to Gen 7/KOR/1614 SM - Item Tyranitarite & Abomasite & Manectite (KOR).wc7full
diff --git a/Gen 7/KOR/1615 SM - Item Rare Candy x5 (KOR).wc7full b/Gen 7/KOR/1615 SM - Item Rare Candy & Lure Ball (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/1615 SM - Item Rare Candy x5 (KOR).wc7full
rename to Gen 7/KOR/1615 SM - Item Rare Candy & Lure Ball (KOR).wc7full
diff --git a/Gen 7/KOR/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (KOR).wc7full b/Gen 7/KOR/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (KOR).wc7full
new file mode 100644
index 00000000..45128aa3
Binary files /dev/null and b/Gen 7/KOR/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (KOR).wc7full differ
diff --git a/Gen 7/KOR/2046 SM - 지우 Greninja (KOR) (M).wc7 b/Gen 7/KOR/2046 SM - 지우 Ash-Greninja (Inactive) (KOR) (M).wc7
similarity index 100%
rename from Gen 7/KOR/2046 SM - 지우 Greninja (KOR) (M).wc7
rename to Gen 7/KOR/2046 SM - 지우 Ash-Greninja (Inactive) (KOR) (M).wc7
diff --git a/Gen 7/KOR/2047 SM -  Battle Points x50 (KOR).wc7full b/Gen 7/KOR/2047 SM - Battle Points x50 (KOR).wc7full
similarity index 100%
rename from Gen 7/KOR/2047 SM -  Battle Points x50 (KOR).wc7full
rename to Gen 7/KOR/2047 SM - Battle Points x50 (KOR).wc7full
diff --git a/Gen 7/SPA/0606 SM - Rocky Lycanroc HA (EU) (SPA).wc7full b/Gen 7/SPA/0606 SM - Rocky Lycanroc (Midnight) HA (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/0606 SM - Rocky Lycanroc HA (EU) (SPA).wc7full
rename to Gen 7/SPA/0606 SM - Rocky Lycanroc (Midnight) HA (SPA).wc7full
diff --git a/Gen 7/SPA/1601 SM -  Munchlax (SPA).wc7full b/Gen 7/SPA/1601 SM - (Trainer) Munchlax & Snorlium Z (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1601 SM -  Munchlax (SPA).wc7full
rename to Gen 7/SPA/1601 SM - (Trainer) Munchlax & Snorlium Z (SPA).wc7full
diff --git a/Gen 7/SPA/1604 SM - Item Rare Candy x5 (SPA).wc7full b/Gen 7/SPA/1604 SM - Item Rare Candy & Friend Ball (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1604 SM - Item Rare Candy x5 (SPA).wc7full
rename to Gen 7/SPA/1604 SM - Item Rare Candy & Friend Ball (SPA).wc7full
diff --git a/Gen 7/SPA/1605 SM - Item Mewtwonite X x1 (SPA).wc7full b/Gen 7/SPA/1605 SM - Item Mewtwonite X & Mewtwonite Y (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1605 SM - Item Mewtwonite X x1 (SPA).wc7full
rename to Gen 7/SPA/1605 SM - Item Mewtwonite X & Mewtwonite Y (SPA).wc7full
diff --git a/Gen 7/SPA/1606 SM - Item Mawilite x1 (SPA).wc7full b/Gen 7/SPA/1606 SM - Item Mawilite & Beedrillite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1606 SM - Item Mawilite x1 (SPA).wc7full
rename to Gen 7/SPA/1606 SM - Item Mawilite & Beedrillite (SPA).wc7full
diff --git a/Gen 7/SPA/1607 SM - Item Rare Candy x5 (SPA).wc7full b/Gen 7/SPA/1607 SM - Item Rare Candy & Heavy Ball (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1607 SM - Item Rare Candy x5 (SPA).wc7full
rename to Gen 7/SPA/1607 SM - Item Rare Candy & Heavy Ball (SPA).wc7full
diff --git a/Gen 7/SPA/1608 SM - Item Pidgeotite x1 (SPA).wc7full b/Gen 7/SPA/1608 SM - Item Pidgeotite & Steelixite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1608 SM - Item Pidgeotite x1 (SPA).wc7full
rename to Gen 7/SPA/1608 SM - Item Pidgeotite & Steelixite (SPA).wc7full
diff --git a/Gen 7/SPA/1609 SM - Item Mawilite x1 (SPA).wc7full b/Gen 7/SPA/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1609 SM - Item Mawilite x1 (SPA).wc7full
rename to Gen 7/SPA/1609 SM - Item Mawilite & Beedrillite & Audinite & Medichamite (SPA).wc7full
diff --git a/Gen 7/SPA/1610 SM - Item Rare Candy x5 (SPA).wc7full b/Gen 7/SPA/1610 SM - Item Rare Candy & Love Ball (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1610 SM - Item Rare Candy x5 (SPA).wc7full
rename to Gen 7/SPA/1610 SM - Item Rare Candy & Love Ball (SPA).wc7full
diff --git a/Gen 7/SPA/1611 SM - Item Pidgeotite x1 (SPA).wc7full b/Gen 7/SPA/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1611 SM - Item Pidgeotite x1 (SPA).wc7full
rename to Gen 7/SPA/1611 SM - Item Pidgeotite & Steelixite & Heracronite & Houndoominite (SPA).wc7full
diff --git a/Gen 7/SPA/1612 SM - Item Rare Candy x5 (SPA).wc7full b/Gen 7/SPA/1612 SM - Item Rare Candy & Level Ball (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1612 SM - Item Rare Candy x5 (SPA).wc7full
rename to Gen 7/SPA/1612 SM - Item Rare Candy & Level Ball (SPA).wc7full
diff --git a/Gen 7/SPA/1613 SM - Item Sceptilite x1 (SPA).wc7full b/Gen 7/SPA/1613 SM - Item Sceptilite & Blazikenite & Swampertite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1613 SM - Item Sceptilite x1 (SPA).wc7full
rename to Gen 7/SPA/1613 SM - Item Sceptilite & Blazikenite & Swampertite (SPA).wc7full
diff --git a/Gen 7/SPA/1614 SM - Item Tyranitarite x1 (SPA).wc7full b/Gen 7/SPA/1614 SM - Item Tyranitarite & Abomasite & Manectite (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1614 SM - Item Tyranitarite x1 (SPA).wc7full
rename to Gen 7/SPA/1614 SM - Item Tyranitarite & Abomasite & Manectite (SPA).wc7full
diff --git a/Gen 7/SPA/1615 SM - Item Rare Candy x5 (SPA).wc7full b/Gen 7/SPA/1615 SM - Item Rare Candy & Lure Ball (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/1615 SM - Item Rare Candy x5 (SPA).wc7full
rename to Gen 7/SPA/1615 SM - Item Rare Candy & Lure Ball (SPA).wc7full
diff --git a/Gen 7/SPA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (SPA).wc7full b/Gen 7/SPA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (SPA).wc7full
new file mode 100644
index 00000000..d0aa7870
Binary files /dev/null and b/Gen 7/SPA/1616 SM - Item Sceptilite & Blazikenite & Swampertite & Cameruptite & Banettite (SPA).wc7full differ
diff --git a/Gen 7/SPA/2046 SM - Ash Greninja (SPA) (M).wc7 b/Gen 7/SPA/2046 SM - Ash Ash-Greninja (Inactive) (SPA) (M).wc7
similarity index 100%
rename from Gen 7/SPA/2046 SM - Ash Greninja (SPA) (M).wc7
rename to Gen 7/SPA/2046 SM - Ash Ash-Greninja (Inactive) (SPA) (M).wc7
diff --git a/Gen 7/SPA/2047 SM -  Battle Points x50 (SPA).wc7full b/Gen 7/SPA/2047 SM - Battle Points x50 (SPA).wc7full
similarity index 100%
rename from Gen 7/SPA/2047 SM -  Battle Points x50 (SPA).wc7full
rename to Gen 7/SPA/2047 SM - Battle Points x50 (SPA).wc7full