summaryrefslogtreecommitdiff
path: root/include/field_effect.h
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-06-24 13:45:15 -0400
committerGitHub <noreply@github.com>2018-06-24 13:45:15 -0400
commitb3dec86071ae7d2eb5c1258ea778f0e823a5f636 (patch)
tree594590b12dc14049b9c17587d8b602686a4c57fa /include/field_effect.h
parentac636ec14e896214b549025e671fc6ae7f6fd045 (diff)
parent4313b2f49d22f4e5a6db3c45f9f3a434079a7c1f (diff)
Merge pull request #1 from pret/master
upstream merge
Diffstat (limited to 'include/field_effect.h')
-rw-r--r--include/field_effect.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/field_effect.h b/include/field_effect.h
index 4ca97c898..a1c175eb8 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -120,9 +120,6 @@ bool8 sub_8087774(struct Task *, struct EventObject *, struct Sprite *);
bool8 sub_80877AC(struct Task *, struct EventObject *, struct Sprite *);
bool8 sub_80877D4(struct Task *, struct EventObject *, struct Sprite *);
-void sub_80878F4(struct Task *);
-void sub_8087914(struct Task *);
-
void sub_8087AA4(struct Task *);
void sub_8087AC8(struct Task *);
@@ -176,7 +173,7 @@ u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority);
u8 CreateMonSprite_PicBox(u16, s16, s16, u8);
void FreeResourcesAndDestroySprite(struct Sprite *sprite);
void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
-void sub_80878A8(void);
+void StartEscapeRopeFieldEffect(void);
void CreateTeleportFieldEffectTask(void);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);