diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/fldeff_groundshake.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/fldeff_groundshake.c')
| -rw-r--r-- | src/fldeff_groundshake.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index 60b078982..e9a46bb86 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -1,10 +1,7 @@ #include "global.h" -#include "global.fieldmap.h" -#include "constants/flags.h" -#include "constants/songs.h" #include "event_data.h" -#include "field_camera.h" #include "event_object_movement.h" +#include "field_camera.h" #include "malloc.h" #include "random.h" #include "roulette_util.h" @@ -12,6 +9,8 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/flags.h" +#include "constants/songs.h" // structures struct Struct203CF18 { |