diff --git a/README.md b/README.md index cad2fe12..f2e1a95b 100644 --- a/README.md +++ b/README.md @@ -46,18 +46,18 @@ $ tup Pokemon sprite filenames are in a 1-to-1 correspondence with the Pokemon's name, for ease of processing. Filenames may be directly substituted in shell commands without escaping. This naming scheme means that some of the filenames in `src/` are a little awkward looking to humans, but it means that no additional data beyond what is encoded in the filesystem is required to determine the correct name for any given Pokémon. -- Characters outside `[0-9a-zA-Z-.]` will be escaped using `_` and four hex characters, similar to JavaScript Unicode escapes. This conforms to the POSIX portable filename character set. (example: `Flabébé` -> `Flabe_0301be_0301`) +Filenames must conform to the POSIX portable filename character set, `[0-9a-zA-Z-._]`. To ensure this, we encode filenames according to the following rules. Characters in `[0-9a-zA-Z-.]` are left as-is. Spaces are converted to an underscore. Other characters are escaped using two underscores and four hex characters, similar to JavaScript Unicode escapes. (example: `Flabébé` -> `Flabe__0301be__0301`) The following JS functions may be useful: ```javascript function encode(s) { - return s.replace(/[^0-9a-zA-Z-.]/g, c => '_' + c.charCodeAt(0).toString(16).padStart(4, '0')); + return s.replace(/[^0-9a-zA-Z-. ]/g, c => '__' + c.charCodeAt(0).toString(16).padStart(4, '0')).replace(" ", "_"); } function decode(s) { - return s.replace(/_(....)/g, (_, m) => String.fromCharCode(parseInt(m, 16))); + return s.replace(/__(....)/g, (_, m) => String.fromCharCode(parseInt(m, 16))).replace("_", " "); } - ``` +``` - Formes are separated with two dashes from their base. (example: `Necrozma--Dawn-Wings`) diff --git a/src/canonical/minisprites/gen5/pokemon/Farfetch_0027d.png b/src/canonical/minisprites/gen5/pokemon/Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Farfetch_0027d.png rename to src/canonical/minisprites/gen5/pokemon/Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mime_0020Jr..png b/src/canonical/minisprites/gen5/pokemon/Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mime_0020Jr..png rename to src/canonical/minisprites/gen5/pokemon/Mime_Jr..png diff --git a/src/canonical/minisprites/gen5/pokemon/Mr._0020Mime.png b/src/canonical/minisprites/gen5/pokemon/Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mr._0020Mime.png rename to src/canonical/minisprites/gen5/pokemon/Mr._Mime.png diff --git a/src/canonical/minisprites/gen6/asymmetrical/Zygarde--10_0025.png b/src/canonical/minisprites/gen6/asymmetrical/Zygarde--10__0025.png similarity index 100% rename from src/canonical/minisprites/gen6/asymmetrical/Zygarde--10_0025.png rename to src/canonical/minisprites/gen6/asymmetrical/Zygarde--10__0025.png diff --git a/src/canonical/minisprites/gen6/custom/Farfetch_0027d--Galar.png b/src/canonical/minisprites/gen6/custom/Farfetch__0027d--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Farfetch_0027d--Galar.png rename to src/canonical/minisprites/gen6/custom/Farfetch__0027d--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Mr._0020Mime--Galar.png b/src/canonical/minisprites/gen6/custom/Mr._Mime--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Mr._0020Mime--Galar.png rename to src/canonical/minisprites/gen6/custom/Mr._Mime--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Mr._0020Rime.png b/src/canonical/minisprites/gen6/custom/Mr._Rime.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Mr._0020Rime.png rename to src/canonical/minisprites/gen6/custom/Mr._Rime.png diff --git a/src/canonical/minisprites/gen6/custom/Sirfetch_0027d.png b/src/canonical/minisprites/gen6/custom/Sirfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sirfetch_0027d.png rename to src/canonical/minisprites/gen6/custom/Sirfetch__0027d.png diff --git a/src/canonical/minisprites/gen6/pokemon/Farfetch_0027d.png b/src/canonical/minisprites/gen6/pokemon/Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Farfetch_0027d.png rename to src/canonical/minisprites/gen6/pokemon/Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Blue.png b/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Blue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Blue.png rename to src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Blue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Orange.png b/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Orange.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Orange.png rename to src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Orange.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--White.png b/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--White.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--White.png rename to src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--White.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Yellow.png b/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Yellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301--Yellow.png rename to src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Yellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301.png b/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe_0301be_0301.png rename to src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mime_0020Jr..png b/src/canonical/minisprites/gen6/pokemon/Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mime_0020Jr..png rename to src/canonical/minisprites/gen6/pokemon/Mime_Jr..png diff --git a/src/canonical/minisprites/gen6/pokemon/Mr._0020Mime.png b/src/canonical/minisprites/gen6/pokemon/Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mr._0020Mime.png rename to src/canonical/minisprites/gen6/pokemon/Mr._Mime.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oricorio--Pa_0027u.png b/src/canonical/minisprites/gen6/pokemon/Oricorio--Pa__0027u.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oricorio--Pa_0027u.png rename to src/canonical/minisprites/gen6/pokemon/Oricorio--Pa__0027u.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_0020Bulu.png b/src/canonical/minisprites/gen6/pokemon/Tapu_Bulu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_0020Bulu.png rename to src/canonical/minisprites/gen6/pokemon/Tapu_Bulu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_0020Fini.png b/src/canonical/minisprites/gen6/pokemon/Tapu_Fini.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_0020Fini.png rename to src/canonical/minisprites/gen6/pokemon/Tapu_Fini.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_0020Koko.png b/src/canonical/minisprites/gen6/pokemon/Tapu_Koko.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_0020Koko.png rename to src/canonical/minisprites/gen6/pokemon/Tapu_Koko.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_0020Lele.png b/src/canonical/minisprites/gen6/pokemon/Tapu_Lele.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_0020Lele.png rename to src/canonical/minisprites/gen6/pokemon/Tapu_Lele.png diff --git a/src/canonical/minisprites/gen6/pokemon/Type_003a_0020Null.png b/src/canonical/minisprites/gen6/pokemon/Type__003a_Null.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Type_003a_0020Null.png rename to src/canonical/minisprites/gen6/pokemon/Type__003a_Null.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--High_0020Plains.png b/src/canonical/minisprites/gen6/pokemon/Vivillon--High_Plains.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--High_0020Plains.png rename to src/canonical/minisprites/gen6/pokemon/Vivillon--High_Plains.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_0020Snow.png b/src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_Snow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_0020Snow.png rename to src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_Snow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zygarde--10_0025.png b/src/canonical/minisprites/gen6/pokemon/Zygarde--10__0025.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zygarde--10_0025.png rename to src/canonical/minisprites/gen6/pokemon/Zygarde--10__0025.png diff --git a/src/canonical/minisprites/gen8/pokemon/Farfetch_0027d--Galar.png b/src/canonical/minisprites/gen8/pokemon/Farfetch__0027d--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Farfetch_0027d--Galar.png rename to src/canonical/minisprites/gen8/pokemon/Farfetch__0027d--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Farfetch_0027d.png b/src/canonical/minisprites/gen8/pokemon/Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Farfetch_0027d.png rename to src/canonical/minisprites/gen8/pokemon/Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mime_0020Jr..png b/src/canonical/minisprites/gen8/pokemon/Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mime_0020Jr..png rename to src/canonical/minisprites/gen8/pokemon/Mime_Jr..png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._0020Mime--Galar.png b/src/canonical/minisprites/gen8/pokemon/Mr._Mime--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._0020Mime--Galar.png rename to src/canonical/minisprites/gen8/pokemon/Mr._Mime--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._0020Mime.png b/src/canonical/minisprites/gen8/pokemon/Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._0020Mime.png rename to src/canonical/minisprites/gen8/pokemon/Mr._Mime.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._0020Rime.png b/src/canonical/minisprites/gen8/pokemon/Mr._Rime.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._0020Rime.png rename to src/canonical/minisprites/gen8/pokemon/Mr._Rime.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sirfetch_0027d.png b/src/canonical/minisprites/gen8/pokemon/Sirfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sirfetch_0027d.png rename to src/canonical/minisprites/gen8/pokemon/Sirfetch__0027d.png diff --git a/src/canonical/minisprites/gen8/pokemon/Type_003a_0020Null.png b/src/canonical/minisprites/gen8/pokemon/Type__003a_Null.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Type_003a_0020Null.png rename to src/canonical/minisprites/gen8/pokemon/Type__003a_Null.png diff --git a/src/canonical/minisprites/items/battle/Absorb_0020Bulb.png b/src/canonical/minisprites/items/battle/Absorb_Bulb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Absorb_0020Bulb.png rename to src/canonical/minisprites/items/battle/Absorb_Bulb.png diff --git a/src/canonical/minisprites/items/battle/Adamant_0020Orb.png b/src/canonical/minisprites/items/battle/Adamant_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Adamant_0020Orb.png rename to src/canonical/minisprites/items/battle/Adamant_Orb.png diff --git a/src/canonical/minisprites/items/battle/Adrenaline_0020Orb.png b/src/canonical/minisprites/items/battle/Adrenaline_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Adrenaline_0020Orb.png rename to src/canonical/minisprites/items/battle/Adrenaline_Orb.png diff --git a/src/canonical/minisprites/items/battle/Aguav_0020Berry.png b/src/canonical/minisprites/items/battle/Aguav_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Aguav_0020Berry.png rename to src/canonical/minisprites/items/battle/Aguav_Berry.png diff --git a/src/canonical/minisprites/items/battle/Air_0020Balloon.png b/src/canonical/minisprites/items/battle/Air_Balloon.png similarity index 100% rename from src/canonical/minisprites/items/battle/Air_0020Balloon.png rename to src/canonical/minisprites/items/battle/Air_Balloon.png diff --git a/src/canonical/minisprites/items/battle/Aloraichium_0020Z.png b/src/canonical/minisprites/items/battle/Aloraichium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Aloraichium_0020Z.png rename to src/canonical/minisprites/items/battle/Aloraichium_Z.png diff --git a/src/canonical/minisprites/items/battle/Apicot_0020Berry.png b/src/canonical/minisprites/items/battle/Apicot_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Apicot_0020Berry.png rename to src/canonical/minisprites/items/battle/Apicot_Berry.png diff --git a/src/canonical/minisprites/items/battle/Aspear_0020Berry.png b/src/canonical/minisprites/items/battle/Aspear_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Aspear_0020Berry.png rename to src/canonical/minisprites/items/battle/Aspear_Berry.png diff --git a/src/canonical/minisprites/items/battle/Assault_0020Vest.png b/src/canonical/minisprites/items/battle/Assault_Vest.png similarity index 100% rename from src/canonical/minisprites/items/battle/Assault_0020Vest.png rename to src/canonical/minisprites/items/battle/Assault_Vest.png diff --git a/src/canonical/minisprites/items/battle/Babiri_0020Berry.png b/src/canonical/minisprites/items/battle/Babiri_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Babiri_0020Berry.png rename to src/canonical/minisprites/items/battle/Babiri_Berry.png diff --git a/src/canonical/minisprites/items/battle/Belue_0020Berry.png b/src/canonical/minisprites/items/battle/Belue_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Belue_0020Berry.png rename to src/canonical/minisprites/items/battle/Belue_Berry.png diff --git a/src/canonical/minisprites/items/battle/Berry_0020Juice.png b/src/canonical/minisprites/items/battle/Berry_Juice.png similarity index 100% rename from src/canonical/minisprites/items/battle/Berry_0020Juice.png rename to src/canonical/minisprites/items/battle/Berry_Juice.png diff --git a/src/canonical/minisprites/items/battle/Berserk_0020Gene.png b/src/canonical/minisprites/items/battle/Berserk_Gene.png similarity index 100% rename from src/canonical/minisprites/items/battle/Berserk_0020Gene.png rename to src/canonical/minisprites/items/battle/Berserk_Gene.png diff --git a/src/canonical/minisprites/items/battle/Big_0020Root.png b/src/canonical/minisprites/items/battle/Big_Root.png similarity index 100% rename from src/canonical/minisprites/items/battle/Big_0020Root.png rename to src/canonical/minisprites/items/battle/Big_Root.png diff --git a/src/canonical/minisprites/items/battle/Binding_0020Band.png b/src/canonical/minisprites/items/battle/Binding_Band.png similarity index 100% rename from src/canonical/minisprites/items/battle/Binding_0020Band.png rename to src/canonical/minisprites/items/battle/Binding_Band.png diff --git a/src/canonical/minisprites/items/battle/Black_0020Belt.png b/src/canonical/minisprites/items/battle/Black_Belt.png similarity index 100% rename from src/canonical/minisprites/items/battle/Black_0020Belt.png rename to src/canonical/minisprites/items/battle/Black_Belt.png diff --git a/src/canonical/minisprites/items/battle/Black_0020Glasses.png b/src/canonical/minisprites/items/battle/Black_Glasses.png similarity index 100% rename from src/canonical/minisprites/items/battle/Black_0020Glasses.png rename to src/canonical/minisprites/items/battle/Black_Glasses.png diff --git a/src/canonical/minisprites/items/battle/Black_0020Sludge.png b/src/canonical/minisprites/items/battle/Black_Sludge.png similarity index 100% rename from src/canonical/minisprites/items/battle/Black_0020Sludge.png rename to src/canonical/minisprites/items/battle/Black_Sludge.png diff --git a/src/canonical/minisprites/items/battle/Blue_0020Orb.png b/src/canonical/minisprites/items/battle/Blue_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Blue_0020Orb.png rename to src/canonical/minisprites/items/battle/Blue_Orb.png diff --git a/src/canonical/minisprites/items/battle/Bluk_0020Berry.png b/src/canonical/minisprites/items/battle/Bluk_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Bluk_0020Berry.png rename to src/canonical/minisprites/items/battle/Bluk_Berry.png diff --git a/src/canonical/minisprites/items/battle/Blunder_0020Policy.png b/src/canonical/minisprites/items/battle/Blunder_Policy.png similarity index 100% rename from src/canonical/minisprites/items/battle/Blunder_0020Policy.png rename to src/canonical/minisprites/items/battle/Blunder_Policy.png diff --git a/src/canonical/minisprites/items/battle/Bright_0020Powder.png b/src/canonical/minisprites/items/battle/Bright_Powder.png similarity index 100% rename from src/canonical/minisprites/items/battle/Bright_0020Powder.png rename to src/canonical/minisprites/items/battle/Bright_Powder.png diff --git a/src/canonical/minisprites/items/battle/Bug_0020Gem.png b/src/canonical/minisprites/items/battle/Bug_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Bug_0020Gem.png rename to src/canonical/minisprites/items/battle/Bug_Gem.png diff --git a/src/canonical/minisprites/items/battle/Bug_0020Memory.png b/src/canonical/minisprites/items/battle/Bug_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Bug_0020Memory.png rename to src/canonical/minisprites/items/battle/Bug_Memory.png diff --git a/src/canonical/minisprites/items/battle/Buginium_0020Z.png b/src/canonical/minisprites/items/battle/Buginium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Buginium_0020Z.png rename to src/canonical/minisprites/items/battle/Buginium_Z.png diff --git a/src/canonical/minisprites/items/battle/Burn_0020Drive.png b/src/canonical/minisprites/items/battle/Burn_Drive.png similarity index 100% rename from src/canonical/minisprites/items/battle/Burn_0020Drive.png rename to src/canonical/minisprites/items/battle/Burn_Drive.png diff --git a/src/canonical/minisprites/items/battle/Cell_0020Battery.png b/src/canonical/minisprites/items/battle/Cell_Battery.png similarity index 100% rename from src/canonical/minisprites/items/battle/Cell_0020Battery.png rename to src/canonical/minisprites/items/battle/Cell_Battery.png diff --git a/src/canonical/minisprites/items/battle/Charizardite_0020X.png b/src/canonical/minisprites/items/battle/Charizardite_X.png similarity index 100% rename from src/canonical/minisprites/items/battle/Charizardite_0020X.png rename to src/canonical/minisprites/items/battle/Charizardite_X.png diff --git a/src/canonical/minisprites/items/battle/Charizardite_0020Y.png b/src/canonical/minisprites/items/battle/Charizardite_Y.png similarity index 100% rename from src/canonical/minisprites/items/battle/Charizardite_0020Y.png rename to src/canonical/minisprites/items/battle/Charizardite_Y.png diff --git a/src/canonical/minisprites/items/battle/Charti_0020Berry.png b/src/canonical/minisprites/items/battle/Charti_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Charti_0020Berry.png rename to src/canonical/minisprites/items/battle/Charti_Berry.png diff --git a/src/canonical/minisprites/items/battle/Cheri_0020Berry.png b/src/canonical/minisprites/items/battle/Cheri_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Cheri_0020Berry.png rename to src/canonical/minisprites/items/battle/Cheri_Berry.png diff --git a/src/canonical/minisprites/items/battle/Chesto_0020Berry.png b/src/canonical/minisprites/items/battle/Chesto_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Chesto_0020Berry.png rename to src/canonical/minisprites/items/battle/Chesto_Berry.png diff --git a/src/canonical/minisprites/items/battle/Chilan_0020Berry.png b/src/canonical/minisprites/items/battle/Chilan_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Chilan_0020Berry.png rename to src/canonical/minisprites/items/battle/Chilan_Berry.png diff --git a/src/canonical/minisprites/items/battle/Chill_0020Drive.png b/src/canonical/minisprites/items/battle/Chill_Drive.png similarity index 100% rename from src/canonical/minisprites/items/battle/Chill_0020Drive.png rename to src/canonical/minisprites/items/battle/Chill_Drive.png diff --git a/src/canonical/minisprites/items/battle/Choice_0020Band.png b/src/canonical/minisprites/items/battle/Choice_Band.png similarity index 100% rename from src/canonical/minisprites/items/battle/Choice_0020Band.png rename to src/canonical/minisprites/items/battle/Choice_Band.png diff --git a/src/canonical/minisprites/items/battle/Choice_0020Scarf.png b/src/canonical/minisprites/items/battle/Choice_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/battle/Choice_0020Scarf.png rename to src/canonical/minisprites/items/battle/Choice_Scarf.png diff --git a/src/canonical/minisprites/items/battle/Choice_0020Specs.png b/src/canonical/minisprites/items/battle/Choice_Specs.png similarity index 100% rename from src/canonical/minisprites/items/battle/Choice_0020Specs.png rename to src/canonical/minisprites/items/battle/Choice_Specs.png diff --git a/src/canonical/minisprites/items/battle/Chople_0020Berry.png b/src/canonical/minisprites/items/battle/Chople_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Chople_0020Berry.png rename to src/canonical/minisprites/items/battle/Chople_Berry.png diff --git a/src/canonical/minisprites/items/battle/Coba_0020Berry.png b/src/canonical/minisprites/items/battle/Coba_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Coba_0020Berry.png rename to src/canonical/minisprites/items/battle/Coba_Berry.png diff --git a/src/canonical/minisprites/items/battle/Colbur_0020Berry.png b/src/canonical/minisprites/items/battle/Colbur_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Colbur_0020Berry.png rename to src/canonical/minisprites/items/battle/Colbur_Berry.png diff --git a/src/canonical/minisprites/items/battle/Cornn_0020Berry.png b/src/canonical/minisprites/items/battle/Cornn_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Cornn_0020Berry.png rename to src/canonical/minisprites/items/battle/Cornn_Berry.png diff --git a/src/canonical/minisprites/items/battle/Custap_0020Berry.png b/src/canonical/minisprites/items/battle/Custap_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Custap_0020Berry.png rename to src/canonical/minisprites/items/battle/Custap_Berry.png diff --git a/src/canonical/minisprites/items/battle/Damp_0020Rock.png b/src/canonical/minisprites/items/battle/Damp_Rock.png similarity index 100% rename from src/canonical/minisprites/items/battle/Damp_0020Rock.png rename to src/canonical/minisprites/items/battle/Damp_Rock.png diff --git a/src/canonical/minisprites/items/battle/Dark_0020Gem.png b/src/canonical/minisprites/items/battle/Dark_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dark_0020Gem.png rename to src/canonical/minisprites/items/battle/Dark_Gem.png diff --git a/src/canonical/minisprites/items/battle/Dark_0020Memory.png b/src/canonical/minisprites/items/battle/Dark_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dark_0020Memory.png rename to src/canonical/minisprites/items/battle/Dark_Memory.png diff --git a/src/canonical/minisprites/items/battle/Darkinium_0020Z.png b/src/canonical/minisprites/items/battle/Darkinium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Darkinium_0020Z.png rename to src/canonical/minisprites/items/battle/Darkinium_Z.png diff --git a/src/canonical/minisprites/items/battle/Decidium_0020Z.png b/src/canonical/minisprites/items/battle/Decidium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Decidium_0020Z.png rename to src/canonical/minisprites/items/battle/Decidium_Z.png diff --git a/src/canonical/minisprites/items/battle/Deep_0020Sea_0020Scale.png b/src/canonical/minisprites/items/battle/Deep_Sea_Scale.png similarity index 100% rename from src/canonical/minisprites/items/battle/Deep_0020Sea_0020Scale.png rename to src/canonical/minisprites/items/battle/Deep_Sea_Scale.png diff --git a/src/canonical/minisprites/items/battle/Deep_0020Sea_0020Tooth.png b/src/canonical/minisprites/items/battle/Deep_Sea_Tooth.png similarity index 100% rename from src/canonical/minisprites/items/battle/Deep_0020Sea_0020Tooth.png rename to src/canonical/minisprites/items/battle/Deep_Sea_Tooth.png diff --git a/src/canonical/minisprites/items/battle/Destiny_0020Knot.png b/src/canonical/minisprites/items/battle/Destiny_Knot.png similarity index 100% rename from src/canonical/minisprites/items/battle/Destiny_0020Knot.png rename to src/canonical/minisprites/items/battle/Destiny_Knot.png diff --git a/src/canonical/minisprites/items/battle/Douse_0020Drive.png b/src/canonical/minisprites/items/battle/Douse_Drive.png similarity index 100% rename from src/canonical/minisprites/items/battle/Douse_0020Drive.png rename to src/canonical/minisprites/items/battle/Douse_Drive.png diff --git a/src/canonical/minisprites/items/battle/Draco_0020Plate.png b/src/canonical/minisprites/items/battle/Draco_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Draco_0020Plate.png rename to src/canonical/minisprites/items/battle/Draco_Plate.png diff --git a/src/canonical/minisprites/items/battle/Dragon_0020Fang.png b/src/canonical/minisprites/items/battle/Dragon_Fang.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dragon_0020Fang.png rename to src/canonical/minisprites/items/battle/Dragon_Fang.png diff --git a/src/canonical/minisprites/items/battle/Dragon_0020Gem.png b/src/canonical/minisprites/items/battle/Dragon_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dragon_0020Gem.png rename to src/canonical/minisprites/items/battle/Dragon_Gem.png diff --git a/src/canonical/minisprites/items/battle/Dragon_0020Memory.png b/src/canonical/minisprites/items/battle/Dragon_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dragon_0020Memory.png rename to src/canonical/minisprites/items/battle/Dragon_Memory.png diff --git a/src/canonical/minisprites/items/battle/Dragon_0020Scale.png b/src/canonical/minisprites/items/battle/Dragon_Scale.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dragon_0020Scale.png rename to src/canonical/minisprites/items/battle/Dragon_Scale.png diff --git a/src/canonical/minisprites/items/battle/Dragonium_0020Z.png b/src/canonical/minisprites/items/battle/Dragonium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dragonium_0020Z.png rename to src/canonical/minisprites/items/battle/Dragonium_Z.png diff --git a/src/canonical/minisprites/items/battle/Dread_0020Plate.png b/src/canonical/minisprites/items/battle/Dread_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Dread_0020Plate.png rename to src/canonical/minisprites/items/battle/Dread_Plate.png diff --git a/src/canonical/minisprites/items/battle/Durin_0020Berry.png b/src/canonical/minisprites/items/battle/Durin_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Durin_0020Berry.png rename to src/canonical/minisprites/items/battle/Durin_Berry.png diff --git a/src/canonical/minisprites/items/battle/Earth_0020Plate.png b/src/canonical/minisprites/items/battle/Earth_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Earth_0020Plate.png rename to src/canonical/minisprites/items/battle/Earth_Plate.png diff --git a/src/canonical/minisprites/items/battle/Eevium_0020Z.png b/src/canonical/minisprites/items/battle/Eevium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Eevium_0020Z.png rename to src/canonical/minisprites/items/battle/Eevium_Z.png diff --git a/src/canonical/minisprites/items/battle/Eject_0020Button.png b/src/canonical/minisprites/items/battle/Eject_Button.png similarity index 100% rename from src/canonical/minisprites/items/battle/Eject_0020Button.png rename to src/canonical/minisprites/items/battle/Eject_Button.png diff --git a/src/canonical/minisprites/items/battle/Eject_0020Pack.png b/src/canonical/minisprites/items/battle/Eject_Pack.png similarity index 100% rename from src/canonical/minisprites/items/battle/Eject_0020Pack.png rename to src/canonical/minisprites/items/battle/Eject_Pack.png diff --git a/src/canonical/minisprites/items/battle/Electric_0020Gem.png b/src/canonical/minisprites/items/battle/Electric_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Electric_0020Gem.png rename to src/canonical/minisprites/items/battle/Electric_Gem.png diff --git a/src/canonical/minisprites/items/battle/Electric_0020Memory.png b/src/canonical/minisprites/items/battle/Electric_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Electric_0020Memory.png rename to src/canonical/minisprites/items/battle/Electric_Memory.png diff --git a/src/canonical/minisprites/items/battle/Electric_0020Seed.png b/src/canonical/minisprites/items/battle/Electric_Seed.png similarity index 100% rename from src/canonical/minisprites/items/battle/Electric_0020Seed.png rename to src/canonical/minisprites/items/battle/Electric_Seed.png diff --git a/src/canonical/minisprites/items/battle/Electrium_0020Z.png b/src/canonical/minisprites/items/battle/Electrium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Electrium_0020Z.png rename to src/canonical/minisprites/items/battle/Electrium_Z.png diff --git a/src/canonical/minisprites/items/battle/Enigma_0020Berry.png b/src/canonical/minisprites/items/battle/Enigma_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Enigma_0020Berry.png rename to src/canonical/minisprites/items/battle/Enigma_Berry.png diff --git a/src/canonical/minisprites/items/battle/Expert_0020Belt.png b/src/canonical/minisprites/items/battle/Expert_Belt.png similarity index 100% rename from src/canonical/minisprites/items/battle/Expert_0020Belt.png rename to src/canonical/minisprites/items/battle/Expert_Belt.png diff --git a/src/canonical/minisprites/items/battle/Fairium_0020Z.png b/src/canonical/minisprites/items/battle/Fairium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fairium_0020Z.png rename to src/canonical/minisprites/items/battle/Fairium_Z.png diff --git a/src/canonical/minisprites/items/battle/Fairy_0020Gem.png b/src/canonical/minisprites/items/battle/Fairy_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fairy_0020Gem.png rename to src/canonical/minisprites/items/battle/Fairy_Gem.png diff --git a/src/canonical/minisprites/items/battle/Fairy_0020Memory.png b/src/canonical/minisprites/items/battle/Fairy_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fairy_0020Memory.png rename to src/canonical/minisprites/items/battle/Fairy_Memory.png diff --git a/src/canonical/minisprites/items/battle/Fighting_0020Gem.png b/src/canonical/minisprites/items/battle/Fighting_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fighting_0020Gem.png rename to src/canonical/minisprites/items/battle/Fighting_Gem.png diff --git a/src/canonical/minisprites/items/battle/Fighting_0020Memory.png b/src/canonical/minisprites/items/battle/Fighting_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fighting_0020Memory.png rename to src/canonical/minisprites/items/battle/Fighting_Memory.png diff --git a/src/canonical/minisprites/items/battle/Fightinium_0020Z.png b/src/canonical/minisprites/items/battle/Fightinium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fightinium_0020Z.png rename to src/canonical/minisprites/items/battle/Fightinium_Z.png diff --git a/src/canonical/minisprites/items/battle/Figy_0020Berry.png b/src/canonical/minisprites/items/battle/Figy_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Figy_0020Berry.png rename to src/canonical/minisprites/items/battle/Figy_Berry.png diff --git a/src/canonical/minisprites/items/battle/Fire_0020Gem.png b/src/canonical/minisprites/items/battle/Fire_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fire_0020Gem.png rename to src/canonical/minisprites/items/battle/Fire_Gem.png diff --git a/src/canonical/minisprites/items/battle/Fire_0020Memory.png b/src/canonical/minisprites/items/battle/Fire_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fire_0020Memory.png rename to src/canonical/minisprites/items/battle/Fire_Memory.png diff --git a/src/canonical/minisprites/items/battle/Firium_0020Z.png b/src/canonical/minisprites/items/battle/Firium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Firium_0020Z.png rename to src/canonical/minisprites/items/battle/Firium_Z.png diff --git a/src/canonical/minisprites/items/battle/Fist_0020Plate.png b/src/canonical/minisprites/items/battle/Fist_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Fist_0020Plate.png rename to src/canonical/minisprites/items/battle/Fist_Plate.png diff --git a/src/canonical/minisprites/items/battle/Flame_0020Orb.png b/src/canonical/minisprites/items/battle/Flame_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Flame_0020Orb.png rename to src/canonical/minisprites/items/battle/Flame_Orb.png diff --git a/src/canonical/minisprites/items/battle/Flame_0020Plate.png b/src/canonical/minisprites/items/battle/Flame_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Flame_0020Plate.png rename to src/canonical/minisprites/items/battle/Flame_Plate.png diff --git a/src/canonical/minisprites/items/battle/Float_0020Stone.png b/src/canonical/minisprites/items/battle/Float_Stone.png similarity index 100% rename from src/canonical/minisprites/items/battle/Float_0020Stone.png rename to src/canonical/minisprites/items/battle/Float_Stone.png diff --git a/src/canonical/minisprites/items/battle/Flying_0020Gem.png b/src/canonical/minisprites/items/battle/Flying_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Flying_0020Gem.png rename to src/canonical/minisprites/items/battle/Flying_Gem.png diff --git a/src/canonical/minisprites/items/battle/Flying_0020Memory.png b/src/canonical/minisprites/items/battle/Flying_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Flying_0020Memory.png rename to src/canonical/minisprites/items/battle/Flying_Memory.png diff --git a/src/canonical/minisprites/items/battle/Flyinium_0020Z.png b/src/canonical/minisprites/items/battle/Flyinium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Flyinium_0020Z.png rename to src/canonical/minisprites/items/battle/Flyinium_Z.png diff --git a/src/canonical/minisprites/items/battle/Focus_0020Band.png b/src/canonical/minisprites/items/battle/Focus_Band.png similarity index 100% rename from src/canonical/minisprites/items/battle/Focus_0020Band.png rename to src/canonical/minisprites/items/battle/Focus_Band.png diff --git a/src/canonical/minisprites/items/battle/Focus_0020Sash.png b/src/canonical/minisprites/items/battle/Focus_Sash.png similarity index 100% rename from src/canonical/minisprites/items/battle/Focus_0020Sash.png rename to src/canonical/minisprites/items/battle/Focus_Sash.png diff --git a/src/canonical/minisprites/items/battle/Full_0020Incense.png b/src/canonical/minisprites/items/battle/Full_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Full_0020Incense.png rename to src/canonical/minisprites/items/battle/Full_Incense.png diff --git a/src/canonical/minisprites/items/battle/Ganlon_0020Berry.png b/src/canonical/minisprites/items/battle/Ganlon_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ganlon_0020Berry.png rename to src/canonical/minisprites/items/battle/Ganlon_Berry.png diff --git a/src/canonical/minisprites/items/battle/Ghost_0020Gem.png b/src/canonical/minisprites/items/battle/Ghost_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ghost_0020Gem.png rename to src/canonical/minisprites/items/battle/Ghost_Gem.png diff --git a/src/canonical/minisprites/items/battle/Ghost_0020Memory.png b/src/canonical/minisprites/items/battle/Ghost_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ghost_0020Memory.png rename to src/canonical/minisprites/items/battle/Ghost_Memory.png diff --git a/src/canonical/minisprites/items/battle/Ghostium_0020Z.png b/src/canonical/minisprites/items/battle/Ghostium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ghostium_0020Z.png rename to src/canonical/minisprites/items/battle/Ghostium_Z.png diff --git a/src/canonical/minisprites/items/battle/Grass_0020Gem.png b/src/canonical/minisprites/items/battle/Grass_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grass_0020Gem.png rename to src/canonical/minisprites/items/battle/Grass_Gem.png diff --git a/src/canonical/minisprites/items/battle/Grass_0020Memory.png b/src/canonical/minisprites/items/battle/Grass_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grass_0020Memory.png rename to src/canonical/minisprites/items/battle/Grass_Memory.png diff --git a/src/canonical/minisprites/items/battle/Grassium_0020Z.png b/src/canonical/minisprites/items/battle/Grassium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grassium_0020Z.png rename to src/canonical/minisprites/items/battle/Grassium_Z.png diff --git a/src/canonical/minisprites/items/battle/Grassy_0020Seed.png b/src/canonical/minisprites/items/battle/Grassy_Seed.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grassy_0020Seed.png rename to src/canonical/minisprites/items/battle/Grassy_Seed.png diff --git a/src/canonical/minisprites/items/battle/Grepa_0020Berry.png b/src/canonical/minisprites/items/battle/Grepa_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grepa_0020Berry.png rename to src/canonical/minisprites/items/battle/Grepa_Berry.png diff --git a/src/canonical/minisprites/items/battle/Grip_0020Claw.png b/src/canonical/minisprites/items/battle/Grip_Claw.png similarity index 100% rename from src/canonical/minisprites/items/battle/Grip_0020Claw.png rename to src/canonical/minisprites/items/battle/Grip_Claw.png diff --git a/src/canonical/minisprites/items/battle/Griseous_0020Orb.png b/src/canonical/minisprites/items/battle/Griseous_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Griseous_0020Orb.png rename to src/canonical/minisprites/items/battle/Griseous_Orb.png diff --git a/src/canonical/minisprites/items/battle/Ground_0020Gem.png b/src/canonical/minisprites/items/battle/Ground_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ground_0020Gem.png rename to src/canonical/minisprites/items/battle/Ground_Gem.png diff --git a/src/canonical/minisprites/items/battle/Ground_0020Memory.png b/src/canonical/minisprites/items/battle/Ground_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ground_0020Memory.png rename to src/canonical/minisprites/items/battle/Ground_Memory.png diff --git a/src/canonical/minisprites/items/battle/Groundium_0020Z.png b/src/canonical/minisprites/items/battle/Groundium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Groundium_0020Z.png rename to src/canonical/minisprites/items/battle/Groundium_Z.png diff --git a/src/canonical/minisprites/items/battle/Haban_0020Berry.png b/src/canonical/minisprites/items/battle/Haban_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Haban_0020Berry.png rename to src/canonical/minisprites/items/battle/Haban_Berry.png diff --git a/src/canonical/minisprites/items/battle/Hard_0020Stone.png b/src/canonical/minisprites/items/battle/Hard_Stone.png similarity index 100% rename from src/canonical/minisprites/items/battle/Hard_0020Stone.png rename to src/canonical/minisprites/items/battle/Hard_Stone.png diff --git a/src/canonical/minisprites/items/battle/Heat_0020Rock.png b/src/canonical/minisprites/items/battle/Heat_Rock.png similarity index 100% rename from src/canonical/minisprites/items/battle/Heat_0020Rock.png rename to src/canonical/minisprites/items/battle/Heat_Rock.png diff --git a/src/canonical/minisprites/items/battle/Heavy-Duty_0020Boots.png b/src/canonical/minisprites/items/battle/Heavy-Duty_Boots.png similarity index 100% rename from src/canonical/minisprites/items/battle/Heavy-Duty_0020Boots.png rename to src/canonical/minisprites/items/battle/Heavy-Duty_Boots.png diff --git a/src/canonical/minisprites/items/battle/Hondew_0020Berry.png b/src/canonical/minisprites/items/battle/Hondew_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Hondew_0020Berry.png rename to src/canonical/minisprites/items/battle/Hondew_Berry.png diff --git a/src/canonical/minisprites/items/battle/Iapapa_0020Berry.png b/src/canonical/minisprites/items/battle/Iapapa_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Iapapa_0020Berry.png rename to src/canonical/minisprites/items/battle/Iapapa_Berry.png diff --git a/src/canonical/minisprites/items/battle/Ice_0020Gem.png b/src/canonical/minisprites/items/battle/Ice_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ice_0020Gem.png rename to src/canonical/minisprites/items/battle/Ice_Gem.png diff --git a/src/canonical/minisprites/items/battle/Ice_0020Memory.png b/src/canonical/minisprites/items/battle/Ice_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ice_0020Memory.png rename to src/canonical/minisprites/items/battle/Ice_Memory.png diff --git a/src/canonical/minisprites/items/battle/Icicle_0020Plate.png b/src/canonical/minisprites/items/battle/Icicle_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Icicle_0020Plate.png rename to src/canonical/minisprites/items/battle/Icicle_Plate.png diff --git a/src/canonical/minisprites/items/battle/Icium_0020Z.png b/src/canonical/minisprites/items/battle/Icium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Icium_0020Z.png rename to src/canonical/minisprites/items/battle/Icium_Z.png diff --git a/src/canonical/minisprites/items/battle/Icy_0020Rock.png b/src/canonical/minisprites/items/battle/Icy_Rock.png similarity index 100% rename from src/canonical/minisprites/items/battle/Icy_0020Rock.png rename to src/canonical/minisprites/items/battle/Icy_Rock.png diff --git a/src/canonical/minisprites/items/battle/Incinium_0020Z.png b/src/canonical/minisprites/items/battle/Incinium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Incinium_0020Z.png rename to src/canonical/minisprites/items/battle/Incinium_Z.png diff --git a/src/canonical/minisprites/items/battle/Insect_0020Plate.png b/src/canonical/minisprites/items/battle/Insect_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Insect_0020Plate.png rename to src/canonical/minisprites/items/battle/Insect_Plate.png diff --git a/src/canonical/minisprites/items/battle/Iron_0020Ball.png b/src/canonical/minisprites/items/battle/Iron_Ball.png similarity index 100% rename from src/canonical/minisprites/items/battle/Iron_0020Ball.png rename to src/canonical/minisprites/items/battle/Iron_Ball.png diff --git a/src/canonical/minisprites/items/battle/Iron_0020Plate.png b/src/canonical/minisprites/items/battle/Iron_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Iron_0020Plate.png rename to src/canonical/minisprites/items/battle/Iron_Plate.png diff --git a/src/canonical/minisprites/items/battle/Jaboca_0020Berry.png b/src/canonical/minisprites/items/battle/Jaboca_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Jaboca_0020Berry.png rename to src/canonical/minisprites/items/battle/Jaboca_Berry.png diff --git a/src/canonical/minisprites/items/battle/Kasib_0020Berry.png b/src/canonical/minisprites/items/battle/Kasib_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Kasib_0020Berry.png rename to src/canonical/minisprites/items/battle/Kasib_Berry.png diff --git a/src/canonical/minisprites/items/battle/Kebia_0020Berry.png b/src/canonical/minisprites/items/battle/Kebia_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Kebia_0020Berry.png rename to src/canonical/minisprites/items/battle/Kebia_Berry.png diff --git a/src/canonical/minisprites/items/battle/Kee_0020Berry.png b/src/canonical/minisprites/items/battle/Kee_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Kee_0020Berry.png rename to src/canonical/minisprites/items/battle/Kee_Berry.png diff --git a/src/canonical/minisprites/items/battle/Kelpsy_0020Berry.png b/src/canonical/minisprites/items/battle/Kelpsy_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Kelpsy_0020Berry.png rename to src/canonical/minisprites/items/battle/Kelpsy_Berry.png diff --git a/src/canonical/minisprites/items/battle/King_0027s_0020Rock.png b/src/canonical/minisprites/items/battle/King__0027s_Rock.png similarity index 100% rename from src/canonical/minisprites/items/battle/King_0027s_0020Rock.png rename to src/canonical/minisprites/items/battle/King__0027s_Rock.png diff --git a/src/canonical/minisprites/items/battle/Kommonium_0020Z.png b/src/canonical/minisprites/items/battle/Kommonium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Kommonium_0020Z.png rename to src/canonical/minisprites/items/battle/Kommonium_Z.png diff --git a/src/canonical/minisprites/items/battle/Lagging_0020Tail.png b/src/canonical/minisprites/items/battle/Lagging_Tail.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lagging_0020Tail.png rename to src/canonical/minisprites/items/battle/Lagging_Tail.png diff --git a/src/canonical/minisprites/items/battle/Lansat_0020Berry.png b/src/canonical/minisprites/items/battle/Lansat_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lansat_0020Berry.png rename to src/canonical/minisprites/items/battle/Lansat_Berry.png diff --git a/src/canonical/minisprites/items/battle/Lax_0020Incense.png b/src/canonical/minisprites/items/battle/Lax_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lax_0020Incense.png rename to src/canonical/minisprites/items/battle/Lax_Incense.png diff --git a/src/canonical/minisprites/items/battle/Leppa_0020Berry.png b/src/canonical/minisprites/items/battle/Leppa_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Leppa_0020Berry.png rename to src/canonical/minisprites/items/battle/Leppa_Berry.png diff --git a/src/canonical/minisprites/items/battle/Liechi_0020Berry.png b/src/canonical/minisprites/items/battle/Liechi_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Liechi_0020Berry.png rename to src/canonical/minisprites/items/battle/Liechi_Berry.png diff --git a/src/canonical/minisprites/items/battle/Life_0020Orb.png b/src/canonical/minisprites/items/battle/Life_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Life_0020Orb.png rename to src/canonical/minisprites/items/battle/Life_Orb.png diff --git a/src/canonical/minisprites/items/battle/Light_0020Ball.png b/src/canonical/minisprites/items/battle/Light_Ball.png similarity index 100% rename from src/canonical/minisprites/items/battle/Light_0020Ball.png rename to src/canonical/minisprites/items/battle/Light_Ball.png diff --git a/src/canonical/minisprites/items/battle/Light_0020Clay.png b/src/canonical/minisprites/items/battle/Light_Clay.png similarity index 100% rename from src/canonical/minisprites/items/battle/Light_0020Clay.png rename to src/canonical/minisprites/items/battle/Light_Clay.png diff --git a/src/canonical/minisprites/items/battle/Luck_0020Incense.png b/src/canonical/minisprites/items/battle/Luck_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Luck_0020Incense.png rename to src/canonical/minisprites/items/battle/Luck_Incense.png diff --git a/src/canonical/minisprites/items/battle/Lucky_0020Punch.png b/src/canonical/minisprites/items/battle/Lucky_Punch.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lucky_0020Punch.png rename to src/canonical/minisprites/items/battle/Lucky_Punch.png diff --git a/src/canonical/minisprites/items/battle/Lum_0020Berry.png b/src/canonical/minisprites/items/battle/Lum_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lum_0020Berry.png rename to src/canonical/minisprites/items/battle/Lum_Berry.png diff --git a/src/canonical/minisprites/items/battle/Luminous_0020Moss.png b/src/canonical/minisprites/items/battle/Luminous_Moss.png similarity index 100% rename from src/canonical/minisprites/items/battle/Luminous_0020Moss.png rename to src/canonical/minisprites/items/battle/Luminous_Moss.png diff --git a/src/canonical/minisprites/items/battle/Lunalium_0020Z.png b/src/canonical/minisprites/items/battle/Lunalium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lunalium_0020Z.png rename to src/canonical/minisprites/items/battle/Lunalium_Z.png diff --git a/src/canonical/minisprites/items/battle/Lustrous_0020Orb.png b/src/canonical/minisprites/items/battle/Lustrous_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lustrous_0020Orb.png rename to src/canonical/minisprites/items/battle/Lustrous_Orb.png diff --git a/src/canonical/minisprites/items/battle/Lycanium_0020Z.png b/src/canonical/minisprites/items/battle/Lycanium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Lycanium_0020Z.png rename to src/canonical/minisprites/items/battle/Lycanium_Z.png diff --git a/src/canonical/minisprites/items/battle/Macho_0020Brace.png b/src/canonical/minisprites/items/battle/Macho_Brace.png similarity index 100% rename from src/canonical/minisprites/items/battle/Macho_0020Brace.png rename to src/canonical/minisprites/items/battle/Macho_Brace.png diff --git a/src/canonical/minisprites/items/battle/Mago_0020Berry.png b/src/canonical/minisprites/items/battle/Mago_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mago_0020Berry.png rename to src/canonical/minisprites/items/battle/Mago_Berry.png diff --git a/src/canonical/minisprites/items/battle/Magost_0020Berry.png b/src/canonical/minisprites/items/battle/Magost_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Magost_0020Berry.png rename to src/canonical/minisprites/items/battle/Magost_Berry.png diff --git a/src/canonical/minisprites/items/battle/Maranga_0020Berry.png b/src/canonical/minisprites/items/battle/Maranga_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Maranga_0020Berry.png rename to src/canonical/minisprites/items/battle/Maranga_Berry.png diff --git a/src/canonical/minisprites/items/battle/Marshadium_0020Z.png b/src/canonical/minisprites/items/battle/Marshadium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Marshadium_0020Z.png rename to src/canonical/minisprites/items/battle/Marshadium_Z.png diff --git a/src/canonical/minisprites/items/battle/Meadow_0020Plate.png b/src/canonical/minisprites/items/battle/Meadow_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Meadow_0020Plate.png rename to src/canonical/minisprites/items/battle/Meadow_Plate.png diff --git a/src/canonical/minisprites/items/battle/Mental_0020Herb.png b/src/canonical/minisprites/items/battle/Mental_Herb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mental_0020Herb.png rename to src/canonical/minisprites/items/battle/Mental_Herb.png diff --git a/src/canonical/minisprites/items/battle/Metal_0020Coat.png b/src/canonical/minisprites/items/battle/Metal_Coat.png similarity index 100% rename from src/canonical/minisprites/items/battle/Metal_0020Coat.png rename to src/canonical/minisprites/items/battle/Metal_Coat.png diff --git a/src/canonical/minisprites/items/battle/Metal_0020Powder.png b/src/canonical/minisprites/items/battle/Metal_Powder.png similarity index 100% rename from src/canonical/minisprites/items/battle/Metal_0020Powder.png rename to src/canonical/minisprites/items/battle/Metal_Powder.png diff --git a/src/canonical/minisprites/items/battle/Mewnium_0020Z.png b/src/canonical/minisprites/items/battle/Mewnium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mewnium_0020Z.png rename to src/canonical/minisprites/items/battle/Mewnium_Z.png diff --git a/src/canonical/minisprites/items/battle/Mewtwonite_0020X.png b/src/canonical/minisprites/items/battle/Mewtwonite_X.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mewtwonite_0020X.png rename to src/canonical/minisprites/items/battle/Mewtwonite_X.png diff --git a/src/canonical/minisprites/items/battle/Mewtwonite_0020Y.png b/src/canonical/minisprites/items/battle/Mewtwonite_Y.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mewtwonite_0020Y.png rename to src/canonical/minisprites/items/battle/Mewtwonite_Y.png diff --git a/src/canonical/minisprites/items/battle/Micle_0020Berry.png b/src/canonical/minisprites/items/battle/Micle_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Micle_0020Berry.png rename to src/canonical/minisprites/items/battle/Micle_Berry.png diff --git a/src/canonical/minisprites/items/battle/Mimikium_0020Z.png b/src/canonical/minisprites/items/battle/Mimikium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mimikium_0020Z.png rename to src/canonical/minisprites/items/battle/Mimikium_Z.png diff --git a/src/canonical/minisprites/items/battle/Mind_0020Plate.png b/src/canonical/minisprites/items/battle/Mind_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mind_0020Plate.png rename to src/canonical/minisprites/items/battle/Mind_Plate.png diff --git a/src/canonical/minisprites/items/battle/Miracle_0020Seed.png b/src/canonical/minisprites/items/battle/Miracle_Seed.png similarity index 100% rename from src/canonical/minisprites/items/battle/Miracle_0020Seed.png rename to src/canonical/minisprites/items/battle/Miracle_Seed.png diff --git a/src/canonical/minisprites/items/battle/Misty_0020Seed.png b/src/canonical/minisprites/items/battle/Misty_Seed.png similarity index 100% rename from src/canonical/minisprites/items/battle/Misty_0020Seed.png rename to src/canonical/minisprites/items/battle/Misty_Seed.png diff --git a/src/canonical/minisprites/items/battle/Muscle_0020Band.png b/src/canonical/minisprites/items/battle/Muscle_Band.png similarity index 100% rename from src/canonical/minisprites/items/battle/Muscle_0020Band.png rename to src/canonical/minisprites/items/battle/Muscle_Band.png diff --git a/src/canonical/minisprites/items/battle/Mystic_0020Water.png b/src/canonical/minisprites/items/battle/Mystic_Water.png similarity index 100% rename from src/canonical/minisprites/items/battle/Mystic_0020Water.png rename to src/canonical/minisprites/items/battle/Mystic_Water.png diff --git a/src/canonical/minisprites/items/battle/Nanab_0020Berry.png b/src/canonical/minisprites/items/battle/Nanab_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Nanab_0020Berry.png rename to src/canonical/minisprites/items/battle/Nanab_Berry.png diff --git a/src/canonical/minisprites/items/battle/Nest_0020Ball.png b/src/canonical/minisprites/items/battle/Nest_Ball.png similarity index 100% rename from src/canonical/minisprites/items/battle/Nest_0020Ball.png rename to src/canonical/minisprites/items/battle/Nest_Ball.png diff --git a/src/canonical/minisprites/items/battle/Net_0020Ball.png b/src/canonical/minisprites/items/battle/Net_Ball.png similarity index 100% rename from src/canonical/minisprites/items/battle/Net_0020Ball.png rename to src/canonical/minisprites/items/battle/Net_Ball.png diff --git a/src/canonical/minisprites/items/battle/Never-Melt_0020Ice.png b/src/canonical/minisprites/items/battle/Never-Melt_Ice.png similarity index 100% rename from src/canonical/minisprites/items/battle/Never-Melt_0020Ice.png rename to src/canonical/minisprites/items/battle/Never-Melt_Ice.png diff --git a/src/canonical/minisprites/items/battle/Nomel_0020Berry.png b/src/canonical/minisprites/items/battle/Nomel_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Nomel_0020Berry.png rename to src/canonical/minisprites/items/battle/Nomel_Berry.png diff --git a/src/canonical/minisprites/items/battle/Normal_0020Gem.png b/src/canonical/minisprites/items/battle/Normal_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Normal_0020Gem.png rename to src/canonical/minisprites/items/battle/Normal_Gem.png diff --git a/src/canonical/minisprites/items/battle/Normalium_0020Z.png b/src/canonical/minisprites/items/battle/Normalium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Normalium_0020Z.png rename to src/canonical/minisprites/items/battle/Normalium_Z.png diff --git a/src/canonical/minisprites/items/battle/Occa_0020Berry.png b/src/canonical/minisprites/items/battle/Occa_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Occa_0020Berry.png rename to src/canonical/minisprites/items/battle/Occa_Berry.png diff --git a/src/canonical/minisprites/items/battle/Odd_0020Incense.png b/src/canonical/minisprites/items/battle/Odd_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Odd_0020Incense.png rename to src/canonical/minisprites/items/battle/Odd_Incense.png diff --git a/src/canonical/minisprites/items/battle/Oran_0020Berry.png b/src/canonical/minisprites/items/battle/Oran_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Oran_0020Berry.png rename to src/canonical/minisprites/items/battle/Oran_Berry.png diff --git a/src/canonical/minisprites/items/battle/Oval_0020Stone.png b/src/canonical/minisprites/items/battle/Oval_Stone.png similarity index 100% rename from src/canonical/minisprites/items/battle/Oval_0020Stone.png rename to src/canonical/minisprites/items/battle/Oval_Stone.png diff --git a/src/canonical/minisprites/items/battle/Pamtre_0020Berry.png b/src/canonical/minisprites/items/battle/Pamtre_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pamtre_0020Berry.png rename to src/canonical/minisprites/items/battle/Pamtre_Berry.png diff --git a/src/canonical/minisprites/items/battle/Passho_0020Berry.png b/src/canonical/minisprites/items/battle/Passho_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Passho_0020Berry.png rename to src/canonical/minisprites/items/battle/Passho_Berry.png diff --git a/src/canonical/minisprites/items/battle/Payapa_0020Berry.png b/src/canonical/minisprites/items/battle/Payapa_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Payapa_0020Berry.png rename to src/canonical/minisprites/items/battle/Payapa_Berry.png diff --git a/src/canonical/minisprites/items/battle/Pecha_0020Berry.png b/src/canonical/minisprites/items/battle/Pecha_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pecha_0020Berry.png rename to src/canonical/minisprites/items/battle/Pecha_Berry.png diff --git a/src/canonical/minisprites/items/battle/Persim_0020Berry.png b/src/canonical/minisprites/items/battle/Persim_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Persim_0020Berry.png rename to src/canonical/minisprites/items/battle/Persim_Berry.png diff --git a/src/canonical/minisprites/items/battle/Petaya_0020Berry.png b/src/canonical/minisprites/items/battle/Petaya_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Petaya_0020Berry.png rename to src/canonical/minisprites/items/battle/Petaya_Berry.png diff --git a/src/canonical/minisprites/items/battle/Pikanium_0020Z.png b/src/canonical/minisprites/items/battle/Pikanium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pikanium_0020Z.png rename to src/canonical/minisprites/items/battle/Pikanium_Z.png diff --git a/src/canonical/minisprites/items/battle/Pikashunium_0020Z.png b/src/canonical/minisprites/items/battle/Pikashunium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pikashunium_0020Z.png rename to src/canonical/minisprites/items/battle/Pikashunium_Z.png diff --git a/src/canonical/minisprites/items/battle/Pinap_0020Berry.png b/src/canonical/minisprites/items/battle/Pinap_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pinap_0020Berry.png rename to src/canonical/minisprites/items/battle/Pinap_Berry.png diff --git a/src/canonical/minisprites/items/battle/Pixie_0020Plate.png b/src/canonical/minisprites/items/battle/Pixie_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pixie_0020Plate.png rename to src/canonical/minisprites/items/battle/Pixie_Plate.png diff --git a/src/canonical/minisprites/items/battle/Poison_0020Barb.png b/src/canonical/minisprites/items/battle/Poison_Barb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Poison_0020Barb.png rename to src/canonical/minisprites/items/battle/Poison_Barb.png diff --git a/src/canonical/minisprites/items/battle/Poison_0020Gem.png b/src/canonical/minisprites/items/battle/Poison_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Poison_0020Gem.png rename to src/canonical/minisprites/items/battle/Poison_Gem.png diff --git a/src/canonical/minisprites/items/battle/Poison_0020Memory.png b/src/canonical/minisprites/items/battle/Poison_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Poison_0020Memory.png rename to src/canonical/minisprites/items/battle/Poison_Memory.png diff --git a/src/canonical/minisprites/items/battle/Poisonium_0020Z.png b/src/canonical/minisprites/items/battle/Poisonium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Poisonium_0020Z.png rename to src/canonical/minisprites/items/battle/Poisonium_Z.png diff --git a/src/canonical/minisprites/items/battle/Pomeg_0020Berry.png b/src/canonical/minisprites/items/battle/Pomeg_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Pomeg_0020Berry.png rename to src/canonical/minisprites/items/battle/Pomeg_Berry.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Anklet.png b/src/canonical/minisprites/items/battle/Power_Anklet.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Anklet.png rename to src/canonical/minisprites/items/battle/Power_Anklet.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Band.png b/src/canonical/minisprites/items/battle/Power_Band.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Band.png rename to src/canonical/minisprites/items/battle/Power_Band.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Belt.png b/src/canonical/minisprites/items/battle/Power_Belt.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Belt.png rename to src/canonical/minisprites/items/battle/Power_Belt.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Bracer.png b/src/canonical/minisprites/items/battle/Power_Bracer.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Bracer.png rename to src/canonical/minisprites/items/battle/Power_Bracer.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Herb.png b/src/canonical/minisprites/items/battle/Power_Herb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Herb.png rename to src/canonical/minisprites/items/battle/Power_Herb.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Lens.png b/src/canonical/minisprites/items/battle/Power_Lens.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Lens.png rename to src/canonical/minisprites/items/battle/Power_Lens.png diff --git a/src/canonical/minisprites/items/battle/Power_0020Weight.png b/src/canonical/minisprites/items/battle/Power_Weight.png similarity index 100% rename from src/canonical/minisprites/items/battle/Power_0020Weight.png rename to src/canonical/minisprites/items/battle/Power_Weight.png diff --git a/src/canonical/minisprites/items/battle/Primarium_0020Z.png b/src/canonical/minisprites/items/battle/Primarium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Primarium_0020Z.png rename to src/canonical/minisprites/items/battle/Primarium_Z.png diff --git a/src/canonical/minisprites/items/battle/Protective_0020Pads.png b/src/canonical/minisprites/items/battle/Protective_Pads.png similarity index 100% rename from src/canonical/minisprites/items/battle/Protective_0020Pads.png rename to src/canonical/minisprites/items/battle/Protective_Pads.png diff --git a/src/canonical/minisprites/items/battle/Psychic_0020Gem.png b/src/canonical/minisprites/items/battle/Psychic_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Psychic_0020Gem.png rename to src/canonical/minisprites/items/battle/Psychic_Gem.png diff --git a/src/canonical/minisprites/items/battle/Psychic_0020Memory.png b/src/canonical/minisprites/items/battle/Psychic_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Psychic_0020Memory.png rename to src/canonical/minisprites/items/battle/Psychic_Memory.png diff --git a/src/canonical/minisprites/items/battle/Psychic_0020Seed.png b/src/canonical/minisprites/items/battle/Psychic_Seed.png similarity index 100% rename from src/canonical/minisprites/items/battle/Psychic_0020Seed.png rename to src/canonical/minisprites/items/battle/Psychic_Seed.png diff --git a/src/canonical/minisprites/items/battle/Psychium_0020Z.png b/src/canonical/minisprites/items/battle/Psychium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Psychium_0020Z.png rename to src/canonical/minisprites/items/battle/Psychium_Z.png diff --git a/src/canonical/minisprites/items/battle/Qualot_0020Berry.png b/src/canonical/minisprites/items/battle/Qualot_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Qualot_0020Berry.png rename to src/canonical/minisprites/items/battle/Qualot_Berry.png diff --git a/src/canonical/minisprites/items/battle/Quick_0020Claw.png b/src/canonical/minisprites/items/battle/Quick_Claw.png similarity index 100% rename from src/canonical/minisprites/items/battle/Quick_0020Claw.png rename to src/canonical/minisprites/items/battle/Quick_Claw.png diff --git a/src/canonical/minisprites/items/battle/Quick_0020Powder.png b/src/canonical/minisprites/items/battle/Quick_Powder.png similarity index 100% rename from src/canonical/minisprites/items/battle/Quick_0020Powder.png rename to src/canonical/minisprites/items/battle/Quick_Powder.png diff --git a/src/canonical/minisprites/items/battle/Rabuta_0020Berry.png b/src/canonical/minisprites/items/battle/Rabuta_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rabuta_0020Berry.png rename to src/canonical/minisprites/items/battle/Rabuta_Berry.png diff --git a/src/canonical/minisprites/items/battle/Rawst_0020Berry.png b/src/canonical/minisprites/items/battle/Rawst_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rawst_0020Berry.png rename to src/canonical/minisprites/items/battle/Rawst_Berry.png diff --git a/src/canonical/minisprites/items/battle/Razor_0020Claw.png b/src/canonical/minisprites/items/battle/Razor_Claw.png similarity index 100% rename from src/canonical/minisprites/items/battle/Razor_0020Claw.png rename to src/canonical/minisprites/items/battle/Razor_Claw.png diff --git a/src/canonical/minisprites/items/battle/Razor_0020Fang.png b/src/canonical/minisprites/items/battle/Razor_Fang.png similarity index 100% rename from src/canonical/minisprites/items/battle/Razor_0020Fang.png rename to src/canonical/minisprites/items/battle/Razor_Fang.png diff --git a/src/canonical/minisprites/items/battle/Razz_0020Berry.png b/src/canonical/minisprites/items/battle/Razz_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Razz_0020Berry.png rename to src/canonical/minisprites/items/battle/Razz_Berry.png diff --git a/src/canonical/minisprites/items/battle/Red_0020Card.png b/src/canonical/minisprites/items/battle/Red_Card.png similarity index 100% rename from src/canonical/minisprites/items/battle/Red_0020Card.png rename to src/canonical/minisprites/items/battle/Red_Card.png diff --git a/src/canonical/minisprites/items/battle/Red_0020Orb.png b/src/canonical/minisprites/items/battle/Red_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Red_0020Orb.png rename to src/canonical/minisprites/items/battle/Red_Orb.png diff --git a/src/canonical/minisprites/items/battle/Rindo_0020Berry.png b/src/canonical/minisprites/items/battle/Rindo_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rindo_0020Berry.png rename to src/canonical/minisprites/items/battle/Rindo_Berry.png diff --git a/src/canonical/minisprites/items/battle/Ring_0020Target.png b/src/canonical/minisprites/items/battle/Ring_Target.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ring_0020Target.png rename to src/canonical/minisprites/items/battle/Ring_Target.png diff --git a/src/canonical/minisprites/items/battle/Rock_0020Gem.png b/src/canonical/minisprites/items/battle/Rock_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rock_0020Gem.png rename to src/canonical/minisprites/items/battle/Rock_Gem.png diff --git a/src/canonical/minisprites/items/battle/Rock_0020Incense.png b/src/canonical/minisprites/items/battle/Rock_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rock_0020Incense.png rename to src/canonical/minisprites/items/battle/Rock_Incense.png diff --git a/src/canonical/minisprites/items/battle/Rock_0020Memory.png b/src/canonical/minisprites/items/battle/Rock_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rock_0020Memory.png rename to src/canonical/minisprites/items/battle/Rock_Memory.png diff --git a/src/canonical/minisprites/items/battle/Rockium_0020Z.png b/src/canonical/minisprites/items/battle/Rockium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rockium_0020Z.png rename to src/canonical/minisprites/items/battle/Rockium_Z.png diff --git a/src/canonical/minisprites/items/battle/Rocky_0020Helmet.png b/src/canonical/minisprites/items/battle/Rocky_Helmet.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rocky_0020Helmet.png rename to src/canonical/minisprites/items/battle/Rocky_Helmet.png diff --git a/src/canonical/minisprites/items/battle/Room_0020Service.png b/src/canonical/minisprites/items/battle/Room_Service.png similarity index 100% rename from src/canonical/minisprites/items/battle/Room_0020Service.png rename to src/canonical/minisprites/items/battle/Room_Service.png diff --git a/src/canonical/minisprites/items/battle/Rose_0020Incense.png b/src/canonical/minisprites/items/battle/Rose_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rose_0020Incense.png rename to src/canonical/minisprites/items/battle/Rose_Incense.png diff --git a/src/canonical/minisprites/items/battle/Roseli_0020Berry.png b/src/canonical/minisprites/items/battle/Roseli_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Roseli_0020Berry.png rename to src/canonical/minisprites/items/battle/Roseli_Berry.png diff --git a/src/canonical/minisprites/items/battle/Rowap_0020Berry.png b/src/canonical/minisprites/items/battle/Rowap_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rowap_0020Berry.png rename to src/canonical/minisprites/items/battle/Rowap_Berry.png diff --git a/src/canonical/minisprites/items/battle/Rusted_0020Shield.png b/src/canonical/minisprites/items/battle/Rusted_Shield.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rusted_0020Shield.png rename to src/canonical/minisprites/items/battle/Rusted_Shield.png diff --git a/src/canonical/minisprites/items/battle/Rusted_0020Sword.png b/src/canonical/minisprites/items/battle/Rusted_Sword.png similarity index 100% rename from src/canonical/minisprites/items/battle/Rusted_0020Sword.png rename to src/canonical/minisprites/items/battle/Rusted_Sword.png diff --git a/src/canonical/minisprites/items/battle/Safety_0020Goggles.png b/src/canonical/minisprites/items/battle/Safety_Goggles.png similarity index 100% rename from src/canonical/minisprites/items/battle/Safety_0020Goggles.png rename to src/canonical/minisprites/items/battle/Safety_Goggles.png diff --git a/src/canonical/minisprites/items/battle/Salac_0020Berry.png b/src/canonical/minisprites/items/battle/Salac_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Salac_0020Berry.png rename to src/canonical/minisprites/items/battle/Salac_Berry.png diff --git a/src/canonical/minisprites/items/battle/Scope_0020Lens.png b/src/canonical/minisprites/items/battle/Scope_Lens.png similarity index 100% rename from src/canonical/minisprites/items/battle/Scope_0020Lens.png rename to src/canonical/minisprites/items/battle/Scope_Lens.png diff --git a/src/canonical/minisprites/items/battle/Sea_0020Incense.png b/src/canonical/minisprites/items/battle/Sea_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Sea_0020Incense.png rename to src/canonical/minisprites/items/battle/Sea_Incense.png diff --git a/src/canonical/minisprites/items/battle/Sharp_0020Beak.png b/src/canonical/minisprites/items/battle/Sharp_Beak.png similarity index 100% rename from src/canonical/minisprites/items/battle/Sharp_0020Beak.png rename to src/canonical/minisprites/items/battle/Sharp_Beak.png diff --git a/src/canonical/minisprites/items/battle/Shed_0020Shell.png b/src/canonical/minisprites/items/battle/Shed_Shell.png similarity index 100% rename from src/canonical/minisprites/items/battle/Shed_0020Shell.png rename to src/canonical/minisprites/items/battle/Shed_Shell.png diff --git a/src/canonical/minisprites/items/battle/Shell_0020Bell.png b/src/canonical/minisprites/items/battle/Shell_Bell.png similarity index 100% rename from src/canonical/minisprites/items/battle/Shell_0020Bell.png rename to src/canonical/minisprites/items/battle/Shell_Bell.png diff --git a/src/canonical/minisprites/items/battle/Shock_0020Drive.png b/src/canonical/minisprites/items/battle/Shock_Drive.png similarity index 100% rename from src/canonical/minisprites/items/battle/Shock_0020Drive.png rename to src/canonical/minisprites/items/battle/Shock_Drive.png diff --git a/src/canonical/minisprites/items/battle/Shuca_0020Berry.png b/src/canonical/minisprites/items/battle/Shuca_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Shuca_0020Berry.png rename to src/canonical/minisprites/items/battle/Shuca_Berry.png diff --git a/src/canonical/minisprites/items/battle/Silk_0020Scarf.png b/src/canonical/minisprites/items/battle/Silk_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/battle/Silk_0020Scarf.png rename to src/canonical/minisprites/items/battle/Silk_Scarf.png diff --git a/src/canonical/minisprites/items/battle/Silver_0020Powder.png b/src/canonical/minisprites/items/battle/Silver_Powder.png similarity index 100% rename from src/canonical/minisprites/items/battle/Silver_0020Powder.png rename to src/canonical/minisprites/items/battle/Silver_Powder.png diff --git a/src/canonical/minisprites/items/battle/Sitrus_0020Berry.png b/src/canonical/minisprites/items/battle/Sitrus_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Sitrus_0020Berry.png rename to src/canonical/minisprites/items/battle/Sitrus_Berry.png diff --git a/src/canonical/minisprites/items/battle/Sky_0020Plate.png b/src/canonical/minisprites/items/battle/Sky_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Sky_0020Plate.png rename to src/canonical/minisprites/items/battle/Sky_Plate.png diff --git a/src/canonical/minisprites/items/battle/Smooth_0020Rock.png b/src/canonical/minisprites/items/battle/Smooth_Rock.png similarity index 100% rename from src/canonical/minisprites/items/battle/Smooth_0020Rock.png rename to src/canonical/minisprites/items/battle/Smooth_Rock.png diff --git a/src/canonical/minisprites/items/battle/Snorlium_0020Z.png b/src/canonical/minisprites/items/battle/Snorlium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Snorlium_0020Z.png rename to src/canonical/minisprites/items/battle/Snorlium_Z.png diff --git a/src/canonical/minisprites/items/battle/Soft_0020Sand.png b/src/canonical/minisprites/items/battle/Soft_Sand.png similarity index 100% rename from src/canonical/minisprites/items/battle/Soft_0020Sand.png rename to src/canonical/minisprites/items/battle/Soft_Sand.png diff --git a/src/canonical/minisprites/items/battle/Solganium_0020Z.png b/src/canonical/minisprites/items/battle/Solganium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Solganium_0020Z.png rename to src/canonical/minisprites/items/battle/Solganium_Z.png diff --git a/src/canonical/minisprites/items/battle/Soul_0020Dew.png b/src/canonical/minisprites/items/battle/Soul_Dew.png similarity index 100% rename from src/canonical/minisprites/items/battle/Soul_0020Dew.png rename to src/canonical/minisprites/items/battle/Soul_Dew.png diff --git a/src/canonical/minisprites/items/battle/Spell_0020Tag.png b/src/canonical/minisprites/items/battle/Spell_Tag.png similarity index 100% rename from src/canonical/minisprites/items/battle/Spell_0020Tag.png rename to src/canonical/minisprites/items/battle/Spell_Tag.png diff --git a/src/canonical/minisprites/items/battle/Spelon_0020Berry.png b/src/canonical/minisprites/items/battle/Spelon_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Spelon_0020Berry.png rename to src/canonical/minisprites/items/battle/Spelon_Berry.png diff --git a/src/canonical/minisprites/items/battle/Splash_0020Plate.png b/src/canonical/minisprites/items/battle/Splash_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Splash_0020Plate.png rename to src/canonical/minisprites/items/battle/Splash_Plate.png diff --git a/src/canonical/minisprites/items/battle/Spooky_0020Plate.png b/src/canonical/minisprites/items/battle/Spooky_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Spooky_0020Plate.png rename to src/canonical/minisprites/items/battle/Spooky_Plate.png diff --git a/src/canonical/minisprites/items/battle/Starf_0020Berry.png b/src/canonical/minisprites/items/battle/Starf_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Starf_0020Berry.png rename to src/canonical/minisprites/items/battle/Starf_Berry.png diff --git a/src/canonical/minisprites/items/battle/Steel_0020Gem.png b/src/canonical/minisprites/items/battle/Steel_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Steel_0020Gem.png rename to src/canonical/minisprites/items/battle/Steel_Gem.png diff --git a/src/canonical/minisprites/items/battle/Steel_0020Mail.png b/src/canonical/minisprites/items/battle/Steel_Mail.png similarity index 100% rename from src/canonical/minisprites/items/battle/Steel_0020Mail.png rename to src/canonical/minisprites/items/battle/Steel_Mail.png diff --git a/src/canonical/minisprites/items/battle/Steel_0020Memory.png b/src/canonical/minisprites/items/battle/Steel_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Steel_0020Memory.png rename to src/canonical/minisprites/items/battle/Steel_Memory.png diff --git a/src/canonical/minisprites/items/battle/Steelium_0020Z.png b/src/canonical/minisprites/items/battle/Steelium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Steelium_0020Z.png rename to src/canonical/minisprites/items/battle/Steelium_Z.png diff --git a/src/canonical/minisprites/items/battle/Sticky_0020Barb.png b/src/canonical/minisprites/items/battle/Sticky_Barb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Sticky_0020Barb.png rename to src/canonical/minisprites/items/battle/Sticky_Barb.png diff --git a/src/canonical/minisprites/items/battle/Stone_0020Plate.png b/src/canonical/minisprites/items/battle/Stone_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Stone_0020Plate.png rename to src/canonical/minisprites/items/battle/Stone_Plate.png diff --git a/src/canonical/minisprites/items/battle/Tamato_0020Berry.png b/src/canonical/minisprites/items/battle/Tamato_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Tamato_0020Berry.png rename to src/canonical/minisprites/items/battle/Tamato_Berry.png diff --git a/src/canonical/minisprites/items/battle/Tanga_0020Berry.png b/src/canonical/minisprites/items/battle/Tanga_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Tanga_0020Berry.png rename to src/canonical/minisprites/items/battle/Tanga_Berry.png diff --git a/src/canonical/minisprites/items/battle/Tapunium_0020Z.png b/src/canonical/minisprites/items/battle/Tapunium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Tapunium_0020Z.png rename to src/canonical/minisprites/items/battle/Tapunium_Z.png diff --git a/src/canonical/minisprites/items/battle/Terrain_0020Extender.png b/src/canonical/minisprites/items/battle/Terrain_Extender.png similarity index 100% rename from src/canonical/minisprites/items/battle/Terrain_0020Extender.png rename to src/canonical/minisprites/items/battle/Terrain_Extender.png diff --git a/src/canonical/minisprites/items/battle/Thick_0020Club.png b/src/canonical/minisprites/items/battle/Thick_Club.png similarity index 100% rename from src/canonical/minisprites/items/battle/Thick_0020Club.png rename to src/canonical/minisprites/items/battle/Thick_Club.png diff --git a/src/canonical/minisprites/items/battle/Throat_0020Spray.png b/src/canonical/minisprites/items/battle/Throat_Spray.png similarity index 100% rename from src/canonical/minisprites/items/battle/Throat_0020Spray.png rename to src/canonical/minisprites/items/battle/Throat_Spray.png diff --git a/src/canonical/minisprites/items/battle/Toxic_0020Orb.png b/src/canonical/minisprites/items/battle/Toxic_Orb.png similarity index 100% rename from src/canonical/minisprites/items/battle/Toxic_0020Orb.png rename to src/canonical/minisprites/items/battle/Toxic_Orb.png diff --git a/src/canonical/minisprites/items/battle/Toxic_0020Plate.png b/src/canonical/minisprites/items/battle/Toxic_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Toxic_0020Plate.png rename to src/canonical/minisprites/items/battle/Toxic_Plate.png diff --git a/src/canonical/minisprites/items/battle/Twisted_0020Spoon.png b/src/canonical/minisprites/items/battle/Twisted_Spoon.png similarity index 100% rename from src/canonical/minisprites/items/battle/Twisted_0020Spoon.png rename to src/canonical/minisprites/items/battle/Twisted_Spoon.png diff --git a/src/canonical/minisprites/items/battle/Ultranecrozium_0020Z.png b/src/canonical/minisprites/items/battle/Ultranecrozium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Ultranecrozium_0020Z.png rename to src/canonical/minisprites/items/battle/Ultranecrozium_Z.png diff --git a/src/canonical/minisprites/items/battle/Utility_0020Umbrella.png b/src/canonical/minisprites/items/battle/Utility_Umbrella.png similarity index 100% rename from src/canonical/minisprites/items/battle/Utility_0020Umbrella.png rename to src/canonical/minisprites/items/battle/Utility_Umbrella.png diff --git a/src/canonical/minisprites/items/battle/Wacan_0020Berry.png b/src/canonical/minisprites/items/battle/Wacan_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wacan_0020Berry.png rename to src/canonical/minisprites/items/battle/Wacan_Berry.png diff --git a/src/canonical/minisprites/items/battle/Water_0020Gem.png b/src/canonical/minisprites/items/battle/Water_Gem.png similarity index 100% rename from src/canonical/minisprites/items/battle/Water_0020Gem.png rename to src/canonical/minisprites/items/battle/Water_Gem.png diff --git a/src/canonical/minisprites/items/battle/Water_0020Memory.png b/src/canonical/minisprites/items/battle/Water_Memory.png similarity index 100% rename from src/canonical/minisprites/items/battle/Water_0020Memory.png rename to src/canonical/minisprites/items/battle/Water_Memory.png diff --git a/src/canonical/minisprites/items/battle/Waterium_0020Z.png b/src/canonical/minisprites/items/battle/Waterium_Z.png similarity index 100% rename from src/canonical/minisprites/items/battle/Waterium_0020Z.png rename to src/canonical/minisprites/items/battle/Waterium_Z.png diff --git a/src/canonical/minisprites/items/battle/Watmel_0020Berry.png b/src/canonical/minisprites/items/battle/Watmel_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Watmel_0020Berry.png rename to src/canonical/minisprites/items/battle/Watmel_Berry.png diff --git a/src/canonical/minisprites/items/battle/Wave_0020Incense.png b/src/canonical/minisprites/items/battle/Wave_Incense.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wave_0020Incense.png rename to src/canonical/minisprites/items/battle/Wave_Incense.png diff --git a/src/canonical/minisprites/items/battle/Weakness_0020Policy.png b/src/canonical/minisprites/items/battle/Weakness_Policy.png similarity index 100% rename from src/canonical/minisprites/items/battle/Weakness_0020Policy.png rename to src/canonical/minisprites/items/battle/Weakness_Policy.png diff --git a/src/canonical/minisprites/items/battle/Wepear_0020Berry.png b/src/canonical/minisprites/items/battle/Wepear_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wepear_0020Berry.png rename to src/canonical/minisprites/items/battle/Wepear_Berry.png diff --git a/src/canonical/minisprites/items/battle/White_0020Herb.png b/src/canonical/minisprites/items/battle/White_Herb.png similarity index 100% rename from src/canonical/minisprites/items/battle/White_0020Herb.png rename to src/canonical/minisprites/items/battle/White_Herb.png diff --git a/src/canonical/minisprites/items/battle/Wide_0020Lens.png b/src/canonical/minisprites/items/battle/Wide_Lens.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wide_0020Lens.png rename to src/canonical/minisprites/items/battle/Wide_Lens.png diff --git a/src/canonical/minisprites/items/battle/Wiki_0020Berry.png b/src/canonical/minisprites/items/battle/Wiki_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wiki_0020Berry.png rename to src/canonical/minisprites/items/battle/Wiki_Berry.png diff --git a/src/canonical/minisprites/items/battle/Wise_0020Glasses.png b/src/canonical/minisprites/items/battle/Wise_Glasses.png similarity index 100% rename from src/canonical/minisprites/items/battle/Wise_0020Glasses.png rename to src/canonical/minisprites/items/battle/Wise_Glasses.png diff --git a/src/canonical/minisprites/items/battle/Yache_0020Berry.png b/src/canonical/minisprites/items/battle/Yache_Berry.png similarity index 100% rename from src/canonical/minisprites/items/battle/Yache_0020Berry.png rename to src/canonical/minisprites/items/battle/Yache_Berry.png diff --git a/src/canonical/minisprites/items/battle/Zap_0020Plate.png b/src/canonical/minisprites/items/battle/Zap_Plate.png similarity index 100% rename from src/canonical/minisprites/items/battle/Zap_0020Plate.png rename to src/canonical/minisprites/items/battle/Zap_Plate.png diff --git a/src/canonical/minisprites/items/battle/Zoom_0020Lens.png b/src/canonical/minisprites/items/battle/Zoom_Lens.png similarity index 100% rename from src/canonical/minisprites/items/battle/Zoom_0020Lens.png rename to src/canonical/minisprites/items/battle/Zoom_Lens.png diff --git a/src/canonical/minisprites/items/misc/No_0020Item.png b/src/canonical/minisprites/items/misc/No_Item.png similarity index 100% rename from src/canonical/minisprites/items/misc/No_0020Item.png rename to src/canonical/minisprites/items/misc/No_Item.png diff --git a/src/canonical/minisprites/items/nonbattle/Armor_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Armor_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Armor_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Armor_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Beast_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Beast_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Beast_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Beast_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Berry_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Berry_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Berry_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Berry_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Bottle_0020Cap.png b/src/canonical/minisprites/items/nonbattle/Bottle_Cap.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Bottle_0020Cap.png rename to src/canonical/minisprites/items/nonbattle/Bottle_Cap.png diff --git a/src/canonical/minisprites/items/nonbattle/Cherish_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Cherish_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Cherish_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Cherish_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Chipped_0020Pot.png b/src/canonical/minisprites/items/nonbattle/Chipped_Pot.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Chipped_0020Pot.png rename to src/canonical/minisprites/items/nonbattle/Chipped_Pot.png diff --git a/src/canonical/minisprites/items/nonbattle/Claw_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Claw_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Claw_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Claw_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Clover_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Clover_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Clover_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Clover_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Cover_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Cover_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Cover_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Cover_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Cracked_0020Pot.png b/src/canonical/minisprites/items/nonbattle/Cracked_Pot.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Cracked_0020Pot.png rename to src/canonical/minisprites/items/nonbattle/Cracked_Pot.png diff --git a/src/canonical/minisprites/items/nonbattle/Dawn_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Dawn_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dawn_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Dawn_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Dive_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Dive_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dive_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Dive_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Dome_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Dome_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dome_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Dome_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Dream_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Dream_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dream_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Dream_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Dubious_0020Disc.png b/src/canonical/minisprites/items/nonbattle/Dubious_Disc.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dubious_0020Disc.png rename to src/canonical/minisprites/items/nonbattle/Dubious_Disc.png diff --git a/src/canonical/minisprites/items/nonbattle/Dusk_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Dusk_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dusk_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Dusk_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Dusk_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Dusk_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Dusk_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Dusk_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Fast_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Fast_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fast_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Fast_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Fire_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Fire_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fire_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Fire_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Flower_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Flower_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Flower_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Flower_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Fossilized_0020Bird.png b/src/canonical/minisprites/items/nonbattle/Fossilized_Bird.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fossilized_0020Bird.png rename to src/canonical/minisprites/items/nonbattle/Fossilized_Bird.png diff --git a/src/canonical/minisprites/items/nonbattle/Fossilized_0020Dino.png b/src/canonical/minisprites/items/nonbattle/Fossilized_Dino.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fossilized_0020Dino.png rename to src/canonical/minisprites/items/nonbattle/Fossilized_Dino.png diff --git a/src/canonical/minisprites/items/nonbattle/Fossilized_0020Drake.png b/src/canonical/minisprites/items/nonbattle/Fossilized_Drake.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fossilized_0020Drake.png rename to src/canonical/minisprites/items/nonbattle/Fossilized_Drake.png diff --git a/src/canonical/minisprites/items/nonbattle/Fossilized_0020Fish.png b/src/canonical/minisprites/items/nonbattle/Fossilized_Fish.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Fossilized_0020Fish.png rename to src/canonical/minisprites/items/nonbattle/Fossilized_Fish.png diff --git a/src/canonical/minisprites/items/nonbattle/Friend_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Friend_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Friend_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Friend_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Gold_0020Bottle_0020Cap.png b/src/canonical/minisprites/items/nonbattle/Gold_Bottle_Cap.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Gold_0020Bottle_0020Cap.png rename to src/canonical/minisprites/items/nonbattle/Gold_Bottle_Cap.png diff --git a/src/canonical/minisprites/items/nonbattle/Great_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Great_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Great_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Great_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Heal_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Heal_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Heal_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Heal_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Heavy_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Heavy_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Heavy_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Heavy_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Helix_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Helix_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Helix_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Helix_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Ice_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Ice_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Ice_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Ice_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Jaw_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Jaw_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Jaw_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Jaw_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Leaf_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Leaf_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Leaf_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Leaf_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Level_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Level_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Level_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Level_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Love_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Love_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Love_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Love_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Love_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Love_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Love_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Love_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Lure_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Lure_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Lure_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Lure_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Luxury_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Luxury_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Luxury_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Luxury_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Master_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Master_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Master_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Master_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Moon_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Moon_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Moon_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Moon_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Moon_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Moon_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Moon_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Moon_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Old_0020Amber.png b/src/canonical/minisprites/items/nonbattle/Old_Amber.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Old_0020Amber.png rename to src/canonical/minisprites/items/nonbattle/Old_Amber.png diff --git a/src/canonical/minisprites/items/nonbattle/Park_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Park_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Park_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Park_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Plume_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Plume_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Plume_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Plume_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Poke_0301_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Poke__0301_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Poke_0301_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Poke__0301_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Premier_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Premier_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Premier_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Premier_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Prism_0020Scale.png b/src/canonical/minisprites/items/nonbattle/Prism_Scale.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Prism_0020Scale.png rename to src/canonical/minisprites/items/nonbattle/Prism_Scale.png diff --git a/src/canonical/minisprites/items/nonbattle/Quick_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Quick_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Quick_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Quick_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Rare_0020Bone.png b/src/canonical/minisprites/items/nonbattle/Rare_Bone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Rare_0020Bone.png rename to src/canonical/minisprites/items/nonbattle/Rare_Bone.png diff --git a/src/canonical/minisprites/items/nonbattle/Reaper_0020Cloth.png b/src/canonical/minisprites/items/nonbattle/Reaper_Cloth.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Reaper_0020Cloth.png rename to src/canonical/minisprites/items/nonbattle/Reaper_Cloth.png diff --git a/src/canonical/minisprites/items/nonbattle/Repeat_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Repeat_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Repeat_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Repeat_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Ribbon_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Ribbon_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Ribbon_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Ribbon_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Root_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Root_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Root_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Root_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Safari_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Safari_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Safari_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Safari_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Sail_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Sail_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Sail_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Sail_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Shiny_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Shiny_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Shiny_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Shiny_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Skull_0020Fossil.png b/src/canonical/minisprites/items/nonbattle/Skull_Fossil.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Skull_0020Fossil.png rename to src/canonical/minisprites/items/nonbattle/Skull_Fossil.png diff --git a/src/canonical/minisprites/items/nonbattle/Sport_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Sport_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Sport_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Sport_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Star_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Star_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Star_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Star_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Strawberry_0020Sweet.png b/src/canonical/minisprites/items/nonbattle/Strawberry_Sweet.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Strawberry_0020Sweet.png rename to src/canonical/minisprites/items/nonbattle/Strawberry_Sweet.png diff --git a/src/canonical/minisprites/items/nonbattle/Sun_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Sun_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Sun_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Sun_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Sweet_0020Apple.png b/src/canonical/minisprites/items/nonbattle/Sweet_Apple.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Sweet_0020Apple.png rename to src/canonical/minisprites/items/nonbattle/Sweet_Apple.png diff --git a/src/canonical/minisprites/items/nonbattle/Tart_0020Apple.png b/src/canonical/minisprites/items/nonbattle/Tart_Apple.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Tart_0020Apple.png rename to src/canonical/minisprites/items/nonbattle/Tart_Apple.png diff --git a/src/canonical/minisprites/items/nonbattle/Thunder_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Thunder_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Thunder_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Thunder_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Timer_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Timer_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Timer_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Timer_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Ultra_0020Ball.png b/src/canonical/minisprites/items/nonbattle/Ultra_Ball.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Ultra_0020Ball.png rename to src/canonical/minisprites/items/nonbattle/Ultra_Ball.png diff --git a/src/canonical/minisprites/items/nonbattle/Water_0020Stone.png b/src/canonical/minisprites/items/nonbattle/Water_Stone.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Water_0020Stone.png rename to src/canonical/minisprites/items/nonbattle/Water_Stone.png diff --git a/src/canonical/minisprites/items/nonbattle/Whipped_0020Dream.png b/src/canonical/minisprites/items/nonbattle/Whipped_Dream.png similarity index 100% rename from src/canonical/minisprites/items/nonbattle/Whipped_0020Dream.png rename to src/canonical/minisprites/items/nonbattle/Whipped_Dream.png diff --git a/src/canonical/minisprites/items/other/Ability_0020Urge.png b/src/canonical/minisprites/items/other/Ability_Urge.png similarity index 100% rename from src/canonical/minisprites/items/other/Ability_0020Urge.png rename to src/canonical/minisprites/items/other/Ability_Urge.png diff --git a/src/canonical/minisprites/items/other/Acro_0020Bike.png b/src/canonical/minisprites/items/other/Acro_Bike.png similarity index 100% rename from src/canonical/minisprites/items/other/Acro_0020Bike.png rename to src/canonical/minisprites/items/other/Acro_Bike.png diff --git a/src/canonical/minisprites/items/other/Air_0020Mail.png b/src/canonical/minisprites/items/other/Air_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Air_0020Mail.png rename to src/canonical/minisprites/items/other/Air_Mail.png diff --git a/src/canonical/minisprites/items/other/Amulet_0020Coin.png b/src/canonical/minisprites/items/other/Amulet_Coin.png similarity index 100% rename from src/canonical/minisprites/items/other/Amulet_0020Coin.png rename to src/canonical/minisprites/items/other/Amulet_Coin.png diff --git a/src/canonical/minisprites/items/other/Apricorn_0020Box.png b/src/canonical/minisprites/items/other/Apricorn_Box.png similarity index 100% rename from src/canonical/minisprites/items/other/Apricorn_0020Box.png rename to src/canonical/minisprites/items/other/Apricorn_Box.png diff --git a/src/canonical/minisprites/items/other/Aurora_0020Ticket.png b/src/canonical/minisprites/items/other/Aurora_Ticket.png similarity index 100% rename from src/canonical/minisprites/items/other/Aurora_0020Ticket.png rename to src/canonical/minisprites/items/other/Aurora_Ticket.png diff --git a/src/canonical/minisprites/items/other/Azure_0020Flute.png b/src/canonical/minisprites/items/other/Azure_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Azure_0020Flute.png rename to src/canonical/minisprites/items/other/Azure_Flute.png diff --git a/src/canonical/minisprites/items/other/Balm_0020Mushroom.png b/src/canonical/minisprites/items/other/Balm_Mushroom.png similarity index 100% rename from src/canonical/minisprites/items/other/Balm_0020Mushroom.png rename to src/canonical/minisprites/items/other/Balm_Mushroom.png diff --git a/src/canonical/minisprites/items/other/Basement_0020Key.png b/src/canonical/minisprites/items/other/Basement_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Basement_0020Key.png rename to src/canonical/minisprites/items/other/Basement_Key.png diff --git a/src/canonical/minisprites/items/other/Bead_0020Mail.png b/src/canonical/minisprites/items/other/Bead_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Bead_0020Mail.png rename to src/canonical/minisprites/items/other/Bead_Mail.png diff --git a/src/canonical/minisprites/items/other/Berry_0020Pots.png b/src/canonical/minisprites/items/other/Berry_Pots.png similarity index 100% rename from src/canonical/minisprites/items/other/Berry_0020Pots.png rename to src/canonical/minisprites/items/other/Berry_Pots.png diff --git a/src/canonical/minisprites/items/other/Berry_0020Pouch.png b/src/canonical/minisprites/items/other/Berry_Pouch.png similarity index 100% rename from src/canonical/minisprites/items/other/Berry_0020Pouch.png rename to src/canonical/minisprites/items/other/Berry_Pouch.png diff --git a/src/canonical/minisprites/items/other/Big_0020Mushroom.png b/src/canonical/minisprites/items/other/Big_Mushroom.png similarity index 100% rename from src/canonical/minisprites/items/other/Big_0020Mushroom.png rename to src/canonical/minisprites/items/other/Big_Mushroom.png diff --git a/src/canonical/minisprites/items/other/Big_0020Nugget.png b/src/canonical/minisprites/items/other/Big_Nugget.png similarity index 100% rename from src/canonical/minisprites/items/other/Big_0020Nugget.png rename to src/canonical/minisprites/items/other/Big_Nugget.png diff --git a/src/canonical/minisprites/items/other/Big_0020Pearl.png b/src/canonical/minisprites/items/other/Big_Pearl.png similarity index 100% rename from src/canonical/minisprites/items/other/Big_0020Pearl.png rename to src/canonical/minisprites/items/other/Big_Pearl.png diff --git a/src/canonical/minisprites/items/other/Bike_0020Voucher.png b/src/canonical/minisprites/items/other/Bike_Voucher.png similarity index 100% rename from src/canonical/minisprites/items/other/Bike_0020Voucher.png rename to src/canonical/minisprites/items/other/Bike_Voucher.png diff --git a/src/canonical/minisprites/items/other/Black_0020Apricorn.png b/src/canonical/minisprites/items/other/Black_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Black_0020Apricorn.png rename to src/canonical/minisprites/items/other/Black_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Black_0020Flute.png b/src/canonical/minisprites/items/other/Black_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Black_0020Flute.png rename to src/canonical/minisprites/items/other/Black_Flute.png diff --git a/src/canonical/minisprites/items/other/Bloom_0020Mail.png b/src/canonical/minisprites/items/other/Bloom_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Bloom_0020Mail.png rename to src/canonical/minisprites/items/other/Bloom_Mail.png diff --git a/src/canonical/minisprites/items/other/Blue_0020Apricorn.png b/src/canonical/minisprites/items/other/Blue_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Blue_0020Apricorn.png rename to src/canonical/minisprites/items/other/Blue_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Blue_0020Card.png b/src/canonical/minisprites/items/other/Blue_Card.png similarity index 100% rename from src/canonical/minisprites/items/other/Blue_0020Card.png rename to src/canonical/minisprites/items/other/Blue_Card.png diff --git a/src/canonical/minisprites/items/other/Blue_0020Flute.png b/src/canonical/minisprites/items/other/Blue_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Blue_0020Flute.png rename to src/canonical/minisprites/items/other/Blue_Flute.png diff --git a/src/canonical/minisprites/items/other/Blue_0020Scarf.png b/src/canonical/minisprites/items/other/Blue_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/other/Blue_0020Scarf.png rename to src/canonical/minisprites/items/other/Blue_Scarf.png diff --git a/src/canonical/minisprites/items/other/Blue_0020Shard.png b/src/canonical/minisprites/items/other/Blue_Shard.png similarity index 100% rename from src/canonical/minisprites/items/other/Blue_0020Shard.png rename to src/canonical/minisprites/items/other/Blue_Shard.png diff --git a/src/canonical/minisprites/items/other/Brick_0020Mail.png b/src/canonical/minisprites/items/other/Brick_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Brick_0020Mail.png rename to src/canonical/minisprites/items/other/Brick_Mail.png diff --git a/src/canonical/minisprites/items/other/BridgeMail_0020D.png b/src/canonical/minisprites/items/other/BridgeMail_D.png similarity index 100% rename from src/canonical/minisprites/items/other/BridgeMail_0020D.png rename to src/canonical/minisprites/items/other/BridgeMail_D.png diff --git a/src/canonical/minisprites/items/other/BridgeMail_0020M.png b/src/canonical/minisprites/items/other/BridgeMail_M.png similarity index 100% rename from src/canonical/minisprites/items/other/BridgeMail_0020M.png rename to src/canonical/minisprites/items/other/BridgeMail_M.png diff --git a/src/canonical/minisprites/items/other/BridgeMail_0020S.png b/src/canonical/minisprites/items/other/BridgeMail_S.png similarity index 100% rename from src/canonical/minisprites/items/other/BridgeMail_0020S.png rename to src/canonical/minisprites/items/other/BridgeMail_S.png diff --git a/src/canonical/minisprites/items/other/BridgeMail_0020T.png b/src/canonical/minisprites/items/other/BridgeMail_T.png similarity index 100% rename from src/canonical/minisprites/items/other/BridgeMail_0020T.png rename to src/canonical/minisprites/items/other/BridgeMail_T.png diff --git a/src/canonical/minisprites/items/other/BridgeMail_0020V.png b/src/canonical/minisprites/items/other/BridgeMail_V.png similarity index 100% rename from src/canonical/minisprites/items/other/BridgeMail_0020V.png rename to src/canonical/minisprites/items/other/BridgeMail_V.png diff --git a/src/canonical/minisprites/items/other/Bubble_0020Mail.png b/src/canonical/minisprites/items/other/Bubble_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Bubble_0020Mail.png rename to src/canonical/minisprites/items/other/Bubble_Mail.png diff --git a/src/canonical/minisprites/items/other/Burn_0020Heal.png b/src/canonical/minisprites/items/other/Burn_Heal.png similarity index 100% rename from src/canonical/minisprites/items/other/Burn_0020Heal.png rename to src/canonical/minisprites/items/other/Burn_Heal.png diff --git a/src/canonical/minisprites/items/other/Card_0020Key.png b/src/canonical/minisprites/items/other/Card_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Card_0020Key.png rename to src/canonical/minisprites/items/other/Card_Key.png diff --git a/src/canonical/minisprites/items/other/Cleanse_0020Tag.png b/src/canonical/minisprites/items/other/Cleanse_Tag.png similarity index 100% rename from src/canonical/minisprites/items/other/Cleanse_0020Tag.png rename to src/canonical/minisprites/items/other/Cleanse_Tag.png diff --git a/src/canonical/minisprites/items/other/Clear_0020Bell.png b/src/canonical/minisprites/items/other/Clear_Bell.png similarity index 100% rename from src/canonical/minisprites/items/other/Clear_0020Bell.png rename to src/canonical/minisprites/items/other/Clear_Bell.png diff --git a/src/canonical/minisprites/items/other/Clever_0020Wing.png b/src/canonical/minisprites/items/other/Clever_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Clever_0020Wing.png rename to src/canonical/minisprites/items/other/Clever_Wing.png diff --git a/src/canonical/minisprites/items/other/Coin_0020Case.png b/src/canonical/minisprites/items/other/Coin_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Coin_0020Case.png rename to src/canonical/minisprites/items/other/Coin_Case.png diff --git a/src/canonical/minisprites/items/other/Comet_0020Shard.png b/src/canonical/minisprites/items/other/Comet_Shard.png similarity index 100% rename from src/canonical/minisprites/items/other/Comet_0020Shard.png rename to src/canonical/minisprites/items/other/Comet_Shard.png diff --git a/src/canonical/minisprites/items/other/Contest_0020Pass.png b/src/canonical/minisprites/items/other/Contest_Pass.png similarity index 100% rename from src/canonical/minisprites/items/other/Contest_0020Pass.png rename to src/canonical/minisprites/items/other/Contest_Pass.png diff --git a/src/canonical/minisprites/items/other/Coupon_00201.png b/src/canonical/minisprites/items/other/Coupon_1.png similarity index 100% rename from src/canonical/minisprites/items/other/Coupon_00201.png rename to src/canonical/minisprites/items/other/Coupon_1.png diff --git a/src/canonical/minisprites/items/other/Coupon_00202.png b/src/canonical/minisprites/items/other/Coupon_2.png similarity index 100% rename from src/canonical/minisprites/items/other/Coupon_00202.png rename to src/canonical/minisprites/items/other/Coupon_2.png diff --git a/src/canonical/minisprites/items/other/Coupon_00203.png b/src/canonical/minisprites/items/other/Coupon_3.png similarity index 100% rename from src/canonical/minisprites/items/other/Coupon_00203.png rename to src/canonical/minisprites/items/other/Coupon_3.png diff --git a/src/canonical/minisprites/items/other/Damp_0020Mulch.png b/src/canonical/minisprites/items/other/Damp_Mulch.png similarity index 100% rename from src/canonical/minisprites/items/other/Damp_0020Mulch.png rename to src/canonical/minisprites/items/other/Damp_Mulch.png diff --git a/src/canonical/minisprites/items/other/Dark_0020Stone.png b/src/canonical/minisprites/items/other/Dark_Stone.png similarity index 100% rename from src/canonical/minisprites/items/other/Dark_0020Stone.png rename to src/canonical/minisprites/items/other/Dark_Stone.png diff --git a/src/canonical/minisprites/items/other/Data_0020Card.png b/src/canonical/minisprites/items/other/Data_Card.png similarity index 100% rename from src/canonical/minisprites/items/other/Data_0020Card.png rename to src/canonical/minisprites/items/other/Data_Card.png diff --git a/src/canonical/minisprites/items/other/Devon_0020Goods.png b/src/canonical/minisprites/items/other/Devon_Goods.png similarity index 100% rename from src/canonical/minisprites/items/other/Devon_0020Goods.png rename to src/canonical/minisprites/items/other/Devon_Goods.png diff --git a/src/canonical/minisprites/items/other/Devon_0020Scope.png b/src/canonical/minisprites/items/other/Devon_Scope.png similarity index 100% rename from src/canonical/minisprites/items/other/Devon_0020Scope.png rename to src/canonical/minisprites/items/other/Devon_Scope.png diff --git a/src/canonical/minisprites/items/other/Dire_0020Hit.png b/src/canonical/minisprites/items/other/Dire_Hit.png similarity index 100% rename from src/canonical/minisprites/items/other/Dire_0020Hit.png rename to src/canonical/minisprites/items/other/Dire_Hit.png diff --git a/src/canonical/minisprites/items/other/Dire_0020Hit_00202.png b/src/canonical/minisprites/items/other/Dire_Hit_2.png similarity index 100% rename from src/canonical/minisprites/items/other/Dire_0020Hit_00202.png rename to src/canonical/minisprites/items/other/Dire_Hit_2.png diff --git a/src/canonical/minisprites/items/other/Dire_0020Hit_00203.png b/src/canonical/minisprites/items/other/Dire_Hit_3.png similarity index 100% rename from src/canonical/minisprites/items/other/Dire_0020Hit_00203.png rename to src/canonical/minisprites/items/other/Dire_Hit_3.png diff --git a/src/canonical/minisprites/items/other/Dowsing_0020Machine.png b/src/canonical/minisprites/items/other/Dowsing_Machine.png similarity index 100% rename from src/canonical/minisprites/items/other/Dowsing_0020Machine.png rename to src/canonical/minisprites/items/other/Dowsing_Machine.png diff --git a/src/canonical/minisprites/items/other/Dragon_0020Skull.png b/src/canonical/minisprites/items/other/Dragon_Skull.png similarity index 100% rename from src/canonical/minisprites/items/other/Dragon_0020Skull.png rename to src/canonical/minisprites/items/other/Dragon_Skull.png diff --git a/src/canonical/minisprites/items/other/Dream_0020Mail.png b/src/canonical/minisprites/items/other/Dream_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Dream_0020Mail.png rename to src/canonical/minisprites/items/other/Dream_Mail.png diff --git a/src/canonical/minisprites/items/other/Energy_0020Powder.png b/src/canonical/minisprites/items/other/Energy_Powder.png similarity index 100% rename from src/canonical/minisprites/items/other/Energy_0020Powder.png rename to src/canonical/minisprites/items/other/Energy_Powder.png diff --git a/src/canonical/minisprites/items/other/Energy_0020Root.png b/src/canonical/minisprites/items/other/Energy_Root.png similarity index 100% rename from src/canonical/minisprites/items/other/Energy_0020Root.png rename to src/canonical/minisprites/items/other/Energy_Root.png diff --git a/src/canonical/minisprites/items/other/Enigma_0020Stone.png b/src/canonical/minisprites/items/other/Enigma_Stone.png similarity index 100% rename from src/canonical/minisprites/items/other/Enigma_0020Stone.png rename to src/canonical/minisprites/items/other/Enigma_Stone.png diff --git a/src/canonical/minisprites/items/other/Eon_0020Ticket.png b/src/canonical/minisprites/items/other/Eon_Ticket.png similarity index 100% rename from src/canonical/minisprites/items/other/Eon_0020Ticket.png rename to src/canonical/minisprites/items/other/Eon_Ticket.png diff --git a/src/canonical/minisprites/items/other/Escape_0020Rope.png b/src/canonical/minisprites/items/other/Escape_Rope.png similarity index 100% rename from src/canonical/minisprites/items/other/Escape_0020Rope.png rename to src/canonical/minisprites/items/other/Escape_Rope.png diff --git a/src/canonical/minisprites/items/other/Exp._0020Share.png b/src/canonical/minisprites/items/other/Exp._Share.png similarity index 100% rename from src/canonical/minisprites/items/other/Exp._0020Share.png rename to src/canonical/minisprites/items/other/Exp._Share.png diff --git a/src/canonical/minisprites/items/other/Explorer_0020Kit.png b/src/canonical/minisprites/items/other/Explorer_Kit.png similarity index 100% rename from src/canonical/minisprites/items/other/Explorer_0020Kit.png rename to src/canonical/minisprites/items/other/Explorer_Kit.png diff --git a/src/canonical/minisprites/items/other/Fab_0020Mail.png b/src/canonical/minisprites/items/other/Fab_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Fab_0020Mail.png rename to src/canonical/minisprites/items/other/Fab_Mail.png diff --git a/src/canonical/minisprites/items/other/Fame_0020Checker.png b/src/canonical/minisprites/items/other/Fame_Checker.png similarity index 100% rename from src/canonical/minisprites/items/other/Fame_0020Checker.png rename to src/canonical/minisprites/items/other/Fame_Checker.png diff --git a/src/canonical/minisprites/items/other/Fashion_0020Case.png b/src/canonical/minisprites/items/other/Fashion_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Fashion_0020Case.png rename to src/canonical/minisprites/items/other/Fashion_Case.png diff --git a/src/canonical/minisprites/items/other/Favored_0020Mail.png b/src/canonical/minisprites/items/other/Favored_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Favored_0020Mail.png rename to src/canonical/minisprites/items/other/Favored_Mail.png diff --git a/src/canonical/minisprites/items/other/Flame_0020Mail.png b/src/canonical/minisprites/items/other/Flame_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Flame_0020Mail.png rename to src/canonical/minisprites/items/other/Flame_Mail.png diff --git a/src/canonical/minisprites/items/other/Fluffy_0020Tail.png b/src/canonical/minisprites/items/other/Fluffy_Tail.png similarity index 100% rename from src/canonical/minisprites/items/other/Fluffy_0020Tail.png rename to src/canonical/minisprites/items/other/Fluffy_Tail.png diff --git a/src/canonical/minisprites/items/other/Fresh_0020Water.png b/src/canonical/minisprites/items/other/Fresh_Water.png similarity index 100% rename from src/canonical/minisprites/items/other/Fresh_0020Water.png rename to src/canonical/minisprites/items/other/Fresh_Water.png diff --git a/src/canonical/minisprites/items/other/Full_0020Heal.png b/src/canonical/minisprites/items/other/Full_Heal.png similarity index 100% rename from src/canonical/minisprites/items/other/Full_0020Heal.png rename to src/canonical/minisprites/items/other/Full_Heal.png diff --git a/src/canonical/minisprites/items/other/Full_0020Restore.png b/src/canonical/minisprites/items/other/Full_Restore.png similarity index 100% rename from src/canonical/minisprites/items/other/Full_0020Restore.png rename to src/canonical/minisprites/items/other/Full_Restore.png diff --git a/src/canonical/minisprites/items/other/GB_0020Sounds.png b/src/canonical/minisprites/items/other/GB_Sounds.png similarity index 100% rename from src/canonical/minisprites/items/other/GB_0020Sounds.png rename to src/canonical/minisprites/items/other/GB_Sounds.png diff --git a/src/canonical/minisprites/items/other/Galactic_0020Key.png b/src/canonical/minisprites/items/other/Galactic_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Galactic_0020Key.png rename to src/canonical/minisprites/items/other/Galactic_Key.png diff --git a/src/canonical/minisprites/items/other/Genius_0020Wing.png b/src/canonical/minisprites/items/other/Genius_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Genius_0020Wing.png rename to src/canonical/minisprites/items/other/Genius_Wing.png diff --git a/src/canonical/minisprites/items/other/Glitter_0020Mail.png b/src/canonical/minisprites/items/other/Glitter_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Glitter_0020Mail.png rename to src/canonical/minisprites/items/other/Glitter_Mail.png diff --git a/src/canonical/minisprites/items/other/God_0020Stone.png b/src/canonical/minisprites/items/other/God_Stone.png similarity index 100% rename from src/canonical/minisprites/items/other/God_0020Stone.png rename to src/canonical/minisprites/items/other/God_Stone.png diff --git a/src/canonical/minisprites/items/other/Gold_0020Teeth.png b/src/canonical/minisprites/items/other/Gold_Teeth.png similarity index 100% rename from src/canonical/minisprites/items/other/Gold_0020Teeth.png rename to src/canonical/minisprites/items/other/Gold_Teeth.png diff --git a/src/canonical/minisprites/items/other/Good_0020Rod.png b/src/canonical/minisprites/items/other/Good_Rod.png similarity index 100% rename from src/canonical/minisprites/items/other/Good_0020Rod.png rename to src/canonical/minisprites/items/other/Good_Rod.png diff --git a/src/canonical/minisprites/items/other/Gooey_0020Mulch.png b/src/canonical/minisprites/items/other/Gooey_Mulch.png similarity index 100% rename from src/canonical/minisprites/items/other/Gooey_0020Mulch.png rename to src/canonical/minisprites/items/other/Gooey_Mulch.png diff --git a/src/canonical/minisprites/items/other/Gram_00201.png b/src/canonical/minisprites/items/other/Gram_1.png similarity index 100% rename from src/canonical/minisprites/items/other/Gram_00201.png rename to src/canonical/minisprites/items/other/Gram_1.png diff --git a/src/canonical/minisprites/items/other/Gram_00202.png b/src/canonical/minisprites/items/other/Gram_2.png similarity index 100% rename from src/canonical/minisprites/items/other/Gram_00202.png rename to src/canonical/minisprites/items/other/Gram_2.png diff --git a/src/canonical/minisprites/items/other/Gram_00203.png b/src/canonical/minisprites/items/other/Gram_3.png similarity index 100% rename from src/canonical/minisprites/items/other/Gram_00203.png rename to src/canonical/minisprites/items/other/Gram_3.png diff --git a/src/canonical/minisprites/items/other/Grass_0020Mail.png b/src/canonical/minisprites/items/other/Grass_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Grass_0020Mail.png rename to src/canonical/minisprites/items/other/Grass_Mail.png diff --git a/src/canonical/minisprites/items/other/Green_0020Apricorn.png b/src/canonical/minisprites/items/other/Green_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Green_0020Apricorn.png rename to src/canonical/minisprites/items/other/Green_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Green_0020Scarf.png b/src/canonical/minisprites/items/other/Green_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/other/Green_0020Scarf.png rename to src/canonical/minisprites/items/other/Green_Scarf.png diff --git a/src/canonical/minisprites/items/other/Green_0020Shard.png b/src/canonical/minisprites/items/other/Green_Shard.png similarity index 100% rename from src/canonical/minisprites/items/other/Green_0020Shard.png rename to src/canonical/minisprites/items/other/Green_Shard.png diff --git a/src/canonical/minisprites/items/other/Greet_0020Mail.png b/src/canonical/minisprites/items/other/Greet_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Greet_0020Mail.png rename to src/canonical/minisprites/items/other/Greet_Mail.png diff --git a/src/canonical/minisprites/items/other/Growth_0020Mulch.png b/src/canonical/minisprites/items/other/Growth_Mulch.png similarity index 100% rename from src/canonical/minisprites/items/other/Growth_0020Mulch.png rename to src/canonical/minisprites/items/other/Growth_Mulch.png diff --git a/src/canonical/minisprites/items/other/Guard_0020Spec..png b/src/canonical/minisprites/items/other/Guard_Spec..png similarity index 100% rename from src/canonical/minisprites/items/other/Guard_0020Spec..png rename to src/canonical/minisprites/items/other/Guard_Spec..png diff --git a/src/canonical/minisprites/items/other/HP_0020Up.png b/src/canonical/minisprites/items/other/HP_Up.png similarity index 100% rename from src/canonical/minisprites/items/other/HP_0020Up.png rename to src/canonical/minisprites/items/other/HP_Up.png diff --git a/src/canonical/minisprites/items/other/Harbor_0020Mail.png b/src/canonical/minisprites/items/other/Harbor_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Harbor_0020Mail.png rename to src/canonical/minisprites/items/other/Harbor_Mail.png diff --git a/src/canonical/minisprites/items/other/Heal_0020Powder.png b/src/canonical/minisprites/items/other/Heal_Powder.png similarity index 100% rename from src/canonical/minisprites/items/other/Heal_0020Powder.png rename to src/canonical/minisprites/items/other/Heal_Powder.png diff --git a/src/canonical/minisprites/items/other/Health_0020Wing.png b/src/canonical/minisprites/items/other/Health_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Health_0020Wing.png rename to src/canonical/minisprites/items/other/Health_Wing.png diff --git a/src/canonical/minisprites/items/other/Heart_0020Mail.png b/src/canonical/minisprites/items/other/Heart_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Heart_0020Mail.png rename to src/canonical/minisprites/items/other/Heart_Mail.png diff --git a/src/canonical/minisprites/items/other/Heart_0020Scale.png b/src/canonical/minisprites/items/other/Heart_Scale.png similarity index 100% rename from src/canonical/minisprites/items/other/Heart_0020Scale.png rename to src/canonical/minisprites/items/other/Heart_Scale.png diff --git a/src/canonical/minisprites/items/other/Hyper_0020Potion.png b/src/canonical/minisprites/items/other/Hyper_Potion.png similarity index 100% rename from src/canonical/minisprites/items/other/Hyper_0020Potion.png rename to src/canonical/minisprites/items/other/Hyper_Potion.png diff --git a/src/canonical/minisprites/items/other/Ice_0020Heal.png b/src/canonical/minisprites/items/other/Ice_Heal.png similarity index 100% rename from src/canonical/minisprites/items/other/Ice_0020Heal.png rename to src/canonical/minisprites/items/other/Ice_Heal.png diff --git a/src/canonical/minisprites/items/other/Inquiry_0020Mail.png b/src/canonical/minisprites/items/other/Inquiry_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Inquiry_0020Mail.png rename to src/canonical/minisprites/items/other/Inquiry_Mail.png diff --git a/src/canonical/minisprites/items/other/Item_0020Drop.png b/src/canonical/minisprites/items/other/Item_Drop.png similarity index 100% rename from src/canonical/minisprites/items/other/Item_0020Drop.png rename to src/canonical/minisprites/items/other/Item_Drop.png diff --git a/src/canonical/minisprites/items/other/Item_0020Urge.png b/src/canonical/minisprites/items/other/Item_Urge.png similarity index 100% rename from src/canonical/minisprites/items/other/Item_0020Urge.png rename to src/canonical/minisprites/items/other/Item_Urge.png diff --git a/src/canonical/minisprites/items/other/Jade_0020Orb.png b/src/canonical/minisprites/items/other/Jade_Orb.png similarity index 100% rename from src/canonical/minisprites/items/other/Jade_0020Orb.png rename to src/canonical/minisprites/items/other/Jade_Orb.png diff --git a/src/canonical/minisprites/items/other/Key_0020to_0020Room_00201.png b/src/canonical/minisprites/items/other/Key_to_Room_1.png similarity index 100% rename from src/canonical/minisprites/items/other/Key_0020to_0020Room_00201.png rename to src/canonical/minisprites/items/other/Key_to_Room_1.png diff --git a/src/canonical/minisprites/items/other/Key_0020to_0020Room_00202.png b/src/canonical/minisprites/items/other/Key_to_Room_2.png similarity index 100% rename from src/canonical/minisprites/items/other/Key_0020to_0020Room_00202.png rename to src/canonical/minisprites/items/other/Key_to_Room_2.png diff --git a/src/canonical/minisprites/items/other/Key_0020to_0020Room_00204.png b/src/canonical/minisprites/items/other/Key_to_Room_4.png similarity index 100% rename from src/canonical/minisprites/items/other/Key_0020to_0020Room_00204.png rename to src/canonical/minisprites/items/other/Key_to_Room_4.png diff --git a/src/canonical/minisprites/items/other/Key_0020to_0020Room_00206.png b/src/canonical/minisprites/items/other/Key_to_Room_6.png similarity index 100% rename from src/canonical/minisprites/items/other/Key_0020to_0020Room_00206.png rename to src/canonical/minisprites/items/other/Key_to_Room_6.png diff --git a/src/canonical/minisprites/items/other/Lava_0020Cookie.png b/src/canonical/minisprites/items/other/Lava_Cookie.png similarity index 100% rename from src/canonical/minisprites/items/other/Lava_0020Cookie.png rename to src/canonical/minisprites/items/other/Lava_Cookie.png diff --git a/src/canonical/minisprites/items/other/Liberty_0020Pass.png b/src/canonical/minisprites/items/other/Liberty_Pass.png similarity index 100% rename from src/canonical/minisprites/items/other/Liberty_0020Pass.png rename to src/canonical/minisprites/items/other/Liberty_Pass.png diff --git a/src/canonical/minisprites/items/other/Lift_0020Key.png b/src/canonical/minisprites/items/other/Lift_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Lift_0020Key.png rename to src/canonical/minisprites/items/other/Lift_Key.png diff --git a/src/canonical/minisprites/items/other/Light_0020Stone.png b/src/canonical/minisprites/items/other/Light_Stone.png similarity index 100% rename from src/canonical/minisprites/items/other/Light_0020Stone.png rename to src/canonical/minisprites/items/other/Light_Stone.png diff --git a/src/canonical/minisprites/items/other/Like_0020Mail.png b/src/canonical/minisprites/items/other/Like_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Like_0020Mail.png rename to src/canonical/minisprites/items/other/Like_Mail.png diff --git a/src/canonical/minisprites/items/other/Lock_0020Capsule.png b/src/canonical/minisprites/items/other/Lock_Capsule.png similarity index 100% rename from src/canonical/minisprites/items/other/Lock_0020Capsule.png rename to src/canonical/minisprites/items/other/Lock_Capsule.png diff --git a/src/canonical/minisprites/items/other/Loot_0020Sack.png b/src/canonical/minisprites/items/other/Loot_Sack.png similarity index 100% rename from src/canonical/minisprites/items/other/Loot_0020Sack.png rename to src/canonical/minisprites/items/other/Loot_Sack.png diff --git a/src/canonical/minisprites/items/other/Lost_0020Item.png b/src/canonical/minisprites/items/other/Lost_Item.png similarity index 100% rename from src/canonical/minisprites/items/other/Lost_0020Item.png rename to src/canonical/minisprites/items/other/Lost_Item.png diff --git a/src/canonical/minisprites/items/other/Lucky_0020Egg.png b/src/canonical/minisprites/items/other/Lucky_Egg.png similarity index 100% rename from src/canonical/minisprites/items/other/Lucky_0020Egg.png rename to src/canonical/minisprites/items/other/Lucky_Egg.png diff --git a/src/canonical/minisprites/items/other/Lunar_0020Wing.png b/src/canonical/minisprites/items/other/Lunar_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Lunar_0020Wing.png rename to src/canonical/minisprites/items/other/Lunar_Wing.png diff --git a/src/canonical/minisprites/items/other/Mach_0020Bike.png b/src/canonical/minisprites/items/other/Mach_Bike.png similarity index 100% rename from src/canonical/minisprites/items/other/Mach_0020Bike.png rename to src/canonical/minisprites/items/other/Mach_Bike.png diff --git a/src/canonical/minisprites/items/other/Machine_0020Part.png b/src/canonical/minisprites/items/other/Machine_Part.png similarity index 100% rename from src/canonical/minisprites/items/other/Machine_0020Part.png rename to src/canonical/minisprites/items/other/Machine_Part.png diff --git a/src/canonical/minisprites/items/other/Magma_0020Emblem.png b/src/canonical/minisprites/items/other/Magma_Emblem.png similarity index 100% rename from src/canonical/minisprites/items/other/Magma_0020Emblem.png rename to src/canonical/minisprites/items/other/Magma_Emblem.png diff --git a/src/canonical/minisprites/items/other/Magma_0020Stone.png b/src/canonical/minisprites/items/other/Magma_Stone.png similarity index 100% rename from src/canonical/minisprites/items/other/Magma_0020Stone.png rename to src/canonical/minisprites/items/other/Magma_Stone.png diff --git a/src/canonical/minisprites/items/other/Max_0020Elixir.png b/src/canonical/minisprites/items/other/Max_Elixir.png similarity index 100% rename from src/canonical/minisprites/items/other/Max_0020Elixir.png rename to src/canonical/minisprites/items/other/Max_Elixir.png diff --git a/src/canonical/minisprites/items/other/Max_0020Ether.png b/src/canonical/minisprites/items/other/Max_Ether.png similarity index 100% rename from src/canonical/minisprites/items/other/Max_0020Ether.png rename to src/canonical/minisprites/items/other/Max_Ether.png diff --git a/src/canonical/minisprites/items/other/Max_0020Potion.png b/src/canonical/minisprites/items/other/Max_Potion.png similarity index 100% rename from src/canonical/minisprites/items/other/Max_0020Potion.png rename to src/canonical/minisprites/items/other/Max_Potion.png diff --git a/src/canonical/minisprites/items/other/Max_0020Repel.png b/src/canonical/minisprites/items/other/Max_Repel.png similarity index 100% rename from src/canonical/minisprites/items/other/Max_0020Repel.png rename to src/canonical/minisprites/items/other/Max_Repel.png diff --git a/src/canonical/minisprites/items/other/Max_0020Revive.png b/src/canonical/minisprites/items/other/Max_Revive.png similarity index 100% rename from src/canonical/minisprites/items/other/Max_0020Revive.png rename to src/canonical/minisprites/items/other/Max_Revive.png diff --git a/src/canonical/minisprites/items/other/Mech_0020Mail.png b/src/canonical/minisprites/items/other/Mech_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Mech_0020Mail.png rename to src/canonical/minisprites/items/other/Mech_Mail.png diff --git a/src/canonical/minisprites/items/other/Member_0020Card.png b/src/canonical/minisprites/items/other/Member_Card.png similarity index 100% rename from src/canonical/minisprites/items/other/Member_0020Card.png rename to src/canonical/minisprites/items/other/Member_Card.png diff --git a/src/canonical/minisprites/items/other/Moomoo_0020Milk.png b/src/canonical/minisprites/items/other/Moomoo_Milk.png similarity index 100% rename from src/canonical/minisprites/items/other/Moomoo_0020Milk.png rename to src/canonical/minisprites/items/other/Moomoo_Milk.png diff --git a/src/canonical/minisprites/items/other/Mosaic_0020Mail.png b/src/canonical/minisprites/items/other/Mosaic_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Mosaic_0020Mail.png rename to src/canonical/minisprites/items/other/Mosaic_Mail.png diff --git a/src/canonical/minisprites/items/other/Muscle_0020Wing.png b/src/canonical/minisprites/items/other/Muscle_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Muscle_0020Wing.png rename to src/canonical/minisprites/items/other/Muscle_Wing.png diff --git a/src/canonical/minisprites/items/other/Mystery_0020Egg.png b/src/canonical/minisprites/items/other/Mystery_Egg.png similarity index 100% rename from src/canonical/minisprites/items/other/Mystery_0020Egg.png rename to src/canonical/minisprites/items/other/Mystery_Egg.png diff --git a/src/canonical/minisprites/items/other/Mystic_0020Ticket.png b/src/canonical/minisprites/items/other/Mystic_Ticket.png similarity index 100% rename from src/canonical/minisprites/items/other/Mystic_0020Ticket.png rename to src/canonical/minisprites/items/other/Mystic_Ticket.png diff --git a/src/canonical/minisprites/items/other/Oak_0027s_0020Letter.png b/src/canonical/minisprites/items/other/Oak__0027s_Letter.png similarity index 100% rename from src/canonical/minisprites/items/other/Oak_0027s_0020Letter.png rename to src/canonical/minisprites/items/other/Oak__0027s_Letter.png diff --git a/src/canonical/minisprites/items/other/Oak_0027s_0020Parcel.png b/src/canonical/minisprites/items/other/Oak__0027s_Parcel.png similarity index 100% rename from src/canonical/minisprites/items/other/Oak_0027s_0020Parcel.png rename to src/canonical/minisprites/items/other/Oak__0027s_Parcel.png diff --git a/src/canonical/minisprites/items/other/Odd_0020Keystone.png b/src/canonical/minisprites/items/other/Odd_Keystone.png similarity index 100% rename from src/canonical/minisprites/items/other/Odd_0020Keystone.png rename to src/canonical/minisprites/items/other/Odd_Keystone.png diff --git a/src/canonical/minisprites/items/other/Old_0020Charm.png b/src/canonical/minisprites/items/other/Old_Charm.png similarity index 100% rename from src/canonical/minisprites/items/other/Old_0020Charm.png rename to src/canonical/minisprites/items/other/Old_Charm.png diff --git a/src/canonical/minisprites/items/other/Old_0020Gateau.png b/src/canonical/minisprites/items/other/Old_Gateau.png similarity index 100% rename from src/canonical/minisprites/items/other/Old_0020Gateau.png rename to src/canonical/minisprites/items/other/Old_Gateau.png diff --git a/src/canonical/minisprites/items/other/Old_0020Rod.png b/src/canonical/minisprites/items/other/Old_Rod.png similarity index 100% rename from src/canonical/minisprites/items/other/Old_0020Rod.png rename to src/canonical/minisprites/items/other/Old_Rod.png diff --git a/src/canonical/minisprites/items/other/Old_0020Sea_0020Map.png b/src/canonical/minisprites/items/other/Old_Sea_Map.png similarity index 100% rename from src/canonical/minisprites/items/other/Old_0020Sea_0020Map.png rename to src/canonical/minisprites/items/other/Old_Sea_Map.png diff --git a/src/canonical/minisprites/items/other/Orange_0020Mail.png b/src/canonical/minisprites/items/other/Orange_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Orange_0020Mail.png rename to src/canonical/minisprites/items/other/Orange_Mail.png diff --git a/src/canonical/minisprites/items/other/PP_0020Max.png b/src/canonical/minisprites/items/other/PP_Max.png similarity index 100% rename from src/canonical/minisprites/items/other/PP_0020Max.png rename to src/canonical/minisprites/items/other/PP_Max.png diff --git a/src/canonical/minisprites/items/other/PP_0020Up.png b/src/canonical/minisprites/items/other/PP_Up.png similarity index 100% rename from src/canonical/minisprites/items/other/PP_0020Up.png rename to src/canonical/minisprites/items/other/PP_Up.png diff --git a/src/canonical/minisprites/items/other/Pal_0020Pad.png b/src/canonical/minisprites/items/other/Pal_Pad.png similarity index 100% rename from src/canonical/minisprites/items/other/Pal_0020Pad.png rename to src/canonical/minisprites/items/other/Pal_Pad.png diff --git a/src/canonical/minisprites/items/other/Paralyze_0020Heal.png b/src/canonical/minisprites/items/other/Paralyze_Heal.png similarity index 100% rename from src/canonical/minisprites/items/other/Paralyze_0020Heal.png rename to src/canonical/minisprites/items/other/Paralyze_Heal.png diff --git a/src/canonical/minisprites/items/other/Pass_0020Orb.png b/src/canonical/minisprites/items/other/Pass_Orb.png similarity index 100% rename from src/canonical/minisprites/items/other/Pass_0020Orb.png rename to src/canonical/minisprites/items/other/Pass_Orb.png diff --git a/src/canonical/minisprites/items/other/Pearl_0020String.png b/src/canonical/minisprites/items/other/Pearl_String.png similarity index 100% rename from src/canonical/minisprites/items/other/Pearl_0020String.png rename to src/canonical/minisprites/items/other/Pearl_String.png diff --git a/src/canonical/minisprites/items/other/Photo_0020Album.png b/src/canonical/minisprites/items/other/Photo_Album.png similarity index 100% rename from src/canonical/minisprites/items/other/Photo_0020Album.png rename to src/canonical/minisprites/items/other/Photo_Album.png diff --git a/src/canonical/minisprites/items/other/Pink_0020Apricorn.png b/src/canonical/minisprites/items/other/Pink_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Pink_0020Apricorn.png rename to src/canonical/minisprites/items/other/Pink_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Pink_0020Scarf.png b/src/canonical/minisprites/items/other/Pink_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/other/Pink_0020Scarf.png rename to src/canonical/minisprites/items/other/Pink_Scarf.png diff --git a/src/canonical/minisprites/items/other/Poffin_0020Case.png b/src/canonical/minisprites/items/other/Poffin_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Poffin_0020Case.png rename to src/canonical/minisprites/items/other/Poffin_Case.png diff --git a/src/canonical/minisprites/items/other/Point_0020Card.png b/src/canonical/minisprites/items/other/Point_Card.png similarity index 100% rename from src/canonical/minisprites/items/other/Point_0020Card.png rename to src/canonical/minisprites/items/other/Point_Card.png diff --git a/src/canonical/minisprites/items/other/Poke_0301_0020Doll.png b/src/canonical/minisprites/items/other/Poke__0301_Doll.png similarity index 100% rename from src/canonical/minisprites/items/other/Poke_0301_0020Doll.png rename to src/canonical/minisprites/items/other/Poke__0301_Doll.png diff --git a/src/canonical/minisprites/items/other/Poke_0301_0020Flute.png b/src/canonical/minisprites/items/other/Poke__0301_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Poke_0301_0020Flute.png rename to src/canonical/minisprites/items/other/Poke__0301_Flute.png diff --git a/src/canonical/minisprites/items/other/Poke_0301_0020Radar.png b/src/canonical/minisprites/items/other/Poke__0301_Radar.png similarity index 100% rename from src/canonical/minisprites/items/other/Poke_0301_0020Radar.png rename to src/canonical/minisprites/items/other/Poke__0301_Radar.png diff --git a/src/canonical/minisprites/items/other/Poke_0301_0020Toy.png b/src/canonical/minisprites/items/other/Poke__0301_Toy.png similarity index 100% rename from src/canonical/minisprites/items/other/Poke_0301_0020Toy.png rename to src/canonical/minisprites/items/other/Poke__0301_Toy.png diff --git a/src/canonical/minisprites/items/other/Poke_0301block_0020Case.png b/src/canonical/minisprites/items/other/Poke__0301block_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Poke_0301block_0020Case.png rename to src/canonical/minisprites/items/other/Poke__0301block_Case.png diff --git a/src/canonical/minisprites/items/other/Powder_0020Jar.png b/src/canonical/minisprites/items/other/Powder_Jar.png similarity index 100% rename from src/canonical/minisprites/items/other/Powder_0020Jar.png rename to src/canonical/minisprites/items/other/Powder_Jar.png diff --git a/src/canonical/minisprites/items/other/Pretty_0020Wing.png b/src/canonical/minisprites/items/other/Pretty_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Pretty_0020Wing.png rename to src/canonical/minisprites/items/other/Pretty_Wing.png diff --git a/src/canonical/minisprites/items/other/Prop_0020Case.png b/src/canonical/minisprites/items/other/Prop_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Prop_0020Case.png rename to src/canonical/minisprites/items/other/Prop_Case.png diff --git a/src/canonical/minisprites/items/other/Pure_0020Incense.png b/src/canonical/minisprites/items/other/Pure_Incense.png similarity index 100% rename from src/canonical/minisprites/items/other/Pure_0020Incense.png rename to src/canonical/minisprites/items/other/Pure_Incense.png diff --git a/src/canonical/minisprites/items/other/RSVP_0020Mail.png b/src/canonical/minisprites/items/other/RSVP_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/RSVP_0020Mail.png rename to src/canonical/minisprites/items/other/RSVP_Mail.png diff --git a/src/canonical/minisprites/items/other/Rage_0020Candy_0020Bar.png b/src/canonical/minisprites/items/other/Rage_Candy_Bar.png similarity index 100% rename from src/canonical/minisprites/items/other/Rage_0020Candy_0020Bar.png rename to src/canonical/minisprites/items/other/Rage_Candy_Bar.png diff --git a/src/canonical/minisprites/items/other/Rainbow_0020Pass.png b/src/canonical/minisprites/items/other/Rainbow_Pass.png similarity index 100% rename from src/canonical/minisprites/items/other/Rainbow_0020Pass.png rename to src/canonical/minisprites/items/other/Rainbow_Pass.png diff --git a/src/canonical/minisprites/items/other/Rainbow_0020Wing.png b/src/canonical/minisprites/items/other/Rainbow_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Rainbow_0020Wing.png rename to src/canonical/minisprites/items/other/Rainbow_Wing.png diff --git a/src/canonical/minisprites/items/other/Rare_0020Candy.png b/src/canonical/minisprites/items/other/Rare_Candy.png similarity index 100% rename from src/canonical/minisprites/items/other/Rare_0020Candy.png rename to src/canonical/minisprites/items/other/Rare_Candy.png diff --git a/src/canonical/minisprites/items/other/Red_0020Apricorn.png b/src/canonical/minisprites/items/other/Red_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Red_0020Apricorn.png rename to src/canonical/minisprites/items/other/Red_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Red_0020Flute.png b/src/canonical/minisprites/items/other/Red_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Red_0020Flute.png rename to src/canonical/minisprites/items/other/Red_Flute.png diff --git a/src/canonical/minisprites/items/other/Red_0020Scale.png b/src/canonical/minisprites/items/other/Red_Scale.png similarity index 100% rename from src/canonical/minisprites/items/other/Red_0020Scale.png rename to src/canonical/minisprites/items/other/Red_Scale.png diff --git a/src/canonical/minisprites/items/other/Red_0020Scarf.png b/src/canonical/minisprites/items/other/Red_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/other/Red_0020Scarf.png rename to src/canonical/minisprites/items/other/Red_Scarf.png diff --git a/src/canonical/minisprites/items/other/Red_0020Shard.png b/src/canonical/minisprites/items/other/Red_Shard.png similarity index 100% rename from src/canonical/minisprites/items/other/Red_0020Shard.png rename to src/canonical/minisprites/items/other/Red_Shard.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Band.png b/src/canonical/minisprites/items/other/Relic_Band.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Band.png rename to src/canonical/minisprites/items/other/Relic_Band.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Copper.png b/src/canonical/minisprites/items/other/Relic_Copper.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Copper.png rename to src/canonical/minisprites/items/other/Relic_Copper.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Crown.png b/src/canonical/minisprites/items/other/Relic_Crown.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Crown.png rename to src/canonical/minisprites/items/other/Relic_Crown.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Gold.png b/src/canonical/minisprites/items/other/Relic_Gold.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Gold.png rename to src/canonical/minisprites/items/other/Relic_Gold.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Silver.png b/src/canonical/minisprites/items/other/Relic_Silver.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Silver.png rename to src/canonical/minisprites/items/other/Relic_Silver.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Statue.png b/src/canonical/minisprites/items/other/Relic_Statue.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Statue.png rename to src/canonical/minisprites/items/other/Relic_Statue.png diff --git a/src/canonical/minisprites/items/other/Relic_0020Vase.png b/src/canonical/minisprites/items/other/Relic_Vase.png similarity index 100% rename from src/canonical/minisprites/items/other/Relic_0020Vase.png rename to src/canonical/minisprites/items/other/Relic_Vase.png diff --git a/src/canonical/minisprites/items/other/Reset_0020Urge.png b/src/canonical/minisprites/items/other/Reset_Urge.png similarity index 100% rename from src/canonical/minisprites/items/other/Reset_0020Urge.png rename to src/canonical/minisprites/items/other/Reset_Urge.png diff --git a/src/canonical/minisprites/items/other/Resist_0020Wing.png b/src/canonical/minisprites/items/other/Resist_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Resist_0020Wing.png rename to src/canonical/minisprites/items/other/Resist_Wing.png diff --git a/src/canonical/minisprites/items/other/Retro_0020Mail.png b/src/canonical/minisprites/items/other/Retro_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Retro_0020Mail.png rename to src/canonical/minisprites/items/other/Retro_Mail.png diff --git a/src/canonical/minisprites/items/other/Revival_0020Herb.png b/src/canonical/minisprites/items/other/Revival_Herb.png similarity index 100% rename from src/canonical/minisprites/items/other/Revival_0020Herb.png rename to src/canonical/minisprites/items/other/Revival_Herb.png diff --git a/src/canonical/minisprites/items/other/Rule_0020Book.png b/src/canonical/minisprites/items/other/Rule_Book.png similarity index 100% rename from src/canonical/minisprites/items/other/Rule_0020Book.png rename to src/canonical/minisprites/items/other/Rule_Book.png diff --git a/src/canonical/minisprites/items/other/SS_0020Ticket.png b/src/canonical/minisprites/items/other/SS_Ticket.png similarity index 100% rename from src/canonical/minisprites/items/other/SS_0020Ticket.png rename to src/canonical/minisprites/items/other/SS_Ticket.png diff --git a/src/canonical/minisprites/items/other/Sacred_0020Ash.png b/src/canonical/minisprites/items/other/Sacred_Ash.png similarity index 100% rename from src/canonical/minisprites/items/other/Sacred_0020Ash.png rename to src/canonical/minisprites/items/other/Sacred_Ash.png diff --git a/src/canonical/minisprites/items/other/Seal_0020Bag.png b/src/canonical/minisprites/items/other/Seal_Bag.png similarity index 100% rename from src/canonical/minisprites/items/other/Seal_0020Bag.png rename to src/canonical/minisprites/items/other/Seal_Bag.png diff --git a/src/canonical/minisprites/items/other/Seal_0020Case.png b/src/canonical/minisprites/items/other/Seal_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/Seal_0020Case.png rename to src/canonical/minisprites/items/other/Seal_Case.png diff --git a/src/canonical/minisprites/items/other/Secret_0020Key.png b/src/canonical/minisprites/items/other/Secret_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Secret_0020Key.png rename to src/canonical/minisprites/items/other/Secret_Key.png diff --git a/src/canonical/minisprites/items/other/Secret_0020Potion.png b/src/canonical/minisprites/items/other/Secret_Potion.png similarity index 100% rename from src/canonical/minisprites/items/other/Secret_0020Potion.png rename to src/canonical/minisprites/items/other/Secret_Potion.png diff --git a/src/canonical/minisprites/items/other/Shadow_0020Mail.png b/src/canonical/minisprites/items/other/Shadow_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Shadow_0020Mail.png rename to src/canonical/minisprites/items/other/Shadow_Mail.png diff --git a/src/canonical/minisprites/items/other/Shoal_0020Salt.png b/src/canonical/minisprites/items/other/Shoal_Salt.png similarity index 100% rename from src/canonical/minisprites/items/other/Shoal_0020Salt.png rename to src/canonical/minisprites/items/other/Shoal_Salt.png diff --git a/src/canonical/minisprites/items/other/Shoal_0020Shell.png b/src/canonical/minisprites/items/other/Shoal_Shell.png similarity index 100% rename from src/canonical/minisprites/items/other/Shoal_0020Shell.png rename to src/canonical/minisprites/items/other/Shoal_Shell.png diff --git a/src/canonical/minisprites/items/other/Silph_0020Scope.png b/src/canonical/minisprites/items/other/Silph_Scope.png similarity index 100% rename from src/canonical/minisprites/items/other/Silph_0020Scope.png rename to src/canonical/minisprites/items/other/Silph_Scope.png diff --git a/src/canonical/minisprites/items/other/Silver_0020Wing.png b/src/canonical/minisprites/items/other/Silver_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Silver_0020Wing.png rename to src/canonical/minisprites/items/other/Silver_Wing.png diff --git a/src/canonical/minisprites/items/other/Slowpoke_0020Tail.png b/src/canonical/minisprites/items/other/Slowpoke_Tail.png similarity index 100% rename from src/canonical/minisprites/items/other/Slowpoke_0020Tail.png rename to src/canonical/minisprites/items/other/Slowpoke_Tail.png diff --git a/src/canonical/minisprites/items/other/Smoke_0020Ball.png b/src/canonical/minisprites/items/other/Smoke_Ball.png similarity index 100% rename from src/canonical/minisprites/items/other/Smoke_0020Ball.png rename to src/canonical/minisprites/items/other/Smoke_Ball.png diff --git a/src/canonical/minisprites/items/other/Snow_0020Mail.png b/src/canonical/minisprites/items/other/Snow_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Snow_0020Mail.png rename to src/canonical/minisprites/items/other/Snow_Mail.png diff --git a/src/canonical/minisprites/items/other/Soda_0020Pop.png b/src/canonical/minisprites/items/other/Soda_Pop.png similarity index 100% rename from src/canonical/minisprites/items/other/Soda_0020Pop.png rename to src/canonical/minisprites/items/other/Soda_Pop.png diff --git a/src/canonical/minisprites/items/other/Soot_0020Sack.png b/src/canonical/minisprites/items/other/Soot_Sack.png similarity index 100% rename from src/canonical/minisprites/items/other/Soot_0020Sack.png rename to src/canonical/minisprites/items/other/Soot_Sack.png diff --git a/src/canonical/minisprites/items/other/Soothe_0020Bell.png b/src/canonical/minisprites/items/other/Soothe_Bell.png similarity index 100% rename from src/canonical/minisprites/items/other/Soothe_0020Bell.png rename to src/canonical/minisprites/items/other/Soothe_Bell.png diff --git a/src/canonical/minisprites/items/other/Space_0020Mail.png b/src/canonical/minisprites/items/other/Space_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Space_0020Mail.png rename to src/canonical/minisprites/items/other/Space_Mail.png diff --git a/src/canonical/minisprites/items/other/Squirt_0020Bottle.png b/src/canonical/minisprites/items/other/Squirt_Bottle.png similarity index 100% rename from src/canonical/minisprites/items/other/Squirt_0020Bottle.png rename to src/canonical/minisprites/items/other/Squirt_Bottle.png diff --git a/src/canonical/minisprites/items/other/Stable_0020Mulch.png b/src/canonical/minisprites/items/other/Stable_Mulch.png similarity index 100% rename from src/canonical/minisprites/items/other/Stable_0020Mulch.png rename to src/canonical/minisprites/items/other/Stable_Mulch.png diff --git a/src/canonical/minisprites/items/other/Star_0020Piece.png b/src/canonical/minisprites/items/other/Star_Piece.png similarity index 100% rename from src/canonical/minisprites/items/other/Star_0020Piece.png rename to src/canonical/minisprites/items/other/Star_Piece.png diff --git a/src/canonical/minisprites/items/other/Storage_0020Key.png b/src/canonical/minisprites/items/other/Storage_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Storage_0020Key.png rename to src/canonical/minisprites/items/other/Storage_Key.png diff --git a/src/canonical/minisprites/items/other/Suite_0020Key.png b/src/canonical/minisprites/items/other/Suite_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Suite_0020Key.png rename to src/canonical/minisprites/items/other/Suite_Key.png diff --git a/src/canonical/minisprites/items/other/Super_0020Potion.png b/src/canonical/minisprites/items/other/Super_Potion.png similarity index 100% rename from src/canonical/minisprites/items/other/Super_0020Potion.png rename to src/canonical/minisprites/items/other/Super_Potion.png diff --git a/src/canonical/minisprites/items/other/Super_0020Repel.png b/src/canonical/minisprites/items/other/Super_Repel.png similarity index 100% rename from src/canonical/minisprites/items/other/Super_0020Repel.png rename to src/canonical/minisprites/items/other/Super_Repel.png diff --git a/src/canonical/minisprites/items/other/Super_0020Rod.png b/src/canonical/minisprites/items/other/Super_Rod.png similarity index 100% rename from src/canonical/minisprites/items/other/Super_0020Rod.png rename to src/canonical/minisprites/items/other/Super_Rod.png diff --git a/src/canonical/minisprites/items/other/Sweet_0020Heart.png b/src/canonical/minisprites/items/other/Sweet_Heart.png similarity index 100% rename from src/canonical/minisprites/items/other/Sweet_0020Heart.png rename to src/canonical/minisprites/items/other/Sweet_Heart.png diff --git a/src/canonical/minisprites/items/other/Swift_0020Wing.png b/src/canonical/minisprites/items/other/Swift_Wing.png similarity index 100% rename from src/canonical/minisprites/items/other/Swift_0020Wing.png rename to src/canonical/minisprites/items/other/Swift_Wing.png diff --git a/src/canonical/minisprites/items/other/TM_0020Case.png b/src/canonical/minisprites/items/other/TM_Case.png similarity index 100% rename from src/canonical/minisprites/items/other/TM_0020Case.png rename to src/canonical/minisprites/items/other/TM_Case.png diff --git a/src/canonical/minisprites/items/other/Teachy_0020TV.png b/src/canonical/minisprites/items/other/Teachy_TV.png similarity index 100% rename from src/canonical/minisprites/items/other/Teachy_0020TV.png rename to src/canonical/minisprites/items/other/Teachy_TV.png diff --git a/src/canonical/minisprites/items/other/Thanks_0020Mail.png b/src/canonical/minisprites/items/other/Thanks_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Thanks_0020Mail.png rename to src/canonical/minisprites/items/other/Thanks_Mail.png diff --git a/src/canonical/minisprites/items/other/Tidal_0020Bell.png b/src/canonical/minisprites/items/other/Tidal_Bell.png similarity index 100% rename from src/canonical/minisprites/items/other/Tidal_0020Bell.png rename to src/canonical/minisprites/items/other/Tidal_Bell.png diff --git a/src/canonical/minisprites/items/other/Tiny_0020Mushroom.png b/src/canonical/minisprites/items/other/Tiny_Mushroom.png similarity index 100% rename from src/canonical/minisprites/items/other/Tiny_0020Mushroom.png rename to src/canonical/minisprites/items/other/Tiny_Mushroom.png diff --git a/src/canonical/minisprites/items/other/Town_0020Map.png b/src/canonical/minisprites/items/other/Town_Map.png similarity index 100% rename from src/canonical/minisprites/items/other/Town_0020Map.png rename to src/canonical/minisprites/items/other/Town_Map.png diff --git a/src/canonical/minisprites/items/other/Tropic_0020Mail.png b/src/canonical/minisprites/items/other/Tropic_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Tropic_0020Mail.png rename to src/canonical/minisprites/items/other/Tropic_Mail.png diff --git a/src/canonical/minisprites/items/other/Tunnel_0020Mail.png b/src/canonical/minisprites/items/other/Tunnel_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Tunnel_0020Mail.png rename to src/canonical/minisprites/items/other/Tunnel_Mail.png diff --git a/src/canonical/minisprites/items/other/Unown_0020Report.png b/src/canonical/minisprites/items/other/Unown_Report.png similarity index 100% rename from src/canonical/minisprites/items/other/Unown_0020Report.png rename to src/canonical/minisprites/items/other/Unown_Report.png diff --git a/src/canonical/minisprites/items/other/Vs._0020Recorder.png b/src/canonical/minisprites/items/other/Vs._Recorder.png similarity index 100% rename from src/canonical/minisprites/items/other/Vs._0020Recorder.png rename to src/canonical/minisprites/items/other/Vs._Recorder.png diff --git a/src/canonical/minisprites/items/other/Vs._0020Seeker.png b/src/canonical/minisprites/items/other/Vs._Seeker.png similarity index 100% rename from src/canonical/minisprites/items/other/Vs._0020Seeker.png rename to src/canonical/minisprites/items/other/Vs._Seeker.png diff --git a/src/canonical/minisprites/items/other/Wailmer_0020Pail.png b/src/canonical/minisprites/items/other/Wailmer_Pail.png similarity index 100% rename from src/canonical/minisprites/items/other/Wailmer_0020Pail.png rename to src/canonical/minisprites/items/other/Wailmer_Pail.png diff --git a/src/canonical/minisprites/items/other/Wave_0020Mail.png b/src/canonical/minisprites/items/other/Wave_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Wave_0020Mail.png rename to src/canonical/minisprites/items/other/Wave_Mail.png diff --git a/src/canonical/minisprites/items/other/White_0020Apricorn.png b/src/canonical/minisprites/items/other/White_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/White_0020Apricorn.png rename to src/canonical/minisprites/items/other/White_Apricorn.png diff --git a/src/canonical/minisprites/items/other/White_0020Flute.png b/src/canonical/minisprites/items/other/White_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/White_0020Flute.png rename to src/canonical/minisprites/items/other/White_Flute.png diff --git a/src/canonical/minisprites/items/other/Wood_0020Mail.png b/src/canonical/minisprites/items/other/Wood_Mail.png similarity index 100% rename from src/canonical/minisprites/items/other/Wood_0020Mail.png rename to src/canonical/minisprites/items/other/Wood_Mail.png diff --git a/src/canonical/minisprites/items/other/Works_0020Key.png b/src/canonical/minisprites/items/other/Works_Key.png similarity index 100% rename from src/canonical/minisprites/items/other/Works_0020Key.png rename to src/canonical/minisprites/items/other/Works_Key.png diff --git a/src/canonical/minisprites/items/other/X_0020Accuracy.png b/src/canonical/minisprites/items/other/X_Accuracy.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Accuracy.png rename to src/canonical/minisprites/items/other/X_Accuracy.png diff --git a/src/canonical/minisprites/items/other/X_0020Accuracy_00202.png b/src/canonical/minisprites/items/other/X_Accuracy_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Accuracy_00202.png rename to src/canonical/minisprites/items/other/X_Accuracy_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Accuracy_00203.png b/src/canonical/minisprites/items/other/X_Accuracy_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Accuracy_00203.png rename to src/canonical/minisprites/items/other/X_Accuracy_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Accuracy_00206.png b/src/canonical/minisprites/items/other/X_Accuracy_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Accuracy_00206.png rename to src/canonical/minisprites/items/other/X_Accuracy_6.png diff --git a/src/canonical/minisprites/items/other/X_0020Attack.png b/src/canonical/minisprites/items/other/X_Attack.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Attack.png rename to src/canonical/minisprites/items/other/X_Attack.png diff --git a/src/canonical/minisprites/items/other/X_0020Attack_00202.png b/src/canonical/minisprites/items/other/X_Attack_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Attack_00202.png rename to src/canonical/minisprites/items/other/X_Attack_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Attack_00203.png b/src/canonical/minisprites/items/other/X_Attack_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Attack_00203.png rename to src/canonical/minisprites/items/other/X_Attack_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Attack_00206.png b/src/canonical/minisprites/items/other/X_Attack_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Attack_00206.png rename to src/canonical/minisprites/items/other/X_Attack_6.png diff --git a/src/canonical/minisprites/items/other/X_0020Defense.png b/src/canonical/minisprites/items/other/X_Defense.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Defense.png rename to src/canonical/minisprites/items/other/X_Defense.png diff --git a/src/canonical/minisprites/items/other/X_0020Defense_00202.png b/src/canonical/minisprites/items/other/X_Defense_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Defense_00202.png rename to src/canonical/minisprites/items/other/X_Defense_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Defense_00203.png b/src/canonical/minisprites/items/other/X_Defense_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Defense_00203.png rename to src/canonical/minisprites/items/other/X_Defense_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Defense_00206.png b/src/canonical/minisprites/items/other/X_Defense_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Defense_00206.png rename to src/canonical/minisprites/items/other/X_Defense_6.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Atk.png b/src/canonical/minisprites/items/other/X_Sp._Atk.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Atk.png rename to src/canonical/minisprites/items/other/X_Sp._Atk.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00202.png b/src/canonical/minisprites/items/other/X_Sp._Atk_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00202.png rename to src/canonical/minisprites/items/other/X_Sp._Atk_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00203.png b/src/canonical/minisprites/items/other/X_Sp._Atk_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00203.png rename to src/canonical/minisprites/items/other/X_Sp._Atk_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00206.png b/src/canonical/minisprites/items/other/X_Sp._Atk_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Atk_00206.png rename to src/canonical/minisprites/items/other/X_Sp._Atk_6.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Def.png b/src/canonical/minisprites/items/other/X_Sp._Def.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Def.png rename to src/canonical/minisprites/items/other/X_Sp._Def.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Def_00202.png b/src/canonical/minisprites/items/other/X_Sp._Def_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Def_00202.png rename to src/canonical/minisprites/items/other/X_Sp._Def_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Def_00203.png b/src/canonical/minisprites/items/other/X_Sp._Def_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Def_00203.png rename to src/canonical/minisprites/items/other/X_Sp._Def_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Sp._0020Def_00206.png b/src/canonical/minisprites/items/other/X_Sp._Def_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Sp._0020Def_00206.png rename to src/canonical/minisprites/items/other/X_Sp._Def_6.png diff --git a/src/canonical/minisprites/items/other/X_0020Speed.png b/src/canonical/minisprites/items/other/X_Speed.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Speed.png rename to src/canonical/minisprites/items/other/X_Speed.png diff --git a/src/canonical/minisprites/items/other/X_0020Speed_00202.png b/src/canonical/minisprites/items/other/X_Speed_2.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Speed_00202.png rename to src/canonical/minisprites/items/other/X_Speed_2.png diff --git a/src/canonical/minisprites/items/other/X_0020Speed_00203.png b/src/canonical/minisprites/items/other/X_Speed_3.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Speed_00203.png rename to src/canonical/minisprites/items/other/X_Speed_3.png diff --git a/src/canonical/minisprites/items/other/X_0020Speed_00206.png b/src/canonical/minisprites/items/other/X_Speed_6.png similarity index 100% rename from src/canonical/minisprites/items/other/X_0020Speed_00206.png rename to src/canonical/minisprites/items/other/X_Speed_6.png diff --git a/src/canonical/minisprites/items/other/Yellow_0020Apricorn.png b/src/canonical/minisprites/items/other/Yellow_Apricorn.png similarity index 100% rename from src/canonical/minisprites/items/other/Yellow_0020Apricorn.png rename to src/canonical/minisprites/items/other/Yellow_Apricorn.png diff --git a/src/canonical/minisprites/items/other/Yellow_0020Flute.png b/src/canonical/minisprites/items/other/Yellow_Flute.png similarity index 100% rename from src/canonical/minisprites/items/other/Yellow_0020Flute.png rename to src/canonical/minisprites/items/other/Yellow_Flute.png diff --git a/src/canonical/minisprites/items/other/Yellow_0020Scarf.png b/src/canonical/minisprites/items/other/Yellow_Scarf.png similarity index 100% rename from src/canonical/minisprites/items/other/Yellow_0020Scarf.png rename to src/canonical/minisprites/items/other/Yellow_Scarf.png diff --git a/src/canonical/minisprites/items/other/Yellow_0020Shard.png b/src/canonical/minisprites/items/other/Yellow_Shard.png similarity index 100% rename from src/canonical/minisprites/items/other/Yellow_0020Shard.png rename to src/canonical/minisprites/items/other/Yellow_Shard.png diff --git a/src/canonical/models/back-cosmetic/Flabe_0301be_0301--Blue.gif b/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe_0301be_0301--Blue.gif rename to src/canonical/models/back-cosmetic/Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/back-cosmetic/Flabe_0301be_0301--Orange.gif b/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe_0301be_0301--Orange.gif rename to src/canonical/models/back-cosmetic/Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/back-cosmetic/Flabe_0301be_0301--White.gif b/src/canonical/models/back-cosmetic/Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe_0301be_0301--White.gif rename to src/canonical/models/back-cosmetic/Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/back-cosmetic/Flabe_0301be_0301--Yellow.gif b/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe_0301be_0301--Yellow.gif rename to src/canonical/models/back-cosmetic/Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--High_0020Plains.gif b/src/canonical/models/back-cosmetic/Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--High_0020Plains.gif rename to src/canonical/models/back-cosmetic/Vivillon--High_Plains.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Icy_0020Snow.gif b/src/canonical/models/back-cosmetic/Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Icy_0020Snow.gif rename to src/canonical/models/back-cosmetic/Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Blue.gif b/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Orange.gif b/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Orange.gif rename to src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--White.gif b/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--White.gif rename to src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe_0301be_0301--Yellow.gif rename to src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--High_0020Plains.gif b/src/canonical/models/back-shiny-cosmetic/Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--High_0020Plains.gif rename to src/canonical/models/back-shiny-cosmetic/Vivillon--High_Plains.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_0020Snow.gif b/src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_0020Snow.gif rename to src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/back-shiny/Farfetch_0027d--Galar.gif b/src/canonical/models/back-shiny/Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Farfetch_0027d--Galar.gif rename to src/canonical/models/back-shiny/Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/back-shiny/Farfetch_0027d.gif b/src/canonical/models/back-shiny/Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/back-shiny/Farfetch_0027d.gif rename to src/canonical/models/back-shiny/Farfetch__0027d.gif diff --git a/src/canonical/models/back-shiny/Flabe_0301be_0301.gif b/src/canonical/models/back-shiny/Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/back-shiny/Flabe_0301be_0301.gif rename to src/canonical/models/back-shiny/Flabe__0301be__0301.gif diff --git a/src/canonical/models/back-shiny/Mime_0020Jr..gif b/src/canonical/models/back-shiny/Mime_Jr..gif similarity index 100% rename from src/canonical/models/back-shiny/Mime_0020Jr..gif rename to src/canonical/models/back-shiny/Mime_Jr..gif diff --git a/src/canonical/models/back-shiny/Mr._0020Mime--Galar.gif b/src/canonical/models/back-shiny/Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._0020Mime--Galar.gif rename to src/canonical/models/back-shiny/Mr._Mime--Galar.gif diff --git a/src/canonical/models/back-shiny/Mr._0020Mime.gif b/src/canonical/models/back-shiny/Mr._Mime.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._0020Mime.gif rename to src/canonical/models/back-shiny/Mr._Mime.gif diff --git a/src/canonical/models/back-shiny/Mr._0020Rime.gif b/src/canonical/models/back-shiny/Mr._Rime.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._0020Rime.gif rename to src/canonical/models/back-shiny/Mr._Rime.gif diff --git a/src/canonical/models/back-shiny/Oricorio--Pa_0027u.gif b/src/canonical/models/back-shiny/Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/back-shiny/Oricorio--Pa_0027u.gif rename to src/canonical/models/back-shiny/Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/back-shiny/Sirfetch_0027d.gif b/src/canonical/models/back-shiny/Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/back-shiny/Sirfetch_0027d.gif rename to src/canonical/models/back-shiny/Sirfetch__0027d.gif diff --git a/src/canonical/models/back-shiny/Tapu_0020Bulu.gif b/src/canonical/models/back-shiny/Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_0020Bulu.gif rename to src/canonical/models/back-shiny/Tapu_Bulu.gif diff --git a/src/canonical/models/back-shiny/Tapu_0020Fini.gif b/src/canonical/models/back-shiny/Tapu_Fini.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_0020Fini.gif rename to src/canonical/models/back-shiny/Tapu_Fini.gif diff --git a/src/canonical/models/back-shiny/Tapu_0020Koko.gif b/src/canonical/models/back-shiny/Tapu_Koko.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_0020Koko.gif rename to src/canonical/models/back-shiny/Tapu_Koko.gif diff --git a/src/canonical/models/back-shiny/Tapu_0020Lele.gif b/src/canonical/models/back-shiny/Tapu_Lele.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_0020Lele.gif rename to src/canonical/models/back-shiny/Tapu_Lele.gif diff --git a/src/canonical/models/back-shiny/Type_003a_0020Null.gif b/src/canonical/models/back-shiny/Type__003a_Null.gif similarity index 100% rename from src/canonical/models/back-shiny/Type_003a_0020Null.gif rename to src/canonical/models/back-shiny/Type__003a_Null.gif diff --git a/src/canonical/models/back-shiny/Zygarde--10_0025.gif b/src/canonical/models/back-shiny/Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/back-shiny/Zygarde--10_0025.gif rename to src/canonical/models/back-shiny/Zygarde--10__0025.gif diff --git a/src/canonical/models/back/Farfetch_0027d--Galar.gif b/src/canonical/models/back/Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/back/Farfetch_0027d--Galar.gif rename to src/canonical/models/back/Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/back/Farfetch_0027d.gif b/src/canonical/models/back/Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/back/Farfetch_0027d.gif rename to src/canonical/models/back/Farfetch__0027d.gif diff --git a/src/canonical/models/back/Flabe_0301be_0301.gif b/src/canonical/models/back/Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/back/Flabe_0301be_0301.gif rename to src/canonical/models/back/Flabe__0301be__0301.gif diff --git a/src/canonical/models/back/Mime_0020Jr..gif b/src/canonical/models/back/Mime_Jr..gif similarity index 100% rename from src/canonical/models/back/Mime_0020Jr..gif rename to src/canonical/models/back/Mime_Jr..gif diff --git a/src/canonical/models/back/Mr._0020Mime--Galar.gif b/src/canonical/models/back/Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/back/Mr._0020Mime--Galar.gif rename to src/canonical/models/back/Mr._Mime--Galar.gif diff --git a/src/canonical/models/back/Mr._0020Mime.gif b/src/canonical/models/back/Mr._Mime.gif similarity index 100% rename from src/canonical/models/back/Mr._0020Mime.gif rename to src/canonical/models/back/Mr._Mime.gif diff --git a/src/canonical/models/back/Mr._0020Rime.gif b/src/canonical/models/back/Mr._Rime.gif similarity index 100% rename from src/canonical/models/back/Mr._0020Rime.gif rename to src/canonical/models/back/Mr._Rime.gif diff --git a/src/canonical/models/back/Oricorio--Pa_0027u.gif b/src/canonical/models/back/Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/back/Oricorio--Pa_0027u.gif rename to src/canonical/models/back/Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/back/Sirfetch_0027d.gif b/src/canonical/models/back/Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/back/Sirfetch_0027d.gif rename to src/canonical/models/back/Sirfetch__0027d.gif diff --git a/src/canonical/models/back/Tapu_0020Bulu.gif b/src/canonical/models/back/Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/back/Tapu_0020Bulu.gif rename to src/canonical/models/back/Tapu_Bulu.gif diff --git a/src/canonical/models/back/Tapu_0020Fini.gif b/src/canonical/models/back/Tapu_Fini.gif similarity index 100% rename from src/canonical/models/back/Tapu_0020Fini.gif rename to src/canonical/models/back/Tapu_Fini.gif diff --git a/src/canonical/models/back/Tapu_0020Koko.gif b/src/canonical/models/back/Tapu_Koko.gif similarity index 100% rename from src/canonical/models/back/Tapu_0020Koko.gif rename to src/canonical/models/back/Tapu_Koko.gif diff --git a/src/canonical/models/back/Tapu_0020Lele.gif b/src/canonical/models/back/Tapu_Lele.gif similarity index 100% rename from src/canonical/models/back/Tapu_0020Lele.gif rename to src/canonical/models/back/Tapu_Lele.gif diff --git a/src/canonical/models/back/Type_003a_0020Null.gif b/src/canonical/models/back/Type__003a_Null.gif similarity index 100% rename from src/canonical/models/back/Type_003a_0020Null.gif rename to src/canonical/models/back/Type__003a_Null.gif diff --git a/src/canonical/models/back/Zygarde--10_0025.gif b/src/canonical/models/back/Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/back/Zygarde--10_0025.gif rename to src/canonical/models/back/Zygarde--10__0025.gif diff --git a/src/canonical/models/front-cosmetic/Flabe_0301be_0301--Blue.gif b/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe_0301be_0301--Blue.gif rename to src/canonical/models/front-cosmetic/Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/front-cosmetic/Flabe_0301be_0301--Orange.gif b/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe_0301be_0301--Orange.gif rename to src/canonical/models/front-cosmetic/Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/front-cosmetic/Flabe_0301be_0301--White.gif b/src/canonical/models/front-cosmetic/Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe_0301be_0301--White.gif rename to src/canonical/models/front-cosmetic/Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/front-cosmetic/Flabe_0301be_0301--Yellow.gif b/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe_0301be_0301--Yellow.gif rename to src/canonical/models/front-cosmetic/Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--High_0020Plains.gif b/src/canonical/models/front-cosmetic/Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--High_0020Plains.gif rename to src/canonical/models/front-cosmetic/Vivillon--High_Plains.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Icy_0020Snow.gif b/src/canonical/models/front-cosmetic/Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Icy_0020Snow.gif rename to src/canonical/models/front-cosmetic/Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/front/Farfetch_0027d--Galar.gif b/src/canonical/models/front/Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/front/Farfetch_0027d--Galar.gif rename to src/canonical/models/front/Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/front/Farfetch_0027d.gif b/src/canonical/models/front/Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/front/Farfetch_0027d.gif rename to src/canonical/models/front/Farfetch__0027d.gif diff --git a/src/canonical/models/front/Flabe_0301be_0301.gif b/src/canonical/models/front/Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/front/Flabe_0301be_0301.gif rename to src/canonical/models/front/Flabe__0301be__0301.gif diff --git a/src/canonical/models/front/Mime_0020Jr..gif b/src/canonical/models/front/Mime_Jr..gif similarity index 100% rename from src/canonical/models/front/Mime_0020Jr..gif rename to src/canonical/models/front/Mime_Jr..gif diff --git a/src/canonical/models/front/Mr._0020Mime--Galar.gif b/src/canonical/models/front/Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/front/Mr._0020Mime--Galar.gif rename to src/canonical/models/front/Mr._Mime--Galar.gif diff --git a/src/canonical/models/front/Mr._0020Mime.gif b/src/canonical/models/front/Mr._Mime.gif similarity index 100% rename from src/canonical/models/front/Mr._0020Mime.gif rename to src/canonical/models/front/Mr._Mime.gif diff --git a/src/canonical/models/front/Mr._0020Rime.gif b/src/canonical/models/front/Mr._Rime.gif similarity index 100% rename from src/canonical/models/front/Mr._0020Rime.gif rename to src/canonical/models/front/Mr._Rime.gif diff --git a/src/canonical/models/front/Oricorio--Pa_0027u.gif b/src/canonical/models/front/Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/front/Oricorio--Pa_0027u.gif rename to src/canonical/models/front/Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/front/Sirfetch_0027d.gif b/src/canonical/models/front/Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/front/Sirfetch_0027d.gif rename to src/canonical/models/front/Sirfetch__0027d.gif diff --git a/src/canonical/models/front/Tapu_0020Bulu.gif b/src/canonical/models/front/Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/front/Tapu_0020Bulu.gif rename to src/canonical/models/front/Tapu_Bulu.gif diff --git a/src/canonical/models/front/Tapu_0020Fini.gif b/src/canonical/models/front/Tapu_Fini.gif similarity index 100% rename from src/canonical/models/front/Tapu_0020Fini.gif rename to src/canonical/models/front/Tapu_Fini.gif diff --git a/src/canonical/models/front/Tapu_0020Koko.gif b/src/canonical/models/front/Tapu_Koko.gif similarity index 100% rename from src/canonical/models/front/Tapu_0020Koko.gif rename to src/canonical/models/front/Tapu_Koko.gif diff --git a/src/canonical/models/front/Tapu_0020Lele.gif b/src/canonical/models/front/Tapu_Lele.gif similarity index 100% rename from src/canonical/models/front/Tapu_0020Lele.gif rename to src/canonical/models/front/Tapu_Lele.gif diff --git a/src/canonical/models/front/Type_003a_0020Null.gif b/src/canonical/models/front/Type__003a_Null.gif similarity index 100% rename from src/canonical/models/front/Type_003a_0020Null.gif rename to src/canonical/models/front/Type__003a_Null.gif diff --git a/src/canonical/models/front/Zygarde--10_0025.gif b/src/canonical/models/front/Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/front/Zygarde--10_0025.gif rename to src/canonical/models/front/Zygarde--10__0025.gif diff --git a/src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Blue.gif b/src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Blue.gif rename to src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Orange.gif b/src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Orange.gif rename to src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--White.gif b/src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--White.gif rename to src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Yellow.gif b/src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Flabe_0301be_0301--Yellow.gif rename to src/canonical/models/shiny-cosmetic/Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/shiny-cosmetic/Vivillon--High_0020Plains.gif b/src/canonical/models/shiny-cosmetic/Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Vivillon--High_0020Plains.gif rename to src/canonical/models/shiny-cosmetic/Vivillon--High_Plains.gif diff --git a/src/canonical/models/shiny-cosmetic/Vivillon--Icy_0020Snow.gif b/src/canonical/models/shiny-cosmetic/Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/shiny-cosmetic/Vivillon--Icy_0020Snow.gif rename to src/canonical/models/shiny-cosmetic/Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/shiny/Farfetch_0027d--Galar.gif b/src/canonical/models/shiny/Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/shiny/Farfetch_0027d--Galar.gif rename to src/canonical/models/shiny/Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/shiny/Farfetch_0027d.gif b/src/canonical/models/shiny/Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/shiny/Farfetch_0027d.gif rename to src/canonical/models/shiny/Farfetch__0027d.gif diff --git a/src/canonical/models/shiny/Flabe_0301be_0301.gif b/src/canonical/models/shiny/Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/shiny/Flabe_0301be_0301.gif rename to src/canonical/models/shiny/Flabe__0301be__0301.gif diff --git a/src/canonical/models/shiny/Mime_0020Jr..gif b/src/canonical/models/shiny/Mime_Jr..gif similarity index 100% rename from src/canonical/models/shiny/Mime_0020Jr..gif rename to src/canonical/models/shiny/Mime_Jr..gif diff --git a/src/canonical/models/shiny/Mr._0020Mime--Galar.gif b/src/canonical/models/shiny/Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/shiny/Mr._0020Mime--Galar.gif rename to src/canonical/models/shiny/Mr._Mime--Galar.gif diff --git a/src/canonical/models/shiny/Mr._0020Mime.gif b/src/canonical/models/shiny/Mr._Mime.gif similarity index 100% rename from src/canonical/models/shiny/Mr._0020Mime.gif rename to src/canonical/models/shiny/Mr._Mime.gif diff --git a/src/canonical/models/shiny/Mr._0020Rime.gif b/src/canonical/models/shiny/Mr._Rime.gif similarity index 100% rename from src/canonical/models/shiny/Mr._0020Rime.gif rename to src/canonical/models/shiny/Mr._Rime.gif diff --git a/src/canonical/models/shiny/Oricorio--Pa_0027u.gif b/src/canonical/models/shiny/Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/shiny/Oricorio--Pa_0027u.gif rename to src/canonical/models/shiny/Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/shiny/Sirfetch_0027d.gif b/src/canonical/models/shiny/Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/shiny/Sirfetch_0027d.gif rename to src/canonical/models/shiny/Sirfetch__0027d.gif diff --git a/src/canonical/models/shiny/Tapu_0020Bulu.gif b/src/canonical/models/shiny/Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/shiny/Tapu_0020Bulu.gif rename to src/canonical/models/shiny/Tapu_Bulu.gif diff --git a/src/canonical/models/shiny/Tapu_0020Fini.gif b/src/canonical/models/shiny/Tapu_Fini.gif similarity index 100% rename from src/canonical/models/shiny/Tapu_0020Fini.gif rename to src/canonical/models/shiny/Tapu_Fini.gif diff --git a/src/canonical/models/shiny/Tapu_0020Koko.gif b/src/canonical/models/shiny/Tapu_Koko.gif similarity index 100% rename from src/canonical/models/shiny/Tapu_0020Koko.gif rename to src/canonical/models/shiny/Tapu_Koko.gif diff --git a/src/canonical/models/shiny/Tapu_0020Lele.gif b/src/canonical/models/shiny/Tapu_Lele.gif similarity index 100% rename from src/canonical/models/shiny/Tapu_0020Lele.gif rename to src/canonical/models/shiny/Tapu_Lele.gif diff --git a/src/canonical/models/shiny/Type_003a_0020Null.gif b/src/canonical/models/shiny/Type__003a_Null.gif similarity index 100% rename from src/canonical/models/shiny/Type_003a_0020Null.gif rename to src/canonical/models/shiny/Type__003a_Null.gif diff --git a/src/canonical/models/shiny/Zygarde--10_0025.gif b/src/canonical/models/shiny/Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/shiny/Zygarde--10_0025.gif rename to src/canonical/models/shiny/Zygarde--10__0025.gif diff --git a/tools/sprites/ps.js b/tools/sprites/ps.js index 0ed6f061..e2cfd0cb 100755 --- a/tools/sprites/ps.js +++ b/tools/sprites/ps.js @@ -23,7 +23,7 @@ for (const directory of program.args) { } function decode(s) { - return s.replace(/_(....)/g, (_, m) => String.fromCharCode(parseInt(m, 16))); + return s.replace(/__(....)/g, (_, m) => String.fromCharCode(parseInt(m, 16))).replace("_", " "); } function toPSID(s) { diff --git a/util/pokemon.lua b/util/pokemon.lua index 815c59f4..67146b9b 100644 --- a/util/pokemon.lua +++ b/util/pokemon.lua @@ -1,9 +1,9 @@ function decodeFS(filename) - return filename:gsub('_(%x%x%x%x)', + return filename:gsub('__(%x%x%x%x)', function(hex) return utf8.char(tonumber(hex, 16)) - end) + end):gsub('_', ' ') end function decodeBase(filename)