From dcea8e45ed0bb72f67ef2f78513450dfb6133d70 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 17 Oct 2021 10:51:22 -0300 Subject: [PATCH] Fixed jumpifspecies --- asm/macros/battle_script.inc | 2 +- src/battle_script_commands.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 9d624195b5..fd20478d26 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -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 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2a4b2e347e..7b5e782c2a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -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; }