diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
| commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
| tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/field_effect.h | |
| parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
fix merge conflict
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 7ec26b3d7..aa3f7eba0 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,7 +1,3 @@ -// -// Created by Scott Norton on 9/15/17. -// - #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H @@ -73,8 +69,9 @@ enum FieldEffectScriptIdx FLDEFF_USE_TELEPORT }; -extern u32 gFieldEffectSpawnParams[8]; - u8 FieldEffectStart(u8); +bool8 FieldEffectActiveListContains(u8 id); + +extern u32 gFieldEffectArguments[8]; #endif //GUARD_FIELD_EFFECTS_H |