From b5f7ed050093b9c233c22eb6f3bef5bf9653df93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Mon, 21 Jun 2021 18:39:48 +0200
Subject: rename into font.c and add headers

---
 include/font.h | 25 ++++++++++++++++++++++++-
 include/text.h |  1 -
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/font.h b/include/font.h
index e5e64e88..bddf6411 100644
--- a/include/font.h
+++ b/include/font.h
@@ -1,6 +1,29 @@
 #ifndef POKEDIAMOND_FONT_H
 #define POKEDIAMOND_FONT_H
 
-extern s32 GetFontAttribute(u8 fontId, s32 attr);
+#include "global.h"
+#include "text.h"
+
+struct UnkStruct_02002C14
+{
+    const char buf[0x80];
+    u8 width;
+    u8 height;
+    void *unk84[4];
+    void *unk94[4];
+};
+
+void FUN_02002C14();
+void FUN_02002C50(u32 param0, u32 param1);
+void FUN_02002C84(s32 param0, u32 param1);
+void FUN_02002CC0(s32 param0);
+void FUN_02002CF8(s32 param0);
+struct UnkStruct_02002C14 *FUN_02002D94(u32 param0, u32 param1);
+u32 FontFunc(u32 fontId, struct TextPrinter *printer);
+u32 FUN_02002DE0(u32 param0, u16 *str, u32 param2);
+u32 FUN_02002E14(u32 param0, struct String *str, u32 param2);
+s32 GetFontAttribute(u8 fontId, s32 attr);
+void FUN_02002ED0(u32 layer, u32 baseAddr, u32 heap_id);
+void FUN_02002EEC(u32 layer, u32 baseAddr, u32 heap_id);
 
 #endif // POKEDIAMOND_FONT_H
diff --git a/include/text.h b/include/text.h
index 034447c7..ad0698a0 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,7 +2,6 @@
 #define POKEDIAMOND_TEXT_H
 
 #include "global.h"
-#include "font.h"
 #include "bg_window.h"
 
 
-- 
cgit v1.2.3


From 153430dda98d33ecabac5813c08226f20f63c053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Mon, 21 Jun 2021 19:59:09 +0200
Subject: match FUN_02002CF8

---
 include/font.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/font.h b/include/font.h
index bddf6411..3818fb7b 100644
--- a/include/font.h
+++ b/include/font.h
@@ -17,7 +17,7 @@ void FUN_02002C14();
 void FUN_02002C50(u32 param0, u32 param1);
 void FUN_02002C84(s32 param0, u32 param1);
 void FUN_02002CC0(s32 param0);
-void FUN_02002CF8(s32 param0);
+void FUN_02002CF8(int param0);
 struct UnkStruct_02002C14 *FUN_02002D94(u32 param0, u32 param1);
 u32 FontFunc(u32 fontId, struct TextPrinter *printer);
 u32 FUN_02002DE0(u32 param0, u16 *str, u32 param2);
-- 
cgit v1.2.3