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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 97e8f7041..48a2ef257 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -51,8 +51,6 @@ struct TrainerBattleParameter
u8 ptrType;
};
-extern void (*gFieldCallback)(void);
-
extern bool8 InBattlePyramid(void);
extern bool8 InBattlePike(void);
extern bool32 InTrainerHill(void);
@@ -396,7 +394,7 @@ static void DoStandardWildBattle(void)
gBattleTypeFlags = 0;
if (InBattlePyramid())
{
- VarSet(VAR_0x400E, 0);
+ VarSet(VAR_TEMP_E, 0);
gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
}
CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -1260,7 +1258,7 @@ void BattleSetup_StartTrainerBattle(void)
if (InBattlePyramid())
{
- VarSet(VAR_0x400E, 0);
+ VarSet(VAR_TEMP_E, 0);
gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
if (gNoOfApproachingTrainers == 2)