atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed jumpifspecies

Browse source
This commit is contained in:
LOuroboros 2021-10-17 10:51:22 -03:00
parent bfc66a21cc
commit dcea8e45ed
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asm/macros/battle_script.inc
View file

@ -1771,7 +1771,7 @@
.macro jumpifspecies battler:req, species:req, ptr:req .macro jumpifspecies battler:req, species:req, ptr:req
various \battler, VARIOUS_JUMP_IF_SPECIES various \battler, VARIOUS_JUMP_IF_SPECIES
.byte \species .2byte \species
.4byte \ptr .4byte \ptr
.endm .endm

6
src/battle_script_commands.c
View file

@ -8427,10 +8427,10 @@ static void Cmd_various(void)
} }
return; return;
case VARIOUS_JUMP_IF_SPECIES: case VARIOUS_JUMP_IF_SPECIES:
if (gBattleMons[gBattlerAttacker].species == gBattlescriptCurrInstr[3]) if (gBattleMons[gActiveBattler].species == T1_READ_16(gBattlescriptCurrInstr + 3))
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 4); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 5);
else else
gBattlescriptCurrInstr += 8; gBattlescriptCurrInstr += 9;
return; return;
} }