diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 14:07:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 14:07:31 -0600 |
| commit | 5498eaf94849bbc7b56d8c280862b61ecefa0643 (patch) | |
| tree | 518b0b12e669c09c31a33c7a071f10bcd4ea76b9 /src/battle/calculate_base_damage.c | |
| parent | 66f2ac4ba38cb32eb210545536a487969b593d10 (diff) | |
| parent | 5d74d11d3e3047b4b53153365325db9e6999c627 (diff) | |
Merge pull request #477 from camthesaxman/constant_headers
Use common headers for constants in assembly and C
Diffstat (limited to 'src/battle/calculate_base_damage.c')
| -rw-r--r-- | src/battle/calculate_base_damage.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 42c26dee0..f9ac03075 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -1,16 +1,16 @@ #include "global.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle.h" #include "berry.h" #include "data2.h" #include "event_data.h" -#include "hold_effects.h" +#include "constants/hold_effects.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "pokemon.h" -#include "species.h" -#include "moves.h" -#include "battle_move_effects.h" +#include "constants/species.h" +#include "constants/moves.h" +#include "constants/battle_move_effects.h" #include "ewram.h" extern u16 gBattleTypeFlags; |