diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2016-03-05 14:40:38 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2016-03-05 14:40:38 +0100 |
| commit | 4f740092b306c1652131fe37dde65d35a42a0b6b (patch) | |
| tree | 78c635aceb2dde9ac92790b48a3482350d3ae20d | |
| parent | 613e12b1e2da06f593bd24b434ca96063923ff8b (diff) | |
no need for CARD_ prefix in status constants
| -rw-r--r-- | src/constants/duel_constants.asm | 14 | ||||
| -rwxr-xr-x | src/engine/bank1.asm | 8 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 10 | ||||
| -rwxr-xr-x | src/engine/home.asm | 8 |
4 files changed, 21 insertions, 19 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 0ba6715..87bfdba 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -39,9 +39,11 @@ CARD_LOCATION_BENCH_5 EQU $15 ; status condition constants ; two statuses can be combined if they are identified by a different nybble -CARD_NOSTATUS EQU $00 -CARD_CONFUSED EQU $01 -CARD_ASLEEP EQU $02 -CARD_PARALYZED EQU $03 -CARD_POISONED EQU $80 -CARD_DOUBLE_POISONED EQU $c0 +CARD_NOSTATUS EQU $00 +CONFUSED EQU $01 +ASLEEP EQU $02 +PARALYZED EQU $03 +POISONED EQU $80 +DOUBLE_POISONED EQU $c0 + +PASSIVE_STATUS_MASK EQU $f ; confused, asleep or paralyzed diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 70a8ffd..74687df 100755 --- a/src/engine/bank1.asm +++ b/src/engine/bank1.asm @@ -402,7 +402,7 @@ PlayerEndTurn: ; 439a (1:439a) PlayerRetreat: ; 43ab (1:43ab) ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable - and a,$0f + and a,PASSIVE_STATUS_MASK cp a, $01 ldh [$ffa0], a jr nz, Func_43f1 @@ -739,10 +739,10 @@ INCBIN "baserom.gbc",$488f, $4918 - $488f CheckIfActiveCardParalyzedOrAsleep: ; 4918 (1:4918) ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable - and $0f - cp CARD_PARALYZED + and PASSIVE_STATUS_MASK + cp PARALYZED jr z, .paralyzed - cp CARD_ASLEEP + cp ASLEEP jr z, .asleep or a ret diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 84d3b0b..3fabccd 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -4,24 +4,24 @@ Poison50PercentEffect: ; 2c000 (b:4000) ret nc PoisonEffect: ; 2c007 (b:4007) - lb bc, $0f, CARD_POISONED + lb bc, $0f, POISONED jr applyEffect - lb bc, $0f, CARD_DOUBLE_POISONED + lb bc, $0f, DOUBLE_POISONED jr applyEffect Paralysis50PercentEffect: ; 2c011 (b:4011) text_de ParalysisCheckText call DisplayCoinTossScreen2_BankB ret nc - lb bc, $f0, CARD_PARALYZED + lb bc, $f0, PARALYZED jr applyEffect Confusion50PercentEffect: ; 2c01d (b:401d) text_de ConfusionCheckText call DisplayCoinTossScreen2_BankB ret nc - lb bc, $f0, CARD_CONFUSED + lb bc, $f0, CONFUSED jr applyEffect text_de SleepCheckText @@ -29,7 +29,7 @@ Confusion50PercentEffect: ; 2c01d (b:401d) ret nc SleepEffect: ; 2c030 (b:4030) - lb bc, $f0, CARD_ASLEEP + lb bc, $f0, ASLEEP jr applyEffect applyEffect diff --git a/src/engine/home.asm b/src/engine/home.asm index 090279a..9e8144f 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2768,8 +2768,8 @@ Func_18d7: ; 18d7 (0:18d7) ld [wccc9], a ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable - and $f - cp CARD_CONFUSED + and PASSIVE_STATUS_MASK + cp CONFUSED jr z, .confused or a ret @@ -6058,7 +6058,7 @@ Func_34f0: ; 34f0 (0:34f0) jr nz, .asm_3500 ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable - and $f + and PASSIVE_STATUS_MASK text_hl CannotUseDueToStatusText scf jr nz, .asm_3508 @@ -6103,7 +6103,7 @@ Func_3525: ; 3525 (0:3525) jr nz, .asm_3549 ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable - and $f + and PASSIVE_STATUS_MASK jr nz, .asm_3549 inc c .asm_3549 |