diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 0bb9e072be..7209310fca 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1048,7 +1048,7 @@ .byte 0xcc .endm - .macro cureifburnedparalysedorpoisoned ptr:req + .macro cureifburnedparalyzedorpoisoned ptr:req .byte 0xcd .4byte \ptr .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 49ffeffb42..e04d68defd 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2521,7 +2521,7 @@ BattleScript_EffectRefresh:: attackcanceler attackstring ppreduce - cureifburnedparalysedorpoisoned BattleScript_ButItFailed + cureifburnedparalyzedorpoisoned BattleScript_ButItFailed attackanimation waitanimation printstring STRINGID_PKMNSTATUSNORMAL diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 30f347a9d4..d5013b0239 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -281,7 +281,7 @@ static void Cmd_trymemento(void); static void Cmd_setforcedtarget(void); static void Cmd_setcharge(void); static void Cmd_callenvironmentattack(void); -static void Cmd_cureifburnedparalysedorpoisoned(void); +static void Cmd_cureifburnedparalyzedorpoisoned(void); static void Cmd_settorment(void); static void Cmd_jumpifnodamage(void); static void Cmd_settaunt(void); @@ -533,7 +533,7 @@ void (*const gBattleScriptingCommandsTable[])(void) = Cmd_setforcedtarget, //0xCA Cmd_setcharge, //0xCB Cmd_callenvironmentattack, //0xCC - Cmd_cureifburnedparalysedorpoisoned, //0xCD + Cmd_cureifburnedparalyzedorpoisoned, //0xCD Cmd_settorment, //0xCE Cmd_jumpifnodamage, //0xCF Cmd_settaunt, //0xD0 @@ -9116,7 +9116,7 @@ static void Cmd_callenvironmentattack(void) } // Refresh -static void Cmd_cureifburnedparalysedorpoisoned(void) +static void Cmd_cureifburnedparalyzedorpoisoned(void) { if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) { diff --git a/src/battle_util.c b/src/battle_util.c index f511a86764..ea721743dd 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1992,7 +1992,7 @@ enum CANCELER_TAUNTED, CANCELER_IMPRISONED, CANCELER_CONFUSED, - CANCELER_PARALYSED, + CANCELER_PARALYZED, CANCELER_IN_LOVE, CANCELER_BIDE, CANCELER_THAW, @@ -2185,7 +2185,7 @@ u8 AtkCanceler_UnableToUseMove(void) } gBattleStruct->atkCancelerTracker++; break; - case CANCELER_PARALYSED: // paralysis + case CANCELER_PARALYZED: // paralysis if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0) { gProtectStructs[gBattlerAttacker].prlzImmobility = 1;