Merge pull request #304 from octorock/lilypadLarge

Decompile LilypadLarge

5 files changed, 43 insertions, 6 deletions

diff --git a/include/flags.h b/include/flags.h
index 10224374..b08a5908 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -31,7 +31,6 @@ extern u32 WriteBit(void*, u32);
 extern u32 ClearBit(void*, u32);
 
 extern u32 gGlobalFlags;
-extern u32 gRoomFlags;
 
 extern const u16 gLocalFlagBanks[];
 
diff --git a/include/functions.h b/include/functions.h
index 7709868b..819701fa 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -19,7 +19,7 @@ extern void TryLoadPrologueHyruleTown(void);
 extern void FlushSprites(void);
 
 // Unidentified
-extern void sub_0805EC9C();
+extern void sub_0805EC9C(Entity*, u32, u32, u32);
 extern void sub_0805EC60(Entity*);
 extern void sub_0806D0B0(Entity*);
 extern void sub_0806D02C(Entity*);
@@ -121,6 +121,43 @@ extern bool32 sub_08077EFC(ItemBehavior*);
 extern void sub_08078E84(Entity*, Entity*);
 extern void sub_080042D0(Entity*, u32, u16);
 extern u32 sub_080002A8(u32, u32, u32);
-extern void sub_080806BC(u32, u32, u32, u32);
+extern bool32 sub_080806BC(u32, u32, u32, u32);
+extern bool32 sub_0806FC80(Entity*, Entity*, s32);
+extern u32 sub_080002B4(Entity*, u32, u32);
+extern u32 sub_080AF134(Entity*);
+extern void sub_0806F5BC(Entity*, u32, u32);
+extern void sub_080A2AF4(Entity*, u32, u32);
+extern u32 sub_080002CC(Entity*, s32, s32);
+extern bool32 sub_0807BD14(Entity*, u32);
+extern void sub_0807A5B8(u32);
+extern Entity* sub_080A2AD4(Entity*);
+extern u32 sub_080040A2(Entity*);
 
+extern Entity* sub_08049DF4(u32);
+extern s32 sub_080012DC(Entity*);
+extern s32 sub_08056338(void);
+extern s32 sub_080AF090(Entity*);
+extern u32 PlayerInRange(Entity*, u32, u32);
+extern u32 sub_080002C8(u16, u8);
+extern u32 sub_080002D4(s32, s32, u32);
+extern u32 sub_080002E0(u32, u32);
+extern u32 sub_08031E04(Entity*);
+extern u32 sub_080322A4(Entity*);
+extern u32 sub_08049F1C(Entity*, Entity*, u32);
+extern u32 sub_08049F1C(Entity*, Entity*, u32);
+extern void SoundReqClipped(Entity*, u32);
+extern void SoundReqClipped(Entity*, u32);
+extern void sub_08001328(Entity*);
+extern void sub_08031E48(Entity*, Entity*);
+extern void sub_08032290(Entity*);
+extern void sub_08032338(Entity*);
+extern void sub_0803C0AC(Entity*);
+extern void sub_0804AA1C(Entity*);
+extern u32 sub_0806F824(Entity*, Entity*, s32, s32);
+extern void sub_08078930(Entity*);
+extern void sub_08078954(Entity*);
+extern void sub_08079BD8(Entity*);
+extern void sub_080AEFB4(Entity*);
+extern void UnloadOBJPalette(Entity*);
+void sub_080322E8(Entity*);
 #endif
diff --git a/include/global.h b/include/global.h
index d9d22943..0f656445 100644
--- a/include/global.h
+++ b/include/global.h
@@ -99,6 +99,7 @@ typedef union {
 
 union SplitWord {
     s32 WORD;
+    u32 WORD_U;
     struct {
         s16 LO, HI;
     } HALF;
diff --git a/include/item.h b/include/item.h
index c5409c29..e7460936 100644
--- a/include/item.h
+++ b/include/item.h
@@ -24,7 +24,7 @@ extern void ItemOcarina(ItemBehavior*, u32);
 extern void ItemTryPickupObject(ItemBehavior*, u32);
 extern void ItemJarEmpty(ItemBehavior*, u32);
 
-enum {
+typedef enum {
     ITEM_NONE,
     ITEM_SMITH_SWORD,
     ITEM_GREEN_SWORD,
@@ -143,6 +143,6 @@ enum {
     ITEM_SKILL_FAST_SPIN,
     ITEM_SKILL_FAST_SPLIT,
     ITEM_SKILL_LONG_SPIN,
-};
+} Item;
 
 #endif
diff --git a/include/object.h b/include/object.h
index f45e8393..fa41a123 100644
--- a/include/object.h
+++ b/include/object.h
@@ -246,7 +246,7 @@ void Object10(Entity*);
 void Object11(Entity*);
 void Object12(Entity*);
 void Railtrack(Entity*);
-void LilypadLarge(Entity*);
+void LilypadLarge();
 void Object15(Entity*);
 void FloatingPlatform(Entity*);
 void Object17(Entity*);