Defined DungeonEntity (#51)

* Defined DungeonEntity

* Rename EntityType enums

* Revert EntityType rename

1 files changed, 85 insertions, 85 deletions

diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c
index b411a26..28ac016 100644
--- a/src/code_8041AD0.c
+++ b/src/code_8041AD0.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "code_8041D5C.h"
+#include "dungeon_entity.h"
 #include "gUnknown_203B418.h"
 
 struct unkStruct_80420E8
@@ -12,32 +12,32 @@ struct unkStruct_80420E8
 extern struct unkStruct_203B418 *gUnknown_203B418;
 
 
-extern void sub_803ED30(u8, struct unkDungeon_8041D5C *r0, u8, u8); 
-extern void sub_804151C(struct unkDungeon_8041D5C *r0, u32 r1, u8 r2);
-extern void sub_80416E0(struct unkDungeon_8041D5C *r0, u32, u32);
-extern u8 sub_8042768(struct unkDungeon_8041D5C *r0);
-extern void sub_806CDD4(struct unkDungeon_8041D5C *r0, u8, u32);
-extern u8 sub_8071858(struct unkDungeon_8041D5C *r0, u8);
+extern void sub_803ED30(u8, struct DungeonEntity *r0, u8, u8);
+extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2);
+extern void sub_80416E0(struct DungeonEntity *r0, u32, u32);
+extern u8 sub_8042768(struct DungeonEntity *r0);
+extern void sub_806CDD4(struct DungeonEntity *r0, u8, u32);
+extern u8 sub_8071858(struct DungeonEntity *r0, u8);
 extern u32 sub_806F62C(u32);
 extern void PlaySoundEffect(u32);
-extern u8 sub_803F428(struct unkDungeon_8041D5C *r0);
-extern void sub_8041550(struct unkDungeon_8041D5C *r0, u32, u32, u32, u32, u32);
+extern u8 sub_803F428(struct DungeonEntity *r0);
+extern void sub_8041550(struct DungeonEntity *r0, u32, u32, u32, u32, u32);
 
 
-void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1);
+void sub_80421C0(struct DungeonEntity *r0, u16 r1);
 
 
-void sub_8041AD0(struct unkDungeon_8041D5C *r0)
+void sub_8041AD0(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xA2 << 1, 1);
 }
 
-void sub_8041AE0(struct unkDungeon_8041D5C *r0)
+void sub_8041AE0(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x143, 1);
 }
 
-void sub_8041AF4(struct unkDungeon_8041D5C *r0)
+void sub_8041AF4(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x25, 1);
     sub_80421C0(r0, 0x197);
@@ -47,7 +47,7 @@ void nullsub_57(void)
 {
 }
 
-void sub_8041B18(struct unkDungeon_8041D5C *r0)
+void sub_8041B18(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x141, 1);
 }
@@ -60,7 +60,7 @@ void nullsub_59(void)
 {
 }
 
-void sub_8041B34(struct unkDungeon_8041D5C *r0)
+void sub_8041B34(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 7, 1);
 }
@@ -69,7 +69,7 @@ void nullsub_60(void)
 {
 }
 
-void sub_8041B48(struct unkDungeon_8041D5C *r0)
+void sub_8041B48(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 4, 0);
 }
@@ -78,16 +78,16 @@ void nullsub_61(void)
 {
 }
 
-void sub_8041B5C(struct unkDungeon_8041D5C *r0)
+void sub_8041B5C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x171, 1);
 }
 
-void nullsub_62(struct unkDungeon_8041D5C *r0)
+void nullsub_62(struct DungeonEntity *r0)
 {
 }
 
-void sub_8041B74(struct unkDungeon_8041D5C *r0)
+void sub_8041B74(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x171, 0);
 }
@@ -100,7 +100,7 @@ void nullsub_64(void)
 {
 }
 
-void sub_8041B90(struct unkDungeon_8041D5C *r0)
+void sub_8041B90(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xD6 << 1, 0);
 }
@@ -113,7 +113,7 @@ void nullsub_66(void)
 {
 }
 
-void sub_8041BA8(struct unkDungeon_8041D5C *r0)
+void sub_8041BA8(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 4, 1);
 }
@@ -122,7 +122,7 @@ void nullsub_67(void)
 {
 }
 
