diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp index f701ad4fe1..8d1fabeff2 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp @@ -111,9 +111,9 @@ const std::map, SkyData> list_skylanders = {{30, 0x0000}, {"Chop Chop", Game::SpyrosAdv, Element::Undead}}, {{30, 0x1801}, {"Series 2 Chop Chop", Game::Giants, Element::Undead}}, {{30, 0x2805}, {"Twin Blade Chop Chop", Game::SwapForce, Element::Undead}}, - {{30, 0x3810}, {"Eon's Elite Chop Chop"}}, + {{30, 0x3810}, {"Eon's Elite Chop Chop", Game::TrapTeam, Element::Undead}}, {{31, 0x0000}, {"Ghost Roaster", Game::SpyrosAdv, Element::Undead}}, - {{31, 0x4810}, {"Eon's Elite Ghost Roaster"}}, + {{31, 0x4810}, {"Eon's Elite Ghost Roaster", Game::Superchargers, Element::Undead}}, {{32, 0x0000}, {"Cynder", Game::SpyrosAdv, Element::Undead}}, {{32, 0x1801}, {"Series 2 Cynder", Game::Giants, Element::Undead}}, {{32, 0x2805}, {"Phantom Cynder", Game::SwapForce, Element::Undead}}, @@ -165,60 +165,60 @@ const std::map, SkyData> list_skylanders = {{205, 0x0000}, {"Sky Iron Shield", Game::SpyrosAdv}}, {{206, 0x0000}, {"Winged Boots", Game::SpyrosAdv}}, {{207, 0x0000}, {"Sparx the Dragonfly", Game::SpyrosAdv}}, - {{208, 0x0000}, {"Dragonfire Cannon", Game::SpyrosAdv}}, - {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::SpyrosAdv}}, + {{208, 0x0000}, {"Dragonfire Cannon", Game::Giants}}, + {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::Giants}}, {{209, 0x0000}, {"Scorpion Striker", Game::Giants}}, - {{210, 0x3002}, {"Biter's Bane", Game::TrapTeam}}, - {{210, 0x3008}, {"Sorcerous Skull", Game::TrapTeam}}, - {{210, 0x300B}, {"Axe of Illusion", Game::TrapTeam}}, - {{210, 0x300E}, {"Arcane Hourglass", Game::TrapTeam}}, - {{210, 0x3012}, {"Spell Slapper", Game::TrapTeam}}, - {{210, 0x3014}, {"Rune Rocket", Game::TrapTeam}}, - {{211, 0x3001}, {"Tidal Tiki", Game::TrapTeam}}, - {{211, 0x3002}, {"Wet Walter", Game::TrapTeam}}, - {{211, 0x3006}, {"Flood Flask", Game::TrapTeam}}, - {{211, 0x3406}, {"Legendary Flood Flask", Game::TrapTeam}}, - {{211, 0x3007}, {"Soaking Staff", Game::TrapTeam}}, - {{211, 0x300B}, {"Aqua Axe", Game::TrapTeam}}, - {{211, 0x3016}, {"Frost Helm", Game::TrapTeam}}, - {{212, 0x3003}, {"Breezy Bird", Game::TrapTeam}}, - {{212, 0x3006}, {"Drafty Decanter", Game::TrapTeam}}, - {{212, 0x300D}, {"Tempest Timer", Game::TrapTeam}}, - {{212, 0x3010}, {"Cloudy Cobra", Game::TrapTeam}}, - {{212, 0x3011}, {"Storm Warning", Game::TrapTeam}}, - {{212, 0x3018}, {"Cyclone Saber", Game::TrapTeam}}, - {{213, 0x3004}, {"Spirit Sphere", Game::TrapTeam}}, - {{213, 0x3404}, {"Legendary Spirit Sphere", Game::TrapTeam}}, - {{213, 0x3008}, {"Spectral Skull", Game::TrapTeam}}, - {{213, 0x3408}, {"Legendary Spectral Skull", Game::TrapTeam}}, - {{213, 0x300B}, {"Haunted Hatchet", Game::TrapTeam}}, - {{213, 0x300C}, {"Grim Gripper", Game::TrapTeam}}, - {{213, 0x3010}, {"Spooky Snake", Game::TrapTeam}}, - {{213, 0x3017}, {"Dream Piercer", Game::TrapTeam}}, - {{214, 0x3000}, {"Tech Totem", Game::TrapTeam}}, - {{214, 0x3007}, {"Automatic Angel", Game::TrapTeam}}, - {{214, 0x3009}, {"Factory Flower", Game::TrapTeam}}, - {{214, 0x300C}, {"Grabbing Gadget", Game::TrapTeam}}, - {{214, 0x3016}, {"Makers Mana", Game::TrapTeam}}, - {{214, 0x301A}, {"Topsy Techy", Game::TrapTeam}}, - {{215, 0x3005}, {"Eternal Flame", Game::TrapTeam}}, - {{215, 0x3009}, {"Fire Flower", Game::TrapTeam}}, - {{215, 0x3011}, {"Scorching Stopper", Game::TrapTeam}}, - {{215, 0x3012}, {"Searing Spinner", Game::TrapTeam}}, - {{215, 0x3017}, {"Spark Spear", Game::TrapTeam}}, - {{215, 0x301B}, {"Blazing Belch", Game::TrapTeam}}, - {{216, 0x3000}, {"Banded Boulder", Game::TrapTeam}}, - {{216, 0x3003}, {"Rock Hawk", Game::TrapTeam}}, - {{216, 0x300A}, {"Slag Hammer", Game::TrapTeam}}, - {{216, 0x300E}, {"Dust Of Time", Game::TrapTeam}}, - {{216, 0x3013}, {"Spinning Sandstorm", Game::TrapTeam}}, - {{216, 0x301A}, {"Rubble Trouble", Game::TrapTeam}}, - {{217, 0x3003}, {"Oak Eagle", Game::TrapTeam}}, - {{217, 0x3005}, {"Emerald Energy", Game::TrapTeam}}, - {{217, 0x300A}, {"Weed Whacker", Game::TrapTeam}}, - {{217, 0x3010}, {"Seed Serpent", Game::TrapTeam}}, - {{217, 0x3018}, {"Jade Blade", Game::TrapTeam}}, - {{217, 0x301B}, {"Shrub Shrieker", Game::TrapTeam}}, + {{210, 0x3002}, {"Biter's Bane", Game::TrapTeam, Element::Magic}}, + {{210, 0x3008}, {"Sorcerous Skull", Game::TrapTeam, Element::Magic}}, + {{210, 0x300B}, {"Axe of Illusion", Game::TrapTeam, Element::Magic}}, + {{210, 0x300E}, {"Arcane Hourglass", Game::TrapTeam, Element::Magic}}, + {{210, 0x3012}, {"Spell Slapper", Game::TrapTeam, Element::Magic}}, + {{210, 0x3014}, {"Rune Rocket", Game::TrapTeam, Element::Magic}}, + {{211, 0x3001}, {"Tidal Tiki", Game::TrapTeam, Element::Water}}, + {{211, 0x3002}, {"Wet Walter", Game::TrapTeam, Element::Water}}, + {{211, 0x3006}, {"Flood Flask", Game::TrapTeam, Element::Water}}, + {{211, 0x3406}, {"Legendary Flood Flask", Game::TrapTeam, Element::Water}}, + {{211, 0x3007}, {"Soaking Staff", Game::TrapTeam, Element::Water}}, + {{211, 0x300B}, {"Aqua Axe", Game::TrapTeam, Element::Water}}, + {{211, 0x3016}, {"Frost Helm", Game::TrapTeam, Element::Water}}, + {{212, 0x3003}, {"Breezy Bird", Game::TrapTeam, Element::Air}}, + {{212, 0x3006}, {"Drafty Decanter", Game::TrapTeam, Element::Air}}, + {{212, 0x300D}, {"Tempest Timer", Game::TrapTeam, Element::Air}}, + {{212, 0x3010}, {"Cloudy Cobra", Game::TrapTeam, Element::Air}}, + {{212, 0x3011}, {"Storm Warning", Game::TrapTeam, Element::Air}}, + {{212, 0x3018}, {"Cyclone Saber", Game::TrapTeam, Element::Air}}, + {{213, 0x3004}, {"Spirit Sphere", Game::TrapTeam, Element::Undead}}, + {{213, 0x3404}, {"Legendary Spirit Sphere", Game::TrapTeam, Element::Undead}}, + {{213, 0x3008}, {"Spectral Skull", Game::TrapTeam, Element::Undead}}, + {{213, 0x3408}, {"Legendary Spectral Skull", Game::TrapTeam, Element::Undead}}, + {{213, 0x300B}, {"Haunted Hatchet", Game::TrapTeam, Element::Undead}}, + {{213, 0x300C}, {"Grim Gripper", Game::TrapTeam, Element::Undead}}, + {{213, 0x3010}, {"Spooky Snake", Game::TrapTeam, Element::Undead}}, + {{213, 0x3017}, {"Dream Piercer", Game::TrapTeam, Element::Undead}}, + {{214, 0x3000}, {"Tech Totem", Game::TrapTeam, Element::Tech}}, + {{214, 0x3007}, {"Automatic Angel", Game::TrapTeam, Element::Tech}}, + {{214, 0x3009}, {"Factory Flower", Game::TrapTeam, Element::Tech}}, + {{214, 0x300C}, {"Grabbing Gadget", Game::TrapTeam, Element::Tech}}, + {{214, 0x3016}, {"Makers Mana", Game::TrapTeam, Element::Tech}}, + {{214, 0x301A}, {"Topsy Techy", Game::TrapTeam, Element::Tech}}, + {{215, 0x3005}, {"Eternal Flame", Game::TrapTeam, Element::Fire}}, + {{215, 0x3009}, {"Fire Flower", Game::TrapTeam, Element::Fire}}, + {{215, 0x3011}, {"Scorching Stopper", Game::TrapTeam, Element::Fire}}, + {{215, 0x3012}, {"Searing Spinner", Game::TrapTeam, Element::Fire}}, + {{215, 0x3017}, {"Spark Spear", Game::TrapTeam, Element::Fire}}, + {{215, 0x301B}, {"Blazing Belch", Game::TrapTeam, Element::Fire}}, + {{216, 0x3000}, {"Banded Boulder", Game::TrapTeam, Element::Earth}}, + {{216, 0x3003}, {"Rock Hawk", Game::TrapTeam, Element::Earth}}, + {{216, 0x300A}, {"Slag Hammer", Game::TrapTeam, Element::Earth}}, + {{216, 0x300E}, {"Dust Of Time", Game::TrapTeam, Element::Earth}}, + {{216, 0x3013}, {"Spinning Sandstorm", Game::TrapTeam, Element::Earth}}, + {{216, 0x301A}, {"Rubble Trouble", Game::TrapTeam, Element::Earth}}, + {{217, 0x3003}, {"Oak Eagle", Game::TrapTeam, Element::Life}}, + {{217, 0x3005}, {"Emerald Energy", Game::TrapTeam, Element::Life}}, + {{217, 0x300A}, {"Weed Whacker", Game::TrapTeam, Element::Life}}, + {{217, 0x3010}, {"Seed Serpent", Game::TrapTeam, Element::Life}}, + {{217, 0x3018}, {"Jade Blade", Game::TrapTeam, Element::Life}}, + {{217, 0x301B}, {"Shrub Shrieker", Game::TrapTeam, Element::Life}}, {{218, 0x3000}, {"Dark Dagger", Game::TrapTeam}}, {{218, 0x3014}, {"Shadow Spider", Game::TrapTeam}}, {{218, 0x301A}, {"Ghastly Grimace", Game::TrapTeam}}, @@ -232,11 +232,11 @@ const std::map, SkyData> list_skylanders = {{231, 0x0000}, {"Piggy Bank", Game::TrapTeam}}, {{232, 0x0000}, {"Rocket Ram", Game::TrapTeam}}, {{233, 0x0000}, {"Tiki Speaky", Game::TrapTeam}}, - {{300, 0x0000}, {"Dragon’s Peak", Game::TrapTeam}}, - {{301, 0x0000}, {"Empire of Ice", Game::TrapTeam}}, - {{302, 0x0000}, {"Pirate Seas", Game::TrapTeam}}, - {{303, 0x0000}, {"Darklight Crypt", Game::TrapTeam}}, - {{304, 0x0000}, {"Volcanic Vault", Game::TrapTeam}}, + {{300, 0x0000}, {"Dragon's Peak", Game::SpyrosAdv}}, + {{301, 0x0000}, {"Empire of Ice", Game::SpyrosAdv}}, + {{302, 0x0000}, {"Pirate Seas", Game::SpyrosAdv}}, + {{303, 0x0000}, {"Darklight Crypt", Game::SpyrosAdv}}, + {{304, 0x0000}, {"Volcanic Vault", Game::SpyrosAdv}}, {{305, 0x0000}, {"Mirror of Mystery", Game::TrapTeam}}, {{306, 0x0000}, {"Nightmare Express", Game::TrapTeam}}, {{307, 0x0000}, {"Sunscraper Spire", Game::TrapTeam}}, @@ -288,10 +288,10 @@ const std::map, SkyData> list_skylanders = {{479, 0x0000}, {"Short Cut", Game::TrapTeam, Element::Undead}}, {{480, 0x0000}, {"Bat Spin", Game::TrapTeam, Element::Undead}}, {{481, 0x0000}, {"Funny Bone", Game::TrapTeam, Element::Undead}}, - {{482, 0x0000}, {"Knight Light", Game::TrapTeam, Element::Other}}, - {{483, 0x0000}, {"Spotlight", Game::TrapTeam, Element::Other}}, - {{484, 0x0000}, {"Knight Mare", Game::TrapTeam, Element::Other}}, - {{485, 0x0000}, {"Blackout", Game::TrapTeam, Element::Other}}, + {{482, 0x0000}, {"Knight Light", Game::TrapTeam}}, + {{483, 0x0000}, {"Spotlight", Game::TrapTeam}}, + {{484, 0x0000}, {"Knight Mare", Game::TrapTeam}}, + {{485, 0x0000}, {"Blackout", Game::TrapTeam}}, {{502, 0x0000}, {"Bop", Game::TrapTeam, Element::Earth}}, {{505, 0x0000}, {"Terrabite", Game::SpyrosAdv, Element::Earth}}, {{506, 0x0000}, {"Breeze", Game::TrapTeam, Element::Air}}, @@ -390,52 +390,52 @@ const std::map, SkyData> list_skylanders = {{3013, 0x2206}, {"LightCore Grim Creeper", Game::SwapForce, Element::Undead}}, {{3014, 0x0000}, {"Rip Tide", Game::SwapForce, Element::Water}}, {{3015, 0x0000}, {"Punk Shock", Game::SwapForce, Element::Water}}, - {{3200, 0x0000}, {"Battle Hammer", Game::SwapForce, Element::Other}}, - {{3201, 0x0000}, {"Sky Diamond", Game::SwapForce, Element::Other}}, - {{3202, 0x0000}, {"Platinum Sheep", Game::SwapForce, Element::Other}}, - {{3203, 0x0000}, {"Groove Machine", Game::SwapForce, Element::Other}}, - {{3204, 0x0000}, {"UFO Hat", Game::SwapForce, Element::Other}}, - {{3300, 0x0000}, {"Sheep Wreck Island", Game::SwapForce, Element::Other}}, - {{3301, 0x0000}, {"Tower of Time", Game::SwapForce, Element::Other}}, - {{3302, 0x0000}, {"Fiery Forge", Game::SwapForce, Element::Other}}, - {{3303, 0x0000}, {"Arkeyan Crossbow", Game::SwapForce, Element::Other}}, - {{3220, 0x0000}, {"Jet Stream", Game::Superchargers, Element::Other}}, - {{3221, 0x0000}, {"Tomb Buggy", Game::Superchargers, Element::Other}}, - {{3222, 0x0000}, {"Reef Ripper", Game::Superchargers, Element::Other}}, - {{3223, 0x0000}, {"Burn Cycle", Game::Superchargers, Element::Other}}, - {{3224, 0x0000}, {"Hot Streak", Game::Superchargers, Element::Other}}, - {{3224, 0x4402}, {"Dark Hot Streak", Game::Superchargers, Element::Other}}, - {{3224, 0x4004}, {"E3 Hot Streak", Game::Superchargers, Element::Other}}, - {{3224, 0x441E}, {"Golden Hot Streak", Game::Superchargers, Element::Other}}, - {{3225, 0x0000}, {"Shark Tank", Game::Superchargers, Element::Other}}, - {{3226, 0x0000}, {"Thump Truck", Game::Superchargers, Element::Other}}, - {{3227, 0x0000}, {"Crypt Crusher", Game::Superchargers, Element::Other}}, - {{3228, 0x0000}, {"Stealth Stinger", Game::Superchargers, Element::Other}}, - {{3228, 0x4402}, {"Nitro Stealth Stinger", Game::Superchargers, Element::Other}}, - {{3231, 0x0000}, {"Dive Bomber", Game::Superchargers, Element::Other}}, - {{3231, 0x4402}, {"Spring Ahead Dive Bomber", Game::Superchargers, Element::Other}}, - {{3232, 0x0000}, {"Sky Slicer", Game::Superchargers, Element::Other}}, - {{3233, 0x0000}, {"Clown Cruiser (Nintendo Only)", Game::Superchargers, Element::Other}}, - {{3233, 0x4402}, {"Dark Clown Cruiser (Nintendo Only)", Game::Superchargers, Element::Other}}, - {{3234, 0x0000}, {"Gold Rusher", Game::Superchargers, Element::Other}}, - {{3234, 0x4402}, {"Power Blue Gold Rusher", Game::Superchargers, Element::Other}}, - {{3235, 0x0000}, {"Shield Striker", Game::Superchargers, Element::Other}}, - {{3236, 0x0000}, {"Sun Runner", Game::Superchargers, Element::Other}}, - {{3236, 0x4403}, {"Legendary Sun Runner", Game::Superchargers, Element::Other}}, - {{3237, 0x0000}, {"Sea Shadow", Game::Superchargers, Element::Other}}, - {{3237, 0x4402}, {"Dark Sea Shadow", Game::Superchargers, Element::Other}}, - {{3238, 0x0000}, {"Splatter Splasher", Game::Superchargers, Element::Other}}, - {{3238, 0x4402}, {"Power Blue Splatter Splasher", Game::Superchargers, Element::Other}}, - {{3239, 0x0000}, {"Soda Skimmer", Game::Superchargers, Element::Other}}, - {{3240, 0x0000}, {"Barrel Blaster (Nintendo Only)", Game::Superchargers, Element::Other}}, - {{3240, 0x4402}, {"Dark Barrel Blaster (Nintendo Only)", Game::Superchargers, Element::Other}}, - {{3239, 0x4402}, {"Nitro Soda Skimmer", Game::Superchargers, Element::Other}}, - {{3241, 0x0000}, {"Buzz Wing", Game::Superchargers, Element::Other}}, + {{3200, 0x0000}, {"Battle Hammer", Game::SwapForce}}, + {{3201, 0x0000}, {"Sky Diamond", Game::SwapForce}}, + {{3202, 0x0000}, {"Platinum Sheep", Game::SwapForce}}, + {{3203, 0x0000}, {"Groove Machine", Game::SwapForce}}, + {{3204, 0x0000}, {"UFO Hat", Game::SwapForce}}, + {{3220, 0x0000}, {"Jet Stream", Game::Superchargers}}, + {{3221, 0x0000}, {"Tomb Buggy", Game::Superchargers}}, + {{3222, 0x0000}, {"Reef Ripper", Game::Superchargers}}, + {{3223, 0x0000}, {"Burn Cycle", Game::Superchargers}}, + {{3224, 0x0000}, {"Hot Streak", Game::Superchargers}}, + {{3224, 0x4402}, {"Dark Hot Streak", Game::Superchargers}}, + {{3224, 0x4004}, {"E3 Hot Streak", Game::Superchargers}}, + {{3224, 0x441E}, {"Golden Hot Streak", Game::Superchargers}}, + {{3225, 0x0000}, {"Shark Tank", Game::Superchargers}}, + {{3226, 0x0000}, {"Thump Truck", Game::Superchargers}}, + {{3227, 0x0000}, {"Crypt Crusher", Game::Superchargers}}, + {{3228, 0x0000}, {"Stealth Stinger", Game::Superchargers}}, + {{3228, 0x4402}, {"Nitro Stealth Stinger", Game::Superchargers}}, + {{3231, 0x0000}, {"Dive Bomber", Game::Superchargers}}, + {{3231, 0x4402}, {"Spring Ahead Dive Bomber", Game::Superchargers}}, + {{3232, 0x0000}, {"Sky Slicer", Game::Superchargers}}, + {{3233, 0x0000}, {"Clown Cruiser", Game::Superchargers}}, + {{3233, 0x4402}, {"Dark Clown Cruiser", Game::Superchargers}}, + {{3234, 0x0000}, {"Gold Rusher", Game::Superchargers}}, + {{3234, 0x4402}, {"Power Blue Gold Rusher", Game::Superchargers}}, + {{3235, 0x0000}, {"Shield Striker", Game::Superchargers}}, + {{3236, 0x0000}, {"Sun Runner", Game::Superchargers}}, + {{3236, 0x4403}, {"Legendary Sun Runner", Game::Superchargers}}, + {{3237, 0x0000}, {"Sea Shadow", Game::Superchargers}}, + {{3237, 0x4402}, {"Dark Sea Shadow", Game::Superchargers}}, + {{3238, 0x0000}, {"Splatter Splasher", Game::Superchargers}}, + {{3238, 0x4402}, {"Power Blue Splatter Splasher", Game::Superchargers}}, + {{3239, 0x0000}, {"Soda Skimmer", Game::Superchargers}}, + {{3240, 0x0000}, {"Barrel Blaster", Game::Superchargers}}, + {{3240, 0x4402}, {"Dark Barrel Blaster", Game::Superchargers}}, + {{3239, 0x4402}, {"Nitro Soda Skimmer", Game::Superchargers}}, + {{3241, 0x0000}, {"Buzz Wing", Game::Superchargers}}, + {{3300, 0x0000}, {"Sheep Wreck Island", Game::SwapForce}}, + {{3301, 0x0000}, {"Tower of Time", Game::SwapForce}}, + {{3302, 0x0000}, {"Fiery Forge", Game::SwapForce}}, + {{3303, 0x0000}, {"Arkeyan Crossbow", Game::SwapForce}}, {{3400, 0x0000}, {"Fiesta", Game::Superchargers, Element::Undead}}, {{3400, 0x4515}, {"Frightful Fiesta", Game::Superchargers, Element::Undead}}, {{3401, 0x0000}, {"High Volt", Game::Superchargers, Element::Tech}}, {{3402, 0x0000}, {"Splat", Game::Superchargers, Element::Magic}}, - {{3402, 0x4502}, {"Power Blue Splat", Game::Superchargers, Element::Other}}, + {{3402, 0x4502}, {"Power Blue Splat", Game::Superchargers, Element::Magic}}, {{3406, 0x0000}, {"Stormblade", Game::Superchargers, Element::Air}}, {{3411, 0x0000}, {"Smash Hit", Game::Superchargers, Element::Earth}}, {{3411, 0x4502}, {"Steel Plated Smash Hit", Game::Superchargers, Element::Earth}}, @@ -454,24 +454,21 @@ const std::map, SkyData> list_skylanders = {{3420, 0x450E}, {"Birthday Bash Big Bubble Pop Fizz", Game::Superchargers, Element::Magic}}, {{3421, 0x0000}, {"Lava Lance Eruptor", Game::Superchargers, Element::Fire}}, {{3422, 0x0000}, {"Deep Dive Gill Grunt", Game::Superchargers, Element::Water}}, - {{3423, 0x0000}, - {"Turbo Charge Donkey Kong (Nintendo Only)", Game::Superchargers, Element::Life}}, - {{3423, 0x4502}, - {"Dark Turbo Charge Donkey Kong (Nintendo Only)", Game::Superchargers, Element::Life}}, - {{3424, 0x0000}, {"Hammer Slam Bowser (Nintendo Only)", Game::Superchargers, Element::Fire}}, - {{3424, 0x4502}, - {"Dark Hammer Slam Bowser (Nintendo Only)", Game::Superchargers, Element::Fire}}, + {{3423, 0x0000}, {"Turbo Charge Donkey Kong", Game::Superchargers, Element::Life}}, + {{3423, 0x4502}, {"Dark Turbo Charge Donkey Kong", Game::Superchargers, Element::Life}}, + {{3424, 0x0000}, {"Hammer Slam Bowser", Game::Superchargers, Element::Fire}}, + {{3424, 0x4502}, {"Dark Hammer Slam Bowser", Game::Superchargers, Element::Fire}}, {{3425, 0x0000}, {"Dive-Clops", Game::Superchargers, Element::Water}}, {{3425, 0x450E}, {"Missile-Tow Dive-Clops", Game::Superchargers, Element::Water}}, - {{3426, 0x0000}, {"Astroblast", Game::Superchargers, Element::Other}}, - {{3426, 0x4503}, {"Legendary Astroblast", Game::Superchargers, Element::Other}}, - {{3427, 0x0000}, {"Nightfall", Game::Superchargers, Element::Other}}, + {{3426, 0x0000}, {"Astroblast", Game::Superchargers}}, + {{3426, 0x4503}, {"Legendary Astroblast", Game::Superchargers}}, + {{3427, 0x0000}, {"Nightfall", Game::Superchargers}}, {{3428, 0x0000}, {"Thrillipede", Game::Superchargers, Element::Life}}, {{3428, 0x450D}, {"Eggcited Thrillipede", Game::Superchargers, Element::Life}}, - {{3500, 0x0000}, {"Sky Trophy", Game::Superchargers, Element::Other}}, - {{3501, 0x0000}, {"Land Trophy", Game::Superchargers, Element::Other}}, - {{3502, 0x0000}, {"Sea Trophy", Game::Superchargers, Element::Other}}, - {{3503, 0x0000}, {"Kaos Trophy", Game::Superchargers, Element::Other}}}; + {{3500, 0x0000}, {"Sky Trophy", Game::Superchargers}}, + {{3501, 0x0000}, {"Land Trophy", Game::Superchargers}}, + {{3502, 0x0000}, {"Sea Trophy", Game::Superchargers}}, + {{3503, 0x0000}, {"Kaos Trophy", Game::Superchargers}}}; SkylanderUSB::SkylanderUSB(EmulationKernel& ios, const std::string& device_name) : m_ios(ios) {