diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-14 19:25:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 19:25:10 -0400 |
| commit | 928cdf2531e74df2432ec8d602c4c2d2fee14eb1 (patch) | |
| tree | 9a520de5b4790f14175a28eb70665a4f60ade486 /src/field_control_avatar.c | |
| parent | 30ef49416391d036286661a8e1225b4ba03e3109 (diff) | |
| parent | 26962b7725ffc5df719a0eea9442735b9dc04b5c (diff) | |
Merge branch 'master' into doc-inc2
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 f3f9be530..bde49b663 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -547,7 +547,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) { if (UpdatePoisonStepCounter() == TRUE) { - ScriptContext1_SetupScript(EventScript_Poison); + ScriptContext1_SetupScript(EventScript_FieldPoison); return TRUE; } if (ShouldEggHatch()) @@ -733,7 +733,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) { - ScriptContext1_SetupScript(gUnknown_082A8350); + ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre); return TRUE; } if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE) |