summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index a70157a43..09a1b14e1 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,6 +1,10 @@
+#include "fldeff_80C5CD4.h"
+#include "battle_transition.h"
+#include "fieldmap.h"
+#include "secret_base.h"
+#include "field_fadetransition.h"
#include "global.h"
#include "battle_setup.h"
-#include "asm.h"
#include "battle.h"
#include "data2.h"
#include "event_data.h"
@@ -33,9 +37,6 @@ extern u16 gScriptResult;
extern void (*gUnknown_0300485C)(void);
-extern struct Pokemon gEnemyParty[];
-extern struct Pokemon gPlayerParty[];
-
EWRAM_DATA u16 gTrainerBattleMode = 0;
EWRAM_DATA u16 gTrainerBattleOpponent = 0;
EWRAM_DATA u16 gTrainerMapObjectLocalId = 0;