diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-03 14:09:21 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-03 14:09:21 -0400 |
| commit | 7f5075336072486bc3261b20551f9a035768d42b (patch) | |
| tree | 46bdd0e92ab1eb1578a6def20a49d4031b12e020 /src/field_effect.c | |
| parent | cb90fda18d63e0d780b6766d2fce95193127e208 (diff) | |
Sync field_effect_object_template_pointers.h with Emerald
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index e193ab3b5..e5d94e889 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1903,7 +1903,7 @@ u8 FldEff_LavaridgeGymWarp(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_LAUNCH], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_PUFF], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -3048,7 +3048,7 @@ static void sub_8086D94(struct Sprite * sprite); u8 FldEff_NpcFlyOut(void) { - u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0x78, 0, 1); + u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0x78, 0, 1); struct Sprite * sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; @@ -3239,7 +3239,7 @@ static u8 sub_8087168(void) { u8 spriteId; struct Sprite * sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0xff, 0xb4, 0x1); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1); sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; |