diff options
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 5c1214cb7..c585bae23 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1541,11 +1541,6 @@ BattleCheckTypeMatchup: ; 347c8 and a jr z, CheckTypeMatchup ld hl, BattleMonType1 - - ; fallthrough -; 347d3 - - CheckTypeMatchup: ; 347d3 push hl push de @@ -2837,11 +2832,11 @@ PlayerAttackDamage: ; 352e2 call GetDamageStatsCritical jr c, .thickclub - ld hl, EnemyStats + 2 + ld hl, EnemyDefense ld a, [hli] ld b, a ld c, [hl] - ld hl, PlayerStats + ld hl, PlayerAttack jr .thickclub .special @@ -2861,11 +2856,11 @@ PlayerAttackDamage: ; 352e2 call GetDamageStatsCritical jr c, .lightball - ld hl, EnemyStats + SP_DEFENSE * 2 + ld hl, EnemySpDef ld a, [hli] ld b, a ld c, [hl] - ld hl, PlayerStats + SP_ATTACK * 2 + ld hl, PlayerSpAtk .lightball ; Note: Returns player special attack at hl in hl. @@ -3103,11 +3098,11 @@ EnemyAttackDamage: ; 353f6 call GetDamageStatsCritical jr c, .thickclub - ld hl, PlayerStats + 2 + ld hl, PlayerDefense ld a, [hli] ld b, a ld c, [hl] - ld hl, EnemyStats + ld hl, EnemyAttack jr .thickclub .Special: @@ -3126,11 +3121,11 @@ EnemyAttackDamage: ; 353f6 ld hl, EnemyMonSpclAtk call GetDamageStatsCritical jr c, .lightball - ld hl, PlayerStats + 8 + ld hl, PlayerSpDef ld a, [hli] ld b, a ld c, [hl] - ld hl, EnemyStats + 6 + ld hl, EnemySpAtk .lightball call LightBallBoost @@ -3407,9 +3402,9 @@ HitSelfInConfusion: ; 355dd sla c rl b .mimic_screen -rept 3 dec hl -endr + dec hl + dec hl ld a, [hli] ld l, [hl] ld h, a @@ -3953,9 +3948,9 @@ BattleCommand_Encore: ; 35864 set SUBSTATUS_ENCORED, [hl] call BattleRandom and $3 -rept 3 inc a -endr + inc a + inc a ld [de], a call CheckOpponentWentFirst jr nz, .finish_move @@ -4094,12 +4089,12 @@ BattleCommand_PainSplit: ; 35926 ld a, [CurDamage + 1] rr a ld [CurDamage + 1], a -rept 3 inc hl -endr -rept 3 + inc hl + inc hl + inc de + inc de inc de -endr .EnemyShareHP: ; 359ac ld c, [hl] @@ -7447,9 +7442,9 @@ BattleCommand_TrapTarget: ; 36c2d ret nz call BattleRandom and 3 -rept 3 inc a -endr + inc a + inc a ld [hl], a ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar |