falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use sfx sounds enum whereever applicable

This commit is contained in:
Tal Hayon 2022-01-28 13:11:05 +02:00
parent fd9049f598
commit 416a4b1191
54 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/non_matching/playerItem3/sub_0801B4C8.inc
View File

@ -200,4 +200,4 @@ _0801B56C:
bl sub_0801B584
pop {r4, r5, pc}
.syntax divided
.endif
.endif

8
src/collision.c
View File

@ -231,7 +231,7 @@ s32 sub_08017874(Entity* a, Entity* b) {
if (newDmg <= 0)
newDmg = 1;
v5 = ModHealth(-newDmg);
SoundReqClipped(a, 122);
SoundReqClipped(a, SFX_PLY_VO6);
} else {
v6 = b->damage;
if (b->kind == 8) {
@ -247,9 +247,9 @@ s32 sub_08017874(Entity* a, Entity* b) {
v5 = a->health - v6;
if (a->kind == 3) {
if ((a->field_0x6c.HALF.HI & 1) != 0)
SoundReqClipped(a, 295);
SoundReqClipped(a, SFX_BOSS_HIT);
else
SoundReqClipped(a, 254);
SoundReqClipped(a, SFX_HIT);
}
}
if (v5 <= 0) {
@ -749,7 +749,7 @@ s32 sub_08018308(Entity* org, Entity* tgt, u32 direction, ColSettings* settings)
}
} else if (org->id == 3) {
if (settings->_9) {
SoundReqClipped(tgt, 254);
SoundReqClipped(tgt, SFX_HIT);
}
} else if (org->id == 5) {
gPlayerEntity.iframes = 0x80;

2
src/enemy/acroBandits.c
View File

@ -330,7 +330,7 @@ void sub_08031EE8(Entity* this) {
if (this->z.HALF.HI < 1) {
draw = this->spriteSettings.draw;
if (!draw)
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
this->spriteSettings.draw = 1;
}

4
src/enemy/beetle.c
View File

@ -137,7 +137,7 @@ void sub_08021984(Entity* this) {
this->z.HALF.HI = -0x80;
this->spriteRendering.b3 = 1;
this->spriteOrientation.flipY = 1;
EnqueueSFX(0x12d);
EnqueueSFX(SFX_12D);
}
if (GravityUpdate(this, 0x1800) == 0) {
@ -204,7 +204,7 @@ void sub_08021AD8(Entity* this) {
return;
}
this->direction = (u8)tmp;
EnqueueSFX(0x7c);
EnqueueSFX(SFX_PLY_JUMP);
}
sub_080AEFE0(this);
if (!GravityUpdate(this, 0x1800))

2
src/enemy/bladeTrap.c
View File

@ -24,7 +24,7 @@ void BladeTrap(Entity* this) {
if (!(--this->field_0x74.HWORD)) {
if (!(this->direction & 0x80)) {
EnqueueSFX(0x74);
EnqueueSFX(SFX_METAL_CLINK);
}
sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
}

6
src/enemy/bobomb.c
View File

@ -55,7 +55,7 @@ void sub_0802C688(Entity* this) {
switch (this->field_0x82.HALF.LO) {
case 1:
sub_0802CB68(this);
EnqueueSFX(0x14d);
EnqueueSFX(SFX_14D);
break;
case 2:
this->action = 3;
@ -245,7 +245,7 @@ void sub_0802CAF8(Entity* this) {
sub_0802CBC4(this);
} else {
if (this->field_0x80.HALF.HI && sub_080044EC(this, 0x2800) == 1) {
EnqueueSFX(0x104);
EnqueueSFX(SFX_104);
}
sub_0802CC18(this);
sub_08078930(this);
@ -300,7 +300,7 @@ void sub_0802CBC4(Entity* this) {
void sub_0802CC18(Entity* this) {
if (--this->field_0x80.HALF.LO == 0) {
this->field_0x80.HALF.LO = 28;
EnqueueSFX(0x14d);
EnqueueSFX(SFX_14D);
}
}

2
src/enemy/businessScrub.c
View File

@ -65,7 +65,7 @@ void sub_08028934(Entity* this) {
if (pEVar1 != NULL) {
pEVar1->z.HALF.HI -= 8;
}
EnqueueSFX(0x1bb);
EnqueueSFX(SFX_EM_DEKUSCRUB_HIT);
}
}

8
src/enemy/chuchu.c
View File

@ -220,7 +220,7 @@ void sub_0801F1B0(Entity* this) {
if (this->frame & 1) {
this->frame ^= 1;
this->hitType = 90;
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
}
sub_080AEFE0(this);
if (GravityUpdate(this, 0x4000) == 0)
@ -416,7 +416,7 @@ void sub_0801F584(Entity* this) {
if (this->frame & 0x1) {
this->frame ^= 1;
this->hitType = 91;
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
}
sub_080AEFE0(this);
if (GravityUpdate(this, 0x4000) == 0)
@ -564,7 +564,7 @@ void sub_0801F884(Entity* this) {
ent->type2 = 64;
this->action = 4;
this->hitType = 165;
EnqueueSFX(0x193);
EnqueueSFX(SFX_193);
}
}
}
@ -593,7 +593,7 @@ void sub_0801F940(Entity* this) {
if (this->frame & 0x10) {
if (this->frame & 1) {
this->frame ^= 1;
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
}
sub_080AEFE0(this);
if (GravityUpdate(this, 0x4000) == 0)

6
src/enemy/cuccoChickAggr.c
View File

@ -53,7 +53,7 @@ void sub_08022988(Entity* this) {
this->frameIndex = 1;
this->zVelocity = Q_16_16(1.0);
EnqueueSFX(0xd6);
EnqueueSFX(SFX_VO_CHEEP);
}
ProcessMovement(this);
@ -79,7 +79,7 @@ void sub_080229F8(Entity* this) {
sub_08022B44(this);
} else {
this->zVelocity = Q_16_16(1.0);
EnqueueSFX(0xd6);
EnqueueSFX(SFX_VO_CHEEP);
}
}
}
@ -147,7 +147,7 @@ void sub_08022B44(Entity* this) {
if (this->direction & 0xf)
this->spriteSettings.flipX = (this->direction >> 4) ^ 1;
EnqueueSFX(0xd6);
EnqueueSFX(SFX_VO_CHEEP);
}
// clang-format off

16
src/enemy/darkNut.c
View File

@ -97,7 +97,7 @@ void sub_08020BB8(Entity* this) {
}
this->action = 10;
sub_08021218(this, 0xb, this->animationState);
EnqueueSFX(0x15d);
EnqueueSFX(SFX_15D);
sub_08021588(this);
break;
case 0x4c:
@ -280,7 +280,7 @@ void sub_08021038(Entity* this) {
pEVar2->parent = this;
this->child = pEVar2;
}
EnqueueSFX(270);
EnqueueSFX(SFX_10E);
}
if (this->frame & 0x80) {
@ -302,7 +302,7 @@ void sub_080210A8(Entity* this) {
if (this->frame & 1) {
this->frame = 0;
sub_08021588(this);
EnqueueSFX(349);
EnqueueSFX(SFX_15D);
} else if (this->frame & 0x80) {
sub_08021390(this);
}
@ -320,7 +320,7 @@ void sub_080210E4(Entity* this) {
this->child = ent;
}
EnqueueSFX(270);
EnqueueSFX(SFX_10E);
}
sub_08021644(this);
@ -578,13 +578,13 @@ void sub_0802159C(Entity* this) {
ent->parent = this;
this->child = ent;
}
EnqueueSFX(0x116);
EnqueueSFX(SFX_116);
} else if (this->frame == 2) {
this->frame = 0;
sub_08021588(this);
} else if (this->frame & 0x20) {
this->frame &= ~0x20;
EnqueueSFX(0x115);
EnqueueSFX(SFX_115);
}
}
@ -599,7 +599,7 @@ void sub_08021600(Entity* this) {
ent->parent = this;
this->child = ent;
}
EnqueueSFX(0x10e);
EnqueueSFX(SFX_10E);
} else if (this->frame == 2) {
this->frame = 0;
sub_08021588(this);
@ -609,7 +609,7 @@ void sub_08021600(Entity* this) {
void sub_08021644(Entity* this) {
if (this->frame & 0x20) {
this->frame &= ~0x20;
EnqueueSFX(0x7d);
EnqueueSFX(SFX_PLY_LAND);
}
}

2
src/enemy/doorMimic.c
View File

@ -91,7 +91,7 @@ void sub_080220F0(Entity* this) {
fx->y.HALF.HI += off->v;
}
}
EnqueueSFX(260);
EnqueueSFX(SFX_104);
} else if (this->frame & 1) {
this->damage = 4;
}

2
src/enemy/fallingBoulder.c
View File

@ -80,7 +80,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E
GetNextFrame(this);
this->field_0x7c.HALF.HI = COORD_TO_TILE(this);
if (sub_080044EC(this, *(u32*)&this->cutsceneBeh) == 1) {
EnqueueSFX(0x14c);
EnqueueSFX(SFX_14C);
COLLISION_ON(this);
this->field_0x7a.HWORD = 0xc;
sub_0802C4B0(this);

2
src/enemy/gyorgFemaleEye.c
View File

@ -150,7 +150,7 @@ void sub_08048BB0(GyorgFemaleEyeEntity* this) {
super->iframes = 0xF4;
super->hitType = 0x89;
InitializeAnimation(super, (parent->base.animationState >> 6) + 0x14);
SoundReq(0x119);
SoundReq(SFX_ITEM_GLOVES_KNOCKBACK);
}
GetNextFrame(super);
if (super->frame & 0x80) {

2
src/enemy/lakitu.c
View File

@ -318,7 +318,7 @@ void Lakitu_SpawnLightning(Entity* this) {
PositionRelative(this, lightning, Q_16_16(offset->x), Q_16_16(offset->y));
EnqueueSFX(0x193);
EnqueueSFX(SFX_193);
}
void sub_0803CBAC(Entity* this) {

2
src/enemy/lakituCloud.c
View File

@ -64,7 +64,7 @@ void sub_0803CD40(Entity* this) {
ModHealth(-2);
SoundReqClipped(&gPlayerEntity, 122);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
sub_08079D84();
sub_0803CE3C(this);

2
src/enemy/likeLike.c
View File

@ -205,7 +205,7 @@ void sub_0802805C(Entity* this) {
}
if ((this->actionDelay & 3) == 0) {
EnqueueSFX(0x104);
EnqueueSFX(SFX_104);
}
}
}

16
src/enemy/madderpillar.c
View File

@ -61,7 +61,7 @@ void sub_080298A4(Entity* this) {
this->hitType = 0x6b;
this->field_0x76.HALF.HI = 0;
ChangeObjPalette(this, 0x7f);
EnqueueSFX(0xfe);
EnqueueSFX(SFX_HIT);
this->child->action = 2;
break;
}
@ -145,7 +145,7 @@ void sub_08029AA4(Entity* this) {
this->field_0x7a.HWORD = 0x168;
this->field_0x74.HALF.HI = 4;
sub_08029EEC(this);
EnqueueSFX(0x19d);
EnqueueSFX(SFX_19D);
}
}
@ -159,7 +159,7 @@ void sub_08029AE0(Entity* this) {
this->field_0x74.HALF.HI = 0;
sub_08029EEC(this);
ChangeObjPalette(this, 0x77);
EnqueueSFX(0x182);
EnqueueSFX(SFX_182);
}
}
@ -221,7 +221,7 @@ void sub_08029C2C(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 4;
ChangeObjPalette(this, 0x7f);
EnqueueSFX(0x6c);
EnqueueSFX(SFX_MENU_CANCEL);
}
}
@ -275,7 +275,7 @@ void sub_08029D14(Entity* this) {
if (--this->actionDelay == 0) {
InitializeAnimation(this, this->animationState + 0xc);
ChangeObjPalette(this, 0x7f);
EnqueueSFX(0x6c);
EnqueueSFX(SFX_MENU_CANCEL);
}
} else {
GetNextFrame(this);
@ -284,7 +284,7 @@ void sub_08029D14(Entity* this) {
this->actionDelay = 0x78;
this->hitType = 0x6c;
this->hitbox = &gUnk_080FD298;
EnqueueSFX(0x6b);
EnqueueSFX(SFX_6B);
}
}
}
@ -454,7 +454,7 @@ void sub_0802A098(Entity* this) {
if (sub_08029F48(this)) {
sub_08029E0C(this);
sub_08029EEC(this);
EnqueueSFX(0x104);
EnqueueSFX(SFX_104);
}
sub_08029FB4(this, this->x.HALF.HI - uVar1, this->y.HALF.HI - uVar2);
@ -505,7 +505,7 @@ void sub_0802A18C(Entity* this) {
case 0x1e:
break;
default:
EnqueueSFX(0x12e);
EnqueueSFX(SFX_12E);
break;
}
}

2
src/enemy/mazaalBracelet.c
View File

@ -1244,7 +1244,7 @@ void sub_0803B798(void) {
void sub_0803B804(Entity* this) {
gPlayerEntity.iframes = 30;
ModHealth(-4);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
}
void sub_0803B824(Entity* this) {

2
src/enemy/moldworm.c
View File

@ -411,7 +411,7 @@ void sub_08023894(Entity* this) {
gPlayerEntity.animationState = gPlayerEntity.direction >> 2;
gPlayerEntity.iframes = 12;
ModHealth(-0x10);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
}
}
}

2
src/enemy/octorok.c
View File

@ -137,7 +137,7 @@ void Octorok_ShootNut(Entity* this) {
ent->y.HALF.HI += off[1];
ent->z.HALF.HI = -3;
this->frame &= 0xfe;
EnqueueSFX(0x18d);
EnqueueSFX(SFX_18D);
}
}

2
src/enemy/pesto.c
View File

@ -819,7 +819,7 @@ void sub_08024E4C(Entity* this) {
this->field_0x86.HALF.HI++;
player->iframes = 8;
ModHealth(-2);
SoundReqClipped(player, 0x7a);
SoundReqClipped(player, SFX_PLY_VO6);
}
}
}

