diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/battle | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/anim/battle_intro.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/current.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/dark.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/fight.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/ghost.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/ice.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/normal.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c index a189b1425..c18f5790c 100644 --- a/src/battle/anim/battle_intro.c +++ b/src/battle/anim/battle_intro.c @@ -1,5 +1,5 @@ #include "global.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "battle.h" #include "battle_anim.h" #include "battle_anim_80CA710.h" diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index 9b447ce5a..23bf9373d 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -4,7 +4,7 @@ #include "rom_8077ABC.h" #include "sound.h" #include "trig.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "constants/songs.h" extern s16 gBattleAnimArgs[]; diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 47f86b744..f98623ee6 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -9,7 +9,7 @@ #include "sound.h" #include "sprite.h" #include "trig.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index f51a5c56c..6b8d8a3b5 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -5,7 +5,7 @@ #include "sprite.h" #include "task.h" #include "trig.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" extern s16 gBattleAnimArgs[]; extern u8 gBankAttacker; diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 52911f366..c4bbe8458 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -7,7 +7,7 @@ #include "scanline_effect.h" #include "sound.h" #include "trig.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "constants/songs.h" extern s16 gBattleAnimArgs[]; diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index fed21ebe9..76300df4b 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -4,7 +4,7 @@ #include "rom_8077ABC.h" #include "battle.h" #include "battle_anim.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "task.h" #include "decompress.h" #include "palette.h" diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 4ac8737ad..b611ca62e 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -10,7 +10,7 @@ #include "sound.h" #include "task.h" #include "trig.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "constants/songs.h" extern s16 gBattleAnimArgs[]; |