Merge branch 'master' into doc-overworld

2020-07-23 10:31:52 -04:00
parent 60ca1aa3fd 2e077f09e4
commit 4a42e2a710
14 changed files with 1090 additions and 1155 deletions
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -8127,7 +8127,7 @@ static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *
 {
    u8 i;

-    if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent))
+    if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !ShouldMewShakeGrass(objEvent))
        return;

    for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)