diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2022-08-31 02:28:37 +0200 |
---|---|---|
committer | german77 <juangerman-13@hotmail.com> | 2022-09-07 08:04:00 +0200 |
commit | caa138b33f6bbc18cde4d403017dad6bd4387e13 (patch) | |
tree | 7de25f6a4f3f17e2beff0711e01119bedde15c2e /src/core/hle/service/nfp/nfp.h | |
parent | core: nfp: Implement Convert and RecreateApplicationArea, accuracy fixes (diff) | |
download | yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar.gz yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar.bz2 yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar.lz yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar.xz yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.tar.zst yuzu-caa138b33f6bbc18cde4d403017dad6bd4387e13.zip |
Diffstat (limited to 'src/core/hle/service/nfp/nfp.h')
-rw-r--r-- | src/core/hle/service/nfp/nfp.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/hle/service/nfp/nfp.h b/src/core/hle/service/nfp/nfp.h index 6b979daba..0de0b48e7 100644 --- a/src/core/hle/service/nfp/nfp.h +++ b/src/core/hle/service/nfp/nfp.h @@ -22,6 +22,8 @@ enum class NpadIdType : u32; } // namespace Core::HID namespace Service::NFP { +using AmiiboName = std::array<char, (amiibo_name_length * 4) + 1>; + struct TagInfo { TagUuid uuid; u8 uuid_length; @@ -59,9 +61,9 @@ struct RegisterInfo { u16 first_write_year; u8 first_write_month; u8 first_write_day; - std::array<u8, 0xA + 1> amiibo_name; - u8 unknown; - INSERT_PADDING_BYTES(0x98); + AmiiboName amiibo_name; + u8 font_region; + INSERT_PADDING_BYTES(0x7A); }; static_assert(sizeof(RegisterInfo) == 0x100, "RegisterInfo is an invalid size"); @@ -109,6 +111,8 @@ public: std::shared_ptr<Module> module; private: + AmiiboName GetAmiiboName(const AmiiboSettings& settings) const; + const Core::HID::NpadIdType npad_id; bool is_data_decoded{}; |