diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:54:25 -0400 |
| commit | 7ada56f0395ca6d4d6810c6f3762f8e03dc60cb7 (patch) | |
| tree | acdd4137cef25d027789bc67ab972d49aeb81b50 /include/field_effect.h | |
| parent | c6b27013cc42161636ae345c913a2bd26c5854fd (diff) | |
| parent | e06de33cbdab8ca853bcdd1b4c8909a61aabfcef (diff) | |
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 59f99ad93..731fb9c59 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -16,7 +16,7 @@ void ReturnToFieldFromFlyMapSelect(void); u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); -void CreateTeleportFieldEffectTask(void); +void FldEff_TeleportWarpOut(void); void FieldEffectActiveListRemove(u8 id); void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); void FieldEffectActiveListAdd(u8 id); @@ -39,12 +39,8 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority); void StartLavaridgeGymB1FWarp(u8 priority); void StartLavaridgeGym1FWarp(u8 priority); -void sub_80B9C28(s16*, u8); -void sub_80B9C54(s16*, u8); -void sub_80B9CDC(s16*, u8); - -void SpriteCB_PopOutOfAsh(struct Sprite*); -void SpriteCB_LavaridgeGymWarp(struct Sprite*); +void SpriteCB_AshPuff(struct Sprite*); +void SpriteCB_AshLaunch(struct Sprite*); void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); |