diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp index 643c33d4b8..2997f90ab0 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp @@ -22,17 +22,19 @@ namespace IOS::HLE::USB const std::map, SkyData> list_skylanders = { {{0, 0x0000}, {"Whirlwind", Game::SpyrosAdv, Element::Air, Type::Skylander}}, {{0, 0x1801}, {"Whirlwind (S2)", Game::Giants, Element::Air, Type::Skylander}}, + {{0, 0x1812}, {"Whirlwind (Stone)", Game::Giants, Element::Air, Type::Skylander}}, {{0, 0x1C02}, {"Whirlwind (Polar)", Game::Giants, Element::Air, Type::Skylander}}, {{0, 0x2805}, {"Whirlwind (Horn Blast)", Game::SwapForce, Element::Air, Type::Skylander}}, {{0, 0x3810}, {"Whirlwind (Eon's Elite)", Game::TrapTeam, Element::Air, Type::Skylander}}, {{1, 0x0000}, {"Sonic Boom", Game::SpyrosAdv, Element::Air, Type::Skylander}}, {{1, 0x1801}, {"Sonic Boom (S2)", Game::Giants, Element::Air, Type::Skylander}}, - {{1, 0x1811}, {"Sonic Boom (Glow In The Dark)", Game::Giants, Element::Air, Type::Skylander}}, + {{1, 0x1811}, {"Sonic Boom (Glow in the Dark)", Game::Giants, Element::Air, Type::Skylander}}, {{1, 0x1813}, {"Sonic Boom (Sparkle)", Game::Giants, Element::Air, Type::Skylander}}, {{2, 0x0000}, {"Warnado", Game::SpyrosAdv, Element::Air, Type::Skylander}}, - {{2, 0x2206}, {"Warnado (Lightcore)", Game::SwapForce, Element::Air, Type::Skylander}}, + {{2, 0x2206}, {"Warnado (LightCore)", Game::SwapForce, Element::Air, Type::Skylander}}, {{3, 0x0000}, {"Lightning Rod", Game::SpyrosAdv, Element::Air, Type::Skylander}}, {{3, 0x1801}, {"Lightning Rod (S2)", Game::Giants, Element::Air, Type::Skylander}}, + {{3, 0x1814}, {"Lightning Rod (Metallic Purple)", Game::Giants, Element::Air, Type::Skylander}}, {{4, 0x0000}, {"Bash", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, {{4, 0x1801}, {"Bash (S2)", Game::Giants, Element::Earth, Type::Skylander}}, {{5, 0x0000}, {"Terrafin", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, @@ -43,15 +45,19 @@ const std::map, SkyData> list_skylanders = {{6, 0x4810}, {"Dino-Rang (Eon's Elite)", Game::Superchargers, Element::Earth, Type::Skylander}}, {{7, 0x0000}, {"Prism Break", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, - {{7, 0x1206}, {"Prism Break (Lightcore)", Game::Giants, Element::Earth, Type::Skylander}}, + {{7, 0x1206}, {"Prism Break (LightCore)", Game::Giants, Element::Earth, Type::Skylander}}, + {{7, 0x1214}, + {"Prism Break (White Flocked LightCore)", Game::Giants, Element::Earth, Type::Skylander}}, {{7, 0x1801}, {"Prism Break (S2)", Game::Giants, Element::Earth, Type::Skylander}}, {{7, 0x2805}, {"Prism Break (Hyper Beam)", Game::SwapForce, Element::Earth, Type::Skylander}}, {{8, 0x0000}, {"Sunburn", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, {{9, 0x0000}, {"Eruptor", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, - {{9, 0x1206}, {"Eruptor (Lightcore)", Game::Giants, Element::Fire, Type::Skylander}}, + {{9, 0x1206}, {"Eruptor (LightCore)", Game::Giants, Element::Fire, Type::Skylander}}, {{9, 0x1801}, {"Eruptor (S2)", Game::Giants, Element::Fire, Type::Skylander}}, + {{9, 0x1814}, {"Eruptor (White Flocked)", Game::Giants, Element::Fire, Type::Skylander}}, {{9, 0x2805}, {"Eruptor (Lava Barf)", Game::SwapForce, Element::Fire, Type::Skylander}}, - {{9, 0x2C02}, {"Eruptor (Volcanic)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{9, 0x2C02}, + {"Eruptor (Volcanic Lava Barf)", Game::SwapForce, Element::Fire, Type::Skylander}}, {{9, 0x3810}, {"Eruptor (Eon's Elite)", Game::TrapTeam, Element::Fire, Type::Skylander}}, {{10, 0x0000}, {"Ignitor", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, {{10, 0x1801}, {"Ignitor (S2)", Game::Giants, Element::Fire, Type::Skylander}}, @@ -62,10 +68,10 @@ const std::map, SkyData> list_skylanders = {{12, 0x0000}, {"Zap", Game::SpyrosAdv, Element::Water, Type::Skylander}}, {{12, 0x1801}, {"Zap (S2)", Game::Giants, Element::Water, Type::Skylander}}, {{13, 0x0000}, {"Wham-Shell", Game::SpyrosAdv, Element::Water, Type::Skylander}}, - {{13, 0x2206}, {"Wham-Shell (Lightcore)", Game::SwapForce, Element::Water, Type::Skylander}}, + {{13, 0x2206}, {"Wham-Shell (LightCore)", Game::SwapForce, Element::Water, Type::Skylander}}, {{14, 0x0000}, {"Gill Grunt", Game::SpyrosAdv, Element::Water, Type::Skylander}}, {{14, 0x1801}, {"Gill Grunt (S2)", Game::Giants, Element::Water, Type::Skylander}}, - {{14, 0x1817}, {"Gill Grunt (Metallic)", Game::Giants, Element::Water, Type::Skylander}}, + {{14, 0x1817}, {"Gill Grunt (Metallic Green)", Game::Giants, Element::Water, Type::Skylander}}, {{14, 0x2805}, {"Gill Grunt (Anchors Away)", Game::SwapForce, Element::Water, Type::Skylander}}, {{14, 0x3809}, {"Gill Grunt (Tidal Wave)", Game::TrapTeam, Element::Water, Type::Skylander}}, {{14, 0x3810}, {"Gill Grunt (Eon's Elite)", Game::TrapTeam, Element::Water, Type::Skylander}}, @@ -87,10 +93,11 @@ const std::map, SkyData> list_skylanders = {{19, 0x0000}, {"Trigger Happy", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, {{19, 0x1801}, {"Trigger Happy (S2)", Game::Giants, Element::Tech, Type::Skylander}}, {{19, 0x2805}, {"Trigger Happy (Big Bang)", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{19, 0x2C02}, {"Trigger Happy (Springtime)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{19, 0x2C02}, + {"Trigger Happy (Springtime Big Bang)", Game::SwapForce, Element::Tech, Type::Skylander}}, {{19, 0x3810}, {"Trigger Happy (Eon's Elite)", Game::TrapTeam, Element::Tech, Type::Skylander}}, {{20, 0x0000}, {"Drobot", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, - {{20, 0x1206}, {"Drobot (Lightcore)", Game::Giants, Element::Tech, Type::Skylander}}, + {{20, 0x1206}, {"Drobot (LightCore)", Game::Giants, Element::Tech, Type::Skylander}}, {{20, 0x1801}, {"Drobot (S2)", Game::Giants, Element::Tech, Type::Skylander}}, {{21, 0x0000}, {"Drill Sergeant", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, {{21, 0x1801}, {"Drill Sergeant (S2)", Game::Giants, Element::Tech, Type::Skylander}}, @@ -98,25 +105,30 @@ const std::map, SkyData> list_skylanders = {{22, 0x4810}, {"Boomer (Eon's Elite)", Game::Superchargers, Element::Tech, Type::Skylander}}, {{23, 0x0000}, {"Wrecking Ball", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, {{23, 0x1801}, {"Wrecking Ball (S2)", Game::Giants, Element::Magic, Type::Skylander}}, + {{23, 0x1814}, + {"Wrecking Ball (Metallic Purple)", Game::Giants, Element::Magic, Type::Skylander}}, {{24, 0x0000}, {"Camo", Game::SpyrosAdv, Element::Life, Type::Skylander}}, {{24, 0x2805}, {"Camo (Thorn Horn)", Game::SwapForce, Element::Life, Type::Skylander}}, {{25, 0x0000}, {"Zook", Game::SpyrosAdv, Element::Life, Type::Skylander}}, {{25, 0x1801}, {"Zook (S2)", Game::Giants, Element::Life, Type::Skylander}}, + {{25, 0x1812}, {"Zook (Stone)", Game::Giants, Element::Life, Type::Skylander}}, {{25, 0x3810}, {"Zook (Eon's Elite)", Game::Superchargers, Element::Life, Type::Skylander}}, {{26, 0x0000}, {"Stealth Elf", Game::SpyrosAdv, Element::Life, Type::Skylander}}, {{26, 0x1801}, {"Stealth Elf (S2)", Game::Giants, Element::Life, Type::Skylander}}, {{26, 0x1C03}, {"Stealth Elf (Legendary)", Game::Giants, Element::Life, Type::Skylander}}, {{26, 0x2805}, {"Stealth Elf (Ninja)", Game::SwapForce, Element::Life, Type::Skylander}}, - {{26, 0x2C02}, {"Stealth Elf (Dark)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{26, 0x2C02}, {"Stealth Elf (Dark Ninja)", Game::SwapForce, Element::Life, Type::Skylander}}, {{26, 0x3810}, {"Stealth Elf (Eon's Elite)", Game::TrapTeam, Element::Life, Type::Skylander}}, {{27, 0x0000}, {"Stump Smash", Game::SpyrosAdv, Element::Life, Type::Skylander}}, {{27, 0x1801}, {"Stump Smash (S2)", Game::Giants, Element::Life, Type::Skylander}}, + {{27, 0x1814}, {"Stump Smash (White Flocked)", Game::Giants, Element::Life, Type::Skylander}}, {{28, 0x0000}, {"Spyro (Dark)", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, {{29, 0x0000}, {"Hex", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, - {{29, 0x1206}, {"Hex (Lightcore)", Game::Giants, Element::Undead, Type::Skylander}}, + {{29, 0x1206}, {"Hex (LightCore)", Game::Giants, Element::Undead, Type::Skylander}}, {{29, 0x1801}, {"Hex (S2)", Game::Giants, Element::Undead, Type::Skylander}}, {{30, 0x0000}, {"Chop Chop", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, {{30, 0x1801}, {"Chop Chop (S2)", Game::Giants, Element::Undead, Type::Skylander}}, + {{30, 0x1804}, {"Chop Chop (Metallic Blue)", Game::Giants, Element::Undead, Type::Skylander}}, {{30, 0x2805}, {"Chop Chop (Twin Blade)", Game::SwapForce, Element::Undead, Type::Skylander}}, {{30, 0x2816}, {"Chop Chop (Green Twin Blade)", Game::SwapForce, Element::Undead, Type::Skylander}}, @@ -126,11 +138,10 @@ const std::map, SkyData> list_skylanders = {"Ghost Roaster (Eon's Elite)", Game::Superchargers, Element::Undead, Type::Skylander}}, {{32, 0x0000}, {"Cynder", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, {{32, 0x1801}, {"Cynder (S2)", Game::Giants, Element::Undead, Type::Skylander}}, - {{32, 0x1811}, {"Cynder (Glow In The Dark)", Game::Giants, Element::Undead, Type::Skylander}}, + {{32, 0x1811}, {"Cynder (Glow in the Dark)", Game::Giants, Element::Undead, Type::Skylander}}, {{32, 0x2805}, {"Cynder (Phantom)", Game::SwapForce, Element::Undead, Type::Skylander}}, - {{32, 0x301D}, {"Cynder (Clear)", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, {{100, 0x1000}, {"Jet-Vac", Game::Giants, Element::Air, Type::Skylander}}, - {{100, 0x1206}, {"Jet-Vac (Lightcore)", Game::Giants, Element::Air, Type::Skylander}}, + {{100, 0x1206}, {"Jet-Vac (LightCore)", Game::Giants, Element::Air, Type::Skylander}}, {{100, 0x1403}, {"Jet-Vac (Legendary)", Game::Giants, Element::Air, Type::Skylander}}, {{100, 0x2805}, {"Jet Vac (Turbo)", Game::SwapForce, Element::Air, Type::Skylander}}, {{100, 0x3805}, {"Jet-Vac (Full Blast)", Game::TrapTeam, Element::Air, Type::Skylander}}, @@ -139,309 +150,68 @@ const std::map, SkyData> list_skylanders = {{102, 0x1602}, {"Crusher (Granite)", Game::Giants, Element::Earth, Type::Giant}}, {{103, 0x1000}, {"Flashwing", Game::Giants, Element::Earth, Type::Skylander}}, {{103, 0x1402}, {"Flashwing (Jade)", Game::Giants, Element::Earth, Type::Skylander}}, - {{103, 0x2206}, {"Flashwing (Lightcore)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{103, 0x2206}, {"Flashwing (LightCore)", Game::SwapForce, Element::Earth, Type::Skylander}}, {{104, 0x1206}, {"Hot Head", Game::Giants, Element::Fire, Type::Giant}}, {{104, 0x1213}, {"Hot Head (Sparkle)", Game::Giants, Element::Fire, Type::Skylander}}, {{105, 0x1000}, {"Hot Dog", Game::Giants, Element::Fire, Type::Skylander}}, + {{105, 0x1015}, {"Hot Dog (Bronze)", Game::Giants, Element::Fire, Type::Skylander}}, {{105, 0x1402}, {"Hot Dog (Molten)", Game::Giants, Element::Fire, Type::Skylander}}, {{105, 0x2805}, {"Hot Dog (Fire Bone)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{105, 0x281A}, + {"Hot Dog (Red Flame Frito-Lay Fire Bone)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{105, 0x281B}, + {"Hot Dog (Green Flame Frito-Lay Fire Bone)", Game::SwapForce, Element::Fire, + Type::Skylander}}, + {{105, 0x281C}, + {"Hot Dog (Purple Flame Frito-Lay Fire Bone)", Game::SwapForce, Element::Fire, + Type::Skylander}}, {{106, 0x1000}, {"Chill", Game::Giants, Element::Water, Type::Skylander}}, - {{106, 0x1206}, {"Chill (Lightcore)", Game::Giants, Element::Water, Type::Skylander}}, - {{106, 0x1603}, {"Chill (Legendary)", Game::Giants, Element::Water, Type::Skylander}}, + {{106, 0x1206}, {"Chill (LightCore)", Game::Giants, Element::Water, Type::Skylander}}, + {{106, 0x1603}, {"Chill (Legendary LightCore)", Game::Giants, Element::Water, Type::Skylander}}, {{106, 0x2805}, {"Chill (Blizzard)", Game::SwapForce, Element::Water, Type::Skylander}}, {{107, 0x1206}, {"Thumpback", Game::Giants, Element::Water, Type::Giant}}, {{108, 0x1000}, {"Pop Fizz", Game::Giants, Element::Magic, Type::Skylander}}, - {{108, 0x1206}, {"Pop Fizz (Lightcore)", Game::Giants, Element::Magic, Type::Skylander}}, + {{108, 0x1206}, {"Pop Fizz (LightCore)", Game::Giants, Element::Magic, Type::Skylander}}, {{108, 0x1402}, {"Pop Fizz (Punch)", Game::Giants, Element::Magic, Type::Skylander}}, {{108, 0x2805}, {"Pop Fizz (Super Gulp)", Game::SwapForce, Element::Magic, Type::Skylander}}, {{108, 0x3805}, {"Pop Fizz (Fizzy Frenzy)", Game::TrapTeam, Element::Magic, Type::Skylander}}, - {{108, 0x3C02}, {"Pop Fizz (Love Potion)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{108, 0x3C02}, + {"Pop Fizz (Love Potion Fizzy Frenzy)", Game::TrapTeam, Element::Magic, Type::Skylander}}, {{109, 0x1206}, {"Ninjini", Game::Giants, Element::Magic, Type::Giant}}, {{109, 0x1602}, {"Ninjini (Scarlet)", Game::Giants, Element::Magic, Type::Giant}}, {{110, 0x1206}, {"Bouncer", Game::Giants, Element::Tech, Type::Giant}}, {{110, 0x1603}, {"Bouncer (Legendary)", Game::Giants, Element::Tech, Type::Giant}}, {{111, 0x1000}, {"Sprocket", Game::Giants, Element::Tech, Type::Skylander}}, + {{111, 0x1013}, {"Sprocket (Sparkle)", Game::Giants, Element::Tech, Type::Skylander}}, {{111, 0x2805}, {"Sprocket (Heavy Duty)", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{111, 0x2819}, {"Sprocket (Heavy Metal)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{111, 0x2819}, + {"Sprocket (Heavy Metal Heavy Duty)", Game::SwapForce, Element::Tech, Type::Skylander}}, {{112, 0x1206}, {"Tree Rex", Game::Giants, Element::Life, Type::Giant}}, {{112, 0x1602}, {"Tree Rex (Gnarly)", Game::Giants, Element::Life, Type::Giant}}, {{113, 0x1000}, {"Shroomboom", Game::Giants, Element::Life, Type::Skylander}}, - {{113, 0x1206}, {"Shroomboom (Lightcore)", Game::Giants, Element::Life, Type::Skylander}}, + {{113, 0x1017}, {"Shroomboom (Metallic Green)", Game::Giants, Element::Life, Type::Skylander}}, + {{113, 0x1206}, {"Shroomboom (LightCore)", Game::Giants, Element::Life, Type::Skylander}}, {{113, 0x3801}, {"Shroomboom (Sure Shot)", Game::TrapTeam, Element::Life, Type::Skylander}}, {{114, 0x1206}, {"Eye-Brawl", Game::Giants, Element::Undead, Type::Giant}}, + {{114, 0x1214}, {"Eye-Brawl (Metallic Purple)", Game::Giants, Element::Undead, Type::Giant}}, {{114, 0x1215}, {"Eye-Brawl (Pumpkin)", Game::Giants, Element::Undead, Type::Giant}}, {{115, 0x1000}, {"Fright Rider", Game::Giants, Element::Undead, Type::Skylander}}, - {{115, 0x1011}, {"Fright Rider (Halloween)", Game::Giants, Element::Undead, Type::Skylander}}, - {{115, 0x1811}, - {"Fright Rider (Glow In The Dark)", Game::Giants, Element::Undead, Type::Skylander}}, - {{404, 0x0000}, {"Bash (Legendary)", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, - {{416, 0x0000}, {"Spyro (Legendary)", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, - {{419, 0x0000}, {"Trigger Happy (Legendary)", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, - {{430, 0x0000}, {"Chop Chop (Legendary)", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, - {{450, 0x3000}, {"Gusto", Game::TrapTeam, Element::Air, Type::TrapMaster}}, - {{451, 0x3000}, {"Thunderbolt", Game::TrapTeam, Element::Air, Type::TrapMaster}}, - {{451, 0x301D}, {"Thunderbolt (Clear)", Game::TrapTeam, Element::Air, Type::TrapMaster}}, - {{452, 0x3000}, {"Fling Kong", Game::TrapTeam, Element::Air, Type::Skylander}}, - {{453, 0x3000}, {"Blades", Game::TrapTeam, Element::Air, Type::Skylander}}, - {{453, 0x3403}, {"Blades (Legendary)", Game::TrapTeam, Element::Air, Type::Skylander}}, - {{454, 0x3000}, {"Wallop", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, - {{455, 0x3000}, {"Head Rush", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, - {{455, 0x3402}, {"Head Rush (Nitro)", Game::TrapTeam, Element::Earth, Type::Skylander}}, - {{456, 0x3000}, {"Fist Bump", Game::TrapTeam, Element::Earth, Type::Skylander}}, - {{457, 0x3000}, {"Rocky Roll", Game::TrapTeam, Element::Earth, Type::Skylander}}, - {{458, 0x3000}, {"Wildfire", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, - {{458, 0x3402}, {"Wildfire (Dark)", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, - {{459, 0x3000}, {"Kaboom", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, - {{460, 0x3000}, {"Trail Blazer", Game::TrapTeam, Element::Fire, Type::Skylander}}, - {{461, 0x3000}, {"Torch", Game::TrapTeam, Element::Fire, Type::Skylander}}, - {{462, 0x3000}, {"Snap Shot", Game::TrapTeam, Element::Water, Type::TrapMaster}}, - {{462, 0x450F}, {"Snap Shot (Virtual)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, - {{462, 0x3402}, {"Snap Shot (Dark)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, - {{463, 0x3000}, {"Lob Star", Game::TrapTeam, Element::Water, Type::TrapMaster}}, - {{463, 0x3402}, {"Lob Star (Winterfest)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, - {{464, 0x3000}, {"Flip Wreck", Game::TrapTeam, Element::Water, Type::Skylander}}, - {{465, 0x3000}, {"Echo", Game::TrapTeam, Element::Water, Type::Skylander}}, - {{466, 0x3000}, {"Blastermind", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, - {{467, 0x3000}, {"Enigma", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, - {{468, 0x3000}, {"Deja Vu", Game::TrapTeam, Element::Magic, Type::Skylander}}, - {{468, 0x3403}, {"Deja Vu (Legendary)", Game::TrapTeam, Element::Magic, Type::Skylander}}, - {{469, 0x3000}, {"Cobra Cadabra", Game::TrapTeam, Element::Magic, Type::Skylander}}, - {{469, 0x3402}, {"Cobra Cadabra (King)", Game::TrapTeam, Element::Magic, Type::Skylander}}, - {{470, 0x3000}, {"Jawbreaker", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, - {{470, 0x3403}, {"Jawbreaker (Legendary)", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, - {{471, 0x3000}, {"Gearshift", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, - {{472, 0x3000}, {"Chopper", Game::TrapTeam, Element::Tech, Type::Skylander}}, - {{473, 0x3000}, {"Tread Head", Game::TrapTeam, Element::Tech, Type::Skylander}}, - {{474, 0x3000}, {"Bushwhack", Game::TrapTeam, Element::Life, Type::TrapMaster}}, - {{474, 0x3403}, {"Bushwhack (Legendary)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, - {{475, 0x3000}, {"Tuff Luck", Game::TrapTeam, Element::Life, Type::TrapMaster}}, - {{475, 0x301D}, {"Tuff Luck (Clear)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, - {{476, 0x3000}, {"Food Fight", Game::TrapTeam, Element::Life, Type::Skylander}}, - {{476, 0x3402}, {"Food Fight (Dark)", Game::TrapTeam, Element::Life, Type::Skylander}}, - {{476, 0x450F}, {"Food Fight (Virtual)", Game::TrapTeam, Element::Life, Type::Skylander}}, - {{477, 0x3000}, {"High Five", Game::TrapTeam, Element::Life, Type::Skylander}}, - {{478, 0x3000}, {"Krypt King", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, - {{478, 0x3402}, {"Krypt King (Nitro)", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, - {{479, 0x3000}, {"Short Cut", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, - {{480, 0x3000}, {"Bat Spin", Game::TrapTeam, Element::Undead, Type::Skylander}}, - {{481, 0x3000}, {"Funny Bone", Game::TrapTeam, Element::Undead, Type::Skylander}}, - {{482, 0x3000}, {"Knight Light", Game::TrapTeam, Element::Light, Type::TrapMaster}}, - {{483, 0x3000}, {"Spot Light", Game::TrapTeam, Element::Light, Type::Skylander}}, - {{484, 0x3000}, {"Knight Mare", Game::TrapTeam, Element::Dark, Type::TrapMaster}}, - {{485, 0x3000}, {"Blackout", Game::TrapTeam, Element::Dark, Type::Skylander}}, - {{502, 0x3000}, {"Bop", Game::TrapTeam, Element::Earth, Type::Mini}}, - {{503, 0x3000}, {"Spry", Game::TrapTeam, Element::Magic, Type::Mini}}, - {{504, 0x3000}, {"Hijinx", Game::TrapTeam, Element::Undead, Type::Mini}}, - {{505, 0x3000}, {"Terrabite", Game::TrapTeam, Element::Earth, Type::Mini}}, - {{506, 0x3000}, {"Breeze", Game::TrapTeam, Element::Air, Type::Mini}}, - {{507, 0x3000}, {"Weeruptor", Game::TrapTeam, Element::Fire, Type::Mini}}, - {{507, 0x3402}, {"Weeruptor (Eggsellent)", Game::TrapTeam, Element::Fire, Type::Mini}}, - {{508, 0x3000}, {"Pet Vac", Game::TrapTeam, Element::Air, Type::Mini}}, - {{508, 0x3402}, {"Pet Vac (Power Punch)", Game::TrapTeam, Element::Air, Type::Mini}}, - {{509, 0x3000}, {"Small Fry", Game::TrapTeam, Element::Fire, Type::Mini}}, - {{510, 0x3000}, {"Drobit", Game::TrapTeam, Element::Tech, Type::Mini}}, - {{514, 0x3000}, {"Gill Runt", Game::TrapTeam, Element::Water, Type::Mini}}, - {{519, 0x3000}, {"Trigger Snappy", Game::TrapTeam, Element::Tech, Type::Mini}}, - {{526, 0x3000}, {"Whisper Elf", Game::TrapTeam, Element::Life, Type::Mini}}, - {{540, 0x1000}, {"Barkley (Sidekick)", Game::Giants, Element::Life, Type::Mini}}, - {{540, 0x3000}, {"Barkley", Game::TrapTeam, Element::Life, Type::Mini}}, - {{540, 0x3402}, {"Barkley (Gnarly)", Game::TrapTeam, Element::Life, Type::Mini}}, - {{541, 0x1000}, {"Thumpling (Sidekick)", Game::Giants, Element::Water, Type::Mini}}, - {{541, 0x3000}, {"Thumpling", Game::TrapTeam, Element::Water, Type::Mini}}, - {{542, 0x1000}, {"Mini Jini (Sidekick)", Game::Giants, Element::Magic, Type::Mini}}, - {{542, 0x3000}, {"Mini Jini", Game::TrapTeam, Element::Magic, Type::Mini}}, - {{543, 0x1000}, {"Eye-Small (Sidekick)", Game::Giants, Element::Undead, Type::Mini}}, - {{543, 0x3000}, {"Eye-Small", Game::TrapTeam, Element::Undead, Type::Mini}}, - {{1000, 0x2000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{1001, 0x2000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{1001, 0x2403}, - {"Free Ranger (Legendary) (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{1002, 0x2000}, {"Rubble Rouser (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, - {{1003, 0x2000}, {"Doom Stone (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, - {{1004, 0x2000}, {"Blast Zone (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{1004, 0x2402}, {"Blast Zone (Dark) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{1005, 0x2000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{1005, 0x2402}, - {"Fire Kraken (Jade) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{1006, 0x2000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, - {{1007, 0x2000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, - {{1008, 0x2000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{1008, 0x2402}, - {"Hoot Loop (Enchanted) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{1009, 0x2000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{1010, 0x2000}, {"Magna Charge (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{1010, 0x2402}, - {"Magna Charge (Nitro) (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{1011, 0x2000}, {"Spy Rise (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{1012, 0x2000}, {"Night Shift (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{1012, 0x2403}, - {"Night Shift (Legendary) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{1013, 0x2000}, {"Rattle Shake (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{1013, 0x2402}, - {"Rattle Shake (Quickdraw) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{1014, 0x2000}, {"Freeze Blade (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{1014, 0x2402}, - {"Freeze Blade (Nitro) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{1015, 0x2000}, {"Wash Buckler (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{1015, 0x2402}, - {"Wash Buckler (Dark) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{2000, 0x2000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{2001, 0x2000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{2001, 0x2403}, - {"Free Ranger (Legendary) (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, - {{2002, 0x2000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, - {{2003, 0x2000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, - {{2004, 0x2000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{2004, 0x2402}, {"Blast Zone (Dark) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{2005, 0x2000}, {"Fire Kraken (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{2005, 0x2402}, {"Fire Kraken (Jade) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, - {{2006, 0x2000}, {"Stink Bomb (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, - {{2007, 0x2000}, {"Grilla Drilla (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, - {{2008, 0x2000}, {"Hoot Loop (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{2008, 0x2402}, - {"Hoot Loop (Enchanted) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{2009, 0x2000}, {"Trap Shadow (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, - {{2010, 0x2000}, {"Magna Charge (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{2010, 0x2402}, {"Magna Charge (Nitro) (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{2011, 0x2000}, {"Spy Rise (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, - {{2012, 0x2000}, {"Night Shift (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{2012, 0x2403}, - {"Night Shift (Legendary) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{2013, 0x2000}, {"Rattle Shake (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{2013, 0x2402}, - {"Rattle Shake (Quickdraw) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, - {{2014, 0x2000}, {"Freeze Blade (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{2014, 0x2402}, - {"Freeze Blade (Nitro) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{2015, 0x2000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{2015, 0x2402}, {"Wash Buckler (Dark) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, - {{3000, 0x2000}, {"Scratch", Game::SwapForce, Element::Air, Type::Skylander}}, - {{3001, 0x2000}, {"Pop Thorn", Game::SwapForce, Element::Air, Type::Skylander}}, - {{3002, 0x2000}, {"Slobber Tooth", Game::SwapForce, Element::Earth, Type::Skylander}}, - {{3002, 0x2402}, {"Slobber Tooth (Dark)", Game::SwapForce, Element::Earth, Type::Skylander}}, - {{3003, 0x2000}, {"Scorp", Game::SwapForce, Element::Earth, Type::Skylander}}, - {{3004, 0x2000}, {"Fryno", Game::SwapForce, Element::Fire, Type::Skylander}}, - {{3004, 0x3801}, {"Fryno (Hog Wild)", Game::TrapTeam, Element::Fire, Type::Skylander}}, - {{3005, 0x2000}, {"Smolderdash", Game::SwapForce, Element::Fire, Type::Skylander}}, - {{3005, 0x2206}, {"Smolderdash (Lightcore)", Game::SwapForce, Element::Fire, Type::Skylander}}, - {{3006, 0x2000}, {"Bumble Blast", Game::SwapForce, Element::Life, Type::Skylander}}, - {{3006, 0x2206}, {"Bumble Blast (Lightcore)", Game::SwapForce, Element::Life, Type::Skylander}}, - {{3006, 0x2402}, {"Bumble Blast (Jolly)", Game::SwapForce, Element::Life, Type::Skylander}}, - {{3007, 0x2000}, {"Zoo Lou", Game::SwapForce, Element::Life, Type::Skylander}}, - {{3007, 0x2403}, {"Zoo Lou (Legendary)", Game::SwapForce, Element::Life, Type::Skylander}}, - {{3008, 0x2000}, {"Dune Bug", Game::SwapForce, Element::Magic, Type::Skylander}}, - {{3009, 0x2000}, {"Star Strike", Game::SwapForce, Element::Magic, Type::Skylander}}, - {{3009, 0x2206}, {"Star Strike (Lightcore)", Game::SwapForce, Element::Magic, Type::Skylander}}, - {{3009, 0x2602}, - {"Star Strike (Lightcore Enchanted)", Game::SwapForce, Element::Magic, Type::Skylander}}, - {{3010, 0x2000}, {"Countdown", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{3010, 0x2206}, {"Countdown (Lightcore)", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{3010, 0x2402}, {"Countdown (Kickoff)", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{3011, 0x2000}, {"Wind Up", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{3011, 0x2404}, - {"Wind Up (Gear Head Vicarious Visions)", Game::SwapForce, Element::Tech, Type::Skylander}}, - {{3012, 0x2000}, {"Roller Brawl", Game::SwapForce, Element::Undead, Type::Skylander}}, - {{3013, 0x2000}, {"Grim Creeper", Game::SwapForce, Element::Undead, Type::Skylander}}, - {{3013, 0x2206}, - {"Grim Creeper (Lightcore)", Game::SwapForce, Element::Undead, Type::Skylander}}, - {{3013, 0x2603}, - {"Grim Creeper (Legendary) (Lightcore)", Game::SwapForce, Element::Undead, Type::Skylander}}, - {{3014, 0x2000}, {"Rip Tide", Game::SwapForce, Element::Water, Type::Skylander}}, - {{3015, 0x2000}, {"Punk Shock", Game::SwapForce, Element::Water, Type::Skylander}}, - {{3400, 0x4100}, {"Fiesta", Game::Superchargers, Element::Undead, Type::Skylander}}, - {{3400, 0x4515}, {"Fiesta (Frightful)", Game::Superchargers, Element::Undead, Type::Skylander}}, - {{3401, 0x4100}, {"High Volt", Game::Superchargers, Element::Tech, Type::Skylander}}, - {{3402, 0x4100}, {"Splat", Game::Superchargers, Element::Magic, Type::Skylander}}, - {{3402, 0x4502}, {"Splat (Power Blue)", Game::Superchargers, Element::Magic, Type::Skylander}}, - {{3406, 0x4100}, {"Stormblade", Game::Superchargers, Element::Air, Type::Skylander}}, - {{3406, 0x4502}, {"Stormblade (Dark)", Game::Superchargers, Element::Air, Type::Skylander}}, - {{3406, 0x4503}, {"Stormblade (Dark)", Game::Superchargers, Element::Air, Type::Skylander}}, - {{3411, 0x4100}, {"Smash Hit", Game::Superchargers, Element::Earth, Type::Skylander}}, - {{3411, 0x4502}, - {"Smash Hit (Steel Plated)", Game::Superchargers, Element::Earth, Type::Skylander}}, - {{3412, 0x4100}, {"Spitfire", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3412, 0x4502}, {"Spitfire (Dark)", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3412, 0x450F}, {"Spitfire (Instant)", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3413, 0x4100}, {"Jet-Vac (Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, - {{3413, 0x4503}, - {"Jet-Vac (Legendary Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, - {{3414, 0x4100}, - {"Trigger Happy (Double Dare)", Game::Superchargers, Element::Tech, Type::Skylander}}, - {{3414, 0x4502}, - {"Trigger Happy (Power Blue)", Game::Superchargers, Element::Tech, Type::Skylander}}, - {{3415, 0x4100}, - {"Stealth Elf (Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3415, 0x4502}, - {"Stealth Elf (Dark Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3415, 0x450F}, - {"Stealth Elf (Instant)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3416, 0x4100}, - {"Terrafin (Shark Shooter)", Game::Superchargers, Element::Earth, Type::Skylander}}, - {{3417, 0x4100}, - {"Roller Brawl (Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, - {{3417, 0x4503}, - {"Roller Brawl (Legendary Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, - {{3420, 0x4100}, - {"Pop Fizz (Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, - {{3420, 0x450E}, - {"Pop Fizz (Birthday Bash Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, - {{3421, 0x4100}, {"Eruptor (Lava Lance)", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3422, 0x4100}, - {"Gill Grunt (Deep Dive)", Game::Superchargers, Element::Water, Type::Skylander}}, - {{3423, 0x4100}, - {"Donkey Kong (Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3423, 0x4502}, - {"Donkey Kong (Dark Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3424, 0x4100}, {"Bowser (Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3424, 0x4502}, - {"Bowser (Dark Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, - {{3425, 0x4100}, {"Dive-Clops", Game::Superchargers, Element::Water, Type::Skylander}}, - {{3425, 0x450E}, - {"Dive-Clops (Missile-Tow)", Game::Superchargers, Element::Water, Type::Skylander}}, - {{3425, 0x450F}, - {"Dive-Clops (Instant)", Game::Superchargers, Element::Water, Type::Skylander}}, - {{3426, 0x4100}, {"Astroblast", Game::Superchargers, Element::Tech, Type::Skylander}}, - {{3426, 0x4503}, - {"Astroblast (Legendary)", Game::Superchargers, Element::Light, Type::Skylander}}, - {{3427, 0x4100}, {"Nightfall", Game::Superchargers, Element::Dark, Type::Skylander}}, - {{3428, 0x4100}, {"Thrillipede", Game::Superchargers, Element::Life, Type::Skylander}}, - {{3428, 0x450D}, - {"Thrillipede (Eggcited)", Game::Superchargers, Element::Life, Type::Skylander}}, - {{200, 0x2000}, {"Anvil Rain", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{201, 0x2000}, {"Hidden Treasure", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{202, 0x2000}, {"Healing Elixer", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{203, 0x2000}, {"Ghost Pirate Swords", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{204, 0x2000}, {"Time Twister Hourglass", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{205, 0x2000}, {"Sky-Iron Shield", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{206, 0x2000}, {"Winged Boots", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{207, 0x2000}, {"Sparx Dragonfly", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{115, 0x1011}, + {"Fright Rider (Glow in the Dark)", Game::Giants, Element::Undead, Type::Skylander}}, + {{115, 0x1015}, {"Fright Rider (Halloween)", Game::Giants, Element::Undead, Type::Skylander}}, + {{200, 0x0000}, {"Anvil Rain", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{201, 0x0000}, {"Hidden Treasure", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{201, 0x0002}, {"Hidden Treasure (Platinum)", Game::Giants, Element::Other, Type::Item}}, + {{202, 0x0000}, {"Healing Elixir", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{203, 0x0000}, {"Ghost Pirate Swords", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{204, 0x0000}, {"Time Twister Hourglass", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{205, 0x0000}, {"Sky-Iron Shield", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{206, 0x0000}, {"Winged Boots", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{207, 0x0000}, {"Sparx Dragonfly", Game::SpyrosAdv, Element::Other, Type::Item}}, {{208, 0x1206}, {"Dragonfire Cannon", Game::Giants, Element::Other, Type::Item}}, {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::Giants, Element::Other, Type::Item}}, {{209, 0x1206}, {"Scorpion Striker Catapult", Game::Giants, Element::Other, Type::Item}}, - {{230, 0x0000}, {"Hand Of Fate", Game::TrapTeam, Element::Other, Type::Item}}, - {{230, 0x3403}, {"Hand Of Fate (Legendary)", Game::TrapTeam, Element::Other, Type::Item}}, - {{231, 0x0000}, {"Piggy Bank", Game::TrapTeam, Element::Other, Type::Item}}, - {{232, 0x0000}, {"Rocket Ram", Game::TrapTeam, Element::Other, Type::Item}}, - {{233, 0x0000}, {"Tiki Speaky", Game::TrapTeam, Element::Other, Type::Item}}, - {{300, 0x0000}, {"Dragon's Peak", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{301, 0x2000}, {"Empire Of Ice", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{302, 0x2000}, {"Pirate Ship", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{303, 0x2000}, {"Darklight Crypt", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{304, 0x2000}, {"Volcanic Vault", Game::SpyrosAdv, Element::Other, Type::Item}}, - {{305, 0x3000}, {"Mirror Of Mystery", Game::TrapTeam, Element::Other, Type::Item}}, - {{306, 0x3000}, {"Nightmare Express", Game::TrapTeam, Element::Other, Type::Item}}, - {{307, 0x3206}, {"Sunscraper Spire", Game::TrapTeam, Element::Other, Type::Item}}, - {{308, 0x3206}, {"Midnight Museum", Game::TrapTeam, Element::Other, Type::Item}}, - {{3200, 0x2000}, {"Battle Hammer", Game::SwapForce, Element::Other, Type::Item}}, - {{3201, 0x2000}, {"Sky Diamond", Game::SwapForce, Element::Other, Type::Item}}, - {{3202, 0x2000}, {"Platinum Sheep", Game::SwapForce, Element::Other, Type::Item}}, - {{3203, 0x2000}, {"Groove Machine", Game::SwapForce, Element::Other, Type::Item}}, - {{3204, 0x2000}, {"Ufo Hat", Game::SwapForce, Element::Other, Type::Item}}, - {{3300, 0x2000}, {"Sheep Wreck Island", Game::SwapForce, Element::Other, Type::Item}}, - {{3301, 0x2000}, {"Tower Of Time", Game::SwapForce, Element::Other, Type::Item}}, - {{3302, 0x2206}, {"Fiery Forge", Game::SwapForce, Element::Other, Type::Item}}, - {{3303, 0x2206}, {"Arkeyan Crossbow", Game::SwapForce, Element::Other, Type::Item}}, - {{210, 0x3001}, {"Magic Log Holder", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x3002}, {"Magic Log Holder", Game::TrapTeam, Element::Magic, Type::Trap}}, {{210, 0x3008}, {"Magic Skull", Game::TrapTeam, Element::Magic, Type::Trap}}, {{210, 0x300B}, {"Magic Axe", Game::TrapTeam, Element::Magic, Type::Trap}}, {{210, 0x300E}, {"Magic Hourglass", Game::TrapTeam, Element::Magic, Type::Trap}}, @@ -474,9 +244,8 @@ const std::map, SkyData> list_skylanders = {{214, 0x300C}, {"Tech Hand", Game::TrapTeam, Element::Tech, Type::Trap}}, {{214, 0x3016}, {"Tech Flying Helmet", Game::TrapTeam, Element::Tech, Type::Trap}}, {{214, 0x301A}, {"Tech Handstand", Game::TrapTeam, Element::Tech, Type::Trap}}, - {{215, 0x3001}, {"Fire Flower", Game::TrapTeam, Element::Fire, Type::Trap}}, {{215, 0x3005}, {"Fire Torch", Game::TrapTeam, Element::Fire, Type::Trap}}, - {{215, 0x3009}, {"Fire Flower (NEW)", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3009}, {"Fire Scepter", Game::TrapTeam, Element::Fire, Type::Trap}}, {{215, 0x3011}, {"Fire Screamer", Game::TrapTeam, Element::Fire, Type::Trap}}, {{215, 0x3012}, {"Fire Totem", Game::TrapTeam, Element::Fire, Type::Trap}}, {{215, 0x3017}, {"Fire Captain's Hat", Game::TrapTeam, Element::Fire, Type::Trap}}, @@ -488,7 +257,6 @@ const std::map, SkyData> list_skylanders = {{216, 0x3012}, {"Earth Totem", Game::TrapTeam, Element::Earth, Type::Trap}}, {{216, 0x301A}, {"Earth Handstand", Game::TrapTeam, Element::Earth, Type::Trap}}, {{217, 0x3001}, {"Life Toucan", Game::TrapTeam, Element::Life, Type::Trap}}, - {{217, 0x3003}, {"Life Toucan (NEW)", Game::TrapTeam, Element::Life, Type::Trap}}, {{217, 0x3005}, {"Life Torch", Game::TrapTeam, Element::Life, Type::Trap}}, {{217, 0x300A}, {"Life Hammer", Game::TrapTeam, Element::Life, Type::Trap}}, {{217, 0x3010}, {"Life Snake", Game::TrapTeam, Element::Life, Type::Trap}}, @@ -502,20 +270,237 @@ const std::map, SkyData> list_skylanders = {{219, 0x301B}, {"Light Yawn", Game::TrapTeam, Element::Light, Type::Trap}}, {{220, 0x301E}, {"Kaos", Game::TrapTeam, Element::Other, Type::Trap}}, {{220, 0x351F}, {"Kaos (Ultimate)", Game::TrapTeam, Element::Other, Type::Trap}}, - {{3500, 0x4000}, {"Sky Trophy", Game::Superchargers, Element::Air, Type::Trophy}}, - {{3500, 0x4403}, {"Sky Trophy (Legendary)", Game::Superchargers, Element::Air, Type::Trophy}}, - {{3501, 0x4000}, {"Land Trophy", Game::Superchargers, Element::Earth, Type::Trophy}}, - {{3502, 0x4000}, {"Sea Trophy", Game::Superchargers, Element::Water, Type::Trophy}}, - {{3503, 0x4000}, {"Kaos Trophy", Game::Superchargers, Element::Other, Type::Trophy}}, + {{230, 0x3000}, {"Hand of Fate", Game::TrapTeam, Element::Other, Type::Item}}, + {{230, 0x3403}, {"Hand of Fate (Legendary)", Game::TrapTeam, Element::Other, Type::Item}}, + {{231, 0x3000}, {"Piggy Bank", Game::TrapTeam, Element::Other, Type::Item}}, + {{232, 0x3000}, {"Rocket Ram", Game::TrapTeam, Element::Other, Type::Item}}, + {{233, 0x3000}, {"Tiki Speaky", Game::TrapTeam, Element::Other, Type::Item}}, + {{300, 0x0000}, {"Dragon's Peak", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{301, 0x0000}, {"Empire of Ice", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{302, 0x0000}, {"Pirate Seas", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{303, 0x0000}, {"Darklight Crypt", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{304, 0x0000}, {"Volcanic Vault", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{305, 0x3000}, {"Mirror of Mystery", Game::TrapTeam, Element::Other, Type::Item}}, + {{306, 0x3000}, {"Nightmare Express", Game::TrapTeam, Element::Other, Type::Item}}, + {{307, 0x3206}, {"Sunscraper Spire", Game::TrapTeam, Element::Other, Type::Item}}, + {{308, 0x3206}, {"Midnight Museum", Game::TrapTeam, Element::Other, Type::Item}}, + {{404, 0x0000}, {"Bash (Legendary)", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{416, 0x0000}, {"Spyro (Legendary)", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{419, 0x0000}, {"Trigger Happy (Legendary)", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{430, 0x0000}, {"Chop Chop (Legendary)", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{450, 0x3000}, {"Gusto", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{451, 0x3000}, {"Thunderbolt", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{451, 0x301D}, {"Thunderbolt (Clear)", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{452, 0x3000}, {"Fling Kong", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{453, 0x3000}, {"Blades", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{453, 0x3403}, {"Blades (Legendary)", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{454, 0x3000}, {"Wallop", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, + {{455, 0x3000}, {"Head Rush", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, + {{455, 0x3402}, {"Head Rush (Nitro)", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{456, 0x3000}, {"Fist Bump", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{457, 0x3000}, {"Rocky Roll", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{458, 0x3000}, {"Wildfire", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{458, 0x3402}, {"Wildfire (Dark)", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{459, 0x3000}, {"Ka-Boom", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{460, 0x3000}, {"Trail Blazer", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{461, 0x3000}, {"Torch", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{462, 0x3000}, {"Snap Shot", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{462, 0x3402}, {"Snap Shot (Dark)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{462, 0x450F}, {"Snap Shot (Virtual)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{463, 0x3000}, {"Lob-Star", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{463, 0x3402}, {"Lob-Star (Winterfest)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{464, 0x3000}, {"Flip Wreck", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{465, 0x3000}, {"Echo", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{466, 0x3000}, {"Blastermind", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, + {{467, 0x3000}, {"Enigma", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, + {{468, 0x3000}, {"Deja Vu", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{468, 0x3403}, {"Deja Vu (Legendary)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{469, 0x3000}, {"Cobra Cadabra", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{469, 0x3402}, {"Cobra Cadabra (King)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{470, 0x3000}, {"Jawbreaker", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{470, 0x3403}, {"Jawbreaker (Legendary)", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{471, 0x3000}, {"Gearshift", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{472, 0x3000}, {"Chopper", Game::TrapTeam, Element::Tech, Type::Skylander}}, + {{473, 0x3000}, {"Tread Head", Game::TrapTeam, Element::Tech, Type::Skylander}}, + {{474, 0x3000}, {"Bushwhack", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{474, 0x3403}, {"Bushwhack (Legendary)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{475, 0x3000}, {"Tuff Luck", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{475, 0x301D}, {"Tuff Luck (Clear)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{476, 0x3000}, {"Food Fight", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{476, 0x3402}, {"Food Fight (Dark)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{476, 0x450F}, {"Food Fight (Virtual)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{477, 0x3000}, {"High Five", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{478, 0x3000}, {"Krypt King", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{478, 0x3402}, {"Krypt King (Nitro)", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{479, 0x3000}, {"Short Cut", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{479, 0x301D}, {"Short Cut (Clear)", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{480, 0x3000}, {"Bat Spin", Game::TrapTeam, Element::Undead, Type::Skylander}}, + {{481, 0x3000}, {"Funny Bone", Game::TrapTeam, Element::Undead, Type::Skylander}}, + {{482, 0x3000}, {"Knight Light", Game::TrapTeam, Element::Light, Type::TrapMaster}}, + {{483, 0x3000}, {"Spotlight", Game::TrapTeam, Element::Light, Type::Skylander}}, + {{484, 0x3000}, {"Knight Mare", Game::TrapTeam, Element::Dark, Type::TrapMaster}}, + {{485, 0x3000}, {"Blackout", Game::TrapTeam, Element::Dark, Type::Skylander}}, + {{502, 0x3000}, {"Bop", Game::TrapTeam, Element::Earth, Type::Mini}}, + {{503, 0x3000}, {"Spry", Game::TrapTeam, Element::Magic, Type::Mini}}, + {{504, 0x3000}, {"Hijinx", Game::TrapTeam, Element::Undead, Type::Mini}}, + {{505, 0x0000}, {"Terrabite (Sidekick)", Game::SpyrosAdv, Element::Earth, Type::Mini}}, + {{505, 0x3000}, {"Terrabite", Game::TrapTeam, Element::Earth, Type::Mini}}, + {{506, 0x3000}, {"Breeze", Game::TrapTeam, Element::Air, Type::Mini}}, + {{507, 0x3000}, {"Weeruptor", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{507, 0x3402}, {"Weeruptor (Eggsellent)", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{508, 0x3000}, {"Pet Vac", Game::TrapTeam, Element::Air, Type::Mini}}, + {{508, 0x3402}, {"Pet Vac (Power Punch)", Game::TrapTeam, Element::Air, Type::Mini}}, + {{509, 0x3000}, {"Small Fry", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{510, 0x3000}, {"Drobit", Game::TrapTeam, Element::Tech, Type::Mini}}, + {{514, 0x0000}, {"Gill Runt (Sidekick)", Game::SpyrosAdv, Element::Water, Type::Mini}}, + {{514, 0x3000}, {"Gill Runt", Game::TrapTeam, Element::Water, Type::Mini}}, + {{519, 0x0000}, {"Trigger Snappy (Sidekick)", Game::SpyrosAdv, Element::Tech, Type::Mini}}, + {{519, 0x3000}, {"Trigger Snappy", Game::TrapTeam, Element::Tech, Type::Mini}}, + {{526, 0x0000}, {"Whisper Elf (Sidekick)", Game::SpyrosAdv, Element::Life, Type::Mini}}, + {{526, 0x3000}, {"Whisper Elf", Game::TrapTeam, Element::Life, Type::Mini}}, + {{540, 0x1000}, {"Barkley (Sidekick)", Game::Giants, Element::Life, Type::Mini}}, + {{540, 0x3000}, {"Barkley", Game::TrapTeam, Element::Life, Type::Mini}}, + {{540, 0x3402}, {"Barkley (Gnarly)", Game::TrapTeam, Element::Life, Type::Mini}}, + {{541, 0x1000}, {"Thumpling (Sidekick)", Game::Giants, Element::Water, Type::Mini}}, + {{541, 0x3000}, {"Thumpling", Game::TrapTeam, Element::Water, Type::Mini}}, + {{542, 0x1000}, {"Mini Jini (Sidekick)", Game::Giants, Element::Magic, Type::Mini}}, + {{542, 0x3000}, {"Mini Jini", Game::TrapTeam, Element::Magic, Type::Mini}}, + {{543, 0x1000}, {"Eye-Small (Sidekick)", Game::Giants, Element::Undead, Type::Mini}}, + {{543, 0x3000}, {"Eye-Small", Game::TrapTeam, Element::Undead, Type::Mini}}, + {{1000, 0x2000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1001, 0x2000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1001, 0x2403}, + {"Free Ranger (Legendary) (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1002, 0x2000}, {"Rubble Rouser (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{1003, 0x2000}, {"Doom Stone (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{1003, 0x2016}, + {"Doom Stone (Gold & Bronze) (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{1004, 0x2000}, {"Blast Zone (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1004, 0x2402}, {"Blast Zone (Dark) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1005, 0x2000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1005, 0x2004}, + {"Fire Kraken (Gold) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1005, 0x2402}, + {"Fire Kraken (Jade) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1006, 0x2000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{1006, 0x2016}, + {"Stink Bomb (Silver & Gold) (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{1007, 0x2000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{1008, 0x2000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1008, 0x2402}, + {"Hoot Loop (Enchanted) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1009, 0x2000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1009, 0x2016}, + {"Trap Shadow (Bronze & Silver) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1010, 0x2000}, {"Magna Charge (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1010, 0x2402}, + {"Magna Charge (Nitro) (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1011, 0x2000}, {"Spy Rise (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1012, 0x2000}, {"Night Shift (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1012, 0x2403}, + {"Night Shift (Legendary) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1013, 0x2000}, {"Rattle Shake (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1013, 0x2402}, + {"Rattle Shake (Quickdraw) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1014, 0x2000}, {"Freeze Blade (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1014, 0x2402}, + {"Freeze Blade (Nitro) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1015, 0x2000}, {"Wash Buckler (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1015, 0x2018}, + {"Wash Buckler (Gold) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1015, 0x2402}, + {"Wash Buckler (Dark) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2000, 0x2000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2001, 0x2000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2001, 0x2403}, + {"Free Ranger (Legendary) (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2002, 0x2000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{2003, 0x2000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{2003, 0x2016}, + {"Doom Stone (Gold & Bronze) (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{2004, 0x2000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2004, 0x2402}, {"Blast Zone (Dark) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2005, 0x2000}, {"Fire Kraken (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2005, 0x2004}, {"Fire Kraken (Gold) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2005, 0x2402}, {"Fire Kraken (Jade) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2006, 0x2000}, {"Stink Bomb (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{2006, 0x2016}, + {"Stink Bomb (Silver & Gold) (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{2007, 0x2000}, {"Grilla Drilla (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{2008, 0x2000}, {"Hoot Loop (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2008, 0x2402}, + {"Hoot Loop (Enchanted) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2009, 0x2000}, {"Trap Shadow (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2009, 0x2016}, + {"Trap Shadow (Bronze & Silver) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2010, 0x2000}, {"Magna Charge (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2010, 0x2402}, {"Magna Charge (Nitro) (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2011, 0x2000}, {"Spy Rise (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2012, 0x2000}, {"Night Shift (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2012, 0x2403}, + {"Night Shift (Legendary) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2013, 0x2000}, {"Rattle Shake (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2013, 0x2402}, + {"Rattle Shake (Quickdraw) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2014, 0x2000}, {"Freeze Blade (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2014, 0x2402}, + {"Freeze Blade (Nitro) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2015, 0x2000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2015, 0x2018}, {"Wash Buckler (Gold) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2015, 0x2402}, {"Wash Buckler (Dark) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{3000, 0x2000}, {"Scratch", Game::SwapForce, Element::Air, Type::Skylander}}, + {{3001, 0x2000}, {"Pop Thorn", Game::SwapForce, Element::Air, Type::Skylander}}, + {{3002, 0x2000}, {"Slobber Tooth", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3002, 0x2402}, {"Slobber Tooth (Dark)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3003, 0x2000}, {"Scorp", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3003, 0x2016}, {"Scorp (Green)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3004, 0x2000}, {"Fryno", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3004, 0x3801}, {"Fryno (Hog Wild)", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{3005, 0x2000}, {"Smolderdash", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3005, 0x2206}, {"Smolderdash (LightCore)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3005, 0x2219}, {"Snowderdash (LightCore)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3006, 0x2000}, {"Bumble Blast", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3006, 0x2206}, {"Bumble Blast (LightCore)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3006, 0x2402}, {"Bumble Blast (Jolly)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3007, 0x2000}, {"Zoo Lou", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3007, 0x2403}, {"Zoo Lou (Legendary)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3008, 0x2000}, {"Dune Bug", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3008, 0x2004}, {"Dune Bug (Metallic Red)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2000}, {"Star Strike", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2206}, {"Star Strike (LightCore)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2602}, + {"Star Strike (Enchanted LightCore)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3010, 0x2000}, {"Countdown", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3010, 0x2206}, {"Countdown (LightCore)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3010, 0x2402}, {"Countdown (Kickoff)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3011, 0x2000}, {"Wind Up", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3011, 0x2404}, + {"Wind Up (Gear Head Vicarious Visions)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3012, 0x2000}, {"Roller Brawl", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2000}, {"Grim Creeper", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2206}, + {"Grim Creeper (LightCore)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2603}, + {"Grim Creeper (Legendary LightCore)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3014, 0x2000}, {"Rip Tide", Game::SwapForce, Element::Water, Type::Skylander}}, + {{3014, 0x2016}, {"Rip Tide (Green)", Game::SwapForce, Element::Water, Type::Skylander}}, + {{3015, 0x2000}, {"Punk Shock", Game::SwapForce, Element::Water, Type::Skylander}}, + {{3200, 0x2000}, {"Battle Hammer", Game::SwapForce, Element::Other, Type::Item}}, + {{3201, 0x2000}, {"Sky Diamond", Game::SwapForce, Element::Other, Type::Item}}, + {{3202, 0x2000}, {"Platinum Sheep", Game::SwapForce, Element::Other, Type::Item}}, + {{3203, 0x2000}, {"Groove Machine", Game::SwapForce, Element::Other, Type::Item}}, + {{3204, 0x2000}, {"UFO Hat", Game::SwapForce, Element::Other, Type::Item}}, {{3220, 0x4000}, {"Jet Stream", Game::Superchargers, Element::Air, Type::Vehicle}}, {{3221, 0x4000}, {"Tomb Buggy", Game::Superchargers, Element::Undead, Type::Vehicle}}, + {{3221, 0x401E}, {"Tomb Buggy (Bronze)", Game::Superchargers, Element::Undead, Type::Vehicle}}, {{3222, 0x4000}, {"Reef Ripper", Game::Superchargers, Element::Water, Type::Vehicle}}, {{3223, 0x4000}, {"Burn-Cycle", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3223, 0x401E}, {"Burn-Cycle (Patina)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3224, 0x4000}, {"Hot Streak", Game::Superchargers, Element::Fire, Type::Vehicle}}, - {{3224, 0x4004}, {"Hot Streak (Mobile)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x4004}, + {"Hot Streak (Event Exclusive)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3224, 0x4402}, {"Hot Streak (Dark)", Game::Superchargers, Element::Fire, Type::Vehicle}}, - {{3224, 0x441E}, - {"Hot Streak (Golden) (E3)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x441E}, {"Hot Streak (Golden)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3224, 0x450F}, {"Hot Streak (Instant)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3225, 0x4000}, {"Shark Tank", Game::Superchargers, Element::Earth, Type::Vehicle}}, {{3226, 0x4000}, {"Thump Truck", Game::Superchargers, Element::Earth, Type::Vehicle}}, @@ -536,6 +521,8 @@ const std::map, SkyData> list_skylanders = {{3234, 0x4402}, {"Gold Rusher (Power Blue)", Game::Superchargers, Element::Tech, Type::Vehicle}}, {{3235, 0x4000}, {"Shield Striker", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3235, 0x401E}, + {"Shield Striker (Patina)", Game::Superchargers, Element::Tech, Type::Vehicle}}, {{3236, 0x4000}, {"Sun Runner", Game::Superchargers, Element::Light, Type::Vehicle}}, {{3236, 0x4403}, {"Sun Runner (Legendary)", Game::Superchargers, Element::Light, Type::Vehicle}}, @@ -549,6 +536,79 @@ const std::map, SkyData> list_skylanders = {{3240, 0x4000}, {"Barrel Blaster", Game::Superchargers, Element::Tech, Type::Vehicle}}, {{3240, 0x4402}, {"Barrel Blaster (Dark)", Game::Superchargers, Element::Tech, Type::Vehicle}}, {{3241, 0x4000}, {"Buzz Wing", Game::Superchargers, Element::Life, Type::Vehicle}}, + {{3300, 0x2000}, {"Sheep Wreck Island", Game::SwapForce, Element::Other, Type::Item}}, + {{3301, 0x2000}, {"Tower of Time", Game::SwapForce, Element::Other, Type::Item}}, + {{3302, 0x2206}, {"Fiery Forge", Game::SwapForce, Element::Other, Type::Item}}, + {{3303, 0x2206}, {"Arkeyan Crossbow", Game::SwapForce, Element::Other, Type::Item}}, + {{3400, 0x4100}, {"Fiesta", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3400, 0x4515}, {"Fiesta (Frightful)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3401, 0x4100}, {"High Volt", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3401, 0x411E}, {"High Volt (Patina)", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3402, 0x4100}, {"Splat", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3402, 0x4502}, {"Splat (Power Blue)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3406, 0x4100}, {"Stormblade", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3406, 0x410E}, + {"Stormblade (Snow-Brite)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3411, 0x4100}, {"Smash Hit", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3411, 0x4502}, + {"Smash Hit (Steel Plated)", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3412, 0x4100}, {"Spitfire", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3412, 0x4502}, {"Spitfire (Dark)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3412, 0x450F}, {"Spitfire (Instant)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3413, 0x4100}, {"Jet-Vac (Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3413, 0x4503}, + {"Jet-Vac (Legendary Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3414, 0x4100}, + {"Trigger Happy (Double Dare)", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3414, 0x4502}, + {"Trigger Happy (Power Blue Double Dare)", Game::Superchargers, Element::Tech, + Type::Skylander}}, + {{3415, 0x4100}, + {"Stealth Elf (Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3415, 0x4502}, + {"Stealth Elf (Dark Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3415, 0x450F}, + {"Stealth Elf (Instant Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3416, 0x4100}, + {"Terrafin (Shark Shooter)", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3417, 0x4100}, + {"Roller Brawl (Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3417, 0x411E}, + {"Roller Brawl (Bronze Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3417, 0x4503}, + {"Roller Brawl (Legendary Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3420, 0x4100}, + {"Pop Fizz (Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3420, 0x450E}, + {"Pop Fizz (Birthday Bash Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3421, 0x4100}, {"Eruptor (Lava Lance)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3421, 0x411E}, + {"Eruptor (Patina Lava Lance)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3422, 0x4100}, + {"Gill Grunt (Deep Dive)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3423, 0x4100}, + {"Donkey Kong (Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3423, 0x4502}, + {"Donkey Kong (Dark Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3424, 0x4100}, {"Bowser (Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3424, 0x4502}, + {"Bowser (Dark Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3425, 0x4100}, {"Dive-Clops", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3425, 0x450E}, + {"Dive-Clops (Missile-Tow)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3425, 0x450F}, + {"Dive-Clops (Instant)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3426, 0x4100}, {"Astroblast", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3426, 0x4503}, + {"Astroblast (Legendary)", Game::Superchargers, Element::Light, Type::Skylander}}, + {{3427, 0x4100}, {"Nightfall", Game::Superchargers, Element::Dark, Type::Skylander}}, + {{3428, 0x4100}, {"Thrillipede", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3428, 0x450D}, + {"Thrillipede (Eggcited)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3500, 0x4000}, {"Sky Trophy", Game::Superchargers, Element::Air, Type::Trophy}}, + {{3501, 0x4000}, {"Land Trophy", Game::Superchargers, Element::Earth, Type::Trophy}}, + {{3502, 0x4000}, {"Sea Trophy", Game::Superchargers, Element::Water, Type::Trophy}}, + {{3503, 0x4000}, {"Kaos Trophy", Game::Superchargers, Element::Other, Type::Trophy}}, }; SkylanderUSB::SkylanderUSB(EmulationKernel& ios, const std::string& device_name) : m_ios(ios)