Merge remote-tracking branch 'upstream/master'

include/entity.h

@@ -91,7 +91,7 @@ typedef struct Entity {
     /*0x3a*/ u8 field_0x3a;
     /*0x3b*/ u8 flags2;
     /*0x3c*/ u8 field_0x3c;
-    /*0x3d*/ u8 hurtBlinkTime;
+    /*0x3d*/ s8 hurtBlinkTime;
     /*0x3e*/ u8 field_0x3e;
     /*0x3f*/ u8 damageType;
     /*0x40*/ u8 field_0x40;
@@ -130,10 +130,10 @@ typedef struct Entity {
     /*0x6c*/ union SplitHWord field_0x6c;
     /*0x6e*/ u8 filler4[2];
     /*0x70*/ union SplitWord field_0x70;
-    /*0x74*/ u16 field_0x74;
-    /*0x76*/ u16 field_0x76;
+    /*0x74*/ union SplitHWord field_0x74;
+    /*0x76*/ union SplitHWord field_0x76;
     /*0x78*/ union SplitHWord field_0x78;
-    /*0x7a*/ u16 field_0x7a;
+    /*0x7a*/ union SplitHWord field_0x7a;
     /*0x7c*/ union SplitWord field_0x7c;
     /*0x80*/ union SplitHWord field_0x80;
     /*0x82*/ union SplitHWord field_0x82;

include/functions.h

@@ -60,7 +60,7 @@ extern void sub_0805EC9C();
 extern void sub_0805EC60();
 extern void sub_080873D0();
 extern u8 sub_080045D4(s16, s16, u16, u16);
-extern void sub_0806F69C();
+extern void sub_0806F69C(Entity*);
 extern void sub_0805E3A0(Entity*, u32);
 extern void sub_0806D0B0(Entity*);
 extern void sub_0807DD64(Entity*);

include/manager.h

@@ -3,6 +3,13 @@
 
 #include "global.h"
 
+union SplitSHWord {
+    s16 SHWORD;
+    struct {
+        u8 LO, HI;
+    } PACKED HALF;
+} PACKED;
+
 typedef struct {
     u8 unk_00[0x0a];
     u8 unk_0a;
@@ -18,10 +25,8 @@ typedef struct {
     u8 unk_28[0x0D];
     u8 unk_35;
     u16 unk_36;
-    u8 unk_38;
-    u8 unk_39;
-    u8 unk_3a;
-    u8 unk_3b;
+    union SplitSHWord unk_38;
+    union SplitSHWord unk_3a;
     u16 unk_3c;
     u16 unk_3e;
 } Manager;
@@ -43,4 +48,25 @@ typedef struct {
     } PACKED field_0x07;
 } UnkManagerHelperStruct;
 
+typedef struct {
+    u16 unk_00;
+    u8 source_roomID;
+    u8 unk_03;
+    u8 target_areaID;
+    u8 target_roomID;
+    u16 unk_06;
+} DiggingCaveEntrance;
+
+extern struct {
+    DiggingCaveEntrance* unk_00;
+    u16 unk_04;
+    u16 unk_06;
+    u8 unk_08;
+    u8 unk_09;
+    u8 unk_0a;
+    u8 unk_0b;
+} gUnk_03004030;
+
+extern DiggingCaveEntrance* gUnk_08107DC0[];
+
 #endif

include/structures.h

@@ -45,7 +45,9 @@ typedef struct {
     /*0x040*/ u32 windcrests;
     /*0x044*/ u8 filler44[0xC];
     /*0x050*/ u32 unk50;
-    /*0x054*/ u8 filler54[0x54];
+    /*0x054*/ u8 filler54[0x2C];
+    /*0x080*/ u8 playerName[6];
+    /*0x086*/ u8 filler86[0x22];
     /*0x0A8*/ Stats stats;
     /*0x0D0*/ u8 fillerD0[0x3c0];
     /*0x490*/ u32 unk490;
@@ -135,7 +137,11 @@ typedef struct {
 extern struct_03000FD0 gFadeControl;
 
 typedef struct {
-    u8 unk0[0x24];
+    u8 filler0[0x1A];
+    u16 unk1A;
+    u8 filler1C[0x4];
+    u16 unk20;
+    u8 filler22[0x2];
     u8 ezloNagFuncIndex;
     u8 filler25[0x30F];
 } struct_0200AF00;
@@ -148,4 +154,10 @@ typedef struct {
 
 extern struct_02024490 gUnk_02024490;
 
-#endif
+typedef struct {
+    u16 unk_00;
+    u8 unk_02[0xE];
+} struct_02034480;
+extern struct_02034480 gUnk_02034480;
+
+#endif