Merge branch 'master' into reverts

2020-10-26 12:16:36 -03:00
parent fe40c0c466 585f313c64
commit 1c3d75f673
382 changed files with 22866 additions and 22447 deletions
@@ -536,6 +536,8 @@ void HandleAction_ThrowPokeblock(void)
        gBattleStruct->safariPkblThrowCounter++;
    if (gBattleStruct->safariEscapeFactor > 1)
    {
+        // BUG: The safariEscapeFactor is unintetionally able to become 0 (but it can not become negative!). This causes the pokeblock throw glitch.
+        // To fix that change the < in the if statement below to <=. 
        if (gBattleStruct->safariEscapeFactor < sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]])
            gBattleStruct->safariEscapeFactor = 1;
        else