diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2016-09-17 20:54:45 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2016-09-17 20:54:45 +0200 |
| commit | 3d80668e91fe1812c86b2f1517d75f547479de7b (patch) | |
| tree | f96dd4aefb749e30687a6f2f86dd90b29da1b7f7 /src | |
| parent | f822834131d68e7262055ec8fe89d13865c673f2 (diff) | |
wNoDamageOrEffect constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/duel_constants.asm | 7 | ||||
| -rwxr-xr-x | src/engine/home.asm | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 9d8415f..7976e38 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -82,3 +82,10 @@ SUBSTATUS2_BONE_ATTACK EQU $0b SUBSTATUS2_GROWL EQU $12 SUBSTATUS5_THIS_TURN_DOUBLE_DAMAGE EQU 0 + +;;; wNoDamageOrEffect constants +NO_DAMAGE_OR_EFFECT_AGILITY EQU $01 +NO_DAMAGE_OR_EFFECT_BARRIER EQU $02 +NO_DAMAGE_OR_EFFECT_FLY EQU $03 +NO_DAMAGE_OR_EFFECT_TRANSPARENCY EQU $04 +NO_DAMAGE_OR_EFFECT_NSHIELD EQU $05 diff --git a/src/engine/home.asm b/src/engine/home.asm index f2faa33..66f78aa 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2827,7 +2827,7 @@ Func_17ed: ; 17ed (0:17ed) ld hl, wDamage ld [hli], a ld [hl], a - ld a, $1 + ld a, NO_DAMAGE_OR_EFFECT_AGILITY ld [wNoDamageOrEffect], a Func_17fb: ; 17fb (0:17fb) ld a, [wTempNonTurnDuelistCardId] @@ -6407,15 +6407,15 @@ HandleNoDamageOrEffectSubstatus: ; 3432 (0:3432) ret z ld a, DUELVARS_ARENA_CARD_SUBSTATUS1 call GetTurnDuelistVariable - ld e, $3 + ld e, NO_DAMAGE_OR_EFFECT_FLY text_hl NoDamageOrEffectDueToFlyText cp SUBSTATUS1_FLY jr z, .noDamageOrEffect - ld e, $2 + ld e, NO_DAMAGE_OR_EFFECT_BARRIER text_hl NoDamageOrEffectDueToBarrierText cp SUBSTATUS1_BARRIER jr z, .noDamageOrEffect - ld e, $1 + ld e, NO_DAMAGE_OR_EFFECT_AGILITY text_hl NoDamageOrEffectDueToAgilityText cp SUBSTATUS1_AGILITY jr z, .noDamageOrEffect @@ -6443,7 +6443,7 @@ HandleNoDamageOrEffectSubstatus: ; 3432 (0:3432) ld a, [wLoadedCard2Stage] or a ret z - ld e, $5 + ld e, NO_DAMAGE_OR_EFFECT_NSHIELD text_hl NoDamageOrEffectDueToNShieldText jr .noDamageOrEffect @@ -6468,7 +6468,7 @@ HandleTransparency: ; 348a (0:348a) ld de, $00f6 call TossCoin ret nc - ld a, $4 + ld a, NO_DAMAGE_OR_EFFECT_TRANSPARENCY ld [wNoDamageOrEffect], a text_hl NoDamageOrEffectDueToTransparencyText scf |