diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
| commit | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (patch) | |
| tree | 7f03009ed9475a0f8e7aac6ed6ca2ab89a527577 /src/field_effect.c | |
| parent | 8b462f3f6c30de55767808136861e892fc3f0356 (diff) | |
| parent | 8b80b417e2172a44098a22473717da20585bd15d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index c4e9fc40a..07579f55d 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2043,7 +2043,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEve u8 FldEff_LavaridgeGymWarp(void) { u8 spriteId; - sub_80930E0((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); + SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = 1; @@ -2136,7 +2136,7 @@ static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent *o u8 FldEff_PopOutOfAsh(void) { u8 spriteId; - sub_80930E0((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); + SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = 1; |