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

Merge pull request #1253 from LOuroboros/patch-1

Browse source 
sanityIsBagEgg -> sanityIsBadEgg
This commit is contained in:
GriffinR 2020-11-16 14:57:16 -05:00 committed by GitHub
commit de153a67cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pokemon_storage_system.c
View file

@ -6777,11 +6777,11 @@ static void SetCursorMonData(void *pokemon, u8 mode)
{ {
u8 *txtPtr; u8 *txtPtr;
u16 gender; u16 gender;
bool8 sanityIsBagEgg; bool8 sanityIsBadEgg;
sPSSData->cursorMonItem = 0; sPSSData->cursorMonItem = 0;
gender = MON_MALE; gender = MON_MALE;
sanityIsBagEgg = FALSE; sanityIsBadEgg = FALSE;
if (mode == MODE_PARTY) if (mode == MODE_PARTY)
{ {
struct Pokemon *mon = (struct Pokemon *)pokemon; struct Pokemon *mon = (struct Pokemon *)pokemon;
@ -6789,8 +6789,8 @@ static void SetCursorMonData(void *pokemon, u8 mode)
sPSSData->cursorMonSpecies = GetMonData(mon, MON_DATA_SPECIES2); sPSSData->cursorMonSpecies = GetMonData(mon, MON_DATA_SPECIES2);
if (sPSSData->cursorMonSpecies != SPECIES_NONE) if (sPSSData->cursorMonSpecies != SPECIES_NONE)
{ {
sanityIsBagEgg = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG); sanityIsBadEgg = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG);
if (sanityIsBagEgg) if (sanityIsBadEgg)
sPSSData->cursorMonIsEgg = TRUE; sPSSData->cursorMonIsEgg = TRUE;
else else
sPSSData->cursorMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG); sPSSData->cursorMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG);
@ -6813,8 +6813,8 @@ static void SetCursorMonData(void *pokemon, u8 mode)
if (sPSSData->cursorMonSpecies != SPECIES_NONE) if (sPSSData->cursorMonSpecies != SPECIES_NONE)
{ {
u32 otId = GetBoxMonData(boxMon, MON_DATA_OT_ID); u32 otId = GetBoxMonData(boxMon, MON_DATA_OT_ID);
sanityIsBagEgg = GetBoxMonData(boxMon, MON_DATA_SANITY_IS_BAD_EGG); sanityIsBadEgg = GetBoxMonData(boxMon, MON_DATA_SANITY_IS_BAD_EGG);
if (sanityIsBagEgg) if (sanityIsBadEgg)
sPSSData->cursorMonIsEgg = TRUE; sPSSData->cursorMonIsEgg = TRUE;
else else
sPSSData->cursorMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG); sPSSData->cursorMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG);
@ -6846,7 +6846,7 @@ static void SetCursorMonData(void *pokemon, u8 mode)
} }
else if (sPSSData->cursorMonIsEgg) else if (sPSSData->cursorMonIsEgg)
{ {
if (sanityIsBagEgg) if (sanityIsBadEgg)
StringCopyPadded(sPSSData->cursorMonNickText, sPSSData->cursorMonNick, CHAR_SPACE, 5); StringCopyPadded(sPSSData->cursorMonNickText, sPSSData->cursorMonNick, CHAR_SPACE, 5);
else else
StringCopyPadded(sPSSData->cursorMonNickText, gText_EggNickname, CHAR_SPACE, 8); StringCopyPadded(sPSSData->cursorMonNickText, gText_EggNickname, CHAR_SPACE, 8);