mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-19 21:41:59 +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_Demo_6K/z_demo_6k.c
View file

@ -142,7 +142,7 @@ void Demo6K_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->actor, 0.0f);
this->initActionFunc = func_8096784C;
this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f;
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_NABALL_VANISH);
Actor_PlaySfx(&this->actor, NA_SE_EV_NABALL_VANISH);
break;
case 12:
Actor_SetScale(&this->actor, 0.0f);
@ -388,7 +388,7 @@ void func_809674E0(Demo6K* this, PlayState* play) {
this->actor.world.pos.y += (19.0f - this->actor.world.pos.y) * temp;
this->actor.world.pos.z += (1613.0f - this->actor.world.pos.z) * temp;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FANTOM_FIRE - SFX_FLAG);
Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_FIRE - SFX_FLAG);
}
Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
@ -506,7 +506,7 @@ void func_80967BF8(Player* player, PlayState* play) {
}
void func_80967DBC(Demo6K* this, PlayState* play) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_ATTACK_DEMO - SFX_FLAG);
Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_ATTACK_DEMO - SFX_FLAG);
this->timer2++;
@ -520,13 +520,13 @@ void func_80967DBC(Demo6K* this, PlayState* play) {
if (this->timer2 > 104) {
func_80967BF8(GET_PLAYER(play), play);
Actor_Kill(&this->actor);
Audio_PlayActorSfx2(&GET_PLAYER(play)->actor, NA_SE_EN_FANTOM_HIT_THUNDER);
Actor_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_EN_FANTOM_HIT_THUNDER);
} else if (this->timer2 > 94) {
Actor_SetScale(&this->actor, this->actor.scale.x + 0.03f);
if (this->timer2 == 95) {
osSyncPrintf(VT_FGCOL(CYAN) " NA_SE_EN_GANON_FIRE_DEMO\n" VT_RST);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_FIRE_DEMO);
Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_FIRE_DEMO);
}
}