mirror
/
pokefirered
mirror of https://github.com/pret/pokefirered
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consolidate arrow tiles (#682)

This commit is contained in:
cawtds 2025-02-03 18:19:40 +01:00 committed by GitHub
parent d844877218
commit 355b92f791
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/fonts/down_arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 162 B

BIN
graphics/fonts/down_arrow_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 150 B

BIN
graphics/fonts/down_arrow_RS.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 163 B

BIN
graphics/fonts/down_arrow_RS_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 150 B

BIN
graphics/fonts/down_arrows.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

15
src/text.c
View File

@ -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;
}