From d9f7ad89ad018ae036b3094ab01b3790c2311a2b Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 28 Feb 2021 20:56:06 -0800 Subject: resolve sfx calls --- src/object/bird.c | 3 ++- src/object/cloud.c | 5 +++-- src/object/greatFairy.c | 9 +++++---- src/object/heartContainer.c | 3 ++- src/object/itemOnGround.c | 1 + src/object/minecart.c | 7 ++++--- src/object/object49.c | 3 ++- src/object/treeHidingPortal.c | 3 ++- src/object/windcrest.c | 3 ++- 9 files changed, 23 insertions(+), 14 deletions(-) (limited to 'src/object') diff --git a/src/object/bird.c b/src/object/bird.c index 2b6f194b..acda3985 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "flags.h" #include "functions.h" @@ -95,7 +96,7 @@ void sub_0809D0AC(Entity* this) { this->height.WORD = 0; this->collisionLayer = 1; SetLocalFlag(0x45); - SoundReq(0x72); + SoundReq(SFX_SECRET); fx = CreateFx(this, 0x11, 0); if (fx != NULL) { sub_0806FAD8(this, fx); diff --git a/src/object/cloud.c b/src/object/cloud.c index a2637b6b..e7851f07 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "room.h" #include "player.h" @@ -70,7 +71,7 @@ void sub_0809F548(Entity* this) { void sub_0809F5B0(Entity* this) { if (--this->actionDelay == 0) { - SoundReq(115); + SoundReq(SFX_SECRET_BIG); SetGlobalFlag(KUMOTATSUMAKI); LoadRoomEntityList(&gUnk_080DD750); DeleteThisEntity(); @@ -123,7 +124,7 @@ void sub_0809F69C(Entity* this) { this->actionDelay = 30; this->action = 4; gRoomControls.cameraTarget = &gPlayerEntity; - SoundReq(115); + SoundReq(SFX_SECRET_BIG); } } diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index e71ddfc6..2140f167 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "room.h" #include "screen.h" @@ -220,7 +221,7 @@ void GreatFairy_MiniRisingUpdate(Entity* this) { this->height.WORD -= 0x8000; if (this->height.HALF.HI == -20) { this->action = 2; - SoundReq(321); + SoundReq(SFX_HEART_CONTAINER_SPAWN); } else { if (((this->height.HALF.HI == -10) && (this->field_0xf == 0)) && (target = GreatFairy_CreateForm(this, DROPLET, 0), target != NULL)) { @@ -289,7 +290,7 @@ void GreatFairy_DropletInit(Entity* this) { this->spriteSettings.b.draw = 1; this->height.HALF.HI = 0; this->spritePriority.b0 = 5; - SoundReq(320); + SoundReq(SFX_140); } void GreatFairy_DropletUpdate(Entity* this) { @@ -328,7 +329,7 @@ void GreatFairy_BigRippleInit(Entity* this) { this->actionDelay = 120; this->spriteSettings.b.draw = 1; this->spritePriority.b0 = 5; - SoundReq(249); + SoundReq(SFX_TELEPORTER); } void GreatFairy_BigRippleUpdate(Entity* this) { @@ -520,7 +521,7 @@ void sub_080873D0(Entity* this) { void sub_080873FC(void) { Entity* ent; - SoundReq(0xf7); + SoundReq(SFX_APPARATE); gRoomControls.cameraTarget = NULL; while (ent = FindEntityInListBySubtype(0x6, 0x1b, 0x6), ent != NULL) { diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c index f6858b50..6fad6461 100644 --- a/src/object/heartContainer.c +++ b/src/object/heartContainer.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "flags.h" #include "functions.h" @@ -54,7 +55,7 @@ static void sub_0808E714(Entity* this) { this->action = 3; this->field_0x3c |= 0x10; sub_0805EC60(this); - SoundReq(0x141); + SoundReq(SFX_HEART_CONTAINER_SPAWN); } sub_08080CB4(this); } diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 409c1d04..94a0881c 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "flags.h" #include "functions.h" diff --git a/src/object/minecart.c b/src/object/minecart.c index 53d1ff82..e86c814e 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "functions.h" #include "room.h" @@ -85,7 +86,7 @@ void sub_080917DC(Entity* this) { gPlayerEntity.flags &= 0x7f; ResetPlayer(); sub_0807A108(); - SoundReq(0x7c); + SoundReq(SFX_PLY_JUMP); } } else { this->actionDelay = 0; @@ -153,7 +154,7 @@ void sub_080919AC(Entity* this) { } if (--this->field_0xf == 0xff) { - SoundReq(0x7b); + SoundReq(SFX_PLY_VO7); this->field_0xf = 0x3c; } @@ -182,7 +183,7 @@ void sub_080919AC(Entity* this) { gPlayerEntity.flags |= 0x80; sub_08004168(this); InitAnimationForceUpdate(this, this->animationState + 0xc); - SoundReq(0x78); + SoundReq(SFX_PLY_VO4); SoundReq(0x139); return; case 0x67: diff --git a/src/object/object49.c b/src/object/object49.c index 16bf7bb9..0479ce1f 100644 --- a/src/object/object49.c +++ b/src/object/object49.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "functions.h" #include "position.h" @@ -59,7 +60,7 @@ static void sub_0808F14C(Entity* this) { sub_0808F2B0(this); if (sub_08003FC4(this, 0x2000) == 0) { this->action++; - SoundReq(0x84); + SoundReq(SFX_WATER_SPLASH); } } diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 912003b9..9236ce5c 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "flags.h" #include "player.h" @@ -62,7 +63,7 @@ void sub_0809E8EC(Entity* this) { if (--this->actionDelay == 0) { SetFlag(this->field_0x86.HWORD); sub_08078A90(0); - SoundReq(0x73); + SoundReq(SFX_SECRET_BIG); DeleteThisEntity(); } } diff --git a/src/object/windcrest.c b/src/object/windcrest.c index efc11dc4..ffd01ce6 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -1,4 +1,5 @@ #include "global.h" +#include "audio.h" #include "entity.h" #include "functions.h" #include "save.h" @@ -27,7 +28,7 @@ void sub_080A2124(Entity* this) { } void Windcrest_Unlock(Entity* this) { - SoundReq(0x72); + SoundReq(SFX_SECRET); gSave.windcrests = gSave.windcrests | 1 << (this->type2 + 0x18); CreateFx(this, 0x46, 0); } -- cgit v1.2.3