Misc improvements to pokerus code, 2 new egg related configs

Author: FosterProgramming

include/config/pokemon.h

@@ -66,15 +66,6 @@
 #define P_LEARNSET_HELPER_TEACHABLE      TRUE   // If TRUE, teachable_learnsets.h will be populated by tools/learnset_helpers/make_teachables.py using the included JSON files based on available TMs and tutors.
 #define P_TUTOR_MOVES_ARRAY              FALSE  // If TRUE, generates a gTutorMoves array automatically using make_teachables.py. (generally not needed, but the HGSS Pokedex has an optional use for it)
 
-//Pokerus settings
-//For pokerus, we refer to infection as a pokemon catching Pokerus from an enemy pokemon (trainer or wild) and we refer to spreading as pokemon catching pokerus from another infected pokemon in the party
-#define P_POKERUS_ENABLED                TRUE       // If FALSE, Pokerus will have no effect, won't be shown and won't be aquired in any way but save data won't be affected
-#define P_POKERUS_STRAIN_DISTRIBUTION    GEN_LATEST // Pokerus has 16 different strains and their probability distribution change depending on generation
-#define P_POKERUS_SPREAD_ADJACENECY      GEN_LATEST // In Gen 2, Pokerus spread to one adjacent pokemon but it spreads to both adjacent pokemon in gen 3+
-#define P_POKERUS_SPREAD_DAYS_LEFT       GEN_LATEST // In Gen 2, a freshly spreaded pokemon will get its full infection duration based on strain. In gen 3+, the pokerus duration will copy the duration from the pokemon it was spreaded from
-#define P_POKERUS_INFECT_AGAIN           TRUE       // If TRUE, your party can get infected even when it is already infected with Pokerus (doesn't affect spreading, only TRUE in gen 2)
-#define P_POKERUS_INFECTION_FLAG         0          // If Pokerus can only get infected if this flag is set or undefined (0). This emulates a gen 2 mechanic where Pokemon can only get infected by Pokerus after visiting Goldernrod. This does not affect spreading
-
 // Flag settings
 // To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
 // Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.

include/config/pokerus.h

@@ -0,0 +1,14 @@
+#ifndef GUARD_CONFIG_POKERUS_H
+#define GUARD_CONFIG_POKERUS_H
+
+//For pokerus, we refer to infection as a pokemon catching Pokerus from an enemy pokemon (trainer or wild) and we refer to spreading as pokemon catching pokerus from another infected pokemon in the party
+#define P_POKERUS_ENABLED                TRUE       // If FALSE, Pokerus will have no effect, won't be shown and won't be aquired in any way but save data won't be affected
+#define P_POKERUS_STRAIN_DISTRIBUTION    GEN_LATEST // Pokerus has 16 different strains and their probability distribution change depending on generation
+#define P_POKERUS_SPREAD_ADJACENECY      GEN_LATEST // In Gen 2, Pokerus spread to one adjacent pokemon but it spreads to both adjacent pokemon in gen 3+
+#define P_POKERUS_SPREAD_DAYS_LEFT       GEN_LATEST // In Gen 2, a freshly spreaded pokemon will get its full infection duration based on strain. In gen 3+, the pokerus duration will copy the duration from the pokemon it was spreaded from
+#define P_POKERUS_INFECT_AGAIN           TRUE       // If TRUE, your party can get infected even when it is already infected with Pokerus (doesn't affect spreading, only TRUE in gen 2)
+#define P_POKERUS_INFECT_EGG             FALSE      // If TRUE, eggs can receive Pokerus from spread and direction infection (gen 2). If FALSE, eggs can receive Pokerus from spread but not direct infection (gen 3). Behavior is unknown in other gens.
+#define P_POKERUS_VISIBLE_ON_EGG         TRUE       // Controls if eggs can show pokerus symbol in summary screen (TRUE from gen 3 to 6, FALSE in gen 2,7 and 8)
+#define P_POKERUS_INFECTION_FLAG         0          // If Pokerus can only get infected if this flag is set or undefined (0). This emulates a gen 2 mechanic where Pokemon can only get infected by Pokerus after visiting Goldernrod. This does not affect spreading
+
+#endif // GUARD_CONFIG_POKERUS_H

