Merge pull request #60 from Ibot02:master

manager4.c and managerE.c: ok

src/manager/manager4.c

@@ -0,0 +1,132 @@
+#include "global.h"
+#include "player.h"
+#include "room.h"
+#include "manager.h"
+#include "structures.h"
+
+extern void (*gUnk_08107C70[])(Manager*);
+
+void sub_08057854(Manager* this) {
+	    gUnk_08107C70[this->unk_0c](this);
+}
+
+extern void sub_080805F8(void);
+
+extern void SetTile(u32, u32, u32);
+
+extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
+
+void sub_0805786C(Manager* this) {
+    DiggingCaveEntrance* tmp;
+    u8 roomID;
+    u8 areaID;
+    u16 uVar = 0x81<<7;
+    sub_080805F8();
+    if (gUnk_03004030.unk_08 != 0) {
+        if (gUnk_03004030.unk_00 == 0) {
+            gUnk_03004030.unk_0a = 0xFF;
+            roomID = gRoomControls.roomID;
+            tmp = gUnk_08107DC0[gRoomControls.areaID];
+            tmp = sub_08057AA8(tmp, roomID);
+            if (tmp != 0) {
+                roomID = tmp->target_roomID;
+                tmp = gUnk_08107DC0[tmp->target_areaID];
+                tmp = sub_08057AA8(tmp, roomID);
+                if (tmp != 0) {
+                    gUnk_03004030.unk_00 = tmp;
+                }
+            }
+        }
+        roomID = gRoomControls.roomID;
+        tmp = gUnk_08107DC0[gRoomControls.areaID];
+        uVar = 0x81<<7;
+        for (tmp = sub_08057AA8(tmp, roomID); tmp != 0; tmp = sub_08057AA8(tmp, roomID)){
+            SetTile(uVar, tmp->unk_00 + 0x3F, 1);
+            SetTile(uVar, tmp->unk_00 + 0x40, 1);
+            SetTile(uVar, tmp->unk_00 + 0x41, 1);
+            tmp++;
+        }
+    }
+    this->unk_0c = 1;
+}
+
+extern u32 sub_0805795C(Manager*, DiggingCaveEntrance*);
+
+void sub_08057920(Manager* this) {
+    DiggingCaveEntrance* tmp;
+    u8 roomID;
+    roomID = gRoomControls.roomID;
+    for (tmp = gUnk_08107DC0[gRoomControls.areaID];(tmp = sub_08057AA8(tmp, roomID)) != 0 && !sub_0805795C(this, tmp);tmp++);
+}
+
+void sub_08057A18(Manager*, DiggingCaveEntrance*);
+
+#ifdef NON_MATCHING
+u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
+    u16 offsetX, offsetY, offsetX2, offsetY2;
+    u32 tmp;
+    if (gUnk_03004030.unk_08) {
+        offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX;
+        offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+        offsetX2 = (entr->unk_00 & 0x3F) * 16 + 8;
+        offsetY2 = ((entr->unk_00 & 0xFC0)>> 6) * 16 + 0x18;
+        if ((u32)(offsetX - offsetX2) + 0x18 > 0x30) return 0;
+        if (
+            (u32)(offsetY - offsetY2) + 8 > 0x10) return 0;
+        if (
+            ((offsetY < offsetY2)))
+            if (
+                (u32)(offsetX - offsetX2) + 0xC <= 0x18) return 0;
+        
+    } else {
+        //offsetX = ((gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3F;
+        //offsetY = ((gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3F;
+        //tmp = offsetX | (offsetY << 6);
+        tmp = COORD_TO_TILE((&gPlayerEntity));
+        if (tmp != entr->unk_00) return 0;
+        offsetY = gRoomControls.roomOriginY + ((tmp>>6) * 16) + 6;
+        if (gPlayerEntity.y.HALF.HI >= offsetY) return 0;
+    }
+    sub_08057A18(this, entr);
+    return 1;
+}
+#else
+NAKED
+u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
+    asm(".include \"asm/non_matching/manager4/sub_0805795C.inc\"");
+}
+#endif
+
+extern void sub_0805E5A8(void);
+extern void sub_0805E900(Manager*);
+extern void sub_08080930();
+
+void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
+    u16 tmp;
+    sub_0805E5A8();
+    gUnk_03004030.unk_0a = gUnk_03004030.unk_09;
+    gUnk_03004030.unk_09 = gRoomControls.areaID;
+    gScreenTransition.areaID = entr->target_areaID;
+    gScreenTransition.roomID = entr->target_roomID;
+    gRoomControls.areaID = entr->target_areaID;
+    gRoomControls.roomID = entr->target_roomID;
+    gUnk_03004030.unk_00 = entr;
+    gUnk_03004030.unk_04 = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX - ((entr->unk_00 & 0x3F)*16);
+    gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY - ((entr->unk_00 & 0xFC0) >> 2);
+    tmp = gUnk_03004030.unk_08;
+    if (!tmp) {
+        if ((entr->target_roomID | 0x80) != gUnk_03004030.unk_0b) {
+            gUnk_02034480.unk_00 = gUnk_03004030.unk_08;
+        }
+        gUnk_03004030.unk_0b = entr->target_roomID | 0x80;
+    }
+    sub_08080930(entr->unk_03);
+    sub_0805E900(this);
+}
+
+DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int roomID){
+    for (;entr->unk_00 != 0xFFFF;entr++) {
+        if (entr->source_roomID == roomID) return entr;
+    }
+    return 0;
+}

