diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
| commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
| tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/battle_script_commands.c | |
| parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
Merge with master
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 475b16c98..d399cddbb 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -55,11 +55,11 @@ extern const u8* const gBattleScriptsForMoveEffects[]; extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon* party, u8 monPartyId, u8 monCount, void (*callback)(void), u16 move); // pokemon summary screen extern u8 sub_81C1B94(void); // pokemon summary screen extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s -extern void sub_81D3640(u8 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s -extern void sub_81D3784(u8 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s +extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s +extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s extern u8* GetMonNickname(struct Pokemon* mon, u8* dst); // party_menu extern void sub_81B8E80(u8 battlerId, u8, u8); // party menu -extern bool8 sub_81B1250(void); // ? +extern bool8 IsMultiBattle(void); // ? extern u8 sub_813B21C(void); extern u16 get_unknown_box_id(void); @@ -7609,7 +7609,7 @@ static void atk8F_forcerandomswitch(void) } *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i; - if (!sub_81B1250()) + if (!IsMultiBattle()) sub_803BDA0(gBattlerTarget); if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) @@ -8648,7 +8648,7 @@ static void atkAE_healpartystatus(void) u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); u8 abilityBit = GetMonData(&party[i], MON_DATA_ALT_ABILITY); - if (species != 0 && species != SPECIES_EGG) + if (species != SPECIES_NONE && species != SPECIES_EGG) { u8 ability; |