Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 13:09:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

More sfxIDs (#1665)

Browse Source
This commit is contained in:
SynaMax 2024-09-24 12:45:53 -04:00 committed by GitHub
parent 3ae3f75767
commit 715caabee9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/sfx.h
View File

@ -193,11 +193,6 @@ enum SfxModes {
#define JP_VO_SH_SONO_TEIDO 0x530 // Shaft: Sono teido no chikara de tatakai...
#endif
#define NA_SE_EN_SLOGRA_SPEAR_SLASH 0x6C6
#define NA_SE_EN_SLOGRA_BEAK_ATTACK 0x6C8
#define NA_SE_EN_SKELETON_THROW_BONE 0x6C8
#define NA_SE_EN_BLOOD_SKELETON_DISASSEMBLES 0x6CB
#define NA_SE_EN_BLOOD_SKELETON_REASSEMBLES 0x6CC
#define SFX_UNK_6DF 0x6DF
#define SFX_UNK_6E0 0x6E0
#define NA_SE_PL_RIC_UNK_6E2 0x6E2
@ -248,7 +243,6 @@ enum SfxModes {
#define BIBLE_SUBWPN_SWOOSH 0x8C3
// STAGE DRE
#define NA_SE_SU_FLAPPING_WINGS 0x6C6
#define NA_SE_SU_CREATE_CLONES 0x6D5
#define NA_SE_SU_CHARGE_PINKBALLS 0x6E2
#define NA_VO_SU_LAUGH 0x86E
@ -480,7 +474,7 @@ enum Sfx {
SFX_SEED_SPIT,
SFX_CANNON_EXPLODE,
SFX_UI_ALERT_TINK,
SFX_FROZEN_SHARD_APPEAR,
SFX_TINK_JINGLE, // Frozen Shade Shards, NO1 Telescope jingle
SFX_GUARD_TINK,
SFX_GLASS_SHARDS, // 0x6B0 (Succubus, Frozen Shade, Shamen Shield)
SFX_TRANSFORM_3X, // Karma Coin and shields
@ -493,6 +487,24 @@ enum Sfx {
SFX_UNK_LOW_CLOCK_TICK,
SFX_UNK_METAL_TING,
SFX_FAST_SWORD_SWISHES, // Sword of Dawn
SFX_GRANDFATHER_CLOCK_TICK,
SFX_MULTI_CLOCK_TICK,
SFX_QUIET_STEPS,
SFX_BLIPS_A,
SFX_UNK_BLIPS_B,
SFX_BLIPS_C,
SFX_BLIPS_D, // Fleaman movement
SFX_CAT_MULTI_EXPLODE,
SFX_SWISHES_ECHO_REPEAT,
SFX_RCAT_DISSONANT_DINK,
SFX_MAGIC_NOISE_SWEEP,
SFX_BOSS_WING_FLAP,
SFX_WHIP_TWIRL_SWISH,
SFX_BONE_THROW,
SFX_CREAK,
SFX_LOW_SKEL_EXPLODE,
SFX_RED_SKEL_COLLAPSE,
SFX_RED_SKEL_REBUILD,
};
#endif

9
src/boss/mar/17FEC.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include <stage.h>
#include "mar.h"
#include "sfx.h"
void EntityClockRoomController(Entity* self) {
PlayerStatus* status = &g_Status;
@ -235,7 +236,7 @@ void EntityBirdcageDoor(Entity* self) {
self->ext.birdcage.timer = 64;
self->ext.birdcage.prevState = self->ext.birdcage.state;
self->step++;
g_api.PlaySfx(0x608);
g_api.PlaySfx(SFX_STONE_MOVE_B);
}
break;
@ -246,7 +247,7 @@ void EntityBirdcageDoor(Entity* self) {
self->ext.birdcage.timer = 64;
self->zPriority = 0;
self->step++;
g_api.PlaySfx(0x608);
g_api.PlaySfx(SFX_STONE_MOVE_B);
}
break;
@ -258,7 +259,7 @@ void EntityBirdcageDoor(Entity* self) {
self->posX.i.hi -= 8;
self->posY.i.hi += 8;
self->step++;
g_api.PlaySfx(0x608);
g_api.PlaySfx(SFX_STONE_MOVE_B);
}
break;
@ -268,7 +269,7 @@ void EntityBirdcageDoor(Entity* self) {
self->ext.birdcage.timer = 64;
self->zPriority = 0x3C;
self->step++;
g_api.PlaySfx(0x608);
g_api.PlaySfx(SFX_STONE_MOVE_B);
}
break;

6
src/st/dre/succubus.c
View File

@ -318,7 +318,7 @@ void EntitySuccubus(Entity* self) {
AnimateEntity(D_801806C4, self);
if ((self->animFrameIdx == 3) && (self->animFrameDuration == 0)) {
PlaySfxPositional(NA_SE_SU_FLAPPING_WINGS);
PlaySfxPositional(SFX_BOSS_WING_FLAP);
}
posY = self->posY.i.hi - self->ext.succubus.yOffset;
@ -357,7 +357,7 @@ void EntitySuccubus(Entity* self) {
case SUCCUBUS_FLY_1:
AnimateEntity(D_801806E8, self);
if ((self->animFrameIdx == 3) && (self->animFrameDuration == 0)) {
PlaySfxPositional(NA_SE_SU_FLAPPING_WINGS);
PlaySfxPositional(SFX_BOSS_WING_FLAP);
}
MoveEntity();
@ -449,7 +449,7 @@ void EntitySuccubus(Entity* self) {
}
AnimateEntity(D_801806E8, self);
if ((self->animFrameIdx == 3) && (self->animFrameDuration == 0)) {
PlaySfxPositional(NA_SE_SU_FLAPPING_WINGS);
PlaySfxPositional(SFX_BOSS_WING_FLAP);
}
MoveEntity();
if (--self->ext.succubus.timer == 0) {

6
src/st/np3/4B018.c
View File

@ -678,7 +678,7 @@ void EntityOwlKnight(Entity* self) {
self->velocityX = 0;
}
if (self->animFrameDuration == 0 && self->animFrameIdx == 7) {
PlaySfxPositional(0x6C7);
PlaySfxPositional(SFX_WHIP_TWIRL_SWISH);
PlaySfxPositional(SFX_SCRAPE_B);
self->velocityX = FIX(-3);
if (self->ext.owl.unk80 & 0x10) {
@ -702,7 +702,7 @@ void EntityOwlKnight(Entity* self) {
self->velocityX = 0;
}
if (self->animFrameDuration == 0 && self->animFrameIdx == 5) {
PlaySfxPositional(0x6C7);
PlaySfxPositional(SFX_WHIP_TWIRL_SWISH);
PlaySfxPositional(0x793);
self->velocityX = FIX(-6.0);
if (self->facingLeft) {
@ -959,7 +959,7 @@ void EntityOwlKnight(Entity* self) {
self->velocityX = 0;
}
if (self->animFrameDuration == 0 && self->animFrameIdx == 5) {
PlaySfxPositional(0x6C7);
PlaySfxPositional(SFX_WHIP_TWIRL_SWISH);
PlaySfxPositional(0x793);
self->velocityX = FIX(-8.0);
if (self->facingLeft) {

4
src/st/np3/slogra.c
View File

@ -174,7 +174,7 @@ void EntitySlogra(Entity* self) {
SetStep(SLOGRA_WALKING_WITH_SPEAR);
}
if (self->animFrameIdx == 4 && self->animFrameDuration == 0) {
PlaySfxPositional(NA_SE_EN_SLOGRA_SPEAR_SLASH);
PlaySfxPositional(SFX_BOSS_WING_FLAP);
}
break;
@ -297,7 +297,7 @@ void EntitySlogra(Entity* self) {
SetStep(SLOGRA_WALKING_WITHOUT_SPEAR);
}
if (self->animFrameIdx == 7 && self->animFrameDuration == 0) {
PlaySfxPositional(NA_SE_EN_SLOGRA_BEAK_ATTACK);
PlaySfxPositional(SFX_BONE_THROW);
}
break;

5
src/st/nz0/e_bloody_skeleton.c
View File

@ -5,6 +5,7 @@
*/
#include "nz0.h"
#include "sfx.h"
typedef enum {
BLOOD_SKELETON_INIT,
@ -18,7 +19,7 @@ void EntityBloodSkeleton(Entity* self) {
u8* animation;
if ((self->flags & FLAG_DEAD) && (self->step < 3)) {
PlaySfxPositional(NA_SE_EN_BLOOD_SKELETON_DISASSEMBLES);
PlaySfxPositional(SFX_RED_SKEL_COLLAPSE);
self->hitboxState = 0;
SetStep(BLOOD_SKELETON_DISASSEMBLE);
}
@ -77,7 +78,7 @@ void EntityBloodSkeleton(Entity* self) {
if (--self->ext.generic.unk80.modeS16.unk0 == 0) {
self->rotZ = 0;
self->drawFlags |= FLAG_DRAW_ROTZ;
PlaySfxPositional(NA_SE_EN_BLOOD_SKELETON_REASSEMBLES);
PlaySfxPositional(SFX_RED_SKEL_REBUILD);
self->step_s++;
return;
}

2
src/st/nz0/e_skeleton.c
View File

@ -132,7 +132,7 @@ void EntitySkeleton(Entity* self) {
((u16)self->posY.i.hi <= 240)) {
newEntity = AllocEntity(g_Entities + 160, g_Entities + 192);
if (newEntity != NULL) { // Spawn bone
PlaySfxPositional(NA_SE_EN_SKELETON_THROW_BONE);
PlaySfxPositional(SFX_BONE_THROW);
CreateEntityFromCurrentEntity(
E_SKELETON_THROWN_BONE, newEntity);
if (self->facingLeft) {

4
src/st/nz0/slogra.c
View File

@ -205,7 +205,7 @@ void EntitySlogra(Entity* self) {
SetStep(SLOGRA_WALKING_WITH_SPEAR);
}
if (self->animFrameIdx == 4 && self->animFrameDuration == 0) {
PlaySfxPositional(NA_SE_EN_SLOGRA_SPEAR_SLASH);
PlaySfxPositional(SFX_BOSS_WING_FLAP);
}
break;
@ -349,7 +349,7 @@ void EntitySlogra(Entity* self) {
SetStep(SLOGRA_WALKING_WITHOUT_SPEAR);
}
if (self->animFrameIdx == 7 && self->animFrameDuration == 0) {
PlaySfxPositional(NA_SE_EN_SLOGRA_BEAK_ATTACK);
PlaySfxPositional(SFX_BONE_THROW);
}
break;

2
src/weapon/w_016.c
View File

@ -178,7 +178,7 @@ void func_ptr_80170008(Entity* self) {
self->hitboxWidth = 0xC;
g_api.PlaySfx(SFX_THROW_WEAPON_SWISHES);
if (flag != 0) {
g_api.PlaySfx(0x65B);
g_api.PlaySfx(SFX_FM_EXPLODE_B);
}
g_Player.timers[10] = 4;
self->step++;