dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix differences in battle_message.c (#736)

Browse Source
This commit is contained in:
SiliconA-Z
2026-03-21 20:35:01 -04:00
committed by GitHub
parent 590d5a6f7b
commit 37d50c4c19
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_message.c
+6 -19
View File
@@ -1785,33 +1785,20 @@ static const u8 *TryGetStatusString(u8 *src)
{ {
u32 i; u32 i;
u8 status[] = _("$$$$$$$"); u8 status[] = _("$$$$$$$");
u32 chars1, chars2; u32 chars1, chars2, *cmp;
u8 *statusPtr; u8 *statusPtr;
statusPtr = status; statusPtr = status;
#if REVISION >= 0xA
for (i = 0; i < 8 && *src != EOS; i++) for (i = 0; i < 8 && *src != EOS; i++)
#else *statusPtr++ = *src++;
for (i = 0; i < 8; i++)
#endif
{
#if REVISION >= 0xA
#else
if (*src == EOS)
break;
#endif
*statusPtr = *src;
src++;
statusPtr++;
}
chars1 = *(u32 *)(&status[0]); chars1 = *(u32 *)status;
chars2 = *(u32 *)(&status[4]); chars2 = *((u32 *)status + 1);
for (i = 0; i < NELEMS(gStatusConditionStringsTable); i++) for (i = 0; i < NELEMS(gStatusConditionStringsTable); i++)
{ {
if (chars1 == *(u32 *)(&gStatusConditionStringsTable[i][0][0]) cmp = (u32 *)gStatusConditionStringsTable[i][0];
&& chars2 == *(u32 *)(&gStatusConditionStringsTable[i][0][4])) if (chars1 == cmp[0] && chars2 == cmp[1])
return gStatusConditionStringsTable[i][1]; return gStatusConditionStringsTable[i][1];
} }
return NULL; return NULL;