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

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Rr/z_en_rr.c
View file

@ -207,7 +207,7 @@ void EnRr_Destroy(Actor* thisx, PlayState* play) {
void EnRr_SetSpeed(EnRr* this, f32 speed) {
this->actor.speedXZ = speed;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_WALK);
}
void EnRr_SetupReach(EnRr* this) {
@ -225,7 +225,7 @@ void EnRr_SetupReach(EnRr* this) {
this->bodySegs[i].rotTarget.z = 0.0f;
}
this->actionFunc = EnRr_Reach;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_UNARI);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_UNARI);
}
void EnRr_SetupNeutral(EnRr* this) {
@ -266,7 +266,7 @@ void EnRr_SetupGrabPlayer(EnRr* this, Player* player) {
this->bodySegs[i].scaleTarget.x = this->bodySegs[i].scaleTarget.z = 1.0f;
}
this->actionFunc = EnRr_GrabPlayer;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_DRINK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_DRINK);
}
u8 EnRr_GetMessage(u8 shield, u8 tunic) {
@ -325,7 +325,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, PlayState* play) {
func_8002F6D4(play, &this->actor, 4.0f, this->actor.shape.rot.y, 12.0f, 8);
if (this->actor.colorFilterTimer == 0) {
this->actionFunc = EnRr_Approach;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_THROW);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_THROW);
} else if (this->actor.colChkInfo.health != 0) {
EnRr_SetupDamage(this);
} else {
@ -348,7 +348,7 @@ void EnRr_SetupDamage(EnRr* this) {
this->bodySegs[i].scaleTarget.x = this->bodySegs[i].scaleTarget.z = 1.0f;
}
this->actionFunc = EnRr_Damage;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_DAMAGE);
}
void EnRr_SetupApproach(EnRr* this) {
@ -378,7 +378,7 @@ void EnRr_SetupDeath(EnRr* this) {
this->bodySegs[i].rotTarget.x = this->bodySegs[i].rotTarget.z = 0.0f;
}
this->actionFunc = EnRr_Death;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_DEAD);
this->actor.flags &= ~ACTOR_FLAG_0;
}
@ -492,7 +492,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
EnRr_SetupStunned(this);
return;
case RR_DMG_STUN: // Boomerang and Hookshot
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_SetColorFilter(&this->actor, 0, 0xFF, 0x2000, 0x50);
EnRr_SetupStunned(this);
return;
@ -624,7 +624,7 @@ void EnRr_GrabPlayer(EnRr* this, PlayState* play) {
func_800AA000(this->actor.xyzDistToPlayerSq, 120, 2, 120);
if ((this->frameCount % 8) == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_EAT);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIKE_EAT);
}
this->ocTimer = 8;
if ((this->grabTimer == 0) || !(player->stateFlags2 & PLAYER_STATE2_7)) {