summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlampharos <Blampharos@users.noreply.github.com>2018-01-25 13:56:33 +0100
committerBlampharos <Blampharos@users.noreply.github.com>2018-01-25 13:56:33 +0100
commit776016e9ecf469b2c06a4d234b93af2e52d4cd04 (patch)
tree5c982c3199b9c9cab56d702a19079dd0908121ef /src
parent7061864e49a52a686637685b0208bc99b1221eb6 (diff)
Move trainer party includes to parent file
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_1.c3
-rw-r--r--src/data/trainer_parties.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c
index 3c6cee457..1f920f345 100644
--- a/src/battle/battle_1.c
+++ b/src/battle/battle_1.c
@@ -1,6 +1,9 @@
#include "global.h"
#include "data2.h"
+#include "battle_setup.h"
#include "constants/species.h"
+#include "constants/moves.h"
+#include "constants/items.h"
const struct MonCoords gTrainerBackPicCoords[] = {
{8, 4},
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 760fd1979..ad6b052df 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,7 +1,3 @@
-#include "battle_setup.h"
-#include "constants/moves.h"
-#include "constants/items.h"
-
const struct TrainerPartyMember0 gTrainerParty_Archie1[] = {
{
.iv = 0,