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

Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes

Browse source 
Fix uses of gBattlescriptCurrInstr
This commit is contained in:
Eduardo Quezada D'Ottone 2023-01-27 19:25:06 -03:00 committed by GitHub
commit f1d97bfad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/battle_script_commands.c
View file

@ -5413,7 +5413,7 @@ static void Cmd_moveend(void)
gStatuses3[gBattlerTarget] |= STATUS3_SMACKED_DOWN; gStatuses3[gBattlerTarget] |= STATUS3_SMACKED_DOWN;
gStatuses3[gBattlerTarget] &= ~(STATUS3_MAGNET_RISE | STATUS3_TELEKINESIS | STATUS3_ON_AIR); gStatuses3[gBattlerTarget] &= ~(STATUS3_MAGNET_RISE | STATUS3_TELEKINESIS | STATUS3_ON_AIR);
effect = TRUE; effect = TRUE;
BattleScriptPush(gBattlescriptCurrInstr + 1); BattleScriptPush(gBattlescriptCurrInstr);
gBattlescriptCurrInstr = BattleScript_MoveEffectSmackDown; gBattlescriptCurrInstr = BattleScript_MoveEffectSmackDown;
} }
break; break;
@ -5426,7 +5426,7 @@ static void Cmd_moveend(void)
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);
effect = TRUE; effect = TRUE;
BattleScriptPush(gBattlescriptCurrInstr + 1); BattleScriptPush(gBattlescriptCurrInstr);
switch (gBattleMoves[gCurrentMove].argument) switch (gBattleMoves[gCurrentMove].argument)
{ {
case STATUS1_PARALYSIS: case STATUS1_PARALYSIS:
@ -10106,9 +10106,9 @@ static void Cmd_various(void)
return; return;
case VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY: case VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY:
if (ItemId_GetPocket(gLastUsedItem) == POCKET_BERRIES) if (ItemId_GetPocket(gLastUsedItem) == POCKET_BERRIES)
gBattlescriptCurrInstr += 7;
else
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
else
gBattlescriptCurrInstr += 7;
return; return;
case VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT: case VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT:
if (ItemId_GetHoldEffect(gLastUsedItem) == gBattlescriptCurrInstr[3]) if (ItemId_GetHoldEffect(gLastUsedItem) == gBattlescriptCurrInstr[3])
@ -10191,6 +10191,8 @@ static void Cmd_various(void)
break; break;
} }
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId); PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
gBattlescriptCurrInstr += 4;
return;
} }
break; break;
case VARIOUS_TEATIME_TARGETS: case VARIOUS_TEATIME_TARGETS: