diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 13:48:11 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 13:48:11 -0400 |
commit | 541c069857d5207b5c2d5856c83f5774d24b261e (patch) | |
tree | abcd35a7a049d8ddef6e52ebd3b314af32a23ea1 /src/script_pokemon_util_80C4BF0.c | |
parent | 2e74b9c2eb0f80b81f91933fbb58ff6995b55e42 (diff) |
Sync trainer_battle.inc
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
-rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index ce6c01439..c405d9cb4 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -437,20 +437,18 @@ u8 ScriptGiveEgg(u16 species) return GiveMonToPlayer(&mon); } -void CheckForAlivePartyMons(void) +void HasEnoughMonsForDoubleBattle(void) { - u8 var = sub_803DAA0(); - - switch(var) + switch (GetMonsStateToDoubles()) { - case 1: - gSpecialVar_Result = var; + case PLAYER_HAS_TWO_USABLE_MONS: + gSpecialVar_Result = PLAYER_HAS_TWO_USABLE_MONS; break; - case 0: - gSpecialVar_Result = var; + case PLAYER_HAS_ONE_MON: + gSpecialVar_Result = PLAYER_HAS_ONE_MON; break; - case 2: - gSpecialVar_Result = var; + case PLAYER_HAS_ONE_USABLE_MON: + gSpecialVar_Result = PLAYER_HAS_ONE_USABLE_MON; break; } } |