2
src/enemy/puffstool.c
View File

@ -89,7 +89,7 @@ void sub_08025020(Entity* this) {
ent->spritePriority.b0 = 3;
CopyPosition(this, ent);
}
EnqueueSFX(0x186);
EnqueueSFX(SFX_186);
}
break;
}

2
src/enemy/rollobite.c
View File

@ -190,7 +190,7 @@ void Rollobite_RolledUp(Entity* this) {
sub_08078930(this);
} else {
if (unk == 1)
EnqueueSFX(260);
EnqueueSFX(SFX_104);
if ((this->direction & 0x80) == 0)
sub_080AEFE0(this);

2
src/enemy/rope.c
View File

@ -95,7 +95,7 @@ void sub_08031480(Entity* this) {
this->field_0xf = 0xf;
this->spriteSettings.draw = 1;
UpdateSpriteForCollisionLayer(this);
EnqueueSFX(0x84);
EnqueueSFX(SFX_WATER_SPLASH);
}
}
}

2
src/enemy/rupeeLike.c
View File

@ -71,7 +71,7 @@ void sub_08029318(Entity* this) {
this->field_0x82.HALF.HI = 0x41;
this->flags2 &= 0xfc;
this->field_0x80.HALF.LO = gPlayerEntity.spritePriority.b1;
EnqueueSFX(0x104);
EnqueueSFX(SFX_104);
} else {
if (this->field_0x43 != 0) {
sub_0804A9FC(this, 0x1c);

2
src/enemy/sensorBladeTrap.c
View File

@ -95,7 +95,7 @@ void sub_0802BB10(Entity* this) {
this->action = 3;
this->speed = 0xc0;
this->direction = this->direction ^ 0x10;
EnqueueSFX(0x74);
EnqueueSFX(SFX_METAL_CLINK);
}
bool32 sub_0802BB2C(Entity* this, u32 param_2) {

4
src/enemy/sluggula.c
View File

@ -121,13 +121,13 @@ void sub_08023CE0(Entity* this) {
case 2:
if (this->actionDelay != 0) {
if (--this->actionDelay == 0) {
EnqueueSFX(0x12d);
EnqueueSFX(SFX_12D);
InitializeAnimation(this, 4);
}
} else if (!GravityUpdate(this, Q_8_8(24))) {
this->action = 3;
this->spriteSettings.draw = 1;
EnqueueSFX(0x84);
EnqueueSFX(SFX_WATER_SPLASH);
UpdateSpriteForCollisionLayer(this);
}
break;

4
src/enemy/spearMoblin.c
View File

@ -168,7 +168,7 @@ void sub_08028488(Entity* this) {
this->action = 4;
this->speed = 0x180;
this->direction = sub_08049F84(this, 1);
EnqueueSFX(0x11e);
EnqueueSFX(SFX_EM_MOBLIN_SPEAR);
break;
case 2:
this->action = 2;
@ -225,7 +225,7 @@ void sub_08028528(Entity* this) {
}
if ((this->actionDelay & 7) == 0) {
EnqueueSFX(0xf0);
EnqueueSFX(SFX_F0);
CreateFx(this, FX_DEATH, 0x40);
}

4
src/enemy/spikedBeetle.c
View File

@ -159,7 +159,7 @@ void sub_0802B8B0(Entity* this) {
this->actionDelay = 0x96;
/* fallthrough */
case 1:
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
break;
}
}
@ -175,7 +175,7 @@ void sub_0802B8E0(Entity* this) {
this->speed = 0x60;
this->hitType = 99;
InitializeAnimation(this, this->animationState);
EnqueueSFX(299);
EnqueueSFX(SFX_12B);
}
}

8
src/enemy/spinyChuchu.c
View File

@ -75,7 +75,7 @@ void sub_0802244C(Entity* this) {
if (this->action == 3) {
this->action = 4;
InitializeAnimation(this, 3);
EnqueueSFX(0x194);
EnqueueSFX(SFX_194);
}
}
} else {
@ -138,7 +138,7 @@ void sub_08022654(Entity* this) {
this->subAction = 2;
this->spriteSettings.draw = 1;
InitializeAnimation(this, 5);
EnqueueSFX(0x7d);
EnqueueSFX(SFX_PLY_LAND);
UpdateSpriteForCollisionLayer(this);
/* fallthrough */
case 2:
@ -186,7 +186,7 @@ void sub_08022780(Entity* this) {
if (this->frame & 0x80) {
this->action = 4;
InitializeAnimation(this, 3);
EnqueueSFX(0x194);
EnqueueSFX(SFX_194);
}
}
@ -229,7 +229,7 @@ void sub_08022854(Entity* this) {
this->action = 7;
this->hitType = 0x5c;
InitializeAnimation(this, 5);
EnqueueSFX(0x7d);
EnqueueSFX(SFX_PLY_LAND);
}
}
}

2
src/enemy/wallMaster.c
View File

@ -92,7 +92,7 @@ void sub_0802A5B8(Entity* this) {
sub_0802A7D0(this);
if (this->actionDelay) {
if (--this->actionDelay == 0) {
EnqueueSFX(0x12d);
EnqueueSFX(SFX_12D);
InitializeAnimation(this, 0);
}
} else {

2
src/enemy/waterDrop.c
View File

@ -43,7 +43,7 @@ void sub_0802A2B4(Entity* this) {
if (!GravityUpdate(this, 0x2800)) {
this->action = 2;
this->spritePriority.b0 = 7;
EnqueueSFX(0x84);
EnqueueSFX(SFX_WATER_SPLASH);
} else {
LinearMoveUpdate(this);
}

2
src/manager/managerF.c
View File

@ -379,7 +379,7 @@ void sub_08059424(ManagerF* this) {
tmp->collisionLayer = 2;
tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
EnqueueSFX(0x1B0);
EnqueueSFX(SFX_1B0);
DeleteThisEntity();
}

4
src/npc/carlov.c
View File

@ -12,11 +12,11 @@ void Carlov(Entity* this) {
}
if ((this->frame & 0x10) != 0) {
this->frame = this->frame & 0xef;
EnqueueSFX(0x104);
EnqueueSFX(SFX_104);
InitScreenShake(0x10, 0);
}
if ((this->frame & 0x20) != 0) {
this->frame = this->frame & 0xdf;
EnqueueSFX(0x7c);
EnqueueSFX(SFX_PLY_JUMP);
}
}

2
src/npc/castorWildsStatue.c
View File

@ -103,7 +103,7 @@ void sub_08067534(Entity* this) {
entity->y.HALF.HI += 0x1c;
}
}
EnqueueSFX(0x14c);
EnqueueSFX(SFX_14C);
InitScreenShake(0x28, 4);
}

2
src/object/bakerOven.c
View File

@ -61,7 +61,7 @@ void sub_0809CD0C(Entity* this) {
sub_0806FC80(this, &gPlayerEntity, 4)) {
this->field_0xf++;
ModHealth(-2);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
gPlayerEntity.iframes = 16;
gPlayerEntity.knockbackDirection = 16;
gPlayerEntity.knockbackDuration = 12;

2
src/object/book.c
View File

@ -98,7 +98,7 @@ void sub_0809B4A8(Entity* this) {
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = gPlayerEntity.animationState << 2;
EnqueueSFX(0x10f);
EnqueueSFX(SFX_10F);
} else {
this->actionDelay = 0x16;
}

6
src/object/lightableSwitch.c
View File

@ -48,7 +48,7 @@ void sub_0809EA80(Entity* this) {
} else {
SetFlag(this->field_0x86.HWORD);
}
EnqueueSFX(0x110);
EnqueueSFX(SFX_110);
}
sub_0809EABC(this);
}
@ -121,7 +121,7 @@ void sub_0809EBD8(Entity* this) {
this->actionDelay = 0x10;
this->frameIndex = 2;
SetFlag(this->field_0x86.HWORD);
EnqueueSFX(0x110);
EnqueueSFX(SFX_110);
}
}
@ -135,7 +135,7 @@ void sub_0809EC08(Entity* this) {
this->action = 1;
this->frameIndex = 3;
ClearFlag(this->field_0x86.HWORD);
EnqueueSFX(0x110);
EnqueueSFX(SFX_110);
}
}
}

