dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

Browse Source
This commit is contained in:
PikalaxALT
2020-04-09 11:25:47 -04:00
parent eba370ac3b a81edaba1d
commit a42e4134af
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_main.c
+5 -1
View File
@@ -3851,7 +3851,11 @@ static void ReturnFromBattleToOverworld(void)
if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
{ {
UpdateRoamerHPStatus(&gEnemyParty[0]); 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(); SetRoamerInactive();
} }
m4aSongNumStop(SE_HINSI); m4aSongNumStop(SE_HINSI);