Merge pull request #394 from Henny022p/doc-WCR

4 files changed, 136 insertions, 134 deletions

diff --git a/src/enemy/gyorgChild.c b/src/enemy/gyorgChild.c
index 91b6bf41..698ad03a 100644
--- a/src/enemy/gyorgChild.c
+++ b/src/enemy/gyorgChild.c
@@ -27,55 +27,55 @@ void GyorgChild(Entity* this) {
     GyorgChild_Functions[GetNextFunction(this)]((GyorgChildEntity*)this);
 }
 
-void sub_080486F4(GyorgChildEntity*);
-void sub_0804877C(GyorgChildEntity*);
-void sub_0804882C(GyorgChildEntity*);
-void sub_08048904(GyorgChildEntity*);
+void GyorgChild_Action0(GyorgChildEntity* this);
+void GyorgChild_Action1(GyorgChildEntity* this);
+void GyorgChild_Action2(GyorgChildEntity* this);
+void GyorgChild_Action3(GyorgChildEntity* this);
 
 void GyorgChild_OnTick(GyorgChildEntity* this) {
-    static void (*const gUnk_080D1E84[])(GyorgChildEntity*) = {
-        sub_080486F4,
-        sub_0804877C,
-        sub_0804882C,
-        sub_08048904,
+    static void (*const GyorgChild_Actions[])(GyorgChildEntity*) = {
+        GyorgChild_Action0,
+        GyorgChild_Action1,
+        GyorgChild_Action2,
+        GyorgChild_Action3,
     };
-    gUnk_080D1E84[super->action](this);
+    GyorgChild_Actions[super->action](this);
 }
 
 void GyorgChild_OnCollision(GyorgChildEntity* this) {
     EnemyFunctionHandlerAfterCollision(super, GyorgChild_Functions);
 }
 
-void sub_080486D0(GyorgChildEntity*);
-void sub_080486D8(GyorgChildEntity*);
-void sub_080486E0(GyorgChildEntity*);
+void GyordChild_OnGrabbed_Action0(GyorgChildEntity* this);
+void GyorgChild_OnGrabbed_Action1(GyorgChildEntity* this);
+void GyorgChild_OnGrabbed_Action3(GyorgChildEntity* this);
 
 void GyorgChild_OnGrabbed(GyorgChildEntity* this) {
-    static void (*const gUnk_080D1E94[])(GyorgChildEntity*) = {
-        sub_080486D0,
-        sub_080486D8,
-        sub_080486E0,
+    static void (*const GyorgChild_OnGrabbed_Actions[])(GyorgChildEntity*) = {
+        GyordChild_OnGrabbed_Action0,
+        GyorgChild_OnGrabbed_Action1,
+        GyorgChild_OnGrabbed_Action3,
     };
     if (sub_0806F520()) {
-        gUnk_080D1E94[super->subAction](this);
+        GyorgChild_OnGrabbed_Actions[super->subAction](this);
     }
 }
 
-void sub_080486D0(GyorgChildEntity* this) {
+void GyordChild_OnGrabbed_Action0(GyorgChildEntity* this) {
     super->subAction = 2;
 }
 
-void sub_080486D8(GyorgChildEntity* this) {
+void GyorgChild_OnGrabbed_Action1(GyorgChildEntity* this) {
     sub_0806F4E8(super);
 }
 
-void sub_080486E0(GyorgChildEntity* this) {
+void GyorgChild_OnGrabbed_Action3(GyorgChildEntity* this) {
     if (sub_0806F3E4(super)) {
         GenericDeath(super);
     }
 }
 
-void sub_080486F4(GyorgChildEntity* this) {
+void GyorgChild_Action0(GyorgChildEntity* this) {
     static const s8 gUnk_080D1EA0[] = {
         0x50, 0x1,  0x40, 0x1,  0x30, 0x1,  0x20, 0x1,  0x10, 0x1,  0,
         0,    0x10, -0x1, 0x20, -0x1, 0x30, -0x1, 0x40, -0x1, 0x50, -0x1,
@@ -84,13 +84,13 @@ void sub_080486F4(GyorgChildEntity* this) {
     super->spriteOrientation.flipY = 3;
     super->spriteRendering.b3 = 3;
     super->spritePriority.b0 = 7;
-    super->animationState = super->direction >> 2;
+    super->animationState = Direction8ToAnimationState(super->direction);
     if (super->type == 0) {
         s32 r;
         InitializeAnimation(super, super->animationState);
         super->action = 1;
         super->flags |= ENT_COLLIDE;
-        r = (signed)Random() % 0xB;
+        r = (signed)Random() % 11;
         super->direction += r;
         super->direction -= 5;
         super->direction &= 0x1F;
@@ -105,7 +105,7 @@ void sub_080486F4(GyorgChildEntity* this) {
     }
 }
 
-void sub_0804877C(GyorgChildEntity* this) {
+void GyorgChild_Action1(GyorgChildEntity* this) {
     LinearMoveUpdate(super);
     if (super->actionDelay != 0) {
         if ((--super->actionDelay & 0xF) == 0) {
@@ -140,29 +140,29 @@ void sub_0804877C(GyorgChildEntity* this) {
     super->spriteSettings.draw = 0;
 }
 
-void sub_0804882C(GyorgChildEntity* this) {
+void GyorgChild_Action2(GyorgChildEntity* this) {
     if (--super->actionDelay == 0) {
         super->action = 3;
         super->flags |= ENT_COLLIDE;
         Random();
         super->spriteSettings.draw = 1;
         super->spritePriority.b0 = 4;
-        super->speed = this->unk_78;
+        super->speed = this->attackSpeed;
         super->collisionLayer = 2;
         UpdateSpriteForCollisionLayer(super);
-        super->direction = this->unk_7a;
+        super->direction = this->attackDirection;
         super->animationState = super->direction >> 2;
         InitializeAnimation(super, super->animationState);
         switch (super->animationState >> 1) {
             case 0:
             case 2:
-                super->x.HALF.HI = gPlayerEntity.x.HALF.HI + this->unk_74;
-                super->y.HALF.HI = gRoomControls.scroll_y + this->unk_76;
+                super->x.HALF.HI = gPlayerEntity.x.HALF.HI + this->attackOffsetX;
+                super->y.HALF.HI = gRoomControls.scroll_y + this->attackOffsetY;
                 break;
             case 1:
             default:
-                super->x.HALF.HI = gRoomControls.scroll_x + this->unk_74;
-                super->y.HALF.HI = gPlayerEntity.y.HALF.HI + this->unk_76;
+                super->x.HALF.HI = gRoomControls.scroll_x + this->attackOffsetX;
+                super->y.HALF.HI = gPlayerEntity.y.HALF.HI + this->attackOffsetY;
                 break;
         }
         if (super->type2 == 0) {
@@ -171,7 +171,7 @@ void sub_0804882C(GyorgChildEntity* this) {
     }
 }
 
-void sub_08048904(GyorgChildEntity* this) {
+void GyorgChild_Action3(GyorgChildEntity* this) {
     LinearMoveUpdate(super);
     GetNextFrame(super);
     switch (super->animationState >> 1) {
diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c
index a411698e..2b7911d3 100644
--- a/src/enemy/gyorgFemale.c
+++ b/src/enemy/gyorgFemale.c
@@ -20,10 +20,10 @@ extern void RegisterTransitionManager(void*, void (*)(), void (*)());
 void sub_08046498();
 void sub_0804660C(GyorgFemaleEntity*, u32);
 void sub_080464C0(GyorgFemaleEntity*);
-void sub_08046634(GyorgFemaleEntity*, u32);
+void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp);
 void sub_080465C8(void);
-void sub_080466A8(GyorgFemaleEntity*);
-void sub_08046668(GyorgFemaleEntity*);
+void GyorgFemale_ProcessEyeHit(GyorgFemaleEntity* this);
+void GyorgFemale_ChooseEyePattern(GyorgFemaleEntity* this);
 void sub_08046518(void);
 void sub_080467DC(GyorgFemaleEntity*);
 
@@ -37,32 +37,32 @@ extern const u8 gUnk_080D1AAC[];
 extern const u8 gUnk_080D1AC4[];
 extern const u8 gUnk_080D1ADC[];
 
-void sub_0804614C(GyorgFemaleEntity*);
-void sub_0804625C(GyorgFemaleEntity*);
-void sub_0804632C(GyorgFemaleEntity*);
-void sub_080463E4(GyorgFemaleEntity*);
+void GyorgFemale_Setup(GyorgFemaleEntity* this);
+void GyorgFemale_Action1(GyorgFemaleEntity* this);
+void GyorgFemale_Action2(GyorgFemaleEntity* this);
+void GyorgFemale_Action3(GyorgFemaleEntity* this);
 
 void GyorgFemale(Entity* this) {
-    static void (*const gUnk_080D1A64[])(GyorgFemaleEntity*) = {
-        sub_0804614C,
-        sub_0804625C,
-        sub_0804632C,
-        sub_080463E4,
+    static void (*const GyorgFemale_Actions[])(GyorgFemaleEntity*) = {
+        GyorgFemale_Setup,
+        GyorgFemale_Action1,
+        GyorgFemale_Action2,
+        GyorgFemale_Action3,
     };
-    gUnk_080D1A64[this->action]((GyorgFemaleEntity*)this);
+    GyorgFemale_Actions[this->action]((GyorgFemaleEntity*)this);
 }
 
-void sub_0804614C(GyorgFemaleEntity* this) {
+void GyorgFemale_Setup(GyorgFemaleEntity* this) {
     Entity* tmp;
     if (gEntCount > 0x3d)
         return;
     tmp = CreateProjectile(GYORG_TAIL);
     tmp->type = 0;
     tmp->parent = super;
-    ((GyorgHeap*)super->myHeap)->unk_14 = (GenericEntity*)tmp;
+    ((GyorgHeap*)super->myHeap)->tail = (GenericEntity*)tmp;
     tmp = CreateEnemy(GYORG_FEMALE_MOUTH, 0);
     tmp->parent = super;
-    ((GyorgHeap*)super->myHeap)->unk_10 = (GyorgFemaleMouthEntity*)tmp;
+    ((GyorgHeap*)super->myHeap)->mouth = (GyorgFemaleMouthEntity*)tmp;
     tmp = CreateEnemy(GYORG_FEMALE_EYE, 0);
     tmp->parent = super;
     tmp = CreateEnemy(GYORG_FEMALE_EYE, 1);
@@ -83,9 +83,9 @@ void sub_0804614C(GyorgFemaleEntity* this) {
     super->spriteOrientation.flipY = 2;
     super->spriteRendering.b3 = 2;
     super->collisionLayer = 2;
-    this->unk_78 = 0;
+    this->eyesVulnerable = 0;
     this->unk_79 = 0;
-    this->unk_70 = 0x3C;
+    this->childrenSpawnTimer = 0x3C;
     MemClear(&gUnk_02019EE0, 0x8000);
     MemClear(&gMapDataTopSpecial, 0x8000);
     sub_0804660C(this, 0);
@@ -99,7 +99,7 @@ void sub_0804614C(GyorgFemaleEntity* this) {
 #endif
 }
 
-void sub_0804625C(GyorgFemaleEntity* this) {
+void GyorgFemale_Action1(GyorgFemaleEntity* this) {
     if (this->unk_79 & 0x80) {
         this->unk_79 &= ~0x80;
         this->unk_79 |= 0x40;
@@ -114,86 +114,86 @@ void sub_0804625C(GyorgFemaleEntity* this) {
     if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) {
         super->action = 2;
         super->actionDelay = 0;
-        this->unk_7a = 0;
-        this->unk_7c = 0;
-        this->unk_7d = 0;
-        this->unk_70 = 0x3c;
+        this->eyeTimer = 0;
+        this->eyesHitFrame = 0;
+        this->eyesHit = 0;
+        this->childrenSpawnTimer = 0x3c;
         this->unk_80 = 0;
         return;
     }
     if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x40) {
         super->action = 3;
-        this->unk_70 = 0x3c;
+        this->childrenSpawnTimer = 0x3c;
         super->actionDelay = 0;
-        this->unk_7a = 0;
-        this->unk_7c = 0;
-        this->unk_7d = 0;
+        this->eyeTimer = 0;
+        this->eyesHitFrame = 0;
+        this->eyesHit = 0;
         this->unk_80 = 0;
         return;
     }
     if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x100) {
-        if (--this->unk_70 == 0) {
-            this->unk_70 = 0x168;
-            sub_08046634(this, 1);
+        if (--this->childrenSpawnTimer == 0) {
+            this->childrenSpawnTimer = 0x168;
+            GyorgFemale_SpawnChildren(this, TRUE);
         }
     }
 }
 
-void sub_0804632C(GyorgFemaleEntity* this) {
+void GyorgFemale_Action2(GyorgFemaleEntity* this) {
     sub_080465C8();
-    sub_080466A8(this);
-    if (++this->unk_7a > 0x59f) {
-        this->unk_7a = 0;
-        this->unk_7c = 0;
-        this->unk_7d = 0;
+    GyorgFemale_ProcessEyeHit(this);
+    if (++this->eyeTimer >= 1440) {
+        this->eyeTimer = 0;
+        this->eyesHitFrame = 0;
+        this->eyesHit = 0;
         this->unk_80 = 0;
     } else {
-        if (this->unk_7a == 0x78) {
-            sub_08046668(this);
+        if (this->eyeTimer == 120) {
+            GyorgFemale_ChooseEyePattern(this);
         } else {
-            if (this->unk_7a == 0x528) {
-                this->unk_78 = 0;
+            if (this->eyeTimer == 1320) {
+                this->eyesVulnerable = 0;
 #ifndef EU
-                this->unk_7d = 0;
+                this->eyesHit = 0;
                 this->unk_7f = 0;
 #endif
             }
         }
     }
-    if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x80 && --this->unk_70 == 0) {
-        this->unk_70 = 0x168;
-        sub_08046634(this, 0);
+    if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x80 && --this->childrenSpawnTimer == 0) {
+        this->childrenSpawnTimer = 0x168;
+        GyorgFemale_SpawnChildren(this, 0);
     }
     if ((((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) == 0) {
         super->action = 1;
-        this->unk_70 = 0x3c;
+        this->childrenSpawnTimer = 0x3c;
 #ifndef EU
-        this->unk_78 = 0;
+        this->eyesVulnerable = 0;
 #endif
         this->unk_80 = 0;
     }
 }
 
-void sub_080463E4(GyorgFemaleEntity* this) {
+void GyorgFemale_Action3(GyorgFemaleEntity* this) {
     sub_080465C8();
-    if (--this->unk_70 == 0) {
-        this->unk_70 = 0x168;
-        sub_08046634(this, 1);
+    if (--this->childrenSpawnTimer == 0) {
+        this->childrenSpawnTimer = 0x168;
+        GyorgFemale_SpawnChildren(this, 1);
     }
-    sub_080466A8(this);
-    if (++this->unk_7a > 0x59f) {
-        this->unk_7a = 0;
-        this->unk_7c = 0;
-        this->unk_7d = 0;
+    GyorgFemale_ProcessEyeHit(this);
+    if (++this->eyeTimer >= 1440) {
+        this->eyeTimer = 0;
+        this->eyesHitFrame = 0;
+        this->eyesHit = 0;
         this->unk_80 = 0;
     } else {
-        if (this->unk_7a == 0x78) {
-            sub_08046668(this);
+        if (this->eyeTimer == 120) {
+            GyorgFemale_ChooseEyePattern(this);
         } else {
-            if (this->unk_7a == 0x528) {
-                this->unk_78 = 0;
+            if (this->eyeTimer == 1320) {
+                this->eyesVulnerable = 0;
 #ifndef EU
-                this->unk_7d = 0;
+                this->eyesHit = 0;
                 this->unk_7f = 0;
 #endif
             }
@@ -202,11 +202,11 @@ void sub_080463E4(GyorgFemaleEntity* this) {
     if (super->health == 0) {
         super->action = 1;
 #ifdef EU
-        this->unk_78 = 0;
+        this->eyesVulnerable = 0;
 #endif
-        this->unk_70 = 0x3c;
+        this->childrenSpawnTimer = 0x3c;
 #ifndef EU
-        this->unk_78 = 0;
+        this->eyesVulnerable = 0;
 #endif
         this->unk_80 = 0;
         SoundReq(SFX_BOSS_DIE);
@@ -364,70 +364,70 @@ const u8 gUnk_080D1ADC[] = {
     0xDE, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80,
 };
 
-void sub_08046634(GyorgFemaleEntity* this, u32 unk1) {
+void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp) {
     static const u8 gUnk_080D1AF4[] = { 2, 3, 6, 7 };
     u32 tmp;
-    if (unk1 == 0) {
+    if (unlimit_tmp == 0) {
         tmp = gUnk_080D1AF4[Random() & 3];
     } else {
         tmp = Random() & 7;
     }
-    sub_080A1ED0(tmp, 0, super->animationState >> 3);
+    GyorgBossObject_SpawnChildren(tmp, FALSE, super->animationState >> 3);
 }
 
-void sub_08046668(GyorgFemaleEntity* this) {
+void GyorgFemale_ChooseEyePattern(GyorgFemaleEntity* this) {
     static const u8 gUnk_080D1AF8[] = { 0x16, 0x92, 0x94, 0x86 };
     if (super->health == 0) {
         return;
     }
 #ifndef EU
-    if (this->unk_78 == 0xFF) {
+    if (this->eyesVulnerable == 0xFF) {
         return;
     }
 #endif
-    this->unk_78 = gUnk_080D1AF8[Random() & 3];
+    this->eyesVulnerable = gUnk_080D1AF8[Random() & 3];
     this->unk_7f = 0;
-    this->unk_82 = 0;
+    this->damageTakenCycle = 0;
     sub_080467DC(this);
 }
 
-void sub_080466A8(GyorgFemaleEntity* this) {
-    if (this->unk_7c != 0) {
-        this->unk_7d |= this->unk_7c;
-        if (super->actionDelay == 0 && this->unk_78 != 0xFF) {
+void GyorgFemale_ProcessEyeHit(GyorgFemaleEntity* this) {
+    if (this->eyesHitFrame != 0) {
+        this->eyesHit |= this->eyesHitFrame;
+        if (super->actionDelay == 0 && this->eyesVulnerable != 0xFF) {
 #ifndef EU
             super->actionDelay = 4;
 #else
             super->actionDelay = 3;
 #endif
         }
-        if (sub_08000E62(this->unk_7d) > 2) {
+        if (sub_08000E62(this->eyesHit) > 2) {
             super->actionDelay = 0;
-            this->unk_7d = 0;
-            this->unk_78 = 0xFF;
+            this->eyesHit = 0;
+            this->eyesVulnerable = 0xFF;
             SoundReq(SFX_BOSS_HIT);
             if (super->health != 0) {
                 InitScreenShake(8, 0);
-                if (++this->unk_82 <= 0xC) {
+                if (++this->damageTakenCycle <= 12) {
                     super->health--;
                 }
                 if (super->health == 0) {
-                    this->unk_78 = 0;
-                    this->unk_7a = 0x528;
+                    this->eyesVulnerable = 0;
+                    this->eyeTimer = 1320;
                 } else {
                     if (this->unk_7f == 0) {
                         this->unk_7f = 1;
-                        this->unk_7a = 0x438;
+                        this->eyeTimer = 1080;
                     }
                 }
             }
             sub_080467DC(this);
         }
     }
-    if (super->actionDelay != 0 && this->unk_78 != 0xFF && --super->actionDelay == 0) {
+    if (super->actionDelay != 0 && this->eyesVulnerable != 0xFF && --super->actionDelay == 0) {
         Entity* tmp;
-        this->unk_80 |= this->unk_7d;
-        this->unk_7d = 0;
+        this->unk_80 |= this->eyesHit;
+        this->eyesHit = 0;
         sub_080467DC(this);
 #ifndef EU
         if (((GyorgHeap*)super->myHeap)->unk_3c != 0xFF) {
@@ -436,10 +436,10 @@ void sub_080466A8(GyorgFemaleEntity* this) {
             tmp->knockbackDirection = ((GyorgHeap*)super->myHeap)->unk_3c;
             tmp->iframes = 0xF4;
             tmp->knockbackDuration = 0xA;
-            tmp = CreateFx(super, 0x2C, 0);
+            tmp = CreateFx(super, FX_REFECT3, 0);
             if (tmp) {
-                tmp->x.HALF.HI = ((GyorgHeap*)super->myHeap)->unk_38;
-                tmp->y.HALF.HI = ((GyorgHeap*)super->myHeap)->unk_3a;
+                tmp->x.HALF.HI = ((GyorgHeap*)super->myHeap)->reflectFxPos.HALF.x;
+                tmp->y.HALF.HI = ((GyorgHeap*)super->myHeap)->reflectFxPos.HALF.y;
                 tmp->collisionLayer = 1;
                 UpdateSpriteForCollisionLayer(tmp);
             }
@@ -447,7 +447,7 @@ void sub_080466A8(GyorgFemaleEntity* this) {
         }
 #endif
     }
-    this->unk_7c = 0;
+    this->eyesHitFrame = 0;
 }
 
 void sub_080467DC(GyorgFemaleEntity* this) {
diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c
index 89d8207a..84d1aa3b 100644
--- a/src/enemy/gyorgFemaleEye.c
+++ b/src/enemy/gyorgFemaleEye.c
@@ -67,9 +67,9 @@ void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity* this) {
     if (super->health != 0xFF) {
         parent = (GyorgFemaleEntity*)super->parent;
 #ifndef EU
-        if ((parent->unk_78 >> super->type) & 1) {
+        if ((parent->eyesVulnerable >> super->type) & 1) {
 #endif
-            parent->unk_7c |= (1 << super->type);
+            parent->eyesHitFrame |= (1 << super->type);
 #ifndef EU
             switch (super->bitfield & 0x7F) {
                 case 4 ... 6:
@@ -78,8 +78,10 @@ void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity* this) {
                 case 24 ... 26:
 #endif
                     (*(((GyorgHeap**)&parent->base.myHeap)))->unk_18[super->type] = super->field_0x4c;
-                    (*(((GyorgHeap**)&parent->base.myHeap)))->unk_38 = (gPlayerEntity.x.HALF.HI + super->x.HALF.HI) / 2;
-                    (*(((GyorgHeap**)&parent->base.myHeap)))->unk_3a = (gPlayerEntity.y.HALF.HI + super->y.HALF.HI) / 2;
+                    (*(((GyorgHeap**)&parent->base.myHeap)))->reflectFxPos.HALF.x =
+                        (gPlayerEntity.x.HALF.HI + super->x.HALF.HI) / 2;
+                    (*(((GyorgHeap**)&parent->base.myHeap)))->reflectFxPos.HALF.y =
+                        (gPlayerEntity.y.HALF.HI + super->y.HALF.HI) / 2;
                     (*(((GyorgHeap**)&parent->base.myHeap)))->unk_3c = (super->knockbackDirection ^= 0x10);
 #ifndef EU
                     break;
@@ -116,7 +118,7 @@ void sub_08048B2C(GyorgFemaleEyeEntity* this) {
     } else {
         super->spriteSettings.draw = 0;
     }
-    if ((parent->unk_78 >> super->type) & 1) {
+    if ((parent->eyesVulnerable >> super->type) & 1) {
         super->action = 2;
     }
 }
@@ -132,7 +134,7 @@ void sub_08048B84(GyorgFemaleEyeEntity* this) {
 
 void sub_08048BB0(GyorgFemaleEyeEntity* this) {
     GyorgFemaleEntity* parent = (GyorgFemaleEntity*)super->parent;
-    if (!((parent->unk_78 >> super->type) & 1)) {
+    if (!((parent->eyesVulnerable >> super->type) & 1)) {
         if (parent->base.health != 0) {
             super->action = 4;
             super->flags &= ~ENT_COLLIDE;
@@ -160,7 +162,7 @@ void sub_08048BB0(GyorgFemaleEyeEntity* this) {
                 parent->unk_80 &= ~(1 << super->type);
             }
         } else {
-            if (parent->unk_78 == 0xFF) {
+            if (parent->eyesVulnerable == 0xFF) {
                 u32 tmp = super->animIndex;
                 if (tmp < 0x10 || tmp > 0x13) {
                     InitializeAnimation(super, super->animationState + 0x10);
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 667fa934..b2ba5b13 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -91,9 +91,9 @@ void sub_08047DF0(GyorgMaleEntity*, u32);
 void sub_08047E48(GyorgMaleEntity*); //
 void sub_08047E58(GyorgMaleEntity*); //
 void sub_08047EA4(GyorgMaleEntity*, u32);
-u32 sub_08047F68(GyorgMaleEntity*);  // distance this to player?
-void sub_08048004(GyorgMaleEntity*); //
-void sub_0804813C(GyorgMaleEntity*); //
+u32 sub_08047F68(GyorgMaleEntity*);                  // distance this to player?
+void sub_08048004(GyorgMaleEntity*);                 //
+void GyorgMale_SpawnChildren(GyorgMaleEntity* this); //
 u32 sub_08048158(u32);
 void sub_08048178(GyorgMaleEntity*, u32);
 
@@ -847,7 +847,7 @@ void sub_08047978(GyorgMaleEntity* this) {
             }
         } else {
             if (this->unk_70 == 0xF0) {
-                sub_0804813C(this);
+                GyorgMale_SpawnChildren(this);
             }
         }
     } else {
@@ -1165,9 +1165,9 @@ void sub_08048004(GyorgMaleEntity* this) {
     }
 }
 
-void sub_0804813C(GyorgMaleEntity* this) {
+void GyorgMale_SpawnChildren(GyorgMaleEntity* this) {
     u32 rand = Random();
-    sub_080A1ED0(rand & 7, 1, (rand >> 8) & 3);
+    GyorgBossObject_SpawnChildren(rand & 7, TRUE, (rand >> 8) & 3);
 }
 
 const u8 gUnk_080D1C44[0xC] = { 0, 2, 6, 0, 2, 4, 2, 4, 6, 0, 4, 6 };