4
src/object/lockedDoor.c
View File

@ -148,7 +148,7 @@ void sub_080834B4(Entity* this) {
this->action = 2;
this->actionDelay = 7;
SetTile(this->field_0x74.HWORD, this->field_0x76.HWORD, this->collisionLayer);
EnqueueSFX(0x10b);
EnqueueSFX(SFX_10B);
}
}
@ -184,7 +184,7 @@ void sub_08083540(Entity* this) {
}
}
sub_08083814(this, this->field_0x7c.BYTES.byte2);
EnqueueSFX(0x10b);
EnqueueSFX(SFX_10B);
}
}

2
src/object/mask.c
View File

@ -97,7 +97,7 @@ void sub_08092B0C(Entity* this) {
this->actionDelay = 0;
switch (this->type2 & 0xC0) {
case 0x80:
EnqueueSFX(0x72);
EnqueueSFX(SFX_SECRET);
case 0x40:
SetFlag(this->field_0x86.HWORD);
break;

2
src/object/metalDoor.c
View File

@ -67,7 +67,7 @@ void sub_080A074C(Entity* this) {
ent->x.HALF.HI -= 0xc;
ent->y.HALF.HI -= 0xc;
}
EnqueueSFX(0x10b);
EnqueueSFX(SFX_10B);
}
}

