mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Name Actor_PlaySfx and Player_PlaySfx (#1469)

Browse source 
* name two main actor sfx functions

* adjust comments

* fix double s in player

* fix commas
This commit is contained in:
engineer124 2022-12-18 23:18:21 -05:00 • committed by GitHub
parent f181c2f10e
commit be22b836f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
213 changed files with 1424 additions and 1414 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Dha/z_en_dha.c
View file

@ -221,7 +221,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) {
this->actor.parent->params = ENDH_START_ATTACK_GRAB;
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_GRIP);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_HAND_AT);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_HAND_DEAD);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EN_DEADHAND_DAMAGE);
Actor_PlaySfx(&this->actor, NA_SE_EN_DEADHAND_DAMAGE);
this->unk_1C0 = 9;
EnDha_SetupTakeDamage(this);
}