diff --git a/include/battle_util.h b/include/battle_util.h index c91078db2b..e63b3a5395 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -119,7 +119,7 @@ enum MoveSuccessOrder CANCELER_TAUNTED, CANCELER_IMPRISONED, CANCELER_CONFUSED, - CANCELER_PARALYSED, + CANCELER_PARALYZED, CANCELER_INFATUATION, CANCELER_BIDE, CANCELER_THAW, diff --git a/src/battle_util.c b/src/battle_util.c index 06023975e9..4772eb872c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2238,7 +2238,7 @@ static enum MoveCanceler CancelerConfused(void) return MOVE_STEP_SUCCESS; } -static enum MoveCanceler CancelerParalysed(void) +static enum MoveCanceler CancelerParalyzed(void) { if (!gBattleStruct->isAtkCancelerForCalledMove && (gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) @@ -2636,7 +2636,7 @@ static enum MoveCanceler (*const sMoveSuccessOrderCancelers[])(void) = [CANCELER_TAUNTED] = CancelerTaunted, [CANCELER_IMPRISONED] = CancelerImprisoned, [CANCELER_CONFUSED] = CancelerConfused, - [CANCELER_PARALYSED] = CancelerParalysed, + [CANCELER_PARALYZED] = CancelerParalyzed, [CANCELER_BIDE] = CancelerBide, [CANCELER_THAW] = CancelerThaw, [CANCELER_STANCE_CHANGE_2] = CancelerStanceChangeTwo, diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 2e9e1a8510..66767882cd 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -35,8 +35,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); @@ -1248,13 +1248,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[] = { @@ -1273,7 +1273,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; diff --git a/src/list_menu.c b/src/list_menu.c index 124d39ba43..64512b12d8 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -13,6 +13,10 @@ #include "sound.h" #include "constants/songs.h" +// GF cast Task data to ListMenu in many places, which effectively puts +// an upper bound on sizeof(struct ListMenu). +STATIC_ASSERT(sizeof(struct ListMenu) <= sizeof(((struct Task *)NULL)->data), ListMenuTooLargeForTaskData); + // Cursors after this point are created using a sprite with their own task. // This allows them to have idle animations. Cursors prior to this are simply printed text. #define CURSOR_OBJECT_START CURSOR_RED_OUTLINE