diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-20 12:16:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-20 12:16:45 +0200 |
| commit | 4d5bfc149e26d7d750ba35dba10465258ba7d51e (patch) | |
| tree | 78d827b11205d93f15787a47e9522258c73983f0 /src/battle_setup.c | |
| parent | 1a8d5132d66c731c59ac1eee7eb33ea37a8cc1c4 (diff) | |
| parent | de60bdf2febff1879d7a1985a009dc439a546497 (diff) | |
Merge branch 'master' into decomp_record_mixing
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 15af005c4..48a2ef257 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -394,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); @@ -1258,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) |