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

Merge c427210980 into 83df84e406

Browse Source
This commit is contained in:
AZero13
2026-07-14 05:20:43 +04:00
committed by GitHub
parent 83df84e406 c427210980
commit 3d7a21874c
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/battle_message.c
View File

@@ -2256,28 +2256,23 @@ u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src)
static const u8 *TryGetStatusString(u8 *src)
{
u32 i;
u8 status[8];
u32 chars1, chars2;
ALIGNED(4) u8 status[ARRAY_COUNT(sText_EmptyStatus)];
u32 chars1, chars2, *cmp;
u8 *statusPtr;
memcpy(status, sText_EmptyStatus, min(ARRAY_COUNT(status), ARRAY_COUNT(sText_EmptyStatus)));
memcpy(status, sText_EmptyStatus, ARRAY_COUNT(status));
statusPtr = status;
for (i = 0; i < ARRAY_COUNT(status); i++)
{
if (*src == EOS) break; // one line required to match -g
*statusPtr = *src;
src++;
statusPtr++;
}
for (i = 0; i < ARRAY_COUNT(status) && *src != EOS; i++)
*statusPtr++ = *src++;
chars1 = *(u32 *)(&status[0]);
chars2 = *(u32 *)(&status[4]);
chars1 = *(u32 *)status;
chars2 = *((u32 *)status + 1);
for (i = 0; i < ARRAY_COUNT(gStatusConditionStringsTable); i++)
{
if (chars1 == *(u32 *)(&gStatusConditionStringsTable[i][0][0])
&& chars2 == *(u32 *)(&gStatusConditionStringsTable[i][0][4]))
cmp = (u32 *)gStatusConditionStringsTable[i][0];
if (chars1 == cmp[0] && chars2 == cmp[1])
return gStatusConditionStringsTable[i][1];
}
return NULL;