H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-18 11:23:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct Eon's Elite Zook and Slam Bam

Browse Source 
They're 0x4810, not 0x3810, 0x4XXX means superchargers, 0x3XXX means trap team.
This commit is contained in:
NefariousTechSupport 2026-03-14 02:16:14 +00:00 committed by GitHub
parent 7a45ede688
commit 5bfb0a0ee0
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

@ -74,7 +74,7 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
{{15, 0x0000}, {"Slam Bam", Game::SpyrosAdv, Element::Water, Type::Skylander}}, {{15, 0x0000}, {"Slam Bam", Game::SpyrosAdv, Element::Water, Type::Skylander}},
{{15, 0x1801}, {"Slam Bam (S2)", Game::Giants, Element::Water, Type::Skylander}}, {{15, 0x1801}, {"Slam Bam (S2)", Game::Giants, Element::Water, Type::Skylander}},
{{15, 0x1C03}, {"Slam Bam (Legendary)", Game::Giants, Element::Water, Type::Skylander}}, {{15, 0x1C03}, {"Slam Bam (Legendary)", Game::Giants, Element::Water, Type::Skylander}},
{{15, 0x3810}, {{15, 0x4810},
{"Slam Bam (Eon's Elite)", Game::Superchargers, Element::Water, Type::Skylander}}, {"Slam Bam (Eon's Elite)", Game::Superchargers, Element::Water, Type::Skylander}},
{{16, 0x0000}, {"Spyro", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, {{16, 0x0000}, {"Spyro", Game::SpyrosAdv, Element::Magic, Type::Skylander}},
{{16, 0x1801}, {"Spyro (S2)", Game::Giants, Element::Magic, Type::Skylander}}, {{16, 0x1801}, {"Spyro (S2)", Game::Giants, Element::Magic, Type::Skylander}},
@ -108,7 +108,7 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
{{25, 0x0000}, {"Zook", Game::SpyrosAdv, Element::Life, Type::Skylander}}, {{25, 0x0000}, {"Zook", Game::SpyrosAdv, Element::Life, Type::Skylander}},
{{25, 0x1801}, {"Zook (S2)", Game::Giants, 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, 0x1812}, {"Zook (Stone)", Game::Giants, Element::Life, Type::Skylander}},
{{25, 0x3810}, {"Zook (Eon's Elite)", Game::Superchargers, Element::Life, Type::Skylander}}, {{25, 0x4810}, {"Zook (Eon's Elite)", Game::Superchargers, Element::Life, Type::Skylander}},
{{26, 0x0000}, {"Stealth Elf", Game::SpyrosAdv, 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, 0x1801}, {"Stealth Elf (S2)", Game::Giants, Element::Life, Type::Skylander}},
{{26, 0x1C03}, {"Stealth Elf (Legendary)", Game::Giants, Element::Life, Type::Skylander}}, {{26, 0x1C03}, {"Stealth Elf (Legendary)", Game::Giants, Element::Life, Type::Skylander}},