Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply suggestions

Browse Source
This commit is contained in:
Alex 2023-10-22 19:46:31 +02:00
parent 783ec0e957
commit bf56ea8a8b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -1366,8 +1366,8 @@
.byte \battler
.endm
.macro setoctolock battler:req, failInstr:req
callnative BS_Octolock
.macro trysetoctolock battler:req, failInstr:req
callnative BS_TrySetOctolock
.byte \battler
.4byte \failInstr
.endm

2
data/battle_scripts_1.s
View File

@ -1057,7 +1057,7 @@ BattleScript_EffectOctolock:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setoctolock BS_TARGET, BattleScript_ButItFailed
trysetoctolock BS_TARGET, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE

6
src/battle_script_commands.c
View File

@ -15697,7 +15697,7 @@ static bool8 IsFinalStrikeEffect(u16 move)
return FALSE;
}
static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 isIntimidate)
static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 byIntimidate)
{
switch (abilityDef)
{
@ -15709,7 +15709,7 @@ static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 isIntimidate)
case ABILITY_SCRAPPY:
case ABILITY_OWN_TEMPO:
case ABILITY_OBLIVIOUS:
if (isIntimidate && (B_UPDATED_INTIMIDATE >= GEN_8))
if (byIntimidate && (B_UPDATED_INTIMIDATE >= GEN_8))
return TRUE;
break;
}
@ -16238,7 +16238,7 @@ void BS_JumpIfTerrainAffected(void)
gBattlescriptCurrInstr = cmd->nextInstr;
}
void BS_Octolock(void)
void BS_TrySetOctolock(void)
{
NATIVE_ARGS(u8 battler, const u8 *failInstr);
u32 battler = GetBattlerForBattleScript(cmd->battler);