diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
commit | 82f55f238125ff42845881189eb9237692c48ba4 (patch) | |
tree | 7b496125c6e0b644ce535548ec09755fd4f489bb /src/field_control_avatar.c | |
parent | 6556b556dd624964f53d76ff546589e6688412eb (diff) | |
parent | 6967caefb246f9709032049b0ae2baee71f71eb6 (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r-- | src/field_control_avatar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 004d72614..bd261e055 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -517,7 +517,7 @@ static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior) } else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior)) { - ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8); + ScriptContext1_SetupScript(BattlePyramid_WarpToNextFloor); return TRUE; } else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE) |