Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix more uses of EFFECTIVE

This commit is contained in:
mid-kid 2018-08-07 14:38:41 +02:00
parent fb52b2fdc9
commit 3cf49b7245
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/battle/ai/switch.asm
View File

@ -30,11 +30,11 @@ CheckPlayerMoveTypeMatchups:
ld hl, wEnemyMonType ld hl, wEnemyMonType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp EFFECTIVE + 1 ; 1.0 + 0.1
jr nc, .super_effective jr nc, .super_effective
and a and a
jr z, .next jr z, .next
cp 10 ; 1.0 cp EFFECTIVE ; 1.0
jr nc, .neutral jr nc, .neutral
.not_very_effective .not_very_effective
@ -75,7 +75,7 @@ CheckPlayerMoveTypeMatchups:
ld hl, wEnemyMonType1 ld hl, wEnemyMonType1
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp EFFECTIVE + 1 ; 1.0 + 0.1
jr c, .ok jr c, .ok
call .DecreaseScore call .DecreaseScore
.ok .ok
@ -84,7 +84,7 @@ CheckPlayerMoveTypeMatchups:
jr z, .ok2 jr z, .ok2
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp EFFECTIVE + 1 ; 1.0 + 0.1
jr c, .ok2 jr c, .ok2
call .DecreaseScore call .DecreaseScore
.ok2 .ok2
@ -130,7 +130,7 @@ CheckPlayerMoveTypeMatchups:
; not very effective ; not very effective
inc c inc c
cp 10 cp EFFECTIVE
jr c, .loop2 jr c, .loop2
; neutral ; neutral
@ -139,7 +139,7 @@ CheckPlayerMoveTypeMatchups:
inc c inc c
inc c inc c
inc c inc c
cp 10 cp EFFECTIVE
jr z, .loop2 jr z, .loop2
; super effective ; super effective
@ -481,7 +481,7 @@ FindEnemyMonsWithASuperEffectiveMove:
; if neutral: load 1 and continue ; if neutral: load 1 and continue
ld e, 1 ld e, 1
cp 10 + 1 cp EFFECTIVE + 1
jr c, .nope jr c, .nope
; if super-effective: load 2 and break ; if super-effective: load 2 and break
@ -584,7 +584,7 @@ FindEnemyMonsThatResistPlayer:
ld hl, wBaseType ld hl, wBaseType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp EFFECTIVE + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon
ld a, b ld a, b