diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-19 19:57:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 19:57:31 -0600 |
| commit | 48d7c0a7a389479727b771361132871ca99f9087 (patch) | |
| tree | fb6bac591e74f1d867e59b5bf5b2ca7a01ad6f2e /src/battle_script_commands.c | |
| parent | 5b73fe138cf06f176ca2c2184b8ea004acb9545b (diff) | |
| parent | d6589d1abc29516fe1afe0aed4105d0dabc81778 (diff) | |
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f1e7143dc..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) |