diff options
Diffstat (limited to 'src/engine/effect_functions.asm')
| -rw-r--r-- | src/engine/effect_functions.asm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index d699851..de5c9c3 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -4,17 +4,17 @@ Poison50PercentEffect: ; 2c000 (b:4000) ret nc PoisonEffect: ; 2c007 (b:4007) - lb bc, $0f, POISONED + lb bc, CNF_SLP_PRZ, POISONED jr ApplyStatusEffect - lb bc, $0f, DOUBLE_POISONED + lb bc, CNF_SLP_PRZ, DOUBLE_POISONED jr ApplyStatusEffect Paralysis50PercentEffect: ; 2c011 (b:4011) ldtx de, ParalysisCheckText call TossCoin_BankB ret nc - lb bc, $f0, PARALYZED + lb bc, PSN_DBLPSN, PARALYZED jr ApplyStatusEffect Confusion50PercentEffect: ; 2c01d (b:401d) @@ -23,7 +23,7 @@ Confusion50PercentEffect: ; 2c01d (b:401d) ret nc ConfusionEffect: ; 2c024 (b:4024) - lb bc, $f0, CONFUSED + lb bc, PSN_DBLPSN, CONFUSED jr ApplyStatusEffect ldtx de, SleepCheckText @@ -31,7 +31,7 @@ ConfusionEffect: ; 2c024 (b:4024) ret nc SleepEffect: ; 2c030 (b:4030) - lb bc, $f0, ASLEEP + lb bc, PSN_DBLPSN, ASLEEP jr ApplyStatusEffect ApplyStatusEffect: @@ -62,20 +62,21 @@ ApplyStatusEffect: ret .can_induce_status - ld hl, wcccd + ld hl, wEffectFunctionsFeedbackIndex push hl ld e, [hl] ld d, $0 - ld hl, wccce + ld hl, wEffectFunctionsFeedback add hl, de call SwapTurn ldh a, [hWhoseTurn] ld [hli], a call SwapTurn - ld [hl], b + ld [hl], b ; mask of status conditions not to discard on the target inc hl - ld [hl], c + ld [hl], c ; status condition to inflict to the target pop hl + ; advance wEffectFunctionsFeedbackIndex inc [hl] inc [hl] inc [hl] @@ -97,14 +98,14 @@ CommentedOut_2c086: ; 2c086 (b:4086) ret ; 0x2c087 -PlaceTextItems7: ; 2c087 (b:4087) +Func_2c087: ; 2c087 (b:4087) xor a - jr PlaceTextItemsc + jr Func_2c08c -PlaceTextItemsa: ; 2c08a (b:408a) +Func_2c08a: ; 2c08a (b:408a) ld a, $1 -PlaceTextItemsc: +Func_2c08c: push de push af ld a, $11 |