diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-11 16:05:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 16:05:04 -0400 |
| commit | 0ccdd940f728d533ffff43288314cb2a3693d183 (patch) | |
| tree | 9759375214d042e1aea2d0c8b09793f5314cd53d /src/field_effect.c | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
| parent | c05af7f3941ab1aae6b45dfd0290b0d378a4aa72 (diff) | |
Merge pull request #429 from PikalaxALT/doc_field_effect_templates
Document field effect graphics
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index c2b507882..4cab3cff8 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1903,13 +1903,13 @@ u8 FldEff_LavaridgeGymWarp(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[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; } -void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite) +void SpriteCB_AshLaunch(struct Sprite * sprite) { if (sprite->animEnded) { @@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[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[26], 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[26], 0xff, 0xb4, 0x1); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1); sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; |