mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity

"doesnt, isnt" -> "doesn't, isn't"

Browse source
This commit is contained in:
Dragorn421 2022-10-05 12:56:54 +02:00
parent 51258cf173
commit c09e1829ec
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_sram.c
View file

@ -312,7 +312,7 @@ static s16 sDungeonEntrances[] = {
* - If health is less than 3 hearts, give 3 hearts * - 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 * - 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 * - 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 * - Revert any trade items that spoil
*/ */
void Sram_OpenSave(SramContext* sramCtx) { void Sram_OpenSave(SramContext* sramCtx) {

6
src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -114,10 +114,10 @@ static ColliderQuadInit sQuadInit = {
typedef enum { typedef enum {
/* 00 */ AM_DMGEFF_NONE, // used by anything that cant kill the armos /* 00 */ AM_DMGEFF_NONE, // used by anything that cant kill the armos
/* 01 */ AM_DMGEFF_NUT, /* 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, /* 13 */ AM_DMGEFF_ICE = 13,
/* 14 */ AM_DMGEFF_MAGIC_FIRE_LIGHT, /* 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; } ArmosDamageEffect;
static DamageTable sDamageTable = { static DamageTable sDamageTable = {
@ -246,7 +246,7 @@ void EnAm_Destroy(Actor* thisx, PlayState* play) {
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(play, &this->hurtCollider); Collider_DestroyCylinder(play, &this->hurtCollider);
Collider_DestroyCylinder(play, &this->blockCollider); 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) { void EnAm_SpawnEffects(EnAm* this, PlayState* play) {

2
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -272,7 +272,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
thisx->shape.rot.z = 0; thisx->shape.rot.z = 0;
} else { } else {
// if a lit stick touches the bomb, set timer to 100 // 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)) { if ((this->timer > 100) && Player_IsBurningStickInRange(play, &thisx->world.pos, 30.0f, 50.0f)) {
this->timer = 100; this->timer = 100;
} }

2
src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
View file

@ -451,7 +451,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) {
// sidehops onto the next screen and prevent getting caught. // sidehops onto the next screen and prevent getting caught.
if (!(player->actor.velocity.y > -3.9f)) { if (!(player->actor.velocity.y > -3.9f)) {
this->linkDetected = false; 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) { if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) {
func_80078884(NA_SE_SY_FOUND); func_80078884(NA_SE_SY_FOUND);
// "Discovered!" // "Discovered!"