diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
commit | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (patch) | |
tree | aec3073d480a2fbc3f0221397aa5e84f85755e48 /include/field_effect.h | |
parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 |