diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-14 21:04:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-14 21:04:11 -0400 |
| commit | 37537e38f99e2d0ad055d8d72e244f9f83ea8125 (patch) | |
| tree | a259730235bf3e2e8795a5e078104fbc30fde1cd /src/event_object_movement.c | |
| parent | 31f4edbe503134eba4f7fee8ca9ecc85099c51bd (diff) | |
| parent | 5075067ecd8718ab96a063946662c71fe3ef5369 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 7f6785e37..271d60bf5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -20,6 +20,10 @@ #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 +#if !defined(NONMATCHING) && MODERN +#define static +#endif + static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static u8 GetCollisionInDirection(struct ObjectEvent *, u8); |