include/pokerus.h

@@ -2,9 +2,10 @@
 #define GUARD_POKERUS_H
 
 void RandomlyGivePartyPokerus(struct Pokemon *party);
-u8 CheckPartyPokerus(struct Pokemon *party, u8 selection);
-u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
+u8 CheckPartyPokerus(struct Pokemon *party);
+u8 CheckMonPokerus(struct Pokemon *mon);
+u8 CheckMonHasHadPokerus(struct Pokemon *mon);
 void UpdatePartyPokerusTime(u16 days);
 void PartySpreadPokerus(struct Pokemon *party);
 
-#endif // GUARD_POKERUS_H
+#endif // GUARD_POKERUS_H

src/field_specials.c

@@ -1490,10 +1490,7 @@ bool8 ScriptCheckFreePokemonStorageSpace(void)
 
 bool8 IsPokerusInParty(void)
 {
-    if (!CheckPartyPokerus(gPlayerParty, (1 << PARTY_SIZE) - 1))
-        return FALSE;
-
-    return TRUE;
+    return CheckPartyPokerus(gPlayerParty);
 }
 
 // Task data for Task_ShakeCamera

src/party_menu.c

@@ -79,6 +79,7 @@
 #include "constants/party_menu.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "config/pokerus.h"
 
 enum {
     MENU_SUMMARY,
@@ -2134,7 +2135,7 @@ u8 GetMonAilment(struct Pokemon *mon)
     ailment = GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS));
     if (ailment != AILMENT_NONE)
         return ailment;
-    if (CheckPartyPokerus(mon, 0))
+    if (CheckMonPokerus(mon) && (P_POKERUS_VISIBLE_ON_EGG || !GetMonData(mon, MON_DATA_IS_EGG)))
         return AILMENT_PKRS;
     return AILMENT_NONE;
 }

src/pokemon.c

@@ -5346,7 +5346,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
         if (totalEVs >= currentEVCap)
             break;
 
-        if (CheckPartyHasHadPokerus(mon, 0))
+        if (CheckMonHasHadPokerus(mon))
             multiplier = 2;
         else
             multiplier = 1;

src/pokemon_summary_screen.c

@@ -52,6 +52,7 @@
 #include "constants/region_map_sections.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "config/pokerus.h"
 
 // Screen titles (upper left)
 #define PSS_LABEL_WINDOW_POKEMON_INFO_TITLE 0
