Merge branch 'master' into nohara

1 files changed, 18 insertions, 18 deletions

diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index f8f075296..a463e8054 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -4823,20 +4823,20 @@ void sub_80A1C30(u8 a)
     }
 }
 
-u8 pokemon_ailments_get_primary(u32 status)
+u8 GetPrimaryStatus(u32 status)
 {
-    if (status & 0x88)
-        return 1;
-    if (status & 0x40)
-        return 2;
-    if (status & 0x7)
-        return 3;
-    if (status & 0x20)
-        return 4;
-    if (status & 0x10)
-        return 5;
-
-    return 0;
+    if (status & (STATUS_POISON | STATUS_TOXIC_POISON))
+        return STATUS_PRIMARY_POISON;
+    if (status & STATUS_PARALYSIS)
+        return STATUS_PRIMARY_PARALYSIS;
+    if (status & STATUS_SLEEP)
+        return STATUS_PRIMARY_SLEEP;
+    if (status & STATUS_FREEZE)
+        return STATUS_PRIMARY_FREEZE;
+    if (status & STATUS_BURN)
+        return STATUS_PRIMARY_BURN;
+
+    return STATUS_PRIMARY_NONE;
 }
 
 u8 GetMonStatusAndPokerus(struct Pokemon *mon)
@@ -4844,15 +4844,15 @@ u8 GetMonStatusAndPokerus(struct Pokemon *mon)
     u8 statusAilment;
 
     if (GetMonData(mon, MON_DATA_HP) == 0)
-        return 7;
+        return STATUS_PRIMARY_FAINTED;
 
-    statusAilment = pokemon_ailments_get_primary(GetMonData(mon, MON_DATA_STATUS));
-    if (statusAilment == 0)
+    statusAilment = GetPrimaryStatus(GetMonData(mon, MON_DATA_STATUS));
+    if (statusAilment == STATUS_PRIMARY_NONE)
     {
         if (!CheckPartyPokerus(mon, 0))
-            return 0;
+            return STATUS_PRIMARY_NONE;
         else
-            return 6;
+            return STATUS_PRIMARY_POKERUS;
     }
 
     return statusAilment;