diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp index 8d1fabeff2..1163e9c83c 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp @@ -39,15 +39,15 @@ const std::map, SkyData> list_skylanders = {{6, 0x0000}, {"Dino Rang", Game::SpyrosAdv, Element::Earth}}, {{6, 0x4810}, {"Eon's Elite Dino Rang", Game::Superchargers, Element::Earth}}, {{7, 0x0000}, {"Prism Break", Game::SpyrosAdv, Element::Earth}}, + {{7, 0x1206}, {"LightCore Prism Break", Game::Giants, Element::Earth}}, {{7, 0x1801}, {"Series 2 Prism Break", Game::Giants, Element::Earth}}, {{7, 0x2805}, {"Hyper Beam Prism Break", Game::SwapForce, Element::Earth}}, - {{7, 0x1206}, {"LightCore Prism Break", Game::Giants, Element::Earth}}, {{8, 0x0000}, {"Sunburn", Game::SpyrosAdv, Element::Fire}}, {{9, 0x0000}, {"Eruptor", Game::SpyrosAdv, Element::Fire}}, + {{9, 0x1206}, {"LightCore Eruptor", Game::Giants, Element::Fire}}, {{9, 0x1801}, {"Series 2 Eruptor", Game::Giants, Element::Fire}}, {{9, 0x2C02}, {"Volcanic Eruptor", Game::SwapForce, Element::Fire}}, {{9, 0x2805}, {"Lava Barf Eruptor", Game::SwapForce, Element::Fire}}, - {{9, 0x1206}, {"LightCore Eruptor", Game::Giants, Element::Fire}}, {{9, 0x3810}, {"Eon's Elite Eruptor", Game::TrapTeam, Element::Fire}}, {{10, 0x0000}, {"Ignitor", Game::SpyrosAdv, Element::Fire}}, {{10, 0x1801}, {"Series 2 Ignitor", Game::Giants, Element::Fire}}, @@ -69,8 +69,8 @@ const std::map, SkyData> list_skylanders = {{15, 0x4810}, {"Eon's Elite Slam Bam", Game::Superchargers, Element::Water}}, {{16, 0x0000}, {"Spyro", Game::SpyrosAdv, Element::Magic}}, {{16, 0x1801}, {"Series 2 Spyro", Game::Giants, Element::Magic}}, - {{16, 0x2C02}, {"Dark Mega Ram Spyro", Game::SwapForce, Element::Magic}}, {{16, 0x2805}, {"Mega Ram Spyro", Game::SwapForce, Element::Magic}}, + {{16, 0x2C02}, {"Dark Mega Ram Spyro", Game::SwapForce, Element::Magic}}, {{16, 0x3810}, {"Eon's Elite Spyro", Game::TrapTeam, Element::Magic}}, {{17, 0x0000}, {"Voodood", Game::SpyrosAdv, Element::Magic}}, {{17, 0x4810}, {"Eon's Elite Voodood", Game::Superchargers, Element::Magic}}, @@ -79,12 +79,12 @@ const std::map, SkyData> list_skylanders = {{18, 0x1C02}, {"Royal Double Trouble", Game::Giants, Element::Magic}}, {{19, 0x0000}, {"Trigger Happy", Game::SpyrosAdv, Element::Tech}}, {{19, 0x1801}, {"Series 2 Trigger Happy", Game::Giants, Element::Tech}}, - {{19, 0x2C02}, {"Springtime Trigger Happy", Game::SwapForce, Element::Tech}}, {{19, 0x2805}, {"Big Bang Trigger Happy", Game::SwapForce, Element::Tech}}, + {{19, 0x2C02}, {"Springtime Trigger Happy", Game::SwapForce, Element::Tech}}, {{19, 0x3810}, {"Eon's Elite Trigger Happy", Game::TrapTeam, Element::Tech}}, {{20, 0x0000}, {"Drobot", Game::SpyrosAdv, Element::Tech}}, - {{20, 0x1801}, {"Series 2 Drobot", Game::Giants, Element::Tech}}, {{20, 0x1206}, {"LightCore Drobot", Game::Giants, Element::Tech}}, + {{20, 0x1801}, {"Series 2 Drobot", Game::Giants, Element::Tech}}, {{21, 0x0000}, {"Drill Seargeant", Game::SpyrosAdv, Element::Tech}}, {{21, 0x1801}, {"Series 2 Drill Seargeant", Game::Giants, Element::Tech}}, {{22, 0x0000}, {"Boomer", Game::SpyrosAdv, Element::Tech}}, @@ -98,16 +98,16 @@ const std::map, SkyData> list_skylanders = {{25, 0x4810}, {"Eon's Elite Zook", Game::Superchargers, Element::Life}}, {{26, 0x0000}, {"Stealth Elf", Game::SpyrosAdv, Element::Life}}, {{26, 0x1801}, {"Series 2 Stealth Elf", Game::Giants, Element::Life}}, - {{26, 0x2C02}, {"Dark Stealth Elf", Game::SwapForce, Element::Life}}, {{26, 0x1C03}, {"Legendary Stealth Elf", Game::Giants, Element::Life}}, + {{26, 0x2C02}, {"Dark Stealth Elf", Game::SwapForce, Element::Life}}, {{26, 0x2805}, {"Ninja Stealth Elf", Game::SwapForce, Element::Life}}, {{26, 0x3810}, {"Eon's Elite Stealth Elf", Game::TrapTeam, Element::Life}}, {{27, 0x0000}, {"Stump Smash", Game::SpyrosAdv, Element::Life}}, {{27, 0x1801}, {"Series 2 Stump Smash", Game::Giants, Element::Life}}, {{28, 0x0000}, {"Dark Spyro", Game::SpyrosAdv, Element::Magic}}, {{29, 0x0000}, {"Hex", Game::SpyrosAdv, Element::Undead}}, - {{29, 0x1801}, {"Series 2 Hex", Game::Giants, Element::Undead}}, {{29, 0x1206}, {"LightCore Hex", Game::Giants, Element::Undead}}, + {{29, 0x1801}, {"Series 2 Hex", Game::Giants, Element::Undead}}, {{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}}, @@ -118,10 +118,10 @@ const std::map, SkyData> list_skylanders = {{32, 0x1801}, {"Series 2 Cynder", Game::Giants, Element::Undead}}, {{32, 0x2805}, {"Phantom Cynder", Game::SwapForce, Element::Undead}}, {{100, 0x0000}, {"Jet Vac", Game::Giants, Element::Air}}, + {{100, 0x1206}, {"LightCore Jet Vac", Game::Giants, Element::Air}}, {{100, 0x1403}, {"Legendary Jet Vac", Game::Giants, Element::Air}}, {{100, 0x2805}, {"Turbo Jet Vac", Game::SwapForce, Element::Air}}, {{100, 0x3805}, {"Full Blast Jet Vac", Game::TrapTeam, Element::Air}}, - {{100, 0x1206}, {"LightCore Jet Vac", Game::Giants, Element::Air}}, {{101, 0x0000}, {"Swarm", Game::Giants, Element::Air}}, {{102, 0x0000}, {"Crusher", Game::Giants, Element::Earth}}, {{102, 0x1602}, {"Granite Crusher", Game::Giants, Element::Earth}}, @@ -133,16 +133,16 @@ const std::map, SkyData> list_skylanders = {{105, 0x1402}, {"Molten Hot Dog", Game::Giants, Element::Fire}}, {{105, 0x2805}, {"Fire Bone Hot Dog", Game::SwapForce, Element::Fire}}, {{106, 0x0000}, {"Chill", Game::Giants, Element::Water}}, - {{106, 0x1603}, {"Legendary Chill", Game::Giants, Element::Water}}, - {{106, 0x2805}, {"Blizzard Chill", Game::SwapForce, Element::Water}}, {{106, 0x1206}, {"LightCore Chill", Game::Giants, Element::Water}}, + {{106, 0x1603}, {"Legendary LightCore Chill", Game::Giants, Element::Water}}, + {{106, 0x2805}, {"Blizzard Chill", Game::SwapForce, Element::Water}}, {{107, 0x0000}, {"Thumpback", Game::Giants, Element::Water}}, {{108, 0x0000}, {"Pop Fizz", Game::Giants, Element::Magic}}, + {{108, 0x1206}, {"LightCore Pop Fizz", Game::Giants, Element::Magic}}, {{108, 0x1402}, {"Punch Pop Fizz", Game::Giants, Element::Magic}}, - {{108, 0x3C02}, {"Love Potion Pop Fizz", Game::TrapTeam, Element::Magic}}, {{108, 0x2805}, {"Super Gulp Pop Fizz", Game::SwapForce, Element::Magic}}, {{108, 0x3805}, {"Fizzy Frenzy Pop Fizz", Game::TrapTeam, Element::Magic}}, - {{108, 0x1206}, {"LightCore Pop Fizz", Game::Giants, Element::Magic}}, + {{108, 0x3C02}, {"Love Potion Pop Fizz", Game::TrapTeam, Element::Magic}}, {{109, 0x0000}, {"Ninjini", Game::Giants, Element::Magic}}, {{109, 0x1602}, {"Scarlet Ninjini", Game::Giants, Element::Magic}}, {{110, 0x0000}, {"Bouncer", Game::Giants, Element::Tech}}, @@ -152,8 +152,8 @@ const std::map, SkyData> list_skylanders = {{112, 0x0000}, {"Tree Rex", Game::Giants, Element::Life}}, {{112, 0x1602}, {"Gnarly Tree Rex", Game::Giants, Element::Life}}, {{113, 0x0000}, {"Shroomboom", Game::Giants, Element::Life}}, - {{113, 0x3805}, {"Sure Shot Shroomboom", Game::TrapTeam, Element::Life}}, {{113, 0x1206}, {"LightCore Shroomboom", Game::Giants, Element::Life}}, + {{113, 0x3805}, {"Sure Shot Shroomboom", Game::TrapTeam, Element::Life}}, {{114, 0x0000}, {"Eye Brawl", Game::Giants, Element::Undead}}, {{115, 0x0000}, {"Fright Rider", Game::Giants, Element::Undead}}, {{200, 0x0000}, {"Anvil Rain", Game::SpyrosAdv}}, @@ -167,7 +167,7 @@ const std::map, SkyData> list_skylanders = {{207, 0x0000}, {"Sparx the Dragonfly", Game::SpyrosAdv}}, {{208, 0x0000}, {"Dragonfire Cannon", Game::Giants}}, {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::Giants}}, - {{209, 0x0000}, {"Scorpion Striker", Game::Giants}}, + {{209, 0x0000}, {"Scorpion Striker Catapult", Game::Giants}}, {{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}}, @@ -292,25 +292,33 @@ const std::map, SkyData> list_skylanders = {{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}}, - {{508, 0x0000}, {"Pet Vac", Game::TrapTeam, Element::Air}}, - {{508, 0x3402}, {"Power Punch Pet Vac", Game::TrapTeam, Element::Air}}, - {{507, 0x0000}, {"Weeruptor", Game::TrapTeam, Element::Fire}}, - {{507, 0x3402}, {"Eggcellent Weeruptor", Game::TrapTeam, Element::Fire}}, - {{509, 0x0000}, {"Small Fry", Game::TrapTeam, Element::Fire}}, - {{510, 0x0000}, {"Drobit", Game::TrapTeam, Element::Fire}}, - {{519, 0x0000}, {"Trigger Snappy", Game::SpyrosAdv, Element::Tech}}, - {{526, 0x0000}, {"Whisper Elf", Game::SpyrosAdv, Element::Life}}, - {{540, 0x0000}, {"Barkley", Game::Giants, Element::Life}}, - {{540, 0x3402}, {"Gnarly Barkley", Game::Giants, Element::Life}}, - {{541, 0x0000}, {"Thumpling", Game::Giants, Element::Water}}, - {{514, 0x0000}, {"Gill Runt", Game::SpyrosAdv, Element::Water}}, - {{542, 0x0000}, {"Mini-Jini", Game::Giants, Element::Magic}}, - {{503, 0x0000}, {"Spry", Game::TrapTeam, Element::Magic}}, - {{504, 0x0000}, {"Hijinx", Game::TrapTeam, Element::Magic}}, - {{543, 0x0000}, {"Eye Small", Game::Giants, Element::Undead}}, + {{502, 0x0000}, {"Bop (Mini)", Game::TrapTeam, Element::Earth}}, + {{503, 0x0000}, {"Spry (Mini)", Game::TrapTeam, Element::Magic}}, + {{504, 0x0000}, {"Hijinx (Mini)", Game::TrapTeam, Element::Undead}}, + {{505, 0x0000}, {"Terrabite (Sidekick)", Game::SpyrosAdv, Element::Earth}}, + {{505, 0x3000}, {"Terrabite (Mini)", Game::TrapTeam, Element::Earth}}, + {{506, 0x0000}, {"Breeze (Mini)", Game::TrapTeam, Element::Air}}, + {{507, 0x0000}, {"Weeruptor (Mini)", Game::TrapTeam, Element::Fire}}, + {{507, 0x3402}, {"Eggcellent Weeruptor (Mini)", Game::TrapTeam, Element::Fire}}, + {{508, 0x0000}, {"Pet Vac (Mini)", Game::TrapTeam, Element::Air}}, + {{508, 0x3402}, {"Power Punch Pet Vac (Mini)", Game::TrapTeam, Element::Air}}, + {{509, 0x0000}, {"Small Fry (Mini)", Game::TrapTeam, Element::Fire}}, + {{510, 0x0000}, {"Drobit (Mini)", Game::TrapTeam, Element::Tech}}, + {{514, 0x0000}, {"Gill Runt (Sidekick)", Game::SpyrosAdv, Element::Water}}, + {{514, 0x3000}, {"Gill Runt (Mini)", Game::TrapTeam, Element::Water}}, + {{519, 0x0000}, {"Trigger Snappy (Sidekick)", Game::SpyrosAdv, Element::Tech}}, + {{519, 0x3000}, {"Trigger Snappy (Mini)", Game::TrapTeam, Element::Tech}}, + {{526, 0x0000}, {"Whisper Elf (Sidekick)", Game::SpyrosAdv, Element::Life}}, + {{526, 0x3000}, {"Whisper Elf (Mini)", Game::TrapTeam, Element::Life}}, + {{540, 0x0000}, {"Barkley (Sidekick)", Game::Giants, Element::Life}}, + {{540, 0x3000}, {"Barkley (Mini)", Game::TrapTeam, Element::Life}}, + {{540, 0x3402}, {"Gnarly Barkley (Mini)", Game::TrapTeam, Element::Life}}, + {{541, 0x0000}, {"Thumpling (Sidekick)", Game::Giants, Element::Water}}, + {{541, 0x3000}, {"Thumpling (Mini)", Game::TrapTeam, Element::Water}}, + {{542, 0x0000}, {"Mini-Jini (Sidekick)", Game::Giants, Element::Magic}}, + {{542, 0x3000}, {"Mini-Jini (Mini)", Game::TrapTeam, Element::Magic}}, + {{543, 0x0000}, {"Eye Small (Sidekick)", Game::Giants, Element::Undead}}, + {{543, 0x3000}, {"Eye Small (Mini)", Game::TrapTeam, Element::Undead}}, {{1000, 0x0000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air}}, {{1001, 0x0000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air}}, {{1001, 0x2403}, {"Legendary Free Ranger (Bottom)", Game::SwapForce, Element::Air}}, @@ -321,7 +329,7 @@ const std::map, SkyData> list_skylanders = {{1005, 0x0000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire}}, {{1005, 0x2402}, {"Jade Fire Kraken (Bottom)", Game::SwapForce, Element::Fire}}, {{1006, 0x0000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life}}, - {{1007, 0x0000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Earth}}, + {{1007, 0x0000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life}}, {{1008, 0x0000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic}}, {{1008, 0x2402}, {"Enchanted Hoot Loop (Bottom)", Game::SwapForce, Element::Magic}}, {{1009, 0x0000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic}}, @@ -339,8 +347,8 @@ const std::map, SkyData> list_skylanders = {{2000, 0x0000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air}}, {{2001, 0x0000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air}}, {{2001, 0x2403}, {"Legendary Free Ranger (Top)", Game::SwapForce, Element::Air}}, - {{2002, 0x0000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Air}}, - {{2003, 0x0000}, {"Doom Stone (Top)", Game::SwapForce, Element::Air}}, + {{2002, 0x0000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth}}, + {{2003, 0x0000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth}}, {{2004, 0x0000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire}}, {{2004, 0x2402}, {"Dark Blast Zone (Top)", Game::SwapForce, Element::Fire}}, {{2005, 0x0000}, {"Fire Kraken (Top)", Game::SwapForce, Element::Fire}}, @@ -362,7 +370,7 @@ const std::map, SkyData> list_skylanders = {{2015, 0x0000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water}}, {{2015, 0x2402}, {"Dark Wash Buckler (Top)", Game::SwapForce, Element::Water}}, {{3000, 0x0000}, {"Scratch", Game::SwapForce, Element::Air}}, - {{3001, 0x0000}, {"Pop Thorn", Game::SwapForce, Element::Magic}}, + {{3001, 0x0000}, {"Pop Thorn", Game::SwapForce, Element::Air}}, {{3002, 0x0000}, {"Slobber Tooth", Game::SwapForce, Element::Earth}}, {{3002, 0x2402}, {"Dark Slobber Tooth", Game::SwapForce, Element::Earth}}, {{3003, 0x0000}, {"Scorp", Game::SwapForce, Element::Earth}}, @@ -371,23 +379,23 @@ const std::map, SkyData> list_skylanders = {{3005, 0x0000}, {"Smolderdash", Game::SwapForce, Element::Fire}}, {{3005, 0x2206}, {"LightCore Smolderdash", Game::SwapForce, Element::Fire}}, {{3006, 0x0000}, {"Bumble Blast", Game::SwapForce, Element::Life}}, - {{3006, 0x2402}, {"Jolly Bumble Blast", Game::SwapForce, Element::Life}}, {{3006, 0x2206}, {"LightCore Bumble Blast", Game::SwapForce, Element::Life}}, + {{3006, 0x2402}, {"Jolly Bumble Blast", Game::SwapForce, Element::Life}}, {{3007, 0x0000}, {"Zoo Lou", Game::SwapForce, Element::Life}}, {{3007, 0x2403}, {"Legendary Zoo Lou", Game::SwapForce, Element::Life}}, {{3008, 0x0000}, {"Dune Bug", Game::SwapForce, Element::Magic}}, {{3009, 0x0000}, {"Star Strike", Game::SwapForce, Element::Magic}}, - {{3009, 0x2602}, {"Enchanted Star Strike", Game::SwapForce, Element::Magic}}, {{3009, 0x2206}, {"LightCore Star Strike", Game::SwapForce, Element::Magic}}, + {{3009, 0x2602}, {"Enchanted Star Strike", Game::SwapForce, Element::Magic}}, {{3010, 0x0000}, {"Countdown", Game::SwapForce, Element::Tech}}, - {{3010, 0x2402}, {"Kickoff Countdown", Game::SwapForce, Element::Tech}}, {{3010, 0x2206}, {"LightCore Countdown", Game::SwapForce, Element::Tech}}, + {{3010, 0x2402}, {"Kickoff Countdown", Game::SwapForce, Element::Tech}}, {{3011, 0x0000}, {"Wind Up", Game::SwapForce, Element::Tech}}, {{3011, 0x2404}, {"Gear Head VVind Up", Game::SwapForce, Element::Tech}}, {{3012, 0x0000}, {"Roller Brawl", Game::SwapForce, Element::Undead}}, {{3013, 0x0000}, {"Grim Creeper", Game::SwapForce, Element::Undead}}, - {{3013, 0x2603}, {"Legendary Grim Creeper", Game::SwapForce, Element::Undead}}, {{3013, 0x2206}, {"LightCore Grim Creeper", Game::SwapForce, Element::Undead}}, + {{3013, 0x2603}, {"Legendary 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}}, @@ -395,38 +403,38 @@ const std::map, SkyData> list_skylanders = {{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}}, + {{3220, 0x0000}, {"Jet Stream", Game::Superchargers, Element::Air}}, + {{3221, 0x0000}, {"Tomb Buggy", Game::Superchargers, Element::Undead}}, + {{3222, 0x0000}, {"Reef Ripper", Game::Superchargers, Element::Water}}, + {{3223, 0x0000}, {"Burn Cycle", Game::Superchargers, Element::Fire}}, + {{3224, 0x0000}, {"Hot Streak", Game::Superchargers, Element::Fire}}, + {{3224, 0x4004}, {"E3 Hot Streak", Game::Superchargers, Element::Fire}}, + {{3224, 0x4402}, {"Dark Hot Streak", Game::Superchargers, Element::Fire}}, + {{3224, 0x441E}, {"Golden Hot Streak", Game::Superchargers, Element::Fire}}, + {{3225, 0x0000}, {"Shark Tank", Game::Superchargers, Element::Earth}}, + {{3226, 0x0000}, {"Thump Truck", Game::Superchargers, Element::Earth}}, + {{3227, 0x0000}, {"Crypt Crusher", Game::Superchargers, Element::Undead}}, + {{3228, 0x0000}, {"Stealth Stinger", Game::Superchargers, Element::Life}}, + {{3228, 0x4402}, {"Nitro Stealth Stinger", Game::Superchargers, Element::Life}}, + {{3231, 0x0000}, {"Dive Bomber", Game::Superchargers, Element::Water}}, + {{3231, 0x4402}, {"Spring Ahead Dive Bomber", Game::Superchargers, Element::Water}}, + {{3232, 0x0000}, {"Sky Slicer", Game::Superchargers, Element::Air}}, + {{3233, 0x0000}, {"Clown Cruiser", Game::Superchargers, Element::Air}}, + {{3233, 0x4402}, {"Dark Clown Cruiser", Game::Superchargers, Element::Air}}, + {{3234, 0x0000}, {"Gold Rusher", Game::Superchargers, Element::Tech}}, + {{3234, 0x4402}, {"Power Blue Gold Rusher", Game::Superchargers, Element::Tech}}, + {{3235, 0x0000}, {"Shield Striker", Game::Superchargers, Element::Tech}}, {{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}}, + {{3238, 0x0000}, {"Splatter Splasher", Game::Superchargers, Element::Magic}}, + {{3238, 0x4402}, {"Power Blue Splatter Splasher", Game::Superchargers, Element::Magic}}, + {{3239, 0x0000}, {"Soda Skimmer", Game::Superchargers, Element::Magic}}, + {{3239, 0x4402}, {"Nitro Soda Skimmer", Game::Superchargers, Element::Magic}}, + {{3240, 0x0000}, {"Barrel Blaster", Game::Superchargers, Element::Tech}}, + {{3240, 0x4402}, {"Dark Barrel Blaster", Game::Superchargers, Element::Tech}}, + {{3241, 0x0000}, {"Buzz Wing", Game::Superchargers, Element::Life}}, {{3300, 0x0000}, {"Sheep Wreck Island", Game::SwapForce}}, {{3301, 0x0000}, {"Tower of Time", Game::SwapForce}}, {{3302, 0x0000}, {"Fiery Forge", Game::SwapForce}}, @@ -437,6 +445,7 @@ const std::map, SkyData> list_skylanders = {{3402, 0x0000}, {"Splat", Game::Superchargers, Element::Magic}}, {{3402, 0x4502}, {"Power Blue Splat", Game::Superchargers, Element::Magic}}, {{3406, 0x0000}, {"Stormblade", Game::Superchargers, Element::Air}}, + {{3406, 0x4502}, {"Dark Stormblade", Game::Superchargers, Element::Air}}, {{3411, 0x0000}, {"Smash Hit", Game::Superchargers, Element::Earth}}, {{3411, 0x4502}, {"Steel Plated Smash Hit", Game::Superchargers, Element::Earth}}, {{3412, 0x0000}, {"Spitfire", Game::Superchargers, Element::Fire}}, @@ -448,8 +457,8 @@ const std::map, SkyData> list_skylanders = {{3415, 0x0000}, {"Super Shot Stealth Elf", Game::Superchargers, Element::Life}}, {{3415, 0x4502}, {"Dark Super Shot Stealth Elf", Game::Superchargers, Element::Life}}, {{3416, 0x0000}, {"Shark Shooter Terrafin", Game::Superchargers, Element::Earth}}, - {{3417, 0x0000}, {"Bone Bash Roller Brawl", Game::Superchargers, Element::Earth}}, - {{3417, 0x4503}, {"Legendary Bone Bash Roller Brawl", Game::Superchargers, Element::Earth}}, + {{3417, 0x0000}, {"Bone Bash Roller Brawl", Game::Superchargers, Element::Undead}}, + {{3417, 0x4503}, {"Legendary Bone Bash Roller Brawl", Game::Superchargers, Element::Undead}}, {{3420, 0x0000}, {"Big Bubble Pop Fizz", Game::Superchargers, Element::Magic}}, {{3420, 0x450E}, {"Birthday Bash Big Bubble Pop Fizz", Game::Superchargers, Element::Magic}}, {{3421, 0x0000}, {"Lava Lance Eruptor", Game::Superchargers, Element::Fire}},