diff --git a/Gui.py b/Gui.py index b42d5d50..ba8ba9f4 100755 --- a/Gui.py +++ b/Gui.py @@ -1077,7 +1077,7 @@ class SpriteSelector(object): for file in glob(output_path(path)): sprites.append(Sprite(file)) - sprites.sort(key=lambda s: str.lower(s.name or "")) + sprites.sort(key=lambda s: str.lower(s.name or "").strip()) i = 0 for sprite in sprites: @@ -1161,7 +1161,7 @@ class SpriteSelector(object): deleted += 1 if successful: - resultmessage = "official sprites updated sucessfully" + resultmessage = "official sprites updated successfully" task.queue_event(finished) diff --git a/data/sprites/official/bronzor.1.zspr b/data/sprites/official/bronzor.1.zspr new file mode 100644 index 00000000..d1afd117 Binary files /dev/null and b/data/sprites/official/bronzor.1.zspr differ diff --git a/data/sprites/official/casual-zelda.1.zspr b/data/sprites/official/casual-zelda.1.zspr new file mode 100644 index 00000000..80257f11 Binary files /dev/null and b/data/sprites/official/casual-zelda.1.zspr differ diff --git a/data/sprites/official/cat.1.zspr b/data/sprites/official/cat.2.zspr similarity index 80% rename from data/sprites/official/cat.1.zspr rename to data/sprites/official/cat.2.zspr index 019e6d62..e7a3c015 100644 Binary files a/data/sprites/official/cat.1.zspr and b/data/sprites/official/cat.2.zspr differ diff --git a/data/sprites/official/cdilink.1.zspr b/data/sprites/official/cdilink.1.zspr new file mode 100644 index 00000000..3236f799 Binary files /dev/null and b/data/sprites/official/cdilink.1.zspr differ diff --git a/data/sprites/official/celes.1.zspr b/data/sprites/official/celes.1.zspr new file mode 100644 index 00000000..ac0c1226 Binary files /dev/null and b/data/sprites/official/celes.1.zspr differ diff --git a/data/sprites/official/clifford.1.zspr b/data/sprites/official/clifford.1.zspr new file mode 100644 index 00000000..73f848c1 Binary files /dev/null and b/data/sprites/official/clifford.1.zspr differ diff --git a/data/sprites/official/deadrock.1.zspr b/data/sprites/official/deadrock.1.zspr new file mode 100644 index 00000000..cc28cd79 Binary files /dev/null and b/data/sprites/official/deadrock.1.zspr differ diff --git a/data/sprites/official/eggplant.1.zspr b/data/sprites/official/eggplant.1.zspr new file mode 100644 index 00000000..c33c2008 Binary files /dev/null and b/data/sprites/official/eggplant.1.zspr differ diff --git a/data/sprites/official/goomba.1.zspr b/data/sprites/official/goomba.1.zspr new file mode 100644 index 00000000..0438682f Binary files /dev/null and b/data/sprites/official/goomba.1.zspr differ diff --git a/data/sprites/official/grandpoobear.1.zspr b/data/sprites/official/grandpoobear.1.zspr new file mode 100644 index 00000000..857265f9 Binary files /dev/null and b/data/sprites/official/grandpoobear.1.zspr differ diff --git a/data/sprites/official/grunclestan.1.zspr b/data/sprites/official/grunclestan.1.zspr new file mode 100644 index 00000000..cf371839 Binary files /dev/null and b/data/sprites/official/grunclestan.1.zspr differ diff --git a/data/sprites/official/hoarder-bush.1.zspr b/data/sprites/official/hoarder-bush.1.zspr new file mode 100644 index 00000000..d2adb227 Binary files /dev/null and b/data/sprites/official/hoarder-bush.1.zspr differ diff --git a/data/sprites/official/hoarder-pot.1.zspr b/data/sprites/official/hoarder-pot.1.zspr new file mode 100644 index 00000000..717e4199 Binary files /dev/null and b/data/sprites/official/hoarder-pot.1.zspr differ diff --git a/data/sprites/official/hoarder-rock.1.zspr b/data/sprites/official/hoarder-rock.1.zspr new file mode 100644 index 00000000..a93fd1c4 Binary files /dev/null and b/data/sprites/official/hoarder-rock.1.zspr differ diff --git a/data/sprites/official/ignignokt.1.zspr b/data/sprites/official/ignignokt.2.zspr similarity index 93% rename from data/sprites/official/ignignokt.1.zspr rename to data/sprites/official/ignignokt.2.zspr index 56e98bc9..f06d07cc 100644 Binary files a/data/sprites/official/ignignokt.1.zspr and b/data/sprites/official/ignignokt.2.zspr differ diff --git a/data/sprites/official/kecleon.1.zspr b/data/sprites/official/kecleon.1.zspr new file mode 100644 index 00000000..5e1786ba Binary files /dev/null and b/data/sprites/official/kecleon.1.zspr differ diff --git a/data/sprites/official/kholdstare.1.zspr b/data/sprites/official/kholdstare.1.zspr new file mode 100644 index 00000000..393a491d Binary files /dev/null and b/data/sprites/official/kholdstare.1.zspr differ diff --git a/data/sprites/official/lakitu.1.zspr b/data/sprites/official/lakitu.1.zspr new file mode 100644 index 00000000..24d0f12e Binary files /dev/null and b/data/sprites/official/lakitu.1.zspr differ diff --git a/data/sprites/official/magus.1.zspr b/data/sprites/official/magus.1.zspr new file mode 100644 index 00000000..171980ef Binary files /dev/null and b/data/sprites/official/magus.1.zspr differ diff --git a/data/sprites/official/meatwad.1.zspr b/data/sprites/official/meatwad.1.zspr new file mode 100644 index 00000000..a09a4adf Binary files /dev/null and b/data/sprites/official/meatwad.1.zspr differ diff --git a/data/sprites/official/mike-jones.2.zspr b/data/sprites/official/mike-jones.2.zspr new file mode 100644 index 00000000..550fb213 Binary files /dev/null and b/data/sprites/official/mike-jones.2.zspr differ diff --git a/data/sprites/official/mikejones.1.zspr b/data/sprites/official/mikejones.1.zspr deleted file mode 100644 index 6b83b72c..00000000 Binary files a/data/sprites/official/mikejones.1.zspr and /dev/null differ diff --git a/data/sprites/official/minishcaplink.1.zspr b/data/sprites/official/minishcaplink.1.zspr deleted file mode 100644 index 3ae002bf..00000000 Binary files a/data/sprites/official/minishcaplink.1.zspr and /dev/null differ diff --git a/data/sprites/official/minishcaplink.2.zspr b/data/sprites/official/minishcaplink.2.zspr new file mode 100644 index 00000000..aaca256b Binary files /dev/null and b/data/sprites/official/minishcaplink.2.zspr differ diff --git a/data/sprites/official/mushy.1.zspr b/data/sprites/official/mushy.1.zspr new file mode 100644 index 00000000..a6c924a5 Binary files /dev/null and b/data/sprites/official/mushy.1.zspr differ diff --git a/data/sprites/official/ness.1.zspr b/data/sprites/official/ness.1.zspr new file mode 100644 index 00000000..b8b3de81 Binary files /dev/null and b/data/sprites/official/ness.1.zspr differ diff --git a/data/sprites/official/ori.1.zspr b/data/sprites/official/ori.1.zspr new file mode 100644 index 00000000..bbb84eae Binary files /dev/null and b/data/sprites/official/ori.1.zspr differ diff --git a/data/sprites/official/parallelworldslink.1.zspr b/data/sprites/official/parallelworldslink.1.zspr new file mode 100644 index 00000000..71a9bdc1 Binary files /dev/null and b/data/sprites/official/parallelworldslink.1.zspr differ diff --git a/data/sprites/official/phoenix-wright.1.zspr b/data/sprites/official/phoenix-wright.1.zspr new file mode 100644 index 00000000..d7cb0be2 Binary files /dev/null and b/data/sprites/official/phoenix-wright.1.zspr differ diff --git a/data/sprites/official/plagueknight.1.zspr b/data/sprites/official/plagueknight.1.zspr new file mode 100644 index 00000000..d07fb60b Binary files /dev/null and b/data/sprites/official/plagueknight.1.zspr differ diff --git a/data/sprites/official/pokey.1.zspr b/data/sprites/official/pokey.1.zspr new file mode 100644 index 00000000..4de17faf Binary files /dev/null and b/data/sprites/official/pokey.1.zspr differ diff --git a/data/sprites/official/pridelink.1.zspr b/data/sprites/official/pridelink.1.zspr new file mode 100644 index 00000000..310a6b75 Binary files /dev/null and b/data/sprites/official/pridelink.1.zspr differ diff --git a/data/sprites/official/psyduck.1.zspr b/data/sprites/official/psyduck.1.zspr new file mode 100644 index 00000000..2a2ff949 Binary files /dev/null and b/data/sprites/official/psyduck.1.zspr differ diff --git a/data/sprites/official/rainbowlink.1.zspr b/data/sprites/official/rainbowlink.1.zspr new file mode 100644 index 00000000..bc8443f9 Binary files /dev/null and b/data/sprites/official/rainbowlink.1.zspr differ diff --git a/data/sprites/official/ryu.1.zspr b/data/sprites/official/ryu.1.zspr new file mode 100644 index 00000000..5c6d5411 Binary files /dev/null and b/data/sprites/official/ryu.1.zspr differ diff --git a/data/sprites/official/sailormoon.1.zspr b/data/sprites/official/sailormoon.1.zspr new file mode 100644 index 00000000..1120d3f4 Binary files /dev/null and b/data/sprites/official/sailormoon.1.zspr differ diff --git a/data/sprites/official/samus.1.zspr b/data/sprites/official/samus.1.zspr deleted file mode 100644 index 8b12ecc1..00000000 Binary files a/data/sprites/official/samus.1.zspr and /dev/null differ diff --git a/data/sprites/official/samus.2.zspr b/data/sprites/official/samus.2.zspr new file mode 100644 index 00000000..81b0912f Binary files /dev/null and b/data/sprites/official/samus.2.zspr differ diff --git a/data/sprites/official/scholar.1.zspr b/data/sprites/official/scholar.1.zspr new file mode 100644 index 00000000..bf697f16 Binary files /dev/null and b/data/sprites/official/scholar.1.zspr differ diff --git a/data/sprites/official/shantae.1.zspr b/data/sprites/official/shantae.1.zspr new file mode 100644 index 00000000..03a1c7b9 Binary files /dev/null and b/data/sprites/official/shantae.1.zspr differ diff --git a/data/sprites/official/shuppet.1.zspr b/data/sprites/official/shuppet.1.zspr new file mode 100644 index 00000000..55a51ae9 Binary files /dev/null and b/data/sprites/official/shuppet.1.zspr differ diff --git a/data/sprites/official/shy-guy.1.zspr b/data/sprites/official/shy-guy.1.zspr new file mode 100644 index 00000000..43ee0fe4 Binary files /dev/null and b/data/sprites/official/shy-guy.1.zspr differ diff --git a/data/sprites/official/snes-controller.1.zspr b/data/sprites/official/snes-controller.1.zspr new file mode 100644 index 00000000..5dd70f39 Binary files /dev/null and b/data/sprites/official/snes-controller.1.zspr differ diff --git a/data/sprites/official/teatime.1.zspr b/data/sprites/official/teatime.1.zspr new file mode 100644 index 00000000..8953bc79 Binary files /dev/null and b/data/sprites/official/teatime.1.zspr differ diff --git a/data/sprites/official/thief.1.zspr b/data/sprites/official/thief.1.zspr new file mode 100644 index 00000000..b6b0ffef Binary files /dev/null and b/data/sprites/official/thief.1.zspr differ diff --git a/data/sprites/official/tmnt.1.zspr b/data/sprites/official/tmnt.1.zspr new file mode 100644 index 00000000..8f01c1db Binary files /dev/null and b/data/sprites/official/tmnt.1.zspr differ diff --git a/data/sprites/official/toadette.1.zspr b/data/sprites/official/toadette.1.zspr new file mode 100644 index 00000000..f503b383 Binary files /dev/null and b/data/sprites/official/toadette.1.zspr differ diff --git a/data/sprites/official/totem-links.1.zspr b/data/sprites/official/totem-links.1.zspr new file mode 100644 index 00000000..e4ac6abc Binary files /dev/null and b/data/sprites/official/totem-links.1.zspr differ diff --git a/data/sprites/official/ultros.1.zspr b/data/sprites/official/ultros.1.zspr new file mode 100644 index 00000000..bd312843 Binary files /dev/null and b/data/sprites/official/ultros.1.zspr differ diff --git a/data/sprites/official/vanillalink.1.zspr b/data/sprites/official/vanillalink.1.zspr new file mode 100644 index 00000000..409171fa Binary files /dev/null and b/data/sprites/official/vanillalink.1.zspr differ diff --git a/data/sprites/official/vivian.1.zspr b/data/sprites/official/vivian.1.zspr new file mode 100644 index 00000000..9de1061f Binary files /dev/null and b/data/sprites/official/vivian.1.zspr differ diff --git a/data/sprites/official/wixb.1.zspr b/data/sprites/official/wixb.1.zspr new file mode 100644 index 00000000..2e67941b Binary files /dev/null and b/data/sprites/official/wixb.1.zspr differ diff --git a/data/sprites/official/zandra.1.zspr b/data/sprites/official/zandra.1.zspr new file mode 100644 index 00000000..6a6bf146 Binary files /dev/null and b/data/sprites/official/zandra.1.zspr differ diff --git a/data/sprites/official/zerosuitsamus.1.zspr b/data/sprites/official/zerosuitsamus.2.zspr similarity index 97% rename from data/sprites/official/zerosuitsamus.1.zspr rename to data/sprites/official/zerosuitsamus.2.zspr index fe9fef36..0e5a7d17 100644 Binary files a/data/sprites/official/zerosuitsamus.1.zspr and b/data/sprites/official/zerosuitsamus.2.zspr differ