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
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -1007,7 +1007,7 @@ void DoSecretBaseGlitterMatSparkle(void)
    s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
    u8 spriteId;

-    sub_80930E0(&x, &y, 8, 4);
+    SetSpritePosToOffsetMapCoords(&x, &y, 8, 4);

    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[22], x, y, 0);
    if (spriteId != MAX_SPRITES)