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

Document Pokemon Summary Screen, 1

Browse Source
This commit is contained in:
PikalaxALT
2021-04-04 09:59:40 -04:00
parent 0ecc1876a9
commit c99894bc60
13 changed files with 1510 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+10 -8
View File
@@ -5416,7 +5416,7 @@ void RandomlyGivePartyPokerus(struct Pokemon *party)
&foo;
}
u8 CheckPartyPokerus(struct Pokemon *party, u8 selection)
u8 CheckPartyPokerus(struct Pokemon *party, u8 party_bm)
{
u8 retVal;
@@ -5424,23 +5424,25 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection)
unsigned curBit = 1;
retVal = 0;
if (selection)
if (party_bm != 0) // Check mons in party based on bitmask, LSB = first mon
{
do
{
if ((selection & 1) && (GetMonData(&party[partyIndex], MON_DATA_POKERUS, NULL) & 0xF))
if ((party_bm & 1) && (GetMonData(&party[partyIndex], MON_DATA_POKERUS, NULL) & 0xF))
retVal |= curBit;
partyIndex++;
curBit <<= 1;
selection >>= 1;
party_bm >>= 1;
}
while (selection);
while (party_bm);
}
else if (GetMonData(&party[0], MON_DATA_POKERUS, NULL) & 0xF)
else // Single Pokemon
{
retVal = 1;
if (GetMonData(&party[0], MON_DATA_POKERUS, NULL) & 0xF)
{
retVal = 1;
}
}
return retVal;
}