From 1082494d9886e99f2eab1d924ec4091a1a902055 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 15 Feb 2018 21:42:06 +0100 Subject: Style --- src/engine/effect_functions.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/engine/effect_functions.asm') 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 -- cgit v1.2.3 From cdd2d4eac475082078cf4a266dd6429d0d8c6379 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Fri, 16 Feb 2018 17:49:37 +0100 Subject: Correct palette engine functions and more clean up --- src/engine/effect_functions.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 5b9d6ef..88a8361 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -5,17 +5,17 @@ Poison50PercentEffect: ; 2c000 (b:4000) PoisonEffect: ; 2c007 (b:4007) lb bc, $0f, POISONED - jr applyEffect + jr ApplyStatusEffect lb bc, $0f, DOUBLE_POISONED - jr applyEffect + jr ApplyStatusEffect Paralysis50PercentEffect: ; 2c011 (b:4011) ldtx de, ParalysisCheckText call TossCoin_BankB ret nc lb bc, $f0, PARALYZED - jr applyEffect + jr ApplyStatusEffect Confusion50PercentEffect: ; 2c01d (b:401d) ldtx de, ConfusionCheckText @@ -24,7 +24,7 @@ Confusion50PercentEffect: ; 2c01d (b:401d) ConfusionEffect: ; 2c024 (b:4024) lb bc, $f0, CONFUSED - jr applyEffect + jr ApplyStatusEffect ldtx de, SleepCheckText call TossCoin_BankB @@ -32,9 +32,9 @@ ConfusionEffect: ; 2c024 (b:4024) SleepEffect: ; 2c030 (b:4030) lb bc, $f0, ASLEEP - jr applyEffect + jr ApplyStatusEffect -applyEffect +ApplyStatusEffect: ldh a, [hWhoseTurn] ld hl, wcc05 cp [hl] -- cgit v1.2.3 From c60dd37d93cf681b40052e7c970d88feab037c86 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 21 Feb 2018 13:58:32 +0100 Subject: Some hram labels --- src/engine/effect_functions.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 88a8361..1d49838 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -108,7 +108,7 @@ asm_2c08c push de push af ld a, $11 - call Func_0f7f + call SetDuelAIAction pop af pop de call Func_0fac -- cgit v1.2.3 From d543a896fd381046dee795f3020237d6da623a9e Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 22 Feb 2018 13:49:27 +0100 Subject: CARD_DATA_* constants and more labeling and disasm --- src/engine/effect_functions.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 1d49838..22d7cec 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -99,12 +99,12 @@ CommentedOut_2c086: ; 2c086 (b:4086) Func_2c087: ; 2c087 (b:4087) xor a - jr asm_2c08c + jr Func_2c08c Func_2c08a: ; 2c08a (b:408a) ld a, $1 -asm_2c08c +Func_2c08c: push de push af ld a, $11 -- cgit v1.2.3 From 46416da9fa3e33738fce25bbd79d9b61476b5164 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 22 Feb 2018 19:41:55 +0100 Subject: More duel related disassembly and more DUELVAR constants --- src/engine/effect_functions.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 22d7cec..45aad3b 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -44,12 +44,12 @@ ApplyStatusEffect: jr z, .cant_induce_status cp MYSTERIOUS_FOSSIL jr z, .cant_induce_status - ; snorlax's thick skinned prevents it from being statused... + ; Snorlax's Thick Skinned prevents it from being statused... cp SNORLAX jr nz, .can_induce_status call SwapTurn xor a - ; ...unless already so, or if affected by muk's toxic gas + ; ...unless already so, or if affected by Muk's Toxic Gas call CheckIfUnderAnyCannotUseStatus2 call SwapTurn jr c, .can_induce_status -- cgit v1.2.3 From 4ab687caf426041e6e5b79093eff9f1b805bf4d5 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Fri, 23 Feb 2018 18:23:30 +0100 Subject: more duel home disassembly --- src/engine/effect_functions.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 45aad3b..aeb35a8 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -39,7 +39,7 @@ ApplyStatusEffect: ld hl, wcc05 cp [hl] jr nz, .can_induce_status - ld a, [wTempNonTurnDuelistCardId] + ld a, [wTempNonTurnDuelistCardID] cp CLEFAIRY_DOLL jr z, .cant_induce_status cp MYSTERIOUS_FOSSIL @@ -296,7 +296,7 @@ KakunaPoisonPowder_AIEffect: ; 2c7b4 (b:47b4) INCROM $2c7bc, $2c7d0 SwordsDanceEffect: ; 2c7d0 (b:47d0) - ld a, [wTempTurnDuelistCardId] + ld a, [wTempTurnDuelistCardID] cp SCYTHER ret nz ld a, SUBSTATUS1_NEXT_TURN_DOUBLE_DAMAGE -- cgit v1.2.3 From 098c6df150a83ec3f10051a65c42bd0bf64a86dc Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sat, 24 Feb 2018 17:10:28 +0100 Subject: More bank0 disasm, labeling, and sram-related constants --- src/engine/effect_functions.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/effect_functions.asm') diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index aeb35a8..0d7a910 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -50,7 +50,7 @@ ApplyStatusEffect: call SwapTurn xor a ; ...unless already so, or if affected by Muk's Toxic Gas - call CheckIfUnderAnyCannotUseStatus2 + call CheckCannotUseDueToStatus_OnlyToxicGasIfANon0 call SwapTurn jr c, .can_induce_status -- cgit v1.2.3