diff options
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index bdc8d88bb..5a65a49d8 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -75525,7 +75525,7 @@ _0809FDF8: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_803DB14 + bl GetAbilityBySpecies adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -76006,7 +76006,7 @@ _080A020C: lsrs r1, 24 adds r0, r6, 0 adds r2, r7, 0 - bl CalcPPWithPPUps + bl CalculatePPWithBonus adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -135390,7 +135390,7 @@ sub_80BCE1C: @ 80BCE1C lsls r0, 5 ldr r1, _080BCE48 adds r0, r1 - bl create_enemy_party + bl CreateSecretBaseEnemyParty pop {r4} pop {r0} bx r0 @@ -152132,7 +152132,7 @@ _080C5304: lsrs r0, 16 adds r1, r7, 0 adds r2, r5, 0 - bl CalcPPWithPPUps + bl CalculatePPWithBonus strb r0, [r6] adds r1, r5, 0 adds r1, 0x11 @@ -162394,7 +162394,7 @@ ItemUseInBattle_PokeBall: @ 80CA244 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_803DD20 + bl PlayerPartyAndPokemonStorageFull lsls r0, 24 cmp r0, 0 bne _080CA26C @@ -261137,7 +261137,7 @@ sub_80FA0DC: @ 80FA0DC muls r0, r6 adds r0, r5 ldrb r1, [r4] - bl sub_803DE34 + bl RemoveMonPPBonus ldrh r4, [r4] cmp r4, 0x2 bhi _080FA130 @@ -312757,7 +312757,7 @@ _08112E24: lsrs r4, 24 mov r0, r9 adds r1, r4, 0 - bl sub_803DE34 + bl RemoveMonPPBonus ldr r0, _08112E84 ldrh r1, [r0] mov r0, r9 @@ -314053,7 +314053,7 @@ _08113970: lsrs r4, 24 mov r0, r8 adds r1, r4, 0 - bl sub_803DE34 + bl RemoveMonPPBonus ldr r0, _081139D4 ldrh r1, [r0] mov r0, r8 @@ -341987,7 +341987,7 @@ _0812174C: lsls r0, 3 cmp r1, r0 bne _08121768 - bl sub_803DCE4 + bl GetSecretBaseTrainerNameIndex lsls r0, 24 lsrs r0, 24 movs r1, 0xD @@ -378468,7 +378468,7 @@ _08132EA4: ldr r2, _08132F48 adds r1, r2 ldrb r1, [r1] - bl sub_803DE34 + bl RemoveMonPPBonus ldr r3, [r7] adds r4, r3, r4 ldrb r0, [r4] |