atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve line breaks/scrolls (#5641)

Browse source
This commit is contained in:
cawtds 2024-11-04 02:05:58 +01:00 committed by GitHub
parent ee2535be96
commit 57e771c8b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/battle_message.c
View file

@ -3340,6 +3340,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize)
u8 fontId = FONT_NORMAL; u8 fontId = FONT_NORMAL;
s16 letterSpacing = 0; s16 letterSpacing = 0;
u32 lineNum = 1; u32 lineNum = 1;
u32 displayedLineNums = 1;
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
multiplayerId = gRecordedBattleMultiplayerId; multiplayerId = gRecordedBattleMultiplayerId;
@ -3753,8 +3754,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize)
if (dstWidth + toCpyWidth > BATTLE_MSG_MAX_WIDTH) if (dstWidth + toCpyWidth > BATTLE_MSG_MAX_WIDTH)
{ {
dst[lastValidSkip] = lineNum == 1 ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; dst[lastValidSkip] = displayedLineNums == 1 ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL;
dstWidth = GetStringLineWidth(fontId, dst, letterSpacing, lineNum, dstSize); dstWidth = GetStringLineWidth(fontId, dst, letterSpacing, lineNum, dstSize);
if (displayedLineNums == 1)
displayedLineNums++;
else
displayedLineNums = 1;
lineNum++; lineNum++;
} }
while (*toCpy != EOS) while (*toCpy != EOS)
@ -3780,15 +3785,20 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize)
dst[dstID] = *src; dst[dstID] = *src;
if (dstWidth + toCpyWidth > BATTLE_MSG_MAX_WIDTH) if (dstWidth + toCpyWidth > BATTLE_MSG_MAX_WIDTH)
{ {
dst[lastValidSkip] = lineNum == 1 ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; dst[lastValidSkip] = displayedLineNums == 1 ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL;
if (displayedLineNums == 1)
displayedLineNums++;
else
displayedLineNums = 1;
lineNum++; lineNum++;
dstWidth = 0; dstWidth = 0;
} }
switch (*src) switch (*src)
{ {
case CHAR_NEWLINE:
case CHAR_PROMPT_SCROLL:
case CHAR_PROMPT_CLEAR: case CHAR_PROMPT_CLEAR:
case CHAR_PROMPT_SCROLL:
displayedLineNums = 1;
case CHAR_NEWLINE:
lineNum++; lineNum++;
dstWidth = 0; dstWidth = 0;
//fallthrough //fallthrough