dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize spelling of "paralyze"

Browse Source
This commit is contained in:
mitsunee
2025-11-19 21:19:15 +01:00
parent c0569cd529
commit afa42f5d29
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/battle_script.inc
View File

@@ -1048,7 +1048,7 @@
.byte 0xcc .byte 0xcc
.endm .endm
.macro cureifburnedparalysedorpoisoned ptr:req .macro cureifburnedparalyzedorpoisoned ptr:req
.byte 0xcd .byte 0xcd
.4byte \ptr .4byte \ptr
.endm .endm

2
data/battle_scripts_1.s
View File

@@ -2521,7 +2521,7 @@ BattleScript_EffectRefresh::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
cureifburnedparalysedorpoisoned BattleScript_ButItFailed cureifburnedparalyzedorpoisoned BattleScript_ButItFailed
attackanimation attackanimation
waitanimation waitanimation
printstring STRINGID_PKMNSTATUSNORMAL printstring STRINGID_PKMNSTATUSNORMAL

6
src/battle_script_commands.c
View File

@@ -281,7 +281,7 @@ static void Cmd_trymemento(void);
static void Cmd_setforcedtarget(void); static void Cmd_setforcedtarget(void);
static void Cmd_setcharge(void); static void Cmd_setcharge(void);
static void Cmd_callenvironmentattack(void); static void Cmd_callenvironmentattack(void);
static void Cmd_cureifburnedparalysedorpoisoned(void); static void Cmd_cureifburnedparalyzedorpoisoned(void);
static void Cmd_settorment(void); static void Cmd_settorment(void);
static void Cmd_jumpifnodamage(void); static void Cmd_jumpifnodamage(void);
static void Cmd_settaunt(void); static void Cmd_settaunt(void);
@@ -533,7 +533,7 @@ void (*const gBattleScriptingCommandsTable[])(void) =
Cmd_setforcedtarget, //0xCA Cmd_setforcedtarget, //0xCA
Cmd_setcharge, //0xCB Cmd_setcharge, //0xCB
Cmd_callenvironmentattack, //0xCC Cmd_callenvironmentattack, //0xCC
Cmd_cureifburnedparalysedorpoisoned, //0xCD Cmd_cureifburnedparalyzedorpoisoned, //0xCD
Cmd_settorment, //0xCE Cmd_settorment, //0xCE
Cmd_jumpifnodamage, //0xCF Cmd_jumpifnodamage, //0xCF
Cmd_settaunt, //0xD0 Cmd_settaunt, //0xD0
@@ -9116,7 +9116,7 @@ static void Cmd_callenvironmentattack(void)
} }
// Refresh // Refresh
static void Cmd_cureifburnedparalysedorpoisoned(void) static void Cmd_cureifburnedparalyzedorpoisoned(void)
{ {
if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
{ {

4
src/battle_util.c
View File

@@ -1992,7 +1992,7 @@ enum
CANCELER_TAUNTED, CANCELER_TAUNTED,
CANCELER_IMPRISONED, CANCELER_IMPRISONED,
CANCELER_CONFUSED, CANCELER_CONFUSED,
CANCELER_PARALYSED, CANCELER_PARALYZED,
CANCELER_IN_LOVE, CANCELER_IN_LOVE,
CANCELER_BIDE, CANCELER_BIDE,
CANCELER_THAW, CANCELER_THAW,
@@ -2185,7 +2185,7 @@ u8 AtkCanceler_UnableToUseMove(void)
} }
gBattleStruct->atkCancelerTracker++; gBattleStruct->atkCancelerTracker++;
break; break;
case CANCELER_PARALYSED: // paralysis case CANCELER_PARALYZED: // paralysis
if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0) if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
{ {
gProtectStructs[gBattlerAttacker].prlzImmobility = 1; gProtectStructs[gBattlerAttacker].prlzImmobility = 1;