diff options
-rw-r--r-- | src/data/text/font0_widths.h (renamed from include/fonts/font0_widths.h) | 6 | ||||
-rw-r--r-- | src/data/text/font1_widths.h (renamed from include/fonts/font1_widths.h) | 6 | ||||
-rw-r--r-- | src/data/text/font3_widths.h (renamed from include/fonts/font3_widths.h) | 6 | ||||
-rw-r--r-- | src/data/text/font4_widths.h (renamed from include/fonts/font4_widths.h) | 6 | ||||
-rw-r--r-- | src/data/text/type1_map.h (renamed from include/fonts/type1_map.h) | 3 | ||||
-rw-r--r-- | src/data/text/type3_map.h (renamed from include/fonts/type3_map.h) | 3 | ||||
-rw-r--r-- | src/text.c | 14 |
7 files changed, 18 insertions, 26 deletions
diff --git a/include/fonts/font0_widths.h b/src/data/text/font0_widths.h index 77fcff3ee..ff102ecec 100644 --- a/include/fonts/font0_widths.h +++ b/src/data/text/font0_widths.h @@ -1,6 +1,5 @@ #if REVISION >= 1 -static const u8 sFont0Widths[] = -{ +static const u8 sFont0Widths[] = { 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8, @@ -19,8 +18,7 @@ static const u8 sFont0Widths[] = 3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1, }; #else -static const u8 sFont0Widths[] = -{ +static const u8 sFont0Widths[] = { 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 5, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, diff --git a/include/fonts/font1_widths.h b/src/data/text/font1_widths.h index 454bbfaca..05b4da130 100644 --- a/include/fonts/font1_widths.h +++ b/src/data/text/font1_widths.h @@ -1,6 +1,5 @@ #if REVISION >= 1 -static const u8 sFont1Widths[] = -{ +static const u8 sFont1Widths[] = { 5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5, @@ -17,8 +16,7 @@ static const u8 sFont1Widths[] = 5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5, }; #else -static const u8 sFont1Widths[] = -{ +static const u8 sFont1Widths[] = { 5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5, diff --git a/include/fonts/font3_widths.h b/src/data/text/font3_widths.h index 45dc69c06..d84cbdf73 100644 --- a/include/fonts/font3_widths.h +++ b/src/data/text/font3_widths.h @@ -1,6 +1,5 @@ #if REVISION >= 1 -static const u8 sFont3Widths[] = -{ +static const u8 sFont3Widths[] = { 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8, @@ -19,8 +18,7 @@ static const u8 sFont3Widths[] = 3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1, }; #else -static const u8 sFont3Widths[] = -{ +static const u8 sFont3Widths[] = { 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, diff --git a/include/fonts/font4_widths.h b/src/data/text/font4_widths.h index 63adf4921..bfa30b8e1 100644 --- a/include/fonts/font4_widths.h +++ b/src/data/text/font4_widths.h @@ -1,6 +1,5 @@ #if REVISION >= 1 -static const u8 sFont4Widths[] = -{ +static const u8 sFont4Widths[] = { 5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5, @@ -17,8 +16,7 @@ static const u8 sFont4Widths[] = 5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5, }; #else -static const u8 sFont4Widths[] = -{ +static const u8 sFont4Widths[] = { 5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5, diff --git a/include/fonts/type1_map.h b/src/data/text/type1_map.h index 45e42f62c..ff22e560a 100644 --- a/include/fonts/type1_map.h +++ b/src/data/text/type1_map.h @@ -1,5 +1,4 @@ -static const u8 sFontType1Map[] = -{ +static const u8 sFontType1Map[] = { 0xD4, 0xD4, 0xD4, 0x31, 0xD4, 0x32, diff --git a/include/fonts/type3_map.h b/src/data/text/type3_map.h index 48219423b..cb3694b39 100644 --- a/include/fonts/type3_map.h +++ b/src/data/text/type3_map.h @@ -1,5 +1,4 @@ -static const u8 sFontType3Map[] = -{ +static const u8 sFontType3Map[] = { 0x00, 0x10, 0x01, 0x10, 0x02, 0x10, diff --git a/src/text.c b/src/text.c index 02cafea48..b27084b86 100644 --- a/src/text.c +++ b/src/text.c @@ -218,12 +218,14 @@ static const u8 sFont1JapaneseGlyphs[] = INCBIN_U8("graphics/fonts/font1_jpn.1bp static const u8 sBrailleGlyphs[] = INCBIN_U8("graphics/fonts/font6_braille.1bpp"); static const u32 sDownArrowTiles[] = INCBIN_U32("graphics/fonts/down_arrow.4bpp"); -#include "fonts/type1_map.h" -#include "fonts/type3_map.h" -#include "fonts/font1_widths.h" -#include "fonts/font4_widths.h" -#include "fonts/font0_widths.h" -#include "fonts/font3_widths.h" +// clang-format off +#include "data/text/type1_map.h" +#include "data/text/type3_map.h" +#include "data/text/font1_widths.h" +#include "data/text/font4_widths.h" +#include "data/text/font0_widths.h" +#include "data/text/font3_widths.h" +// clang-format on const u16 gUnknownPalette_81E6692[] = INCBIN_U16("graphics/fonts/unknown_81E6692.gbapal"); const u16 gFontDefaultPalette[] = INCBIN_U16("graphics/fonts/default.gbapal"); |