Merge pull request #394 from Henny022p/doc-WCR

include/enemy/gyorg.h

@@ -6,18 +6,18 @@
 typedef struct {
     Entity base;
     u8 unk_68[0x8];
-    u16 unk_70;
+    u16 childrenSpawnTimer;
     u8 unk_72[0x6];
-    u8 unk_78;
+    u8 eyesVulnerable; /**< bitset of eyes currently vulnerable */
     u8 unk_79;
-    u16 unk_7a;
-    u8 unk_7c;
-    u8 unk_7d;
+    u16 eyeTimer;
+    u8 eyesHitFrame; /**< bitset of eyes hit this frame */
+    u8 eyesHit;      /**< bitset buffer of eyes hit */
     u8 unk_7e[1];
     u8 unk_7f;
     u8 unk_80;
     u8 unk_81[1];
-    u8 unk_82;
+    u8 damageTakenCycle; /**< damage taken this cycle */
     u8 unk_83[5];
 } GyorgFemaleEntity;
 
@@ -52,10 +52,10 @@ typedef struct {
 typedef struct {
     Entity base;
     u8 unk_68[0xC];
-    u16 unk_74;
-    u16 unk_76;
-    u16 unk_78;
-    u8 unk_7a;
+    s16 attackOffsetX;
+    s16 attackOffsetY;
+    s16 attackSpeed;
+    u8 attackDirection;
     u8 unk_7b;
     u8 unk_7c[0xC];
 } GyorgChildEntity;
@@ -64,7 +64,7 @@ typedef struct {
     Entity base;
     u8 unk_68[4];
     u16 unk_6c;
-    u16 unk_6e;
+    u16 timer;
     u16 unk_70;
     u16 unk_72;
     u8 unk_74;
@@ -82,12 +82,13 @@ typedef struct {
     GyorgFemaleEntity* female;
     GyorgMaleEntity* male1;
     GyorgMaleEntity* male2;
-    GyorgFemaleMouthEntity* unk_10;
-    GenericEntity* unk_14;
+    GyorgFemaleMouthEntity* mouth;
+    GenericEntity* tail;
     void* unk_18[0x8];
-    u16 unk_38;
-    u16 unk_3a;
+    Coords reflectFxPos;
     u8 unk_3c;
 } GyorgHeap;
 
+extern void GyorgBossObject_SpawnChildren(u32 unk0, bool32 fromBlue, u32 animationState);
+
 #endif

include/functions.h

@@ -181,7 +181,6 @@ extern void sub_0808091C(const ScreenTransitionData*, u32);
 extern void sub_080809D4(void);
 extern void sub_08080CB4(Entity*);
 extern u32 sub_0808288C(Entity*, u32, u32, u32);
-extern void sub_080A1ED0(u32, u32, u32);
 extern Entity* sub_080A2A3C(Entity*, u32, u32, u32);
 extern Entity* sub_080A2AD4(Entity*);
 extern void sub_080A2AF4(Entity*, u32, u32);