@@ -2967,7 +2968,8 @@ static void TilemapFiveMovesDisplay(u16 *dst, u16 palette, bool8 remove)
 
 static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mon has been cured of pokerus
 {
-    if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol
+    if (!CheckMonPokerus(mon) && CheckMonHasHadPokerus(mon)
+        && (P_POKERUS_VISIBLE_ON_EGG || !GetMonData(mon, MON_DATA_IS_EGG))) // If yes it draws the cured symbol
     {
         sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C;
         sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C;

src/pokerus.c

@@ -3,13 +3,14 @@
 #include "pokemon.h"
 #include "pokerus.h"
 #include "random.h"
+#include "config/pokerus.h"
 
 void RandomlyGivePartyPokerus(struct Pokemon *party)
 {
     if (!P_POKERUS_ENABLED)
         return;
 
-    if (!P_POKERUS_INFECT_AGAIN && CheckPartyPokerus(gPlayerParty, (1 << PARTY_SIZE) - 1))
+    if (!P_POKERUS_INFECT_AGAIN && CheckPartyPokerus(party))
         return;
 
     if (P_POKERUS_INFECTION_FLAG && !FlagGet(P_POKERUS_INFECTION_FLAG))
@@ -25,9 +26,9 @@ void RandomlyGivePartyPokerus(struct Pokemon *party)
             rnd = Random() % PARTY_SIZE;
             mon = &party[rnd];
         }
-        while (!GetMonData(mon, MON_DATA_SPECIES, 0) || GetMonData(mon, MON_DATA_IS_EGG, 0));
+        while (!GetMonData(mon, MON_DATA_SPECIES) || (!P_POKERUS_INFECT_EGG && GetMonData(mon, MON_DATA_IS_EGG)));
 
-        if (!(CheckPartyHasHadPokerus(party, 1u << rnd)))
+        if (!(CheckMonHasHadPokerus(&party[rnd])))
         {
             u32 strain;
             u32 daysLeft;
@@ -46,95 +47,73 @@ void RandomlyGivePartyPokerus(struct Pokemon *party)
     }
 }
 
-u8 CheckPartyPokerus(struct Pokemon *party, u8 selection)
+u8 CheckPartyPokerus(struct Pokemon *party)
 {
     if (!P_POKERUS_ENABLED)
         return FALSE;
 
-    u8 retVal;
-    int partyIndex = 0;
-    unsigned curBit = 1;
-    retVal = 0;
-
-    if (selection)
-    {
-        do
-        {
-            if ((selection & 1) && GetMonData(&party[partyIndex], MON_DATA_POKERUS_DAYS_LEFT))
-                retVal |= curBit;
-            partyIndex++;
-            curBit <<= 1;
-            selection >>= 1;
-        }
-        while (selection);
-    }
-    else if (GetMonData(&party[0], MON_DATA_POKERUS_DAYS_LEFT, 0))
+    for (u32 i = 0; i < PARTY_SIZE; i++)
     {
-        retVal = 1;
+        if (!GetMonData(&party[i], MON_DATA_SPECIES))
+            continue;
+
+        if (GetMonData(&party[i], MON_DATA_POKERUS_DAYS_LEFT))
+            return TRUE;
     }
 
-    return retVal;
+    return FALSE;
 }
 
-u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection)
+u8 CheckMonPokerus(struct Pokemon *mon)
 {
     if (!P_POKERUS_ENABLED)
         return FALSE;
 
-    u8 retVal;
-    int partyIndex = 0;
-    unsigned curBit = 1;
-    retVal = 0;
+    if (GetMonData(mon, MON_DATA_POKERUS_DAYS_LEFT))
+        return TRUE;
 
-    if (selection)
-    {
-        do
-        {
-            if ((selection & 1) && GetMonData(&party[partyIndex], MON_DATA_POKERUS_STRAIN))
-                retVal |= curBit;
-            partyIndex++;
-            curBit <<= 1;
-            selection >>= 1;
-        }
-        while (selection);
-    }
-    else if (GetMonData(&party[0], MON_DATA_POKERUS_STRAIN))
-    {
-        retVal = 1;
-    }
+    return FALSE;
+}
+
+u8 CheckMonHasHadPokerus(struct Pokemon *mon)
+{
+    if (!P_POKERUS_ENABLED)
+        return FALSE;
+
+    if (GetMonData(mon, MON_DATA_POKERUS_STRAIN))
+        return TRUE;
 
-    return retVal;
+    return FALSE;
 }
 
 void UpdatePartyPokerusTime(u16 days)
 {
     if (!P_POKERUS_ENABLED)
         return;
 
-    int i;
-    for (i = 0; i < PARTY_SIZE; i++)
+    for (u32 i = 0; i < PARTY_SIZE; i++)
     {
-        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, 0))
+        if (!GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+            continue;
+
+        u32 strain = GetMonData(&gPlayerParty[i], MON_DATA_POKERUS_STRAIN);
+        u32 daysLeft = GetMonData(&gPlayerParty[i], MON_DATA_POKERUS_DAYS_LEFT);
+        if (daysLeft)
         {
-            u32 strain = GetMonData(&gPlayerParty[i], MON_DATA_POKERUS_STRAIN, 0);
-            u32 daysLeft = GetMonData(&gPlayerParty[i], MON_DATA_POKERUS_DAYS_LEFT, 0);
-            if (daysLeft)
+            if (daysLeft < days || days > 4)
+                daysLeft = 0;
+            else
+                daysLeft -= days;
+
+            //If the strain was 0, we changed it to 1 when the pokerus disappear to remember the pokemon was infected by pokerus
+            // (otherwise its data would look the same as unaffected pokemon)
+            if (daysLeft == 0 && strain == 0)
             {
-                if (daysLeft < days || days > 4)
-                    daysLeft = 0;
-                else
-                    daysLeft -= days;
-
-                //If the strain was 0, we changed it to 1 when the pokerus disappear to remember the pokemon was infected by pokerus
-                // (otherwise its data would look the same as unaffected pokemon)
-                if (daysLeft == 0 && strain == 0)
-                {
-                    strain = 1;
-                    SetMonData(&gPlayerParty[i], MON_DATA_POKERUS, &strain);
-                }
-
-                SetMonData(&gPlayerParty[i], MON_DATA_POKERUS, &daysLeft);
+                strain = 1;
+                SetMonData(&gPlayerParty[i], MON_DATA_POKERUS_STRAIN, &strain);
             }
+
+            SetMonData(&gPlayerParty[i], MON_DATA_POKERUS_DAYS_LEFT, &daysLeft);
         }
     }
 }
