diff options
Diffstat (limited to 'src/engine/effect_functions.asm')
| -rw-r--r-- | src/engine/effect_functions.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index dc05043..5b9d6ef 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -38,30 +38,30 @@ applyEffect ldh a, [hWhoseTurn] ld hl, wcc05 cp [hl] - jr nz, .canInduceStatus + jr nz, .can_induce_status ld a, [wTempNonTurnDuelistCardId] cp CLEFAIRY_DOLL - jr z, .cantInduceStatus + jr z, .cant_induce_status cp MYSTERIOUS_FOSSIL - jr z, .cantInduceStatus + jr z, .cant_induce_status ; snorlax's thick skinned prevents it from being statused... cp SNORLAX - jr nz, .canInduceStatus + jr nz, .can_induce_status call SwapTurn xor a ; ...unless already so, or if affected by muk's toxic gas call CheckIfUnderAnyCannotUseStatus2 call SwapTurn - jr c, .canInduceStatus + jr c, .can_induce_status -.cantInduceStatus +.cant_induce_status ld a, c ld [wccf1], a call Func_2c09c or a ret -.canInduceStatus +.can_induce_status ld hl, wcccd push hl ld e, [hl] @@ -101,7 +101,7 @@ Func_2c087: ; 2c087 (b:4087) xor a jr asm_2c08c -Func_2c08a: ; 2c08a (b:408a) +Func_2c08a: ; 2c08a (b:408a) ld a, $1 asm_2c08c @@ -143,7 +143,7 @@ Func_2c0d4: ; 2c0d4 (b:40d4) ld a, DUELVARS_ARENA_CARD_STATUS call GetNonTurnDuelistVariable and DOUBLE_POISONED - jr z, .notDoublePoisoned + jr z, .not_double_poisoned pop af ld a, [wDamage] ld [wccbb], a @@ -152,7 +152,7 @@ Func_2c0d4: ; 2c0d4 (b:40d4) push af -.notDoublePoisoned +.not_double_poisoned ld hl, wDamage ld a, [hl] add d @@ -198,7 +198,7 @@ ApplySubstatus1ToDefendingCard: ; 2c140 (b:4140) ApplySubstatus2ToDefendingCard: ; 2c149 (b:4149) push af call CheckNoDamageOrEffect - jr c, .noDamageOrEffect + jr c, .no_damage_orEffect ld a, DUELVARS_ARENA_CARD_SUBSTATUS2 call GetNonTurnDuelistVariable pop af @@ -207,7 +207,7 @@ ApplySubstatus2ToDefendingCard: ; 2c149 (b:4149) ld [hl], a ret -.noDamageOrEffect +.no_damage_orEffect pop af push hl bank1call $4f9d |