Merge branch 'master' of github.com:Proxmark/proxmark3

diff --git a/client/cmddata.c b/client/cmddata.c
index 4d79eeaebda96bbe2ebf266c2eb39ec9646b6286..7b666c263550094f9e5f42d02dd8fc71dbd9f3fa 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -333,11 +333,11 @@ int Cmdaskmandemod(const char *Cmd)
     PrintAndLog("     <invert>, 1 for invert output");
     PrintAndLog("     [set maximum allowed errors], default = 100.");
     PrintAndLog("");
-    PrintAndLog("    sample: data askmandemod        = demod an ask/manchester tag from GraphBuffer");
-    PrintAndLog("          : data askmandemod 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
-    PrintAndLog("          : data askmandemod 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
-    PrintAndLog("          : data askmandemod 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
-    PrintAndLog("          : data askmandemod 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    PrintAndLog("    sample: data rawdemod am        = demod an ask/manchester tag from GraphBuffer");
+    PrintAndLog("          : data rawdemod am 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
+    PrintAndLog("          : data rawdemod am 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLog("          : data rawdemod am 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
+    PrintAndLog("          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
 
     return 0;
   }
@@ -514,13 +514,13 @@ int Cmdaskrawdemod(const char *Cmd)
     PrintAndLog("     [set maximum allowed errors], default = 100");
     PrintAndLog("     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
     PrintAndLog("");
-    PrintAndLog("    sample: data askrawdemod          = demod an ask tag from GraphBuffer");
-    PrintAndLog("          : data askrawdemod a        = demod an ask tag from GraphBuffer, amplified");
-    PrintAndLog("          : data askrawdemod 32       = demod an ask tag from GraphBuffer using a clock of RF/32");
-    PrintAndLog("          : data askrawdemod 32 1     = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
-    PrintAndLog("          : data askrawdemod 1        = demod an ask tag from GraphBuffer while inverting data");
-    PrintAndLog("          : data askrawdemod 64 1 0   = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-    PrintAndLog("          : data askrawdemod 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+    PrintAndLog("    sample: data rawdemod ar          = demod an ask tag from GraphBuffer");
+    PrintAndLog("          : data rawdemod ar a        = demod an ask tag from GraphBuffer, amplified");
+    PrintAndLog("          : data rawdemod ar 32       = demod an ask tag from GraphBuffer using a clock of RF/32");
+    PrintAndLog("          : data rawdemod ar 32 1     = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLog("          : data rawdemod ar 1        = demod an ask tag from GraphBuffer while inverting data");
+    PrintAndLog("          : data rawdemod ar 64 1 0   = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    PrintAndLog("          : data rawdemod ar 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
   }
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
@@ -830,13 +830,13 @@ int CmdFSKrawdemod(const char *Cmd)
     PrintAndLog("     [fchigh], larger field clock length, omit for autodetect");
     PrintAndLog("     [fclow], small field clock length, omit for autodetect");
     PrintAndLog("");
-    PrintAndLog("    sample: data fskrawdemod           = demod an fsk tag from GraphBuffer using autodetect");
-    PrintAndLog("          : data fskrawdemod 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
-    PrintAndLog("          : data fskrawdemod 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");   
-    PrintAndLog("          : data fskrawdemod 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
-    PrintAndLog("          : data fskrawdemod 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
-    PrintAndLog("          : data fskrawdemod 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
-    PrintAndLog("          : data fskrawdemod 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
+    PrintAndLog("    sample: data rawdemod fs           = demod an fsk tag from GraphBuffer using autodetect");
+    PrintAndLog("          : data rawdemod fs 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
+    PrintAndLog("          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");   
+    PrintAndLog("          : data rawdemod fs 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
+    PrintAndLog("          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
+    PrintAndLog("          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
+    PrintAndLog("          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
     return 0;
   }
   //set options from parameters entered with the command
@@ -1937,6 +1937,7 @@ int CmdTuneSamples(const char *Cmd)
                PrintAndLog("\n");
                GraphTraceLen = 256;
                ShowGraphWindow();
+               RepaintGraphWindow();
        }
 
        return 0;
@@ -2379,24 +2380,24 @@ static command_t CommandTable[] =
   {"help",          CmdHelp,            1, "This help"},
   {"amp",           CmdAmp,             1, "Amplify peaks"},
   //{"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
-  {"askedgedetect", CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave - default = 25"},
-  {"askem410xdemod",CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
+  {"askedgedetect", CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave (default = 25)"},
+  {"askem410xdemod",CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},
   //{"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
   //{"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},
   {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
-  {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in demod buffer (offset = 0|1 bits to shift the decode start)"},
+  {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   //{"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
   {"buffclear",     CmdBuffClear,       1, "Clear sample buffer and graph window"},
   {"dec",           CmdDec,             1, "Decimate samples"},
-  {"detectclock",   CmdDetectClockRate, 1, "[modulation] Detect clock rate (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
+  {"detectclock",   CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
   //{"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
-  {"fskawiddemod",  CmdFSKdemodAWID,    1, "Demodulate graph window as an AWID FSK tag using raw"},
+  {"fskawiddemod",  CmdFSKdemodAWID,    1, "Demodulate an AWID FSK tag from GraphBuffer"},
   //{"fskfcdetect",   CmdFSKfcDetect,     1, "Try to detect the Field Clock of an FSK wave"},
-  {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate graph window as a HID FSK tag using raw"},
-  {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate graph window as an IO Prox tag FSK using raw"},
-  {"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate graph window as a Pyramid FSK tag using raw"},
-  {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate graph window as a Paradox FSK tag using raw"},
+  {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate a HID FSK tag from GraphBuffer"},
+  {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate an IO Prox FSK tag from GraphBuffer"},
+  {"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate a Pyramid FSK tag from GraphBuffer"},
+  {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate a Paradox FSK tag from GraphBuffer"},
   //{"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to bin (clock = 50)(invert = 1|0)(rchigh = 10)(rclow=8)"},
   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
   {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
@@ -2406,18 +2407,18 @@ static command_t CommandTable[] =
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
   {"rtrim",         CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
   //{"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
-  {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream already in graph buffer"},
+  {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream in DemodBuffer"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
   {"norm",          CmdNorm,            1, "Normalize max/min to +/-128"},
   //{"nrzdetectclock",CmdDetectNRZClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
   //{"nrzrawdemod",   CmdNRZrawDemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate nrz tags and output binary (args optional)"},
   {"plot",          CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
   //{"pskdetectclock",CmdDetectPSKClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
-  {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Attempt to demodulate psk1 indala tags and output ID binary & hex (args optional)"},
+  {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},
   //{"psk1rawdemod",  CmdPSK1rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk1 tags and output binary (args optional)"},
   //{"psk2rawdemod",  CmdPSK2rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk2 tags and output binary (args optional)"},
-  {"rawdemod",      CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) - Attempt to demodulate the data in the GraphBuffer and output binary"},  
-  {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window"},
+  {"rawdemod",      CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
+  {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
   {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
   {"scale",         CmdScale,           1, "<int> -- Set cursor display scale"},
   {"setdebugmode",  CmdSetDebugMode,    1, "<0|1> -- Turn on or off Debugging Mode for demods"},

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index b843730f65fcd3dcd10a0145beed54682689d35c..c3ff7dd6d3976574b668ab5ec13fa5c0b398f8b3 100644 (file)
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -132,13 +132,23 @@ const productName uidmapping[] = {
        { 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
        { 0xE015000000000000LL, 16, "ATMEL France" },
        
-       { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)" },
-       { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034? no 'read', just 'readmulti'" },
-       { 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" },
-       { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
-       { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233;" },
-       { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" },
-       
+       { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
+       { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
+       { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
+       { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
+       { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
+       { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"}, 
+       { 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
+       { 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
+       { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
+       { 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" },
+       { 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"},
+       { 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"},
+       { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF  51x64bit "},
+       { 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" },
+       { 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" },
+       { 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" },
+
        { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
        { 0xE018000000000000LL, 16, "ZMD AG Germany" },
        { 0xE019000000000000LL, 16, "XICOR, Inc. USA" },

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index cd839ca1ef7d13b405e847b2f5d6e5b6c98787b4..048a29c9684e63ef5af729ba6a0debaab5347531 100644 (file)
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -74,6 +74,7 @@ local _names = {
        ["D200"]="MAGIC TRAP",
        ["D300"]="WATER TRAP",
        ["D400"]="AIR TRAP",
+       ["D500"]="UNDEAD TRAP",
        ["D600"]="TECH TRAP",
        ["D700"]="FIRE TRAP",
        ["D800"]="EARTH TRAP",
@@ -94,11 +95,11 @@ local _names = {
     --[[
        EXPANSION
     --]]
-       ["012C"]="DRAGON",
-       ["012D"]="ICE",
-       ["012E"]="PIRATE",
-       ["012F"]="UNDEAD",
-       ["0130"]="PVPUNLOCK",
+       ["012C"]="DRAGONS PEAK",
+       ["012D"]="EMPIRE OF ICE",
+       ["012E"]="PIRATE SEAS",
+       ["012F"]="DARKLIGHT CRYPT",
+       ["0130"]="VOLCANIC VAULT",
        ["0131"]="MIRROR OF MYSTERY",
        ["0132"]="NIGHTMARE EXPRESS",
        ["0133"]="SUNSCRAPER SPIRE",
@@ -117,39 +118,39 @@ local _names = {
     --]]
        ["01C2"]="TRAPTEAM GUSTO",
        ["01C3"]="TRAPTEAM THUNDERBOLT",
-       ["01C4"]="TRAPTEAM FLINGKONG",
+       ["01C4"]="TRAPTEAM FLING KONG",
        ["01C5"]="TRAPTEAM BLADES",
        ["01C6"]="TRAPTEAM WALLOP",
-       ["01C7"]="TRAPTEAM HEADRUSH",
-       ["01C8"]="TRAPTEAM FISTBUMP",
-       ["01C9"]="TRAPTEAM ROCKYROLL",
+       ["01C7"]="TRAPTEAM HEAD RUSH",
+       ["01C8"]="TRAPTEAM FIST BUMP",
+       ["01C9"]="TRAPTEAM ROCKY ROLL",
        ["01CA"]="TRAPTEAM WILDFIRE",
-       ["01CB"]="TRAPTEAM KABOOM",
-       ["01CC"]="TRAPTEAM TRAILBLAZER",
+       ["01CB"]="TRAPTEAM KA BOOM",
+       ["01CC"]="TRAPTEAM TRAIL BLAZER",
        ["01CD"]="TRAPTEAM TORCH",
-       ["01CE"]="TRAPTEAM SNAPSHOT",
-       ["01CF"]="TRAPTEAM LOBSTAR",
-       ["01D0"]="TRAPTEAM FLIPWRECK",
+       ["01CE"]="TRAPTEAM SNAP SHOT",
+       ["01CF"]="TRAPTEAM LOB STAR",
+       ["01D0"]="TRAPTEAM FLIP WRECK",
        ["01D1"]="TRAPTEAM ECHO",
        ["01D2"]="TRAPTEAM BLASTERMIND",
        ["01D3"]="TRAPTEAM ENIGMA",
-       ["01D4"]="TRAPTEAM DEJAVU",
+       ["01D4"]="TRAPTEAM DEJA VU",
        ["01D5"]="TRAPTEAM COBRA CADABRA",
        ["01D6"]="TRAPTEAM JAWBREAKER", 
        ["01D7"]="TRAPTEAM GEARSHIFT",
        ["01D8"]="TRAPTEAM CHOPPER",
-       ["01D9"]="TRAPTEAM TREADHEAD",
+       ["01D9"]="TRAPTEAM TREAD HEAD",
        ["01DA"]="TRAPTEAM BUSHWHACK",
        ["01DB"]="TRAPTEAM TUFF LUCK",
-       ["01DC"]="TRAPTEAM FOODFIGHT",
-       ["01DD"]="TRAPTEAM HIGHFIVE",
-       ["01DE"]="TRAPTEAM KRYPTKING",
-       ["01DF"]="TRAPTEAM SHORTCUT",
-       ["01E0"]="TRAPTEAM BATSPIN",
-       ["01E1"]="TRAPTEAM FUNNYBONE",
-       ["01E2"]="TRAPTEAM KNIGHTLIGHT",
+       ["01DC"]="TRAPTEAM FOOD FIGHT",
+       ["01DD"]="TRAPTEAM HIGH FIVE",
+       ["01DE"]="TRAPTEAM NITRO KRYPT KING",
+       ["01DF"]="TRAPTEAM SHORT CUT",
+       ["01E0"]="TRAPTEAM BAT SPIN",
+       ["01E1"]="TRAPTEAM FUNNY BONE",
+       ["01E2"]="TRAPTEAM KNIGHT LIGHT",
        ["01E3"]="TRAPTEAM SPOTLIGHT",
-       ["01E4"]="TRAPTEAM KNIGHTMARE",
+       ["01E4"]="TRAPTEAM KNIGHT MARE",
        ["01E5"]="TRAPTEAM BLACKOUT",
 
        --[[
@@ -161,12 +162,12 @@ local _names = {
        ["01F9"]="PET TERRAFIN",
        ["01FA"]="PET BREEZE",
        ["01FB"]="PET WEERUPTOR",
-       ["01FC"]="PET PETVAC",
-       ["01FD"]="PET SMALLFRY",
+       ["01FC"]="PET PET VAC",
+       ["01FD"]="PET SMALL FRY",
        ["01FE"]="PET DROBIT",
        ["0202"]="PET GILL GRUNT",
-       ["0207"]="PET TRIGGER HAPPY",
-       ["020E"]="PET STEALTH ELF",
+       ["0207"]="PET TRIGGER SNAPPY",
+       ["020E"]="PET WHISPER ELF",
        ["021C"]="PET BARKLEY",
        ["021D"]="PET THUMPLING",
        ["021E"]="PET MINI JINI",
@@ -182,14 +183,14 @@ local _names = {
        ["0BBC"]="SWAPFORCE HOG WILD FRYNO",
        ["0BBD"]="SWAPFORCE SMOLDER DASH",
        ["0BBE"]="SWAPFORCE BUMBLE BLAST",
-       ["0BBF"]="SWAPFORCE ZOOLOU",
+       ["0BBF"]="SWAPFORCE ZOO LOU",
        ["0BC0"]="SWAPFORCE DUNE BUG",
        ["0BC1"]="SWAPFORCE STAR STRIKE",
        ["0BC2"]="SWAPFORCE COUNTDOWN",
-       ["0BC3"]="SWAPFORCE WINDUP",
+       ["0BC3"]="SWAPFORCE WIND UP",
        ["0BC4"]="SWAPFORCE ROLLER BRAWL",
        ["0BC5"]="SWAPFORCE GRIM CREEPER",
-       ["0BC6"]="SWAPFORCE RIPTIDE",
-       ["0BC7"]="SWAPFORCE PUNKSHOCK",
+       ["0BC6"]="SWAPFORCE RIP TIDE",
+       ["0BC7"]="SWAPFORCE PUNK SHOCK",
 }
 return _names