Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consolidate arrow tiles #682

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

consolidate arrow tiles #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
250853a
consolidate down arrow tiles
cawtds Jan 7, 2025
4ca4686
formatting
cawtds Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed graphics/fonts/down_arrow.png
View file
Open in desktop
Binary file not shown.
Binary file removed graphics/fonts/down_arrow_2.png
View file
Open in desktop
Binary file not shown.
Binary file removed graphics/fonts/down_arrow_RS.png
View file
Open in desktop
Binary file not shown.
Binary file removed graphics/fonts/down_arrow_RS_2.png
View file
Open in desktop
Binary file not shown.
Binary file added graphics/fonts/down_arrows.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 7 additions & 8 deletions src/text.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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[] = {
Expand Down Expand Up @@ -497,7 +496,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
arrowTiles = sDownArrowTiles;
break;
case 1:
arrowTiles = sDarkDownArrowTiles;
arrowTiles = &sDownArrowTiles[DARK_DOWN_ARROW_OFFSET];
break;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Loading