diff options
| author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
|---|---|---|
| committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
| commit | 1c3d75f6736445324fdcba31d5dbd858997e22c4 (patch) | |
| tree | e0a94bdb8c2a3323048c9dc9540fa6b5af004c83 /src/battle_util.c | |
| parent | fe40c0c4663d732c8ba9ca5f5e00b3c14a17d304 (diff) | |
| parent | 585f313c646cb9494bed48395572daf1502978a5 (diff) | |
Merge branch 'master' into reverts
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index db9903d33..7025f0e3f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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 |