diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 17:01:50 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 17:01:50 -0600 |
| commit | 611984671904aa19cf678c59ff2a8682cba09224 (patch) | |
| tree | 271151b8f6671e435543d3d85c7107254c332f9a /src/field | |
| parent | e9ce374e57266f0816450acda926509cae6a087f (diff) | |
opponents, map_objects, hold_effects, game_stat, decorations, battle_move_effects constants
Diffstat (limited to 'src/field')
| -rw-r--r-- | src/field/battle_tower.c | 2 | ||||
| -rw-r--r-- | src/field/decoration.c | 3 | ||||
| -rw-r--r-- | src/field/decoration_inventory.c | 5 | ||||
| -rw-r--r-- | src/field/field_map_obj.c | 2 | ||||
| -rw-r--r-- | src/field/field_player_avatar.c | 2 | ||||
| -rw-r--r-- | src/field/item.c | 2 | ||||
| -rw-r--r-- | src/field/secret_base.c | 1 | ||||
| -rw-r--r-- | src/field/trader.c | 1 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 37ef10c24..db822f71b 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -10,7 +10,7 @@ #include "item.h" #include "constants/items.h" #include "main.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "constants/moves.h" #include "new_game.h" #include "overworld.h" diff --git a/src/field/decoration.c b/src/field/decoration.c index 89d8cbefd..c7647f98d 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -1,6 +1,7 @@ #include "global.h" +#include "constants/decorations.h" #include "main.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "overworld.h" #include "sound.h" #include "constants/songs.h" diff --git a/src/field/decoration_inventory.c b/src/field/decoration_inventory.c index 687589373..dd0e972aa 100644 --- a/src/field/decoration_inventory.c +++ b/src/field/decoration_inventory.c @@ -1,8 +1,5 @@ -// - -// - #include "global.h" +#include "constants/decorations.h" #include "sprite.h" #include "task.h" #include "decoration.h" diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 816de8917..0768092b1 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -15,7 +15,7 @@ #include "sprite.h" #include "metatile_behavior.h" #include "constants/maps.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "trainer_see.h" // rodata diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 166846ba0..437d16208 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -9,7 +9,7 @@ #include "field_map_obj_helpers.h" #include "fieldmap.h" #include "main.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "menu.h" #include "metatile_behavior.h" #include "party_menu.h" diff --git a/src/field/item.c b/src/field/item.c index cf7d8bd42..66d7d65df 100644 --- a/src/field/item.c +++ b/src/field/item.c @@ -1,5 +1,5 @@ #include "global.h" -#include "hold_effects.h" +#include "constants/hold_effects.h" #include "item.h" #include "constants/items.h" #include "item_use.h" diff --git a/src/field/secret_base.c b/src/field/secret_base.c index c1ca10c1f..b3591564d 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/decorations.h" #include "secret_base.h" #include "decoration.h" #include "constants/species.h" diff --git a/src/field/trader.c b/src/field/trader.c index 69eef1152..c4fe73ba1 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/decorations.h" #include "decoration.h" #include "decoration_inventory.h" #include "event_data.h" |