diff --git a/Gui.py b/Gui.py index 46826409..2d43f9c6 100755 --- a/Gui.py +++ b/Gui.py @@ -1292,20 +1292,20 @@ class SpriteSelector(object): self.window['pady'] = 5 self.all_sprites = [] - def open_unofficial_sprite_dir(_evt): - open_file(self.unofficial_sprite_dir) + def open_custom_sprite_dir(_evt): + open_file(self.custom_sprite_dir) - official_frametitle = Label(self.window, text='Official Sprites') + alttpr_frametitle = Label(self.window, text='ALTTPR Sprites') - unofficial_frametitle = Frame(self.window) - title_text = Label(unofficial_frametitle, text="Unofficial Sprites") - title_link = Label(unofficial_frametitle, text="(open)", fg="blue", cursor="hand2") + custom_frametitle = Frame(self.window) + title_text = Label(custom_frametitle, text="Custom Sprites") + title_link = Label(custom_frametitle, text="(open)", fg="blue", cursor="hand2") title_text.pack(side=LEFT) title_link.pack(side=LEFT) - title_link.bind("", open_unofficial_sprite_dir) + title_link.bind("", open_custom_sprite_dir) - self.icon_section(official_frametitle, self.official_sprite_dir+'/*', 'Official sprites not found. Click "Update official sprites" to download them.') - self.icon_section(unofficial_frametitle, self.unofficial_sprite_dir+'/*', 'Put sprites in the unofficial sprites folder (see open link above) to have them appear here.') + self.icon_section(alttpr_frametitle, self.alttpr_sprite_dir + '/*', 'ALTTPR sprites not found. Click "Update alttpr sprites" to download them.') + self.icon_section(custom_frametitle, self.custom_sprite_dir + '/*', 'Put sprites in the custom sprites folder (see open link above) to have them appear here.') frame = Frame(self.window) frame.pack(side=BOTTOM, fill=X, pady=5) @@ -1313,7 +1313,7 @@ class SpriteSelector(object): button = Button(frame, text="Browse for file...", command=self.browse_for_sprite) button.pack(side=RIGHT, padx=(5, 0)) - button = Button(frame, text="Update official sprites", command=self.update_official_sprites) + button = Button(frame, text="Update alttpr sprites", command=self.update_alttpr_sprites) button.pack(side=RIGHT, padx=(5, 0)) button = Button(frame, text="Default Link sprite", command=self.use_default_link_sprite) @@ -1368,7 +1368,7 @@ class SpriteSelector(object): for i, button in enumerate(frame.buttons): button.grid(row=i // sprites_per_row, column=i % sprites_per_row) - def update_official_sprites(self): + def update_alttpr_sprites(self): # need to wrap in try catch. We don't want errors getting the json or downloading the files to break us. self.window.destroy() self.parent.update() @@ -1386,25 +1386,25 @@ class SpriteSelector(object): SpriteSelector(self.parent, self.callback, self.adjuster) try: - task.update_status("Downloading official sprites list") + task.update_status("Downloading alttpr sprites list") with urlopen('https://alttpr.com/sprites') as response: sprites_arr = json.loads(response.read().decode("utf-8")) except Exception as e: - resultmessage = "Error getting list of official sprites. Sprites not updated.\n\n%s: %s" % (type(e).__name__, e) + resultmessage = "Error getting list of alttpr sprites. Sprites not updated.\n\n%s: %s" % (type(e).__name__, e) successful = False task.queue_event(finished) return try: task.update_status("Determining needed sprites") - current_sprites = [os.path.basename(file) for file in glob(self.official_sprite_dir+'/*')] - official_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path)) for sprite in sprites_arr] - needed_sprites = [(sprite_url, filename) for (sprite_url, filename) in official_sprites if filename not in current_sprites] - bundled_sprites = [os.path.basename(file) for file in glob(self.local_official_sprite_dir+'/*')] + current_sprites = [os.path.basename(file) for file in glob(self.alttpr_sprite_dir + '/*')] + alttpr_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path)) for sprite in sprites_arr] + needed_sprites = [(sprite_url, filename) for (sprite_url, filename) in alttpr_sprites if filename not in current_sprites] + bundled_sprites = [os.path.basename(file) for file in glob(self.local_alttpr_sprite_dir + '/*')] # todo: eventually use the above list to avoid downloading any sprites that we already have cached in the bundle. - official_filenames = [filename for (_, filename) in official_sprites] - obsolete_sprites = [sprite for sprite in current_sprites if sprite not in official_filenames] + alttpr_filenames = [filename for (_, filename) in alttpr_sprites] + obsolete_sprites = [sprite for sprite in current_sprites if sprite not in alttpr_filenames] except Exception as e: resultmessage = "Error Determining which sprites to update. Sprites not updated.\n\n%s: %s" % (type(e).__name__, e) successful = False @@ -1415,7 +1415,7 @@ class SpriteSelector(object): for (sprite_url, filename) in needed_sprites: try: task.update_status("Downloading needed sprite %g/%g" % (updated + 1, len(needed_sprites))) - target = os.path.join(self.official_sprite_dir, filename) + target = os.path.join(self.alttpr_sprite_dir, filename) with urlopen(sprite_url) as response, open(target, 'wb') as out: shutil.copyfileobj(response, out) except Exception as e: @@ -1427,14 +1427,14 @@ class SpriteSelector(object): for sprite in obsolete_sprites: try: task.update_status("Removing obsolete sprite %g/%g" % (deleted + 1, len(obsolete_sprites))) - os.remove(os.path.join(self.official_sprite_dir, sprite)) + os.remove(os.path.join(self.alttpr_sprite_dir, sprite)) except Exception as e: resultmessage = "Error removing obsolete sprite. Not all sprites updated.\n\n%s: %s" % (type(e).__name__, e) successful = False deleted += 1 if successful: - resultmessage = "official sprites updated successfully" + resultmessage = "alttpr sprites updated successfully" task.queue_event(finished) @@ -1473,30 +1473,30 @@ class SpriteSelector(object): def deploy_icons(self): - if not os.path.exists(self.unofficial_sprite_dir): - os.makedirs(self.unofficial_sprite_dir) - if not os.path.exists(self.official_sprite_dir): - shutil.copytree(self.local_official_sprite_dir, self.official_sprite_dir) + if not os.path.exists(self.custom_sprite_dir): + os.makedirs(self.custom_sprite_dir) + if not os.path.exists(self.alttpr_sprite_dir): + shutil.copytree(self.local_alttpr_sprite_dir, self.alttpr_sprite_dir) @property - def official_sprite_dir(self): + def alttpr_sprite_dir(self): if is_bundled(): - return output_path("sprites/official") - return self.local_official_sprite_dir + return output_path("sprites/alttpr") + return self.local_alttpr_sprite_dir @property - def local_official_sprite_dir(self): - return local_path("data/sprites/official") + def local_alttpr_sprite_dir(self): + return local_path("data/sprites/alttpr") @property - def unofficial_sprite_dir(self): + def custom_sprite_dir(self): if is_bundled(): - return output_path("sprites/unofficial") - return self.local_unofficial_sprite_dir + return output_path("sprites/custom") + return self.local_custom_sprite_dir @property - def local_unofficial_sprite_dir(self): - return local_path("data/sprites/unofficial") + def local_custom_sprite_dir(self): + return local_path("data/sprites/custom") def get_image_for_sprite(sprite): diff --git a/Rom.py b/Rom.py index 862c9a8b..e6f324d4 100644 --- a/Rom.py +++ b/Rom.py @@ -333,7 +333,7 @@ def patch_enemizer(world, player: int, rom: LocalRom, enemizercli, random_sprite _sprite_table = {} def _populate_sprite_table(): if not _sprite_table: - for dir in [local_path('data/sprites/official'), local_path('data/sprites/unofficial')]: + for dir in [local_path('data/sprites/alttpr'), local_path('data/sprites/custom')]: for file in os.listdir(dir): filepath = os.path.join(dir, file) if not os.path.isfile(filepath): diff --git a/data/sprites/official/001.link.1.zspr b/data/sprites/alttpr/001.link.1.zspr similarity index 100% rename from data/sprites/official/001.link.1.zspr rename to data/sprites/alttpr/001.link.1.zspr diff --git a/data/sprites/official/4slink-armors.1.zspr b/data/sprites/alttpr/4slink-armors.1.zspr similarity index 100% rename from data/sprites/official/4slink-armors.1.zspr rename to data/sprites/alttpr/4slink-armors.1.zspr diff --git a/data/sprites/official/abigail.1.zspr b/data/sprites/alttpr/abigail.1.zspr similarity index 100% rename from data/sprites/official/abigail.1.zspr rename to data/sprites/alttpr/abigail.1.zspr diff --git a/data/sprites/official/adol.1.zspr b/data/sprites/alttpr/adol.1.zspr similarity index 100% rename from data/sprites/official/adol.1.zspr rename to data/sprites/alttpr/adol.1.zspr diff --git a/data/sprites/official/aggretsuko.1.zspr b/data/sprites/alttpr/aggretsuko.1.zspr similarity index 100% rename from data/sprites/official/aggretsuko.1.zspr rename to data/sprites/alttpr/aggretsuko.1.zspr diff --git a/data/sprites/official/alice.1.zspr b/data/sprites/alttpr/alice.1.zspr similarity index 100% rename from data/sprites/official/alice.1.zspr rename to data/sprites/alttpr/alice.1.zspr diff --git a/data/sprites/official/angry-video-game-nerd.1.zspr b/data/sprites/alttpr/angry-video-game-nerd.1.zspr similarity index 100% rename from data/sprites/official/angry-video-game-nerd.1.zspr rename to data/sprites/alttpr/angry-video-game-nerd.1.zspr diff --git a/data/sprites/official/arcane.1.zspr b/data/sprites/alttpr/arcane.1.zspr similarity index 100% rename from data/sprites/official/arcane.1.zspr rename to data/sprites/alttpr/arcane.1.zspr diff --git a/data/sprites/official/ark.2.zspr b/data/sprites/alttpr/ark.2.zspr similarity index 100% rename from data/sprites/official/ark.2.zspr rename to data/sprites/alttpr/ark.2.zspr diff --git a/data/sprites/official/arrghus.2.zspr b/data/sprites/alttpr/arrghus.2.zspr similarity index 100% rename from data/sprites/official/arrghus.2.zspr rename to data/sprites/alttpr/arrghus.2.zspr diff --git a/data/sprites/official/astronaut.1.zspr b/data/sprites/alttpr/astronaut.1.zspr similarity index 100% rename from data/sprites/official/astronaut.1.zspr rename to data/sprites/alttpr/astronaut.1.zspr diff --git a/data/sprites/official/badeline.1.zspr b/data/sprites/alttpr/badeline.1.zspr similarity index 100% rename from data/sprites/official/badeline.1.zspr rename to data/sprites/alttpr/badeline.1.zspr diff --git a/data/sprites/official/bananas-in-pyjamas.1.zspr b/data/sprites/alttpr/bananas-in-pyjamas.1.zspr similarity index 100% rename from data/sprites/official/bananas-in-pyjamas.1.zspr rename to data/sprites/alttpr/bananas-in-pyjamas.1.zspr diff --git a/data/sprites/official/bandit.1.zspr b/data/sprites/alttpr/bandit.1.zspr similarity index 100% rename from data/sprites/official/bandit.1.zspr rename to data/sprites/alttpr/bandit.1.zspr diff --git a/data/sprites/official/batman.1.zspr b/data/sprites/alttpr/batman.1.zspr similarity index 100% rename from data/sprites/official/batman.1.zspr rename to data/sprites/alttpr/batman.1.zspr diff --git a/data/sprites/official/beau.1.zspr b/data/sprites/alttpr/beau.1.zspr similarity index 100% rename from data/sprites/official/beau.1.zspr rename to data/sprites/alttpr/beau.1.zspr diff --git a/data/sprites/official/bewp.1.zspr b/data/sprites/alttpr/bewp.1.zspr similarity index 100% rename from data/sprites/official/bewp.1.zspr rename to data/sprites/alttpr/bewp.1.zspr diff --git a/data/sprites/official/bigkey.1.zspr b/data/sprites/alttpr/bigkey.1.zspr similarity index 100% rename from data/sprites/official/bigkey.1.zspr rename to data/sprites/alttpr/bigkey.1.zspr diff --git a/data/sprites/official/birb.1.zspr b/data/sprites/alttpr/birb.1.zspr similarity index 100% rename from data/sprites/official/birb.1.zspr rename to data/sprites/alttpr/birb.1.zspr diff --git a/data/sprites/official/birdo.1.zspr b/data/sprites/alttpr/birdo.1.zspr similarity index 100% rename from data/sprites/official/birdo.1.zspr rename to data/sprites/alttpr/birdo.1.zspr diff --git a/data/sprites/official/blackmage.1.zspr b/data/sprites/alttpr/blackmage.1.zspr similarity index 100% rename from data/sprites/official/blackmage.1.zspr rename to data/sprites/alttpr/blackmage.1.zspr diff --git a/data/sprites/official/blacksmithlink.1.zspr b/data/sprites/alttpr/blacksmithlink.1.zspr similarity index 100% rename from data/sprites/official/blacksmithlink.1.zspr rename to data/sprites/alttpr/blacksmithlink.1.zspr diff --git a/data/sprites/official/blossom.1.zspr b/data/sprites/alttpr/blossom.1.zspr similarity index 100% rename from data/sprites/official/blossom.1.zspr rename to data/sprites/alttpr/blossom.1.zspr diff --git a/data/sprites/official/bob.1.zspr b/data/sprites/alttpr/bob.1.zspr similarity index 100% rename from data/sprites/official/bob.1.zspr rename to data/sprites/alttpr/bob.1.zspr diff --git a/data/sprites/official/boo-two.1.zspr b/data/sprites/alttpr/boo-two.1.zspr similarity index 100% rename from data/sprites/official/boo-two.1.zspr rename to data/sprites/alttpr/boo-two.1.zspr diff --git a/data/sprites/official/boo.2.zspr b/data/sprites/alttpr/boo.2.zspr similarity index 100% rename from data/sprites/official/boo.2.zspr rename to data/sprites/alttpr/boo.2.zspr diff --git a/data/sprites/official/bottle_o_goo.1.zspr b/data/sprites/alttpr/bottle_o_goo.1.zspr similarity index 100% rename from data/sprites/official/bottle_o_goo.1.zspr rename to data/sprites/alttpr/bottle_o_goo.1.zspr diff --git a/data/sprites/official/botw-zelda.1.zspr b/data/sprites/alttpr/botw-zelda.1.zspr similarity index 100% rename from data/sprites/official/botw-zelda.1.zspr rename to data/sprites/alttpr/botw-zelda.1.zspr diff --git a/data/sprites/official/bowser.1.zspr b/data/sprites/alttpr/bowser.1.zspr similarity index 100% rename from data/sprites/official/bowser.1.zspr rename to data/sprites/alttpr/bowser.1.zspr diff --git a/data/sprites/official/branch.1.zspr b/data/sprites/alttpr/branch.1.zspr similarity index 100% rename from data/sprites/official/branch.1.zspr rename to data/sprites/alttpr/branch.1.zspr diff --git a/data/sprites/official/brian.1.zspr b/data/sprites/alttpr/brian.1.zspr similarity index 100% rename from data/sprites/official/brian.1.zspr rename to data/sprites/alttpr/brian.1.zspr diff --git a/data/sprites/official/broccoli.1.zspr b/data/sprites/alttpr/broccoli.1.zspr similarity index 100% rename from data/sprites/official/broccoli.1.zspr rename to data/sprites/alttpr/broccoli.1.zspr diff --git a/data/sprites/official/bronzor.1.zspr b/data/sprites/alttpr/bronzor.1.zspr similarity index 100% rename from data/sprites/official/bronzor.1.zspr rename to data/sprites/alttpr/bronzor.1.zspr diff --git a/data/sprites/official/bsboy.1.zspr b/data/sprites/alttpr/bsboy.1.zspr similarity index 100% rename from data/sprites/official/bsboy.1.zspr rename to data/sprites/alttpr/bsboy.1.zspr diff --git a/data/sprites/official/bsgirl.1.zspr b/data/sprites/alttpr/bsgirl.1.zspr similarity index 100% rename from data/sprites/official/bsgirl.1.zspr rename to data/sprites/alttpr/bsgirl.1.zspr diff --git a/data/sprites/official/bubbles.1.zspr b/data/sprites/alttpr/bubbles.1.zspr similarity index 100% rename from data/sprites/official/bubbles.1.zspr rename to data/sprites/alttpr/bubbles.1.zspr diff --git a/data/sprites/official/bullet_bill.1.zspr b/data/sprites/alttpr/bullet_bill.1.zspr similarity index 100% rename from data/sprites/official/bullet_bill.1.zspr rename to data/sprites/alttpr/bullet_bill.1.zspr diff --git a/data/sprites/official/buttercup.1.zspr b/data/sprites/alttpr/buttercup.1.zspr similarity index 100% rename from data/sprites/official/buttercup.1.zspr rename to data/sprites/alttpr/buttercup.1.zspr diff --git a/data/sprites/official/cactuar.1.zspr b/data/sprites/alttpr/cactuar.1.zspr similarity index 100% rename from data/sprites/official/cactuar.1.zspr rename to data/sprites/alttpr/cactuar.1.zspr diff --git a/data/sprites/official/cadence.1.zspr b/data/sprites/alttpr/cadence.1.zspr similarity index 100% rename from data/sprites/official/cadence.1.zspr rename to data/sprites/alttpr/cadence.1.zspr diff --git a/data/sprites/official/carlsagan42.1.zspr b/data/sprites/alttpr/carlsagan42.1.zspr similarity index 100% rename from data/sprites/official/carlsagan42.1.zspr rename to data/sprites/alttpr/carlsagan42.1.zspr diff --git a/data/sprites/official/casual-zelda.1.zspr b/data/sprites/alttpr/casual-zelda.1.zspr similarity index 100% rename from data/sprites/official/casual-zelda.1.zspr rename to data/sprites/alttpr/casual-zelda.1.zspr diff --git a/data/sprites/official/cat.3.zspr b/data/sprites/alttpr/cat.3.zspr similarity index 100% rename from data/sprites/official/cat.3.zspr rename to data/sprites/alttpr/cat.3.zspr diff --git a/data/sprites/official/catboo.1.zspr b/data/sprites/alttpr/catboo.1.zspr similarity index 100% rename from data/sprites/official/catboo.1.zspr rename to data/sprites/alttpr/catboo.1.zspr diff --git a/data/sprites/official/cdilink.1.zspr b/data/sprites/alttpr/cdilink.1.zspr similarity index 100% rename from data/sprites/official/cdilink.1.zspr rename to data/sprites/alttpr/cdilink.1.zspr diff --git a/data/sprites/official/celes.1.zspr b/data/sprites/alttpr/celes.1.zspr similarity index 100% rename from data/sprites/official/celes.1.zspr rename to data/sprites/alttpr/celes.1.zspr diff --git a/data/sprites/official/charizard.1.zspr b/data/sprites/alttpr/charizard.1.zspr similarity index 100% rename from data/sprites/official/charizard.1.zspr rename to data/sprites/alttpr/charizard.1.zspr diff --git a/data/sprites/official/cheepcheep.1.zspr b/data/sprites/alttpr/cheepcheep.1.zspr similarity index 100% rename from data/sprites/official/cheepcheep.1.zspr rename to data/sprites/alttpr/cheepcheep.1.zspr diff --git a/data/sprites/official/chibity.1.zspr b/data/sprites/alttpr/chibity.1.zspr similarity index 100% rename from data/sprites/official/chibity.1.zspr rename to data/sprites/alttpr/chibity.1.zspr diff --git a/data/sprites/official/cirno.1.zspr b/data/sprites/alttpr/cirno.1.zspr similarity index 100% rename from data/sprites/official/cirno.1.zspr rename to data/sprites/alttpr/cirno.1.zspr diff --git a/data/sprites/official/clifford.1.zspr b/data/sprites/alttpr/clifford.1.zspr similarity index 100% rename from data/sprites/official/clifford.1.zspr rename to data/sprites/alttpr/clifford.1.zspr diff --git a/data/sprites/official/clyde.1.zspr b/data/sprites/alttpr/clyde.1.zspr similarity index 100% rename from data/sprites/official/clyde.1.zspr rename to data/sprites/alttpr/clyde.1.zspr diff --git a/data/sprites/official/conker.1.zspr b/data/sprites/alttpr/conker.1.zspr similarity index 100% rename from data/sprites/official/conker.1.zspr rename to data/sprites/alttpr/conker.1.zspr diff --git a/data/sprites/official/cornelius.1.zspr b/data/sprites/alttpr/cornelius.1.zspr similarity index 100% rename from data/sprites/official/cornelius.1.zspr rename to data/sprites/alttpr/cornelius.1.zspr diff --git a/data/sprites/official/corona.1.zspr b/data/sprites/alttpr/corona.1.zspr similarity index 100% rename from data/sprites/official/corona.1.zspr rename to data/sprites/alttpr/corona.1.zspr diff --git a/data/sprites/official/cucco.1.zspr b/data/sprites/alttpr/cucco.1.zspr similarity index 100% rename from data/sprites/official/cucco.1.zspr rename to data/sprites/alttpr/cucco.1.zspr diff --git a/data/sprites/official/cursor.1.zspr b/data/sprites/alttpr/cursor.1.zspr similarity index 100% rename from data/sprites/official/cursor.1.zspr rename to data/sprites/alttpr/cursor.1.zspr diff --git a/data/sprites/official/d_owls.1.zspr b/data/sprites/alttpr/d_owls.1.zspr similarity index 100% rename from data/sprites/official/d_owls.1.zspr rename to data/sprites/alttpr/d_owls.1.zspr diff --git a/data/sprites/official/dark-panda.1.zspr b/data/sprites/alttpr/dark-panda.1.zspr similarity index 100% rename from data/sprites/official/dark-panda.1.zspr rename to data/sprites/alttpr/dark-panda.1.zspr diff --git a/data/sprites/official/darkboy.1.zspr b/data/sprites/alttpr/darkboy.1.zspr similarity index 100% rename from data/sprites/official/darkboy.1.zspr rename to data/sprites/alttpr/darkboy.1.zspr diff --git a/data/sprites/official/darkgirl.1.zspr b/data/sprites/alttpr/darkgirl.1.zspr similarity index 100% rename from data/sprites/official/darkgirl.1.zspr rename to data/sprites/alttpr/darkgirl.1.zspr diff --git a/data/sprites/official/darklink-tunic.1.zspr b/data/sprites/alttpr/darklink-tunic.1.zspr similarity index 100% rename from data/sprites/official/darklink-tunic.1.zspr rename to data/sprites/alttpr/darklink-tunic.1.zspr diff --git a/data/sprites/official/darklink.1.zspr b/data/sprites/alttpr/darklink.1.zspr similarity index 100% rename from data/sprites/official/darklink.1.zspr rename to data/sprites/alttpr/darklink.1.zspr diff --git a/data/sprites/official/darkswatchy.1.zspr b/data/sprites/alttpr/darkswatchy.1.zspr similarity index 100% rename from data/sprites/official/darkswatchy.1.zspr rename to data/sprites/alttpr/darkswatchy.1.zspr diff --git a/data/sprites/official/darkzelda.1.zspr b/data/sprites/alttpr/darkzelda.1.zspr similarity index 100% rename from data/sprites/official/darkzelda.1.zspr rename to data/sprites/alttpr/darkzelda.1.zspr diff --git a/data/sprites/official/darkzora.2.zspr b/data/sprites/alttpr/darkzora.2.zspr similarity index 100% rename from data/sprites/official/darkzora.2.zspr rename to data/sprites/alttpr/darkzora.2.zspr diff --git a/data/sprites/official/deadpool-mythic.1.zspr b/data/sprites/alttpr/deadpool-mythic.1.zspr similarity index 100% rename from data/sprites/official/deadpool-mythic.1.zspr rename to data/sprites/alttpr/deadpool-mythic.1.zspr diff --git a/data/sprites/official/deadpool.1.zspr b/data/sprites/alttpr/deadpool.1.zspr similarity index 100% rename from data/sprites/official/deadpool.1.zspr rename to data/sprites/alttpr/deadpool.1.zspr diff --git a/data/sprites/official/deadrock.1.zspr b/data/sprites/alttpr/deadrock.1.zspr similarity index 100% rename from data/sprites/official/deadrock.1.zspr rename to data/sprites/alttpr/deadrock.1.zspr diff --git a/data/sprites/official/decidueye.1.zspr b/data/sprites/alttpr/decidueye.1.zspr similarity index 100% rename from data/sprites/official/decidueye.1.zspr rename to data/sprites/alttpr/decidueye.1.zspr diff --git a/data/sprites/official/demonlink.1.zspr b/data/sprites/alttpr/demonlink.1.zspr similarity index 100% rename from data/sprites/official/demonlink.1.zspr rename to data/sprites/alttpr/demonlink.1.zspr diff --git a/data/sprites/official/dragonite.2.zspr b/data/sprites/alttpr/dragonite.2.zspr similarity index 100% rename from data/sprites/official/dragonite.2.zspr rename to data/sprites/alttpr/dragonite.2.zspr diff --git a/data/sprites/official/drake.1.zspr b/data/sprites/alttpr/drake.1.zspr similarity index 100% rename from data/sprites/official/drake.1.zspr rename to data/sprites/alttpr/drake.1.zspr diff --git a/data/sprites/official/eggplant.1.zspr b/data/sprites/alttpr/eggplant.1.zspr similarity index 100% rename from data/sprites/official/eggplant.1.zspr rename to data/sprites/alttpr/eggplant.1.zspr diff --git a/data/sprites/official/emosaru.1.zspr b/data/sprites/alttpr/emosaru.1.zspr similarity index 100% rename from data/sprites/official/emosaru.1.zspr rename to data/sprites/alttpr/emosaru.1.zspr diff --git a/data/sprites/official/ezlo.1.zspr b/data/sprites/alttpr/ezlo.1.zspr similarity index 100% rename from data/sprites/official/ezlo.1.zspr rename to data/sprites/alttpr/ezlo.1.zspr diff --git a/data/sprites/official/fierce-deity-link.1.zspr b/data/sprites/alttpr/fierce-deity-link.1.zspr similarity index 100% rename from data/sprites/official/fierce-deity-link.1.zspr rename to data/sprites/alttpr/fierce-deity-link.1.zspr diff --git a/data/sprites/official/finn.3.zspr b/data/sprites/alttpr/finn.3.zspr similarity index 100% rename from data/sprites/official/finn.3.zspr rename to data/sprites/alttpr/finn.3.zspr diff --git a/data/sprites/official/finny_bear.1.zspr b/data/sprites/alttpr/finny_bear.1.zspr similarity index 100% rename from data/sprites/official/finny_bear.1.zspr rename to data/sprites/alttpr/finny_bear.1.zspr diff --git a/data/sprites/official/fish_floodgate.1.zspr b/data/sprites/alttpr/fish_floodgate.1.zspr similarity index 100% rename from data/sprites/official/fish_floodgate.1.zspr rename to data/sprites/alttpr/fish_floodgate.1.zspr diff --git a/data/sprites/official/flavor_guy.1.zspr b/data/sprites/alttpr/flavor_guy.1.zspr similarity index 100% rename from data/sprites/official/flavor_guy.1.zspr rename to data/sprites/alttpr/flavor_guy.1.zspr diff --git a/data/sprites/official/foxlink.1.zspr b/data/sprites/alttpr/foxlink.1.zspr similarity index 100% rename from data/sprites/official/foxlink.1.zspr rename to data/sprites/alttpr/foxlink.1.zspr diff --git a/data/sprites/official/freya.1.zspr b/data/sprites/alttpr/freya.1.zspr similarity index 100% rename from data/sprites/official/freya.1.zspr rename to data/sprites/alttpr/freya.1.zspr diff --git a/data/sprites/official/frisk.1.zspr b/data/sprites/alttpr/frisk.1.zspr similarity index 100% rename from data/sprites/official/frisk.1.zspr rename to data/sprites/alttpr/frisk.1.zspr diff --git a/data/sprites/official/froglink.3.zspr b/data/sprites/alttpr/froglink.3.zspr similarity index 100% rename from data/sprites/official/froglink.3.zspr rename to data/sprites/alttpr/froglink.3.zspr diff --git a/data/sprites/official/fujin.2.zspr b/data/sprites/alttpr/fujin.2.zspr similarity index 100% rename from data/sprites/official/fujin.2.zspr rename to data/sprites/alttpr/fujin.2.zspr diff --git a/data/sprites/official/future_trunks.1.zspr b/data/sprites/alttpr/future_trunks.1.zspr similarity index 100% rename from data/sprites/official/future_trunks.1.zspr rename to data/sprites/alttpr/future_trunks.1.zspr diff --git a/data/sprites/official/gamer.1.zspr b/data/sprites/alttpr/gamer.1.zspr similarity index 100% rename from data/sprites/official/gamer.1.zspr rename to data/sprites/alttpr/gamer.1.zspr diff --git a/data/sprites/official/ganon.1.zspr b/data/sprites/alttpr/ganon.1.zspr similarity index 100% rename from data/sprites/official/ganon.1.zspr rename to data/sprites/alttpr/ganon.1.zspr diff --git a/data/sprites/official/ganondorf.1.zspr b/data/sprites/alttpr/ganondorf.1.zspr similarity index 100% rename from data/sprites/official/ganondorf.1.zspr rename to data/sprites/alttpr/ganondorf.1.zspr diff --git a/data/sprites/official/garfield.2.zspr b/data/sprites/alttpr/garfield.2.zspr similarity index 100% rename from data/sprites/official/garfield.2.zspr rename to data/sprites/alttpr/garfield.2.zspr diff --git a/data/sprites/official/garnet.1.zspr b/data/sprites/alttpr/garnet.1.zspr similarity index 100% rename from data/sprites/official/garnet.1.zspr rename to data/sprites/alttpr/garnet.1.zspr diff --git a/data/sprites/official/garomaster.1.zspr b/data/sprites/alttpr/garomaster.1.zspr similarity index 100% rename from data/sprites/official/garomaster.1.zspr rename to data/sprites/alttpr/garomaster.1.zspr diff --git a/data/sprites/official/gbc-link.1.zspr b/data/sprites/alttpr/gbc-link.1.zspr similarity index 100% rename from data/sprites/official/gbc-link.1.zspr rename to data/sprites/alttpr/gbc-link.1.zspr diff --git a/data/sprites/official/geno.1.zspr b/data/sprites/alttpr/geno.1.zspr similarity index 100% rename from data/sprites/official/geno.1.zspr rename to data/sprites/alttpr/geno.1.zspr diff --git a/data/sprites/official/gobli.1.zspr b/data/sprites/alttpr/gobli.1.zspr similarity index 100% rename from data/sprites/official/gobli.1.zspr rename to data/sprites/alttpr/gobli.1.zspr diff --git a/data/sprites/official/goomba.1.zspr b/data/sprites/alttpr/goomba.1.zspr similarity index 100% rename from data/sprites/official/goomba.1.zspr rename to data/sprites/alttpr/goomba.1.zspr diff --git a/data/sprites/official/goose.1.zspr b/data/sprites/alttpr/goose.1.zspr similarity index 100% rename from data/sprites/official/goose.1.zspr rename to data/sprites/alttpr/goose.1.zspr diff --git a/data/sprites/official/grandpoobear.2.zspr b/data/sprites/alttpr/grandpoobear.2.zspr similarity index 100% rename from data/sprites/official/grandpoobear.2.zspr rename to data/sprites/alttpr/grandpoobear.2.zspr diff --git a/data/sprites/official/grunclestan.1.zspr b/data/sprites/alttpr/grunclestan.1.zspr similarity index 100% rename from data/sprites/official/grunclestan.1.zspr rename to data/sprites/alttpr/grunclestan.1.zspr diff --git a/data/sprites/official/guiz.1.zspr b/data/sprites/alttpr/guiz.1.zspr similarity index 100% rename from data/sprites/official/guiz.1.zspr rename to data/sprites/alttpr/guiz.1.zspr diff --git a/data/sprites/official/hardhat_beetle.1.zspr b/data/sprites/alttpr/hardhat_beetle.1.zspr similarity index 100% rename from data/sprites/official/hardhat_beetle.1.zspr rename to data/sprites/alttpr/hardhat_beetle.1.zspr diff --git a/data/sprites/official/hat-kid.1.zspr b/data/sprites/alttpr/hat-kid.1.zspr similarity index 100% rename from data/sprites/official/hat-kid.1.zspr rename to data/sprites/alttpr/hat-kid.1.zspr diff --git a/data/sprites/official/headlesslink.1.zspr b/data/sprites/alttpr/headlesslink.1.zspr similarity index 100% rename from data/sprites/official/headlesslink.1.zspr rename to data/sprites/alttpr/headlesslink.1.zspr diff --git a/data/sprites/official/hello_kitty.1.zspr b/data/sprites/alttpr/hello_kitty.1.zspr similarity index 100% rename from data/sprites/official/hello_kitty.1.zspr rename to data/sprites/alttpr/hello_kitty.1.zspr diff --git a/data/sprites/official/hidari.1.zspr b/data/sprites/alttpr/hidari.1.zspr similarity index 100% rename from data/sprites/official/hidari.1.zspr rename to data/sprites/alttpr/hidari.1.zspr diff --git a/data/sprites/official/hint_tile.1.zspr b/data/sprites/alttpr/hint_tile.1.zspr similarity index 100% rename from data/sprites/official/hint_tile.1.zspr rename to data/sprites/alttpr/hint_tile.1.zspr diff --git a/data/sprites/official/hitsuyan.1.zspr b/data/sprites/alttpr/hitsuyan.1.zspr similarity index 100% rename from data/sprites/official/hitsuyan.1.zspr rename to data/sprites/alttpr/hitsuyan.1.zspr diff --git a/data/sprites/official/hoarder-bush.1.zspr b/data/sprites/alttpr/hoarder-bush.1.zspr similarity index 100% rename from data/sprites/official/hoarder-bush.1.zspr rename to data/sprites/alttpr/hoarder-bush.1.zspr diff --git a/data/sprites/official/hoarder-pot.1.zspr b/data/sprites/alttpr/hoarder-pot.1.zspr similarity index 100% rename from data/sprites/official/hoarder-pot.1.zspr rename to data/sprites/alttpr/hoarder-pot.1.zspr diff --git a/data/sprites/official/hoarder-rock.1.zspr b/data/sprites/alttpr/hoarder-rock.1.zspr similarity index 100% rename from data/sprites/official/hoarder-rock.1.zspr rename to data/sprites/alttpr/hoarder-rock.1.zspr diff --git a/data/sprites/official/homer.1.zspr b/data/sprites/alttpr/homer.1.zspr similarity index 100% rename from data/sprites/official/homer.1.zspr rename to data/sprites/alttpr/homer.1.zspr diff --git a/data/sprites/official/hyruleknight.1.zspr b/data/sprites/alttpr/hyruleknight.1.zspr similarity index 100% rename from data/sprites/official/hyruleknight.1.zspr rename to data/sprites/alttpr/hyruleknight.1.zspr diff --git a/data/sprites/official/ibazly.1.zspr b/data/sprites/alttpr/ibazly.1.zspr similarity index 100% rename from data/sprites/official/ibazly.1.zspr rename to data/sprites/alttpr/ibazly.1.zspr diff --git a/data/sprites/official/ignignokt.2.zspr b/data/sprites/alttpr/ignignokt.2.zspr similarity index 100% rename from data/sprites/official/ignignokt.2.zspr rename to data/sprites/alttpr/ignignokt.2.zspr diff --git a/data/sprites/official/informant_woman.1.zspr b/data/sprites/alttpr/informant_woman.1.zspr similarity index 100% rename from data/sprites/official/informant_woman.1.zspr rename to data/sprites/alttpr/informant_woman.1.zspr diff --git a/data/sprites/official/inkling.1.zspr b/data/sprites/alttpr/inkling.1.zspr similarity index 100% rename from data/sprites/official/inkling.1.zspr rename to data/sprites/alttpr/inkling.1.zspr diff --git a/data/sprites/official/invisibleman.1.zspr b/data/sprites/alttpr/invisibleman.1.zspr similarity index 100% rename from data/sprites/official/invisibleman.1.zspr rename to data/sprites/alttpr/invisibleman.1.zspr diff --git a/data/sprites/official/jack-frost.1.zspr b/data/sprites/alttpr/jack-frost.1.zspr similarity index 100% rename from data/sprites/official/jack-frost.1.zspr rename to data/sprites/alttpr/jack-frost.1.zspr diff --git a/data/sprites/official/jason_frudnick.1.zspr b/data/sprites/alttpr/jason_frudnick.1.zspr similarity index 100% rename from data/sprites/official/jason_frudnick.1.zspr rename to data/sprites/alttpr/jason_frudnick.1.zspr diff --git a/data/sprites/official/jasp.1.zspr b/data/sprites/alttpr/jasp.1.zspr similarity index 100% rename from data/sprites/official/jasp.1.zspr rename to data/sprites/alttpr/jasp.1.zspr diff --git a/data/sprites/official/jogurt.1.zspr b/data/sprites/alttpr/jogurt.1.zspr similarity index 100% rename from data/sprites/official/jogurt.1.zspr rename to data/sprites/alttpr/jogurt.1.zspr diff --git a/data/sprites/official/katsura.1.zspr b/data/sprites/alttpr/katsura.1.zspr similarity index 100% rename from data/sprites/official/katsura.1.zspr rename to data/sprites/alttpr/katsura.1.zspr diff --git a/data/sprites/official/kecleon.1.zspr b/data/sprites/alttpr/kecleon.1.zspr similarity index 100% rename from data/sprites/official/kecleon.1.zspr rename to data/sprites/alttpr/kecleon.1.zspr diff --git a/data/sprites/official/kenny_mccormick.1.zspr b/data/sprites/alttpr/kenny_mccormick.1.zspr similarity index 100% rename from data/sprites/official/kenny_mccormick.1.zspr rename to data/sprites/alttpr/kenny_mccormick.1.zspr diff --git a/data/sprites/official/ketchup.1.zspr b/data/sprites/alttpr/ketchup.1.zspr similarity index 100% rename from data/sprites/official/ketchup.1.zspr rename to data/sprites/alttpr/ketchup.1.zspr diff --git a/data/sprites/official/kholdstare.1.zspr b/data/sprites/alttpr/kholdstare.1.zspr similarity index 100% rename from data/sprites/official/kholdstare.1.zspr rename to data/sprites/alttpr/kholdstare.1.zspr diff --git a/data/sprites/official/king_gothalion.1.zspr b/data/sprites/alttpr/king_gothalion.1.zspr similarity index 100% rename from data/sprites/official/king_gothalion.1.zspr rename to data/sprites/alttpr/king_gothalion.1.zspr diff --git a/data/sprites/official/king_graham.1.zspr b/data/sprites/alttpr/king_graham.1.zspr similarity index 100% rename from data/sprites/official/king_graham.1.zspr rename to data/sprites/alttpr/king_graham.1.zspr diff --git a/data/sprites/official/kirby-meta.1.zspr b/data/sprites/alttpr/kirby-meta.1.zspr similarity index 100% rename from data/sprites/official/kirby-meta.1.zspr rename to data/sprites/alttpr/kirby-meta.1.zspr diff --git a/data/sprites/official/kore8.1.zspr b/data/sprites/alttpr/kore8.1.zspr similarity index 100% rename from data/sprites/official/kore8.1.zspr rename to data/sprites/alttpr/kore8.1.zspr diff --git a/data/sprites/official/lakitu.1.zspr b/data/sprites/alttpr/lakitu.1.zspr similarity index 100% rename from data/sprites/official/lakitu.1.zspr rename to data/sprites/alttpr/lakitu.1.zspr diff --git a/data/sprites/official/lapras.1.zspr b/data/sprites/alttpr/lapras.1.zspr similarity index 100% rename from data/sprites/official/lapras.1.zspr rename to data/sprites/alttpr/lapras.1.zspr diff --git a/data/sprites/official/lest.1.zspr b/data/sprites/alttpr/lest.1.zspr similarity index 100% rename from data/sprites/official/lest.1.zspr rename to data/sprites/alttpr/lest.1.zspr diff --git a/data/sprites/official/lily.1.zspr b/data/sprites/alttpr/lily.1.zspr similarity index 100% rename from data/sprites/official/lily.1.zspr rename to data/sprites/alttpr/lily.1.zspr diff --git a/data/sprites/official/linja.1.zspr b/data/sprites/alttpr/linja.1.zspr similarity index 100% rename from data/sprites/official/linja.1.zspr rename to data/sprites/alttpr/linja.1.zspr diff --git a/data/sprites/official/linkhatcolor.1.zspr b/data/sprites/alttpr/linkhatcolor.1.zspr similarity index 100% rename from data/sprites/official/linkhatcolor.1.zspr rename to data/sprites/alttpr/linkhatcolor.1.zspr diff --git a/data/sprites/official/linktuniccolor.1.zspr b/data/sprites/alttpr/linktuniccolor.1.zspr similarity index 100% rename from data/sprites/official/linktuniccolor.1.zspr rename to data/sprites/alttpr/linktuniccolor.1.zspr diff --git a/data/sprites/official/littlepony.1.zspr b/data/sprites/alttpr/littlepony.1.zspr similarity index 100% rename from data/sprites/official/littlepony.1.zspr rename to data/sprites/alttpr/littlepony.1.zspr diff --git a/data/sprites/official/locke_merchant.1.zspr b/data/sprites/alttpr/locke_merchant.1.zspr similarity index 100% rename from data/sprites/official/locke_merchant.1.zspr rename to data/sprites/alttpr/locke_merchant.1.zspr diff --git a/data/sprites/official/lucario.1.zspr b/data/sprites/alttpr/lucario.1.zspr similarity index 100% rename from data/sprites/official/lucario.1.zspr rename to data/sprites/alttpr/lucario.1.zspr diff --git a/data/sprites/official/luigi.1.zspr b/data/sprites/alttpr/luigi.1.zspr similarity index 100% rename from data/sprites/official/luigi.1.zspr rename to data/sprites/alttpr/luigi.1.zspr diff --git a/data/sprites/official/madeline.1.zspr b/data/sprites/alttpr/madeline.1.zspr similarity index 100% rename from data/sprites/official/madeline.1.zspr rename to data/sprites/alttpr/madeline.1.zspr diff --git a/data/sprites/official/magus.1.zspr b/data/sprites/alttpr/magus.1.zspr similarity index 100% rename from data/sprites/official/magus.1.zspr rename to data/sprites/alttpr/magus.1.zspr diff --git a/data/sprites/official/maiden.1.zspr b/data/sprites/alttpr/maiden.1.zspr similarity index 100% rename from data/sprites/official/maiden.1.zspr rename to data/sprites/alttpr/maiden.1.zspr diff --git a/data/sprites/official/mallow-cat.1.zspr b/data/sprites/alttpr/mallow-cat.1.zspr similarity index 100% rename from data/sprites/official/mallow-cat.1.zspr rename to data/sprites/alttpr/mallow-cat.1.zspr diff --git a/data/sprites/official/mangalink.1.zspr b/data/sprites/alttpr/mangalink.1.zspr similarity index 100% rename from data/sprites/official/mangalink.1.zspr rename to data/sprites/alttpr/mangalink.1.zspr diff --git a/data/sprites/official/maplequeen.2.zspr b/data/sprites/alttpr/maplequeen.2.zspr similarity index 100% rename from data/sprites/official/maplequeen.2.zspr rename to data/sprites/alttpr/maplequeen.2.zspr diff --git a/data/sprites/official/marin.2.zspr b/data/sprites/alttpr/marin.2.zspr similarity index 100% rename from data/sprites/official/marin.2.zspr rename to data/sprites/alttpr/marin.2.zspr diff --git a/data/sprites/official/mario-classic.2.zspr b/data/sprites/alttpr/mario-classic.2.zspr similarity index 100% rename from data/sprites/official/mario-classic.2.zspr rename to data/sprites/alttpr/mario-classic.2.zspr diff --git a/data/sprites/official/mario_tanooki.1.zspr b/data/sprites/alttpr/mario_tanooki.1.zspr similarity index 100% rename from data/sprites/official/mario_tanooki.1.zspr rename to data/sprites/alttpr/mario_tanooki.1.zspr diff --git a/data/sprites/official/mariocappy.1.zspr b/data/sprites/alttpr/mariocappy.1.zspr similarity index 100% rename from data/sprites/official/mariocappy.1.zspr rename to data/sprites/alttpr/mariocappy.1.zspr diff --git a/data/sprites/official/marisa.1.zspr b/data/sprites/alttpr/marisa.1.zspr similarity index 100% rename from data/sprites/official/marisa.1.zspr rename to data/sprites/alttpr/marisa.1.zspr diff --git a/data/sprites/official/matthias.1.zspr b/data/sprites/alttpr/matthias.1.zspr similarity index 100% rename from data/sprites/official/matthias.1.zspr rename to data/sprites/alttpr/matthias.1.zspr diff --git a/data/sprites/official/meatwad.1.zspr b/data/sprites/alttpr/meatwad.1.zspr similarity index 100% rename from data/sprites/official/meatwad.1.zspr rename to data/sprites/alttpr/meatwad.1.zspr diff --git a/data/sprites/official/medallions.1.zspr b/data/sprites/alttpr/medallions.1.zspr similarity index 100% rename from data/sprites/official/medallions.1.zspr rename to data/sprites/alttpr/medallions.1.zspr diff --git a/data/sprites/official/medli.1.zspr b/data/sprites/alttpr/medli.1.zspr similarity index 100% rename from data/sprites/official/medli.1.zspr rename to data/sprites/alttpr/medli.1.zspr diff --git a/data/sprites/official/megaman-x.2.zspr b/data/sprites/alttpr/megaman-x.2.zspr similarity index 100% rename from data/sprites/official/megaman-x.2.zspr rename to data/sprites/alttpr/megaman-x.2.zspr diff --git a/data/sprites/official/metroid.1.zspr b/data/sprites/alttpr/metroid.1.zspr similarity index 100% rename from data/sprites/official/metroid.1.zspr rename to data/sprites/alttpr/metroid.1.zspr diff --git a/data/sprites/official/mew.1.zspr b/data/sprites/alttpr/mew.1.zspr similarity index 100% rename from data/sprites/official/mew.1.zspr rename to data/sprites/alttpr/mew.1.zspr diff --git a/data/sprites/official/mike-jones.2.zspr b/data/sprites/alttpr/mike-jones.2.zspr similarity index 100% rename from data/sprites/official/mike-jones.2.zspr rename to data/sprites/alttpr/mike-jones.2.zspr diff --git a/data/sprites/official/minish_link.1.zspr b/data/sprites/alttpr/minish_link.1.zspr similarity index 100% rename from data/sprites/official/minish_link.1.zspr rename to data/sprites/alttpr/minish_link.1.zspr diff --git a/data/sprites/official/minishcaplink.2.zspr b/data/sprites/alttpr/minishcaplink.2.zspr similarity index 100% rename from data/sprites/official/minishcaplink.2.zspr rename to data/sprites/alttpr/minishcaplink.2.zspr diff --git a/data/sprites/official/missingno.1.zspr b/data/sprites/alttpr/missingno.1.zspr similarity index 100% rename from data/sprites/official/missingno.1.zspr rename to data/sprites/alttpr/missingno.1.zspr diff --git a/data/sprites/official/modernlink.1.zspr b/data/sprites/alttpr/modernlink.1.zspr similarity index 100% rename from data/sprites/official/modernlink.1.zspr rename to data/sprites/alttpr/modernlink.1.zspr diff --git a/data/sprites/official/mog.2.zspr b/data/sprites/alttpr/mog.2.zspr similarity index 100% rename from data/sprites/official/mog.2.zspr rename to data/sprites/alttpr/mog.2.zspr diff --git a/data/sprites/official/momiji.1.zspr b/data/sprites/alttpr/momiji.1.zspr similarity index 100% rename from data/sprites/official/momiji.1.zspr rename to data/sprites/alttpr/momiji.1.zspr diff --git a/data/sprites/official/moosh.1.zspr b/data/sprites/alttpr/moosh.1.zspr similarity index 100% rename from data/sprites/official/moosh.1.zspr rename to data/sprites/alttpr/moosh.1.zspr diff --git a/data/sprites/official/mouse.1.zspr b/data/sprites/alttpr/mouse.1.zspr similarity index 100% rename from data/sprites/official/mouse.1.zspr rename to data/sprites/alttpr/mouse.1.zspr diff --git a/data/sprites/official/ms-paintdog.1.zspr b/data/sprites/alttpr/ms-paintdog.1.zspr similarity index 100% rename from data/sprites/official/ms-paintdog.1.zspr rename to data/sprites/alttpr/ms-paintdog.1.zspr diff --git a/data/sprites/official/mushy.1.zspr b/data/sprites/alttpr/mushy.1.zspr similarity index 100% rename from data/sprites/official/mushy.1.zspr rename to data/sprites/alttpr/mushy.1.zspr diff --git a/data/sprites/official/naturelink.1.zspr b/data/sprites/alttpr/naturelink.1.zspr similarity index 100% rename from data/sprites/official/naturelink.1.zspr rename to data/sprites/alttpr/naturelink.1.zspr diff --git a/data/sprites/official/navi.1.zspr b/data/sprites/alttpr/navi.1.zspr similarity index 100% rename from data/sprites/official/navi.1.zspr rename to data/sprites/alttpr/navi.1.zspr diff --git a/data/sprites/official/navirou.1.zspr b/data/sprites/alttpr/navirou.1.zspr similarity index 100% rename from data/sprites/official/navirou.1.zspr rename to data/sprites/alttpr/navirou.1.zspr diff --git a/data/sprites/official/ned-flanders.1.zspr b/data/sprites/alttpr/ned-flanders.1.zspr similarity index 100% rename from data/sprites/official/ned-flanders.1.zspr rename to data/sprites/alttpr/ned-flanders.1.zspr diff --git a/data/sprites/official/negativelink.1.zspr b/data/sprites/alttpr/negativelink.1.zspr similarity index 100% rename from data/sprites/official/negativelink.1.zspr rename to data/sprites/alttpr/negativelink.1.zspr diff --git a/data/sprites/official/neosad.1.zspr b/data/sprites/alttpr/neosad.1.zspr similarity index 100% rename from data/sprites/official/neosad.1.zspr rename to data/sprites/alttpr/neosad.1.zspr diff --git a/data/sprites/official/neslink.1.zspr b/data/sprites/alttpr/neslink.1.zspr similarity index 100% rename from data/sprites/official/neslink.1.zspr rename to data/sprites/alttpr/neslink.1.zspr diff --git a/data/sprites/official/ness.1.zspr b/data/sprites/alttpr/ness.1.zspr similarity index 100% rename from data/sprites/official/ness.1.zspr rename to data/sprites/alttpr/ness.1.zspr diff --git a/data/sprites/official/nia.1.zspr b/data/sprites/alttpr/nia.1.zspr similarity index 100% rename from data/sprites/official/nia.1.zspr rename to data/sprites/alttpr/nia.1.zspr diff --git a/data/sprites/official/niko.1.zspr b/data/sprites/alttpr/niko.1.zspr similarity index 100% rename from data/sprites/official/niko.1.zspr rename to data/sprites/alttpr/niko.1.zspr diff --git a/data/sprites/official/oldman.2.zspr b/data/sprites/alttpr/oldman.2.zspr similarity index 100% rename from data/sprites/official/oldman.2.zspr rename to data/sprites/alttpr/oldman.2.zspr diff --git a/data/sprites/official/ori.2.zspr b/data/sprites/alttpr/ori.2.zspr similarity index 100% rename from data/sprites/official/ori.2.zspr rename to data/sprites/alttpr/ori.2.zspr diff --git a/data/sprites/official/outlinelink.1.zspr b/data/sprites/alttpr/outlinelink.1.zspr similarity index 100% rename from data/sprites/official/outlinelink.1.zspr rename to data/sprites/alttpr/outlinelink.1.zspr diff --git a/data/sprites/official/parallelworldslink.1.zspr b/data/sprites/alttpr/parallelworldslink.1.zspr similarity index 100% rename from data/sprites/official/parallelworldslink.1.zspr rename to data/sprites/alttpr/parallelworldslink.1.zspr diff --git a/data/sprites/official/paula.1.zspr b/data/sprites/alttpr/paula.1.zspr similarity index 100% rename from data/sprites/official/paula.1.zspr rename to data/sprites/alttpr/paula.1.zspr diff --git a/data/sprites/official/peach.1.zspr b/data/sprites/alttpr/peach.1.zspr similarity index 100% rename from data/sprites/official/peach.1.zspr rename to data/sprites/alttpr/peach.1.zspr diff --git a/data/sprites/official/penguinlink.1.zspr b/data/sprites/alttpr/penguinlink.1.zspr similarity index 100% rename from data/sprites/official/penguinlink.1.zspr rename to data/sprites/alttpr/penguinlink.1.zspr diff --git a/data/sprites/official/pete.1.zspr b/data/sprites/alttpr/pete.1.zspr similarity index 100% rename from data/sprites/official/pete.1.zspr rename to data/sprites/alttpr/pete.1.zspr diff --git a/data/sprites/official/phoenix-wright.1.zspr b/data/sprites/alttpr/phoenix-wright.1.zspr similarity index 100% rename from data/sprites/official/phoenix-wright.1.zspr rename to data/sprites/alttpr/phoenix-wright.1.zspr diff --git a/data/sprites/official/pikachu.1.zspr b/data/sprites/alttpr/pikachu.1.zspr similarity index 100% rename from data/sprites/official/pikachu.1.zspr rename to data/sprites/alttpr/pikachu.1.zspr diff --git a/data/sprites/official/pinkribbonlink.2.zspr b/data/sprites/alttpr/pinkribbonlink.2.zspr similarity index 100% rename from data/sprites/official/pinkribbonlink.2.zspr rename to data/sprites/alttpr/pinkribbonlink.2.zspr diff --git a/data/sprites/official/piranha_plant.1.zspr b/data/sprites/alttpr/piranha_plant.1.zspr similarity index 100% rename from data/sprites/official/piranha_plant.1.zspr rename to data/sprites/alttpr/piranha_plant.1.zspr diff --git a/data/sprites/official/plagueknight.1.zspr b/data/sprites/alttpr/plagueknight.1.zspr similarity index 100% rename from data/sprites/official/plagueknight.1.zspr rename to data/sprites/alttpr/plagueknight.1.zspr diff --git a/data/sprites/official/pokey.1.zspr b/data/sprites/alttpr/pokey.1.zspr similarity index 100% rename from data/sprites/official/pokey.1.zspr rename to data/sprites/alttpr/pokey.1.zspr diff --git a/data/sprites/official/popoi.1.zspr b/data/sprites/alttpr/popoi.1.zspr similarity index 100% rename from data/sprites/official/popoi.1.zspr rename to data/sprites/alttpr/popoi.1.zspr diff --git a/data/sprites/official/poppy.1.zspr b/data/sprites/alttpr/poppy.1.zspr similarity index 100% rename from data/sprites/official/poppy.1.zspr rename to data/sprites/alttpr/poppy.1.zspr diff --git a/data/sprites/official/porg_knight.1.zspr b/data/sprites/alttpr/porg_knight.1.zspr similarity index 100% rename from data/sprites/official/porg_knight.1.zspr rename to data/sprites/alttpr/porg_knight.1.zspr diff --git a/data/sprites/official/powerpuff_girl.1.zspr b/data/sprites/alttpr/powerpuff_girl.1.zspr similarity index 100% rename from data/sprites/official/powerpuff_girl.1.zspr rename to data/sprites/alttpr/powerpuff_girl.1.zspr diff --git a/data/sprites/official/pridelink.2.zspr b/data/sprites/alttpr/pridelink.2.zspr similarity index 100% rename from data/sprites/official/pridelink.2.zspr rename to data/sprites/alttpr/pridelink.2.zspr diff --git a/data/sprites/official/primm.1.zspr b/data/sprites/alttpr/primm.1.zspr similarity index 100% rename from data/sprites/official/primm.1.zspr rename to data/sprites/alttpr/primm.1.zspr diff --git a/data/sprites/official/princess_bubblegum.1.zspr b/data/sprites/alttpr/princess_bubblegum.1.zspr similarity index 100% rename from data/sprites/official/princess_bubblegum.1.zspr rename to data/sprites/alttpr/princess_bubblegum.1.zspr diff --git a/data/sprites/official/psyduck.2.zspr b/data/sprites/alttpr/psyduck.2.zspr similarity index 100% rename from data/sprites/official/psyduck.2.zspr rename to data/sprites/alttpr/psyduck.2.zspr diff --git a/data/sprites/official/pug.1.zspr b/data/sprites/alttpr/pug.1.zspr similarity index 100% rename from data/sprites/official/pug.1.zspr rename to data/sprites/alttpr/pug.1.zspr diff --git a/data/sprites/official/purplechest-bottle.1.zspr b/data/sprites/alttpr/purplechest-bottle.1.zspr similarity index 100% rename from data/sprites/official/purplechest-bottle.1.zspr rename to data/sprites/alttpr/purplechest-bottle.1.zspr diff --git a/data/sprites/official/pyro.1.zspr b/data/sprites/alttpr/pyro.1.zspr similarity index 100% rename from data/sprites/official/pyro.1.zspr rename to data/sprites/alttpr/pyro.1.zspr diff --git a/data/sprites/official/rainbowlink.1.zspr b/data/sprites/alttpr/rainbowlink.1.zspr similarity index 100% rename from data/sprites/official/rainbowlink.1.zspr rename to data/sprites/alttpr/rainbowlink.1.zspr diff --git a/data/sprites/official/remeer.1.zspr b/data/sprites/alttpr/remeer.1.zspr similarity index 100% rename from data/sprites/official/remeer.1.zspr rename to data/sprites/alttpr/remeer.1.zspr diff --git a/data/sprites/official/rick.1.zspr b/data/sprites/alttpr/rick.1.zspr similarity index 100% rename from data/sprites/official/rick.1.zspr rename to data/sprites/alttpr/rick.1.zspr diff --git a/data/sprites/official/robotlink.1.zspr b/data/sprites/alttpr/robotlink.1.zspr similarity index 100% rename from data/sprites/official/robotlink.1.zspr rename to data/sprites/alttpr/robotlink.1.zspr diff --git a/data/sprites/official/rocko.1.zspr b/data/sprites/alttpr/rocko.1.zspr similarity index 100% rename from data/sprites/official/rocko.1.zspr rename to data/sprites/alttpr/rocko.1.zspr diff --git a/data/sprites/official/rottytops.1.zspr b/data/sprites/alttpr/rottytops.1.zspr similarity index 100% rename from data/sprites/official/rottytops.1.zspr rename to data/sprites/alttpr/rottytops.1.zspr diff --git a/data/sprites/official/roykoopa.1.zspr b/data/sprites/alttpr/roykoopa.1.zspr similarity index 100% rename from data/sprites/official/roykoopa.1.zspr rename to data/sprites/alttpr/roykoopa.1.zspr diff --git a/data/sprites/official/rumia.1.zspr b/data/sprites/alttpr/rumia.1.zspr similarity index 100% rename from data/sprites/official/rumia.1.zspr rename to data/sprites/alttpr/rumia.1.zspr diff --git a/data/sprites/official/rydia.1.zspr b/data/sprites/alttpr/rydia.1.zspr similarity index 100% rename from data/sprites/official/rydia.1.zspr rename to data/sprites/alttpr/rydia.1.zspr diff --git a/data/sprites/official/ryu.1.zspr b/data/sprites/alttpr/ryu.1.zspr similarity index 100% rename from data/sprites/official/ryu.1.zspr rename to data/sprites/alttpr/ryu.1.zspr diff --git a/data/sprites/official/sailormoon.1.zspr b/data/sprites/alttpr/sailormoon.1.zspr similarity index 100% rename from data/sprites/official/sailormoon.1.zspr rename to data/sprites/alttpr/sailormoon.1.zspr diff --git a/data/sprites/official/saitama.1.zspr b/data/sprites/alttpr/saitama.1.zspr similarity index 100% rename from data/sprites/official/saitama.1.zspr rename to data/sprites/alttpr/saitama.1.zspr diff --git a/data/sprites/official/samus-sm.1.zspr b/data/sprites/alttpr/samus-sm.1.zspr similarity index 100% rename from data/sprites/official/samus-sm.1.zspr rename to data/sprites/alttpr/samus-sm.1.zspr diff --git a/data/sprites/official/samus.2.zspr b/data/sprites/alttpr/samus.2.zspr similarity index 100% rename from data/sprites/official/samus.2.zspr rename to data/sprites/alttpr/samus.2.zspr diff --git a/data/sprites/official/samus_classic.1.zspr b/data/sprites/alttpr/samus_classic.1.zspr similarity index 100% rename from data/sprites/official/samus_classic.1.zspr rename to data/sprites/alttpr/samus_classic.1.zspr diff --git a/data/sprites/official/santalink.2.zspr b/data/sprites/alttpr/santalink.2.zspr similarity index 100% rename from data/sprites/official/santalink.2.zspr rename to data/sprites/alttpr/santalink.2.zspr diff --git a/data/sprites/official/scholar.1.zspr b/data/sprites/alttpr/scholar.1.zspr similarity index 100% rename from data/sprites/official/scholar.1.zspr rename to data/sprites/alttpr/scholar.1.zspr diff --git a/data/sprites/official/selan.1.zspr b/data/sprites/alttpr/selan.1.zspr similarity index 100% rename from data/sprites/official/selan.1.zspr rename to data/sprites/alttpr/selan.1.zspr diff --git a/data/sprites/official/sevens1ns.1.zspr b/data/sprites/alttpr/sevens1ns.1.zspr similarity index 100% rename from data/sprites/official/sevens1ns.1.zspr rename to data/sprites/alttpr/sevens1ns.1.zspr diff --git a/data/sprites/official/shadow.1.zspr b/data/sprites/alttpr/shadow.1.zspr similarity index 100% rename from data/sprites/official/shadow.1.zspr rename to data/sprites/alttpr/shadow.1.zspr diff --git a/data/sprites/official/shadowsaku.2.zspr b/data/sprites/alttpr/shadowsaku.2.zspr similarity index 100% rename from data/sprites/official/shadowsaku.2.zspr rename to data/sprites/alttpr/shadowsaku.2.zspr diff --git a/data/sprites/official/shantae.1.zspr b/data/sprites/alttpr/shantae.1.zspr similarity index 100% rename from data/sprites/official/shantae.1.zspr rename to data/sprites/alttpr/shantae.1.zspr diff --git a/data/sprites/official/shuppet.1.zspr b/data/sprites/alttpr/shuppet.1.zspr similarity index 100% rename from data/sprites/official/shuppet.1.zspr rename to data/sprites/alttpr/shuppet.1.zspr diff --git a/data/sprites/official/shy-gal.1.zspr b/data/sprites/alttpr/shy-gal.1.zspr similarity index 100% rename from data/sprites/official/shy-gal.1.zspr rename to data/sprites/alttpr/shy-gal.1.zspr diff --git a/data/sprites/official/shy-guy.1.zspr b/data/sprites/alttpr/shy-guy.1.zspr similarity index 100% rename from data/sprites/official/shy-guy.1.zspr rename to data/sprites/alttpr/shy-guy.1.zspr diff --git a/data/sprites/official/sighn_waive.1.zspr b/data/sprites/alttpr/sighn_waive.1.zspr similarity index 100% rename from data/sprites/official/sighn_waive.1.zspr rename to data/sprites/alttpr/sighn_waive.1.zspr diff --git a/data/sprites/official/snes-controller.1.zspr b/data/sprites/alttpr/snes-controller.1.zspr similarity index 100% rename from data/sprites/official/snes-controller.1.zspr rename to data/sprites/alttpr/snes-controller.1.zspr diff --git a/data/sprites/official/sodacan.1.zspr b/data/sprites/alttpr/sodacan.1.zspr similarity index 100% rename from data/sprites/official/sodacan.1.zspr rename to data/sprites/alttpr/sodacan.1.zspr diff --git a/data/sprites/official/solaire.1.zspr b/data/sprites/alttpr/solaire.1.zspr similarity index 100% rename from data/sprites/official/solaire.1.zspr rename to data/sprites/alttpr/solaire.1.zspr diff --git a/data/sprites/official/soldiersprite.1.zspr b/data/sprites/alttpr/soldiersprite.1.zspr similarity index 100% rename from data/sprites/official/soldiersprite.1.zspr rename to data/sprites/alttpr/soldiersprite.1.zspr diff --git a/data/sprites/official/sonic.1.zspr b/data/sprites/alttpr/sonic.1.zspr similarity index 100% rename from data/sprites/official/sonic.1.zspr rename to data/sprites/alttpr/sonic.1.zspr diff --git a/data/sprites/official/sora.1.zspr b/data/sprites/alttpr/sora.1.zspr similarity index 100% rename from data/sprites/official/sora.1.zspr rename to data/sprites/alttpr/sora.1.zspr diff --git a/data/sprites/official/sora_kh1.1.zspr b/data/sprites/alttpr/sora_kh1.1.zspr similarity index 100% rename from data/sprites/official/sora_kh1.1.zspr rename to data/sprites/alttpr/sora_kh1.1.zspr diff --git a/data/sprites/official/squall.1.zspr b/data/sprites/alttpr/squall.1.zspr similarity index 100% rename from data/sprites/official/squall.1.zspr rename to data/sprites/alttpr/squall.1.zspr diff --git a/data/sprites/official/squirrel.1.zspr b/data/sprites/alttpr/squirrel.1.zspr similarity index 100% rename from data/sprites/official/squirrel.1.zspr rename to data/sprites/alttpr/squirrel.1.zspr diff --git a/data/sprites/official/squirtle.1.zspr b/data/sprites/alttpr/squirtle.1.zspr similarity index 100% rename from data/sprites/official/squirtle.1.zspr rename to data/sprites/alttpr/squirtle.1.zspr diff --git a/data/sprites/official/stalfos.1.zspr b/data/sprites/alttpr/stalfos.1.zspr similarity index 100% rename from data/sprites/official/stalfos.1.zspr rename to data/sprites/alttpr/stalfos.1.zspr diff --git a/data/sprites/official/stan.1.zspr b/data/sprites/alttpr/stan.1.zspr similarity index 100% rename from data/sprites/official/stan.1.zspr rename to data/sprites/alttpr/stan.1.zspr diff --git a/data/sprites/official/staticlink.1.zspr b/data/sprites/alttpr/staticlink.1.zspr similarity index 100% rename from data/sprites/official/staticlink.1.zspr rename to data/sprites/alttpr/staticlink.1.zspr diff --git a/data/sprites/official/stick_man.1.zspr b/data/sprites/alttpr/stick_man.1.zspr similarity index 100% rename from data/sprites/official/stick_man.1.zspr rename to data/sprites/alttpr/stick_man.1.zspr diff --git a/data/sprites/official/superbomb.1.zspr b/data/sprites/alttpr/superbomb.1.zspr similarity index 100% rename from data/sprites/official/superbomb.1.zspr rename to data/sprites/alttpr/superbomb.1.zspr diff --git a/data/sprites/official/superbunny.2.zspr b/data/sprites/alttpr/superbunny.2.zspr similarity index 100% rename from data/sprites/official/superbunny.2.zspr rename to data/sprites/alttpr/superbunny.2.zspr diff --git a/data/sprites/official/supermeatboy.1.zspr b/data/sprites/alttpr/supermeatboy.1.zspr similarity index 100% rename from data/sprites/official/supermeatboy.1.zspr rename to data/sprites/alttpr/supermeatboy.1.zspr diff --git a/data/sprites/official/swatchy.1.zspr b/data/sprites/alttpr/swatchy.1.zspr similarity index 100% rename from data/sprites/official/swatchy.1.zspr rename to data/sprites/alttpr/swatchy.1.zspr diff --git a/data/sprites/official/tasbot.1.zspr b/data/sprites/alttpr/tasbot.1.zspr similarity index 100% rename from data/sprites/official/tasbot.1.zspr rename to data/sprites/alttpr/tasbot.1.zspr diff --git a/data/sprites/official/teatime.1.zspr b/data/sprites/alttpr/teatime.1.zspr similarity index 100% rename from data/sprites/official/teatime.1.zspr rename to data/sprites/alttpr/teatime.1.zspr diff --git a/data/sprites/official/terra.1.zspr b/data/sprites/alttpr/terra.1.zspr similarity index 100% rename from data/sprites/official/terra.1.zspr rename to data/sprites/alttpr/terra.1.zspr diff --git a/data/sprites/official/tetra.1.zspr b/data/sprites/alttpr/tetra.1.zspr similarity index 100% rename from data/sprites/official/tetra.1.zspr rename to data/sprites/alttpr/tetra.1.zspr diff --git a/data/sprites/official/tgh.1.zspr b/data/sprites/alttpr/tgh.1.zspr similarity index 100% rename from data/sprites/official/tgh.1.zspr rename to data/sprites/alttpr/tgh.1.zspr diff --git a/data/sprites/official/thief.1.zspr b/data/sprites/alttpr/thief.1.zspr similarity index 100% rename from data/sprites/official/thief.1.zspr rename to data/sprites/alttpr/thief.1.zspr diff --git a/data/sprites/official/thomcrow.1.zspr b/data/sprites/alttpr/thomcrow.1.zspr similarity index 100% rename from data/sprites/official/thomcrow.1.zspr rename to data/sprites/alttpr/thomcrow.1.zspr diff --git a/data/sprites/official/tile.2.zspr b/data/sprites/alttpr/tile.2.zspr similarity index 100% rename from data/sprites/official/tile.2.zspr rename to data/sprites/alttpr/tile.2.zspr diff --git a/data/sprites/official/tingle.1.zspr b/data/sprites/alttpr/tingle.1.zspr similarity index 100% rename from data/sprites/official/tingle.1.zspr rename to data/sprites/alttpr/tingle.1.zspr diff --git a/data/sprites/official/tmnt.1.zspr b/data/sprites/alttpr/tmnt.1.zspr similarity index 100% rename from data/sprites/official/tmnt.1.zspr rename to data/sprites/alttpr/tmnt.1.zspr diff --git a/data/sprites/official/toad.2.zspr b/data/sprites/alttpr/toad.2.zspr similarity index 100% rename from data/sprites/official/toad.2.zspr rename to data/sprites/alttpr/toad.2.zspr diff --git a/data/sprites/official/Toadette.2.zspr b/data/sprites/alttpr/toadette.2.zspr similarity index 100% rename from data/sprites/official/Toadette.2.zspr rename to data/sprites/alttpr/toadette.2.zspr diff --git a/data/sprites/official/toadette_captain.1.zspr b/data/sprites/alttpr/toadette_captain.1.zspr similarity index 100% rename from data/sprites/official/toadette_captain.1.zspr rename to data/sprites/alttpr/toadette_captain.1.zspr diff --git a/data/sprites/official/totem-links.1.zspr b/data/sprites/alttpr/totem-links.1.zspr similarity index 100% rename from data/sprites/official/totem-links.1.zspr rename to data/sprites/alttpr/totem-links.1.zspr diff --git a/data/sprites/official/trogdor.1.zspr b/data/sprites/alttpr/trogdor.1.zspr similarity index 100% rename from data/sprites/official/trogdor.1.zspr rename to data/sprites/alttpr/trogdor.1.zspr diff --git a/data/sprites/official/twilightprincesszelda.2.zspr b/data/sprites/alttpr/twilightprincesszelda.2.zspr similarity index 100% rename from data/sprites/official/twilightprincesszelda.2.zspr rename to data/sprites/alttpr/twilightprincesszelda.2.zspr diff --git a/data/sprites/official/two_faced.1.zspr b/data/sprites/alttpr/two_faced.1.zspr similarity index 100% rename from data/sprites/official/two_faced.1.zspr rename to data/sprites/alttpr/two_faced.1.zspr diff --git a/data/sprites/official/ty.1.zspr b/data/sprites/alttpr/ty.1.zspr similarity index 100% rename from data/sprites/official/ty.1.zspr rename to data/sprites/alttpr/ty.1.zspr diff --git a/data/sprites/official/ultros.1.zspr b/data/sprites/alttpr/ultros.1.zspr similarity index 100% rename from data/sprites/official/ultros.1.zspr rename to data/sprites/alttpr/ultros.1.zspr diff --git a/data/sprites/official/valeera.1.zspr b/data/sprites/alttpr/valeera.1.zspr similarity index 100% rename from data/sprites/official/valeera.1.zspr rename to data/sprites/alttpr/valeera.1.zspr diff --git a/data/sprites/official/vanillalink.1.zspr b/data/sprites/alttpr/vanillalink.1.zspr similarity index 100% rename from data/sprites/official/vanillalink.1.zspr rename to data/sprites/alttpr/vanillalink.1.zspr diff --git a/data/sprites/official/vaporeon.1.zspr b/data/sprites/alttpr/vaporeon.1.zspr similarity index 100% rename from data/sprites/official/vaporeon.1.zspr rename to data/sprites/alttpr/vaporeon.1.zspr diff --git a/data/sprites/official/vegeta.1.zspr b/data/sprites/alttpr/vegeta.1.zspr similarity index 100% rename from data/sprites/official/vegeta.1.zspr rename to data/sprites/alttpr/vegeta.1.zspr diff --git a/data/sprites/official/vera.1.zspr b/data/sprites/alttpr/vera.1.zspr similarity index 100% rename from data/sprites/official/vera.1.zspr rename to data/sprites/alttpr/vera.1.zspr diff --git a/data/sprites/official/vitreous.1.zspr b/data/sprites/alttpr/vitreous.1.zspr similarity index 100% rename from data/sprites/official/vitreous.1.zspr rename to data/sprites/alttpr/vitreous.1.zspr diff --git a/data/sprites/official/vivi.1.zspr b/data/sprites/alttpr/vivi.1.zspr similarity index 100% rename from data/sprites/official/vivi.1.zspr rename to data/sprites/alttpr/vivi.1.zspr diff --git a/data/sprites/official/vivian.1.zspr b/data/sprites/alttpr/vivian.1.zspr similarity index 100% rename from data/sprites/official/vivian.1.zspr rename to data/sprites/alttpr/vivian.1.zspr diff --git a/data/sprites/official/wario.1.zspr b/data/sprites/alttpr/wario.1.zspr similarity index 100% rename from data/sprites/official/wario.1.zspr rename to data/sprites/alttpr/wario.1.zspr diff --git a/data/sprites/official/will.1.zspr b/data/sprites/alttpr/will.1.zspr similarity index 100% rename from data/sprites/official/will.1.zspr rename to data/sprites/alttpr/will.1.zspr diff --git a/data/sprites/official/wizzrobe.2.zspr b/data/sprites/alttpr/wizzrobe.2.zspr similarity index 100% rename from data/sprites/official/wizzrobe.2.zspr rename to data/sprites/alttpr/wizzrobe.2.zspr diff --git a/data/sprites/official/wolf_link.1.zspr b/data/sprites/alttpr/wolf_link.1.zspr similarity index 100% rename from data/sprites/official/wolf_link.1.zspr rename to data/sprites/alttpr/wolf_link.1.zspr diff --git a/data/sprites/official/wolf_link_tp.1.zspr b/data/sprites/alttpr/wolf_link_tp.1.zspr similarity index 100% rename from data/sprites/official/wolf_link_tp.1.zspr rename to data/sprites/alttpr/wolf_link_tp.1.zspr diff --git a/data/sprites/official/yoshi.1.zspr b/data/sprites/alttpr/yoshi.1.zspr similarity index 100% rename from data/sprites/official/yoshi.1.zspr rename to data/sprites/alttpr/yoshi.1.zspr diff --git a/data/sprites/official/yunica.1.zspr b/data/sprites/alttpr/yunica.1.zspr similarity index 100% rename from data/sprites/official/yunica.1.zspr rename to data/sprites/alttpr/yunica.1.zspr diff --git a/data/sprites/official/zandra.1.zspr b/data/sprites/alttpr/zandra.1.zspr similarity index 100% rename from data/sprites/official/zandra.1.zspr rename to data/sprites/alttpr/zandra.1.zspr diff --git a/data/sprites/official/zebraunicorn.1.zspr b/data/sprites/alttpr/zebraunicorn.1.zspr similarity index 100% rename from data/sprites/official/zebraunicorn.1.zspr rename to data/sprites/alttpr/zebraunicorn.1.zspr diff --git a/data/sprites/official/zeck.1.zspr b/data/sprites/alttpr/zeck.1.zspr similarity index 100% rename from data/sprites/official/zeck.1.zspr rename to data/sprites/alttpr/zeck.1.zspr diff --git a/data/sprites/official/zelda.1.zspr b/data/sprites/alttpr/zelda.1.zspr similarity index 100% rename from data/sprites/official/zelda.1.zspr rename to data/sprites/alttpr/zelda.1.zspr diff --git a/data/sprites/official/zerosuitsamus.2.zspr b/data/sprites/alttpr/zerosuitsamus.2.zspr similarity index 100% rename from data/sprites/official/zerosuitsamus.2.zspr rename to data/sprites/alttpr/zerosuitsamus.2.zspr diff --git a/data/sprites/official/zora.2.zspr b/data/sprites/alttpr/zora.2.zspr similarity index 100% rename from data/sprites/official/zora.2.zspr rename to data/sprites/alttpr/zora.2.zspr diff --git a/data/sprites/unofficial/.gitignore b/data/sprites/custom/.gitignore similarity index 100% rename from data/sprites/unofficial/.gitignore rename to data/sprites/custom/.gitignore