2
src/object/object2A.c
View File

@ -36,5 +36,5 @@ void sub_08089B18(Entity* this) {
return;
}
}
EnqueueSFX(0x124);
EnqueueSFX(SFX_124);
}

4
src/object/object6A.c
View File

@ -344,7 +344,7 @@ void sub_08094E30(Object6AEntity* this) {
super->z.WORD = 0;
super->zVelocity = 0;
InitializeAnimation(super, 1);
EnqueueSFX(382);
EnqueueSFX(SFX_LAVA_TILE_FLIP);
}
break;
case 2:
@ -871,7 +871,7 @@ void sub_08095954(Object6AEntity* this) {
PositionRelative(super, e, x, y);
e->z.HALF.HI = -3;
((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08012C48);
EnqueueSFX(292);
EnqueueSFX(SFX_124);
super->frame &= ~1;
} else {
gActiveScriptInfo.syncFlags |= 0x100;

2
src/object/pot.c
View File

@ -89,7 +89,7 @@ void sub_08082310(Entity* this) {
this->actionDelay = 64;
}
SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);
EnqueueSFX(0x10F);
EnqueueSFX(SFX_10F);
break;
case 0x4067:
SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);

6
src/object/railtrack.c
View File

@ -55,7 +55,7 @@ void sub_08085264(Entity* this) {
this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
InitializeAnimation(this, this->animationState);
sub_0808543C(this);
EnqueueSFX(0x151);
EnqueueSFX(SFX_151);
}
}
@ -67,7 +67,7 @@ void sub_080852B4(Entity* this) {
this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
InitializeAnimation(this, this->animationState);
sub_08085394(this);
EnqueueSFX(0x151);
EnqueueSFX(SFX_151);
}
}
@ -97,7 +97,7 @@ void sub_08085308(Entity* this) {
this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
InitializeAnimation(this, this->animationState);
sub_0808543C(this);
EnqueueSFX(0x151);
EnqueueSFX(SFX_151);
}
}
}

