ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT

Browse Source
This commit is contained in:
LOuroboros 2021-10-29 19:00:07 -03:00
parent 5536bce88d
commit cde0ce878c
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gflib/string_util.c
View File

@ -386,7 +386,7 @@ u8 *StringBraille(u8 *dest, const u8 *src)
{ {
const u8 setBrailleFont[] = { const u8 setBrailleFont[] = {
EXT_CTRL_CODE_BEGIN, EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_SIZE, EXT_CTRL_CODE_FONT,
6, 6,
EOS EOS
}; };
@ -664,7 +664,7 @@ u8 GetExtCtrlCodeLength(u8 code)
[EXT_CTRL_CODE_SHADOW] = 2, [EXT_CTRL_CODE_SHADOW] = 2,
[EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW] = 4, [EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW] = 4,
[EXT_CTRL_CODE_PALETTE] = 2, [EXT_CTRL_CODE_PALETTE] = 2,
[EXT_CTRL_CODE_SIZE] = 2, [EXT_CTRL_CODE_FONT] = 2,
[EXT_CTRL_CODE_RESET_SIZE] = 1, [EXT_CTRL_CODE_RESET_SIZE] = 1,
[EXT_CTRL_CODE_PAUSE] = 2, [EXT_CTRL_CODE_PAUSE] = 2,
[EXT_CTRL_CODE_PAUSE_UNTIL_PRESS] = 1, [EXT_CTRL_CODE_PAUSE_UNTIL_PRESS] = 1,

8
gflib/text.c
View File

@ -906,7 +906,7 @@ u16 RenderText(struct TextPrinter *textPrinter)
case EXT_CTRL_CODE_PALETTE: case EXT_CTRL_CODE_PALETTE:
textPrinter->printerTemplate.currentChar++; textPrinter->printerTemplate.currentChar++;
return 2; return 2;
case EXT_CTRL_CODE_SIZE: case EXT_CTRL_CODE_FONT:
subStruct->glyphId = *textPrinter->printerTemplate.currentChar; subStruct->glyphId = *textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.currentChar++; textPrinter->printerTemplate.currentChar++;
return 2; return 2;
@ -1170,7 +1170,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
case EXT_CTRL_CODE_HIGHLIGHT: case EXT_CTRL_CODE_HIGHLIGHT:
case EXT_CTRL_CODE_SHADOW: case EXT_CTRL_CODE_SHADOW:
case EXT_CTRL_CODE_PALETTE: case EXT_CTRL_CODE_PALETTE:
case EXT_CTRL_CODE_SIZE: case EXT_CTRL_CODE_FONT:
case EXT_CTRL_CODE_PAUSE: case EXT_CTRL_CODE_PAUSE:
case EXT_CTRL_CODE_ESCAPE: case EXT_CTRL_CODE_ESCAPE:
case EXT_CTRL_CODE_SHIFT_TEXT: case EXT_CTRL_CODE_SHIFT_TEXT:
@ -1319,7 +1319,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
case EXT_CTRL_CODE_SHIFT_DOWN: case EXT_CTRL_CODE_SHIFT_DOWN:
++str; ++str;
break; break;
case EXT_CTRL_CODE_SIZE: case EXT_CTRL_CODE_FONT:
func = GetFontWidthFunc(*++str); func = GetFontWidthFunc(*++str);
if (func == NULL) if (func == NULL)
return 0; return 0;
@ -1449,7 +1449,7 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
shadowColor = strLocal[strPos++]; shadowColor = strLocal[strPos++];
GenerateFontHalfRowLookupTable(fgColor, bgColor, shadowColor); GenerateFontHalfRowLookupTable(fgColor, bgColor, shadowColor);
continue; continue;
case EXT_CTRL_CODE_SIZE: case EXT_CTRL_CODE_FONT:
fontId = strLocal[strPos++]; fontId = strLocal[strPos++];
break; break;
case EXT_CTRL_CODE_PLAY_BGM: case EXT_CTRL_CODE_PLAY_BGM:

2
gflib/text.h
View File

@ -211,7 +211,7 @@
#define EXT_CTRL_CODE_SHADOW 0x03 #define EXT_CTRL_CODE_SHADOW 0x03
#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04 #define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04
#define EXT_CTRL_CODE_PALETTE 0x05 #define EXT_CTRL_CODE_PALETTE 0x05
#define EXT_CTRL_CODE_SIZE 0x06 #define EXT_CTRL_CODE_FONT 0x06
#define EXT_CTRL_CODE_RESET_SIZE 0x07 #define EXT_CTRL_CODE_RESET_SIZE 0x07
#define EXT_CTRL_CODE_PAUSE 0x08 #define EXT_CTRL_CODE_PAUSE 0x08
#define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS 0x09 #define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS 0x09

2
src/battle_controller_player.c
View File

@ -1500,7 +1500,7 @@ static void MoveSelectionDisplayMoveType(void)
txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType); txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
*(txtPtr)++ = EXT_CTRL_CODE_BEGIN; *(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
*(txtPtr)++ = EXT_CTRL_CODE_SIZE; *(txtPtr)++ = EXT_CTRL_CODE_FONT;
*(txtPtr)++ = 1; *(txtPtr)++ = 1;
StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]); StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);

2
src/unk_text_util_2.c
View File

@ -80,7 +80,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
case EXT_CTRL_CODE_PALETTE: case EXT_CTRL_CODE_PALETTE:
textPrinter->printerTemplate.currentChar++; textPrinter->printerTemplate.currentChar++;
return 2; return 2;
case EXT_CTRL_CODE_SIZE: case EXT_CTRL_CODE_FONT:
subStruct->glyphId = *textPrinter->printerTemplate.currentChar; subStruct->glyphId = *textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.currentChar++; textPrinter->printerTemplate.currentChar++;
return 2; return 2;