Merge branch 'master' into fix-fdxb-iso

Signed-off-by: Iceman <iceman@iuse.se>
This commit is contained in:
Iceman authored and GitHub committed 2026-11-08 08:02:48 +08:00
commit 6f3c6759d9
2 files changed
+8 -7

No files matched your search

+4 -4
View File
@@ -6,8 +6,8 @@ local ansicolors = require('ansicolors')
local amiibo_tools = require('amiibo_tools')
copyright = ''
author = 'George Talusan, modified by Lee Hambley'
version = 'v0.0.3'
author = 'George Talusan, modified by Lee Hambley and tpglitch'
version = 'v0.0.4'
desc = [[
This script will try to load a binary datadump of an Amiibo.
It will recalculate PWD and PACK if necessary.
@@ -82,10 +82,10 @@ local function LoadEmulator(uid, blocks)
io.write('.')
io.flush()
core.clearCommandBuffer()
-- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + data
-- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + flags (uint8_t) + data
local block_lo = bit32.band(i, 0xff)
local block_hi = bit32.rshift(i, 8)
local payload = ('%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4)..blockdata
local payload = ('%02x%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4, 0)..blockdata
cmd = Command:newNG{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, data = payload}
local err, msg = cmd:sendNG(true)
if err == nil then return err, msg end