Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave

2020-07-08 16:03:32 -04:00
parent 2ed1f7c6f9 ebade7affb
commit beeb673ba1
534 changed files with 9282 additions and 8186 deletions
@@ -376,7 +376,7 @@ void sub_81D4A90(void)

        x = mew->currentCoords.x;
        y = mew->currentCoords.y;
-        sub_80930E0(&x, &y, 8, 8);
+        SetSpritePosToOffsetMapCoords(&x, &y, 8, 8);
        sUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1);
        if (sUnknown_0203CF50 != MAX_SPRITES)
        {