consolidate arrow tiles (#682)
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 162 B |
Binary file not shown.
|
Before Width: | Height: | Size: 150 B |
Binary file not shown.
|
Before Width: | Height: | Size: 163 B |
Binary file not shown.
|
Before Width: | Height: | Size: 150 B |
Binary file not shown.
|
After Width: | Height: | Size: 237 B |
+7
-8
@@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
#define CURSOR_DELAY 8
|
#define CURSOR_DELAY 8
|
||||||
|
|
||||||
|
#define DARK_DOWN_ARROW_OFFSET 256
|
||||||
|
|
||||||
extern const struct OamData gOamData_AffineOff_ObjNormal_16x16;
|
extern const struct OamData gOamData_AffineOff_ObjNormal_16x16;
|
||||||
|
|
||||||
static void DecompressGlyph_NormalCopy1(u16 glyphId, bool32 isJapanese);
|
static void DecompressGlyph_NormalCopy1(u16 glyphId, bool32 isJapanese);
|
||||||
@@ -26,12 +28,9 @@ static void SpriteCB_TextCursor(struct Sprite *sprite);
|
|||||||
|
|
||||||
COMMON_DATA TextFlags gTextFlags = {0};
|
COMMON_DATA TextFlags gTextFlags = {0};
|
||||||
|
|
||||||
static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp");
|
static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrows.4bpp");
|
||||||
static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp");
|
static const u8 sDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp");
|
||||||
static const u8 sTinyArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp");
|
static const u8 sDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.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 sDownArrowYCoords[] = { 0, 16, 32, 16 };
|
static const u8 sDownArrowYCoords[] = { 0, 16, 32, 16 };
|
||||||
static const u8 sWindowVerticalScrollSpeeds[] = {
|
static const u8 sWindowVerticalScrollSpeeds[] = {
|
||||||
@@ -497,7 +496,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
|
|||||||
arrowTiles = sDownArrowTiles;
|
arrowTiles = sDownArrowTiles;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
arrowTiles = sDarkDownArrowTiles;
|
arrowTiles = &sDownArrowTiles[DARK_DOWN_ARROW_OFFSET];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -605,7 +604,7 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
|
|||||||
arrowTiles = sDownArrowTiles;
|
arrowTiles = sDownArrowTiles;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
arrowTiles = sDarkDownArrowTiles;
|
arrowTiles = &sDownArrowTiles[DARK_DOWN_ARROW_OFFSET];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user