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_ground_effect.h | |
parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
fix merge conflicts
Diffstat (limited to 'include/field_ground_effect.h')
-rw-r--r-- | include/field_ground_effect.h | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h index 8a69426b3..19d43c916 100644 --- a/include/field_ground_effect.h +++ b/include/field_ground_effect.h @@ -1,11 +1,27 @@ -// -// Created by Scott Norton on 5/22/17. -// - -#ifndef POKERUBY_FIELD_GROUND_EFFECT_H -#define POKERUBY_FIELD_GROUND_EFFECT_H +#ifndef GUARD_FIELD_GROUND_EFFECT_H +#define GUARD_FIELD_GROUND_EFFECT_H bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y); bool8 AreZCoordsCompatible(u8 z1, u8 z2); +void FieldObjectUpdateMetatileBehaviors(struct MapObject *); +void GetGroundEffectFlags_Reflection(struct MapObject *, u32 *); +void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *, u32 *); +void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *, u32 *); +void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *, u32 *); +void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *, u32 *); +void GetGroundEffectFlags_Tracks(struct MapObject *, u32 *); +void GetGroundEffectFlags_SandPile(struct MapObject *, u32 *); +void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *, u32 *); +void GetGroundEffectFlags_Puddle(struct MapObject *, u32 *); +void GetGroundEffectFlags_Ripple(struct MapObject *, u32 *); +void GetGroundEffectFlags_ShortGrass(struct MapObject *, u32 *); +void GetGroundEffectFlags_HotSprings(struct MapObject *, u32 *); +void GetGroundEffectFlags_Seaweed(struct MapObject *, u32 *); +void GetGroundEffectFlags_JumpLanding(struct MapObject *, u32 *); +u8 FieldObjectCheckForReflectiveSurface(struct MapObject *); +u8 GetLedgeJumpDirection(s16, s16, u8); +u8 ZCoordToPriority(u8); +void FieldObjectUpdateZCoord(struct MapObject *pObject); +void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -#endif //POKERUBY_FIELD_GROUND_EFFECT_H +#endif // GUARD_FIELD_GROUND_EFFECT_H |