merge changes

src/object/bird.c

@@ -34,7 +34,7 @@ void sub_0809CF54(Entity* this) {
     this->direction = 8;
     this->collisionLayer = 2;
     this->x.HALF.HI = gRoomControls.roomScrollX;
-    SoundReq(0x123);
+    SoundReq(SFX_123);
     UpdateSpriteForCollisionLayer(this);
     InitAnimationForceUpdate(this, 0);
     target = CreateObject(0x95, 1, 0);

src/object/button.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "room.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*const gUnk_0811EE38[])(Entity*);
@@ -94,7 +95,7 @@ void sub_08081C30(Entity* this) {
         this->action = 2;
         ClearFlag(this->field_0x86.HWORD);
         SetTileType(0x77, this->field_0x74.HWORD, this->collisionLayer);
-        SoundReq(0x10C);
+        SoundReq(SFX_10C);
     }
 }
 
@@ -260,7 +261,7 @@ u32 sub_08081F7C(Entity* this, u32 r7) {
             SetFlag(this->field_0x86.HWORD);
             SetTileType(r7, this->field_0x74.HWORD, this->collisionLayer);
             sub_08081F24(this);
-            SoundReq(0x10C);
+            SoundReq(SFX_10C);
             if (this->field_0x70.HALF_U.LO != 0xFFFF)
                 SetTile(this->field_0x70.HALF_U.LO, this->field_0x74.HWORD, this->collisionLayer);
             return 0;

src/object/cloud.c

@@ -46,7 +46,7 @@ void sub_0809F548(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 2;
         this->actionDelay = 90;
-        SoundReq(285);
+        SoundReq(SFX_11D);
         sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) |
                      (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6);
     } else {
@@ -94,7 +94,7 @@ void sub_0809F61C(Entity* this) {
         if (--this->actionDelay == 0) {
             this->action = 3;
             this->actionDelay = 120;
-            SoundReq(285);
+            SoundReq(SFX_11D);
             sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) |
                          (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6);
         } else {
@@ -178,7 +178,7 @@ void sub_0809F7BC(Entity* this) {
 void sub_0809F7F4(Entity* this) {
     if (--this->field_0x68.HALF.LO == 0) {
         this->field_0x68.HALF.LO = 12;
-        SoundReq(388);
+        SoundReq(SFX_184);
     }
 }
 

src/object/greatFairy.c

@@ -105,7 +105,7 @@ void GreatFairy_SpawningUpdate(Entity* this) {
         if (mini != NULL) {
             CopyPosition(this, mini);
             DoFade(6, 4);
-            SoundReq(325);
+            SoundReq(SFX_145);
             this->action = 4;
             this->actionDelay = 60;
             this->spriteSettings.b.draw = 1;

src/object/houseDoorExterior.c

@@ -1,9 +1,10 @@
 #include "global.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "room.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 typedef struct {
     /*0x00*/ u16 unk0;
@@ -111,7 +112,7 @@ void sub_0808681C(Entity* this) {
                 this->action++;
                 this->frameIndex = 1;
                 sub_08078AC0(16, 0, 1);
-                SoundReq(0x111);
+                SoundReq(SFX_111);
             }
             break;
     }

src/object/itemOnGround.c

@@ -182,7 +182,7 @@ static void sub_08081150(Entity* this) {
     this->height.HALF.HI = -0x80;
     this->spriteOrientation.flipY = 1;
     this->spriteRendering.b3 = 1;
-    SoundReq(0x12D);
+    SoundReq(SFX_12D);
 }
 
 static void sub_08081188(Entity* this) {
@@ -206,7 +206,7 @@ void sub_080811C8(Entity* this) {
 
 void sub_080811D8(Entity* this) {
     sub_08081188(this);
-    SoundReq(0x215);
+    SoundReq(SFX_215);
 }
 
 void sub_080811EC(Entity* this) {

src/object/jailBars.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "room.h"
-#include "functions.h"
+#include "audio.h"
 
 extern void sub_080A0960(Entity*, u32);
 extern void sub_0801AF18(u8*, u32, u32);
@@ -33,7 +33,7 @@ void sub_080A0910(Entity* this) {
     if (CheckFlags(this->field_0x86.HWORD) != 0) {
         this->action = 2;
         sub_080A0960(this, 1);
-        SoundReq(0x10b);
+        SoundReq(SFX_10B);
     }
 }
 

src/object/metalDoor.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "room.h"
 #include "flags.h"
+#include "audio.h"
 #include "functions.h"
 
 extern u32 sub_08083734(Entity*, u32);
@@ -76,7 +77,7 @@ void sub_080A07BC(Entity* this) {
         this->direction = 0x10;
         this->y.HALF.HI += 2;
         sub_080A0870(this);
-        SoundReq(0x10b);
+        SoundReq(SFX_10B);
     }
 }
 

src/object/minecart.c

@@ -63,7 +63,7 @@ void sub_080917DC(Entity* this) {
         this->field_0x20 = 0x2a000;
         this->action = 7;
         InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState);
-        SoundReq(0x13b);
+        SoundReq(SFX_13B);
     } else {
         if (sub_0800445C(this) != 0) {
             if (((gPlayerState.flags.all & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) &&
@@ -113,7 +113,7 @@ void sub_080918A4(Entity* this) {
             this->field_0x44 = 8;
             sub_0801766C(this);
             sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer);
-            SoundReq(0x137);
+            SoundReq(SFX_137);
         }
     } else {
         gPlayerEntity.direction = GetFacingDirection(&gPlayerEntity, this);
@@ -149,7 +149,7 @@ void sub_080919AC(Entity* this) {
         gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1;
         if (!sub_08091DDC(this)) {
             if ((gScreenTransition.frameCount & 0xf) == 0) {
-                SoundReq(0x138);
+                SoundReq(SFX_138);
             }
 
             if (--this->field_0xf == 0xff) {
@@ -183,7 +183,7 @@ void sub_080919AC(Entity* this) {
                         sub_08004168(this);
                         InitAnimationForceUpdate(this, this->animationState + 0xc);
                         SoundReq(SFX_PLY_VO4);
-                        SoundReq(0x139);
+                        SoundReq(SFX_139);
                         return;
                     case 0x67:
                     case 0x68:

src/object/object49.c

@@ -218,7 +218,7 @@ void sub_0808F498(Entity* this) {
     if (this->action != 0) {
         if (sub_0806F3E4(this)) {
             if (gScreenTransition.frameCount % 16 == 0) {
-                SoundReq(0xEF);
+                SoundReq(SFX_EF);
             }
             DeleteThisEntity();
         }

src/object/objectA2.c

@@ -2,6 +2,7 @@
 #include "object.h"
 #include "menu.h"
 #include "random.h"
+#include "audio.h"
 #include "structures.h"
 #include "functions.h"
 
@@ -48,7 +49,7 @@ void sub_0809F374(Entity* this) {
             this->height.WORD = 0;
             this->action = 2;
             InitializeAnimation(this, 1);
-            SoundReq(0x186);
+            SoundReq(SFX_186);
         } else {
             this->actionDelay++;
         }
@@ -64,7 +65,7 @@ void sub_0809F374(Entity* this) {
             case 1:
                 this->actionDelay = 0;
                 sub_0809F448(this);
-                SoundReq(0x186);
+                SoundReq(SFX_186);
         }
     }
 }

src/object/thoughtBubble.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "entity.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*const ThoughtBubble_Behaviors[])(Entity*);