-void sub_8041BBC(struct unkDungeon_8041D5C *r0)
+void sub_8041BBC(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xD4 << 1, 1);
 }
@@ -131,7 +131,7 @@ void nullsub_68(void)
 {
 }
 
-void sub_8041BD0(struct unkDungeon_8041D5C *r0, u8 r1)
+void sub_8041BD0(struct DungeonEntity *r0, u8 r1)
 {
     if(r1 == 0)
     {
@@ -140,22 +140,22 @@ void sub_8041BD0(struct unkDungeon_8041D5C *r0, u8 r1)
     sub_80421C0(r0, 0x1a5);
 }
 
-void sub_8041BE8(struct unkDungeon_8041D5C *r0)
+void sub_8041BE8(struct DungeonEntity *r0)
 {
     sub_80421C0(r0, 0xCB << 1);
 }
 
-void sub_8041BF8(struct unkDungeon_8041D5C *r0)
+void sub_8041BF8(struct DungeonEntity *r0)
 {
     sub_806CDD4(r0, 0xA, 8);
 }
 
-void sub_8041C08(struct unkDungeon_8041D5C *r0)
+void sub_8041C08(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x1a7, 1);
 }
 
-void sub_8041C1C(struct unkDungeon_8041D5C *r0)
+void sub_8041C1C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x1a7, 1);
 }
@@ -164,7 +164,7 @@ void nullsub_69(void)
 {
 }
 
-void sub_8041C34(struct unkDungeon_8041D5C *r0)
+void sub_8041C34(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x4C, 1);
 }
@@ -177,22 +177,22 @@ void nullsub_71(void)
 {
 }
 
-void sub_8041C4C(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041C4C(struct DungeonEntity *r0, u32 r1)
 {
     sub_804151C(r0, r1, 1);
 }
 
-void sub_8041C58(struct unkDungeon_8041D5C *r0)
+void sub_8041C58(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x1a9, 1);
 }
 
-void sub_8041C6C(struct unkDungeon_8041D5C *r0)
+void sub_8041C6C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x9D << 1, 1);
 }
 
-void sub_8041C7C(struct unkDungeon_8041D5C *r0)
+void sub_8041C7C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x9D << 1, 1);
 }
@@ -205,32 +205,32 @@ void nullsub_73(void)
 {
 }
 
-void sub_8041C94(struct unkDungeon_8041D5C *r0)
+void sub_8041C94(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x171, 1);
 }
 
-void sub_8041CA8(struct unkDungeon_8041D5C *r0)
+void sub_8041CA8(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 7, 1);
 }
 
-void sub_8041CB8(struct unkDungeon_8041D5C *r0)
+void sub_8041CB8(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x18b, 1);
 }
 
-void sub_8041CCC(struct unkDungeon_8041D5C *r0)
+void sub_8041CCC(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xC5 << 1, 1);
 }
 
-void sub_8041CDC(struct unkDungeon_8041D5C *r0)
+void sub_8041CDC(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 5, 1);
 }
 
-void sub_8041CEC(struct unkDungeon_8041D5C *r0)
+void sub_8041CEC(struct DungeonEntity *r0)
 {
     sub_80421C0(r0, 0x19d);
 }
@@ -239,7 +239,7 @@ void nullsub_74(void)
 {
 }
 
