diff --git a/Rom.py b/Rom.py index d2d74e6e..8a61dc71 100644 --- a/Rom.py +++ b/Rom.py @@ -2306,7 +2306,7 @@ def set_inverted_mode(world, player, rom): rom.write_byte(0x1607C + 0x06, 0xF2) rom.write_int16(0x160CB + 2 * 0x06, 0x0000) rom.write_int16(0x16169 + 2 * 0x06, 0x0000) - rom.write_int16(snes_to_pc(0x02E87B), 0x00AE) # move flute splot 9 + rom.write_int16(snes_to_pc(0x02E87B), 0x00AE) # move flute spot 9 rom.write_int16(snes_to_pc(0x02E89D), 0x0610) rom.write_int16(snes_to_pc(0x02E8BF), 0x077E) rom.write_int16(snes_to_pc(0x02E8E1), 0x0672) diff --git a/WebHostLib/static/static/spriteData.json b/WebHostLib/static/static/spriteData.json index f54078e9..fdf9e7f5 100644 --- a/WebHostLib/static/static/spriteData.json +++ b/WebHostLib/static/static/spriteData.json @@ -1 +1 @@ -{"Link": "001.link.1.zspr", "Four Swords Link": "4slink-armors.1.zspr", "Abigail": "abigail.1.zspr", "Adol": "adol.1.zspr", "Aggretsuko": "aggretsuko.1.zspr", "Alice": "alice.1.zspr", "Angry Video Game Nerd": "angry-video-game-nerd.1.zspr", "Arcane": "arcane.1.zspr", "Ark": "ark.2.zspr", "Arrghus": "arrghus.2.zspr", "Astronaut": "astronaut.1.zspr", "Badeline": "badeline.1.zspr", "Bananas In Pyjamas": "bananas-in-pyjamas.1.zspr", "Bandit": "bandit.1.zspr", "Batman": "batman.1.zspr", "Beau": "beau.1.zspr", "Bewp": "bewp.1.zspr", "Big Key": "bigkey.1.zspr", "Birb": "birb.1.zspr", "Birdo": "birdo.1.zspr", "Black Mage": "blackmage.1.zspr", "Blacksmith Link": "blacksmithlink.1.zspr", "Blossom": "blossom.1.zspr", "Bob": "bob.1.zspr", "Boo 2": "boo-two.1.zspr", "Boo": "boo.2.zspr", "Bottle o' Goo": "bottle_o_goo.1.zspr", "": "botw-zelda.1.zspr", "Bowser": "bowser.1.zspr", "Branch": "branch.1.zspr", "Brian": "brian.1.zspr", "Broccoli": "broccoli.1.zspr", "Bronzor": "bronzor.1.zspr", "B.S. Boy": "bsboy.1.zspr", "B.S. Girl": "bsgirl.1.zspr", "Bubbles": "bubbles.1.zspr", "Bullet Bill": "bullet_bill.1.zspr", "Buttercup": "buttercup.1.zspr", "Cactuar": "cactuar.1.zspr", "Cadence": "cadence.1.zspr", "CarlSagan42": "carlsagan42.1.zspr", "Casual Zelda": "casual-zelda.1.zspr", "Marvin the Cat": "cat.3.zspr", "Cat Boo": "catboo.1.zspr", "CD-i Link": "cdilink.1.zspr", "Celes": "celes.1.zspr", "Charizard": "charizard.1.zspr", "Cheep Cheep": "cheepcheep.1.zspr", "Chibity": "chibity.1.zspr", "Cirno": "cirno.1.zspr", "Clifford": "clifford.1.zspr", "Clyde": "clyde.1.zspr", "Conker": "conker.1.zspr", "Cornelius": "cornelius.1.zspr", "Untitled": "corona.1.zspr", "Cucco": "cucco.1.zspr", "Cursor": "cursor.1.zspr", "Dark Panda": "dark-panda.1.zspr", "Dark Boy": "darkboy.1.zspr", "Dark Girl": "darkgirl.1.zspr", "Dark Link (Tunic)": "darklink-tunic.1.zspr", "Dark Link": "darklink.1.zspr", "Dark Swatchy": "darkswatchy.1.zspr", "Dark Zelda": "darkzelda.1.zspr", "Dark Zora": "darkzora.2.zspr", "Deadpool (Mythic)": "deadpool-mythic.1.zspr", "Deadpool (SirCzah)": "deadpool.1.zspr", "Deadrock": "deadrock.1.zspr", "Decidueye": "decidueye.1.zspr", "Demon Link": "demonlink.1.zspr", "Dragonite": "dragonite.2.zspr", "Drake The Dragon": "drake.1.zspr", "D.Owls": "d_owls.1.zspr", "Eggplant": "eggplant.1.zspr", "EmoSaru": "emosaru.1.zspr", "Ezlo": "ezlo.1.zspr", "Fierce Deity Link": "fierce-deity-link.1.zspr", "Finn Merten": "finn.3.zspr", "Finny Bear": "finny_bear.1.zspr", "Floodgate Fish": "fish_floodgate.1.zspr", "Flavor Guy": "flavor_guy.1.zspr", "Fox Link": "foxlink.1.zspr", "Freya Crescent": "freya.1.zspr", "Frisk": "frisk.1.zspr", "Frog Link": "froglink.3.zspr", "Fujin": "fujin.2.zspr", "Future Trunks": "future_trunks.1.zspr", "Gamer": "gamer.1.zspr", "Mini Ganon": "ganon.1.zspr", "Ganondorf": "ganondorf.1.zspr", "Garfield": "garfield.2.zspr", "Garnet": "garnet.1.zspr", "Garo Master": "garomaster.1.zspr", "GBC Link": "gbc-link.1.zspr", "Geno": "geno.1.zspr", "Gobli": "gobli.1.zspr", "Goomba": "goomba.1.zspr", "Goose": "goose.1.zspr", "GrandPOOBear": "grandpoobear.2.zspr", "Gruncle Stan": "grunclestan.1.zspr", "GuizDP": "guiz.1.zspr", "Hardhat Beetle": "hardhat_beetle.1.zspr", "Hat Kid": "hat-kid.1.zspr", "Headless Link": "headlesslink.1.zspr", "Hello Kitty": "hello_kitty.1.zspr", "Hidari": "hidari.1.zspr", "Hint Tile": "hint_tile.1.zspr", "Hitsuyan1337": "hitsuyan.1.zspr", "Hoarder (Bush)": "hoarder-bush.1.zspr", "Hoarder (Pot)": "hoarder-pot.1.zspr", "Hoarder (Rock)": "hoarder-rock.1.zspr", "Homer Simpson": "homer.1.zspr", "Hyrule Knight": "hyruleknight.1.zspr", "iBazly": "ibazly.1.zspr", "Ignignokt": "ignignokt.2.zspr", "Informant Woman": "informant_woman.1.zspr", "Inkling": "inkling.1.zspr", "Invisible Link": "invisibleman.1.zspr", "Jack Frost": "jack-frost.1.zspr", "Jason Frudnick": "jason_frudnick.1.zspr", "Jasp": "jasp.1.zspr", "Jogurt": "jogurt.1.zspr", "Katsura": "katsura.1.zspr", "Kecleon": "kecleon.1.zspr", "Kenny McCormick": "kenny_mccormick.1.zspr", "Ketchup": "ketchup.1.zspr", "Kholdstare": "kholdstare.1.zspr", "King Gothalion": "king_gothalion.1.zspr", "King Graham v1.1": "king_graham.1.zspr", "Kirby": "kirby-meta.1.zspr", "Kore8": "kore8.1.zspr", "Lakitu": "lakitu.1.zspr", "Lapras": "lapras.1.zspr", "Lest": "lest.1.zspr", "Lily": "lily.1.zspr", "Linja": "linja.1.zspr", "Hat Color Link": "linkhatcolor.1.zspr", "Tunic Color Link": "linktuniccolor.1.zspr", "Pony": "littlepony.1.zspr", "Figaro Merchant": "locke_merchant.1.zspr", "Lucario": "lucario.1.zspr", "Luigi": "luigi.1.zspr", "Madeline": "madeline.1.zspr", "Magus": "magus.1.zspr", "Maiden": "maiden.1.zspr", "Mallow (Cat)": "mallow-cat.1.zspr", "Manga Link": "mangalink.1.zspr", "Maple Queen": "maplequeen.2.zspr", "Marin": "marin.2.zspr", "Mario (Classic)": "mario-classic.2.zspr", "Mario and Cappy": "mariocappy.1.zspr", "Tanooki Mario": "mario_tanooki.1.zspr", "Marisa Kirisame": "marisa.1.zspr", "Matthias": "matthias.1.zspr", "Meatwad": "meatwad.1.zspr", "Medallions": "medallions.1.zspr", "Medli": "medli.1.zspr", "Megaman X": "megaman-x.2.zspr", "Baby Metroid": "metroid.1.zspr", "MewLp": "mew.1.zspr", "Mike Jones": "mike-jones.2.zspr", "Minish Cap Link": "minishcaplink.2.zspr", "Minish Link": "minish_link.1.zspr", "missingno": "missingno.1.zspr", "Modern Link": "modernlink.1.zspr", "Mog": "mog.2.zspr", "Momiji Inubashiri": "momiji.1.zspr", "Moosh": "moosh.1.zspr", "Mouse": "mouse.1.zspr", "Ms. Paint Dog": "ms-paintdog.1.zspr", "Power Up with Pride Mushroom": "mushy.1.zspr", "Nature Link": "naturelink.1.zspr", "Navi": "navi.1.zspr", "Navirou": "navirou.1.zspr", "Ned Flanders": "ned-flanders.1.zspr", "Negative Link": "negativelink.1.zspr", "Neosad": "neosad.1.zspr", " NES Link": "neslink.1.zspr", "Ness (Earthbound)": "ness.1.zspr", "Nia": "nia.1.zspr", "Niko": "niko.1.zspr", "Old Man": "oldman.2.zspr", "Ori": "ori.2.zspr", "Outline Link": "outlinelink.1.zspr", "Parallel Worlds Link": "parallelworldslink.1.zspr", "Paula": "paula.1.zspr", "Princess Peach": "peach.1.zspr", "Penguin Link": "penguinlink.1.zspr", "Pete (Harvest Moon)": "pete.1.zspr", "Phoenix Wright": "phoenix-wright.1.zspr", "Pikachu": "pikachu.1.zspr", "Pink Ribbon Link": "pinkribbonlink.2.zspr", "Piranha Plant": "piranha_plant.1.zspr", "Plague Knight": "plagueknight.1.zspr", "Pokey": "pokey.1.zspr", "Popoi": "popoi.1.zspr", "Poppy": "poppy.1.zspr", "Porg Knight": "porg_knight.1.zspr", "Powerpuff Girl": "powerpuff_girl.1.zspr", "Pride Link": "pridelink.2.zspr", "Primm": "primm.1.zspr", "Princess Bubblegum": "princess_bubblegum.1.zspr", "Psyduck": "psyduck.2.zspr", "The Pug": "pug.1.zspr", "Purple Chest": "purplechest-bottle.1.zspr", "Pyro": "pyro.1.zspr", "Rainbow Link": "rainbowlink.1.zspr", "Remeer": "remeer.1.zspr", "Rick (Redacted)": "rick.1.zspr", "Robo-Link 9000": "robotlink.1.zspr", "Rocko": "rocko.1.zspr", "Rottytops": "rottytops.1.zspr", "Roy Koopa": "roykoopa.1.zspr", "Rumia": "rumia.1.zspr", "Rydia": "rydia.1.zspr", "Ryu": "ryu.1.zspr", "Sailor Moon": "sailormoon.1.zspr", "Saitama": "saitama.1.zspr", "Samus (Super Metroid)": "samus-sm.1.zspr", "Samus": "samus.2.zspr", "Samus (Classic)": "samus_classic.1.zspr", "Santa Link": "santalink.2.zspr", "Scholar": "scholar.1.zspr", "Selan": "selan.1.zspr", "SevenS1ns": "sevens1ns.1.zspr", "Shadow": "shadow.1.zspr", "Shadow Sakura": "shadowsaku.2.zspr", "Shantae": "shantae.1.zspr", "Shuppet": "shuppet.1.zspr", "Shy Gal": "shy-gal.1.zspr", "Shy Guy": "shy-guy.1.zspr", "SighnWaive": "sighn_waive.1.zspr", "SNES Controller": "snes-controller.1.zspr", "Soda Can": "sodacan.1.zspr", "Solaire of Astora": "solaire.1.zspr", "Hyrule Soldier": "soldiersprite.1.zspr", "Sonic the Hedgehog": "sonic.1.zspr", "Sora": "sora.1.zspr", "Sora (KH1)": "sora_kh1.1.zspr", "Squall": "squall.1.zspr", "Squirrel": "squirrel.1.zspr", "Squirtle": "squirtle.1.zspr", "Stalfos": "stalfos.1.zspr", "Stan": "stan.1.zspr", "Static Link": "staticlink.1.zspr", "Stick Man": "stick_man.1.zspr", "Super Bomb": "superbomb.1.zspr", "Super Bunny": "superbunny.2.zspr", "Super Meat Boy": "supermeatboy.1.zspr", "Swatchy": "swatchy.1.zspr", "TASBot": "tasbot.1.zspr", "Tea Time": "teatime.1.zspr", "Terra (Esper)": "terra.1.zspr", "Tetra Sheet": "tetra.1.zspr", "TGH": "tgh.1.zspr", "Thief": "thief.1.zspr", "Thomcrow": "thomcrow.1.zspr", "Tile": "tile.2.zspr", "Tingle": "tingle.1.zspr", "TMNT": "tmnt.1.zspr", "Toad": "toad.2.zspr", "Toadette": "toadette.2.zspr", "Captain Toadette": "toadette_captain.1.zspr", "TotemLinks": "totem-links.1.zspr", "Trogdor the Burninator": "trogdor.1.zspr", "TP Zelda": "twilightprincesszelda.2.zspr", "TwoFaced": "two_faced.1.zspr", "Ty the Tasmanian Tiger": "ty.1.zspr", "Ultros": "ultros.1.zspr", "Valeera": "valeera.1.zspr", "VanillaLink": "vanillalink.1.zspr", "Vaporeon": "vaporeon.1.zspr", "Vegeta": "vegeta.1.zspr", "Vera": "vera.1.zspr", "Vitreous": "vitreous.1.zspr", "Vivi": "vivi.1.zspr", "Vivian": "vivian.1.zspr", "Wario": "wario.1.zspr", "Will": "will.1.zspr", "Wizzrobe": "wizzrobe.2.zspr", "Wolf Link (Festive)": "wolf_link.1.zspr", "Wolf Link (TP)": "wolf_link_tp.1.zspr", "Yoshi": "yoshi.1.zspr", "Yunica Tovah": "yunica.1.zspr", "Zandra": "zandra.1.zspr", "Zebra Unicorn": "zebraunicorn.1.zspr", "Zeckemyro": "zeck.1.zspr", "Zelda": "zelda.1.zspr", "Zero Suit Samus": "zerosuitsamus.2.zspr", "Zora": "zora.2.zspr"} +{"Link": "001.link.1.zspr", "Four Swords Link": "4slink-armors.1.zspr", "Abigail": "abigail.1.zspr", "Adol": "adol.1.zspr", "Aggretsuko": "aggretsuko.1.zspr", "Alice": "alice.1.zspr", "Angry Video Game Nerd": "angry-video-game-nerd.1.zspr", "Arcane": "arcane.1.zspr", "Ark (No Cape)": "ark-dorana.1.zspr", "Ark (Cape)": "ark.1.zspr", "Arrghus": "arrghus.2.zspr", "Astronaut": "astronaut.1.zspr", "Asuna": "asuna.1.zspr", "Badeline": "badeline.1.zspr", "Bananas In Pyjamas": "bananas-in-pyjamas.1.zspr", "Bandit": "bandit.1.zspr", "Batman": "batman.1.zspr", "Beau": "beau.1.zspr", "Bewp": "bewp.1.zspr", "Big Key": "bigkey.1.zspr", "Birb": "birb.1.zspr", "Birdo": "birdo.1.zspr", "Black Mage": "blackmage.1.zspr", "Blacksmith Link": "blacksmithlink.1.zspr", "Blazer": "blazer.1.zspr", "Blossom": "blossom.1.zspr", "Bob": "bob.1.zspr", "Bob Ross": "bobross.1.zspr", "boco": "boco.1.zspr", "Boo 2": "boo-two.1.zspr", "Boo": "boo.2.zspr", "Bottle o' Goo": "bottle_o_goo.1.zspr", "BotW Link": "botw-link.1.zspr", "botw-zelda": "botw-zelda.1.zspr", "Bowser": "bowser.1.zspr", "Bowsette Red": "bowsette-red.1.zspr", "Bowsette": "bowsette.1.zspr", "Branch": "branch.1.zspr", "Brian": "brian.1.zspr", "Broccoli": "broccoli.1.zspr", "Bronzor": "bronzor.1.zspr", "B.S. Boy": "bsboy.1.zspr", "B.S. Girl": "bsgirl.1.zspr", "Bubbles": "bubbles.1.zspr", "Bullet Bill": "bullet_bill.1.zspr", "Buttercup": "buttercup.1.zspr", "Cactuar": "cactuar.1.zspr", "Cadence": "cadence.1.zspr", "CarlSagan42": "carlsagan42.1.zspr", "Casual Zelda": "casual-zelda.1.zspr", "Marvin the Cat": "cat.3.zspr", "Cat Boo": "catboo.1.zspr", "CD-i Link": "cdilink.1.zspr", "Celes": "celes.1.zspr", "Charizard": "charizard.1.zspr", "Cheep Cheep": "cheepcheep.1.zspr", "Chibity": "chibity.1.zspr", "Chrizzz": "chrizzz.1.zspr", "Cirno": "cirno.1.zspr", "Clifford": "clifford.1.zspr", "Clyde": "clyde.1.zspr", "Conker": "conker.1.zspr", "Cornelius": "cornelius.1.zspr", "Untitled": "corona.1.zspr", "Imposter": "crewmate.1.zspr", "Cucco": "cucco.1.zspr", "Cursor": "cursor.1.zspr", "Dark Panda": "dark-panda.1.zspr", "Dark Boy": "darkboy.1.zspr", "Dark Girl": "darkgirl.1.zspr", "Dark Link (Tunic)": "darklink-tunic.1.zspr", "Dark Link": "darklink.1.zspr", "Dark Swatchy": "darkswatchy.1.zspr", "Dark Zelda": "darkzelda.1.zspr", "Dark Zora": "darkzora.2.zspr", "Deadpool (Mythic)": "deadpool-mythic.1.zspr", "Deadpool (SirCzah)": "deadpool.1.zspr", "Deadrock": "deadrock.1.zspr", "Decidueye": "decidueye.1.zspr", "Dekar": "dekar.1.zspr", "Demon Link": "demonlink.1.zspr", "Dragonite": "dragonite.2.zspr", "Drake The Dragon": "drake.1.zspr", "D.Owls": "d_owls.2.zspr", "Eggplant": "eggplant.1.zspr", "EmoSaru": "emosaru.1.zspr", "Ezlo": "ezlo.1.zspr", "Fierce Deity Link": "fierce-deity-link.2.zspr", "Finn Merten": "finn.3.zspr", "Finny Bear": "finny_bear.1.zspr", "Floodgate Fish": "fish_floodgate.1.zspr", "Flavor Guy": "flavor_guy.1.zspr", "Fox Link": "foxlink.1.zspr", "Freya Crescent": "freya.1.zspr", "Frisk": "frisk.1.zspr", "Frog Link": "froglink.3.zspr", "Fujin": "fujin.2.zspr", "Future Trunks": "future_trunks.1.zspr", "Gamer": "gamer.1.zspr", "Mini Ganon": "ganon.1.zspr", "Ganondorf": "ganondorf.1.zspr", "Garfield": "garfield.2.zspr", "Garnet": "garnet.1.zspr", "Garo Master": "garomaster.1.zspr", "GBC Link": "gbc-link.1.zspr", "Geno": "geno.1.zspr", "GliitchWiitch": "gliitchwiitch.1.zspr", "Gobli": "gobli.1.zspr", "Goomba": "goomba.1.zspr", "Goose": "goose.1.zspr", "GrandPOOBear": "grandpoobear.2.zspr", "Gretis": "gretis.1.zspr", "Gruncle Stan": "grunclestan.1.zspr", "GuizDP": "guiz.1.zspr", "Hanna": "hanna.1.zspr", "Hardhat Beetle": "hardhat_beetle.1.zspr", "Hat Kid": "hat-kid.1.zspr", "Headless Link": "headlesslink.1.zspr", "Hello Kitty": "hello_kitty.1.zspr", "Hidari": "hidari.1.zspr", "Hint Tile": "hint_tile.1.zspr", "Hoarder (Bush)": "hoarder-bush.1.zspr", "Hoarder (Pot)": "hoarder-pot.1.zspr", "Hoarder (Rock)": "hoarder-rock.1.zspr", "hollow_test": "hollow-knight.1.zspr", "Homer Simpson": "homer.1.zspr", "Hotdog": "hotdog.1.zspr", "Hyrule Knight": "hyruleknight.1.zspr", "iBazly": "ibazly.1.zspr", "Ignignokt": "ignignokt.2.zspr", "Informant Woman": "informant_woman.1.zspr", "Inkling": "inkling.1.zspr", "Invisible Link": "invisibleman.1.zspr", "Jack Frost": "jack-frost.1.zspr", "Jason Frudnick": "jason_frudnick.1.zspr", "Jasp": "jasp.1.zspr", "Jogurt": "jogurt.1.zspr", "Katsura": "katsura.1.zspr", "Kecleon": "kecleon.1.zspr", "Kenny McCormick": "kenny_mccormick.1.zspr", "Ketchup": "ketchup.1.zspr", "Kholdstare": "kholdstare.1.zspr", "King Gothalion": "king_gothalion.1.zspr", "King Graham v1.1": "king_graham.1.zspr", "Kirby": "kirby-meta.1.zspr", "Kore8": "kore8.1.zspr", "Korok": "korok.1.zspr", "Lakitu": "lakitu.1.zspr", "Lapras": "lapras.1.zspr", "Lest": "lest.1.zspr", "Lily": "lily.1.zspr", "Linja": "linja.1.zspr", "Link Redrawn": "link-redrawn.1.zspr", "Hat Color Link": "linkhatcolor.1.zspr", "Tunic Color Link": "linktuniccolor.1.zspr", "Little Hylian": "little-hylian.1.zspr", "Pony": "littlepony.1.zspr", "Locke": "locke.1.zspr", "Figaro Merchant": "locke_merchant.1.zspr", "Lucario": "lucario.1.zspr", "Hitsuyan1337": "luffy.1.zspr", "Luigi": "luigi.1.zspr", "Luna Maindo": "luna-maindo.1.zspr", "Madeline": "madeline.1.zspr", "Magus": "magus.1.zspr", "Maiden": "maiden.1.zspr", "Mallow (Cat)": "mallow-cat.1.zspr", "Manga Link": "mangalink.1.zspr", "Maple Queen": "maplequeen.2.zspr", "Marin": "marin.2.zspr", "Mario (Classic)": "mario-classic.2.zspr", "Mario and Cappy": "mariocappy.1.zspr", "Tanooki Mario": "mario_tanooki.1.zspr", "Marisa Kirisame": "marisa.1.zspr", "Matthias": "matthias.1.zspr", "Meatwad": "meatwad.1.zspr", "Medallions": "medallions.1.zspr", "Medli": "medli.1.zspr", "Megaman X": "megaman-x.2.zspr", "Baby Metroid": "metroid.1.zspr", "MewLp": "mew.1.zspr", "Mike Jones": "mike-jones.2.zspr", "Minish Cap Link": "minishcaplink.2.zspr", "Minish Link": "minish_link.1.zspr", "missingno": "missingno.1.zspr", "MoblinSprite": "moblin.1.zspr", "Modern Link": "modernlink.1.zspr", "Mog": "mog.2.zspr", "Momiji Inubashiri": "momiji.1.zspr", "Moosh": "moosh.1.zspr", "Mouse": "mouse.1.zspr", "Ms. Paint Dog": "ms-paintdog.1.zspr", "Power Up with Pride Mushroom": "mushy.1.zspr", "Nature Link": "naturelink.1.zspr", "Navi": "navi.1.zspr", "Navirou": "navirou.2.zspr", "Ned Flanders": "ned-flanders.1.zspr", "Negative Link": "negativelink.1.zspr", "Neosad": "neosad.1.zspr", " NES Link": "neslink.1.zspr", "Ness (Earthbound)": "ness.1.zspr", "Nia": "nia.1.zspr", "Niddraig": "niddraig.1.zspr", "Niko": "niko.1.zspr", "Old Man": "oldman.2.zspr", "Ori": "ori.2.zspr", "Outline Link": "outlinelink.1.zspr", "Parallel Worlds Link": "parallelworldslink.1.zspr", "Paula": "paula.1.zspr", "Princess Peach": "peach.1.zspr", "Penguin Link": "penguinlink.1.zspr", "Pete (Harvest Moon)": "pete.1.zspr", "Phoenix Wright": "phoenix-wright.1.zspr", "Pikachu": "pikachu.1.zspr", "Pink Ribbon Link": "pinkribbonlink.2.zspr", "Piranha Plant": "piranha_plant.1.zspr", "Plague Knight": "plagueknight.1.zspr", "Pokey": "pokey.1.zspr", "Popoi": "popoi.1.zspr", "Poppy": "poppy.1.zspr", "Porg Knight": "porg_knight.1.zspr", "Powerpuff Girl": "powerpuff_girl.1.zspr", "Pride Link": "pridelink.2.zspr", "Primm": "primm.1.zspr", "Princess Bubblegum": "princess_bubblegum.1.zspr", "Psyduck": "psyduck.2.zspr", "The Pug": "pug.1.zspr", "Purple Chest": "purplechest-bottle.1.zspr", "Pyro": "pyro.1.zspr", "Rainbow Link": "rainbowlink.1.zspr", "Rat": "rat.1.zspr", "Red Mage": "red-mage.1.zspr", "Remeer": "remeer.1.zspr", "Rick (Redacted)": "rick.1.zspr", "Robo-Link 9000": "robotlink.1.zspr", "Rocko": "rocko.1.zspr", "Rottytops": "rottytops.1.zspr", "Rover": "rover.1.zspr", "Roy Koopa": "roykoopa.1.zspr", "Rumia": "rumia.1.zspr", "Rydia": "rydia.1.zspr", "Ryu": "ryu.1.zspr", "Sailor Moon": "sailormoon.1.zspr", "Saitama": "saitama.1.zspr", "Samus (Super Metroid)": "samus-sm.1.zspr", "Samus": "samus.2.zspr", "Samus (Classic)": "samus_classic.1.zspr", "Santa Link": "santalink.2.zspr", "Scholar": "scholar.1.zspr", "Selan": "selan.1.zspr", "SevenS1ns": "sevens1ns.1.zspr", "Shadow": "shadow.1.zspr", "Shadow Sakura": "shadowsaku.2.zspr", "Shantae": "shantae.1.zspr", "Shuppet": "shuppet.1.zspr", "Shy Gal": "shy-gal.1.zspr", "Shy Guy": "shy-guy.1.zspr", "SighnWaive": "sighn_waive.1.zspr", "DQ Slime": "slime.1.zspr", "Slowpoke": "slowpoke.1.zspr", "SNES Controller": "snes-controller.1.zspr", "Soda Can": "sodacan.1.zspr", "Solaire of Astora": "solaire.1.zspr", "Hyrule Soldier": "soldiersprite.1.zspr", "Sonic the Hedgehog": "sonic.1.zspr", "Sora": "sora.1.zspr", "Sora (KH1)": "sora_kh1.1.zspr", "SpongeBob SquarePants": "spongebob.1.zspr", "Squall": "squall.1.zspr", "Squirrel": "squirrel.1.zspr", "Squirtle": "squirtle.1.zspr", "Stalfos": "stalfos.1.zspr", "Stan": "stan.1.zspr", "Static Link": "staticlink.1.zspr", "Steamed Ham": "steamedhams.1.zspr", "Stick Man": "stick_man.1.zspr", "Super Bomb": "superbomb.1.zspr", "Super Bunny": "superbunny.2.zspr", "Super Meat Boy": "supermeatboy.1.zspr", "Susie": "susie.1.zspr", "Swatchy": "swatchy.1.zspr", "TASBot": "tasbot.1.zspr", "Tea Time": "teatime.1.zspr", "Terra (Esper)": "terra.1.zspr", "Tetra Sheet": "tetra.1.zspr", "TGH": "tgh.1.zspr", "Thief": "thief.1.zspr", "Thomcrow": "thomcrow.1.zspr", "Tile": "tile.2.zspr", "Tingle": "tingle.1.zspr", "TMNT": "tmnt.1.zspr", "Toad": "toad.2.zspr", "Toadette": "toadette.2.zspr", "Captain Toadette": "toadette_captain.1.zspr", "TotemLinks": "totem-links.1.zspr", "Trogdor the Burninator": "trogdor.1.zspr", "TP Zelda": "twilightprincesszelda.2.zspr", "TwoFaced": "two_faced.1.zspr", "Ty the Tasmanian Tiger": "ty.1.zspr", "Ultros": "ultros.1.zspr", "Valeera": "valeera.1.zspr", "VanillaLink": "vanillalink.1.zspr", "Vaporeon": "vaporeon.1.zspr", "Vegeta": "vegeta.1.zspr", "Vera": "vera.1.zspr", "Vitreous": "vitreous.1.zspr", "Vivi": "vivi.1.zspr", "Vivian": "vivian.1.zspr", "Wario": "wario.1.zspr", "Will": "will.1.zspr", "Wizzrobe": "wizzrobe.2.zspr", "Wolf Link (Festive)": "wolf_link.1.zspr", "Wolf Link (TP)": "wolf_link_tp.1.zspr", "Yoshi": "yoshi.1.zspr", "Yunica Tovah": "yunica.1.zspr", "Zandra": "zandra.1.zspr", "Zebra Unicorn": "zebraunicorn.1.zspr", "Zeckemyro": "zeck.1.zspr", "Zelda": "zelda.1.zspr", "Zero Suit Samus": "zerosuitsamus.2.zspr", "Zora": "zora.2.zspr"} \ No newline at end of file diff --git a/WebHostLib/static/static/sprites/Ark (Cape).gif b/WebHostLib/static/static/sprites/Ark (Cape).gif new file mode 100644 index 00000000..a4b66812 Binary files /dev/null and b/WebHostLib/static/static/sprites/Ark (Cape).gif differ diff --git a/WebHostLib/static/static/sprites/Ark (No Cape).gif b/WebHostLib/static/static/sprites/Ark (No Cape).gif new file mode 100644 index 00000000..3d0d9289 Binary files /dev/null and b/WebHostLib/static/static/sprites/Ark (No Cape).gif differ diff --git a/WebHostLib/static/static/sprites/Asuna.gif b/WebHostLib/static/static/sprites/Asuna.gif new file mode 100644 index 00000000..5b08b251 Binary files /dev/null and b/WebHostLib/static/static/sprites/Asuna.gif differ diff --git a/WebHostLib/static/static/sprites/Blazer.gif b/WebHostLib/static/static/sprites/Blazer.gif new file mode 100644 index 00000000..9deaefb6 Binary files /dev/null and b/WebHostLib/static/static/sprites/Blazer.gif differ diff --git a/WebHostLib/static/static/sprites/Bob Ross.gif b/WebHostLib/static/static/sprites/Bob Ross.gif new file mode 100644 index 00000000..bd432ac0 Binary files /dev/null and b/WebHostLib/static/static/sprites/Bob Ross.gif differ diff --git a/WebHostLib/static/static/sprites/BotW Link.gif b/WebHostLib/static/static/sprites/BotW Link.gif new file mode 100644 index 00000000..53635c19 Binary files /dev/null and b/WebHostLib/static/static/sprites/BotW Link.gif differ diff --git a/WebHostLib/static/static/sprites/Bowsette Red.gif b/WebHostLib/static/static/sprites/Bowsette Red.gif new file mode 100644 index 00000000..afe4bd29 Binary files /dev/null and b/WebHostLib/static/static/sprites/Bowsette Red.gif differ diff --git a/WebHostLib/static/static/sprites/Bowsette.gif b/WebHostLib/static/static/sprites/Bowsette.gif new file mode 100644 index 00000000..c40f7dd4 Binary files /dev/null and b/WebHostLib/static/static/sprites/Bowsette.gif differ diff --git a/WebHostLib/static/static/sprites/Chrizzz.gif b/WebHostLib/static/static/sprites/Chrizzz.gif new file mode 100644 index 00000000..bf962524 Binary files /dev/null and b/WebHostLib/static/static/sprites/Chrizzz.gif differ diff --git a/WebHostLib/static/static/sprites/DQ Slime.gif b/WebHostLib/static/static/sprites/DQ Slime.gif new file mode 100644 index 00000000..c9678bb1 Binary files /dev/null and b/WebHostLib/static/static/sprites/DQ Slime.gif differ diff --git a/WebHostLib/static/static/sprites/Dekar.gif b/WebHostLib/static/static/sprites/Dekar.gif new file mode 100644 index 00000000..6c51f092 Binary files /dev/null and b/WebHostLib/static/static/sprites/Dekar.gif differ diff --git a/WebHostLib/static/static/sprites/Fierce Deity Link.gif b/WebHostLib/static/static/sprites/Fierce Deity Link.gif index f566d416..aede93df 100644 Binary files a/WebHostLib/static/static/sprites/Fierce Deity Link.gif and b/WebHostLib/static/static/sprites/Fierce Deity Link.gif differ diff --git a/WebHostLib/static/static/sprites/GliitchWiitch.gif b/WebHostLib/static/static/sprites/GliitchWiitch.gif new file mode 100644 index 00000000..9d9a8623 Binary files /dev/null and b/WebHostLib/static/static/sprites/GliitchWiitch.gif differ diff --git a/WebHostLib/static/static/sprites/Gretis.gif b/WebHostLib/static/static/sprites/Gretis.gif new file mode 100644 index 00000000..d4cfbd8a Binary files /dev/null and b/WebHostLib/static/static/sprites/Gretis.gif differ diff --git a/WebHostLib/static/static/sprites/Hanna.gif b/WebHostLib/static/static/sprites/Hanna.gif new file mode 100644 index 00000000..c818f050 Binary files /dev/null and b/WebHostLib/static/static/sprites/Hanna.gif differ diff --git a/WebHostLib/static/static/sprites/Hotdog.gif b/WebHostLib/static/static/sprites/Hotdog.gif new file mode 100644 index 00000000..ec7c7b36 Binary files /dev/null and b/WebHostLib/static/static/sprites/Hotdog.gif differ diff --git a/WebHostLib/static/static/sprites/Imposter.gif b/WebHostLib/static/static/sprites/Imposter.gif new file mode 100644 index 00000000..de6cfc73 Binary files /dev/null and b/WebHostLib/static/static/sprites/Imposter.gif differ diff --git a/WebHostLib/static/static/sprites/Korok.gif b/WebHostLib/static/static/sprites/Korok.gif new file mode 100644 index 00000000..1e45dd46 Binary files /dev/null and b/WebHostLib/static/static/sprites/Korok.gif differ diff --git a/WebHostLib/static/static/sprites/Link Redrawn.gif b/WebHostLib/static/static/sprites/Link Redrawn.gif new file mode 100644 index 00000000..669c4ee7 Binary files /dev/null and b/WebHostLib/static/static/sprites/Link Redrawn.gif differ diff --git a/WebHostLib/static/static/sprites/Little Hylian.gif b/WebHostLib/static/static/sprites/Little Hylian.gif new file mode 100644 index 00000000..4b252c09 Binary files /dev/null and b/WebHostLib/static/static/sprites/Little Hylian.gif differ diff --git a/WebHostLib/static/static/sprites/Locke.gif b/WebHostLib/static/static/sprites/Locke.gif new file mode 100644 index 00000000..f9a2dc21 Binary files /dev/null and b/WebHostLib/static/static/sprites/Locke.gif differ diff --git a/WebHostLib/static/static/sprites/Luna Maindo.gif b/WebHostLib/static/static/sprites/Luna Maindo.gif new file mode 100644 index 00000000..e801545b Binary files /dev/null and b/WebHostLib/static/static/sprites/Luna Maindo.gif differ diff --git a/WebHostLib/static/static/sprites/MoblinSprite.gif b/WebHostLib/static/static/sprites/MoblinSprite.gif new file mode 100644 index 00000000..43480319 Binary files /dev/null and b/WebHostLib/static/static/sprites/MoblinSprite.gif differ diff --git a/WebHostLib/static/static/sprites/Navirou.gif b/WebHostLib/static/static/sprites/Navirou.gif index b16c1ab4..fc03423f 100644 Binary files a/WebHostLib/static/static/sprites/Navirou.gif and b/WebHostLib/static/static/sprites/Navirou.gif differ diff --git a/WebHostLib/static/static/sprites/Niddraig.gif b/WebHostLib/static/static/sprites/Niddraig.gif new file mode 100644 index 00000000..70368029 Binary files /dev/null and b/WebHostLib/static/static/sprites/Niddraig.gif differ diff --git a/WebHostLib/static/static/sprites/Rat.gif b/WebHostLib/static/static/sprites/Rat.gif new file mode 100644 index 00000000..78567a46 Binary files /dev/null and b/WebHostLib/static/static/sprites/Rat.gif differ diff --git a/WebHostLib/static/static/sprites/Red Mage.gif b/WebHostLib/static/static/sprites/Red Mage.gif new file mode 100644 index 00000000..c355c484 Binary files /dev/null and b/WebHostLib/static/static/sprites/Red Mage.gif differ diff --git a/WebHostLib/static/static/sprites/Rover.gif b/WebHostLib/static/static/sprites/Rover.gif new file mode 100644 index 00000000..ac38f258 Binary files /dev/null and b/WebHostLib/static/static/sprites/Rover.gif differ diff --git a/WebHostLib/static/static/sprites/Slowpoke.gif b/WebHostLib/static/static/sprites/Slowpoke.gif new file mode 100644 index 00000000..d7ae78d8 Binary files /dev/null and b/WebHostLib/static/static/sprites/Slowpoke.gif differ diff --git a/WebHostLib/static/static/sprites/SpongeBob SquarePants.gif b/WebHostLib/static/static/sprites/SpongeBob SquarePants.gif new file mode 100644 index 00000000..cc2c108d Binary files /dev/null and b/WebHostLib/static/static/sprites/SpongeBob SquarePants.gif differ diff --git a/WebHostLib/static/static/sprites/Steamed Ham.gif b/WebHostLib/static/static/sprites/Steamed Ham.gif new file mode 100644 index 00000000..4785d66c Binary files /dev/null and b/WebHostLib/static/static/sprites/Steamed Ham.gif differ diff --git a/WebHostLib/static/static/sprites/Susie.gif b/WebHostLib/static/static/sprites/Susie.gif new file mode 100644 index 00000000..58d3843d Binary files /dev/null and b/WebHostLib/static/static/sprites/Susie.gif differ diff --git a/WebHostLib/static/static/sprites/boco.gif b/WebHostLib/static/static/sprites/boco.gif new file mode 100644 index 00000000..0bcc8f33 Binary files /dev/null and b/WebHostLib/static/static/sprites/boco.gif differ diff --git a/WebHostLib/static/static/sprites/botw-zelda.gif b/WebHostLib/static/static/sprites/botw-zelda.gif new file mode 100644 index 00000000..3ad3ab04 Binary files /dev/null and b/WebHostLib/static/static/sprites/botw-zelda.gif differ diff --git a/WebHostLib/static/static/sprites/hollow_test.gif b/WebHostLib/static/static/sprites/hollow_test.gif new file mode 100644 index 00000000..248f663c Binary files /dev/null and b/WebHostLib/static/static/sprites/hollow_test.gif differ diff --git a/dumpSprites.py b/dumpSprites.py index c9289ea9..84fde3a7 100644 --- a/dumpSprites.py +++ b/dumpSprites.py @@ -1,39 +1,35 @@ -import argparse -import json -from os import listdir -from os.path import isfile, join -from Rom import Sprite -from Gui import get_image_for_sprite - -parser = argparse.ArgumentParser(description='Dump sprite data and .png files to a directory.') -parser.add_argument('-i') -parser.add_argument('-o') -args = parser.parse_args() - -if not args.i or not args.o: - print('Invalid arguments provided. -i and -o are required.') - exit() +from Gui import * +import threading # Target directories -input_dir = args.i -output_dir = args.o +input_dir = local_path("data", "sprites", "alttpr") +output_dir = local_path("WebHostLib", "static", "static") -# Get a list of all files in the input directory -targetFiles = [file for file in listdir(input_dir) if isfile(join(input_dir, file))] +#update sprites through gui.py's functions +done = threading.Event() +top = Tk() +top.withdraw() +BackgroundTaskProgress(top, update_sprites, "Updating Sprites", lambda succesful, resultmessage: done.set()) +while not done.isSet(): + top.update() + +print("Done updating sprites") spriteData = {} -for file in targetFiles: - if file[-5:] != '.zspr': - continue +for file in os.listdir(input_dir): + sprite = Sprite(os.path.join(input_dir, file)) - sprite = Sprite(join(input_dir, file)) - spriteData[sprite.name] = file + if not sprite.name: + print("Warning:",file,"has no name.") + sprite.name = file.split(".", 1)[0] - image = open(f'{output_dir}/{sprite.name}.gif', 'wb') - image.write(get_image_for_sprite(sprite, True)) - image.close() + if sprite.valid: + with open(os.path.join(output_dir, "sprites", f"{sprite.name}.gif"), 'wb') as image: + image.write(get_image_for_sprite(sprite, True)) + spriteData[sprite.name] = file + else: + print(file, "dropped, as it has no valid sprite data.") -jsonFile = open(f'{output_dir}/spriteData.json', 'w') -jsonFile.write(json.dumps(spriteData)) -jsonFile.close() +with open(f'{output_dir}/spriteData.json', 'w') as file: + json.dump(spriteData, file)