@@ -152,35 +131,34 @@ void PartySpreadPokerus(struct Pokemon *party)
     if (!P_POKERUS_ENABLED)
         return;
 
-    if ((Random() % 3) == 0)
+    if (Random() % 3)
+        return;
+
+    for (u32 i = 0; i < PARTY_SIZE; i++)
     {
-        int i;
-        for (i = 0; i < PARTY_SIZE; i++)
+        if (!GetMonData(&party[i], MON_DATA_SPECIES))
+            continue;
+
+        u32 strain = GetMonData(&party[i], MON_DATA_POKERUS_STRAIN);
+        u32 daysLeft = GetMonData(&party[i], MON_DATA_POKERUS_DAYS_LEFT);
+        if (daysLeft)
         {
-            if (GetMonData(&party[i], MON_DATA_SPECIES, 0))
+            bool32 spreadUp = TRUE, spreadDown = TRUE;
+            if (P_POKERUS_SPREAD_ADJACENECY < GEN_3)
             {
-                u32 strain = GetMonData(&party[i], MON_DATA_POKERUS_STRAIN);
-                u32 daysLeft = GetMonData(&party[i], MON_DATA_POKERUS_DAYS_LEFT);
-                if (daysLeft)
-                {
-                    bool32 spreadUp = TRUE, spreadDown = TRUE;
-                    if (P_POKERUS_SPREAD_ADJACENECY < GEN_3)
-                    {
-                        if (i == (CalculatePlayerPartyCount() - 1)
-                            || (Random() % 2))
-                            spreadUp = FALSE;
-                        else
-                            spreadDown = FALSE;
-                    }
-                    if (spreadDown && i != 0 && !GetMonData(&party[i - 1], MON_DATA_POKERUS_STRAIN))
-                        SpreadPokerusToSpecificMon(&party[i - 1], strain, daysLeft);
-                    if (spreadUp && i != (PARTY_SIZE - 1) && !GetMonData(&party[i + 1], MON_DATA_POKERUS_STRAIN))
-                    {
-                        SpreadPokerusToSpecificMon(&party[i + 1], strain, daysLeft);
-                        i++;
-                    }
-                }
+                if (i == (gPlayerPartyCount - 1)
+                    || (Random() % 2))
+                    spreadUp = FALSE;
+                else
+                    spreadDown = FALSE;
+            }
+            if (spreadDown && i != 0 && !GetMonData(&party[i - 1], MON_DATA_POKERUS_STRAIN))
+                SpreadPokerusToSpecificMon(&party[i - 1], strain, daysLeft);
+            if (spreadUp && i != (PARTY_SIZE - 1) && !GetMonData(&party[i + 1], MON_DATA_POKERUS_STRAIN))
+            {
+                SpreadPokerusToSpecificMon(&party[i + 1], strain, daysLeft);
+                i++;
             }
         }
     }
-}
+}