diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-04 21:43:13 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-04 21:43:13 +0200 |
| commit | 2702b0ec9b4b2ae25d847ccd3b5b8ec1ad8cf1ff (patch) | |
| tree | f804cd23f6dd6d2c1ca6b132d667be7951d7bb29 /asm/battle_4.s | |
| parent | 92892d140a2ed704a1cfa2748ea015c9007da14c (diff) | |
decomp calc dmg and clean up battle ai
Diffstat (limited to 'asm/battle_4.s')
| -rw-r--r-- | asm/battle_4.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_4.s b/asm/battle_4.s index 3fad18089..f46085f7a 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -1572,7 +1572,7 @@ atk05_damagecalc1: @ 8046D8C str r4, [sp, 0x8] ldrb r4, [r5] str r4, [sp, 0xC] - bl sub_806957C + bl CalculateBaseDamage ldr r4, =gBattleMoveDamage ldr r1, =gCritMultiplier ldrb r1, [r1] @@ -1670,7 +1670,7 @@ sub_8046E7C: @ 8046E7C str r4, [sp, 0x4] str r7, [sp, 0x8] str r5, [sp, 0xC] - bl sub_806957C + bl CalculateBaseDamage ldr r4, =gBattleMoveDamage movs r1, 0 strh r1, [r6] @@ -18750,7 +18750,7 @@ _0805035C: cmp r0, 0 beq _080503CC movs r0, 0x1 - bl sub_8069DEC + bl CountAliveMonsInBattle lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 @@ -19329,7 +19329,7 @@ _08050828: str r4, [sp, 0x8] ldrb r4, [r5] str r4, [sp, 0xC] - bl sub_806957C + bl CalculateBaseDamage ldrb r2, [r6] lsls r1, r2, 3 subs r1, r2 @@ -21033,7 +21033,7 @@ _080516A4: cmp r0, 0 beq _08051714 movs r0, 0x1 - bl sub_8069DEC + bl CountAliveMonsInBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -26497,7 +26497,7 @@ _080545DC: str r4, [sp, 0x8] ldrb r4, [r6] str r4, [sp, 0xC] - bl sub_806957C + bl CalculateBaseDamage ldrb r1, [r6] lsls r1, 2 mov r2, r8 |