diff options
| author | Blampharos <Blampharos@users.noreply.github.com> | 2018-01-25 17:31:41 +0100 |
|---|---|---|
| committer | Blampharos <Blampharos@users.noreply.github.com> | 2018-01-25 17:31:41 +0100 |
| commit | 0bf16dd66a6b0d7ad0526406e82a5236567e58d0 (patch) | |
| tree | 6ebb13f4c97064ce06570c3ca010c079e31f9144 /src/battle/battle_1.c | |
| parent | 776016e9ecf469b2c06a4d234b93af2e52d4cd04 (diff) | |
Decompile trainer data
This necessitated changes in other files which access this data.
Three macro constants were migrated from trainer_constants.inc to
trainer.h
data/trainers.inc and data-de/trainers.inc have been deleted
Diffstat (limited to 'src/battle/battle_1.c')
| -rw-r--r-- | src/battle/battle_1.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c index 1f920f345..210d2c2ab 100644 --- a/src/battle/battle_1.c +++ b/src/battle/battle_1.c @@ -1,9 +1,12 @@ #include "global.h" #include "data2.h" #include "battle_setup.h" +#include "battle.h" +#include "trainer.h" #include "constants/species.h" #include "constants/moves.h" #include "constants/items.h" +#include "constants/opponents.h" const struct MonCoords gTrainerBackPicCoords[] = { {8, 4}, @@ -452,6 +455,9 @@ const u8 gEnemyMonElevation[] = { #if ENGLISH #include "../data/text/trainer_class_names_en.h" +#include "../data/trainers_en.h" #elif GERMAN #include "../data/text/trainer_class_names_de.h" +#include "../data/trainers_de.h" #endif + |