diff --git a/Gui.py b/Gui.py index b42d5d5007..ba8ba9f417 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 0000000000..d1afd11701 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 0000000000..80257f11a3 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 019e6d62c0..e7a3c0153a 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 0000000000..3236f7999b 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 0000000000..ac0c122695 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 0000000000..73f848c16e 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 0000000000..cc28cd7902 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 0000000000..c33c200896 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 0000000000..0438682fe0 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 0000000000..857265f9ac 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 0000000000..cf371839f5 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 0000000000..d2adb22751 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 0000000000..717e419991 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 0000000000..a93fd1c458 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 56e98bc90f..f06d07cc61 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 0000000000..5e1786ba55 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 0000000000..393a491d25 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 0000000000..24d0f12ee2 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 0000000000..171980ef38 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 0000000000..a09a4adf2e 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 0000000000..550fb213d1 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 6b83b72cd8..0000000000 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 3ae002bfb7..0000000000 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 0000000000..aaca256bdc 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 0000000000..a6c924a50f 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 0000000000..b8b3de81e2 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 0000000000..bbb84eae8a 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 0000000000..71a9bdc1d4 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 0000000000..d7cb0be2ee 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 0000000000..d07fb60b44 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 0000000000..4de17faf53 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 0000000000..310a6b7565 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 0000000000..2a2ff94948 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 0000000000..bc8443f9d7 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 0000000000..5c6d541156 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 0000000000..1120d3f42b 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 8b12ecc181..0000000000 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 0000000000..81b0912fa9 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 0000000000..bf697f16f4 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 0000000000..03a1c7b9a7 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 0000000000..55a51ae994 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 0000000000..43ee0fe47c 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 0000000000..5dd70f3943 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 0000000000..8953bc79b8 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 0000000000..b6b0ffefc1 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 0000000000..8f01c1db46 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 0000000000..f503b383f2 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 0000000000..e4ac6abcc5 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 0000000000..bd312843f7 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 0000000000..409171fab1 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 0000000000..9de1061f87 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 0000000000..2e67941b4e 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 0000000000..6a6bf14639 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 fe9fef361f..0e5a7d1790 100644 Binary files a/data/sprites/official/zerosuitsamus.1.zspr and b/data/sprites/official/zerosuitsamus.2.zspr differ