From 46420f10afb9c3834d26db4fdd2ba0be5a76d13d Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Fri, 8 Jan 2021 03:31:21 -0800
Subject: [PATCH] Move sprites back to ./data

---
 Rom.py                                              |   2 +-
 .../meta => data}/sprites/official/001.link.1.zspr  | Bin
 .../app/meta => data}/sprites/official/bob.1.zspr   | Bin
 .../meta => data}/sprites/official/stick_man.1.zspr | Bin
 source/classes/SpriteSelector.py                    |   4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {resources/app/meta => data}/sprites/official/001.link.1.zspr (100%)
 rename {resources/app/meta => data}/sprites/official/bob.1.zspr (100%)
 rename {resources/app/meta => data}/sprites/official/stick_man.1.zspr (100%)

diff --git a/Rom.py b/Rom.py
index 4b435297..f8267327 100644
--- a/Rom.py
+++ b/Rom.py
@@ -342,7 +342,7 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_
 _sprite_table = {}
 def _populate_sprite_table():
     if not _sprite_table:
-        for dir in [local_path(os.path.join(".","resources","app","meta","sprites","official")), local_path(os.path.join(".","resources","app","meta","sprites","unofficial"))]:
+        for dir in [local_path(os.path.join(".","data","sprites","official")), local_path(os.path.join(".","data","sprites","unofficial"))]:
             for file in os.listdir(dir):
                 filepath = os.path.join(dir, file)
                 if not os.path.isfile(filepath):
diff --git a/resources/app/meta/sprites/official/001.link.1.zspr b/data/sprites/official/001.link.1.zspr
similarity index 100%
rename from resources/app/meta/sprites/official/001.link.1.zspr
rename to data/sprites/official/001.link.1.zspr
diff --git a/resources/app/meta/sprites/official/bob.1.zspr b/data/sprites/official/bob.1.zspr
similarity index 100%
rename from resources/app/meta/sprites/official/bob.1.zspr
rename to data/sprites/official/bob.1.zspr
diff --git a/resources/app/meta/sprites/official/stick_man.1.zspr b/data/sprites/official/stick_man.1.zspr
similarity index 100%
rename from resources/app/meta/sprites/official/stick_man.1.zspr
rename to data/sprites/official/stick_man.1.zspr
diff --git a/source/classes/SpriteSelector.py b/source/classes/SpriteSelector.py
index 8a7302af..d010e603 100644
--- a/source/classes/SpriteSelector.py
+++ b/source/classes/SpriteSelector.py
@@ -235,7 +235,7 @@ class SpriteSelector(object):
 
     @property
     def local_official_sprite_dir(self):
-        return local_path(os.path.join(".","resources","app","meta","sprites","official"))
+        return local_path(os.path.join(".","data","sprites","official"))
 
     @property
     def unofficial_sprite_dir(self):
@@ -243,7 +243,7 @@ class SpriteSelector(object):
 
     @property
     def local_unofficial_sprite_dir(self):
-        return local_path(os.path.join(".","resources","app","meta","sprites","unofficial"))
+        return local_path(os.path.join(".","data","sprites","unofficial"))
 
 
 def get_image_for_sprite(sprite):