summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
Diffstat (limited to 'src/object')
-rw-r--r--src/object/bird.c3
-rw-r--r--src/object/cloud.c5
-rw-r--r--src/object/greatFairy.c9
-rw-r--r--src/object/heartContainer.c3
-rw-r--r--src/object/itemOnGround.c1
-rw-r--r--src/object/minecart.c7
-rw-r--r--src/object/object49.c3
-rw-r--r--src/object/treeHidingPortal.c3
-rw-r--r--src/object/windcrest.c3
9 files changed, 23 insertions, 14 deletions
diff --git a/src/object/bird.c b/src/object/bird.c
index 7f4bd844..fcf03eab 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 "save.h"
@@ -96,7 +97,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 0b7e7c0a..56b55984 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"
@@ -58,7 +59,7 @@ void sub_0809F548(Entity* this) {
void sub_0809F5B0(Entity* this) {
if (--this->actionDelay == 0) {
- SoundReq(115);
+ SoundReq(SFX_SECRET_BIG);
SetGlobalFlag(KUMOTATSUMAKI);
LoadRoomEntityList((EntityData*)&gUnk_080DD750);
DeleteThisEntity();
@@ -111,7 +112,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 3ec961eb..87afa483 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"
@@ -216,7 +217,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)) {
@@ -283,7 +284,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) {
@@ -322,7 +323,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) {
@@ -501,7 +502,7 @@ void sub_080873D0(Entity* this) {
void sub_080873FC(void) {
Entity* ent;
- SoundReq(0xf7);
+ SoundReq(SFX_APPARATE);
gRoomControls.cameraTarget = NULL;
while (ent = FindEntityByID(0x6, 0x1b, 0x6), ent != NULL) {
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index 501bb7d7..046eb0aa 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"
@@ -51,7 +52,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 b30b1d33..351b21bd 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 5b347736..af74c357 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"
@@ -84,7 +85,7 @@ void sub_080917DC(Entity* this) {
gPlayerEntity.flags &= 0x7f;
ResetPlayer();
sub_0807A108();
- SoundReq(0x7c);
+ SoundReq(SFX_PLY_JUMP);
}
} else {
this->actionDelay = 0;
@@ -152,7 +153,7 @@ void sub_080919AC(Entity* this) {
}
if (--this->field_0xf == 0xff) {
- SoundReq(0x7b);
+ SoundReq(SFX_PLY_VO7);
this->field_0xf = 0x3c;
}
@@ -181,7 +182,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 b483e25a..82d39bd6 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 "coord.h"
@@ -58,7 +59,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 20833f0f..53f593bb 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"
@@ -60,7 +61,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 d2dc4431..b21c5ee0 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 "save.h"
#include "script.h"
@@ -22,7 +23,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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 17:27:48 +0000