summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/enemy.h10
-rw-r--r--include/enemy/gyorg.h22
2 files changed, 25 insertions, 7 deletions
diff --git a/include/enemy.h b/include/enemy.h
index 8595b8f3..479e5273 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -214,14 +214,14 @@ extern void FireballGuy(Entity*);
extern void MiniFireballGuy(Entity*);
extern void VaatiTransfiguredEye(Entity*);
extern void BusinessScrubPrologue(Entity*);
-extern void GyorgFemale(Entity*);
-extern void GyorgMale(Entity*);
+extern void GyorgFemale();
+extern void GyorgMale();
extern void Curtain(Entity*);
extern void VaatiWrathEye(Entity*);
-extern void GyorgChild(Entity*);
-extern void GyorgFemaleEye(Entity*);
+extern void GyorgChild();
+extern void GyorgFemaleEye();
extern void Enemy62(Entity*);
-extern void GyorgFemaleMouth(Entity*);
+extern void GyorgFemaleMouth();
extern void Enemy64(Entity*);
extern void TreeItem(Entity*);
extern void Enemy66(Entity*);
diff --git a/include/enemy/gyorg.h b/include/enemy/gyorg.h
index 66ef35a2..a45b3657 100644
--- a/include/enemy/gyorg.h
+++ b/include/enemy/gyorg.h
@@ -33,6 +33,24 @@ typedef struct {
typedef struct {
Entity base;
+ u8 unk_68[0x8];
+ u16 unk_70;
+ u16 unk_72;
+ u16 unk_74;
+ u16 unk_76;
+ u16 unk_78;
+ u16 unk_7a;
+ u8 unk_7c;
+ u8 unk_7d;
+ u16 unk_7e;
+ u16 unk_80;
+ u16 unk_82;
+ u16 unk_84;
+ u16 unk_86;
+} GyorgMaleEntity;
+
+typedef struct {
+ Entity base;
u8 unk_68[0xC];
u16 unk_74;
u16 unk_76;
@@ -62,8 +80,8 @@ typedef struct {
typedef struct {
GyorgBossObjectEntity* boss;
GyorgFemaleEntity* female;
- GenericEntity* male1;
- GenericEntity* male2;
+ GyorgMaleEntity* male1;
+ GyorgMaleEntity* male2;
GyorgFemaleMouthEntity* unk_10;
GenericEntity* unk_14;
void* unk_18[0x8];