Merge pull request #1003 from garakmon/move-fonts

move fonts from data/graphics/ to graphics/

29 files changed, 26 insertions, 26 deletions

diff --git a/data/fonts.s b/data/fonts.s
index aa8423acf..facc882ac 100644
--- a/data/fonts.s
+++ b/data/fonts.s
@@ -5,72 +5,72 @@
 
 	.align 2
 gFont8LatinGlyphs:: @ 862BAE4
-	.incbin "data/graphics/fonts/font8.latfont"
+	.incbin "graphics/fonts/font8.latfont"
 
 	.align 2
 gFont8LatinGlyphWidths:: @ 8633AE4
-	.include "data/graphics/fonts/font8_latin_widths.inc"
+	.include "graphics/fonts/font8_latin_widths.inc"
 
 	.align 2
 gFont0LatinGlyphs:: @ 8633CE4
-	.incbin "data/graphics/fonts/font0.latfont"
+	.incbin "graphics/fonts/font0.latfont"
 
 	.align 2
 gFont0LatinGlyphWidths:: @ 863BCE4
-	.include "data/graphics/fonts/font0_latin_widths.inc"
+	.include "graphics/fonts/font0_latin_widths.inc"
 
 	.align 2
 gFont7LatinGlyphs:: @ 863BEE4
-	.incbin "data/graphics/fonts/font7.latfont"
+	.incbin "graphics/fonts/font7.latfont"
 
 	.align 2
 gFont7LatinGlyphWidths:: @ 8643EE4
-	.include "data/graphics/fonts/font7_latin_widths.inc"
+	.include "graphics/fonts/font7_latin_widths.inc"
 
 	.align 2
 gFont2LatinGlyphs:: @ 86440E4
-	.incbin "data/graphics/fonts/font2.latfont"
+	.incbin "graphics/fonts/font2.latfont"
 
 	.align 2
 gFont2LatinGlyphWidths:: @ 864C0E4
-	.include "data/graphics/fonts/font2_latin_widths.inc"
+	.include "graphics/fonts/font2_latin_widths.inc"
 
 	.align 2
 gFont1LatinGlyphs:: @ 864C2E4
-	.incbin "data/graphics/fonts/font1.latfont"
+	.incbin "graphics/fonts/font1.latfont"
 
 	.align 2
 gFont1LatinGlyphWidths:: @ 86542E4
-	.include "data/graphics/fonts/font1_latin_widths.inc"
+	.include "graphics/fonts/font1_latin_widths.inc"
 
 	.align 2
 gFont0JapaneseGlyphs:: @ 86544E4
-	.incbin "data/graphics/fonts/font0.hwjpnfont"
+	.incbin "graphics/fonts/font0.hwjpnfont"
 
 	.align 2
 gFont1JapaneseGlyphs:: @ 86584E4
-	.incbin "data/graphics/fonts/font1.hwjpnfont"
+	.incbin "graphics/fonts/font1.hwjpnfont"
 
 	.align 2
 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
-	.incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont"
+	.incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
 
 	.align 2
 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
-	.include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
+	.include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
 
 	.align 2
 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
-	.incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont"
+	.incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
 
 	.align 2
 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
-	.include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
+	.include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
 
 	.align 2
 gFont2JapaneseGlyphs:: @ 866C8E4
-	.incbin "data/graphics/fonts/font2.fwjpnfont"
+	.incbin "graphics/fonts/font2.fwjpnfont"
 
 	.align 2
 gFont2JapaneseGlyphWidths:: @ 86748E4
-	.include "data/graphics/fonts/font2_japanese_widths.inc"
+	.include "graphics/fonts/font2_japanese_widths.inc"
diff --git a/gflib/text.c b/gflib/text.c
index 7e4fa7104..f7d71bd00 100644
--- a/gflib/text.c
+++ b/gflib/text.c
@@ -45,10 +45,10 @@ const u8 gFontHalfRowOffsets[] =
     0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00
 };
 
-const u8 gDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow.4bpp");
-const u8 gDarkDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow_RS.4bpp");
-const u8 gUnusedFRLGBlankedDownArrow[] = INCBIN_U8("data/graphics/fonts/unused_frlg_blanked_down_arrow.4bpp");
-const u8 gUnusedFRLGDownArrow[] = INCBIN_U8("data/graphics/fonts/unused_frlg_down_arrow.4bpp");
+const u8 gDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp");
+const u8 gDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp");
+const u8 gUnusedFRLGBlankedDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_blanked_down_arrow.4bpp");
+const u8 gUnusedFRLGDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_down_arrow.4bpp");
 const u8 gDownArrowYCoords[] = { 0x0, 0x1, 0x2, 0x1 };
 const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2, 0x4, 0x0 };
 
