Merge pull request #304 from octorock/lilypadLarge

Decompile LilypadLarge

18 files changed, 3 insertions, 57 deletions

diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index b73c8104..3fe81a09 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -8,16 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern u32 sub_080002D4(s32, s32, u32);
-extern s32 sub_080012DC(Entity*);
-extern u32 sub_08031E04(Entity*);
-extern void sub_08031E48(Entity*, Entity*);
-extern void sub_08032290(Entity*);
-extern u32 sub_080322A4(Entity*);
-void sub_080322E8(Entity*);
-extern void sub_08032338(Entity*);
-extern Entity* sub_08049DF4(u32);
-
 extern Entity* gUnk_020000B0;
 extern void (*const gUnk_080012C8[])(Entity*);
 extern void (*const gUnk_080CE56C[])(Entity*);
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index dbdda527..3a7a0064 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -12,12 +12,6 @@
 #include "object.h"
 #include "functions.h"
 
-extern void sub_08078954(Entity*);
-extern void sub_08078930(Entity*);
-extern s32 sub_080012DC(Entity*);
-extern Entity* sub_08049DF4(u32);
-extern void sub_08079BD8(Entity*);
-
 void sub_0802AD1C(Entity*, u32);
 void sub_0802AD54(Entity*);
 void sub_0802B048(Entity*);
diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
index 61f93cae..19615fe9 100644
--- a/src/enemy/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
@@ -33,8 +33,6 @@ void sub_0803C714(BowMoblinEntity*);
 void sub_0803C634(BowMoblinEntity*);
 u32 sub_0803C6F8(BowMoblinEntity*);
 u32 sub_0803C568(BowMoblinEntity*);
-extern Entity* sub_08049DF4(u32);
-extern u32 sub_0806FC80(Entity*, Entity*, s32);
 void sub_0803C664(BowMoblinEntity*);
 
 void (*const gUnk_080CFF78[])(Entity*);
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 9c52774f..eb1bb1e1 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -14,10 +14,6 @@
 #include "game.h"
 #include "item.h"
 
-extern Entity* sub_08049DF4(u32);
-extern bool32 sub_08056338(void);
-extern void UnloadOBJPalette(Entity*);
-
 bool32 sub_0802915C(Entity*);
 bool32 sub_080291DC(Entity*);
 void sub_0802922C(Entity*);
diff --git a/src/enemy/crow.c b/src/enemy/crow.c
index 8fdb1547..4dfdc773 100644
--- a/src/enemy/crow.c
+++ b/src/enemy/crow.c
@@ -20,8 +20,6 @@ void (*const gUnk_080CE990[])(CrowEntity*);
 void (*const gUnk_080CE9A4[])(CrowEntity*);
 extern Entity* gUnk_020000B0;
 
-extern Entity* sub_08049DF4(u32);
-
 void sub_08032AF4(CrowEntity* this);
 void sub_08032AB0(CrowEntity* this);
 void sub_08032B38(CrowEntity* this);
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index e4946da6..2b6bb47f 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -8,8 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern Entity* sub_08049DF4(u32);
-
 void sub_08022A88(Entity*);
 void sub_08022AA4(Entity*);
 void sub_08022B0C(Entity*);
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index a8ca9c69..2cb70480 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -27,9 +27,7 @@ void sub_08037B48(Entity*);
 void sub_08037A14(Entity*);
 
 extern void sub_0804A4E4(Entity*, Entity*);
-extern Entity* sub_08049DF4(u32);
 u32 sub_0804A044(Entity*, Entity*, u32);
-extern void SoundReqClipped(Entity*, u32);
 
 extern void (*const gGibdo[6])(Entity*);
 extern void (*const gUnk_080CF2AC[9])(Entity*);
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 4763fe56..d2dabadb 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -106,7 +106,7 @@ void GyorgMale(GyorgMaleEntity* this) {
     }
     gUnk_080D1AFC[super->action](this);
     if (super->action != 7) {
-        sub_0805EC9C(this, 0xaa, 0xaa, this->unk_78);
+        sub_0805EC9C(super, 0xaa, 0xaa, this->unk_78);
     }
     super->animationState = -(this->unk_78 >> 8);
     sub_08048004(this);
@@ -986,7 +986,7 @@ void sub_08047BF0(GyorgMaleEntity* this) {
             }
         }
     }
