From 95358bc5236dacbea19d95b385de882e038ea207 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 28 Apr 2021 10:31:24 +0200 Subject: [PATCH] Never download a sprite with Author "Nintendo" --- Gui.py | 3 ++- worlds/alttp/Rom.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gui.py b/Gui.py index 515520f3..d2e8b19e 100755 --- a/Gui.py +++ b/Gui.py @@ -1746,7 +1746,8 @@ def update_sprites(task, on_finish=None): try: task.update_status("Determining needed sprites") current_sprites = [os.path.basename(file) for file in glob(sprite_dir + '/*')] - alttpr_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path)) for sprite in sprites_arr] + alttpr_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path)) + for sprite in sprites_arr if sprite["author"] != "Nintendo"] needed_sprites = [(sprite_url, filename) for (sprite_url, filename) in alttpr_sprites if filename not in current_sprites] alttpr_filenames = [filename for (_, filename) in alttpr_sprites] diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py index 12923180..439e0ef6 100644 --- a/worlds/alttp/Rom.py +++ b/worlds/alttp/Rom.py @@ -548,10 +548,10 @@ class Sprite(): from Patch import get_base_rom_path file_name = get_base_rom_path() base_rom_bytes = bytes(read_rom(open(file_name, "rb"))) - sprite = base_rom_bytes[0x80000:0x87000] - palette = base_rom_bytes[0xDD308:0xDD380] - glove_palette = base_rom_bytes[0xDEDF5:0xDEDF9] - Sprite.base_data = sprite + palette + glove_palette + Sprite.sprite = base_rom_bytes[0x80000:0x87000] + Sprite.palette = base_rom_bytes[0xDD308:0xDD380] + Sprite.glove_palette = base_rom_bytes[0xDEDF5:0xDEDF9] + Sprite.base_data = Sprite.sprite + Sprite.palette + Sprite.glove_palette def from_ap_sprite(self, filedata): filedata = filedata.decode("utf-8-sig")