diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /include/field_effect.h | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 629ae07c7..772b20d37 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -71,8 +71,9 @@ enum FieldEffectScriptIdx extern u32 gFieldEffectArguments[8]; -u8 FieldEffectStart(u8); +u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); +void FieldEffectStop(struct Sprite *sprite, u8 id); #endif //GUARD_FIELD_EFFECTS_H |