diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-23 00:11:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 00:11:42 +0100 |
| commit | 5e61b9f18d4592bd964e238e2d3f45265f863cea (patch) | |
| tree | 4d57137cd2097018e31d2db19d72c22f51942834 /include | |
| parent | cec1d428f458997fe3e4c0ac4abf0dc6b36ba699 (diff) | |
| parent | 66d408a02664eabd153377fe3f4842da0da2d627 (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'include')
| -rw-r--r-- | include/font.h | 25 | ||||
| -rw-r--r-- | include/text.h | 1 |
2 files changed, 24 insertions, 2 deletions
diff --git a/include/font.h b/include/font.h index e5e64e88..3818fb7b 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(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); +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" |