Convert fonts.s to C

Iceman8911 · Oct 31, 2021 · 36039e1 · 36039e1
1 parent fdaf436
commit 36039e1
Show file tree

Hide file tree

Showing 28 changed files with 336 additions and 384 deletions.
diff --git a/data/fonts.s b/data/fonts.s
diff --git a/gflib/text.c b/gflib/text.c
@@ -11,6 +11,7 @@
 #include "blit.h"
 #include "menu.h"
 #include "dynamic_placeholder_text_util.h"
+#include "fonts.h"
 
 static u16 FontFunc_Small(struct TextPrinter *);
 static u16 FontFunc_Normal(struct TextPrinter *);
@@ -222,22 +223,7 @@ static const u8 sMenuCursorDimensions[][2] =
     [FONT_BOLD]         = {}
 };
 
-const u16 gFontBoldJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/bold_glyphs.hwjpnfont");
-
-extern const u16 gFontNormalLatinGlyphs[];
-extern const u8 gFontNormalLatinGlyphWidths[];
-extern const u16 gFontNormalJapaneseGlyphs[];
-extern const u16 gFontSmallLatinGlyphs[];
-extern const u8 gFontSmallLatinGlyphWidths[];
-extern const u16 gFontSmallJapaneseGlyphs[];
-extern const u16 gFontShortLatinGlyphs[];
-extern const u8 gFontShortLatinGlyphWidths[];
-extern const u16 gFontShortJapaneseGlyphs[];
-extern const u8 gFontShortJapaneseGlyphWidths[];
-extern const u16 gFontNarrowLatinGlyphs[];
-extern const u8 gFontNarrowLatinGlyphWidths[];
-extern const u16 gFontSmallNarrowLatinGlyphs[];
-extern const u8 gFontSmallNarrowLatinGlyphWidths[];
+const u16 gFontBoldJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/bold.hwjpnfont");
 
 static void SetFontsPointer(const struct FontInfo *fonts)
 {
@@ -1510,7 +1496,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
     return width;
 }
 
-u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
+u8 RenderTextHandleBold(u8 *pixels, u8 fontId, u8 *str)
 {
     u8 shadowColor;
     u8 *strLocal;

diff --git a/gflib/text.h b/gflib/text.h
@@ -147,7 +147,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter);
 void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
 u16 RenderText(struct TextPrinter *textPrinter);
 s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing);
-u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str);
+u8 RenderTextHandleBold(u8 *pixels, u8 fontId, u8 *str);
 u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y);
 u8 GetKeypadIconTileOffset(u8 keypadIconId);
 u8 GetKeypadIconWidth(u8 keypadIconId);

diff --git a/graphics/fonts/bold_japanese.png → graphics/fonts/japanese_bold.png b/graphics/fonts/bold_japanese.png → graphics/fonts/japanese_bold.png
diff --git a/...onts/unused_japanese_frlg_female_font.png → graphics/fonts/japanese_frlg_female_font.png b/...onts/unused_japanese_frlg_female_font.png → graphics/fonts/japanese_frlg_female_font.png
diff --git a/.../fonts/unused_japanese_frlg_male_font.png → graphics/fonts/japanese_frlg_male_font.png b/.../fonts/unused_japanese_frlg_male_font.png → graphics/fonts/japanese_frlg_male_font.png
diff --git a/graphics/fonts/normal/japanese.png → graphics/fonts/japanese_normal.png b/graphics/fonts/normal/japanese.png → graphics/fonts/japanese_normal.png
diff --git a/graphics/fonts/short/japanese.png → graphics/fonts/japanese_short.png b/graphics/fonts/short/japanese.png → graphics/fonts/japanese_short.png
diff --git a/graphics/fonts/small/japanese.png → graphics/fonts/japanese_small.png b/graphics/fonts/small/japanese.png → graphics/fonts/japanese_small.png
diff --git a/graphics/fonts/narrow/latin.png → graphics/fonts/latin_narrow.png b/graphics/fonts/narrow/latin.png → graphics/fonts/latin_narrow.png
diff --git a/graphics/fonts/normal/latin.png → graphics/fonts/latin_normal.png b/graphics/fonts/normal/latin.png → graphics/fonts/latin_normal.png
diff --git a/graphics/fonts/short/latin.png → graphics/fonts/latin_short.png b/graphics/fonts/short/latin.png → graphics/fonts/latin_short.png
diff --git a/graphics/fonts/small/latin.png → graphics/fonts/latin_small.png b/graphics/fonts/small/latin.png → graphics/fonts/latin_small.png
diff --git a/graphics/fonts/small_narrow/latin.png → graphics/fonts/latin_small_narrow.png b/graphics/fonts/small_narrow/latin.png → graphics/fonts/latin_small_narrow.png
diff --git a/graphics/fonts/narrow/latin_widths.inc b/graphics/fonts/narrow/latin_widths.inc
diff --git a/graphics/fonts/normal/latin_widths.inc b/graphics/fonts/normal/latin_widths.inc
diff --git a/graphics/fonts/short/japanese_widths.inc b/graphics/fonts/short/japanese_widths.inc
diff --git a/graphics/fonts/short/latin_widths.inc b/graphics/fonts/short/latin_widths.inc
diff --git a/graphics/fonts/small/latin_widths.inc b/graphics/fonts/small/latin_widths.inc
diff --git a/graphics/fonts/small_narrow/latin_widths.inc b/graphics/fonts/small_narrow/latin_widths.inc
diff --git a/graphics/fonts/unused_japanese_frlg_female_font_widths.inc b/graphics/fonts/unused_japanese_frlg_female_font_widths.inc