-void sub_8041D00(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1)
+void sub_8041D00(struct DungeonEntity *r0, struct DungeonEntity *r1)
 {
     sub_804151C(r1, 0x2F, 1);
     sub_804151C(r0, 0x30, 1);
@@ -269,12 +269,12 @@ void nullsub_80(void)
 {
 }
 
-void sub_8041D38(struct unkDungeon_8041D5C * r0)
+void sub_8041D38(struct DungeonEntity * r0)
 {
     sub_804151C(r0, 0x21, 1);
 }
 
-void sub_8041D48(struct unkDungeon_8041D5C * r0)
+void sub_8041D48(struct DungeonEntity * r0)
 {
     sub_80421C0(r0, 0x191);
 }
@@ -283,7 +283,7 @@ void nullsub_81(void)
 {
 }
 
-void sub_8041D5C(struct unkDungeon_8041D5C *r0)
+void sub_8041D5C(struct DungeonEntity *r0)
 {
     if(sub_8042768(r0) == 0)
     {
@@ -292,7 +292,7 @@ void sub_8041D5C(struct unkDungeon_8041D5C *r0)
     sub_803ED30(r0->unk70->unk112 , r0, 1, 0xB);
 }
 
-void sub_8041D84(struct unkDungeon_8041D5C * r0)
+void sub_8041D84(struct DungeonEntity * r0)
 {
     sub_80421C0(r0, 0x19f);
 }
@@ -305,12 +305,12 @@ void nullsub_83(void)
 {
 }
 
-void sub_8041D9C(struct unkDungeon_8041D5C * r0)
+void sub_8041D9C(struct DungeonEntity * r0)
 {
     sub_804151C(r0, 0x131, 1);
 }
 
-void sub_8041DB0(struct unkDungeon_8041D5C * r0)
+void sub_8041DB0(struct DungeonEntity * r0)
 {
     sub_804151C(r0, 0x30, 1);
 }
@@ -339,7 +339,7 @@ void nullsub_88(void)
 {
 }
 
-void sub_8041DD8(struct unkDungeon_8041D5C *r0, s16 r1)
+void sub_8041DD8(struct DungeonEntity *r0, s16 r1)
 {
     u32 temp;
     temp = r1;
@@ -354,78 +354,78 @@ void nullsub_89(void)
 {
 }
 
-void sub_8041E0C(struct unkDungeon_8041D5C *r0)
+void sub_8041E0C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x41, 1);
 }
 
-void sub_8041E1C(struct unkDungeon_8041D5C *r0)
+void sub_8041E1C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x8F << 1, 1);
     sub_80421C0(r0, 0xCE << 1);
 }
 
-void sub_8041E3C(struct unkDungeon_8041D5C *r0)
+void sub_8041E3C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xD7 << 1, 1);
 }
 
-void sub_8041E4C(struct unkDungeon_8041D5C *r0)
+void sub_8041E4C(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x1b1, 1);
 }
 
-void sub_8041E60(struct unkDungeon_8041D5C *r0)
+void sub_8041E60(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x1a9, 1);
 }
 
-void sub_8041E74(struct unkDungeon_8041D5C *r0)
+void sub_8041E74(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xC9 << 1, 1);
 }
 
-void sub_8041E84(struct unkDungeon_8041D5C *r0)
+void sub_8041E84(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xC7 << 1, 1);
 }
 
-void sub_8041E94(struct unkDungeon_8041D5C *r0)
+void sub_8041E94(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xC8 << 1, 1);
 }
 
-void sub_8041EA4(struct unkDungeon_8041D5C *r0)
+void sub_8041EA4(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x15, 1);
 }
 
-void sub_8041EB4(struct unkDungeon_8041D5C *r0)
+void sub_8041EB4(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x171, 1);
 }
 
-void sub_8041EC8(struct unkDungeon_8041D5C *r0)
+void sub_8041EC8(struct DungeonEntity *r0)
 {
     sub_80421C0(r0, 0x197);
 }
 
-void sub_8041ED8(struct unkDungeon_8041D5C *r0)
+void sub_8041ED8(struct DungeonEntity *r0)
 {
     sub_80421C0(r0, 0x197);
 }
 
-void sub_8041EE8(struct unkDungeon_8041D5C *r0)
+void sub_8041EE8(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0x15, 1);
 }
 
-void sub_8041EF8(struct unkDungeon_8041D5C *r0)
+void sub_8041EF8(struct DungeonEntity *r0)
 {
     sub_804151C(r0, 0xF, 1);
 }
 
-void sub_8041F08(struct unkDungeon_8041D5C *r0)
+void sub_8041F08(struct DungeonEntity *r0)
 {
     sub_8041550(r0, 0x15, 1, 3, 2, 0);
 }
@@ -434,7 +434,7 @@ void nullsub_90(void)
 {
 }
 
