Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-29 05:18:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2347 from mrgriffin/pret-text-260720

Browse Source 
Minor text cleanups
This commit is contained in:
GriffinR
2026-09-01 02:26:56 -04:00
committed by GitHub
parent 9702c24bd0 a6b2c6134f
commit f559fac24e
9 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charmap.txt
View File

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

2
include/constants/characters.h
View File

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

12
include/text.h
View File

@@ -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,

4
src/main_menu.c
View File

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

2
src/menu_specialized.c
View File

@@ -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)

2
src/pokeblock.c
View File

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

2
src/pokenav_conditions.c
View File

@@ -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)
{

2
src/string_util.c
View File

@@ -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,

8
src/text.c
View File

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