diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/battle_util2.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index a9891814c..0a0f65b95 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -3,17 +3,14 @@ #include "battle_controllers.h" #include "alloc.h" #include "pokemon.h" +#include "party_menu.h" #include "event_data.h" #include "constants/abilities.h" #include "random.h" #include "battle_scripts.h" -extern u8 gUnknown_0203CF00[]; - extern void sub_81D55D0(void); extern void sub_81D5694(void); -extern u8 pokemon_order_func(u8); -extern void sub_81B8FB0(u8, u8); void AllocateBattleResources(void) { @@ -42,7 +39,7 @@ void AllocateBattleResources(void) if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE) { - u16 currSecretBaseId = VarGet(VAR_0x4054); + u16 currSecretBaseId = VarGet(VAR_CURRENT_SECRET_BASE); CreateSecretBaseEnemyParty(&gSaveBlock1Ptr->secretBases[currSecretBaseId]); } } |