Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 60 additions & 10 deletions source/amiibolookup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -751,17 +751,17 @@ static map<uint16_t, const char*> idList = {
{0x0392,"Shovel Knight Gold Edition (SHK)"},
{0x0393,"Pawapuro (JPPB)"},
{0x0394,"Ikari (JPPB)"},
{0x0395,"Daijobu (JJPB)"},
{0x0396,"Hayakawa (JJPB)"},
{0x0397,"Yabe (JJPB)"},
{0x0398,"Ganda (JJPB)"},
{0x0395,"Yabe (JPPB)"},
{0x0396,"Hayakawa (JPPB)"},
{0x0397,"Ganda (JPPB)"},
{0x0398,"Daijobu (JPPB)"},
{0x0399,"Link (Link's Awakening) (ZLA)"},
{0x039B,"Mario Power-Up Band (SMB)"},
{0x039C,"Luigi Power-Up Band (SMB)"},
{0x039D,"Peach Power-Up Band (SMB)"},
{0x039E,"Daisy Power-Up Band (SMB)"},
{0x039F,"Yoshi Power-Up Band (SMB)"},
{0x03A0,"Toad Power-Up Band (SMB)"},
{0x039B,"Mario Power-Up Band (SNW)"},
{0x039C,"Luigi Power-Up Band (SNW)"},
{0x039D,"Peach Power-Up Band (SNW)"},
{0x039E,"Daisy Power-Up Band (SNW)"},
{0x039F,"Yoshi Power-Up Band (SNW)"},
{0x03A0,"Toad Power-Up Band (SNW)"},
{0x03A1,"Joker (SSB)"},
{0x03A2,"Hero (SSB)"},
{0x03A3,"Banjo & Kazooie (SSB)"},
Expand Down Expand Up @@ -827,9 +827,14 @@ static map<uint16_t, const char*> idList = {
{0x0413,"E.M.M.I. (MET)"},
{0x0414,"Zelda & Loftwing (ZSS)"},
{0x0415,"Inkling (Yellow) (SPL)"},
{0x0418,"Link (TOTK)"},
{0x0419,"Zelda (TOTK)"},
{0x041A,"Ganondorf (TOTK)"},
{0x041B,"Octoling (Blue) (SPL)"},
{0x041C,"Smallfry (SPL)"},
{0x041D,"Min Min (SSB)"},
{0x041E,"Pyra (SSB)"},
{0x041F,"Mythra (SSB)"},
{0x0420,"Kazuya (SSB)"},
{0x0421,"Sephiroth (SSSB)"},
{0x0422,"Steve (SSB)"},
Expand All @@ -844,6 +849,50 @@ static map<uint16_t, const char*> idList = {
{0x042B,"Palico 'Felyne Malzeno X' (MHR)"},
{0x042C,"Palamute 'Canyne Malzeno X' (MHR)"},
{0x042D,"Malzeno (MHR)"},
{0x042E,"Sora (SSB)"},
{0x042F,"Donkey Kong and Pauline (DKB)"},
{0x0430,"Gold Mario Power-Up Band (SNW)"},
{0x0431,"Donkey Kong Power-Up Band (SNW)"},
{0x0432,"Diddy Kong Power-Up Band (SNW)"},
{0x0433,"Shiver (SPL)"},
{0x0434,"Frye (SPL)"},
{0x0435,"Big Man (SPL)"},
{0x0436,"Callie (Alterna) (SPL)"},
{0x0437,"Marie (Alterna) (SPL)"},
{0x0438,"Pearl (Side Order) (SPL)"},
{0x0439,"Marina (Side Order) (SPL)"},
{0x043D,"Noah (XC3)"},
{0x043E,"Mio (XC3)"},
{0x043F,"Mario (MMWB)"},
{0x0440,"Luigi (MMWB)"},
{0x0441,"Peach (MMWB)"},
{0x0442,"Yoshi (MMWB)"},
{0x04A3,"Riju (TOTK)"},
{0x04A4,"Sidon (TOTK)"},
{0x04A5,"Tulin (TOTK)"},
{0x04A6,"Yunobo (TOTK)"},
{0x04A8,"Ryu (SF6)"},
{0x04A9,"Ken (SF6)"},
{0x04AB,"Luke (SF6)"},
{0x04AD,"Jamie (SF6)"},
{0x04AF,"Kimberly (SF6)"},
{0x04B0,"Chun-Li (SF6)"},
{0x04B1,"Guile (SF6)"},
{0x04B2,"Juri (SF6)"},
{0x04B3,"Blanka (SF6)"},
{0x04B4,"Dhalsim (SF6)"},
{0x04B5,"E.Honda (SF6)"},
{0x04B6,"Dee Jay (SF6)"},
{0x04B7,"Manon (SF6)"},
{0x04B8,"Marisa (SF6)"},
{0x04B9,"JP (SF6)"},
{0x04BA,"Zangief (SF6)"},
{0x04BB,"Lily (SF6)"},
{0x04BC,"Cammy (SF6)"},
{0x04BD,"Rashid (SF6)"},
{0x04BE,"A.K.I. (SF6)"},
{0x04BF,"ED (SF6)"},
{0x04C0,"Akuma (SF6)"},
};

struct AmiiboIdStruct* parseCharData(const uint8_t* data) {
Expand Down Expand Up @@ -2579,3 +2628,4 @@ int getNameByHexId(uint16_t id, char *name, int length) {
strcpy(name, val);
return len;
}

Loading