ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13028 from lycheefox/skylanders 

Skylanders: Add Mobile Hot Streak and fix typo
This commit is contained in:
OatmealDome 2024-08-21 11:44:22 -04:00 committed by GitHub
parent 7b8b733b11 b71474ec64
commit 2058439598
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp
View File

@ -143,7 +143,7 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
{{100, 0x1000}, {"Jet-Vac", Game::Giants, Element::Air, 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, 0x1403}, {"Jet-Vac (Legendary)", Game::Giants, Element::Air, Type::Skylander}},
{{100, 0x2805}, {"Jet Vac (Turbo)", Game::SwapForce, 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}}, {{100, 0x3805}, {"Jet-Vac (Full Blast)", Game::TrapTeam, Element::Air, Type::Skylander}},
{{101, 0x1206}, {"Swarm", Game::Giants, Element::Air, Type::Giant}}, {{101, 0x1206}, {"Swarm", Game::Giants, Element::Air, Type::Giant}},
{{102, 0x1206}, {"Crusher", Game::Giants, Element::Earth, Type::Giant}}, {{102, 0x1206}, {"Crusher", Game::Giants, Element::Earth, Type::Giant}},
@ -499,6 +499,7 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
{{3224, 0x4000}, {"Hot Streak", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3224, 0x4000}, {"Hot Streak", Game::Superchargers, Element::Fire, Type::Vehicle}},
{{3224, 0x4004}, {{3224, 0x4004},
{"Hot Streak (Event Exclusive)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {"Hot Streak (Event Exclusive)", Game::Superchargers, Element::Fire, Type::Vehicle}},
{{3224, 0x411F}, {"Hot Streak (Mobile)", Game::Superchargers, Element::Fire, Type::Vehicle}},
{{3224, 0x4402}, {"Hot Streak (Dark)", Game::Superchargers, Element::Fire, Type::Vehicle}}, {{3224, 0x4402}, {"Hot Streak (Dark)", Game::Superchargers, Element::Fire, Type::Vehicle}},
{{3224, 0x441E}, {"Hot Streak (Golden)", 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}}, {{3224, 0x450F}, {"Hot Streak (Instant)", Game::Superchargers, Element::Fire, Type::Vehicle}},