diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /src/field_control_avatar.c | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e6a859c84..4f6f5acdf 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -32,7 +32,7 @@ #include "constants/maps.h" #include "constants/songs.h" -extern bool32 sub_8196034(void); +extern bool32 TryStartMatchCall(void); static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; @@ -600,7 +600,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050); return TRUE; } - if (sub_8196034()) + if (TryStartMatchCall()) return TRUE; return FALSE; } |