dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-06 15:23:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13105 from lycheefox/skylanders

Browse Source 
Skylanders: Fix Head Rush (Nitro)
This commit is contained in:
JMC47 2024-10-06 11:21:32 -04:00 committed by GitHub
commit d78b76790d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,7 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
{{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}},
{{455, 0x3402}, {"Head Rush (Nitro)", Game::TrapTeam, Element::Earth, Type::TrapMaster}},
{{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}},
@ -929,7 +929,7 @@ int SkylanderUSB::SubmitTransfer(std::unique_ptr<CtrlMessage> cmd)
// The 4 bytes {55, 00, 00, 55} are the status of characters on the portal. The 4 bytes are
// treated as a 32-bit binary array. Each unique Skylander placed on a board is represented
// by 2 bits starting with the first Skylander in the least significant bit. This bit is
// present whenever the Skylandar is added or present on the portal. When the Skylander is
// present whenever the Skylander is added or present on the portal. When the Skylander is
// added to the board, both bits are set in the next status message as a one-time signal.
// When a Skylander is removed from the board, only the most significant bit of the 2 bits
// is set.