4
src/object/warpPoint.c
View File

@ -56,7 +56,7 @@ void sub_0808B474(Entity* this) {
gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
gPlayerEntity.y.HALF.HI = this->y.HALF.HI;
gPlayerEntity.animationState = 4;
EnqueueSFX(0x112);
EnqueueSFX(SFX_112);
RequestPriorityDuration(this, this->field_0xf + 0x10);
}
@ -68,7 +68,7 @@ void sub_0808B530(Entity* this) {
}
this->action = 2;
this->field_0xf = 60;
EnqueueSFX(0x112);
EnqueueSFX(SFX_112);
}
}

2
src/playerItem/playerItem3.c
View File

@ -23,7 +23,7 @@ void PlayerItem3(Entity* this) {
this->field_0xf--;
if ((this->field_0xf & 0xf) == 0) {
EnqueueSFX(0xfb);
EnqueueSFX(SFX_FB);
}
}

2
src/projectile/arrowProjectile.c
View File

@ -73,7 +73,7 @@ void ArrowProjectile_Action2(Entity* this) {
COLLISION_OFF(this);
this->actionDelay = 0x20;
InitializeAnimation(this, this->animIndex + 2);
EnqueueSFX(0x18a);
EnqueueSFX(SFX_18A);
LinearMoveUpdate(this);
} else if (--this->actionDelay == 0) {
DeleteThisEntity();

2
src/projectile/dirtBallProjectile.c
View File

@ -145,7 +145,7 @@ void DirtBallProjectile_Action2(Entity* this) {
switch (this->type) {
case 0:
InitializeAnimation(this, 1);
EnqueueSFX(0x84);
EnqueueSFX(SFX_WATER_SPLASH);
this->action = 3;
return;
case 2:

2
src/projectile/lakituCloudProjectile.c
View File

@ -42,7 +42,7 @@ void LakituCloudProjectile_SubAction2(Entity* this) {
if (sub_0806F3E4(this) != 0) {
if (this->hitType == 0xa6) {
ModHealth(-2);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
sub_08079D84();
}
CreateFx(this, FX_DEATH, 0);

2
src/projectile/mandiblesProjectile.c
View File

@ -171,7 +171,7 @@ void MandiblesProjectile_Action4(Entity* this) {
if (entity->health == 0) {
DeleteThisEntity();
}
EnqueueSFX(0xf2);
EnqueueSFX(SFX_F2);
this->action = 1;
this->animationState = 0xff;
this->field_0x82.HALF.LO = 0;

2
src/projectile/spiderWeb.c
View File

@ -149,7 +149,7 @@ void SpiderWeb_SubAction0(Entity* this) {
if ((this->frame & 1) != 0) {
entity->x.HALF.HI = gUnk_0812A06C[entity->animationState] + entity->x.HALF.HI;
entity->y.HALF.HI = gUnk_0812A06C[entity->animationState + 1] + entity->y.HALF.HI;
EnqueueSFX(0x100);
EnqueueSFX(SFX_100);
}
}
}

2
src/projectile/v1DarkMagicProjectile.c
View File

@ -203,7 +203,7 @@ void sub_080AAF74(Entity* this) {
this->actionDelay = 0x1e;
gPlayerEntity.iframes = 8;
ModHealth(-4);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
if (gPlayerEntity.health == 0) {
this->health = 0;
}

2
src/projectile/v2Projectile.c
View File

@ -84,7 +84,7 @@ void nullsub_542(Entity* this) {
void sub_080ABC90(Entity* this) {
if (sub_0806F3E4(this) != 0) {
ModHealth(-2);
SoundReqClipped(&gPlayerEntity, 0x7a);
SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
sub_08079D84();
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();