diff --git a/src/common.c b/src/common.c index ef97b516..a7f10150 100644 --- a/src/common.c +++ b/src/common.c @@ -463,7 +463,7 @@ void sub_0801E044(void) { MenuFadeIn(4, 0); gFuseInfo._0 = 4; gFuseInfo.action = 2; - SoundReq(0x6b); + SoundReq(SFX_6B); } } diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index e76ef4f8..612e3af4 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -667,7 +667,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) { this->field_0x76.HALF.HI = 0xff; } if (0 < this->iframes) { - SoundReq(0x127); + SoundReq(SFX_BOSS_HIT); InitScreenShake(0xc, 1); if (this->actionDelay == 0) this->actionDelay = 0x48; diff --git a/src/item/itemShield.c b/src/item/itemShield.c index 445bbece..4da81cbe 100644 --- a/src/item/itemShield.c +++ b/src/item/itemShield.c @@ -1,6 +1,7 @@ #include "global.h" #include "entity.h" #include "item.h" +#include "sound.h" // TODO include correct headers? extern void sub_08077E78(ItemBehavior*, u32); @@ -33,7 +34,7 @@ void sub_08076D34(ItemBehavior* beh, u32 arg1) { beh->stateID++; beh->field_0xf = 0; gPlayerState.field_0xa &= ~(u8)(8 >> arg1); - SoundReq(0x15d); + SoundReq(SFX_15D); } } else { gPlayerState.field_0x3[0] = 0; diff --git a/src/manager/manager10.c b/src/manager/manager10.c index 1ba0150d..f45f2013 100644 --- a/src/manager/manager10.c +++ b/src/manager/manager10.c @@ -69,14 +69,14 @@ void sub_08059608(Manager10* this) { if (gArea.queued_bgm != 0x1E) { gArea.queued_bgm = 0x1E; this->unk_23 = 0x78; - SoundReq(0x800d0000); + SoundReq(SONG_FADE_OUT_BGM); } return; } if (gArea.queued_bgm != 0x37) { gArea.queued_bgm = 0x37; this->unk_23 = 0x78; - SoundReq(0x800d0000); + SoundReq(SONG_FADE_OUT_BGM); } } diff --git a/src/manager/managerF.c b/src/manager/managerF.c index 0a7cec00..93724172 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -109,7 +109,7 @@ void sub_08058EE4(ManagerF* this) { sub_08058F44(0x158, 0x68, this->manager.unk_0b + 2); sub_08058F44(0x128, 0x98, this->manager.unk_0b + 3); sub_08058F44(0x158, 0x98, this->manager.unk_0b + 4); - SoundReq(0x124); + SoundReq(SFX_124); DeleteThisEntity(); } @@ -227,7 +227,7 @@ void sub_08059124(ManagerF* this) { if (!--this->manager.unk_0e) { CreateDustAt(this->unk_38, this->unk_3a, this->manager.unk_0b); sub_0807BA8C(((this->unk_38 >> 4) & 0x3f) | ((this->unk_3a >> 4) & 0x3f) << 6, this->manager.unk_0b); - SoundReq(0xcd); + SoundReq(SFX_TASK_COMPLETE); DeleteThisEntity(); } break; @@ -309,7 +309,7 @@ void sub_080592A4(ManagerF* this) { sub_080592EC(this); sub_0805930C(this); #ifndef EU - SoundReq(0x16E); + SoundReq(SFX_16E); #endif DeleteThisEntity(); } diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index 9762c83c..5ebe073f 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -240,7 +240,7 @@ void sub_08083658(Entity* this) { this->x.HALF.HI += tmp->x; this->y.HALF.HI += tmp->y; RequestPriorityDuration(this, 0x3c); - SoundReq(0x10b); + SoundReq(SFX_10B); } void sub_080836A0(Entity* this) { diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c index 3ed7ed2f..065b9fcc 100644 --- a/src/object/warpPoint.c +++ b/src/object/warpPoint.c @@ -93,7 +93,7 @@ void sub_0808B590(Entity* this) { gPlayerEntity.animationState = 4; gPlayerEntity.flags &= ~0x80; RequestPriorityDuration(this, this->field_0xf + 0x10); - SoundReq(0x113); + SoundReq(SFX_113); } else { this->actionDelay = 0; } @@ -112,7 +112,7 @@ void sub_0808B5E8(Entity* this) { switch (this->field_0xf & 0x60) { case 0x40: if (this->field_0xf == 0x58) { - SoundReq(0x114); + SoundReq(SFX_114); } if (!(this->field_0xf & 1)) { tmp = 1; diff --git a/src/player.c b/src/player.c index 92002cf0..a76b4013 100644 --- a/src/player.c +++ b/src/player.c @@ -1917,7 +1917,7 @@ static void sub_0807246C(Entity* this) { this->subAction = 1; this->actionDelay = gPlayerState.field_0x38; gPlayerState.animation = 0x3c0; - SoundReq(0x7b); + SoundReq(SFX_PLY_VO7); } static void sub_08072490(Entity* this) { @@ -2163,7 +2163,7 @@ static void PlayerInHoleInit(Entity* this) { SetTile(0x4070, COORD_TO_TILE(this), this->collisionLayer); ResetPlayer(); PlayerInHoleUpdate(this); - SoundReq(0x81); + SoundReq(SFX_81); } } @@ -2242,7 +2242,7 @@ static void sub_08072B5C(Entity* this) { this->zVelocity = temp; this->speed = 0x100; gPlayerState.animation = 0x810; - SoundReq(0x7c); + SoundReq(SFX_PLY_JUMP); } static void sub_08072C48(Entity* this) { @@ -2396,7 +2396,7 @@ static NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(En this->actionDelay = 6; this->subAction = 3; this->knockbackDuration = 0; - SoundReq(0x7d); + SoundReq(SFX_PLY_LAND); } } } diff --git a/src/roomInit.c b/src/roomInit.c index f0b1fa5a..e4fd06fa 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -677,7 +677,7 @@ void sub_StateChange_HyruleCastle_4(void) { gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x40; sub_080751E8(0, 6, &script_PlayerWakingUpInHyruleCastle); #ifdef EU - SoundReq(0x80010000); + SoundReq(SONG_STOP_ALL); gArea.bgm = gArea.queued_bgm; } #else diff --git a/src/title.c b/src/title.c index d01e6bef..fcc6e7c6 100644 --- a/src/title.c +++ b/src/title.c @@ -177,11 +177,11 @@ static void HandleNintendoCapcomLogos(void) { if (gUnk_02000010.listenForKeyPresses == 0) { if ((gInput.heldKeys & 0x204) == 0x204) { // TODO gUnk_02000010.field_0x7 = 1; - SoundReq(0x73); + SoundReq(SFX_SECRET_BIG); } else { if ((gInput.heldKeys & 0x104) == 0x104) { // TODO gUnk_02000010.field_0x7 = 2; - SoundReq(0xcd); + SoundReq(SFX_TASK_COMPLETE); } else { gUnk_02000010.field_0x7 = 0; }