-    sub_0805EC9C(this, 0xAA, 0xAA, this->unk_78);
+    sub_0805EC9C(super, 0xAA, 0xAA, this->unk_78);
 }
 
 void sub_08047D24(GyorgMaleEntity* this) {
@@ -1005,7 +1005,7 @@ void sub_08047D24(GyorgMaleEntity* this) {
         } else {
             sub_08047E58(this);
         }
-        sub_0805EC9C(this, this->unk_7e, this->unk_7e, this->unk_78);
+        sub_0805EC9C(super, this->unk_7e, this->unk_7e, this->unk_78);
     }
 }
 
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index b1aedfc6..658d94a0 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -8,8 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern Entity* sub_08049DF4(u32);
-
 void Octorok_Pause(Entity*);
 bool32 Octorok_FacesPlayer(Entity*);
 void Octorok_Turn(Entity*);
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index 8514214a..c0aa2b65 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -13,7 +13,6 @@
 
 extern void sub_08078AC0(u32, u32, u32);
 extern u32 GetRandomByWeight(const u8*);
-extern u32 sub_0806FC80(Entity*, Entity*, s32);
 extern void sub_080792BC(s32, u32, u32);
 
 enum OctorokRotation { ROTATION_CW, ROTATION_CCW, NO_ROTATION = 0xff };
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 7d5db56e..34e316cc 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -11,12 +11,6 @@
 #include "functions.h"
 #include "save.h"
 
-extern u32 sub_080002E0(u16, u32);
-extern void SoundReqClipped(Entity*, u32);
-extern u32 sub_08049F1C(Entity*, Entity*, u32);
-extern u32 PlayerInRange(Entity*, u32, u32);
-extern void sub_080AEFB4(Entity*);
-
 void sub_080249F4(Entity*);
 void sub_08024940(Entity*);
 void sub_080249DC(Entity*);
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index b42e5b2f..6e35dbfc 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -9,12 +9,6 @@
 #include "object.h"
 #include "functions.h"
 
-extern u32 sub_080002E0(u32, u32);
-extern u32 sub_080002C8(u16, u8);
-extern u8 sub_080002D4(u32, u32, u32);
-extern void sub_0804AA1C(Entity*);
-extern Entity* sub_08049DF4(u32);
-
 extern u8 gUnk_080B37A0[];
 extern u8 gUnk_080B3E80[];
 
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index e95bc8c7..0ef493dd 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -16,7 +16,6 @@ void sub_08044FF8(Entity*);
 void sub_08045178(Entity*, Entity*, int, int);
 
 extern void sub_0804A4E4(Entity*, Entity*);
-extern u32 sub_080002CC(Entity*, s32, s32);
 
 extern void (*const gUnk_080D16BC[])(Entity*);
 extern void (*const gUnk_080D16A4[])(Entity*);
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 91475342..6cd8f4ca 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -8,9 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern bool32 sub_0806FC80(Entity*, Entity*, u32);
-extern Entity* sub_08049DF4(u32);
-
 void sub_08028604(Entity*);
 void sub_08028754(Entity*);
 void sub_08028784(Entity*);
diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c
index a0fc0dbb..7817f0d7 100644
--- a/src/enemy/takkuri.c
+++ b/src/enemy/takkuri.c
@@ -20,8 +20,6 @@ typedef struct {
 
 static_assert(sizeof(TakkuriEntity) == 0x88);
 
-extern void sub_0803C0AC(Entity*);
-extern Entity* sub_08049DF4(u32);
 extern Entity* gUnk_020000B0;
 
 void (*const gUnk_080CFF3C[])(Entity*);
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index d268a30e..e53d51f1 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -8,7 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern u32 sub_080002E0(u32, u32);
 extern s16 gUnk_080B4488[];
 
 void VaatiEyesMacroFunction0(Entity*);
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index d4194d4d..c9d1fbbf 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -8,8 +8,6 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern bool32 PlayerInRange(Entity*, u32, u32);
-extern u32 sub_080002E0(u32, u32);
 extern Entity* gUnk_020000B0;
 extern const ScreenTransitionData gUnk_0813AB94;
 
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index 554ca1c5..a9648193 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -9,8 +9,6 @@
 #include "area.h"
 #include "functions.h"
 
-extern void sub_08001328(Entity*);
-extern Entity* sub_08049DF4(u32);
 extern ScreenTransitionData* gUnk_0813AB1C[];
 
 void sub_0802A78C(Entity*);