diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/field_effect_helpers.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/field_effect_helpers.h')
| -rw-r--r-- | include/field_effect_helpers.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 62f492bdc..56838fc3a 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -1,11 +1,13 @@ -// -// Created by scott on 5/25/2017. -// - -#ifndef POKERUBY_FIELD_EFFECT_HELPERS_H -#define POKERUBY_FIELD_EFFECT_HELPERS_H +#ifndef GUARD_FIELD_EFFECT_HELPERS_H +#define GUARD_FIELD_EFFECT_HELPERS_H void sub_812869C(struct MapObject *); bool8 sub_81286C4(struct MapObject *); +u8 sub_8126B54(void); +void objid_set_invisible(u8); +void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); +void sub_8127ED0(u8, u8); +void sub_8127F28(u8, u8, s16); +u8 sub_8128124(u8 id); -#endif //POKERUBY_FIELD_EFFECT_HELPERS_H +#endif // GUARD_FIELD_EFFECT_HELPERS_H |