From 1ffded6b490c23db809aa46c5c186dd8d554b271 Mon Sep 17 00:00:00 2001
From: Prakxo <87568477+Prakxo@users.noreply.github.com>
Date: Wed, 3 Apr 2024 00:09:06 +0200
Subject: m_string OK (#162)

* m_string OK

* replace with defines
---
 include/6B3DC0.h     |  2 +-
 include/6E7AD0.h     | 17 -----------------
 include/m_msg_main.h |  2 +-
 include/m_string.h   | 19 +++++++++++++++++++
 4 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 include/6E7AD0.h
 create mode 100644 include/m_string.h

(limited to 'include')

diff --git a/include/6B3DC0.h b/include/6B3DC0.h
index 04d1df6..37e5715 100644
--- a/include/6B3DC0.h
+++ b/include/6B3DC0.h
@@ -67,6 +67,6 @@ void func_80091074_jp(struct GraphicsContext* gfxCtx);
 // void func_80092468_jp();
 // void func_800924CC_jp();
 // void func_80092538_jp();
-// void func_8009264C_jp();
+s32 mFont_UnintToString(char*, u32, s32, s32, s32); 
 
 #endif
diff --git a/include/6E7AD0.h b/include/6E7AD0.h
deleted file mode 100644
index 00d74f5..0000000
--- a/include/6E7AD0.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef C_6E7AD0_H
-#define C_6E7AD0_H
-
-#include "ultra64.h"
-
-// void func_800C3E30_jp();
-void mString_Load_StringFromRom(char* buffer, s32 buffer_len, s32 arg2);
-// void func_800C4084_jp();
-// void func_800C40F8_jp();
-// void func_800C4168_jp();
-// void func_800C41B8_jp();
-// void func_800C4228_jp();
-// void func_800C42E8_jp();
-// void func_800C4350_jp();
-// void func_800C43B8_jp();
-
-#endif
diff --git a/include/m_msg_main.h b/include/m_msg_main.h
index 2fbefee..fbb49f2 100644
--- a/include/m_msg_main.h
+++ b/include/m_msg_main.h
@@ -76,7 +76,7 @@ void mMsg_Set_mail_str(UNK_PTR arg0, s32 arg1, char* str, s32 size);
 // void func_8009E6C4_jp();
 // void func_8009E6D4_jp();
 // void func_8009E6F8_jp();
-// void func_8009E8D0_jp();
+size_t mMsg_Get_Length_String(char*, s32);
 // void func_8009E908_jp();
 // void func_8009E94C_jp();
 // void func_8009E970_jp();
diff --git a/include/m_string.h b/include/m_string.h
new file mode 100644
index 0000000..f336639
--- /dev/null
+++ b/include/m_string.h
@@ -0,0 +1,19 @@
+#ifndef C_6E7AD0_H
+#define C_6E7AD0_H
+
+#include "ultra64.h"
+#include "lb_rtc.h"
+#include "libc/stdint.h"
+
+void mString_Get_StringDataAddressAndSize(s32 idx, uintptr_t* vramp, size_t* size);
+void mString_Load_StringFromRom(char* dst, s32 dstLen, s32 strIdx);
+s32 mString_Load_YearStringFromRom(char* dst, lbRTC_year_t year);
+s32 mString_Load_MonthStringFromRom(char* dst, lbRTC_month_t month);
+s32 mString_Load_WeekStringFromRom(char* dst, lbRTC_weekday_t weekday);
+s32 mString_Load_DayStringFromRom(char* dst, lbRTC_day_t day);
+s32 mString_Load_HourStringFromRom(char* dst, lbRTC_hour_t hour);
+s32 mString_Load_MinStringFromRom(char* dst, lbRTC_min_t min);
+s32 mString_Load_SecStringFromRom(char* dst, lbRTC_sec_t sec);
+s32 mString_Load_NumberStringAddUnitFromRom(char* dst, u16 num, s32 idx);
+
+#endif
-- 
cgit v1.2.3