i'm going to Detatch your fingers

SonicMania/Objects/MMZ/BuzzSaw.c

@@ -50,7 +50,7 @@ void BuzzSaw_Create(void *data)
  self->startPos = self->position;
 
  if (self->type == BUZZSAW_ATTACHED)
- self->state = BuzzSaw_State_Attatched;
+ self->state = BuzzSaw_State_Attached;
  else
  self->state = BuzzSaw_State_Stray_Waiting;
  }
@@ -120,7 +120,7 @@ void BuzzSaw_CheckPlayerCollisions(void)
  self->position.y = self->startPos.y;
 }
 
-void BuzzSaw_State_Attatched(void)
+void BuzzSaw_State_Attached(void)
 {
  RSDK_THIS(BuzzSaw);
 

SonicMania/Objects/MMZ/BuzzSaw.h

@@ -51,7 +51,7 @@ void BuzzSaw_SfxUpdate_SawSus(int32 sfx);
 
 void BuzzSaw_CheckPlayerCollisions(void);
 
-void BuzzSaw_State_Attatched(void);
+void BuzzSaw_State_Attached(void);
 
 void BuzzSaw_State_Stray_Waiting(void);
 void BuzzSaw_State_Stray_Released(void);

SonicMania/Objects/MMZ/Gachapandora.c

@@ -183,7 +183,7 @@ void Gachapandora_Create(void *data)
 
  RSDK.SetSpriteAnimation(Gachapandora->aniFrames, 13, &self->mainAnimator, true, 0);
 
- self->state = Gachapandora_StateSpark_Attatched;
+ self->state = Gachapandora_StateSpark_Attached;
  self->stateDraw = Gachapandora_Draw_Simple;
 
  self->updateRange.x = 0x800000;
@@ -860,7 +860,7 @@ void Gachapandora_StateBoss_LastDitchAttack(void)
  spark->velocity.x = self->velocity.x + 0x10000;
  }
 
- spark->state = Gachapandora_StateSpark_Detatched;
+ spark->state = Gachapandora_StateSpark_Detached;
  spark->position.y += (RSDK.Rand(-8, 8) + 20) << 16;
  }
  }
@@ -1754,7 +1754,7 @@ void Gachapandora_Draw_BossDebris(void)
  RSDK.DrawSprite(&self->mainAnimator, NULL, false);
 }
 
-void Gachapandora_StateSpark_Attatched(void)
+void Gachapandora_StateSpark_Attached(void)
 {
  RSDK_THIS(Gachapandora);
 
@@ -1779,7 +1779,7 @@ void Gachapandora_StateSpark_Attatched(void)
  destroyEntity(self);
 }
 
-void Gachapandora_StateSpark_Detatched(void)
+void Gachapandora_StateSpark_Detached(void)
 {
  RSDK_THIS(Gachapandora);
 
@@ -1802,7 +1802,7 @@ void Gachapandora_StateSpark_Detatched(void)
  RSDK.SetSpriteAnimation(Gachapandora->aniFrames, 16, &self->mainAnimator, true, 0);
  self->velocity.x = 0;
  self->velocity.y = 0;
- self->state = Gachapandora_StateSpark_Attatched;
+ self->state = Gachapandora_StateSpark_Attached;
  }
 }
 

SonicMania/Objects/MMZ/Gachapandora.h

@@ -154,8 +154,8 @@ void Gachapandora_StateDebris_Falling(void);
 void Gachapandora_StateDebris_BossDebris(void);
 void Gachapandora_Draw_BossDebris(void);
 
-void Gachapandora_StateSpark_Attatched(void);
-void Gachapandora_StateSpark_Detatched(void);
+void Gachapandora_StateSpark_Attached(void);
+void Gachapandora_StateSpark_Detached(void);
 
 void Gachapandora_StateEggman_Falling(void);
 void Gachapandora_StateEggman_Escape(void);

SonicMania/Objects/SSZ/Bungee.c

