diff options
| -rw-r--r-- | src/constants/duel_constants.asm | 3 | ||||
| -rw-r--r-- | src/engine/bank01.asm | 12 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index f42e64a..4abf9d7 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -117,13 +117,14 @@ 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 +PSN_DAMAGE EQU 10 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 79c80bf..ed2ec14 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7179,11 +7179,11 @@ Func_6d3f: ; 6d3f (1:6d3f) push hl 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 + ldtx hl, Received10DamageDueToPoisonText + jr z, .not_double_poisoned ld a, $14 - ldtx hl, Received20DamageDueToPoisonText ; copies from the byte of the damage due to poison by 20 -.Damage_Dealt_From_Poison + ldtx hl, Received20DamageDueToPoisonText +.not_double_poisoned push af ld [wd4b1], a xor a @@ -8304,9 +8304,7 @@ Func_7576: ; 7576 (1:7576) INCROM $757b, $758f Func_758f: ; 758f (1:758f) - rst $28 - ld b, $cf - ld h, h + farcall Func_1a4cf ret ; 0x7594 diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 7c5c9a6..d3aa46a 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1526,7 +1526,10 @@ Func_19a12: ; 19a12 (6:5a12) INCROM $19a1f, $19c20 Func_19c20: ; 19c20 (6:5c20) - INCROM $19c20, $1a61f + INCROM $19c20, $1a4cf + +Func_1a4cf: ; 1a4cf (6:64cf) + INCROM $1a4cf, $1a61f Func_1a61f: ; 1a61f (6:661f) push af |