Various documentations

5 files changed, 12 insertions, 12 deletions

diff --git a/src/manager/delayedEntityLoadManager.c b/src/manager/delayedEntityLoadManager.c
index f113330a..de9a8390 100644
--- a/src/manager/delayedEntityLoadManager.c
+++ b/src/manager/delayedEntityLoadManager.c
@@ -36,7 +36,7 @@ void DelayedEntityLoadManager_Main(DelayedEntityLoadManager* this) {
     }
     if (super->action == 0) {
         super->action++;
-        this->unk_20 = gArea.filler[2];
+        this->unk_20 = gArea.filler[1];
         SetDefaultPriority((Entity*)this, 6);
         npcPtr = gNPCData;
         npcPtr += (super->type2 + this->unk_20);
diff --git a/src/manager/fightManager.c b/src/manager/fightManager.c
index 3459bbd8..1ac77f67 100644
--- a/src/manager/fightManager.c
+++ b/src/manager/fightManager.c
@@ -65,8 +65,8 @@ void FightManager_WaitForFlag(FightManager* this) {
     if (CheckFlags(this->fightStartFlag)) {
         FightManager_LoadFight(this);
         if (!this->unk_35) {
-            tmp = gRoomVars.field_0x9 ? gRoomVars.field_0x9 : 0x33;
-            this->unk_20 = gArea.bgm;
+            tmp = gRoomVars.fight_bgm ? gRoomVars.fight_bgm : BGM_FIGHT_THEME2;
+            this->prevBgm = gArea.bgm;
             gArea.bgm = tmp;
             SoundReq(tmp);
         }
@@ -84,7 +84,7 @@ void FightManager_WaitForDone(FightManager* this) {
     // restore music (if it was set, which apparently is only possible if there's a flag the fight waited for)
     if (this->fightStartFlag) {
         if (!this->unk_35) {
-            gArea.bgm = this->unk_20;
+            gArea.bgm = this->prevBgm;
             SoundReq(gArea.bgm);
             sub_0801855C();
         }
@@ -138,7 +138,7 @@ FightManagerHelper* FightManager_CreateHelper(FightManager* this) {
         extra->base.type = 1;
         extra->base.parent = (Entity*)this;
         super->timer++;
-        MemClear(&extra->enemies, 0x20);
+        MemClear(&extra->enemies, sizeof(extra->enemies));
         AppendEntityToList((Entity*)extra, 8);
     }
     return extra;
diff --git a/src/manager/hyruleTownBellManager.c b/src/manager/hyruleTownBellManager.c
index bc8eb795..c22442dc 100644
--- a/src/manager/hyruleTownBellManager.c
+++ b/src/manager/hyruleTownBellManager.c
@@ -28,7 +28,7 @@ void HyruleTownBellManager_Main(HyruleTownBellManager* this) {
             if (object != NULL) {
                 object->x.HALF.HI = roomControls->origin_x + 0x1f8;
                 object->y.HALF.HI = roomControls->origin_y + 0x140;
-                object->z.HALF.HI = 0xffe8;
+                object->z.HALF.HI = -24;
             }
             DeleteThisEntity();
         }
diff --git a/src/manager/vaati3StartManager.c b/src/manager/vaati3StartManager.c
index 9f727808..f088d9a4 100644
--- a/src/manager/vaati3StartManager.c
+++ b/src/manager/vaati3StartManager.c
@@ -140,7 +140,7 @@ void Vaati3StartManager_Type1_Init(Vaati3StartManager* this) {
         super->child = enemy;
         super->action = 1;
         SetPlayerControl(3);
-        gArea.queued_bgm = 0x80010000;
+        gArea.queued_bgm = SONG_STOP_ALL;
         SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 4);
         SoundReq(SFX_APPARATE);
     }
diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c
index c6c0c3d1..b74edcc2 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -70,15 +70,15 @@ void sub_08059608(WeatherChangeManager* this) {
         return;
     }
     if (sub_0805986C()) {
-        if (gArea.queued_bgm != 0x1E) {
-            gArea.queued_bgm = 0x1E;
+        if (gArea.queued_bgm != BGM_CRENEL_STORM) {
+            gArea.queued_bgm = BGM_CRENEL_STORM;
             this->unk_23 = 0x78;
             SoundReq(SONG_FADE_OUT_BGM);
         }
         return;
     }
-    if (gArea.queued_bgm != 0x37) {
-        gArea.queued_bgm = 0x37;
+    if (gArea.queued_bgm != BGM_MT_CRENEL) {
+        gArea.queued_bgm = BGM_MT_CRENEL;
         this->unk_23 = 0x78;
         SoundReq(SONG_FADE_OUT_BGM);
     }
@@ -214,6 +214,6 @@ void sub_08059960(const u16* unk1, const u16* unk2, u16* unk3, u8 unk4) {
 void sub_08059994(void) {
     if (sub_0805986C()) {
         LoadPaletteGroup(0x5B);
-        gArea.queued_bgm = 0x1E;
+        gArea.queued_bgm = BGM_CRENEL_STORM;
     }
 }