From 2f7083a59af93ff7750967b74c9cba16f3b0eab6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Jul 2022 07:45:57 +0200
Subject: [PATCH] text

---
 client/src/cmdhfmf.c  | 10 +++++++---
 client/src/cmdhfmfu.c |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index b98e7bc1f..b5d061215 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -3421,18 +3421,22 @@ void readerAttack(sector_t *k_sector, uint8_t k_sectorsCount, nonces_t data, boo
 static int CmdHF14AMfSim(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf mf sim",
-                  "Simulate MIFARE Classic card",
+                  "Simulate MIFARE Classic family type based upon\n"
+                  "ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n"
+                  "from emulator memory.  See `hf mf eload` first.\n"
+                  "The UID from emulator memory will be used if not specified.",
                   "hf mf sim --mini                    --> MIFARE Mini\n"
                   "hf mf sim --1k                      --> MIFARE Classic 1k (default)\n"
                   "hf mf sim --1k -u 0a0a0a0a          --> MIFARE Classic 1k with 4b UID\n"
                   "hf mf sim --1k -u 11223344556677    --> MIFARE Classic 1k with 7b UID\n"
                   "hf mf sim --1k -u 11223344 -i -x    --> Perform reader attack in interactive mode\n"
                   "hf mf sim --2k                      --> MIFARE 2k\n"
-                  "hf mf sim --4k                      --> MIFARE 4k");
+                  "hf mf sim --4k                      --> MIFARE 4k"
+                  );
 
     void *argtable[] = {
         arg_param_begin,
-        arg_str0("u", "uid", "<hex>", "UID 4,7 or 10bytes. If not specified, the UID 4b/7b from emulator memory will be used"),
+        arg_str0("u", "uid", "<hex>", "<4|7|10> hex bytes UID"),
         arg_lit0(NULL, "mini", "MIFARE Classic Mini / S20"),
         arg_lit0(NULL, "1k", "MIFARE Classic 1k / S50"),
         arg_lit0(NULL, "2k", "MIFARE Classic/Plus 2k"),
diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c
index 20b443787..60196afbd 100644
--- a/client/src/cmdhfmfu.c
+++ b/client/src/cmdhfmfu.c
@@ -2716,6 +2716,7 @@ static int CmdHF14AMfUeLoad(const char *Cmd) {
     int res = CmdHF14AMfELoad(nc);
     free(nc);
 
+    PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfu sim -t 7`") " to simulate an Amiibo.");
     return res;
 }
 //
@@ -2727,9 +2728,11 @@ static int CmdHF14AMfUSim(const char *Cmd) {
                   "Simulate MIFARE Ultralight family type based upon\n"
                   "ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n"
                   "from emulator memory.  See `hf mfu eload` first. \n"
+                  "The UID from emulator memory will be used if not specified.\n"
                   "See `hf 14a sim -h` to see available types. You want 2 or 7 usually.",
                   "hf mfu sim -t 2 --uid 11223344556677        -> MIFARE Ultralight\n"
-                  "hf mfu sim -t 7 --uid 11223344556677 -n 5   -> AMIIBO (NTAG 215),  pack 0x8080"
+                  "hf mfu sim -t 7 --uid 11223344556677 -n 5   -> Amiibo (NTAG 215),  pack 0x8080\n"
+                  "hf mfu sim -t 7                             -> Amiibo (NTAG 215),  pack 0x8080"
                  );
 
     void *argtable[] = {