diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-09 10:21:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 10:21:28 -0400 |
| commit | a81edaba1d5e0f84336fd8a57a48b2a970171ba4 (patch) | |
| tree | 3daaada662ec39f66f5e97ef4b43dc1cbed02a2b /src | |
| parent | 7f9e0ae6bf9d8e0ffe8ff0ef32a3d9d40db893f2 (diff) | |
| parent | c79f1f1c8007c483b731448489b67a4b7480e698 (diff) | |
Merge pull request #327 from ultima-soul/documentation
Document Roamer Roar bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index d2735086f..841985c48 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3851,7 +3851,11 @@ static void ReturnFromBattleToOverworld(void) if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) { UpdateRoamerHPStatus(&gEnemyParty[0]); - if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) +#ifdef BUGFIX + if ((gBattleOutcome == B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) +#else + if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) // Bug: When Roar is used by roamer, gBattleOutcome is B_OUTCOME_PLAYER_TELEPORTED (5). +#endif // & with B_OUTCOME_WON (1) will return TRUE and deactivates the roamer. SetRoamerInactive(); } m4aSongNumStop(SE_HINSI); |