1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00

Rename "Sound" to "Sfx" (#1292)

* First attempt

* More

* rename

* more sound -> sfx / sound effect (#7)

* PR Suggestions

* PR Suggestions

* Small fix

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
engineer124 2022-07-30 07:05:27 -06:00 committed by GitHub
parent 1652b7e5d7
commit 1d19f37b26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
321 changed files with 2879 additions and 2904 deletions

View file

@ -221,7 +221,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) {
this->actor.parent->params = ENDH_START_ATTACK_GRAB;
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
}
} else {
this->timer += 0x1194;
@ -234,7 +234,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) {
}
if (this->timer < -0x6E6B) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
}
}
@ -249,7 +249,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) {
}
if (this->actor.home.rot.z != 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_HAND_AT);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_HAND_AT);
this->actor.home.rot.z = 0;
}
}
@ -326,7 +326,7 @@ void EnDha_SetupDeath(EnDha* this) {
if (this->actor.parent != NULL) {
if (this->actor.parent->params != ENDH_DEATH) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_HAND_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_HAND_DEAD);
}
if (this->actor.parent->params <= ENDH_WAIT_UNDERGROUND) {
this->actor.parent->params--;
@ -389,7 +389,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) {
this->actor.colChkInfo.health = 8;
Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0xE0);
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_DAMAGE);
this->unk_1C0 = 9;
EnDha_SetupTakeDamage(this);
}