diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-06 08:25:29 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 20:54:44 -0500 |
| commit | 01609145aec678783addc26ded6e390b4fb94c06 (patch) | |
| tree | 3feedee424ea0a920ad9a87d9436b5bee2dd648b /src | |
| parent | dc6fb7be6a6391f705b052906d0b566e9eb0891e (diff) | |
Move metatile_behaviors.h into include/constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/fldeff_cut.c | 3 | ||||
| -rw-r--r-- | src/fldeff_secretpower.c | 3 | ||||
| -rw-r--r-- | src/metatile_behavior.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 58409b4f3..c8c3325df 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,3 +1,4 @@ + #include "global.h" #include "field_camera.h" #include "field_effect.h" @@ -6,7 +7,6 @@ #include "fieldmap.h" #include "event_obj_lock.h" #include "metatile_behavior.h" -#include "metatile_behaviors.h" #include "pokemon_menu.h" #include "overworld.h" #include "rom6.h" @@ -18,6 +18,7 @@ #include "ewram.h" #include "constants/field_effects.h" #include "constants/event_objects.h" +#include "constants/metatile_behaviors.h" #include "constants/songs.h" extern void (*gFieldCallback)(void); diff --git a/src/fldeff_secretpower.c b/src/fldeff_secretpower.c index fd8791cb8..47a8bd608 100644 --- a/src/fldeff_secretpower.c +++ b/src/fldeff_secretpower.c @@ -1,10 +1,10 @@ + #include "global.h" #include "event_data.h" #include "fieldmap.h" #include "field_effect.h" #include "field_player_avatar.h" #include "metatile_behavior.h" -#include "metatile_behaviors.h" #include "overworld.h" #include "pokemon_menu.h" #include "rom6.h" @@ -12,6 +12,7 @@ #include "secret_base.h" #include "sound.h" #include "constants/field_effects.h" +#include "constants/metatile_behaviors.h" #include "constants/songs.h" extern u8 DoSecretBaseCaveFieldEffectScript[]; diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index b8a490dde..7c8149d87 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -1,6 +1,6 @@ #include "global.h" #include "metatile_behavior.h" -#include "metatile_behaviors.h" +#include "constants/metatile_behaviors.h" #define TILE_ATTRIBUTES(three, two, one) (((one) ? 1 : 0) | ((two) ? 2 : 0) | ((three) ? 4 : 0)) |