-void sub_8041F28(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041F28(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -446,7 +446,7 @@ void sub_8041F28(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041F4C(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041F4C(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -458,7 +458,7 @@ void sub_8041F4C(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041F70(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041F70(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -470,7 +470,7 @@ void sub_8041F70(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041F94(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041F94(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -482,7 +482,7 @@ void sub_8041F94(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041FB4(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041FB4(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -494,7 +494,7 @@ void sub_8041FB4(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041FD8(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041FD8(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -506,7 +506,7 @@ void sub_8041FD8(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8041FFC(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8041FFC(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -518,7 +518,7 @@ void sub_8041FFC(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_804201C(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_804201C(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -530,7 +530,7 @@ void sub_804201C(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8042040(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8042040(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -542,7 +542,7 @@ void sub_8042040(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8042060(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8042060(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -554,7 +554,7 @@ void sub_8042060(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_8042080(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_8042080(struct DungeonEntity *r0, u32 r1)
 {
     if(r1 == 0)
     {
@@ -566,7 +566,7 @@ void sub_8042080(struct unkDungeon_8041D5C *r0, u32 r1)
     }
 }
 
-void sub_80420A0(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_80420A0(struct DungeonEntity *r0, u32 r1)
 {
     sub_804151C(r0, 0x143, 1);
 }
@@ -575,12 +575,12 @@ void nullsub_91(void)
 {
 }
 
-void sub_80420B8(struct unkDungeon_8041D5C *r0, u32 r1)
+void sub_80420B8(struct DungeonEntity *r0, u32 r1)
 {
     sub_804151C(r0, 0x19, 1);
 }
 
-void sub_80420C8(struct unkDungeon_8041D5C *r0)
+void sub_80420C8(struct DungeonEntity *r0)
 {
     sub_8041550(r0, 0x15, 1, 3, 2, 0);
 }
@@ -589,7 +589,7 @@ void nullsub_92(void)
 {
 }
 
-void sub_80420E8(struct unkDungeon_8041D5C *r0, struct unkStruct_80420E8 *r1)
+void sub_80420E8(struct DungeonEntity *r0, struct unkStruct_80420E8 *r1)
 {
     u32 temp;
     u32 arg;
@@ -615,7 +615,7 @@ void sub_80420E8(struct unkDungeon_8041D5C *r0, struct unkStruct_80420E8 *r1)
     sub_8041550(r0, arg, 1, 3, 0, 1);
 }
 
-void sub_8042148(struct unkDungeon_8041D5C *r0)
+void sub_8042148(struct DungeonEntity *r0)
 {
     sub_80421C0(r0, 0x1a7);
     sub_804151C(r0, 0x9F << 1, 1);
@@ -625,7 +625,7 @@ void nullsub_93()
 {
 }
 
-void sub_804216C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2)
+void sub_804216C(u32 r0, struct DungeonEntity *r1, u32 r2)
 {
     if(r2 == 1)
         sub_804151C(r1, 0xF8, 1);
@@ -633,22 +633,22 @@ void sub_804216C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2)
         sub_804151C(r1, 0xF9, 1);
 }
 
-void sub_804218C(u32 r0, struct unkDungeon_8041D5C *r1)
+void sub_804218C(u32 r0, struct DungeonEntity *r1)
 {
     sub_804151C(r1, 0x2A, 1);
 }
 
-void sub_804219C(struct unkDungeon_8041D5C *r0)
+void sub_804219C(struct DungeonEntity *r0)
 {
     sub_80416E0(r0, 0x90, 1);
 }
 
-void sub_80421AC(u32 r0, struct unkDungeon_8041D5C * r1)
+void sub_80421AC(u32 r0, struct DungeonEntity * r1)
 {
     sub_804151C(r1, 0x167, 1);
 }
 
-void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1)
+void sub_80421C0(struct DungeonEntity *r0, u16 r1)
 {
     if(r0 == NULL)
         PlaySoundEffect(r1);
@@ -657,13 +657,13 @@ void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1)
             PlaySoundEffect(r1);
 }
 
-void sub_80421EC(struct unkDungeon_8041D5C *r0, u16 r1)
+void sub_80421EC(struct DungeonEntity *r0, u16 r1)
 {
     if(sub_803F428(r0) != 0)
         PlaySoundEffect(r1);
 }
 
-void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1)
+void sub_8042208(struct DungeonEntity *r0, u8 r1)
 {
     if(r1 == 0)
         PlaySoundEffect(0x152);
@@ -673,7 +673,7 @@ void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1)
         PlaySoundEffect(0x150);
 }
 
-void sub_8042238(u32 r0, struct unkDungeon_8041D5C *r1)
+void sub_8042238(u32 r0, struct DungeonEntity *r1)
 {
     if(r1->unk70->unk6 != 0)
         PlaySoundEffect(0x157);