From caa138b33f6bbc18cde4d403017dad6bd4387e13 Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Tue, 30 Aug 2022 19:28:37 -0500
Subject: core: nfp: Correct date and amiibo name

---
 src/core/hle/service/nfp/nfp.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/service/nfp/nfp.h')

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{};
-- 
cgit v1.2.3