From b1dd945cbf44339a369c408892c77b6254df89cb Mon Sep 17 00:00:00 2001 From: garakmon Date: Thu, 12 Mar 2020 13:40:00 -0400 Subject: [PATCH] move fonts from data/graphics/ to graphics/ --- data/fonts.s | 36 +++++++++--------- gflib/text.c | 12 +++--- .../fonts/down_arrow.png | Bin .../fonts/down_arrow_RS.png | Bin .../fonts/font0_japanese.png | Bin .../fonts/font0_latin.png | Bin .../fonts/font0_latin_widths.inc | 0 .../fonts/font1_japanese.png | Bin .../fonts/font1_latin.png | Bin .../fonts/font1_latin_widths.inc | 0 .../fonts/font2_japanese.png | Bin .../fonts/font2_japanese_widths.inc | 0 .../fonts/font2_latin.png | Bin .../fonts/font2_latin_widths.inc | 0 .../fonts/font6_braille.png | Bin .../fonts/font7_latin.png | Bin .../fonts/font7_latin_widths.inc | 0 .../fonts/font8_latin.png | Bin .../fonts/font8_latin_widths.inc | 0 .../fonts/font9_japanese.png | Bin .../fonts/keypad_icons.png | Bin .../fonts/unused_frlg_blanked_down_arrow.png | Bin .../fonts/unused_frlg_down_arrow.png | Bin .../unused_japanese_frlg_female_font.png | Bin ...nused_japanese_frlg_female_font_widths.inc | 0 .../fonts/unused_japanese_frlg_male_font.png | Bin .../unused_japanese_frlg_male_font_widths.inc | 0 graphics_file_rules.mk | 2 +- src/unk_text_util_2.c | 2 +- 29 files changed, 26 insertions(+), 26 deletions(-) rename {data/graphics => graphics}/fonts/down_arrow.png (100%) rename {data/graphics => graphics}/fonts/down_arrow_RS.png (100%) rename {data/graphics => graphics}/fonts/font0_japanese.png (100%) rename {data/graphics => graphics}/fonts/font0_latin.png (100%) rename {data/graphics => graphics}/fonts/font0_latin_widths.inc (100%) rename {data/graphics => graphics}/fonts/font1_japanese.png (100%) rename {data/graphics => graphics}/fonts/font1_latin.png (100%) rename {data/graphics => graphics}/fonts/font1_latin_widths.inc (100%) rename {data/graphics => graphics}/fonts/font2_japanese.png (100%) rename {data/graphics => graphics}/fonts/font2_japanese_widths.inc (100%) rename {data/graphics => graphics}/fonts/font2_latin.png (100%) rename {data/graphics => graphics}/fonts/font2_latin_widths.inc (100%) rename {data/graphics => graphics}/fonts/font6_braille.png (100%) rename {data/graphics => graphics}/fonts/font7_latin.png (100%) rename {data/graphics => graphics}/fonts/font7_latin_widths.inc (100%) rename {data/graphics => graphics}/fonts/font8_latin.png (100%) rename {data/graphics => graphics}/fonts/font8_latin_widths.inc (100%) rename {data/graphics => graphics}/fonts/font9_japanese.png (100%) rename {data/graphics => graphics}/fonts/keypad_icons.png (100%) rename {data/graphics => graphics}/fonts/unused_frlg_blanked_down_arrow.png (100%) rename {data/graphics => graphics}/fonts/unused_frlg_down_arrow.png (100%) rename {data/graphics => graphics}/fonts/unused_japanese_frlg_female_font.png (100%) rename {data/graphics => graphics}/fonts/unused_japanese_frlg_female_font_widths.inc (100%) rename {data/graphics => graphics}/fonts/unused_japanese_frlg_male_font.png (100%) rename {data/graphics => graphics}/fonts/unused_japanese_frlg_male_font_widths.inc (100%) 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 similarity index 100% rename from data/graphics/fonts/down_arrow.png rename to graphics/fonts/down_arrow.png diff --git a/data/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png similarity index 100% rename from data/graphics/fonts/down_arrow_RS.png rename to graphics/fonts/down_arrow_RS.png diff --git a/data/graphics/fonts/font0_japanese.png b/graphics/fonts/font0_japanese.png similarity index 100% rename from data/graphics/fonts/font0_japanese.png rename to graphics/fonts/font0_japanese.png diff --git a/data/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png similarity index 100% rename from data/graphics/fonts/font0_latin.png rename to graphics/fonts/font0_latin.png diff --git a/data/graphics/fonts/font0_latin_widths.inc b/graphics/fonts/font0_latin_widths.inc similarity index 100% rename from data/graphics/fonts/font0_latin_widths.inc rename to graphics/fonts/font0_latin_widths.inc diff --git a/data/graphics/fonts/font1_japanese.png b/graphics/fonts/font1_japanese.png similarity index 100% rename from data/graphics/fonts/font1_japanese.png rename to graphics/fonts/font1_japanese.png diff --git a/data/graphics/fonts/font1_latin.png b/graphics/fonts/font1_latin.png similarity index 100% rename from data/graphics/fonts/font1_latin.png rename to graphics/fonts/font1_latin.png diff --git a/data/graphics/fonts/font1_latin_widths.inc b/graphics/fonts/font1_latin_widths.inc similarity index 100% rename from data/graphics/fonts/font1_latin_widths.inc rename to graphics/fonts/font1_latin_widths.inc diff --git a/data/graphics/fonts/font2_japanese.png b/graphics/fonts/font2_japanese.png similarity index 100% rename from data/graphics/fonts/font2_japanese.png rename to graphics/fonts/font2_japanese.png diff --git a/data/graphics/fonts/font2_japanese_widths.inc b/graphics/fonts/font2_japanese_widths.inc similarity index 100% rename from data/graphics/fonts/font2_japanese_widths.inc rename to graphics/fonts/font2_japanese_widths.inc diff --git a/data/graphics/fonts/font2_latin.png b/graphics/fonts/font2_latin.png similarity index 100% rename from data/graphics/fonts/font2_latin.png rename to graphics/fonts/font2_latin.png diff --git a/data/graphics/fonts/font2_latin_widths.inc b/graphics/fonts/font2_latin_widths.inc similarity index 100% rename from data/graphics/fonts/font2_latin_widths.inc rename to graphics/fonts/font2_latin_widths.inc diff --git a/data/graphics/fonts/font6_braille.png b/graphics/fonts/font6_braille.png similarity index 100% rename from data/graphics/fonts/font6_braille.png rename to graphics/fonts/font6_braille.png diff --git a/data/graphics/fonts/font7_latin.png b/graphics/fonts/font7_latin.png similarity index 100% rename from data/graphics/fonts/font7_latin.png rename to graphics/fonts/font7_latin.png diff --git a/data/graphics/fonts/font7_latin_widths.inc b/graphics/fonts/font7_latin_widths.inc similarity index 100% rename from data/graphics/fonts/font7_latin_widths.inc rename to graphics/fonts/font7_latin_widths.inc diff --git a/data/graphics/fonts/font8_latin.png b/graphics/fonts/font8_latin.png similarity index 100% rename from data/graphics/fonts/font8_latin.png rename to graphics/fonts/font8_latin.png diff --git a/data/graphics/fonts/font8_latin_widths.inc b/graphics/fonts/font8_latin_widths.inc similarity index 100% rename from data/graphics/fonts/font8_latin_widths.inc rename to graphics/fonts/font8_latin_widths.inc diff --git a/data/graphics/fonts/font9_japanese.png b/graphics/fonts/font9_japanese.png similarity index 100% rename from data/graphics/fonts/font9_japanese.png rename to graphics/fonts/font9_japanese.png diff --git a/data/graphics/fonts/keypad_icons.png b/graphics/fonts/keypad_icons.png similarity index 100% rename from data/graphics/fonts/keypad_icons.png rename to 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 similarity index 100% rename from data/graphics/fonts/unused_frlg_blanked_down_arrow.png rename to 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 similarity index 100% rename from data/graphics/fonts/unused_frlg_down_arrow.png rename to 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 similarity index 100% rename from data/graphics/fonts/unused_japanese_frlg_female_font.png rename to 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 similarity index 100% rename from data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc rename to 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 similarity index 100% rename from data/graphics/fonts/unused_japanese_frlg_male_font.png rename to 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 similarity index 100% rename from data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc rename to 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);