Port PSS utility functions

2020-03-11 09:55:45 -04:00
parent 6af8c04d8f
commit d2b0f36b7d
8 changed files with 22521 additions and 23037 deletions
@@ -442,7 +442,7 @@ bool8 IsThereRoomInAnyBoxForMorePokemon(void)
    {
        for (j = 0; j < IN_BOX_COUNT; j++)
        {
-            if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SPECIES) == SPECIES_NONE)
+            if (GetBoxMonDataAt(i, j, MON_DATA_SPECIES) == SPECIES_NONE)
                return TRUE;
        }
    }
@@ -1642,7 +1642,7 @@ void ChangeBoxPokemonNickname(void)

 static void ChangeBoxPokemonNickname_CB(void)
 {
-    SetBoxMonNickFromAnyBox(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2);
+    SetBoxMonNickAt(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2);
    CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }