diff options
| author | pinksylveon <shakibafzali@gmail.com> | 2020-12-01 13:48:23 -0500 |
|---|---|---|
| committer | pinksylveon <shakibafzali@gmail.com> | 2020-12-01 13:48:23 -0500 |
| commit | e1d567dc159a97aab015caee779cae42f5af4c96 (patch) | |
| tree | bbf7e474532e2ea6b13b187e7c6ba43655b47114 /src | |
| parent | 3c17355ec7df797e1418615995b7e0e51fddba93 (diff) | |
Fixed some things and added a couple constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/duel_constants.asm | 4 | ||||
| -rw-r--r-- | src/engine/bank01.asm | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 344cff1..f42e64a 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -117,9 +117,13 @@ ASLEEP EQU $02 PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 +DOUBLE_POISONED_F EQU 6 +POISONED_F EQU 7 + CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed PSN_DBLPSN EQU $f0 ; poisoned or double poisoned +PSN_DAMAGE EQU $0a ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index d09e657..dc5a733 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7174,16 +7174,16 @@ Func_6cfa: ; 6cfa (1:6cfa) Func_6d3f: ; 6d3f (1:6d3f) or a - bit 7, [hl] + bit POISONED_F , [hl] ret z push hl - bit 6, [hl] - ld a, $0a - ld hl, $26 ; copies from the byte of the damage due to poison by 10 - jr z, .asm_6d52 + bit DOUBLE_POISONED_F, [hl] + ld a, PSN_DAMAGE + ldtx hl, Received10DamageDueToPoisonText ; copies from the byte of the damage due to poison by 10 + jr z, .Damage_Dealt_From_Poison ld a, $14 - ld hl, $27 ; copies from the byte of the damage due to poison by 20 -.asm_6d52 + ldtx hl, Received20DamageDueToPoisonText ; copies from the byte of the damage due to poison by 20 +.Damage_Dealt_From_Poison push af ld [wd4b1], a xor a |