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

Fix some uses of EFFECTIVE

This commit is contained in:
mid-kid 2018-03-09 22:09:03 +01:00
parent 28c6eb8341
commit 80d437d565
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/core.asm
View File

@ -1533,7 +1533,7 @@ HandleFutureSight: ; 3ca26
xor a xor a
ld [wAttackMissed], a ld [wAttackMissed], a
ld [wAlreadyDisobeyed], a ld [wAlreadyDisobeyed], a
ld a, 10 ld a, EFFECTIVE
ld [wTypeModifier], a ld [wTypeModifier], a
callfar DoMove callfar DoMove
xor a xor a

2
engine/battle/move_effects/conversion2.asm
View File

@ -50,7 +50,7 @@ BattleCommand_Conversion2: ; 359e6
ld [hl], a ld [hl], a
pop hl pop hl
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 cp EFFECTIVE
jr nc, .loop jr nc, .loop
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn

2
engine/battle_anims/anim_commands.asm
View File

@ -1338,7 +1338,7 @@ PlayHitSound: ; cc881
and $7f and $7f
ret z ret z
cp 10 cp EFFECTIVE
ld de, SFX_DAMAGE ld de, SFX_DAMAGE
jr z, .play jr z, .play