diff --git a/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png deleted file mode 100644 index e74ed47efd..0000000000 Binary files a/graphics/fonts/down_arrow.png and /dev/null differ diff --git a/graphics/fonts/down_arrow_2.png b/graphics/fonts/down_arrow_2.png deleted file mode 100644 index aefcf4f084..0000000000 Binary files a/graphics/fonts/down_arrow_2.png and /dev/null differ diff --git a/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png deleted file mode 100644 index c0aae894f7..0000000000 Binary files a/graphics/fonts/down_arrow_RS.png and /dev/null differ diff --git a/graphics/fonts/down_arrow_RS_2.png b/graphics/fonts/down_arrow_RS_2.png deleted file mode 100644 index de9d9cf47b..0000000000 Binary files a/graphics/fonts/down_arrow_RS_2.png and /dev/null differ diff --git a/graphics/fonts/down_arrows.png b/graphics/fonts/down_arrows.png new file mode 100644 index 0000000000..b89fa6bfe9 Binary files /dev/null and b/graphics/fonts/down_arrows.png differ diff --git a/src/text.c b/src/text.c index b2dcff3b5a..baaefe2e6a 100644 --- a/src/text.c +++ b/src/text.c @@ -10,6 +10,8 @@ #define CURSOR_DELAY 8 +#define DARK_DOWN_ARROW_OFFSET 256 + extern const struct OamData gOamData_AffineOff_ObjNormal_16x16; static void DecompressGlyph_NormalCopy1(u16 glyphId, bool32 isJapanese); @@ -26,12 +28,9 @@ static void SpriteCB_TextCursor(struct Sprite *sprite); COMMON_DATA TextFlags gTextFlags = {0}; -static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp"); -static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp"); -static const u8 sTinyArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp"); -static const u8 sTinyDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS_2.4bpp"); -static const u8 sDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp"); -static const u8 sDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp"); +static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrows.4bpp"); +static const u8 sDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp"); +static const u8 sDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp"); static const u8 sDownArrowYCoords[] = { 0, 16, 32, 16 }; static const u8 sWindowVerticalScrollSpeeds[] = { @@ -497,7 +496,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter) arrowTiles = sDownArrowTiles; break; case 1: - arrowTiles = sDarkDownArrowTiles; + arrowTiles = &sDownArrowTiles[DARK_DOWN_ARROW_OFFSET]; break; } @@ -605,7 +604,7 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c arrowTiles = sDownArrowTiles; break; case 1: - arrowTiles = sDarkDownArrowTiles; + arrowTiles = &sDownArrowTiles[DARK_DOWN_ARROW_OFFSET]; break; }