diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp index 55802a65dc..ba9eb1096d 100644 --- a/rpcs3/rpcs3qt/skylander_dialog.cpp +++ b/rpcs3/rpcs3qt/skylander_dialog.cpp @@ -14,112 +14,145 @@ skylander_dialog* skylander_dialog::inst = nullptr; const std::map, const std::string> list_skylanders = { {{0, 0}, "Whirlwind"}, - {{0, 6145}, "Series 2 Whirlwind"}, - {{0, 10245}, "Horn Blast Whirlwind"}, + {{0, 280}, "Series 2 Whirlwind"}, + {{0, 540}, "Polar Whirlwind"}, + {{0, 1320}, "Horn Blast Whirlwind"}, + {{0, 4152}, "Eon's Elite Whirlwind"}, {{1, 0}, "Sonic Boom"}, - {{1, 6145}, "Series 2 Sonic Boom"}, + {{1, 280}, "Series 2 Sonic Boom"}, {{2, 0}, "Warnado"}, - {{2, 4614}, "LightCore Warnado"}, + {{2, 1570}, "LightCore Warnado"}, {{3, 0}, "Lightning Rod"}, - {{3, 6145}, "Series 2 Lightning Rod"}, + {{3, 280}, "Series 2 Lightning Rod"}, {{4, 0}, "Bash"}, - {{4, 6145}, "Series 2 Bash"}, + {{4, 280}, "Series 2 Bash"}, {{5, 0}, "Terrafin"}, - {{5, 6145}, "Series 2 Terrafin"}, - {{5, 10245}, "Knockout Terrafin"}, + {{5, 280}, "Series 2 Terrafin"}, + {{5, 1320}, "Knockout Terrafin"}, + {{5, 4152}, "Eon's Elite Terrafin"}, {{6, 0}, "Dino Rang"}, + {{6, 4168}, "Eon's Elite Dino Rang"}, {{7, 0}, "Prism Break"}, - {{7, 4614}, "LightCore Prism Break"}, - {{7, 6145}, "Series 2 Prism Break"}, - {{7, 10245}, "Hyper Beam Prism Break"}, + {{7, 280}, "Series 2 Prism Break"}, + {{7, 1320}, "Hyper Beam Prism Break"}, + {{7, 1554}, "LightCore Prism Break"}, {{8, 0}, "Sunburn"}, {{9, 0}, "Eruptor"}, - {{9, 4614}, "LightCore Eruptor"}, - {{9, 6145}, "Series 2 Eruptor"}, - {{9, 10245}, "Lava Barf Eruptor"}, + {{9, 280}, "Series 2 Eruptor"}, + {{9, 556}, "Volcanic Eruptor"}, + {{9, 1320}, "Lava Barf Eruptor"}, + {{9, 1554}, "LightCore Eruptor"}, + {{9, 4152}, "Eon's Elite Eruptor"}, {{10, 0}, "Ignitor"}, - {{10, 6145}, "Series 2 Ignitor"}, + {{10, 280}, "Series 2 Ignitor"}, + {{10, 796}, "Legendary Ignitor"}, {{11, 0}, "Flameslinger"}, - {{11, 6145}, "Series 2 Flameslinger"}, + {{11, 280}, "Series 2 Flameslinger"}, {{12, 0}, "Zap"}, - {{12, 6145}, "Series 2 Zap"}, + {{12, 280}, "Series 2 Zap"}, {{13, 0}, "Wham Shell"}, - {{13, 4614}, "LightCore Wham Shell"}, + {{13, 1570}, "LightCore Wham Shell"}, {{14, 0}, "Gill Grunt"}, - {{14, 6145}, "Series 2 Gill Grunt"}, - {{14, 10245}, "Anchors Away Gill Grunt"}, + {{14, 280}, "Series 2 Gill Grunt"}, + {{14, 1320}, "Anchors Away Gill Grunt"}, + {{14, 1336}, "Tidal Wave Gill Grunt"}, + {{14, 4152}, "Eon's Elite Gill Grunt"}, {{15, 0}, "Slam Bam"}, - {{15, 6145}, "Series 2 Slam Bam"}, + {{15, 280}, "Series 2 Slam Bam"}, + {{15, 796}, "Legendary Slam Bam"}, + {{15, 4168}, "Eon's Elite Slam Bam"}, {{16, 0}, "Spyro"}, - {{16, 6145}, "Series 2 Spyro"}, - {{16, 10245}, "Mega Ram Spyro"}, - {{16, 11266}, "Dark Mega Ram Spyro"}, + {{16, 280}, "Series 2 Spyro"}, + {{16, 556}, "Dark Mega Ram Spyro"}, + {{16, 1320}, "Mega Ram Spyro"}, + {{16, 4152}, "Eon's Elite Spyro"}, {{17, 0}, "Voodood"}, + {{17, 4168}, "Eon's Elite Voodood"}, {{18, 0}, "Double Trouble"}, - {{18, 6145}, "Series 2 Double Trouble"}, + {{18, 280}, "Series 2 Double Trouble"}, + {{18, 540}, "Royal Double Trouble"}, {{19, 0}, "Trigger Happy"}, - {{19, 6145}, "Series 2 Trigger Happy"}, + {{19, 280}, "Series 2 Trigger Happy"}, + {{19, 556}, "Springtime Trigger Happy"}, + {{19, 1320}, "Big Bang Tripper Happy"}, + {{19, 4152}, "Eon's Elite Trigger Happy"}, {{20, 0}, "Drobot"}, - {{20, 4614}, "LightCore Drobot"}, - {{20, 6145}, "Series 2 Drobot"}, + {{20, 280}, "Series 2 Drobot"}, + {{20, 1554}, "LightCore Drobot"}, {{21, 0}, "Drill Seargeant"}, - {{21, 6145}, "Series 2 Drill Seargeant"}, + {{21, 280}, "Series 2 Drill Seargeant"}, {{22, 0}, "Boomer"}, + {{22, 4168}, "Eon's Elite Boomer"}, {{23, 0}, "Wrecking Ball"}, - {{23, 6145}, "Series 2 Wrecking Ball"}, + {{23, 280}, "Series 2 Wrecking Ball"}, {{24, 0}, "Camo"}, - {{24, 10245}, "Thorn Horn Camo"}, + {{24, 1320}, "Thorn Horn Camo"}, {{25, 0}, "Zook"}, - {{25, 6145}, "Series 2 Zook"}, + {{25, 280}, "Series 2 Zook"}, + {{25, 4168}, "Eon's Elite Zook"}, {{26, 0}, "Stealth Elf"}, - {{26, 6145}, "Series 2 Stealth Elf"}, - {{26, 10245}, "Ninja Stealth Elf"}, - {{26, 11266}, "Dark Stealth Elf"}, + {{26, 280}, "Series 2 Stealth Elf"}, + {{26, 556}, "Dark Stealth Elf"}, + {{26, 796}, "Legendary Stealth Elf"}, + {{26, 1320}, "Ninja Stealth Elf"}, + {{26, 4152}, "Eon's Elite Stealth Elf"}, {{27, 0}, "Stump Smash"}, - {{27, 6145}, "Series 2 Stump Smash"}, + {{27, 280}, "Series 2 Stump Smash"}, {{28, 0}, "Dark Spyro"}, - {{28, 6145}, "Series 2 Dark Spyro"}, {{29, 0}, "Hex"}, - {{29, 6145}, "Series 2 Hex"}, + {{29, 280}, "Series 2 Hex"}, + {{29, 1554}, "LightCore Hex"}, {{30, 0}, "Chop Chop"}, - {{30, 6145}, "Series 2 Chop Chop"}, - {{30, 10245}, "Twin Blade Chop Chop"}, + {{30, 280}, "Series 2 Chop Chop"}, + {{30, 1320}, "Twin Blade Chop Chop"}, + {{30, 4152}, "Eon's Elite Chop Chop"}, {{31, 0}, "Ghost Roaster"}, + {{31, 4168}, "Eon's Elite Ghost Roaster"}, {{32, 0}, "Cynder"}, - {{32, 6145}, "Series 2 Cynder"}, - {{32, 10245}, "Phantom Cynder"}, + {{32, 280}, "Series 2 Cynder"}, + {{32, 1320}, "Phantom Cynder"}, {{100, 0}, "Jet Vac"}, - {{100, 4614}, "LightCore Jet Vac"}, - {{100, 10245}, "Turbo Jet Vac"}, + {{100, 788}, "Legendary Jet Vac"}, + {{100, 1320}, "Turbo Jet Vac"}, + {{100, 1336}, "Full Blast Jet Vac"}, + {{100, 1554}, "LightCore Jet Vac"}, {{101, 0}, "Swarm"}, {{102, 0}, "Crusher"}, + {{102, 534}, "Granite Crusher"}, {{103, 0}, "Flashwing"}, - {{103, 4614}, "LightCore Flashwing"}, - {{103, 13314}, "Jade Flash Wing"}, + {{103, 532}, "Jade Flash Wing"}, + {{103, 1570}, "LightCore Flashwing"}, {{104, 0}, "Hot Head"}, {{105, 0}, "Hot Dog"}, - {{105, 10245}, "Fire Bone Hot Dog"}, + {{105, 532}, "Molten Hot Dog"}, + {{105, 1320}, "Fire Bone Hot Dog"}, {{106, 0}, "Chill"}, - {{106, 4614}, "LightCore Chill"}, - {{106, 10245}, "Blizzard Chill"}, + {{106, 790}, "Legendary Chill"}, + {{106, 1320}, "Blizzard Chill"}, + {{106, 1554}, "LightCore Chill"}, {{107, 0}, "Thumpback"}, {{108, 0}, "Pop Fizz"}, - {{108, 4614}, "LightCore Pop Fizz"}, - {{108, 10245}, "Super Gulp Pop Fizz"}, - {{108, 15362}, "Love Potion Pop Fizz"}, + {{108, 532}, "Punch Pop Fizz"}, + {{108, 572}, "Love Potion Pop Fizz"}, + {{108, 1320}, "Super Gulp Pop Fizz"}, + {{108, 1336}, "Fizzy Frenzy Pop Fizz"}, + {{108, 1554}, "LightCore Pop Fizz"}, {{109, 0}, "Ninjini"}, - {{109, 13314}, "Scarlet Ninjini"}, + {{109, 534}, "Scarlet Ninjini"}, {{110, 0}, "Bouncer"}, + {{110, 790}, "Legendary Bouncer"}, {{111, 0}, "Sprocket"}, - {{111, 10245}, "Heavy Duty Sprocket"}, + {{111, 1320}, "Heavy Duty Sprocket"}, {{112, 0}, "Tree Rex"}, - {{112, 13314}, "Gnarly Tree Rex"}, + {{112, 534}, "Gnarly Tree Rex"}, {{113, 0}, "Shroomboom"}, - {{113, 4614}, "LightCore Shroomboom"}, + {{113, 1336}, "Sure Shot Shroomboom"}, + {{113, 1554}, "LightCore Shroomboom"}, {{114, 0}, "Eye Brawl"}, {{115, 0}, "Fright Rider"}, {{200, 0}, "Anvil Rain"}, {{201, 0}, "Hidden Treasure"}, + {{201, 32}, "Platinum Hidden Treasure"}, {{202, 0}, "Healing Elixir"}, {{203, 0}, "Ghost Pirate Swords"}, {{204, 0}, "Time Twist Hourglass"}, @@ -127,64 +160,69 @@ const std::map, const std::string> list_sk {{206, 0}, "Winged Boots"}, {{207, 0}, "Sparx the Dragonfly"}, {{208, 0}, "Dragonfire Cannon"}, + {{208, 534}, "Golden Dragonfire Cannon"}, {{209, 0}, "Scorpion Striker"}, - {{210, 12290}, "Biter's Bane"}, - {{210, 12296}, "Sorcerous Skull"}, - {{210, 12299}, "Axe of Illusion"}, - {{210, 12302}, "Arcane Hourglass"}, - {{210, 12306}, "Spell Slapper"}, - {{210, 12308}, "Rune Rocket"}, - {{211, 12289}, "Tidal Tiki"}, - {{211, 12290}, "Wet Walter"}, - {{211, 12294}, "Flood Flask"}, - {{211, 12295}, "Soaking Staff"}, - {{211, 12299}, "Aqua Axe"}, - {{211, 12310}, "Frost Helm"}, - {{212, 12291}, "Breezy Bird"}, - {{212, 12294}, "Drafty Decanter"}, - {{212, 12301}, "Tempest Timer"}, - {{212, 12304}, "Cloudy Cobra"}, - {{212, 12305}, "Storm Warning"}, - {{212, 12312}, "Cyclone Saber"}, - {{213, 12292}, "Spirit Sphere"}, - {{213, 12296}, "Spectral Skull"}, - {{213, 12299}, "Haunted Hatchet"}, - {{213, 12300}, "Grim Gripper"}, - {{213, 12304}, "Spooky Snake"}, - {{213, 12311}, "Dream Piercer"}, - {{214, 12288}, "Tech Totem"}, - {{214, 12295}, "Automatic Angel"}, - {{214, 12297}, "Factory Flower"}, - {{214, 12300}, "Grabbing Gadget"}, - {{214, 12310}, "Makers Mana"}, - {{214, 12314}, "Topsy Techy"}, - {{215, 12293}, "Eternal Flame"}, - {{215, 12297}, "Fire Flower"}, - {{215, 12305}, "Scorching Stopper"}, - {{215, 12306}, "Searing Spinner"}, - {{215, 12311}, "Spark Spear"}, - {{215, 12315}, "Blazing Belch"}, - {{216, 12288}, "Banded Boulder"}, - {{216, 12291}, "Rock Hawk"}, - {{216, 12298}, "Slag Hammer"}, - {{216, 12302}, "Dust Of Time"}, - {{216, 12307}, "Spinning Sandstorm"}, - {{216, 12314}, "Rubble Trouble"}, - {{217, 12291}, "Oak Eagle"}, - {{217, 12293}, "Emerald Energy"}, - {{217, 12298}, "Weed Whacker"}, - {{217, 12304}, "Seed Serpent"}, - {{217, 12312}, "Jade Blade"}, - {{217, 12315}, "Shrub Shrieker"}, - {{218, 12288}, "Dark Dagger"}, - {{218, 12308}, "Shadow Spider"}, - {{218, 12314}, "Ghastly Grimace"}, - {{219, 12288}, "Shining Ship"}, - {{219, 12303}, "Heavenly Hawk"}, - {{219, 12315}, "Beam Scream"}, - {{220, 12336}, "Kaos Trap"}, - {{220, 12337}, "Ultimate Kaos Trap"}, + {{210, 560}, "Biter's Bane"}, + {{210, 2096}, "Sorcerous Skull"}, + {{210, 2864}, "Axe of Illusion"}, + {{210, 3632}, "Arcane Hourglass"}, + {{210, 4656}, "Spell Slapper"}, + {{210, 5168}, "Rune Rocket"}, + {{211, 304}, "Tidal Tiki"}, + {{211, 560}, "Wet Walter"}, + {{211, 1584}, "Flood Flask"}, + {{211, 1588}, "Legendary Flood Flask"}, + {{211, 1840}, "Soaking Staff"}, + {{211, 2864}, "Aqua Axe"}, + {{211, 5680}, "Frost Helm"}, + {{212, 816}, "Breezy Bird"}, + {{212, 1584}, "Drafty Decanter"}, + {{212, 3376}, "Tempest Timer"}, + {{212, 4144}, "Cloudy Cobra"}, + {{212, 4400}, "Storm Warning"}, + {{212, 6192}, "Cyclone Saber"}, + {{213, 1072}, "Spirit Sphere"}, + {{213, 1076}, "Legendary Spirit Sphere"}, + {{213, 2096}, "Spectral Skull"}, + {{213, 2100}, "Legendary Spectral Skull"}, + {{213, 2864}, "Haunted Hatchet"}, + {{213, 3120}, "Grim Gripper"}, + {{213, 4144}, "Spooky Snake"}, + {{213, 5936}, "Dream Piercer"}, + {{214, 48}, "Tech Totem"}, + {{214, 1840}, "Automatic Angel"}, + {{214, 2352}, "Factory Flower"}, + {{214, 3120}, "Grabbing Gadget"}, + {{214, 5680}, "Makers Mana"}, + {{214, 6704}, "Topsy Techy"}, + {{215, 1328}, "Eternal Flame"}, + {{215, 2352}, "Fire Flower"}, + {{215, 4400}, "Scorching Stopper"}, + {{215, 4656}, "Searing Spinner"}, + {{215, 5936}, "Spark Spear"}, + {{215, 6960}, "Blazing Belch"}, + {{216, 48}, "Banded Boulder"}, + {{216, 816}, "Rock Hawk"}, + {{216, 2608}, "Slag Hammer"}, + {{216, 3632}, "Dust Of Time"}, + {{216, 4912}, "Spinning Sandstorm"}, + {{216, 6704}, "Rubble Trouble"}, + {{217, 816}, "Oak Eagle"}, + {{217, 1328}, "Emerald Energy"}, + {{217, 2608}, "Weed Whacker"}, + {{217, 4144}, "Seed Serpent"}, + {{217, 6192}, "Jade Blade"}, + {{217, 6960}, "Shrub Shrieker"}, + {{218, 48}, "Dark Dagger"}, + {{218, 5168}, "Shadow Spider"}, + {{218, 6704}, "Ghastly Grimace"}, + {{219, 48}, "Shining Ship"}, + {{219, 3888}, "Heavenly Hawk"}, + {{219, 6960}, "Beam Scream"}, + {{220, 7728}, "Kaos Trap"}, + {{220, 7989}, "Ultimate Kaos Trap"}, {{230, 0}, "Hand of Fate"}, + {{230, 820}, "Legendary Hand of Fate"}, {{231, 0}, "Piggy Bank"}, {{232, 0}, "Rocket Ram"}, {{233, 0}, "Tiki Speaky"}, @@ -205,34 +243,42 @@ const std::map, const std::string> list_sk {{451, 0}, "Thunderbolt"}, {{452, 0}, "Fling Kong"}, {{453, 0}, "Blades"}, + {{453, 820}, "Legendary Blades"}, {{454, 0}, "Wallop"}, {{455, 0}, "Head Rush"}, + {{455, 564}, "Nitro Head Rush"}, {{456, 0}, "Fist Bump"}, {{457, 0}, "Rocky Roll"}, {{458, 0}, "Wildfire"}, - {{458, 11266}, "Dark Wildfire"}, + {{458, 564}, "Dark Wildfire"}, {{459, 0}, "Ka Boom"}, {{460, 0}, "Trail Blazer"}, {{461, 0}, "Torch"}, {{462, 0}, "Snap Shot"}, - {{462, 11266}, "Dark Snap Shot"}, + {{462, 564}, "Dark Snap Shot"}, {{463, 0}, "Lob Star"}, + {{463, 564}, "Winterfest Lob-Star"}, {{464, 0}, "Flip Wreck"}, {{465, 0}, "Echo"}, {{466, 0}, "Blastermind"}, {{467, 0}, "Enigma"}, {{468, 0}, "Deja Vu"}, + {{468, 820}, "Legendary Deja Vu"}, {{469, 0}, "Cobra Candabra"}, + {{469, 564}, "King Cobra Cadabra"}, {{470, 0}, "Jawbreaker"}, + {{470, 820}, "Legendary Jawbreaker"}, {{471, 0}, "Gearshift"}, {{472, 0}, "Chopper"}, {{473, 0}, "Tread Head"}, {{474, 0}, "Bushwack"}, + {{474, 820}, "Legendary Bushwack"}, {{475, 0}, "Tuff Luck"}, {{476, 0}, "Food Fight"}, - {{476, 11266}, "Dark Food Fight"}, + {{476, 564}, "Dark Food Fight"}, {{477, 0}, "High Five"}, {{478, 0}, "Krypt King"}, + {{478, 564}, "Nitro Krypt King"}, {{479, 0}, "Short Cut"}, {{480, 0}, "Bat Spin"}, {{481, 0}, "Funny Bone"}, @@ -244,13 +290,15 @@ const std::map, const std::string> list_sk {{505, 0}, "Terrabite"}, {{506, 0}, "Breeze"}, {{508, 0}, "Pet Vac"}, + {{508, 564}, "Power Punch Pet Vac"}, {{507, 0}, "Weeruptor"}, + {{507, 564}, "Eggcellent Weeruptor"}, {{509, 0}, "Small Fry"}, {{510, 0}, "Drobit"}, {{519, 0}, "Trigger Snappy"}, {{526, 0}, "Whisper Elf"}, {{540, 0}, "Barkley"}, - {{540, 13314}, "Gnarly Barkley"}, + {{540, 564}, "Gnarly Barkley"}, {{541, 0}, "Thumpling"}, {{514, 0}, "Gill Runt"}, {{542, 0}, "Mini-Jini"}, @@ -258,7 +306,6 @@ const std::map, const std::string> list_sk {{504, 0}, "Hijinx"}, {{543, 0}, "Eye Small"}, {{601, 0}, "King Pen"}, - {{601, 11266}, "Dark King Pen"}, {{602, 0}, "Tri-Tip"}, {{603, 0}, "Chopscotch"}, {{604, 0}, "Boom Bloom"}, @@ -271,9 +318,7 @@ const std::map, const std::string> list_sk {{611, 0}, "Hood Sickle"}, {{612, 0}, "Tae Kwon Crow"}, {{613, 0}, "Golden Queen"}, - {{613, 11266}, "Dark Golden Queen"}, {{614, 0}, "Wolfgang"}, - {{614, 11266}, "Dark Wolfgang"}, {{615, 0}, "Pain-Yatta"}, {{616, 0}, "Mysticat"}, {{617, 0}, "Starcast"}, @@ -294,110 +339,155 @@ const std::map, const std::string> list_sk {{3000, 0}, "Scratch"}, {{3001, 0}, "Pop Thorn"}, {{3002, 0}, "Slobber Tooth"}, - {{3002, 11266}, "Dark Slobber Tooth"}, + {{3002, 548}, "Dark Slobber Tooth"}, {{3003, 0}, "Scorp"}, {{3004, 0}, "Fryno"}, + {{3004, 1336}, "Hog Wild Fryno"}, {{3005, 0}, "Smolderdash"}, - {{3005, 4614}, "LightCore Smolderdash"}, + {{3005, 1570}, "LightCore Smolderdash"}, {{3006, 0}, "Bumble Blast"}, - {{3006, 4614}, "LightCore Bumble Blast"}, + {{3006, 548}, "Jolly Bumble Blast"}, + {{3006, 1570}, "LightCore Bumble Blast"}, {{3007, 0}, "Zoo Lou"}, + {{3007, 804}, "Legendary Zoo Lou"}, {{3008, 0}, "Dune Bug"}, {{3009, 0}, "Star Strike"}, - {{3009, 4614}, "LightCore Star Strike"}, + {{3009, 550}, "Enchanted Star Strike (LightCore)"}, + {{3009, 1570}, "LightCore Star Strike"}, {{3010, 0}, "Countdown"}, - {{3010, 4614}, "LightCore Countdown"}, + {{3010, 548}, "Kickoff Countdown"}, + {{3010, 1570}, "LightCore Countdown"}, {{3011, 0}, "Wind Up"}, {{3012, 0}, "Roller Brawl"}, {{3013, 0}, "Grim Creeper"}, - {{3013, 4614}, "LightCore Grim Creeper"}, + {{3013, 806}, "Legendary Grim Creeper"}, + {{3013, 1570}, "LightCore Grim Creeper"}, {{3014, 0}, "Rip Tide"}, {{3015, 0}, "Punk Shock"}, {{1000, 0}, "Boom Jet (Bottom)"}, {{1001, 0}, "Free Ranger (Bottom)"}, + {{1001, 804}, "Legendary Free Ranger (Bottom)"}, {{1002, 0}, "Rubble Rouser (Bottom)"}, {{1003, 0}, "Doom Stone (Bottom)"}, {{1004, 0}, "Blast Zone (Bottom)"}, - {{1004, 11266}, "Dark Blast Zone (Bottom)"}, + {{1004, 548}, "Dark Blast Zone (Bottom)"}, {{1005, 0}, "Fire Kraken (Bottom)"}, + {{1005, 548}, "Jade Fire Kraken (Bottom)"}, {{1006, 0}, "Stink Bomb (Bottom)"}, {{1007, 0}, "Grilla Drilla (Bottom)"}, {{1008, 0}, "Hoot Loop (Bottom)"}, - {{1008, 9218}, "Enchanted Hoot Loop (Bottom)"}, + {{1008, 548}, "Enchanted Hoot Loop (Bottom)"}, {{1009, 0}, "Trap Shadow (Bottom)"}, {{1010, 0}, "Magna Charge (Bottom)"}, + {{1010, 548}, "Nitro Magna Charge (Bottom)"}, {{1011, 0}, "Spy Rise (Bottom)"}, {{1012, 0}, "Night Shift (Bottom)"}, + {{1012, 804}, "Legendary Night Shift (Bottom)"}, {{1013, 0}, "Rattle Shake (Bottom)"}, + {{1013, 548}, "Quick Draw Rattle Shake (Bottom)"}, {{1014, 0}, "Freeze Blade (Bottom)"}, + {{1014, 548}, "Nitro Freeze Blade (Bottom)"}, {{1015, 0}, "Wash Buckler (Bottom)"}, - {{1015, 11266}, "Dark Wash Buckler (Bottom)"}, + {{1015, 548}, "Dark Wash Buckler (Bottom)"}, {{2000, 0}, "Boom Jet (Top)"}, {{2001, 0}, "Free Ranger (Top)"}, + {{2001, 804}, "Legendary Free Ranger (Top)"}, {{2002, 0}, "Rubble Rouser (Top)"}, {{2003, 0}, "Doom Stone (Top)"}, {{2004, 0}, "Blast Zone (Top)"}, - {{2004, 11266}, "Dark Blast Zone (Top)"}, + {{2004, 548}, "Dark Blast Zone (Top)"}, {{2005, 0}, "Fire Kraken (Top)"}, + {{2005, 548}, "Jade Fire Kraken (Top)"}, {{2006, 0}, "Stink Bomb (Top)"}, {{2007, 0}, "Grilla Drilla (Top)"}, {{2008, 0}, "Hoot Loop (Top)"}, - {{2008, 9218}, "Enchanted Hoot Loop (Top)"}, + {{2008, 548}, "Enchanted Hoot Loop (Top)"}, {{2009, 0}, "Trap Shadow (Top)"}, {{2010, 0}, "Magna Charge (Top)"}, + {{2010, 548}, "Nitro Magna Charge (Top)"}, {{2011, 0}, "Spy Rise (Top)"}, {{2012, 0}, "Night Shift (Top)"}, + {{2012, 804}, "Legendary Night Shift (Top)"}, {{2013, 0}, "Rattle Shake (Top)"}, + {{2013, 548}, "Quick Draw Rattle Shake (Top)"}, {{2014, 0}, "Freeze Blade (Top)"}, + {{2014, 548}, "Nitro Freeze Blade (Top)"}, {{2015, 0}, "Wash Buckler (Top)"}, - {{2015, 11266}, "Dark Wash Buckler (Top)"}, + {{2015, 548}, "Dark Wash Buckler (Top)"}, + {{3200, 0}, "Battle Hammer"}, + {{3201, 0}, "Sky Diamond"}, + {{3202, 0}, "Platinum Sheep"}, + {{3203, 0}, "Groove Machine"}, + {{3204, 0}, "UFO Hat"}, + {{3300, 0}, "Sheep Wreck Island"}, + {{3301, 0}, "Tower of Time"}, + {{3302, 0}, "Fiery Forge"}, + {{3303, 0}, "Arkeyan Crossbow"}, {{3220, 0}, "Jet Stream"}, {{3221, 0}, "Tomb Buggy"}, {{3222, 0}, "Reef Ripper"}, {{3223, 0}, "Burn Cycle"}, {{3224, 0}, "Hot Streak"}, + {{3224, 580}, "Dark Hot Streak"}, + {{3224, 1088}, "E3 Hot Streak"}, + {{3224, 7748}, "Golden Hot Streak"}, {{3225, 0}, "Shark Tank"}, {{3226, 0}, "Thump Truck"}, {{3227, 0}, "Crypt Crusher"}, {{3228, 0}, "Stealth Stinger"}, {{3231, 0}, "Dive Bomber"}, + {{3231, 580}, "Spring Ahead Dive Bomber"}, {{3232, 0}, "Sky Slicer"}, //{{3233, 0}, "Clown Cruiser (Nintendo Only)"}, - //{{3233, 11266}, "Dark Clown Cruiser (Nintendo Only)"}, + //{{3233, 580}, "Dark Clown Cruiser (Nintendo Only)"}, {{3234, 0}, "Gold Rusher"}, + {{3234, 580}, "Power Blue Gold Rusher"}, {{3235, 0}, "Shield Striker"}, {{3236, 0}, "Sun Runner"}, + {{3236, 836}, "Legendary Sun Runner"}, {{3237, 0}, "Sea Shadow"}, - {{3237, 11266}, "Dark Sea Shadow"}, + {{3237, 580}, "Dark Sea Shadow"}, {{3238, 0}, "Splatter Splasher"}, + {{3238, 580}, "Power Blue Splatter Splasher"}, {{3239, 0}, "Soda Skimmer"}, + {{3239, 580}, "Nitro Soda Skimmer"}, //{{3240, 0}, "Barrel Blaster (Nintendo Only)"}, - //{{3240, 11266}, "Dark Barrel Blaster (Nintendo Only)"}, + //{{3240, 580}, "Dark Barrel Blaster (Nintendo Only)"}, {{3241, 0}, "Buzz Wing"}, {{3400, 0}, "Fiesta"}, + {{3400, 5445}, "Frightful Fiesta"}, {{3401, 0}, "High Volt"}, {{3402, 0}, "Splat"}, + {{3402, 581}, "Power Blue Splat"}, {{3406, 0}, "Stormblade"}, {{3411, 0}, "Smash Hit"}, + {{3411, 581}, "Steel Plated Smash Hit"}, {{3412, 0}, "Spitfire"}, - {{3412, 11266}, "Dark Spitfire"}, + {{3412, 581}, "Dark Spitfire"}, {{3413, 0}, "Hurricane Jet Vac"}, + {{3413, 837}, "Legendary Hurricane Jet Vac"}, {{3414, 0}, "Double Dare Trigger Happy"}, + {{3414, 581}, "Power Blue Double Dare Trigger Happy"}, {{3415, 0}, "Super Shot Stealth Elf"}, - {{3415, 11266}, "Dark Super Shot Stealth Elf"}, + {{3415, 581}, "Dark Super Shot Stealth Elf"}, {{3416, 0}, "Shark Shooter Terrafin"}, {{3417, 0}, "Bone Bash Roller Brawl"}, + {{3417, 837}, "Legendary Bone Bash Roller Brawl"}, {{3420, 0}, "Big Bubble Pop Fizz"}, + {{3420, 3653}, "Birthday Bash Big Bubble Pop Fizz"}, {{3421, 0}, "Lava Lance Eruptor"}, {{3422, 0}, "Deep Dive Gill Grunt"}, //{{3423, 0}, "Turbo Charge Donkey Kong (Nintendo Only)"}, - //{{3423, 11266}, "Dark Turbo Charge Donkey Kong (Nintendo Only)"}, + //{{3423, 581}, "Dark Turbo Charge Donkey Kong (Nintendo Only)"}, //{{3424, 0}, "Hammer Slam Bowser (Nintendo Only)"}, - //{{3424, 11266}, "Dark Hammer Slam Bowser (Nintendo Only)"}, + //{{3424, 581}, "Dark Hammer Slam Bowser (Nintendo Only)"}, {{3425, 0}, "Dive-Clops"}, + {{3425, 3653}, "Missile-Tow Dive-Clops"}, {{3426, 0}, "Astroblast"}, + {{3426, 837}, "Legendary Astroblast"}, {{3427, 0}, "Nightfall"}, {{3428, 0}, "Thrillipede"}, + {{3428, 3397}, "Eggcited Thrillipede"}, {{3500, 0}, "Sky Trophy"}, {{3501, 0}, "Land Trophy"}, {{3502, 0}, "Sea Trophy"},