diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-02 14:31:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 14:31:19 -0600 |
| commit | 7914220acd9a39e08bc09b70eaef6433a6ba9cd6 (patch) | |
| tree | b5955a26de58feb834007ee84ba036308992e422 /src | |
| parent | 2912ec0e37360ede1bae882f0ea2457ec336f16f (diff) | |
| parent | a2a99bde115e183267db6bb4b5c1dc73d57284fc (diff) | |
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 3 | ||||
| -rw-r--r-- | src/trainer_see.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index ab2a12fb7..4243d2f3f 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" @@ -1085,7 +1086,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT: + case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); return EventScript_2713C2; case TRAINER_BATTLE_DOUBLE: 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" |