@@ -13,16 +13,16 @@ void Bungee_Update(void)
 {
  RSDK_THIS(Bungee);
 
- if (self->hasAttatchedPlayer) {
- EntityPlayer *player = self->attatchedPlayer;
+ if (self->hasAttachedPlayer) {
+ EntityPlayer *player = self->attachedPlayer;
 
  self->timer = 2;
 #if GAME_VERSION != VER_100
  if (player && !Player_CheckValidState(player)) {
- self->attatchedPlayer = NULL;
- self->hasAttatchedPlayer = false;
+ self->attachedPlayer = NULL;
+ self->hasAttachedPlayer = false;
  }
- if (self->attatchedPlayer) {
+ if (self->attachedPlayer) {
 #endif
  RSDK.GetHitbox(&player->animator, 0); // yeah
 
@@ -44,9 +44,9 @@ void Bungee_Update(void)
  if (self->bungeePos.y <= self->startPos.y) {
  self->bungeePos.x = self->startPos.x;
  self->bungeePos.y = self->startPos.y;
- self->hasAttatchedPlayer = false;
+ self->hasAttachedPlayer = false;
 
- if (self->attatchedPlayer) {
+ if (self->attachedPlayer) {
  player->tileCollisions = TILECOLLISION_DOWN;
  player->velocity = self->velocity;
  RSDK.SetSpriteAnimation(player->aniFrames, ANI_SPRING_TWIRL, &player->animator, true, 0);
@@ -74,13 +74,13 @@ void Bungee_Update(void)
  if (abs(player->position.x - self->position.x) < 0x180000 && self->playerY[player->playerID] <= self->position.y
  && player->position.y >= self->position.y) {
  if (abs(player->groundVel) > 0x20000 || player->velocity.y > 0x20000) {
- if (player->state != Player_State_Static && !self->hasAttatchedPlayer && !self->timer) {
+ if (player->state != Player_State_Static && !self->hasAttachedPlayer && !self->timer) {
  self->stretchForce = -0x2C00;
  self->timer = 2;
- self->attatchedPlayer = player;
+ self->attachedPlayer = player;
  self->bungeePos.x = self->startPos.x;
  self->bungeePos.y = self->startPos.y;
- self->hasAttatchedPlayer = true;
+ self->hasAttachedPlayer = true;
  self->velocity.x = 0;
 
  int32 velocity = player->onGround ? abs(player->groundVel) : player->velocity.y;
@@ -118,11 +118,11 @@ void Bungee_Update(void)
  self->timer--;
  }
  else {
- EntityPlayer *player = self->attatchedPlayer;
+ EntityPlayer *player = self->attachedPlayer;
  if (player) {
  Zone->deathBoundary[player->playerID] = self->deathBoundary[player->playerID];
  self->deathBoundary[player->playerID] = 0;
- self->attatchedPlayer = NULL;
+ self->attachedPlayer = NULL;
  }
  }
 }
@@ -135,8 +135,8 @@ void Bungee_Draw(void)
 {
  RSDK_THIS(Bungee);
 
- if (self->hasAttatchedPlayer) {
- EntityPlayer *player = self->attatchedPlayer;
+ if (self->hasAttachedPlayer) {
+ EntityPlayer *player = self->attachedPlayer;
  Vector2 drawPos = self->startPos;
 
  int32 playerY = player->position.y;

SonicMania/Objects/SSZ/Bungee.h

@@ -16,8 +16,8 @@ struct EntityBungee {
  Vector2 startPos;
  Vector2 bungeePos;
  int32 playerY[PLAYER_COUNT];
- bool32 hasAttatchedPlayer;
- EntityPlayer *attatchedPlayer;
+ bool32 hasAttachedPlayer;
+ EntityPlayer *attachedPlayer;
  int32 stretchForce;
  int32 deathBoundary[PLAYER_COUNT];
  uint8 timer;

SonicMania/Objects/TMZ/SentryBug.c

@@ -27,7 +27,7 @@ void SentryBug_Draw(void)
 {
  RSDK_THIS(SentryBug);
 
- if (self->orbsDetatched) {
+ if (self->orbsDetached) {
  RSDK.DrawSprite(&self->bugAnimator, NULL, false);
 
  if (self->showNet) {
@@ -170,9 +170,9 @@ void SentryBug_StateOrbs_Attached(void)
 
  Vector2 *offsets = NULL;
  if (self->bugAnimator.animationID == 1)
- offsets = (Vector2 *)&SentryBug->orbOffsets_Attatched[12 * self->bugAnimator.frameID];
+ offsets = (Vector2 *)&SentryBug->orbOffsets_Attached[12 * self->bugAnimator.frameID];
  else
- offsets = (Vector2 *)&SentryBug->orbOffsets_Attatched[-12 * self->bugAnimator.frameID + 72];
+ offsets = (Vector2 *)&SentryBug->orbOffsets_Attached[-12 * self->bugAnimator.frameID + 72];
 
  for (int32 i = 0; i < 6; ++i) {
  self->orbPositions[i].x = self->position.x + offsets[i].x;
@@ -230,9 +230,9 @@ void SentryBug_StateOrbs_ReturnToSlots(void)
 
  Vector2 *offsets = NULL;
  if (self->bugAnimator.animationID == 1)
- offsets = (Vector2 *)&SentryBug->orbOffsets_Attatched[12 * self->bugAnimator.frameID];
+ offsets = (Vector2 *)&SentryBug->orbOffsets_Attached[12 * self->bugAnimator.frameID];
  else
- offsets = (Vector2 *)&SentryBug->orbOffsets_Attatched[-12 * self->bugAnimator.frameID + 72];
+ offsets = (Vector2 *)&SentryBug->orbOffsets_Attached[-12 * self->bugAnimator.frameID + 72];
 
  for (int32 i = 0; i < 6; ++i) {
  self->orbVelocities[i].x = CLAMP((self->position.x + offsets[i].x - self->orbPositions[i].x) >> 3, -0xC0000, 0xC0000);
@@ -306,7 +306,7 @@ void SentryBug_State_DropOrbs(void)
  }
 
  if (self->timer == 30) {
- self->orbsDetatched = true;
+ self->orbsDetached = true;
  self->stateOrbs = SentryBug_StateOrbs_BeginNetRotation;
  }
 
@@ -362,7 +362,7 @@ void SentryBug_State_NetShrink(void)
  }
  else {
  self->orbAnimator.frameID = 0;
- self->orbsDetatched = false;
+ self->orbsDetached = false;
  self->stateOrbs = SentryBug_StateOrbs_ReturnToSlots;
  self->state = SentryBug_State_ReturnToSlots;
  RSDK.StopSfx(SentryBug->sfxSwarm);
@@ -376,7 +376,7 @@ void SentryBug_State_NetShrink(void)
  }
  else {
  self->orbAnimator.frameID = 0;
- self->orbsDetatched = false;
+ self->orbsDetached = false;
 
  self->stateOrbs = SentryBug_StateOrbs_ReturnToSlots;
  self->state = SentryBug_State_ReturnToSlots;
@@ -408,7 +408,7 @@ void SentryBug_State_NetFlash(void)
 
  self->orbAnimator.frameID = 0;
  self->netColor = 0xF02000;
- self->orbsDetatched = false;
+ self->orbsDetached = false;
  self->stateOrbs = SentryBug_StateOrbs_ReturnToSlots;
  self->state = SentryBug_State_ReturnToSlots;
 

SonicMania/Objects/TMZ/SentryBug.h

@@ -6,7 +6,7 @@
 // Object Class
 struct ObjectSentryBug {
  RSDK_OBJECT
- TABLE(int32 orbOffsets_Attatched[84], { -0x50000, 0x30000, -0x90000, 0xA0000, -0x70000, 0x100000, 0x70000, 0x30000, 0x30000, 0xA0000,
+ TABLE(int32 orbOffsets_Attached[84], { -0x50000, 0x30000, -0x90000, 0xA0000, -0x70000, 0x100000, 0x70000, 0x30000, 0x30000, 0xA0000,
  -0x30000, 0x100000, -0x70000, 0x30000, -0xB0000, 0xA0000, -0x80000, 0x100000, 0x90000, 0x30000,
  0x60000, 0xA0000, 0, 0x100000, -0x90000, 0x30000, -0xB0000, 0xA0000, -0x80000, 0x100000,
  0x90000, 0x30000, 0x80000, 0xA0000, 0x30000, 0x100000, -0x90000, 0x30000, -0xB0000, 0xA0000,
@@ -32,7 +32,7 @@ struct EntitySentryBug {
  StateMachine(stateOrbs);
  uint8 speed;
  Vector2 amplitude;
- bool32 orbsDetatched;
+ bool32 orbsDetached;
  bool32 showNet;
  int32 timer;
  Vector2 originPos;