diff options
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index fd35756ee..1892717ce 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f ld hl, HurtItselfText call StdBattleTextBox call Function355dd - call BattleCommand62 + call BattleCommand62_DamageCalcWithStats call BattleCommand0a xor a ld [wcfca], a @@ -652,7 +652,7 @@ HitConfusion: ; 343a5 ld [CriticalHit], a call Function355dd - call BattleCommand62 + call BattleCommand62_DamageCalcWithStats call BattleCommand0a xor a @@ -1336,8 +1336,8 @@ BattleCommand4f: ; 346cd ; 346d2 -BattleCommand07: ; 346d2 -; stab +BattleCommand07_CalcDamageTypeMultiplier: ; 346d2 +; STAB = Same Type Attack Bonus ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar cp STRUGGLE @@ -1354,7 +1354,7 @@ BattleCommand07: ; 346d2 ld a, [hBattleTurn] and a - jr z, .go + jr z, .go ; Who Attacks and who Defends ld hl, EnemyMonType1 ld a, [hli] @@ -3932,6 +3932,7 @@ BattleCommanda8: ; 355b5 ld a, [wc72d] and a ret nz + jp PrintButItFailed ; 355bd @@ -3955,11 +3956,12 @@ Function355bd: ; 355bd ; 355d5 -BattleCommanda9: ; 355d5 +BattleCommanda9_IfAttackMissedResetDamage: ; 355d5 ; clearmissdamage ld a, [AttackMissed] and a ret z + jp ResetDamage ; 355dd @@ -4002,7 +4004,7 @@ endr ; 35612 -BattleCommand62: ; 35612 +BattleCommand62_DamageCalcWithStats: ; 35612 ; damagecalc ; Return a damage value for move power d, player level e, enemy defense c and player attack b. @@ -4136,12 +4138,12 @@ endr ; Update CurDamage (capped at 997). ld hl, CurDamage ld b, [hl] - ld a, [$ffb6] + ld a, [hQuotient + 2] add b ld [$ffb6], a jr nc, .asm_356a5 - ld a, [$ffb5] + ld a, [hQuotient + 1] inc a ld [$ffb5], a and a @@ -4395,22 +4397,22 @@ BattleCommand3f: ; 35726 ld a, [hBattleTurn] and a ld a, [hl] - jr nz, .asm_357f8 + jr nz, .notPlayersTurn ld hl, wPlayerMoveStruct + MOVE_POWER ld [hl], a push hl call PlayerAttackDamage - jr .asm_35800 + jr .notEnemysTurn -.asm_357f8 +.notPlayersTurn ld hl, wEnemyMoveStruct + MOVE_POWER ld [hl], a push hl call EnemyAttackDamage -.asm_35800 - call BattleCommand62 +.notEnemysTurn + call BattleCommand62_DamageCalcWithStats pop hl ld [hl], 1 ret @@ -7200,7 +7202,7 @@ BattleCommand23: ; 3680f ld a, [BattleType] cp BATTLETYPE_SHINY jp z, .asm_36969 - cp $9 + cp BATTLETYPE_TRAP jp z, .asm_36969 cp BATTLETYPE_CELEBI jp z, .asm_36969 @@ -9498,7 +9500,7 @@ BattleCommand61: ; 37874 push de .asm_3787d - call BattleCommand07 + call BattleCommand07_CalcDamageTypeMultiplier ld a, [InLinkBattle] cp $3 @@ -9746,7 +9748,7 @@ BattleCommand67: ; 379c9 call ClearBox ld b, 1 call GetSGBLayout - call Function32f9 + call SetPalettes call BatonPass_LinkPlayerSwitch ; Mobile link battles handle entrances differently @@ -9787,7 +9789,7 @@ BattleCommand67: ; 379c9 call CallBattleCore ld a, 1 ld [wd265], a - ld hl, Function3ecab + ld hl, ApplyStatLevelMultiplierOnAllStats call CallBattleCore ld hl, SpikesDamage |