Replace some $a with EFFECTIVE (#399)

This commit is contained in:
RainbowMetalPigeon 2023-11-21 17:01:20 -08:00 committed by GitHub
parent a681f718ac
commit 465b859c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3076,7 +3076,7 @@ ExecutePlayerMove:
ld [wMoveMissed], a ld [wMoveMissed], a
ld [wMonIsDisobedient], a ld [wMonIsDisobedient], a
ld [wMoveDidntMiss], a ld [wMoveDidntMiss], a
ld a, $a ld a, EFFECTIVE
ld [wDamageMultipliers], a ld [wDamageMultipliers], a
ld a, [wActionResultOrTookBattleTurn] ld a, [wActionResultOrTookBattleTurn]
and a ; has the player already used the turn (e.g. by using an item, trying to run or switching pokemon) 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 xor a
ld [wMoveMissed], a ld [wMoveMissed], a
ld [wMoveDidntMiss], a ld [wMoveDidntMiss], a
ld a, $a ld a, EFFECTIVE
ld [wDamageMultipliers], a ld [wDamageMultipliers], a
call CheckEnemyStatusConditions call CheckEnemyStatusConditions
jr nz, .enemyHasNoSpecialConditions jr nz, .enemyHasNoSpecialConditions