diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:08:38 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:23:47 -0500 |
| commit | 9e840dc5fea3d732a347092c804afb3c6a86d61a (patch) | |
| tree | 22141282dc7f0f7cf9fd05f48dbb884def3d9f19 /src/battle_controller_safari.c | |
| parent | d50554bb8e90d314ae0131e925224406992a4c97 (diff) | |
| parent | 1f767e4c4925f77f1a34c3da124b8be267a0b193 (diff) | |
Merge remote-tracking branch 'Tetra/master'
Diffstat (limited to 'src/battle_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index aab804b41..898e18294 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -687,7 +687,7 @@ static void SafariHandleCmd55(void) FadeOutMapMusic(5); BeginFastPaletteFade(3); SafariBufferExecCompleted(); - if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; } |