dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1533 from LOuroboros/fontControl

Browse Source 
Renamed "SIZE" text controller
This commit is contained in:
GriffinR
2021-10-29 18:15:16 -04:00
committed by GitHub
parent af4d6dd8f0 7574af3558
commit 8c2b401bb3
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charmap.txt
+1 -1
View File
@@ -414,7 +414,7 @@ HIGHLIGHT = FC 02 @ same as fc 01
SHADOW = FC 03 @ same as fc 01 SHADOW = FC 03 @ same as fc 01
COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
PALETTE = FC 05 @ used in credits PALETTE = FC 05 @ used in credits
SIZE = FC 06 @ note that anything other than "SMALL" is invalid FONT = FC 06 @ valid values are 0, 1, 2, 6 (braille), 7 and 8
RESET_SIZE = FC 07 RESET_SIZE = FC 07
PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
PAUSE_UNTIL_PRESS = FC 09 PAUSE_UNTIL_PRESS = FC 09
gflib/string_util.c
+2 -2
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,
gflib/text.c
+4 -4
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:
gflib/text.h
+1 -1
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
src/battle_controller_player.c
+1 -1
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]);
src/strings.c
+11 -11
View File
@@ -839,17 +839,17 @@ const u8 gText_B4F[] = _("B4F");
const u8 gText_Rooftop[] = _("ROOFTOP"); const u8 gText_Rooftop[] = _("ROOFTOP");
const u8 gText_ElevatorNowOn[] = _("Now on:"); const u8 gText_ElevatorNowOn[] = _("Now on:");
const u8 gText_BP[] = _("BP"); const u8 gText_BP[] = _("BP");
const u8 gText_EnergyPowder50[] = _("ENERGYPOWDER{CLEAR_TO 0x72}{SIZE 0}50"); const u8 gText_EnergyPowder50[] = _("ENERGYPOWDER{CLEAR_TO 0x72}{FONT 0}50");
const u8 gText_EnergyRoot80[] = _("ENERGY ROOT{CLEAR_TO 0x72}{SIZE 0}80"); const u8 gText_EnergyRoot80[] = _("ENERGY ROOT{CLEAR_TO 0x72}{FONT 0}80");
const u8 gText_HealPowder50[] = _("HEAL POWDER{CLEAR_TO 0x72}{SIZE 0}50"); const u8 gText_HealPowder50[] = _("HEAL POWDER{CLEAR_TO 0x72}{FONT 0}50");
const u8 gText_RevivalHerb300[] = _("REVIVAL HERB{CLEAR_TO 0x6C}{SIZE 0}300"); const u8 gText_RevivalHerb300[] = _("REVIVAL HERB{CLEAR_TO 0x6C}{FONT 0}300");
const u8 gText_Protein1000[] = _("PROTEIN{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_Protein1000[] = _("PROTEIN{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_Iron1000[] = _("IRON{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_Iron1000[] = _("IRON{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_Carbos1000[] = _("CARBOS{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_Carbos1000[] = _("CARBOS{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_Calcium1000[] = _("CALCIUM{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_Calcium1000[] = _("CALCIUM{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_Zinc1000[] = _("ZINC{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_Zinc1000[] = _("ZINC{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_HPUp1000[] = _("HP UP{CLEAR_TO 0x63}{SIZE 0}1,000"); const u8 gText_HPUp1000[] = _("HP UP{CLEAR_TO 0x63}{FONT 0}1,000");
const u8 gText_PPUp3000[] = _("PP UP{CLEAR_TO 0x63}{SIZE 0}3,000"); const u8 gText_PPUp3000[] = _("PP UP{CLEAR_TO 0x63}{FONT 0}3,000");
const u8 gText_RankingHall[] = _("RANKING HALL"); const u8 gText_RankingHall[] = _("RANKING HALL");
const u8 gText_ExchangeService[] = _("EXCHANGE SERVICE"); const u8 gText_ExchangeService[] = _("EXCHANGE SERVICE");
const u8 gText_LilycoveCity[] = _("LILYCOVE CITY"); const u8 gText_LilycoveCity[] = _("LILYCOVE CITY");
src/unk_text_util_2.c
+1 -1
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;