diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-05-27 16:36:47 -0400 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-05-27 16:36:47 -0400 |
commit | c5b262159d204c63ae0452d5989cb7ecbe12476d (patch) | |
tree | b7834a4b1aad6a7cc298b7b6d4d242a7cfe36126 /src/battle_factory.c | |
parent | 8b45c8e48ac1ddce3e986fb512937cf2e57f86ec (diff) | |
parent | c9c558606899f898c7b14ad4a35f19ce2831d66a (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/battle_factory.c')
-rw-r--r-- | src/battle_factory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 72772929a..e0bfdfdd0 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -38,7 +38,7 @@ static void GenerateInitialRentalMons(void); static void GetOpponentMostCommonMonType(void); static void GetOpponentBattleStyle(void); static void RestorePlayerPartyHeldItems(void); -static u16 GetFactoryMonId(u8 lvlMode, u8 challengeNum, bool8 arg2); +static u16 GetFactoryMonId(u8 lvlMode, u8 challengeNum, bool8 useBetterRange); static u8 GetMoveBattleStyle(u16 move); // Number of moves needed on the team to be considered using a certain battle style |