diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
| commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
| tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /asm/battle_script_commands.s | |
| parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
| parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'asm/battle_script_commands.s')
| -rw-r--r-- | asm/battle_script_commands.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index b240c3da2..42d1f653d 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -13273,7 +13273,7 @@ sub_80240D4: @ 80240D4 adds r1, r4 ldr r2, [r1] movs r1, 0x2 - bl sub_8044898 + bl HandleSetPokedexFlag _0802412A: ldr r2, _08024180 @ =gAbsentBattlerFlags ldr r1, _08024184 @ =gBitTable @@ -13398,7 +13398,7 @@ _08024228: bl GetBankMultiplayerId lsls r0, 24 lsrs r0, 24 - bl sub_8043620 + bl GetLinkTrainerFlankId lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -19745,7 +19745,7 @@ _0802753C: cmp r0, 0 beq _080275AC movs r0, 0x1 - bl CountAliveMons + bl CountAliveMonsInBattle lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 @@ -21520,7 +21520,7 @@ _08028336: bl GetBankMultiplayerId lsls r0, 24 lsrs r0, 24 - bl sub_8043620 + bl GetLinkTrainerFlankId lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -21665,7 +21665,7 @@ _08028458: bl GetBankMultiplayerId lsls r0, 24 lsrs r0, 24 - bl sub_8043620 + bl GetLinkTrainerFlankId lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -22207,7 +22207,7 @@ _0802887C: cmp r0, 0 beq _080288EC movs r0, 0x1 - bl CountAliveMons + bl CountAliveMonsInBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -32384,7 +32384,7 @@ _0802D9B4: lsrs r0, 16 movs r1, 0x3 adds r2, r4, 0 - bl sub_8044898 + bl HandleSetPokedexFlag ldr r1, _0802D9D4 @ =gUnknown_2023D74 ldr r0, [r1] adds r0, 0x5 |