Merge pull request #324 from hatal175/SFXEverywhere

src/object/bakerOven.c

@@ -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;

src/object/book.c

@@ -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;
     }

src/object/lightableSwitch.c

@@ -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);
         }
     }
 }

src/object/lockedDoor.c

@@ -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);
     }
 }
 

src/object/mask.c

@@ -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;

src/object/metalDoor.c

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

src/object/object6A.c

@@ -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;

src/object/pot.c

@@ -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);

src/object/railtrack.c

@@ -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);
         }
     }
 }

src/object/warpPoint.c

@@ -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);
     }
 }