diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a90cee26..b12176d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: # os & python versions strategy: matrix: - os-name: [ ubuntu-latest, ubuntu-16.04, macOS-latest, windows-latest ] - python-version: [ 3.7 ] + os-name: [ ubuntu-latest, ubuntu-18.04, macOS-latest, windows-latest ] + python-version: [ 3.8 ] # needs: [ install-test ] steps: # checkout commit @@ -57,11 +57,11 @@ jobs: # run build-gui.py - name: Build GUI run: | - python ./build-gui.py + python ./source/meta/build-gui.py # run build-dr.py - name: Build DungeonRandomizer run: | - python ./build-dr.py + python ./source/meta/build-dr.py # prepare binary artifacts for later step - name: Prepare Binary Artifacts env: @@ -88,8 +88,8 @@ jobs: strategy: matrix: # install/release on not xenial - os-name: [ ubuntu-latest, macOS-latest, windows-latest ] - python-version: [ 3.7 ] + os-name: [ ubuntu-latest, ubuntu-18.04, macOS-latest, windows-latest ] + python-version: [ 3.8 ] needs: [ install-build ] steps: @@ -150,9 +150,9 @@ jobs: # os & python versions strategy: matrix: - # release only on bionic + # release only on focal/bionic os-name: [ ubuntu-latest ] - python-version: [ 3.7 ] + python-version: [ 3.8 ] needs: [ install-prepare-release ] steps: diff --git a/Gui.py b/Gui.py index 66fd4999..4cc5b106 100755 --- a/Gui.py +++ b/Gui.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 import json import os import sys diff --git a/Utils.py b/Utils.py index 18d46667..229573f2 100644 --- a/Utils.py +++ b/Utils.py @@ -36,6 +36,9 @@ def is_bundled(): return getattr(sys, 'frozen', False) def local_path(path): + # just do stuff here and bail + return os.path.join(".", path) + if local_path.cached_path is not None: return os.path.join(local_path.cached_path, path) @@ -51,6 +54,9 @@ def local_path(path): local_path.cached_path = None def output_path(path): + # just do stuff here and bail + return os.path.join(".", path) + if output_path.cached_path is not None: return os.path.join(output_path.cached_path, path) @@ -61,15 +67,7 @@ def output_path(path): # has been packaged, so cannot use CWD for output. if sys.platform == 'win32': #windows - import ctypes.wintypes - CSIDL_PERSONAL = 5 # My Documents - SHGFP_TYPE_CURRENT = 0 # Get current, not default value - - buf = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH) - ctypes.windll.shell32.SHGetFolderPathW(None, CSIDL_PERSONAL, None, SHGFP_TYPE_CURRENT, buf) - - documents = buf.value - + documents = os.path.join(os.path.expanduser("~"),"Documents") elif sys.platform == 'darwin': from AppKit import NSSearchPathForDirectoriesInDomains # pylint: disable=import-error # http://developer.apple.com/DOCUMENTATION/Cocoa/Reference/Foundation/Miscellaneous/Foundation_Functions/Reference/reference.html#//apple_ref/c/func/NSSearchPathForDirectoriesInDomains @@ -655,4 +653,3 @@ if __name__ == '__main__': # room_palette_data(old_rom=sys.argv[1]) # extract_data_from_us_rom(sys.argv[1]) extract_data_from_jp_rom(sys.argv[1]) - diff --git a/data/sprites/official/4slink-armors.1.zspr b/data/sprites/official/4slink-armors.1.zspr deleted file mode 100644 index 7a944113..00000000 Binary files a/data/sprites/official/4slink-armors.1.zspr and /dev/null differ diff --git a/data/sprites/official/abigail.1.zspr b/data/sprites/official/abigail.1.zspr deleted file mode 100644 index 526990c5..00000000 Binary files a/data/sprites/official/abigail.1.zspr and /dev/null differ diff --git a/data/sprites/official/adol.1.zspr b/data/sprites/official/adol.1.zspr deleted file mode 100644 index da8210a9..00000000 Binary files a/data/sprites/official/adol.1.zspr and /dev/null differ diff --git a/data/sprites/official/aggretsuko.1.zspr b/data/sprites/official/aggretsuko.1.zspr deleted file mode 100644 index c23d9d83..00000000 Binary files a/data/sprites/official/aggretsuko.1.zspr and /dev/null differ diff --git a/data/sprites/official/alice.1.zspr b/data/sprites/official/alice.1.zspr deleted file mode 100644 index 4c673acd..00000000 Binary files a/data/sprites/official/alice.1.zspr and /dev/null differ diff --git a/data/sprites/official/angry-video-game-nerd.1.zspr b/data/sprites/official/angry-video-game-nerd.1.zspr deleted file mode 100644 index 79aee561..00000000 Binary files a/data/sprites/official/angry-video-game-nerd.1.zspr and /dev/null differ diff --git a/data/sprites/official/arcane.1.zspr b/data/sprites/official/arcane.1.zspr deleted file mode 100644 index b0fd4760..00000000 Binary files a/data/sprites/official/arcane.1.zspr and /dev/null differ diff --git a/data/sprites/official/ark-dorana.1.zspr b/data/sprites/official/ark-dorana.1.zspr deleted file mode 100644 index afd1c574..00000000 Binary files a/data/sprites/official/ark-dorana.1.zspr and /dev/null differ diff --git a/data/sprites/official/ark.1.zspr b/data/sprites/official/ark.1.zspr deleted file mode 100644 index 6ee7c09e..00000000 Binary files a/data/sprites/official/ark.1.zspr and /dev/null differ diff --git a/data/sprites/official/arrghus.2.zspr b/data/sprites/official/arrghus.2.zspr deleted file mode 100644 index 2064009d..00000000 Binary files a/data/sprites/official/arrghus.2.zspr and /dev/null differ diff --git a/data/sprites/official/astronaut.1.zspr b/data/sprites/official/astronaut.1.zspr deleted file mode 100644 index a4db3020..00000000 Binary files a/data/sprites/official/astronaut.1.zspr and /dev/null differ diff --git a/data/sprites/official/asuna.1.zspr b/data/sprites/official/asuna.1.zspr deleted file mode 100644 index f6f41545..00000000 Binary files a/data/sprites/official/asuna.1.zspr and /dev/null differ diff --git a/data/sprites/official/badeline.1.zspr b/data/sprites/official/badeline.1.zspr deleted file mode 100644 index b9fb1346..00000000 Binary files a/data/sprites/official/badeline.1.zspr and /dev/null differ diff --git a/data/sprites/official/bananas-in-pyjamas.1.zspr b/data/sprites/official/bananas-in-pyjamas.1.zspr deleted file mode 100644 index f75af2b2..00000000 Binary files a/data/sprites/official/bananas-in-pyjamas.1.zspr and /dev/null differ diff --git a/data/sprites/official/bandit.1.zspr b/data/sprites/official/bandit.1.zspr deleted file mode 100644 index 5b3288f8..00000000 Binary files a/data/sprites/official/bandit.1.zspr and /dev/null differ diff --git a/data/sprites/official/batman.1.zspr b/data/sprites/official/batman.1.zspr deleted file mode 100644 index a4a1e9c0..00000000 Binary files a/data/sprites/official/batman.1.zspr and /dev/null differ diff --git a/data/sprites/official/beau.1.zspr b/data/sprites/official/beau.1.zspr deleted file mode 100644 index 8d8d2079..00000000 Binary files a/data/sprites/official/beau.1.zspr and /dev/null differ diff --git a/data/sprites/official/bewp.1.zspr b/data/sprites/official/bewp.1.zspr deleted file mode 100644 index 265d2e1a..00000000 Binary files a/data/sprites/official/bewp.1.zspr and /dev/null differ diff --git a/data/sprites/official/bigkey.1.zspr b/data/sprites/official/bigkey.1.zspr deleted file mode 100644 index eab4854e..00000000 Binary files a/data/sprites/official/bigkey.1.zspr and /dev/null differ diff --git a/data/sprites/official/birb.1.zspr b/data/sprites/official/birb.1.zspr deleted file mode 100644 index d6d86bb6..00000000 Binary files a/data/sprites/official/birb.1.zspr and /dev/null differ diff --git a/data/sprites/official/birdo.1.zspr b/data/sprites/official/birdo.1.zspr deleted file mode 100644 index 54c49747..00000000 Binary files a/data/sprites/official/birdo.1.zspr and /dev/null differ diff --git a/data/sprites/official/blackmage.1.zspr b/data/sprites/official/blackmage.1.zspr deleted file mode 100644 index d9b56288..00000000 Binary files a/data/sprites/official/blackmage.1.zspr and /dev/null differ diff --git a/data/sprites/official/blacksmithlink.1.zspr b/data/sprites/official/blacksmithlink.1.zspr deleted file mode 100644 index e9aeb31a..00000000 Binary files a/data/sprites/official/blacksmithlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/blazer.1.zspr b/data/sprites/official/blazer.1.zspr deleted file mode 100644 index 9a15c25c..00000000 Binary files a/data/sprites/official/blazer.1.zspr and /dev/null differ diff --git a/data/sprites/official/blossom.1.zspr b/data/sprites/official/blossom.1.zspr deleted file mode 100644 index 57f4918c..00000000 Binary files a/data/sprites/official/blossom.1.zspr and /dev/null differ diff --git a/data/sprites/official/bobross.1.zspr b/data/sprites/official/bobross.1.zspr deleted file mode 100644 index eaa9811b..00000000 Binary files a/data/sprites/official/bobross.1.zspr and /dev/null differ diff --git a/data/sprites/official/boco.1.zspr b/data/sprites/official/boco.1.zspr deleted file mode 100644 index 21825520..00000000 Binary files a/data/sprites/official/boco.1.zspr and /dev/null differ diff --git a/data/sprites/official/boo-two.1.zspr b/data/sprites/official/boo-two.1.zspr deleted file mode 100644 index a5c5463c..00000000 Binary files a/data/sprites/official/boo-two.1.zspr and /dev/null differ diff --git a/data/sprites/official/boo.2.zspr b/data/sprites/official/boo.2.zspr deleted file mode 100644 index 24c74bde..00000000 Binary files a/data/sprites/official/boo.2.zspr and /dev/null differ diff --git a/data/sprites/official/bottle_o_goo.1.zspr b/data/sprites/official/bottle_o_goo.1.zspr deleted file mode 100644 index 28ca1f9b..00000000 Binary files a/data/sprites/official/bottle_o_goo.1.zspr and /dev/null differ diff --git a/data/sprites/official/botw-link.1.zspr b/data/sprites/official/botw-link.1.zspr deleted file mode 100644 index 1e14eff1..00000000 Binary files a/data/sprites/official/botw-link.1.zspr and /dev/null differ diff --git a/data/sprites/official/botw-zelda.1.zspr b/data/sprites/official/botw-zelda.1.zspr deleted file mode 100644 index 39f4a893..00000000 Binary files a/data/sprites/official/botw-zelda.1.zspr and /dev/null differ diff --git a/data/sprites/official/bowser.1.zspr b/data/sprites/official/bowser.1.zspr deleted file mode 100644 index 1cc256d8..00000000 Binary files a/data/sprites/official/bowser.1.zspr and /dev/null differ diff --git a/data/sprites/official/bowsette-red.1.zspr b/data/sprites/official/bowsette-red.1.zspr deleted file mode 100644 index d4bd4346..00000000 Binary files a/data/sprites/official/bowsette-red.1.zspr and /dev/null differ diff --git a/data/sprites/official/bowsette.1.zspr b/data/sprites/official/bowsette.1.zspr deleted file mode 100644 index 017414bc..00000000 Binary files a/data/sprites/official/bowsette.1.zspr and /dev/null differ diff --git a/data/sprites/official/branch.1.zspr b/data/sprites/official/branch.1.zspr deleted file mode 100644 index b7926418..00000000 Binary files a/data/sprites/official/branch.1.zspr and /dev/null differ diff --git a/data/sprites/official/brian.1.zspr b/data/sprites/official/brian.1.zspr deleted file mode 100644 index 013a2207..00000000 Binary files a/data/sprites/official/brian.1.zspr and /dev/null differ diff --git a/data/sprites/official/broccoli.1.zspr b/data/sprites/official/broccoli.1.zspr deleted file mode 100644 index e335df01..00000000 Binary files a/data/sprites/official/broccoli.1.zspr and /dev/null differ diff --git a/data/sprites/official/bronzor.1.zspr b/data/sprites/official/bronzor.1.zspr deleted file mode 100644 index d1afd117..00000000 Binary files a/data/sprites/official/bronzor.1.zspr and /dev/null differ diff --git a/data/sprites/official/bsboy.1.zspr b/data/sprites/official/bsboy.1.zspr deleted file mode 100644 index 7d00be74..00000000 Binary files a/data/sprites/official/bsboy.1.zspr and /dev/null differ diff --git a/data/sprites/official/bsgirl.1.zspr b/data/sprites/official/bsgirl.1.zspr deleted file mode 100644 index 82923751..00000000 Binary files a/data/sprites/official/bsgirl.1.zspr and /dev/null differ diff --git a/data/sprites/official/bubbles.1.zspr b/data/sprites/official/bubbles.1.zspr deleted file mode 100644 index bbba3b75..00000000 Binary files a/data/sprites/official/bubbles.1.zspr and /dev/null differ diff --git a/data/sprites/official/bullet_bill.1.zspr b/data/sprites/official/bullet_bill.1.zspr deleted file mode 100644 index 5b561b9e..00000000 Binary files a/data/sprites/official/bullet_bill.1.zspr and /dev/null differ diff --git a/data/sprites/official/buttercup.1.zspr b/data/sprites/official/buttercup.1.zspr deleted file mode 100644 index bd066c27..00000000 Binary files a/data/sprites/official/buttercup.1.zspr and /dev/null differ diff --git a/data/sprites/official/cactuar.1.zspr b/data/sprites/official/cactuar.1.zspr deleted file mode 100644 index 51c32893..00000000 Binary files a/data/sprites/official/cactuar.1.zspr and /dev/null differ diff --git a/data/sprites/official/cadence.1.zspr b/data/sprites/official/cadence.1.zspr deleted file mode 100644 index 05f174f7..00000000 Binary files a/data/sprites/official/cadence.1.zspr and /dev/null differ diff --git a/data/sprites/official/carlsagan42.1.zspr b/data/sprites/official/carlsagan42.1.zspr deleted file mode 100644 index 2632cb6f..00000000 Binary files a/data/sprites/official/carlsagan42.1.zspr and /dev/null differ diff --git a/data/sprites/official/casual-zelda.1.zspr b/data/sprites/official/casual-zelda.1.zspr deleted file mode 100644 index 80257f11..00000000 Binary files a/data/sprites/official/casual-zelda.1.zspr and /dev/null differ diff --git a/data/sprites/official/cat.3.zspr b/data/sprites/official/cat.3.zspr deleted file mode 100644 index 69946d73..00000000 Binary files a/data/sprites/official/cat.3.zspr and /dev/null differ diff --git a/data/sprites/official/catboo.1.zspr b/data/sprites/official/catboo.1.zspr deleted file mode 100644 index 45a4fa81..00000000 Binary files a/data/sprites/official/catboo.1.zspr and /dev/null differ diff --git a/data/sprites/official/cdilink.1.zspr b/data/sprites/official/cdilink.1.zspr deleted file mode 100644 index 3236f799..00000000 Binary files a/data/sprites/official/cdilink.1.zspr and /dev/null differ diff --git a/data/sprites/official/celes.1.zspr b/data/sprites/official/celes.1.zspr deleted file mode 100644 index ac0c1226..00000000 Binary files a/data/sprites/official/celes.1.zspr and /dev/null differ diff --git a/data/sprites/official/charizard.1.zspr b/data/sprites/official/charizard.1.zspr deleted file mode 100644 index babed511..00000000 Binary files a/data/sprites/official/charizard.1.zspr and /dev/null differ diff --git a/data/sprites/official/cheepcheep.1.zspr b/data/sprites/official/cheepcheep.1.zspr deleted file mode 100644 index a49545f2..00000000 Binary files a/data/sprites/official/cheepcheep.1.zspr and /dev/null differ diff --git a/data/sprites/official/chibity.1.zspr b/data/sprites/official/chibity.1.zspr deleted file mode 100644 index 949dbe2e..00000000 Binary files a/data/sprites/official/chibity.1.zspr and /dev/null differ diff --git a/data/sprites/official/chrizzz.1.zspr b/data/sprites/official/chrizzz.1.zspr deleted file mode 100644 index 337d5e5d..00000000 Binary files a/data/sprites/official/chrizzz.1.zspr and /dev/null differ diff --git a/data/sprites/official/cirno.1.zspr b/data/sprites/official/cirno.1.zspr deleted file mode 100644 index 75de8ab6..00000000 Binary files a/data/sprites/official/cirno.1.zspr and /dev/null differ diff --git a/data/sprites/official/clifford.1.zspr b/data/sprites/official/clifford.1.zspr deleted file mode 100644 index 73f848c1..00000000 Binary files a/data/sprites/official/clifford.1.zspr and /dev/null differ diff --git a/data/sprites/official/clyde.1.zspr b/data/sprites/official/clyde.1.zspr deleted file mode 100644 index b590a2ef..00000000 Binary files a/data/sprites/official/clyde.1.zspr and /dev/null differ diff --git a/data/sprites/official/conker.1.zspr b/data/sprites/official/conker.1.zspr deleted file mode 100644 index 121d5233..00000000 Binary files a/data/sprites/official/conker.1.zspr and /dev/null differ diff --git a/data/sprites/official/cornelius.1.zspr b/data/sprites/official/cornelius.1.zspr deleted file mode 100644 index 4c58f356..00000000 Binary files a/data/sprites/official/cornelius.1.zspr and /dev/null differ diff --git a/data/sprites/official/corona.1.zspr b/data/sprites/official/corona.1.zspr deleted file mode 100644 index 2ed39a78..00000000 Binary files a/data/sprites/official/corona.1.zspr and /dev/null differ diff --git a/data/sprites/official/crewmate.1.zspr b/data/sprites/official/crewmate.1.zspr deleted file mode 100644 index f2ce441d..00000000 Binary files a/data/sprites/official/crewmate.1.zspr and /dev/null differ diff --git a/data/sprites/official/cucco.1.zspr b/data/sprites/official/cucco.1.zspr deleted file mode 100644 index f237de4a..00000000 Binary files a/data/sprites/official/cucco.1.zspr and /dev/null differ diff --git a/data/sprites/official/cursor.1.zspr b/data/sprites/official/cursor.1.zspr deleted file mode 100644 index 45bc9739..00000000 Binary files a/data/sprites/official/cursor.1.zspr and /dev/null differ diff --git a/data/sprites/official/d_owls.2.zspr b/data/sprites/official/d_owls.2.zspr deleted file mode 100644 index a49080bb..00000000 Binary files a/data/sprites/official/d_owls.2.zspr and /dev/null differ diff --git a/data/sprites/official/dark-panda.1.zspr b/data/sprites/official/dark-panda.1.zspr deleted file mode 100644 index 1b39b747..00000000 Binary files a/data/sprites/official/dark-panda.1.zspr and /dev/null differ diff --git a/data/sprites/official/darkboy.1.zspr b/data/sprites/official/darkboy.1.zspr deleted file mode 100644 index de55ebbe..00000000 Binary files a/data/sprites/official/darkboy.1.zspr and /dev/null differ diff --git a/data/sprites/official/darkgirl.1.zspr b/data/sprites/official/darkgirl.1.zspr deleted file mode 100644 index 8fd848fd..00000000 Binary files a/data/sprites/official/darkgirl.1.zspr and /dev/null differ diff --git a/data/sprites/official/darklink-tunic.1.zspr b/data/sprites/official/darklink-tunic.1.zspr deleted file mode 100644 index fe417308..00000000 Binary files a/data/sprites/official/darklink-tunic.1.zspr and /dev/null differ diff --git a/data/sprites/official/darklink.1.zspr b/data/sprites/official/darklink.1.zspr deleted file mode 100644 index b0d9a95f..00000000 Binary files a/data/sprites/official/darklink.1.zspr and /dev/null differ diff --git a/data/sprites/official/darkswatchy.1.zspr b/data/sprites/official/darkswatchy.1.zspr deleted file mode 100644 index 88677425..00000000 Binary files a/data/sprites/official/darkswatchy.1.zspr and /dev/null differ diff --git a/data/sprites/official/darkzelda.1.zspr b/data/sprites/official/darkzelda.1.zspr deleted file mode 100644 index 519c278a..00000000 Binary files a/data/sprites/official/darkzelda.1.zspr and /dev/null differ diff --git a/data/sprites/official/darkzora.2.zspr b/data/sprites/official/darkzora.2.zspr deleted file mode 100644 index fbb15c69..00000000 Binary files a/data/sprites/official/darkzora.2.zspr and /dev/null differ diff --git a/data/sprites/official/deadpool-mythic.1.zspr b/data/sprites/official/deadpool-mythic.1.zspr deleted file mode 100644 index abcda926..00000000 Binary files a/data/sprites/official/deadpool-mythic.1.zspr and /dev/null differ diff --git a/data/sprites/official/deadpool.1.zspr b/data/sprites/official/deadpool.1.zspr deleted file mode 100644 index 3d2e87f7..00000000 Binary files a/data/sprites/official/deadpool.1.zspr and /dev/null differ diff --git a/data/sprites/official/deadrock.1.zspr b/data/sprites/official/deadrock.1.zspr deleted file mode 100644 index cc28cd79..00000000 Binary files a/data/sprites/official/deadrock.1.zspr and /dev/null differ diff --git a/data/sprites/official/decidueye.1.zspr b/data/sprites/official/decidueye.1.zspr deleted file mode 100644 index 1c769e62..00000000 Binary files a/data/sprites/official/decidueye.1.zspr and /dev/null differ diff --git a/data/sprites/official/dekar.1.zspr b/data/sprites/official/dekar.1.zspr deleted file mode 100644 index 203abccd..00000000 Binary files a/data/sprites/official/dekar.1.zspr and /dev/null differ diff --git a/data/sprites/official/demonlink.1.zspr b/data/sprites/official/demonlink.1.zspr deleted file mode 100644 index 2daf7359..00000000 Binary files a/data/sprites/official/demonlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/dragonite.2.zspr b/data/sprites/official/dragonite.2.zspr deleted file mode 100644 index 37d95ad0..00000000 Binary files a/data/sprites/official/dragonite.2.zspr and /dev/null differ diff --git a/data/sprites/official/drake.1.zspr b/data/sprites/official/drake.1.zspr deleted file mode 100644 index 1be94a75..00000000 Binary files a/data/sprites/official/drake.1.zspr and /dev/null differ diff --git a/data/sprites/official/eggplant.1.zspr b/data/sprites/official/eggplant.1.zspr deleted file mode 100644 index c33c2008..00000000 Binary files a/data/sprites/official/eggplant.1.zspr and /dev/null differ diff --git a/data/sprites/official/emosaru.1.zspr b/data/sprites/official/emosaru.1.zspr deleted file mode 100644 index a636dad9..00000000 Binary files a/data/sprites/official/emosaru.1.zspr and /dev/null differ diff --git a/data/sprites/official/ezlo.1.zspr b/data/sprites/official/ezlo.1.zspr deleted file mode 100644 index 54596847..00000000 Binary files a/data/sprites/official/ezlo.1.zspr and /dev/null differ diff --git a/data/sprites/official/fierce-deity-link.2.zspr b/data/sprites/official/fierce-deity-link.2.zspr deleted file mode 100644 index 0700bcac..00000000 Binary files a/data/sprites/official/fierce-deity-link.2.zspr and /dev/null differ diff --git a/data/sprites/official/finn.3.zspr b/data/sprites/official/finn.3.zspr deleted file mode 100644 index 265b197c..00000000 Binary files a/data/sprites/official/finn.3.zspr and /dev/null differ diff --git a/data/sprites/official/finny_bear.1.zspr b/data/sprites/official/finny_bear.1.zspr deleted file mode 100644 index 9c3a530b..00000000 Binary files a/data/sprites/official/finny_bear.1.zspr and /dev/null differ diff --git a/data/sprites/official/fish_floodgate.1.zspr b/data/sprites/official/fish_floodgate.1.zspr deleted file mode 100644 index 86684e7d..00000000 Binary files a/data/sprites/official/fish_floodgate.1.zspr and /dev/null differ diff --git a/data/sprites/official/flavor_guy.1.zspr b/data/sprites/official/flavor_guy.1.zspr deleted file mode 100644 index 5e1df365..00000000 Binary files a/data/sprites/official/flavor_guy.1.zspr and /dev/null differ diff --git a/data/sprites/official/foxlink.1.zspr b/data/sprites/official/foxlink.1.zspr deleted file mode 100644 index d6eaf433..00000000 Binary files a/data/sprites/official/foxlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/freya.1.zspr b/data/sprites/official/freya.1.zspr deleted file mode 100644 index b43338d5..00000000 Binary files a/data/sprites/official/freya.1.zspr and /dev/null differ diff --git a/data/sprites/official/frisk.1.zspr b/data/sprites/official/frisk.1.zspr deleted file mode 100644 index d521cae3..00000000 Binary files a/data/sprites/official/frisk.1.zspr and /dev/null differ diff --git a/data/sprites/official/froglink.3.zspr b/data/sprites/official/froglink.3.zspr deleted file mode 100644 index f5c46d82..00000000 Binary files a/data/sprites/official/froglink.3.zspr and /dev/null differ diff --git a/data/sprites/official/fujin.2.zspr b/data/sprites/official/fujin.2.zspr deleted file mode 100644 index 9254ff7b..00000000 Binary files a/data/sprites/official/fujin.2.zspr and /dev/null differ diff --git a/data/sprites/official/future_trunks.1.zspr b/data/sprites/official/future_trunks.1.zspr deleted file mode 100644 index 456e64c7..00000000 Binary files a/data/sprites/official/future_trunks.1.zspr and /dev/null differ diff --git a/data/sprites/official/gamer.1.zspr b/data/sprites/official/gamer.1.zspr deleted file mode 100644 index 9f78d894..00000000 Binary files a/data/sprites/official/gamer.1.zspr and /dev/null differ diff --git a/data/sprites/official/ganon.1.zspr b/data/sprites/official/ganon.1.zspr deleted file mode 100644 index a6adda43..00000000 Binary files a/data/sprites/official/ganon.1.zspr and /dev/null differ diff --git a/data/sprites/official/ganondorf.1.zspr b/data/sprites/official/ganondorf.1.zspr deleted file mode 100644 index 5bb6f548..00000000 Binary files a/data/sprites/official/ganondorf.1.zspr and /dev/null differ diff --git a/data/sprites/official/garfield.2.zspr b/data/sprites/official/garfield.2.zspr deleted file mode 100644 index 6ca890e8..00000000 Binary files a/data/sprites/official/garfield.2.zspr and /dev/null differ diff --git a/data/sprites/official/garnet.1.zspr b/data/sprites/official/garnet.1.zspr deleted file mode 100644 index 858497c7..00000000 Binary files a/data/sprites/official/garnet.1.zspr and /dev/null differ diff --git a/data/sprites/official/garomaster.1.zspr b/data/sprites/official/garomaster.1.zspr deleted file mode 100644 index 65b9959d..00000000 Binary files a/data/sprites/official/garomaster.1.zspr and /dev/null differ diff --git a/data/sprites/official/gbc-link.1.zspr b/data/sprites/official/gbc-link.1.zspr deleted file mode 100644 index e98a6d08..00000000 Binary files a/data/sprites/official/gbc-link.1.zspr and /dev/null differ diff --git a/data/sprites/official/geno.1.zspr b/data/sprites/official/geno.1.zspr deleted file mode 100644 index 3d747a2a..00000000 Binary files a/data/sprites/official/geno.1.zspr and /dev/null differ diff --git a/data/sprites/official/gliitchwiitch.1.zspr b/data/sprites/official/gliitchwiitch.1.zspr deleted file mode 100644 index 0f618df0..00000000 Binary files a/data/sprites/official/gliitchwiitch.1.zspr and /dev/null differ diff --git a/data/sprites/official/gobli.1.zspr b/data/sprites/official/gobli.1.zspr deleted file mode 100644 index 51dd1192..00000000 Binary files a/data/sprites/official/gobli.1.zspr and /dev/null differ diff --git a/data/sprites/official/goomba.1.zspr b/data/sprites/official/goomba.1.zspr deleted file mode 100644 index 0438682f..00000000 Binary files a/data/sprites/official/goomba.1.zspr and /dev/null differ diff --git a/data/sprites/official/goose.1.zspr b/data/sprites/official/goose.1.zspr deleted file mode 100644 index d2ffb5ba..00000000 Binary files a/data/sprites/official/goose.1.zspr and /dev/null differ diff --git a/data/sprites/official/grandpoobear.2.zspr b/data/sprites/official/grandpoobear.2.zspr deleted file mode 100644 index 72663680..00000000 Binary files a/data/sprites/official/grandpoobear.2.zspr and /dev/null differ diff --git a/data/sprites/official/gretis.1.zspr b/data/sprites/official/gretis.1.zspr deleted file mode 100644 index 87607a17..00000000 Binary files a/data/sprites/official/gretis.1.zspr and /dev/null differ diff --git a/data/sprites/official/grunclestan.1.zspr b/data/sprites/official/grunclestan.1.zspr deleted file mode 100644 index cf371839..00000000 Binary files a/data/sprites/official/grunclestan.1.zspr and /dev/null differ diff --git a/data/sprites/official/guiz.1.zspr b/data/sprites/official/guiz.1.zspr deleted file mode 100644 index 995c08ad..00000000 Binary files a/data/sprites/official/guiz.1.zspr and /dev/null differ diff --git a/data/sprites/official/hanna.1.zspr b/data/sprites/official/hanna.1.zspr deleted file mode 100644 index 92ce372e..00000000 Binary files a/data/sprites/official/hanna.1.zspr and /dev/null differ diff --git a/data/sprites/official/hardhat_beetle.1.zspr b/data/sprites/official/hardhat_beetle.1.zspr deleted file mode 100644 index 80b63af1..00000000 Binary files a/data/sprites/official/hardhat_beetle.1.zspr and /dev/null differ diff --git a/data/sprites/official/hat-kid.1.zspr b/data/sprites/official/hat-kid.1.zspr deleted file mode 100644 index d0341060..00000000 Binary files a/data/sprites/official/hat-kid.1.zspr and /dev/null differ diff --git a/data/sprites/official/headlesslink.1.zspr b/data/sprites/official/headlesslink.1.zspr deleted file mode 100644 index 8a9b3ce4..00000000 Binary files a/data/sprites/official/headlesslink.1.zspr and /dev/null differ diff --git a/data/sprites/official/hello_kitty.1.zspr b/data/sprites/official/hello_kitty.1.zspr deleted file mode 100644 index a2f5df06..00000000 Binary files a/data/sprites/official/hello_kitty.1.zspr and /dev/null differ diff --git a/data/sprites/official/hidari.1.zspr b/data/sprites/official/hidari.1.zspr deleted file mode 100644 index 54a4d0da..00000000 Binary files a/data/sprites/official/hidari.1.zspr and /dev/null differ diff --git a/data/sprites/official/hint_tile.1.zspr b/data/sprites/official/hint_tile.1.zspr deleted file mode 100644 index 9cfd7e90..00000000 Binary files a/data/sprites/official/hint_tile.1.zspr and /dev/null differ diff --git a/data/sprites/official/hoarder-bush.1.zspr b/data/sprites/official/hoarder-bush.1.zspr deleted file mode 100644 index d2adb227..00000000 Binary files a/data/sprites/official/hoarder-bush.1.zspr and /dev/null differ diff --git a/data/sprites/official/hoarder-pot.1.zspr b/data/sprites/official/hoarder-pot.1.zspr deleted file mode 100644 index 717e4199..00000000 Binary files a/data/sprites/official/hoarder-pot.1.zspr and /dev/null differ diff --git a/data/sprites/official/hoarder-rock.1.zspr b/data/sprites/official/hoarder-rock.1.zspr deleted file mode 100644 index a93fd1c4..00000000 Binary files a/data/sprites/official/hoarder-rock.1.zspr and /dev/null differ diff --git a/data/sprites/official/hollow-knight.1.zspr b/data/sprites/official/hollow-knight.1.zspr deleted file mode 100644 index 31d8ee3d..00000000 Binary files a/data/sprites/official/hollow-knight.1.zspr and /dev/null differ diff --git a/data/sprites/official/homer.1.zspr b/data/sprites/official/homer.1.zspr deleted file mode 100644 index ee8b5f5f..00000000 Binary files a/data/sprites/official/homer.1.zspr and /dev/null differ diff --git a/data/sprites/official/hotdog.1.zspr b/data/sprites/official/hotdog.1.zspr deleted file mode 100644 index 4ed5e636..00000000 Binary files a/data/sprites/official/hotdog.1.zspr and /dev/null differ diff --git a/data/sprites/official/hyruleknight.1.zspr b/data/sprites/official/hyruleknight.1.zspr deleted file mode 100644 index a8815bc3..00000000 Binary files a/data/sprites/official/hyruleknight.1.zspr and /dev/null differ diff --git a/data/sprites/official/ibazly.1.zspr b/data/sprites/official/ibazly.1.zspr deleted file mode 100644 index 01114c9e..00000000 Binary files a/data/sprites/official/ibazly.1.zspr and /dev/null differ diff --git a/data/sprites/official/ignignokt.2.zspr b/data/sprites/official/ignignokt.2.zspr deleted file mode 100644 index f06d07cc..00000000 Binary files a/data/sprites/official/ignignokt.2.zspr and /dev/null differ diff --git a/data/sprites/official/informant_woman.1.zspr b/data/sprites/official/informant_woman.1.zspr deleted file mode 100644 index 6465a0e9..00000000 Binary files a/data/sprites/official/informant_woman.1.zspr and /dev/null differ diff --git a/data/sprites/official/inkling.1.zspr b/data/sprites/official/inkling.1.zspr deleted file mode 100644 index 6b39e4a7..00000000 Binary files a/data/sprites/official/inkling.1.zspr and /dev/null differ diff --git a/data/sprites/official/invisibleman.1.zspr b/data/sprites/official/invisibleman.1.zspr deleted file mode 100644 index 7993c500..00000000 Binary files a/data/sprites/official/invisibleman.1.zspr and /dev/null differ diff --git a/data/sprites/official/jack-frost.1.zspr b/data/sprites/official/jack-frost.1.zspr deleted file mode 100644 index 12dd417a..00000000 Binary files a/data/sprites/official/jack-frost.1.zspr and /dev/null differ diff --git a/data/sprites/official/jason_frudnick.1.zspr b/data/sprites/official/jason_frudnick.1.zspr deleted file mode 100644 index 2411759c..00000000 Binary files a/data/sprites/official/jason_frudnick.1.zspr and /dev/null differ diff --git a/data/sprites/official/jasp.1.zspr b/data/sprites/official/jasp.1.zspr deleted file mode 100644 index 6dc74496..00000000 Binary files a/data/sprites/official/jasp.1.zspr and /dev/null differ diff --git a/data/sprites/official/jogurt.1.zspr b/data/sprites/official/jogurt.1.zspr deleted file mode 100644 index b229060c..00000000 Binary files a/data/sprites/official/jogurt.1.zspr and /dev/null differ diff --git a/data/sprites/official/katsura.1.zspr b/data/sprites/official/katsura.1.zspr deleted file mode 100644 index 422a0faf..00000000 Binary files a/data/sprites/official/katsura.1.zspr and /dev/null differ diff --git a/data/sprites/official/kecleon.1.zspr b/data/sprites/official/kecleon.1.zspr deleted file mode 100644 index 5e1786ba..00000000 Binary files a/data/sprites/official/kecleon.1.zspr and /dev/null differ diff --git a/data/sprites/official/kenny_mccormick.1.zspr b/data/sprites/official/kenny_mccormick.1.zspr deleted file mode 100644 index c66a74a5..00000000 Binary files a/data/sprites/official/kenny_mccormick.1.zspr and /dev/null differ diff --git a/data/sprites/official/ketchup.1.zspr b/data/sprites/official/ketchup.1.zspr deleted file mode 100644 index 9dbb326c..00000000 Binary files a/data/sprites/official/ketchup.1.zspr and /dev/null differ diff --git a/data/sprites/official/kholdstare.1.zspr b/data/sprites/official/kholdstare.1.zspr deleted file mode 100644 index 393a491d..00000000 Binary files a/data/sprites/official/kholdstare.1.zspr and /dev/null differ diff --git a/data/sprites/official/king_gothalion.1.zspr b/data/sprites/official/king_gothalion.1.zspr deleted file mode 100644 index 65c73f04..00000000 Binary files a/data/sprites/official/king_gothalion.1.zspr and /dev/null differ diff --git a/data/sprites/official/king_graham.1.zspr b/data/sprites/official/king_graham.1.zspr deleted file mode 100644 index 28b75cf1..00000000 Binary files a/data/sprites/official/king_graham.1.zspr and /dev/null differ diff --git a/data/sprites/official/kirby-meta.1.zspr b/data/sprites/official/kirby-meta.1.zspr deleted file mode 100644 index 9cb132b3..00000000 Binary files a/data/sprites/official/kirby-meta.1.zspr and /dev/null differ diff --git a/data/sprites/official/kore8.1.zspr b/data/sprites/official/kore8.1.zspr deleted file mode 100644 index a1db104a..00000000 Binary files a/data/sprites/official/kore8.1.zspr and /dev/null differ diff --git a/data/sprites/official/korok.1.zspr b/data/sprites/official/korok.1.zspr deleted file mode 100644 index 3045b95b..00000000 Binary files a/data/sprites/official/korok.1.zspr and /dev/null differ diff --git a/data/sprites/official/lakitu.1.zspr b/data/sprites/official/lakitu.1.zspr deleted file mode 100644 index 24d0f12e..00000000 Binary files a/data/sprites/official/lakitu.1.zspr and /dev/null differ diff --git a/data/sprites/official/lapras.1.zspr b/data/sprites/official/lapras.1.zspr deleted file mode 100644 index bcec01b2..00000000 Binary files a/data/sprites/official/lapras.1.zspr and /dev/null differ diff --git a/data/sprites/official/lest.1.zspr b/data/sprites/official/lest.1.zspr deleted file mode 100644 index 99764924..00000000 Binary files a/data/sprites/official/lest.1.zspr and /dev/null differ diff --git a/data/sprites/official/lily.1.zspr b/data/sprites/official/lily.1.zspr deleted file mode 100644 index 5cb5d2aa..00000000 Binary files a/data/sprites/official/lily.1.zspr and /dev/null differ diff --git a/data/sprites/official/linja.1.zspr b/data/sprites/official/linja.1.zspr deleted file mode 100644 index 414efaf7..00000000 Binary files a/data/sprites/official/linja.1.zspr and /dev/null differ diff --git a/data/sprites/official/link-redrawn.1.zspr b/data/sprites/official/link-redrawn.1.zspr deleted file mode 100644 index 1cbb7501..00000000 Binary files a/data/sprites/official/link-redrawn.1.zspr and /dev/null differ diff --git a/data/sprites/official/linkhatcolor.1.zspr b/data/sprites/official/linkhatcolor.1.zspr deleted file mode 100644 index af53898d..00000000 Binary files a/data/sprites/official/linkhatcolor.1.zspr and /dev/null differ diff --git a/data/sprites/official/linktuniccolor.1.zspr b/data/sprites/official/linktuniccolor.1.zspr deleted file mode 100644 index 305a9f8f..00000000 Binary files a/data/sprites/official/linktuniccolor.1.zspr and /dev/null differ diff --git a/data/sprites/official/little-hylian.1.zspr b/data/sprites/official/little-hylian.1.zspr deleted file mode 100644 index fbee749c..00000000 Binary files a/data/sprites/official/little-hylian.1.zspr and /dev/null differ diff --git a/data/sprites/official/littlepony.1.zspr b/data/sprites/official/littlepony.1.zspr deleted file mode 100644 index 0ed4b1b1..00000000 Binary files a/data/sprites/official/littlepony.1.zspr and /dev/null differ diff --git a/data/sprites/official/locke.1.zspr b/data/sprites/official/locke.1.zspr deleted file mode 100644 index c2273791..00000000 Binary files a/data/sprites/official/locke.1.zspr and /dev/null differ diff --git a/data/sprites/official/locke_merchant.1.zspr b/data/sprites/official/locke_merchant.1.zspr deleted file mode 100644 index bfd87c7d..00000000 Binary files a/data/sprites/official/locke_merchant.1.zspr and /dev/null differ diff --git a/data/sprites/official/lucario.1.zspr b/data/sprites/official/lucario.1.zspr deleted file mode 100644 index 44ce395e..00000000 Binary files a/data/sprites/official/lucario.1.zspr and /dev/null differ diff --git a/data/sprites/official/luffy.1.zspr b/data/sprites/official/luffy.1.zspr deleted file mode 100644 index 0661577b..00000000 Binary files a/data/sprites/official/luffy.1.zspr and /dev/null differ diff --git a/data/sprites/official/luigi.1.zspr b/data/sprites/official/luigi.1.zspr deleted file mode 100644 index 1a1dc552..00000000 Binary files a/data/sprites/official/luigi.1.zspr and /dev/null differ diff --git a/data/sprites/official/luna-maindo.1.zspr b/data/sprites/official/luna-maindo.1.zspr deleted file mode 100644 index 5a8acdbf..00000000 Binary files a/data/sprites/official/luna-maindo.1.zspr and /dev/null differ diff --git a/data/sprites/official/madeline.1.zspr b/data/sprites/official/madeline.1.zspr deleted file mode 100644 index 8256e6a3..00000000 Binary files a/data/sprites/official/madeline.1.zspr and /dev/null differ diff --git a/data/sprites/official/magus.1.zspr b/data/sprites/official/magus.1.zspr deleted file mode 100644 index 171980ef..00000000 Binary files a/data/sprites/official/magus.1.zspr and /dev/null differ diff --git a/data/sprites/official/maiden.1.zspr b/data/sprites/official/maiden.1.zspr deleted file mode 100644 index e0297901..00000000 Binary files a/data/sprites/official/maiden.1.zspr and /dev/null differ diff --git a/data/sprites/official/mallow-cat.1.zspr b/data/sprites/official/mallow-cat.1.zspr deleted file mode 100644 index 395684b2..00000000 Binary files a/data/sprites/official/mallow-cat.1.zspr and /dev/null differ diff --git a/data/sprites/official/mangalink.1.zspr b/data/sprites/official/mangalink.1.zspr deleted file mode 100644 index adb57b99..00000000 Binary files a/data/sprites/official/mangalink.1.zspr and /dev/null differ diff --git a/data/sprites/official/maplequeen.2.zspr b/data/sprites/official/maplequeen.2.zspr deleted file mode 100644 index 35b7deec..00000000 Binary files a/data/sprites/official/maplequeen.2.zspr and /dev/null differ diff --git a/data/sprites/official/marin.2.zspr b/data/sprites/official/marin.2.zspr deleted file mode 100644 index 72a06ecf..00000000 Binary files a/data/sprites/official/marin.2.zspr and /dev/null differ diff --git a/data/sprites/official/mario-classic.2.zspr b/data/sprites/official/mario-classic.2.zspr deleted file mode 100644 index 6443e327..00000000 Binary files a/data/sprites/official/mario-classic.2.zspr and /dev/null differ diff --git a/data/sprites/official/mario_tanooki.1.zspr b/data/sprites/official/mario_tanooki.1.zspr deleted file mode 100644 index 255350dd..00000000 Binary files a/data/sprites/official/mario_tanooki.1.zspr and /dev/null differ diff --git a/data/sprites/official/mariocappy.1.zspr b/data/sprites/official/mariocappy.1.zspr deleted file mode 100644 index b888396d..00000000 Binary files a/data/sprites/official/mariocappy.1.zspr and /dev/null differ diff --git a/data/sprites/official/marisa.1.zspr b/data/sprites/official/marisa.1.zspr deleted file mode 100644 index 16b2a803..00000000 Binary files a/data/sprites/official/marisa.1.zspr and /dev/null differ diff --git a/data/sprites/official/matthias.1.zspr b/data/sprites/official/matthias.1.zspr deleted file mode 100644 index 062dae6d..00000000 Binary files a/data/sprites/official/matthias.1.zspr and /dev/null differ diff --git a/data/sprites/official/meatwad.1.zspr b/data/sprites/official/meatwad.1.zspr deleted file mode 100644 index a09a4adf..00000000 Binary files a/data/sprites/official/meatwad.1.zspr and /dev/null differ diff --git a/data/sprites/official/medallions.1.zspr b/data/sprites/official/medallions.1.zspr deleted file mode 100644 index dc4b04d1..00000000 Binary files a/data/sprites/official/medallions.1.zspr and /dev/null differ diff --git a/data/sprites/official/medli.1.zspr b/data/sprites/official/medli.1.zspr deleted file mode 100644 index 59284a36..00000000 Binary files a/data/sprites/official/medli.1.zspr and /dev/null differ diff --git a/data/sprites/official/megaman-x.2.zspr b/data/sprites/official/megaman-x.2.zspr deleted file mode 100644 index ffe75595..00000000 Binary files a/data/sprites/official/megaman-x.2.zspr and /dev/null differ diff --git a/data/sprites/official/metroid.1.zspr b/data/sprites/official/metroid.1.zspr deleted file mode 100644 index d81187cb..00000000 Binary files a/data/sprites/official/metroid.1.zspr and /dev/null differ diff --git a/data/sprites/official/mew.1.zspr b/data/sprites/official/mew.1.zspr deleted file mode 100644 index a06dc8d6..00000000 Binary files a/data/sprites/official/mew.1.zspr and /dev/null differ diff --git a/data/sprites/official/mike-jones.2.zspr b/data/sprites/official/mike-jones.2.zspr deleted file mode 100644 index 550fb213..00000000 Binary files a/data/sprites/official/mike-jones.2.zspr and /dev/null differ diff --git a/data/sprites/official/minish_link.1.zspr b/data/sprites/official/minish_link.1.zspr deleted file mode 100644 index 4b342c1a..00000000 Binary files a/data/sprites/official/minish_link.1.zspr and /dev/null differ diff --git a/data/sprites/official/minishcaplink.2.zspr b/data/sprites/official/minishcaplink.2.zspr deleted file mode 100644 index aaca256b..00000000 Binary files a/data/sprites/official/minishcaplink.2.zspr and /dev/null differ diff --git a/data/sprites/official/missingno.1.zspr b/data/sprites/official/missingno.1.zspr deleted file mode 100644 index 68e61b9b..00000000 Binary files a/data/sprites/official/missingno.1.zspr and /dev/null differ diff --git a/data/sprites/official/moblin.1.zspr b/data/sprites/official/moblin.1.zspr deleted file mode 100644 index 3e425e12..00000000 Binary files a/data/sprites/official/moblin.1.zspr and /dev/null differ diff --git a/data/sprites/official/modernlink.1.zspr b/data/sprites/official/modernlink.1.zspr deleted file mode 100644 index 6d5e68a4..00000000 Binary files a/data/sprites/official/modernlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/mog.2.zspr b/data/sprites/official/mog.2.zspr deleted file mode 100644 index a6ed2225..00000000 Binary files a/data/sprites/official/mog.2.zspr and /dev/null differ diff --git a/data/sprites/official/momiji.1.zspr b/data/sprites/official/momiji.1.zspr deleted file mode 100644 index 86a18586..00000000 Binary files a/data/sprites/official/momiji.1.zspr and /dev/null differ diff --git a/data/sprites/official/moosh.1.zspr b/data/sprites/official/moosh.1.zspr deleted file mode 100644 index 0a1e167a..00000000 Binary files a/data/sprites/official/moosh.1.zspr and /dev/null differ diff --git a/data/sprites/official/mouse.1.zspr b/data/sprites/official/mouse.1.zspr deleted file mode 100644 index 16ba884d..00000000 Binary files a/data/sprites/official/mouse.1.zspr and /dev/null differ diff --git a/data/sprites/official/ms-paintdog.1.zspr b/data/sprites/official/ms-paintdog.1.zspr deleted file mode 100644 index 75f5f541..00000000 Binary files a/data/sprites/official/ms-paintdog.1.zspr and /dev/null differ diff --git a/data/sprites/official/mushy.1.zspr b/data/sprites/official/mushy.1.zspr deleted file mode 100644 index a6c924a5..00000000 Binary files a/data/sprites/official/mushy.1.zspr and /dev/null differ diff --git a/data/sprites/official/naturelink.1.zspr b/data/sprites/official/naturelink.1.zspr deleted file mode 100644 index bdfd0efb..00000000 Binary files a/data/sprites/official/naturelink.1.zspr and /dev/null differ diff --git a/data/sprites/official/navi.1.zspr b/data/sprites/official/navi.1.zspr deleted file mode 100644 index 4621bf4a..00000000 Binary files a/data/sprites/official/navi.1.zspr and /dev/null differ diff --git a/data/sprites/official/navirou.2.zspr b/data/sprites/official/navirou.2.zspr deleted file mode 100644 index ea9d95a4..00000000 Binary files a/data/sprites/official/navirou.2.zspr and /dev/null differ diff --git a/data/sprites/official/ned-flanders.1.zspr b/data/sprites/official/ned-flanders.1.zspr deleted file mode 100644 index 78ed5bc4..00000000 Binary files a/data/sprites/official/ned-flanders.1.zspr and /dev/null differ diff --git a/data/sprites/official/negativelink.1.zspr b/data/sprites/official/negativelink.1.zspr deleted file mode 100644 index a3dd1566..00000000 Binary files a/data/sprites/official/negativelink.1.zspr and /dev/null differ diff --git a/data/sprites/official/neosad.1.zspr b/data/sprites/official/neosad.1.zspr deleted file mode 100644 index 7e95d7f7..00000000 Binary files a/data/sprites/official/neosad.1.zspr and /dev/null differ diff --git a/data/sprites/official/neslink.1.zspr b/data/sprites/official/neslink.1.zspr deleted file mode 100644 index 805b3162..00000000 Binary files a/data/sprites/official/neslink.1.zspr and /dev/null differ diff --git a/data/sprites/official/ness.1.zspr b/data/sprites/official/ness.1.zspr deleted file mode 100644 index b8b3de81..00000000 Binary files a/data/sprites/official/ness.1.zspr and /dev/null differ diff --git a/data/sprites/official/nia.1.zspr b/data/sprites/official/nia.1.zspr deleted file mode 100644 index 5d01ba4b..00000000 Binary files a/data/sprites/official/nia.1.zspr and /dev/null differ diff --git a/data/sprites/official/niddraig.1.zspr b/data/sprites/official/niddraig.1.zspr deleted file mode 100644 index d02794bc..00000000 Binary files a/data/sprites/official/niddraig.1.zspr and /dev/null differ diff --git a/data/sprites/official/niko.1.zspr b/data/sprites/official/niko.1.zspr deleted file mode 100644 index 5d39e6bb..00000000 Binary files a/data/sprites/official/niko.1.zspr and /dev/null differ diff --git a/data/sprites/official/oldman.2.zspr b/data/sprites/official/oldman.2.zspr deleted file mode 100644 index 1d47cdac..00000000 Binary files a/data/sprites/official/oldman.2.zspr and /dev/null differ diff --git a/data/sprites/official/ori.2.zspr b/data/sprites/official/ori.2.zspr deleted file mode 100644 index 10c1e462..00000000 Binary files a/data/sprites/official/ori.2.zspr and /dev/null differ diff --git a/data/sprites/official/outlinelink.1.zspr b/data/sprites/official/outlinelink.1.zspr deleted file mode 100644 index 50ae98bc..00000000 Binary files a/data/sprites/official/outlinelink.1.zspr and /dev/null differ diff --git a/data/sprites/official/parallelworldslink.1.zspr b/data/sprites/official/parallelworldslink.1.zspr deleted file mode 100644 index 71a9bdc1..00000000 Binary files a/data/sprites/official/parallelworldslink.1.zspr and /dev/null differ diff --git a/data/sprites/official/paula.1.zspr b/data/sprites/official/paula.1.zspr deleted file mode 100644 index 657752ea..00000000 Binary files a/data/sprites/official/paula.1.zspr and /dev/null differ diff --git a/data/sprites/official/peach.1.zspr b/data/sprites/official/peach.1.zspr deleted file mode 100644 index 7973f952..00000000 Binary files a/data/sprites/official/peach.1.zspr and /dev/null differ diff --git a/data/sprites/official/penguinlink.1.zspr b/data/sprites/official/penguinlink.1.zspr deleted file mode 100644 index 2fe01e49..00000000 Binary files a/data/sprites/official/penguinlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/pete.1.zspr b/data/sprites/official/pete.1.zspr deleted file mode 100644 index a3135615..00000000 Binary files a/data/sprites/official/pete.1.zspr and /dev/null differ diff --git a/data/sprites/official/phoenix-wright.1.zspr b/data/sprites/official/phoenix-wright.1.zspr deleted file mode 100644 index d7cb0be2..00000000 Binary files a/data/sprites/official/phoenix-wright.1.zspr and /dev/null differ diff --git a/data/sprites/official/pikachu.1.zspr b/data/sprites/official/pikachu.1.zspr deleted file mode 100644 index 0b8a88c4..00000000 Binary files a/data/sprites/official/pikachu.1.zspr and /dev/null differ diff --git a/data/sprites/official/pinkribbonlink.2.zspr b/data/sprites/official/pinkribbonlink.2.zspr deleted file mode 100644 index ba516f18..00000000 Binary files a/data/sprites/official/pinkribbonlink.2.zspr and /dev/null differ diff --git a/data/sprites/official/piranha_plant.1.zspr b/data/sprites/official/piranha_plant.1.zspr deleted file mode 100644 index 59bf4d0d..00000000 Binary files a/data/sprites/official/piranha_plant.1.zspr and /dev/null differ diff --git a/data/sprites/official/plagueknight.1.zspr b/data/sprites/official/plagueknight.1.zspr deleted file mode 100644 index 258bed7b..00000000 Binary files a/data/sprites/official/plagueknight.1.zspr and /dev/null differ diff --git a/data/sprites/official/pokey.1.zspr b/data/sprites/official/pokey.1.zspr deleted file mode 100644 index 4de17faf..00000000 Binary files a/data/sprites/official/pokey.1.zspr and /dev/null differ diff --git a/data/sprites/official/popoi.1.zspr b/data/sprites/official/popoi.1.zspr deleted file mode 100644 index 663d4dc1..00000000 Binary files a/data/sprites/official/popoi.1.zspr and /dev/null differ diff --git a/data/sprites/official/poppy.1.zspr b/data/sprites/official/poppy.1.zspr deleted file mode 100644 index 80d4ca69..00000000 Binary files a/data/sprites/official/poppy.1.zspr and /dev/null differ diff --git a/data/sprites/official/porg_knight.1.zspr b/data/sprites/official/porg_knight.1.zspr deleted file mode 100644 index 4d6f9635..00000000 Binary files a/data/sprites/official/porg_knight.1.zspr and /dev/null differ diff --git a/data/sprites/official/powerpuff_girl.1.zspr b/data/sprites/official/powerpuff_girl.1.zspr deleted file mode 100644 index fbf3c694..00000000 Binary files a/data/sprites/official/powerpuff_girl.1.zspr and /dev/null differ diff --git a/data/sprites/official/pridelink.2.zspr b/data/sprites/official/pridelink.2.zspr deleted file mode 100644 index 66231013..00000000 Binary files a/data/sprites/official/pridelink.2.zspr and /dev/null differ diff --git a/data/sprites/official/primm.1.zspr b/data/sprites/official/primm.1.zspr deleted file mode 100644 index e9ff2d05..00000000 Binary files a/data/sprites/official/primm.1.zspr and /dev/null differ diff --git a/data/sprites/official/princess_bubblegum.1.zspr b/data/sprites/official/princess_bubblegum.1.zspr deleted file mode 100644 index c46dcc0f..00000000 Binary files a/data/sprites/official/princess_bubblegum.1.zspr and /dev/null differ diff --git a/data/sprites/official/psyduck.2.zspr b/data/sprites/official/psyduck.2.zspr deleted file mode 100644 index c9e17117..00000000 Binary files a/data/sprites/official/psyduck.2.zspr and /dev/null differ diff --git a/data/sprites/official/pug.1.zspr b/data/sprites/official/pug.1.zspr deleted file mode 100644 index 60692711..00000000 Binary files a/data/sprites/official/pug.1.zspr and /dev/null differ diff --git a/data/sprites/official/purplechest-bottle.1.zspr b/data/sprites/official/purplechest-bottle.1.zspr deleted file mode 100644 index 8daed4d6..00000000 Binary files a/data/sprites/official/purplechest-bottle.1.zspr and /dev/null differ diff --git a/data/sprites/official/pyro.1.zspr b/data/sprites/official/pyro.1.zspr deleted file mode 100644 index 9037c8e4..00000000 Binary files a/data/sprites/official/pyro.1.zspr and /dev/null differ diff --git a/data/sprites/official/rainbowlink.1.zspr b/data/sprites/official/rainbowlink.1.zspr deleted file mode 100644 index bc8443f9..00000000 Binary files a/data/sprites/official/rainbowlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/rat.1.zspr b/data/sprites/official/rat.1.zspr deleted file mode 100644 index b4574c06..00000000 Binary files a/data/sprites/official/rat.1.zspr and /dev/null differ diff --git a/data/sprites/official/red-mage.1.zspr b/data/sprites/official/red-mage.1.zspr deleted file mode 100644 index 803a5b6f..00000000 Binary files a/data/sprites/official/red-mage.1.zspr and /dev/null differ diff --git a/data/sprites/official/remeer.1.zspr b/data/sprites/official/remeer.1.zspr deleted file mode 100644 index 8d7f245a..00000000 Binary files a/data/sprites/official/remeer.1.zspr and /dev/null differ diff --git a/data/sprites/official/rick.1.zspr b/data/sprites/official/rick.1.zspr deleted file mode 100644 index 93a163f6..00000000 Binary files a/data/sprites/official/rick.1.zspr and /dev/null differ diff --git a/data/sprites/official/robotlink.1.zspr b/data/sprites/official/robotlink.1.zspr deleted file mode 100644 index 8a1eed43..00000000 Binary files a/data/sprites/official/robotlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/rocko.1.zspr b/data/sprites/official/rocko.1.zspr deleted file mode 100644 index ab34f635..00000000 Binary files a/data/sprites/official/rocko.1.zspr and /dev/null differ diff --git a/data/sprites/official/rottytops.1.zspr b/data/sprites/official/rottytops.1.zspr deleted file mode 100644 index d4007ffb..00000000 Binary files a/data/sprites/official/rottytops.1.zspr and /dev/null differ diff --git a/data/sprites/official/rover.1.zspr b/data/sprites/official/rover.1.zspr deleted file mode 100644 index 8b9e9edd..00000000 Binary files a/data/sprites/official/rover.1.zspr and /dev/null differ diff --git a/data/sprites/official/roykoopa.1.zspr b/data/sprites/official/roykoopa.1.zspr deleted file mode 100644 index e1f9699f..00000000 Binary files a/data/sprites/official/roykoopa.1.zspr and /dev/null differ diff --git a/data/sprites/official/rumia.1.zspr b/data/sprites/official/rumia.1.zspr deleted file mode 100644 index dc037ae2..00000000 Binary files a/data/sprites/official/rumia.1.zspr and /dev/null differ diff --git a/data/sprites/official/rydia.1.zspr b/data/sprites/official/rydia.1.zspr deleted file mode 100644 index ff98ab56..00000000 Binary files a/data/sprites/official/rydia.1.zspr and /dev/null differ diff --git a/data/sprites/official/ryu.1.zspr b/data/sprites/official/ryu.1.zspr deleted file mode 100644 index 5c6d5411..00000000 Binary files a/data/sprites/official/ryu.1.zspr and /dev/null differ diff --git a/data/sprites/official/sailormoon.1.zspr b/data/sprites/official/sailormoon.1.zspr deleted file mode 100644 index 1120d3f4..00000000 Binary files a/data/sprites/official/sailormoon.1.zspr and /dev/null differ diff --git a/data/sprites/official/saitama.1.zspr b/data/sprites/official/saitama.1.zspr deleted file mode 100644 index acd9170d..00000000 Binary files a/data/sprites/official/saitama.1.zspr and /dev/null differ diff --git a/data/sprites/official/samus-sm.1.zspr b/data/sprites/official/samus-sm.1.zspr deleted file mode 100644 index c8fde01b..00000000 Binary files a/data/sprites/official/samus-sm.1.zspr and /dev/null differ diff --git a/data/sprites/official/samus.2.zspr b/data/sprites/official/samus.2.zspr deleted file mode 100644 index 81b0912f..00000000 Binary files a/data/sprites/official/samus.2.zspr and /dev/null differ diff --git a/data/sprites/official/samus_classic.1.zspr b/data/sprites/official/samus_classic.1.zspr deleted file mode 100644 index 6559e25c..00000000 Binary files a/data/sprites/official/samus_classic.1.zspr and /dev/null differ diff --git a/data/sprites/official/santalink.2.zspr b/data/sprites/official/santalink.2.zspr deleted file mode 100644 index 0e78fedb..00000000 Binary files a/data/sprites/official/santalink.2.zspr and /dev/null differ diff --git a/data/sprites/official/scholar.1.zspr b/data/sprites/official/scholar.1.zspr deleted file mode 100644 index bf697f16..00000000 Binary files a/data/sprites/official/scholar.1.zspr and /dev/null differ diff --git a/data/sprites/official/selan.1.zspr b/data/sprites/official/selan.1.zspr deleted file mode 100644 index eb3b0318..00000000 Binary files a/data/sprites/official/selan.1.zspr and /dev/null differ diff --git a/data/sprites/official/sevens1ns.1.zspr b/data/sprites/official/sevens1ns.1.zspr deleted file mode 100644 index d59a1b52..00000000 Binary files a/data/sprites/official/sevens1ns.1.zspr and /dev/null differ diff --git a/data/sprites/official/shadow.1.zspr b/data/sprites/official/shadow.1.zspr deleted file mode 100644 index fcd0d49b..00000000 Binary files a/data/sprites/official/shadow.1.zspr and /dev/null differ diff --git a/data/sprites/official/shadowsaku.2.zspr b/data/sprites/official/shadowsaku.2.zspr deleted file mode 100644 index 8972f9f2..00000000 Binary files a/data/sprites/official/shadowsaku.2.zspr and /dev/null differ diff --git a/data/sprites/official/shantae.1.zspr b/data/sprites/official/shantae.1.zspr deleted file mode 100644 index 03a1c7b9..00000000 Binary files a/data/sprites/official/shantae.1.zspr and /dev/null differ diff --git a/data/sprites/official/shuppet.1.zspr b/data/sprites/official/shuppet.1.zspr deleted file mode 100644 index 55a51ae9..00000000 Binary files a/data/sprites/official/shuppet.1.zspr and /dev/null differ diff --git a/data/sprites/official/shy-gal.1.zspr b/data/sprites/official/shy-gal.1.zspr deleted file mode 100644 index b86b27bc..00000000 Binary files a/data/sprites/official/shy-gal.1.zspr and /dev/null differ diff --git a/data/sprites/official/shy-guy.1.zspr b/data/sprites/official/shy-guy.1.zspr deleted file mode 100644 index 43ee0fe4..00000000 Binary files a/data/sprites/official/shy-guy.1.zspr and /dev/null differ diff --git a/data/sprites/official/sighn_waive.1.zspr b/data/sprites/official/sighn_waive.1.zspr deleted file mode 100644 index d961dc4d..00000000 Binary files a/data/sprites/official/sighn_waive.1.zspr and /dev/null differ diff --git a/data/sprites/official/slime.1.zspr b/data/sprites/official/slime.1.zspr deleted file mode 100644 index 711e459f..00000000 Binary files a/data/sprites/official/slime.1.zspr and /dev/null differ diff --git a/data/sprites/official/slowpoke.1.zspr b/data/sprites/official/slowpoke.1.zspr deleted file mode 100644 index d1b40e23..00000000 Binary files a/data/sprites/official/slowpoke.1.zspr and /dev/null differ diff --git a/data/sprites/official/snes-controller.1.zspr b/data/sprites/official/snes-controller.1.zspr deleted file mode 100644 index 5dd70f39..00000000 Binary files a/data/sprites/official/snes-controller.1.zspr and /dev/null differ diff --git a/data/sprites/official/sodacan.1.zspr b/data/sprites/official/sodacan.1.zspr deleted file mode 100644 index 93e6fb1e..00000000 Binary files a/data/sprites/official/sodacan.1.zspr and /dev/null differ diff --git a/data/sprites/official/solaire.1.zspr b/data/sprites/official/solaire.1.zspr deleted file mode 100644 index e216a7d9..00000000 Binary files a/data/sprites/official/solaire.1.zspr and /dev/null differ diff --git a/data/sprites/official/soldiersprite.1.zspr b/data/sprites/official/soldiersprite.1.zspr deleted file mode 100644 index d5e8ee35..00000000 Binary files a/data/sprites/official/soldiersprite.1.zspr and /dev/null differ diff --git a/data/sprites/official/sonic.1.zspr b/data/sprites/official/sonic.1.zspr deleted file mode 100644 index 55724219..00000000 Binary files a/data/sprites/official/sonic.1.zspr and /dev/null differ diff --git a/data/sprites/official/sora.1.zspr b/data/sprites/official/sora.1.zspr deleted file mode 100644 index c8d656fd..00000000 Binary files a/data/sprites/official/sora.1.zspr and /dev/null differ diff --git a/data/sprites/official/sora_kh1.1.zspr b/data/sprites/official/sora_kh1.1.zspr deleted file mode 100644 index e77c922d..00000000 Binary files a/data/sprites/official/sora_kh1.1.zspr and /dev/null differ diff --git a/data/sprites/official/spongebob.1.zspr b/data/sprites/official/spongebob.1.zspr deleted file mode 100644 index 714f6983..00000000 Binary files a/data/sprites/official/spongebob.1.zspr and /dev/null differ diff --git a/data/sprites/official/squall.1.zspr b/data/sprites/official/squall.1.zspr deleted file mode 100644 index b9cd9556..00000000 Binary files a/data/sprites/official/squall.1.zspr and /dev/null differ diff --git a/data/sprites/official/squirrel.1.zspr b/data/sprites/official/squirrel.1.zspr deleted file mode 100644 index 64e399a1..00000000 Binary files a/data/sprites/official/squirrel.1.zspr and /dev/null differ diff --git a/data/sprites/official/squirtle.1.zspr b/data/sprites/official/squirtle.1.zspr deleted file mode 100644 index 274bf1c7..00000000 Binary files a/data/sprites/official/squirtle.1.zspr and /dev/null differ diff --git a/data/sprites/official/stalfos.1.zspr b/data/sprites/official/stalfos.1.zspr deleted file mode 100644 index d4787a3b..00000000 Binary files a/data/sprites/official/stalfos.1.zspr and /dev/null differ diff --git a/data/sprites/official/stan.1.zspr b/data/sprites/official/stan.1.zspr deleted file mode 100644 index 5fd3eb11..00000000 Binary files a/data/sprites/official/stan.1.zspr and /dev/null differ diff --git a/data/sprites/official/staticlink.1.zspr b/data/sprites/official/staticlink.1.zspr deleted file mode 100644 index d0f1bc06..00000000 Binary files a/data/sprites/official/staticlink.1.zspr and /dev/null differ diff --git a/data/sprites/official/steamedhams.1.zspr b/data/sprites/official/steamedhams.1.zspr deleted file mode 100644 index bcae82fb..00000000 Binary files a/data/sprites/official/steamedhams.1.zspr and /dev/null differ diff --git a/data/sprites/official/superbomb.1.zspr b/data/sprites/official/superbomb.1.zspr deleted file mode 100644 index 1ed38ae3..00000000 Binary files a/data/sprites/official/superbomb.1.zspr and /dev/null differ diff --git a/data/sprites/official/superbunny.2.zspr b/data/sprites/official/superbunny.2.zspr deleted file mode 100644 index b842d1c3..00000000 Binary files a/data/sprites/official/superbunny.2.zspr and /dev/null differ diff --git a/data/sprites/official/supermeatboy.1.zspr b/data/sprites/official/supermeatboy.1.zspr deleted file mode 100644 index ad4368bb..00000000 Binary files a/data/sprites/official/supermeatboy.1.zspr and /dev/null differ diff --git a/data/sprites/official/susie.1.zspr b/data/sprites/official/susie.1.zspr deleted file mode 100644 index c1127b87..00000000 Binary files a/data/sprites/official/susie.1.zspr and /dev/null differ diff --git a/data/sprites/official/swatchy.1.zspr b/data/sprites/official/swatchy.1.zspr deleted file mode 100644 index 46795e9b..00000000 Binary files a/data/sprites/official/swatchy.1.zspr and /dev/null differ diff --git a/data/sprites/official/tasbot.1.zspr b/data/sprites/official/tasbot.1.zspr deleted file mode 100644 index b7278587..00000000 Binary files a/data/sprites/official/tasbot.1.zspr and /dev/null differ diff --git a/data/sprites/official/teatime.1.zspr b/data/sprites/official/teatime.1.zspr deleted file mode 100644 index 8953bc79..00000000 Binary files a/data/sprites/official/teatime.1.zspr and /dev/null differ diff --git a/data/sprites/official/terra.1.zspr b/data/sprites/official/terra.1.zspr deleted file mode 100644 index e24ca87a..00000000 Binary files a/data/sprites/official/terra.1.zspr and /dev/null differ diff --git a/data/sprites/official/tetra.1.zspr b/data/sprites/official/tetra.1.zspr deleted file mode 100644 index 77525f08..00000000 Binary files a/data/sprites/official/tetra.1.zspr and /dev/null differ diff --git a/data/sprites/official/tgh.1.zspr b/data/sprites/official/tgh.1.zspr deleted file mode 100644 index 929b8705..00000000 Binary files a/data/sprites/official/tgh.1.zspr and /dev/null differ diff --git a/data/sprites/official/thief.1.zspr b/data/sprites/official/thief.1.zspr deleted file mode 100644 index b6b0ffef..00000000 Binary files a/data/sprites/official/thief.1.zspr and /dev/null differ diff --git a/data/sprites/official/thomcrow.1.zspr b/data/sprites/official/thomcrow.1.zspr deleted file mode 100644 index 81bba95d..00000000 Binary files a/data/sprites/official/thomcrow.1.zspr and /dev/null differ diff --git a/data/sprites/official/tile.2.zspr b/data/sprites/official/tile.2.zspr deleted file mode 100644 index 38332bb0..00000000 Binary files a/data/sprites/official/tile.2.zspr and /dev/null differ diff --git a/data/sprites/official/tingle.1.zspr b/data/sprites/official/tingle.1.zspr deleted file mode 100644 index 9a53f8d2..00000000 Binary files a/data/sprites/official/tingle.1.zspr and /dev/null differ diff --git a/data/sprites/official/tmnt.1.zspr b/data/sprites/official/tmnt.1.zspr deleted file mode 100644 index 8f01c1db..00000000 Binary files a/data/sprites/official/tmnt.1.zspr and /dev/null differ diff --git a/data/sprites/official/toad.2.zspr b/data/sprites/official/toad.2.zspr deleted file mode 100644 index 6abca2d7..00000000 Binary files a/data/sprites/official/toad.2.zspr and /dev/null differ diff --git a/data/sprites/official/toadette.2.zspr b/data/sprites/official/toadette.2.zspr deleted file mode 100644 index 8c6498b2..00000000 Binary files a/data/sprites/official/toadette.2.zspr and /dev/null differ diff --git a/data/sprites/official/toadette_captain.1.zspr b/data/sprites/official/toadette_captain.1.zspr deleted file mode 100644 index e69f74a7..00000000 Binary files a/data/sprites/official/toadette_captain.1.zspr and /dev/null differ diff --git a/data/sprites/official/totem-links.1.zspr b/data/sprites/official/totem-links.1.zspr deleted file mode 100644 index e4ac6abc..00000000 Binary files a/data/sprites/official/totem-links.1.zspr and /dev/null differ diff --git a/data/sprites/official/trogdor.1.zspr b/data/sprites/official/trogdor.1.zspr deleted file mode 100644 index b37191ac..00000000 Binary files a/data/sprites/official/trogdor.1.zspr and /dev/null differ diff --git a/data/sprites/official/twilightprincesszelda.2.zspr b/data/sprites/official/twilightprincesszelda.2.zspr deleted file mode 100644 index 2487f44a..00000000 Binary files a/data/sprites/official/twilightprincesszelda.2.zspr and /dev/null differ diff --git a/data/sprites/official/two_faced.1.zspr b/data/sprites/official/two_faced.1.zspr deleted file mode 100644 index d504c321..00000000 Binary files a/data/sprites/official/two_faced.1.zspr and /dev/null differ diff --git a/data/sprites/official/ty.1.zspr b/data/sprites/official/ty.1.zspr deleted file mode 100644 index 1091b298..00000000 Binary files a/data/sprites/official/ty.1.zspr and /dev/null differ diff --git a/data/sprites/official/ultros.1.zspr b/data/sprites/official/ultros.1.zspr deleted file mode 100644 index bd312843..00000000 Binary files a/data/sprites/official/ultros.1.zspr and /dev/null differ diff --git a/data/sprites/official/valeera.1.zspr b/data/sprites/official/valeera.1.zspr deleted file mode 100644 index 090a6631..00000000 Binary files a/data/sprites/official/valeera.1.zspr and /dev/null differ diff --git a/data/sprites/official/vanillalink.1.zspr b/data/sprites/official/vanillalink.1.zspr deleted file mode 100644 index 409171fa..00000000 Binary files a/data/sprites/official/vanillalink.1.zspr and /dev/null differ diff --git a/data/sprites/official/vaporeon.1.zspr b/data/sprites/official/vaporeon.1.zspr deleted file mode 100644 index 55372722..00000000 Binary files a/data/sprites/official/vaporeon.1.zspr and /dev/null differ diff --git a/data/sprites/official/vegeta.1.zspr b/data/sprites/official/vegeta.1.zspr deleted file mode 100644 index b4f46019..00000000 Binary files a/data/sprites/official/vegeta.1.zspr and /dev/null differ diff --git a/data/sprites/official/vera.1.zspr b/data/sprites/official/vera.1.zspr deleted file mode 100644 index b8914365..00000000 Binary files a/data/sprites/official/vera.1.zspr and /dev/null differ diff --git a/data/sprites/official/vitreous.1.zspr b/data/sprites/official/vitreous.1.zspr deleted file mode 100644 index 947eff30..00000000 Binary files a/data/sprites/official/vitreous.1.zspr and /dev/null differ diff --git a/data/sprites/official/vivi.1.zspr b/data/sprites/official/vivi.1.zspr deleted file mode 100644 index a7ad1a5f..00000000 Binary files a/data/sprites/official/vivi.1.zspr and /dev/null differ diff --git a/data/sprites/official/vivian.1.zspr b/data/sprites/official/vivian.1.zspr deleted file mode 100644 index 9de1061f..00000000 Binary files a/data/sprites/official/vivian.1.zspr and /dev/null differ diff --git a/data/sprites/official/wario.1.zspr b/data/sprites/official/wario.1.zspr deleted file mode 100644 index f1a5aab7..00000000 Binary files a/data/sprites/official/wario.1.zspr and /dev/null differ diff --git a/data/sprites/official/will.1.zspr b/data/sprites/official/will.1.zspr deleted file mode 100644 index d3794969..00000000 Binary files a/data/sprites/official/will.1.zspr and /dev/null differ diff --git a/data/sprites/official/wizzrobe.2.zspr b/data/sprites/official/wizzrobe.2.zspr deleted file mode 100644 index f79195d2..00000000 Binary files a/data/sprites/official/wizzrobe.2.zspr and /dev/null differ diff --git a/data/sprites/official/wolf_link.1.zspr b/data/sprites/official/wolf_link.1.zspr deleted file mode 100644 index 5ee07dcb..00000000 Binary files a/data/sprites/official/wolf_link.1.zspr and /dev/null differ diff --git a/data/sprites/official/wolf_link_tp.1.zspr b/data/sprites/official/wolf_link_tp.1.zspr deleted file mode 100644 index 9627cd73..00000000 Binary files a/data/sprites/official/wolf_link_tp.1.zspr and /dev/null differ diff --git a/data/sprites/official/yoshi.1.zspr b/data/sprites/official/yoshi.1.zspr deleted file mode 100644 index 189ea390..00000000 Binary files a/data/sprites/official/yoshi.1.zspr and /dev/null differ diff --git a/data/sprites/official/yunica.1.zspr b/data/sprites/official/yunica.1.zspr deleted file mode 100644 index 57f1f416..00000000 Binary files a/data/sprites/official/yunica.1.zspr and /dev/null differ diff --git a/data/sprites/official/zandra.1.zspr b/data/sprites/official/zandra.1.zspr deleted file mode 100644 index d7e5012c..00000000 Binary files a/data/sprites/official/zandra.1.zspr and /dev/null differ diff --git a/data/sprites/official/zebraunicorn.1.zspr b/data/sprites/official/zebraunicorn.1.zspr deleted file mode 100644 index c06130ff..00000000 Binary files a/data/sprites/official/zebraunicorn.1.zspr and /dev/null differ diff --git a/data/sprites/official/zeck.1.zspr b/data/sprites/official/zeck.1.zspr deleted file mode 100644 index 630acd1a..00000000 Binary files a/data/sprites/official/zeck.1.zspr and /dev/null differ diff --git a/data/sprites/official/zelda.1.zspr b/data/sprites/official/zelda.1.zspr deleted file mode 100644 index 26ba1a05..00000000 Binary files a/data/sprites/official/zelda.1.zspr and /dev/null differ diff --git a/data/sprites/official/zerosuitsamus.2.zspr b/data/sprites/official/zerosuitsamus.2.zspr deleted file mode 100644 index 0e5a7d17..00000000 Binary files a/data/sprites/official/zerosuitsamus.2.zspr and /dev/null differ diff --git a/data/sprites/official/zora.2.zspr b/data/sprites/official/zora.2.zspr deleted file mode 100644 index 1ca568e1..00000000 Binary files a/data/sprites/official/zora.2.zspr and /dev/null differ diff --git a/data/sprites/unofficial/.gitignore b/data/sprites/unofficial/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/data/sprites/unofficial/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/data/sprites/unofficial/.gitkeep b/data/sprites/unofficial/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/resources/ci/common/common.py b/resources/ci/common/common.py index 7066fa8d..f2288fe2 100644 --- a/resources/ci/common/common.py +++ b/resources/ci/common/common.py @@ -1,6 +1,22 @@ import os # for env vars import stat # file statistics +global UBUNTU_VERSIONS +global DEFAULT_EVENT +global DEFAULT_REPO_SLUG +global FILENAME_CHECKS +global FILESIZE_CHECK +UBUNTU_VERSIONS = { + "latest": "focal", + "20.04": "focal", + "18.04": "bionic", + "16.04": "xenial" +} +DEFAULT_EVENT = "event" +DEFAULT_REPO_SLUG = "miketrethewey/ALttPDoorRandomizer" +FILENAME_CHECKS = [ "Gui", "DungeonRandomizer" ] +FILESIZE_CHECK = (6 * 1024 * 1024) # 6MB + # take number of bytes and convert to string with units measure def convert_bytes(num): for x in ["bytes","KB","MB","GB","TB","PB"]: @@ -16,9 +32,8 @@ def file_size(file_path): # prepare environment variables def prepare_env(): - DEFAULT_EVENT = "event" - DEFAULT_REPO_SLUG = "miketrethewey/ALttPDoorRandomizer" - + global DEFAULT_EVENT + global DEFAULT_REPO_SLUG env = {} # get app version @@ -33,7 +48,7 @@ def prepare_env(): env["BRANCH"] = os.getenv("TRAVIS_BRANCH","") env["GITHUB_ACTOR"] = os.getenv("GITHUB_ACTOR","MegaMan.EXE") env["GITHUB_SHA"] = os.getenv("GITHUB_SHA","") - env["GITHUB_RUN_ID"] = os.getenv("GITHUB_RUN_ID","") + env["GITHUB_RUN_NUMBER"] = os.getenv("GITHUB_RUN_NUMBER","") env["GITHUB_SHA_SHORT"] = env["GITHUB_SHA"] # commit data env["COMMIT_ID"] = os.getenv("TRAVIS_COMMIT",os.getenv("GITHUB_SHA","")) @@ -57,7 +72,7 @@ def prepare_env(): env["GITHUB_SHA_SHORT"] = env["GITHUB_SHA"][:7] # ci data - env["BUILD_NUMBER"] = os.getenv("TRAVIS_BUILD_NUMBER",env["GITHUB_RUN_ID"]) + env["BUILD_NUMBER"] = os.getenv("TRAVIS_BUILD_NUMBER",env["GITHUB_RUN_NUMBER"]) GITHUB_TAG = os.getenv("TRAVIS_TAG",os.getenv("GITHUB_TAG","")) OS_NAME = os.getenv("TRAVIS_OS_NAME",os.getenv("OS_NAME","")).replace("macOS","osx") @@ -68,10 +83,8 @@ def prepare_env(): OS_VERSION = OS_NAME[OS_NAME.find('-')+1:] OS_NAME = OS_NAME[:OS_NAME.find('-')] if OS_NAME == "linux" or OS_NAME == "ubuntu": - if OS_VERSION == "latest": - OS_VERSION = "bionic" - elif OS_VERSION == "16.04": - OS_VERSION = "xenial" + if OS_VERSION in UBUNTU_VERSIONS: + OS_VERSION = UBUNTU_VERSIONS[OS_VERSION] OS_DIST = OS_VERSION if OS_VERSION == "" and not OS_DIST == "" and not OS_DIST == "notset": @@ -115,8 +128,8 @@ def prepare_filename(BUILD_FILENAME): # find a binary file if it's executable # failing that, assume it's over 6MB def find_binary(listdir): - FILENAME_CHECKS = [ "Gui", "DungeonRandomizer" ] - FILESIZE_CHECK = (6 * 1024 * 1024) # 6MB + global FILENAME_CHECKS + global FILESIZE_CHECK BUILD_FILENAMES = [] executable = stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH diff --git a/resources/ci/common/prepare_binary.py b/resources/ci/common/prepare_binary.py index 583c7d7b..ff9b7c99 100644 --- a/resources/ci/common/prepare_binary.py +++ b/resources/ci/common/prepare_binary.py @@ -32,6 +32,8 @@ for BUILD_FILENAME in BUILD_FILENAMES: print("Dest Filename: " + DEST_FILENAME) if not BUILD_FILENAME == "": print("Build Filesize: " + common.file_size(BUILD_FILENAME)) + else: + exit(1) if not BUILD_FILENAME == "": move( diff --git a/resources/ci/common/prepare_release.py b/resources/ci/common/prepare_release.py index 5e32b410..c3869f2d 100644 --- a/resources/ci/common/prepare_release.py +++ b/resources/ci/common/prepare_release.py @@ -29,6 +29,11 @@ for dirname in ["resources","user","meta","manifests"]: if os.path.isdir(dirpath): os.chmod(dirpath,0o755) +# nuke git files +for git in [ os.path.join(".", ".gitattrubutes"), os.path.join(".", ".gitignore") ]: + if os.path.isfile(git): + os.remove(git) + # nuke travis file if it exists for travis in [ os.path.join(".", ".travis.yml"), os.path.join(".", ".travis.off") ]: if os.path.isfile(travis): @@ -95,7 +100,10 @@ if len(BUILD_FILENAMES) > 0: # .zip if windows # .tar.gz otherwise - ZIP_FILENAME = os.path.join("..","deploy",env["REPO_NAME"]) if len(BUILD_FILENAMES) > 1 else os.path.join("..","deploy",os.path.splitext(BUILD_FILENAME)[0]) + if len(BUILD_FILENAMES) > 1: + ZIP_FILENAME = os.path.join("..","deploy",env["REPO_NAME"]) + else: + ZIP_FILENAME = os.path.join("..","deploy",os.path.splitext(BUILD_FILENAME)[0]) if env["OS_NAME"] == "windows": make_archive(ZIP_FILENAME,"zip") ZIP_FILENAME += ".zip" @@ -125,3 +133,6 @@ else: print("No Zip to prepare: " + ZIP_FILENAME) print("Git tag: " + env["GITHUB_TAG"]) + +if (len(BUILD_FILENAMES) == 0) or (ZIP_FILENAME == ""): + exit(1) diff --git a/DungeonRandomizer.spec b/source/DungeonRandomizer.spec similarity index 85% rename from DungeonRandomizer.spec rename to source/DungeonRandomizer.spec index d7234682..beb2ecfc 100644 --- a/DungeonRandomizer.spec +++ b/source/DungeonRandomizer.spec @@ -3,7 +3,10 @@ import sys block_cipher = None -console = True +console = True # <--- change this to True to enable command prompt when the app runs + +if sys.platform.find("mac") or sys.platform.find("osx"): + console = False BINARY_SLUG = "DungeonRandomizer" @@ -27,13 +30,10 @@ def recurse_for_py_files(names_so_far): hiddenimports = [] binaries = [] -#if sys.platform.find("windows"): -# binaries.append(("ucrtbase.dll",".")) - -a = Analysis([f"./{BINARY_SLUG}.py"], +a = Analysis([f"../{BINARY_SLUG}.py"], pathex=[], binaries=binaries, - datas=[], + datas=[('../data/', 'data/')], hiddenimports=hiddenimports, hookspath=[], runtime_hooks=[], @@ -46,6 +46,7 @@ a = Analysis([f"./{BINARY_SLUG}.py"], # https://stackoverflow.com/questions/17034434/how-to-remove-exclude-modules-and-files-from-pyinstaller excluded_binaries = [ 'VCRUNTIME140.dll', + 'ucrtbase.dll', 'msvcp140.dll', 'mfc140u.dll'] a.binaries = TOC([x for x in a.binaries if x[0] not in excluded_binaries]) @@ -64,4 +65,4 @@ exe = EXE(pyz, strip=False, upx=True, runtime_tmpdir=None, - console=console ) # <--- change this to True to enable command prompt when the app runs + console=console ) diff --git a/Gui.spec b/source/Gui.spec similarity index 88% rename from Gui.spec rename to source/Gui.spec index 001e82b2..8b140a75 100644 --- a/Gui.spec +++ b/source/Gui.spec @@ -3,10 +3,11 @@ import sys block_cipher = None -console = True +console = True # <--- change this to True to enable command prompt when the app runs if sys.platform.find("mac") or sys.platform.find("osx"): console = False + BINARY_SLUG = "Gui" def recurse_for_py_files(names_so_far): @@ -29,13 +30,10 @@ def recurse_for_py_files(names_so_far): hiddenimports = [] binaries = [] -#if sys.platform.find("windows"): -# binaries.append(("ucrtbase.dll",".")) - -a = Analysis([f"./{BINARY_SLUG}.py"], +a = Analysis([f"../{BINARY_SLUG}.py"], pathex=[], binaries=binaries, - datas=[], + datas=[('../data/', 'data/')], hiddenimports=hiddenimports, hookspath=[], runtime_hooks=[], @@ -48,6 +46,7 @@ a = Analysis([f"./{BINARY_SLUG}.py"], # https://stackoverflow.com/questions/17034434/how-to-remove-exclude-modules-and-files-from-pyinstaller excluded_binaries = [ 'VCRUNTIME140.dll', + 'ucrtbase.dll', 'msvcp140.dll', 'mfc140u.dll'] a.binaries = TOC([x for x in a.binaries if x[0] not in excluded_binaries]) @@ -63,7 +62,8 @@ exe = EXE(pyz, name=BINARY_SLUG, debug=False, bootloader_ignore_signals=False, + icon='../data/ER.ico', strip=False, upx=True, runtime_tmpdir=None, - console=console ) # <--- change this to True to enable command prompt when the app runs + console=console ) diff --git a/source/classes/SpriteSelector.py b/source/classes/SpriteSelector.py index 1ab073ad..102e4351 100644 --- a/source/classes/SpriteSelector.py +++ b/source/classes/SpriteSelector.py @@ -31,6 +31,11 @@ class SpriteSelector(object): def open_official_sprite_listing(_evt): webbrowser.open("http://alttpr.com/sprite_preview") + def open_official_sprite_dir(_evt): + if not os.path.isdir(self.official_sprite_dir): + os.makedirs(self.official_sprite_dir) + open_file(self.official_sprite_dir) + def open_unofficial_sprite_dir(_evt): if not os.path.isdir(self.unofficial_sprite_dir): os.makedirs(self.unofficial_sprite_dir) @@ -42,14 +47,17 @@ class SpriteSelector(object): official_frametitle = Frame(self.window) official_title_text = Label(official_frametitle, text="Official Sprites") - official_title_link = Label(official_frametitle, text="(open)", fg="blue", cursor="hand2") official_title_text.pack(side=LEFT) + official_local_title_link = Label(official_frametitle, text="(open local)", fg="blue", cursor="hand2") + official_local_title_link.pack(side=LEFT) + official_local_title_link.bind("", open_official_sprite_dir) + official_title_link = Label(official_frametitle, text="(ALttPR)", fg="blue", cursor="hand2") official_title_link.pack(side=LEFT) official_title_link.bind("", open_official_sprite_listing) unofficial_frametitle = Frame(self.window) unofficial_title_text = Label(unofficial_frametitle, text="Unofficial Sprites") - unofficial_title_link = Label(unofficial_frametitle, text="(open)", fg="blue", cursor="hand2") + unofficial_title_link = Label(unofficial_frametitle, text="(open local)", fg="blue", cursor="hand2") unofficial_title_text.pack(side=LEFT) unofficial_title_link.pack(side=LEFT) unofficial_title_link.bind("", open_unofficial_sprite_dir) @@ -231,8 +239,6 @@ class SpriteSelector(object): @property def official_sprite_dir(self): -# if is_bundled(): -# return output_path(os.path.join("sprites","official")) return self.local_official_sprite_dir @property @@ -241,8 +247,6 @@ class SpriteSelector(object): @property def unofficial_sprite_dir(self): -# if is_bundled(): -# return output_path(os.path.join("sprites","unofficial")) return self.local_unofficial_sprite_dir @property diff --git a/build-dr.py b/source/meta/build-dr.py similarity index 91% rename from build-dr.py rename to source/meta/build-dr.py index 46f5b88a..6f26adb9 100644 --- a/build-dr.py +++ b/source/meta/build-dr.py @@ -4,7 +4,7 @@ import shutil import sys # Spec file -SPEC_FILE = os.path.join("DungeonRandomizer.spec") +SPEC_FILE = os.path.join(".", "source", "DungeonRandomizer.spec") # Destination is current dir DEST_DIRECTORY = '.' diff --git a/build-gui.py b/source/meta/build-gui.py similarity index 93% rename from build-gui.py rename to source/meta/build-gui.py index 6cc69228..ae284261 100644 --- a/build-gui.py +++ b/source/meta/build-gui.py @@ -4,7 +4,7 @@ import shutil import sys # Spec file -SPEC_FILE = os.path.join("Gui.spec") +SPEC_FILE = os.path.join(".", "source", "Gui.spec") # Destination is current dir DEST_DIRECTORY = '.'