From 01a274bb108d5635a6c01cfcea9f9f8441276c02 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Mon, 20 Jul 2026 13:38:32 +0100 Subject: [PATCH 1/3] s/SKIP/SKIP_TO CLEAR: takes number of pixels to clear CLEAR_TO: takes x position to clear until Therefore: SKIP_TO: takes x position to skip until --- charmap.txt | 2 +- include/constants/characters.h | 2 +- src/menu_specialized.c | 2 +- src/pokeblock.c | 2 +- src/pokenav_conditions.c | 2 +- src/string_util.c | 2 +- src/text.c | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charmap.txt b/charmap.txt index 97782f6a97f2..24e352c53921 100644 --- a/charmap.txt +++ b/charmap.txt @@ -427,7 +427,7 @@ SHIFT_DOWN = FC 0E FILL_WINDOW = FC 0F PLAY_SE = FC 10 CLEAR = FC 11 -SKIP = FC 12 +SKIP_TO = FC 12 CLEAR_TO = FC 13 MIN_LETTER_SPACING = FC 14 JPN = FC 15 diff --git a/include/constants/characters.h b/include/constants/characters.h index 8ed440e63a91..39c253cb49ce 100644 --- a/include/constants/characters.h +++ b/include/constants/characters.h @@ -223,7 +223,7 @@ #define EXT_CTRL_CODE_FILL_WINDOW 0x0F #define EXT_CTRL_CODE_PLAY_SE 0x10 #define EXT_CTRL_CODE_CLEAR 0x11 -#define EXT_CTRL_CODE_SKIP 0x12 +#define EXT_CTRL_CODE_SKIP_TO 0x12 #define EXT_CTRL_CODE_CLEAR_TO 0x13 #define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14 #define EXT_CTRL_CODE_JPN 0x15 diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 6be8b96026fb..bd00d25acfe0 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -940,7 +940,7 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId) ; *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_SKIP; + *(str++) = EXT_CTRL_CODE_SKIP_TO; *(str++) = 60; switch (gender) diff --git a/src/pokeblock.c b/src/pokeblock.c index 8ecf7f6e1dc7..4375a02a404d 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -740,7 +740,7 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId) u8 *txtPtr = StringCopy(dst, gPokeblockNames[pkblock->color]); *(txtPtr++) = EXT_CTRL_CODE_BEGIN; - *(txtPtr++) = EXT_CTRL_CODE_SKIP; + *(txtPtr++) = EXT_CTRL_CODE_SKIP_TO; *(txtPtr++) = CHAR_BLOCK_1; ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3); diff --git a/src/pokenav_conditions.c b/src/pokenav_conditions.c index 1ebf6edbe9a2..a05d68c3c5e5 100644 --- a/src/pokenav_conditions.c +++ b/src/pokenav_conditions.c @@ -373,7 +373,7 @@ static u8 *CopyConditionMonNameGender(u8 *str, u16 listId, bool8 skipPadding) (str_++); *(str_++) = EXT_CTRL_CODE_BEGIN; - *(str_++) = EXT_CTRL_CODE_SKIP; + *(str_++) = EXT_CTRL_CODE_SKIP_TO; *(str_++) = 60; switch (gender) { diff --git a/src/string_util.c b/src/string_util.c index d515c14cdaf1..ed7bbb8585ae 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -676,7 +676,7 @@ u8 GetExtCtrlCodeLength(u8 code) [EXT_CTRL_CODE_FILL_WINDOW] = 1, [EXT_CTRL_CODE_PLAY_SE] = 3, [EXT_CTRL_CODE_CLEAR] = 2, - [EXT_CTRL_CODE_SKIP] = 2, + [EXT_CTRL_CODE_SKIP_TO] = 2, [EXT_CTRL_CODE_CLEAR_TO] = 2, [EXT_CTRL_CODE_MIN_LETTER_SPACING] = 2, [EXT_CTRL_CODE_JPN] = 1, diff --git a/src/text.c b/src/text.c index a77c2da7060f..398aaba26feb 100644 --- a/src/text.c +++ b/src/text.c @@ -1070,7 +1070,7 @@ static u16 RenderText(struct TextPrinter *textPrinter) return RENDER_PRINT; } return RENDER_REPEAT; - case EXT_CTRL_CODE_SKIP: + case EXT_CTRL_CODE_SKIP_TO: textPrinter->printerTemplate.currentX = *textPrinter->printerTemplate.currentChar + textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentChar++; return RENDER_REPEAT; @@ -1272,7 +1272,7 @@ static u32 UNUSED GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 lett case EXT_CTRL_CODE_SHIFT_RIGHT: case EXT_CTRL_CODE_SHIFT_DOWN: case EXT_CTRL_CODE_CLEAR: - case EXT_CTRL_CODE_SKIP: + case EXT_CTRL_CODE_SKIP_TO: case EXT_CTRL_CODE_CLEAR_TO: case EXT_CTRL_CODE_MIN_LETTER_SPACING: ++strPos; @@ -1426,7 +1426,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) glyphWidth = *++str; lineWidth += glyphWidth; break; - case EXT_CTRL_CODE_SKIP: + case EXT_CTRL_CODE_SKIP_TO: lineWidth = *++str; break; case EXT_CTRL_CODE_CLEAR_TO: @@ -1557,7 +1557,7 @@ u8 RenderTextHandleBold(u8 *pixels, u8 fontId, u8 *str) case EXT_CTRL_CODE_SHIFT_RIGHT: case EXT_CTRL_CODE_SHIFT_DOWN: case EXT_CTRL_CODE_CLEAR: - case EXT_CTRL_CODE_SKIP: + case EXT_CTRL_CODE_SKIP_TO: case EXT_CTRL_CODE_CLEAR_TO: case EXT_CTRL_CODE_MIN_LETTER_SPACING: ++strPos; From f92fa0b80345c163109eb553a6b8cc13013ed003 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Thu, 11 Jun 2026 10:59:24 +0100 Subject: [PATCH 2/3] text.h brace style --- include/text.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/text.h b/include/text.h index 26edd7878c67..3799a87a4d38 100644 --- a/include/text.h +++ b/include/text.h @@ -7,7 +7,8 @@ // loaded at once but not copied to vram yet. #define TEXT_SKIP_DRAW 0xFF -enum { +enum +{ FONT_SMALL, FONT_NORMAL, FONT_SHORT, @@ -21,7 +22,8 @@ enum { }; // Return values for font functions -enum { +enum +{ RENDER_PRINT, RENDER_FINISH, RENDER_REPEAT, // Run render function again, if e.g. a control code is encountered. @@ -29,7 +31,8 @@ enum { }; // Text printer states read by RenderText / FontFunc_Braille -enum { +enum +{ RENDER_STATE_HANDLE_CHAR, RENDER_STATE_WAIT, RENDER_STATE_CLEAR, @@ -39,7 +42,8 @@ enum { RENDER_STATE_PAUSE, }; -enum { +enum +{ FONTATTR_MAX_LETTER_WIDTH, FONTATTR_MAX_LETTER_HEIGHT, FONTATTR_LETTER_SPACING, From a6b2c6134ff5f3cc4b091a72b66acaa93c1842f3 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Tue, 2 Jun 2026 12:57:07 +0100 Subject: [PATCH 3/3] Document MainMenu_FormatSavegameTime --- src/main_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main_menu.c b/src/main_menu.c index d834c29dc686..45fa12cfc09a 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -2147,8 +2147,8 @@ static void MainMenu_FormatSavegameTime(void) StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime); AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); - *ptr = 0xF0; - ConvertIntToDecimalStringN(ptr + 1, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); + *ptr++ = CHAR_COLON; + ConvertIntToDecimalStringN(ptr, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, str, 0xD0), 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, str); }