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

Merge pull request #2208 from Mitsunee/spelling-synchronize-paralyze

Browse Source 
Standardize Spelling of "synchronize" and "paralyze"
This commit is contained in:
Martin Griffin
2025-11-19 20:28:33 +00:00
committed by GitHub
parent c5bbaeab5d afa42f5d29
commit ff230c7603
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+1 -1
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
data/battle_scripts_1.s
+1 -1
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
include/constants/battle.h
+1 -1
View File
@@ -188,7 +188,7 @@ enum BattlerId
#define HITMARKER_NO_PPDEDUCT (1 << 11) #define HITMARKER_NO_PPDEDUCT (1 << 11)
#define HITMARKER_SWAP_ATTACKER_TARGET (1 << 12) #define HITMARKER_SWAP_ATTACKER_TARGET (1 << 12)
#define HITMARKER_STATUS_ABILITY_EFFECT (1 << 13) #define HITMARKER_STATUS_ABILITY_EFFECT (1 << 13)
#define HITMARKER_SYNCHRONISE_EFFECT (1 << 14) #define HITMARKER_SYNCHRONIZE_EFFECT (1 << 14)
#define HITMARKER_RUN (1 << 15) #define HITMARKER_RUN (1 << 15)
#define HITMARKER_IGNORE_ON_AIR (1 << 16) #define HITMARKER_IGNORE_ON_AIR (1 << 16)
#define HITMARKER_IGNORE_UNDERGROUND (1 << 17) #define HITMARKER_IGNORE_UNDERGROUND (1 << 17)
src/battle_script_commands.c
+5 -5
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
@@ -2507,7 +2507,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
{ {
u8 *synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; u8 *synchronizeEffect = &gBattleStruct->synchronizeMoveEffect;
*synchronizeEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; *synchronizeEffect = gBattleCommunication[MOVE_EFFECT_BYTE];
gHitMarker |= HITMARKER_SYNCHRONISE_EFFECT; gHitMarker |= HITMARKER_SYNCHRONIZE_EFFECT;
} }
return; return;
} }
@@ -3626,7 +3626,7 @@ static void MoveValuesCleanUp(void)
gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
gBattleCommunication[MISS_TYPE] = 0; gBattleCommunication[MISS_TYPE] = 0;
gHitMarker &= ~HITMARKER_DESTINYBOND; gHitMarker &= ~HITMARKER_DESTINYBOND;
gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT; gHitMarker &= ~HITMARKER_SYNCHRONIZE_EFFECT;
} }
static void Cmd_movevaluescleanup(void) static void Cmd_movevaluescleanup(void)
@@ -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))
{ {
src/battle_util.c
+8 -8
View File
@@ -651,7 +651,7 @@ void HandleAction_NothingIsFainted(void)
gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
| HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR | HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR
| HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_HP_UPDATE | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_HP_UPDATE
| HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONIZE_EFFECT
| HITMARKER_CHARGING | HITMARKER_NEVER_SET); | HITMARKER_CHARGING | HITMARKER_NEVER_SET);
} }
@@ -664,7 +664,7 @@ void HandleAction_ActionFinished(void)
gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
| HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR | HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR
| HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_HP_UPDATE | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_HP_UPDATE
| HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONIZE_EFFECT
| HITMARKER_CHARGING | HITMARKER_NEVER_SET); | HITMARKER_CHARGING | HITMARKER_NEVER_SET);
gCurrentMove = 0; gCurrentMove = 0;
@@ -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;
@@ -2969,9 +2969,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
} }
break; break;
case ABILITYEFFECT_SYNCHRONIZE: // 7 case ABILITYEFFECT_SYNCHRONIZE: // 7
if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONIZE_EFFECT))
{ {
gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT; gHitMarker &= ~HITMARKER_SYNCHRONIZE_EFFECT;
gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN); gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN);
if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC) if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC)
gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON; gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
@@ -2985,9 +2985,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
} }
break; break;
case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8 case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8
if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONIZE_EFFECT))
{ {
gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT; gHitMarker &= ~HITMARKER_SYNCHRONIZE_EFFECT;
gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN); gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN);
if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC) if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC)
gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON; gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
src/field_effect_helpers.c
+6 -6
View File
@@ -26,8 +26,8 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *);
static void UpdateAshFieldEffect_Wait(struct Sprite *); static void UpdateAshFieldEffect_Wait(struct Sprite *);
static void UpdateAshFieldEffect_Show(struct Sprite *); static void UpdateAshFieldEffect_Show(struct Sprite *);
static void UpdateAshFieldEffect_End(struct Sprite *); static void UpdateAshFieldEffect_End(struct Sprite *);
static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); static void SynchronizeSurfAnim(struct ObjectEvent *, struct Sprite *);
static void SynchroniseSurfPosition(struct ObjectEvent *, struct Sprite *); static void SynchronizeSurfPosition(struct ObjectEvent *, struct Sprite *);
static void UpdateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void UpdateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *);
static void SpriteCB_UnderwaterSurfBlob(struct Sprite *); static void SpriteCB_UnderwaterSurfBlob(struct Sprite *);
static u32 ShowDisguiseFieldEffect(u8, u8, u8); static u32 ShowDisguiseFieldEffect(u8, u8, u8);
@@ -1053,13 +1053,13 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
{ {
struct ObjectEvent *playerObj = &gObjectEvents[sprite->sPlayerObjId]; struct ObjectEvent *playerObj = &gObjectEvents[sprite->sPlayerObjId];
struct Sprite *playerSprite = &gSprites[playerObj->spriteId]; struct Sprite *playerSprite = &gSprites[playerObj->spriteId];
SynchroniseSurfAnim(playerObj, sprite); SynchronizeSurfAnim(playerObj, sprite);
SynchroniseSurfPosition(playerObj, sprite); SynchronizeSurfPosition(playerObj, sprite);
UpdateBobbingEffect(playerObj, playerSprite, sprite); UpdateBobbingEffect(playerObj, playerSprite, sprite);
sprite->oam.priority = playerSprite->oam.priority; sprite->oam.priority = playerSprite->oam.priority;
} }
static void SynchroniseSurfAnim(struct ObjectEvent *playerObj, struct Sprite *sprite) static void SynchronizeSurfAnim(struct ObjectEvent *playerObj, struct Sprite *sprite)
{ {
// Indexes into sAnimTable_SurfBlob // Indexes into sAnimTable_SurfBlob
u8 surfBlobDirectionAnims[] = { u8 surfBlobDirectionAnims[] = {
@@ -1078,7 +1078,7 @@ static void SynchroniseSurfAnim(struct ObjectEvent *playerObj, struct Sprite *sp
StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[playerObj->movementDirection]); StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[playerObj->movementDirection]);
} }
void SynchroniseSurfPosition(struct ObjectEvent *playerObj, struct Sprite *sprite) void SynchronizeSurfPosition(struct ObjectEvent *playerObj, struct Sprite *sprite)
{ {
u8 i; u8 i;
s16 x = playerObj->currentCoords.x; s16 x = playerObj->currentCoords.x;