Decompile targetedpropCheckCmpFollow

src/include/constants.h

@@ -2177,10 +2177,10 @@
 #define PORTALMODE_SHOW 0
 #define PORTALMODE_HIDE 1
 
-#define PROPFLAG_02     0x02
-#define PROPFLAG_HIDDEN 0x04
-#define PROPFLAG_40     0x40
-#define PROPFLAG_80     0x80
+#define PROPFLAG_CMPFOLLOW 0x02
+#define PROPFLAG_HIDDEN    0x04
+#define PROPFLAG_40        0x40
+#define PROPFLAG_80        0x80
 
 #define PROPTYPE_OBJ       1
 #define PROPTYPE_DOOR      2

src/include/game/game_167ae0.h

@@ -12,7 +12,7 @@ void boostAndSlayerSfxUpdate(void);
 void func0f167e7c(s32 stagenum);
 Gfx *fadeRender(Gfx *gdl);
 void fadeCancel(void);
-u32 func0f1688fc(void);
+bool targetedpropCheckCmpFollow(struct targetedprop *targetedprop, s32 index);
 u32 func0f168b4c(void);
 u32 func0f168f24(void);
 u32 func0f1691c0(void);

src/include/game/propobj.h

@@ -49,7 +49,7 @@ u32 func0f0679ac(void);
 u32 func0f067bc4(void);
 u32 func0f067d88(void);
 u32 func0f067dc4(void);
-void func0f068018(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
+bool func0f068018(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
 u32 func0f06803c(void);
 struct defaultobj *objFindByPadNum(s32 padnum);
 u32 func0f068218(void);

src/include/types.h

@@ -1198,7 +1198,7 @@ struct playerbond {
 	/*0x0360 0x0394*/ struct coord unk28;
 };
 
-struct player1630 {
+struct targetedprop {
 	struct prop *prop;
 	s16 unk04;
 	s16 unk06;
@@ -2082,10 +2082,8 @@ struct player {
 	/*0x161c*/ u16 floorflags;
 	/*0x161e*/ u8 floortype;
 	/*0x1620*/ u32 aimtype;
-	/*0x1624*/ struct prop *lookingatprop;
-	/*0x1628*/ u32 unk1628;
-	/*0x162c*/ u32 unk162c;
-	/*0x1630*/ struct player1630 unk1630[4];
+	/*0x1624*/ struct targetedprop lookingatprop;
+	/*0x1630*/ struct targetedprop cmpfollowprops[4];
 	/*0x1660*/ u32 unk1660;
 	/*0x1664*/ u32 unk1664;
 	/*0x1668*/ u32 unk1668;
@@ -2297,7 +2295,7 @@ struct player {
 	/*0x1b84*/ bool tickdiefinished;
 	/*0x1b88*/ s32 introanimnum;
 	/*0x1b8c*/ u32 unk1b8c;
-	/*0x1b90*/ u16 unk1b90[4];
+	/*0x1b90*/ u16 unk1b90[4]; // related to cmpfollowprops
 	/*0x1b98*/ u32 unk1b98;
 	/*0x1b9c*/ f32 speedthetacontrol;
 	/*0x1ba0*/ s32 cam_room;