diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
commit | 1b7246395d0d7e47834f3b9c4f9f016a906a9953 (patch) | |
tree | e775f8d4d5e30bbfb7ef3b5ca9dcf62171d919bb /include/field_effect.h | |
parent | ba00a1c688f84edcab44bd183d6dea4e2e7ba0be (diff) | |
parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) |
merge conflicts, review changes, daycare
Diffstat (limited to 'include/field_effect.h')
-rw-r--r-- | include/field_effect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index aa3f7eba0..629ae07c7 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -69,9 +69,10 @@ enum FieldEffectScriptIdx FLDEFF_USE_TELEPORT }; +extern u32 gFieldEffectArguments[8]; + u8 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); - -extern u32 gFieldEffectArguments[8]; +void sub_80B69DC(void); #endif //GUARD_FIELD_EFFECTS_H |