diff --git a/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (F).wc6 b/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (F).wc6
similarity index 72%
rename from Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (F).wc6
rename to Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (F).wc6
index b7937ea8..1f8ddd28 100644
Binary files a/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (F).wc6 and b/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (M).wc6 b/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (M).wc6
rename to Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (M).wc6
index dfa49805..41b48f7d 100644
Binary files a/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (C) (M).wc6 and b/Gen 6/JPN/0028 XY - ポケセン Gengar (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (F).wc6 b/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (F).wc6
similarity index 72%
rename from Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (F).wc6
rename to Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (F).wc6
index 45293b62..7804cd98 100644
Binary files a/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (F).wc6 and b/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (M).wc6 b/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (M).wc6
rename to Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (M).wc6
index d7bb141d..b954d7f7 100644
Binary files a/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (C) (M).wc6 and b/Gen 6/JPN/0029 XY - ポケセン Tyranitar (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (F).wc6 b/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (F).wc6
similarity index 72%
rename from Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (F).wc6
rename to Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (F).wc6
index 995ac338..f0931e2f 100644
Binary files a/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (F).wc6 and b/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (M).wc6 b/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (M).wc6
rename to Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (M).wc6
index bc72c435..1ab26513 100644
Binary files a/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (C) (M).wc6 and b/Gen 6/JPN/0030 XY - ポケセン Mawile (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (F).wc6 b/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (F).wc6
similarity index 72%
rename from Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (F).wc6
rename to Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (F).wc6
index c05a8590..93cfdc7e 100644
Binary files a/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (F).wc6 and b/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (M).wc6 b/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (M).wc6
rename to Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (M).wc6
index 83d1d4f2..282b5777 100644
Binary files a/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (C) (M).wc6 and b/Gen 6/JPN/0032 XY - ポケセン Gengar (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (F).wc6 b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (F).wc6
deleted file mode 100644
index 3a6b96a4..00000000
Binary files a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (F).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (M).wc6 b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (M).wc6
deleted file mode 100644
index f3cdea41..00000000
Binary files a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (C) (M).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (F).wc6 b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (F).wc6
new file mode 100644
index 00000000..8a3f819f
Binary files /dev/null and b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (M).wc6 b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (M).wc6
new file mode 100644
index 00000000..8e788a2a
Binary files /dev/null and b/Gen 6/JPN/0032 XY - ポケセン Mawile (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (F).wc6 b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (F).wc6
deleted file mode 100644
index 9b259858..00000000
Binary files a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (F).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (M).wc6 b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (M).wc6
deleted file mode 100644
index c0313008..00000000
Binary files a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (C) (M).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (F).wc6 b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (F).wc6
new file mode 100644
index 00000000..6b0e81da
Binary files /dev/null and b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (M).wc6 b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (M).wc6
new file mode 100644
index 00000000..341994e9
Binary files /dev/null and b/Gen 6/JPN/0032 XY - ポケセン Tyranitar (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6 b/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6
similarity index 73%
rename from Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6
rename to Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6
index 025b3e0d..a489ddb3 100644
Binary files a/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6 and b/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6 b/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6
similarity index 73%
rename from Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6
rename to Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6
index 928fd025..dc19ce58 100644
Binary files a/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6 and b/Gen 6/JPN/0036 XY - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (M).wc6
similarity index 54%
rename from Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (M).wc6
index fbc76835..675274cb 100644
Binary files a/Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0037 XY - みなとみらい Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (M).wc6
similarity index 54%
rename from Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (M).wc6
index 0c66de60..cd2061c9 100644
Binary files a/Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0038 XY - みなとみらい Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (M).wc6
similarity index 54%
rename from Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (M).wc6
index 1311b156..9fec507f 100644
Binary files a/Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0039 XY - みなとみらい Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (M).wc6
similarity index 54%
rename from Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (M).wc6
index 88a200e8..644ea4c1 100644
Binary files a/Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0040 XY - みなとみらい Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (M).wc6
similarity index 54%
rename from Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (M).wc6
index 202318b1..c8c3625a 100644
Binary files a/Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0041 XY - みなとみらい Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (C) (F).wc6 b/Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (F).wc6
similarity index 54%
rename from Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (C) (F).wc6
rename to Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (F).wc6
index 0a3eb944..5963ac21 100644
Binary files a/Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (C) (F).wc6 and b/Gen 6/JPN/0042 XY - みなとみらい Pikachu (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (C) (M).wc6 b/Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (C) (M).wc6
rename to Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (M).wc6
index a46ca6cc..db1435b2 100644
Binary files a/Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (C) (M).wc6 and b/Gen 6/JPN/0103 XYORAS - サトシ Pikachu (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (C) (M).wc6 b/Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (C) (M).wc6
rename to Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (M).wc6
index b1e1af71..7cd948e6 100644
Binary files a/Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (C) (M).wc6 and b/Gen 6/JPN/0104 XYORAS - セレナ Pancham (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN) (C).wc6 b/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN) (C).wc6
deleted file mode 100644
index 0b95bbda..00000000
Binary files a/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN) (C).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN).wc6 b/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN).wc6
new file mode 100644
index 00000000..74be5ae6
Binary files /dev/null and b/Gen 6/JPN/0105 XYORAS - ポケセン Lugia (JPN).wc6 differ
diff --git a/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (C) (M).wc6 b/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (C) (M).wc6
deleted file mode 100644
index 2b28a39b..00000000
Binary files a/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (C) (M).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (M).wc6 b/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (M).wc6
new file mode 100644
index 00000000..68fac782
Binary files /dev/null and b/Gen 6/JPN/0106 XYORAS - ポケセン Latios (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN) (C).wc6 b/Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN).wc6
similarity index 72%
rename from Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN) (C).wc6
rename to Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN).wc6
index 16051225..d31da509 100644
Binary files a/Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN) (C).wc6 and b/Gen 6/JPN/0124 XYORAS - Mighty Hoopa (JPN).wc6 differ
diff --git a/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (F).wc6 b/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (F).wc6
similarity index 72%
rename from Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (F).wc6
rename to Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (F).wc6
index 7aab5ff5..fdf79085 100644
Binary files a/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (F).wc6 and b/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (M).wc6 b/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (M).wc6
similarity index 72%
rename from Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (M).wc6
rename to Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (M).wc6
index 5336a455..610c30e3 100644
Binary files a/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (C) (M).wc6 and b/Gen 6/JPN/0139 ORAS - メガトウキョ Shiny Charizard (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN) (C).wc6 b/Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN).wc6
similarity index 72%
rename from Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN) (C).wc6
rename to Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN).wc6
index fcea5c88..2f5f2197 100644
Binary files a/Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN) (C).wc6 and b/Gen 6/JPN/0140 ORAS - コロコロ Shiny Rayquaza (JPN).wc6 differ
diff --git a/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6 b/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6
similarity index 73%
rename from Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6
rename to Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6
index 87301739..26e486b5 100644
Binary files a/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (F).wc6 and b/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6 b/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6
similarity index 73%
rename from Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6
rename to Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6
index 9921003b..85e99ffb 100644
Binary files a/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poke Ball Forme) (JPN) (C) (M).wc6 and b/Gen 6/JPN/0143 ORAS - ポケセン Vivillon (Poké Ball Forme) (JPN) (M).wc6 differ
diff --git a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (F).wc6 b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (F).wc6
deleted file mode 100644
index 4a5ef6f1..00000000
Binary files a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (F).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (M).wc6 b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (M).wc6
deleted file mode 100644
index d5310e10..00000000
Binary files a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (C) (M).wc6 and /dev/null differ
diff --git a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (F).wc6 b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (F).wc6
new file mode 100644
index 00000000..8494ee04
Binary files /dev/null and b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (F).wc6 differ
diff --git a/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (M).wc6 b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (M).wc6
new file mode 100644
index 00000000..c5579a89
Binary files /dev/null and b/Gen 6/JPN/0144 ORAS - メガトウキョ Shiny Pikachu HA (JPN) (M).wc6 differ