Skip to content

Commit 2d2b3f4

Browse files
Merge pull request #23 from JaySea77/patch-3
Update amiibolookup.cpp
2 parents 04229ff + 6c26198 commit 2d2b3f4

1 file changed

Lines changed: 57 additions & 10 deletions

File tree

source/amiibolookup.cpp

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,17 +751,17 @@ static map<uint16_t, const char*> idList = {
751751
{0x0392,"Shovel Knight Gold Edition (SHK)"},
752752
{0x0393,"Pawapuro (JPPB)"},
753753
{0x0394,"Ikari (JPPB)"},
754-
{0x0395,"Daijobu (JJPB)"},
755-
{0x0396,"Hayakawa (JJPB)"},
756-
{0x0397,"Yabe (JJPB)"},
757-
{0x0398,"Ganda (JJPB)"},
754+
{0x0395,"Yabe (JPPB)"},
755+
{0x0396,"Hayakawa (JPPB)"},
756+
{0x0397,"Ganda (JPPB)"},
757+
{0x0398,"Daijobu (JPPB)"},
758758
{0x0399,"Link (Link's Awakening) (ZLA)"},
759-
{0x039B,"Mario Power-Up Band (SMB)"},
760-
{0x039C,"Luigi Power-Up Band (SMB)"},
761-
{0x039D,"Peach Power-Up Band (SMB)"},
762-
{0x039E,"Daisy Power-Up Band (SMB)"},
763-
{0x039F,"Yoshi Power-Up Band (SMB)"},
764-
{0x03A0,"Toad Power-Up Band (SMB)"},
759+
{0x039B,"Mario Power-Up Band (SNW)"},
760+
{0x039C,"Luigi Power-Up Band (SNW)"},
761+
{0x039D,"Peach Power-Up Band (SNW)"},
762+
{0x039E,"Daisy Power-Up Band (SNW)"},
763+
{0x039F,"Yoshi Power-Up Band (SNW)"},
764+
{0x03A0,"Toad Power-Up Band (SNW)"},
765765
{0x03A1,"Joker (SSB)"},
766766
{0x03A2,"Hero (SSB)"},
767767
{0x03A3,"Banjo & Kazooie (SSB)"},
@@ -833,6 +833,8 @@ static map<uint16_t, const char*> idList = {
833833
{0x041B,"Octoling (Blue) (SPL)"},
834834
{0x041C,"Smallfry (SPL)"},
835835
{0x041D,"Min Min (SSB)"},
836+
{0x041E,"Pyra (SSB)"},
837+
{0x041F,"Mythra (SSB)"},
836838
{0x0420,"Kazuya (SSB)"},
837839
{0x0421,"Sephiroth (SSSB)"},
838840
{0x0422,"Steve (SSB)"},
@@ -847,6 +849,50 @@ static map<uint16_t, const char*> idList = {
847849
{0x042B,"Palico 'Felyne Malzeno X' (MHR)"},
848850
{0x042C,"Palamute 'Canyne Malzeno X' (MHR)"},
849851
{0x042D,"Malzeno (MHR)"},
852+
{0x042E,"Sora (SSB)"},
853+
{0x042F,"Donkey Kong and Pauline (DKB)"},
854+
{0x0430,"Gold Mario Power-Up Band (SNW)"},
855+
{0x0431,"Donkey Kong Power-Up Band (SNW)"},
856+
{0x0432,"Diddy Kong Power-Up Band (SNW)"},
857+
{0x0433,"Shiver (SPL)"},
858+
{0x0434,"Frye (SPL)"},
859+
{0x0435,"Big Man (SPL)"},
860+
{0x0436,"Callie (Alterna) (SPL)"},
861+
{0x0437,"Marie (Alterna) (SPL)"},
862+
{0x0438,"Pearl (Side Order) (SPL)"},
863+
{0x0439,"Marina (Side Order) (SPL)"},
864+
{0x043D,"Noah (XC3)"},
865+
{0x043E,"Mio (XC3)"},
866+
{0x043F,"Mario (MMWB)"},
867+
{0x0440,"Luigi (MMWB)"},
868+
{0x0441,"Peach (MMWB)"},
869+
{0x0442,"Yoshi (MMWB)"},
870+
{0x04A3,"Riju (TOTK)"},
871+
{0x04A4,"Sidon (TOTK)"},
872+
{0x04A5,"Tulin (TOTK)"},
873+
{0x04A6,"Yunobo (TOTK)"},
874+
{0x04A8,"Ryu (SF6)"},
875+
{0x04A9,"Ken (SF6)"},
876+
{0x04AB,"Luke (SF6)"},
877+
{0x04AD,"Jamie (SF6)"},
878+
{0x04AF,"Kimberly (SF6)"},
879+
{0x04B0,"Chun-Li (SF6)"},
880+
{0x04B1,"Guile (SF6)"},
881+
{0x04B2,"Juri (SF6)"},
882+
{0x04B3,"Blanka (SF6)"},
883+
{0x04B4,"Dhalsim (SF6)"},
884+
{0x04B5,"E.Honda (SF6)"},
885+
{0x04B6,"Dee Jay (SF6)"},
886+
{0x04B7,"Manon (SF6)"},
887+
{0x04B8,"Marisa (SF6)"},
888+
{0x04B9,"JP (SF6)"},
889+
{0x04BA,"Zangief (SF6)"},
890+
{0x04BB,"Lily (SF6)"},
891+
{0x04BC,"Cammy (SF6)"},
892+
{0x04BD,"Rashid (SF6)"},
893+
{0x04BE,"A.K.I. (SF6)"},
894+
{0x04BF,"ED (SF6)"},
895+
{0x04C0,"Akuma (SF6)"},
850896
};
851897

852898
struct AmiiboIdStruct* parseCharData(const uint8_t* data) {
@@ -2588,3 +2634,4 @@ int getNameByHexId(uint16_t id, char *name, int length) {
25882634
strcpy(name, val);
25892635
return len;
25902636
}
2637+

0 commit comments

Comments
 (0)