summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-02 07:17:54 -0500
committerMelody <melody@pallet.town>2018-12-02 15:08:19 -0500
commitbad5323642a0db0875ca6213370b1947c1fc105a (patch)
treef1d7db2b43a2a8229094fc21d2917c93a05d1fe5 /src
parent2912ec0e37360ede1bae882f0ea2457ec336f16f (diff)
cleans up trainer battle scripts
* adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c1
-rw-r--r--src/trainer_see.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index ab2a12fb7..6db787a5f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "constants/trainers.h"
#include "battle.h"
+#include "constants/battle_setup.h"
#include "battle_setup.h"
#include "battle_transition.h"
#include "main.h"
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b74608d0b..d3d450de4 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "constants/battle_setup.h"
#include "battle_setup.h"
#include "event_data.h"
#include "event_object_movement.h"