Decompile func00027d1c

src/include/constants.h

@@ -529,13 +529,22 @@
 #define CDRESULT_COLLISION   0
 #define CDRESULT_NOCOLLISION 1
 
-#define CDTYPE_OBJS    0x01
-#define CDTYPE_DOORS   0x02
-#define CDTYPE_PLAYERS 0x04
-#define CDTYPE_CHRS    0x08
-#define CDTYPE_10      0x10
-#define CDTYPE_BG      0x20
-#define CDTYPE_ALL     0x3f
+#define CDTYPE_OBJS              0x0001
+#define CDTYPE_DOORS             0x0002
+#define CDTYPE_PLAYERS           0x0004
+#define CDTYPE_CHRS              0x0008
+#define CDTYPE_10                0x0010
+#define CDTYPE_BG                0x0020
+#define CDTYPE_OBJSWITHFLAG      0x0080
+#define CDTYPE_OBJSWITHOUTFLAG   0x0100
+#define CDTYPE_OBJSWITHFLAG2     0x0200
+#define CDTYPE_OBJSNOTSAFEORHELI 0x0400
+#define CDTYPE_DOORSWITHOUTFLAG  0x0800
+#define CDTYPE_CLOSEDDOORS       0x1000
+#define CDTYPE_OPENDOORS         0x2000
+#define CDTYPE_AJARDOORS         0x4000
+#define CDTYPE_DOORSLOCKEDTOAI   0x8000
+#define CDTYPE_ALL               0x003f
 
 #define COLOR_00_GREEN  0x00
 #define COLOR_02_WHITE  0x02

src/include/game/game_0601b0.h

@@ -39,8 +39,8 @@ void func0f0641f4(void);
 u32 func0f06438c(void);
 u32 func0f064a24(void);
 void func0f064ce8(void);
-u32 func0f0654e8(struct prop *prop);
-bool func0f06554c(struct prop *prop, u32 flags);
+u32 propDoorGetCdTypes(struct prop *prop);
+bool propIsOfCdType(struct prop *prop, u32 types);
 void roomsCopy(s16 *srcrooms, s16 *dstrooms);
 void func0f0657d8(s16 *newrooms, s16 *rooms, u32 arg2);
 bool arrayIntersects(s16 *a, s16 *b);

src/include/gvars/gvars.h

@@ -453,8 +453,8 @@ extern u32 var8009a88c;
 extern u32 var8009a890;
 extern s16 var8009a894;
 extern struct animheader *var8009a898;
-extern u32 *g_TileFileData;
-extern u32 g_TileNumRooms;
+extern union filedataptr g_TileFileData;
+extern s32 g_TileNumRooms;
 extern u32 *g_TileRooms;
 extern u32 var8009a8ac;
 extern u32 var8009a8b4;

src/include/lib/lib_233c0.h

@@ -64,8 +64,8 @@ u32 func0002709c(void);
 u32 func000272f8(void);
 s32 func000274e0(struct geo *geo, f32 x, f32 z, f32 angle, s32 arg4, s32 arg5);
 s32 func000276c8(struct geo *geo, f32 x, f32 z, f32 angle, s32 arg4, s32 arg5);
-u32 func00027738(void);
-void func00027d1c(struct coord *pos, f32 width, s16 *rooms, u32 types, u32 arg4, u32 arg5, f32 arg6, f32 arg7, u32 *arg8, u32 arg9);
+void func00027738(struct coord *pos, f32 width, void *arg2, void *arg3, u32 arg4, u32 arg5, f32 arg6, f32 arg7, struct prop *prop, struct collisionthing *arg9, u32 arg10, s32 *arg11, s16 roomnum);
+void func00027d1c(struct coord *pos, f32 width, s16 *rooms, u32 types, u16 arg4, u32 arg5, f32 arg6, f32 arg7, struct collisionthing *arg8, s32 arg9);
 u32 func00027f78(void);
 u32 func00028200(void);
 u32 func0002840c(void);
@@ -74,7 +74,7 @@ u32 func0002885c(void);
 u32 func00028914(void);
 void func00028df0(struct coord *dstpos, f32 width, s16 *dstrooms, s32 types, s32 arg4, s32 arg5, f32 ymax, f32 ymin, s32 *arg8, s32 arg9);
 void func0002901c(struct coord *pos, struct coord *dist, f32 width, s32 *arg3);
-f32 func000296a0(u32 *arg0, struct coord *pos, struct tilething **arg2, f32 width);
+f32 func000296a0(struct collisionthing *arg0, struct coord *pos, struct tilething **arg2, f32 width);
 bool func00029ffc(struct coord *pos, f32 width, f32 foreheadheight, f32 inversefeettoeyesheight, s16 *rooms, u32 arg5, struct coord *laddernormal);
 u32 func0002a13c(void);
 f32 cdFindGroundY(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, s16 *floorroom, s32 *inlift, struct prop **lift);

src/include/types.h

@@ -104,6 +104,11 @@ struct pad {
 	/*0x52*/ s16 unk52;
 };
 
+union filedataptr {
+	u8 *u8;
+	u32 *u32;
+};
+
 struct animfloats {
 	/*0x00*/ u16 animnum;
 	/*0x04*/ f32 unk04;
@@ -6883,4 +6888,12 @@ struct var800ab570 {
 	u32 unk04;
 };
 
+struct collisionthing {
+	u32 unk00;
+	u32 unk04;
+	u32 unk08;
+	u32 unk0c;
+	u32 unk10;
+};
+
 #endif