@@ -82,7 +82,7 @@ const struct KeypadIcon gKeypadIcons[] =
     { 0x22,  0x8, 0xC }
 };
 
-const u8 gKeypadIconTiles[] = INCBIN_U8("data/graphics/fonts/keypad_icons.4bpp");
+const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp");
 
 const struct FontInfo gFontInfos[] =
 {
@@ -112,7 +112,7 @@ const u8 gMenuCursorDimensions[][2] =
     { 0x0,  0x0 }
 };
 
-const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font9.hwjpnfont");
+const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9.hwjpnfont");
 
 extern const u16 gFont8LatinGlyphs[];
 extern const u8 gFont8LatinGlyphWidths[];
diff --git a/data/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png
index 5b6c7e7bd..5b6c7e7bd 100644
--- a/data/graphics/fonts/down_arrow.png
+++ b/graphics/fonts/down_arrow.png
diff --git a/data/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png
index b762471c6..b762471c6 100644
--- a/data/graphics/fonts/down_arrow_RS.png
+++ b/graphics/fonts/down_arrow_RS.png
diff --git a/data/graphics/fonts/font0_japanese.png b/graphics/fonts/font0_japanese.png
index 35345f399..35345f399 100644
--- a/data/graphics/fonts/font0_japanese.png
+++ b/graphics/fonts/font0_japanese.png
diff --git a/data/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png
index 55ed43506..55ed43506 100644
--- a/data/graphics/fonts/font0_latin.png
+++ b/graphics/fonts/font0_latin.png
diff --git a/data/graphics/fonts/font0_latin_widths.inc b/graphics/fonts/font0_latin_widths.inc
index 2392e9717..2392e9717 100644
--- a/data/graphics/fonts/font0_latin_widths.inc
+++ b/graphics/fonts/font0_latin_widths.inc
diff --git a/data/graphics/fonts/font1_japanese.png b/graphics/fonts/font1_japanese.png
index 3d2d55541..3d2d55541 100644
--- a/data/graphics/fonts/font1_japanese.png
+++ b/graphics/fonts/font1_japanese.png
diff --git a/data/graphics/fonts/font1_latin.png b/graphics/fonts/font1_latin.png
index ade914858..ade914858 100644
--- a/data/graphics/fonts/font1_latin.png
+++ b/graphics/fonts/font1_latin.png
diff --git a/data/graphics/fonts/font1_latin_widths.inc b/graphics/fonts/font1_latin_widths.inc
index 5d62068cd..5d62068cd 100644
--- a/data/graphics/fonts/font1_latin_widths.inc
+++ b/graphics/fonts/font1_latin_widths.inc
diff --git a/data/graphics/fonts/font2_japanese.png b/graphics/fonts/font2_japanese.png
index efdb4b77e..efdb4b77e 100644
--- a/data/graphics/fonts/font2_japanese.png
+++ b/graphics/fonts/font2_japanese.png
diff --git a/data/graphics/fonts/font2_japanese_widths.inc b/graphics/fonts/font2_japanese_widths.inc
index 22cad5281..22cad5281 100644
--- a/data/graphics/fonts/font2_japanese_widths.inc
+++ b/graphics/fonts/font2_japanese_widths.inc
diff --git a/data/graphics/fonts/font2_latin.png b/graphics/fonts/font2_latin.png
index 7eba3e748..7eba3e748 100644
--- a/data/graphics/fonts/font2_latin.png
+++ b/graphics/fonts/font2_latin.png
diff --git a/data/graphics/fonts/font2_latin_widths.inc b/graphics/fonts/font2_latin_widths.inc
index 79bf539be..79bf539be 100644
--- a/data/graphics/fonts/font2_latin_widths.inc
+++ b/graphics/fonts/font2_latin_widths.inc
diff --git a/data/graphics/fonts/font6_braille.png b/graphics/fonts/font6_braille.png
index cb4451bc2..cb4451bc2 100644
--- a/data/graphics/fonts/font6_braille.png
+++ b/graphics/fonts/font6_braille.png
diff --git a/data/graphics/fonts/font7_latin.png b/graphics/fonts/font7_latin.png
index 08652d45f..08652d45f 100644
--- a/data/graphics/fonts/font7_latin.png
+++ b/graphics/fonts/font7_latin.png
diff --git a/data/graphics/fonts/font7_latin_widths.inc b/graphics/fonts/font7_latin_widths.inc
index b82b11540..b82b11540 100644
--- a/data/graphics/fonts/font7_latin_widths.inc
+++ b/graphics/fonts/font7_latin_widths.inc
diff --git a/data/graphics/fonts/font8_latin.png b/graphics/fonts/font8_latin.png
index 3a88def3a..3a88def3a 100644
--- a/data/graphics/fonts/font8_latin.png
+++ b/graphics/fonts/font8_latin.png
diff --git a/data/graphics/fonts/font8_latin_widths.inc b/graphics/fonts/font8_latin_widths.inc
index 2e2a8d746..2e2a8d746 100644
--- a/data/graphics/fonts/font8_latin_widths.inc
+++ b/graphics/fonts/font8_latin_widths.inc
diff --git a/data/graphics/fonts/font9_japanese.png b/graphics/fonts/font9_japanese.png
index cf5b61668..cf5b61668 100644
--- a/data/graphics/fonts/font9_japanese.png
+++ b/graphics/fonts/font9_japanese.png
diff --git a/data/graphics/fonts/keypad_icons.png b/graphics/fonts/keypad_icons.png
index 8a9ecbcba..8a9ecbcba 100644
--- a/data/graphics/fonts/keypad_icons.png
+++ b/graphics/fonts/keypad_icons.png
diff --git a/data/graphics/fonts/unused_frlg_blanked_down_arrow.png b/graphics/fonts/unused_frlg_blanked_down_arrow.png
index 3164a2e14..3164a2e14 100644
--- a/data/graphics/fonts/unused_frlg_blanked_down_arrow.png
+++ b/graphics/fonts/unused_frlg_blanked_down_arrow.png
diff --git a/data/graphics/fonts/unused_frlg_down_arrow.png b/graphics/fonts/unused_frlg_down_arrow.png
index 882e3a687..882e3a687 100644
--- a/data/graphics/fonts/unused_frlg_down_arrow.png
+++ b/graphics/fonts/unused_frlg_down_arrow.png
diff --git a/data/graphics/fonts/unused_japanese_frlg_female_font.png b/graphics/fonts/unused_japanese_frlg_female_font.png
index 7da59c0eb..7da59c0eb 100644
--- a/data/graphics/fonts/unused_japanese_frlg_female_font.png
+++ b/graphics/fonts/unused_japanese_frlg_female_font.png
diff --git a/data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc b/graphics/fonts/unused_japanese_frlg_female_font_widths.inc
index 56bdecb28..56bdecb28 100644
--- a/data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc
+++ b/graphics/fonts/unused_japanese_frlg_female_font_widths.inc
diff --git a/data/graphics/fonts/unused_japanese_frlg_male_font.png b/graphics/fonts/unused_japanese_frlg_male_font.png
index da4f2beac..da4f2beac 100644
--- a/data/graphics/fonts/unused_japanese_frlg_male_font.png
+++ b/graphics/fonts/unused_japanese_frlg_male_font.png
diff --git a/data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc b/graphics/fonts/unused_japanese_frlg_male_font_widths.inc
index ad18d2884..ad18d2884 100644
--- a/data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc
+++ b/graphics/fonts/unused_japanese_frlg_male_font_widths.inc
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 28351aa90..79c910ea2 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,6 +1,6 @@
 CASTFORMGFXDIR := graphics/pokemon/castform
 TILESETGFXDIR := data/tilesets
-FONTGFXDIR := data/graphics/fonts
+FONTGFXDIR := graphics/fonts
 INTERFACEGFXDIR := graphics/interface
 BTLANMSPRGFXDIR := graphics/battle_anims/sprites
 UNUSEDGFXDIR := graphics/unused
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index 02648bf93..b1d2264e4 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -6,7 +6,7 @@
 
 ALIGNED(4)
 static const u8 sUnknown_08616124[] = {1, 2, 4};
-static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
+static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("graphics/fonts/font6.fwjpnfont");
 
 static void DecompressGlyphFont6(u16);