From c09e1829ecc5327a23bef2f39276242f274e94c6 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 5 Oct 2022 12:56:54 +0200 Subject: [PATCH] "doesnt, isnt" -> "doesn't, isn't" --- src/code/z_sram.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 6 +++--- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 2 +- src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code/z_sram.c b/src/code/z_sram.c index bec39a2e82..4e79b22144 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -312,7 +312,7 @@ static s16 sDungeonEntrances[] = { * - If health is less than 3 hearts, give 3 hearts * - If either scarecrow song is set, copy them from save context to the proper location * - Handle a case where the player saved and quit after zelda cutscene but didnt get the song - * - Give and equip master sword if player is adult and doesnt have master sword + * - Give and equip master sword if player is adult and doesn't have master sword * - Revert any trade items that spoil */ void Sram_OpenSave(SramContext* sramCtx) { diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 9bd69031ba..ceca0e4105 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -114,10 +114,10 @@ static ColliderQuadInit sQuadInit = { typedef enum { /* 00 */ AM_DMGEFF_NONE, // used by anything that cant kill the armos /* 01 */ AM_DMGEFF_NUT, - /* 06 */ AM_DMGEFF_STUN = 6, // doesnt include deku nuts + /* 06 */ AM_DMGEFF_STUN = 6, // doesn't include deku nuts /* 13 */ AM_DMGEFF_ICE = 13, /* 14 */ AM_DMGEFF_MAGIC_FIRE_LIGHT, - /* 15 */ AM_DMGEFF_KILL // any damage source that can kill the armos (and isnt a special case) + /* 15 */ AM_DMGEFF_KILL // any damage source that can kill the armos (and isn't a special case) } ArmosDamageEffect; static DamageTable sDamageTable = { @@ -246,7 +246,7 @@ void EnAm_Destroy(Actor* thisx, PlayState* play) { DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); Collider_DestroyCylinder(play, &this->hurtCollider); Collider_DestroyCylinder(play, &this->blockCollider); - //! @bug Quad collider is not destroyed (though destroy doesnt really do anything anyway) + //! @bug Quad collider is not destroyed (though destroy doesn't really do anything anyway) } void EnAm_SpawnEffects(EnAm* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 445250e8d5..9e91b70aa7 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -272,7 +272,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { thisx->shape.rot.z = 0; } else { // if a lit stick touches the bomb, set timer to 100 - // these bombs never have a timer over 70, so this isnt used + // these bombs never have a timer over 70, so this isn't used if ((this->timer > 100) && Player_IsBurningStickInRange(play, &thisx->world.pos, 30.0f, 50.0f)) { this->timer = 100; } diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index be46befc8e..22064e62a5 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -451,7 +451,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { // sidehops onto the next screen and prevent getting caught. if (!(player->actor.velocity.y > -3.9f)) { this->linkDetected = false; - // this 60 unit height check is so the player doesnt get caught when on the upper path + // this 60 unit height check is so the player doesn't get caught when on the upper path if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) { func_80078884(NA_SE_SY_FOUND); // "Discovered!"