consolidate down arrow tiles

pret · Jan 7, 2025 · 250853a · 250853a
1 parent 2a3e92e
commit 250853a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png
diff --git a/graphics/fonts/down_arrow_2.png b/graphics/fonts/down_arrow_2.png
diff --git a/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png
diff --git a/graphics/fonts/down_arrow_RS_2.png b/graphics/fonts/down_arrow_RS_2.png
diff --git a/graphics/fonts/down_arrows.png b/graphics/fonts/down_arrows.png
diff --git 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,10 +28,7 @@ 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 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");
 
@@ -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;
             }