diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
| commit | bcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (patch) | |
| tree | cd9e57cb761cad0ad93d5024d3f8c84e49e2bd9d /include/field_effect_helpers.h | |
| parent | df479661ffd0c270e4a8c35f37285d5d3988f592 (diff) | |
| parent | a705a863d1f59411a6f18fdd95e81de76f66fd66 (diff) | |
pokeblock merge conflicts
Diffstat (limited to 'include/field_effect_helpers.h')
| -rw-r--r-- | include/field_effect_helpers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e80daf3bd..15928eba3 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -12,5 +12,6 @@ // Exported ROM declarations u8 sub_8154228(void); bool8 sub_8155DA0(struct MapObject *); +void sub_8155D78(struct MapObject *); #endif //GUARD_FIELD_EFFECT_HELPERS_H |