From c0569cd5297948e8f7bbbf3c24ab8fdc14a7b4c5 Mon Sep 17 00:00:00 2001 From: mitsunee Date: Wed, 19 Nov 2025 21:14:45 +0100 Subject: [PATCH] Standardize spelling of "synchronize" --- include/constants/battle.h | 2 +- src/battle_script_commands.c | 4 ++-- src/battle_util.c | 12 ++++++------ src/field_effect_helpers.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/constants/battle.h b/include/constants/battle.h index f6b4836ba2..1712dc0730 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -188,7 +188,7 @@ enum BattlerId #define HITMARKER_NO_PPDEDUCT (1 << 11) #define HITMARKER_SWAP_ATTACKER_TARGET (1 << 12) #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_IGNORE_ON_AIR (1 << 16) #define HITMARKER_IGNORE_UNDERGROUND (1 << 17) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 65663f77d3..30f347a9d4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2507,7 +2507,7 @@ void SetMoveEffect(bool8 primary, u8 certain) { u8 *synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; *synchronizeEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; - gHitMarker |= HITMARKER_SYNCHRONISE_EFFECT; + gHitMarker |= HITMARKER_SYNCHRONIZE_EFFECT; } return; } @@ -3626,7 +3626,7 @@ static void MoveValuesCleanUp(void) gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleCommunication[MISS_TYPE] = 0; gHitMarker &= ~HITMARKER_DESTINYBOND; - gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT; + gHitMarker &= ~HITMARKER_SYNCHRONIZE_EFFECT; } static void Cmd_movevaluescleanup(void) diff --git a/src/battle_util.c b/src/battle_util.c index 96c5dbc6f2..f511a86764 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -651,7 +651,7 @@ void HandleAction_NothingIsFainted(void) gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR | 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); } @@ -664,7 +664,7 @@ void HandleAction_ActionFinished(void) gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_IGNORE_ON_AIR | 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); gCurrentMove = 0; @@ -2969,9 +2969,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } break; 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); if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC) gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON; @@ -2985,9 +2985,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } break; 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); if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC) gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON; diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index ac4dac3ecb..320bfea578 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -26,8 +26,8 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); static void UpdateAshFieldEffect_Wait(struct Sprite *); static void UpdateAshFieldEffect_Show(struct Sprite *); static void UpdateAshFieldEffect_End(struct Sprite *); -static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); -static void SynchroniseSurfPosition(struct ObjectEvent *, struct Sprite *); +static void SynchronizeSurfAnim(struct ObjectEvent *, struct Sprite *); +static void SynchronizeSurfPosition(struct ObjectEvent *, struct Sprite *); static void UpdateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void SpriteCB_UnderwaterSurfBlob(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); @@ -1053,13 +1053,13 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { struct ObjectEvent *playerObj = &gObjectEvents[sprite->sPlayerObjId]; struct Sprite *playerSprite = &gSprites[playerObj->spriteId]; - SynchroniseSurfAnim(playerObj, sprite); - SynchroniseSurfPosition(playerObj, sprite); + SynchronizeSurfAnim(playerObj, sprite); + SynchronizeSurfPosition(playerObj, sprite); UpdateBobbingEffect(playerObj, playerSprite, sprite); 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 u8 surfBlobDirectionAnims[] = { @@ -1078,7 +1078,7 @@ static void SynchroniseSurfAnim(struct ObjectEvent *playerObj, struct Sprite *sp StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[playerObj->movementDirection]); } -void SynchroniseSurfPosition(struct ObjectEvent *playerObj, struct Sprite *sprite) +void SynchronizeSurfPosition(struct ObjectEvent *playerObj, struct Sprite *sprite) { u8 i; s16 x = playerObj->currentCoords.x;