fix merge conflicts

1 files changed, 8 insertions, 8 deletions

diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index d111cf8f6..abc4dbc9e 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -560,16 +560,16 @@ u8 ScriptGiveMon(u16 species, u8 var, u16 item, u32 var3, u32 var4, u8 var5)
     nationalSpecies = SpeciesToNationalPokedexNum(species);
 
     // nested if check to fool compiler
-    if(sentToPc < 2)
+    switch(sentToPc)
     {
-        if(sentToPc >= 0)
-        {
-            // set both the seen and caught flags
-            sub_8090D90(nationalSpecies, 2);
-            sub_8090D90(nationalSpecies, 3);
-        }
+        case 0:
+        case 1:
+            GetNationalPokedexFlag(nationalSpecies, 2);
+            GetNationalPokedexFlag(nationalSpecies, 3);
+            return sentToPc;
+        default:
+            return sentToPc;
     }
-    return sentToPc;
 }
 
 u8 ScriptGiveEgg(u16 value)