ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
various \battler, VARIOUS_JUMP_IF_SPECIES
.byte \species
.2byte \species
.4byte \ptr
.endm

6
src/battle_script_commands.c
View File

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