Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR
2020-07-08 15:51:58 -04:00
committed by GitHub
498 changed files with 8011 additions and 7053 deletions

View File

@@ -1019,7 +1019,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[FLDEFFOBJ_SPARKLE], x, y, 0);
if (spriteId != MAX_SPRITES)