diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-21 10:10:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 10:10:04 -0500 |
| commit | b787f8ca045b03521f03d84df8ea06ff87a2ab01 (patch) | |
| tree | 63467bde2f08295e231eec02610f6e041ca38944 /src/battle_controller_wally.c | |
| parent | 25e469b6644377ec4e4f82eab294437a61ea7635 (diff) | |
| parent | 66fd9b2ddfef147159033271046f62b4f2c8adad (diff) | |
Merge pull request #335 from DizzyEggg/battledoc
Document some not labeled battle things
Diffstat (limited to 'src/battle_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 747aa2987..80dd6d3bb 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1560,7 +1560,7 @@ static void WallyHandleCmd55(void) BeginFastPaletteFade(3); WallyBufferExecCompleted(); - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD) && gBattleTypeFlags & BATTLE_TYPE_LINK) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) && gBattleTypeFlags & BATTLE_TYPE_LINK) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } |