Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon

rh-hideout · Sep 9, 2022 · ceb0c67 · ceb0c67
1 parent 12fee71
commit ceb0c67
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/src/pokemon.c b/src/pokemon.c
@@ -8273,26 +8273,23 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *boxMon, u16 method, u32
                         targetSpecies = formChanges[i].targetSpecies;
                     break;
                 case FORM_ITEM_USE:
-                    RtcCalcLocalTime();
                     if (arg == formChanges[i].param1)
                     {
-                        if (!formChanges[i].param2)
+                        switch (formChanges[i].param2)
                         {
+                        case DAY:
+                            RtcCalcLocalTime();
+                            if (gLocalTime.hours >= 12 && gLocalTime.hours < 24)
+                                targetSpecies = formChanges[i].targetSpecies;
+                            break;
+                        case NIGHT:
+                            RtcCalcLocalTime();
+                            if (gLocalTime.hours >= 0 && gLocalTime.hours < 12)
+                                targetSpecies = formChanges[i].targetSpecies;
+                            break;
+                        default:
                             targetSpecies = formChanges[i].targetSpecies;
-                        }
-                        else
-                        {
-                            switch (formChanges[i].param2)
-                            {
-                            case DAY:
-                                if (gLocalTime.hours >= 12 && gLocalTime.hours < 24)
-                                    targetSpecies = formChanges[i].targetSpecies;
-                                break;
-                            case NIGHT:
-                                if (gLocalTime.hours >= 0 && gLocalTime.hours < 12)
-                                    targetSpecies = formChanges[i].targetSpecies;
-                                break;
-                            }
+                            break;
                         }
                     }
                     break;