src/manager/managerA.c

@@ -21,10 +21,10 @@ void sub_08058398(Manager* this) {
     if (CheckFlags(this->unk_3c) != 0) {
         DeleteThisEntity();
     }
-    this->unk_24 = this->unk_3a<<3;
-    this->unk_26 = this->unk_3b<<3;
-    this->unk_20 = this->unk_24 + (this->unk_38<<4);
-    this->unk_22 = this->unk_26 + (this->unk_39<<4);
+    this->unk_24 = this->unk_3a.HALF.LO<<3;
+    this->unk_26 = this->unk_3a.HALF.HI<<3;
+    this->unk_20 = this->unk_24 + (this->unk_38.HALF.LO<<4);
+    this->unk_22 = this->unk_26 + (this->unk_38.HALF.HI<<4);
     sub_0805E3A0(this, 0x06);
     if (this->unk_3e == 0) {
         this->unk_0c = 2;

src/manager/managerE.c

@@ -0,0 +1,39 @@
+#include "global.h"
+#include "entity.h"
+#include "manager.h"
+#include "flags.h"
+#include "room.h"
+
+extern Entity* GetCurrentRoomProperty(u8);
+extern void LoadRoomEntityList(Entity*);
+extern void DeleteThisEntity(void);
+extern void sub_0805E900(Manager*);
+extern void sub_08078A90(u32);
+extern void sub_08078B48(void);
+extern void PlaySFX(u32);
+
+void sub_08058E60(Manager* this) {
+    if (!this->unk_0c) {
+        this->unk_0c = 1;
+        if (CheckFlags(this->unk_3e)) {
+            sub_0805E900(this);
+            return;
+        }
+    }
+    if (!CheckFlags(this->unk_3e))
+        return;
+    if (this->unk_0b != 0) {
+        this->unk_0b = 0;
+        sub_08078A90(0xff);
+        sub_08078B48();
+    }
+    if (this->unk_3a.SHWORD == 0){
+        if (this->unk_38.SHWORD != 0) {
+            PlaySFX(this->unk_38.SHWORD);
+        }
+        LoadRoomEntityList(GetCurrentRoomProperty(this->unk_0a));
+        DeleteThisEntity();
+    } else {
+        this->unk_3a.SHWORD -= 1;
+    }
+}