diff options
| author | RainbowMetalPigeon <118711812+RainbowMetalPigeon@users.noreply.github.com> | 2023-11-21 17:01:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 20:01:20 -0500 |
| commit | 465b859c4c75ae7a36d532cc5d8186e96cc16311 (patch) | |
| tree | 71ff093f67cc6313ec8c6896edccacec050fd306 /engine | |
| parent | Rename `EV_*` constants to `EVOLVE_*` like pokecrystal (#407) (diff) | |
| download | pokeyellow-465b859c4c75ae7a36d532cc5d8186e96cc16311.tar.gz pokeyellow-465b859c4c75ae7a36d532cc5d8186e96cc16311.tar.xz pokeyellow-465b859c4c75ae7a36d532cc5d8186e96cc16311.zip | |
Replace some `$a` with `EFFECTIVE` (#399)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 19ebdfcf..ed2c4b7a 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3076,7 +3076,7 @@ ExecutePlayerMove: ld [wMoveMissed], a ld [wMonIsDisobedient], a ld [wMoveDidntMiss], a - ld a, $a + ld a, EFFECTIVE ld [wDamageMultipliers], a ld a, [wActionResultOrTookBattleTurn] and a ; has the player already used the turn (e.g. by using an item, trying to run or switching pokemon) @@ -5602,7 +5602,7 @@ ExecuteEnemyMove: xor a ld [wMoveMissed], a ld [wMoveDidntMiss], a - ld a, $a + ld a, EFFECTIVE ld [wDamageMultipliers], a call CheckEnemyStatusConditions jr nz, .enemyHasNoSpecialConditions |