diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
| commit | a252140f3b462efbeaec392030479e9e12999f23 (patch) | |
| tree | bb85cfb66bc0aa970e9b27eedaa7d9894e83666f /include/field_effect.h | |
| parent | 1112af4e1905135a7bc2dd53353b52762ff7d49a (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into mail
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 |